@mxpicture/gcp-functions-generator 0.2.69 → 0.2.71

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

@@ -1 +1 @@
-{"version":3,"file":"GeneratorAnnotations.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorAnnotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,YAAY,EACZ,cAAc,EACf,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAW1D,qBAAa,oBAAqB,SAAQ,SAAS;;cAUxB,SAAS,CAChC,UAAU,EAAE,YAAY,EACxB,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;CA8GjC;;AAED,wBAA0C"}
+{"version":3,"file":"GeneratorAnnotations.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorAnnotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAgB5E,qBAAa,oBAAqB,SAAQ,SAAS;;cAUxB,SAAS,CAChC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;CAgHjC;;AAED,wBAA0C"}

package/dist/generator/GeneratorAnnotations.js

@@ -1,17 +1,18 @@
-import { MetaFileType, MetaFileExtension, MetaTargetType, mapAnnotationsHeader, } from "@mxpicture/gcp-functions-common/meta";
 import { Generator } from "./Generator.js";
 import { Collector } from "../common/Collector.js";
 import { formatJsonStringify } from "@mxpicture/build-api/code";
+import { DecoFileExtension, DecoFileType, DecoTargetType, } from "@mxpicture/gcp-functions-common/decorator";
 const typeRegex = /\"type\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
-const itemTypeRegex = /\"itemType\": \"(MetaPropertyType\.|)([a-zA-Z][a-zA-Z0-9]*)\"/;
+const itemTypeRegex = /\"itemType\": \"(DecoPropertyType\.|)([a-zA-Z][a-zA-Z0-9]*)\"/;
 const propertyRefRegex = /\"propertyRef\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
 const subHeaderNameRegex = /\"subHeaderName\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
 const dateFormatRegex = /\"dateFormat\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
 export class GeneratorAnnotations extends Generator {
     constructor() {
-        super(MetaFileType.annotations, MetaFileExtension.ts, MetaTargetType.common, Collector.instance());
+        super(DecoFileType.annotations, DecoFileExtension.ts, DecoTargetType.common, Collector.instance());
     }
-    async runHeader(mainHeader, names, allParams) {
+    async runHeader(current) {
+        const names = current.names;
         const res = {
             code: [],
             imports: [
@@ -26,16 +27,16 @@ export class GeneratorAnnotations extends Generator {
                     isType: false,
                 },
                 {
-                    path: this.importCommon(MetaFileType.doc),
+                    path: this.importCommon(DecoFileType.doc),
                     props: [names.doc],
                     isType: true,
                 },
             ],
-            name: mainHeader.templateName,
+            name: current.decorator.name,
         };
-        const importMetaProps = new Set();
-        const importMetaTypeProps = new Set();
-        const header = mapAnnotationsHeader(mainHeader, allParams);
+        const importDecoProps = new Set();
+        const importDecoTypeProps = new Set();
+        const header = current.decorator.extractAnnotations();
         const json = await formatJsonStringify(JSON.stringify(header));
         const lines = json.split("\n");
         res.code.push("", `export const ${names.initialFunc} = (): Partial<${names.doc}> => annoDocInitial(${names.annotations}.properties);`, "");
@@ -46,29 +47,29 @@ export class GeneratorAnnotations extends Generator {
             let match = null;
             match = line.match(typeRegex);
             while (match && match.length > 1) {
-                importMetaProps.add("MetaPropertyType");
-                line = line.replace(typeRegex, `type: MetaPropertyType.${match[1]}`);
+                importDecoProps.add("DecoPropertyType");
+                line = line.replace(typeRegex, `type: DecoPropertyType.${match[1]}`);
                 match = line.match(typeRegex);
             }
             // itemType
             match = line.match(itemTypeRegex);
             while (match && match.length > 2) {
-                importMetaProps.add("MetaPropertyType");
-                line = line.replace(itemTypeRegex, `itemType: MetaPropertyType.${match[2]}`);
+                importDecoProps.add("DecoPropertyType");
+                line = line.replace(itemTypeRegex, `itemType: DecoPropertyType.${match[2]}`);
                 match = line.match(itemTypeRegex);
             }
             // propertyRef
             match = line.match(propertyRefRegex);
             while (match && match.length > 1) {
-                importMetaTypeProps.add("MetaPropertyDataWoType");
-                line = line.replace(propertyRefRegex, `propertyRef: "${match[1]}" as keyof MetaPropertyDataWoType`);
+                importDecoTypeProps.add("DecoPropertyDataWoType");
+                line = line.replace(propertyRefRegex, `propertyRef: "${match[1]}" as keyof DecoPropertyDataWoType`);
                 match = line.match(propertyRefRegex);
             }
             // dateFormat
             match = line.match(dateFormatRegex);
             while (match && match.length > 1) {
-                importMetaProps.add("MetaDateFormat");
-                line = line.replace(dateFormatRegex, `dateFormat: MetaDateFormat.${match[1]}`);
+                importDecoProps.add("DecoDateFormat");
+                line = line.replace(dateFormatRegex, `dateFormat: DecoDateFormat.${match[1]}`);
                 match = line.match(dateFormatRegex);
             }
             // subHeader(Name)
@@ -80,16 +81,16 @@ export class GeneratorAnnotations extends Generator {
             res.code.push(line);
         }
         res.code.push(";");
-        if (importMetaTypeProps.size > 0)
+        if (importDecoTypeProps.size > 0)
             res.imports.push({
-                path: "@mxpicture/gcp-functions-common/meta",
-                props: [...importMetaTypeProps],
+                path: "@mxpicture/gcp-functions-common/decorator",
+                props: [...importDecoTypeProps],
                 isType: true,
             });
-        if (importMetaProps.size > 0)
+        if (importDecoProps.size > 0)
             res.imports.push({
-                path: "@mxpicture/gcp-functions-common/meta",
-                props: [...importMetaProps],
+                path: "@mxpicture/gcp-functions-common/decorator",
+                props: [...importDecoProps],
                 isType: false,
             });
         return res;

package/dist/generator/GeneratorAnnotations.js.map

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

package/dist/generator/GeneratorBackend.d.ts

@@ -1,14 +1,14 @@
-import type { MetaNames } from "@mxpicture/gcp-functions-common/types";
-import { MetaHeadData, MetaRoutes, MetaRunHeaders } from "@mxpicture/gcp-functions-common/meta";
-import { Generator, GeneratorCode } from "./Generator.js";
+import { DecoNames } from "@mxpicture/gcp-functions-common/decorator";
+import { Generator, GeneratorCode, GeneratorRunItem, GeneratorRunItems } from "./Generator.js";
 import { GeneratorEnv } from "../common/types.common.js";
+import { DecoRoutes } from "@mxpicture/gcp-functions-common/types";
 export declare class GeneratorBackend extends Generator {
     constructor();
-    protected runHeader(header: MetaHeadData, names: MetaNames, allParams: MetaRunHeaders, env: GeneratorEnv): Promise<GeneratorCode | null>;
-    protected buildApi(routes: MetaRoutes, names: MetaNames): string[];
-    protected buildFunction(names: MetaNames, datePaths: string[]): string[];
-    protected buildStore(names: MetaNames, namespace: string): string[];
-    protected buildCreate(names: MetaNames, region: string, serviceAccount: string): string[];
+    protected runHeader(current: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv): Promise<GeneratorCode | null>;
+    protected buildApi(routes: DecoRoutes, names: DecoNames): string[];
+    protected buildFunction(names: DecoNames, datePaths: string[]): string[];
+    protected buildStore(names: DecoNames, namespace: string): string[];
+    protected buildCreate(names: DecoNames, region: string, serviceAccount: string): string[];
 }
 declare const _default: GeneratorBackend;
 export default _default;

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

@@ -1 +1 @@
-{"version":3,"file":"GeneratorBackend.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorBackend.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAOL,YAAY,EAEZ,UAAU,EACV,cAAc,EAEf,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI1D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,qBAAa,gBAAiB,SAAQ,SAAS;;cAWpB,SAAS,CAChC,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,cAAc,EACzB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAwFhC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IA6BlE,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAexE,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;IAQnE,SAAS,CAAC,WAAW,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GACrB,MAAM,EAAE;CAiBZ;;AAED,wBAAsC"}
+{"version":3,"file":"GeneratorBackend.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorBackend.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,SAAS,EACV,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,SAAS,EACT,aAAa,EACb,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAGnE,qBAAa,gBAAiB,SAAQ,SAAS;;cAUpB,SAAS,CAChC,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,iBAAiB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAwFhC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IA6BlE,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IAexE,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;IAQnE,SAAS,CAAC,WAAW,CACnB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GACrB,MAAM,EAAE;CAiBZ;;AAED,wBAAsC"}

package/dist/generator/GeneratorBackend.js

@@ -1,21 +1,24 @@
-import { extractAnnotationsPaths, hasCrudRoute, isCrudRoute, mapAnnotationsHeader, MetaFileExtension, MetaFileType, MetaPropertyType, MetaTargetType, } from "@mxpicture/gcp-functions-common/meta";
-import { Generator } from "./Generator.js";
+import { hasCrudRoute, isCrudRoute, DecoFileExtension, DecoFileType, DecoPropertyType, DecoTargetType, } from "@mxpicture/gcp-functions-common/decorator";
+import { Generator, } from "./Generator.js";
 import { Collector } from "../common/Collector.js";
+import { extractAnnotationsPaths } from "@mxpicture/gcp-functions-common/annotation";
 export class GeneratorBackend extends Generator {
     constructor() {
-        super(MetaFileType.backend, MetaFileExtension.ts, MetaTargetType.backend, Collector.instance(), true);
+        super(DecoFileType.backend, DecoFileExtension.ts, DecoTargetType.backend, Collector.instance());
     }
-    async runHeader(header, names, allParams, env) {
-        if (Object.keys(header.routes).length === 0)
+    async runHeader(current, all, env) {
+        const raw = current.decorator.extractRaw();
+        if (!raw.routes || Object.keys(raw.routes).length === 0)
             return null;
-        const namespace = header.namespace ?? "default";
-        const annoHeader = mapAnnotationsHeader(header, allParams);
-        const datePaths = extractAnnotationsPaths(annoHeader.properties, MetaPropertyType.date, MetaPropertyType.createTime, MetaPropertyType.updateTime);
+        const namespace = raw.namespace ?? "default";
+        const names = current.names;
+        const header = current.decorator.extractAnnotations();
+        const datePaths = extractAnnotationsPaths(header.properties, DecoPropertyType.date);
         return {
             code: [
                 ...this.buildFunction(names, datePaths),
                 "",
-                ...this.buildApi(header.routes, names),
+                ...this.buildApi(raw.routes, names),
                 "",
                 ...this.buildStore(names, namespace),
                 "",
@@ -58,12 +61,12 @@ export class GeneratorBackend extends Generator {
                     isType: true,
                 },
                 {
-                    path: this.importCommon(MetaFileType.routes),
+                    path: this.importCommon(DecoFileType.routes),
                     props: [names.routes],
                     isType: true,
                 },
                 {
-                    path: this.importCommon(MetaFileType.doc),
+                    path: this.importCommon(DecoFileType.doc),
                     props: [names.doc],
                     isType: true,
                 },
@@ -73,17 +76,17 @@ export class GeneratorBackend extends Generator {
                     isType: false,
                 },
                 {
-                    path: this.importCommon(MetaFileType.routes),
-                    props: [`${names.routes}Name`],
+                    path: this.importCommon(DecoFileType.routes),
+                    props: [names.routesName],
                     isType: false,
                 },
                 {
-                    path: this.importBackend(MetaFileType.zod),
+                    path: this.importBackend(DecoFileType.zod),
                     props: [names.shape],
                     isType: false,
                 },
             ],
-            name: header.templateName,
+            name: raw.name,
         };
     }
     buildApi(routes, names) {
@@ -97,10 +100,10 @@ export class GeneratorBackend extends Generator {
                 continue; // ignore crud --> provided by super class
             let definition = routeName;
             if (params.requestType !== "never" && params.requestType !== "void")
-                definition += `(request: ${params.requestType})`;
+                definition += `(request: ${names.routes}["${routeName}"]["request"])`;
             else
                 definition += `()`;
-            definition += `: Promise<${params.responseType}>`;
+            definition += `: Promise<${names.routes}["${routeName}"]["response"]>`;
             code.push(`  public abstract ${definition};`);
         }
         code.push("}");
@@ -113,7 +116,7 @@ export class GeneratorBackend extends Generator {
             "];",
             "",
             `export class ${names.func} extends IBackendFunction<${names.doc}, I${names.api}> {`,
-            `  public constructor(region: string, serviceAccount: string, api?: I${names.api}) { super("${names.functionName}", region, serviceAccount, ${names.basenameLower}DatePaths); this.useRoutes(${names.routes}Name); if (api) this.useApi(api); }`,
+            `  public constructor(region: string, serviceAccount: string, api?: I${names.api}) { super("${names.functionName}", region, serviceAccount, ${names.basenameLower}DatePaths); this.useRoutes(${names.routesName}); if (api) this.useApi(api); }`,
             "",
             "  // defined to be able to debug ingress",
             "  public override async ingress<REQ, RES extends DocumentData>(request: FunctionRequest<REQ>): Promise<FunctionResponse<RES>> { return super.ingress(request); }",

package/dist/generator/GeneratorBackend.js.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratorBackend.js","sourceRoot":"","sources":["../../src/generator/GeneratorBackend.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GeneratorBackend.js","sourceRoot":"","sources":["../../src/generator/GeneratorBackend.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,EAChB,cAAc,GAEf,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,SAAS,GAIV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAKnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,4CAA4C,CAAC;AAErF,MAAM,OAAO,gBAAiB,SAAQ,SAAS;IAC7C;QACE,KAAK,CACH,YAAY,CAAC,OAAO,EACpB,iBAAiB,CAAC,EAAE,EACpB,cAAc,CAAC,OAAO,EACtB,SAAS,CAAC,QAAQ,EAAE,CACrB,CAAC;IACJ,CAAC;IAEkB,KAAK,CAAC,SAAS,CAChC,OAAyB,EACzB,GAAsB,EACtB,GAAiB;QAEjB,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;QAC3C,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACrE,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,SAAS,CAAC;QAC7C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAE5B,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,kBAAkB,EAAE,CAAC;QACtD,MAAM,SAAS,GAAG,uBAAuB,CACvC,MAAM,CAAC,UAAU,EACjB,gBAAgB,CAAC,IAAI,CACtB,CAAC;QAEF,OAAO;YACL,IAAI,EAAE;gBACJ,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,CAAC;gBACvC,EAAE;gBACF,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC;gBACnC,EAAE;gBACF,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,CAAC;gBACpC,EAAE;gBACF,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,cAAc,CAAC;aAC3D;YACD,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,uCAAuC;oBAC7C,KAAK,EAAE;wBACL,eAAe;wBACf,iBAAiB;wBACjB,kBAAkB;wBAClB,cAAc;qBACf;oBACD,MAAM,EAAE,IAAI;iBACb;gBACD;oBACE,IAAI,EAAE,wCAAwC;oBAC9C,KAAK,EAAE,CAAC,OAAO,CAAC;oBAChB,MAAM,EAAE,KAAK;iBACd;gBACD;oBACE,IAAI,EAAE,6CAA6C;oBACnD,KAAK,EAAE,CAAC,YAAY,CAAC;oBACrB,MAAM,EAAE,KAAK;iBACd;gBACD;oBACE,IAAI,EAAE,sCAAsC;oBAC5C,KAAK,EAAE,CAAC,YAAY,CAAC;oBACrB,MAAM,EAAE,KAAK;iBACd;gBACD;oBACE,IAAI,EAAE,0BAA0B;oBAChC,KAAK,EAAE,CAAC,wBAAwB,CAAC;oBACjC,MAAM,EAAE,IAAI;iBACb;gBACD;oBACE,IAAI,EAAE,6BAA6B;oBACnC,KAAK,EAAE,CAAC,kBAAkB,CAAC;oBAC3B,MAAM,EAAE,IAAI;iBACb;gBACD;oBACE,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC;oBAC5C,KAAK,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC;oBACrB,MAAM,EAAE,IAAI;iBACb;gBACD;oBACE,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC;oBACzC,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;oBAClB,MAAM,EAAE,IAAI;iBACb;gBACD;oBACE,IAAI,EAAE,2CAA2C;oBACjD,KAAK,EAAE,CAAC,kBAAkB,CAAC;oBAC3B,MAAM,EAAE,KAAK;iBACd;gBACD;oBACE,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,CAAC;oBAC5C,KAAK,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC;oBACzB,MAAM,EAAE,KAAK;iBACd;gBACD;oBACE,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,GAAG,CAAC;oBAC1C,KAAK,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC;oBACpB,MAAM,EAAE,KAAK;iBACd;aACF;YACD,IAAI,EAAE,GAAG,CAAC,IAAI;SACf,CAAC;IACJ,CAAC;IAES,QAAQ,CAAC,MAAkB,EAAE,KAAgB;QACrD,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,MAAM,cAAc,GAAG,YAAY,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACtD,CAAC,CAAC,YAAY;YACd,CAAC,CAAC,aAAa,CAAC;QAElB,IAAI,CAAC,IAAI,CACP,0BAA0B,KAAK,CAAC,GAAG,YAAY,cAAc,IAAI,KAAK,CAAC,GAAG,KAAK,KAAK,CAAC,KAAK,gBAAgB,KAAK,CAAC,GAAG,IAAI,EACvH,4BAA4B,KAAK,CAAC,MAAM,GAAG,EAC3C,GAAG,EACH,mCAAmC,KAAK,CAAC,aAAa,OAAO,EAC7D,EAAE,CACH,CAAC;QAEF,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACzD,IAAI,WAAW,CAAC,SAAS,CAAC;gBAAE,SAAS,CAAC,0CAA0C;YAEhF,IAAI,UAAU,GAAG,SAAS,CAAC;YAC3B,IAAI,MAAM,CAAC,WAAW,KAAK,OAAO,IAAI,MAAM,CAAC,WAAW,KAAK,MAAM;gBACjE,UAAU,IAAI,aAAa,KAAK,CAAC,MAAM,KAAK,SAAS,gBAAgB,CAAC;;gBACnE,UAAU,IAAI,IAAI,CAAC;YACxB,UAAU,IAAI,aAAa,KAAK,CAAC,MAAM,KAAK,SAAS,iBAAiB,CAAC;YAEvE,IAAI,CAAC,IAAI,CAAC,qBAAqB,UAAU,GAAG,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAES,aAAa,CAAC,KAAgB,EAAE,SAAmB;QAC3D,OAAO;YACL,SAAS,KAAK,CAAC,aAAa,yBAAyB;YACrD,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,QAAQ,IAAI,CAAC;YAChD,IAAI;YACJ,EAAE;YACF,gBAAgB,KAAK,CAAC,IAAI,6BAA6B,KAAK,CAAC,GAAG,MAAM,KAAK,CAAC,GAAG,KAAK;YACpF,uEAAuE,KAAK,CAAC,GAAG,cAAc,KAAK,CAAC,YAAY,8BAA8B,KAAK,CAAC,aAAa,8BAA8B,KAAK,CAAC,UAAU,iCAAiC;YAChP,EAAE;YACF,0CAA0C;YAC1C,kKAAkK;YAClK,GAAG;SACJ,CAAC;IACJ,CAAC;IAES,UAAU,CAAC,KAAgB,EAAE,SAAiB;QACtD,OAAO;YACL,gBAAgB,KAAK,CAAC,KAAK,kBAAkB,KAAK,CAAC,GAAG,KAAK;YAC3D,2DAA2D,KAAK,CAAC,GAAG,eAAe,KAAK,CAAC,aAAa,OAAO,SAAS,kBAAkB;YACxI,GAAG;SACJ,CAAC;IACJ,CAAC;IAES,WAAW,CACnB,KAAgB,EAChB,MAAc,EACd,cAAsB;QAEtB,OAAO;YACL,sBAAsB,KAAK,CAAC,QAAQ,qBAAqB,KAAK,CAAC,GAAG,+FAA+F;YACjK,uBAAuB,KAAK,CAAC,KAAK,KAAK;YACvC,EAAE;YACF,gCAAgC,KAAK,CAAC,GAAG,MAAM,KAAK,CAAC,aAAa,KAAK;YACvE,kBAAkB,KAAK,CAAC,KAAK,IAAI;YACjC,EAAE;YACF,sBAAsB,KAAK,CAAC,IAAI,KAAK,MAAM,OAAO,cAAc,UAAU;YAC1E,EAAE;YACF,wBAAwB;YACxB,2BAA2B;YAC3B,EAAE;YACF,gCAAgC;YAChC,IAAI;SACL,CAAC;IACJ,CAAC;CACF;AAED,eAAe,IAAI,gBAAgB,EAAE,CAAC"}

package/dist/generator/GeneratorDoc.d.ts

@@ -1,9 +1,7 @@
-import { MetaHeadData } from "@mxpicture/gcp-functions-common/meta";
-import { MetaNames } from "@mxpicture/gcp-functions-common/types";
-import { Generator, GeneratorCode } from "./Generator.js";
+import { Generator, GeneratorCode, GeneratorRunItem } from "./Generator.js";
 export declare class GeneratorDoc extends Generator {
     constructor();
-    protected runHeader(mainData: MetaHeadData, names: MetaNames): Promise<GeneratorCode | null>;
+    protected runHeader(current: GeneratorRunItem): Promise<GeneratorCode | null>;
 }
 declare const _default: GeneratorDoc;
 export default _default;

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

@@ -1 +1 @@
-{"version":3,"file":"GeneratorDoc.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorDoc.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EAEb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI1D,qBAAa,YAAa,SAAQ,SAAS;;cAUhB,SAAS,CAChC,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;CAmBjC;;AAED,wBAAkC"}
+{"version":3,"file":"GeneratorDoc.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorDoc.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAmB5E,qBAAa,YAAa,SAAQ,SAAS;;cAUhB,SAAS,CAChC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;CAoBjC;;AAED,wBAAkC"}

package/dist/generator/GeneratorDoc.js

@@ -1,20 +1,36 @@
-import { MetaFileExtension, MetaFileType, MetaTargetType, } from "@mxpicture/gcp-functions-common/meta";
+import { DecoFileExtension, DecoFileType, DecoPropertyType, DecoTargetType, } from "@mxpicture/gcp-functions-common/decorator";
 import { Generator } from "./Generator.js";
 import { Collector } from "../common/Collector.js";
-import { metaBasename, isMetaNameType } from "../meta/meta.names.js";
+const decoTypeToTs = (data) => {
+    switch (data.type) {
+        case DecoPropertyType.date:
+            return "Date";
+        case DecoPropertyType.object: {
+            const deco = data["deco"];
+            if (typeof deco === "object" && deco !== null && "name" in deco)
+                return `${deco.name}Doc`;
+            return "object";
+        }
+        default:
+            return data.type;
+    }
+};
 export class GeneratorDoc extends Generator {
     constructor() {
-        super(MetaFileType.doc, MetaFileExtension.ts, MetaTargetType.common, Collector.instance());
+        super(DecoFileType.doc, DecoFileExtension.ts, DecoTargetType.common, Collector.instance());
     }
-    async runHeader(mainData, names) {
+    async runHeader(current) {
         const res = {
             code: [],
             imports: [],
-            name: mainData.templateName,
+            name: current.decorator.name,
         };
-        res.code.push(`export interface ${names.doc} {`);
-        for (const prop of mainData.properties)
-            res.code.push(`  ${prop.propertyKey}${prop.optional ? "?" : ""}: `, `${metaBasename(prop.propertyType)}${isMetaNameType(prop.propertyType, MetaFileType.template) ? "Doc" : ""};`);
+        const raw = current.decorator.extractRaw();
+        res.code.push(`export interface ${current.names.doc} {`);
+        for (const [key, prop] of Object.entries(raw.properties ?? {})) {
+            const extr = prop.extractRaw();
+            res.code.push(`  ${key}${extr.common.optional ? "?" : ""}: ${decoTypeToTs(extr.data)}`);
+        }
         res.code.push("}");
         return res;
     }

package/dist/generator/GeneratorDoc.js.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratorDoc.js","sourceRoot":"","sources":["../../src/generator/GeneratorDoc.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,YAAY,EAEZ,cAAc,GACf,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAiB,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAErE,MAAM,OAAO,YAAa,SAAQ,SAAS;IACzC;QACE,KAAK,CACH,YAAY,CAAC,GAAG,EAChB,iBAAiB,CAAC,EAAE,EACpB,cAAc,CAAC,MAAM,EACrB,SAAS,CAAC,QAAQ,EAAE,CACrB,CAAC;IACJ,CAAC;IAEkB,KAAK,CAAC,SAAS,CAChC,QAAsB,EACtB,KAAgB;QAEhB,MAAM,GAAG,GAAkB;YACzB,IAAI,EAAE,EAAE;YACR,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,QAAQ,CAAC,YAAY;SAC5B,CAAC;QAEF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QACjD,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,UAAU;YACpC,GAAG,CAAC,IAAI,CAAC,IAAI,CACX,KAAK,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EACpD,GAAG,YAAY,CAAC,IAAI,CAAC,YAAY,CAAC,GAChC,cAAc,CAAC,IAAI,CAAC,YAAY,EAAE,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EACrE,GAAG,CACJ,CAAC;QAEJ,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAED,eAAe,IAAI,YAAY,EAAE,CAAC"}
+{"version":3,"file":"GeneratorDoc.js","sourceRoot":"","sources":["../../src/generator/GeneratorDoc.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,EAChB,cAAc,GACf,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,SAAS,EAAmC,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAGnD,MAAM,YAAY,GAAG,CAAC,IAAsB,EAAU,EAAE;IACtD,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,gBAAgB,CAAC,IAAI;YACxB,OAAO,MAAM,CAAC;QAChB,KAAK,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC;YAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1B,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,MAAM,IAAI,IAAI;gBAC7D,OAAO,GAAI,IAAyB,CAAC,IAAI,KAAK,CAAC;YACjD,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD;YACE,OAAO,IAAI,CAAC,IAAI,CAAC;IACrB,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,OAAO,YAAa,SAAQ,SAAS;IACzC;QACE,KAAK,CACH,YAAY,CAAC,GAAG,EAChB,iBAAiB,CAAC,EAAE,EACpB,cAAc,CAAC,MAAM,EACrB,SAAS,CAAC,QAAQ,EAAE,CACrB,CAAC;IACJ,CAAC;IAEkB,KAAK,CAAC,SAAS,CAChC,OAAyB;QAEzB,MAAM,GAAG,GAAkB;YACzB,IAAI,EAAE,EAAE;YACR,OAAO,EAAE,EAAE;YACX,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,IAAI;SAC7B,CAAC;QAEF,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;QAE3C,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,oBAAoB,OAAO,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;QACzD,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,CAAC;YAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YAC/B,GAAG,CAAC,IAAI,CAAC,IAAI,CACX,KAAK,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACzE,CAAC;QACJ,CAAC;QAED,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,GAAG,CAAC;IACb,CAAC;CACF;AAED,eAAe,IAAI,YAAY,EAAE,CAAC"}

package/dist/generator/GeneratorFrontend.d.ts

@@ -1,12 +1,12 @@
-import { MetaHeadData, MetaRoutes, MetaRunHeaders } from "@mxpicture/gcp-functions-common/meta";
-import { MetaNames } from "@mxpicture/gcp-functions-common/types";
-import { Generator, GeneratorCode } from "./Generator.js";
+import { Generator, GeneratorCode, GeneratorRunItem } from "./Generator.js";
+import { DecoNames } from "@mxpicture/gcp-functions-common/decorator";
+import { DecoRoutes } from "@mxpicture/gcp-functions-common/types";
 export declare class GeneratorFrontend extends Generator {
     constructor();
-    protected runHeader(header: MetaHeadData, names: MetaNames, allParams: MetaRunHeaders): Promise<GeneratorCode | null>;
-    protected buildApi(routes: MetaRoutes, names: MetaNames): string[];
-    protected buildFunction(names: MetaNames, datePaths: string[]): string[];
-    protected buildCreate(names: MetaNames): string[];
+    protected runHeader(current: GeneratorRunItem): Promise<GeneratorCode | null>;
+    protected buildApi(routes: DecoRoutes, names: DecoNames): string[];
+    protected buildFunction(names: DecoNames, datePaths: string[]): string[];
+    protected buildCreate(names: DecoNames): string[];
 }
 declare const _default: GeneratorFrontend;
 export default _default;

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,EAOL,YAAY,EAEZ,UAAU,EACV,cAAc,EAEf,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG1D,qBAAa,iBAAkB,SAAQ,SAAS;;cAWrB,SAAS,CAChC,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IA4DhC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IAqClE,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,aAAa,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAE5E,OAAO,EAGL,SAAS,EAKV,MAAM,2CAA2C,CAAC;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAEnE,qBAAa,iBAAkB,SAAQ,SAAS;;cAUrB,SAAS,CAChC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IA4DhC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IAqClE,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,20 +1,23 @@
-import { extractAnnotationsPaths, hasCrudRoute, isCrudRoute, mapAnnotationsHeader, MetaFileExtension, MetaFileType, MetaPropertyType, MetaTargetType, } from "@mxpicture/gcp-functions-common/meta";
 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 { extractAnnotationsPaths } from "@mxpicture/gcp-functions-common/annotation";
 export class GeneratorFrontend extends Generator {
     constructor() {
-        super(MetaFileType.frontend, MetaFileExtension.ts, MetaTargetType.frontend, Collector.instance(), true);
+        super(DecoFileType.frontend, DecoFileExtension.ts, DecoTargetType.frontend, Collector.instance());
     }
-    async runHeader(header, names, allParams) {
-        if (Object.keys(header.routes).length === 0)
+    async runHeader(current) {
+        const raw = current.decorator.extractRaw();
+        if (!raw.routes || Object.keys(raw.routes).length === 0)
             return null;
-        const annoHeader = mapAnnotationsHeader(header, allParams);
-        const datePaths = extractAnnotationsPaths(annoHeader.properties, MetaPropertyType.date, MetaPropertyType.createTime, MetaPropertyType.updateTime);
+        const names = current.names;
+        const header = current.decorator.extractAnnotations();
+        const datePaths = extractAnnotationsPaths(header.properties, DecoPropertyType.date);
         return {
             code: [
                 ...this.buildFunction(names, datePaths),
                 "",
-                ...this.buildApi(header.routes, names),
+                ...this.buildApi(raw.routes, names),
                 "",
                 ...this.buildCreate(names),
             ],
@@ -25,8 +28,8 @@ export class GeneratorFrontend extends Generator {
                     isType: false,
                 },
                 {
-                    path: this.importCommon(MetaFileType.routes),
-                    props: [`${names.routes}Name`],
+                    path: this.importCommon(DecoFileType.routes),
+                    props: [names.routesName],
                     isType: false,
                 },
                 {
@@ -45,17 +48,17 @@ export class GeneratorFrontend extends Generator {
                     isType: true,
                 },
                 {
-                    path: this.importCommon(MetaFileType.routes),
+                    path: this.importCommon(DecoFileType.routes),
                     props: [names.routes],
                     isType: true,
                 },
                 {
-                    path: this.importCommon(MetaFileType.doc),
+                    path: this.importCommon(DecoFileType.doc),
                     props: [names.doc],
                     isType: true,
                 },
             ],
-            name: header.templateName,
+            name: raw.name,
         };
     }
     buildApi(routes, names) {
@@ -69,11 +72,11 @@ export class GeneratorFrontend extends Generator {
                 continue; // ignore crud --> provided by super class
             let definition = routeName;
             if (params.requestType !== "never" && params.requestType !== "void")
-                definition += `(request: ${params.requestType})`;
+                definition += `(request: ${names.routes}["${routeName}"]["request"])`;
             else
                 definition += `()`;
-            definition += `: Promise<${params.responseType}>`;
-            code.push(` public async ${definition} {`, `   return (await this.func().outgress({ route: "${routeName}", data: request })).data as ${params.responseType};`, " }", "");
+            definition += `: Promise<${names.routes}["${routeName}"]["response"]>`;
+            code.push(` public async ${definition} {`, `   return (await this.func().outgress({ route: "${routeName}", data: request })).data as ${names.routes}["${routeName}"]["response"];`, " }", "");
         }
         code.push("}");
         return code;
@@ -85,7 +88,7 @@ export class GeneratorFrontend extends Generator {
             "];",
             "",
             `export class ${names.func} extends IFrontendFunction {`,
-            `  public constructor() { super("${names.functionName}", ${names.basenameLower}DatePaths); this.useRoutes(${names.routes}Name); }`,
+            `  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 DocumentData>(request: FunctionRequest<REQ>): Promise<FunctionResponse<RES>> { return super.outgress(request); }",

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,11 +1,10 @@
-import { MetaHeadData } from "@mxpicture/gcp-functions-common/meta";
-import { MetaNames } from "@mxpicture/gcp-functions-common/types";
-import { Generator, GeneratorCode } from "./Generator.js";
+import { Generator, GeneratorCode, GeneratorRunItem } from "./Generator.js";
+import { DecoNames, DecoratorData } from "@mxpicture/gcp-functions-common/decorator";
 export declare class GeneratorRoutes extends Generator {
     constructor();
-    protected runHeader(mainData: MetaHeadData, names: MetaNames): Promise<GeneratorCode | null>;
-    protected buildType(res: GeneratorCode, names: MetaNames, mainData: MetaHeadData): void;
-    protected buildEnum(res: GeneratorCode, names: MetaNames, mainData: MetaHeadData): void;
+    protected runHeader(current: GeneratorRunItem): Promise<GeneratorCode | null>;
+    protected buildType(res: GeneratorCode, names: DecoNames, mainData: DecoratorData): void;
+    protected buildEnum(res: GeneratorCode, names: DecoNames, mainData: DecoratorData): void;
 }
 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,EAGL,YAAY,EAEb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,uCAAuC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG1D,qBAAa,eAAgB,SAAQ,SAAS;;cAUnB,SAAS,CAChC,QAAQ,EAAE,YAAY,EACtB,KAAK,EAAE,SAAS,GACf,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAiChC,SAAS,CAAC,SAAS,CACjB,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,YAAY;IAUxB,SAAS,CAAC,SAAS,CACjB,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,YAAY;CAOzB;;AAED,wBAAqC"}
+{"version":3,"file":"GeneratorRoutes.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAE5E,OAAO,EAGL,SAAS,EACT,aAAa,EAEd,MAAM,2CAA2C,CAAC;AAEnD,qBAAa,eAAgB,SAAQ,SAAS;;cAWnB,SAAS,CAChC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAmChC,SAAS,CAAC,SAAS,CACjB,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,aAAa;IAYzB,SAAS,CAAC,SAAS,CACjB,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,aAAa;CAS1B;;AAED,wBAAqC"}

package/dist/generator/GeneratorRoutes.js

@@ -1,13 +1,15 @@
-import { MetaFileExtension, MetaFileType, MetaTargetType, } from "@mxpicture/gcp-functions-common/meta";
 import { Generator } from "./Generator.js";
 import { Collector } from "../common/Collector.js";
+import { DecoFileExtension, DecoFileType, DecoTargetType, } from "@mxpicture/gcp-functions-common/decorator";
 export class GeneratorRoutes extends Generator {
     constructor() {
-        super(MetaFileType.routes, MetaFileExtension.ts, MetaTargetType.common, Collector.instance());
+        super(DecoFileType.routes, DecoFileExtension.ts, DecoTargetType.common, Collector.instance(), true);
     }
-    async runHeader(mainData, names) {
-        if (Object.keys(mainData.routes).length === 0)
+    async runHeader(current) {
+        const raw = current.decorator.extractRaw();
+        if (!raw.routes || Object.keys(raw.routes).length === 0)
             return null;
+        const names = current.names;
         const res = {
             code: [],
             imports: [
@@ -24,26 +26,30 @@ export class GeneratorRoutes extends Generator {
                     ],
                 },
                 {
-                    path: this.importCommon(MetaFileType.doc),
+                    path: this.importCommon(DecoFileType.doc),
                     isType: true,
                     props: [names.doc],
                 },
             ],
-            name: mainData.templateName,
+            name: raw.name,
         };
-        this.buildType(res, names, mainData);
+        this.buildType(res, names, raw);
         res.code.push("");
-        this.buildEnum(res, names, mainData);
+        this.buildEnum(res, names, raw);
         return res;
     }
     buildType(res, names, mainData) {
+        if (!mainData.routes)
+            return;
         res.code.push(`export type ${names.routes} = WithRoutes<{`);
         for (const [routeName, params] of Object.entries(mainData.routes))
             res.code.push(`  ${routeName}: RouteDef<${params.requestType}, ${params.responseType}>;`);
         res.code.push("}>;");
     }
     buildEnum(res, names, mainData) {
-        res.code.push(`export enum ${names.routes}Name {`);
+        if (!mainData.routes)
+            return;
+        res.code.push(`export enum ${names.routesName} {`);
         for (const routeName of Object.keys(mainData.routes))
             res.code.push(`  ${routeName} = "${routeName}",`);
         res.code.push("}");

package/dist/generator/GeneratorRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"GeneratorRoutes.js","sourceRoot":"","sources":["../../src/generator/GeneratorRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,YAAY,EAEZ,cAAc,GACf,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAE,SAAS,EAAiB,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,OAAO,eAAgB,SAAQ,SAAS;IAC5C;QACE,KAAK,CACH,YAAY,CAAC,MAAM,EACnB,iBAAiB,CAAC,EAAE,EACpB,cAAc,CAAC,MAAM,EACrB,SAAS,CAAC,QAAQ,EAAE,CACrB,CAAC;IACJ,CAAC;IAEkB,KAAK,CAAC,SAAS,CAChC,QAAsB,EACtB,KAAgB;QAEhB,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QAE3D,MAAM,GAAG,GAAkB;YACzB,IAAI,EAAE,EAAE;YACR,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,uCAAuC;oBAC7C,MAAM,EAAE,IAAI;oBACZ,KAAK,EAAE;wBACL,WAAW;wBACX,aAAa;wBACb,UAAU;wBACV,SAAS;wBACT,YAAY;wBACZ,YAAY;qBACb;iBACF;gBACD;oBACE,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC;oBACzC,MAAM,EAAE,IAAI;oBACZ,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;iBACnB;aACF;YACD,IAAI,EAAE,QAAQ,CAAC,YAAY;SAC5B,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACrC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClB,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QACrC,OAAO,GAAG,CAAC;IACb,CAAC;IAES,SAAS,CACjB,GAAkB,EAClB,KAAgB,EAChB,QAAsB;QAEtB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,MAAM,iBAAiB,CAAC,CAAC;QAC5D,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC/D,GAAG,CAAC,IAAI,CAAC,IAAI,CACX,KAAK,SAAS,cAAc,MAAM,CAAC,WAAW,KAAK,MAAM,CAAC,YAAY,IAAI,CAC3E,CAAC;QACJ,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAES,SAAS,CACjB,GAAkB,EAClB,KAAgB,EAChB,QAAsB;QAEtB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,MAAM,QAAQ,CAAC,CAAC;QACnD,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAClD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,SAAS,OAAO,SAAS,IAAI,CAAC,CAAC;QACpD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;CACF;AAED,eAAe,IAAI,eAAe,EAAE,CAAC"}
+{"version":3,"file":"GeneratorRoutes.js","sourceRoot":"","sources":["../../src/generator/GeneratorRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAmC,MAAM,gBAAgB,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EACL,iBAAiB,EACjB,YAAY,EAGZ,cAAc,GACf,MAAM,2CAA2C,CAAC;AAEnD,MAAM,OAAO,eAAgB,SAAQ,SAAS;IAC5C;QACE,KAAK,CACH,YAAY,CAAC,MAAM,EACnB,iBAAiB,CAAC,EAAE,EACpB,cAAc,CAAC,MAAM,EACrB,SAAS,CAAC,QAAQ,EAAE,EACpB,IAAI,CACL,CAAC;IACJ,CAAC;IAEkB,KAAK,CAAC,SAAS,CAChC,OAAyB;QAEzB,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;QAC3C,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,OAAO,CAAC,KAAK,CAAC;QAE5B,MAAM,GAAG,GAAkB;YACzB,IAAI,EAAE,EAAE;YACR,OAAO,EAAE;gBACP;oBACE,IAAI,EAAE,uCAAuC;oBAC7C,MAAM,EAAE,IAAI;oBACZ,KAAK,EAAE;wBACL,WAAW;wBACX,aAAa;wBACb,UAAU;wBACV,SAAS;wBACT,YAAY;wBACZ,YAAY;qBACb;iBACF;gBACD;oBACE,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC;oBACzC,MAAM,EAAE,IAAI;oBACZ,KAAK,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC;iBACnB;aACF;YACD,IAAI,EAAE,GAAG,CAAC,IAAI;SACf,CAAC;QAEF,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QAChC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAClB,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QAChC,OAAO,GAAG,CAAC;IACb,CAAC;IAES,SAAS,CACjB,GAAkB,EAClB,KAAgB,EAChB,QAAuB;QAEvB,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,OAAO;QAE7B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,MAAM,iBAAiB,CAAC,CAAC;QAC5D,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC/D,GAAG,CAAC,IAAI,CAAC,IAAI,CACX,KAAK,SAAS,cAAc,MAAM,CAAC,WAAW,KAAK,MAAM,CAAC,YAAY,IAAI,CAC3E,CAAC;QACJ,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvB,CAAC;IAES,SAAS,CACjB,GAAkB,EAClB,KAAgB,EAChB,QAAuB;QAEvB,IAAI,CAAC,QAAQ,CAAC,MAAM;YAAE,OAAO;QAE7B,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,UAAU,IAAI,CAAC,CAAC;QACnD,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAClD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,SAAS,OAAO,SAAS,IAAI,CAAC,CAAC;QACpD,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;CACF;AAED,eAAe,IAAI,eAAe,EAAE,CAAC"}