@mxpicture/gcp-functions-generator 0.2.37 → 0.2.39
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/Generator.d.ts +3 -3
- package/dist/generator/Generator.d.ts.map +1 -1
- package/dist/generator/Generator.js +24 -14
- package/dist/generator/Generator.js.map +1 -1
- package/dist/generator/GeneratorAnnotations.d.ts +2 -2
- package/dist/generator/GeneratorAnnotations.d.ts.map +1 -1
- package/dist/generator/GeneratorAnnotations.js +10 -2
- package/dist/generator/GeneratorAnnotations.js.map +1 -1
- package/package.json +4 -4
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { MetaFile, MetaImport, MetaNames } from "@mxpicture/gcp-functions-common/types";
|
|
2
|
-
import { MetaFileType, MetaFileExtension, MetaTargetType, MetaHeadData } from "@mxpicture/gcp-functions-common/meta";
|
|
2
|
+
import { MetaFileType, MetaFileExtension, MetaTargetType, MetaHeadData, MetaRunHeaders, MetaRunHeader } from "@mxpicture/gcp-functions-common/meta";
|
|
3
3
|
import { Collector } from "../common/Collector.js";
|
|
4
4
|
export interface GeneratorBase {
|
|
5
5
|
imports: MetaImport[];
|
|
@@ -34,9 +34,9 @@ export declare abstract class Generator {
|
|
|
34
34
|
protected addCode(res: GeneratorResultFile, code: string[]): void;
|
|
35
35
|
protected addImport(res: GeneratorResultFile, imp: MetaImport): void;
|
|
36
36
|
protected addImports(res: GeneratorResultFile, imports: MetaImport[]): void;
|
|
37
|
-
protected processHeader(
|
|
37
|
+
protected processHeader(curretHeader: MetaRunHeader, allHeaders: MetaRunHeaders): Promise<(GeneratorCode & {
|
|
38
38
|
inputFilePath: string;
|
|
39
39
|
}) | null>;
|
|
40
|
-
protected abstract runHeader(header: MetaHeadData, names: MetaNames,
|
|
40
|
+
protected abstract runHeader(header: MetaHeadData, names: MetaNames, allParams: MetaRunHeaders): Promise<GeneratorCode | null>;
|
|
41
41
|
}
|
|
42
42
|
//# sourceMappingURL=Generator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Generator.d.ts","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EACR,UAAU,EACV,SAAS,EACV,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,YAAY,
|
|
1
|
+
{"version":3,"file":"Generator.d.ts","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,QAAQ,EACR,UAAU,EACV,SAAS,EACV,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,YAAY,EACZ,cAAc,EACd,aAAa,EACd,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAWnD,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,UAAU,EAAE,CAAC;IACtB,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED,MAAM,WAAW,aAAc,SAAQ,aAAa;IAClD,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAoB,SAAQ,aAAa;IACxD,IAAI,EAAE,YAAY,CAAC;IACnB,GAAG,EAAE,iBAAiB,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,cAAc,CAAC;IAC3B,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB;AAYD,eAAO,MAAM,aAAa,GAAI,SAAS,UAAU,EAAE,KAAG,MAAM,EACH,CAAC;AAE1D,eAAO,MAAM,kBAAkB,GAC7B,SAAS,UAAU,EAAE,KACpB,OAAO,CAAC,MAAM,EAAE,CAGhB,CAAC;AAEJ,8BAAsB,SAAS;aAEX,IAAI,EAAE,YAAY;aAClB,GAAG,EAAE,iBAAiB;aACtB,UAAU,EAAE,cAAc;aAC1B,SAAS,EAAE,SAAS;aACpB,oBAAoB,EAAE,OAAO;gBAJ7B,IAAI,EAAE,YAAY,EAClB,GAAG,EAAE,iBAAiB,EACtB,UAAU,EAAE,cAAc,EAC1B,SAAS,EAAE,SAAS,EACpB,oBAAoB,GAAE,OAAe;IAG1C,GAAG,CAAC,IAAI,EAAE,QAAQ,GAAG,OAAO,CAAC,mBAAmB,CAAC;WAiE1C,KAAK,CAAC,GAAG,KAAK,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBlE,aAAa,CAClB,UAAU,EAAE,cAAc,EAC1B,QAAQ,EAAE,YAAY,GACrB,MAAM;IAOF,YAAY,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM;IAI5C,cAAc,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM;IAG9C,aAAa,CAAC,QAAQ,EAAE,YAAY,GAAG,MAAM;IAIpD,SAAS,CAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE;IAK1D,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,mBAAmB,EAAE,GAAG,EAAE,UAAU;IAgB7D,SAAS,CAAC,UAAU,CAAC,GAAG,EAAE,mBAAmB,EAAE,OAAO,EAAE,UAAU,EAAE;cAIpD,aAAa,CAC3B,YAAY,EAAE,aAAa,EAC3B,UAAU,EAAE,cAAc,GACzB,OAAO,CAAC,CAAC,aAAa,GAAG;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;IAuB9D,SAAS,CAAC,QAAQ,CAAC,SAAS,CAC1B,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,cAAc,GACxB,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;CACjC"}
|
|
@@ -26,7 +26,20 @@ export class Generator {
|
|
|
26
26
|
}
|
|
27
27
|
async run(file) {
|
|
28
28
|
let result = null;
|
|
29
|
-
const
|
|
29
|
+
const runHeaders = {};
|
|
30
|
+
for (const header of file.headers) {
|
|
31
|
+
const extrName = await metaBasenameAsync(header.templateName);
|
|
32
|
+
const names = this.targetType === MetaTargetType.backend
|
|
33
|
+
? await metaBackendNamesAsync(extrName, header.prefix)
|
|
34
|
+
: this.targetType === MetaTargetType.frontend
|
|
35
|
+
? await metaFrontendNamesAsync(extrName, header.prefix)
|
|
36
|
+
: await metaNamesAsync(extrName, header.prefix);
|
|
37
|
+
runHeaders[header.templateName] = {
|
|
38
|
+
headerData: header,
|
|
39
|
+
names,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
const interfaceResults = await Promise.all(Object.values(runHeaders).map((p) => this.processHeader(p, runHeaders)));
|
|
30
43
|
for (const interfaceResult of interfaceResults) {
|
|
31
44
|
if (!interfaceResult)
|
|
32
45
|
continue;
|
|
@@ -108,25 +121,22 @@ export class Generator {
|
|
|
108
121
|
for (const imp of imports)
|
|
109
122
|
this.addImport(res, imp);
|
|
110
123
|
}
|
|
111
|
-
async processHeader(
|
|
112
|
-
const
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
: await metaNamesAsync(extrName, header.prefix);
|
|
118
|
-
this.collector.add(names.basename, this.targetType, { names });
|
|
119
|
-
const result = await this.runHeader(header, names, otherHeaders);
|
|
124
|
+
async processHeader(curretHeader, allHeaders) {
|
|
125
|
+
const { headerData, names } = curretHeader;
|
|
126
|
+
this.collector.add(names.basename, this.targetType, {
|
|
127
|
+
names: names,
|
|
128
|
+
});
|
|
129
|
+
const result = await this.runHeader(headerData, names, allHeaders);
|
|
120
130
|
if (!result)
|
|
121
131
|
return result;
|
|
122
132
|
return {
|
|
123
133
|
name: result.name,
|
|
124
|
-
inputFilePath:
|
|
134
|
+
inputFilePath: headerData.inputFilePath,
|
|
125
135
|
code: [...result.code],
|
|
126
136
|
imports: this.useAdditionalImports &&
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
? [...result.imports, ...
|
|
137
|
+
headerData.additionalImports &&
|
|
138
|
+
headerData.additionalImports.length > 0
|
|
139
|
+
? [...result.imports, ...headerData.additionalImports]
|
|
130
140
|
: [...result.imports],
|
|
131
141
|
};
|
|
132
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Generator.js","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAMpD,OAAO,EAEL,iBAAiB,EACjB,cAAc,
|
|
1
|
+
{"version":3,"file":"Generator.js","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { MetaHeadData } from "@mxpicture/gcp-functions-common/meta";
|
|
1
|
+
import { MetaHeadData, MetaRunHeaders } from "@mxpicture/gcp-functions-common/meta";
|
|
2
2
|
import { MetaNames } from "@mxpicture/gcp-functions-common/types";
|
|
3
3
|
import { Generator, GeneratorCode } from "./Generator.js";
|
|
4
4
|
export declare class GeneratorAnnotations extends Generator {
|
|
5
5
|
constructor();
|
|
6
|
-
protected runHeader(mainHeader: MetaHeadData, names: MetaNames,
|
|
6
|
+
protected runHeader(mainHeader: MetaHeadData, names: MetaNames, allParams: MetaRunHeaders): Promise<GeneratorCode | null>;
|
|
7
7
|
}
|
|
8
8
|
declare const _default: GeneratorAnnotations;
|
|
9
9
|
export default _default;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorAnnotations.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorAnnotations.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,YAAY,
|
|
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;AAU1D,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;CA0FjC;;AAED,wBAA0C"}
|
|
@@ -5,11 +5,12 @@ import { formatJsonStringify } from "@mxpicture/build-api/code";
|
|
|
5
5
|
const typeRegex = /\"type\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
|
|
6
6
|
const itemTypeRegex = /\"itemType\": \"(MetaPropertyType\.|)([a-zA-Z][a-zA-Z0-9]*)\"/;
|
|
7
7
|
const propertyRefRegex = /\"propertyRef\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
|
|
8
|
+
const subHeaderRegex = /\"subHeader\": \"([a-zA-Z][a-zA-Z0-9]*)\"/;
|
|
8
9
|
export class GeneratorAnnotations extends Generator {
|
|
9
10
|
constructor() {
|
|
10
11
|
super(MetaFileType.annotations, MetaFileExtension.ts, MetaTargetType.common, Collector.instance());
|
|
11
12
|
}
|
|
12
|
-
async runHeader(mainHeader, names,
|
|
13
|
+
async runHeader(mainHeader, names, allParams) {
|
|
13
14
|
const res = {
|
|
14
15
|
code: [],
|
|
15
16
|
imports: [
|
|
@@ -41,7 +42,8 @@ export class GeneratorAnnotations extends Generator {
|
|
|
41
42
|
],
|
|
42
43
|
name: mainHeader.templateName,
|
|
43
44
|
};
|
|
44
|
-
|
|
45
|
+
// todo other headers only as reference/varialbe --> do not copy the whole sub header again
|
|
46
|
+
const header = mapAnnotationsHeader(mainHeader, allParams);
|
|
45
47
|
const json = await formatJsonStringify(JSON.stringify(header));
|
|
46
48
|
const lines = json.split("\n");
|
|
47
49
|
res.code.push("", `export const ${names.initialFunc} = (): Partial<${names.doc}> => annoDocInitial(${names.annotations}.properties);`, "");
|
|
@@ -67,6 +69,12 @@ export class GeneratorAnnotations extends Generator {
|
|
|
67
69
|
line = line.replace(propertyRefRegex, `propertyRef: "${match[1]}" as keyof MetaPropertyDataWoType`);
|
|
68
70
|
match = line.match(propertyRefRegex);
|
|
69
71
|
}
|
|
72
|
+
// subHeader
|
|
73
|
+
match = line.match(subHeaderRegex);
|
|
74
|
+
while (match && match.length > 1) {
|
|
75
|
+
line = line.replace(subHeaderRegex, `subHeader: ${match[1]}`);
|
|
76
|
+
match = line.match(subHeaderRegex);
|
|
77
|
+
}
|
|
70
78
|
res.code.push(line);
|
|
71
79
|
}
|
|
72
80
|
res.code.push(";");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorAnnotations.js","sourceRoot":"","sources":["../../src/generator/GeneratorAnnotations.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,iBAAiB,EACjB,cAAc,EACd,oBAAoB,
|
|
1
|
+
{"version":3,"file":"GeneratorAnnotations.js","sourceRoot":"","sources":["../../src/generator/GeneratorAnnotations.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": "0.2.
|
|
3
|
+
"version": "0.2.39",
|
|
4
4
|
"description": "Tools for google cloud functions",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"author": "MXPicture",
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@mxpicture/build-api": "^0.2.56",
|
|
35
|
-
"@mxpicture/gcp-functions-backend": "^0.2.
|
|
36
|
-
"@mxpicture/gcp-functions-common": "^0.2.
|
|
37
|
-
"@mxpicture/gcp-functions-frontend": "^0.2.
|
|
35
|
+
"@mxpicture/gcp-functions-backend": "^0.2.39",
|
|
36
|
+
"@mxpicture/gcp-functions-common": "^0.2.39",
|
|
37
|
+
"@mxpicture/gcp-functions-frontend": "^0.2.39"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@types/node": "^25.2.3",
|