different line imports

Author: jeannettetang

transforms/convert-htmlbars-import/__testfixtures__/both-imports.output.js

@@ -1 +1,2 @@
-import { hbs as h, hbs } from 'ember-cli-htmlbars';
+import { hbs } from 'ember-cli-htmlbars';
+import { hbs as h } from 'ember-cli-htmlbars';

transforms/convert-htmlbars-import/index.js

@@ -22,14 +22,12 @@ function writeImportStatement(j, root, importsToReplace) {
 
     // if import statement exists, remove it and replace with a new import
     if (importStatement.length !== 0) {
-      replaceWithNewImport(j, root, importStatement);
+      replaceImports(j, root, importStatement);
     }
   });
 }
 
-function replaceWithNewImport(j, root, oldImport) {
-  let body = root.get().value.program.body;
-
+function replaceImports(j, root, oldImport) {
   // setting up new import information
   let namedIdentifier = oldImport.find(j.Identifier).get(0).node.name;
   if (namedIdentifier !== 'hbs') {
@@ -48,16 +46,29 @@ function replaceWithNewImport(j, root, oldImport) {
     },
   });
 
-  // if no imports from 'ember-cli-htmlbars' exists, write one;
+  // if no imports from 'ember-cli-htmlbars' exists, write a new import delcaration;
   if (emberCliImportStatement.length === 0) {
-    const importStatement = j.importDeclaration([variableId], j.literal('ember-cli-htmlbars'));
-    body.unshift(importStatement);
+    createNewImport(j, root, variableId);
   }
-  // if any imports from 'ember-cli-htmlbars' already exists, include hbs
+  // if any imports from 'ember-cli-htmlbars' exist
   else {
     let existingSpecifiers = emberCliImportStatement.get('specifiers');
-    if (existingSpecifiers.filter(exSp => exSp.value.imported.name === 'hbs').length === 0) {
+
+    // if 'hbs' is already being imported from 'ember-cli-htmlbars', write a new import declaration
+    if (existingSpecifiers.filter(exSp => exSp.value.imported.name.includes('hbs')).length > 0) {
+      createNewImport(j, root, variableId);
+    }
+    // otherwise, add hbs import to existing 'ember-cli-htmlbars' import declaration
+    else {
       existingSpecifiers.push(variableId);
     }
   }
 }
+
+function createNewImport(j, root, variableId, importLiteral = 'ember-cli-htmlbars') {
+  let body = root.get().value.program.body;
+
+  // write a new import delcaration
+  const importStatement = j.importDeclaration([variableId], j.literal(importLiteral));
+  body.unshift(importStatement);
+}