non-standard imported names

Author: jeannettetang

transforms/convert-htmlbars-import/README.md

@@ -16,6 +16,7 @@ ember-cli-htmlbars-inline-precompile-codemod path/of/files/ or/some**/*
 
 <!--FIXTURES_TOC_START-->
 * [convert-htmlbars-import](#convert-htmlbars-import)
+* [non-standard-imported-name](#non-standard-imported-name)
 <!--FIXTURES_TOC_END-->
 
 <!--FIXTURES_CONTENT_START-->
@@ -32,5 +33,19 @@ import hbs from 'htmlbars-inline-precompile';
 ```js
 import { hbs } from 'ember-cli-htmlbars';
 
+```
+---
+<a id="non-standard-imported-name">**non-standard-imported-name**</a>
+
+**Input** (<small>[non-standard-imported-name.input.js](transforms/convert-htmlbars-import/__testfixtures__/non-standard-imported-name.input.js)</small>):
+```js
+import h from 'htmlbars-inline-precompile';
+
+```
+
+**Output** (<small>[non-standard-imported-name.output.js](transforms/convert-htmlbars-import/__testfixtures__/non-standard-imported-name.output.js)</small>):
+```js
+import { hbs as h } from 'ember-cli-htmlbars';
+
 ```
 <!--FIXTURES_CONTENT_END-->

transforms/convert-htmlbars-import/__testfixtures__/non-standard-imported-name.input.js

@@ -0,0 +1 @@
+import h from 'htmlbars-inline-precompile';

transforms/convert-htmlbars-import/__testfixtures__/non-standard-imported-name.output.js

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

transforms/convert-htmlbars-import/index.js

@@ -21,12 +21,16 @@ function writeImportStatement(j, root) {
 
   // if any imports from 'htmlbars-inline-precompile' exists, remove it and replace with a new import
   if (inlinePrecompileImportStatement.length !== 0) {
-    inlinePrecompileImportStatement.remove();
+    // setting up import information
+    let namedIdentifier = inlinePrecompileImportStatement.find(j.Identifier).get(0).node.name;
+    if (namedIdentifier !== 'hbs') {
+      namedIdentifier = `hbs as ${namedIdentifier}`;
+    }
+    const identifier = j.identifier(namedIdentifier);
+    const variableId = j.importSpecifier(identifier);
 
-    // setting up 'hbs' as an identifier for import statement
-    const hbs = 'hbs';
-    const hbsAsIdentifier = j.identifier(hbs);
-    const variableId = j.importSpecifier(hbsAsIdentifier);
+    // remove imports from 'htmlbars-inline-precompile'
+    inlinePrecompileImportStatement.remove();
 
     // finding all 'ember-cli-htmlbars' import statements
     const emberCliImportStatement = root.find(j.ImportDeclaration, {
@@ -35,15 +39,15 @@ function writeImportStatement(j, root) {
       },
     });
 
-    // if no imports from 'ember-cli-htmlbars' exists, write import { hbs } from 'ember-cli-htmlbars';
+    // if no imports from 'ember-cli-htmlbars' exists, write one;
     if (emberCliImportStatement.length === 0) {
       const importStatement = j.importDeclaration([variableId], j.literal('ember-cli-htmlbars'));
       body.unshift(importStatement);
     }
     // if any imports from 'ember-cli-htmlbars' already exists, include hbs
     else {
       let existingSpecifiers = emberCliImportStatement.get('specifiers');
-      if (existingSpecifiers.filter(exSp => exSp.value.imported.name === hbs).length === 0) {
+      if (existingSpecifiers.filter(exSp => exSp.value.imported.name === 'hbs').length === 0) {
         existingSpecifiers.push(variableId);
       }
     }