malinajs 0.6.51 → 0.6.54

package/compile.js

@@ -19,7 +19,7 @@ function assert(x, info) {
 
 function toCamelCase(name) {
     assert(name[name.length - 1] !== '-', 'Wrong name');
-    return name.replace(/(\-\w)/g, function(part) {
+    return name.replace(/(?<!-)(\-\w)/g, function(part) {
         return part[1].toUpperCase();
     });
 }
@@ -55,19 +55,10 @@ function detectExpressionType(name) {
     let ast = acorn.parse(name, {allowReturnOutsideFunction: true});
 
     function checkIdentificator(body) {
-        if(body.length != 1) return;
-        if(body[0].type != 'ExpressionStatement') return;
-        if(body[0].expression.type != 'Identifier') return;
-        return true;
-    }
-
-    function checkMemberIdentificator(body) {
         if(body.length != 1) return;
         if(body[0].type != 'ExpressionStatement') return;
         let obj = body[0].expression;
-        if(obj.type != 'MemberExpression') return;
-        if(obj.property.type != 'Identifier') return;
-        return true;
+        return obj.type == 'Identifier' || obj.type == 'MemberExpression';
     }
 
     function checkFunction(body) {
@@ -79,7 +70,6 @@ function detectExpressionType(name) {
     }
 
     if(checkIdentificator(ast.body)) return 'identifier';
-    if(checkMemberIdentificator(ast.body)) return 'identifier';
     if(checkFunction(ast.body)) return 'function';
 
     return;
@@ -829,7 +819,8 @@ function parse() {
             } else continue;
 
             return {
-                value: source.substring(start + 1, index - 1)
+                value: source.substring(start + 1, index - 1),
+                raw: source.substring(start, index)
             };
         }
     };
@@ -846,6 +837,16 @@ function parse() {
     const go = (parent) => {
         let textNode = null;
 
+        const addText = v => {
+            if(!textNode) {
+                textNode = {
+                    type: 'text',
+                    value: ''
+                };
+            }
+            textNode.value += v;
+        };
+
         const flushText = () => {
             if(!textNode) return;
             parent.body.push(textNode);
@@ -910,10 +911,12 @@ function parse() {
                 }
                 continue;
             } else if(a === '{') {
-                if(['#', '/', ':', '@'].indexOf(source[index + 1]) >= 0) {
-                    flushText();
+                if(['#', '/', ':', '@', '*'].indexOf(source[index + 1]) >= 0) {
                     let bind = readBinding();
-                    if(bind.value.match(/^@\w+/)) {
+                    if(bind.value[0] != '*') flushText();
+                    if(bind.value[0] == '*') {
+                        addText(bind.raw);
+                    } else if(bind.value.match(/^@\w+/)) {
                         let tag = {
                             type: 'systag',
                             value: bind.value
@@ -1005,13 +1008,7 @@ function parse() {
                 }
             }
 
-            if(!textNode) {
-                textNode = {
-                    type: 'text',
-                    value: ''
-                };
-            }
-            textNode.value += readNext();
+            addText(readNext());
         }        flushText();
         assert(parent.type === 'root', 'File ends to early');
     };

package/malina.js

@@ -20,7 +20,7 @@
 
     function toCamelCase(name) {
         assert(name[name.length - 1] !== '-', 'Wrong name');
-        return name.replace(/(\-\w)/g, function(part) {
+        return name.replace(/(?<!-)(\-\w)/g, function(part) {
             return part[1].toUpperCase();
         });
     }
@@ -56,19 +56,10 @@
         let ast = acorn.parse(name, {allowReturnOutsideFunction: true});
 
         function checkIdentificator(body) {
-            if(body.length != 1) return;
-            if(body[0].type != 'ExpressionStatement') return;
-            if(body[0].expression.type != 'Identifier') return;
-            return true;
-        }
-
-        function checkMemberIdentificator(body) {
             if(body.length != 1) return;
             if(body[0].type != 'ExpressionStatement') return;
             let obj = body[0].expression;
-            if(obj.type != 'MemberExpression') return;
-            if(obj.property.type != 'Identifier') return;
-            return true;
+            return obj.type == 'Identifier' || obj.type == 'MemberExpression';
         }
 
         function checkFunction(body) {
@@ -80,7 +71,6 @@
         }
 
         if(checkIdentificator(ast.body)) return 'identifier';
-        if(checkMemberIdentificator(ast.body)) return 'identifier';
         if(checkFunction(ast.body)) return 'function';
 
         return;
@@ -830,7 +820,8 @@
                 } else continue;
 
                 return {
-                    value: source.substring(start + 1, index - 1)
+                    value: source.substring(start + 1, index - 1),
+                    raw: source.substring(start, index)
                 };
             }
         };
@@ -847,6 +838,16 @@
         const go = (parent) => {
             let textNode = null;
 
+            const addText = v => {
+                if(!textNode) {
+                    textNode = {
+                        type: 'text',
+                        value: ''
+                    };
+                }
+                textNode.value += v;
+            };
+
             const flushText = () => {
                 if(!textNode) return;
                 parent.body.push(textNode);
@@ -911,10 +912,12 @@
                     }
                     continue;
                 } else if(a === '{') {
-                    if(['#', '/', ':', '@'].indexOf(source[index + 1]) >= 0) {
-                        flushText();
+                    if(['#', '/', ':', '@', '*'].indexOf(source[index + 1]) >= 0) {
                         let bind = readBinding();
-                        if(bind.value.match(/^@\w+/)) {
+                        if(bind.value[0] != '*') flushText();
+                        if(bind.value[0] == '*') {
+                            addText(bind.raw);
+                        } else if(bind.value.match(/^@\w+/)) {
                             let tag = {
                                 type: 'systag',
                                 value: bind.value
@@ -1006,13 +1009,7 @@
                     }
                 }
 
-                if(!textNode) {
-                    textNode = {
-                        type: 'text',
-                        value: ''
-                    };
-                }
-                textNode.value += readNext();
+                addText(readNext());
             }        flushText();
             assert(parent.type === 'root', 'File ends to early');
         };
@@ -5891,7 +5888,7 @@
         return {event, fn};
     }
 
-    const version = '0.6.51';
+    const version = '0.6.54';
 
 
     async function compile(source, config = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "malinajs",
-  "version": "0.6.51",
+  "version": "0.6.54",
   "license": "MIT",
   "scripts": {
     "prepare": "npm run build",

package/runtime.js

@@ -295,12 +295,12 @@ function $tick(fn, uniq) {
     _tick_list.push(fn);
     if(_tick_planned.$tick) return;
     _tick_planned.$tick = true;
-    setTimeout(() => {
+    Promise.resolve().then(() => {
         _tick_planned = {};
         let list = _tick_list;
         _tick_list = [];
         list.map(safeCall);
-    }, 0);
+    });
 }
 
 function $makeEmitter(option) {
@@ -510,7 +510,7 @@ const bindText = (cd, element, fn) => {
 
 const bindStyle = (cd, element, name, fn) => {
     $watchReadOnly(cd, fn, (value) => {
-        element.style[name] = value;
+        element.style.setProperty(name, value);
     });
 };