refactor(AOT): use ng-tools public api instead of ngc private apis

use ng-tools public api instead of ngc private apis

Author: danbucholtz

src/aot/aot-compiler.ts

@@ -43,7 +43,7 @@ export class AotCompiler {
     this.program = createProgram(this.tsConfig.parsed.fileNames, this.tsConfig.parsed.options, this.compilerHost);
   }
 
-  compile(): Promise<void> {
+  compile(): Promise<any> {
     return Promise.resolve().then(() => {
     }).then(() => {
       clearDiagnostics(this.context, DiagnosticsType.TypeScript);
@@ -59,7 +59,8 @@ export class AotCompiler {
         angularCompilerOptions: this.angularCompilerOptions,
         cliOptions: i18nOptions,
         program: this.program,
-        compilerHost: this.compilerHost
+        compilerHost: this.compilerHost,
+        compilerOptions: this.tsConfig.parsed.options
       });
     }).then(() => {
       Logger.debug('[AotCompiler] compile: starting codegen ... DONE');

src/aot/codegen.ts

@@ -1,13 +1,22 @@
-import { CodegenOptions } from '../util/interfaces';
-import { runCodegen, isAngular22 } from './codegen/codegen-ng22';
-import { runCodegen as runCodegen23 } from './codegen/codegen-ng23plus';
+import { __NGTOOLS_PRIVATE_API_2 } from '@angular/compiler-cli';
 
+import { readFileAsync } from '../util/helpers';
+import { CodegenOptions } from '../util/interfaces';
 
 export function doCodegen(options: CodegenOptions) {
-  if (isAngular22()) {
-    return runCodegen(options);
-  }
-  return runCodegen23(options);
+  return __NGTOOLS_PRIVATE_API_2.codeGen({
+    angularCompilerOptions: options.angularCompilerOptions,
+    basePath: options.cliOptions.basePath,
+    program: options.program,
+    host: options.compilerHost,
+    compilerOptions: options.compilerOptions,
+    i18nFile: options.cliOptions.i18nFile,
+    i18nFormat: options.cliOptions.i18nFormat,
+    locale: options.cliOptions.locale,
+    readResource: (fileName: string) => {
+      return readFileAsync(fileName);
+    }
+  });
 }
 
 

src/aot/codegen/codegen-ng22.ts

@@ -1,6 +1,6 @@
 import * as CompilerCLI from '@angular/compiler-cli';
 import AngularCompilerOptions from '@angular/tsc-wrapped/src/options';
-import { CompilerHost, Program } from 'typescript';
+import { CompilerHost, CompilerOptions, Program } from 'typescript';
 
 import { FileCache } from './file-cache';
 import { VirtualDirStats, VirtualFileStats } from './virtual-file-utils';
@@ -179,6 +179,7 @@ export interface CodegenOptions {
   cliOptions: CompilerCLI.NgcCliOptions;
   program: Program;
   compilerHost: CompilerHost;
+  compilerOptions: CompilerOptions;
 };
 
 export interface TreeShakeCalcResults {