@mxpicture/gcp-functions-generator 2.1.4 → 2.1.5
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/decorator/deco.names.d.ts +10 -3
- package/dist/decorator/deco.names.d.ts.map +1 -1
- package/dist/decorator/deco.names.js +24 -9
- package/dist/decorator/deco.names.js.map +1 -1
- package/dist/generator/Generator.js +1 -1
- package/dist/generator/Generator.js.map +1 -1
- package/dist/generator/GeneratorBackend.d.ts +1 -0
- package/dist/generator/GeneratorBackend.d.ts.map +1 -1
- package/dist/generator/GeneratorBackend.js +17 -5
- package/dist/generator/GeneratorBackend.js.map +1 -1
- package/dist/generator/GeneratorComposite.js +1 -1
- package/dist/generator/GeneratorComposite.js.map +1 -1
- package/dist/generator/GeneratorFrontend.d.ts.map +1 -1
- package/dist/generator/GeneratorFrontend.js +8 -3
- package/dist/generator/GeneratorFrontend.js.map +1 -1
- package/package.json +4 -4
|
@@ -32,12 +32,19 @@ export declare const isDecoNameType: (name: string, type: DecoFileType) => boole
|
|
|
32
32
|
*
|
|
33
33
|
* @param basename - The base decorator name.
|
|
34
34
|
* @param namespace - Optional namespace prefix for the function name.
|
|
35
|
-
* @param
|
|
36
|
-
* @param
|
|
35
|
+
* @param apiSuffix - Optional API type suffix override.
|
|
36
|
+
* @param funcSuffix - Optional function type suffix override.
|
|
37
37
|
* @param packageType - Target type; defaults to `DecoPackageType.common`.
|
|
38
38
|
* @returns A fully populated {@link DecoNames} object.
|
|
39
39
|
*/
|
|
40
|
-
export declare const decoNames: (
|
|
40
|
+
export declare const decoNames: (p: {
|
|
41
|
+
basename: string;
|
|
42
|
+
namespace?: string;
|
|
43
|
+
apiSuffix?: string;
|
|
44
|
+
funcSuffix?: string;
|
|
45
|
+
factorySuffix?: string;
|
|
46
|
+
packageType?: DecoPackageType;
|
|
47
|
+
}) => DecoNames;
|
|
41
48
|
/**
|
|
42
49
|
* Builds frontend-specific decorator names with `feApi`/`feFunction` suffixes.
|
|
43
50
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deco.names.d.ts","sourceRoot":"","sources":["../../src/decorator/deco.names.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EACL,YAAY,EACZ,eAAe,EAChB,MAAM,2CAA2C,CAAC;AAMnD;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,MAAM,YAAY,GAAG,MAAM,KAAG,MACrB,CAAC;AAEnD;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,KAAG,MAM3C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,MAAM,YAAY,KAAG,OAC3B,CAAC;AAExC;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"deco.names.d.ts","sourceRoot":"","sources":["../../src/decorator/deco.names.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,EACL,YAAY,EACZ,eAAe,EAChB,MAAM,2CAA2C,CAAC;AAMnD;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,GAAI,MAAM,MAAM,EAAE,MAAM,YAAY,GAAG,MAAM,KAAG,MACrB,CAAC;AAEnD;;;;;GAKG;AACH,eAAO,MAAM,YAAY,GAAI,MAAM,MAAM,KAAG,MAM3C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,EAAE,MAAM,YAAY,KAAG,OAC3B,CAAC;AAExC;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,SAAS,GAAI,GAAG;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,CAAC,EAAE,eAAe,CAAC;CAC/B,KAAG,SAyDH,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,GAAI,UAAU,MAAM,EAAE,YAAY,MAAM,cAQlE,CAAC;AAEL;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAAI,UAAU,MAAM,EAAE,YAAY,MAAM,cAQjE,CAAC"}
|
|
@@ -38,12 +38,13 @@ export const isDecoNameType = (name, type) => name.endsWith(upperFirstLetter(typ
|
|
|
38
38
|
*
|
|
39
39
|
* @param basename - The base decorator name.
|
|
40
40
|
* @param namespace - Optional namespace prefix for the function name.
|
|
41
|
-
* @param
|
|
42
|
-
* @param
|
|
41
|
+
* @param apiSuffix - Optional API type suffix override.
|
|
42
|
+
* @param funcSuffix - Optional function type suffix override.
|
|
43
43
|
* @param packageType - Target type; defaults to `DecoPackageType.common`.
|
|
44
44
|
* @returns A fully populated {@link DecoNames} object.
|
|
45
45
|
*/
|
|
46
|
-
export const decoNames = (
|
|
46
|
+
export const decoNames = (p) => {
|
|
47
|
+
const { basename, namespace, apiSuffix, funcSuffix, factorySuffix, packageType, } = p;
|
|
47
48
|
const basenameLower = lowerFirstLetter(basename);
|
|
48
49
|
const basenameUpper = upperFirstLetter(basename);
|
|
49
50
|
const doc = decoRename(basename, DecoFileType.doc);
|
|
@@ -57,8 +58,9 @@ export const decoNames = (basename, namespace, apiType, funcType, packageType) =
|
|
|
57
58
|
const annotationsRaw = decoRename(basename, "annotations");
|
|
58
59
|
const initialFuncRaw = decoRename(basename, "initial");
|
|
59
60
|
const namespaceLower = namespace ? lowerFirstLetter(namespace) : null;
|
|
60
|
-
const api =
|
|
61
|
-
const func =
|
|
61
|
+
const api = apiSuffix ? decoRename(basename, apiSuffix) : "";
|
|
62
|
+
const func = funcSuffix ? decoRename(basename, funcSuffix) : "";
|
|
63
|
+
const factory = factorySuffix ? decoRename(basename, factorySuffix) : "";
|
|
62
64
|
const shape = lowerFirstLetter(shapeRaw);
|
|
63
65
|
const schema = lowerFirstLetter(schemaRaw);
|
|
64
66
|
const validation = lowerFirstLetter(validationRaw);
|
|
@@ -78,9 +80,8 @@ export const decoNames = (basename, namespace, apiType, funcType, packageType) =
|
|
|
78
80
|
routes,
|
|
79
81
|
routesName: `${routes}Name`,
|
|
80
82
|
api,
|
|
81
|
-
apiInterface: `I${api}`,
|
|
82
83
|
func,
|
|
83
|
-
|
|
84
|
+
factory,
|
|
84
85
|
store,
|
|
85
86
|
shape,
|
|
86
87
|
schema,
|
|
@@ -97,7 +98,14 @@ export const decoNames = (basename, namespace, apiType, funcType, packageType) =
|
|
|
97
98
|
* @param namespace - Optional namespace prefix.
|
|
98
99
|
* @returns A {@link DecoNames} object for the frontend target.
|
|
99
100
|
*/
|
|
100
|
-
export const decoFrontendNames = (basename, namespace) => decoNames(
|
|
101
|
+
export const decoFrontendNames = (basename, namespace) => decoNames({
|
|
102
|
+
basename,
|
|
103
|
+
namespace,
|
|
104
|
+
apiSuffix: "feApi",
|
|
105
|
+
funcSuffix: "feFunction",
|
|
106
|
+
factorySuffix: "feFactory",
|
|
107
|
+
packageType: DecoPackageType.frontend,
|
|
108
|
+
});
|
|
101
109
|
/**
|
|
102
110
|
* Builds backend-specific decorator names with `beApi`/`beFunction` suffixes.
|
|
103
111
|
*
|
|
@@ -105,5 +113,12 @@ export const decoFrontendNames = (basename, namespace) => decoNames(basename, na
|
|
|
105
113
|
* @param namespace - Optional namespace prefix.
|
|
106
114
|
* @returns A {@link DecoNames} object for the backend target.
|
|
107
115
|
*/
|
|
108
|
-
export const decoBackendNames = (basename, namespace) => decoNames(
|
|
116
|
+
export const decoBackendNames = (basename, namespace) => decoNames({
|
|
117
|
+
basename,
|
|
118
|
+
namespace,
|
|
119
|
+
apiSuffix: "beApi",
|
|
120
|
+
funcSuffix: "beFunction",
|
|
121
|
+
factorySuffix: "beFactory",
|
|
122
|
+
packageType: DecoPackageType.backend,
|
|
123
|
+
});
|
|
109
124
|
//# sourceMappingURL=deco.names.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deco.names.js","sourceRoot":"","sources":["../../src/decorator/deco.names.ts"],"names":[],"mappings":"AACA,OAAO,EACL,YAAY,EACZ,eAAe,GAChB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EACL,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,wCAAwC,CAAC;AAEhD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAY,EAAE,IAA2B,EAAU,EAAE,CAC9E,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;AAEnD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAY,EAAU,EAAE;IACnD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,CAAC;QAC/C,IAAI,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC;YAC5B,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;IAC7D,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAE,IAAkB,EAAW,EAAE,CAC1E,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;AAExC;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"deco.names.js","sourceRoot":"","sources":["../../src/decorator/deco.names.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,7 +68,7 @@ export class Generator {
|
|
|
68
68
|
? decoBackendNames(extr.name, extr.namespace)
|
|
69
69
|
: packageType === DecoPackageType.frontend
|
|
70
70
|
? decoFrontendNames(extr.name, extr.namespace)
|
|
71
|
-
: decoNames(extr.name, extr.namespace);
|
|
71
|
+
: decoNames({ basename: extr.name, namespace: extr.namespace });
|
|
72
72
|
allNames.push(names);
|
|
73
73
|
runItems[extr.name] = {
|
|
74
74
|
decorator,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Generator.js","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Generator.js","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ export declare class GeneratorBackend extends Generator {
|
|
|
16
16
|
protected buildConstants(virtualKeysName: string, virtuals: AnnotationsProperty<DecoPropertyBase>[], datePathsName: string, datePaths: string[], sideEffectsName: string, sideEffects: AnnotationsProperty<DecoPropertyBase>[]): string[];
|
|
17
17
|
protected buildApi(raw: DecoratorData, names: DecoNames, virtualKeysName: string, datePathsName: string, sideEffectsName: string, virtuals: AnnotationsProperty<DecoPropertyBase>[], sideEffects: AnnotationsProperty<DecoPropertyBase>[]): string[];
|
|
18
18
|
protected buildFunction(names: DecoNames): string[];
|
|
19
|
+
protected buildFactory(names: DecoNames): string[];
|
|
19
20
|
protected buildStore(names: DecoNames, namespace: string): string[];
|
|
20
21
|
protected buildCreateCallable(names: DecoNames, env: GeneratorEnv): {
|
|
21
22
|
code: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorBackend.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorBackend.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EACd,MAAM,2CAA2C,CAAC;AAWnD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D;;;;;;GAMG;AACH,qBAAa,gBAAiB,SAAQ,SAAS;;cASpB,SAAS,CAChC,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"GeneratorBackend.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorBackend.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,aAAa,EACd,MAAM,2CAA2C,CAAC;AAWnD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAG3C,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EACV,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,uCAAuC,CAAC;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D;;;;;;GAMG;AACH,qBAAa,gBAAiB,SAAQ,SAAS;;cASpB,SAAS,CAChC,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAsErC,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,MAAM,EAAE;IAqBX,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,MAAM,EAAE;IAqDX,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IAkBnD,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IAalD,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;IAQnE,SAAS,CAAC,mBAAmB,CAC3B,KAAK,EAAE,SAAS,EAChB,GAAG,EAAE,YAAY,GAChB;QACD,IAAI,EAAE,MAAM,EAAE,CAAC;QACf,OAAO,EAAE,YAAY,EAAE,CAAC;KACzB;IAmBD,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,YAAY,GAAG,MAAM,EAAE;CAe1E;;AAED,wBAAsC"}
|
|
@@ -76,7 +76,7 @@ export class GeneratorBackend extends Generator {
|
|
|
76
76
|
: hasCrudRoute(raw.routes)
|
|
77
77
|
? "BackendDefaultApi"
|
|
78
78
|
: "BackendStoreApi";
|
|
79
|
-
code.push(`export
|
|
79
|
+
code.push(`export class ${names.api} extends ${superClassName}<${names.docStore}, ${names.doc}, ${names.docSideEffects}, ${names.store}, Validation<${names.doc}>>`, `implements ApiFromRoutes<${names.routes}>`, "{", ` public constructor() { super("${names.basenameLower}", ${datePathsName}, ${virtualKeysName}, ${sideEffectsName}); }`, "");
|
|
80
80
|
if (virtuals.length === 0) {
|
|
81
81
|
// create dummy method with 1:1 mapping
|
|
82
82
|
code.push(` // default 1:1 mapping`, ` protected async loadVirtualFields(doc: ${names.docStore}): Promise<${names.doc}> {return doc as ${names.doc};}`, "");
|
|
@@ -103,12 +103,12 @@ export class GeneratorBackend extends Generator {
|
|
|
103
103
|
}
|
|
104
104
|
buildFunction(names) {
|
|
105
105
|
return [
|
|
106
|
-
`export
|
|
106
|
+
`export class ${names.func} extends IBackendFunction<${names.docStore}, ${names.doc}, ${names.docSideEffects}, ${names.api}> {`,
|
|
107
107
|
` public constructor(`,
|
|
108
108
|
" projectId: string,",
|
|
109
109
|
" region: string,",
|
|
110
110
|
" serviceAccount: string,",
|
|
111
|
-
` api?: ${names.
|
|
111
|
+
` api?: ${names.api},`,
|
|
112
112
|
" name?: string",
|
|
113
113
|
` ) { super(name ?? "${names.functionName}", projectId, region, serviceAccount, ${names.basenameLower}DatePaths);`,
|
|
114
114
|
` if (api) this.useApi(api); this.useRoutes(${names.routesName}); }`,
|
|
@@ -118,6 +118,18 @@ export class GeneratorBackend extends Generator {
|
|
|
118
118
|
"}",
|
|
119
119
|
];
|
|
120
120
|
}
|
|
121
|
+
buildFactory(names) {
|
|
122
|
+
return [
|
|
123
|
+
// todo differ between IApiStoreFactory and IApiFactory (lead/non-lead)
|
|
124
|
+
`export class ${names.factory} extends IApiStoreFactory<${names.docStore}, ${names.doc}, ${names.api}, ${names.docSideEffects}, ${names.validation}, ${names.store}> {`,
|
|
125
|
+
` protected override _createApi(name: string): ${names.api} { return new ${names.api}(); }`,
|
|
126
|
+
"",
|
|
127
|
+
` protected override _createValidation(name: string): ${names.validation} { return new ${names.validation}(name); }`,
|
|
128
|
+
"",
|
|
129
|
+
` protected override _createStore(_name: string): ${names.store} { return new ${names.store}(); }`,
|
|
130
|
+
"}",
|
|
131
|
+
];
|
|
132
|
+
}
|
|
121
133
|
buildStore(names, namespace) {
|
|
122
134
|
return [
|
|
123
135
|
`export class ${names.store} extends Store<${names.doc}> {`,
|
|
@@ -129,7 +141,7 @@ export class GeneratorBackend extends Generator {
|
|
|
129
141
|
return {
|
|
130
142
|
aliases: [{ real: "CallableFunction", alias: "ZCallableFunction" }],
|
|
131
143
|
code: [
|
|
132
|
-
`export const create${names.basename}CallableFunction = (createFunc: (projectId: string, region: string, serviceAccount: string) => ${names.
|
|
144
|
+
`export const create${names.basename}CallableFunction = (createFunc: (projectId: string, region: string, serviceAccount: string) => ${names.func}): ZCallableFunction<FunctionRequest<unknown>,Promise<FunctionResponse<unknown>>,unknown> => {`,
|
|
133
145
|
` const store = new ${names.store}();`,
|
|
134
146
|
"",
|
|
135
147
|
` const func = createFunc("${env.projectId}", "${env.region}", "${env.serviceAccount}");`,
|
|
@@ -145,7 +157,7 @@ export class GeneratorBackend extends Generator {
|
|
|
145
157
|
}
|
|
146
158
|
buildCreateHttps(names, env) {
|
|
147
159
|
return [
|
|
148
|
-
`export const create${names.basename}HttpsFunction = (createFunc: (projectId: string, region: string, serviceAccount: string) => ${names.
|
|
160
|
+
`export const create${names.basename}HttpsFunction = (createFunc: (projectId: string, region: string, serviceAccount: string) => ${names.func}, auth?: ExpressAuthHandler | null): HttpsFunction => {`,
|
|
149
161
|
` const store = new ${names.store}();`,
|
|
150
162
|
"",
|
|
151
163
|
` const func = createFunc("${env.projectId}", "${env.region}", "${env.serviceAccount}");`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorBackend.js","sourceRoot":"","sources":["../../src/generator/GeneratorBackend.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"GeneratorBackend.js","sourceRoot":"","sources":["../../src/generator/GeneratorBackend.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,7 +62,7 @@ export class GeneratorComposite extends Generator {
|
|
|
62
62
|
code.push(`import { CompositeBackendFunction } from "@mxpicture/gcp-functions-backend/function";`, `import type { ExpressAuthHandler } from "@mxpicture/gcp-functions-backend/types";`, "");
|
|
63
63
|
code.push(`export interface ${factoriesType} {`, ...items.map((item) => {
|
|
64
64
|
const names = item.names;
|
|
65
|
-
return ` ${names.basenameLower}: (projectId: string, region: string, serviceAccount: string) => ${names.
|
|
65
|
+
return ` ${names.basenameLower}: (projectId: string, region: string, serviceAccount: string) => ${names.func};`;
|
|
66
66
|
}), "}", "");
|
|
67
67
|
const wireTopic = (item) => {
|
|
68
68
|
const names = item.names;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorComposite.js","sourceRoot":"","sources":["../../src/generator/GeneratorComposite.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"GeneratorComposite.js","sourceRoot":"","sources":["../../src/generator/GeneratorComposite.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorFrontend.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorFrontend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAY3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AAEnC;;;;;;GAMG;AACH,qBAAa,iBAAkB,SAAQ,SAAS;;cASrB,SAAS,CAChC,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"GeneratorFrontend.d.ts","sourceRoot":"","sources":["../../src/generator/GeneratorFrontend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAY3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,KAAK,EACV,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AAEnC;;;;;;GAMG;AACH,qBAAa,iBAAkB,SAAQ,SAAS;;cASrB,SAAS,CAChC,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IA+BrC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;IA6ClE,SAAS,CAAC,aAAa,CACrB,KAAK,EAAE,SAAS,EAChB,SAAS,EAAE,MAAM,EAAE,EACnB,SAAS,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,GACxD,MAAM,EAAE;IAsBX,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,GAAG,MAAM,EAAE;CAWlD;;AAED,wBAAuC"}
|
|
@@ -25,7 +25,10 @@ export class GeneratorFrontend extends Generator {
|
|
|
25
25
|
const header = item.decorator.extractAnnotations();
|
|
26
26
|
const datePaths = extractAnnotationsPaths(header.properties, DecoPropertyType.date);
|
|
27
27
|
const composite = raw.standalone === false
|
|
28
|
-
? {
|
|
28
|
+
? {
|
|
29
|
+
topic: names.basenameLower,
|
|
30
|
+
functionName: raw.namespace ?? "default",
|
|
31
|
+
}
|
|
29
32
|
: null;
|
|
30
33
|
const code = [
|
|
31
34
|
...this.buildFunction(names, datePaths, composite),
|
|
@@ -41,7 +44,7 @@ export class GeneratorFrontend extends Generator {
|
|
|
41
44
|
const superClassName = hasCrudRoute(routes) || hasCustomCrudRoute(routes)
|
|
42
45
|
? `FrontendApi<${names.doc}, ${names.func}>`
|
|
43
46
|
: `IFrontendApi<${names.func}>`;
|
|
44
|
-
code.push(`export type ${names.
|
|
47
|
+
code.push(`export type ${names.api} = ApiFromRoutes<${names.routes}>;`, "", `export class ${names.api} extends ${superClassName}`, `implements ${names.api}`, "{", `public constructor(func?: ${names.func}) { super("${names.basenameLower}"); if (func) this.useFunc(func); }`, "");
|
|
45
48
|
for (const [routeName, params] of Object.entries(routes)) {
|
|
46
49
|
if (isCrudRoute(params) || isCustomCrudRoute(params))
|
|
47
50
|
continue; // ignore crud --> provided by super class
|
|
@@ -62,7 +65,9 @@ export class GeneratorFrontend extends Generator {
|
|
|
62
65
|
return code;
|
|
63
66
|
}
|
|
64
67
|
buildFunction(names, datePaths, composite) {
|
|
65
|
-
const functionName = composite
|
|
68
|
+
const functionName = composite
|
|
69
|
+
? composite.functionName
|
|
70
|
+
: names.functionName;
|
|
66
71
|
const outgressBody = composite
|
|
67
72
|
? `return super.outgress({ ...request, topic: "${composite.topic}" } as CompositeFunctionRequest<REQ>);`
|
|
68
73
|
: "return super.outgress(request);";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorFrontend.js","sourceRoot":"","sources":["../../src/generator/GeneratorFrontend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,4CAA4C,CAAC;AAQrF;;;;;;GAMG;AACH,MAAM,OAAO,iBAAkB,SAAQ,SAAS;IAC9C;QACE,KAAK,CAAC;YACJ,QAAQ,EAAE,YAAY,CAAC,QAAQ;YAC/B,GAAG,EAAE,iBAAiB,CAAC,EAAE;YACzB,WAAW,EAAE,eAAe,CAAC,QAAQ;SACtC,CAAC,CAAC;IACL,CAAC;IAEkB,KAAK,CAAC,SAAS,CAChC,IAAsB,EACtB,GAAiB;QAEjB,KAAK,GAAG,CAAC;QACT,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACrE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,CAAC;QACnD,MAAM,SAAS,GAAG,uBAAuB,CACvC,MAAM,CAAC,UAAU,EACjB,gBAAgB,CAAC,IAAI,CACtB,CAAC;QAEF,MAAM,SAAS,GACb,GAAG,CAAC,UAAU,KAAK,KAAK;YACtB,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"GeneratorFrontend.js","sourceRoot":"","sources":["../../src/generator/GeneratorFrontend.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EACL,iBAAiB,EACjB,YAAY,EACZ,gBAAgB,EAChB,eAAe,EACf,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,2CAA2C,CAAC;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,4CAA4C,CAAC;AAQrF;;;;;;GAMG;AACH,MAAM,OAAO,iBAAkB,SAAQ,SAAS;IAC9C;QACE,KAAK,CAAC;YACJ,QAAQ,EAAE,YAAY,CAAC,QAAQ;YAC/B,GAAG,EAAE,iBAAiB,CAAC,EAAE;YACzB,WAAW,EAAE,eAAe,CAAC,QAAQ;SACtC,CAAC,CAAC;IACL,CAAC;IAEkB,KAAK,CAAC,SAAS,CAChC,IAAsB,EACtB,GAAiB;QAEjB,KAAK,GAAG,CAAC;QACT,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,CAAC;QACxC,IAAI,CAAC,GAAG,CAAC,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC;QACrE,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;QAEzB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,EAAE,CAAC;QACnD,MAAM,SAAS,GAAG,uBAAuB,CACvC,MAAM,CAAC,UAAU,EACjB,gBAAgB,CAAC,IAAI,CACtB,CAAC;QAEF,MAAM,SAAS,GACb,GAAG,CAAC,UAAU,KAAK,KAAK;YACtB,CAAC,CAAC;gBACE,KAAK,EAAE,KAAK,CAAC,aAAa;gBAC1B,YAAY,EAAE,GAAG,CAAC,SAAS,IAAI,SAAS;aACzC;YACH,CAAC,CAAC,IAAI,CAAC;QAEX,MAAM,IAAI,GAAG;YACX,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,CAAC;YAClD,EAAE;YACF,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC;YACnC,EAAE;YACF,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;SAC3B,CAAC;QAEF,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC;IAC5E,CAAC;IAES,QAAQ,CAAC,MAAkB,EAAE,KAAgB;QACrD,MAAM,IAAI,GAAa,EAAE,CAAC;QAC1B,MAAM,cAAc,GAClB,YAAY,CAAC,MAAM,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC;YAChD,CAAC,CAAC,eAAe,KAAK,CAAC,GAAG,KAAK,KAAK,CAAC,IAAI,GAAG;YAC5C,CAAC,CAAC,gBAAgB,KAAK,CAAC,IAAI,GAAG,CAAC;QAEpC,IAAI,CAAC,IAAI,CACP,eAAe,KAAK,CAAC,GAAG,oBAAoB,KAAK,CAAC,MAAM,IAAI,EAC5D,EAAE,EACF,gBAAgB,KAAK,CAAC,GAAG,YAAY,cAAc,EAAE,EACrD,cAAc,KAAK,CAAC,GAAG,EAAE,EACzB,GAAG,EACH,6BAA6B,KAAK,CAAC,IAAI,cAAc,KAAK,CAAC,aAAa,qCAAqC,EAC7G,EAAE,CACH,CAAC;QAEF,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YACzD,IAAI,WAAW,CAAC,MAAM,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC;gBAAE,SAAS,CAAC,0CAA0C;YAE1G,IAAI,UAAU,GAAG,SAAS,CAAC;YAC3B,IAAI,WAAW,GAAkB,IAAI,CAAC;YAEtC,IAAI,MAAM,CAAC,WAAW,KAAK,OAAO,IAAI,MAAM,CAAC,WAAW,KAAK,MAAM,EAAE,CAAC;gBACpE,UAAU,IAAI,aAAa,KAAK,CAAC,MAAM,KAAK,SAAS,gBAAgB,CAAC;gBACtE,WAAW,GAAG,SAAS,CAAC;YAC1B,CAAC;iBAAM,CAAC;gBACN,UAAU,IAAI,IAAI,CAAC;gBACnB,WAAW,GAAG,IAAI,CAAC;YACrB,CAAC;YAED,UAAU,IAAI,aAAa,KAAK,CAAC,MAAM,KAAK,SAAS,iBAAiB,CAAC;YAEvE,IAAI,CAAC,IAAI,CACP,iBAAiB,UAAU,IAAI,EAC/B,mDAAmD,SAAS,YAAY,WAAW,gBAAgB,KAAK,CAAC,MAAM,KAAK,SAAS,iBAAiB,EAC9I,IAAI,EACJ,EAAE,CACH,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAES,aAAa,CACrB,KAAgB,EAChB,SAAmB,EACnB,SAAyD;QAEzD,MAAM,YAAY,GAAG,SAAS;YAC5B,CAAC,CAAC,SAAS,CAAC,YAAY;YACxB,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC;QACvB,MAAM,YAAY,GAAG,SAAS;YAC5B,CAAC,CAAC,+CAA+C,SAAS,CAAC,KAAK,wCAAwC;YACxG,CAAC,CAAC,iCAAiC,CAAC;QAEtC,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,8BAA8B;YACxD,mCAAmC,YAAY,MAAM,KAAK,CAAC,aAAa,8BAA8B,KAAK,CAAC,UAAU,MAAM;YAC5H,EAAE;YACF,2CAA2C;YAC3C,oIAAoI,YAAY,IAAI;YACpJ,GAAG;SACJ,CAAC;IACJ,CAAC;IAES,WAAW,CAAC,KAAgB;QACpC,OAAO;YACL,sBAAsB,KAAK,CAAC,QAAQ,eAAe;YACnD,sBAAsB,KAAK,CAAC,IAAI,KAAK;YACrC,qBAAqB,KAAK,CAAC,GAAG,SAAS;YACvC,eAAe;YACf,IAAI;YACJ,EAAE;YACF,gBAAgB,KAAK,CAAC,aAAa,eAAe,KAAK,CAAC,QAAQ,QAAQ;SACzE,CAAC;IACJ,CAAC;CACF;AAED,eAAe,IAAI,iBAAiB,EAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@mxpicture/gcp-functions-generator",
|
|
3
|
-
"version": "2.1.
|
|
3
|
+
"version": "2.1.5",
|
|
4
4
|
"description": "Tools for google cloud functions",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"author": "MXPicture",
|
|
@@ -49,9 +49,9 @@
|
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"@google-cloud/scheduler": "^5.3.1",
|
|
51
51
|
"@mxpicture/build-api": "^0.4.37",
|
|
52
|
-
"@mxpicture/gcp-functions-backend": "^2.1.
|
|
53
|
-
"@mxpicture/gcp-functions-common": "^2.1.
|
|
54
|
-
"@mxpicture/gcp-functions-frontend": "^2.1.
|
|
52
|
+
"@mxpicture/gcp-functions-backend": "^2.1.5",
|
|
53
|
+
"@mxpicture/gcp-functions-common": "^2.1.5",
|
|
54
|
+
"@mxpicture/gcp-functions-frontend": "^2.1.5",
|
|
55
55
|
"google-auth-library": "^10.6.2",
|
|
56
56
|
"googleapis": "^171.4.0",
|
|
57
57
|
"json5": "^2.2.3"
|