feat(compiler-cli): add param to set MissingTranslationStrategy on ngc (angular#15987)

ocombe · mhevery · commit 6e2abcd5fc51 · 2017-04-27T17:38:59.000-05:00
This commit adds a new parameter to ngc named `missingTranslation` to set the MissingTranslationStrategy for AoT, it takes the value `error`, `warning` or `ignore`. Fixes angular#15808 PR Close angular#15987
diff --git a/packages/compiler-cli/src/codegen.ts b/packages/compiler-cli/src/codegen.ts
@@ -11,9 +11,9 @@
  * Intended to be used in a build step.
  */
 import * as compiler from '@angular/compiler';
+import {MissingTranslationStrategy} from '@angular/core';
 import {AngularCompilerOptions, NgcCliOptions} from '@angular/tsc-wrapped';
 import {readFileSync} from 'fs';
-import * as path from 'path';
 import * as ts from 'typescript';
 
 import {CompilerHost, CompilerHostContext, ModuleResolutionHostAdapter} from './compiler_host';
@@ -61,20 +61,35 @@ export class CodeGenerator {
       ngCompilerHost = usePathMapping ? new PathMappedCompilerHost(program, options, context) :
                                         new CompilerHost(program, options, context);
     }
-    const transFile = cliOptions.i18nFile;
-    const locale = cliOptions.locale;
     let transContent: string = '';
-    if (transFile) {
-      if (!locale) {
+    if (cliOptions.i18nFile) {
+      if (!cliOptions.locale) {
         throw new Error(
-            `The translation file (${transFile}) locale must be provided. Use the --locale option.`);
+            `The translation file (${cliOptions.i18nFile}) locale must be provided. Use the --locale option.`);
+      }
+      transContent = readFileSync(cliOptions.i18nFile, 'utf8');
+    }
+    let missingTranslation = MissingTranslationStrategy.Warning;
+    if (cliOptions.missingTranslation) {
+      switch (cliOptions.missingTranslation) {
+        case 'error':
+          missingTranslation = MissingTranslationStrategy.Error;
+          break;
+        case 'warning':
+          missingTranslation = MissingTranslationStrategy.Warning;
+          break;
+        case 'ignore':
+          missingTranslation = MissingTranslationStrategy.Ignore;
+          break;
+        default:
+          throw new Error(
+              `Unknown option for missingTranslation (${cliOptions.missingTranslation}). Use either error, warning or ignore.`);
       }
-      transContent = readFileSync(transFile, 'utf8');
     }
     const {compiler: aotCompiler} = compiler.createAotCompiler(ngCompilerHost, {
       translations: transContent,
       i18nFormat: cliOptions.i18nFormat,
-      locale: cliOptions.locale,
+      locale: cliOptions.locale, missingTranslation,
       enableLegacyTemplate: options.enableLegacyTemplate !== false,
       genFilePreamble: PREAMBLE,
     });
diff --git a/packages/compiler-cli/src/ngtools_api.ts b/packages/compiler-cli/src/ngtools_api.ts
@@ -35,6 +35,7 @@ export interface NgTools_InternalApi_NG2_CodeGen_Options {
   i18nFormat?: string;
   i18nFile?: string;
   locale?: string;
+  missingTranslation?: string;
 
   readResource: (fileName: string) => Promise<string>;
 
@@ -95,6 +96,7 @@ export class NgTools_InternalApi_NG_2 {
       i18nFormat: options.i18nFormat !,
       i18nFile: options.i18nFile !,
       locale: options.locale !,
+      missingTranslation: options.missingTranslation !,
       basePath: options.basePath
     };
 
diff --git a/packages/compiler/src/aot/compiler_factory.ts b/packages/compiler/src/aot/compiler_factory.ts
@@ -51,12 +51,12 @@ export function createAotCompiler(compilerHost: AotCompilerHost, options: AotCom
   StaticAndDynamicReflectionCapabilities.install(staticReflector);
   const console = new Console();
   const htmlParser = new I18NHtmlParser(
-      new HtmlParser(), translations, options.i18nFormat, MissingTranslationStrategy.Warning,
-      console);
+      new HtmlParser(), translations, options.i18nFormat, options.missingTranslation, console);
   const config = new CompilerConfig({
     defaultEncapsulation: ViewEncapsulation.Emulated,
     useJit: false,
     enableLegacyTemplate: options.enableLegacyTemplate !== false,
+    missingTranslation: options.missingTranslation,
   });
   const normalizer = new DirectiveNormalizer(
       {get: (url: string) => compilerHost.loadResource(url)}, urlResolver, htmlParser, config);
diff --git a/packages/compiler/src/aot/compiler_options.ts b/packages/compiler/src/aot/compiler_options.ts
@@ -6,10 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {MissingTranslationStrategy} from '@angular/core';
+
 export interface AotCompilerOptions {
   locale?: string;
   i18nFormat?: string;
   translations?: string;
+  missingTranslation?: MissingTranslationStrategy;
   enableLegacyTemplate?: boolean;
   /** preamble for all generated source files */
   genFilePreamble?: string;
diff --git a/tools/@angular/tsc-wrapped/src/cli_options.ts b/tools/@angular/tsc-wrapped/src/cli_options.ts
@@ -31,12 +31,20 @@ export class NgcCliOptions extends CliOptions {
   public i18nFormat: string;
   public i18nFile: string;
   public locale: string;
+  public missingTranslation: string;
 
-  constructor({i18nFormat = null, i18nFile = null, locale = null, basePath = null}:
-                  {i18nFormat?: string, i18nFile?: string, locale?: string, basePath?: string}) {
+  constructor({i18nFormat = null, i18nFile = null, locale = null, missingTranslation = null,
+               basePath = null}: {
+    i18nFormat?: string,
+    i18nFile?: string,
+    locale?: string,
+    missingTranslation?: string,
+    basePath?: string
+  }) {
     super({basePath: basePath});
     this.i18nFormat = i18nFormat;
     this.i18nFile = i18nFile;
     this.locale = locale;
+    this.missingTranslation = missingTranslation;
   }
 }
