TypescriptAPIUtils: add AppendImportsBuffer class

Author: davidkudera

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

@@ -3,7 +3,7 @@ import {findNodesByType} from './findNodesByType';
 import * as ts from 'typescript';
 
 
-export function appendImport(moduleSpecifier: string, propertyName: string|undefined, name: string, sourceFile: ts.SourceFile): string
+export function appendImport(moduleSpecifier: string, propertyName: string|undefined, name: string, sourceFile: ts.SourceFile, noImportReuseOnDifferentNames: boolean = false): string
 {
 	const imports = findNodesByType<ts.ImportDeclaration>(ts.SyntaxKind.ImportDeclaration, sourceFile);
 	const pos = imports.length ? (sourceFile.statements.indexOf(imports[imports.length - 1]) + 1 || 0) : 0;
@@ -22,7 +22,7 @@ export function appendImport(moduleSpecifier: string, propertyName: string|undef
 		const namedBindings = <ts.NamedImports>existingImport.importClause.namedBindings;
 		const elements = clone(namedBindings.elements);
 
-		const existingElement: ts.ImportSpecifier = find(elements, (existingElement: ts.ImportSpecifier) => {
+		let existingElement: ts.ImportSpecifier = find(elements, (existingElement: ts.ImportSpecifier) => {
 			return (
 				(<ts.Identifier>existingElement.name).text === name ||
 				(
@@ -42,6 +42,10 @@ export function appendImport(moduleSpecifier: string, propertyName: string|undef
 			);
 		});
 
+		if (noImportReuseOnDifferentNames && (<ts.Identifier>existingElement.name).text !== name) {
+			existingElement = undefined;
+		}
+
 		if (existingElement) {
 			if (exists(propertyName) && exists(existingElement.propertyName) && propertyName !== (<ts.Identifier>existingElement.propertyName).text) {
 				throw new Error(`appendImport: can not append new import {${propertyName} as ${name}}. File already contains import with the same name {${(<ts.Identifier>existingElement.propertyName).text} as ${(<ts.Identifier>existingElement.name).text}}.`);

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

@@ -0,0 +1,38 @@
+import {forEach} from '@slicky/utils';
+import {appendImport} from './appendImport';
+import * as ts from 'typescript';
+
+
+export declare interface ImportItem
+{
+	moduleSpecifier: string,
+	propertyName: string|undefined,
+	name: string,
+}
+
+
+export class AppendImportsBuffer
+{
+
+
+	private imports: Array<ImportItem> = [];
+
+
+	public add(moduleSpecifier: string, propertyName: string|undefined, name: string): void
+	{
+		this.imports.push({
+			moduleSpecifier: moduleSpecifier,
+			propertyName: propertyName,
+			name: name,
+		});
+	}
+
+
+	public applyImports(sourceFile: ts.SourceFile): void
+	{
+		forEach(this.imports, (newImport: ImportItem) => {
+			appendImport(newImport.moduleSpecifier, newImport.propertyName, newImport.name, sourceFile, true);
+		});
+	}
+
+}

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

@@ -1,4 +1,5 @@
 export * from './appendImport';
+export * from './appendImportsBuffer';
 export * from './findNode';
 export * from './findLastNodeOfType';
 export * from './findNodesByType';

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

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

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

@@ -0,0 +1 @@
+import { A as B, A } from "/import";

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

@@ -114,6 +114,14 @@ describe('#sourceFiles/appendImport', () => {
 			compareSourceFile('valid_9.updated', sourceFile);
 		});
 
+		it('should not reuse import with different names', () => {
+			const sourceFile = getFileSource('valid_10.original');
+			const imported = appendImport('/import', undefined, 'A', sourceFile, true);
+
+			expect(imported).to.be.equal('A');
+			compareSourceFile('valid_10.updated', sourceFile);
+		});
+
 	});
 
 });