@xuda.io/xuda-worker-bundle-min 1.3.844 → 1.3.846

package/index.js

@@ -49,20 +49,9 @@ func.common.find_ROWID_idx = function (_ds, rowId) {
   if (!_ds?.data_feed?.rows) {
     throw new Error("data_feed not found");
   }
-  // let index;
-  // if (rowId === "newRecord") {
-  //   index = glb.newRecord;
-  //   if (!_ds.data_feed.rows[index]) {
-  //     index = -1;
-  //   }
-  // } else {
+
   // Find the index of the object with the given _ROWID
   const index = _ds.data_feed.rows.findIndex((item) => item._ROWID === rowId);
-  // }
-  // If the index is -1, the ROWID was not found, so throw an error
-  // if (index === -1) {
-  //   throw new Error(`ROWID "${rowId}" not found`);
-  // }
 
   // Return the found index
   return index;
@@ -2195,11 +2184,10 @@ func.datasource.execute = async function (
   if (_ds.prog_id === "system") {
     //TBD tree_obj.menuType === "globals"
     _ds.currentRecordId = "dataset";
-    await func.datasource.render_fields_dataset(
-      SESSION_ID,
-      dataSourceSession,
-      _session.url_params
-    );
+    await func.datasource.render_fields_dataset(SESSION_ID, dataSourceSession, {
+      id: "dataset",
+      value: _session.url_params,
+    });
 
     return await callback_datasource();
   }
@@ -2493,24 +2481,24 @@ func.datasource.execute = async function (
       "after_record"
     );
   };
-  let data_arr = [];
+  let _raw_data_rows = [];
   switch (tree_obj.menuType) {
     case "api": {
       _ds.api_rendered_output = "";
       let has_datasource = await calc_batch_loops();
 
-      data_arr = _ds.data_feed.rows || [];
+      _raw_data_rows = _ds.raw_data.rows || [];
       if (!has_datasource) {
         for (n = 0; n < _ds.v.batch_loops; n++) {
-          data_arr.push({ _ROWID: n });
+          _raw_data_rows.push({ id: n, value: {} });
         }
       }
       _ds.currentRecordId = "dataset";
-      for await (let [key, val] of Object.entries(data_arr)) {
+      for await (let [key, raw_data_row] of Object.entries(_raw_data_rows)) {
         if (has_datasource && Number(key) >= _ds.v.batch_loops) break;
 
         if (!has_datasource) {
-          val = _ds?.data_feed?.rows?.[key] || { _ROWID: key };
+          raw_data_row = _ds?.raw_data?.rows?.[key] || { id: key, value: {} };
         }
 
         if (await get_before_record_count()) {
@@ -2524,7 +2512,7 @@ func.datasource.execute = async function (
         await func.datasource.render_fields_dataset(
           SESSION_ID,
           dataSourceSession,
-          val
+          raw_data_row
         );
 
         if (await get_after_record_count()) {
@@ -2556,18 +2544,18 @@ func.datasource.execute = async function (
     case "batch": {
       let has_datasource = await calc_batch_loops();
 
-      data_arr = _ds?.data_feed?.rows || [];
+      _raw_data_rows = _ds?.raw_data?.rows || [];
       if (!has_datasource) {
         for (n = 0; n < _ds.v.batch_loops; n++) {
-          data_arr.push({ _ROWID: n });
+          _raw_data_rows.push({ id: n, value: {} });
         }
       }
       _ds.currentRecordId = "dataset";
-      for await (let [key, val] of Object.entries(data_arr)) {
+      for await (let [key, raw_data_row] of Object.entries(_raw_data_rows)) {
         if (has_datasource && Number(key) >= _ds.v.batch_loops) break;
 
         if (!has_datasource) {
-          val = _ds?.data_feed?.rows?.[key] || { _ROWID: key };
+          raw_data_row = _ds?.raw_data?.rows?.[key] || { id: key, value: {} };
         }
 
         if (await get_before_record_count()) {
@@ -2581,7 +2569,7 @@ func.datasource.execute = async function (
         await func.datasource.render_fields_dataset(
           SESSION_ID,
           dataSourceSession,
-          val
+          raw_data_row
         );
 
         if (await get_after_record_count()) {
@@ -2635,14 +2623,34 @@ func.datasource.execute = async function (
         );
       }
 
+      const get_data_from_data_feed = function () {
+        const rows = _ds?.data_feed?.rows || [];
+        return rows.map((item) => ({
+          id: item._ROWID,
+          value: {
+            ...item.value,
+          },
+        }));
+      };
+
+      const find_ROWID_idx_from_raw_data_arr = function (rowId) {
+        if (!_raw_data_rows) {
+          throw new Error("_raw_data_rows not found");
+        }
+
+        const index = _raw_data_rows.findIndex((item) => item.id === rowId);
+
+        return index;
+      };
+
       if (tree_obj.crudMode === "U") {
         _ds.set_mode = "U";
-        data_arr = _ds?.data_feed?.rows || [];
+        _raw_data_rows = get_data_from_data_feed(); // _ds?.raw_data?.rows || [];
       }
 
       if (tree_obj.crudMode === "D") {
         _ds.set_mode = "D";
-        data_arr = _ds.data_feed?.rows || [];
+        _raw_data_rows = get_data_from_data_feed(); // _ds.raw_data?.rows || [];
       }
 
       // initiated with Update but no rows found
@@ -2652,28 +2660,28 @@ func.datasource.execute = async function (
         !_ds?.data_feed?.rows?.length
       ) {
         _ds.set_mode = "C";
-        // data_arr[glb.newRecord] = [{ _ROWID: "newRecord" }];
+        // _raw_data_rows[glb.newRecord] = [{ _ROWID: "newRecord" }];
 
         try {
-          const row_idx = func.common.find_ROWID_idx(_ds, "newRecord");
-          data_arr[row_idx] = [{ _ROWID: "newRecord" }];
+          const row_idx = find_ROWID_idx_from_raw_data_arr("newRecord");
+          _raw_data_rows[row_idx] = [{ id: "newRecord", value: {} }];
         } catch (error) {
-          data_arr.push({ _ROWID: "newRecord" });
+          _raw_data_rows.push({ _ROWID: "newRecord" });
         }
       }
 
       if (tree_obj.crudMode === "C") {
         _ds.set_mode = "C";
-        // data_arr[glb.newRecord] = [{ _ROWID: "newRecord" }];
+        // _raw_data_rows[glb.newRecord] = [{ _ROWID: "newRecord" }];
         try {
-          const row_idx = func.common.find_ROWID_idx(_ds, "newRecord");
-          data_arr[row_idx] = [{ _ROWID: "newRecord" }];
+          const row_idx = find_ROWID_idx_from_raw_data_arr("newRecord");
+          _raw_data_rows[row_idx] = [{ id: "newRecord", value: {} }];
         } catch (error) {
-          data_arr.push({ _ROWID: "newRecord" });
+          _raw_data_rows.push({ id: "newRecord", value: {} });
         }
       }
 
-      for await (let val of data_arr) {
+      for await (let raw_data_row of _raw_data_rows) {
         _ds.currentRecordId = val.id;
         if (await get_before_record_count()) {
           await func.datasource.execute_view_events(
@@ -2686,7 +2694,7 @@ func.datasource.execute = async function (
         await func.datasource.render_fields_dataset(
           SESSION_ID,
           dataSourceSession,
-          val
+          raw_data_row
         );
         let data_feed_str = JSON.stringify(_ds.data_feed);
 
@@ -2737,7 +2745,7 @@ func.datasource.execute = async function (
           await func.datasource.render_fields_form(
             SESSION_ID,
             dataSourceSession,
-            { id: "newRecord" }
+            { id: "newRecord", value: {} }
           );
         }
 
@@ -2798,6 +2806,7 @@ func.datasource.execute = async function (
       };
 
       for await (const [key, val] of Object.entries(_ds.raw_data.rows)) {
+        const raw_data_row = val.value;
         if (await get_before_record_count()) {
           await func.datasource.execute_view_events(
             SESSION_ID,
@@ -2810,7 +2819,7 @@ func.datasource.execute = async function (
           SESSION_ID,
           dataSourceSession,
           key,
-          val.value
+          raw_data_row
         );
 
         if (await get_after_record_count()) {
@@ -2841,7 +2850,7 @@ func.datasource.execute = async function (
 func.datasource.render_fields_dataset = async function (
   SESSION_ID,
   dataSourceSession,
-  data
+  raw_data_row
 ) {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
   var args = _ds.args;
@@ -2923,11 +2932,11 @@ func.datasource.render_fields_dataset = async function (
         var fieldId = val.data.field_id;
 
         if (val.data.type === "virtual" || _ds.set_mode === "C") {
-          if (typeof data?.[fieldId] !== "undefined") {
+          if (typeof raw_data_row?.value?.[fieldId] !== "undefined") {
             // supports x=x+1
             _ds.data_feed.rows[row_idx][fieldId] = await get_value(
               fieldId,
-              data[fieldId]
+              raw_data_row.value[fieldId]
             );
             continue;
           }
@@ -2954,12 +2963,12 @@ func.datasource.render_fields_dataset = async function (
           continue;
         }
         if (val.data.type === "table" || val.data.type === "datasource") {
-          if (typeof data[fieldId] === "undefined") {
+          if (typeof raw_data_row.value[fieldId] === "undefined") {
             throw "field do not exist in data: " + fieldId;
           }
           _ds.data_feed.rows[row_idx][fieldId] = await get_value(
             fieldId,
-            data[fieldId]
+            raw_data_row.value[fieldId]
           );
         }
       } catch (err) {
@@ -2967,13 +2976,6 @@ func.datasource.render_fields_dataset = async function (
       }
     }
   }
-
-  // let data_feed = { _ROWID: _ds.currentRecordId };
-
-  // _ds.data_feed._ROWID = _ds.currentRecordId;
-
-  // _ds.data_feed.rows.push(data_feed);
-  // _ds.data_feed.rows[0] = data_feed;
 };
 
 func.datasource.run_events_functions = async function (
@@ -3010,7 +3012,7 @@ func.datasource.run_events_functions = async function (
 func.datasource.render_fields_form = async function (
   SESSION_ID,
   dataSourceSession,
-  data
+  raw_data_row
 ) {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
   // var v = _ds.v;
@@ -3085,15 +3087,15 @@ func.datasource.render_fields_form = async function (
 
   let row_idx;
   try {
-    row_idx = func.common.find_ROWID_idx(_ds, data.id);
+    row_idx = func.common.find_ROWID_idx(_ds, raw_data_row.id);
     // data_arr[row_idx] = [{ _ROWID: "newRecord" }];
   } catch (error) {
-    // if (data._ROWID === "newRecord") {
-    //   _ds.data_feed.rows[glb.newRecord] = { _ROWID: data._ROWID };
+    // if (raw_data_row._ROWID === "newRecord") {
+    //   _ds.data_feed.rows[glb.newRecord] = { _ROWID: raw_data_row._ROWID };
     // } else {
-    _ds.data_feed.rows.push({ _ROWID: data.id });
+    _ds.data_feed.rows.push({ _ROWID: raw_data_row.id });
     // }
-    row_idx = func.common.find_ROWID_idx(_ds, data.id);
+    row_idx = func.common.find_ROWID_idx(_ds, raw_data_row.id);
   }
 
   _ds.dataset_alias = {};
@@ -3102,7 +3104,7 @@ func.datasource.render_fields_form = async function (
     try {
       var fieldId = val.data.field_id;
 
-      if (val.data.type === "virtual" || data.id === "newRecord") {
+      if (val.data.type === "virtual" || raw_data_row.id === "newRecord") {
         if (glb.PROTECTED_VARS.includes(fieldId)) {
           switch (fieldId) {
             case "_ROWNO": {
@@ -3115,7 +3117,7 @@ func.datasource.render_fields_form = async function (
             case "_ROWID": {
               _ds.data_feed.rows[row_idx][fieldId] = await get_value(
                 fieldId,
-                data.id
+                raw_data_row.id
               );
 
               continue;
@@ -3123,7 +3125,7 @@ func.datasource.render_fields_form = async function (
             case "_ROWDOC": {
               _ds.data_feed.rows[row_idx][fieldId] = await get_value(
                 fieldId,
-                data.value
+                raw_data_row.value
               );
 
               continue;
@@ -3138,7 +3140,7 @@ func.datasource.render_fields_form = async function (
             val.props?.propExpressions?.fieldValue,
             dataSourceSession,
             "update",
-            data.id
+            raw_data_row.id
           );
           _ds.data_feed.rows[row_idx][fieldId] = await get_value(
             fieldId,
@@ -3156,12 +3158,12 @@ func.datasource.render_fields_form = async function (
         continue;
       }
       if (val.data.type === "table" || val.data.type === "datasource") {
-        if (typeof data[fieldId] === "undefined") {
+        if (typeof raw_data_row[fieldId] === "undefined") {
           throw "field do not exist in data: " + fieldId;
         }
         _ds.data_feed.rows[row_idx][fieldId] = await get_value(
           fieldId,
-          data.value[fieldId]
+          raw_data_row.value[fieldId]
         );
       }
     } catch (err) {
@@ -3174,7 +3176,7 @@ func.datasource.run_rows_form = async function (
   SESSION_ID,
   dataSourceSession,
   rowIdxP,
-  data
+  raw_data_row
 ) {
   var _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dataSourceSession];
   if (!_ds) return;
@@ -3198,7 +3200,11 @@ func.datasource.run_rows_form = async function (
 
   _ds.currentRecordId = _ROWID; // set temporary to allow expression decoder work
 
-  await func.datasource.render_fields_form(SESSION_ID, dataSourceSession, data);
+  await func.datasource.render_fields_form(
+    SESSION_ID,
+    dataSourceSession,
+    raw_data_row
+  );
   const init_count = await func.datasource.get_field_init_count(
     SESSION_ID,
     dataSourceSession,

package/package.json

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