@xuda.io/xuda-worker-bundle-min 1.3.1101 → 1.3.1103

package/index.js

@@ -2101,7 +2101,7 @@ func.datasource.execute = async function (
   dataSourceSession,
   IS_DATASOURCE_REFRESH
 ) {
-  debugger
+
   var _session = SESSION_OBJ[SESSION_ID];
   var _ds = _session.DS_GLB[dataSourceSession];
   var args = _ds.args;
@@ -2632,7 +2632,7 @@ func.datasource.execute = async function (
     }
 
     case "batch": {
-      debugger
+
       let has_datasource = await calc_batch_loops();
 
       _raw_data_rows = _ds?.v.raw_data?.rows || [];
@@ -2671,7 +2671,7 @@ func.datasource.execute = async function (
           );
         }
       }
-
+      await func.datasource.set_outputField(SESSION_ID, dataSourceSession, _ds?.v?.raw_data?.rows);
       break;
     }
 
@@ -4154,6 +4154,8 @@ func.datasource.callback = function (
   }
   delete _ds.old_dataSource;
 
+
+
   return {
     SESSION_ID,
     dsSessionP,
@@ -5095,21 +5097,12 @@ func.datasource.update_changes_for_out_parameter = async function (
   }
 };
 
-func.datasource.set_outputField = async function (SESSION_ID, elementP, triggerP, functionP, dsSessionP, result) {
+func.datasource.set_outputField = async function (SESSION_ID, dsSessionP, result) {
   var _session = SESSION_OBJ[SESSION_ID];
+  let _ds = _session.DS_GLB[dsSessionP];
 
-  const output_field = await get_args_property_value("outputField");
-
-  // if (!output_field) {
-  //   func.utils.debug_report(
-  //     SESSION_ID,
-  //     "func.events.execute",
-  //     `${elementP} >${triggerP} >${functionP} > Output field not defined`,
-  //     "W"
-  //   );
-
-  // }
 
+  const output_field = await func.datasource.get_args_property_value(SESSION_ID, dsSessionP, _ds.args, "outputField")
 
 
   if (output_field) {
@@ -5139,6 +5132,23 @@ func.datasource.set_outputField = async function (SESSION_ID, elementP, triggerP
   }
 
 }
+
+func.datasource.get_args_property_value = async function (SESSION_ID, dsSession, args, prop_name) {
+  let _prop = args?.calling_trigger_prop?.data?.name;
+  let _value = _prop[prop_name];
+  if (_prop?.[`xu-exp:${prop_name}`]) {
+    _value = (
+      await func.expression.get(
+        SESSION_ID,
+        _prop[`xu-exp:${prop_name}`],
+        dsSession,
+        `${prop_name} expression`
+      )
+    ).result;
+  }
+
+  return _value;
+};
  func.utils = {};
 
 func.utils.debug = {};
@@ -5464,9 +5474,9 @@ func.utils.job_worker = function (session_id) {
     if (
       !_session.WORKER_OBJ.jobs[_session.WORKER_OBJ.stat] ||
       _session.WORKER_OBJ.jobs[_session.WORKER_OBJ.stat].typeP ===
-        "system_interval" ||
+      "system_interval" ||
       _session.WORKER_OBJ.jobs[_session.WORKER_OBJ.stat].typeP ===
-        "system event"
+      "system event"
     ) {
       return;
     }
@@ -5832,10 +5842,10 @@ func.utils.ws_worker.functions = {
     if (show_log)
       console.log(
         "DATASOURCE EXECUTION DONE " +
-          ret.dsSessionP +
-          " " +
-          _session.DS_GLB[ret.dsSessionP]?.tree_obj?.menuName ||
-          "" + " SESSION_ID: " + SESSION_ID,
+        ret.dsSessionP +
+        " " +
+        _session.DS_GLB[ret.dsSessionP]?.tree_obj?.menuName ||
+        "" + " SESSION_ID: " + SESSION_ID,
         APP_OBJ[_session.app_id].app_name
       );
     var obj = func.utils.clean_returned_datasource(SESSION_ID, ret.dsSessionP);
@@ -5916,9 +5926,9 @@ func.utils.ws_worker.functions = {
     if (show_log)
       console.log(
         "DATASOURCE RETURN TO DATASOURCE " +
-          params.dssession +
-          " SESSION_ID: " +
-          SESSION_ID,
+        params.dssession +
+        " SESSION_ID: " +
+        SESSION_ID,
         APP_OBJ[_session.app_id].app_name
       );
     _session.DS_GLB[params.dssession].v.onscreen_events_active =
@@ -5931,9 +5941,9 @@ func.utils.ws_worker.functions = {
       if (show_log)
         console.log(
           "DATASOURCE RETURN TO DATASOURCE DONE " +
-            DS +
-            " SESSION_ID: " +
-            SESSION_ID,
+          DS +
+          " SESSION_ID: " +
+          SESSION_ID,
           APP_OBJ[_session.app_id].app_name
         );
       var obj = func.utils.clean_returned_datasource(SESSION_ID, DS);
@@ -5961,9 +5971,9 @@ func.utils.ws_worker.functions = {
     if (show_log)
       console.log(
         "UPDATE CHANGE EVENT DONE TO DATASOURCE " +
-          params.dssession +
-          " SESSION_ID: " +
-          SESSION_ID,
+        params.dssession +
+        " SESSION_ID: " +
+        SESSION_ID,
         APP_OBJ[_session.app_id].app_name
       );
     ds.eventChangesResults_done = true;
@@ -5975,9 +5985,9 @@ func.utils.ws_worker.functions = {
     if (show_log)
       console.log(
         "RETURN FROM DB_QUERY " +
-          params.dssession +
-          " SESSION_ID: " +
-          SESSION_ID,
+        params.dssession +
+        " SESSION_ID: " +
+        SESSION_ID,
         APP_OBJ[_session.app_id].app_name
       );
     debugger;
@@ -5994,9 +6004,9 @@ func.utils.ws_worker.functions = {
     if (show_log)
       console.log(
         "RETURN FROM SAVE_DATA " +
-          params.dssession +
-          " SESSION_ID: " +
-          SESSION_ID,
+        params.dssession +
+        " SESSION_ID: " +
+        SESSION_ID,
         APP_OBJ[_session.app_id].app_name
       );
     func.utils.get_callback_queue(SESSION_ID, params.callback_id)();
@@ -6098,7 +6108,7 @@ func.utils.ws_worker.functions = {
           const couch = await __.rpi.get_app_couch(req.body.app_id);
           const session_doc = await couch.get(req.body.app_token);
           ret.session_stat = session_doc.stat;
-        } catch (error) {}
+        } catch (error) { }
       }
     } catch (error) {
       debugger;
@@ -6220,8 +6230,7 @@ func.utils.replace_studio_drive_url = function (SESSION_ID, val) {
   try {
     return val.replaceAll(
       `https://xuda.io/studio-drive/${APP_OBJ[_session.app_id].app_replicate}`,
-      `https://${_session.domain}/studio-drive/${
-        APP_OBJ[_session.app_id].app_replicate
+      `https://${_session.domain}/studio-drive/${APP_OBJ[_session.app_id].app_replicate
       }`
     );
   } catch (err) {
@@ -6236,9 +6245,8 @@ func.utils.get_drive_url = function (SESSION_ID, val, wrap) {
   function replaceFiletoURL(fileString) {
     const _app = APP_OBJ[_session.app_id];
 
-    let url = `https://${_session.domain}/workspace-drive/${
-      _app.is_deployment ? _app.app_datacenter_id : _app.app_id_reference
-    }/`;
+    let url = `https://${_session.domain}/workspace-drive/${_app.is_deployment ? _app.app_datacenter_id : _app.app_id_reference
+      }/`;
 
     let FILE_REPLACE_URL = `${url}${val}`;
 
@@ -6247,9 +6255,8 @@ func.utils.get_drive_url = function (SESSION_ID, val, wrap) {
       FILE_REPLACE_URL += `?app_token=${_session.app_token}`;
     }
 
-    let match = `drv_${
-      _app.app_replicate || _session.app_id
-    }_[0-9a-f\\-]+\\.[a-zA-Z0-9]+`;
+    let match = `drv_${_app.app_replicate || _session.app_id
+      }_[0-9a-f\\-]+\\.[a-zA-Z0-9]+`;
 
     let pat = new RegExp(match, "g");
     let URLString = fileString.replace(pat, function (match, idx) {
@@ -6628,8 +6635,8 @@ func.utils.alerts.execute = function (
         alert_type === "success"
           ? "log"
           : alert_type === "warning"
-          ? "warn"
-          : alert_type
+            ? "warn"
+            : alert_type
       ](alert_type, title, message);
       ALERT_IS_ACTIVE = false;
       break;
@@ -7525,6 +7532,7 @@ func.utils.set_SYS_GLOBAL_OBJ_WIDGET_INFO = async function (SESSION_ID, docP) {
   };
   await func.datasource.update(SESSION_ID, datasource_changes);
 };
+
  func.events = {};
 func.events.validate = async function (
   SESSION_ID,
@@ -8122,22 +8130,22 @@ func.events.execute = async function (
 
     return _prog_id;
   };
-  const get_args_property_value = async function (prop_name) {
-    let _prop = args?.calling_trigger_prop?.data?.name;
-    let _value = _prop[prop_name];
-    if (_prop?.[`xu-exp:${prop_name}`]) {
-      _value = (
-        await func.expression.get(
-          SESSION_ID,
-          _prop[`xu-exp:${prop_name}`],
-          dsSession,
-          `${prop_name} expression`
-        )
-      ).result;
-    }
+  // const get_args_property_value = async function (prop_name) {
+  //   let _prop = args?.calling_trigger_prop?.data?.name;
+  //   let _value = _prop[prop_name];
+  //   if (_prop?.[`xu-exp:${prop_name}`]) {
+  //     _value = (
+  //       await func.expression.get(
+  //         SESSION_ID,
+  //         _prop[`xu-exp:${prop_name}`],
+  //         dsSession,
+  //         `${prop_name} expression`
+  //       )
+  //     ).result;
+  //   }
 
-    return _value;
-  };
+  //   return _value;
+  // };
 
 
   var args = {
@@ -8854,7 +8862,7 @@ func.events.execute = async function (
 
       const api_ret = await func.api.call_project_api(_prog_id, params_obj);
 
-      await func.datasource.set_outputField(SESSION_ID, elementP, triggerP, functionP, dsSessionP, api_ret);
+      await func.datasource.set_outputField(SESSION_ID, dsSessionP, api_ret);
 
       // if (output_field) {
       //   let datasource_changes = {};
@@ -8884,7 +8892,7 @@ func.events.execute = async function (
       func.events.delete_job(SESSION_ID, jobNoP);
     },
     call_system_api: async function () {
-      const api_method = await get_args_property_value("api_method");
+      const api_method = await func.datasource.get_args_property_value(SESSION_ID, dsSession, args, "api_method");
 
       if (!api_method) {
         func.utils.debug_report(
@@ -8897,7 +8905,7 @@ func.events.execute = async function (
         return;
       }
       let payload = {};
-      const _payload = await get_args_property_value("payload");
+      const _payload = await func.datasource.get_args_property_value(SESSION_ID, dsSession, args, "payload");
       if (_payload) {
         const get_payload_property_value = async function (prop_name) {
           let _prop = _payload;
@@ -8935,7 +8943,7 @@ func.events.execute = async function (
       //   return;
       // }
 
-      const output_field = await get_args_property_value("outputField");
+      const output_field = await func.datasource.get_args_property_value(SESSION_ID, dsSession, args, "outputField");
 
       // if (!output_field) {
       //   func.utils.debug_report(
@@ -8977,7 +8985,7 @@ func.events.execute = async function (
       func.events.delete_job(SESSION_ID, jobNoP);
     },
     call_external_api: async function () {
-      const method = await get_args_property_value("method");
+      const method = await func.datasource.get_args_property_value(SESSION_ID, dsSession, args, "method");
 
       if (!method) {
         func.utils.debug_report(
@@ -8990,7 +8998,7 @@ func.events.execute = async function (
         return;
       }
 
-      const url = await get_args_property_value("url");
+      const url = await func.datasource.get_args_property_value(SESSION_ID, dsSession, args, "url");
 
       if (!url) {
         func.utils.debug_report(
@@ -9003,7 +9011,7 @@ func.events.execute = async function (
         return;
       }
 
-      const payload_arr = await get_args_property_value("payload");
+      const payload_arr = await func.datasource.get_args_property_value(SESSION_ID, dsSession, args, "payload");
 
       const report_conversion_error = function (res, typeP, valP) {
         var msg = `${elementP} >${triggerP} >${functionP} > error converting from ${valP} to ${typeP}`;
@@ -9067,7 +9075,7 @@ func.events.execute = async function (
       //   return;
       // }
 
-      const output_field = await get_args_property_value("outputField");
+      const output_field = await func.datasource.get_args_property_value(SESSION_ID, dsSession, args, "outputField");
 
       // if (!output_field) {
       //   func.utils.debug_report(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/xuda-worker-bundle-min",
-  "version": "1.3.1101",
+  "version": "1.3.1103",
   "description": "xuda framework min",
   "main": "index.js",
   "scripts": {