cleaner attempt to find the property and remove trailing comma if not last property

Author: Brocco

packages/@ngtools/webpack/src/loader.ts

@@ -90,24 +90,44 @@ function _replaceBootstrap(plugin: AotPlugin, refactor: TypeScriptFileRefactor)
 function _removeModuleId(refactor: TypeScriptFileRefactor) {
   const sourceFile = refactor.sourceFile;
 
-  // Find all object literals.
   refactor.findAstNodes(sourceFile, ts.SyntaxKind.ObjectLiteralExpression, true)
     // Get all their property assignments.
-    .map(node => refactor.findAstNodes(node, ts.SyntaxKind.PropertyAssignment))
-    // Flatten into a single array (from an array of array<property assignments>).
-    .reduce((prev, curr) => curr ? prev.concat(curr) : prev, [])
-    // Remove every property assignment that aren't 'loadChildren'.
-    .filter((node: ts.PropertyAssignment) => {
-      const key = _getContentOfKeyLiteral(sourceFile, node.name);
-      if (!key) {
-        // key is an expression, can't do anything.
-        return false;
-      }
-      return key == 'moduleId';
-    })
-    .forEach((node: ts.PropertyAssignment) => {
-      refactor.removeNode(node);
+    .filter((node: ts.ObjectLiteralExpression) =>
+      node.properties.some(prop => prop.name.getText() == 'moduleId'))
+    .forEach((node: ts.ObjectLiteralExpression) => {
+      let isLastProp: boolean = false;
+
+      let moduleIdProp = node.properties.filter((prop: ts.ObjectLiteralElement, idx) => {
+        const isModuleId = prop.name.getText() == 'moduleId';
+        if (isModuleId && idx == node.properties.length - 1) {
+          isLastProp = true;
+        }
+        return isModuleId;
+      })[0];
+
+      refactor.removeNode(moduleIdProp, isLastProp ? undefined : ',');
     });
+
+  // // Find all object literals.
+  // refactor.findAstNodes(sourceFile, ts.SyntaxKind.ObjectLiteralExpression, true)
+  //   // Get all their property assignments.
+  //   .map((node: ts.ObjectLiteralExpression) => refactor.findAstNodes(node, ts.SyntaxKind.PropertyAssignment))
+  //   // Flatten into a single array (from an array of array<property assignments>).
+  //   .reduce((prev, curr) => curr ? prev.concat(curr) : prev, [])
+  //   // Remove every property assignment that aren't 'loadChildren'.
+  //   .filter((node: ts.PropertyAssignment) => {
+  //     const key = _getContentOfKeyLiteral(sourceFile, node.name);
+  //     if (!key) {
+  //       // key is an expression, can't do anything.
+  //       return false;
+  //     }
+  //     return key == 'moduleId';
+  //   })
+  //   .forEach((node: ts.PropertyAssignment) => {
+  //     console.log('');
+  //     console.log('removing node: ', node.getFullText());
+  //     refactor.removeNode(node);
+  //   });
 }
 
 function _replaceResources(refactor: TypeScriptFileRefactor): void {

packages/@ngtools/webpack/src/refactor.ts

@@ -164,8 +164,14 @@ export class TypeScriptFileRefactor {
     }
   }
 
-  removeNode(node: ts.Node) {
-    this._sourceString.remove(node.getStart(this._sourceFile), node.getEnd());
+  removeNode(node: ts.Node, deleteThroughChar: string) {
+    let end = node.getEnd();
+    if (!!deleteThroughChar) {
+      while(this._sourceText.charAt(end-1) != deleteThroughChar) {
+        end++;
+      }
+    }
+    this._sourceString.remove(node.getStart(this._sourceFile), end);
     this._changed = true;
   }