@mxpicture/gcp-functions-generator 1.2.86 → 1.2.88
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/run/GeneratorFile.d.ts +10 -1
- package/dist/run/GeneratorFile.d.ts.map +1 -1
- package/dist/run/GeneratorFile.js +27 -1
- package/dist/run/GeneratorFile.js.map +1 -1
- package/dist/run/GeneratorFileImports.d.ts +1 -2
- package/dist/run/GeneratorFileImports.d.ts.map +1 -1
- package/dist/run/GeneratorFileImports.js +9 -6
- package/dist/run/GeneratorFileImports.js.map +1 -1
- package/dist/run/GeneratorFs.d.ts +3 -8
- package/dist/run/GeneratorFs.d.ts.map +1 -1
- package/dist/run/GeneratorFs.js +7 -13
- package/dist/run/GeneratorFs.js.map +1 -1
- package/dist/run/GeneratorRun.d.ts +2 -6
- package/dist/run/GeneratorRun.d.ts.map +1 -1
- package/dist/run/GeneratorRun.js +11 -10
- package/dist/run/GeneratorRun.js.map +1 -1
- package/package.json +5 -5
|
@@ -4,12 +4,21 @@ import type { DecoResolve } from "@mxpicture/gcp-functions-common/types";
|
|
|
4
4
|
import { GeneratorFileImports } from "./GeneratorFileImports.js";
|
|
5
5
|
import type { FileDiagnostics, IFile } from "@mxpicture/build-api/file";
|
|
6
6
|
import type { ExportNodeFile } from "@mxpicture/build-api/types";
|
|
7
|
+
export declare const diagKey: (diag: FileDiagnostics | string) => string;
|
|
7
8
|
export declare class GeneratorFile extends GeneratorBaseFile implements IFile {
|
|
9
|
+
readonly maxTries: number;
|
|
8
10
|
protected _version: number;
|
|
9
11
|
protected _imports: GeneratorFileImports | null;
|
|
10
12
|
protected _logicCode: string[];
|
|
11
13
|
protected _diagnostics: FileDiagnostics[];
|
|
12
|
-
|
|
14
|
+
protected _tries: Map<string, number>;
|
|
15
|
+
constructor(filename: string, parent: GeneratorDirectory, maxTries?: number);
|
|
16
|
+
resetTries(): void;
|
|
17
|
+
getTries(diag: FileDiagnostics | string): number;
|
|
18
|
+
isTryable(diag: FileDiagnostics | string): boolean;
|
|
19
|
+
addTry(diag: FileDiagnostics | string): number;
|
|
20
|
+
getTryables(): FileDiagnostics[];
|
|
21
|
+
hasTryables(): boolean;
|
|
13
22
|
patchVersion(): void;
|
|
14
23
|
useResolve(res: DecoResolve): void;
|
|
15
24
|
get imports(): GeneratorFileImports;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorFile.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorFile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,qBAAa,aAAc,SAAQ,iBAAkB,YAAW,KAAK;
|
|
1
|
+
{"version":3,"file":"GeneratorFile.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorFile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACxE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAEjE,eAAO,MAAM,OAAO,GAAI,MAAM,eAAe,GAAG,MAAM,KAAG,MACM,CAAC;AAEhE,qBAAa,aAAc,SAAQ,iBAAkB,YAAW,KAAK;aAWjD,QAAQ,EAAE,MAAM;IAVlC,SAAS,CAAC,QAAQ,SAAK;IAEvB,SAAS,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAQ;IACvD,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,CAAM;IACpC,SAAS,CAAC,YAAY,EAAE,eAAe,EAAE,CAAM;IAC/C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;gBAGhD,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,kBAAkB,EACV,QAAQ,GAAE,MAAU;IAK/B,UAAU,IAAI,IAAI;IAIlB,QAAQ,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,GAAG,MAAM;IAIhD,SAAS,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,GAAG,OAAO;IAIlD,MAAM,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,GAAG,MAAM;IAU9C,WAAW,IAAI,eAAe,EAAE;IAIhC,WAAW,IAAI,OAAO;IAItB,YAAY,IAAI,IAAI;IAIpB,UAAU,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI;IAKzC,IAAW,OAAO,IAAI,oBAAoB,CAIzC;IAEM,OAAO,IAAI,MAAM;IAGjB,WAAW,IAAI,MAAM;IAGrB,UAAU,IAAI,MAAM;IAGpB,cAAc,IAAI,eAAe,EAAE;IAGnC,UAAU,IAAI,MAAM;IAIX,YAAY,IAAI,MAAM,EAAE;IAGxB,cAAc,IAAI,MAAM,EAAE;IAI1B,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI;IAIlC,UAAU,IAAI,IAAI;IAMZ,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAI3C,SAAS,KAAK,EAAE,6GAEf;IAED,SAAS,CAAC,cAAc,IAAI,cAAc,EAAE;IAQ5C,SAAS,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc;CAepE"}
|
|
@@ -1,13 +1,39 @@
|
|
|
1
1
|
import { extractExportsFilesString } from "@mxpicture/build-api/exp";
|
|
2
2
|
import { GeneratorBaseFile } from "./GeneratorBaseFile.js";
|
|
3
3
|
import { GeneratorFileImports } from "./GeneratorFileImports.js";
|
|
4
|
+
export const diagKey = (diag) => typeof diag === "string" ? diag : diag.messageText.toString();
|
|
4
5
|
export class GeneratorFile extends GeneratorBaseFile {
|
|
6
|
+
maxTries;
|
|
5
7
|
_version = 0;
|
|
6
8
|
_imports = null;
|
|
7
9
|
_logicCode = [];
|
|
8
10
|
_diagnostics = [];
|
|
9
|
-
|
|
11
|
+
_tries = new Map();
|
|
12
|
+
constructor(filename, parent, maxTries = 2) {
|
|
10
13
|
super(filename, parent);
|
|
14
|
+
this.maxTries = maxTries;
|
|
15
|
+
}
|
|
16
|
+
resetTries() {
|
|
17
|
+
this._tries.clear();
|
|
18
|
+
}
|
|
19
|
+
getTries(diag) {
|
|
20
|
+
return this._tries.get(diagKey(diag)) ?? 0;
|
|
21
|
+
}
|
|
22
|
+
isTryable(diag) {
|
|
23
|
+
return this.getTries(diag) < this.maxTries;
|
|
24
|
+
}
|
|
25
|
+
addTry(diag) {
|
|
26
|
+
const key = diagKey(diag);
|
|
27
|
+
let tries = this._tries.get(key);
|
|
28
|
+
tries = typeof tries === "number" ? tries + 1 : 0;
|
|
29
|
+
this._tries.set(key, tries);
|
|
30
|
+
return tries;
|
|
31
|
+
}
|
|
32
|
+
getTryables() {
|
|
33
|
+
return this._diagnostics.filter((diag) => this.isTryable(diag));
|
|
34
|
+
}
|
|
35
|
+
hasTryables() {
|
|
36
|
+
return this.getTryables().length > 0;
|
|
11
37
|
}
|
|
12
38
|
patchVersion() {
|
|
13
39
|
this._version++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorFile.js","sourceRoot":"","sources":["../../src/run/GeneratorFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,0BAA0B,CAAC;AAErE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAIjE,MAAM,OAAO,aAAc,SAAQ,iBAAiB;
|
|
1
|
+
{"version":3,"file":"GeneratorFile.js","sourceRoot":"","sources":["../../src/run/GeneratorFile.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,11 +11,10 @@ export declare class GeneratorFileImports {
|
|
|
11
11
|
resolver: DecoResolve;
|
|
12
12
|
aliases: ExportsAlias[];
|
|
13
13
|
protected _items: DecoImport[];
|
|
14
|
-
protected _errors: Record<string, number>;
|
|
15
14
|
constructor(file: GeneratorFile, resolver: DecoResolve);
|
|
16
15
|
get items(): DecoImport[];
|
|
17
16
|
get code(): string[];
|
|
18
|
-
runImports():
|
|
17
|
+
runImports(): boolean;
|
|
19
18
|
protected processProp(prop: string, type: GeneratorFileImportType, lookup: ExportsLookupRef): void;
|
|
20
19
|
}
|
|
21
20
|
//# sourceMappingURL=GeneratorFileImports.d.ts.map
|
|
@@ -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;
|
|
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;aAMb,IAAI,EAAE,aAAa;IAC5B,QAAQ,EAAE,WAAW;IANvB,OAAO,EAAE,YAAY,EAAE,CAAM;IAEpC,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,CAAM;gBAGlB,IAAI,EAAE,aAAa,EAC5B,QAAQ,EAAE,WAAW;IAG9B,IAAW,KAAK,IAAI,UAAU,EAAE,CAE/B;IAED,IAAW,IAAI,IAAI,MAAM,EAAE,CAE1B;IAEM,UAAU,IAAI,OAAO;IA2B5B,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,uBAAuB,EAC7B,MAAM,EAAE,gBAAgB,GACvB,IAAI;CA0CR"}
|
|
@@ -11,7 +11,6 @@ export class GeneratorFileImports {
|
|
|
11
11
|
resolver;
|
|
12
12
|
aliases = [];
|
|
13
13
|
_items = [];
|
|
14
|
-
_errors = {};
|
|
15
14
|
constructor(file, resolver) {
|
|
16
15
|
this.file = file;
|
|
17
16
|
this.resolver = resolver;
|
|
@@ -23,11 +22,14 @@ export class GeneratorFileImports {
|
|
|
23
22
|
return importsToCode(this._items);
|
|
24
23
|
}
|
|
25
24
|
runImports() {
|
|
25
|
+
const diags = this.file.getTryables();
|
|
26
|
+
if (!diags)
|
|
27
|
+
return false;
|
|
26
28
|
const packageDir = this.file.parent.parent;
|
|
27
29
|
const fs = packageDir.parent;
|
|
28
30
|
const lookup = fs.lookup.ref(packageDir.pkgType);
|
|
29
|
-
const diags = this.file.getDiagnostics();
|
|
30
31
|
for (const diag of diags) {
|
|
32
|
+
this.file.addTry(diag);
|
|
31
33
|
if (diag.code === TsErrorCode.missingImport ||
|
|
32
34
|
diag.code === TsErrorCode.valueImportMissing) {
|
|
33
35
|
this.processProp(diag.text, GeneratorFileImportType.value, lookup);
|
|
@@ -38,11 +40,12 @@ export class GeneratorFileImports {
|
|
|
38
40
|
continue;
|
|
39
41
|
}
|
|
40
42
|
}
|
|
43
|
+
return true;
|
|
41
44
|
}
|
|
42
45
|
processProp(prop, type, lookup) {
|
|
43
|
-
const {
|
|
46
|
+
const { first } = lookup.find({
|
|
44
47
|
prop,
|
|
45
|
-
|
|
48
|
+
realProp: this.aliases.find((alias) => alias.alias === prop)?.real,
|
|
46
49
|
});
|
|
47
50
|
if (!first)
|
|
48
51
|
return;
|
|
@@ -66,10 +69,10 @@ export class GeneratorFileImports {
|
|
|
66
69
|
let i = -1;
|
|
67
70
|
switch (type) {
|
|
68
71
|
case GeneratorFileImportType.type:
|
|
69
|
-
add(
|
|
72
|
+
add(prop, item.valueProps, item.typeProps);
|
|
70
73
|
break;
|
|
71
74
|
case GeneratorFileImportType.value:
|
|
72
|
-
add(
|
|
75
|
+
add(prop, item.typeProps, item.valueProps);
|
|
73
76
|
break;
|
|
74
77
|
default:
|
|
75
78
|
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;
|
|
1
|
+
{"version":3,"file":"GeneratorFileImports.js","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,15 +28,10 @@ export declare class GeneratorFs<H extends IFilesHandler<GeneratorFile>> extends
|
|
|
28
28
|
runImports(): void;
|
|
29
29
|
get files(): GeneratorFile[];
|
|
30
30
|
hasDiagnostics(): boolean;
|
|
31
|
+
hasTryableDiags(): boolean;
|
|
31
32
|
check4diagnostics(): number;
|
|
32
|
-
load(params?: ExportsLookupParamsItem[]
|
|
33
|
-
|
|
34
|
-
own?: boolean;
|
|
35
|
-
}): Promise<this>;
|
|
36
|
-
loadLookup(params?: ExportsLookupParamsItem[], use?: {
|
|
37
|
-
buildCli?: boolean;
|
|
38
|
-
own?: boolean;
|
|
39
|
-
}): Promise<void>;
|
|
33
|
+
load(params?: ExportsLookupParamsItem[]): Promise<this>;
|
|
34
|
+
loadLookup(params?: ExportsLookupParamsItem[]): Promise<void>;
|
|
40
35
|
persist(): Promise<this>;
|
|
41
36
|
}
|
|
42
37
|
//# sourceMappingURL=GeneratorFs.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorFs.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorFs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,eAAe,EACrB,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"GeneratorFs.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorFs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,eAAe,EACrB,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAE1E,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;AAEhF,qBAAa,WAAW,CACtB,CAAC,SAAS,aAAa,CAAC,aAAa,CAAC,CACtC,SAAQ,aAAa;aAQH,QAAQ,EAAE,MAAM;aAChB,OAAO,EAAE,CAAC;IAC1B,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW;aAC5B,OAAO,EAAE,MAAM;IAVjC,SAAgB,MAAM,EAAE,aAAa,CAAuB;IAE5D,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAQ;IAClD,SAAS,CAAC,QAAQ,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IAC/C,SAAS,CAAC,eAAe,EAAE,MAAM,CAAM;gBAGrB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,CAAC,EACP,WAAW,CAAC,EAAE,WAAW,YAAA,EAC5B,OAAO,GAAE,MAAmB;IAM9C,IAAW,QAAQ,IAAI,MAAM,CAE5B;IAED,IAAW,WAAW,IAAI,MAAM,CAE/B;IAED,IAAW,IAAI,IAAI,gBAAgB,EAAE,CAIpC;IAEM,GAAG,CAAC,OAAO,EAAE,eAAe,GAAG,gBAAgB;IAS/C,GAAG,CACR,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,YAAY,GACrB,kBAAkB;IAId,IAAI,CACT,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,MAAM,GACf,aAAa;IAIT,OAAO,CACZ,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,MAAM,EAAE,GACb,IAAI;IAIA,UAAU,IAAI,IAAI;IAKzB,IAAW,KAAK,IAAI,aAAa,EAAE,CAElC;IAEM,cAAc,IAAI,OAAO;IAIzB,eAAe,IAAI,OAAO;IAI1B,iBAAiB,IAAI,MAAM;IAgBZ,IAAI,CACxB,MAAM,GAAE,uBAAuB,EAAO,GACrC,OAAO,CAAC,IAAI,CAAC;IAoBH,UAAU,CACrB,MAAM,GAAE,uBAAuB,EAAO,GACrC,OAAO,CAAC,IAAI,CAAC;IASM,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAK/C"}
|
package/dist/run/GeneratorFs.js
CHANGED
|
@@ -3,8 +3,7 @@ import { GeneratorPackage } from "./GeneratorPackage.js";
|
|
|
3
3
|
import { guardDecoPackageType, guardThrow, } from "@mxpicture/gcp-functions-common/decorator";
|
|
4
4
|
import { GeneratorBase } from "./GeneratorBase.js";
|
|
5
5
|
import { FileImports } from "@mxpicture/build-api/file";
|
|
6
|
-
import {
|
|
7
|
-
import { exportsOwnPath } from "./GeneratorRun.js";
|
|
6
|
+
import { ExportsLookup } from "@mxpicture/build-api/exp";
|
|
8
7
|
export class GeneratorFs extends GeneratorBase {
|
|
9
8
|
rootPath;
|
|
10
9
|
handler;
|
|
@@ -61,6 +60,9 @@ export class GeneratorFs extends GeneratorBase {
|
|
|
61
60
|
hasDiagnostics() {
|
|
62
61
|
return !!this.files.find((file) => file.getDiagnostics().length > 0);
|
|
63
62
|
}
|
|
63
|
+
hasTryableDiags() {
|
|
64
|
+
return !!this.files.find((file) => file.hasTryables());
|
|
65
|
+
}
|
|
64
66
|
check4diagnostics() {
|
|
65
67
|
this._checkIteration++;
|
|
66
68
|
const files = this.files;
|
|
@@ -73,26 +75,18 @@ export class GeneratorFs extends GeneratorBase {
|
|
|
73
75
|
}
|
|
74
76
|
return this._checkIteration;
|
|
75
77
|
}
|
|
76
|
-
async load(params = []
|
|
78
|
+
async load(params = []) {
|
|
77
79
|
const pkgDirs = await readdir(this.realPath);
|
|
78
80
|
this._pkgs = (await Promise.allSettled(pkgDirs.map(async (pkgDir) => new GeneratorPackage(guardThrow(pkgDir, guardDecoPackageType), this).load())))
|
|
79
81
|
.filter((p) => p.status === "fulfilled")
|
|
80
82
|
.map((p) => p.value);
|
|
81
|
-
await this.loadLookup(params
|
|
83
|
+
await this.loadLookup(params);
|
|
82
84
|
return this;
|
|
83
85
|
}
|
|
84
|
-
async loadLookup(params = []
|
|
86
|
+
async loadLookup(params = []) {
|
|
85
87
|
const promises = [this.lookup.load(params)];
|
|
86
88
|
if (this._pkgs)
|
|
87
89
|
this.lookup.adds(this._pkgs.flatMap((pkg) => pkg.installedPkgs));
|
|
88
|
-
if (use?.buildCli)
|
|
89
|
-
promises.push(this.lookup.load([
|
|
90
|
-
{ filesPaths: [exportsBuildCliPath()], refKey: null, priority: 10 },
|
|
91
|
-
]));
|
|
92
|
-
if (use?.own)
|
|
93
|
-
promises.push(this.lookup.load([
|
|
94
|
-
{ filesPaths: [exportsOwnPath()], refKey: null, priority: 20 },
|
|
95
|
-
]));
|
|
96
90
|
await Promise.all(promises);
|
|
97
91
|
}
|
|
98
92
|
async persist() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorFs.js","sourceRoot":"","sources":["../../src/run/GeneratorFs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EACL,oBAAoB,EACpB,UAAU,GAGX,MAAM,2CAA2C,CAAC;AAGnD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"GeneratorFs.js","sourceRoot":"","sources":["../../src/run/GeneratorFs.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@ import type { GeneratorEnv, GeneratorRunFile } from "../common/types.common.js";
|
|
|
5
5
|
import type { ExportsLookupParamsItem } from "@mxpicture/build-api/types";
|
|
6
6
|
import type { IFilesHandler } from "@mxpicture/build-api/file";
|
|
7
7
|
import type { GeneratorFile } from "./GeneratorFile.js";
|
|
8
|
-
export declare const exportsOwnPath: () => string;
|
|
9
8
|
export declare class GeneratorRun {
|
|
10
9
|
readonly rootPath: string;
|
|
11
10
|
readonly templatesPath: string;
|
|
@@ -15,13 +14,10 @@ export declare class GeneratorRun {
|
|
|
15
14
|
readonly template: GeneratorTemplate;
|
|
16
15
|
readonly allowedPkgsAndOrder: string[] | null;
|
|
17
16
|
constructor(rootPath: string, templatesPath: string, fs: GeneratorFs<IFilesHandler<GeneratorFile>>, env: GeneratorEnv, decoResolve: DecoResolve, allowedPkgsAndOrder?: string[] | null);
|
|
18
|
-
run(params?: ExportsLookupParamsItem[]
|
|
19
|
-
buildCli?: boolean;
|
|
20
|
-
own?: boolean;
|
|
21
|
-
}): Promise<void>;
|
|
17
|
+
run(params?: ExportsLookupParamsItem[]): Promise<void>;
|
|
22
18
|
runDeco(): Promise<DecoFile[]>;
|
|
23
19
|
runCode(decoFiles: DecoFile[]): Promise<void>;
|
|
24
|
-
runImpExports(
|
|
20
|
+
runImpExports(): Promise<void>;
|
|
25
21
|
/**
|
|
26
22
|
* Dynamically imports a generator file and returns a cached {@link GeneratorRunFile}.
|
|
27
23
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorRun.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorRun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,KAAK,EACV,QAAQ,EACR,WAAW,EACZ,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"GeneratorRun.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorRun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,OAAO,KAAK,EACV,QAAQ,EACR,WAAW,EACZ,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAGhF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIxD,qBAAa,YAAY;aAKL,QAAQ,EAAE,MAAM;aAChB,aAAa,EAAE,MAAM;aACrB,EAAE,EAAE,WAAW,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;aAC7C,GAAG,EAAE,YAAY;aACjB,WAAW,EAAE,WAAW;IAR1C,SAAgB,QAAQ,EAAE,iBAAiB,CAAC;IAC5C,SAAgB,mBAAmB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;gBAGnC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,MAAM,EACrB,EAAE,EAAE,WAAW,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC,EAC7C,GAAG,EAAE,YAAY,EACjB,WAAW,EAAE,WAAW,EACxC,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI;IAM1B,GAAG,CAAC,MAAM,GAAE,uBAAuB,EAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAO1D,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAQ9B,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAmB3C;;;;;OAKG;IACU,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAY7D"}
|
package/dist/run/GeneratorRun.js
CHANGED
|
@@ -2,9 +2,7 @@ import { GeneratorTemplate } from "./GeneratorTemplate.js";
|
|
|
2
2
|
import { Generator } from "../generator/Generator.js";
|
|
3
3
|
import { DecoExtractor } from "../decorator/DecoExtractor.js";
|
|
4
4
|
import { readGeneratorRunFiles } from "../common/file.common.js";
|
|
5
|
-
|
|
6
|
-
const __dirname = import.meta.dirname;
|
|
7
|
-
export const exportsOwnPath = () => resolve(__dirname, "../exports.gen.json");
|
|
5
|
+
// const __dirname = import.meta.dirname;
|
|
8
6
|
export class GeneratorRun {
|
|
9
7
|
rootPath;
|
|
10
8
|
templatesPath;
|
|
@@ -22,11 +20,11 @@ export class GeneratorRun {
|
|
|
22
20
|
this.template = new GeneratorTemplate(templatesPath);
|
|
23
21
|
this.allowedPkgsAndOrder = allowedPkgsAndOrder ?? null;
|
|
24
22
|
}
|
|
25
|
-
async run(params = []
|
|
26
|
-
await this.fs.load(params
|
|
23
|
+
async run(params = []) {
|
|
24
|
+
await this.fs.load(params);
|
|
27
25
|
const decoFiles = await this.runDeco();
|
|
28
26
|
await this.runCode(decoFiles);
|
|
29
|
-
await this.runImpExports(
|
|
27
|
+
await this.runImpExports();
|
|
30
28
|
}
|
|
31
29
|
async runDeco() {
|
|
32
30
|
await this.template.load();
|
|
@@ -37,14 +35,17 @@ export class GeneratorRun {
|
|
|
37
35
|
const entries = await this.createGenerators();
|
|
38
36
|
await Promise.all(entries.map((entry) => entry.gen.run4codes(decoFiles, this.env, this.fs, this.decoResolve)));
|
|
39
37
|
}
|
|
40
|
-
async runImpExports(
|
|
38
|
+
async runImpExports() {
|
|
41
39
|
// prepare/read local exports
|
|
42
|
-
this.fs.files.forEach((file) =>
|
|
40
|
+
this.fs.files.forEach((file) => {
|
|
41
|
+
file.fillLookup();
|
|
42
|
+
file.resetTries();
|
|
43
|
+
});
|
|
43
44
|
// 1. check for missing imports
|
|
44
45
|
// 2. check faulty imports (type or non-type)
|
|
45
|
-
for (let retry = 0; retry <
|
|
46
|
+
for (let retry = 0; retry < 10; retry++) {
|
|
46
47
|
this.fs.check4diagnostics();
|
|
47
|
-
if (!this.fs.
|
|
48
|
+
if (!this.fs.hasTryableDiags())
|
|
48
49
|
return;
|
|
49
50
|
this.fs.runImports();
|
|
50
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorRun.js","sourceRoot":"","sources":["../../src/run/GeneratorRun.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAOtD,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"GeneratorRun.js","sourceRoot":"","sources":["../../src/run/GeneratorRun.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.88",
|
|
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.4.3",
|
|
52
|
+
"@mxpicture/gcp-functions-backend": "^1.2.88",
|
|
53
|
+
"@mxpicture/gcp-functions-common": "^1.2.88",
|
|
54
|
+
"@mxpicture/gcp-functions-frontend": "^1.2.88",
|
|
55
55
|
"google-auth-library": "^10.6.2",
|
|
56
56
|
"googleapis": "^171.4.0",
|
|
57
57
|
"json5": "^2.2.3"
|