@mxpicture/gcp-functions-generator 1.2.85 → 1.2.86
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.
|
@@ -40,7 +40,7 @@ export class GeneratorFileImports {
|
|
|
40
40
|
}
|
|
41
41
|
}
|
|
42
42
|
processProp(prop, type, lookup) {
|
|
43
|
-
const {
|
|
43
|
+
const { usedAlias, first } = lookup.find({
|
|
44
44
|
prop,
|
|
45
45
|
alias: this.aliases.find((alias) => alias.real === prop)?.alias,
|
|
46
46
|
});
|
|
@@ -56,21 +56,20 @@ export class GeneratorFileImports {
|
|
|
56
56
|
item = { path, typeProps: [], valueProps: [] };
|
|
57
57
|
this._items.push(item);
|
|
58
58
|
}
|
|
59
|
+
const add = (name, from, to) => {
|
|
60
|
+
if (!to.includes(name))
|
|
61
|
+
to.push(name);
|
|
62
|
+
i = from.findIndex((p) => p === name);
|
|
63
|
+
if (i >= 0)
|
|
64
|
+
from.splice(i, 1);
|
|
65
|
+
};
|
|
59
66
|
let i = -1;
|
|
60
67
|
switch (type) {
|
|
61
68
|
case GeneratorFileImportType.type:
|
|
62
|
-
|
|
63
|
-
item.typeProps.push(importString);
|
|
64
|
-
i = item.valueProps.findIndex((p) => p === importString);
|
|
65
|
-
if (i >= 0)
|
|
66
|
-
item.valueProps.splice(i, 1);
|
|
69
|
+
add(usedAlias ?? prop, item.valueProps, item.typeProps);
|
|
67
70
|
break;
|
|
68
71
|
case GeneratorFileImportType.value:
|
|
69
|
-
|
|
70
|
-
item.valueProps.push(importString);
|
|
71
|
-
i = item.typeProps.findIndex((p) => p === importString);
|
|
72
|
-
if (i >= 0)
|
|
73
|
-
item.typeProps.splice(i, 1);
|
|
72
|
+
add(usedAlias ?? prop, item.typeProps, item.valueProps);
|
|
74
73
|
break;
|
|
75
74
|
default:
|
|
76
75
|
break;
|
|
@@ -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,GAEf,MAAM,0BAA0B,CAAC;AAElC,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,GAAmB,EAAE,CAAC;IAE1B,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,UAAU;QACf,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAC3C,MAAM,EAAE,GAAG,UAAU,CAAC,MAAM,CAAC;QAC7B,MAAM,MAAM,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAEjD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QACzC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IACE,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,aAAa;gBACvC,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,kBAAkB,EAC5C,CAAC;gBACD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,uBAAuB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;gBACnE,SAAS;YACX,CAAC;YAED,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC,iBAAiB,EAAE,CAAC;gBAChD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,uBAAuB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;gBAClE,SAAS;YACX,CAAC;QACH,CAAC;IACH,CAAC;IAES,WAAW,CACnB,IAAY,EACZ,IAA6B,EAC7B,MAAwB;QAExB,MAAM,EAAE,
|
|
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.86",
|
|
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.105",
|
|
52
|
+
"@mxpicture/gcp-functions-backend": "^1.2.86",
|
|
53
|
+
"@mxpicture/gcp-functions-common": "^1.2.86",
|
|
54
|
+
"@mxpicture/gcp-functions-frontend": "^1.2.86",
|
|
55
55
|
"google-auth-library": "^10.6.2",
|
|
56
56
|
"googleapis": "^171.4.0",
|
|
57
57
|
"json5": "^2.2.3"
|