@steedos/service-metadata-objects 3.0.0-beta.8 → 3.0.0-beta.80

package/src/formula/core.ts

@@ -25,27 +25,60 @@ const isAmisFormula = (formula: string) => {
 //     return result;
 // }
 
-function extractAmisFormulaVariableNames(node) {
-  const result = [];
+function extractAmisFormulaVariableNames(data) {
+  const variables = new Set();
 
   function traverse(node) {
-    if (!node) return;
+    if (!node || typeof node !== "object") return;
 
-    // 如果是变量节点，收集它的name
-    if (node.type === "variable") {
-      result.push(node.name);
+    // 处理普通变量（排除作为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 (typeof node[key] === "object" && node[key] !== null) {
+      if (key !== "parent" && typeof node[key] === "object") {
+        // 设置父节点引用
+        node[key].parent = node;
         traverse(node[key]);
       }
     }
   }
 
-  traverse(node);
-  return result;
+  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;
+  }
+
+  traverse(data);
+  return Array.from(variables);
 }
 
 /**
@@ -55,7 +88,8 @@ function extractAmisFormulaVariableNames(node) {
 export const pickFormulaVars = (formula: string): Array<string> => {
   if (isAmisFormula(formula)) {
     const result = extractAmisFormulaVariableNames(parse(formula));
-    return result;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return result as any;
   }
   return extract(formula);
 };