@xuda.io/runtime-bundle 1.0.1433 → 1.0.1435

package/js/xuda-runtime-slim.js

@@ -1684,6 +1684,23 @@ func.runtime.platform = {
       return false;
     }
   },
+  get_cookie_item: function (key) {
+    if (!key) {
+      return null;
+    }
+    const doc = func.runtime.platform.get_document();
+    const cookie_string = doc?.cookie;
+    if (!cookie_string) {
+      return null;
+    }
+    const cookie_entry = cookie_string.split('; ').find(function (cookie) {
+      return cookie.startsWith(key + '=');
+    });
+    if (!cookie_entry) {
+      return null;
+    }
+    return cookie_entry.split('=').slice(1).join('=') || null;
+  },
   get_url_href: function () {
     return func.runtime.platform.get_location()?.href || '';
   },
@@ -5708,8 +5725,9 @@ func.datasource.clean = function (SESSION_ID, screenIdP) {
   var arr = [];
   for (const [key, val] of Object.entries(SESSION_OBJ[SESSION_ID].DS_GLB)) {
     try {
-      const _screen_el = val.screenId ? document.getElementById(val.screenId) : null;
-      const screen_parent_id = _screen_el?.parentElement?.id || null;
+      const screen_parent_id = val.screenId && func.runtime?.ui?.get_parent_element_id
+        ? func.runtime.ui.get_parent_element_id(val.screenId)
+        : null;
       if (
         Number(key) > 0 &&
         (val.screenId === screenIdP ||
@@ -5718,7 +5736,7 @@ func.datasource.clean = function (SESSION_ID, screenIdP) {
           (val && val.parentDataSourceNo && arr.includes(val.parentDataSourceNo.toString())))
       ) {
         arr.push(key);
-        if (val.screenId) func.UI.utils.screen_blocker(false, val.screenId);
+        if (val.screenId && func.UI?.utils?.screen_blocker) func.UI.utils.screen_blocker(false, val.screenId);
       }
     } catch (err) {
       console.warn('func.datasource.clean failed');
@@ -9265,11 +9283,14 @@ func.runtime.ui.create_screen_host = function (SESSION_ID, screen_type, params,
   };
 };
 func.runtime.ui.find_xu_ui_in_root = function (SESSION_ID, xu_ui_id) {
+  if (!SESSION_ID || !xu_ui_id) {
+    return func.runtime.ui._wrap_matches([]);
+  }
   if (func.runtime.ui.get_refresh_indexed_element_by_ui_id) {
     const elm = func.runtime.ui.get_refresh_indexed_element_by_ui_id(SESSION_ID, xu_ui_id);
     return func.runtime.ui._wrap_matches(elm ? [elm] : []);
   }
-  return func.runtime.ui.find_in_root(SESSION_ID, `[xu-ui-id=${xu_ui_id}]`);
+  return func.runtime.ui.find_in_root(SESSION_ID, `[xu-ui-id="${xu_ui_id}"]`);
 };
 func.runtime.ui.find_panel_wrapper_in_root = function (SESSION_ID, xu_ui_id) {
   if (func.runtime.ui.get_refresh_indexed_panel_wrapper_by_id) {
@@ -9390,6 +9411,14 @@ func.runtime.ui.find_element_by_id = function (element_id) {
   }
   return null;
 };
+func.runtime.ui.get_parent_element_id = function (element_id) {
+  if (!element_id) {
+    return null;
+  }
+  const clean_id = element_id.startsWith('#') ? element_id.substring(1) : element_id;
+  const element = func.runtime.ui.find_element_by_id(clean_id);
+  return element?.parentElement?.id || null;
+};
 func.runtime.ui.get_session_root = function (SESSION_ID) {
   if (typeof document !== 'undefined') {
     return document.getElementById('embed_' + SESSION_ID) || null;
@@ -9939,12 +9968,23 @@ func.runtime.ui.build_xu_ui_id_seed = function (nodeP, dsSessionP, key_path, cur
   const elem_key = `${nodeId}-${key_path}-${currentRecordId}`;
   return `${nodeP.id}-${elem_key}-${dsSessionP?.toString() || ''}`;
 };
+func.runtime.ui.build_container_key_path = function (container_xu_data, keyP, parent_infoP, nodeP, parent_nodeP) {
+  const key_segment = typeof keyP === 'undefined' || keyP === null ? '0' : `${keyP}`;
+  let key_path = `${container_xu_data?.key_path || '0'}-${key_segment}`;
+  const parent_identity = parent_nodeP?.xu_tree_id || parent_nodeP?.id;
+  const node_identity = nodeP?.xu_tree_id || nodeP?.id;
+  const is_iterated_clone = !!(parent_infoP?.iterate_info && parent_identity && node_identity && parent_identity === node_identity);
+  if (is_iterated_clone) {
+    key_path += '-iter';
+  }
+  return key_path;
+};
 func.runtime.ui.generate_xu_ui_id = async function (SESSION_ID, nodeP, $container, paramsP, keyP, precomputed = {}) {
   const dsSessionP = paramsP.dsSessionP;
   const _ds = SESSION_OBJ[SESSION_ID].DS_GLB[dsSessionP];
   const containerXuData = precomputed.container_xu_data || func.runtime.ui.get_data($container)?.xuData;
   const currentRecordId = typeof precomputed.currentRecordId !== 'undefined' ? precomputed.currentRecordId : containerXuData?.recordid || _ds?.currentRecordId || '';
-  const key_path = precomputed.key_path || `${containerXuData?.key_path || '0'}-${keyP || '0'}`;
+  const key_path = precomputed.key_path || func.runtime.ui.build_container_key_path(containerXuData, keyP, precomputed.parent_infoP, nodeP, precomputed.parent_nodeP);
   const ui_id = func.runtime.ui.build_xu_ui_id_seed(nodeP, dsSessionP, key_path, currentRecordId);
 
   if (func.runtime.ui.ui_id_hash_cache.has(ui_id)) {
@@ -9973,13 +10013,15 @@ func.runtime.ui.create_container = async function (options) {
   const currentRecordId = container_xu_data?.recordid || (_ds ? _ds.currentRecordId : '');
 
   try {
-    const key_path = `${container_xu_data?.key_path || '0'}-${options.keyP || '0'}`;
+    const key_path = func.runtime.ui.build_container_key_path(container_xu_data, options.keyP, options.parent_infoP, options.nodeP, options.parent_nodeP);
     const elem_key = `${options.nodeP.xu_tree_id || options.nodeP.id}-${key_path}-${currentRecordId}`;
     const $div = func.runtime.ui.create_container_element(options.div_typeP, options.attr_str, options.prop, options.nodeP, $appendTo);
     const new_ui_id = await func.runtime.ui.generate_xu_ui_id(options.SESSION_ID, options.nodeP, options.$container, options.paramsP, options.keyP, {
       container_xu_data,
       currentRecordId,
       key_path,
+      parent_infoP: options.parent_infoP,
+      parent_nodeP: options.parent_nodeP,
     });
 
     func.runtime.ui.apply_container_meta($div, {
@@ -10311,9 +10353,7 @@ func.UI.utils.get_url_attribute = function (SESSION_ID, key) {
   const root_attribute = func.runtime.ui.get_attr(_session.root_element, key);
   const option_param = _session.opt?.params?.[key];
   const option_value = _session.opt?.[key];
-  const cookie_value = (typeof document !== 'undefined' && document.cookie)
-    ? (document.cookie.split('; ').find(c => c.startsWith(key + '='))?.split('=').slice(1).join('=') || null)
-    : null;
+  const cookie_value = platform.get_cookie_item(key);
   const storage_value = platform.get_storage_item(key, 'local');
 
   return url_param || root_attribute || option_param || option_value || cookie_value || storage_value;
@@ -11570,8 +11610,40 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
     get_live_element_context: function (elem_key, fallback_$elm, context = {}) {
       let raw_$elm = elem_key ? fx.get_element_by_ui_id(elem_key) : fallback_$elm;
       let $elm = func.runtime?.ui?.get_preferred_live_element ? func.runtime.ui.get_preferred_live_element(raw_$elm) : raw_$elm;
+      const matches_context = function (node_xu_data, allow_loose_match = false) {
+        if (!node_xu_data) {
+          return false;
+        }
+        if (context.node_id && node_xu_data.nodeid !== context.node_id) {
+          return false;
+        }
+        if (typeof context.key !== 'undefined' && context.key !== null && node_xu_data.key !== context.key) {
+          return false;
+        }
+        if (context.key_path && node_xu_data.key_path !== context.key_path) {
+          return false;
+        }
+        if (context.recordid && node_xu_data.recordid !== context.recordid) {
+          return false;
+        }
+        if (!allow_loose_match) {
+          if (context.prog_id && node_xu_data.paramsP?.prog_id !== context.prog_id) {
+            return false;
+          }
+          if (context.parent_element_ui_id && node_xu_data.parent_element_ui_id !== context.parent_element_ui_id) {
+            return false;
+          }
+        }
+        if (node_xu_data.pending_to_delete) {
+          return false;
+        }
+        return true;
+      };
+      const resolved_node = func.runtime.ui.get_first_node($elm);
+      const resolved_data = resolved_node ? func.runtime.ui.get_data(resolved_node)?.xuData : null;
+      const has_matching_resolved_node = matches_context(resolved_data);
 
-      if (context.node_id) {
+      if (context.node_id && !has_matching_resolved_node) {
         const $root = func.UI.worker.get_session_root(SESSION_ID);
         const runtime_nodes = func.runtime?.ui?.get_refresh_index_elements
           ? func.runtime.ui.get_refresh_index_elements(SESSION_ID, $root).toArray()
@@ -11582,22 +11654,7 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
           const node = runtime_nodes[index];
           const node_data = func.runtime.ui.get_data(node);
           const node_xu_data = node_data?.xuData;
-          if (!node_xu_data) {
-            continue;
-          }
-          if (node_xu_data.nodeid !== context.node_id) {
-            continue;
-          }
-          if (context.recordid && node_xu_data.recordid !== context.recordid) {
-            continue;
-          }
-          if (context.prog_id && node_xu_data.paramsP?.prog_id !== context.prog_id) {
-            continue;
-          }
-          if (context.parent_element_ui_id && node_xu_data.parent_element_ui_id !== context.parent_element_ui_id) {
-            continue;
-          }
-          if (node_xu_data.pending_to_delete) {
+          if (!matches_context(node_xu_data)) {
             continue;
           }
           matching_nodes.push(node);
@@ -11608,16 +11665,7 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
             const node = runtime_nodes[index];
             const node_data = func.runtime.ui.get_data(node);
             const node_xu_data = node_data?.xuData;
-            if (!node_xu_data) {
-              continue;
-            }
-            if (node_xu_data.nodeid !== context.node_id) {
-              continue;
-            }
-            if (context.recordid && node_xu_data.recordid !== context.recordid) {
-              continue;
-            }
-            if (node_xu_data.pending_to_delete) {
+            if (!matches_context(node_xu_data, true)) {
               continue;
             }
             matching_nodes.push(node);
@@ -11735,10 +11783,10 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
       const iterate_info = options.iterate_info;
       const iterate_key = iterate_info
         ? [
-            iterate_info.iterator_key || '',
-            iterate_info.iterator_val || '',
-            iterate_info._key || '',
-            iterate_info._val || '',
+            iterate_info.iterator_key ?? '',
+            iterate_info.iterator_val ?? '',
+            iterate_info._key ?? '',
+            iterate_info._val ?? '',
           ].join('::')
         : '';
 
@@ -14688,6 +14736,8 @@ func.runtime.ui.build_refresh_job_obj = function (options, elem_key, elem_val, e
     fields_arr: options.fields_arr,
     elem_key,
     node_id: elm_data?.xuData?.nodeid,
+    key: elm_data?.xuData?.key,
+    key_path: elm_data?.xuData?.key_path,
     recordid: elm_data?.xuData?.recordid,
     parent_element_ui_id: elm_data?.xuData?.parent_element_ui_id,
     prog_id: elm_data?.xuData?.paramsP?.prog_id,
@@ -16194,6 +16244,43 @@ func.runtime.render.scope_css_to_xu_ui = function ($elm, cssText) {
   return parser.getCSSForEditor(parsed);
 };
 func.runtime.render.bind_xu_event = function (options) {
+  const decode_html_entities = function (value) {
+    if (typeof value !== 'string' || value.indexOf('&') === -1) {
+      return value;
+    }
+
+    if (typeof document !== 'undefined') {
+      const textarea = document.createElement('textarea');
+      textarea.innerHTML = value;
+      return textarea.value;
+    }
+
+    return value
+      .replaceAll('"', '"')
+      .replaceAll('"', '"')
+      .replaceAll(''', "'")
+      .replaceAll(''', "'")
+      .replaceAll('&lt;', '<')
+      .replaceAll('&gt;', '>')
+      .replaceAll('&amp;', '&');
+  };
+  const normalize_event_handlers = function (raw_handlers) {
+    if (typeof raw_handlers !== 'string') {
+      return raw_handlers;
+    }
+
+    const decoded_value = decode_html_entities(raw_handlers).trim();
+    if (!decoded_value) {
+      return [];
+    }
+
+    try {
+      return JSON5.parse(decoded_value);
+    } catch (error) {
+      console.error('XUDA RUNTIME', `xu-on has invalid workflow syntax: ${decoded_value}`, error);
+      return [];
+    }
+  };
   CLIENT_ACTIVITY_TS = Date.now();
   const trigger = options.val.key.split('xu-on:')[1].toLowerCase();
   const handler_key = `_xuda_xuOn_${trigger.replace(/[^a-z0-9_]/gi, '_')}`;
@@ -16205,27 +16292,33 @@ func.runtime.render.bind_xu_event = function (options) {
     const _$elm = evt.currentTarget;
     const elm_data = func.runtime.ui.get_data(_$elm);
     const xuAttributes = elm_data?.xuAttributes;
-    const event_handlers = xuAttributes?.['xu-on:' + evt.type];
+    const event_attr_key = 'xu-on:' + evt.type;
+    const event_handlers = normalize_event_handlers(xuAttributes?.[event_attr_key]);
+    if (xuAttributes && event_handlers !== xuAttributes?.[event_attr_key]) {
+      xuAttributes[event_attr_key] = event_handlers;
+    }
     if (xu_isEmpty(xuAttributes) || xu_isEmpty(event_handlers)) return;
     const handler_keys = Object.keys(event_handlers);
 
     for (let handler_index = 0; handler_index < handler_keys.length; handler_index++) {
       const val = event_handlers[handler_keys[handler_index]];
-      if (!xu_isEmpty(val.props.condition)) {
-        const expCond = await func.expression.get(options.SESSION_ID, val.props.condition, options.paramsP.dsSessionP, 'condition', options.paramsP.recordid);
+      const handler_props = val?.props || {};
+      if (!xu_isEmpty(handler_props.condition)) {
+        const expCond = await func.expression.get(options.SESSION_ID, handler_props.condition, options.paramsP.dsSessionP, 'condition', options.paramsP.recordid);
         if (!expCond.result) continue;
       }
 
-      if (val.event_modifiers && evt[val.event_modifiers]) {
+      if (val?.event_modifiers && evt[val.event_modifiers]) {
         evt[val.event_modifiers]();
       }
 
-      const workflow = val.workflow || val.event;
+      const workflow = val?.workflow || val?.event;
       if (workflow) {
         const workflow_keys = Object.keys(workflow);
         for (let workflow_index = 0; workflow_index < workflow_keys.length; workflow_index++) {
           const val2 = workflow[workflow_keys[workflow_index]];
-          if (!val2.data.enabled) continue;
+          if (!val2?.data?.action) continue;
+          if (val2.data.enabled === false) continue;
 
           func.events.add_to_queue(
             options.SESSION_ID,
@@ -17949,18 +18042,12 @@ func.runtime.render.handle_xu_for = async function (options) {
       }
     }
 
-    // Strip xu-ui-id from template elements before removal so that
-    // delete_meta does not destroy the meta entry shared by iteration-0
-    // (the template and first iteration child share the same xu-ui-id
-    // because their key_path values collide).
     const _live_node = func.runtime.ui.get_first_node($live_elm);
     if (_live_node) {
-      _live_node.removeAttribute('xu-ui-id');
       func.runtime.ui.remove($live_elm);
     }
     const _options_node = func.runtime.ui.get_first_node(options.$elm);
     if (_options_node && _options_node !== _live_node) {
-      _options_node.removeAttribute('xu-ui-id');
       func.runtime.ui.remove(options.$elm);
     }
     return { abort: true, consume_placeholder: true };
@@ -18556,11 +18643,40 @@ func.runtime.widgets = func.runtime.widgets || {};
 // Browser-only common xu handler factories live here so registry composition can stay small.
 
 func.runtime.render.build_base_xu_handlers = function (options, _ds) {
+  const decode_html_entities = function (value) {
+    if (typeof value !== 'string' || value.indexOf('&') === -1) {
+      return value;
+    }
+
+    if (typeof document !== 'undefined') {
+      const textarea = document.createElement('textarea');
+      textarea.innerHTML = value;
+      return textarea.value;
+    }
+
+    return value
+      .replaceAll('&quot;', '"')
+      .replaceAll('&#34;', '"')
+      .replaceAll('&#39;', "'")
+      .replaceAll('&#039;', "'")
+      .replaceAll('&lt;', '<')
+      .replaceAll('&gt;', '>')
+      .replaceAll('&amp;', '&');
+  };
   const parse_object_value = function (attr_name, val, shape = 'object') {
     let parsed_value = val?.value;
     if (typeof parsed_value === 'string') {
+      const decoded_value = decode_html_entities(parsed_value);
+      const trimmed_value = decoded_value.trim();
+      const wrapped_candidate =
+        trimmed_value.startsWith('(') && trimmed_value.endsWith(')')
+          ? trimmed_value.slice(1, -1).trim()
+          : trimmed_value;
+      const looks_like_wrapped_shape =
+        (shape === 'object' && wrapped_candidate.startsWith('{') && wrapped_candidate.endsWith('}')) ||
+        (shape === 'array' && wrapped_candidate.startsWith('[') && wrapped_candidate.endsWith(']'));
       try {
-        parsed_value = JSON5.parse(parsed_value);
+        parsed_value = JSON5.parse(looks_like_wrapped_shape ? wrapped_candidate : trimmed_value);
       } catch (error) {
         throw func.runtime.render.build_xu_runtime_error(
           { ...options, xu_func: attr_name, val: { key: attr_name, value: val?.value } },
@@ -19704,6 +19820,7 @@ func.events.execute = async function (
     },
     execute_native_javascript: async function () {
       const module = await func.common.get_module(SESSION_ID, 'xuda-event-javascript-module.mjs');
+      const resolved_element_expr = `(func.runtime.ui && func.runtime.ui.find_xu_ui_in_root && func.runtime.ui.get_first_node ? func.runtime.ui.get_first_node(func.runtime.ui.find_xu_ui_in_root(SESSION_ID, ${JSON.stringify(elementP)})) : null)`;
 
       const result = await module.run_javascript(
         SESSION_ID,
@@ -19711,7 +19828,7 @@ func.events.execute = async function (
         dsSession,
         `(async function(el,evt) {
           ${refIdP.value}
-          })(document.querySelector(\`[xu-ui-id="${elementP}"]\`),evt)`,
+          })(${resolved_element_expr},evt)`,
         null,
         null,
         null,
@@ -19724,6 +19841,7 @@ func.events.execute = async function (
     },
     execute_evaluate_javascript: async function () {
       const module = await func.common.get_module(SESSION_ID, 'xuda-event-javascript-module.mjs');
+      const resolved_element_expr = `(func.runtime.ui && func.runtime.ui.find_xu_ui_in_root && func.runtime.ui.get_first_node ? func.runtime.ui.get_first_node(func.runtime.ui.find_xu_ui_in_root(SESSION_ID, ${JSON.stringify(elementP)})) : null)`;
 
       const result = await module.run_javascript(
         SESSION_ID,
@@ -19731,7 +19849,7 @@ func.events.execute = async function (
         dsSession,
         `(async function(el,evt) {
           ${refIdP.value}
-          })(document.querySelector(\`[xu-ui-id="${elementP}"]\`),evt)`,
+          })(${resolved_element_expr},evt)`,
         true,
         null,
         null,