malinajs 0.7.2-a11 → 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;
@@ -6833,7 +6866,7 @@
     });
   }
 
-  const version = '0.7.2-a11';
+  const version = '0.7.2-a12';
 
 
   async function compile(source, config = {}) {
@@ -6913,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-a11",
+  "version": "0.7.2-a12",
   "license": "MIT",
   "scripts": {
     "prepare": "npm run build",