TypescriptAPIUtils.appendImport: add imports after the last one

Author: davidkudera

packages/typescript-api-utils/sourceFiles/appendImport.ts

@@ -6,7 +6,7 @@ import * as ts from 'typescript';
 export function appendImport(moduleSpecifier: string, propertyName: string|undefined, name: string, sourceFile: ts.SourceFile): string
 {
 	const imports = findNodesByType<ts.ImportDeclaration>(ts.SyntaxKind.ImportDeclaration, sourceFile);
-	const pos = imports.length ? (sourceFile.statements.indexOf(imports[imports.length - 1]) || 0) : 0;
+	const pos = imports.length ? (sourceFile.statements.indexOf(imports[imports.length - 1]) + 1 || 0) : 0;
 
 	const existingImport: ts.ImportDeclaration = find(imports, (existingImport: ts.ImportDeclaration) => {
 		return (

packages/typescript-api-utils/tests/data/sourceFiles/appendImport/valid_9.original.ts

@@ -0,0 +1 @@
+import {A} from '/import_1';

packages/typescript-api-utils/tests/data/sourceFiles/appendImport/valid_9.updated.ts

@@ -0,0 +1,2 @@
+import { A } from "/import_1";
+import { B } from "/import_2";

packages/typescript-api-utils/tests/tests/sourceFiles/appendImport.ts

@@ -106,6 +106,14 @@ describe('#sourceFiles/appendImport', () => {
 			compareSourceFile('valid_8.updated', sourceFile);
 		});
 
+		it('should add import after the last one', () => {
+			const sourceFile = getFileSource('valid_9.original');
+			const imported = appendImport('/import_2', undefined, 'B', sourceFile);
+
+			expect(imported).to.be.equal('B');
+			compareSourceFile('valid_9.updated', sourceFile);
+		});
+
 	});
 
 });

packages/typescript-api-utils/tests/tests/sourceFiles/findNodesByType.ts

@@ -16,7 +16,6 @@ describe('#sourceFiles/findNodesByType', () => {
 
 			const nodes = findNodesByType<ts.Identifier>(ts.SyntaxKind.Identifier, sourceFile);
 
-			console.log(nodes);
 			expect(nodes.length).to.be.equal(2);
 			expect(nodes[0].text).to.be.equal('a');
 			expect(nodes[1].text).to.be.equal('b');