@xuda.io/runtime-bundle 1.0.480 → 1.0.482

package/js/xuda-server-bundle.mjs

@@ -1696,7 +1696,7 @@ func.datasource.create = async function (
           }
         }
 
-        var datasource_changes = {
+        const datasource_changes = {
           [dsSessionP]: {
             ['datasource_main']: {
               stat: 'idle',
@@ -8095,7 +8095,7 @@ func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, row
   return new_class.get();
 };
 
-func.expression.parse = function (strP) {
+func.expression.parse_org = function (strP) {
   var extract_str = function (strP, posP) {
     if (!posP) posP = 0;
     var clean_split_str = function (arrP) {
@@ -8190,6 +8190,119 @@ func.expression.parse = function (strP) {
   return res;
 };
 
+func.expression.parse_bad = function (strP) {
+  const nonLettersPatt = /\W/;
+  const validSymbolsNoArray = /[^.@\[]/;
+  const validSymbolsWithArray = /[^.@"'\[\]]/;
+
+  function extractStr(str, startPos = 0) {
+    const cleanSplit = (arr) => (arr?.length > 1 && arr[0] === '' && arr[1].includes('@') ? arr.slice(1) : arr);
+
+    const segments = cleanSplit(str.replace(/@/g, '^^@').split('^^'));
+    const result = [];
+
+    for (const val of segments || []) {
+      if (!val) continue;
+      const pos = str.indexOf(val) + startPos;
+
+      if (val.startsWith('@')) {
+        let tmpStr = '';
+        let wordStart = null;
+        let wordEnd = null;
+        let validSymbols = validSymbolsNoArray;
+
+        for (let i = 0; i < val.length; i++) {
+          const char = val[i];
+
+          if (char === '[') validSymbols = validSymbolsWithArray;
+          if (char === '.' && wordStart === null) wordStart = i;
+          else if (wordStart !== null && nonLettersPatt.test(char)) wordEnd = i;
+
+          if (wordStart !== null && wordEnd !== null) {
+            const word = val.slice(wordStart + 1, wordEnd);
+            tmpStr = tmpStr.slice(0, wordStart) + '^^' + tmpStr.slice(wordStart, wordEnd);
+            wordStart = char === '.' ? wordEnd : null;
+            wordEnd = null;
+          }
+
+          tmpStr += nonLettersPatt.test(char) && validSymbols.test(char) && !tmpStr.includes('^^') ? '^^' + char : char;
+        }
+
+        if (tmpStr.includes('^^')) {
+          result.push(...extractStr(tmpStr, pos));
+        } else {
+          const fieldIdMatch = val.match(/^@([^.\[]+)/);
+          result.push({
+            value: val,
+            fieldId: fieldIdMatch ? fieldIdMatch[1] : undefined,
+            pos,
+          });
+        }
+      } else {
+        result.push({ value: val, pos });
+      }
+    }
+    return result;
+  }
+
+  return extractStr(strP);
+};
+
+func.expression.parse = function (input) {
+  if (typeof input !== 'string') return [];
+
+  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 = '';
+      }
+
+      // Add @variable segment
+      const fullVarValue = `@${fieldId}`;
+      segments.push({
+        value: fullVarValue,
+        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 !== '@') {
+      segments.push({
+        value: part,
+        pos,
+      });
+      pos += part.length;
+    }
+  }
+
+  return segments;
+};
+
 func.expression.get_property = async function (valP) {
   async function secure_eval(val) {
     if (typeof IS_PROCESS_SERVER === 'undefined') {

package/js/xuda-worker-bundle.js

@@ -1696,7 +1696,7 @@ func.datasource.create = async function (
           }
         }
 
-        var datasource_changes = {
+        const datasource_changes = {
           [dsSessionP]: {
             ['datasource_main']: {
               stat: 'idle',
@@ -8095,7 +8095,7 @@ func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, row
   return new_class.get();
 };
 
-func.expression.parse = function (strP) {
+func.expression.parse_org = function (strP) {
   var extract_str = function (strP, posP) {
     if (!posP) posP = 0;
     var clean_split_str = function (arrP) {
@@ -8190,6 +8190,119 @@ func.expression.parse = function (strP) {
   return res;
 };
 
+func.expression.parse_bad = function (strP) {
+  const nonLettersPatt = /\W/;
+  const validSymbolsNoArray = /[^.@\[]/;
+  const validSymbolsWithArray = /[^.@"'\[\]]/;
+
+  function extractStr(str, startPos = 0) {
+    const cleanSplit = (arr) => (arr?.length > 1 && arr[0] === '' && arr[1].includes('@') ? arr.slice(1) : arr);
+
+    const segments = cleanSplit(str.replace(/@/g, '^^@').split('^^'));
+    const result = [];
+
+    for (const val of segments || []) {
+      if (!val) continue;
+      const pos = str.indexOf(val) + startPos;
+
+      if (val.startsWith('@')) {
+        let tmpStr = '';
+        let wordStart = null;
+        let wordEnd = null;
+        let validSymbols = validSymbolsNoArray;
+
+        for (let i = 0; i < val.length; i++) {
+          const char = val[i];
+
+          if (char === '[') validSymbols = validSymbolsWithArray;
+          if (char === '.' && wordStart === null) wordStart = i;
+          else if (wordStart !== null && nonLettersPatt.test(char)) wordEnd = i;
+
+          if (wordStart !== null && wordEnd !== null) {
+            const word = val.slice(wordStart + 1, wordEnd);
+            tmpStr = tmpStr.slice(0, wordStart) + '^^' + tmpStr.slice(wordStart, wordEnd);
+            wordStart = char === '.' ? wordEnd : null;
+            wordEnd = null;
+          }
+
+          tmpStr += nonLettersPatt.test(char) && validSymbols.test(char) && !tmpStr.includes('^^') ? '^^' + char : char;
+        }
+
+        if (tmpStr.includes('^^')) {
+          result.push(...extractStr(tmpStr, pos));
+        } else {
+          const fieldIdMatch = val.match(/^@([^.\[]+)/);
+          result.push({
+            value: val,
+            fieldId: fieldIdMatch ? fieldIdMatch[1] : undefined,
+            pos,
+          });
+        }
+      } else {
+        result.push({ value: val, pos });
+      }
+    }
+    return result;
+  }
+
+  return extractStr(strP);
+};
+
+func.expression.parse = function (input) {
+  if (typeof input !== 'string') return [];
+
+  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 = '';
+      }
+
+      // Add @variable segment
+      const fullVarValue = `@${fieldId}`;
+      segments.push({
+        value: fullVarValue,
+        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 !== '@') {
+      segments.push({
+        value: part,
+        pos,
+      });
+      pos += part.length;
+    }
+  }
+
+  return segments;
+};
+
 func.expression.get_property = async function (valP) {
   async function secure_eval(val) {
     if (typeof IS_PROCESS_SERVER === 'undefined') {