@mxpicture/gcp-functions-generator 1.2.84 → 1.2.86
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/generator/GeneratorZod.d.ts +3 -4
- package/dist/generator/GeneratorZod.d.ts.map +1 -1
- package/dist/generator/GeneratorZod.js +5 -20
- package/dist/generator/GeneratorZod.js.map +1 -1
- package/dist/run/GeneratorFileImports.d.ts.map +1 -1
- package/dist/run/GeneratorFileImports.js +10 -12
- package/dist/run/GeneratorFileImports.js.map +1 -1
- package/package.json +5 -5
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Generator } from "./Generator.js";
|
|
2
2
|
import type { DecoNames } from "@mxpicture/gcp-functions-common/decorator";
|
|
3
|
-
import type { AnnotationsProperty,
|
|
3
|
+
import type { AnnotationsProperty, DecoPropertyBase } from "@mxpicture/gcp-functions-common/types";
|
|
4
4
|
import type { GeneratorEnv, GeneratorRunItem, GeneratorRunResult } from "../common/types.common.js";
|
|
5
|
+
import type { ExportsAlias } from "@mxpicture/build-api/types";
|
|
5
6
|
/**
|
|
6
7
|
* Generator that produces Zod validation schemas and shape objects from decorator annotations.
|
|
7
8
|
*
|
|
@@ -11,12 +12,10 @@ import type { GeneratorEnv, GeneratorRunItem, GeneratorRunResult } from "../comm
|
|
|
11
12
|
* boolean, date, array, object, and key property types.
|
|
12
13
|
*/
|
|
13
14
|
export declare class GeneratorZod extends Generator {
|
|
14
|
-
protected
|
|
15
|
+
protected importAliases: ExportsAlias[];
|
|
15
16
|
protected typeValidationCount: number;
|
|
16
17
|
constructor();
|
|
17
18
|
protected runHeader(item: GeneratorRunItem, env: GeneratorEnv): Promise<GeneratorRunResult | null>;
|
|
18
|
-
protected startZ(): void;
|
|
19
|
-
protected endZ(): DecoImport[];
|
|
20
19
|
protected z(name: string, params?: string): string;
|
|
21
20
|
protected zAlias(name: string): string;
|
|
22
21
|
protected buildShape(properties: AnnotationsProperty<DecoPropertyBase>[], item: GeneratorRunItem): string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"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,gBAAgB,EACjB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AAEnC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D;;;;;;;GAOG;AACH,qBAAa,YAAa,SAAQ,SAAS;IACzC,SAAS,CAAC,aAAa,EAAE,YAAY,EAAE,CAAM;IAC7C,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,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,MAAa,GAAG,MAAM;IAUxD,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"}
|
|
@@ -11,7 +11,7 @@ import { upperFirstLetter } from "@mxpicture/gcp-functions-common/helper";
|
|
|
11
11
|
* boolean, date, array, object, and key property types.
|
|
12
12
|
*/
|
|
13
13
|
export class GeneratorZod extends Generator {
|
|
14
|
-
|
|
14
|
+
importAliases = [];
|
|
15
15
|
typeValidationCount = 0;
|
|
16
16
|
constructor() {
|
|
17
17
|
super({
|
|
@@ -26,34 +26,19 @@ export class GeneratorZod extends Generator {
|
|
|
26
26
|
if (header.properties.length === 0)
|
|
27
27
|
return null;
|
|
28
28
|
const names = item.names;
|
|
29
|
-
this.
|
|
29
|
+
this.importAliases = [];
|
|
30
30
|
const code = [
|
|
31
31
|
...this.buildComment(names),
|
|
32
32
|
...this.buildShape(header.properties, item),
|
|
33
33
|
...this.buildTypeValidation(names),
|
|
34
34
|
...this.buildSchema(names),
|
|
35
35
|
];
|
|
36
|
-
return { name: header.name, code, importAliases:
|
|
37
|
-
}
|
|
38
|
-
startZ() {
|
|
39
|
-
this.zImports = new Set();
|
|
40
|
-
}
|
|
41
|
-
endZ() {
|
|
42
|
-
if (this.zImports.size === 0)
|
|
43
|
-
return [];
|
|
44
|
-
const results = [
|
|
45
|
-
{
|
|
46
|
-
valueProps: [...this.zImports],
|
|
47
|
-
path: "zod",
|
|
48
|
-
typeProps: [],
|
|
49
|
-
},
|
|
50
|
-
];
|
|
51
|
-
this.zImports = new Set();
|
|
52
|
-
return results;
|
|
36
|
+
return { name: header.name, code, importAliases: this.importAliases };
|
|
53
37
|
}
|
|
54
38
|
z(name, params = "()") {
|
|
55
39
|
const alias = this.zAlias(name);
|
|
56
|
-
this.
|
|
40
|
+
if (!this.importAliases.find((al) => al.real === name && al.alias === alias))
|
|
41
|
+
this.importAliases.push({ real: name, alias });
|
|
57
42
|
return `${alias}${params}`;
|
|
58
43
|
}
|
|
59
44
|
zAlias(name) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorZod.js","sourceRoot":"","sources":["../../src/generator/GeneratorZod.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EACL,aAAa,EACb,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,WAAW,EACX,cAAc,EACd,cAAc,EACd,cAAc,EACd,iBAAiB,EACjB,YAAY,EACZ,eAAe,GAChB,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"GeneratorZod.js","sourceRoot":"","sources":["../../src/generator/GeneratorZod.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorFileImports.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACZ,MAAM,uCAAuC,CAAC;AAK/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,0BAA0B,CAAC;AAElC,oBAAY,uBAAuB;IACjC,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,qBAAa,oBAAoB;aAOb,IAAI,EAAE,aAAa;IAC5B,QAAQ,EAAE,WAAW;IAPvB,OAAO,EAAE,YAAY,EAAE,CAAM;IAEpC,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,CAAM;IACpC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;gBAG7B,IAAI,EAAE,aAAa,EAC5B,QAAQ,EAAE,WAAW;IAG9B,IAAW,KAAK,IAAI,UAAU,EAAE,CAE/B;IAED,IAAW,IAAI,IAAI,MAAM,EAAE,CAE1B;IAEM,UAAU;IAsBjB,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,uBAAuB,EAC7B,MAAM,EAAE,gBAAgB,GACvB,IAAI;
|
|
1
|
+
{"version":3,"file":"GeneratorFileImports.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACZ,MAAM,uCAAuC,CAAC;AAK/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,0BAA0B,CAAC;AAElC,oBAAY,uBAAuB;IACjC,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,qBAAa,oBAAoB;aAOb,IAAI,EAAE,aAAa;IAC5B,QAAQ,EAAE,WAAW;IAPvB,OAAO,EAAE,YAAY,EAAE,CAAM;IAEpC,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,CAAM;IACpC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAM;gBAG7B,IAAI,EAAE,aAAa,EAC5B,QAAQ,EAAE,WAAW;IAG9B,IAAW,KAAK,IAAI,UAAU,EAAE,CAE/B;IAED,IAAW,IAAI,IAAI,MAAM,EAAE,CAE1B;IAEM,UAAU;IAsBjB,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,uBAAuB,EAC7B,MAAM,EAAE,gBAAgB,GACvB,IAAI;CA0CR"}
|
|
@@ -40,13 +40,12 @@ export class GeneratorFileImports {
|
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
processProp(prop, type, lookup) {
|
|
43
|
-
const {
|
|
43
|
+
const { usedAlias, first } = lookup.find({
|
|
44
44
|
prop,
|
|
45
45
|
alias: this.aliases.find((alias) => alias.real === prop)?.alias,
|
|
46
46
|
});
|
|
47
47
|
if (!first)
|
|
48
48
|
return;
|
|
49
|
-
// todo first.packageName is quiet not right. @mxpicture/gcp-functions/types needed instance of @mxpicture/gcp-functions
|
|
50
49
|
const path = first instanceof ExportsContent
|
|
51
50
|
? first.findNode(prop)?.source
|
|
52
51
|
: exportResolveImportPath(this.file, first, this.resolver);
|
|
@@ -57,21 +56,20 @@ export class GeneratorFileImports {
|
|
|
57
56
|
item = { path, typeProps: [], valueProps: [] };
|
|
58
57
|
this._items.push(item);
|
|
59
58
|
}
|
|
59
|
+
const add = (name, from, to) => {
|
|
60
|
+
if (!to.includes(name))
|
|
61
|
+
to.push(name);
|
|
62
|
+
i = from.findIndex((p) => p === name);
|
|
63
|
+
if (i >= 0)
|
|
64
|
+
from.splice(i, 1);
|
|
65
|
+
};
|
|
60
66
|
let i = -1;
|
|
61
67
|
switch (type) {
|
|
62
68
|
case GeneratorFileImportType.type:
|
|
63
|
-
|
|
64
|
-
item.typeProps.push(importString);
|
|
65
|
-
i = item.valueProps.findIndex((p) => p === importString);
|
|
66
|
-
if (i >= 0)
|
|
67
|
-
item.valueProps.splice(i, 1);
|
|
69
|
+
add(usedAlias ?? prop, item.valueProps, item.typeProps);
|
|
68
70
|
break;
|
|
69
71
|
case GeneratorFileImportType.value:
|
|
70
|
-
|
|
71
|
-
item.valueProps.push(importString);
|
|
72
|
-
i = item.typeProps.findIndex((p) => p === importString);
|
|
73
|
-
if (i >= 0)
|
|
74
|
-
item.typeProps.splice(i, 1);
|
|
72
|
+
add(usedAlias ?? prop, item.typeProps, item.valueProps);
|
|
75
73
|
break;
|
|
76
74
|
default:
|
|
77
75
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorFileImports.js","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,uBAAuB,EACvB,aAAa,GACd,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EACL,cAAc,GAEf,MAAM,0BAA0B,CAAC;AAElC,MAAM,CAAN,IAAY,uBAGX;AAHD,WAAY,uBAAuB;IACjC,0CAAe,CAAA;IACf,wCAAa,CAAA;AACf,CAAC,EAHW,uBAAuB,KAAvB,uBAAuB,QAGlC;AAED,MAAM,OAAO,oBAAoB;IAOb;IACT;IAPF,OAAO,GAAmB,EAAE,CAAC;IAE1B,MAAM,GAAiB,EAAE,CAAC;IAC1B,OAAO,GAA2B,EAAE,CAAC;IAE/C,YACkB,IAAmB,EAC5B,QAAqB;QADZ,SAAI,GAAJ,IAAI,CAAe;QAC5B,aAAQ,GAAR,QAAQ,CAAa;IAC3B,CAAC;IAEJ,IAAW,KAAK;QACd,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED,IAAW,IAAI;QACb,OAAO,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACpC,CAAC;IAEM,UAAU;QACf,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAC3C,MAAM,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC;QAC7B,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAEjD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QACzC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IACE,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,aAAa;gBACvC,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,kBAAkB,EAC5C,CAAC;gBACD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,uBAAuB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBACnE,SAAS;YACX,CAAC;YAED,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,iBAAiB,EAAE,CAAC;gBAChD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,uBAAuB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAClE,SAAS;YACX,CAAC;QACH,CAAC;IACH,CAAC;IAES,WAAW,CACnB,IAAY,EACZ,IAA6B,EAC7B,MAAwB;QAExB,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"GeneratorFileImports.js","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mxpicture/gcp-functions-generator",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.86",
|
|
4
4
|
"description": "Tools for google cloud functions",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"author": "MXPicture",
|
|
@@ -48,10 +48,10 @@
|
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"@google-cloud/scheduler": "^5.3.1",
|
|
51
|
-
"@mxpicture/build-api": "^0.3.
|
|
52
|
-
"@mxpicture/gcp-functions-backend": "^1.2.
|
|
53
|
-
"@mxpicture/gcp-functions-common": "^1.2.
|
|
54
|
-
"@mxpicture/gcp-functions-frontend": "^1.2.
|
|
51
|
+
"@mxpicture/build-api": "^0.3.105",
|
|
52
|
+
"@mxpicture/gcp-functions-backend": "^1.2.86",
|
|
53
|
+
"@mxpicture/gcp-functions-common": "^1.2.86",
|
|
54
|
+
"@mxpicture/gcp-functions-frontend": "^1.2.86",
|
|
55
55
|
"google-auth-library": "^10.6.2",
|
|
56
56
|
"googleapis": "^171.4.0",
|
|
57
57
|
"json5": "^2.2.3"
|