@mxpicture/gcp-functions-generator 1.1.49 → 1.1.51

package/dist/4testing/templates/template.medication.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.medication.d.ts","sourceRoot":"","sources":["../../../src/4testing/templates/template.medication.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,UAAU,+DA6EnB,CAAC"}
+{"version":3,"file":"template.medication.d.ts","sourceRoot":"","sources":["../../../src/4testing/templates/template.medication.ts"],"names":[],"mappings":"AAaA,eAAO,MAAM,UAAU,+DAkFnB,CAAC"}

package/dist/4testing/templates/template.medication.js

@@ -12,6 +12,8 @@ export const medication = decorator("Medication")
         responseType: "{test:boolean}",
     },
 })
+    .register("reg_head_basename")
+    .register("reg_head_static", "static_head_value")
     .properties({
     id: decoString()
         .key()
@@ -53,7 +55,9 @@ export const medication = decorator("Medication")
         .sortable()
         .filterable()
         .default(0)
-        .sideEffects(),
+        .sideEffects()
+        .register("reg_prop_propertyKey")
+        .register("reg_prop_static", "static_prop_value"),
     orderMail: decoString()
         .title("Order Mail")
         .optional()

package/dist/4testing/templates/template.medication.js.map

@@ -1 +1 @@
-{"version":3,"file":"template.medication.js","sourceRoot":"","sources":["../../../src/4testing/templates/template.medication.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,QAAQ,EACR,cAAc,EACd,UAAU,EACV,UAAU,GACX,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,SAAS,GAAG,eAAe,CAC/B,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAC/B,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC,YAAY,CAAC;KAC9C,KAAK,CAAC,YAAY,CAAC;KACnB,SAAS,CAAC,QAAQ,CAAC;KACnB,IAAI,EAAE;KACN,UAAU,EAAE;KACZ,MAAM,CAAC;IACN,SAAS,EAAE;QACT,WAAW,EAAE,aAAa;QAC1B,YAAY,EAAE,gBAAgB;KAC/B;CACF,CAAC;KACD,UAAU,CAAC;IACV,EAAE,EAAE,UAAU,EAAE;SACb,GAAG,EAAE;SACL,KAAK,CAAC,YAAY,CAAC;SACnB,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACzB,UAAU,EAAE,QAAQ,EAAE;SACnB,QAAQ,EAAE;SACV,KAAK,CAAC,YAAY,CAAC;SACnB,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACzB,UAAU,EAAE,QAAQ,EAAE;SACnB,QAAQ,EAAE;SACV,KAAK,CAAC,WAAW,CAAC;SAClB,MAAM,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACzB,IAAI,EAAE,UAAU,EAAE;SACf,QAAQ,EAAE;SACV,KAAK,CAAC,MAAM,CAAC;SACb,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,UAAU,EAAE;SACZ,OAAO,CAAC,EAAE,CAAC;SACX,SAAS,CAAC,CAAC,CAAC;IACf,QAAQ,EAAE,UAAU,EAAE;SACnB,KAAK,CAAC,WAAW,CAAC;SAClB,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,EAAE;SACV,OAAO,CAAC,CAAC,CAAC;IACb,IAAI,EAAE,UAAU,EAAE;SACf,KAAK,CAAC,MAAM,CAAC;SACb,QAAQ,EAAE;SACV,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,UAAU,EAAE;SACZ,OAAO,CAAC,CAAC,CAAC;IACb,KAAK,EAAE,UAAU,EAAE;SAChB,KAAK,CAAC,OAAO,CAAC;SACd,GAAG,CAAC,CAAC,CAAC;SACN,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,UAAU,EAAE;SACZ,OAAO,CAAC,CAAC,CAAC;SACV,WAAW,EAAE;IAChB,SAAS,EAAE,UAAU,EAAE;SACpB,KAAK,CAAC,YAAY,CAAC;SACnB,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,OAAO,CAAC,EAAE,CAAC;IACd,gBAAgB,EAAE,QAAQ,EAAE;SACzB,KAAK,CAAC,gBAAgB,CAAC;SACvB,QAAQ,EAAE;IACb,iBAAiB,EAAE,UAAU,EAAE;SAC5B,KAAK,CAAC,qBAAqB,CAAC;SAC5B,QAAQ,EAAE;SACV,OAAO,EAAE;IACZ,QAAQ,EAAE,QAAQ,EAAE;SACjB,KAAK,CAAC,WAAW,CAAC;SAClB,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC;IACnC,YAAY,EAAE,UAAU,EAAE;SACvB,KAAK,CAAC,eAAe,CAAC;SACtB,GAAG,CAAC,CAAC,CAAC;SACN,OAAO,CAAC,CAAC,CAAC;SACV,QAAQ,EAAE;SACV,QAAQ,EAAE;SACV,QAAQ,CAAC,CAAC,CAAC;CACf,CAAC,CAAC"}
+{"version":3,"file":"template.medication.js","sourceRoot":"","sources":["../../../src/4testing/templates/template.medication.ts"],"names":[],"mappings":"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"}

package/dist/common/CodeCollector.d.ts

@@ -0,0 +1,11 @@
+import { DecoImport } from "@mxpicture/gcp-functions-common/types";
+export declare class CodeCollector {
+    protected _code: string[];
+    protected _imports: DecoImport[];
+    constructor();
+    get code(): string[];
+    get imports(): DecoImport[];
+    addCode(...lines: string[]): this;
+    addImport(...imps: DecoImport[]): this;
+}
+//# sourceMappingURL=CodeCollector.d.ts.map

package/dist/common/CodeCollector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CodeCollector.d.ts","sourceRoot":"","sources":["../../src/common/CodeCollector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AAEnE,qBAAa,aAAa;IACxB,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,CAAM;IAC/B,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAM;;IAItC,IAAW,IAAI,IAAI,MAAM,EAAE,CAE1B;IAED,IAAW,OAAO,IAAI,UAAU,EAAE,CAEjC;IAEM,OAAO,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI;IAKjC,SAAS,CAAC,GAAG,IAAI,EAAE,UAAU,EAAE,GAAG,IAAI;CAe9C"}

package/dist/common/CodeCollector.js

@@ -0,0 +1,29 @@
+export class CodeCollector {
+    _code = [];
+    _imports = [];
+    constructor() { }
+    get code() {
+        return structuredClone(this._code);
+    }
+    get imports() {
+        return structuredClone(this._imports);
+    }
+    addCode(...lines) {
+        this._code.push(...lines);
+        return this;
+    }
+    addImport(...imps) {
+        for (const imp of imps) {
+            let found = this._imports.find((i) => i.path === imp.path && i.isType === imp.isType);
+            if (!found) {
+                found = { path: imp.path, isType: imp.isType, props: [] };
+                this._imports.push(found);
+            }
+            for (const prop of imp.props)
+                if (!found.props.includes(prop))
+                    found.props.push(prop);
+        }
+        return this;
+    }
+}
+//# sourceMappingURL=CodeCollector.js.map

package/dist/common/CodeCollector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CodeCollector.js","sourceRoot":"","sources":["../../src/common/CodeCollector.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,aAAa;IACd,KAAK,GAAa,EAAE,CAAC;IACrB,QAAQ,GAAiB,EAAE,CAAC;IAEtC,gBAAsB,CAAC;IAEvB,IAAW,IAAI;QACb,OAAO,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,IAAW,OAAO;QAChB,OAAO,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC;IAEM,OAAO,CAAC,GAAG,KAAe;QAC/B,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,SAAS,CAAC,GAAG,IAAkB;QACpC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,IAAI,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAC5B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG,CAAC,MAAM,CACtD,CAAC;YACF,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,KAAK,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;gBAC1D,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC;YAED,KAAK,MAAM,IAAI,IAAI,GAAG,CAAC,KAAK;gBAC1B,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;oBAAE,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5D,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

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

@@ -1 +1 @@
-{"version":3,"file":"generator.common.d.ts","sourceRoot":"","sources":["../../src/common/generator.common.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAE3E,OAAO,EAAe,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGlE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,uCAAuC,CAAC;AAEjE,4DAA4D;AAC5D,eAAO,MAAM,gBAAgB,QAA+C,CAAC;AAE7E;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,cAAe,SAAQ,aAAa;IACnD,GAAG,EAAE,SAAS,CAAC;CAChB;AAKD;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,aAAa,EAAE,CAyBlE,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAC5B,UAAU,MAAM,KACf,OAAO,CAAC,aAAa,GAAG,IAAI,CAEzB,CAAC;AAEP;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,aAAa,KAClB,OAAO,CAAC,cAAc,GAAG,IAAI,CAY/B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,cAAc,EAAE,CAKjE,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,aAAa,GACxB,QAAQ,iBAAiB,EACzB,KAAK,YAAY,kBA4BlB,CAAC;AAUF;;;;;;;GAOG;AACH,eAAO,MAAM,OAAO,GAClB,MAAM,QAAQ,EACd,KAAK,SAAS,EACd,KAAK,YAAY,KAChB,OAAO,CAAC,mBAAmB,CAK7B,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,QAAQ,GACnB,OAAO,QAAQ,EAAE,EACjB,KAAK,SAAS,EACd,KAAK,YAAY,KAChB,OAAO,CAAC,mBAAmB,EAAE,CAC4B,CAAC"}
+{"version":3,"file":"generator.common.d.ts","sourceRoot":"","sources":["../../src/common/generator.common.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAE3E,OAAO,EAAe,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAGlE,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,uCAAuC,CAAC;AAEjE,4DAA4D;AAC5D,eAAO,MAAM,gBAAgB,QAA+C,CAAC;AAE7E;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,cAAe,SAAQ,aAAa;IACnD,GAAG,EAAE,SAAS,CAAC;CAChB;AAKD;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,aAAa,EAAE,CAyBlE,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,GAC5B,UAAU,MAAM,KACf,OAAO,CAAC,aAAa,GAAG,IAAI,CAEzB,CAAC;AAEP;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,aAAa,KAClB,OAAO,CAAC,cAAc,GAAG,IAAI,CAY/B,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,cAAc,EAAE,CAOjE,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,aAAa,GACxB,QAAQ,iBAAiB,EACzB,KAAK,YAAY,kBA4BlB,CAAC;AAUF;;;;;;;GAOG;AACH,eAAO,MAAM,OAAO,GAClB,MAAM,QAAQ,EACd,KAAK,SAAS,EACd,KAAK,YAAY,KAChB,OAAO,CAAC,mBAAmB,CAK7B,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,QAAQ,GACnB,OAAO,QAAQ,EAAE,EACjB,KAAK,SAAS,EACd,KAAK,YAAY,KAChB,OAAO,CAAC,mBAAmB,EAAE,CAC4B,CAAC"}

package/dist/common/generator.common.js

@@ -69,7 +69,9 @@ export const createGenerators = async () => {
     const files = await readGeneratorFiles();
     const promises = files.map(createGenerator);
     const entries = await Promise.all(promises);
-    return entries.filter((entry) => !!entry);
+    const filtered = entries.filter((entry) => !!entry);
+    filtered.sort((a, b) => a.gen.order - b.gen.order);
+    return filtered;
 };
 /**
  * Orchestrates the full code generation pipeline.

package/dist/common/generator.common.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.common.js","sourceRoot":"","sources":["../../src/common/generator.common.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.common.js","sourceRoot":"","sources":["../../src/common/generator.common.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,SAAS,EAAuB,MAAM,2BAA2B,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAqB,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAIrC,4DAA4D;AAC5D,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;AAmB7E,MAAM,UAAU,GAAqB,EAAE,CAAC;AACxC,IAAI,cAAc,GAA2B,IAAI,CAAC;AAElD;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,IAA8B,EAAE;IACrE,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,SAAS,GAAG,CAAC,MAAM,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,MAAM,CACxD,CAAC,QAAQ,EAAE,EAAE,CACX,QAAQ,KAAK,cAAc;YAC3B,QAAQ,KAAK,cAAc;YAC3B,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC;YAC3B,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CACzD,CAAC;QAEF,cAAc,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAA0B,EAAE;YACvD,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;YAClD,MAAM,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;YAC/B,OAAO;gBACL,QAAQ;gBACR,QAAQ;gBACR,aAAa,EAAE,MAAM,CAAC,IAAI;gBAC1B,OAAO,EAAE,MAAM,CAAC,GAAG;aACpB,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,QAAgB,EACe,EAAE,CACjC,CAAC,MAAM,kBAAkB,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC;IACvE,IAAI,CAAC;AAEP;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,EAClC,IAAmB,EACa,EAAE;IAClC,IAAI,KAAK,GAAG,UAAU,CAAC,IAAI,CACzB,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,CACpD,CAAC;IACF,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC;IAExB,MAAM,GAAG,GAAG,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC;IAClD,IAAI,CAAC,CAAC,GAAG,YAAY,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IAE7C,KAAK,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC;IACzB,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvB,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,IAA+B,EAAE;IACpE,MAAM,KAAK,GAAG,MAAM,kBAAkB,EAAE,CAAC;IACzC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACpD,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACnD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,MAAyB,EACzB,GAAiB,EACjB,EAAE;IACF,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAE9D,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACtB,MAAM,gBAAgB,GAA4B,MAAM,OAAO,CAAC,GAAG,CACjE,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;QAC1B,MAAM,WAAW,GAAG,MAAM,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC1D,MAAM,SAAS,CAAC,KAAK,CAAC,GAAG,WAAW,CAAC,CAAC;QACtC,OAAO,WAAW,CAAC;IACrB,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,WAAW,GAA0B,EAAE,CAAC;IAC9C,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;QACxC,WAAW,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;QAC9B,KAAK,MAAM,OAAO,IAAI,QAAQ;YAC5B,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;QACtC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC;QACpC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;QACzC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,KAAK,EAAE,MAAyB,EAAE,EAAE;IAC/D,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAC1B,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC,iBAAiB,EAAE,CAAC;IAChE,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,iBAAiB,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,MAAM,gBAAgB,EAAE,CAAC;IACzC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAC5B,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,EAC1B,IAAc,EACd,GAAc,EACd,GAAiB,EACa,EAAE;IAChC,OAAO,CAAC,GAAG,CAAC,OAAO,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,GAAG,GAAG,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAC5C,MAAM,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAClC,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAC3B,KAAiB,EACjB,GAAc,EACd,GAAiB,EACe,EAAE,CAClC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC"}

package/dist/common/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./Barrel.js";
+export * from "./CodeCollector.js";
 export * from "./Collector.js";
 export * from "./Directories.js";
 export * from "./Extractor.js";

package/dist/common/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AACA,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AACA,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC"}

package/dist/common/index.js

@@ -1,5 +1,6 @@
 // This file is auto-generated by build-cli. Do not edit manually.
 export * from "./Barrel.js";
+export * from "./CodeCollector.js";
 export * from "./Collector.js";
 export * from "./Directories.js";
 export * from "./Extractor.js";

package/dist/common/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/common/index.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,cAAc,aAAa,CAAC;AAC5B,cAAc,oBAAoB,CAAC;AACnC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,iBAAiB,CAAC;AAChC,cAAc,mBAAmB,CAAC"}

package/dist/generator/Generator.d.ts

@@ -2,6 +2,8 @@ import { DecoFile, DecoImport } from "@mxpicture/gcp-functions-common/types";
 import { DecoFileType, DecoFileExtension, DecoTargetType, DecoNames, Decorator } from "@mxpicture/gcp-functions-common/decorator";
 import { Collector } from "../common/Collector.js";
 import { GeneratorEnv } from "../common/types.common.js";
+import { CodeCollector } from "../common/CodeCollector.js";
+import { Registry } from "@mxpicture/gcp-functions-common/helper";
 /**
  * Base structure shared by all generator outputs, containing imports and code lines.
  */
@@ -12,7 +14,7 @@ export interface GeneratorBase {
 /**
  * Generator output for a single decorator header, including a name identifier.
  */
-export interface GeneratorCode extends GeneratorBase {
+export interface GeneratorHeader extends GeneratorBase {
     name: string;
 }
 /**
@@ -60,6 +62,7 @@ export declare const importsToCodeAsync: (imports: DecoImport[]) => Promise<stri
  * formatting, and writing to disk.
  */
 export declare abstract class Generator {
+    readonly order: number;
     readonly type: DecoFileType;
     readonly ext: DecoFileExtension;
     readonly targetType: DecoTargetType;
@@ -68,13 +71,15 @@ export declare abstract class Generator {
     /**
      * Creates a new generator.
      *
+     * @param order - Execution order generators.
      * @param type - The decorator file type this generator produces.
      * @param ext - The output file extension.
      * @param targetType - The target package (common, backend, frontend).
      * @param collector - The shared collector for cross-generator lookups.
      * @param useAdditionalImports - Whether to include additional imports from the decorator.
      */
-    constructor(type: DecoFileType, ext: DecoFileExtension, targetType: DecoTargetType, collector: Collector, useAdditionalImports?: boolean);
+    constructor(order: number, type: DecoFileType, ext: DecoFileExtension, targetType: DecoTargetType, collector: Collector, useAdditionalImports?: boolean);
+    get registry(): Registry;
     /**
      * Processes a decorator file by running all its headers through the generator.
      *
@@ -119,12 +124,9 @@ export declare abstract class Generator {
      * @returns The resolved import path.
      */
     importBackend(fileType: DecoFileType): string;
-    protected addCode(res: GeneratorResultFile, code: string[]): void;
-    protected addImport(res: GeneratorResultFile, imp: DecoImport): void;
-    protected addImports(res: GeneratorResultFile, imports: DecoImport[]): void;
-    protected processHeader(curretItem: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv): Promise<(GeneratorCode & {
+    protected processHeader(curretItem: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv): Promise<(GeneratorHeader & {
         inputFilePath: string;
     }) | null>;
-    protected abstract runHeader(current: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv): Promise<GeneratorCode | null>;
+    protected abstract runHeader(current: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv, result: CodeCollector): Promise<string | null>;
 }
 //# sourceMappingURL=Generator.d.ts.map

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

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

package/dist/generator/Generator.js

@@ -5,6 +5,8 @@ import { directories } from "../common/Directories.js";
 import { decoBackendNamesAsync, decoFrontendNamesAsync, decoNamesAsync, } from "../decorator/deco.names.js";
 import { formatCode, formatJson } from "@mxpicture/build-api/code";
 import { toFilename } from "../common/file.common.js";
+import { CodeCollector } from "../common/CodeCollector.js";
+import { Registry } from "@mxpicture/gcp-functions-common/helper";
 const importToCode = (imp) => imp.props.length > 0
     ? `import ${imp.isType ? "type " : ""}{ ${[...imp.props].join(", ")} } from "${imp.path}"`
     : null;
@@ -32,6 +34,7 @@ export const importsToCodeAsync = async (imports) => (await Promise.all(imports.
  * formatting, and writing to disk.
  */
 export class Generator {
+    order;
     type;
     ext;
     targetType;
@@ -40,19 +43,24 @@ export class Generator {
     /**
      * Creates a new generator.
      *
+     * @param order - Execution order generators.
      * @param type - The decorator file type this generator produces.
      * @param ext - The output file extension.
      * @param targetType - The target package (common, backend, frontend).
      * @param collector - The shared collector for cross-generator lookups.
      * @param useAdditionalImports - Whether to include additional imports from the decorator.
      */
-    constructor(type, ext, targetType, collector, useAdditionalImports = false) {
+    constructor(order, type, ext, targetType, collector, useAdditionalImports = false) {
+        this.order = order;
         this.type = type;
         this.ext = ext;
         this.targetType = targetType;
         this.collector = collector;
         this.useAdditionalImports = useAdditionalImports;
     }
+    get registry() {
+        return Registry.instance();
+    }
     /**
      * Processes a decorator file by running all its headers through the generator.
      *
@@ -64,6 +72,7 @@ export class Generator {
     async run(file, env) {
         let result = null;
         const runHeaders = {};
+        const resultsCollector = new CodeCollector();
         for (const decorator of file.decorators) {
             const extr = decorator.extractRaw();
             const names = this.targetType === DecoTargetType.backend
@@ -98,11 +107,13 @@ export class Generator {
                     type: this.type,
                 };
             }
-            this.addCode(result, interfaceResult.code);
-            this.addImports(result, interfaceResult.imports);
+            resultsCollector.addCode(...interfaceResult.code);
+            resultsCollector.addImport(...interfaceResult.imports);
         }
         if (!result)
             throw new Error(`Generator ${this.type}, file ${file.templateRepoFilePath}: no headers provided`);
+        result.code = resultsCollector.code;
+        result.imports = resultsCollector.imports;
         result.importsCode = await importsToCodeAsync(result.imports);
         return result;
     }
@@ -166,39 +177,18 @@ export class Generator {
     importBackend(fileType) {
         return this.resolveImport(DecoTargetType.backend, fileType);
     }
-    addCode(res, code) {
-        if (res.code.length > 0)
-            res.code.push("");
-        res.code.push(...code);
-    }
-    addImport(res, imp) {
-        let foundImp = res.imports.find((i) => i.path === imp.path && i.isType === imp.isType);
-        if (!foundImp) {
-            foundImp = {
-                ...imp,
-                props: [],
-            };
-            res.imports.push(foundImp);
-        }
-        for (const prop of imp.props)
-            if (!foundImp.props.find((p) => p === prop))
-                foundImp.props.push(prop);
-    }
-    addImports(res, imports) {
-        for (const imp of imports)
-            this.addImport(res, imp);
-    }
     async processHeader(curretItem, all, env) {
         const { decorator, names } = curretItem;
         const raw = decorator.extractRaw();
         this.collector.add(names.basename, this.targetType, {
             names: names,
         });
-        const result = await this.runHeader(curretItem, all, env);
-        if (!result)
-            return result;
+        const result = new CodeCollector();
+        const name = await this.runHeader(curretItem, all, env, result);
+        if (!name)
+            return null;
         return {
-            name: result.name,
+            name,
             inputFilePath: raw.inputFilePath,
             code: [...result.code],
             imports: this.useAdditionalImports &&

package/dist/generator/Generator.js.map

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

package/dist/generator/GeneratorAnnotations.d.ts

@@ -1,4 +1,6 @@
-import { Generator, GeneratorCode, GeneratorRunItem } from "./Generator.js";
+import { Generator, GeneratorRunItem, GeneratorRunItems } from "./Generator.js";
+import { CodeCollector } from "../common/CodeCollector.js";
+import { GeneratorEnv } from "../common/types.common.js";
 /**
  * Generator that produces annotation metadata and initial-value factory functions.
  *
@@ -8,7 +10,7 @@ import { Generator, GeneratorCode, GeneratorRunItem } from "./Generator.js";
  */
 export declare class GeneratorAnnotations extends Generator {
     constructor();
-    protected runHeader(current: GeneratorRunItem): Promise<GeneratorCode | null>;
+    protected runHeader(current: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv, result: CodeCollector): Promise<string | null>;
 }
 declare const _default: GeneratorAnnotations;
 export default _default;

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,EAAE,SAAS,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAgB5E;;;;;;GAMG;AACH,qBAAa,oBAAqB,SAAQ,SAAS;;cAUxB,SAAS,CAChC,OAAO,EAAE,gBAAgB,GACxB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;CAgHjC;;AAED,wBAA0C"}
+{"version":3,"file":"GeneratorAnnotations.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorAnnotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAQhF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AASzD;;;;;;GAMG;AACH,qBAAa,oBAAqB,SAAQ,SAAS;;cAWxB,SAAS,CAChC,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,iBAAiB,EACtB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CA4G1B;;AAED,wBAA0C"}

package/dist/generator/GeneratorAnnotations.js

@@ -16,38 +16,30 @@ const dateFormatRegex = /\"dateFormat\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
  */
 export class GeneratorAnnotations extends Generator {
     constructor() {
-        super(DecoFileType.annotations, DecoFileExtension.ts, DecoTargetType.common, Collector.instance());
+        super(20, DecoFileType.annotations, DecoFileExtension.ts, DecoTargetType.common, Collector.instance());
     }
-    async runHeader(current) {
+    async runHeader(current, all, env, result) {
         const names = current.names;
-        const res = {
-            code: [],
-            imports: [
-                {
-                    path: "@mxpicture/gcp-functions-common/types",
-                    props: ["AnnotationsHeader"],
-                    isType: true,
-                },
-                {
-                    path: "@mxpicture/gcp-functions-common/helper",
-                    props: ["annoDocInitial"],
-                    isType: false,
-                },
-                {
-                    path: this.importCommon(DecoFileType.doc),
-                    props: [names.doc],
-                    isType: true,
-                },
-            ],
-            name: current.decorator.name,
-        };
+        result.addImport({
+            path: "@mxpicture/gcp-functions-common/types",
+            props: ["AnnotationsHeader"],
+            isType: true,
+        }, {
+            path: "@mxpicture/gcp-functions-common/helper",
+            props: ["annoDocInitial"],
+            isType: false,
+        }, {
+            path: this.importCommon(DecoFileType.doc),
+            props: [names.doc],
+            isType: true,
+        });
         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);`, "");
-        res.code.push(`export const ${names.annotations}: AnnotationsHeader = `);
+        result.addCode("", `export const ${names.initialFunc} = (): Partial<${names.doc}> => annoDocInitial(${names.annotations}.properties);`, "");
+        result.addCode(`export const ${names.annotations}: AnnotationsHeader = `);
         // replace enums and types
         for (let line of lines) {
             // type
@@ -85,22 +77,22 @@ export class GeneratorAnnotations extends Generator {
                 line = line.replace(subHeaderNameRegex, `subHeader: ${match[1]}`);
                 match = line.match(subHeaderNameRegex);
             }
-            res.code.push(line);
+            result.addCode(line);
         }
-        res.code.push(";");
+        result.addCode(";");
         if (importDecoTypeProps.size > 0)
-            res.imports.push({
+            result.addImport({
                 path: "@mxpicture/gcp-functions-common/decorator",
                 props: [...importDecoTypeProps],
                 isType: true,
             });
         if (importDecoProps.size > 0)
-            res.imports.push({
+            result.addImport({
                 path: "@mxpicture/gcp-functions-common/decorator",
                 props: [...importDecoProps],
                 isType: false,
             });
-        return res;
+        return current.decorator.name;
     }
 }
 export default new GeneratorAnnotations();

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,7 +1,8 @@
 import { DecoNames, DecoratorData } from "@mxpicture/gcp-functions-common/decorator";
-import { Generator, GeneratorCode, GeneratorRunItem, GeneratorRunItems } from "./Generator.js";
+import { Generator, GeneratorRunItem, GeneratorRunItems } from "./Generator.js";
 import { GeneratorEnv } from "../common/types.common.js";
 import { AnnotationsProperty, DecoImport, DecoPropertyBase } from "@mxpicture/gcp-functions-common/types";
+import { CodeCollector } from "../common/CodeCollector.js";
 /**
  * Generator that produces backend-specific code including API classes, stores, functions, and factory helpers.
  *
@@ -11,7 +12,7 @@ import { AnnotationsProperty, DecoImport, DecoPropertyBase } from "@mxpicture/gc
  */
 export declare class GeneratorBackend extends Generator {
     constructor();
-    protected runHeader(current: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv): Promise<GeneratorCode | null>;
+    protected runHeader(current: GeneratorRunItem, all: GeneratorRunItems, env: GeneratorEnv, result: CodeCollector): Promise<string | null>;
     protected buildConstants(virtualKeysName: string, virtuals: AnnotationsProperty<DecoPropertyBase>[], datePathsName: string, datePaths: string[], sideEffectsName: string, sideEffects: AnnotationsProperty<DecoPropertyBase>[]): {
         code: string[];
         imports: DecoImport[];

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,EAOL,SAAS,EACT,aAAa,EACd,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,EACL,mBAAmB,EACnB,UAAU,EACV,gBAAgB,EACjB,MAAM,uCAAuC,CAAC;AAG/C;;;;;;GAMG;AACH,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;IAoHhC,SAAS,CAAC,cAAc,CACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,EACjD,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EAAE,EACnB,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,GACnD;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,UAAU,EAAE,CAAA;KAAE;IA8B5C,SAAS,CAAC,QAAQ,CAChB,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,SAAS,EAChB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,EACjD,WAAW,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,GACnD;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,UAAU,EAAE,CAAA;KAAE;IAwE5C,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG;QACzC,IAAI,EAAE,MAAM,EAAE,CAAC;QACf,OAAO,EAAE,UAAU,EAAE,CAAC;KACvB;IAyBD,SAAS,CAAC,UAAU,CAClB,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,MAAM,GAChB;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,UAAU,EAAE,CAAA;KAAE;IAsB5C,SAAS,CAAC,mBAAmB,CAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GACrB;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,UAAU,EAAE,CAAA;KAAE;IAqC5C,SAAS,CAAC,gBAAgB,CACxB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GACrB;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,UAAU,EAAE,CAAA;KAAE;CAoC7C;;AAED,wBAAsC"}
+{"version":3,"file":"GeneratorBackend.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorBackend.ts"],"names":[],"mappings":"AAAA,OAAO,EAOL,SAAS,EACT,aAAa,EACd,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAIhF,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EACL,mBAAmB,EACnB,UAAU,EACV,gBAAgB,EACjB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D;;;;;;GAMG;AACH,qBAAa,gBAAiB,SAAQ,SAAS;;cAWpB,SAAS,CAChC,OAAO,EAAE,gBAAgB,EACzB,GAAG,EAAE,iBAAiB,EACtB,GAAG,EAAE,YAAY,EACjB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAqGzB,SAAS,CAAC,cAAc,CACtB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,EACjD,aAAa,EAAE,MAAM,EACrB,SAAS,EAAE,MAAM,EAAE,EACnB,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,GACnD;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,UAAU,EAAE,CAAA;KAAE;IA8B5C,SAAS,CAAC,QAAQ,CAChB,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,SAAS,EAChB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,EACjD,WAAW,EAAE,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,GACnD;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,UAAU,EAAE,CAAA;KAAE;IAwE5C,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG;QACzC,IAAI,EAAE,MAAM,EAAE,CAAC;QACf,OAAO,EAAE,UAAU,EAAE,CAAC;KACvB;IAyBD,SAAS,CAAC,UAAU,CAClB,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,MAAM,GAChB;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,UAAU,EAAE,CAAA;KAAE;IAsB5C,SAAS,CAAC,mBAAmB,CAC3B,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GACrB;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,UAAU,EAAE,CAAA;KAAE;IAqC5C,SAAS,CAAC,gBAAgB,CACxB,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,MAAM,GACrB;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,OAAO,EAAE,UAAU,EAAE,CAAA;KAAE;CAoC7C;;AAED,wBAAsC"}