chore(general): use insert utility

Author: Peter Smith

libs/ddd/src/schematics/rules/add-declaration.ts

@@ -1,7 +1,6 @@
 import { Rule, Tree } from '@angular-devkit/schematics';
 import { addDeclarationToModule } from '@schematics/angular/utility/ast-utils';
-import { InsertChange } from '@schematics/angular/utility/change';
-import { readIntoSourceFile } from '../utils';
+import { readIntoSourceFile, insert } from '../utils';
 
 /**
  * addDeclaration
@@ -17,19 +16,13 @@ export function addDeclaration(
   return (host: Tree) => {
     const source = readIntoSourceFile(host, modulePath);
 
-    const changes = addDeclarationToModule(
-      source,
-      modulePath,
-      componentToImportName,
-      componentToImportPath
-    );
-
-    const declarationRecorder = host.beginUpdate(modulePath);
-    for (const change of changes) {
-      if (change instanceof InsertChange) {
-        declarationRecorder.insertLeft(change.pos, change.toAdd);
-      }
-    }
-    host.commitUpdate(declarationRecorder);
+    insert(host, modulePath, [
+      ...addDeclarationToModule(
+        source,
+        modulePath,
+        componentToImportName,
+        componentToImportPath
+      ),
+    ]);
   };
 }

libs/ddd/src/schematics/rules/add-export.ts

@@ -1,7 +1,6 @@
 import { Rule, Tree } from '@angular-devkit/schematics';
 import { addExportToModule } from '@schematics/angular/utility/ast-utils';
-import { InsertChange } from '@schematics/angular/utility/change';
-import { readIntoSourceFile } from '../utils';
+import { insert, readIntoSourceFile } from '../utils';
 
 /**
  * addExport
@@ -17,19 +16,13 @@ export function addExport(
   return (host: Tree) => {
     const source = readIntoSourceFile(host, modulePath);
 
-    const changes = addExportToModule(
-      source,
-      modulePath,
-      componentToImportName,
-      componentToImportPath
-    );
-
-    const declarationRecorder = host.beginUpdate(modulePath);
-    for (const change of changes) {
-      if (change instanceof InsertChange) {
-        declarationRecorder.insertLeft(change.pos, change.toAdd);
-      }
-    }
-    host.commitUpdate(declarationRecorder);
+    insert(host, modulePath, [
+      ...addExportToModule(
+        source,
+        modulePath,
+        componentToImportName,
+        componentToImportPath
+      ),
+    ]);
   };
 }

libs/ddd/src/schematics/rules/add-import.ts

@@ -1,7 +1,6 @@
 import { Rule, Tree } from '@angular-devkit/schematics';
 import { addImportToModule } from '@schematics/angular/utility/ast-utils';
-import { InsertChange } from '@schematics/angular/utility/change';
-import { readIntoSourceFile } from '../utils';
+import { insert, readIntoSourceFile } from '../utils';
 
 /**
  * addImport
@@ -23,19 +22,13 @@ export function addImport(
 
     const source = readIntoSourceFile(host, modulePath);
 
-    const changes = addImportToModule(
-      source,
-      modulePath,
-      ngModuleToImportName,
-      ngModuleToImportPath
-    );
-
-    const declarationRecorder = host.beginUpdate(modulePath);
-    for (const change of changes) {
-      if (change instanceof InsertChange) {
-        declarationRecorder.insertLeft(change.pos, change.toAdd);
-      }
-    }
-    host.commitUpdate(declarationRecorder);
+    insert(host, modulePath, [
+      ...addImportToModule(
+        source,
+        modulePath,
+        ngModuleToImportName,
+        ngModuleToImportPath
+      ),
+    ]);
   };
 }

libs/ddd/src/schematics/utils/insert.ts

@@ -6,7 +6,11 @@
  */
 import { Tree } from '@angular-devkit/schematics';
 import { RemoveChange } from '@nrwl/workspace';
-import { Change, InsertChange } from '@schematics/angular/utility/change';
+import {
+  Change,
+  InsertChange,
+  NoopChange,
+} from '@schematics/angular/utility/change';
 
 /**
  * insert
@@ -20,7 +24,10 @@ export function insert(host: Tree, modulePath: string, changes: Change[]) {
   }
 
   // sort changes so that the highest pos goes first
-  const orderedChanges = changes.sort((a, b) => b.order - a.order);
+  // and filter out noop changes
+  const orderedChanges = changes
+    .sort((a, b) => b.order - a.order)
+    .filter((change) => !(change instanceof NoopChange));
 
   const recorder = host.beginUpdate(modulePath);
   for (const change of orderedChanges) {