Merge pull request #23 from simonihmig/fix-double-imports

Fix native-dom transform for multiple import statements

Author: simonihmig

__testfixtures__/native-dom/acceptance.input.js

@@ -1,4 +1,5 @@
-import { currentURL, currentPath, currentRouteName, find, visit } from 'ember-native-dom-helpers';
+import { find, visit } from 'ember-native-dom-helpers';
+import { currentURL, currentPath, currentRouteName } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';
 

__testfixtures__/native-dom/acceptance.output.js

@@ -1,4 +1,4 @@
-import { currentURL, currentRouteName, find, visit } from '@ember/test-helpers';
+import { find, visit, currentURL, currentRouteName } from '@ember/test-helpers';
 import { currentPath } from 'ember-native-dom-helpers';
 import { test } from 'qunit';
 import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';

__testfixtures__/native-dom/double-import.input.js

@@ -0,0 +1,2 @@
+import { click, currentURL } from 'ember-native-dom-helpers';
+import { find, visit } from 'ember-native-dom-helpers';

__testfixtures__/native-dom/double-import.output.js

@@ -0,0 +1 @@
+import { click, currentURL, find, visit } from '@ember/test-helpers';

lib/transforms/native-dom/migrate-imports.js

@@ -49,37 +49,41 @@ function transform(file, api) {
   let j = api.jscodeshift;
   let root = j(source);
 
-  let nativeDomImportStatement = root.find(j.ImportDeclaration, {
+  let nativeDomImportStatements = root.find(j.ImportDeclaration, {
     source: { value: 'ember-native-dom-helpers' }
   });
-  if (nativeDomImportStatement.length === 0) {
+  if (nativeDomImportStatements.length === 0) {
     return root.toSource({ quote: 'single' });
   }
 
   let newImports = [];
-  let oldSpecifiers = nativeDomImportStatement.get('specifiers');
-  let newSpecifiers = [];
-  oldSpecifiers.each(({ node: specifier }) => {
-    let importedName = specifier.imported.name;
-    if (importedName in importMigrationsLookup) {
-      let mappedName = importMigrationsLookup[importedName];
-      // @todo local != imported
-      // let localName = specifier.local.name;
-      newImports.push(mappedName);
-      if (importedName !== mappedName) {
-        renameCallee(j, root, importedName, mappedName);
+
+  nativeDomImportStatements.forEach((importStatement) => {
+    let oldSpecifiers = importStatement.get('specifiers');
+
+    let newSpecifiers = [];
+    oldSpecifiers.each(({ node: specifier }) => {
+      let importedName = specifier.imported.name;
+      if (importedName in importMigrationsLookup) {
+        let mappedName = importMigrationsLookup[importedName];
+        // @todo local != imported
+        // let localName = specifier.local.name;
+        newImports.push(mappedName);
+        if (importedName !== mappedName) {
+          renameCallee(j, root, importedName, mappedName);
+        }
+      } else {
+        newSpecifiers.push(specifier);
       }
+    });
+
+    if (newSpecifiers.length > 0) {
+      oldSpecifiers.replace(newSpecifiers);
     } else {
-      newSpecifiers.push(specifier);
+      importStatement.prune();
     }
   });
 
-  if (newSpecifiers.length > 0) {
-    oldSpecifiers.replace(newSpecifiers);
-  } else {
-    nativeDomImportStatement.remove();
-  }
-
   addImportStatement(newImports);
   writeImportStatements(j, root);
   return root.toSource({ quote: 'single' });