@xuda.io/runtime-bundle 1.0.487 → 1.0.489

package/js/xuda-runtime-bundle.js

@@ -35039,10 +35039,10 @@ func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, row
         return await variable_not_exist();
       }
 
-      var split = [];
+      // var split = [];
       var var_Arr = [];
-      split = func.expression.parse(ret);
-
+      const split = func.expression.parse(ret) || [];
+      console.log(valP, split);
       for await (const [arr_key, val] of Object.entries(split)) {
         // run each field
         const key = Number(arr_key);
@@ -35435,50 +35435,23 @@ func.expression.parse = function (input) {
   const segments = [];
   let pos = 0;
 
-  const parts = input.split(/(@)/).filter(Boolean);
-
-  for (let i = 0; i < parts.length; i++) {
-    const part = parts[i];
-
-    if (part === '@' && i + 1 < parts.length) {
-      const nextPart = parts[i + 1];
-      const varEnd = nextPart.search(/[.\[]/); // Split at first . or [
-      let fieldId, remainder;
-
-      if (varEnd > 0) {
-        fieldId = nextPart.slice(0, varEnd);
-        remainder = nextPart.slice(varEnd);
-      } else {
-        fieldId = nextPart;
-        remainder = '';
-      }
+  const parts = input.split(/(@\w+)/).filter(Boolean);
 
-      // Add @variable segment
-      const fullVarValue = `@${fieldId}`;
+  for (const part of parts) {
+    if (part.startsWith('@')) {
+      const fieldId = part.slice(1);
       segments.push({
-        value: fullVarValue,
+        value: part,
         fieldId,
         pos,
       });
-      pos += fullVarValue.length;
-
-      // Add remainder as a separate segment, if any
-      if (remainder) {
-        segments.push({
-          value: remainder,
-          pos,
-        });
-        pos += remainder.length;
-      }
-
-      i++; // Skip the next part since we consumed it
-    } else if (part !== '@') {
+    } else {
       segments.push({
         value: part,
         pos,
       });
-      pos += part.length;
     }
+    pos += part.length;
   }
 
   return segments;