fix(@ngtools/webpack): fix locale refactoring code for commonjs

And just general be right (since nothing prevents TypeScript from renaming
imports).

Author: hansl

packages/@ngtools/webpack/src/transformers/insert_import.ts

@@ -9,6 +9,8 @@ export function insertStarImport(
   sourceFile: ts.SourceFile,
   identifier: ts.Identifier,
   modulePath: string,
+  target?: ts.Node,
+  before = false,
 ): TransformOperation[] {
   const ops: TransformOperation[] = [];
   const allImports = findAstNodes(null, sourceFile, ts.SyntaxKind.ImportDeclaration);
@@ -21,7 +23,14 @@ export function insertStarImport(
   const newImport = ts.createImportDeclaration(undefined, undefined, importClause,
     ts.createLiteral(modulePath));
 
-  if (allImports.length > 0) {
+  if (target) {
+    ops.push(new AddNodeOperation(
+      sourceFile,
+      target,
+      before ? newImport : undefined,
+      before ? undefined : newImport
+    ));
+  } else if (allImports.length > 0) {
     // Find the last import and insert after.
     ops.push(new AddNodeOperation(
       sourceFile,

packages/@ngtools/webpack/src/transformers/register_locale_data.spec.ts

@@ -21,9 +21,9 @@ describe('@ngtools/webpack transformers', () => {
         platformBrowserDynamic().bootstrapModule(AppModule);
       `;
       const output = stripIndent`
-        import __locale_fr__ from "@angular/common/locales/fr";
-        import { registerLocaleData } from "@angular/common";
-        registerLocaleData(__locale_fr__);
+        import * as __NgCli_locale_1 from "@angular/common/locales/fr";
+        import * as __NgCli_locale_2 from "@angular/common";
+        __NgCli_locale_2.registerLocaleData(__NgCli_locale_1.default);
 
         import { enableProdMode } from '@angular/core';
         import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';

packages/@ngtools/webpack/src/transformers/register_locale_data.ts

@@ -3,6 +3,7 @@ import * as ts from 'typescript';
 
 import { findAstNodes, getFirstNode } from './ast_helpers';
 import { AddNodeOperation, TransformOperation } from './make_transform';
+import { insertStarImport } from './insert_import';
 
 
 export function registerLocaleData(
@@ -44,40 +45,33 @@ export function registerLocaleData(
       return;
     }
 
-    // Create the import node for the locale.
-    const localeIdentifier = ts.createIdentifier(`__locale_${locale.replace(/-/g, '')}__`);
-    const localeImportClause = ts.createImportClause(localeIdentifier, undefined);
-    const localeNewImport = ts.createImportDeclaration(undefined, undefined, localeImportClause,
-      ts.createLiteral(`@angular/common/locales/${locale}`));
+    const firstNode = getFirstNode(sourceFile);
 
-    ops.push(new AddNodeOperation(
-      sourceFile,
-      getFirstNode(sourceFile),
-      localeNewImport
+    // Create the import node for the locale.
+    const localeNamespaceId = ts.createUniqueName('__NgCli_locale_');
+    ops.push(...insertStarImport(
+      sourceFile, localeNamespaceId, `@angular/common/locales/${locale}`, firstNode, true
     ));
 
     // Create the import node for the registerLocaleData function.
     const regIdentifier = ts.createIdentifier(`registerLocaleData`);
-    const regImportSpecifier = ts.createImportSpecifier(undefined, regIdentifier);
-    const regNamedImport = ts.createNamedImports([regImportSpecifier]);
-    const regImportClause = ts.createImportClause(undefined, regNamedImport);
-    const regNewImport = ts.createImportDeclaration(undefined, undefined, regImportClause,
-      ts.createLiteral('@angular/common'));
-
-    ops.push(new AddNodeOperation(
-      sourceFile,
-      getFirstNode(sourceFile),
-      regNewImport
-    ));
+    const regNamespaceId = ts.createUniqueName('__NgCli_locale_');
+    ops.push(
+      ...insertStarImport(sourceFile, regNamespaceId, '@angular/common', firstNode, true)
+    );
 
     // Create the register function call
-    const registerFunctionCall = ts.createCall(regIdentifier, undefined, [localeIdentifier]);
+    const registerFunctionCall = ts.createCall(
+      ts.createPropertyAccess(regNamespaceId, regIdentifier),
+      undefined,
+      [ts.createPropertyAccess(localeNamespaceId, 'default')],
+    );
     const registerFunctionStatement = ts.createStatement(registerFunctionCall);
 
     ops.push(new AddNodeOperation(
       sourceFile,
-      getFirstNode(sourceFile),
-      registerFunctionStatement
+      firstNode,
+      registerFunctionStatement,
     ));
   });