@xuda.io/runtime-bundle 1.0.498 → 1.0.500

package/js/xuda-server-bundle.mjs

@@ -7753,7 +7753,7 @@ func.events.invoke = async function (event_id) {
 };
  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;
@@ -8107,7 +8107,161 @@ func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, row
   return new_class.get();
 };
 
-func.expression.get_bad = 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() {
+      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) => {
     for (const [key, val] of Object.entries(fields)) {
@@ -8401,7 +8555,7 @@ func.expression.parse = function (input) {
   return segments;
 };
 
-func.expression.get_property_org = async function (valP) {
+func.expression.get_property = async function (valP) {
   async function secure_eval(val) {
     if (typeof IS_PROCESS_SERVER === 'undefined') {
       try {
@@ -8440,7 +8594,7 @@ func.expression.get_property_org = async function (valP) {
   };
 };
 
-func.expression.get_property = async function (valP) {
+func.expression.get_property_bad = async function (valP) {
   if (typeof valP !== 'string') return { property1: undefined, property2: undefined };
 
   const secureEval = async (expr) => {
@@ -8485,31 +8639,31 @@ func.expression.get_property = async function (valP) {
   return { property1, property2 };
 };
 
-func.expression.validate_constant_org = function (valP) {
+func.expression.validate_constant = function (valP) {
   var patt = /["']/;
   if (typeof valP === 'string' && patt.test(valP.substr(0, 1)) && patt.test(valP.substr(0, valP.length - 1))) return true;
   else return false;
 };
-func.expression.validate_variables_org = function (valP) {
+func.expression.validate_variables = function (valP) {
   if (typeof valP === 'string' && valP.indexOf('@') > -1) return true;
   else return false;
 };
-func.expression.remove_quotes_org = function (valP) {
+func.expression.remove_quotes = function (valP) {
   if (func.expression.validate_constant(valP)) return valP.substr(1, valP.length - 2);
   else return valP;
 };
 
-func.expression.validate_constant = function (valP) {
-  typeof valP === 'string' && /^["'].*["']$/.test(valP);
-};
+// func.expression.validate_constant = function (valP) {
+//   typeof valP === 'string' && /^["'].*["']$/.test(valP);
+// };
 
-func.expression.validate_variables = function (valP) {
-  typeof valP === 'string' && valP.includes('@');
-};
+// func.expression.validate_variables = function (valP) {
+//   typeof valP === 'string' && valP.includes('@');
+// };
 
-func.expression.remove_quotes = function (valP) {
-  func.expression.validate_constant(valP) && typeof valP === 'string' ? valP.slice(1, -1) : valP;
-};
+// func.expression.remove_quotes = function (valP) {
+//   func.expression.validate_constant(valP) && typeof valP === 'string' ? valP.slice(1, -1) : valP;
+// };
 
 func.expression.secure_eval_org = async function (SESSION_ID, sourceP, val, job_id, dsSessionP, js_script_callback, evt) {
   const api_utils = await func.common.get_module(SESSION_ID, 'xuda-api-library.mjs', {

package/js/xuda-worker-bundle.js

@@ -7753,7 +7753,7 @@ func.events.invoke = async function (event_id) {
 };
  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;
@@ -8107,7 +8107,161 @@ func.expression.get = async function (SESSION_ID, valP, dsSessionP, sourceP, row
   return new_class.get();
 };
 
-func.expression.get_bad = 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() {
+      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) => {
     for (const [key, val] of Object.entries(fields)) {
@@ -8401,7 +8555,7 @@ func.expression.parse = function (input) {
   return segments;
 };
 
-func.expression.get_property_org = async function (valP) {
+func.expression.get_property = async function (valP) {
   async function secure_eval(val) {
     if (typeof IS_PROCESS_SERVER === 'undefined') {
       try {
@@ -8440,7 +8594,7 @@ func.expression.get_property_org = async function (valP) {
   };
 };
 
-func.expression.get_property = async function (valP) {
+func.expression.get_property_bad = async function (valP) {
   if (typeof valP !== 'string') return { property1: undefined, property2: undefined };
 
   const secureEval = async (expr) => {
@@ -8485,31 +8639,31 @@ func.expression.get_property = async function (valP) {
   return { property1, property2 };
 };
 
-func.expression.validate_constant_org = function (valP) {
+func.expression.validate_constant = function (valP) {
   var patt = /["']/;
   if (typeof valP === 'string' && patt.test(valP.substr(0, 1)) && patt.test(valP.substr(0, valP.length - 1))) return true;
   else return false;
 };
-func.expression.validate_variables_org = function (valP) {
+func.expression.validate_variables = function (valP) {
   if (typeof valP === 'string' && valP.indexOf('@') > -1) return true;
   else return false;
 };
-func.expression.remove_quotes_org = function (valP) {
+func.expression.remove_quotes = function (valP) {
   if (func.expression.validate_constant(valP)) return valP.substr(1, valP.length - 2);
   else return valP;
 };
 
-func.expression.validate_constant = function (valP) {
-  typeof valP === 'string' && /^["'].*["']$/.test(valP);
-};
+// func.expression.validate_constant = function (valP) {
+//   typeof valP === 'string' && /^["'].*["']$/.test(valP);
+// };
 
-func.expression.validate_variables = function (valP) {
-  typeof valP === 'string' && valP.includes('@');
-};
+// func.expression.validate_variables = function (valP) {
+//   typeof valP === 'string' && valP.includes('@');
+// };
 
-func.expression.remove_quotes = function (valP) {
-  func.expression.validate_constant(valP) && typeof valP === 'string' ? valP.slice(1, -1) : valP;
-};
+// func.expression.remove_quotes = function (valP) {
+//   func.expression.validate_constant(valP) && typeof valP === 'string' ? valP.slice(1, -1) : valP;
+// };
 
 func.expression.secure_eval_org = async function (SESSION_ID, sourceP, val, job_id, dsSessionP, js_script_callback, evt) {
   const api_utils = await func.common.get_module(SESSION_ID, 'xuda-api-library.mjs', {