@mxpicture/gcp-functions-generator 1.2.36 → 1.2.38
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/common/resolve.common.js +1 -1
- package/dist/common/resolve.common.js.map +1 -1
- package/dist/exports.gen.json +5 -0
- package/dist/run/GeneratorFs.d.ts +6 -2
- package/dist/run/GeneratorFs.d.ts.map +1 -1
- package/dist/run/GeneratorFs.js +14 -3
- package/dist/run/GeneratorFs.js.map +1 -1
- package/dist/run/GeneratorRun.d.ts +2 -2
- package/dist/run/GeneratorRun.d.ts.map +1 -1
- package/dist/run/GeneratorRun.js +13 -8
- package/dist/run/GeneratorRun.js.map +1 -1
- package/package.json +4 -4
|
@@ -4,7 +4,7 @@ import { relative, resolve } from "node:path";
|
|
|
4
4
|
export const generatorDirPath = resolve(import.meta.dirname, "../generator");
|
|
5
5
|
export const isPrimitiveType = (type) => decoPropertyPrimitives.includes(type);
|
|
6
6
|
const importToCode = (imp) => {
|
|
7
|
-
if (imp.valueProps.length === 0)
|
|
7
|
+
if (imp.valueProps.length === 0 && imp.typeProps.length === 0)
|
|
8
8
|
return null;
|
|
9
9
|
const results = [];
|
|
10
10
|
if (imp.valueProps.length > 0)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.common.js","sourceRoot":"","sources":["../../src/common/resolve.common.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,eAAe,GAChB,MAAM,2CAA2C,CAAC;AAOnD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE9C,4DAA4D;AAC5D,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE,CAC9C,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAExC,MAAM,YAAY,GAAG,CAAC,GAAe,EAAiB,EAAE;IACtD,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve.common.js","sourceRoot":"","sources":["../../src/common/resolve.common.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,eAAe,GAChB,MAAM,2CAA2C,CAAC;AAOnD,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE9C,4DAA4D;AAC5D,MAAM,CAAC,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;AAE7E,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,EAAE,CAC9C,sBAAsB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;AAExC,MAAM,YAAY,GAAG,CAAC,GAAe,EAAiB,EAAE;IACtD,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,GAAG,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAC3E,MAAM,OAAO,GAAa,EAAE,CAAC;IAE7B,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC;IAE9E,IAAI,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC;QAC1B,OAAO,CAAC,IAAI,CACV,iBAAiB,GAAG,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,GAAG,CAAC,IAAI,IAAI,CAClE,CAAC;IAEJ,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,OAAqB,EAAY,EAAE,CAC/D,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;AAE1D,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,IAAmB,EACnB,EAAqB,EACrB,GAAgB,EACR,EAAE;IACV,MAAM,OAAO,GACX,EAAE,CAAC,WAAW,KAAK,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;IAE1E,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,eAAe,CAAC,GAAG;YACtB,OAAO,EAAE,CAAC,WAAW,CAAC;QAExB,KAAK,eAAe,CAAC,GAAG;YACtB,OAAO,QAAQ,CACb,IAAI,CAAC,cAAc,EACnB,OAAO,CAAC,MAAM,KAAK,iBAAiB,CAAC,MAAM;gBACzC,CAAC,CAAC,EAAE,CAAC,iBAAiB;gBACtB,CAAC,CAAC,EAAE,CAAC,iBAAiB,CACzB,CAAC;QAEJ;YACE,MAAM,IAAI,KAAK,CACb,4BAA4B,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAC7D,CAAC;IACN,CAAC;AACH,CAAC,CAAC"}
|
package/dist/exports.gen.json
CHANGED
|
@@ -1357,6 +1357,11 @@
|
|
|
1357
1357
|
"kind": "ClassDeclaration",
|
|
1358
1358
|
"source": "@mxpicture/gcp-functions-generator/generator"
|
|
1359
1359
|
},
|
|
1360
|
+
{
|
|
1361
|
+
"name": "IssueLogger",
|
|
1362
|
+
"kind": "TypeAliasDeclaration",
|
|
1363
|
+
"source": "@mxpicture/gcp-functions-generator/run"
|
|
1364
|
+
},
|
|
1360
1365
|
{
|
|
1361
1366
|
"name": "JobConfig",
|
|
1362
1367
|
"kind": "InterfaceDeclaration",
|
|
@@ -6,15 +6,18 @@ import { GeneratorBase } from "./GeneratorBase.js";
|
|
|
6
6
|
import { BaseImports, VirtualFilesHandler } from "@mxpicture/build-api/imp";
|
|
7
7
|
import type { GeneratorFsExport } from "@mxpicture/gcp-functions-common/types";
|
|
8
8
|
import type { PackageAPI } from "@mxpicture/build-api/types";
|
|
9
|
+
export type IssueLogger = (file: GeneratorFile, checkIteration: number) => void;
|
|
9
10
|
export declare class GeneratorFs extends GeneratorBase {
|
|
10
11
|
readonly rootPath: string;
|
|
12
|
+
protected readonly issueLogger?: IssueLogger | undefined;
|
|
11
13
|
readonly pkgsDir: string;
|
|
12
14
|
protected _pkgs: GeneratorPackage[] | null;
|
|
13
15
|
protected _handler: VirtualFilesHandler<GeneratorFile>;
|
|
14
16
|
protected _imports: BaseImports<GeneratorFile>;
|
|
17
|
+
protected _checkIteration: number;
|
|
15
18
|
protected _lastExps: GeneratorFsExport[];
|
|
16
19
|
protected _lastPkgs: PackageAPI[];
|
|
17
|
-
constructor(rootPath: string, tsConfigFilePath: string, pkgsDir?: string);
|
|
20
|
+
constructor(rootPath: string, tsConfigFilePath: string, issueLogger?: IssueLogger | undefined, pkgsDir?: string);
|
|
18
21
|
get realPath(): string;
|
|
19
22
|
get virtualPath(): string;
|
|
20
23
|
get pkgs(): GeneratorPackage[];
|
|
@@ -26,7 +29,8 @@ export declare class GeneratorFs extends GeneratorBase {
|
|
|
26
29
|
rerunImports(): void;
|
|
27
30
|
get exps(): GeneratorFsExport[];
|
|
28
31
|
get files(): GeneratorFile[];
|
|
29
|
-
|
|
32
|
+
hasDiagnostics(): boolean;
|
|
33
|
+
check4diagnostics(): number;
|
|
30
34
|
load(): Promise<this>;
|
|
31
35
|
persist(): Promise<this>;
|
|
32
36
|
}
|
|
@@ -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,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D,qBAAa,WAAY,SAAQ,aAAa;
|
|
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,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC5E,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAE7D,MAAM,MAAM,WAAW,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,KAAK,IAAI,CAAC;AAEhF,qBAAa,WAAY,SAAQ,aAAa;aAU1B,QAAQ,EAAE,MAAM;IAEhC,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW;aAC5B,OAAO,EAAE,MAAM;IAZjC,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAQ;IAClD,SAAS,CAAC,QAAQ,EAAE,mBAAmB,CAAC,aAAa,CAAC,CAAC;IACvD,SAAS,CAAC,QAAQ,EAAE,WAAW,CAAC,aAAa,CAAC,CAAC;IAC/C,SAAS,CAAC,eAAe,EAAE,MAAM,CAAM;IAEvC,SAAS,CAAC,SAAS,EAAE,iBAAiB,EAAE,CAAM;IAC9C,SAAS,CAAC,SAAS,EAAE,UAAU,EAAE,CAAM;gBAGrB,QAAQ,EAAE,MAAM,EAChC,gBAAgB,EAAE,MAAM,EACL,WAAW,CAAC,EAAE,WAAW,YAAA,EAC5B,OAAO,GAAE,MAAmB;IAO9C,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,CAAC,IAAI,EAAE,iBAAiB,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAI;IAM/D,YAAY,IAAI,IAAI;IAO3B,IAAW,IAAI,IAAI,iBAAiB,EAAE,CAErC;IAED,IAAW,KAAK,IAAI,aAAa,EAAE,CAElC;IAEM,cAAc,IAAI,OAAO;IAIzB,iBAAiB,IAAI,MAAM;IAgBZ,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAK/C"}
|
package/dist/run/GeneratorFs.js
CHANGED
|
@@ -5,15 +5,18 @@ import { GeneratorBase } from "./GeneratorBase.js";
|
|
|
5
5
|
import { BaseImports, VirtualFilesHandler } from "@mxpicture/build-api/imp";
|
|
6
6
|
export class GeneratorFs extends GeneratorBase {
|
|
7
7
|
rootPath;
|
|
8
|
+
issueLogger;
|
|
8
9
|
pkgsDir;
|
|
9
10
|
_pkgs = null;
|
|
10
11
|
_handler;
|
|
11
12
|
_imports;
|
|
13
|
+
_checkIteration = -1;
|
|
12
14
|
_lastExps = [];
|
|
13
15
|
_lastPkgs = [];
|
|
14
|
-
constructor(rootPath, tsConfigFilePath, pkgsDir = "packages") {
|
|
16
|
+
constructor(rootPath, tsConfigFilePath, issueLogger, pkgsDir = "packages") {
|
|
15
17
|
super();
|
|
16
18
|
this.rootPath = rootPath;
|
|
19
|
+
this.issueLogger = issueLogger;
|
|
17
20
|
this.pkgsDir = pkgsDir;
|
|
18
21
|
this._handler = new VirtualFilesHandler(tsConfigFilePath);
|
|
19
22
|
this._imports = new BaseImports(this._handler);
|
|
@@ -63,12 +66,20 @@ export class GeneratorFs extends GeneratorBase {
|
|
|
63
66
|
get files() {
|
|
64
67
|
return this.pkgs.flatMap((pkg) => pkg.dirs.flatMap((dir) => dir.files));
|
|
65
68
|
}
|
|
66
|
-
|
|
69
|
+
hasDiagnostics() {
|
|
70
|
+
return !!this.files.find((file) => file.getDiagnostics().length > 0);
|
|
71
|
+
}
|
|
72
|
+
check4diagnostics() {
|
|
73
|
+
this._checkIteration++;
|
|
67
74
|
const files = this.files;
|
|
68
75
|
this._handler.files.length = 0;
|
|
69
76
|
this._handler.files.push(...files);
|
|
70
77
|
this._handler.runDiagnostics();
|
|
71
|
-
|
|
78
|
+
if (this.issueLogger) {
|
|
79
|
+
const log = this.issueLogger;
|
|
80
|
+
files.forEach((file) => log(file, this._checkIteration));
|
|
81
|
+
}
|
|
82
|
+
return this._checkIteration;
|
|
72
83
|
}
|
|
73
84
|
async load() {
|
|
74
85
|
const pkgDirs = await readdir(this.realPath);
|
|
@@ -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;AACnD,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"GeneratorFs.js","sourceRoot":"","sources":["../../src/run/GeneratorFs.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,10 +11,10 @@ export declare class GeneratorRun {
|
|
|
11
11
|
readonly template: GeneratorTemplate;
|
|
12
12
|
readonly allowedPkgsAndOrder: string[] | null;
|
|
13
13
|
constructor(rootPath: string, templatesPath: string, fs: GeneratorFs, env: GeneratorEnv, decoResolve: DecoResolve, allowedPkgsAndOrder?: string[] | null);
|
|
14
|
-
run(): Promise<void>;
|
|
14
|
+
run(importRetries?: number): Promise<void>;
|
|
15
15
|
runDeco(): Promise<DecoFile[]>;
|
|
16
16
|
runCode(decoFiles: DecoFile[]): Promise<void>;
|
|
17
|
-
runImpExports(): Promise<void>;
|
|
17
|
+
runImpExports(importRetries?: number): Promise<void>;
|
|
18
18
|
/**
|
|
19
19
|
* Dynamically imports a generator file and returns a cached {@link GeneratorRunFile}.
|
|
20
20
|
*
|
|
@@ -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;AAUhF,qBAAa,YAAY;aAKL,QAAQ,EAAE,MAAM;aAChB,aAAa,EAAE,MAAM;aACrB,EAAE,EAAE,WAAW;aACf,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,EACf,GAAG,EAAE,YAAY,EACjB,WAAW,EAAE,WAAW,EACxC,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI;IAM1B,GAAG,
|
|
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;AAUhF,qBAAa,YAAY;aAKL,QAAQ,EAAE,MAAM;aAChB,aAAa,EAAE,MAAM;aACrB,EAAE,EAAE,WAAW;aACf,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,EACf,GAAG,EAAE,YAAY,EACjB,WAAW,EAAE,WAAW,EACxC,mBAAmB,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI;IAM1B,GAAG,CAAC,aAAa,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAQ9B,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7C,aAAa,CAAC,aAAa,GAAE,MAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAiCpE;;;;;OAKG;IACU,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAY7D"}
|
package/dist/run/GeneratorRun.js
CHANGED
|
@@ -23,11 +23,11 @@ export class GeneratorRun {
|
|
|
23
23
|
this.template = new GeneratorTemplate(templatesPath);
|
|
24
24
|
this.allowedPkgsAndOrder = allowedPkgsAndOrder ?? null;
|
|
25
25
|
}
|
|
26
|
-
async run() {
|
|
26
|
+
async run(importRetries = 2) {
|
|
27
27
|
await this.fs.load();
|
|
28
28
|
const decoFiles = await this.runDeco();
|
|
29
29
|
await this.runCode(decoFiles);
|
|
30
|
-
await this.runImpExports();
|
|
30
|
+
await this.runImpExports(importRetries);
|
|
31
31
|
}
|
|
32
32
|
async runDeco() {
|
|
33
33
|
await this.template.load();
|
|
@@ -38,7 +38,7 @@ export class GeneratorRun {
|
|
|
38
38
|
const entries = await this.createGenerators();
|
|
39
39
|
await Promise.all(entries.map((entry) => entry.gen.run4codes(decoFiles, this.env, this.fs, this.decoResolve)));
|
|
40
40
|
}
|
|
41
|
-
async runImpExports() {
|
|
41
|
+
async runImpExports(importRetries = 2) {
|
|
42
42
|
const exps = this.fs.exps;
|
|
43
43
|
const allPkgs = [
|
|
44
44
|
...(await readExportsBuildCli()),
|
|
@@ -52,11 +52,16 @@ export class GeneratorRun {
|
|
|
52
52
|
else {
|
|
53
53
|
pkgs.push(...allPkgs);
|
|
54
54
|
}
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
55
|
+
// 1. check for missing imports
|
|
56
|
+
// 2. check faulty imports (type or non-type)
|
|
57
|
+
for (let retry = 0; retry < importRetries; retry++) {
|
|
58
|
+
this.fs.check4diagnostics();
|
|
59
|
+
if (!this.fs.hasDiagnostics())
|
|
60
|
+
return;
|
|
61
|
+
this.fs.runImports(exps, pkgs);
|
|
62
|
+
}
|
|
63
|
+
// check for other/final issues
|
|
64
|
+
this.fs.check4diagnostics();
|
|
60
65
|
}
|
|
61
66
|
/**
|
|
62
67
|
* Dynamically imports a generator file and returns a cached {@link GeneratorRunFile}.
|
|
@@ -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;AACjE,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,UAAU,MAAM,YAAY,CAAC;AAGpC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;AAEtC,MAAM,OAAO,YAAY;IAKL;IACA;IACA;IACA;IACA;IARF,QAAQ,CAAoB;IAC5B,mBAAmB,CAAkB;IAErD,YACkB,QAAgB,EAChB,aAAqB,EACrB,EAAe,EACf,GAAiB,EACjB,WAAwB,EACxC,mBAAqC;QALrB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,kBAAa,GAAb,aAAa,CAAQ;QACrB,OAAE,GAAF,EAAE,CAAa;QACf,QAAG,GAAH,GAAG,CAAc;QACjB,gBAAW,GAAX,WAAW,CAAa;QAGxC,IAAI,CAAC,QAAQ,GAAG,IAAI,iBAAiB,CAAC,aAAa,CAAC,CAAC;QACrD,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,IAAI,IAAI,CAAC;IACzD,CAAC;IAEM,KAAK,CAAC,GAAG;
|
|
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.38",
|
|
4
4
|
"description": "Tools for google cloud functions",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"author": "MXPicture",
|
|
@@ -37,9 +37,9 @@
|
|
|
37
37
|
"dependencies": {
|
|
38
38
|
"@google-cloud/scheduler": "^5.3.1",
|
|
39
39
|
"@mxpicture/build-api": "^0.3.49",
|
|
40
|
-
"@mxpicture/gcp-functions-backend": "^1.2.
|
|
41
|
-
"@mxpicture/gcp-functions-common": "^1.2.
|
|
42
|
-
"@mxpicture/gcp-functions-frontend": "^1.2.
|
|
40
|
+
"@mxpicture/gcp-functions-backend": "^1.2.38",
|
|
41
|
+
"@mxpicture/gcp-functions-common": "^1.2.38",
|
|
42
|
+
"@mxpicture/gcp-functions-frontend": "^1.2.38",
|
|
43
43
|
"@types/micromatch": "^4.0.10",
|
|
44
44
|
"google-auth-library": "^10.6.2",
|
|
45
45
|
"googleapis": "^171.4.0",
|