Merge pull request #47 from andyhot/feature/imports-rewrite

Imports rewrite for moved files

Author: rwjblue

.eslintrc.js

@@ -1,6 +1,7 @@
 module.exports = {
   "env": {
-    "node": true
+    "node": true,
+    "es6": true
   },
   "extends": "eslint:recommended",
   "rules": {

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
-  - "0.10"
-  - "0.12"
   - "4"
+  - "6"
+  - "7"
+  - "8"
   - "stable"

bin/ember-module-migrator

@@ -13,12 +13,24 @@ var Migrator = require('../lib');
 var nopt = require("nopt");
 var options = {
   'project-root': [String],
+  'project-name': [String],
   'engine': [String, 'classic']
 };
 var parsed = nopt(options);
 
+var projectRoot = parsed['project-root'] || process.cwd();
+var projectName = parsed['project-name'];
+if (!projectName) {
+  // determine name from package.json in projectRoot
+  try {
+    var fs = require('fs');
+    projectName = JSON.parse(fs.readFileSync(projectRoot + '/package.json', 'utf8')).name;
+  } catch (e) {}
+}
+
 var migrator = new Migrator({
-  projectRoot: parsed['project-root'] || process.cwd(),
+  projectRoot: projectRoot,
+  projectName: projectName,
   engine: parsed['engine'],
   verbose: true
 });

lib/engines/classic/test-file-info.js

@@ -18,6 +18,7 @@ var TestFileInfo = ClassicFileInfo.extend({
     }
 
     this.populateBucket();
+    this.populateFileContents();
 
     this._fileInfoCollection.add(this);
   },

lib/index.js

@@ -22,7 +22,7 @@ var Engine = CoreObject.extend({
     }
 
     if (!this.engine) {
-      throw new Error('Can not fine engine to use for migration!');
+      throw new Error('Can not find engine to use for migration!');
     }
 
     this._promise = null;
@@ -139,6 +139,7 @@ var Engine = CoreObject.extend({
   fileInfoFor: function(path) {
     var fileInfo = this.engine.buildFor(path, {
       projectRoot: this.projectRoot,
+      projectName: this.projectName,
       _fileInfoCollection: this._fileInfoCollection
     });
 

lib/models/file-info.js

@@ -2,9 +2,11 @@ var path = require('path');
 var CoreObject = require('core-object');
 var fse = require('fs-extra');
 var existsSync = require('exists-sync');
+var jscodeshift = require('jscodeshift');
 var isTypeInSingleTypeCollection = require('../utils/is-type-in-single-type-collection');
 var defaultTypeForCollection = require('../utils/default-type-for-collection');
 var calculateCollectionInfo = require('../utils/calculate-collection-info');
+var importDeclarationsTransform = require('../transforms/import-declarations');
 
 var FileInfo = CoreObject.extend({
   type: 'FileInfo',
@@ -95,7 +97,33 @@ var FileInfo = CoreObject.extend({
     this._fileContents = fse.readFileSync(fullPath, { encoding: 'utf8' });
   },
 
+  updateImports: function() {
+    if (this.ext !== '.js' || !this._fileContents) { return; } // only process JavaScript files
+
+    var appName = this.options.projectName;
+
+    try {
+      var newContents = importDeclarationsTransform(
+        { source: this._fileContents,
+          fileInfo: this,
+          appName: appName,
+          fileInfos: this._fileInfoCollection._fileInfos
+        },
+        { jscodeshift });
+
+      var fullPath = path.join(this.projectRoot, this.sourceRelativePath);
+
+      fse.writeFileSync(fullPath, newContents, { encoding: 'utf-8' });
+      this._fileContents = newContents;
+    } catch(e) {
+      // eslint-disable-next-line no-console
+      console.log('error parsing file `' + this.sourceRelativePath + '` failed to apply codeshift. Possible invalid JS file. Returning original file unchanged. error: ' + e.message);
+    }
+  },
+
   repopulate: function() {
+    this.updateImports();
+
     var inComponentsCollection = this.collection === 'components';
     var renderableName = path.join(this.namespace, this.name);
 
@@ -135,7 +163,7 @@ var FileInfo = CoreObject.extend({
     var fullPath = path.join(this.projectRoot, this.sourceRelativePath);
 
     fse.writeFileSync(fullPath, newContents, { encoding: 'utf-8' });
-    this._fileContents = fse.readFileSync(fullPath, { encoding: 'utf8' });
+    this._fileContents = newContents;
   },
 
   shouldUseDotFormNaming: function() {

lib/transforms/import-declarations.js

@@ -0,0 +1,63 @@
+var path_utils = require('../utils/path');
+
+function transformer(file, api) {
+  var j = api.jscodeshift;
+
+  return j(file.source)
+    .find(j.ImportDeclaration)
+    .find(j.Literal)
+    .forEach(function(path) {
+      var importPath = path.value.value + '.js';
+      var appName = file.appName;
+
+      if (!appName) {
+        // skip import transforms if appName is not set
+        return;
+      }
+
+      // determine the actual path that importPath points to
+      // TODO: extract these resolutions into classic-file-info and test-file-info
+      var relative = path_utils.isRelative(importPath);
+      if (relative) {
+        var sourceRelativePath = file.fileInfo.sourceRelativePath;
+
+        if (sourceRelativePath.startsWith('tests/')) {
+          importPath = path_utils.makeAbsolute(appName + '/app/' + sourceRelativePath, importPath);
+
+          // see if we stayed within tests
+          var inTestsPrefix = appName + '/app/tests/';
+          if (importPath.startsWith(inTestsPrefix)) {
+            importPath = appName + '/tests/' + importPath.substring(inTestsPrefix.length);
+          }
+        } else {
+          importPath = path_utils.makeAbsolute(appName + '/' + sourceRelativePath, importPath);
+        }
+      } else {
+        // check if import path starts with appName and add /app
+        if (importPath.startsWith(appName + '/') && !importPath.startsWith(appName + '/app/')) {
+          importPath = appName + '/app' + importPath.substring(appName.length);
+        }
+      }
+
+      var targetFileInfo = file.fileInfos.find(function(f) {
+        return (appName + '/' + f.sourceRelativePath) === importPath;
+      });
+
+      if (!targetFileInfo) {
+        // TODO error message
+        return;
+      }
+
+      var newImportPath = appName + '/' + targetFileInfo.destRelativePath;
+      if (relative) {
+        newImportPath = path_utils.makeRelative(file.fileInfo.destRelativePath, targetFileInfo.destRelativePath);
+      }
+      // remove extension
+      newImportPath = newImportPath.slice(0, -targetFileInfo.ext.length);
+      j(path).replaceWith(j.literal(newImportPath));
+    })
+    .toSource();
+
+}
+
+module.exports = transformer;

lib/utils/path.js

@@ -0,0 +1,23 @@
+var p = require('path');
+
+function isRelative(path) {
+  return path[0] === '.';
+}
+
+function makeRelative(from, to) {
+  var path = p.relative(p.dirname(from), to);
+  if (!isRelative(path)) {
+    path = './' + path;
+  }
+  return path;
+}
+
+function makeAbsolute(base, path) {
+  return p.resolve(p.dirname('/' + base), path).substring(1);
+}
+
+module.exports = {
+  isRelative,
+  makeRelative,
+  makeAbsolute
+};

package.json

@@ -17,6 +17,7 @@
     "assert-diff": "^1.0.1",
     "espower-loader": "^1.0.0",
     "fixturify": "^0.2.0",
+    "jscodeshift": "^0.3.30",
     "mocha": "^2.4.5",
     "mocha-eslint": "^2.0.2",
     "power-assert": "^1.3.1",

test/engines/classic-test.js

@@ -13,7 +13,8 @@ describe('classic engine', function() {
 
     beforeEach(function() {
       engine = new Migrator({
-        projectRoot: '.'
+        projectRoot: '.',
+        projectName: 'my-app'
       });
     });
 
@@ -148,7 +149,8 @@ describe('classic engine', function() {
         fixturify.writeSync(tmpPath, input);
 
         var engine = new Migrator({
-          projectRoot: tmpPath
+          projectRoot: tmpPath,
+          projectName: 'my-app'
         });
 
         return engine.processFiles()