malinajs 0.7.17 → 0.7.19

package/malina.js

@@ -3100,7 +3100,7 @@
       function(id, context) {
         var node = context, nodes = [ ], next = node.firstElementChild;
         while ((node = next)) {
-          node.id == id && (nodes[nodes.length] = node);
+          (node.id == id || node.dynId) && (nodes[nodes.length] = node);
           if ((next = node.firstElementChild || node.nextElementSibling)) continue;
           while (!next && (node = node.parentElement) && node !== context) {
             next = node.nextElementSibling;
@@ -4905,8 +4905,10 @@
               else n.className += ' ' + a.value;
             }
             n.attributes[a.name] = a.value;
-          } else if(a.name == 'id') n.attributes.id = n.id = a.value;
-          else if(a.name.startsWith('class:')) {
+          } else if(a.name == 'id') {
+            if (a.value?.includes('{')) n.dynId = true;
+            n.attributes.id = n.id = a.value;
+          } else if(a.name.startsWith('class:')) {
             n.className += ' ' + a.name.substring(6);
           } else n.attributes[a.name] = a.value;
         });
@@ -5211,17 +5213,18 @@
         return;
       } else if(this.config.passClass && (name == 'class' || name.startsWith('class:'))) {
         let metaClass, args = name.split(':');
-        if(args.length == 1) {
+        if (args.length == 1) {
           metaClass = '$$main';
         } else {
           assert(args.length == 2);
           metaClass = args[1];
           assert(metaClass);
+          if (!value) value = metaClass;
         }
         assert(value);
         this.css.passingClass = true;
 
-        const parsed = this.parseText(prop.value);
+        const parsed = this.parseText(value);
         this.detectDependency(parsed);
         let exp = parsed.result;
         $class.push(`${metaClass}: $$resolveClass(${exp})`);
@@ -5790,12 +5793,25 @@
       };
     } else {
       if(prop.value && prop.value.indexOf('{') >= 0) {
+        const propList = {
+          hidden: true,
+          checked: true,
+          value: true,
+          disabled: true,
+          selected: true,
+          innerHTML: true,
+          innerText: true,
+          multiple: node.name == 'select',
+          src: true,
+          readonly: 'readOnly'
+        };
+
         const parsed = this.parseText(prop.value);
         this.detectDependency(parsed);
-        let exp = parsed.result;
+        let exp = (propList[name] || isExpression(prop.raw)) && parsed.binding ? parsed.binding : parsed.result;
         let hasElement = prop.value.includes('$element');
 
-        if(node.spreading) return node.spreading.push(`${name}: ${exp}`);
+        if(node.spreading) return node.spreading.push(name == exp ? name : `${name}: ${exp}`);
 
         if(node.name == 'option' && name == 'value' && parsed.binding) {
           return {
@@ -5808,23 +5824,10 @@
           }
         }
 
-        const propList = {
-          hidden: true,
-          checked: true,
-          value: true,
-          disabled: true,
-          selected: true,
-          innerHTML: true,
-          innerText: true,
-          multiple: node.name == 'select',
-          src: true,
-          readonly: 'readOnly'
-        };
-
         let n = xNode('bindAttribute', {
           $wait: ['apply'],
           name,
-          exp: (propList[name] || isExpression(prop.raw)) && parsed.binding ? parsed.binding : exp,
+          exp,
           hasElement,
           el: element.bindName()
         }, (ctx, data) => {
@@ -6904,7 +6907,7 @@
     });
   }
 
-  const version = '0.7.17';
+  const version = '0.7.19';
 
 
   async function compile(source, config = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "malinajs",
-  "version": "0.7.17",
+  "version": "0.7.19",
   "license": "MIT",
   "scripts": {
     "build": "npm run build_runtime && rollup -c",