@mxpicture/gcp-functions-generator 1.2.95 → 1.2.96
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorFileImports.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACZ,MAAM,uCAAuC,CAAC;AAK/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"GeneratorFileImports.d.ts","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EACV,WAAW,EACZ,MAAM,uCAAuC,CAAC;AAK/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAGL,KAAK,gBAAgB,EACtB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,KAAK,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAElE,qBAAa,oBAAqB,SAAQ,aAAa;aAOnC,IAAI,EAAE,aAAa;IAC5B,QAAQ,EAAE,WAAW;IAPvB,OAAO,EAAE,YAAY,EAAE,CAAM;IAEpC,SAAS,CAAC,MAAM,EAAE,UAAU,EAAE,CAAM;IACpC,SAAS,CAAC,MAAM,EAAE,mBAAmB,CAAM;gBAGzB,IAAI,EAAE,aAAa,EAC5B,QAAQ,EAAE,WAAW;IAKd,QAAQ,IAAI,mBAAmB,GAAG,IAAI;IAGtC,QAAQ,CAAC,KAAK,EAAE,mBAAmB,GAAG,IAAI;IAK1D,IAAW,KAAK,IAAI,UAAU,EAAE,CAE/B;IAED,IAAW,IAAI,IAAI,MAAM,EAAE,CAE1B;IAEM,UAAU,IAAI,OAAO;IAoC5B,SAAS,CAAC,WAAW,CACnB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,uBAAuB,EAC7B,MAAM,EAAE,gBAAgB,GACvB,OAAO;CAiEX"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { exportResolveImportPath, importsToCode, } from "../common/resolve.common.js";
|
|
2
2
|
import { TsErrorCode } from "@mxpicture/build-api/enum";
|
|
3
|
-
import { ExportsContent, } from "@mxpicture/build-api/exp";
|
|
3
|
+
import { ExportsContent, splitExportsAlias, } from "@mxpicture/build-api/exp";
|
|
4
4
|
import { GeneratorBase } from "./GeneratorBase.js";
|
|
5
5
|
import { GeneratorFileImportType } from "../common/run.common.js";
|
|
6
6
|
export class GeneratorFileImports extends GeneratorBase {
|
|
@@ -56,16 +56,19 @@ export class GeneratorFileImports extends GeneratorBase {
|
|
|
56
56
|
}
|
|
57
57
|
processProp(prop, type, lookup) {
|
|
58
58
|
this.callDebugImports({ prop, type, lookup });
|
|
59
|
-
const
|
|
60
|
-
const
|
|
59
|
+
const aliasUsed = splitExportsAlias(prop);
|
|
60
|
+
const aliasProp = aliasUsed?.alias ?? prop;
|
|
61
|
+
const realProp = aliasUsed?.real ??
|
|
62
|
+
this.aliases.find((alias) => alias.alias === aliasProp)?.real;
|
|
63
|
+
const asProp = realProp ? `${realProp} as ${aliasProp}` : aliasProp;
|
|
61
64
|
const { first } = lookup.find({
|
|
62
|
-
prop,
|
|
65
|
+
prop: aliasProp,
|
|
63
66
|
realProp,
|
|
64
67
|
});
|
|
65
68
|
if (!first)
|
|
66
69
|
return false;
|
|
67
70
|
const path = first instanceof ExportsContent
|
|
68
|
-
? first.findNode(realProp ??
|
|
71
|
+
? first.findNode(realProp ?? aliasProp)?.source
|
|
69
72
|
: exportResolveImportPath(this.file, first, this.resolver);
|
|
70
73
|
if (!path)
|
|
71
74
|
return false;
|
|
@@ -77,8 +80,8 @@ export class GeneratorFileImports extends GeneratorBase {
|
|
|
77
80
|
const add = (name, from, to) => {
|
|
78
81
|
let changed = false;
|
|
79
82
|
// check also for aliases
|
|
80
|
-
const toIndex = to.findIndex((t) => t === name
|
|
81
|
-
const fromIndex = from.findIndex((t) => t === name
|
|
83
|
+
const toIndex = to.findIndex((t) => t === name);
|
|
84
|
+
const fromIndex = from.findIndex((t) => t === name);
|
|
82
85
|
const searchName = toIndex >= 0 ? to[toIndex] : fromIndex >= 0 ? from[fromIndex] : name;
|
|
83
86
|
if (toIndex < 0) {
|
|
84
87
|
to.push(searchName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeneratorFileImports.js","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,uBAAuB,EACvB,aAAa,GACd,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAExD,OAAO,EACL,cAAc,
|
|
1
|
+
{"version":3,"file":"GeneratorFileImports.js","sourceRoot":"","sources":["../../src/run/GeneratorFileImports.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.96",
|
|
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.4.
|
|
52
|
-
"@mxpicture/gcp-functions-backend": "^1.2.
|
|
53
|
-
"@mxpicture/gcp-functions-common": "^1.2.
|
|
54
|
-
"@mxpicture/gcp-functions-frontend": "^1.2.
|
|
51
|
+
"@mxpicture/build-api": "^0.4.6",
|
|
52
|
+
"@mxpicture/gcp-functions-backend": "^1.2.96",
|
|
53
|
+
"@mxpicture/gcp-functions-common": "^1.2.96",
|
|
54
|
+
"@mxpicture/gcp-functions-frontend": "^1.2.96",
|
|
55
55
|
"google-auth-library": "^10.6.2",
|
|
56
56
|
"googleapis": "^171.4.0",
|
|
57
57
|
"json5": "^2.2.3"
|