[Bugfix] Handle the service and controller imports (#89)

* [Bugfix] Handle the service and controller imports

* Handle the Evented import, Fix for #92

Author: ssutar

transforms/ember-object/__testfixtures__/decorators.input.js

@@ -1,5 +1,7 @@
 import {
   alias,
+  gt,
+  equal,
   readOnly,
   reads,
   oneWay as enoWay,
@@ -13,6 +15,7 @@ import { inject as service } from "@ember/service";
 import { on } from "@ember/object/evented";
 import layout from "components/templates/foo";
 import { someActionUtil } from "some/action/util";
+import NUMERIC_CONSTANT from "constants/numbers";
 
 const Foo = EmberObject.extend({
   tagName: "div",
@@ -146,7 +149,11 @@ const Foo = EmberObject.extend({
   /**
    * Lname5
    */
-  lName5: add("description", "lastName").readOnly()
+  lName5: add("description", "lastName").readOnly(),
+
+  isEqualToLimit: equal("limit", NUMERIC_CONSTANT.LIMIT).readOnly(),
+
+  isGreaterThanLimit: gt("limit", NUMERIC_CONSTANT).readOnly()
 });
 
 const Foo = EmberObject.extend({

transforms/ember-object/__testfixtures__/decorators.output.js

@@ -10,12 +10,15 @@ import {
   oneWay as enoWay,
   reads,
   readOnly,
+  equal,
+  gt,
   alias,
 } from "@ember-decorators/object/computed";
 
 import { get, set } from "@ember/object";
 import layout from "components/templates/foo";
 import { someActionUtil } from "some/action/util";
+import NUMERIC_CONSTANT from "constants/numbers";
 
 @tagName("div")
 @classNames("test-class", "custom-class")
@@ -187,6 +190,12 @@ class Foo extends EmberObject {
    */
   @(add("description", "lastName").readOnly())
   lName5;
+
+  @(equal("limit", NUMERIC_CONSTANT.LIMIT).readOnly())
+  isEqualToLimit;
+
+  @(gt("limit", NUMERIC_CONSTANT).readOnly())
+  isGreaterThanLimit;
 }
 
 @templateLayout(layout)

transforms/ember-object/__testfixtures__/import.input.js

@@ -0,0 +1,13 @@
+import Service from "@ember/service";
+import Controller from "@ember/controller";
+import Evented, { on } from "@ember/object/evented";
+
+const ser = Service.extend({});
+const ctrl = Controller.extend({});
+const evt = Service.extend(Evented, {
+  e: on("click", function() {
+    return "e";
+  })
+});
+
+export { ser, ctrl, evt };

transforms/ember-object/__testfixtures__/import.options.json

@@ -0,0 +1,3 @@
+{
+  "decorators": true
+}

transforms/ember-object/__testfixtures__/import.output.js

@@ -0,0 +1,16 @@
+import { on } from "@ember-decorators/object";
+import Service from "@ember/service";
+import Controller from "@ember/controller";
+import Evented from "@ember/object/evented";
+
+class Ser extends Service {}
+class Ctrl extends Controller {}
+
+class Evt extends Service.extend(Evented) {
+  @on("click")
+  e() {
+    return "e";
+  }
+}
+
+export { Ser, Ctrl, Evt };

transforms/helpers/EOProp.js

@@ -91,8 +91,12 @@ class EOProp {
     return get(this.calleeObject, "arguments") || [];
   }
 
-  get hasNonLiteralArg() {
-    return this.callExprArgs.some(arg => arg.type !== "Literal");
+  get shouldRemoveLastArg() {
+    const lastArg = this.callExprArgs.slice(-1) || [];
+    return (
+      lastArg[0].type === "FunctionExpression" ||
+      lastArg[0].type === "ObjectExpression"
+    );
   }
 
   get hasModifierWithArgs() {

transforms/helpers/decorator-helper.js

@@ -57,7 +57,7 @@ function createCallExpressionDecorators(j, decoratorName, instanceProp) {
   const decoratorArgs =
     !instanceProp.hasMapDecorator &&
     !instanceProp.hasFilterDecorator &&
-    instanceProp.hasNonLiteralArg
+    instanceProp.shouldRemoveLastArg
       ? instanceProp.callExprArgs.slice(0, -1)
       : instanceProp.callExprArgs.slice(0);
 

transforms/helpers/parse-helper.js

@@ -190,20 +190,19 @@ function getExpressionToReplace(j, eoCallExpression) {
  * Returns name of class to be created
  *
  * @param {Object} j - jscodeshift lib reference
- * @param {CallExpression} eoCallExpression
+ * @param {String} classVariableName
  * @param {String} filePath
  * @return {String}
  */
 function getClassName(
   j,
-  eoCallExpression,
+  classVariableName,
   filePath,
   superClassName,
   type = ""
 ) {
-  const varDeclaration = getClosetVariableDeclaration(j, eoCallExpression);
   const className =
-    getVariableName(varDeclaration) || camelCase(path.basename(filePath, "js"));
+    classVariableName || camelCase(path.basename(filePath, "js"));
   let capitalizedClassName = `${capitalizeFirstLetter(
     className
   )}${capitalizeFirstLetter(type)}`;
@@ -298,15 +297,23 @@ function replaceEmberObjectExpressions(j, root, filePath, options = {}) {
     }
 
     const superClassName = get(eoCallExpression, "value.callee.object.name");
+    const varDeclaration = getClosetVariableDeclaration(j, eoCallExpression);
+    const classVariableName = getVariableName(varDeclaration);
+    const className = getClassName(
+      j,
+      classVariableName,
+      filePath,
+      superClassName,
+      get(options, "runtimeData.type")
+    );
+
+    if (classVariableName) {
+      root.findVariableDeclarators(classVariableName).renameTo(className);
+    }
+
     const es6ClassDeclaration = createClass(
       j,
-      getClassName(
-        j,
-        eoCallExpression,
-        filePath,
-        superClassName,
-        get(options, "runtimeData.type")
-      ),
+      className,
       eoProps,
       superClassName,
       mixins

transforms/helpers/util.js

@@ -13,12 +13,21 @@ const DECORATOR_PATHS = {
     decoratorPath: "@ember-decorators/object"
   },
   "@ember/object/evented": {
+    importPropDecoratorMap: {
+      on: "on"
+    },
     decoratorPath: "@ember-decorators/object"
   },
   "@ember/controller": {
+    importPropDecoratorMap: {
+      inject: "inject"
+    },
     decoratorPath: "@ember-decorators/controller"
   },
   "@ember/service": {
+    importPropDecoratorMap: {
+      inject: "inject"
+    },
     decoratorPath: "@ember-decorators/service"
   },
   "@ember/object/computed": {