@xuda.io/runtime-bundle 1.0.1425 → 1.0.1427

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 = [];
@@ -6225,56 +6242,149 @@ func.datasource.get_viewFields_for_update_function = function (SESSION_ID, calli
   if (!exp) {
     return viewFields;
   }
-  try {
-    // parse json
-    var json = JSON5.parse(exp.replace(/\n/gi, ''));
-    for (const [key, val] of Object.entries(json)) {
-      let id = key.substr(1, key.length - 1);
-      if (!id) continue;
-      viewFields.push({
-        val,
-        id,
-      });
+  const trim_wrapping_braces = function (value) {
+    const trimmed = value.trim();
+    if (trimmed.startsWith('{') && trimmed.endsWith('}')) {
+      return trimmed.substring(1, trimmed.length - 1);
+    }
+    return trimmed;
+  };
+  const strip_wrapping_quotes = function (value) {
+    const trimmed = value.trim();
+    const first = trimmed.substring(0, 1);
+    const last = trimmed.substring(trimmed.length - 1);
+    if ((first === "'" || first === '"' || first === '`') && last === first) {
+      return trimmed.substring(1, trimmed.length - 1);
+    }
+    return trimmed;
+  };
+  const split_top_level = function (value) {
+    const parts = [];
+    let current = '';
+    let quote = null;
+    let escape = false;
+    let paren_depth = 0;
+    let bracket_depth = 0;
+    let brace_depth = 0;
+
+    for (let index = 0; index < value.length; index++) {
+      const char = value[index];
+
+      if (escape) {
+        current += char;
+        escape = false;
+        continue;
+      }
+
+      if (quote) {
+        current += char;
+        if (char === '\\') {
+          escape = true;
+        } else if (char === quote) {
+          quote = null;
+        }
+        continue;
+      }
+
+      if (char === "'" || char === '"' || char === '`') {
+        quote = char;
+        current += char;
+        continue;
+      }
+
+      if (char === '(') paren_depth++;
+      if (char === ')') paren_depth = Math.max(0, paren_depth - 1);
+      if (char === '[') bracket_depth++;
+      if (char === ']') bracket_depth = Math.max(0, bracket_depth - 1);
+      if (char === '{') brace_depth++;
+      if (char === '}') brace_depth = Math.max(0, brace_depth - 1);
+
+      if ((char === ',' || char === ';') && !paren_depth && !bracket_depth && !brace_depth) {
+        if (current.trim()) {
+          parts.push(current.trim());
+        }
+        current = '';
+        continue;
+      }
+
+      current += char;
     }
-    return viewFields;
-  } catch (e) {
-    if (!exp) {
-      return;
+
+    if (current.trim()) {
+      parts.push(current.trim());
     }
-    if (exp.substr(exp.length - 1, 1) === ';') exp = exp.substr(0, exp.length - 1); // remove closing if exist;
-    var exp_arr = exp.split(/;\s*(?=(?:[^"]|"[^"]*")*$)/g); // split ; outside quotes
-    if (exp_arr?.length) {
-      for (let val of exp_arr) {
-        // run view fields
-        var pos = val.indexOf(':');
-        var seg = [val.substring(0, pos), val.substring(pos + 1)];
-        if (seg && seg.length === 2) {
-          let id = seg[0].substr(1, seg[0].length);
-          if (!id) continue;
-          viewFields.push({
-            id,
-            val: seg[1],
-            //  , props: {},
-          });
-        } else {
-          func.utils.debug.log(SESSION_ID, _ds.prog_id, {
-            module: _ds.viewModule,
-            action: 'set',
-            prop: 'parse update exp',
-            details: exp,
-            result: '',
-            error: 'Invalid json; too many segments',
-            source: _ds.viewSourceDesc,
-            json: '',
-            fields: '',
-            dsSession: dsSessionP,
-          });
+
+    return parts;
+  };
+  const find_top_level_colon = function (value) {
+    let quote = null;
+    let escape = false;
+    let paren_depth = 0;
+    let bracket_depth = 0;
+    let brace_depth = 0;
+
+    for (let index = 0; index < value.length; index++) {
+      const char = value[index];
+
+      if (escape) {
+        escape = false;
+        continue;
+      }
+
+      if (quote) {
+        if (char === '\\') {
+          escape = true;
+        } else if (char === quote) {
+          quote = null;
         }
+        continue;
+      }
+
+      if (char === "'" || char === '"' || char === '`') {
+        quote = char;
+        continue;
+      }
+
+      if (char === '(') paren_depth++;
+      if (char === ')') paren_depth = Math.max(0, paren_depth - 1);
+      if (char === '[') bracket_depth++;
+      if (char === ']') bracket_depth = Math.max(0, bracket_depth - 1);
+      if (char === '{') brace_depth++;
+      if (char === '}') brace_depth = Math.max(0, brace_depth - 1);
+
+      if (char === ':' && !paren_depth && !bracket_depth && !brace_depth) {
+        return index;
       }
     }
 
-    return viewFields;
+    return -1;
+  };
+
+  exp = trim_wrapping_braces(exp.replace(/\n/gi, ''));
+  const exp_arr = split_top_level(exp);
+  for (let index = 0; index < exp_arr.length; index++) {
+    const segment = exp_arr[index];
+    const pos = find_top_level_colon(segment);
+    if (pos === -1) {
+      continue;
+    }
+
+    let id = strip_wrapping_quotes(segment.substring(0, pos));
+    const val = segment.substring(pos + 1).trim();
+    if (id.substring(0, 1) === '@') {
+      id = id.substring(1);
+    }
+    if (!id || !val) {
+      continue;
+    }
+
+    viewFields.push({
+      id,
+      val,
+    });
   }
+
+  return viewFields;
 };
 func.datasource.get_value = async function (SESSION_ID, fieldIdP, dsSessionP, rowIdP, org_dsSessionP) {
   const return_value = async (field_id, value) => {
@@ -6466,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);
@@ -6491,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);
 };