@steedos/service-metadata-objects 2.7.18-beta.17 → 2.7.18-beta.18
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/lib/formula/core.js +5 -13
- package/lib/formula/core.js.map +1 -1
- package/package.json +5 -5
- package/src/formula/core.ts +7 -19
package/lib/formula/core.js
CHANGED
|
@@ -11,27 +11,19 @@ const isAmisFormula = (formula) => {
|
|
|
11
11
|
};
|
|
12
12
|
function extractAmisFormulaVariableNames(node) {
|
|
13
13
|
let result = [];
|
|
14
|
-
function traverse(node
|
|
14
|
+
function traverse(node) {
|
|
15
15
|
if (!node)
|
|
16
16
|
return;
|
|
17
17
|
if (node.type === 'variable') {
|
|
18
|
-
|
|
19
|
-
}
|
|
20
|
-
if (node.type === 'getter') {
|
|
21
|
-
if (node.key && node.key.type === 'identifier') {
|
|
22
|
-
const newPath = traverse(node.host, currentPath);
|
|
23
|
-
currentPath = newPath ? `${newPath}.${node.key.name}` : `${currentPath}.${node.key.name}`;
|
|
24
|
-
result.push(currentPath);
|
|
25
|
-
}
|
|
18
|
+
result.push(node.name);
|
|
26
19
|
}
|
|
27
20
|
for (const key in node) {
|
|
28
|
-
if (typeof node[key] === 'object' && node[key] !== null
|
|
29
|
-
traverse(node[key]
|
|
21
|
+
if (typeof node[key] === 'object' && node[key] !== null) {
|
|
22
|
+
traverse(node[key]);
|
|
30
23
|
}
|
|
31
24
|
}
|
|
32
|
-
return currentPath;
|
|
33
25
|
}
|
|
34
|
-
traverse(node
|
|
26
|
+
traverse(node);
|
|
35
27
|
return result;
|
|
36
28
|
}
|
|
37
29
|
const pickFormulaVars = (formula) => {
|
package/lib/formula/core.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/formula/core.ts"],"names":[],"mappings":";;;;AAAA,8CAA2C;AAC3C,mDAA+D;AAC/D,iCAAoE;AAEpE,+CAAoC;AAEpC,MAAM,aAAa,GAAG,CAAC,OAAe,EAAE,EAAE;IAEtC,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC,CAAA;AAmBD,SAAS,+BAA+B,CAAC,IAAI;IACzC,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,SAAS,QAAQ,CAAC,IAAI
|
|
1
|
+
{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/formula/core.ts"],"names":[],"mappings":";;;;AAAA,8CAA2C;AAC3C,mDAA+D;AAC/D,iCAAoE;AAEpE,+CAAoC;AAEpC,MAAM,aAAa,GAAG,CAAC,OAAe,EAAE,EAAE;IAEtC,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AACpC,CAAC,CAAA;AAmBD,SAAS,+BAA+B,CAAC,IAAI;IACzC,IAAI,MAAM,GAAG,EAAE,CAAC;IAEhB,SAAS,QAAQ,CAAC,IAAI;QAClB,IAAI,CAAC,IAAI;YAAE,OAAO;QAGlB,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU,EAAE;YAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC1B;QAGD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACpB,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;gBACrD,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;aACvB;SACJ;IACL,CAAC;IAED,QAAQ,CAAC,IAAI,CAAC,CAAC;IACf,OAAO,MAAM,CAAC;AAClB,CAAC;AAMM,MAAM,eAAe,GAAG,CAAC,OAAe,EAAiB,EAAE;IAC9D,IAAG,aAAa,CAAC,OAAO,CAAC,EAAC;QACtB,MAAM,MAAM,GAAG,+BAA+B,CAAC,IAAA,oBAAK,EAAC,OAAO,CAAC,CAAC,CAAC;QAC/D,OAAO,MAAM,CAAC;KACjB;IACD,OAAO,IAAA,iBAAO,EAAC,OAAO,CAAC,CAAC;AAC5B,CAAC,CAAA;AANY,QAAA,eAAe,mBAM3B;AAUM,MAAM,oCAAoC,GAAG,CAAO,iBAAyB,EAAE,gBAAwB,EAAE,UAAkB,EAAE,UAA0B,EAAoB,EAAE;IAChL,MAAM,OAAO,GAAyC,MAAM,IAAA,4CAA4B,EAAC,iBAAiB,EAAE,gBAAgB,CAAC,CAAC;IAC9H,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE;QAC3B,OAAO,IAAA,iDAA0C,EAAC,OAAO,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;KACzF;SACI;QAED,OAAO,KAAK,CAAC;KAChB;AACL,CAAC,CAAA,CAAA;AATY,QAAA,oCAAoC,wCAShD"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@steedos/service-metadata-objects",
|
|
3
|
-
"version": "2.7.18-beta.
|
|
3
|
+
"version": "2.7.18-beta.18",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/objects.service.js",
|
|
6
6
|
"scripts": {
|
|
@@ -20,9 +20,9 @@
|
|
|
20
20
|
"license": "MIT",
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@salesforce/ts-types": "1.1.2",
|
|
23
|
-
"@steedos/formula": "2.7.18-beta.
|
|
24
|
-
"@steedos/i18n": "2.7.18-beta.
|
|
25
|
-
"@steedos/metadata-registrar": "2.7.18-beta.
|
|
23
|
+
"@steedos/formula": "2.7.18-beta.18",
|
|
24
|
+
"@steedos/i18n": "2.7.18-beta.18",
|
|
25
|
+
"@steedos/metadata-registrar": "2.7.18-beta.18",
|
|
26
26
|
"dotenv-flow": "^3.1.0",
|
|
27
27
|
"ioredis": "^4.22.0",
|
|
28
28
|
"lodash": "^4.17.21",
|
|
@@ -37,5 +37,5 @@
|
|
|
37
37
|
"publishConfig": {
|
|
38
38
|
"access": "public"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "e3bc227856fc57567df48eff1a5f8c174a8ba275"
|
|
41
41
|
}
|
package/src/formula/core.ts
CHANGED
|
@@ -29,35 +29,23 @@ const isAmisFormula = (formula: string) => {
|
|
|
29
29
|
function extractAmisFormulaVariableNames(node) {
|
|
30
30
|
let result = [];
|
|
31
31
|
|
|
32
|
-
function traverse(node
|
|
32
|
+
function traverse(node) {
|
|
33
33
|
if (!node) return;
|
|
34
34
|
|
|
35
|
+
// 如果是变量节点，收集它的name
|
|
35
36
|
if (node.type === 'variable') {
|
|
36
|
-
|
|
37
|
-
currentPath = node.name;
|
|
37
|
+
result.push(node.name);
|
|
38
38
|
}
|
|
39
39
|
|
|
40
|
-
|
|
41
|
-
if (node.key && node.key.type === 'identifier') {
|
|
42
|
-
// 如果有 getter，先递归其 host，构建路径
|
|
43
|
-
const newPath = traverse(node.host, currentPath);
|
|
44
|
-
currentPath = newPath ? `${newPath}.${node.key.name}` : `${currentPath}.${node.key.name}`;
|
|
45
|
-
// 只在完整路径构建结束后添加
|
|
46
|
-
result.push(currentPath);
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
// 遍历当前节点的键值，以继续递归查找
|
|
40
|
+
// 递归遍历所有子节点
|
|
51
41
|
for (const key in node) {
|
|
52
|
-
if (typeof node[key] === 'object' && node[key] !== null
|
|
53
|
-
traverse(node[key]
|
|
42
|
+
if (typeof node[key] === 'object' && node[key] !== null) {
|
|
43
|
+
traverse(node[key]);
|
|
54
44
|
}
|
|
55
45
|
}
|
|
56
|
-
|
|
57
|
-
return currentPath;
|
|
58
46
|
}
|
|
59
47
|
|
|
60
|
-
traverse(node
|
|
48
|
+
traverse(node);
|
|
61
49
|
return result;
|
|
62
50
|
}
|
|
63
51
|
|