Fix bug with EOComputedFunctionExpressionProp super expressions

Author: gitKrystan

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

@@ -26,6 +26,9 @@ const Foo1 = EmberObject.extend({
   observedProp: watcher('xyz', function() {
     return 'observed';
   }),
+  observedProp2: watcher('xyz', function() {
+    return this._super(...arguments);
+  }),
   event: on('click', function() {
     return 'abc';
   }),

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

@@ -46,6 +46,11 @@ class Foo1 extends EmberObject {
     return 'observed';
   }
 
+  @watcher('xyz')
+  observedProp2() {
+    return super.observedProp2(...arguments);
+  }
+
   @on('click')
   event() {
     return 'abc';

transforms/helpers/eo-prop/private/computed/function-expression.ts

@@ -1,6 +1,9 @@
 import { default as j } from 'jscodeshift';
 import type * as AST from '../../../ast';
-import { replaceGetterSetterSuperExpressions } from '../../../transform-helper';
+import {
+  replaceGetterSetterSuperExpressions,
+  replaceMethodSuperExpressions,
+} from '../../../transform-helper';
 import { assert, defined } from '../../../util/types';
 import AbstractEOComputedProp from './abstract';
 
@@ -69,8 +72,7 @@ export default class EOComputedFunctionExpressionProp extends AbstractEOComputed
       lastArg && lastArg.type === 'FunctionExpression',
       'expected lastArg to be a FunctionExpression'
     );
-    // FIXME: Is this correct? Maybe should handle kind === 'method' with replaceMethodSuperExpression ??
-    return replaceGetterSetterSuperExpressions(
+    return this.replaceSuperExpression(
       j.classMethod.from({
         kind: defined(this.kind),
         key: this.key,
@@ -83,4 +85,14 @@ export default class EOComputedFunctionExpressionProp extends AbstractEOComputed
       this.key
     );
   }
+
+  private get replaceSuperExpression(): (
+    classMethod: AST.ClassMethod,
+    replaceWithUndefined: boolean,
+    identifier: AST.Identifier
+  ) => AST.ClassMethod {
+    return this.kind === 'method'
+      ? replaceMethodSuperExpressions
+      : replaceGetterSetterSuperExpressions;
+  }
 }

transforms/helpers/eo-prop/private/function-expression.ts

@@ -1,6 +1,6 @@
 import { default as j } from 'jscodeshift';
 import type * as AST from '../../ast';
-import { replaceMethodSuperExpression } from '../../transform-helper';
+import { replaceMethodSuperExpressions } from '../../transform-helper';
 import AbstractEOProp from './abstract';
 
 /**
@@ -42,7 +42,7 @@ export default class EOFunctionExpressionProp extends AbstractEOProp<
   protected override readonly supportsObjectLiteralDecorators = true;
 
   build(): AST.ClassMethod {
-    return replaceMethodSuperExpression(
+    return replaceMethodSuperExpressions(
       j.classMethod.from({
         kind: 'method',
         key: this.key,

transforms/helpers/eo-prop/private/method.ts

@@ -1,6 +1,6 @@
 import { default as j } from 'jscodeshift';
 import type * as AST from '../../ast';
-import { replaceMethodSuperExpression } from '../../transform-helper';
+import { replaceMethodSuperExpressions } from '../../transform-helper';
 import AbstractEOProp from './abstract';
 
 /**
@@ -46,7 +46,7 @@ export default class EOMethod extends AbstractEOProp<
   protected override readonly supportsObjectLiteralDecorators = true;
 
   build(): AST.ClassMethod {
-    return replaceMethodSuperExpression(
+    return replaceMethodSuperExpressions(
       j.classMethod.from({
         kind: this.kind,
         key: this.key,

transforms/helpers/transform-helper.ts

@@ -129,7 +129,7 @@ export function replaceGetterSetterSuperExpressions(
  * super.methodName(...arguments);
  * ```
  */
-export function replaceMethodSuperExpression(
+export function replaceMethodSuperExpressions(
   classMethod: AST.ClassMethod,
   replaceWithUndefined: boolean
 ): AST.ClassMethod {