@xuda.io/runtime-bundle 1.0.1278 → 1.0.1280

package/js/modules/xuda-actions-module.esm.js

@@ -37,7 +37,6 @@ export const action_execute = async function (SESSION_ID, actionP, params, isScr
 
   if (!_ds) {
     func.events.delete_job(SESSION_ID, jobNoP);
-
     return;
   }
 

package/js/xuda-runtime-bundle.js

@@ -28150,50 +28150,126 @@ func.UI.update_xu_ref = function (SESSION_ID, dsSessionP, ref_field_id, $elm) {
   const _ds = func.utils.clean_returned_datasource(SESSION_ID, dsSessionP);
 
   //////////////
+  // function createWatchedObject(obj, onChange) {
+  //   return new Proxy(obj, {
+  //     set(target, property, value) {
+  //       const oldValue = target[property];
+  //       target[property] = value;
+
+  //       if (oldValue !== value) {
+  //         onChange({
+  //           property,
+  //           oldValue,
+  //           newValue: value,
+  //           timestamp: new Date(),
+  //         });
+  //       }
+
+  //       return true;
+  //     },
+
+  //     deleteProperty(target, property) {
+  //       const oldValue = target[property];
+  //       delete target[property];
+
+  //       onChange({
+  //         property,
+  //         oldValue,
+  //         newValue: undefined,
+  //         deleted: true,
+  //         timestamp: new Date(),
+  //       });
+
+  //       return true;
+  //     },
+  //   });
+  // }
+
+  // // Usage
+  // const watchedUser = createWatchedObject(
+  //   { name: "John", age: 25 },
+  //   (change) => console.log("Change detected:", change)
+  // );
+
+  // watchedUser.age = 26; // Logs: Change detected: { property: "age", oldValue: 25, newValue: 26, ... }
+
   function createWatchedObject(obj, onChange) {
-    return new Proxy(obj, {
-      set(target, property, value) {
-        const oldValue = target[property];
-        target[property] = value;
+    const watchers = new WeakMap();
+
+    function createProxy(target, path = []) {
+      if (watchers.has(target)) {
+        return watchers.get(target);
+      }
+
+      const proxy = new Proxy(target, {
+        set(obj, prop, value) {
+          const oldValue = obj[prop];
+          const currentPath = [...path, prop];
+
+          // Set the new value
+          obj[prop] = value;
+
+          // If the new value is an object, make it observable too
+          if (typeof value === 'object' && value !== null) {
+            obj[prop] = createProxy(value, currentPath);
+          }
+
+          // Notify of change
+          if (oldValue !== value) {
+            onChange({
+              path: currentPath.join('.'),
+              oldValue,
+              newValue: value,
+              type: 'set',
+              timestamp: Date.now(),
+            });
+          }
+
+          return true;
+        },
+
+        deleteProperty(obj, prop) {
+          const oldValue = obj[prop];
+          const currentPath = [...path, prop];
+
+          delete obj[prop];
 
-        if (oldValue !== value) {
           onChange({
-            property,
+            path: currentPath.join('.'),
             oldValue,
-            newValue: value,
-            timestamp: new Date(),
+            newValue: undefined,
+            type: 'delete',
+            timestamp: Date.now(),
           });
-        }
 
-        return true;
-      },
+          return true;
+        },
+      });
 
-      deleteProperty(target, property) {
-        const oldValue = target[property];
-        delete target[property];
+      // Make nested objects observable
+      for (const [key, value] of Object.entries(target)) {
+        if (typeof value === 'object' && value !== null) {
+          target[key] = createProxy(value, [...path, key]);
+        }
+      }
 
-        onChange({
-          property,
-          oldValue,
-          newValue: undefined,
-          deleted: true,
-          timestamp: new Date(),
-        });
+      watchers.set(target, proxy);
+      return proxy;
+    }
 
-        return true;
-      },
-    });
+    return createProxy(obj);
   }
 
-  // // Usage
-  // const watchedUser = createWatchedObject(
-  //   { name: "John", age: 25 },
-  //   (change) => console.log("Change detected:", change)
-  // );
+  const watchedUser = createWatchedObject(_ds, async (change) => {
+    console.log('Change detected:', change);
+    try {
+      // _session.DS_GLB[dsSessionP][property] = newValue;
 
-  // watchedUser.age = 26; // Logs: Change detected: { property: "age", oldValue: 25, newValue: 26, ... }
+      _.set(_session.DS_GLB[dsSessionP], change.path, change.newValue);
 
-  const watchedUser = createWatchedObject(_ds, (change) => console.log('Change detected:', change));
+      await func.action.execute(SESSION_ID, 'act_refresh', _session.DS_GLB[dsSessionP], null, null, null, $elm);
+    } catch (error) {}
+  });
 
   //////////////
 
@@ -40052,30 +40128,9 @@ func.events.invoke = async function (event_id) {
   func.events.validate(SESSION_ID, 'user_defined', ds, event_id);
 };
  func.action = {};
-func.action.execute = async function (
-  SESSION_ID,
-  actionP,
-  paramsP,
-  isScreenActionP,
-  event_sourceP,
-  jobNoP,
-  // callbackP,
-  containerP
-) {
-  const module = await func.common.get_module(
-    SESSION_ID,
-    "xuda-actions-module.esm.js"
-  );
-  await module.action_execute(
-    SESSION_ID,
-    actionP,
-    paramsP,
-    isScreenActionP,
-    event_sourceP,
-    jobNoP,
-    // callbackP,
-    containerP
-  );
+func.action.execute = async function (SESSION_ID, actionP, paramsP, isScreenActionP, event_sourceP, jobNoP, containerP) {
+  const module = await func.common.get_module(SESSION_ID, 'xuda-actions-module.esm.js');
+  await module.action_execute(SESSION_ID, actionP, paramsP, isScreenActionP, event_sourceP, jobNoP, containerP);
 };
  func.fcm = {};
 // func.fcm.load_resources = function (callbackP) {