Reworked getVariableDeclaration

rangle · Oct 25, 2018 · 423813f · 423813f
1 parent 2fde65a
commit 423813f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/src/ast/ast-helpers.ts b/src/ast/ast-helpers.ts
@@ -42,13 +42,21 @@ export function getInterfaceDeclarationByType(sourceFile: typescript.SourceFile,
   );
 }
 
-export function getVariableDeclaration(sourceFile: typescript.SourceFile, type: string) {
-  return sourceFile.statements
+export function getVariableDeclaration(
+  sourceFile: typescript.SourceFile,
+  type: string
+): typescript.VariableDeclaration {
+  const variableDeclarations = sourceFile.statements
     .filter(statement => statement.kind === typescript.SyntaxKind.VariableStatement)
-    .map(statement => (statement as typescript.VariableStatement).declarationList.declarations[0])
-    .find(
-      declaration => (declaration.type as typescript.TypeReferenceNode).typeName.getText() === type
+    .map(statement => (statement as typescript.VariableStatement).declarationList.declarations)
+    .filter(declarations =>
+      declarations.some(
+        declaration =>
+          (declaration.type as typescript.TypeReferenceNode).typeName.getText() === type
+      )
     );
+
+  return variableDeclarations.length > 0 ? variableDeclarations[0][0] : null;
 }
 
 export function getTypeArgumentOfVariableDeclaration(

diff --git a/src/ast/rework-app-reducer/rework-app-reducer.spec.ts b/src/ast/rework-app-reducer/rework-app-reducer.spec.ts
@@ -22,5 +22,6 @@ describe('reworkAppReducer()', () => {
     );
     expect(changes[1].order).toEqual(195);
     expect(changes[2].order).toEqual(272);
+    expect(changes[3].order).toEqual(327);
   });
 });
diff --git a/src/rules/tree-helpers.ts b/src/rules/tree-helpers.ts
@@ -1,9 +1,6 @@
 import * as strings from '@angular-devkit/core/src/utils/strings';
 import { DirEntry, Tree } from '@angular-devkit/schematics';
-import {
-  Change,
-  InsertChange
-} from '@schematics/angular/utility/change';
+import { Change, InsertChange } from '@schematics/angular/utility/change';
 import * as typescript from 'typescript';
 
 import { openSourceFile } from '../ast/ast-helpers';
@@ -68,7 +65,7 @@ export function applyChangesToTreeFile(tree: Tree, filename: string, changes: Ch
   changes.forEach(change => {
     if (change instanceof InsertChange) {
       updateRecorder.insertLeft(change.pos, change.toAdd);
-    /*} else if (change instanceof ReplaceChange) {
+      /*} else if (change instanceof ReplaceChange) {
       updateRecorder.remove(change.pos, change.oldText.length);
       updateRecorder.insertLeft(change.order, change.newText);
     } else if (change instanceof RemoveChange) {