@xuda.io/runtime-bundle 1.0.1426 → 1.0.1428

package/js/xuda-runtime-slim.js

@@ -5888,6 +5888,58 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
     var datasource_changed = [];
     let client_datasource_changes = {};
     let server_datasource_changes = {};
+    const mark_field_changed = async function (dataSource, field_id) {
+      if (!fields_changed.includes(field_id)) {
+        fields_changed.push(field_id);
+
+        // Refresh dependent in-parameters that reference this field.
+        for (const [_dsSession, _ds] of Object.entries(_session.DS_GLB)) {
+          if (_ds.args.parameters_raw_obj) {
+            for (const [key, exp] of Object.entries(_ds.args.parameters_raw_obj)) {
+              if (exp.includes(field_id)) {
+                let ret = await func.expression.get(SESSION_ID, exp, _dsSession, 'parameters');
+                _ds.in_parameters[key].value = ret.result;
+              }
+            }
+          }
+        }
+      }
+      if (!datasource_changed.includes(dataSource)) {
+        datasource_changed.push(dataSource);
+      }
+    };
+    const queue_remote_change = async function (dataSource, record_id, field_id, value, _ds) {
+      if (update_local_scope_only) {
+        return;
+      }
+
+      let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, _ds.prog_id);
+      if (glb.IS_WORKER) {
+        if (tree_ret.menuType === 'globals' || tree_ret.menuType === 'component') {
+          const _progFields = await func.datasource.get_progFields(SESSION_ID, dataSource);
+          let view_field_obj = func.common.find_item_by_key(_progFields, 'field_id', field_id);
+          if (!view_field_obj?.data?.serverField && record_id !== 'data_system') {
+            if (!client_datasource_changes[dataSource]) {
+              client_datasource_changes[dataSource] = {};
+            }
+            if (!client_datasource_changes[dataSource][record_id]) {
+              client_datasource_changes[dataSource][record_id] = {};
+            }
+            client_datasource_changes[dataSource][record_id][field_id] = value;
+          }
+        }
+      } else {
+        if ((tree_ret.menuType === 'component' && _ds._run_at !== 'client') || tree_ret.menuType === 'globals') {
+          if (!server_datasource_changes[dataSource]) {
+            server_datasource_changes[dataSource] = {};
+          }
+          if (!server_datasource_changes[dataSource][record_id]) {
+            server_datasource_changes[dataSource][record_id] = {};
+          }
+          server_datasource_changes[dataSource][record_id][field_id] = value;
+        }
+      }
+    };
 
     const update_xu_ref = function (dataSource) {
       let ret;
@@ -5958,6 +6010,18 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
               continue;
             }
 
+            const dynamic_field = _ds?.dynamic_fields?.[field_id];
+            if (dynamic_field) {
+              if (!xu_isEqual(dynamic_field.value, value)) {
+                dynamic_field.value = value;
+                await set_fieldComputed_dependencies(dataSource, field_id, null);
+                update_xu_ref(dataSource);
+                await queue_remote_change(dataSource, record_id, field_id, value, _ds);
+                await mark_field_changed(dataSource, field_id);
+              }
+              continue;
+            }
+
             try {
               const row_idx = func.common.find_ROWID_idx(_ds, record_id);
               // if (_ds.data_feed.rows[row_idx][field_id] !== value) {
@@ -5968,55 +6032,8 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
                 // search the field in refs
                 update_xu_ref(dataSource);
 
-                if (!update_local_scope_only) {
-                  let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, _ds.prog_id);
-                  if (glb.IS_WORKER) {
-                    // RUN AT SERVER
-                    if (tree_ret.menuType === 'globals' || tree_ret.menuType === 'component') {
-                      const _progFields = await func.datasource.get_progFields(SESSION_ID, dataSource);
-                      let view_field_obj = func.common.find_item_by_key(_progFields, 'field_id', field_id);
-                      if (!view_field_obj?.data?.serverField && record_id !== 'data_system') {
-                        if (!client_datasource_changes[dataSource]) {
-                          client_datasource_changes[dataSource] = {};
-                        }
-                        if (!client_datasource_changes[dataSource][record_id]) {
-                          client_datasource_changes[dataSource][record_id] = {};
-                        }
-                        client_datasource_changes[dataSource][record_id][field_id] = value;
-                      }
-                    }
-                  } else {
-                    // RUN AT CLIENT
-                    if ((tree_ret.menuType === 'component' && _ds._run_at !== 'client') || tree_ret.menuType === 'globals') {
-                      if (!server_datasource_changes[dataSource]) {
-                        server_datasource_changes[dataSource] = {};
-                      }
-                      if (!server_datasource_changes[dataSource][record_id]) {
-                        server_datasource_changes[dataSource][record_id] = {};
-                      }
-                      server_datasource_changes[dataSource][record_id][field_id] = value;
-                    }
-                  }
-                }
-
-                if (!fields_changed.includes(field_id)) {
-                  fields_changed.push(field_id);
-
-                  ///// REFRESH PARAMETERS IN
-                  for (const [_dsSession, _ds] of Object.entries(_session.DS_GLB)) {
-                    if (_ds.args.parameters_raw_obj) {
-                      for (const [key, exp] of Object.entries(_ds.args.parameters_raw_obj)) {
-                        if (exp.includes(field_id)) {
-                          let ret = await func.expression.get(SESSION_ID, exp, _dsSession, 'parameters');
-                          _ds.in_parameters[key].value = ret.result;
-                        }
-                      }
-                    }
-                  }
-                }
-                if (!datasource_changed.includes(dataSource)) {
-                  datasource_changed.push(dataSource);
-                }
+                await queue_remote_change(dataSource, record_id, field_id, value, _ds);
+                await mark_field_changed(dataSource, field_id);
 
                 if (!_ds.data_feed.rows_changed) {
                   _ds.data_feed.rows_changed = [];
@@ -6559,6 +6576,10 @@ func.datasource.get_value = async function (SESSION_ID, fieldIdP, dsSessionP, ro
     if (_ds.alias) _field_id = _ds.alias[fieldIdP];
   }
 
+  if (typeof _ds?.dynamic_fields?.[_field_id] !== 'undefined') {
+    return await return_dynamic_value(_field_id, _ds.dynamic_fields[_field_id]);
+  }
+
   if (!org_dsSessionP && recordId) {
     try {
       const row_idx = func.common.find_ROWID_idx(_ds, recordId);
@@ -6584,10 +6605,6 @@ func.datasource.get_value = async function (SESSION_ID, fieldIdP, dsSessionP, ro
     }
   } catch (error) {}
 
-  if (typeof _ds?.dynamic_fields?.[_field_id] !== 'undefined') {
-    return await return_dynamic_value(_field_id, _ds.dynamic_fields[_field_id]);
-  }
-
   return await search_in_parameters(fieldIdP);
 };
 
@@ -11633,6 +11650,18 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
         'xu-on': true,
         'xu-for-key': true,
         'xu-for-val': true,
+        'xu-click': true,
+        'xu-change': true,
+        'xu-blur': true,
+        'xu-focus': true,
+        'xu-init': true,
+        'xu-attrs': true,
+        'xu-cdn': true,
+        'xu-style': true,
+        'xu-style-global': true,
+        'xu-script': true,
+        'xu-viewport': true,
+        'xu-ui-plugin': true,
       };
 
       const execution_plan = [];
@@ -11644,12 +11673,13 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
 
         const attr_new = attr.split('xu-exp:')[1];
         const xu_func = attr_new || attr;
+        const is_raw_value_attribute = !!raw_value_attributes[attr] || attr.substr(0, 6) === 'xu-on:';
         execution_plan.push({
           attr,
           attr_new,
           xu_func,
           is_regular_attribute: !!(attr_new && attr_new.substr(0, 2) !== 'xu'),
-          requires_expression: !raw_value_attributes[attr] && attr !== 'xu-class' && attr !== 'xu-ui-plugin',
+          requires_expression: !is_raw_value_attribute && attr !== 'xu-class' && attr !== 'xu-ui-plugin',
           regular_attr_name: attr_new ? (attr_new !== 'viewBox' ? attr_new.toLowerCase() : attr_new) : null,
         });
       }

package/js/xuda-runtime-slim.min.es.js

@@ -5814,6 +5814,58 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
     var datasource_changed = [];
     let client_datasource_changes = {};
     let server_datasource_changes = {};
+    const mark_field_changed = async function (dataSource, field_id) {
+      if (!fields_changed.includes(field_id)) {
+        fields_changed.push(field_id);
+
+        // Refresh dependent in-parameters that reference this field.
+        for (const [_dsSession, _ds] of Object.entries(_session.DS_GLB)) {
+          if (_ds.args.parameters_raw_obj) {
+            for (const [key, exp] of Object.entries(_ds.args.parameters_raw_obj)) {
+              if (exp.includes(field_id)) {
+                let ret = await func.expression.get(SESSION_ID, exp, _dsSession, 'parameters');
+                _ds.in_parameters[key].value = ret.result;
+              }
+            }
+          }
+        }
+      }
+      if (!datasource_changed.includes(dataSource)) {
+        datasource_changed.push(dataSource);
+      }
+    };
+    const queue_remote_change = async function (dataSource, record_id, field_id, value, _ds) {
+      if (update_local_scope_only) {
+        return;
+      }
+
+      let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, _ds.prog_id);
+      if (glb.IS_WORKER) {
+        if (tree_ret.menuType === 'globals' || tree_ret.menuType === 'component') {
+          const _progFields = await func.datasource.get_progFields(SESSION_ID, dataSource);
+          let view_field_obj = func.common.find_item_by_key(_progFields, 'field_id', field_id);
+          if (!view_field_obj?.data?.serverField && record_id !== 'data_system') {
+            if (!client_datasource_changes[dataSource]) {
+              client_datasource_changes[dataSource] = {};
+            }
+            if (!client_datasource_changes[dataSource][record_id]) {
+              client_datasource_changes[dataSource][record_id] = {};
+            }
+            client_datasource_changes[dataSource][record_id][field_id] = value;
+          }
+        }
+      } else {
+        if ((tree_ret.menuType === 'component' && _ds._run_at !== 'client') || tree_ret.menuType === 'globals') {
+          if (!server_datasource_changes[dataSource]) {
+            server_datasource_changes[dataSource] = {};
+          }
+          if (!server_datasource_changes[dataSource][record_id]) {
+            server_datasource_changes[dataSource][record_id] = {};
+          }
+          server_datasource_changes[dataSource][record_id][field_id] = value;
+        }
+      }
+    };
 
     const update_xu_ref = function (dataSource) {
       let ret;
@@ -5884,6 +5936,18 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
               continue;
             }
 
+            const dynamic_field = _ds?.dynamic_fields?.[field_id];
+            if (dynamic_field) {
+              if (!xu_isEqual(dynamic_field.value, value)) {
+                dynamic_field.value = value;
+                await set_fieldComputed_dependencies(dataSource, field_id, null);
+                update_xu_ref(dataSource);
+                await queue_remote_change(dataSource, record_id, field_id, value, _ds);
+                await mark_field_changed(dataSource, field_id);
+              }
+              continue;
+            }
+
             try {
               const row_idx = func.common.find_ROWID_idx(_ds, record_id);
               // if (_ds.data_feed.rows[row_idx][field_id] !== value) {
@@ -5894,55 +5958,8 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
                 // search the field in refs
                 update_xu_ref(dataSource);
 
-                if (!update_local_scope_only) {
-                  let tree_ret = await func.utils.TREE_OBJ.get(SESSION_ID, _ds.prog_id);
-                  if (glb.IS_WORKER) {
-                    // RUN AT SERVER
-                    if (tree_ret.menuType === 'globals' || tree_ret.menuType === 'component') {
-                      const _progFields = await func.datasource.get_progFields(SESSION_ID, dataSource);
-                      let view_field_obj = func.common.find_item_by_key(_progFields, 'field_id', field_id);
-                      if (!view_field_obj?.data?.serverField && record_id !== 'data_system') {
-                        if (!client_datasource_changes[dataSource]) {
-                          client_datasource_changes[dataSource] = {};
-                        }
-                        if (!client_datasource_changes[dataSource][record_id]) {
-                          client_datasource_changes[dataSource][record_id] = {};
-                        }
-                        client_datasource_changes[dataSource][record_id][field_id] = value;
-                      }
-                    }
-                  } else {
-                    // RUN AT CLIENT
-                    if ((tree_ret.menuType === 'component' && _ds._run_at !== 'client') || tree_ret.menuType === 'globals') {
-                      if (!server_datasource_changes[dataSource]) {
-                        server_datasource_changes[dataSource] = {};
-                      }
-                      if (!server_datasource_changes[dataSource][record_id]) {
-                        server_datasource_changes[dataSource][record_id] = {};
-                      }
-                      server_datasource_changes[dataSource][record_id][field_id] = value;
-                    }
-                  }
-                }
-
-                if (!fields_changed.includes(field_id)) {
-                  fields_changed.push(field_id);
-
-                  ///// REFRESH PARAMETERS IN
-                  for (const [_dsSession, _ds] of Object.entries(_session.DS_GLB)) {
-                    if (_ds.args.parameters_raw_obj) {
-                      for (const [key, exp] of Object.entries(_ds.args.parameters_raw_obj)) {
-                        if (exp.includes(field_id)) {
-                          let ret = await func.expression.get(SESSION_ID, exp, _dsSession, 'parameters');
-                          _ds.in_parameters[key].value = ret.result;
-                        }
-                      }
-                    }
-                  }
-                }
-                if (!datasource_changed.includes(dataSource)) {
-                  datasource_changed.push(dataSource);
-                }
+                await queue_remote_change(dataSource, record_id, field_id, value, _ds);
+                await mark_field_changed(dataSource, field_id);
 
                 if (!_ds.data_feed.rows_changed) {
                   _ds.data_feed.rows_changed = [];
@@ -6485,6 +6502,10 @@ func.datasource.get_value = async function (SESSION_ID, fieldIdP, dsSessionP, ro
     if (_ds.alias) _field_id = _ds.alias[fieldIdP];
   }
 
+  if (typeof _ds?.dynamic_fields?.[_field_id] !== 'undefined') {
+    return await return_dynamic_value(_field_id, _ds.dynamic_fields[_field_id]);
+  }
+
   if (!org_dsSessionP && recordId) {
     try {
       const row_idx = func.common.find_ROWID_idx(_ds, recordId);
@@ -6510,10 +6531,6 @@ func.datasource.get_value = async function (SESSION_ID, fieldIdP, dsSessionP, ro
     }
   } catch (error) {}
 
-  if (typeof _ds?.dynamic_fields?.[_field_id] !== 'undefined') {
-    return await return_dynamic_value(_field_id, _ds.dynamic_fields[_field_id]);
-  }
-
   return await search_in_parameters(fieldIdP);
 };
 
@@ -11559,6 +11576,18 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
         'xu-on': true,
         'xu-for-key': true,
         'xu-for-val': true,
+        'xu-click': true,
+        'xu-change': true,
+        'xu-blur': true,
+        'xu-focus': true,
+        'xu-init': true,
+        'xu-attrs': true,
+        'xu-cdn': true,
+        'xu-style': true,
+        'xu-style-global': true,
+        'xu-script': true,
+        'xu-viewport': true,
+        'xu-ui-plugin': true,
       };
 
       const execution_plan = [];
@@ -11570,12 +11599,13 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
 
         const attr_new = attr.split('xu-exp:')[1];
         const xu_func = attr_new || attr;
+        const is_raw_value_attribute = !!raw_value_attributes[attr] || attr.substr(0, 6) === 'xu-on:';
         execution_plan.push({
           attr,
           attr_new,
           xu_func,
           is_regular_attribute: !!(attr_new && attr_new.substr(0, 2) !== 'xu'),
-          requires_expression: !raw_value_attributes[attr] && attr !== 'xu-class' && attr !== 'xu-ui-plugin',
+          requires_expression: !is_raw_value_attribute && attr !== 'xu-class' && attr !== 'xu-ui-plugin',
           regular_attr_name: attr_new ? (attr_new !== 'viewBox' ? attr_new.toLowerCase() : attr_new) : null,
         });
       }