@mxpicture/gcp-functions-generator 1.2.26 → 1.2.28

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.
Files changed (40) hide show
  1. package/dist/common/resolve.common.d.ts +0 -5
  2. package/dist/common/resolve.common.d.ts.map +1 -1
  3. package/dist/common/resolve.common.js +3 -44
  4. package/dist/common/resolve.common.js.map +1 -1
  5. package/dist/exports.gen.json +14 -24
  6. package/dist/generator/Generator.d.ts +3 -3
  7. package/dist/generator/Generator.d.ts.map +1 -1
  8. package/dist/generator/Generator.js +6 -5
  9. package/dist/generator/Generator.js.map +1 -1
  10. package/dist/generator/GeneratorZod.js +1 -1
  11. package/dist/generator/GeneratorZod.js.map +1 -1
  12. package/dist/run/GeneratorBarrel.d.ts +4 -3
  13. package/dist/run/GeneratorBarrel.d.ts.map +1 -1
  14. package/dist/run/GeneratorBarrel.js +8 -4
  15. package/dist/run/GeneratorBarrel.js.map +1 -1
  16. package/dist/run/GeneratorBaseFile.d.ts +5 -3
  17. package/dist/run/GeneratorBaseFile.d.ts.map +1 -1
  18. package/dist/run/GeneratorBaseFile.js +4 -1
  19. package/dist/run/GeneratorBaseFile.js.map +1 -1
  20. package/dist/run/GeneratorFile.d.ts +18 -13
  21. package/dist/run/GeneratorFile.d.ts.map +1 -1
  22. package/dist/run/GeneratorFile.js +40 -21
  23. package/dist/run/GeneratorFile.js.map +1 -1
  24. package/dist/run/GeneratorFileImports.d.ts +22 -0
  25. package/dist/run/GeneratorFileImports.d.ts.map +1 -0
  26. package/dist/run/GeneratorFileImports.js +83 -0
  27. package/dist/run/GeneratorFileImports.js.map +1 -0
  28. package/dist/run/GeneratorFs.d.ts +5 -5
  29. package/dist/run/GeneratorFs.d.ts.map +1 -1
  30. package/dist/run/GeneratorFs.js +10 -21
  31. package/dist/run/GeneratorFs.js.map +1 -1
  32. package/dist/run/GeneratorRun.d.ts +1 -4
  33. package/dist/run/GeneratorRun.d.ts.map +1 -1
  34. package/dist/run/GeneratorRun.js +3 -11
  35. package/dist/run/GeneratorRun.js.map +1 -1
  36. package/dist/run/index.d.ts +1 -0
  37. package/dist/run/index.d.ts.map +1 -1
  38. package/dist/run/index.js +1 -0
  39. package/dist/run/index.js.map +1 -1
  40. package/package.json +5 -5
@@ -1,6 +1,5 @@
1
1
  import type { DecoImport, DecoResolve, GeneratorFsExport } from "@mxpicture/gcp-functions-common/types";
2
2
  import type { GeneratorFile } from "../run/GeneratorFile.js";
3
- import type { PackageAPI } from "@mxpicture/build-api/types";
4
3
  /** Resolved absolute path to the `generator/` directory. */
5
4
  export declare const generatorDirPath: string;
6
5
  export declare const isPrimitiveType: (type: string) => boolean;
@@ -12,8 +11,4 @@ export declare const isPrimitiveType: (type: string) => boolean;
12
11
  */
13
12
  export declare const importsToCode: (imports: DecoImport[]) => string[];
14
13
  export declare const exportResolveImportPath: (from: GeneratorFile, to: GeneratorFsExport, res: DecoResolve) => string;
15
- export declare const exportsToImports: (from: GeneratorFile, res: DecoResolve, exports: GeneratorFsExport[]) => DecoImport[];
16
- export declare const exportsToCode: (from: GeneratorFile, res: DecoResolve, exports: GeneratorFsExport[]) => string[];
17
- export declare const packageApiToImports: (from: GeneratorFile, pkgs: PackageAPI[]) => DecoImport[];
18
- export declare const packageApiToCode: (from: GeneratorFile, pkgs: PackageAPI[]) => string[];
19
14
  //# sourceMappingURL=resolve.common.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"resolve.common.d.ts","sourceRoot":"","sources":["../../src/common/resolve.common.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,iBAAiB,EAClB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAE7D,OAAO,KAAK,EAAc,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAEzE,4DAA4D;AAC5D,eAAO,MAAM,gBAAgB,QAA+C,CAAC;AAE7E,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,YACL,CAAC;AAiBxC;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAI,SAAS,UAAU,EAAE,KAAG,MAAM,EACH,CAAC;AAE1D,eAAO,MAAM,uBAAuB,GAClC,MAAM,aAAa,EACnB,IAAI,iBAAiB,EACrB,KAAK,WAAW,KACf,MAqBF,CAAC;AAoDF,eAAO,MAAM,gBAAgB,GAC3B,MAAM,aAAa,EACnB,KAAK,WAAW,EAChB,SAAS,iBAAiB,EAAE,KAC3B,UAAU,EACuD,CAAC;AAErE,eAAO,MAAM,aAAa,GACxB,MAAM,aAAa,EACnB,KAAK,WAAW,EAChB,SAAS,iBAAiB,EAAE,aAC0B,CAAC;AAEzD,eAAO,MAAM,mBAAmB,GAC9B,MAAM,aAAa,EACnB,MAAM,UAAU,EAAE,KACjB,UAAU,EAcZ,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,MAAM,aAAa,EAAE,MAAM,UAAU,EAAE,aACxB,CAAC"}
1
+ {"version":3,"file":"resolve.common.d.ts","sourceRoot":"","sources":["../../src/common/resolve.common.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACX,iBAAiB,EAClB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAG7D,4DAA4D;AAC5D,eAAO,MAAM,gBAAgB,QAA+C,CAAC;AAE7E,eAAO,MAAM,eAAe,GAAI,MAAM,MAAM,YACL,CAAC;AAiBxC;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAI,SAAS,UAAU,EAAE,KAAG,MAAM,EACH,CAAC;AAE1D,eAAO,MAAM,uBAAuB,GAClC,MAAM,aAAa,EACnB,IAAI,iBAAiB,EACrB,KAAK,WAAW,KACf,MAqBF,CAAC"}
@@ -4,11 +4,11 @@ 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.props.length === 0)
7
+ if (imp.valueProps.length === 0)
8
8
  return null;
9
9
  const results = [];
10
- if (imp.props.length > 0)
11
- results.push(`import { ${imp.props.join(", ")} } from "${imp.path}";`);
10
+ if (imp.valueProps.length > 0)
11
+ results.push(`import { ${imp.valueProps.join(", ")} } from "${imp.path}";`);
12
12
  if (imp.typeProps.length > 0)
13
13
  results.push(`import type { ${imp.typeProps.join(", ")} } from "${imp.path}";`);
14
14
  return results.join(" ");
@@ -33,45 +33,4 @@ export const exportResolveImportPath = (from, to, res) => {
33
33
  throw new Error(`Path resolvement failed. ${resItem.mode} ${resItem.target}`);
34
34
  }
35
35
  };
36
- const _exportsToImports = (from, res, exports, outputImps, pathResolver) => {
37
- const typeImportsMissing = from.typeImportsMissing;
38
- for (let i = 0; i < from.missingImports.length; i++) {
39
- const missing = from.missingImports[i];
40
- let name = missing;
41
- let exp = exports.find((exp) => exp.name === missing);
42
- if (!exp) {
43
- const alias = from.importAliases.find((a) => a.alias === missing);
44
- if (!alias)
45
- continue;
46
- exp = exports.find((exp) => exp.name === alias.real);
47
- if (exp)
48
- name = `${alias.real} as ${alias.alias}`;
49
- }
50
- if (!exp)
51
- continue;
52
- from.missingImports.splice(i--, 1);
53
- addProp(pathResolver(from, exp, res), name, outputImps, typeImportsMissing);
54
- }
55
- return outputImps;
56
- };
57
- const addProp = (path, name, outputImps, typeImportsMissing) => {
58
- let imp = outputImps.find((imp) => imp.path === path);
59
- if (!imp) {
60
- imp = { path, props: [], typeProps: [] };
61
- outputImps.push(imp);
62
- }
63
- if (typeImportsMissing.find((i) => i === name))
64
- imp.typeProps.push(name);
65
- else
66
- imp.props.push(name);
67
- };
68
- export const exportsToImports = (from, res, exports) => _exportsToImports(from, res, exports, [], exportResolveImportPath);
69
- export const exportsToCode = (from, res, exports) => importsToCode(exportsToImports(from, res, exports));
70
- export const packageApiToImports = (from, pkgs) => {
71
- const imps = [];
72
- for (const pkg of pkgs)
73
- _exportsToImports(from, null, [...pkg.runtimeExports, ...pkg.typeExports], imps, (_, exp) => exp.source);
74
- return imps;
75
- };
76
- export const packageApiToCode = (from, pkgs) => importsToCode(packageApiToImports(from, pkgs));
77
36
  //# sourceMappingURL=resolve.common.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"resolve.common.js","sourceRoot":"","sources":["../../src/common/resolve.common.ts"],"names":[],"mappings":"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"}
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;IAC7C,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"}
@@ -1150,16 +1150,6 @@
1150
1150
  "kind": "function",
1151
1151
  "source": "@mxpicture/gcp-functions-generator/common"
1152
1152
  },
1153
- {
1154
- "name": "exportsToCode",
1155
- "kind": "function",
1156
- "source": "@mxpicture/gcp-functions-generator/common"
1157
- },
1158
- {
1159
- "name": "exportsToImports",
1160
- "kind": "function",
1161
- "source": "@mxpicture/gcp-functions-generator/common"
1162
- },
1163
1153
  {
1164
1154
  "name": "extractFileParts",
1165
1155
  "kind": "function",
@@ -1200,16 +1190,6 @@
1200
1190
  "kind": "function",
1201
1191
  "source": "@mxpicture/gcp-functions-generator/common"
1202
1192
  },
1203
- {
1204
- "name": "packageApiToCode",
1205
- "kind": "function",
1206
- "source": "@mxpicture/gcp-functions-generator/common"
1207
- },
1208
- {
1209
- "name": "packageApiToImports",
1210
- "kind": "function",
1211
- "source": "@mxpicture/gcp-functions-generator/common"
1212
- },
1213
1193
  {
1214
1194
  "name": "readGeneratorRunFiles",
1215
1195
  "kind": "function",
@@ -1264,13 +1244,13 @@
1264
1244
  },
1265
1245
  {
1266
1246
  "name": "GeneratorBase",
1267
- "kind": "ClassDeclaration",
1268
- "source": "@mxpicture/gcp-functions-generator/run"
1247
+ "kind": "InterfaceDeclaration",
1248
+ "source": "@mxpicture/gcp-functions-generator/common"
1269
1249
  },
1270
1250
  {
1271
1251
  "name": "GeneratorBase",
1272
- "kind": "InterfaceDeclaration",
1273
- "source": "@mxpicture/gcp-functions-generator/common"
1252
+ "kind": "ClassDeclaration",
1253
+ "source": "@mxpicture/gcp-functions-generator/run"
1274
1254
  },
1275
1255
  {
1276
1256
  "name": "GeneratorBaseFile",
@@ -1302,6 +1282,16 @@
1302
1282
  "kind": "ClassDeclaration",
1303
1283
  "source": "@mxpicture/gcp-functions-generator/run"
1304
1284
  },
1285
+ {
1286
+ "name": "GeneratorFileImportType",
1287
+ "kind": "enum",
1288
+ "source": "@mxpicture/gcp-functions-generator/run"
1289
+ },
1290
+ {
1291
+ "name": "GeneratorFileImports",
1292
+ "kind": "ClassDeclaration",
1293
+ "source": "@mxpicture/gcp-functions-generator/run"
1294
+ },
1305
1295
  {
1306
1296
  "name": "GeneratorFrontend",
1307
1297
  "kind": "ClassDeclaration",
@@ -1,4 +1,4 @@
1
- import type { DecoFile } from "@mxpicture/gcp-functions-common/types";
1
+ import type { DecoFile, DecoResolve } from "@mxpicture/gcp-functions-common/types";
2
2
  import { type DecoFileType, type DecoFileExtension, DecoPackageType, type Decorator } from "@mxpicture/gcp-functions-common/decorator";
3
3
  import type { GeneratorEnv, GeneratorHeader, GeneratorRunItem, GeneratorRunItems, GeneratorRunResult } from "../common/types.common.js";
4
4
  import type { GeneratorFs } from "../run/GeneratorFs.js";
@@ -36,8 +36,8 @@ export declare abstract class Generator {
36
36
  * @returns A promise resolving to the assembled result file.
37
37
  * @throws Error if no headers are produced for the file.
38
38
  */
39
- run4codes(decoFiles: DecoFile[], env: GeneratorEnv, fs: GeneratorFs): Promise<void>;
40
- protected run4code(decoFile: DecoFile, env: GeneratorEnv, fs: GeneratorFs, runItems: GeneratorRunItems): Promise<GeneratorFile>;
39
+ run4codes(decoFiles: DecoFile[], env: GeneratorEnv, fs: GeneratorFs, resolver: DecoResolve): Promise<void>;
40
+ protected run4code(decoFile: DecoFile, env: GeneratorEnv, fs: GeneratorFs, runItems: GeneratorRunItems, resolver: DecoResolve): Promise<GeneratorFile>;
41
41
  protected buildRunItems(packageType: DecoPackageType, decorators: Decorator[]): GeneratorRunItems;
42
42
  protected processHeader(curretItem: GeneratorRunItem, env: GeneratorEnv): Promise<GeneratorHeader | null>;
43
43
  protected abstract runHeader(item: GeneratorRunItem, env: GeneratorEnv): Promise<GeneratorRunResult | null>;
@@ -1 +1 @@
1
- {"version":3,"file":"Generator.d.ts","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,eAAe,EACf,KAAK,SAAS,EAEf,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAO7D;;;;;;;GAOG;AACH,8BAAsB,SAAS;IAC7B,SAAgB,QAAQ,EAAE,YAAY,CAAC;IACvC,SAAgB,GAAG,EAAE,iBAAiB,CAAC;IACvC,SAAgB,WAAW,EAAE,eAAe,CAAC;IAE7C;;;;;;;OAOG;gBACgB,CAAC,EAAE;QACpB,QAAQ,EAAE,YAAY,CAAC;QACvB,GAAG,EAAE,iBAAiB,CAAC;QACvB,WAAW,EAAE,eAAe,CAAC;KAC9B;IAMD;;;;;;;OAOG;IACU,SAAS,CACpB,SAAS,EAAE,QAAQ,EAAE,EACrB,GAAG,EAAE,YAAY,EACjB,EAAE,EAAE,WAAW;cAeD,QAAQ,CACtB,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,YAAY,EACjB,EAAE,EAAE,WAAW,EACf,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,aAAa,CAAC;IAyBzB,SAAS,CAAC,aAAa,CACrB,WAAW,EAAE,eAAe,EAC5B,UAAU,EAAE,SAAS,EAAE,GACtB,iBAAiB;cA0BJ,aAAa,CAC3B,UAAU,EAAE,gBAAgB,EAC5B,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAelC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAC1B,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;CACtC"}
1
+ {"version":3,"file":"Generator.d.ts","sourceRoot":"","sources":["../../src/generator/Generator.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,WAAW,EACZ,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,iBAAiB,EACtB,eAAe,EACf,KAAK,SAAS,EAEf,MAAM,2CAA2C,CAAC;AACnD,OAAO,KAAK,EACV,YAAY,EACZ,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAO7D;;;;;;;GAOG;AACH,8BAAsB,SAAS;IAC7B,SAAgB,QAAQ,EAAE,YAAY,CAAC;IACvC,SAAgB,GAAG,EAAE,iBAAiB,CAAC;IACvC,SAAgB,WAAW,EAAE,eAAe,CAAC;IAE7C;;;;;;;OAOG;gBACgB,CAAC,EAAE;QACpB,QAAQ,EAAE,YAAY,CAAC;QACvB,GAAG,EAAE,iBAAiB,CAAC;QACvB,WAAW,EAAE,eAAe,CAAC;KAC9B;IAMD;;;;;;;OAOG;IACU,SAAS,CACpB,SAAS,EAAE,QAAQ,EAAE,EACrB,GAAG,EAAE,YAAY,EACjB,EAAE,EAAE,WAAW,EACf,QAAQ,EAAE,WAAW;cAeP,QAAQ,CACtB,QAAQ,EAAE,QAAQ,EAClB,GAAG,EAAE,YAAY,EACjB,EAAE,EAAE,WAAW,EACf,QAAQ,EAAE,iBAAiB,EAC3B,QAAQ,EAAE,WAAW,GACpB,OAAO,CAAC,aAAa,CAAC;IA0BzB,SAAS,CAAC,aAAa,CACrB,WAAW,EAAE,eAAe,EAC5B,UAAU,EAAE,SAAS,EAAE,GACtB,iBAAiB;cA0BJ,aAAa,CAC3B,UAAU,EAAE,gBAAgB,EAC5B,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC;IAelC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAC1B,IAAI,EAAE,gBAAgB,EACtB,GAAG,EAAE,YAAY,GAChB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;CACtC"}
@@ -35,14 +35,14 @@ export class Generator {
35
35
  * @returns A promise resolving to the assembled result file.
36
36
  * @throws Error if no headers are produced for the file.
37
37
  */
38
- async run4codes(decoFiles, env, fs) {
38
+ async run4codes(decoFiles, env, fs, resolver) {
39
39
  const collects = decoFiles.map((decoFile) => ({
40
40
  decoFile,
41
41
  runItems: this.buildRunItems(this.packageType, decoFile.decorators),
42
42
  }));
43
- await Promise.all(collects.map(async (collect) => this.run4code(collect.decoFile, env, fs, collect.runItems)));
43
+ await Promise.all(collects.map(async (collect) => this.run4code(collect.decoFile, env, fs, collect.runItems, resolver)));
44
44
  }
45
- async run4code(decoFile, env, fs, runItems) {
45
+ async run4code(decoFile, env, fs, runItems, resolver) {
46
46
  const headerResults = (await Promise.all(Object.values(runItems).map((p) => this.processHeader(p, env)))).filter((h) => !!h);
47
47
  if (headerResults.length === 0)
48
48
  throw new Error(`Generator ${this.fileType}, file ${decoFile.templateRepoFilePath}: no headers provided`);
@@ -53,8 +53,9 @@ export class Generator {
53
53
  generated: true,
54
54
  });
55
55
  const file = fs.file(this.packageType, this.fileType, filename);
56
- file.code = headerResults.flatMap((res) => res.code);
57
- file.importAliases = headerResults.flatMap((res) => res.importAliases);
56
+ file.createImports(resolver);
57
+ file.setLogicCode(headerResults.flatMap((res) => res.code));
58
+ file.imports.aliases = headerResults.flatMap((res) => res.importAliases);
58
59
  return file;
59
60
  }
60
61
  buildRunItems(packageType, decorators) {
@@ -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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"}
@@ -43,7 +43,7 @@ export class GeneratorZod extends Generator {
43
43
  return [];
44
44
  const results = [
45
45
  {
46
- props: [...this.zImports],
46
+ valueProps: [...this.zImports],
47
47
  path: "zod",
48
48
  typeProps: [],
49
49
  },
@@ -1 +1 @@
1
- {"version":3,"file":"GeneratorZod.js","sourceRoot":"","sources":["../../src/generator/GeneratorZod.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GeneratorZod.js","sourceRoot":"","sources":["../../src/generator/GeneratorZod.ts"],"names":[],"mappings":"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"}
@@ -3,9 +3,10 @@ import { GeneratorBaseFile } from "./GeneratorBaseFile.js";
3
3
  import type { GeneratorExportNode } from "@mxpicture/gcp-functions-common/types";
4
4
  export declare class GeneratorBarrel extends GeneratorBaseFile {
5
5
  constructor(parent: GeneratorDirectory);
6
- get code(): string[];
7
- get importsCode(): string[];
8
- get exports(): GeneratorExportNode[];
6
+ getLogicCode(): string[];
7
+ getImportsCode(): string[];
8
+ getExports(): GeneratorExportNode[];
9
+ setLogicCode(code: string[]): void;
9
10
  load(): Promise<this>;
10
11
  }
11
12
  //# sourceMappingURL=GeneratorBarrel.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"GeneratorBarrel.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorBarrel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAEjF,qBAAa,eAAgB,SAAQ,iBAAiB;gBACjC,MAAM,EAAE,kBAAkB;IAI7C,IAAoB,IAAI,IAAI,MAAM,EAAE,CAOnC;IAED,IAAoB,WAAW,IAAI,MAAM,EAAE,CAE1C;IAED,IAAoB,OAAO,IAAI,mBAAmB,EAAE,CAEnD;IAEqB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG5C"}
1
+ {"version":3,"file":"GeneratorBarrel.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorBarrel.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAEjF,qBAAa,eAAgB,SAAQ,iBAAiB;gBACjC,MAAM,EAAE,kBAAkB;IAI7B,YAAY,IAAI,MAAM,EAAE;IAQxB,cAAc,IAAI,MAAM,EAAE;IAG1B,UAAU,IAAI,mBAAmB,EAAE;IAInC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI;IAI5B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG5C"}
@@ -3,17 +3,21 @@ export class GeneratorBarrel extends GeneratorBaseFile {
3
3
  constructor(parent) {
4
4
  super("index.ts", parent);
5
5
  }
6
- get code() {
6
+ getLogicCode() {
7
7
  return [
8
8
  "// This file is auto-generated by build-cli. Do not edit manually.",
9
9
  ...this.parent.files.map((file) => `export * from "./${file.filename.replace(/\.ts$/, ".js")}";`),
10
10
  ];
11
11
  }
12
- get importsCode() {
12
+ getImportsCode() {
13
13
  return [];
14
14
  }
15
- get exports() {
16
- return this.parent.files.flatMap((file) => file.exports);
15
+ getExports() {
16
+ return this.parent.files.flatMap((file) => file.getExports());
17
+ }
18
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
19
+ setLogicCode(code) {
20
+ return;
17
21
  }
18
22
  async load() {
19
23
  return this;
@@ -1 +1 @@
1
- {"version":3,"file":"GeneratorBarrel.js","sourceRoot":"","sources":["../../src/run/GeneratorBarrel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3D,MAAM,OAAO,eAAgB,SAAQ,iBAAiB;IACpD,YAAmB,MAA0B;QAC3C,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC;IAED,IAAoB,IAAI;QACtB,OAAO;YACL,oEAAoE;YACpE,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CACtB,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CACxE;SACF,CAAC;IACJ,CAAC;IAED,IAAoB,WAAW;QAC7B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAoB,OAAO;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3D,CAAC;IAEe,KAAK,CAAC,IAAI;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
1
+ {"version":3,"file":"GeneratorBarrel.js","sourceRoot":"","sources":["../../src/run/GeneratorBarrel.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAG3D,MAAM,OAAO,eAAgB,SAAQ,iBAAiB;IACpD,YAAmB,MAA0B;QAC3C,KAAK,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAC5B,CAAC;IAEe,YAAY;QAC1B,OAAO;YACL,oEAAoE;YACpE,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CACtB,CAAC,IAAI,EAAE,EAAE,CAAC,oBAAoB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CACxE;SACF,CAAC;IACJ,CAAC;IACe,cAAc;QAC5B,OAAO,EAAE,CAAC;IACZ,CAAC;IACe,UAAU;QACxB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,6DAA6D;IAC7C,YAAY,CAAC,IAAc;QACzC,OAAO;IACT,CAAC;IAEe,KAAK,CAAC,IAAI;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
@@ -10,9 +10,11 @@ export declare abstract class GeneratorBaseFile extends GeneratorBase {
10
10
  get realDirPath(): string;
11
11
  get virtualFilePath(): string;
12
12
  get virtualDirPath(): string;
13
- abstract get code(): string[];
14
- abstract get importsCode(): string[];
15
- abstract get exports(): GeneratorExportNode[];
13
+ abstract getLogicCode(): string[];
14
+ abstract getImportsCode(): string[];
15
+ abstract getExports(): GeneratorExportNode[];
16
+ abstract setLogicCode(code: string[]): void;
17
+ getCode(): string;
16
18
  persist(): Promise<this>;
17
19
  protected prepareCode(code: string): Promise<string>;
18
20
  protected prepareJson(json: string): Promise<string>;
@@ -1 +1 @@
1
- {"version":3,"file":"GeneratorBaseFile.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorBaseFile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAIjF,8BAAsB,iBAAkB,SAAQ,aAAa;aAIzC,QAAQ,EAAE,MAAM;IACzB,MAAM,EAAE,kBAAkB;IAJnC,SAAgB,GAAG,EAAE,MAAM,CAAC;gBAGV,QAAQ,EAAE,MAAM,EACzB,MAAM,EAAE,kBAAkB;IAMnC,IAAW,YAAY,IAAI,MAAM,CAEhC;IAED,IAAW,WAAW,IAAI,MAAM,CAE/B;IAED,IAAW,eAAe,IAAI,MAAM,CAEnC;IAED,IAAW,cAAc,IAAI,MAAM,CAElC;IAED,aAAoB,IAAI,IAAI,MAAM,EAAE,CAAC;IACrC,aAAoB,WAAW,IAAI,MAAM,EAAE,CAAC;IAC5C,aAAoB,OAAO,IAAI,mBAAmB,EAAE,CAAC;IAE/B,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;cAgB9B,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAI1C,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAG3D"}
1
+ {"version":3,"file":"GeneratorBaseFile.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorBaseFile.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAIjF,8BAAsB,iBAAkB,SAAQ,aAAa;aAIzC,QAAQ,EAAE,MAAM;IACzB,MAAM,EAAE,kBAAkB;IAJnC,SAAgB,GAAG,EAAE,MAAM,CAAC;gBAGV,QAAQ,EAAE,MAAM,EACzB,MAAM,EAAE,kBAAkB;IAMnC,IAAW,YAAY,IAAI,MAAM,CAEhC;IAED,IAAW,WAAW,IAAI,MAAM,CAE/B;IAED,IAAW,eAAe,IAAI,MAAM,CAEnC;IAED,IAAW,cAAc,IAAI,MAAM,CAElC;aAEe,YAAY,IAAI,MAAM,EAAE;aACxB,cAAc,IAAI,MAAM,EAAE;aAC1B,UAAU,IAAI,mBAAmB,EAAE;aAEnC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,IAAI;IAE3C,OAAO,IAAI,MAAM;IAIF,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;cAgB9B,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;cAI1C,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;CAG3D"}
@@ -25,8 +25,11 @@ export class GeneratorBaseFile extends GeneratorBase {
25
25
  get virtualDirPath() {
26
26
  return this.parent.virtualPath;
27
27
  }
28
+ getCode() {
29
+ return [...this.getImportsCode(), "", ...this.getLogicCode()].join("\n");
30
+ }
28
31
  async persist() {
29
- let code = [...this.importsCode, "", ...this.code].join("\n");
32
+ let code = this.getCode();
30
33
  code =
31
34
  this.ext === DecoFileExtension.ts
32
35
  ? await this.prepareCode(code)
@@ -1 +1 @@
1
- {"version":3,"file":"GeneratorBaseFile.js","sourceRoot":"","sources":["../../src/run/GeneratorBaseFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEnE,MAAM,OAAgB,iBAAkB,SAAQ,aAAa;IAIzC;IACT;IAJO,GAAG,CAAS;IAE5B,YACkB,QAAgB,EACzB,MAA0B;QAEjC,KAAK,EAAE,CAAC;QAHQ,aAAQ,GAAR,QAAQ,CAAQ;QACzB,WAAM,GAAN,MAAM,CAAoB;QAGjC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,IAAW,YAAY;QACrB,OAAO,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;IAChD,CAAC;IAED,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAED,IAAW,eAAe;QACxB,OAAO,GAAG,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;IACnD,CAAC;IAED,IAAW,cAAc;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;IACjC,CAAC;IAMe,KAAK,CAAC,OAAO;QAC3B,IAAI,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE9D,IAAI;YACF,IAAI,CAAC,GAAG,KAAK,iBAAiB,CAAC,EAAE;gBAC/B,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC9B,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,iBAAiB,CAAC,IAAI;oBACnC,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;oBAC9B,CAAC,CAAC,IAAI,CAAC;QAEb,MAAM,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE;YACvC,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,IAAY;QACtC,OAAO,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,IAAY;QACtC,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF"}
1
+ {"version":3,"file":"GeneratorBaseFile.js","sourceRoot":"","sources":["../../src/run/GeneratorBaseFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEnE,MAAM,OAAgB,iBAAkB,SAAQ,aAAa;IAIzC;IACT;IAJO,GAAG,CAAS;IAE5B,YACkB,QAAgB,EACzB,MAA0B;QAEjC,KAAK,EAAE,CAAC;QAHQ,aAAQ,GAAR,QAAQ,CAAQ;QACzB,WAAM,GAAN,MAAM,CAAoB;QAGjC,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC;IAED,IAAW,YAAY;QACrB,OAAO,GAAG,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;IAChD,CAAC;IAED,IAAW,WAAW;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAED,IAAW,eAAe;QACxB,OAAO,GAAG,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;IACnD,CAAC;IAED,IAAW,cAAc;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;IACjC,CAAC;IAQM,OAAO;QACZ,OAAO,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3E,CAAC;IAEe,KAAK,CAAC,OAAO;QAC3B,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE1B,IAAI;YACF,IAAI,CAAC,GAAG,KAAK,iBAAiB,CAAC,EAAE;gBAC/B,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;gBAC9B,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,iBAAiB,CAAC,IAAI;oBACnC,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;oBAC9B,CAAC,CAAC,IAAI,CAAC;QAEb,MAAM,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,EAAE;YACvC,QAAQ,EAAE,OAAO;SAClB,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,IAAY;QACtC,OAAO,MAAM,UAAU,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC;IAES,KAAK,CAAC,WAAW,CAAC,IAAY;QACtC,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF"}
@@ -1,19 +1,24 @@
1
1
  import type { GeneratorDirectory } from "./GeneratorDirectory.js";
2
2
  import { GeneratorBaseFile } from "./GeneratorBaseFile.js";
3
- import type { GeneratorFsExport } from "@mxpicture/gcp-functions-common/types";
4
- import type { GeneratorRunImpAlias } from "../common/types.common.js";
5
- import type { VirtualFile } from "@mxpicture/build-api/imp";
6
- export declare class GeneratorFile extends GeneratorBaseFile {
7
- code: string[];
8
- missingImports: string[];
9
- valueImportsMissing: string[];
10
- typeImportsMissing: string[];
11
- importsCode: string[];
12
- importAliases: GeneratorRunImpAlias[];
13
- protected _virtual: VirtualFile | null;
3
+ import type { DecoResolve, GeneratorFsExport } from "@mxpicture/gcp-functions-common/types";
4
+ import type { IVirtualFile, VirtualDiagnostics } from "@mxpicture/build-api/imp";
5
+ import { GeneratorFileImports } from "./GeneratorFileImports.js";
6
+ export declare class GeneratorFile extends GeneratorBaseFile implements IVirtualFile {
7
+ protected _imports: GeneratorFileImports | null;
8
+ protected _logicCode: string[];
9
+ protected _diagnostics: VirtualDiagnostics[];
14
10
  constructor(filename: string, parent: GeneratorDirectory);
15
- get virtual(): VirtualFile;
16
- get exports(): GeneratorFsExport[];
11
+ createImports(res: DecoResolve): void;
12
+ get imports(): GeneratorFileImports;
13
+ getVirtualPath(): string;
14
+ getFilename(): string;
15
+ getContent(): string;
16
+ getDiagnostics(): VirtualDiagnostics[];
17
+ getVersion(): number;
18
+ getLogicCode(): string[];
19
+ getImportsCode(): string[];
20
+ setLogicCode(code: string[]): void;
21
+ getExports(): GeneratorFsExport[];
17
22
  load(): Promise<this>;
18
23
  }
19
24
  //# sourceMappingURL=GeneratorFile.d.ts.map
@@ -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,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAC/E,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE5D,qBAAa,aAAc,SAAQ,iBAAiB;IAC3C,IAAI,EAAE,MAAM,EAAE,CAAM;IACpB,cAAc,EAAE,MAAM,EAAE,CAAM;IAC9B,mBAAmB,EAAE,MAAM,EAAE,CAAM;IACnC,kBAAkB,EAAE,MAAM,EAAE,CAAM;IAClC,WAAW,EAAE,MAAM,EAAE,CAAM;IAC3B,aAAa,EAAE,oBAAoB,EAAE,CAAM;IAElD,SAAS,CAAC,QAAQ,EAAE,WAAW,GAAG,IAAI,CAAQ;gBAE3B,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB;IAI/D,IAAW,OAAO,IAAI,WAAW,CAYhC;IAED,IAAoB,OAAO,IAAI,iBAAiB,EAAE,CAmBjD;IAEqB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG5C"}
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,EACV,WAAW,EACX,iBAAiB,EAClB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,KAAK,EACV,YAAY,EACZ,kBAAkB,EACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,qBAAa,aAAc,SAAQ,iBAAkB,YAAW,YAAY;IAC1E,SAAS,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI,CAAQ;IAEvD,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,CAAM;IACpC,SAAS,CAAC,YAAY,EAAE,kBAAkB,EAAE,CAAM;gBAE/B,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,kBAAkB;IAIxD,aAAa,CAAC,GAAG,EAAE,WAAW,GAAG,IAAI;IAK5C,IAAW,OAAO,IAAI,oBAAoB,CAIzC;IAEM,cAAc,IAAI,MAAM;IAGxB,WAAW,IAAI,MAAM;IAGrB,UAAU,IAAI,MAAM;IAGpB,cAAc,IAAI,kBAAkB,EAAE;IAGtC,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,iBAAiB,EAAE;IAqB3B,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAG5C"}
@@ -1,31 +1,50 @@
1
1
  import { extractExportsString } from "@mxpicture/build-api/exp";
2
2
  import { GeneratorBaseFile } from "./GeneratorBaseFile.js";
3
+ import { GeneratorFileImports } from "./GeneratorFileImports.js";
3
4
  export class GeneratorFile extends GeneratorBaseFile {
4
- code = [];
5
- missingImports = [];
6
- valueImportsMissing = [];
7
- typeImportsMissing = [];
8
- importsCode = [];
9
- importAliases = [];
10
- _virtual = null;
5
+ _imports = null;
6
+ _logicCode = [];
7
+ _diagnostics = [];
11
8
  constructor(filename, parent) {
12
9
  super(filename, parent);
13
10
  }
14
- get virtual() {
15
- if (!this._virtual)
16
- this._virtual = {
17
- virtualPath: this.virtualFilePath,
18
- filename: this.filename,
19
- content: "",
20
- diagnostics: [],
21
- version: 0,
22
- };
23
- this._virtual.content = [...this.importsCode, "", ...this.code].join("\n");
24
- return this._virtual;
25
- }
26
- get exports() {
11
+ createImports(res) {
12
+ if (this._imports)
13
+ return;
14
+ this._imports = new GeneratorFileImports(this, res);
15
+ }
16
+ get imports() {
17
+ if (!this._imports)
18
+ throw new Error(`No imports available/provided. ${this.virtualFilePath}`);
19
+ return this._imports;
20
+ }
21
+ getVirtualPath() {
22
+ return this.virtualFilePath;
23
+ }
24
+ getFilename() {
25
+ return this.filename;
26
+ }
27
+ getContent() {
28
+ return this.getCode();
29
+ }
30
+ getDiagnostics() {
31
+ return this._diagnostics;
32
+ }
33
+ getVersion() {
34
+ return 0;
35
+ }
36
+ getLogicCode() {
37
+ return this._logicCode;
38
+ }
39
+ getImportsCode() {
40
+ return this.imports.code;
41
+ }
42
+ setLogicCode(code) {
43
+ this._logicCode = code;
44
+ }
45
+ getExports() {
27
46
  const expNodes = extractExportsString({
28
- code: this.code,
47
+ code: this.getCode(),
29
48
  source: this.virtualFilePath,
30
49
  });
31
50
  return expNodes.map((expNode) => ({
@@ -1 +1 @@
1
- {"version":3,"file":"GeneratorFile.js","sourceRoot":"","sources":["../../src/run/GeneratorFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAK3D,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IAC3C,IAAI,GAAa,EAAE,CAAC;IACpB,cAAc,GAAa,EAAE,CAAC;IAC9B,mBAAmB,GAAa,EAAE,CAAC;IACnC,kBAAkB,GAAa,EAAE,CAAC;IAClC,WAAW,GAAa,EAAE,CAAC;IAC3B,aAAa,GAA2B,EAAE,CAAC;IAExC,QAAQ,GAAuB,IAAI,CAAC;IAE9C,YAAmB,QAAgB,EAAE,MAA0B;QAC7D,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC1B,CAAC;IAED,IAAW,OAAO;QAChB,IAAI,CAAC,IAAI,CAAC,QAAQ;YAChB,IAAI,CAAC,QAAQ,GAAG;gBACd,WAAW,EAAE,IAAI,CAAC,eAAe;gBACjC,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,OAAO,EAAE,EAAE;gBACX,WAAW,EAAE,EAAE;gBACf,OAAO,EAAE,CAAC;aACX,CAAC;QAEJ,IAAI,CAAC,QAAQ,CAAC,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,WAAW,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3E,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,IAAoB,OAAO;QACzB,MAAM,QAAQ,GAAG,oBAAoB,CAAC;YACpC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI,CAAC,eAAe;SAC7B,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC,GAAG,CACjB,CAAC,OAAO,EAAqB,EAAE,CAAC,CAAC;YAC/B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,iBAAiB,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC;YAC/D,iBAAiB,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,WAAW;YACxD,WAAW,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACjE,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI;YACpC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC9B,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO;SACpC,CAAC,CACH,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,IAAI;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
1
+ {"version":3,"file":"GeneratorFile.js","sourceRoot":"","sources":["../../src/run/GeneratorFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAS3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,OAAO,aAAc,SAAQ,iBAAiB;IACxC,QAAQ,GAAgC,IAAI,CAAC;IAE7C,UAAU,GAAa,EAAE,CAAC;IAC1B,YAAY,GAAyB,EAAE,CAAC;IAElD,YAAmB,QAAgB,EAAE,MAA0B;QAC7D,KAAK,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC1B,CAAC;IAEM,aAAa,CAAC,GAAgB;QACnC,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,oBAAoB,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACtD,CAAC;IAED,IAAW,OAAO;QAChB,IAAI,CAAC,IAAI,CAAC,QAAQ;YAChB,MAAM,IAAI,KAAK,CAAC,kCAAkC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;QAC5E,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAEM,cAAc;QACnB,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IACM,WAAW;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IACM,UAAU;QACf,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IACM,cAAc;QACnB,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IACM,UAAU;QACf,OAAO,CAAC,CAAC;IACX,CAAC;IAEe,YAAY;QAC1B,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IACe,cAAc;QAC5B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IAEe,YAAY,CAAC,IAAc;QACzC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC;IAEe,UAAU;QACxB,MAAM,QAAQ,GAAG,oBAAoB,CAAC;YACpC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE;YACpB,MAAM,EAAE,IAAI,CAAC,eAAe;SAC7B,CAAC,CAAC;QAEH,OAAO,QAAQ,CAAC,GAAG,CACjB,CAAC,OAAO,EAAqB,EAAE,CAAC,CAAC;YAC/B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,iBAAiB,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC;YAC/D,iBAAiB,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,WAAW,WAAW;YACxD,WAAW,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;YACjE,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI;YACpC,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ;YAC9B,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO;SACpC,CAAC,CACH,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,IAAI;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
@@ -0,0 +1,22 @@
1
+ import type { DecoImport, DecoResolve, GeneratorFsExport } from "@mxpicture/gcp-functions-common/types";
2
+ import type { GeneratorRunImpAlias } from "../common/types.common.js";
3
+ import type { ExportNode, PackageAPI } from "@mxpicture/build-api/types";
4
+ import type { GeneratorFile } from "./GeneratorFile.js";
5
+ export declare enum GeneratorFileImportType {
6
+ value = "value",
7
+ type = "type"
8
+ }
9
+ export declare class GeneratorFileImports {
10
+ readonly file: GeneratorFile;
11
+ resolver: DecoResolve;
12
+ aliases: GeneratorRunImpAlias[];
13
+ protected _items: DecoImport[];
14
+ protected _errors: Record<string, number>;
15
+ constructor(file: GeneratorFile, resolver: DecoResolve);
16
+ get items(): DecoImport[];
17
+ get code(): string[];
18
+ set(exps: GeneratorFsExport[], pkgs: PackageAPI[]): void;
19
+ protected processProp(prop: string, type: GeneratorFileImportType, exps: GeneratorFsExport[], pkgs: PackageAPI[]): void;
20
+ protected _processProp<T extends GeneratorFsExport | ExportNode>(prop: string, type: GeneratorFileImportType, exps: T[], pathResolver: (from: GeneratorFile, exp: T, res: DecoResolve) => string): void;
21
+ }
22
+ //# sourceMappingURL=GeneratorFileImports.d.ts.map
@@ -0,0 +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,GAAG,CAAC,IAAI,EAAE,iBAAiB,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE;IAkBxD,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;CA+DR"}
@@ -0,0 +1,83 @@
1
+ import { exportResolveImportPath, importsToCode, } from "../common/resolve.common.js";
2
+ import { TsErrorCode } from "@mxpicture/build-api/enum";
3
+ export var GeneratorFileImportType;
4
+ (function (GeneratorFileImportType) {
5
+ GeneratorFileImportType["value"] = "value";
6
+ GeneratorFileImportType["type"] = "type";
7
+ })(GeneratorFileImportType || (GeneratorFileImportType = {}));
8
+ export class GeneratorFileImports {
9
+ file;
10
+ resolver;
11
+ aliases = [];
12
+ _items = [];
13
+ _errors = {};
14
+ constructor(file, resolver) {
15
+ this.file = file;
16
+ this.resolver = resolver;
17
+ }
18
+ get items() {
19
+ return [...this._items];
20
+ }
21
+ get code() {
22
+ return importsToCode(this._items);
23
+ }
24
+ set(exps, pkgs) {
25
+ const diags = this.file.getDiagnostics();
26
+ for (const diag of diags) {
27
+ if (diag.code === TsErrorCode.missingImport ||
28
+ diag.code === TsErrorCode.valueImportMissing) {
29
+ this.processProp(diag.text, GeneratorFileImportType.value, exps, pkgs);
30
+ continue;
31
+ }
32
+ if (diag.code === TsErrorCode.typeImportMissing) {
33
+ this.processProp(diag.text, GeneratorFileImportType.type, exps, pkgs);
34
+ continue;
35
+ }
36
+ }
37
+ }
38
+ processProp(prop, type, exps, pkgs) {
39
+ this._processProp(prop, type, exps, exportResolveImportPath);
40
+ for (const pkg of pkgs) {
41
+ this._processProp(prop, type, [...pkg.runtimeExports, ...pkg.typeExports], (_, exp) => exp.source);
42
+ }
43
+ }
44
+ _processProp(prop, type, exps, pathResolver) {
45
+ let name = prop;
46
+ let exp = exps.find((exp) => exp.name === name);
47
+ if (!exp) {
48
+ const alias = this.aliases.find((a) => a.alias === name);
49
+ if (!alias)
50
+ return;
51
+ exp = exps.find((exp) => exp.name === alias.real);
52
+ if (exp)
53
+ name = `${alias.real} as ${alias.alias}`;
54
+ }
55
+ if (!exp)
56
+ return;
57
+ const path = pathResolver(this.file, exp, this.resolver);
58
+ let item = this._items.find((item) => item.path === path);
59
+ if (!item) {
60
+ item = { path, typeProps: [], valueProps: [] };
61
+ this._items.push(item);
62
+ }
63
+ switch (type) {
64
+ case GeneratorFileImportType.type:
65
+ if (!item.typeProps.includes(name))
66
+ item.typeProps.push(name);
67
+ let i = item.valueProps.findIndex((p) => p === name);
68
+ if (i >= 0)
69
+ item.valueProps.splice(i, 1);
70
+ break;
71
+ case GeneratorFileImportType.value:
72
+ if (!item.valueProps.includes(name))
73
+ item.valueProps.push(name);
74
+ i = item.typeProps.findIndex((p) => p === name);
75
+ if (i >= 0)
76
+ item.typeProps.splice(i, 1);
77
+ break;
78
+ default:
79
+ break;
80
+ }
81
+ }
82
+ }
83
+ //# sourceMappingURL=GeneratorFileImports.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"GeneratorFileImports.js","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.ts"],"names":[],"mappings":"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"}
@@ -3,15 +3,15 @@ import { type DecoFileType, type DecoPackageType } from "@mxpicture/gcp-function
3
3
  import type { GeneratorFile } from "./GeneratorFile.js";
4
4
  import type { GeneratorDirectory } from "./GeneratorDirectory.js";
5
5
  import { GeneratorBase } from "./GeneratorBase.js";
6
- import { FaultyTypeImports, MissingImports, VirtualFilesHandler } from "@mxpicture/build-api/imp";
6
+ import { BaseImports, VirtualFilesHandler } from "@mxpicture/build-api/imp";
7
7
  import type { GeneratorFsExport } from "@mxpicture/gcp-functions-common/types";
8
+ import type { PackageAPI } from "@mxpicture/build-api/types";
8
9
  export declare class GeneratorFs extends GeneratorBase {
9
10
  readonly rootPath: string;
10
11
  readonly pkgsDir: string;
11
12
  protected _pkgs: GeneratorPackage[] | null;
12
- protected _handler: VirtualFilesHandler;
13
- protected _missingImports: MissingImports;
14
- protected _faultyTypeImports: FaultyTypeImports;
13
+ protected _handler: VirtualFilesHandler<GeneratorFile>;
14
+ protected _imports: BaseImports<GeneratorFile>;
15
15
  constructor(rootPath: string, tsConfigFilePath: string, pkgsDir?: string);
16
16
  get realPath(): string;
17
17
  get virtualPath(): string;
@@ -20,7 +20,7 @@ export declare class GeneratorFs extends GeneratorBase {
20
20
  dir(pkgType: DecoPackageType, fileType: DecoFileType): GeneratorDirectory;
21
21
  file(pkgType: DecoPackageType, fileType: DecoFileType, filename: string): GeneratorFile;
22
22
  setCode(pkgType: DecoPackageType, fileType: DecoFileType, filename: string, code: string[]): void;
23
- setImportsCode(pkgType: DecoPackageType, fileType: DecoFileType, filename: string, importsCode: string[]): void;
23
+ setImports(exps: GeneratorFsExport[], pkgs: PackageAPI[]): void;
24
24
  get exps(): GeneratorFsExport[];
25
25
  get files(): GeneratorFile[];
26
26
  check4issues(): GeneratorFile[];
@@ -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,EACL,iBAAiB,EACjB,cAAc,EACd,mBAAmB,EACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uCAAuC,CAAC;AAE/E,qBAAa,WAAY,SAAQ,aAAa;aAO1B,QAAQ,EAAE,MAAM;aAEhB,OAAO,EAAE,MAAM;IARjC,SAAS,CAAC,KAAK,EAAE,gBAAgB,EAAE,GAAG,IAAI,CAAQ;IAClD,SAAS,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IACxC,SAAS,CAAC,eAAe,EAAE,cAAc,CAAC;IAC1C,SAAS,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;gBAG9B,QAAQ,EAAE,MAAM,EAChC,gBAAgB,EAAE,MAAM,EACR,OAAO,GAAE,MAAmB;IAQ9C,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,cAAc,CACnB,OAAO,EAAE,eAAe,EACxB,QAAQ,EAAE,YAAY,EACtB,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EAAE,GACpB,IAAI;IAIP,IAAW,IAAI,IAAI,iBAAiB,EAAE,CAErC;IAED,IAAW,KAAK,IAAI,aAAa,EAAE,CAElC;IAEM,YAAY,IAAI,aAAa,EAAE;IAgChB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAK/C"}
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;aAM1B,QAAQ,EAAE,MAAM;aAEhB,OAAO,EAAE,MAAM;IAPjC,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;gBAG7B,QAAQ,EAAE,MAAM,EAChC,gBAAgB,EAAE,MAAM,EACR,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;IAItE,IAAW,IAAI,IAAI,iBAAiB,EAAE,CAErC;IAED,IAAW,KAAK,IAAI,aAAa,EAAE,CAElC;IAEM,YAAY,IAAI,aAAa,EAAE;IAQhB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmBrB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAK/C"}
@@ -2,21 +2,19 @@ import { mkdir, readdir } from "node:fs/promises";
2
2
  import { GeneratorPackage } from "./GeneratorPackage.js";
3
3
  import { guardDecoPackageType, guardThrow, } from "@mxpicture/gcp-functions-common/decorator";
4
4
  import { GeneratorBase } from "./GeneratorBase.js";
5
- import { FaultyTypeImports, MissingImports, VirtualFilesHandler, } from "@mxpicture/build-api/imp";
5
+ import { BaseImports, VirtualFilesHandler } from "@mxpicture/build-api/imp";
6
6
  export class GeneratorFs extends GeneratorBase {
7
7
  rootPath;
8
8
  pkgsDir;
9
9
  _pkgs = null;
10
10
  _handler;
11
- _missingImports;
12
- _faultyTypeImports;
11
+ _imports;
13
12
  constructor(rootPath, tsConfigFilePath, pkgsDir = "packages") {
14
13
  super();
15
14
  this.rootPath = rootPath;
16
15
  this.pkgsDir = pkgsDir;
17
16
  this._handler = new VirtualFilesHandler(tsConfigFilePath);
18
- this._missingImports = new MissingImports(this._handler);
19
- this._faultyTypeImports = new FaultyTypeImports(this._handler);
17
+ this._imports = new BaseImports(this._handler);
20
18
  }
21
19
  get realPath() {
22
20
  return `${this.rootPath}${this.virtualPath}`;
@@ -44,31 +42,22 @@ export class GeneratorFs extends GeneratorBase {
44
42
  return this.dir(pkgType, fileType).file(filename);
45
43
  }
46
44
  setCode(pkgType, fileType, filename, code) {
47
- this.file(pkgType, fileType, filename).code = code;
45
+ this.file(pkgType, fileType, filename).setLogicCode(code);
48
46
  }
49
- setImportsCode(pkgType, fileType, filename, importsCode) {
50
- this.file(pkgType, fileType, filename).importsCode = importsCode;
47
+ setImports(exps, pkgs) {
48
+ this.files.map((file) => file.imports.set(exps, pkgs));
51
49
  }
52
50
  get exps() {
53
- return this.files.flatMap((file) => file.exports);
51
+ return this.files.flatMap((file) => file.getExports());
54
52
  }
55
53
  get files() {
56
54
  return this.pkgs.flatMap((pkg) => pkg.dirs.flatMap((dir) => dir.files));
57
55
  }
58
56
  check4issues() {
59
57
  const files = this.files;
60
- this._handler.sync(files.map((f) => f.virtual));
61
- const missingNames = Object.entries(this._missingImports.missingNames);
62
- const typeImportsMissing = Object.entries(this._faultyTypeImports.typeMissings);
63
- const valueImportsMissing = Object.entries(this._faultyTypeImports.valueMissings);
64
- for (const file of files) {
65
- file.missingImports =
66
- missingNames.find(([virtualFilePath]) => virtualFilePath === file.virtualFilePath)?.[1] ?? [];
67
- file.typeImportsMissing =
68
- typeImportsMissing.find(([virtualFilePath]) => virtualFilePath === file.virtualFilePath)?.[1] ?? [];
69
- file.valueImportsMissing =
70
- valueImportsMissing.find(([virtualFilePath]) => virtualFilePath === file.virtualFilePath)?.[1] ?? [];
71
- }
58
+ this._handler.files.length = 0;
59
+ this._handler.files.push(...files);
60
+ this._handler.runDiagnostics();
72
61
  return files;
73
62
  }
74
63
  async load() {
@@ -1 +1 @@
1
- {"version":3,"file":"GeneratorFs.js","sourceRoot":"","sources":["../../src/run/GeneratorFs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GeneratorFs.js","sourceRoot":"","sources":["../../src/run/GeneratorFs.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,7 @@
1
1
  import { GeneratorTemplate } from "./GeneratorTemplate.js";
2
- import type { DecoFile, DecoResolve, GeneratorFsExport } from "@mxpicture/gcp-functions-common/types";
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 { PackageAPI } from "@mxpicture/build-api/types";
6
- import type { GeneratorFile } from "./GeneratorFile.js";
7
5
  export declare class GeneratorRun {
8
6
  readonly rootPath: string;
9
7
  readonly templatesPath: string;
@@ -17,7 +15,6 @@ export declare class GeneratorRun {
17
15
  runDeco(): Promise<DecoFile[]>;
18
16
  runCode(decoFiles: DecoFile[]): Promise<void>;
19
17
  runImpExports(): Promise<void>;
20
- protected buildImportsCode(exps: GeneratorFsExport[], files: GeneratorFile[], pkgs: PackageAPI[]): void;
21
18
  /**
22
19
  * Dynamically imports a generator file and returns a cached {@link GeneratorRunFile}.
23
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,EACX,iBAAiB,EAClB,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,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIxD,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,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpB,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;IAQ9B,OAAO,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7C,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAyB3C,SAAS,CAAC,gBAAgB,CACxB,IAAI,EAAE,iBAAiB,EAAE,EACzB,KAAK,EAAE,aAAa,EAAE,EACtB,IAAI,EAAE,UAAU,EAAE;IASpB;;;;;OAKG;IACU,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAY7D"}
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,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpB,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;IAyB3C;;;;;OAKG;IACU,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;CAY7D"}
@@ -1,7 +1,6 @@
1
1
  import { GeneratorTemplate } from "./GeneratorTemplate.js";
2
2
  import { Generator } from "../generator/Generator.js";
3
3
  import { DecoExtractor } from "../decorator/DecoExtractor.js";
4
- import { exportsToCode, packageApiToCode } from "../common/resolve.common.js";
5
4
  import { readGeneratorRunFiles } from "../common/file.common.js";
6
5
  import { readExportsBuildCli, readExportsFile } from "@mxpicture/build-api/exp";
7
6
  import { resolve } from "node:path";
@@ -37,7 +36,7 @@ export class GeneratorRun {
37
36
  }
38
37
  async runCode(decoFiles) {
39
38
  const entries = await this.createGenerators();
40
- await Promise.all(entries.map((entry) => entry.gen.run4codes(decoFiles, this.env, this.fs)));
39
+ await Promise.all(entries.map((entry) => entry.gen.run4codes(decoFiles, this.env, this.fs, this.decoResolve)));
41
40
  }
42
41
  async runImpExports() {
43
42
  const exps = this.fs.exps;
@@ -53,15 +52,8 @@ export class GeneratorRun {
53
52
  else {
54
53
  pkgs.push(...allPkgs);
55
54
  }
56
- this.buildImportsCode(exps, this.fs.check4issues(), pkgs);
57
- this.buildImportsCode(exps, this.fs.check4issues(), pkgs);
58
- }
59
- buildImportsCode(exps, files, pkgs) {
60
- for (const file of files)
61
- file.importsCode = [
62
- ...exportsToCode(file, this.decoResolve, exps),
63
- ...packageApiToCode(file, pkgs),
64
- ];
55
+ this.fs.setImports(exps, pkgs);
56
+ // todo rerun
65
57
  }
66
58
  /**
67
59
  * 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":"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"}
1
+ {"version":3,"file":"GeneratorRun.js","sourceRoot":"","sources":["../../src/run/GeneratorRun.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ export * from "./GeneratorBase.js";
3
3
  export * from "./GeneratorBaseFile.js";
4
4
  export * from "./GeneratorDirectory.js";
5
5
  export * from "./GeneratorFile.js";
6
+ export * from "./GeneratorFileImports.js";
6
7
  export * from "./GeneratorFs.js";
7
8
  export * from "./GeneratorPackage.js";
8
9
  export * from "./GeneratorRun.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/run/index.ts"],"names":[],"mappings":"AACA,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/run/index.ts"],"names":[],"mappings":"AACA,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC"}
package/dist/run/index.js CHANGED
@@ -4,6 +4,7 @@ export * from "./GeneratorBase.js";
4
4
  export * from "./GeneratorBaseFile.js";
5
5
  export * from "./GeneratorDirectory.js";
6
6
  export * from "./GeneratorFile.js";
7
+ export * from "./GeneratorFileImports.js";
7
8
  export * from "./GeneratorFs.js";
8
9
  export * from "./GeneratorPackage.js";
9
10
  export * from "./GeneratorRun.js";
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/run/index.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/run/index.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,wBAAwB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mxpicture/gcp-functions-generator",
3
- "version": "1.2.26",
3
+ "version": "1.2.28",
4
4
  "description": "Tools for google cloud functions",
5
5
  "type": "module",
6
6
  "author": "MXPicture",
@@ -36,10 +36,10 @@
36
36
  },
37
37
  "dependencies": {
38
38
  "@google-cloud/scheduler": "^5.3.1",
39
- "@mxpicture/build-api": "^0.3.42",
40
- "@mxpicture/gcp-functions-backend": "^1.2.26",
41
- "@mxpicture/gcp-functions-common": "^1.2.26",
42
- "@mxpicture/gcp-functions-frontend": "^1.2.26",
39
+ "@mxpicture/build-api": "^0.3.46",
40
+ "@mxpicture/gcp-functions-backend": "^1.2.28",
41
+ "@mxpicture/gcp-functions-common": "^1.2.28",
42
+ "@mxpicture/gcp-functions-frontend": "^1.2.28",
43
43
  "@types/micromatch": "^4.0.10",
44
44
  "google-auth-library": "^10.6.2",
45
45
  "googleapis": "^171.4.0",