Extract helper-fixing codemod to a separate file

Author: bantic

lib/models/file-info.js

@@ -7,6 +7,7 @@ var isTypeInSingleTypeCollection = require('../utils/is-type-in-single-type-coll
 var defaultTypeForCollection = require('../utils/default-type-for-collection');
 var calculateCollectionInfo = require('../utils/calculate-collection-info');
 var importDeclarationsTransform = require('../transforms/import-declarations');
+var renameImportHelperTransform = require('../transforms/rename-helper-import');
 var inflection = require('inflection');
 var PodsSupport = require('../utils/pods-support');
 var typeForPodFile = PodsSupport.typeForPodFile;
@@ -176,6 +177,14 @@ var FileInfo = CoreObject.extend({
         },
         { jscodeshift });
 
+      // Fixes "import { helper } from '@ember/component/helper'"
+      // to "import { helper as buildHelper } from '@ember/component/helper'"
+      newContents = renameImportHelperTransform(
+        {
+          source: newContents
+        },
+        { jscodeshift });
+
       var fullPath = path.join(this.projectRoot, this.sourceRelativePath);
 
       fse.writeFileSync(fullPath, newContents, { encoding: 'utf-8' });

lib/transforms/import-declarations.js

@@ -5,28 +5,6 @@ function transformer(file, api) {
 
   var root = j(file.source);
 
-  var foundHelper;
-
-  root.find(j.ImportDeclaration, {
-    source: { value: '@ember/component/helper' },
-  }).filter(path => {
-    return path.value.specifiers[0].local.name === 'helper';
-  })
-  .forEach(function(path) {
-    foundHelper = true;
-    var specifier = j.importSpecifier(j.identifier('helper'), j.identifier('buildHelper'));                              
-
-    path.value.specifiers[0] = specifier;
-  });
-  
-  if (foundHelper) {
-    root.find(j.CallExpression, {
-      callee: { name: 'helper' }      
-    }).forEach(path => {
-      path.value.callee.name = 'buildHelper';
-    });
-  }
-
   root.find(j.ImportDeclaration)
     .find(j.Literal)
     .forEach(function(path) {

lib/transforms/rename-helper-import.js

@@ -0,0 +1,39 @@
+function transformer(file, api) {
+  var j = api.jscodeshift;
+
+  var foundHelper = false;
+
+  var root = j(file.source);
+
+  // Replaces:
+  //   import { helper } from '@ember/component/helper';
+  // With:
+  //   import { helper as buildHelper } from '@ember/component/helper';
+  root.find(j.ImportDeclaration, {
+    source: { value: '@ember/component/helper' },
+  }).filter(path => {
+    return path.value.specifiers[0].local.name === 'helper';
+  })
+  .forEach(function(path) {
+    foundHelper = true;
+    var specifier = j.importSpecifier(
+      j.identifier('helper'),
+      j.identifier('buildHelper')
+    );
+
+    path.value.specifiers[0] = specifier;
+  });
+  
+  // Replace helper(...) with buildHelper(...)
+  if (foundHelper) {
+    root.find(j.CallExpression, {
+      callee: { name: 'helper' }      
+    }).forEach(path => {
+      path.value.callee.name = 'buildHelper';
+    });
+  }
+
+  return root.toSource();
+}
+
+module.exports = transformer;