@xuda.io/runtime-bundle 1.0.1415 → 1.0.1416

package/js/xuda-runtime-slim.js

@@ -2305,11 +2305,10 @@ func.runtime.bind.toggle_array_value = function (arr_value_before_cast, value_fr
 };
 func.runtime.bind.get_cast_value = async function (SESSION_ID, field_prop, input_field_type, raw_value) {
   const field_type = func.runtime.bind.get_field_type(field_prop);
-  var value = await func.common.get_cast_val(SESSION_ID, 'xu-bind', 'value', field_type, raw_value);
   if (field_type === 'object') {
-    value = await func.common.get_cast_val(SESSION_ID, 'xu-bind', 'value', input_field_type, raw_value);
+    return await func.common.get_cast_val(SESSION_ID, 'xu-bind', 'value', input_field_type, raw_value);
   }
-  return value;
+  return await func.common.get_cast_val(SESSION_ID, 'xu-bind', 'value', field_type, raw_value);
 };
 func.runtime.bind.get_source_value = function (_ds, bind_field_id, is_dynamic_field) {
   if (is_dynamic_field) {
@@ -2346,7 +2345,7 @@ func.runtime.bind.update_reference_source_array = async function (options) {
 
   const arr_idx = Number(options.iterate_info._key);
   const dataset_arr = await func.datasource.get_value(options.SESSION_ID, reference_source_obj.fieldIdP, options.dsSessionP, reference_source_obj.currentRecordId);
-  let new_arr = klona.klona(dataset_arr.ret.value);
+  let new_arr = structuredClone(dataset_arr.ret.value);
 
   if (field_type === 'object' && options.val_is_reference_field) {
     let obj_item = new_arr[arr_idx];
@@ -2412,7 +2411,7 @@ func.runtime.resources.load_plugin_runtime_css = async function (SESSION_ID, plu
   return true;
 };
 func.runtime.resources.resolve_plugin_properties = async function (SESSION_ID, dsSessionP, attributes, properties) {
-  let resolved_properties = klona.klona(properties);
+  let resolved_properties = structuredClone(properties);
   for await (let [prop_name, prop_val] of Object.entries(resolved_properties || {})) {
     prop_val.value = attributes?.[prop_name];
     if (attributes?.[`xu-exp:${prop_name}`]) {
@@ -2835,7 +2834,7 @@ func.common.db = async function (SESSION_ID, serviceP, dataP, opt = {}, dsSessio
           }
 
           await db.get(row_id);
-          let _data = klona.klona(dataP);
+          let _data = structuredClone(dataP);
           _data.ids = [row_id];
           return await func.db.pouch['dbs_delete'](SESSION_ID, _data);
         } catch (err) {
@@ -4231,7 +4230,7 @@ func.datasource.prepare = async function (SESSION_ID, prog_id, dataSourceNoP, pa
         _ds.data_feed = {};
 
         // _ds.v.old_dataSource = _.cloneDeep(_ds);
-        _ds.v.old_dataSource = klona.klona(_ds);
+        _ds.v.old_dataSource = structuredClone(_ds);
       } catch (err) {
         console.error('function: init_existing_dataSource - error');
         return;
@@ -5802,7 +5801,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
 
               await func.runtime.ui.refresh_screen({
                 SESSION_ID,
-                fields_changed_arr: klona.klona(fields_changed),
+                fields_changed_arr: structuredClone(fields_changed),
                 datasource_changed: datasource_changed[0],
                 fields_changed_datasource: datasource_changed[0],
                 watcher: value,
@@ -5917,7 +5916,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
         // await func.UI.screen.refresh_xu_attributes(SESSION_ID, _.cloneDeep(fields_changed), null, null, findMin(datasource_changed), avoid_xu_for_refresh, trigger);
         await func.runtime.ui.refresh_xu_attributes({
           SESSION_ID,
-          fields_arr: klona.klona(fields_changed),
+          fields_arr: structuredClone(fields_changed),
           jobNoP: null,
           $elm_to_search: null,
           dsSession_changed: findMin(datasource_changed),
@@ -5928,7 +5927,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
         // await removed from the below function cause to dead lock Mar 3 25
         await func.runtime.ui.refresh_screen({
           SESSION_ID,
-          fields_changed_arr: klona.klona(fields_changed),
+          fields_changed_arr: structuredClone(fields_changed),
           datasource_changed: null,
           fields_changed_datasource: datasource_changed[0],
         });
@@ -6578,7 +6577,7 @@ func.datasource.set_VIEW_data = async function (SESSION_ID, args, _ds) {
   };
   _ds.viewEventExec_arr = {};
 
-  var view = klona.klona(await func.utils.VIEWS_OBJ.get(SESSION_ID, args.prog_id));
+  var view = structuredClone(await func.utils.VIEWS_OBJ.get(SESSION_ID, args.prog_id));
   // var view = klona.klona(await func.utils.VIEWS_OBJ.get(SESSION_ID, args.prog_id));
 
   _ds.v.dataSourceSrcType = view.dataSourceSrcType;
@@ -9479,7 +9478,7 @@ func.runtime.ui.get_node_snapshot = function (nodeP) {
   if (func.runtime.ui.node_snapshot_cache.has(nodeP)) {
     return func.runtime.ui.node_snapshot_cache.get(nodeP);
   }
-  const snapshot = klona.klona(nodeP);
+  const snapshot = structuredClone(nodeP);
   func.runtime.ui.node_snapshot_cache.set(nodeP, snapshot);
   return snapshot;
 };
@@ -9659,7 +9658,7 @@ func.runtime.ui.generate_xu_ui_id = async function (SESSION_ID, nodeP, $containe
   return hashed_ui_id;
 };
 func.runtime.ui.create_container = async function (options) {
-  const _paramsP = klona.klona(options.paramsP);
+  const _paramsP = structuredClone(options.paramsP);
   const _ds = SESSION_OBJ[options.SESSION_ID].DS_GLB[_paramsP.dsSessionP];
   const $appendTo = func.runtime.ui.get_append_target(options.$container, options.$appendToP);
   if (!$appendTo) return null;
@@ -11574,8 +11573,8 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
           }
 
           if (plan.is_regular_attribute) {
-            if (elm_node) {
-              func.runtime.ui.set_attr($elm, plan.regular_attr_name, result);
+            if (plan.regular_attr_name === 'class') {
+              func.runtime.render.apply_expression_class($elm, result);
             } else {
               func.runtime.ui.set_attr($elm, plan.regular_attr_name, result);
             }
@@ -11611,21 +11610,11 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
           return await func.UI.worker.delete_job(SESSION_ID, queue_obj.job_num);
         }
 
-        const xu_for_item_id = queue_obj?.paramsP?.xu_for_item_id;
-        const parent_node = func.runtime.ui.get_first_node($elm);
-        const children_before = func.runtime.ui.get_children($elm);
-        const _dbg_nodeids = children_before.map(c => func.runtime.ui.get_data(c)?.xuData?.nodeid);
-        console.warn('[xu-for-debug] execute_xu_for START xu_for_item_id=' + xu_for_item_id + ' children=' + children_before.length + ' nodeids=' + JSON.stringify(_dbg_nodeids));
-
         const existing_children_map = new Set();
         if (func.runtime?.ui?.get_refresh_indexed_elements_by_node_id) {
-          const indexed_children = func.runtime.ui.get_refresh_indexed_elements_by_node_id(SESSION_ID, xu_for_item_id).toArray();
-          console.warn('[xu-for-debug] indexed_children', {
-            count: indexed_children.length,
-            parent_match: indexed_children.map(c => c.parentElement === parent_node),
-          });
+          const indexed_children = func.runtime.ui.get_refresh_indexed_elements_by_node_id(SESSION_ID, queue_obj?.paramsP?.xu_for_item_id).toArray();
           for (let index = 0; index < indexed_children.length; index++) {
-            if (indexed_children[index].parentElement === parent_node) {
+            if (indexed_children[index].parentElement === func.runtime.ui.get_first_node($elm)) {
               existing_children_map.add(indexed_children[index]);
             }
           }
@@ -11635,36 +11624,19 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
         for (let index = 0; index < children.length; index++) {
           const child = children[index];
           const child_data = func.runtime.ui.get_data(child);
-          if (child_data?.xuData?.nodeid === xu_for_item_id) {
+          if (child_data?.xuData?.nodeid === queue_obj?.paramsP?.xu_for_item_id) {
             existing_children_map.add(child);
           }
         }
 
-        console.warn('[xu-for-debug] cleanup', {
-          existing_children_map_size: existing_children_map.size,
-        });
-
         if (existing_children_map.size) {
           func.runtime.ui.remove(func.runtime.ui._wrap_matches(Array.from(existing_children_map)));
         }
 
-        const children_after_cleanup = func.runtime.ui.get_children($elm);
-        console.warn('[xu-for-debug] after cleanup, before render', {
-          children_after_cleanup_count: children_after_cleanup.length,
-        });
-
         let _data = live_context.data || func.runtime.ui.get_data($elm);
-        const node_to_render = fx.get_child_node_by_id(_data?.xuData, xu_for_item_id);
-        console.warn('[xu-for-debug] node_to_render', { id: node_to_render?.id, tagName: node_to_render?.tagName });
+        const node_to_render = fx.get_child_node_by_id(_data?.xuData, queue_obj?.paramsP?.xu_for_item_id);
         await func.runtime.render.render_ui_tree(queue_obj.paramsP.SESSION_ID, $elm, node_to_render, null, _data.xuData.paramsP, queue_obj.jobNoP, null, _data.xuData.key, null, _data.xuData.parent_node, null, _data.xuData.$root_container);
-
-        const children_after_render = func.runtime.ui.get_children($elm);
-        console.warn('[xu-for-debug] execute_xu_for END', {
-          children_after_render_count: children_after_render.length,
-          children_after_render_nodeids: children_after_render.map(c => func.runtime.ui.get_data(c)?.xuData?.nodeid),
-        });
       } catch (error) {
-        console.error('[xu-for-debug] execute_xu_for ERROR', error);
       } finally {
         perf_end?.();
       }
@@ -12385,7 +12357,7 @@ func.runtime.ui.init_screen = async function (options) {
   await func.UI.utils.init_ui_framework(SESSION_ID, prog_id);
 
   const _session = SESSION_OBJ[SESSION_ID];
-  const screenInfo = klona.klona(screen_ret);
+  const screenInfo = structuredClone(screen_ret);
 
   const screen_type = source_functionP?.split('_')?.[1];
   const screenId = (glb.screen_num++).toString();
@@ -12501,7 +12473,7 @@ func.runtime.ui.init_screen = async function (options) {
   if (!viewDoc?.progUi) {
     return func.utils.alerts.invoke(SESSION_ID, 'system_msg', 'SYS_MSG_0780', params.renderType, ret.dsSessionP);
   }
-  let node = klona.klona(viewDoc.progUi);
+  let node = structuredClone(viewDoc.progUi);
   if (!node.length) return console.warn('ui node empty');
   const ret_render_$container = await func.runtime.render.render_ui_tree(SESSION_ID, $rootFrame, node[0], null, params, jobNoP, null, null, null, null, null, $rootFrame);
 
@@ -12868,13 +12840,13 @@ func.runtime.ui.copy_runtime_state = function ($source, $target) {
   const xu_data_keys = Object.keys(source_data.xuData);
   for (let index = 0; index < xu_data_keys.length; index++) {
     const key = xu_data_keys[index];
-    target_data.xuData[key] = klona.klona(source_data.xuData[key]);
+    target_data.xuData[key] = structuredClone(source_data.xuData[key]);
   }
 
   const xu_attribute_keys = Object.keys(source_data.xuAttributes);
   for (let index = 0; index < xu_attribute_keys.length; index++) {
     const key = xu_attribute_keys[index];
-    target_data.xuAttributes[key] = klona.klona(source_data.xuAttributes[key]);
+    target_data.xuAttributes[key] = structuredClone(source_data.xuAttributes[key]);
   }
   return $target;
 };
@@ -15041,7 +15013,7 @@ func.runtime.ui.refresh_screen = async function (options) {
               await func.runtime.render.render_ui_tree(
                 options.SESSION_ID,
                 $elm,
-                klona.klona(elm_data.xuData.node),
+                structuredClone(elm_data.xuData.node),
                 {},
                 elm_data.xuData.paramsP,
                 null,
@@ -15135,7 +15107,7 @@ func.runtime.ui.refresh_screen = async function (options) {
             await func.runtime.render.render_ui_tree(
               options.SESSION_ID,
               $div_elm,
-              klona.klona(item),
+              structuredClone(item),
               {},
               wrapper_data.xuData.paramsP,
               null,
@@ -15483,7 +15455,7 @@ func.runtime.render.collect_dependency_fields_from_attributes = function (xu_att
 func.runtime.render.build_xu_render_original_data = function (options) {
   return {
     $container: options.$container,
-    nodeP: func.runtime.ui.get_node_snapshot ? func.runtime.ui.get_node_snapshot(options.nodeP) : klona.klona(options.nodeP),
+    nodeP: func.runtime.ui.get_node_snapshot ? func.runtime.ui.get_node_snapshot(options.nodeP) : structuredClone(options.nodeP),
     parent_infoP: options.parent_infoP,
     paramsP: options.paramsP,
     keyP: options.keyP,
@@ -17586,7 +17558,7 @@ func.runtime.render.handle_xu_for = async function (options) {
           reference_source_obj,
         });
         func.runtime.render.apply_iterate_info_to_current_record(options.SESSION_ID, options.paramsP.dsSessionP, currentRecordId, _progFields, iterate_info);
-        const _parent_info = klona.klona(options.parent_infoP) || {};
+        const _parent_info = structuredClone(options.parent_infoP) || {};
         _parent_info.iterate_info = iterate_info;
 
         const $divP = await func.runtime.render.render_ui_tree(options.SESSION_ID, options.$container, options.nodeP, _parent_info, options.paramsP, options.jobNoP, null, i, null, options.nodeP, null, options.$root_container);
@@ -17611,7 +17583,7 @@ func.runtime.render.handle_xu_for = async function (options) {
           reference_source_obj,
         });
         func.runtime.render.apply_iterate_info_to_current_record(options.SESSION_ID, options.paramsP.dsSessionP, currentRecordId, _progFields, iterate_info);
-        const _parent_info = klona.klona(options.parent_infoP) || {};
+        const _parent_info = structuredClone(options.parent_infoP) || {};
         _parent_info.iterate_info = iterate_info;
 
         const $divP = await func.runtime.render.render_ui_tree(options.SESSION_ID, options.$container, options.nodeP, _parent_info, options.paramsP, options.jobNoP, null, i, null, options.nodeP, null, options.$root_container);
@@ -17626,7 +17598,6 @@ func.runtime.render.handle_xu_for = async function (options) {
     // (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);
-    const _parent_children_before = _live_node?.parentElement ? _live_node.parentElement.children.length : -1;
     if (_live_node) {
       _live_node.removeAttribute('xu-ui-id');
       func.runtime.ui.remove($live_elm);
@@ -17636,16 +17607,6 @@ func.runtime.render.handle_xu_for = async function (options) {
       _options_node.removeAttribute('xu-ui-id');
       func.runtime.ui.remove(options.$elm);
     }
-    const _parent_children_after = _live_node?.parentElement ? _live_node.parentElement.children.length : (options.$container ? func.runtime.ui.get_first_node(options.$container)?.children?.length : -1);
-    console.warn('[xu-for-debug] handle_xu_for template removal', {
-      had_live_node: !!_live_node,
-      had_options_node: !!_options_node,
-      same_node: _live_node === _options_node,
-      live_connected: _live_node?.isConnected,
-      iterations: i,
-      parent_children_before: _parent_children_before,
-      parent_children_after: _parent_children_after,
-    });
     return { abort: true, consume_placeholder: true };
   } catch (e) {
     console.error(' Iterator Arr parse error');
@@ -17740,7 +17701,7 @@ func.runtime.render.handle_legacy_xu_render = async function (options) {
         const new_$div = await func.runtime.render.render_ui_tree(
           options.SESSION_ID,
           options.$elm,
-          klona.klona(original_data_obj.nodeP),
+          structuredClone(original_data_obj.nodeP),
           original_data_obj.parent_infoP,
           original_data_obj.paramsP,
           options.jobNoP,
@@ -17992,10 +17953,37 @@ func.runtime.render.apply_expression_attribute = async function (options) {
     return await options.common_fx[new_val.key](options.$elm, new_val);
   }
 
+  if (new_val.key === 'class') {
+    return func.runtime.render.apply_expression_class(options.$elm, new_val.value);
+  }
+
   const existing_value = func.runtime.ui.get_attr(options.$elm, new_val.key) || '';
   func.runtime.ui.set_attr(options.$elm, new_val.key, existing_value + new_val.value);
   return {};
 };
+func.runtime.render.apply_expression_class = function ($elm, new_class_value) {
+  const xuData = func.runtime.ui.get_data($elm)?.xuData;
+  const old_exp_classes = xuData?._exp_class_cache || '';
+
+  if (old_exp_classes) {
+    const old_classes = old_exp_classes.split(/\s+/).filter(Boolean);
+    for (let i = 0; i < old_classes.length; i++) {
+      func.runtime.ui.remove_class($elm, old_classes[i]);
+    }
+  }
+
+  const new_value = (new_class_value || '').toString();
+  const new_classes = new_value.split(/\s+/).filter(Boolean);
+  for (let i = 0; i < new_classes.length; i++) {
+    func.runtime.ui.add_class($elm, new_classes[i]);
+  }
+
+  if (xuData) {
+    xuData._exp_class_cache = new_value;
+  }
+
+  return {};
+};
 func.runtime.render.apply_visibility = function ($elm, value) {
   if (value) {
     func.runtime.ui.show($elm);
@@ -22812,7 +22800,7 @@ func.index.new_webworker = async function (SESSION_ID, prog_obj, obj) {
 
   const init_worker_session = function (worker_id) {
     const { root_element, ...sessionData } = SESSION_OBJ[SESSION_ID];
-    var _session = klona.klona(sessionData);
+    var _session = JSON.parse(JSON.stringify(sessionData));
 
     const get_parent_ds = function (ds) {
       var ds_obj = {};

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

@@ -2231,11 +2231,10 @@ func.runtime.bind.toggle_array_value = function (arr_value_before_cast, value_fr
 };
 func.runtime.bind.get_cast_value = async function (SESSION_ID, field_prop, input_field_type, raw_value) {
   const field_type = func.runtime.bind.get_field_type(field_prop);
-  var value = await func.common.get_cast_val(SESSION_ID, 'xu-bind', 'value', field_type, raw_value);
   if (field_type === 'object') {
-    value = await func.common.get_cast_val(SESSION_ID, 'xu-bind', 'value', input_field_type, raw_value);
+    return await func.common.get_cast_val(SESSION_ID, 'xu-bind', 'value', input_field_type, raw_value);
   }
-  return value;
+  return await func.common.get_cast_val(SESSION_ID, 'xu-bind', 'value', field_type, raw_value);
 };
 func.runtime.bind.get_source_value = function (_ds, bind_field_id, is_dynamic_field) {
   if (is_dynamic_field) {
@@ -2272,7 +2271,7 @@ func.runtime.bind.update_reference_source_array = async function (options) {
 
   const arr_idx = Number(options.iterate_info._key);
   const dataset_arr = await func.datasource.get_value(options.SESSION_ID, reference_source_obj.fieldIdP, options.dsSessionP, reference_source_obj.currentRecordId);
-  let new_arr = klona.klona(dataset_arr.ret.value);
+  let new_arr = structuredClone(dataset_arr.ret.value);
 
   if (field_type === 'object' && options.val_is_reference_field) {
     let obj_item = new_arr[arr_idx];
@@ -2338,7 +2337,7 @@ func.runtime.resources.load_plugin_runtime_css = async function (SESSION_ID, plu
   return true;
 };
 func.runtime.resources.resolve_plugin_properties = async function (SESSION_ID, dsSessionP, attributes, properties) {
-  let resolved_properties = klona.klona(properties);
+  let resolved_properties = structuredClone(properties);
   for await (let [prop_name, prop_val] of Object.entries(resolved_properties || {})) {
     prop_val.value = attributes?.[prop_name];
     if (attributes?.[`xu-exp:${prop_name}`]) {
@@ -2761,7 +2760,7 @@ func.common.db = async function (SESSION_ID, serviceP, dataP, opt = {}, dsSessio
           }
 
           await db.get(row_id);
-          let _data = klona.klona(dataP);
+          let _data = structuredClone(dataP);
           _data.ids = [row_id];
           return await func.db.pouch['dbs_delete'](SESSION_ID, _data);
         } catch (err) {
@@ -4157,7 +4156,7 @@ func.datasource.prepare = async function (SESSION_ID, prog_id, dataSourceNoP, pa
         _ds.data_feed = {};
 
         // _ds.v.old_dataSource = _.cloneDeep(_ds);
-        _ds.v.old_dataSource = klona.klona(_ds);
+        _ds.v.old_dataSource = structuredClone(_ds);
       } catch (err) {
         console.error('function: init_existing_dataSource - error');
         return;
@@ -5728,7 +5727,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
 
               await func.runtime.ui.refresh_screen({
                 SESSION_ID,
-                fields_changed_arr: klona.klona(fields_changed),
+                fields_changed_arr: structuredClone(fields_changed),
                 datasource_changed: datasource_changed[0],
                 fields_changed_datasource: datasource_changed[0],
                 watcher: value,
@@ -5843,7 +5842,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
         // await func.UI.screen.refresh_xu_attributes(SESSION_ID, _.cloneDeep(fields_changed), null, null, findMin(datasource_changed), avoid_xu_for_refresh, trigger);
         await func.runtime.ui.refresh_xu_attributes({
           SESSION_ID,
-          fields_arr: klona.klona(fields_changed),
+          fields_arr: structuredClone(fields_changed),
           jobNoP: null,
           $elm_to_search: null,
           dsSession_changed: findMin(datasource_changed),
@@ -5854,7 +5853,7 @@ func.datasource.update = async function (SESSION_ID, datasource_changes, update_
         // await removed from the below function cause to dead lock Mar 3 25
         await func.runtime.ui.refresh_screen({
           SESSION_ID,
-          fields_changed_arr: klona.klona(fields_changed),
+          fields_changed_arr: structuredClone(fields_changed),
           datasource_changed: null,
           fields_changed_datasource: datasource_changed[0],
         });
@@ -6504,7 +6503,7 @@ func.datasource.set_VIEW_data = async function (SESSION_ID, args, _ds) {
   };
   _ds.viewEventExec_arr = {};
 
-  var view = klona.klona(await func.utils.VIEWS_OBJ.get(SESSION_ID, args.prog_id));
+  var view = structuredClone(await func.utils.VIEWS_OBJ.get(SESSION_ID, args.prog_id));
   // var view = klona.klona(await func.utils.VIEWS_OBJ.get(SESSION_ID, args.prog_id));
 
   _ds.v.dataSourceSrcType = view.dataSourceSrcType;
@@ -9405,7 +9404,7 @@ func.runtime.ui.get_node_snapshot = function (nodeP) {
   if (func.runtime.ui.node_snapshot_cache.has(nodeP)) {
     return func.runtime.ui.node_snapshot_cache.get(nodeP);
   }
-  const snapshot = klona.klona(nodeP);
+  const snapshot = structuredClone(nodeP);
   func.runtime.ui.node_snapshot_cache.set(nodeP, snapshot);
   return snapshot;
 };
@@ -9585,7 +9584,7 @@ func.runtime.ui.generate_xu_ui_id = async function (SESSION_ID, nodeP, $containe
   return hashed_ui_id;
 };
 func.runtime.ui.create_container = async function (options) {
-  const _paramsP = klona.klona(options.paramsP);
+  const _paramsP = structuredClone(options.paramsP);
   const _ds = SESSION_OBJ[options.SESSION_ID].DS_GLB[_paramsP.dsSessionP];
   const $appendTo = func.runtime.ui.get_append_target(options.$container, options.$appendToP);
   if (!$appendTo) return null;
@@ -11500,8 +11499,8 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
           }
 
           if (plan.is_regular_attribute) {
-            if (elm_node) {
-              func.runtime.ui.set_attr($elm, plan.regular_attr_name, result);
+            if (plan.regular_attr_name === 'class') {
+              func.runtime.render.apply_expression_class($elm, result);
             } else {
               func.runtime.ui.set_attr($elm, plan.regular_attr_name, result);
             }
@@ -11537,21 +11536,11 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
           return await func.UI.worker.delete_job(SESSION_ID, queue_obj.job_num);
         }
 
-        const xu_for_item_id = queue_obj?.paramsP?.xu_for_item_id;
-        const parent_node = func.runtime.ui.get_first_node($elm);
-        const children_before = func.runtime.ui.get_children($elm);
-        const _dbg_nodeids = children_before.map(c => func.runtime.ui.get_data(c)?.xuData?.nodeid);
-        console.warn('[xu-for-debug] execute_xu_for START xu_for_item_id=' + xu_for_item_id + ' children=' + children_before.length + ' nodeids=' + JSON.stringify(_dbg_nodeids));
-
         const existing_children_map = new Set();
         if (func.runtime?.ui?.get_refresh_indexed_elements_by_node_id) {
-          const indexed_children = func.runtime.ui.get_refresh_indexed_elements_by_node_id(SESSION_ID, xu_for_item_id).toArray();
-          console.warn('[xu-for-debug] indexed_children', {
-            count: indexed_children.length,
-            parent_match: indexed_children.map(c => c.parentElement === parent_node),
-          });
+          const indexed_children = func.runtime.ui.get_refresh_indexed_elements_by_node_id(SESSION_ID, queue_obj?.paramsP?.xu_for_item_id).toArray();
           for (let index = 0; index < indexed_children.length; index++) {
-            if (indexed_children[index].parentElement === parent_node) {
+            if (indexed_children[index].parentElement === func.runtime.ui.get_first_node($elm)) {
               existing_children_map.add(indexed_children[index]);
             }
           }
@@ -11561,36 +11550,19 @@ func.UI.worker.execute = async function (SESSION_ID, queue_obj) {
         for (let index = 0; index < children.length; index++) {
           const child = children[index];
           const child_data = func.runtime.ui.get_data(child);
-          if (child_data?.xuData?.nodeid === xu_for_item_id) {
+          if (child_data?.xuData?.nodeid === queue_obj?.paramsP?.xu_for_item_id) {
             existing_children_map.add(child);
           }
         }
 
-        console.warn('[xu-for-debug] cleanup', {
-          existing_children_map_size: existing_children_map.size,
-        });
-
         if (existing_children_map.size) {
           func.runtime.ui.remove(func.runtime.ui._wrap_matches(Array.from(existing_children_map)));
         }
 
-        const children_after_cleanup = func.runtime.ui.get_children($elm);
-        console.warn('[xu-for-debug] after cleanup, before render', {
-          children_after_cleanup_count: children_after_cleanup.length,
-        });
-
         let _data = live_context.data || func.runtime.ui.get_data($elm);
-        const node_to_render = fx.get_child_node_by_id(_data?.xuData, xu_for_item_id);
-        console.warn('[xu-for-debug] node_to_render', { id: node_to_render?.id, tagName: node_to_render?.tagName });
+        const node_to_render = fx.get_child_node_by_id(_data?.xuData, queue_obj?.paramsP?.xu_for_item_id);
         await func.runtime.render.render_ui_tree(queue_obj.paramsP.SESSION_ID, $elm, node_to_render, null, _data.xuData.paramsP, queue_obj.jobNoP, null, _data.xuData.key, null, _data.xuData.parent_node, null, _data.xuData.$root_container);
-
-        const children_after_render = func.runtime.ui.get_children($elm);
-        console.warn('[xu-for-debug] execute_xu_for END', {
-          children_after_render_count: children_after_render.length,
-          children_after_render_nodeids: children_after_render.map(c => func.runtime.ui.get_data(c)?.xuData?.nodeid),
-        });
       } catch (error) {
-        console.error('[xu-for-debug] execute_xu_for ERROR', error);
       } finally {
         perf_end?.();
       }
@@ -12311,7 +12283,7 @@ func.runtime.ui.init_screen = async function (options) {
   await func.UI.utils.init_ui_framework(SESSION_ID, prog_id);
 
   const _session = SESSION_OBJ[SESSION_ID];
-  const screenInfo = klona.klona(screen_ret);
+  const screenInfo = structuredClone(screen_ret);
 
   const screen_type = source_functionP?.split('_')?.[1];
   const screenId = (glb.screen_num++).toString();
@@ -12427,7 +12399,7 @@ func.runtime.ui.init_screen = async function (options) {
   if (!viewDoc?.progUi) {
     return func.utils.alerts.invoke(SESSION_ID, 'system_msg', 'SYS_MSG_0780', params.renderType, ret.dsSessionP);
   }
-  let node = klona.klona(viewDoc.progUi);
+  let node = structuredClone(viewDoc.progUi);
   if (!node.length) return console.warn('ui node empty');
   const ret_render_$container = await func.runtime.render.render_ui_tree(SESSION_ID, $rootFrame, node[0], null, params, jobNoP, null, null, null, null, null, $rootFrame);
 
@@ -12794,13 +12766,13 @@ func.runtime.ui.copy_runtime_state = function ($source, $target) {
   const xu_data_keys = Object.keys(source_data.xuData);
   for (let index = 0; index < xu_data_keys.length; index++) {
     const key = xu_data_keys[index];
-    target_data.xuData[key] = klona.klona(source_data.xuData[key]);
+    target_data.xuData[key] = structuredClone(source_data.xuData[key]);
   }
 
   const xu_attribute_keys = Object.keys(source_data.xuAttributes);
   for (let index = 0; index < xu_attribute_keys.length; index++) {
     const key = xu_attribute_keys[index];
-    target_data.xuAttributes[key] = klona.klona(source_data.xuAttributes[key]);
+    target_data.xuAttributes[key] = structuredClone(source_data.xuAttributes[key]);
   }
   return $target;
 };
@@ -14967,7 +14939,7 @@ func.runtime.ui.refresh_screen = async function (options) {
               await func.runtime.render.render_ui_tree(
                 options.SESSION_ID,
                 $elm,
-                klona.klona(elm_data.xuData.node),
+                structuredClone(elm_data.xuData.node),
                 {},
                 elm_data.xuData.paramsP,
                 null,
@@ -15061,7 +15033,7 @@ func.runtime.ui.refresh_screen = async function (options) {
             await func.runtime.render.render_ui_tree(
               options.SESSION_ID,
               $div_elm,
-              klona.klona(item),
+              structuredClone(item),
               {},
               wrapper_data.xuData.paramsP,
               null,
@@ -15409,7 +15381,7 @@ func.runtime.render.collect_dependency_fields_from_attributes = function (xu_att
 func.runtime.render.build_xu_render_original_data = function (options) {
   return {
     $container: options.$container,
-    nodeP: func.runtime.ui.get_node_snapshot ? func.runtime.ui.get_node_snapshot(options.nodeP) : klona.klona(options.nodeP),
+    nodeP: func.runtime.ui.get_node_snapshot ? func.runtime.ui.get_node_snapshot(options.nodeP) : structuredClone(options.nodeP),
     parent_infoP: options.parent_infoP,
     paramsP: options.paramsP,
     keyP: options.keyP,
@@ -17512,7 +17484,7 @@ func.runtime.render.handle_xu_for = async function (options) {
           reference_source_obj,
         });
         func.runtime.render.apply_iterate_info_to_current_record(options.SESSION_ID, options.paramsP.dsSessionP, currentRecordId, _progFields, iterate_info);
-        const _parent_info = klona.klona(options.parent_infoP) || {};
+        const _parent_info = structuredClone(options.parent_infoP) || {};
         _parent_info.iterate_info = iterate_info;
 
         const $divP = await func.runtime.render.render_ui_tree(options.SESSION_ID, options.$container, options.nodeP, _parent_info, options.paramsP, options.jobNoP, null, i, null, options.nodeP, null, options.$root_container);
@@ -17537,7 +17509,7 @@ func.runtime.render.handle_xu_for = async function (options) {
           reference_source_obj,
         });
         func.runtime.render.apply_iterate_info_to_current_record(options.SESSION_ID, options.paramsP.dsSessionP, currentRecordId, _progFields, iterate_info);
-        const _parent_info = klona.klona(options.parent_infoP) || {};
+        const _parent_info = structuredClone(options.parent_infoP) || {};
         _parent_info.iterate_info = iterate_info;
 
         const $divP = await func.runtime.render.render_ui_tree(options.SESSION_ID, options.$container, options.nodeP, _parent_info, options.paramsP, options.jobNoP, null, i, null, options.nodeP, null, options.$root_container);
@@ -17552,7 +17524,6 @@ func.runtime.render.handle_xu_for = async function (options) {
     // (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);
-    const _parent_children_before = _live_node?.parentElement ? _live_node.parentElement.children.length : -1;
     if (_live_node) {
       _live_node.removeAttribute('xu-ui-id');
       func.runtime.ui.remove($live_elm);
@@ -17562,16 +17533,6 @@ func.runtime.render.handle_xu_for = async function (options) {
       _options_node.removeAttribute('xu-ui-id');
       func.runtime.ui.remove(options.$elm);
     }
-    const _parent_children_after = _live_node?.parentElement ? _live_node.parentElement.children.length : (options.$container ? func.runtime.ui.get_first_node(options.$container)?.children?.length : -1);
-    console.warn('[xu-for-debug] handle_xu_for template removal', {
-      had_live_node: !!_live_node,
-      had_options_node: !!_options_node,
-      same_node: _live_node === _options_node,
-      live_connected: _live_node?.isConnected,
-      iterations: i,
-      parent_children_before: _parent_children_before,
-      parent_children_after: _parent_children_after,
-    });
     return { abort: true, consume_placeholder: true };
   } catch (e) {
     console.error(' Iterator Arr parse error');
@@ -17666,7 +17627,7 @@ func.runtime.render.handle_legacy_xu_render = async function (options) {
         const new_$div = await func.runtime.render.render_ui_tree(
           options.SESSION_ID,
           options.$elm,
-          klona.klona(original_data_obj.nodeP),
+          structuredClone(original_data_obj.nodeP),
           original_data_obj.parent_infoP,
           original_data_obj.paramsP,
           options.jobNoP,
@@ -17918,10 +17879,37 @@ func.runtime.render.apply_expression_attribute = async function (options) {
     return await options.common_fx[new_val.key](options.$elm, new_val);
   }
 
+  if (new_val.key === 'class') {
+    return func.runtime.render.apply_expression_class(options.$elm, new_val.value);
+  }
+
   const existing_value = func.runtime.ui.get_attr(options.$elm, new_val.key) || '';
   func.runtime.ui.set_attr(options.$elm, new_val.key, existing_value + new_val.value);
   return {};
 };
+func.runtime.render.apply_expression_class = function ($elm, new_class_value) {
+  const xuData = func.runtime.ui.get_data($elm)?.xuData;
+  const old_exp_classes = xuData?._exp_class_cache || '';
+
+  if (old_exp_classes) {
+    const old_classes = old_exp_classes.split(/\s+/).filter(Boolean);
+    for (let i = 0; i < old_classes.length; i++) {
+      func.runtime.ui.remove_class($elm, old_classes[i]);
+    }
+  }
+
+  const new_value = (new_class_value || '').toString();
+  const new_classes = new_value.split(/\s+/).filter(Boolean);
+  for (let i = 0; i < new_classes.length; i++) {
+    func.runtime.ui.add_class($elm, new_classes[i]);
+  }
+
+  if (xuData) {
+    xuData._exp_class_cache = new_value;
+  }
+
+  return {};
+};
 func.runtime.render.apply_visibility = function ($elm, value) {
   if (value) {
     func.runtime.ui.show($elm);
@@ -22738,7 +22726,7 @@ func.index.new_webworker = async function (SESSION_ID, prog_obj, obj) {
 
   const init_worker_session = function (worker_id) {
     const { root_element, ...sessionData } = SESSION_OBJ[SESSION_ID];
-    var _session = klona.klona(sessionData);
+    var _session = JSON.parse(JSON.stringify(sessionData));
 
     const get_parent_ds = function (ds) {
       var ds_obj = {};