@mxpicture/gcp-functions-generator 1.2.67 → 1.2.69
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/exports.gen.json +5 -5
- package/dist/run/GeneratorFileImports.d.ts +1 -1
- package/dist/run/GeneratorFileImports.d.ts.map +1 -1
- package/dist/run/GeneratorFileImports.js +4 -1
- package/dist/run/GeneratorFileImports.js.map +1 -1
- package/dist/run/GeneratorFs.d.ts +1 -5
- package/dist/run/GeneratorFs.d.ts.map +1 -1
- package/dist/run/GeneratorFs.js +2 -9
- package/dist/run/GeneratorFs.js.map +1 -1
- package/dist/run/GeneratorPackage.d.ts +6 -1
- package/dist/run/GeneratorPackage.d.ts.map +1 -1
- package/dist/run/GeneratorPackage.js +17 -1
- package/dist/run/GeneratorPackage.js.map +1 -1
- package/dist/run/GeneratorRun.d.ts.map +1 -1
- package/dist/run/GeneratorRun.js +2 -3
- package/dist/run/GeneratorRun.js.map +1 -1
- package/package.json +5 -5
package/dist/exports.gen.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
[
|
|
2
2
|
{
|
|
3
3
|
"packageName": "@mxpicture/gcp-functions-backend",
|
|
4
|
-
"packageVersion": "1.2.
|
|
4
|
+
"packageVersion": "1.2.68",
|
|
5
5
|
"entrypoints": [
|
|
6
6
|
{
|
|
7
7
|
"id": "@mxpicture/gcp-functions-backend/api",
|
|
@@ -144,7 +144,7 @@
|
|
|
144
144
|
},
|
|
145
145
|
{
|
|
146
146
|
"packageName": "@mxpicture/gcp-functions-common",
|
|
147
|
-
"packageVersion": "1.2.
|
|
147
|
+
"packageVersion": "1.2.68",
|
|
148
148
|
"entrypoints": [
|
|
149
149
|
{
|
|
150
150
|
"id": "@mxpicture/gcp-functions-common/annotation",
|
|
@@ -868,7 +868,7 @@
|
|
|
868
868
|
},
|
|
869
869
|
{
|
|
870
870
|
"packageName": "@mxpicture/gcp-functions-frontend",
|
|
871
|
-
"packageVersion": "1.2.
|
|
871
|
+
"packageVersion": "1.2.68",
|
|
872
872
|
"entrypoints": [
|
|
873
873
|
{
|
|
874
874
|
"id": "@mxpicture/gcp-functions-frontend/api",
|
|
@@ -1030,7 +1030,7 @@
|
|
|
1030
1030
|
},
|
|
1031
1031
|
{
|
|
1032
1032
|
"packageName": "@mxpicture/gcp-functions-fs",
|
|
1033
|
-
"packageVersion": "1.2.
|
|
1033
|
+
"packageVersion": "1.2.68",
|
|
1034
1034
|
"entrypoints": [
|
|
1035
1035
|
{
|
|
1036
1036
|
"id": "@mxpicture/gcp-functions-fs/config",
|
|
@@ -1091,7 +1091,7 @@
|
|
|
1091
1091
|
},
|
|
1092
1092
|
{
|
|
1093
1093
|
"packageName": "@mxpicture/gcp-functions-generator",
|
|
1094
|
-
"packageVersion": "1.2.
|
|
1094
|
+
"packageVersion": "1.2.68",
|
|
1095
1095
|
"entrypoints": [
|
|
1096
1096
|
{
|
|
1097
1097
|
"id": "@mxpicture/gcp-functions-generator/common",
|
|
@@ -15,7 +15,7 @@ export declare class GeneratorFileImports {
|
|
|
15
15
|
constructor(file: GeneratorFile, resolver: DecoResolve);
|
|
16
16
|
get items(): DecoImport[];
|
|
17
17
|
get code(): string[];
|
|
18
|
-
|
|
18
|
+
runImports(): void;
|
|
19
19
|
protected processProp(prop: string, type: GeneratorFileImportType, exps: GeneratorFsExport[], pkgs: PackageAPI[]): void;
|
|
20
20
|
protected _processProp<T extends GeneratorFsExport | ExportNode>(prop: string, type: GeneratorFileImportType, exps: T[], pathResolver: (from: GeneratorFile, exp: T, res: DecoResolve) => string): void;
|
|
21
21
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorFileImports.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,iBAAiB,EAClB,MAAM,uCAAuC,CAAC;AAK/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,oBAAY,uBAAuB;IACjC,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,qBAAa,oBAAoB;aAOb,IAAI,EAAE,aAAa;IAC5B,QAAQ,EAAE,WAAW;IAPvB,OAAO,EAAE,oBAAoB,EAAE,CAAM;IAE5C,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,
|
|
1
|
+
{"version":3,"file":"GeneratorFileImports.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,iBAAiB,EAClB,MAAM,uCAAuC,CAAC;AAK/C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAEzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD,oBAAY,uBAAuB;IACjC,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,qBAAa,oBAAoB;aAOb,IAAI,EAAE,aAAa;IAC5B,QAAQ,EAAE,WAAW;IAPvB,OAAO,EAAE,oBAAoB,EAAE,CAAM;IAE5C,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,IAAI,EAAE,iBAAiB,EAAE,EACzB,IAAI,EAAE,UAAU,EAAE,GACjB,IAAI;IAYP,SAAS,CAAC,YAAY,CAAC,CAAC,SAAS,iBAAiB,GAAG,UAAU,EAC7D,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,uBAAuB,EAC7B,IAAI,EAAE,CAAC,EAAE,EACT,YAAY,EAAE,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,WAAW,KAAK,MAAM,GACtE,IAAI;CAuCR"}
|
|
@@ -21,7 +21,10 @@ export class GeneratorFileImports {
|
|
|
21
21
|
get code() {
|
|
22
22
|
return importsToCode(this._items);
|
|
23
23
|
}
|
|
24
|
-
|
|
24
|
+
runImports() {
|
|
25
|
+
const packageDir = this.file.parent.parent;
|
|
26
|
+
const pkgs = packageDir.installedPkgs;
|
|
27
|
+
const exps = packageDir.usableExps;
|
|
25
28
|
const diags = this.file.getDiagnostics();
|
|
26
29
|
for (const diag of diags) {
|
|
27
30
|
if (diag.code === TsErrorCode.missingImport ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorFileImports.js","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,uBAAuB,EACvB,aAAa,GACd,MAAM,6BAA6B,CAAC;AAGrC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAGxD,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,GAA2B,EAAE,CAAC;IAElC,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,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"GeneratorFileImports.js","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,6 @@ import type { GeneratorFile } from "./GeneratorFile.js";
|
|
|
4
4
|
import type { GeneratorDirectory } from "./GeneratorDirectory.js";
|
|
5
5
|
import { GeneratorBase } from "./GeneratorBase.js";
|
|
6
6
|
import type { GeneratorFsExport } from "@mxpicture/gcp-functions-common/types";
|
|
7
|
-
import type { PackageAPI } from "@mxpicture/build-api/types";
|
|
8
7
|
import type { IFilesHandler } from "@mxpicture/build-api/file";
|
|
9
8
|
import { FileImports } from "@mxpicture/build-api/file";
|
|
10
9
|
export type IssueLogger = (file: GeneratorFile, checkIteration: number) => void;
|
|
@@ -16,8 +15,6 @@ export declare class GeneratorFs<H extends IFilesHandler<GeneratorFile>> extends
|
|
|
16
15
|
protected _pkgs: GeneratorPackage[] | null;
|
|
17
16
|
protected _imports: FileImports<GeneratorFile>;
|
|
18
17
|
protected _checkIteration: number;
|
|
19
|
-
protected _lastExps: GeneratorFsExport[];
|
|
20
|
-
protected _lastPkgs: PackageAPI[];
|
|
21
18
|
constructor(rootPath: string, handler: H, issueLogger?: IssueLogger | undefined, pkgsDir?: string);
|
|
22
19
|
get realPath(): string;
|
|
23
20
|
get virtualPath(): string;
|
|
@@ -26,8 +23,7 @@ export declare class GeneratorFs<H extends IFilesHandler<GeneratorFile>> extends
|
|
|
26
23
|
dir(pkgType: DecoPackageType, fileType: DecoFileType): GeneratorDirectory;
|
|
27
24
|
file(pkgType: DecoPackageType, fileType: DecoFileType, filename: string): GeneratorFile;
|
|
28
25
|
setCode(pkgType: DecoPackageType, fileType: DecoFileType, filename: string, code: string[]): void;
|
|
29
|
-
runImports(
|
|
30
|
-
rerunImports(): void;
|
|
26
|
+
runImports(): void;
|
|
31
27
|
get exps(): GeneratorFsExport[];
|
|
32
28
|
get files(): GeneratorFile[];
|
|
33
29
|
hasDiagnostics(): boolean;
|
|
@@ -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,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,
|
|
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,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,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;aAMH,QAAQ,EAAE,MAAM;aAChB,OAAO,EAAE,CAAC;IAC1B,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW;aAC5B,OAAO,EAAE,MAAM;IARjC,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,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
|
@@ -11,8 +11,6 @@ export class GeneratorFs extends GeneratorBase {
|
|
|
11
11
|
_pkgs = null;
|
|
12
12
|
_imports;
|
|
13
13
|
_checkIteration = -1;
|
|
14
|
-
_lastExps = [];
|
|
15
|
-
_lastPkgs = [];
|
|
16
14
|
constructor(rootPath, handler, issueLogger, pkgsDir = "packages") {
|
|
17
15
|
super();
|
|
18
16
|
this.rootPath = rootPath;
|
|
@@ -49,15 +47,10 @@ export class GeneratorFs extends GeneratorBase {
|
|
|
49
47
|
setCode(pkgType, fileType, filename, code) {
|
|
50
48
|
this.file(pkgType, fileType, filename).setLogicCode(code);
|
|
51
49
|
}
|
|
52
|
-
runImports(
|
|
53
|
-
this._lastExps = exps;
|
|
54
|
-
this._lastPkgs = pkgs;
|
|
55
|
-
this.rerunImports();
|
|
56
|
-
}
|
|
57
|
-
rerunImports() {
|
|
50
|
+
runImports() {
|
|
58
51
|
this.handler.patchVersions();
|
|
59
52
|
for (const file of this.files)
|
|
60
|
-
file.imports.
|
|
53
|
+
file.imports.runImports();
|
|
61
54
|
}
|
|
62
55
|
get exps() {
|
|
63
56
|
return this.files.flatMap((file) => file.getExports());
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"GeneratorFs.js","sourceRoot":"","sources":["../../src/run/GeneratorFs.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,18 @@
|
|
|
1
|
-
import type { PackageJson } from "@mxpicture/build-api/types";
|
|
1
|
+
import type { PackageAPI, PackageJson } from "@mxpicture/build-api/types";
|
|
2
2
|
import type { DecoFileType, DecoPackageType } from "@mxpicture/gcp-functions-common/decorator";
|
|
3
3
|
import type { GeneratorFs } from "./GeneratorFs.js";
|
|
4
4
|
import { GeneratorDirectory } from "./GeneratorDirectory.js";
|
|
5
5
|
import { GeneratorBase } from "./GeneratorBase.js";
|
|
6
6
|
import type { IFilesHandler } from "@mxpicture/build-api/file";
|
|
7
7
|
import type { GeneratorFile } from "./GeneratorFile.js";
|
|
8
|
+
import type { GeneratorFsExport } from "@mxpicture/gcp-functions-common/types";
|
|
9
|
+
import type { ExportsFile } from "@mxpicture/build-api/exp";
|
|
8
10
|
export declare class GeneratorPackage extends GeneratorBase {
|
|
9
11
|
readonly pkgType: DecoPackageType;
|
|
10
12
|
readonly parent: GeneratorFs<IFilesHandler<GeneratorFile>>;
|
|
11
13
|
readonly dirs: GeneratorDirectory[];
|
|
12
14
|
protected _json: PackageJson | null;
|
|
15
|
+
protected _expFile: ExportsFile | null;
|
|
13
16
|
constructor(pkgType: DecoPackageType, parent: GeneratorFs<IFilesHandler<GeneratorFile>>);
|
|
14
17
|
get json(): PackageJson;
|
|
15
18
|
get name(): string;
|
|
@@ -17,6 +20,8 @@ export declare class GeneratorPackage extends GeneratorBase {
|
|
|
17
20
|
get virtualPath(): string;
|
|
18
21
|
get pkgExports(): Record<string, string>;
|
|
19
22
|
dir(fileType: DecoFileType): GeneratorDirectory;
|
|
23
|
+
get installedPkgs(): PackageAPI[];
|
|
24
|
+
get usableExps(): GeneratorFsExport[];
|
|
20
25
|
load(): Promise<this>;
|
|
21
26
|
persist(): Promise<this>;
|
|
22
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorPackage.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorPackage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"GeneratorPackage.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorPackage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EAChB,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAI5D,qBAAa,gBAAiB,SAAQ,aAAa;aAO/B,OAAO,EAAE,eAAe;aACxB,MAAM,EAAE,WAAW,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAPnE,SAAgB,IAAI,EAAE,kBAAkB,EAAE,CAAM;IAChD,SAAS,CAAC,KAAK,EAAE,WAAW,GAAG,IAAI,CAAQ;IAE3C,SAAS,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAQ;gBAG5B,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,WAAW,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAKnE,IAAW,IAAI,IAAI,WAAW,CAI7B;IAED,IAAW,IAAI,IAAI,MAAM,CAExB;IAED,IAAW,QAAQ,IAAI,MAAM,CAE5B;IAED,IAAW,WAAW,IAAI,MAAM,CAE/B;IAED,IAAW,UAAU,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAS9C;IAEM,GAAG,CAAC,QAAQ,EAAE,YAAY,GAAG,kBAAkB;IAStD,IAAW,aAAa,IAAI,UAAU,EAAE,CAEvC;IAED,IAAW,UAAU,IAAI,iBAAiB,EAAE,CAE3C;IAEqB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAerB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAQ/C"}
|
|
@@ -2,11 +2,14 @@ import { readPackageJson, writePackageJson } from "@mxpicture/build-api/pkg";
|
|
|
2
2
|
import { GeneratorDirectory } from "./GeneratorDirectory.js";
|
|
3
3
|
import { GeneratorBase } from "./GeneratorBase.js";
|
|
4
4
|
import { mkdir } from "node:fs/promises";
|
|
5
|
+
import { getDependenciesItem, runExtractDeps } from "@mxpicture/build-api/exp";
|
|
6
|
+
import { join } from "node:path";
|
|
5
7
|
export class GeneratorPackage extends GeneratorBase {
|
|
6
8
|
pkgType;
|
|
7
9
|
parent;
|
|
8
10
|
dirs = [];
|
|
9
11
|
_json = null;
|
|
12
|
+
_expFile = null;
|
|
10
13
|
constructor(pkgType, parent) {
|
|
11
14
|
super();
|
|
12
15
|
this.pkgType = pkgType;
|
|
@@ -42,8 +45,21 @@ export class GeneratorPackage extends GeneratorBase {
|
|
|
42
45
|
}
|
|
43
46
|
return dir;
|
|
44
47
|
}
|
|
48
|
+
get installedPkgs() {
|
|
49
|
+
return this._expFile?.pkgs ?? [];
|
|
50
|
+
}
|
|
51
|
+
get usableExps() {
|
|
52
|
+
return this.parent.exps;
|
|
53
|
+
}
|
|
45
54
|
async load() {
|
|
46
|
-
|
|
55
|
+
const packageJson = join(this.realPath, "package.json");
|
|
56
|
+
const filePath = join(this.realPath, "exports.gen.json");
|
|
57
|
+
const res = await Promise.all([
|
|
58
|
+
readPackageJson(packageJson),
|
|
59
|
+
runExtractDeps(filePath, await getDependenciesItem(this.realPath, true)),
|
|
60
|
+
]);
|
|
61
|
+
this._json = res[0];
|
|
62
|
+
this._expFile = res[1];
|
|
47
63
|
return this;
|
|
48
64
|
}
|
|
49
65
|
async persist() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorPackage.js","sourceRoot":"","sources":["../../src/run/GeneratorPackage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAO7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"GeneratorPackage.js","sourceRoot":"","sources":["../../src/run/GeneratorPackage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAO7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAKzC,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAEjC,MAAM,OAAO,gBAAiB,SAAQ,aAAa;IAO/B;IACA;IAPF,IAAI,GAAyB,EAAE,CAAC;IACtC,KAAK,GAAuB,IAAI,CAAC;IAEjC,QAAQ,GAAuB,IAAI,CAAC;IAE9C,YACkB,OAAwB,EACxB,MAAiD;QAEjE,KAAK,EAAE,CAAC;QAHQ,YAAO,GAAP,OAAO,CAAiB;QACxB,WAAM,GAAN,MAAM,CAA2C;IAGnE,CAAC;IAED,IAAW,IAAI;QACb,IAAI,CAAC,IAAI,CAAC,KAAK;YACb,MAAM,IAAI,KAAK,CAAC,2BAA2B,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;IACxB,CAAC;IAED,IAAW,QAAQ;QACjB,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;IACnD,CAAC;IAED,IAAW,WAAW;QACpB,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;IACtD,CAAC;IAED,IAAW,UAAU;QACnB,MAAM,MAAM,GAA2B;YACrC,gBAAgB,EAAE,gBAAgB;SACnC,CAAC;QAEF,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI;YACzB,MAAM,CAAC,KAAK,GAAG,CAAC,QAAQ,EAAE,CAAC,GAAG,UAAU,GAAG,CAAC,QAAQ,WAAW,CAAC;QAElE,OAAO,MAAM,CAAC;IAChB,CAAC;IAEM,GAAG,CAAC,QAAsB;QAC/B,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;QAC7D,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,GAAG,GAAG,IAAI,kBAAkB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YAC7C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC;IACnC,CAAC;IAED,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC;IAC1B,CAAC;IAEe,KAAK,CAAC,IAAI;QACxB,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,kBAAkB,CAAC,CAAC;QAEzD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5B,eAAe,CAAC,WAAW,CAAC;YAC5B,cAAc,CAAC,QAAQ,EAAE,MAAM,mBAAmB,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;SACzE,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAEvB,OAAO,IAAI,CAAC;IACd,CAAC;IAEe,KAAK,CAAC,OAAO;QAC3B,MAAM,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAChD,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;QAEzD,IAAI,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC;QACpC,MAAM,gBAAgB,CAAC,GAAG,IAAI,CAAC,QAAQ,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACnE,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -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;AAOhF,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,CACd,iBAAiB,GAAE,MAAM,EAAO,EAChC,aAAa,GAAE,MAAU,GACxB,OAAO,CAAC,IAAI,CAAC;IAOH,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAQ9B,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7C,aAAa,CACxB,iBAAiB,GAAE,MAAM,EAAO,EAChC,aAAa,GAAE,MAAU,GACxB,OAAO,CAAC,IAAI,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;AAOhF,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,CACd,iBAAiB,GAAE,MAAM,EAAO,EAChC,aAAa,GAAE,MAAU,GACxB,OAAO,CAAC,IAAI,CAAC;IAOH,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAQ9B,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAU7C,aAAa,CACxB,iBAAiB,GAAE,MAAM,EAAO,EAChC,aAAa,GAAE,MAAU,GACxB,OAAO,CAAC,IAAI,CAAC;IAqChB;;;;;OAKG;IACU,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAY7D"}
|
package/dist/run/GeneratorRun.js
CHANGED
|
@@ -39,12 +39,12 @@ export class GeneratorRun {
|
|
|
39
39
|
await Promise.all(entries.map((entry) => entry.gen.run4codes(decoFiles, this.env, this.fs, this.decoResolve)));
|
|
40
40
|
}
|
|
41
41
|
async runImpExports(exportsFilesPaths = [], importRetries = 2) {
|
|
42
|
-
const exps = this.fs.exps;
|
|
43
42
|
const allPkgs = (await Promise.all([
|
|
44
43
|
readExportsBuildCli(),
|
|
45
44
|
readExportsFile(resolve(__dirname, "../exports.gen.json")),
|
|
46
45
|
...exportsFilesPaths.map((path) => readExportsFile(path)),
|
|
47
46
|
])).flat();
|
|
47
|
+
// todo remove duplicates of PackageAPI
|
|
48
48
|
const pkgs = [];
|
|
49
49
|
if (this.allowedPkgsAndOrder && this.allowedPkgsAndOrder.length > 0) {
|
|
50
50
|
pkgs.push(...this.allowedPkgsAndOrder.flatMap((allowedPkg) => allPkgs.filter((aPkg) => micromatch.isMatch(aPkg.packageName, allowedPkg))));
|
|
@@ -58,8 +58,7 @@ export class GeneratorRun {
|
|
|
58
58
|
this.fs.check4diagnostics();
|
|
59
59
|
if (!this.fs.hasDiagnostics())
|
|
60
60
|
return;
|
|
61
|
-
|
|
62
|
-
this.fs.runImports(exps, pkgs);
|
|
61
|
+
this.fs.runImports();
|
|
63
62
|
}
|
|
64
63
|
// check for other/final issues
|
|
65
64
|
this.fs.check4diagnostics();
|
|
@@ -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;AAKpC,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,EAA6C,EAC7C,GAAiB,EACjB,WAAwB,EACxC,mBAAqC;QALrB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,kBAAa,GAAb,aAAa,CAAQ;QACrB,OAAE,GAAF,EAAE,CAA2C;QAC7C,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,CACd,oBAA8B,EAAE,EAChC,gBAAwB,CAAC;QAEzB,MAAM,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;QACrB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACvC,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC9B,MAAM,IAAI,CAAC,aAAa,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;IAC7D,CAAC;IAEM,KAAK,CAAC,OAAO;QAClB,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;QAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAChD,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,aAAa,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CACzD,CAAC;QACF,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACjE,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,SAAqB;QACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAE9C,MAAM,OAAO,CAAC,GAAG,CACf,OAAO,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACpB,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,WAAW,CAAC,CACpE,CACF,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,aAAa,CACxB,oBAA8B,EAAE,EAChC,gBAAwB,CAAC;QAEzB,MAAM,
|
|
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.69",
|
|
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.75",
|
|
52
|
+
"@mxpicture/gcp-functions-backend": "^1.2.69",
|
|
53
|
+
"@mxpicture/gcp-functions-common": "^1.2.69",
|
|
54
|
+
"@mxpicture/gcp-functions-frontend": "^1.2.69",
|
|
55
55
|
"@types/micromatch": "^4.0.10",
|
|
56
56
|
"google-auth-library": "^10.6.2",
|
|
57
57
|
"googleapis": "^171.4.0",
|