@xuda.io/runtime-bundle 1.0.488 → 1.0.490

package/js/xuda-runtime-bundle.js

@@ -34922,7 +34922,7 @@ func.UI.component.init_xu_nav = function ($container, $nav) {
 };
  func.expression = {};
 
-func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, rowIdP, sourceActionP, secondPassP, calling_fieldIdP, fieldsP, debug_infoP, iterate_info, js_script_callback, jobNo, api_output_type) {
+func.expression.get_org = async function (SESSION_ID, valP, dsSessionP, sourceP, rowIdP, sourceActionP, secondPassP, calling_fieldIdP, fieldsP, debug_infoP, iterate_info, js_script_callback, jobNo, api_output_type) {
   class xu_class {
     async get() {
       var ret;
@@ -35042,7 +35042,7 @@ func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, row
       // var split = [];
       var var_Arr = [];
       const split = func.expression.parse(ret) || [];
-      console.log(valP, split);
+      // console.log(valP, split);
       for await (const [arr_key, val] of Object.entries(split)) {
         // run each field
         const key = Number(arr_key);
@@ -35276,6 +35276,177 @@ func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, row
   return new_class.get();
 };
 
+func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, rowIdP, sourceActionP, secondPassP, calling_fieldIdP, fieldsP = {}, debug_infoP, iterate_info, js_script_callback, jobNo, api_output_type) {
+  const evalJson = (text) => eval(`(${text})`);
+  const replaceQuotes = (str) => {
+    for (const [key, val] of Object.entries(fields)) {
+      if (typeof val === 'string') str = str.replace(`"${val}"`, val.replace(/"/g, ''));
+    }
+    return str;
+  };
+
+  let ret, error, warning, var_error_found;
+  const fields = { ...fieldsP };
+
+  // Initial value processing
+  if (valP === null || typeof valP === 'undefined') ret = '';
+  else if (typeof valP === 'boolean') ret = valP ? 'Y' : 'N';
+  else ret = valP.toString();
+
+  ret = ret.replace(/\&/g, '&');
+  ret = func.utils.replace_studio_drive_url(SESSION_ID, ret);
+
+  // End results helper
+  const endResults = () => {
+    if (['update', 'javascript'].includes(sourceP) && typeof ret === 'string') {
+      ret = replaceQuotes(ret);
+    }
+    if ((error || warning) && SESSION_OBJ[SESSION_ID]?.DS_GLB[dsSessionP]) {
+      func.utils.debug.log(SESSION_ID, SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP].nodeId, {
+        module: 'expression',
+        action: sourceP,
+        source: calling_fieldIdP,
+        prop: ret,
+        details: ret,
+        result: ret,
+        error,
+        warning,
+        fields: null,
+        type: 'exp',
+        prog_id: SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP].prog_id,
+        debug_info: debug_infoP,
+      });
+    }
+    return { result: ret, fields, error, warning, req: valP, var_error_found };
+  };
+
+  // Handle non-variable cases
+  const handleNonVariable = async () => {
+    try {
+      if (sourceP !== 'arguments') {
+        if (ret.startsWith('_DATE_')) ret = ret.slice(6);
+        else if (/^\d{4}-\d{2}-\d{2}$/.test(ret) || ret === 'self') return endResults();
+        else ret = await func.expression.secure_eval(SESSION_ID, sourceP, ret, jobNo, dsSessionP, js_script_callback);
+      } else {
+        ret = ret.replace(/_NULL/gi, '');
+      }
+      return endResults();
+    } catch (err) {
+      error = err.message;
+      return endResults();
+    }
+  };
+
+  // Early return for simple cases
+  if (!func.expression.validate_variables(valP)) return await handleNonVariable();
+  if (glb.emailRegex.test(await func.expression.secure_eval(SESSION_ID, sourceP, valP, jobNo, dsSessionP, js_script_callback))) {
+    return await handleNonVariable();
+  }
+
+  // Parse and process variables
+  const split = func.expression.parse(ret) || [];
+  const var_Arr = await Promise.all(
+    split.map(async (val, key) => {
+      const result = { value: val.value, fieldId: val.fieldId };
+
+      if (!val.fieldId) return result;
+
+      // Handle _THIS substitution
+      if (val.fieldId.startsWith('_THIS') && calling_fieldIdP) {
+        result.fieldId = val.fieldId.length === 5 ? calling_fieldIdP : calling_fieldIdP + val.fieldId.slice(5);
+      }
+
+      // Fetch value from datasource
+      const { ret: fetchedValue, fieldIdP } = await func.datasource.get_value(SESSION_ID, result.fieldId, dsSessionP, rowIdP);
+      result.value = fetchedValue?.value ?? (sourceP === 'exp' ? fetchedValue?.value : '""');
+      result.type = fetchedValue?.type;
+
+      // Handle iteration
+      if (iterate_info) {
+        if (iterate_info.iterator_key === fieldIdP) result.value = iterate_info._key;
+        if (iterate_info.iterator_val === fieldIdP) result.value = iterate_info._val;
+      }
+
+      // Process nested properties
+      if (val.value.includes('[') || val.value.includes('.')) {
+        const { property1, property2 } = await func.expression.get_property(val.value);
+        const data = fetchedValue?.type === 'object' ? fetchedValue.value : fetchedValue?.prop;
+
+        if (key > 0 && val.value.includes(']') && !val.value.includes('[') && split[key - 1].value) {
+          const prevData = split[key - 1].value;
+          result.value = prevData[fieldIdP];
+          if (val.value.includes('.') && prevData[fieldIdP]) {
+            result.value = prevData[fieldIdP][property2] ?? '';
+          }
+        } else if (data) {
+          if (property1) result.value = data[property1] ?? '';
+          if (property2) result.value = (property1 ? data[property1]?.[property2] : data[property2]) ?? '';
+        }
+      }
+
+      fields[fieldIdP] = result.value;
+      return result;
+    }),
+  );
+
+  // Final evaluation
+  try {
+    const res = var_Arr.map((val, key) => {
+      if (sourceP === 'UI Property EXP' || sourceP === 'UI Attr EXP') {
+        const { changed, value } = func.utils.get_drive_url(SESSION_ID, val.value, sourceP === 'UI Attr EXP' && var_Arr.length > 1);
+        if (changed) return value;
+      }
+
+      let value = val.value;
+      if (var_Arr.length > 1) {
+        if (!['DbQuery', 'alert', 'exp', 'api_rendered_output'].includes(sourceP) && ['string', 'date'].includes(val.type)) {
+          value = `\`${value}\``;
+        } else if (sourceP === 'api_rendered_output' && api_output_type === 'json' && ['string', 'date'].includes(val.type)) {
+          value = `"${value}"`;
+        }
+      }
+
+      if (val.fieldId && typeof value === 'string') {
+        if (['query', 'condition', 'range', 'sort', 'locate'].includes(sourceP)) value = value.replace(/↵|\r\n|\n|\r/g, '');
+        if (['init', 'update', 'virtual'].includes(sourceP)) value = value.replace(/↵|\r\n|\n|\r/g, '\\n');
+        if (typeof IS_PROCESS_SERVER !== 'undefined') value = value.replace(/↵|\r\n|\n|\r/g, '<br>');
+        fields[val.fieldId] = value;
+      }
+
+      if (typeof value === 'object' && var_Arr.length > 1) {
+        value = Array.isArray(value) || var_Arr[key + 1]?.value?.includes('.') ? JSON.stringify(value) : `(${JSON.stringify(value)})`;
+      }
+
+      if (!val.type === 'exp' && sourceP !== 'exp' && typeof value === 'string' && value.startsWith('@')) {
+        warning = `Error encoding ${value}`;
+        var_error_found = true;
+        return '0';
+      }
+      return value;
+    });
+
+    ret = res.length === 1 ? res[0] : res.join('');
+    if (var_Arr.some((v) => v.type === 'exp') && sourceP !== 'exp' && !secondPassP) {
+      const exp = await func.expression.get(SESSION_ID, ret, dsSessionP, sourceP, rowIdP, sourceActionP, true, calling_fieldIdP, fields, debug_infoP);
+      ret = exp.res?.[0] ?? exp.result;
+      Object.assign(fields, exp.fields);
+    } else if (!secondPassP && !['arguments', 'api_rendered_output', 'DbQuery'].includes(sourceP)) {
+      ret = await func.expression.secure_eval(SESSION_ID, sourceP, ret, jobNo, dsSessionP, js_script_callback);
+    } else if (sourceP === 'DbQuery') {
+      ret = JSON.stringify(evalJson(ret));
+    }
+
+    if (typeof ret === 'string' && ret.startsWith('@')) {
+      error = 'Error encoding @ var';
+      var_error_found = true;
+    }
+  } catch (err) {
+    error = err.message;
+  }
+
+  return endResults();
+};
+
 func.expression.parse_org = function (strP) {
   var extract_str = function (strP, posP) {
     if (!posP) posP = 0;
@@ -35435,50 +35606,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];
+  const parts = input.split(/(@\w+)/).filter(Boolean);
 
-    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}`;
+  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;