malinajs 0.7.12 → 0.7.14

package/malina.js

@@ -21,7 +21,7 @@
     let prev = current_context;
     try {
       current_context = context;
-      return fn();
+      return fn.call(context);
     } finally {
       current_context = prev;
     }
@@ -406,6 +406,18 @@
       xNode(data, handler)
       xNode(handler)
       xNode(xNode, data, handler)
+
+      $wait - wait for a node be processed
+      $hold - hold a node from processing
+
+        xNode('name', {
+          $wait: ['apply', 'rootCD', anotherNode],
+          $hold: ['apply', 'anotherNode']
+        }, (ctx, node) => {
+          this.inuse.apply    // check if apply is used
+          this.inuse.rootCD   // check if rootCD is used
+          node.$wait[0].value // check value of first node in $wait
+        })
     */
     if(_type instanceof xNode) {
       let n = _type;
@@ -598,14 +610,10 @@
             });
           }
 
-          let className = {};
-          node.class.forEach(sel => {
-            if(sel.$selector) sel = get_context().css.resolve(sel);
-            className[sel] = true;
-          });
-          className = Object.keys(className).join(' ');
-          if(className) ctx.write(` class="${className}"`);
-
+          if (node.class.size) {
+            ctx.add(get_context().css.resolveAsNode(node.class, [' class="', '"']));
+          }
+          
           if(node.children.length) {
             ctx.write('>');
             node.children.forEach(n => ctx.build(n));
@@ -2360,13 +2368,13 @@
                 ctx.writeLine(`${elName}.setAttribute('${a.name}', \`${Q(a.value)}\`);`);
               });
             }));
+
             binds.push(xNode('bindClasses', { el }, (ctx, n) => {
               let el = n.el;
+              if (!el.class.size) return;
               let elName = el.bindName();
-              if(el.class.size) {
-                let className = Array.from(el.class.values()).join(' ');
-                ctx.writeLine(`${elName}.className += ' ${className}';`);
-              }
+              ctx.add(this.css.resolveAsNode(el.class, [`${elName}.className += ' `, `';`]));
+              ctx.write(true);
             }));
           }
           bindTail.forEach(b => binds.push(b));
@@ -4827,6 +4835,18 @@
       return sel.local;
     };
 
+    self.resolveAsNode = function(classList, wrap) {
+      return xNode('resolve-class', { classList, wrap }, (ctx, n) => {
+        let className = {};
+        n.classList.forEach(sel => {
+          if(sel.$selector) sel = this.resolve(sel);
+          className[sel] = true;
+        });
+        className = Object.keys(className).join(' ');
+        if(className) ctx.write(`${n.wrap[0]}${className}${n.wrap[1]}`);
+      });
+    };
+
     self.getContent = function() {
       removeBlocks.forEach(node => {
         let i = node.parent.children.indexOf(node);
@@ -5109,8 +5129,7 @@
       if(name[0] == '#') {
         assert(!value, 'Wrong ref');
         name = name.substring(1);
-        assert(isSimpleName(name), name);
-        this.checkRootName(name);
+        assert(detectExpressionType(name) == 'identifier', name);
         reference = name;
         return;
       } else if(name[0] == ':' || name.startsWith('bind:')) {
@@ -6017,19 +6036,26 @@
     if(block.singleBlock) {
       itemBlock = xNode('each-component', {
         block: block.singleBlock,
+        reference: block.reference,
         rebind,
         itemName,
         indexName
       }, (ctx, n) => {
         ctx.write(`$runtime.makeEachSingleBlock((${n.itemName}`);
-        if(n.indexName) ctx.write(`, ${n.indexName}`);
+        if (n.indexName) ctx.write(`, ${n.indexName}`);
         ctx.write(') => [');
         ctx.indent++;
         ctx.write(true);
-        if(n.rebind) ctx.add(n.rebind);
+        if (n.rebind) ctx.add(n.rebind);
         else ctx.write('null');
         ctx.write(',', true);
-        ctx.add(n.block);
+        if (n.reference) {
+          ctx.write(true, `(${n.reference} = `);
+          ctx.add(n.block);
+          ctx.write(')', true);
+        } else {
+          ctx.add(n.block);
+        }
         ctx.indent--;
         ctx.write(true, '])');
       });
@@ -6458,13 +6484,20 @@
           ctx.add(n.slot.template);
           ctx.write(')');
         } else {
-          ctx.write('$runtime.makeBlockBound(');
-          ctx.add(n.slot.template);
-          ctx.write(', ($parentElement) => {', true);
-          ctx.indent++;
-          ctx.add(n.slot.source);
-          ctx.indent--;
-          ctx.write(true, '})');
+          ctx.add(xNode('make-block', {
+            $wait: ['apply'],
+            template: n.slot.template,
+            source: n.slot.source
+          }, (ctx, n) => {
+            if(this.inuse.apply) ctx.write('$runtime.makeBlockBound(');
+            else ctx.write('$runtime.makeBlock(');
+            ctx.add(n.template);
+            ctx.write(', ($parentElement) => {', true);
+            ctx.indent++;
+            ctx.add(n.source);
+            ctx.indent--;
+            ctx.write(true, '})');
+          }));
         }
       } else missed = ', null';
 
@@ -6854,7 +6887,7 @@
     });
   }
 
-  const version = '0.7.12';
+  const version = '0.7.14';
 
 
   async function compile(source, config = {}) {
@@ -6958,7 +6991,7 @@
       }
     };
 
-    use_context(ctx, () => setup.call(ctx));
+    use_context(ctx, setup);
 
     await hook(ctx, 'dom:before');
     ctx.parseHTML();
@@ -6985,7 +7018,7 @@
     await hook(ctx, 'js:before');
     ctx.js_parse();
     await hook(ctx, 'js');
-    use_context(ctx, () => ctx.js_transform());
+    use_context(ctx, ctx.js_transform);
     await hook(ctx, 'js:after');
 
     await hook(ctx, 'css:before');
@@ -6994,38 +7027,38 @@
     await hook(ctx, 'css');
 
     await hook(ctx, 'runtime:before');
-    use_context(ctx, () => ctx.buildRuntime());
+    use_context(ctx, ctx.buildRuntime);
     await hook(ctx, 'runtime');
 
     await hook(ctx, 'build:before');
 
-    use_context(ctx, () => {
-      const result = ctx.result = xNode('block');
+    use_context(ctx, function() {
+      const result = this.result = xNode('block');
       result.push('import * as $runtime from \'malinajs/runtime.js\';');
       result.push('import { $watch, $tick } from \'malinajs/runtime.js\';');
-      result.push(ctx.module.top);
+      result.push(this.module.top);
       result.push(xNode('componentFn-wrapper', {
-        $compile: [ctx.module.head, ctx.module.code, ctx.module.body, ctx.glob.rootCD],
+        $compile: [this.module.head, this.module.code, this.module.body, this.glob.rootCD],
         name: config.name,
-        componentFn: ctx.glob.componentFn
-      }, (ctx2, n) => {
+        componentFn: this.glob.componentFn
+      }, (ctx, n) => {
         if(config.exportDefault) {
-          if(ctx.glob.$$selfComponent.value) {
-            ctx2.write(true, 'const $$selfComponent = ');
-            ctx2.add(n.componentFn);
-            ctx2.write(true, 'export default $$selfComponent;');
+          if(this.glob.$$selfComponent.value) {
+            ctx.write(true, 'const $$selfComponent = ');
+            ctx.add(n.componentFn);
+            ctx.write(true, 'export default $$selfComponent;');
           } else {
-            ctx2.write(true, 'export default ');
-            ctx2.add(n.componentFn);
+            ctx.write(true, 'export default ');
+            ctx.add(n.componentFn);
           }
         } else {
-          assert(!ctx.glob.$$selfComponent.value, 'Not supported');
-          ctx2.write(true, `const ${n.name} = `);
-          ctx2.add(n.componentFn);
+          assert(!this.glob.$$selfComponent.value, 'Not supported');
+          ctx.write(true, `const ${n.name} = `);
+          ctx.add(n.componentFn);
         }
       }));
 
-      ctx.result = xBuild(result);
+      this.result = xBuild(result);
     });
 
     await hook(ctx, 'build');
@@ -7036,7 +7069,7 @@
   async function hook(ctx, name) {
     for(let i = 0; i < ctx.config.plugins.length; i++) {
       const fn = ctx.config.plugins[i][name];
-      if(fn) await use_context(ctx, () => fn(ctx));
+      if(fn) await use_context(ctx, () => fn.call(ctx, ctx));
     }
   }
 

package/package.json

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