[Bugfix] Fix an issue with wrapComputed (#108)

Author: ssutar

transforms/ember-object/__testfixtures__/runtime.data.json

@@ -2,7 +2,7 @@
   "data": [
     {
       "./transforms/ember-object/__testfixtures__/runtime.input.js": {
-        "computedProperties": ["computedMacro"],
+        "computedProperties": ["computedMacro", "numPlusOne", "numPlusPlus"],
         "observedProperties": [],
         "observerProperties": {},
         "offProperties": { "offProp": ["prop1", "prop2"] },

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

@@ -1,4 +1,6 @@
 import RuntimeInput from "common/runtime/input";
+import { alias } from "@ember/object/computed";
+import { computed } from "@ember/object";
 
 /**
  * Program comments
@@ -16,6 +18,12 @@ export default RuntimeInput.extend(MyMixin, {
   unobservedProp: null,
   offProp: null,
 
+  numPlusOne: computed("numProp", function() {
+    return this.get("numProp") + 1;
+  }),
+
+  numPlusPlus: alias("numPlusOne"),
+
   computedMacro: customMacro(),
 
   /**

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

@@ -1,4 +1,5 @@
-import { action, off, unobserves, wrapComputed } from "@ember-decorators/object";
+import { action, off, unobserves, wrapComputed, computed } from "@ember-decorators/object";
+import { alias } from "@ember-decorators/object/computed";
 import RuntimeInput from "common/runtime/input";
 
 /**
@@ -21,6 +22,14 @@ export default class RuntimeInputEmberObject extends RuntimeInput.extend(MyMixin
   @off("prop1", "prop2")
   offProp;
 
+  @computed("numProp")
+  get numPlusOne() {
+    return this.get("numProp") + 1;
+  }
+
+  @alias("numPlusOne")
+  numPlusPlus;
+
   @wrapComputed(customMacro())
   computedMacro;
 

transforms/helpers/EOProp.js

@@ -172,15 +172,14 @@ class EOProp {
       this.setCallExpressionProps();
       const {
         decoratorName,
-        isComputedDecorator,
         isMethodDecorator,
         isMetaDecorator,
         importedName
       } = importedDecoratedProps[this.calleeName] || {};
       if (decoratorName) {
         this.hasMapDecorator = importedName === "map";
         this.hasFilterDecorator = importedName === "filter";
-        this.hasComputedDecorator = isComputedDecorator;
+        this.hasComputedDecorator = importedName === "computed";
         this.hasMethodDecorator = isMethodDecorator;
         this.hasMetaDecorator = isMetaDecorator;
         this.decoratorNames.push(decoratorName);
@@ -221,7 +220,11 @@ class EOProp {
       this.decoratorNames.push("off");
       this.decoratorArgs["off"] = offProperties[name];
     }
-    if (computedProperties.includes(name) && !this.hasComputedDecorator) {
+    if (
+      computedProperties.includes(name) &&
+      !this.hasComputedDecorator &&
+      !this.hasMetaDecorator
+    ) {
       this.decoratorNames.push("wrapComputed");
     }
     if (this.isAction) {