@steedos/service-metadata-objects 2.7.18-beta.26 → 2.7.18-beta.28

package/lib/formula/core.js

@@ -10,30 +10,48 @@ const isAmisFormula = (formula) => {
     return /\$\{.+\}/.test(formula);
 };
 function extractAmisFormulaVariableNames(data) {
-    let variables = [];
-    if (data.type === 'variable' &&
-        (!data._isGetterHost)) {
-        variables.push(data.name);
-    }
-    else if (data.type === 'getter') {
-        data.host._isGetterHost = true;
-        variables.push(`${data.host.name}.${data.key.name}`);
-    }
-    if (Array.isArray(data)) {
-        for (const item of data) {
-            if (typeof item === 'object' && item !== null) {
-                variables = variables.concat(extractAmisFormulaVariableNames(item));
+    const variables = new Set();
+    function traverse(node) {
+        if (!node || typeof node !== 'object')
+            return;
+        if (node.type === 'variable' && !isGetterHost(node)) {
+            variables.add(node.name);
+        }
+        else if (node.type === 'getter' && !isGetterHost(node)) {
+            const path = getFullGetterPath(node);
+            if (path)
+                variables.add(path);
+        }
+        for (const key in node) {
+            if (key !== 'parent' && typeof node[key] === 'object') {
+                node[key].parent = node;
+                traverse(node[key]);
             }
         }
     }
-    else if (typeof data === 'object' && data !== null) {
-        for (const key in data) {
-            if (typeof data[key] === 'object' && data[key] !== null) {
-                variables = variables.concat(extractAmisFormulaVariableNames(data[key]));
+    function isGetterHost(node) {
+        return node.parent && node.parent.type === 'getter' && node.parent.host === node;
+    }
+    function getFullGetterPath(getterNode) {
+        const parts = [getterNode.key.name];
+        let current = getterNode.host;
+        while (current) {
+            if (current.type === 'getter') {
+                parts.unshift(current.key.name);
+                current = current.host;
+            }
+            else if (current.type === 'variable') {
+                parts.unshift(current.name);
+                return parts.join('.');
+            }
+            else {
+                break;
             }
         }
+        return null;
     }
-    return variables;
+    traverse(data);
+    return Array.from(variables);
 }
 const pickFormulaVars = (formula) => {
     if (isAmisFormula(formula)) {

package/lib/formula/core.js.map

@@ -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;IAC3C,IAAI,SAAS,GAAG,EAAE,CAAC;IAGnB,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU;QACxB,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE;QACzB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAC3B;SAEI,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;QAE/B,IAAI,CAAC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC/B,SAAS,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;KACtD;IAGD,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACvB,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE;YACvB,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE;gBAC7C,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC,CAAC;aACrE;SACF;KACF;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE;QACpD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE;gBACvD,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,+BAA+B,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;aAC1E;SACF;KACF;IAED,OAAO,SAAS,CAAC;AACnB,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"}
+{"version":3,"file":"core.js","sourceRoot":"","sources":["../../src/formula/core.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steedos/service-metadata-objects",
-  "version": "2.7.18-beta.26",
+  "version": "2.7.18-beta.28",
   "description": "",
   "main": "lib/objects.service.js",
   "scripts": {
@@ -20,9 +20,9 @@
   "license": "MIT",
   "dependencies": {
     "@salesforce/ts-types": "1.1.2",
-    "@steedos/formula": "2.7.18-beta.26",
-    "@steedos/i18n": "2.7.18-beta.26",
-    "@steedos/metadata-registrar": "2.7.18-beta.26",
+    "@steedos/formula": "2.7.18-beta.28",
+    "@steedos/i18n": "2.7.18-beta.28",
+    "@steedos/metadata-registrar": "2.7.18-beta.28",
     "dotenv-flow": "^3.1.0",
     "ioredis": "^4.22.0",
     "lodash": "^4.17.21",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "742c13436718f7aeb9a0f44b04cef9d0a8c60422"
+  "gitHead": "4473b15021000bc87eb32b74552538b633a143e9"
 }

package/src/formula/core.ts

@@ -27,36 +27,57 @@ const isAmisFormula = (formula: string) => {
 
 
 function extractAmisFormulaVariableNames(data) {
-  let variables = [];
-  
-  // 检查当前节点是否是变量（但不是getter的host）
-  if (data.type === 'variable' && 
-      (!data._isGetterHost)) {  // 添加标记避免重复收集
-    variables.push(data.name);
-  }
-  // 检查当前节点是否是getter
-  else if (data.type === 'getter') {
-    // 标记host节点，避免重复收集
-    data.host._isGetterHost = true;
-    variables.push(`${data.host.name}.${data.key.name}`);
-  }
-  
-  // 递归检查所有子节点
-  if (Array.isArray(data)) {
-    for (const item of data) {
-      if (typeof item === 'object' && item !== null) {
-        variables = variables.concat(extractAmisFormulaVariableNames(item));
+  const variables = new Set();
+
+  function traverse(node) {
+    if (!node || typeof node !== 'object') return;
+
+    // 处理普通变量（排除作为getter host的情况）
+    if (node.type === 'variable' && !isGetterHost(node)) {
+      variables.add(node.name);
+    }
+    // 处理最外层的getter（不处理嵌套的getter host）
+    else if (node.type === 'getter' && !isGetterHost(node)) {
+      const path = getFullGetterPath(node);
+      if (path) variables.add(path);
+    }
+
+    // 递归遍历所有子节点
+    for (const key in node) {
+      if (key !== 'parent' && typeof node[key] === 'object') {
+        // 设置父节点引用
+        node[key].parent = node;
+        traverse(node[key]);
       }
     }
-  } else if (typeof data === 'object' && data !== null) {
-    for (const key in data) {
-      if (typeof data[key] === 'object' && data[key] !== null) {
-        variables = variables.concat(extractAmisFormulaVariableNames(data[key]));
+  }
+
+  function isGetterHost(node) {
+    return node.parent && node.parent.type === 'getter' && node.parent.host === node;
+  }
+
+  function getFullGetterPath(getterNode) {
+    const parts = [getterNode.key.name];
+    let current = getterNode.host;
+
+    // 向上追溯host
+    while (current) {
+      if (current.type === 'getter') {
+        parts.unshift(current.key.name);
+        current = current.host;
+      } else if (current.type === 'variable') {
+        parts.unshift(current.name);
+        return parts.join('.');
+      } else {
+        break;
       }
     }
+
+    return null;
   }
-  
-  return variables;
+
+  traverse(data);
+  return Array.from(variables);
 }
 
 /**
@@ -65,7 +86,7 @@ function extractAmisFormulaVariableNames(data) {
  */
 export const pickFormulaVars = (formula: string): Array<string> => {
     if(isAmisFormula(formula)){
-        const result = extractAmisFormulaVariableNames(parse(formula));
+        const result: any[] = extractAmisFormulaVariableNames(parse(formula));
         return result;
     }
     return extract(formula);