malinajs 0.7.11 → 0.7.13

package/malina.js

@@ -1,12 +1,14 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('acorn'), require('astring'), require('css-tree')) :
   typeof define === 'function' && define.amd ? define(['exports', 'acorn', 'astring', 'css-tree'], factory) :
-  (global = global || self, factory(global.malina = {}, global.acorn, global.astring, global['css-tree']));
-}(this, (function (exports, acorn, astring, csstree) { 'use strict';
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.malina = {}, global.acorn, global.astring, global["css-tree"]));
+})(this, (function (exports, acorn, astring, csstree) { 'use strict';
 
-  acorn = acorn && Object.prototype.hasOwnProperty.call(acorn, 'default') ? acorn['default'] : acorn;
-  astring = astring && Object.prototype.hasOwnProperty.call(astring, 'default') ? astring['default'] : astring;
-  csstree = csstree && Object.prototype.hasOwnProperty.call(csstree, 'default') ? csstree['default'] : csstree;
+  function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+  var acorn__default = /*#__PURE__*/_interopDefaultLegacy(acorn);
+  var astring__default = /*#__PURE__*/_interopDefaultLegacy(astring);
+  var csstree__default = /*#__PURE__*/_interopDefaultLegacy(csstree);
 
   let current_context;
 
@@ -72,7 +74,7 @@
   function detectExpressionType(name) {
     if(isSimpleName(name)) return 'identifier';
 
-    let ast = acorn.parse(name, { allowReturnOutsideFunction: true, ecmaVersion: 'latest' });
+    let ast = acorn__default["default"].parse(name, { allowReturnOutsideFunction: true, ecmaVersion: 'latest' });
 
     function checkIdentificator(body) {
       if(body.length != 1) return;
@@ -139,7 +141,7 @@
 
 
   const extractKeywords = (exp) => {
-    let ast = acorn.parse(exp, { sourceType: 'module', ecmaVersion: 'latest' });
+    let ast = acorn__default["default"].parse(exp, { sourceType: 'module', ecmaVersion: 'latest' });
 
     const keys = new Set();
     const rec = (n) => {
@@ -197,8 +199,8 @@
 
   const parseJS = (exp, option) => {
     let self = {};
-    if(option === true) self.ast = acorn.parse(exp, { ecmaVersion: 'latest' });
-    else self.ast = acorn.parseExpressionAt(exp, 0, { ecmaVersion: 'latest' });
+    if(option === true) self.ast = acorn__default["default"].parse(exp, { ecmaVersion: 'latest' });
+    else self.ast = acorn__default["default"].parseExpressionAt(exp, 0, { ecmaVersion: 'latest' });
 
     self.transform = function(fn) {
       const rec = (n, pk) => {
@@ -229,7 +231,7 @@
     };
 
     self.build = function(data) {
-      return astring.generate(data || self.ast, { indent: '', lineEnd: '' });
+      return astring__default["default"].generate(data || self.ast, { indent: '', lineEnd: '' });
     };
     return self;
   };
@@ -404,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;
@@ -963,17 +977,17 @@
     const reader = new Reader(source);
 
     const readScript = (reader) => {
-      class ScriptParser extends acorn.Parser {
+      class ScriptParser extends acorn__default["default"].Parser {
         readToken_lt_gt(code) {
           if (this.input.slice(this.pos, this.pos + 9) == '</script>') {
-            return this.finishToken(acorn.tokTypes.eof);
+            return this.finishToken(acorn__default["default"].tokTypes.eof);
           }
           return super.readToken_lt_gt(code);
         }
 
         scan() {
           this.nextToken();
-          while (this.type !== acorn.tokTypes.eof) {
+          while (this.type !== acorn__default["default"].tokTypes.eof) {
             this.parseStatement(null, true, null);
           }
           return this.end;
@@ -1219,7 +1233,7 @@
       elArg = reader.read(/^[^\s>/]+/);
     }
 
-    let attributes = parseAttibutes(reader, {closedByTag: true});
+    let attributes = parseAttibutes$1(reader, {closedByTag: true});
 
     let closedTag = false;
     if(reader.readIf('/>')) closedTag = true;
@@ -1370,7 +1384,7 @@
   };
 
 
-  const parseAttibutes = (source, option={}) => {
+  const parseAttibutes$1 = (source, option={}) => {
     const r = new Reader(source);
     let result = [];
 
@@ -1450,7 +1464,7 @@
         if(isBlockComment) return;
         this.script.comments.push({ start, end, value });
       };
-      this.script.ast = acorn.parse(source, { sourceType: 'module', ecmaVersion: 'latest', onComment });
+      this.script.ast = acorn__default["default"].parse(source, { sourceType: 'module', ecmaVersion: 'latest', onComment });
 
       if(source.includes('$props')) this.require('$props');
       if(source.includes('$attributes')) this.require('$attributes');
@@ -1631,10 +1645,10 @@
           target = ex.left.name;
           if(!(target in rootVariables)) resultBody.push(makeVariable(target));
         } else if(ex.left.type == 'MemberExpression') {
-          target = astring.generate(ex.left);
+          target = astring__default["default"].generate(ex.left);
         } else throw 'Error';
         assertExpression(ex.right);
-        const exp = astring.generate(ex.right);
+        const exp = astring__default["default"].generate(ex.right);
         watchers.push(xNode('watch-assign', {
           $wait: ['apply'],
           target,
@@ -1646,7 +1660,7 @@
       } else if(n.body.expression.type == 'SequenceExpression') {
         const ex = n.body.expression.expressions;
         const handler = last(ex);
-        let callback = astring.generate(handler);
+        let callback = astring__default["default"].generate(handler);
         if(handler.type == 'ArrowFunctionExpression' || handler.type == 'FunctionExpression') ; else if(detectExpressionType(callback) == 'identifier') {
           callback = `(v) => { ${callback}(v); }`;
         } else {
@@ -1657,7 +1671,7 @@
           assertExpression(ex[0]);
           watchers.push(xNode('watch-expression', {
             $wait: ['apply'],
-            exp: astring.generate(ex[0]),
+            exp: astring__default["default"].generate(ex[0]),
             callback
           }, (ctx, n) => {
             if(this.inuse.apply) {
@@ -1676,7 +1690,7 @@
 
           watchers.push(xNode('watch-expression', {
             $wait: ['apply'],
-            exp: astring.generate(exp),
+            exp: astring__default["default"].generate(exp),
             callback
           }, (ctx, n) => {
             if(this.inuse.apply) ctx.write(true, `$watch(() => ${n.exp}, ($args) => { (${n.callback}).apply(null, $args); }, {cmp: $runtime.deepComparator(1)});`);
@@ -1735,7 +1749,7 @@
             if(d.init.type == 'Literal') {
               p.value = d.init.raw;
             } else {
-              p.value = astring.generate(d.init);
+              p.value = astring__default["default"].generate(d.init);
             }
           }
           result.props.push(p);
@@ -1867,12 +1881,12 @@
         if(statement.type != 'Raw') state.write(lineEnd);
       }
     }
-  }, astring.baseGenerator);
+  }, astring__default["default"].baseGenerator);
 
 
   xNode.init.ast = (ctx, node) => {
     if(!node.body.length) return;
-    let code = astring.generate({
+    let code = astring__default["default"].generate({
       type: 'CustomBlock',
       body: node.body
     }, { generator, startingIndentLevel: 0 });
@@ -4555,7 +4569,7 @@
 
     const selector2str = (sel) => {
       if(!sel.children) sel = { type: 'Selector', children: sel };
-      return csstree.generate(sel);
+      return csstree__default["default"].generate(sel);
     };
 
     const convertAst = (node, parent) => {
@@ -4570,7 +4584,7 @@
     };
 
     const parseCSS = (content, option) => {
-      let ast = csstree.parse(content, option);
+      let ast = csstree__default["default"].parse(content, option);
       return convertAst(ast, null);
     };
 
@@ -4591,7 +4605,7 @@
       let ast = parseCSS(styleNode.content);
       astList.push(ast);
 
-      csstree.walk(ast, function(node) {
+      csstree__default["default"].walk(ast, function(node) {
         if(node.type == 'Declaration') {
           if(node.property == 'animation' || node.property == 'animation-name') {
             let c = node.value.children[0];
@@ -4832,7 +4846,7 @@
       });
       resolveHashes();
 
-      return astList.map(ast => csstree.generate(ast)).join('');
+      return astList.map(ast => csstree__default["default"].generate(ast)).join('');
     };
   }
 
@@ -5107,8 +5121,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:')) {
@@ -6015,19 +6028,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, '])');
       });
@@ -6294,7 +6314,7 @@
   }
 
 
-  function parseAttibutes$1(attributes) {
+  function parseAttibutes(attributes) {
     let props = [];
     let events = [];
     let forwardAllEvents;
@@ -6339,7 +6359,7 @@
     let slot = null;
     if(node.body?.length) slot = this.buildBlock({ body: trimEmptyNodes(node.body) }, { inline: true });
 
-    let { props, events, forwardAllEvents, staticProps } = parseAttibutes$1.call(this, node.attributes);
+    let { props, events, forwardAllEvents, staticProps } = parseAttibutes.call(this, node.attributes);
 
     return xNode('call-fragment', {
       $compile: [slot?.source],
@@ -6439,7 +6459,7 @@
       // assert(!data.slot.template.svg, 'SVG is not supported for exported fragment');
     }
 
-    let pa = parseAttibutes$1.call(this, node.attributes);
+    let pa = parseAttibutes.call(this, node.attributes);
     data = { ...pa, ...data };
 
     return xNode('attach-exported-fragment', data, (ctx, n) => {
@@ -6456,13 +6476,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';
 
@@ -6829,7 +6856,7 @@
     let key = null;
     let args = node.value.substr(6);
     if(args) {
-      args = parseAttibutes(args);
+      args = parseAttibutes$1(args);
       const a = args.find(a => a.name == 'key');
       if(a) {
         let value = a.value;
@@ -6852,7 +6879,7 @@
     });
   }
 
-  const version = '0.7.11';
+  const version = '0.7.13';
 
 
   async function compile(source, config = {}) {
@@ -7113,5 +7140,5 @@
 
   Object.defineProperty(exports, '__esModule', { value: true });
 
-})));
+}));
 //# sourceMappingURL=malina.js.map

package/package.json

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

package/runtime.js

@@ -178,11 +178,13 @@ const keyComparator = (w, value) => {
 
 
 const fire = w => {
-  if(w.cmp) w.cmp(w, w.fn());
+  let value = w.fn();
+  if(w.cmp) w.cmp(w, value);
   else {
-    w.value = w.fn();
+    w.value = value;
     w.cb(w.value);
   }
+  return value;
 };
 
 function $digest($cd, flag) {
@@ -373,8 +375,7 @@ const callComponentDyn = (component, context, option = {}, propFn, cmp, setter,
       $component.$push?.(value);
       $component.$apply?.();
     }, { value: {}, idle: true, cmp });
-    fire(parentWatch);
-    option.props = parentWatch.value;
+    option.props = fire(parentWatch);
   }
 
   if(classFn) {