Support for filter and map computed property (#40)

Fix for: #39

Author: ssutar

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

@@ -3,7 +3,9 @@ import {
   readOnly,
   reads,
   oneWay as enoWay,
-  sum as add
+  sum as add,
+  map as computedMap,
+  filter
 } from "@ember/object/computed";
 import { get, set, observer as watcher, computed } from "@ember/object";
 import { inject as controller } from "@ember/controller";
@@ -24,6 +26,12 @@ const Foo = EmberObject.extend({
   event: on("click", function() {
     return "abc";
   }),
+  excitingChores: computedMap("chores", function(chore, index) {
+    return chore.toUpperCase() + "!";
+  }),
+  remainingChores: filter("chores", function(chore, index, array) {
+    return !chore.done;
+  }),
 
   actions: {
     someActionUtil,

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

@@ -1,5 +1,15 @@
 import { attribute, className, classNames, layout, tagName } from "@ember-decorators/component";
-import { sum as add, overridableReads as enoWay, overridableReads, reads, alias } from "@ember-decorators/object/computed";
+
+import {
+  filter,
+  map as computedMap,
+  sum as add,
+  overridableReads as enoWay,
+  overridableReads,
+  reads,
+  alias,
+} from "@ember-decorators/object/computed";
+
 import { get, set } from "@ember/object";
 import { action, readOnly, volatile, computed, observes as watcher } from "@ember-decorators/object";
 import { controller } from "@ember-decorators/controller";
@@ -29,6 +39,16 @@ class Foo extends EmberObject {
     return "abc";
   }
 
+  @computedMap("chores", function(chore, index) {
+    return chore.toUpperCase() + "!";
+  })
+  excitingChores;
+
+  @filter("chores", function(chore, index, array) {
+    return !chore.done;
+  })
+  remainingChores;
+
   @action
   someActionUtil() {
     return someActionUtil.call(this, ...arguments);

transforms/helpers/EOProp.js

@@ -146,9 +146,15 @@ class EOProp {
   setDecorators(importedDecoratedProps) {
     if (this.isCallExpression) {
       this.setCallExpressionProps();
-      const { decoratorName, isMethodDecorator, isMetaDecorator } =
-        importedDecoratedProps[this.calleeName] || {};
+      const {
+        decoratorName,
+        isMethodDecorator,
+        isMetaDecorator,
+        importedName
+      } = importedDecoratedProps[this.calleeName] || {};
       if (decoratorName) {
+        this.hasMapDecorator = importedName === "map";
+        this.hasFilterDecorator = importedName === "filter";
         this.hasMethodDecorator = isMethodDecorator;
         this.hasMetaDecorator = isMetaDecorator;
         this.decoratorNames.push(decoratorName);

transforms/helpers/decorator-helper.js

@@ -42,9 +42,12 @@ function createClassDecorator(j, classDecoratorProp) {
  * @returns {Decorator[]}
  */
 function createCallExpressionDecorators(j, decoratorName, instanceProp) {
-  const decoratorArgs = instanceProp.hasNonLiteralArg
-    ? instanceProp.callExprArgs.slice(0, -1)
-    : instanceProp.callExprArgs.slice(0);
+  const decoratorArgs =
+    !instanceProp.hasMapDecorator &&
+    !instanceProp.hasFilterDecorator &&
+    instanceProp.hasNonLiteralArg
+      ? instanceProp.callExprArgs.slice(0, -1)
+      : instanceProp.callExprArgs.slice(0);
 
   if (instanceProp.isVolatileReadOnly) {
     return [];

transforms/helpers/transform-helper.js

@@ -306,7 +306,10 @@ function createActionDecoratedProps(j, actionsProp) {
 function createCallExpressionProp(j, callExprProp) {
   const callExprArgs = callExprProp.callExprArgs.slice(0);
   const callExprLastArg = callExprArgs.pop();
-  const lastArgType = get(callExprLastArg, "type");
+  const lastArgType =
+    !callExprProp.hasMapDecorator && !callExprProp.hasFilterDecorator
+      ? get(callExprLastArg, "type")
+      : "";
 
   if (lastArgType === "FunctionExpression") {
     const functionExpr = {