@mxpicture/gcp-functions-generator 1.2.71 → 1.2.73
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.
|
@@ -2,8 +2,10 @@ import { GeneratorTemplate } from "./GeneratorTemplate.js";
|
|
|
2
2
|
import type { DecoFile, DecoResolve } from "@mxpicture/gcp-functions-common/types";
|
|
3
3
|
import type { GeneratorFs } from "./GeneratorFs.js";
|
|
4
4
|
import type { GeneratorEnv, GeneratorRunFile } from "../common/types.common.js";
|
|
5
|
+
import type { ExportsLookupParamsItem } from "@mxpicture/build-api/types";
|
|
5
6
|
import type { IFilesHandler } from "@mxpicture/build-api/file";
|
|
6
7
|
import type { GeneratorFile } from "./GeneratorFile.js";
|
|
8
|
+
export declare const exportsOwnPath: () => string;
|
|
7
9
|
export declare class GeneratorRun {
|
|
8
10
|
readonly rootPath: string;
|
|
9
11
|
readonly templatesPath: string;
|
|
@@ -13,10 +15,13 @@ export declare class GeneratorRun {
|
|
|
13
15
|
readonly template: GeneratorTemplate;
|
|
14
16
|
readonly allowedPkgsAndOrder: string[] | null;
|
|
15
17
|
constructor(rootPath: string, templatesPath: string, fs: GeneratorFs<IFilesHandler<GeneratorFile>>, env: GeneratorEnv, decoResolve: DecoResolve, allowedPkgsAndOrder?: string[] | null);
|
|
16
|
-
run(
|
|
18
|
+
run(params?: ExportsLookupParamsItem[], importRetries?: number): Promise<void>;
|
|
17
19
|
runDeco(): Promise<DecoFile[]>;
|
|
18
20
|
runCode(decoFiles: DecoFile[]): Promise<void>;
|
|
19
|
-
runImpExports(
|
|
21
|
+
runImpExports(params?: ExportsLookupParamsItem[], importRetries?: number, load?: {
|
|
22
|
+
buildCli?: boolean;
|
|
23
|
+
own?: boolean;
|
|
24
|
+
}): Promise<void>;
|
|
20
25
|
/**
|
|
21
26
|
* Dynamically imports a generator file and returns a cached {@link GeneratorRunFile}.
|
|
22
27
|
*
|
|
@@ -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;AAKhF,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,eAAO,MAAM,cAAc,cAAkD,CAAC;AAE9E,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,MAAM,GAAE,uBAAuB,EAAO,EACtC,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,MAAM,GAAE,uBAAuB,EAAO,EACtC,aAAa,GAAE,MAAU,EACzB,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;QAAC,GAAG,CAAC,EAAE,OAAO,CAAA;KAAE,GAC3C,OAAO,CAAC,IAAI,CAAC;IAgDhB;;;;;OAKG;IACU,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAY7D"}
|
package/dist/run/GeneratorRun.js
CHANGED
|
@@ -2,10 +2,10 @@ 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
|
-
import {
|
|
5
|
+
import { exportsBuildCliPath, ExportsLookup } from "@mxpicture/build-api/exp";
|
|
6
6
|
import { resolve } from "node:path";
|
|
7
|
-
import micromatch from "micromatch";
|
|
8
7
|
const __dirname = import.meta.dirname;
|
|
8
|
+
export const exportsOwnPath = () => resolve(__dirname, "../exports.gen.json");
|
|
9
9
|
export class GeneratorRun {
|
|
10
10
|
rootPath;
|
|
11
11
|
templatesPath;
|
|
@@ -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(params = [], 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(params, importRetries);
|
|
31
31
|
}
|
|
32
32
|
async runDeco() {
|
|
33
33
|
await this.template.load();
|
|
@@ -38,21 +38,32 @@ 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(
|
|
42
|
-
const allPkgs = (await Promise.all([
|
|
43
|
-
(async () => packageAPIsArray(await readExportsBuildCli()))(),
|
|
44
|
-
(async () => packageAPIsArray(await readExportsFile(resolve(__dirname, "../exports.gen.json"))))(),
|
|
45
|
-
...exportsFilesPaths.map(async (path) => packageAPIsArray(await readExportsFile(path))),
|
|
46
|
-
])).flat();
|
|
47
|
-
// todo remove duplicates of PackageAPI
|
|
41
|
+
async runImpExports(params = [], importRetries = 2, load) {
|
|
48
42
|
// todo use ExportsLookup
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
43
|
+
const lookup = new ExportsLookup();
|
|
44
|
+
const promises = [lookup.load(params)];
|
|
45
|
+
if (load?.buildCli)
|
|
46
|
+
promises.push(lookup.load([
|
|
47
|
+
{ filesPaths: [exportsBuildCliPath()], refKey: null, priority: 10 },
|
|
48
|
+
]));
|
|
49
|
+
if (load?.own)
|
|
50
|
+
promises.push(lookup.load([
|
|
51
|
+
{ filesPaths: [exportsOwnPath()], refKey: null, priority: 20 },
|
|
52
|
+
]));
|
|
53
|
+
await Promise.all(promises);
|
|
54
|
+
// const pkgs: PackageAPI[] = [];
|
|
55
|
+
//
|
|
56
|
+
// if (this.allowedPkgsAndOrder && this.allowedPkgsAndOrder.length > 0) {
|
|
57
|
+
// pkgs.push(
|
|
58
|
+
// ...this.allowedPkgsAndOrder.flatMap((allowedPkg) =>
|
|
59
|
+
// allPkgs.filter((aPkg) =>
|
|
60
|
+
// micromatch.isMatch(aPkg.packageName, allowedPkg),
|
|
61
|
+
// ),
|
|
62
|
+
// ),
|
|
63
|
+
// );
|
|
64
|
+
// } else {
|
|
65
|
+
// pkgs.push(...allPkgs);
|
|
66
|
+
// }
|
|
56
67
|
// 1. check for missing imports
|
|
57
68
|
// 2. check faulty imports (type or non-type)
|
|
58
69
|
for (let retry = 0; retry < importRetries; retry++) {
|
|
@@ -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,
|
|
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.73",
|
|
4
4
|
"description": "Tools for google cloud functions",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"author": "MXPicture",
|
|
@@ -48,15 +48,13 @@
|
|
|
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.
|
|
55
|
-
"@types/micromatch": "^4.0.10",
|
|
51
|
+
"@mxpicture/build-api": "^0.3.88",
|
|
52
|
+
"@mxpicture/gcp-functions-backend": "^1.2.73",
|
|
53
|
+
"@mxpicture/gcp-functions-common": "^1.2.73",
|
|
54
|
+
"@mxpicture/gcp-functions-frontend": "^1.2.73",
|
|
56
55
|
"google-auth-library": "^10.6.2",
|
|
57
56
|
"googleapis": "^171.4.0",
|
|
58
|
-
"json5": "^2.2.3"
|
|
59
|
-
"micromatch": "^4.0.8"
|
|
57
|
+
"json5": "^2.2.3"
|
|
60
58
|
},
|
|
61
59
|
"devDependencies": {
|
|
62
60
|
"@types/node": "^25.2.3",
|
package/dist/exports.gen.json
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{}
|