@mxpicture/gcp-functions-generator 1.1.92 → 1.2.2

package/dist/generator/GeneratorEnum.d.ts

@@ -1,7 +1,6 @@
-import { Generator, GeneratorRunItem, GeneratorRunItems } from "./Generator.js";
-import { AnnotationsProperty, DecoPropertyBase, EnumRegistryKeys } from "@mxpicture/gcp-functions-common/types";
-import { CodeCollector } from "../common/CodeCollector.js";
-import { GeneratorEnv } from "../common/types.common.js";
+import { Generator } from "./Generator.js";
+import type { AnnotationsProperty, DecoPropertyBase, EnumRegistryKeys } from "@mxpicture/gcp-functions-common/types";
+import type { GeneratorEnv, GeneratorRunItem, GeneratorRunResult } from "../common/types.common.js";
 /**
  * Generator that produces enums from decorator annotations.
  *
@@ -12,9 +11,9 @@ import { GeneratorEnv } from "../common/types.common.js";
  */
 export declare class GeneratorEnum extends Generator {
     constructor();
-    protected runHeader(current: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv, result: CodeCollector): Promise<string | null>;
-    protected buildEnum(result: CodeCollector, property: AnnotationsProperty<DecoPropertyBase>, _registryKeys: EnumRegistryKeys | null): void;
-    protected buildEnums(result: CodeCollector, properties: AnnotationsProperty<DecoPropertyBase>[]): void;
+    protected runHeader(item: GeneratorRunItem, env: GeneratorEnv): Promise<GeneratorRunResult | null>;
+    protected buildEnum(property: AnnotationsProperty<DecoPropertyBase>, _registryKeys: EnumRegistryKeys | null): string[];
+    protected buildEnums(properties: AnnotationsProperty<DecoPropertyBase>[]): string[];
 }
 declare const _default: GeneratorEnum;
 export default _default;

package/dist/generator/GeneratorEnum.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratorEnum.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorEnum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAShF,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAEhB,gBAAgB,EACjB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD;;;;;;;GAOG;AACH,qBAAa,aAAc,SAAQ,SAAS;;cAWjB,SAAS,CAChC,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,iBAAiB,EACtB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAQzB,SAAS,CAAC,SAAS,CACjB,MAAM,EAAE,aAAa,EACrB,QAAQ,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAC/C,aAAa,EAAE,gBAAgB,GAAG,IAAI,GACrC,IAAI;IAgCP,SAAS,CAAC,UAAU,CAClB,MAAM,EAAE,aAAa,EACrB,UAAU,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,GAClD,IAAI;CASR;;AAED,wBAAmC"}
+{"version":3,"file":"GeneratorEnum.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorEnum.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAQ3C,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EAEhB,gBAAgB,EACjB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AAGnC;;;;;;;GAOG;AACH,qBAAa,aAAc,SAAQ,SAAS;;cASjB,SAAS,CAChC,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IASrC,SAAS,CAAC,SAAS,CACjB,QAAQ,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAC/C,aAAa,EAAE,gBAAgB,GAAG,IAAI,GACrC,MAAM,EAAE;IA8BX,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,GAClD,MAAM,EAAE;CAUZ;;AAED,wBAAmC"}

package/dist/generator/GeneratorEnum.js

@@ -1,6 +1,5 @@
 import { Generator } from "./Generator.js";
-import { Collector } from "../common/Collector.js";
-import { castDecoEnum, DecoFileExtension, DecoFileType, DecoPropertyType, DecoTargetType, } from "@mxpicture/gcp-functions-common/decorator";
+import { castDecoEnum, DecoFileExtension, DecoFileType, DecoPropertyType, DecoPackageType, } from "@mxpicture/gcp-functions-common/decorator";
 import { enumRegistry } from "@mxpicture/gcp-functions-common/helper";
 /**
  * Generator that produces enums from decorator annotations.
@@ -12,19 +11,24 @@ import { enumRegistry } from "@mxpicture/gcp-functions-common/helper";
  */
 export class GeneratorEnum extends Generator {
     constructor() {
-        super(900, DecoFileType.enum, DecoFileExtension.ts, DecoTargetType.common, Collector.instance());
+        super({
+            fileType: DecoFileType.enum,
+            ext: DecoFileExtension.ts,
+            packageType: DecoPackageType.common,
+        });
     }
-    async runHeader(current, all, env, result) {
-        const header = current.decorator.extractAnnotations();
+    async runHeader(item, env) {
+        void env;
+        const header = item.decorator.extractAnnotations();
         if (header.properties.length === 0)
             return null;
-        this.buildEnums(result, header.properties);
-        return header.name;
+        const code = this.buildEnums(header.properties);
+        return { name: header.name, code };
     }
-    buildEnum(result, property, _registryKeys) {
+    buildEnum(property, _registryKeys) {
         const data = castDecoEnum(property.data);
         if (!data)
-            return;
+            return [];
         const mapper = (p) => ({
             key: p[0],
             text: p[1].text,
@@ -35,13 +39,20 @@ export class GeneratorEnum extends Generator {
         for (const registryKey of registryKeys)
             if (!allKeys.find((allKey) => allKey.key === registryKey.key))
                 allKeys.push(registryKey);
-        result.addCode(`export enum ${property.propertyType} {`, ...allKeys.map(({ key }) => `  ${key} = "${key}",`), "};");
-        result.addCode(`export enum ${property.propertyType}Text {`, ...allKeys.map(({ key, text }) => `  ${key} = "${text}",`), "};");
+        return [
+            `export enum ${property.propertyType} {`,
+            ...allKeys.map(({ key }) => `  ${key} = "${key}",`),
+            "};",
+            "",
+            `export enum ${property.propertyType}Text {`,
+            ...allKeys.map(({ key, text }) => `  ${key} = "${text}",`),
+            "};",
+        ];
     }
-    buildEnums(result, properties) {
-        for (const prop of properties)
-            if (prop.data.type === DecoPropertyType.enum)
-                this.buildEnum(result, prop, enumRegistry().getItem(prop.propertyType)?.keys ?? null);
+    buildEnums(properties) {
+        return properties
+            .filter((prop) => prop.data.type === DecoPropertyType.enum)
+            .flatMap((prop) => this.buildEnum(prop, enumRegistry().getItem(prop.propertyType)?.keys ?? null));
     }
 }
 export default new GeneratorEnum();

package/dist/generator/GeneratorEnum.js.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratorEnum.js","sourceRoot":"","sources":["../../src/generator/GeneratorEnum.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GeneratorEnum.js","sourceRoot":"","sources":["../../src/generator/GeneratorEnum.ts"],"names":[],"mappings":"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"}

package/dist/generator/GeneratorFrontend.d.ts

@@ -1,8 +1,7 @@
-import { Generator, GeneratorRunItem, GeneratorRunItems } from "./Generator.js";
-import { DecoNames } from "@mxpicture/gcp-functions-common/decorator";
-import { DecoRoutes } from "@mxpicture/gcp-functions-common/types";
-import { CodeCollector } from "../common/CodeCollector.js";
-import { GeneratorEnv } from "../common/types.common.js";
+import { Generator } from "./Generator.js";
+import type { DecoNames } from "@mxpicture/gcp-functions-common/decorator";
+import type { DecoRoutes } from "@mxpicture/gcp-functions-common/types";
+import type { GeneratorEnv, GeneratorRunItem, GeneratorRunResult } from "../common/types.common.js";
 /**
  * Generator that produces frontend-specific code including API classes, functions, and factory helpers.
  *
@@ -12,7 +11,7 @@ import { GeneratorEnv } from "../common/types.common.js";
  */
 export declare class GeneratorFrontend extends Generator {
     constructor();
-    protected runHeader(current: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv, result: CodeCollector): Promise<string | null>;
+    protected runHeader(item: GeneratorRunItem, env: GeneratorEnv): Promise<GeneratorRunResult | null>;
     protected buildApi(routes: DecoRoutes, names: DecoNames): string[];
     protected buildFunction(names: DecoNames, datePaths: string[]): string[];
     protected buildCreate(names: DecoNames): string[];

package/dist/generator/GeneratorFrontend.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratorFrontend.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorFrontend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEhF,OAAO,EAGL,SAAS,EAKV,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;;GAMG;AACH,qBAAa,iBAAkB,SAAQ,SAAS;;cAWrB,SAAS,CAChC,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,iBAAiB,EACtB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA4DzB,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IA4ClE,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAexE,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;CAWlD;;AAED,wBAAuC"}
+{"version":3,"file":"GeneratorFrontend.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorFrontend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAU3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AAEnC;;;;;;GAMG;AACH,qBAAa,iBAAkB,SAAQ,SAAS;;cASrB,SAAS,CAChC,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAuBrC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IA4ClE,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAexE,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;CAWlD;;AAED,wBAAuC"}

package/dist/generator/GeneratorFrontend.js

@@ -1,6 +1,5 @@
 import { Generator } from "./Generator.js";
-import { Collector } from "../common/Collector.js";
-import { DecoFileExtension, DecoFileType, DecoPropertyType, DecoTargetType, hasCrudRoute, isCrudRoute, } from "@mxpicture/gcp-functions-common/decorator";
+import { DecoFileExtension, DecoFileType, DecoPropertyType, DecoPackageType, hasCrudRoute, isCrudRoute, } from "@mxpicture/gcp-functions-common/decorator";
 import { extractAnnotationsPaths } from "@mxpicture/gcp-functions-common/annotation";
 /**
  * Generator that produces frontend-specific code including API classes, functions, and factory helpers.
@@ -11,54 +10,35 @@ import { extractAnnotationsPaths } from "@mxpicture/gcp-functions-common/annotat
  */
 export class GeneratorFrontend extends Generator {
     constructor() {
-        super(40, DecoFileType.frontend, DecoFileExtension.ts, DecoTargetType.frontend, Collector.instance());
+        super({
+            fileType: DecoFileType.frontend,
+            ext: DecoFileExtension.ts,
+            packageType: DecoPackageType.frontend,
+        });
     }
-    async runHeader(current, all, env, result) {
-        const raw = current.decorator.extractRaw();
+    async runHeader(item, env) {
+        void env;
+        const raw = item.decorator.extractRaw();
         if (!raw.routes || Object.keys(raw.routes).length === 0)
             return null;
-        const names = current.names;
-        const header = current.decorator.extractAnnotations();
+        const names = item.names;
+        const header = item.decorator.extractAnnotations();
         const datePaths = extractAnnotationsPaths(header.properties, DecoPropertyType.date);
-        result.addCode(...this.buildFunction(names, datePaths), "", ...this.buildApi(raw.routes, names), "", ...this.buildCreate(names));
-        result.addImport({
-            path: "@mxpicture/gcp-functions-frontend/function",
-            props: ["IFrontendFunction"],
-            isType: false,
-        }, {
-            path: this.importCommon(DecoFileType.routes),
-            props: [names.routesName],
-            isType: false,
-        }, {
-            path: "@mxpicture/gcp-functions-frontend/api",
-            props: ["FrontendApi"],
-            isType: false,
-        }, {
-            path: "@mxpicture/gcp-functions-common/types",
-            props: [
-                "ApiFromRoutes",
-                "FunctionResponse",
-                "FunctionRequest",
-                "DocumentData",
-            ],
-            isType: true,
-        }, {
-            path: this.importCommon(DecoFileType.routes),
-            props: [names.routes],
-            isType: true,
-        }, {
-            path: this.importCommon(DecoFileType.doc),
-            props: [names.doc],
-            isType: true,
-        });
-        return raw.name;
+        const code = [
+            ...this.buildFunction(names, datePaths),
+            "",
+            ...this.buildApi(raw.routes, names),
+            "",
+            ...this.buildCreate(names),
+        ];
+        return { name: raw.name, code };
     }
     buildApi(routes, names) {
         const code = [];
         const superClassName = hasCrudRoute(routes)
-            ? `${this.i("FrontendApi")}<${this.i(names.doc)}, ${this.i(names.func)}>`
-            : `${this.i("IFrontendApi")}<${this.i(names.func)}>`;
-        code.push(`export type I${names.api} = ${this.i("ApiFromRoutes")}<${this.i(names.routes)}>;`, "", `export class ${names.api} extends ${this.i(superClassName)}`, `implements ${this.i(`I${names.api}`)}`, "{", `public constructor(func?: ${this.i(names.func)}) { super("${names.basenameLower}"); if (func) this.useFunc(func); }`, "");
+            ? `FrontendApi<${names.doc}, ${names.func}>`
+            : `IFrontendApi<${names.func}>`;
+        code.push(`export type I${names.api} = ApiFromRoutes<${names.routes}>;`, "", `export class ${names.api} extends ${superClassName}`, `implements I${names.api}`, "{", `public constructor(func?: ${names.func}) { super("${names.basenameLower}"); if (func) this.useFunc(func); }`, "");
         for (const [routeName, params] of Object.entries(routes)) {
             if (isCrudRoute(params))
                 continue; // ignore crud --> provided by super class
@@ -80,23 +60,23 @@ export class GeneratorFrontend extends Generator {
     }
     buildFunction(names, datePaths) {
         return [
-            `const ${this.i(`${names.basenameLower}DatePaths`)}: string[] = [`,
+            `const ${names.basenameLower}DatePaths: string[] = [`,
             ...datePaths.map((datePath) => `"${datePath}",`),
             "];",
             "",
-            `export class ${names.func} extends ${this.i("IFrontendFunction")} {`,
-            `  public constructor() { super("${names.functionName}", ${this.i(`${names.basenameLower}DatePaths`)}); this.useRoutes(${this.i(names.routesName)}); }`,
+            `export class ${names.func} extends IFrontendFunction {`,
+            `  public constructor() { super("${names.functionName}", ${names.basenameLower}DatePaths); this.useRoutes(${names.routesName}); }`,
             "",
             "  // defined to be able to debug outgress",
-            `  public override async outgress<REQ, RES extends ${this.i("DocumentData")}>(request: ${this.i("FunctionRequest")}<REQ>): Promise<${this.i("FunctionResponse")}<RES>> { return super.outgress(request); }`,
+            "  public override async outgress<REQ, RES extends DocumentData>(request: FunctionRequest<REQ>): Promise<FunctionResponse<RES>> { return super.outgress(request); }",
             "}",
         ];
     }
     buildCreate(names) {
         return [
             `export const create${names.basename}Api = () => {`,
-            `  const func = new ${this.i(names.func)}();`,
-            `  const api = new ${this.i(names.api)}(func);`,
+            `  const func = new ${names.func}();`,
+            `  const api = new ${names.api}(func);`,
             "  return api;",
             "};",
             "",

package/dist/generator/GeneratorFrontend.js.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratorFrontend.js","sourceRoot":"","sources":["../../src/generator/GeneratorFrontend.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GeneratorFrontend.js","sourceRoot":"","sources":["../../src/generator/GeneratorFrontend.ts"],"names":[],"mappings":"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"}

package/dist/generator/GeneratorRoutes.d.ts

@@ -1,7 +1,6 @@
-import { Generator, GeneratorRunItem, GeneratorRunItems } from "./Generator.js";
-import { DecoNames, DecoratorData } from "@mxpicture/gcp-functions-common/decorator";
-import { CodeCollector } from "../common/CodeCollector.js";
-import { GeneratorEnv } from "../common/types.common.js";
+import { Generator } from "./Generator.js";
+import type { DecoNames, DecoratorData } from "@mxpicture/gcp-functions-common/decorator";
+import type { GeneratorEnv, GeneratorRunItem, GeneratorRunResult } from "../common/types.common.js";
 /**
  * Generator that produces route type definitions and route-name enums.
  *
@@ -12,9 +11,9 @@ import { GeneratorEnv } from "../common/types.common.js";
  */
 export declare class GeneratorRoutes extends Generator {
     constructor();
-    protected runHeader(current: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv, result: CodeCollector): Promise<string | null>;
-    protected buildType(result: CodeCollector, names: DecoNames, mainData: DecoratorData): void;
-    protected buildEnum(result: CodeCollector, names: DecoNames, mainData: DecoratorData): void;
+    protected runHeader(item: GeneratorRunItem, env: GeneratorEnv): Promise<GeneratorRunResult | null>;
+    protected buildType(names: DecoNames, mainData: DecoratorData): string[];
+    protected buildEnum(names: DecoNames, mainData: DecoratorData): string[];
 }
 declare const _default: GeneratorRoutes;
 export default _default;

package/dist/generator/GeneratorRoutes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratorRoutes.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEhF,OAAO,EAGL,SAAS,EACT,aAAa,EAEd,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD;;;;;;;GAOG;AACH,qBAAa,eAAgB,SAAQ,SAAS;;cAYnB,SAAS,CAChC,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,iBAAiB,EACtB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA+BzB,SAAS,CAAC,SAAS,CACjB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,aAAa;IAczB,SAAS,CAAC,SAAS,CACjB,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,aAAa;CAY1B;;AAED,wBAAqC"}
+{"version":3,"file":"GeneratorRoutes.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EACd,MAAM,2CAA2C,CAAC;AAMnD,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AAEnC;;;;;;;GAOG;AACH,qBAAa,eAAgB,SAAQ,SAAS;;cASnB,SAAS,CAChC,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IASrC,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,GAAG,MAAM,EAAE;IAaxE,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,GAAG,MAAM,EAAE;CAWzE;;AAED,wBAAqC"}

package/dist/generator/GeneratorRoutes.js

@@ -1,6 +1,5 @@
 import { Generator } from "./Generator.js";
-import { Collector } from "../common/Collector.js";
-import { DecoFileExtension, DecoFileType, DecoTargetType, } from "@mxpicture/gcp-functions-common/decorator";
+import { DecoFileExtension, DecoFileType, DecoPackageType, } from "@mxpicture/gcp-functions-common/decorator";
 /**
  * Generator that produces route type definitions and route-name enums.
  *
@@ -11,42 +10,38 @@ import { DecoFileExtension, DecoFileType, DecoTargetType, } from "@mxpicture/gcp
  */
 export class GeneratorRoutes extends Generator {
     constructor() {
-        super(30, DecoFileType.routes, DecoFileExtension.ts, DecoTargetType.common, Collector.instance(), true);
+        super({
+            fileType: DecoFileType.routes,
+            ext: DecoFileExtension.ts,
+            packageType: DecoPackageType.common,
+        });
     }
-    async runHeader(current, all, env, result) {
-        const raw = current.decorator.extractRaw();
+    async runHeader(item, env) {
+        void env;
+        const raw = item.decorator.extractRaw();
         if (!raw.routes || Object.keys(raw.routes).length === 0)
             return null;
-        const names = current.names;
-        result.addImport({
-            path: "@mxpicture/gcp-functions-common/types",
-            isType: true,
-            props: ["RouteDef", "WithRoutes"],
-        }, {
-            path: this.importCommon(DecoFileType.doc),
-            isType: true,
-            props: [names.doc],
-        });
-        if (Object.values(raw.routes).find((route) => !!route._internalIsCrud)) {
-            result.addImport({
-                path: "@mxpicture/gcp-functions-common/types",
-                isType: true,
-                props: ["ApiFilter", "CreateInput", "DocumentKey", "UpdateInput"],
-            });
-        }
-        this.buildType(result, names, raw);
-        this.buildEnum(result, names, raw);
-        return raw.name;
+        const names = item.names;
+        const code = [...this.buildType(names, raw), ...this.buildEnum(names, raw)];
+        return { name: raw.name, code };
     }
-    buildType(result, names, mainData) {
+    buildType(names, mainData) {
         if (!mainData.routes)
-            return;
-        result.addCode(`export type ${names.routes} = ${this.i("WithRoutes")}<{`, ...Object.entries(mainData.routes).map(([routeName, params]) => `  ${routeName}: ${this.i("RouteDef")}<${this.i(params.requestType)}, ${this.i(params.responseType)}>;`), "}>;");
+            return [];
+        return [
+            `export type ${names.routes} = WithRoutes<{`,
+            ...Object.entries(mainData.routes).map(([routeName, params]) => `  ${routeName}: RouteDef<${params.requestType}, ${params.responseType}>;`),
+            "}>;",
+        ];
     }
-    buildEnum(result, names, mainData) {
+    buildEnum(names, mainData) {
         if (!mainData.routes)
-            return;
-        result.addCode(`export enum ${names.routesName} {`, ...Object.keys(mainData.routes).map((routeName) => `  ${routeName} = "${routeName}",`), "}");
+            return [];
+        return [
+            `export enum ${names.routesName} {`,
+            ...Object.keys(mainData.routes).map((routeName) => `  ${routeName} = "${routeName}",`),
+            "}",
+        ];
     }
 }
 export default new GeneratorRoutes();

package/dist/generator/GeneratorRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratorRoutes.js","sourceRoot":"","sources":["../../src/generator/GeneratorRoutes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GeneratorRoutes.js","sourceRoot":"","sources":["../../src/generator/GeneratorRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAK3C,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,eAAe,GAChB,MAAM,2CAA2C,CAAC;AAOnD;;;;;;;GAOG;AACH,MAAM,OAAO,eAAgB,SAAQ,SAAS;IAC5C;QACE,KAAK,CAAC;YACJ,QAAQ,EAAE,YAAY,CAAC,MAAM;YAC7B,GAAG,EAAE,iBAAiB,CAAC,EAAE;YACzB,WAAW,EAAE,eAAe,CAAC,MAAM;SACpC,CAAC,CAAC;IACL,CAAC;IAEkB,KAAK,CAAC,SAAS,CAChC,IAAsB,EACtB,GAAiB;QAEjB,KAAK,GAAG,CAAC;QACT,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACrE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QACzB,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QAC5E,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC;IAClC,CAAC;IAES,SAAS,CAAC,KAAgB,EAAE,QAAuB;QAC3D,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAEhC,OAAO;YACL,eAAe,KAAK,CAAC,MAAM,iBAAiB;YAC5C,GAAG,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CACpC,CAAC,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,CACtB,KAAK,SAAS,cAAc,MAAM,CAAC,WAAW,KAAK,MAAM,CAAC,YAAY,IAAI,CAC7E;YACD,KAAK;SACN,CAAC;IACJ,CAAC;IAES,SAAS,CAAC,KAAgB,EAAE,QAAuB;QAC3D,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAEhC,OAAO;YACL,eAAe,KAAK,CAAC,UAAU,IAAI;YACnC,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,CACjC,CAAC,SAAS,EAAE,EAAE,CAAC,KAAK,SAAS,OAAO,SAAS,IAAI,CAClD;YACD,GAAG;SACJ,CAAC;IACJ,CAAC;CACF;AAED,eAAe,IAAI,eAAe,EAAE,CAAC"}

package/dist/generator/GeneratorZod.d.ts

@@ -1,8 +1,7 @@
-import { Generator, GeneratorRunItem, GeneratorRunItems } from "./Generator.js";
-import { DecoNames } from "@mxpicture/gcp-functions-common/decorator";
-import { AnnotationsProperty, DecoImport, DecoPropertyBase } from "@mxpicture/gcp-functions-common/types";
-import { CodeCollector } from "../common/CodeCollector.js";
-import { GeneratorEnv } from "../common/types.common.js";
+import { Generator } from "./Generator.js";
+import type { DecoNames } from "@mxpicture/gcp-functions-common/decorator";
+import type { AnnotationsProperty, DecoImport, DecoPropertyBase } from "@mxpicture/gcp-functions-common/types";
+import type { GeneratorEnv, GeneratorRunItem, GeneratorRunResult } from "../common/types.common.js";
 /**
  * Generator that produces Zod validation schemas and shape objects from decorator annotations.
  *
@@ -15,23 +14,23 @@ export declare class GeneratorZod extends Generator {
     protected zImports: Set<string>;
     protected typeValidationCount: number;
     constructor();
-    protected runHeader(current: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv, result: CodeCollector): Promise<string | null>;
+    protected runHeader(item: GeneratorRunItem, env: GeneratorEnv): Promise<GeneratorRunResult | null>;
     protected startZ(): void;
     protected endZ(): DecoImport[];
     protected z(name: string, params?: string): string;
     protected zAlias(name: string): string;
-    protected buildShape(properties: AnnotationsProperty<DecoPropertyBase>[], names: DecoNames): string[];
+    protected buildShape(properties: AnnotationsProperty<DecoPropertyBase>[], item: GeneratorRunItem): string[];
     protected buildTypeValidation(names: DecoNames): string[];
     protected buildComment(names: DecoNames): string[];
     protected buildSchema(names: DecoNames): string[];
-    protected buildProperty(prop: AnnotationsProperty<DecoPropertyBase>): string | null;
+    protected buildProperty(prop: AnnotationsProperty<DecoPropertyBase>, item: GeneratorRunItem): string | null;
     protected buildNumber(_prop: AnnotationsProperty<DecoPropertyBase>): string | null;
     protected buildKey(_prop: AnnotationsProperty<DecoPropertyBase>): string | null;
     protected buildCreateTime(_prop: AnnotationsProperty<DecoPropertyBase>): string | null;
     protected buildUpdateTime(_prop: AnnotationsProperty<DecoPropertyBase>): string | null;
     protected buildString(_prop: AnnotationsProperty<DecoPropertyBase>): string | null;
-    protected buildArray(_prop: AnnotationsProperty<DecoPropertyBase>): string | null;
-    protected buildObject(_prop: AnnotationsProperty<DecoPropertyBase>): string | null;
+    protected buildArray(_prop: AnnotationsProperty<DecoPropertyBase>, item: GeneratorRunItem): string | null;
+    protected buildObject(_prop: AnnotationsProperty<DecoPropertyBase>, item: GeneratorRunItem): string | null;
     protected buildDate(_prop: AnnotationsProperty<DecoPropertyBase>): string | null;
     protected buildBoolean(_prop: AnnotationsProperty<DecoPropertyBase>): string | null;
     protected buildEnum(_prop: AnnotationsProperty<DecoPropertyBase>): string | null;

package/dist/generator/GeneratorZod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratorZod.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorZod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAEhF,OAAO,EAWL,SAAS,EAEV,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,gBAAgB,EACjB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,SAAS;IACzC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAC5C,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAK;;cAYjB,SAAS,CAChC,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,iBAAiB,EACtB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAsBzB,SAAS,CAAC,MAAM,IAAI,IAAI;IAIxB,SAAS,CAAC,IAAI,IAAI,UAAU,EAAE;IAY9B,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,MAAa,GAAG,MAAM;IAMxD,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAItC,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,EACnD,KAAK,EAAE,SAAS,GACf,MAAM,EAAE;IAcX,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IAMzD,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IAMlD,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IAMjD,SAAS,CAAC,aAAa,CACrB,IAAI,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC1C,MAAM,GAAG,IAAI;IAehB,SAAS,CAAC,WAAW,CACnB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAahB,SAAS,CAAC,QAAQ,CAChB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAMhB,SAAS,CAAC,eAAe,CACvB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAMhB,SAAS,CAAC,eAAe,CACvB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAMhB,SAAS,CAAC,WAAW,CACnB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAYhB,SAAS,CAAC,UAAU,CAClB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAchB,SAAS,CAAC,WAAW,CACnB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAShB,SAAS,CAAC,SAAS,CACjB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAShB,SAAS,CAAC,YAAY,CACpB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAMhB,SAAS,CAAC,SAAS,CACjB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;CAKjB;;AAED,wBAAkC"}
+{"version":3,"file":"GeneratorZod.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorZod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAc3E,OAAO,KAAK,EACV,mBAAmB,EACnB,UAAU,EACV,gBAAgB,EACjB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AAGnC;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,SAAS;IACzC,SAAS,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,CAAC,CAAa;IAC5C,SAAS,CAAC,mBAAmB,EAAE,MAAM,CAAK;;cAUjB,SAAS,CAChC,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAiBrC,SAAS,CAAC,MAAM,IAAI,IAAI;IAIxB,SAAS,CAAC,IAAI,IAAI,UAAU,EAAE;IAY9B,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,MAAa,GAAG,MAAM;IAMxD,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAItC,SAAS,CAAC,UAAU,CAClB,UAAU,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,EACnD,IAAI,EAAE,gBAAgB,GACrB,MAAM,EAAE;IAcX,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IAMzD,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IAMlD,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IAMjD,SAAS,CAAC,aAAa,CACrB,IAAI,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAC3C,IAAI,EAAE,gBAAgB,GACrB,MAAM,GAAG,IAAI;IAehB,SAAS,CAAC,WAAW,CACnB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAahB,SAAS,CAAC,QAAQ,CAChB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAMhB,SAAS,CAAC,eAAe,CACvB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAMhB,SAAS,CAAC,eAAe,CACvB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAMhB,SAAS,CAAC,WAAW,CACnB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAYhB,SAAS,CAAC,UAAU,CAClB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAC5C,IAAI,EAAE,gBAAgB,GACrB,MAAM,GAAG,IAAI;IAchB,SAAS,CAAC,WAAW,CACnB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAC5C,IAAI,EAAE,gBAAgB,GACrB,MAAM,GAAG,IAAI;IAUhB,SAAS,CAAC,SAAS,CACjB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAShB,SAAS,CAAC,YAAY,CACpB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;IAMhB,SAAS,CAAC,SAAS,CACjB,KAAK,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,GAC3C,MAAM,GAAG,IAAI;CAKjB;;AAED,wBAAkC"}

package/dist/generator/GeneratorZod.js

@@ -1,6 +1,5 @@
 import { Generator } from "./Generator.js";
-import { Collector } from "../common/Collector.js";
-import { castDecoArray, castDecoBoolean, castDecoDate, castDecoEnum, castDecoKey, castDecoNumber, castDecoObject, castDecoString, DecoFileExtension, DecoFileType, DecoTargetType, } from "@mxpicture/gcp-functions-common/decorator";
+import { castDecoArray, castDecoBoolean, castDecoDate, castDecoEnum, castDecoKey, castDecoNumber, castDecoObject, castDecoString, DecoFileExtension, DecoFileType, DecoPackageType, } from "@mxpicture/gcp-functions-common/decorator";
 import json5 from "json5";
 import { upperFirstLetter } from "@mxpicture/gcp-functions-common/helper";
 /**
@@ -15,21 +14,26 @@ export class GeneratorZod extends Generator {
     zImports = new Set();
     typeValidationCount = 0;
     constructor() {
-        super(900, DecoFileType.zod, DecoFileExtension.ts, DecoTargetType.backend, Collector.instance());
+        super({
+            fileType: DecoFileType.zod,
+            ext: DecoFileExtension.ts,
+            packageType: DecoPackageType.backend,
+        });
     }
-    async runHeader(current, all, env, result) {
-        const header = current.decorator.extractAnnotations();
+    async runHeader(item, env) {
+        void env;
+        const header = item.decorator.extractAnnotations();
         if (header.properties.length === 0)
             return null;
-        const names = current.names;
+        const names = item.names;
         this.startZ();
-        result.addCode(...this.buildComment(names), ...this.buildShape(header.properties, names), ...this.buildTypeValidation(names), ...this.buildSchema(names));
-        result.addImport(...this.endZ(), {
-            path: this.importCommon(DecoFileType.doc),
-            isType: true,
-            props: [names.doc],
-        });
-        return header.name;
+        const code = [
+            ...this.buildComment(names),
+            ...this.buildShape(header.properties, item),
+            ...this.buildTypeValidation(names),
+            ...this.buildSchema(names),
+        ];
+        return { name: header.name, code };
     }
     startZ() {
         this.zImports = new Set();
@@ -54,11 +58,11 @@ export class GeneratorZod extends Generator {
     zAlias(name) {
         return `z${upperFirstLetter(name)}`;
     }
-    buildShape(properties, names) {
+    buildShape(properties, item) {
         const code = [];
-        code.push(`export const ${names.shape} = {`);
+        code.push(`export const ${item.names.shape} = {`);
         for (const prop of properties) {
-            let line = this.buildProperty(prop);
+            let line = this.buildProperty(prop, item);
             if (prop.common.optional)
                 line += ".optional()";
             code.push(`  ${prop.propertyKey}: ${line},`);
@@ -68,7 +72,7 @@ export class GeneratorZod extends Generator {
     }
     buildTypeValidation(names) {
         return [
-            `export const __validation${names.basenameUpper}: Record<keyof ${this.i(names.doc)}, unknown> = ${this.i(names.shape)};`,
+            `export const __validation${names.basenameUpper}: Record<keyof ${names.doc}, unknown> = ${names.shape};`,
         ];
     }
     buildComment(names) {
@@ -81,14 +85,14 @@ export class GeneratorZod extends Generator {
             `export const ${names.schema} = ${this.z("object", `(${names.shape})`)};`,
         ];
     }
-    buildProperty(prop) {
+    buildProperty(prop, item) {
         return (this.buildNumber(prop) ??
             this.buildKey(prop) ??
             this.buildCreateTime(prop) ??
             this.buildUpdateTime(prop) ??
             this.buildString(prop) ??
-            this.buildArray(prop) ??
-            this.buildObject(prop) ??
+            this.buildArray(prop, item) ??
+            this.buildObject(prop, item) ??
             this.buildDate(prop) ??
             this.buildEnum(prop) ??
             this.buildBoolean(prop));
@@ -137,7 +141,7 @@ export class GeneratorZod extends Generator {
             line += `.regex(${prop.regex})`;
         return line;
     }
-    buildArray(_prop) {
+    buildArray(_prop, item) {
         const prop = castDecoArray(_prop.data);
         if (!prop)
             return null;
@@ -145,16 +149,16 @@ export class GeneratorZod extends Generator {
             ? _prop.propertyType.substring(0, _prop.propertyType.length - "[]".length)
             : _prop.propertyType;
         propertyType =
-            this.collector.findFirst(propertyType)?.data.names.schema ??
+            item.allNames.find((names) => names.basename === propertyType)?.schema ??
                 `${propertyType}()`;
         return `${this.z("array", `(${propertyType})`)}`;
     }
-    buildObject(_prop) {
+    buildObject(_prop, item) {
         const prop = castDecoObject(_prop.data);
         if (!prop)
             return null;
-        return (this.collector.findFirst(_prop.propertyType)?.data.names.schema ??
-            _prop.propertyType);
+        return (item.allNames.find((names) => names.basename === _prop.propertyType)
+            ?.schema ?? _prop.propertyType);
     }
     buildDate(_prop) {
         const prop = castDecoDate(_prop.data);

package/dist/generator/GeneratorZod.js.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratorZod.js","sourceRoot":"","sources":["../../src/generator/GeneratorZod.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GeneratorZod.js","sourceRoot":"","sources":["../../src/generator/GeneratorZod.ts"],"names":[],"mappings":"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"}