fix(@ngtools/webpack): dont error on non-identifier properties. (angular#4078)

hansl · web-flow · commit e91552ffcd9e · 2017-01-17T17:27:07.000-08:00
diff --git a/packages/@ngtools/webpack/src/loader.spec.ts b/packages/@ngtools/webpack/src/loader.spec.ts
@@ -0,0 +1,27 @@
+import * as ts from 'typescript';
+import {removeModuleIdOnlyForTesting} from './loader';
+import {WebpackCompilerHost} from './compiler_host';
+import {TypeScriptFileRefactor} from './refactor';
+
+describe('@ngtools/webpack', () => {
+  describe('loader', () => {
+    describe('removeModuleId', () => {
+      it('should work', () => {
+        const host = new WebpackCompilerHost({}, '');
+        host.writeFile('/file.ts', `
+          export const obj = { moduleId: 123 };
+          export const obj2 = { moduleId: 123, otherValue: 1 };
+          export const obj2 = { otherValue: 1, moduleId: 123 };
+        `, false);
+
+        const program = ts.createProgram(['/file.ts'], {}, host);
+
+        const refactor = new TypeScriptFileRefactor('/file.ts', host, program);
+        removeModuleIdOnlyForTesting(refactor);
+
+        expect(refactor.sourceText).toMatch(/obj = \{\s+};/);
+        expect(refactor.sourceText).toMatch(/obj2 = \{\s*otherValue: 1\s*};/);
+      });
+    });
+  });
+});
diff --git a/packages/@ngtools/webpack/src/loader.ts b/packages/@ngtools/webpack/src/loader.ts
@@ -97,10 +97,10 @@ function _removeModuleId(refactor: TypeScriptFileRefactor) {
   refactor.findAstNodes(sourceFile, ts.SyntaxKind.ObjectLiteralExpression, true)
     // Get all their property assignments.
     .filter((node: ts.ObjectLiteralExpression) =>
-      node.properties.some(prop => prop.name.getText() == 'moduleId'))
+      node.properties.some(prop => _getContentOfKeyLiteral(sourceFile, prop.name) == 'moduleId'))
     .forEach((node: ts.ObjectLiteralExpression) => {
       const moduleIdProp = node.properties.filter((prop: ts.ObjectLiteralElement, idx: number) => {
-        return prop.name.getText() == 'moduleId';
+        return _getContentOfKeyLiteral(sourceFile, prop.name) == 'moduleId';
       })[0];
       // get the trailing comma
       const moduleIdCommaProp = moduleIdProp.parent.getChildAt(1).getChildren()[1];
diff --git a/packages/@ngtools/webpack/src/refactor.ts b/packages/@ngtools/webpack/src/refactor.ts
@@ -170,7 +170,7 @@ export class TypeScriptFileRefactor {
   }
 
   removeNodes(...nodes: ts.Node[]) {
-    nodes.forEach(node => this.removeNode(node));
+    nodes.forEach(node => node && this.removeNode(node));
   }
 
   replaceNode(node: ts.Node, replacement: string) {
diff --git a/tests/acceptance/ngtools-webpack-loader.spec.ts b/tests/acceptance/ngtools-webpack-loader.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ export class TypeScriptFileRefactor {`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`removeNodes(...nodes: ts.Node[]) {`
`173`		`- nodes.forEach(node => this.removeNode(node));`
	`173`	`+ nodes.forEach(node => node && this.removeNode(node));`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`replaceNode(node: ts.Node, replacement: string) {`