feat(import management): Merge imports from the same package (#392)

Does automatically merge imports from the same package into one.
buehler · Feb 6, 2018 · abc45f1 · abc45f1
1 parent 9feb1e3
commit abc45f1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,3 @@
 {
-  "editor.tabSize": 4
+  "editor.tabSize": 2
 }
diff --git a/src/import-organizer/import-manager.ts b/src/import-organizer/import-manager.ts
@@ -153,9 +153,20 @@ export default class ImportManager {
             .filter(o => this._parsedDocument.nonLocalUsages.indexOf(o.alias || o.specifier) > -1)
             .sort(specifierSort);
           const defaultSpec = actImport.defaultAlias;
+          const libraryAlreadyImported = keep.find(d => d.libraryName === actImport.libraryName);
           if (actImport.specifiers.length ||
             (!!defaultSpec && this._parsedDocument.nonLocalUsages.indexOf(defaultSpec) >= 0)) {
-            keep.push(actImport);
+            if (libraryAlreadyImported) {
+              if (actImport.defaultAlias) {
+                (<NamedImport>libraryAlreadyImported).defaultAlias = actImport.defaultAlias;
+              }
+              (<NamedImport>libraryAlreadyImported).specifiers = [
+                ...(<NamedImport>libraryAlreadyImported).specifiers,
+                ...actImport.specifiers,
+              ];
+            } else {
+              keep.push(actImport);
+            }
           }
         } else if (actImport instanceof StringImport) {
           keep.push(actImport);

diff --git a/test/etc/workspace_1/main.ts b/test/etc/workspace_1/main.ts
@@ -1,9 +1,11 @@
-import iocSymbols from './ioc-symbols';
 import { Foo } from './server/indices/foobar';
+import { Loggee } from './utilities/Logger';
 import winstonLogger, { Logger } from './utilities/Logger';
 
+import iocSymbols from './ioc-symbols';
+
 function foo() {
-  console.log(winstonLogger, Logger, iocSymbols);
+  console.log(winstonLogger, Logger, Loggee, iocSymbols);
 }
 
 Foo