Merge pull request #170 from dwickern/ember-18047

Author: Robert Jackson

__tests__/index-test.js

@@ -23,9 +23,11 @@ function transform7(source, _plugins) {
   return result.code;
 }
 
-function transformWithPresetEnv(source) {
+function transformWithPresetEnv(source, _plugins) {
+  let plugins = [].concat([[Plugin]], _plugins || []);
   let result = babel7.transformSync(source, {
-    plugins: [[Plugin]],
+    plugins,
+
     presets: [['@babel/preset-env', { targets: { ie: '8' }, modules: false }]],
   });
 
@@ -422,3 +424,36 @@ describe('when used with typescript', () => {
     expect(actual).toEqual(`Ember.addObserver();`);
   });
 });
+
+describe('when used with native classes and decorators', () => {
+  it('allows "action" to be used as a variable name', () => {
+    let source = `
+import { action } from '@ember/object';
+import Controller from '@ember/controller';
+
+export default class MyController extends Controller {
+  @action
+  addAction(action) {
+    this.actions.pushObject(action);
+  }
+}
+`;
+
+    let actual = transform7(source, [
+      [Plugin],
+      ['@babel/plugin-proposal-decorators', { legacy: true }],
+    ]);
+
+    expect(actual).toEqual(`var _dec, _class;
+
+function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; }
+
+let MyController = (_dec = Ember._action, (_class = class MyController extends Ember.Controller {
+  addAction(action) {
+    this.actions.pushObject(action);
+  }
+
+}, (_applyDecoratedDescriptor(_class.prototype, "addAction", [_dec], Object.getOwnPropertyDescriptor(_class.prototype, "addAction"), _class.prototype)), _class));
+export { MyController as default };`);
+  });
+});

package.json

@@ -32,6 +32,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.12.10",
+    "@babel/plugin-proposal-decorators": "^7.12.12",
     "@babel/plugin-transform-typescript": "^7.12.1",
     "@babel/preset-env": "^7.12.11",
     "babel-core": "^6.25.0",

src/index.js

@@ -13,6 +13,24 @@ function isIgnored(ignore, importPath, exportName) {
   }
 }
 
+function isDecorator(moduleName, importName) {
+  switch (moduleName) {
+    case '@ember/service':
+      return importName === 'inject';
+    case '@ember/controller':
+      return importName === 'inject';
+    case '@glimmer/tracking':
+      return importName === 'tracked';
+    case '@ember/object/compat':
+      return importName === 'dependentKeyCompat';
+    case '@ember/object':
+      return ['action', 'computed'].includes(importName);
+    case '@ember/object/computed':
+      // only the default import of this module is not a decorator
+      return importName !== 'default';
+  }
+}
+
 module.exports = function (babel) {
   const t = babel.types;
 
@@ -165,10 +183,36 @@ module.exports = function (babel) {
                 ])
               );
             } else {
-              // Replace the occurences of the imported name with the global name.
               let binding = path.scope.getBinding(local.name);
+              let referencePaths = binding.referencePaths;
+
+              if (isDecorator(importPath, importName)) {
+                // tldr; decorator paths are not always included in `path.scope.getBinding(local.name)`
+                //
+                // In some circumstances, decorators are not included in the
+                // reference paths for a local binding when the decorator
+                // identifier name is also defined _within_ the method being
+                // decorated. This is likely a bug in Babel, that should be
+                // reported and fixed.
+                //
+                // in order to fix that, we have to manually traverse to gather
+                // the decorator references **before** the
+                // @babel/plugin-proposal-decorators runs (because it removes
+                // them)
+                path.parentPath.traverse({
+                  Decorator(decoratorPath) {
+                    if (
+                      decoratorPath.node.expression.type === 'Identifier' &&
+                      decoratorPath.node.expression.name === local.name
+                    ) {
+                      referencePaths.push(decoratorPath.get('expression'));
+                    }
+                  },
+                });
+              }
 
-              binding.referencePaths.forEach((referencePath) => {
+              // Replace the occurences of the imported name with the global name.
+              referencePaths.forEach((referencePath) => {
                 if (!isTypescriptNode(referencePath.parentPath)) {
                   referencePath.replaceWith(getMemberExpressionFor(global));
                 }

yarn.lock

@@ -277,6 +277,15 @@
     "@babel/helper-create-class-features-plugin" "^7.12.1"
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-proposal-decorators@^7.12.12":
+  version "7.12.12"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.12.12.tgz#067a6d3d6ca86d54cf56bb183239199c20daeafe"
+  integrity sha512-fhkE9lJYpw2mjHelBpM2zCbaA11aov2GJs7q4cFaXNrWx0H3bW58H9Esy2rdtYOghFBEYUDRIpvlgi+ZD+AvvQ==
+  dependencies:
+    "@babel/helper-create-class-features-plugin" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.10.4"
+    "@babel/plugin-syntax-decorators" "^7.12.1"
+
 "@babel/plugin-proposal-dynamic-import@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"
@@ -381,6 +390,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
+"@babel/plugin-syntax-decorators@^7.12.1":
+  version "7.12.1"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.1.tgz#81a8b535b284476c41be6de06853a8802b98c5dd"
+  integrity sha512-ir9YW5daRrTYiy9UJ2TzdNIJEZu8KclVzDcfSt4iEmOtwQ4llPtWInNKJyKnVXp1vE4bbVd5S31M/im3mYMO1w==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-dynamic-import@^7.8.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"