Clean up EOProp.decorators

Author: gitKrystan

transforms/helpers/decorator-info.ts

@@ -9,7 +9,9 @@ export interface DecoratorImportInfo {
   isMetaDecorator?: boolean;
   isMethodDecorator?: boolean;
   localName?: string;
+  args?: Array<string | boolean | number | null>;
 }
+
 export type DecoratorImportInfoMap = Map<
   /** local name */ string,
   DecoratorImportInfo

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

@@ -15,11 +15,6 @@ import {
   allowObjectLiteralDecorator,
 } from '../../util/index';
 
-interface EODecoratorArgs {
-  unobserves?: Array<string | boolean | number | null> | undefined;
-  off?: Array<string | boolean | number | null> | undefined;
-}
-
 type EOPropValue = EOProperty['value'] | EOMethod;
 
 /**
@@ -34,7 +29,6 @@ export default abstract class AbstractEOProp<P extends EOExpressionProp, B> {
   };
 
   protected decorators: DecoratorImportInfo[] = [];
-  readonly decoratorArgs: EODecoratorArgs = {};
 
   /** Runtime Data */
   readonly runtimeData: RuntimeData;
@@ -47,14 +41,17 @@ export default abstract class AbstractEOProp<P extends EOExpressionProp, B> {
     if (this.runtimeData.type) {
       const { type, offProperties, unobservedProperties } = this.runtimeData;
 
-      const name = this.name;
-      if (name in unobservedProperties) {
-        this.decorators.push({ name: 'unobserves' });
-        this.decoratorArgs.unobserves = unobservedProperties[name];
+      const unobservedArgs = unobservedProperties[this.name];
+      if (unobservedArgs) {
+        this.decorators.push({
+          name: 'unobserves',
+          args: unobservedArgs,
+        });
       }
-      if (name in offProperties) {
-        this.decorators.push({ name: 'off' });
-        this.decoratorArgs.off = offProperties[name];
+
+      const offArgs = offProperties[this.name];
+      if (offArgs) {
+        this.decorators.push({ name: 'off', args: offArgs });
       }
       this.runtimeType = type;
     }
@@ -124,20 +121,16 @@ export default abstract class AbstractEOProp<P extends EOExpressionProp, B> {
     return this._prop.decorators ?? null;
   }
 
-  get decoratorNames(): string[] {
-    return this.decorators.map((d) => d.name);
-  }
-
   get hasDecorators(): boolean {
     return this.decorators.length > 0;
   }
 
   get hasUnobservesDecorator(): boolean {
-    return this.decoratorNames.includes('unobserves');
+    return this.decorators.some((d) => d.name === 'unobserves');
   }
 
   get hasOffDecorator(): boolean {
-    return this.decoratorNames.includes('off');
+    return this.decorators.some((d) => d.name === 'off');
   }
 
   get hasMetaDecorator(): boolean {

transforms/helpers/eo-prop/private/call-expression/abstract.ts

@@ -18,7 +18,8 @@ export default abstract class AbstractEOCallExpressionProp<
 > extends AbstractEOProp<EOPropertyWithCallExpression, B> {
   protected buildDecorators(): Decorator[] {
     const decorators: Decorator[] = [];
-    for (const decoratorName of this.decoratorNames) {
+    for (const decorator of this.decorators) {
+      const decoratorName = decorator.name;
       if (this.isVolatileReadOnly) {
         logger.info(`[${this.name}] Ignored decorator ${decoratorName}`);
       } else {

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

@@ -2,7 +2,6 @@ import { default as j } from 'jscodeshift';
 import type { ClassProperty, Decorator, EOPropertySimple } from '../../ast';
 import { createDecoratorWithArgs } from '../../decorator-helper';
 import logger from '../../log-helper';
-import { defined } from '../../util/types';
 import AbstractEOProp from './abstract';
 
 export default class EOSimpleProp extends AbstractEOProp<
@@ -33,14 +32,10 @@ export default class EOSimpleProp extends AbstractEOProp<
 
   protected buildDecorators(): Decorator[] {
     const decorators: Decorator[] = [];
-    for (const decoratorName of this.decoratorNames) {
-      if (decoratorName === 'off' || decoratorName === 'unobserves') {
-        decorators.push(
-          createDecoratorWithArgs(
-            decoratorName,
-            defined(this.decoratorArgs[decoratorName])
-          )
-        );
+    for (const decorator of this.decorators) {
+      const decoratorName = decorator.name;
+      if ('args' in decorator) {
+        decorators.push(createDecoratorWithArgs(decoratorName, decorator.args));
       } else {
         logger.info(`[${this.name}] Ignored decorator ${decoratorName}`);
       }