Standardize handling of decorators-disabled errors

Author: gitKrystan

transforms/helpers/eo-extend-expression.ts

@@ -3,7 +3,7 @@ import * as AST from './ast';
 import { createIdentifierDecorator } from './decorator-helper';
 import type { DecoratorImportInfoMap } from './decorator-info';
 import type { EOClassDecorator, EOProp } from './eo-prop/index';
-import makeEOProp from './eo-prop/index';
+import makeEOProp, { isEOClassDecorator, isEOProp } from './eo-prop/index';
 import logger from './log-helper';
 import type { Options } from './options';
 import { getClassName, getExpressionToReplace } from './parse-helper';
@@ -16,8 +16,7 @@ export default class EOExtendExpression {
 
   private expression: AST.EOExpression | null = null;
   private mixins: AST.EOMixin[];
-  readonly properties: EOProp[];
-  readonly decorators: EOClassDecorator[];
+  readonly properties: Array<EOClassDecorator | EOProp>;
 
   constructor(
     private path: AST.Path<AST.EOExtendExpression>,
@@ -48,24 +47,9 @@ export default class EOExtendExpression {
     this.mixins = mixins;
 
     const rawProperties = this.expression?.properties ?? [];
-    const properties: EOProp[] = [];
-    const decorators: EOClassDecorator[] = [];
-
-    for (const property of rawProperties) {
-      const eoProp = makeEOProp(
-        property,
-        existingDecoratorImportInfos,
-        options
-      );
-      if (eoProp.isClassDecorator) {
-        decorators.push(eoProp);
-      } else {
-        properties.push(eoProp);
-      }
-    }
-
-    this.properties = properties;
-    this.decorators = decorators;
+    this.properties = rawProperties.map((raw) =>
+      makeEOProp(raw, existingDecoratorImportInfos, options)
+    );
   }
 
   transform(): boolean {
@@ -97,8 +81,8 @@ export default class EOExtendExpression {
       tagName: false,
       unobserves: false,
     };
-    const allProps = [...this.decorators, ...this.properties];
-    for (const prop of allProps) {
+    const { properties } = this;
+    for (const prop of properties) {
       specs = {
         action: specs.action || prop.decoratorImportSpecs.action,
         classNames: specs.classNames || prop.decoratorImportSpecs.classNames,
@@ -151,10 +135,10 @@ export default class EOExtendExpression {
   }
 
   private buildClassBody(): AST.ClassBody {
-    const { properties } = this;
+    const objectProperties = this.properties.filter(isEOProp);
     let classBody: Parameters<AST.ClassBodyBuilder>[0] = [];
 
-    for (const prop of properties) {
+    for (const prop of objectProperties) {
       const built = prop.build();
       if (Array.isArray(built)) {
         classBody = [...classBody, ...built];
@@ -186,16 +170,16 @@ export default class EOExtendExpression {
   }
 
   private buildClassDecorators(): AST.Decorator[] {
-    const { decorators } = this;
+    const classDecoratorProperties = this.properties.filter(isEOClassDecorator);
     const { classicDecorator } = this.options;
     const classDecorators: AST.Decorator[] = [];
 
     if (classicDecorator) {
       classDecorators.push(createIdentifierDecorator('classic'));
     }
 
-    for (const decorator of decorators) {
-      classDecorators.push(decorator.build());
+    for (const prop of classDecoratorProperties) {
+      classDecorators.push(prop.build());
     }
 
     return classDecorators;
@@ -219,6 +203,7 @@ export default class EOExtendExpression {
     for (const prop of this.properties) {
       errors = [...errors, ...prop.errors];
     }
+
     return errors;
   }
 

transforms/helpers/eo-prop/index.ts

@@ -52,3 +52,15 @@ export default function makeEOProp(
     return new EOSimpleProp(eoProp, options);
   }
 }
+
+/** Type predicate */
+export function isEOProp(p: EOProp | EOClassDecorator): p is EOProp {
+  return !p.isClassDecorator;
+}
+
+/** Type predicate */
+export function isEOClassDecorator(
+  p: EOProp | EOClassDecorator
+): p is EOClassDecorator {
+  return p.isClassDecorator;
+}

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

@@ -4,7 +4,6 @@ import type { Options } from '../../options';
 import type { RuntimeData } from '../../runtime-data';
 import type { DecoratorImportSpecs } from '../../util/index';
 import {
-  DECORATORS_REQUIRED_PROP_NAMES,
   OFF_DECORATOR_NAME,
   UNOBSERVES_DECORATOR_NAME,
   allowObjectLiteralDecorator,
@@ -129,17 +128,6 @@ export default abstract class AbstractEOProp<
       errors.push(this.makeError("need option '--decorators=true'"));
     }
 
-    const unsupportedPropNames: readonly string[] = decorators
-      ? []
-      : DECORATORS_REQUIRED_PROP_NAMES;
-    if (unsupportedPropNames.includes(this.name)) {
-      errors.push(
-        this.makeError(
-          `property with name '${this.name}' and type '${this.type}' can not be transformed`
-        )
-      );
-    }
-
     errors = [...errors, ...this.typeErrors];
 
     return errors;

transforms/helpers/eo-prop/private/actions/index.ts

@@ -50,6 +50,11 @@ export default class EOActionsProp extends AbstractEOProp<
     });
   }
 
+  // eslint-disable-next-line @typescript-eslint/class-literal-property-style
+  protected override get needsDecorators(): boolean {
+    return true;
+  }
+
   protected override get typeErrors(): string[] {
     return [...this.lifecycleHookErrors, ...this.infiniteLoopErrors];
   }