@xuda.io/runtime-bundle 1.0.480 → 1.0.482

package/js/xuda-runtime-slim.js

@@ -3320,7 +3320,7 @@ func.datasource.create = async function (
           }
         }
 
-        var datasource_changes = {
+        const datasource_changes = {
           [dsSessionP]: {
             ['datasource_main']: {
               stat: 'idle',
@@ -9097,15 +9097,6 @@ func.UI.update_xu_ref = function (SESSION_ID, dsSessionP, ref_field_id, $elm) {
   SYS_GLOBAL_OBJ_REFS[ref_field_id].props = _ds.in_parameters || {};
 
   if ($elm) {
-    // const get_attributes = function (retry = 0) {
-    //   if (retry > 500) return;
-    //   $elm?.data()?.xuPanelWrapper?.panelXuAttributes ||
-    //     $elm?.data()?.xuData?.debug_info?.attribute_stat ||
-    //     setTimeout(() => {
-    //       get_attributes(retry + 1);
-    //     }, 500);
-    // };
-
     const attributes = $elm?.data()?.xuData?.xuPanelProps || $elm?.data()?.xuData?.debug_info?.attribute_stat || {};
     SYS_GLOBAL_OBJ_REFS[ref_field_id].attributes = attributes;
     SYS_GLOBAL_OBJ_REFS[ref_field_id].xu_ui_id = $elm.attr('xu-ui-id');
@@ -10825,7 +10816,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) {
@@ -10920,6 +10911,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') {
@@ -11893,31 +11997,32 @@ func.UI.screen.refresh_screen_old = async function (SESSION_ID, fields_changed_a
   }
 };
 
-const get_params_obj = async function (SESSION_ID, prog_id, parameters_obj_inP) {
-  const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
-  if (!_prog) {
-    return;
-  }
+// const get_params_obj = async function (SESSION_ID, prog_id, parameters_obj_inP) {
+//   const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
+//   if (!_prog) {
+//     return;
+//   }
+
+//   // get in parameters
+//   var params_obj = {};
+//   if (_prog?.properties?.progParams) {
+//     for await (const [key, val] of Object.entries(_prog.properties.progParams)) {
+//       if (!val.data.dir === 'in') continue;
+//       if (typeof parameters_obj_inP?.[val.data.parameter] !== 'undefined') {
+//         if (parameters_obj_inP?.[val.data.parameter].fx) {
+//           let ret = await func.expression.get(SESSION_ID, parameters_obj_inP?.[val.data.parameter].fx, dsSession, 'parameters');
+//           params_obj[val.data.parameter] = ret.result;
+//         } else {
+//           params_obj[val.data.parameter] = parameters_obj_inP?.[val.data.parameter].value;
+//         }
+//         continue;
+//       }
+//       console.warn(`Warning: Program ${_prog.properties.menuName} expected In parameter: ${val.data.parameter} but received null instead`);
+//     }
+//   }
+//   return params_obj;
+// };
 
-  // get in parameters
-  var params_obj = {};
-  if (_prog?.properties?.progParams) {
-    for await (const [key, val] of Object.entries(_prog.properties.progParams)) {
-      if (!val.data.dir === 'in') continue;
-      if (typeof parameters_obj_inP?.[val.data.parameter] !== 'undefined') {
-        if (parameters_obj_inP?.[val.data.parameter].fx) {
-          let ret = await func.expression.get(SESSION_ID, parameters_obj_inP?.[val.data.parameter].fx, dsSession, 'parameters');
-          params_obj[val.data.parameter] = ret.result;
-        } else {
-          params_obj[val.data.parameter] = parameters_obj_inP?.[val.data.parameter].value;
-        }
-        continue;
-      }
-      console.warn(`Warning: Program ${_prog.properties.menuName} expected In parameter: ${val.data.parameter} but received null instead`);
-    }
-  }
-  return params_obj;
-};
 const get_params_obj_new = async function (SESSION_ID, prog_id, nodeP, dsSession) {
   const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
   if (!_prog) return;

package/js/xuda-runtime-slim.min.es.js

@@ -3321,7 +3321,7 @@ func.datasource.create = async function (
           }
         }
 
-        var datasource_changes = {
+        const datasource_changes = {
           [dsSessionP]: {
             ['datasource_main']: {
               stat: 'idle',
@@ -9098,15 +9098,6 @@ func.UI.update_xu_ref = function (SESSION_ID, dsSessionP, ref_field_id, $elm) {
   SYS_GLOBAL_OBJ_REFS[ref_field_id].props = _ds.in_parameters || {};
 
   if ($elm) {
-    // const get_attributes = function (retry = 0) {
-    //   if (retry > 500) return;
-    //   $elm?.data()?.xuPanelWrapper?.panelXuAttributes ||
-    //     $elm?.data()?.xuData?.debug_info?.attribute_stat ||
-    //     setTimeout(() => {
-    //       get_attributes(retry + 1);
-    //     }, 500);
-    // };
-
     const attributes = $elm?.data()?.xuData?.xuPanelProps || $elm?.data()?.xuData?.debug_info?.attribute_stat || {};
     SYS_GLOBAL_OBJ_REFS[ref_field_id].attributes = attributes;
     SYS_GLOBAL_OBJ_REFS[ref_field_id].xu_ui_id = $elm.attr('xu-ui-id');
@@ -9966,31 +9957,32 @@ func.UI.screen.refresh_screen_old = async function (SESSION_ID, fields_changed_a
   }
 };
 
-const get_params_obj = async function (SESSION_ID, prog_id, parameters_obj_inP) {
-  const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
-  if (!_prog) {
-    return;
-  }
+// const get_params_obj = async function (SESSION_ID, prog_id, parameters_obj_inP) {
+//   const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
+//   if (!_prog) {
+//     return;
+//   }
+
+//   // get in parameters
+//   var params_obj = {};
+//   if (_prog?.properties?.progParams) {
+//     for await (const [key, val] of Object.entries(_prog.properties.progParams)) {
+//       if (!val.data.dir === 'in') continue;
+//       if (typeof parameters_obj_inP?.[val.data.parameter] !== 'undefined') {
+//         if (parameters_obj_inP?.[val.data.parameter].fx) {
+//           let ret = await func.expression.get(SESSION_ID, parameters_obj_inP?.[val.data.parameter].fx, dsSession, 'parameters');
+//           params_obj[val.data.parameter] = ret.result;
+//         } else {
+//           params_obj[val.data.parameter] = parameters_obj_inP?.[val.data.parameter].value;
+//         }
+//         continue;
+//       }
+//       console.warn(`Warning: Program ${_prog.properties.menuName} expected In parameter: ${val.data.parameter} but received null instead`);
+//     }
+//   }
+//   return params_obj;
+// };
 
-  // get in parameters
-  var params_obj = {};
-  if (_prog?.properties?.progParams) {
-    for await (const [key, val] of Object.entries(_prog.properties.progParams)) {
-      if (!val.data.dir === 'in') continue;
-      if (typeof parameters_obj_inP?.[val.data.parameter] !== 'undefined') {
-        if (parameters_obj_inP?.[val.data.parameter].fx) {
-          let ret = await func.expression.get(SESSION_ID, parameters_obj_inP?.[val.data.parameter].fx, dsSession, 'parameters');
-          params_obj[val.data.parameter] = ret.result;
-        } else {
-          params_obj[val.data.parameter] = parameters_obj_inP?.[val.data.parameter].value;
-        }
-        continue;
-      }
-      console.warn(`Warning: Program ${_prog.properties.menuName} expected In parameter: ${val.data.parameter} but received null instead`);
-    }
-  }
-  return params_obj;
-};
 const get_params_obj_new = async function (SESSION_ID, prog_id, nodeP, dsSession) {
   const _prog = await func.utils.VIEWS_OBJ.get(SESSION_ID, prog_id);
   if (!_prog) return;
@@ -14621,7 +14613,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) {
@@ -14716,6 +14708,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') {