@xuda.io/runtime-bundle 1.0.1356 → 1.0.1358

package/js/xuda-runtime-bundle.js

@@ -24502,7 +24502,7 @@ func.api.call_javascript = async function (prog_id, params, evaluate) {
   return await api_utils.call_javascript(prog_id, params, evaluate);
 };
 
-func.api.watch = function (path, cb) {
+func.api.watch = function (path, cb, opt = {}) {
   if (!path) return 'path is mandatory';
   if (!cb) return 'cb (callback function) is mandatory';
   const SESSION_ID = Object.keys(SESSION_OBJ)[0];
@@ -24512,7 +24512,10 @@ func.api.watch = function (path, cb) {
   }
 
   _session.watchers[path] = cb;
-
+  if (opt.immediate) {
+    const value = _.get(SESSION_OBJ[SESSION_ID][0], path);
+    cb({ path, newValue: value, oldValue: value, timestamp: Date.now(), opt });
+  }
   return 'ok';
 };
 
@@ -42748,7 +42751,7 @@ func.index.set_ds_0_proxy = function (SESSION_ID) {
 
   const watchedDs = createWatchedObject({ _ref: _ds }, async (change) => {
     const { path, newValue, oldValue } = change;
-    console.log('Change detected:', path);
+    // console.log('Change detected:', path);
     try {
       const _session = SESSION_OBJ[SESSION_ID];
 
@@ -42793,32 +42796,32 @@ func.index.set_ds_0_proxy = function (SESSION_ID) {
       }
       return;
       ///////////////////////
-      if (path.split('.')[0] !== 'SYS_GLOBAL_OBJ_REFS') return; //SYS_GLOBAL_OBJ_REFS indicates manual update
-      const ref_id = path.split('.')[1];
-      if (!ref_id) return;
-      const prefix = `SYS_GLOBAL_OBJ_REFS.${ref_id}.ds.`;
-      if (!path.includes(prefix)) return;
-
-      const _ref = SESSION_OBJ[SESSION_ID].DS_GLB[0].data_system.SYS_GLOBAL_OBJ_REFS[ref_id];
-      if (!_ref) return;
-      const _ds = _ref.ds;
-
-      const clean_path_prop = path.replace(prefix, '');
-      const target_ds = _session.DS_GLB[_ds.dsSession];
-      const target_value = _.get(target_ds, clean_path_prop);
-      if (target_value === newValue) return;
-
-      const datasource_changes = {
-        [_ds.dsSession]: {
-          ['datasource_main']: {
-            watcher: { path: path.replace(prefix_path + '.', ''), newValue },
-          },
-        },
-      };
-      await func.datasource.update(SESSION_ID, datasource_changes);
+      // if (path.split('.')[0] !== 'SYS_GLOBAL_OBJ_REFS') return; //SYS_GLOBAL_OBJ_REFS indicates manual update
+      // const ref_id = path.split('.')[1];
+      // if (!ref_id) return;
+      // const prefix = `SYS_GLOBAL_OBJ_REFS.${ref_id}.ds.`;
+      // if (!path.includes(prefix)) return;
+
+      // const _ref = SESSION_OBJ[SESSION_ID].DS_GLB[0].data_system.SYS_GLOBAL_OBJ_REFS[ref_id];
+      // if (!_ref) return;
+      // const _ds = _ref.ds;
+
+      // const clean_path_prop = path.replace(prefix, '');
+      // const target_ds = _session.DS_GLB[_ds.dsSession];
+      // const target_value = _.get(target_ds, clean_path_prop);
+      // if (target_value === newValue) return;
+
+      // const datasource_changes = {
+      //   [_ds.dsSession]: {
+      //     ['datasource_main']: {
+      //       watcher: { path: path.replace(prefix_path + '.', ''), newValue },
+      //     },
+      //   },
+      // };
+      // await func.datasource.update(SESSION_ID, datasource_changes);
       ///////////////////
 
-      return;
+      // return;
       // if (!change.path.includes('data_system.SYS_GLOBAL_OBJ_REFS')) return;
       // const ref_id = change.path.split('SYS_GLOBAL_OBJ_REFS.')[1].split('.')[0];
       // if (!ref_id) return;