feat(i18n): pass translation config directly into ngc (#10622)

modules/@angular/compiler-cli/src/codegen.ts

@@ -12,7 +12,7 @@
  */
 import * as compiler from '@angular/compiler';
 import {ComponentMetadata, NgModuleMetadata, ViewEncapsulation} from '@angular/core';
-import {AngularCompilerOptions} from '@angular/tsc-wrapped';
+import {AngularCompilerOptions, NgcCliOptions} from '@angular/tsc-wrapped';
 import * as path from 'path';
 import * as ts from 'typescript';
 
@@ -22,6 +22,8 @@ import {GENERATED_FILES, ReflectorHost, ReflectorHostContext} from './reflector_
 import {StaticAndDynamicReflectionCapabilities} from './static_reflection_capabilities';
 import {StaticReflector, StaticSymbol} from './static_reflector';
 
+const nodeFs = require('fs');
+
 const PREAMBLE = `/**
  * This file is generated by the Angular 2 template compiler.
  * Do not edit.
@@ -117,8 +119,9 @@ export class CodeGenerator {
   }
 
   static create(
-      options: AngularCompilerOptions, program: ts.Program, compilerHost: ts.CompilerHost,
-      reflectorHostContext?: ReflectorHostContext, xhr?: compiler.XHR): CodeGenerator {
+      options: AngularCompilerOptions, cliOptions: NgcCliOptions, program: ts.Program,
+      compilerHost: ts.CompilerHost, reflectorHostContext?: ReflectorHostContext,
+      xhr?: compiler.XHR): CodeGenerator {
     xhr = xhr || {
       get: (s: string) => {
         if (!compilerHost.fileExists(s)) {
@@ -128,11 +131,18 @@ export class CodeGenerator {
         return Promise.resolve(compilerHost.readFile(s));
       }
     };
+    const transFile = cliOptions.i18nFile;
+    const locale = cliOptions.locale;
+    let transContent: string = '';
+    if (transFile && locale) {
+      transContent = nodeFs.readFileSync(transFile, 'utf8');
+    }
+
     const urlResolver: compiler.UrlResolver = compiler.createOfflineCompileUrlResolver();
     const reflectorHost = new ReflectorHost(program, compilerHost, options, reflectorHostContext);
     const staticReflector = new StaticReflector(reflectorHost);
     StaticAndDynamicReflectionCapabilities.install(staticReflector);
-    const htmlParser = new compiler.i18n.HtmlParser(new HtmlParser());
+    const htmlParser = new compiler.i18n.HtmlParser(new HtmlParser(), transContent);
     const config = new compiler.CompilerConfig({
       genDebugInfo: options.debug === true,
       defaultEncapsulation: ViewEncapsulation.Emulated,
@@ -151,7 +161,8 @@ export class CodeGenerator {
         config, console, elementSchemaRegistry, staticReflector);
     const offlineCompiler = new compiler.OfflineCompiler(
         resolver, normalizer, tmplParser, new StyleCompiler(urlResolver), new ViewCompiler(config),
-        new NgModuleCompiler(), new TypeScriptEmitter(reflectorHost));
+        new NgModuleCompiler(), new TypeScriptEmitter(reflectorHost), cliOptions.locale,
+        cliOptions.i18nFormat);
 
     return new CodeGenerator(
         options, program, compilerHost, staticReflector, offlineCompiler, reflectorHost);

modules/@angular/compiler-cli/src/extract_i18n.ts

@@ -28,8 +28,9 @@ import {StaticAndDynamicReflectionCapabilities} from './static_reflection_capabi
 import {StaticReflector, StaticSymbol} from './static_reflector';
 
 function extract(
-    ngOptions: tsc.AngularCompilerOptions, program: ts.Program, host: ts.CompilerHost) {
-  const extractor = Extractor.create(ngOptions, program, host);
+    ngOptions: tsc.AngularCompilerOptions, cliOptions: tsc.I18nExtractionCliOptions,
+    program: ts.Program, host: ts.CompilerHost) {
+  const extractor = Extractor.create(ngOptions, cliOptions.i18nFormat, program, host);
   const bundlePromise: Promise<compiler.i18n.MessageBundle> = extractor.extract();
 
   return (bundlePromise).then(messageBundle => {
@@ -126,8 +127,8 @@ export class Extractor {
   }
 
   static create(
-      options: tsc.AngularCompilerOptions, program: ts.Program, compilerHost: ts.CompilerHost,
-      reflectorHostContext?: ReflectorHostContext): Extractor {
+      options: tsc.AngularCompilerOptions, translationsFormat: string, program: ts.Program,
+      compilerHost: ts.CompilerHost, reflectorHostContext?: ReflectorHostContext): Extractor {
     const xhr: compiler.XHR = {
       get: (s: string) => {
         if (!compilerHost.fileExists(s)) {
@@ -163,7 +164,7 @@ export class Extractor {
         config, console, elementSchemaRegistry, staticReflector);
     const offlineCompiler = new compiler.OfflineCompiler(
         resolver, normalizer, tmplParser, new StyleCompiler(urlResolver), new ViewCompiler(config),
-        new NgModuleCompiler(), new TypeScriptEmitter(reflectorHost));
+        new NgModuleCompiler(), new TypeScriptEmitter(reflectorHost), null, null);
 
     // TODO(vicb): implicit tags & attributes
     let messageBundle = new compiler.i18n.MessageBundle(htmlParser, [], {});
@@ -183,11 +184,13 @@ interface FileMetadata {
 // Entry point
 if (require.main === module) {
   const args = require('minimist')(process.argv.slice(2));
-  tsc.main(args.p || args.project || '.', args.basePath, extract)
-      .then(exitCode => process.exit(exitCode))
-      .catch(e => {
+  const project = args.p || args.project || '.';
+  const cliOptions = new tsc.I18nExtractionCliOptions(args);
+  tsc.main(project, cliOptions, extract)
+      .then((exitCode: any) => process.exit(exitCode))
+      .catch((e: any) => {
         console.error(e.stack);
         console.error('Extraction failed');
         process.exit(1);
       });
-}
+}

modules/@angular/compiler-cli/src/main.ts

@@ -17,18 +17,19 @@ import * as tsc from '@angular/tsc-wrapped';
 import {CodeGenerator} from './codegen';
 
 function codegen(
-    ngOptions: tsc.AngularCompilerOptions, program: ts.Program, host: ts.CompilerHost) {
-  return CodeGenerator.create(ngOptions, program, host).codegen();
+    ngOptions: tsc.AngularCompilerOptions, cliOptions: tsc.NgcCliOptions, program: ts.Program,
+    host: ts.CompilerHost) {
+  return CodeGenerator.create(ngOptions, cliOptions, program, host).codegen();
 }
 
 // CLI entry point
 if (require.main === module) {
   const args = require('minimist')(process.argv.slice(2));
-  tsc.main(args.p || args.project || '.', args.basePath, codegen)
-      .then(exitCode => process.exit(exitCode))
-      .catch(e => {
-        console.error(e.stack);
-        console.error('Compilation failed');
-        process.exit(1);
-      });
+  const project = args.p || args.project || '.';
+  const cliOptions = new tsc.NgcCliOptions(args);
+  tsc.main(project, cliOptions, codegen).then(exitCode => process.exit(exitCode)).catch(e => {
+    console.error(e.stack);
+    console.error('Compilation failed');
+    process.exit(1);
+  });
 }