@xuda.io/runtime-bundle 1.0.500 → 1.0.502

package/js/xuda-runtime-slim.js

@@ -10474,7 +10474,7 @@ func.events.invoke = async function (event_id) {
 };
  func.expression = {};
 
-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) {
+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) {
   class xu_class {
     async get() {
       var ret;
@@ -10828,160 +10828,6 @@ func.expression.get_org = async function (SESSION_ID, valP, dsSessionP, sourceP,
   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) {
-  class xu_class {
-    async get() {
-      let ret, error, warning, var_error_found;
-      const fields = { ...fieldsP };
-      const evalJson = (text) => eval(`(${text})`);
-
-      // Initial value processing
-      ret = valP === null || typeof valP === 'undefined' ? '' : typeof valP === 'boolean' ? (valP ? 'Y' : 'N') : valP.toString();
-      ret = ret.replace(/\&/g, '&').replace(func.utils.replace_studio_drive_url(SESSION_ID, ret));
-
-      const endResults = () => {
-        if (['update', 'javascript'].includes(sourceP) && typeof ret === 'string') {
-          for (const [key, val] of Object.entries(fields)) {
-            if (typeof val === 'string') ret = ret.replace(`"${val}"`, val.replace(/"/g, ''));
-          }
-        }
-        if (error && 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 };
-      };
-
-      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();
-        }
-      };
-
-      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();
-      }
-
-      const var_Arr = await Promise.all(
-        (func.expression.parse(ret) || []).map(async (val, key) => {
-          const result = { value: val.value, fieldId: val.fieldId };
-          if (!val.fieldId) return result;
-
-          if (val.fieldId.startsWith('_THIS') && calling_fieldIdP) {
-            result.fieldId = val.fieldId.length === 5 ? calling_fieldIdP : calling_fieldIdP + val.fieldId.slice(5);
-          }
-
-          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;
-
-          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;
-          }
-
-          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('[') && var_Arr[key - 1]?.value) {
-              const prevData = var_Arr[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;
-        }),
-      );
-
-      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 Property 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();
-    }
-  }
-
-  return new xu_class().get();
-};
-
 func.expression.get_bad1 = 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) => {
@@ -12303,7 +12149,7 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
           null,
           null,
           wrapper_data.xuData.key, // the wrapper key
-          null,
+          panel_val._ds.dsSession, // the refreshed_ds
           wrapper_data.xuData.parent_node, // the wrapper parent node
           null,
           wrapper_data.xuData.$root_container, // the wrapper root container
@@ -13915,7 +13761,7 @@ func.UI.screen.screen_loading_done = async function (SESSION_ID, paramsP, $div,
   return $div;
 };
 
-func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, parent_infoP, paramsP, jobNoP, is_skeleton, keyP, is_mainP, parent_nodeP, check_existP, $root_container) {
+func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, parent_infoP, paramsP, jobNoP, is_skeleton, keyP, refreshed_ds, parent_nodeP, check_existP, $root_container) {
   if (!is_skeleton) {
     var _session = SESSION_OBJ[SESSION_ID];
     var _ds = _session.DS_GLB[paramsP.dsSessionP];

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

@@ -9881,7 +9881,7 @@ func.UI.screen.refresh_screen = async function (SESSION_ID, fields_changed_arr,
           null,
           null,
           wrapper_data.xuData.key, // the wrapper key
-          null,
+          panel_val._ds.dsSession, // the refreshed_ds
           wrapper_data.xuData.parent_node, // the wrapper parent node
           null,
           wrapper_data.xuData.$root_container, // the wrapper root container
@@ -11493,7 +11493,7 @@ func.UI.screen.screen_loading_done = async function (SESSION_ID, paramsP, $div,
   return $div;
 };
 
-func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, parent_infoP, paramsP, jobNoP, is_skeleton, keyP, is_mainP, parent_nodeP, check_existP, $root_container) {
+func.UI.screen.render_ui_tree = async function (SESSION_ID, $container, nodeP, parent_infoP, paramsP, jobNoP, is_skeleton, keyP, refreshed_ds, parent_nodeP, check_existP, $root_container) {
   if (!is_skeleton) {
     var _session = SESSION_OBJ[SESSION_ID];
     var _ds = _session.DS_GLB[paramsP.dsSessionP];
@@ -14282,7 +14282,7 @@ func.events.invoke = async function (event_id) {
 };
  func.expression = {};
 
-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) {
+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) {
   class xu_class {
     async get() {
       var ret;
@@ -14636,160 +14636,6 @@ func.expression.get_org = async function (SESSION_ID, valP, dsSessionP, sourceP,
   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) {
-  class xu_class {
-    async get() {
-      let ret, error, warning, var_error_found;
-      const fields = { ...fieldsP };
-      const evalJson = (text) => eval(`(${text})`);
-
-      // Initial value processing
-      ret = valP === null || typeof valP === 'undefined' ? '' : typeof valP === 'boolean' ? (valP ? 'Y' : 'N') : valP.toString();
-      ret = ret.replace(/\&/g, '&').replace(func.utils.replace_studio_drive_url(SESSION_ID, ret));
-
-      const endResults = () => {
-        if (['update', 'javascript'].includes(sourceP) && typeof ret === 'string') {
-          for (const [key, val] of Object.entries(fields)) {
-            if (typeof val === 'string') ret = ret.replace(`"${val}"`, val.replace(/"/g, ''));
-          }
-        }
-        if (error && 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 };
-      };
-
-      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();
-        }
-      };
-
-      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();
-      }
-
-      const var_Arr = await Promise.all(
-        (func.expression.parse(ret) || []).map(async (val, key) => {
-          const result = { value: val.value, fieldId: val.fieldId };
-          if (!val.fieldId) return result;
-
-          if (val.fieldId.startsWith('_THIS') && calling_fieldIdP) {
-            result.fieldId = val.fieldId.length === 5 ? calling_fieldIdP : calling_fieldIdP + val.fieldId.slice(5);
-          }
-
-          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;
-
-          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;
-          }
-
-          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('[') && var_Arr[key - 1]?.value) {
-              const prevData = var_Arr[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;
-        }),
-      );
-
-      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 Property 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();
-    }
-  }
-
-  return new xu_class().get();
-};
-
 func.expression.get_bad1 = 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) => {