Update the codemods as per the changes in ember-decorators v6 (#112)

* Update the codemods as per the changes in ember-decorators v6

* Add wrapComputed decorator with required changes

Author: ssutar

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

@@ -1,7 +1,8 @@
 import { attribute, className, classNames, tagName, layout as templateLayout } from "@ember-decorators/component";
-import { action, computed, observes as watcher, on } from "@ember-decorators/object";
-import { inject as controller } from "@ember-decorators/controller";
-import { inject as service } from "@ember-decorators/service";
+import { observes as watcher, on } from "@ember-decorators/object";
+import { action, computed } from "@ember/object";
+import { inject as controller } from "@ember/controller";
+import { inject as service } from "@ember/service";
 
 import {
   filter,
@@ -13,7 +14,7 @@ import {
   equal,
   gt,
   alias,
-} from "@ember-decorators/object/computed";
+} from "@ember/object/computed";
 
 import { get, set } from "@ember/object";
 import layout from "components/templates/foo";

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

@@ -1,5 +1,6 @@
-import { action, off, unobserves, wrapComputed, computed } from "@ember-decorators/object";
-import { alias } from "@ember-decorators/object/computed";
+import { off, unobserves } from "@ember-decorators/object";
+import { action, computed } from "@ember/object";
+import { alias } from "@ember/object/computed";
 import RuntimeInput from "common/runtime/input";
 
 /**
@@ -30,7 +31,7 @@ export default class RuntimeInputEmberObject extends RuntimeInput.extend(MyMixin
   @alias("numPlusOne")
   numPlusPlus;
 
-  @wrapComputed(customMacro())
+  @customMacro
   computedMacro;
 
   /**

transforms/helpers/decorator-helper.js

@@ -49,9 +49,7 @@ function createCallExpressionDecorators(j, decoratorName, instanceProp) {
   }
 
   if (instanceProp.hasWrapComputedDecorator) {
-    return j.decorator(
-      j.callExpression(j.identifier(decoratorName), [instanceProp.value])
-    );
+    return j.decorator(j.identifier(instanceProp.calleeName));
   }
 
   const decoratorArgs =

transforms/helpers/import-helper.js

@@ -1,5 +1,6 @@
 const {
   DECORATOR_PATHS,
+  DECORATOR_PATH_OVERRIDES,
   EMBER_DECORATOR_SPECIFIERS,
   get,
   getFirstDeclaration,
@@ -170,11 +171,18 @@ function createNewImportDeclarations(
 function getDecoratorPathSpecifiers(j, root, decoratorsToImport = []) {
   // create a copy - we need to mutate the object later
   const edPathNameMap = Object.assign({}, EMBER_DECORATOR_SPECIFIERS);
+
+  // Iterate over the existing imports
+  // Extract and process the specifiers
+  // Construct the map with path as key and value as list of specifiers to import from the path
   return getExistingDecoratorImports(j, root).reduce(
     (decoratorPathSpecifierMap, existingDecoratorImport) => {
       const { importPropDecoratorMap, decoratorPath } = DECORATOR_PATHS[
         get(existingDecoratorImport, "value.source.value")
       ];
+      // Decorators to be imported for the path
+      // These are typically additional decorators which need to be imported for a path
+      // For example - `@action` decorator
       const decoratorsForPath = edPathNameMap[decoratorPath] || [];
       // delete the visited path to avoid duplicate imports
       delete edPathNameMap[decoratorPath];
@@ -186,7 +194,6 @@ function getDecoratorPathSpecifiers(j, root, decoratorsToImport = []) {
         decoratorsForPath,
         decoratorsToImport
       );
-
       const existingSpecifiers =
         get(existingDecoratorImport, "value.specifiers") || [];
 
@@ -200,15 +207,26 @@ function getDecoratorPathSpecifiers(j, root, decoratorsToImport = []) {
           // Update decorator local and imported names,
           // Needed in case of `observer` which need to be renamed to `@observes`
           setSpecifierNames(existingSpecifier, importPropDecoratorMap);
-          const isSpecifierPresent = decoratedSpecifiers.some(specifier => {
-            return (
-              !get(specifier, "local.name") &&
-              get(specifier, "imported.name") ===
-                get(existingSpecifier, "imported.name")
+          // Check if the decorator import path is overridden
+          // Needed in case of `observes` which need to be imported from `@ember-decorators/object`
+          const overriddenPath =
+            DECORATOR_PATH_OVERRIDES[get(existingSpecifier, "imported.name")];
+          if (overriddenPath) {
+            decoratorPathSpecifierMap[overriddenPath] = [].concat(
+              decoratorPathSpecifierMap[overriddenPath] || [],
+              existingSpecifier
             );
-          });
-          if (!isSpecifierPresent) {
-            decoratedSpecifiers.push(existingSpecifier);
+          } else {
+            const isSpecifierPresent = decoratedSpecifiers.some(specifier => {
+              return (
+                !get(specifier, "local.name") &&
+                get(specifier, "imported.name") ===
+                  get(existingSpecifier, "imported.name")
+              );
+            });
+            if (!isSpecifierPresent) {
+              decoratedSpecifiers.push(existingSpecifier);
+            }
           }
 
           // Remove the specifier from the existing import
@@ -252,6 +270,7 @@ function createDecoratorImportDeclarations(j, root, decoratorsToImport = []) {
     root,
     decoratorsToImport
   );
+
   const firstDeclaration = getFirstDeclaration(j, root);
   const decoratorPathsImported = Object.keys(decoratorPathSpecifierMap);
   // Create import statement replacing the existing ones with specifiers importing from ember-decorators namespace

transforms/helpers/util.js

@@ -10,7 +10,7 @@ const DECORATOR_PATHS = {
       observer: "observes",
       computed: "computed"
     },
-    decoratorPath: "@ember-decorators/object"
+    decoratorPath: "@ember/object"
   },
   "@ember/object/evented": {
     importPropDecoratorMap: {
@@ -22,27 +22,26 @@ const DECORATOR_PATHS = {
     importPropDecoratorMap: {
       inject: "inject"
     },
-    decoratorPath: "@ember-decorators/controller"
+    decoratorPath: "@ember/controller"
   },
   "@ember/service": {
     importPropDecoratorMap: {
       inject: "inject"
     },
-    decoratorPath: "@ember-decorators/service"
+    decoratorPath: "@ember/service"
   },
   "@ember/object/computed": {
-    decoratorPath: "@ember-decorators/object/computed"
+    decoratorPath: "@ember/object/computed"
   }
 };
 
+const DECORATOR_PATH_OVERRIDES = {
+  observes: "@ember-decorators/object"
+};
+
 const EMBER_DECORATOR_SPECIFIERS = {
-  "@ember-decorators/object": [
-    "action",
-    "off",
-    "on",
-    "unobserves",
-    "wrapComputed"
-  ],
+  "@ember/object": ["action"],
+  "@ember-decorators/object": ["off", "on", "unobserves"],
   "@ember-decorators/component": [
     "attribute",
     "className",
@@ -314,6 +313,7 @@ module.exports = {
   ACTION_SUPER_EXPRESSION_COMMENT,
   capitalizeFirstLetter,
   DECORATOR_PATHS,
+  DECORATOR_PATH_OVERRIDES,
   EMBER_DECORATOR_SPECIFIERS,
   get,
   getFirstDeclaration,