updates per pr & some cleanup

Author: jeannettetang

README.md

@@ -10,12 +10,12 @@ A collection of codemod's for ember-cli-htmlbars-inline-precompile-codemod.
 To run a specific codemod from this project, you would run the following:
 
 ```
-npx ember-cli-htmlbars-inline-precompile-codemod <TRANSFORM NAME> path/of/files/ or/some**/*glob.js
+npx ember-cli-htmlbars-inline-precompile-codemod path/of/files/ or/some**/*glob.js
 
 # or
 
 yarn global add ember-cli-htmlbars-inline-precompile-codemod
-ember-cli-htmlbars-inline-precompile-codemod <TRANSFORM NAME> path/of/files/ or/some**/*glob.js
+ember-cli-htmlbars-inline-precompile-codemod path/of/files/ or/some**/*
 ```
 
 ## Transforms

bin/cli.js

@@ -3,6 +3,6 @@
 
 require('codemod-cli').runTransform(
   __dirname,
-  process.argv[2] /* transform name */,
-  process.argv.slice(3) /* paths or globs */
+  'convert-htmlbars-import' /* transform name */,
+  process.argv.slice(2) /* paths or globs */
 );

transforms/convert-htmlbars-import/README.md

@@ -4,12 +4,12 @@
 ## Usage
 
 ```
-npx ember-cli-htmlbars-inline-precompile-codemod convert-htmlbars-import path/of/files/ or/some**/*glob.js
+npx ember-cli-htmlbars-inline-precompile-codemod path/of/files/ or/some**/*glob.js
 
 # or
 
 yarn global add ember-cli-htmlbars-inline-precompile-codemod
-ember-cli-htmlbars-inline-precompile-codemod convert-htmlbars-import path/of/files/ or/some**/*glob.js
+ember-cli-htmlbars-inline-precompile-codemod path/of/files/ or/some**/*
 ```
 
 ## Input / Output

transforms/convert-htmlbars-import/index.js

@@ -1,14 +1,51 @@
 const { getParser } = require('codemod-cli').jscodeshift;
-const { addImportStatement, writeImportStatements } = require('../utils');
-// const { getOptions } = require('codemod-cli');
 
 module.exports = function transformer(file, api) {
   const j = getParser(api);
-
   const root = j(file.source);
 
-  addImportStatement(['hbs']);
-  writeImportStatements(j, root);
+  writeImportStatement(j, root);
 
   return root.toSource({ quote: 'single' });
 };
+
+function writeImportStatement(j, root) {
+  let body = root.get().value.program.body;
+
+  // finding all 'htmlbars-inline-precompile' import statements
+  const inlinePrecompileImportStatement = root.find(j.ImportDeclaration, {
+    source: {
+      value: 'htmlbars-inline-precompile',
+    },
+  });
+
+  // if any imports from 'htmlbars-inline-precompile' exists, remove it and replace with a new import
+  if (inlinePrecompileImportStatement.length !== 0) {
+    inlinePrecompileImportStatement.remove();
+
+    // setting up 'hbs' as an identifier for import statement
+    const hbs = 'hbs';
+    const hbsAsIdentifier = j.identifier(hbs);
+    const variableId = j.importSpecifier(hbsAsIdentifier);
+
+    // finding all 'ember-cli-htmlbars' import statements
+    const emberCliImportStatement = root.find(j.ImportDeclaration, {
+      source: {
+        value: 'ember-cli-htmlbars',
+      },
+    });
+
+    // if no imports from 'ember-cli-htmlbars' exists, write import { hbs } from 'ember-cli-htmlbars';
+    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) {
+        existingSpecifiers.push(variableId);
+      }
+    }
+  }
+}