@xuda.io/runtime-bundle 1.0.1427 → 1.0.1429

package/js/xuda-runtime-slim.js

@@ -11650,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 = [];
@@ -11661,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,
         });
       }
@@ -19707,6 +19720,29 @@ func.events.execute = async function (
       return result;
     },
     update: async function () {
+      const resolve_update_field_id = async function (field_expr, iterate_info) {
+        let trimmed = field_expr?.trim?.() || '';
+        if (!trimmed) {
+          return trimmed;
+        }
+
+        const first = trimmed.substring(0, 1);
+        const last = trimmed.substring(trimmed.length - 1);
+        if ((first === "'" || first === '"' || first === '`') && last === first) {
+          trimmed = trimmed.substring(1, trimmed.length - 1).trim();
+        }
+
+        if (/^@?[A-Za-z_][\w\-\:\.]*$/.test(trimmed)) {
+          return trimmed.substring(0, 1) === '@' ? trimmed.substring(1) : trimmed;
+        }
+
+        let ret_field_id = await func.expression.get(SESSION_ID, trimmed, dsSessionP, 'update', null, null, null, null, null, null, iterate_info);
+        if (typeof ret_field_id?.result === 'string' && ret_field_id.result.substring(0, 1) === '@') {
+          return ret_field_id.result.substring(1);
+        }
+        return ret_field_id?.result;
+      };
+
       const obj_values_to_update = func.datasource.get_viewFields_for_update_function(SESSION_ID, calling_trigger_prop, null, dsSessionP);
       if (!obj_values_to_update || xu_isEmpty(obj_values_to_update)) {
         func.utils.debug_report(SESSION_ID, 'Update values object is empty', '', 'W');
@@ -19724,9 +19760,8 @@ func.events.execute = async function (
           iterate_info = element_meta?.iterate_info || null;
         }
 
-        let ret_field_id = await func.expression.get(SESSION_ID, val.id.trim(), dsSessionP, 'update', null, null, null, null, null, null, iterate_info);
         let ret_value = await func.expression.get(SESSION_ID, val.val.trim(), dsSessionP, 'update', null, null, null, null, null, null, iterate_info);
-        let _field_id = ret_field_id.result;
+        let _field_id = await resolve_update_field_id(val.id, iterate_info);
         let _value = ret_value.result;
 
         updates.push({ _field_id, _value });

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

@@ -11576,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 = [];
@@ -11587,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,
         });
       }
@@ -20398,6 +20411,29 @@ func.events.execute = async function (
       return result;
     },
     update: async function () {
+      const resolve_update_field_id = async function (field_expr, iterate_info) {
+        let trimmed = field_expr?.trim?.() || '';
+        if (!trimmed) {
+          return trimmed;
+        }
+
+        const first = trimmed.substring(0, 1);
+        const last = trimmed.substring(trimmed.length - 1);
+        if ((first === "'" || first === '"' || first === '`') && last === first) {
+          trimmed = trimmed.substring(1, trimmed.length - 1).trim();
+        }
+
+        if (/^@?[A-Za-z_][\w\-\:\.]*$/.test(trimmed)) {
+          return trimmed.substring(0, 1) === '@' ? trimmed.substring(1) : trimmed;
+        }
+
+        let ret_field_id = await func.expression.get(SESSION_ID, trimmed, dsSessionP, 'update', null, null, null, null, null, null, iterate_info);
+        if (typeof ret_field_id?.result === 'string' && ret_field_id.result.substring(0, 1) === '@') {
+          return ret_field_id.result.substring(1);
+        }
+        return ret_field_id?.result;
+      };
+
       const obj_values_to_update = func.datasource.get_viewFields_for_update_function(SESSION_ID, calling_trigger_prop, null, dsSessionP);
       if (!obj_values_to_update || xu_isEmpty(obj_values_to_update)) {
         func.utils.debug_report(SESSION_ID, 'Update values object is empty', '', 'W');
@@ -20415,9 +20451,8 @@ func.events.execute = async function (
           iterate_info = element_meta?.iterate_info || null;
         }
 
-        let ret_field_id = await func.expression.get(SESSION_ID, val.id.trim(), dsSessionP, 'update', null, null, null, null, null, null, iterate_info);
         let ret_value = await func.expression.get(SESSION_ID, val.val.trim(), dsSessionP, 'update', null, null, null, null, null, null, iterate_info);
-        let _field_id = ret_field_id.result;
+        let _field_id = await resolve_update_field_id(val.id, iterate_info);
         let _value = ret_value.result;
 
         updates.push({ _field_id, _value });