Unify readonly visitor with ts compiler one

Author: CarsonF

src/core/resources/plugin/index.js

@@ -1,8 +1,5 @@
 /** @import ts from 'typescript'; */
-import {
-  ResourceReadonlyVisitor,
-  ResourceVisitor,
-} from './resources.visitor.js';
+import { ResourceVisitor } from './resources.visitor.js';
 
 const visitor = new ResourceVisitor();
 
@@ -17,16 +14,12 @@ export default function (program) {
 }
 
 // For Nest CLI
-export { ResourceReadonlyVisitor as ReadonlyVisitor };
+export { ResourceVisitor as ReadonlyVisitor };
 /**
  * @param _ {*}
  * @param program {ts.Program}
  * @returns {(ctx: ts.TransformationContext) => (sf: ts.SourceFile) => ts.Node}
  */
-export const before = (_, program) => {
-  return (ctx) => {
-    return (sf) => {
-      return visitor.visit(sf, ctx, program);
-    };
-  };
+export const before = (_, program) => (ctx) => (sf) => {
+  return visitor.visit(program, sf, ctx);
 };

src/core/resources/plugin/resources.visitor.js

@@ -4,21 +4,27 @@ import * as ts from 'typescript';
 const securedKeys = ['value', 'canRead', 'canEdit'];
 
 export class ResourceVisitor {
-  constructor(readonly = false) {
-    this.readonly = readonly;
+  key = '@cord/resources';
+  /** @type {Record<string, string>} */
+  typeImports = {};
+
+  collect() {
+    return {};
   }
 
   /**
-   * @param sf {ts.SourceFile}
-   * @param ctx {ts.TransformationContext}
    * @param program {ts.Program}
+   * @param sf {ts.SourceFile}
+   * @param [ctx] {ts.TransformationContext}
    * @returns {ts.Node}
    */
-  visit(sf, ctx, program) {
+  visit(program, sf, ctx) {
     if (!sf.fileName.endsWith('dto.ts')) {
       return sf;
     }
-    const { factory } = ctx;
+
+    const readonly = !ctx;
+    const factory = ctx?.factory ?? ts.factory;
     /**
      * @param node {ts.Node}
      * @returns {ts.Node}
@@ -33,7 +39,7 @@ export class ResourceVisitor {
         return this.enhanceDtoClass(node, program, factory);
       }
 
-      if (this.readonly) {
+      if (readonly) {
         ts.forEachChild(node, visitNode);
       } else {
         return ts.visitEachChild(node, visitNode, ctx);
@@ -112,27 +118,3 @@ export class ResourceVisitor {
     );
   }
 }
-
-export class ResourceReadonlyVisitor {
-  key = '@cord/resources';
-  visitor = new ResourceVisitor(true);
-
-  get typeImports() {
-    return {};
-  }
-
-  /**
-   * @param program {ts.Program}
-   * @param sf {ts.SourceFile}
-   * @returns {ts.Node}
-   */
-  visit(program, sf) {
-    /** @type {*} */
-    const factoryHost = { factory: ts.factory };
-    return this.visitor.visit(sf, factoryHost, program);
-  }
-
-  collect() {
-    return {};
-  }
-}