malinajs 0.7.2-a10 → 0.7.2-a12

package/malina.js

@@ -671,6 +671,42 @@
     }
   };
 
+  const walk = (node, fn) => {
+    switch(node.type) {
+      case 'node':
+      case 'slot':
+      case 'block':
+      case 'fragment':
+      case 'root':
+        if(node.body) fn(node.body, node);
+        break
+      case 'each':
+        if(node.mainBlock) fn(node.mainBlock, node);
+        if(node.elseBlock) fn(node.elseBlock, node);
+        break
+      case 'await':
+        if(node.parts.main) fn(node.parts.main, node);
+        if(node.parts.then) fn(node.parts.then, node);
+        if(node.parts.catch) fn(node.parts.catch, node);
+        break
+      case 'if':
+        node.parts.forEach(p => {
+          if(p.body) fn(p.body, node);
+        });
+        if(node.elsePart) fn(node.elsePart, node);
+        break
+      case 'text':
+      case 'comment':
+      case 'script':
+      case 'style':
+      case 'systag':
+      case 'template':
+        break
+      default:
+        throw `Not implemented: ${node.type}`;
+    }
+  };
+
   function compactDOM() {
     let data = this.DOM;
 
@@ -710,29 +746,7 @@
           }
         } else {
           if(node.type == 'node' && (node.name == 'pre' || node.name == 'textarea')) continue;
-          switch(node.type) {
-            case 'node':
-            case 'slot':
-            case 'block':
-            case 'fragment':
-              if(node.body) go(node.body, node);
-              break
-            case 'each':
-              if(node.mainBlock) go(node.mainBlock, node);
-              if(node.elseBlock) go(node.elseBlock, node);
-              break
-            case 'await':
-              if(node.parts.main) go(node.parts.main, node);
-              if(node.parts.then) go(node.parts.then, node);
-              if(node.parts.catch) go(node.parts.catch, node);
-              break
-            case 'if':
-              node.parts.forEach(p => {
-                if(p.body) go(p.body, node);
-              });
-              if(node.elsePart) go(node.elsePart, node);
-              break
-          }
+          walk(node, go);
         }
       }
 
@@ -841,6 +855,25 @@
     go(data.body);
   }
 
+  function compactFull() {
+    const go = (body) => {
+      let i = 0;
+      while (i < body.length) {
+        let n = body[i];
+        if(n.type == 'text') {
+          n.value = n.value.trim();
+          if(!n.value) {
+            body.splice(i, 1);
+            continue;
+          }
+        } else walk(n, go);
+        i++;
+      }
+    };
+
+    walk(this.DOM, go);
+  }
+
   class Reader {
     constructor(source) {
       if(source instanceof Reader) return source;
@@ -1293,7 +1326,12 @@
       }
     });
     result = '`' + result.map(p => p.type == 'text' ? Q(p.value) : '${' + p.value + '}').join('') + '`';
-    return { result, parts, staticText };
+    return {
+      result,
+      parts,
+      staticText,
+      binding: parts.length == 1 && parts[0].type == 'exp' ? parts[0].value : null
+    };
   }
 
 
@@ -1379,7 +1417,7 @@
             const value = raw.substring(1, raw.length - 1);
             result.push({name, value, raw, content: r.sub(start)});
           } else {
-            const value = r.readIf(/^\S+/);
+            const value = r.readIf(/^[^\s<>]+/);
             result.push({name, value, raw: value, content: r.sub(start)});
           }
         } else {
@@ -5727,13 +5765,13 @@
 
         if(node.spreading) return node.spreading.push(`${name}: ${exp}`);
 
-        if(node.name == 'option' && name == 'value') {
+        if(node.name == 'option' && name == 'value' && parsed.binding) {
           return {
             bind: xNode('bindOptionValue', {
               el: element.bindName(),
-              exp
+              value: parsed.binding
             }, (ctx, n) => {
-              ctx.write(true, `$runtime.selectOption(${n.el}, () => (${n.exp}));`);
+              ctx.write(true, `$runtime.selectOption(${n.el}, () => (${n.value}));`);
             })
           }
         }
@@ -5754,7 +5792,7 @@
         let n = xNode('bindAttribute', {
           $wait: ['apply'],
           name,
-          exp,
+          exp: propList[name] && parsed.binding ? parsed.binding : exp,
           hasElement,
           el: element.bindName()
         }, (ctx, data) => {
@@ -6828,7 +6866,7 @@
     });
   }
 
-  const version = '0.7.2-a10';
+  const version = '0.7.2-a12';
 
 
   async function compile(source, config = {}) {
@@ -6908,7 +6946,7 @@
       parseHTML: function() {
         this.DOM = parseHTML(this.source);
       },
-      compactDOM,
+      compactDOM: config.compact == 'full' ? compactFull : compactDOM,
 
       script: null,
       scriptNodes: null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "malinajs",
-  "version": "0.7.2-a10",
+  "version": "0.7.2-a12",
   "license": "MIT",
   "scripts": {
     "prepare": "npm run build",

package/runtime.js

@@ -1287,19 +1287,31 @@ const keepAlive = (store, keyFn, builder) => {
 
 const selectElement = (el, getter, setter) => {
   addEvent(el, 'change', () => {
-    let op = el.querySelector(':checked');
-    if(op?.$$value) {
-      let value = op.$$value();
-      setter(value);
-      w.value = value;
-    }
+    let value = [];
+    el.querySelectorAll(':checked').forEach(o => {
+      value.push(o.$$value ? o.$$value() : o.value);
+    });
+    value = el.multiple ? value : value[0];
+    setter(value);
+    w.value = value;
   });
   const update = () => {
-    for(let op of el.options) {
-      if(op.$$value?.() === w.value) {
-        op.selected = true;
+    let value = w.value;
+    if(el.multiple) {
+      if(isArray(value)) {
+        for(let o of el.options) {
+          const option_value = o.$$value ? o.$$value() : o.value;
+          o.selected = value.indexOf(option_value) != -1;
+        }
         return;
       }
+    } else {
+      for(let o of el.options) {
+        if((o.$$value ? o.$$value() : o.value) === value) {
+          o.selected = true;
+          return;
+        }
+      }
     }
     el.selectedIndex = -1;
   };