malinajs 0.6.56 → 0.6.59

package/compile.js

@@ -18,9 +18,10 @@ function assert(x, info) {
 }
 
 function toCamelCase(name) {
-    assert(name[name.length - 1] !== '-', 'Wrong name');
-    return name.replace(/(?<!-)(\-\w)/g, function(part) {
-        return part[1].toUpperCase();
+    assert(last(name) !== '-', 'Wrong name');
+    return name.replace(/(.\-\w)/g, function(part) {
+        if(part[0] == '-') return part;
+        return part[0] + part[2].toUpperCase();
     });
 }
 function Q(s) {
@@ -1247,7 +1248,7 @@ function transform() {
     function walk(node, parent, fn) {
         if(typeof node !== 'object') return;
 
-        if(node._apply) return;
+        if(node._apply && node.type == 'ExpressionStatement') return;
         node._parent = parent;
         let forParent = parent;
         if(node.type) {
@@ -4025,7 +4026,10 @@ function makeDom(data) {
             let n = new Node(e.name, {__node: e});
             e.attributes.forEach(a => {
                 if(a.name == 'class') {
-                    if(a.value != null) n.className += ' ' + a.value;
+                    if(a.value != null) {
+                        if(a.value.includes('{')) n.dynClass = true;
+                        else n.className += ' ' + a.value;
+                    }
                     n.attributes[a.name] = a.value;
                 } else if(a.name == 'id') n.attributes.id = n.id = a.value;
                 else if(a.name.startsWith('class:')) {
@@ -4102,12 +4106,16 @@ Node.prototype.getElementsByClassName = function(names) {
     if(names.length != 1) throw 'Not supported';
     let cls = names[0];
 
+    let rx = RegExp('(^|\\s)' + cls + '(\\s|$)', 'i');
     let result = [];
-    this.childNodes.forEach(n => {
-        let rx = RegExp('(^|\\s)' + cls + '(\\s|$)', 'i');
-        if(rx.test(n.className)) result.push(n);
-        result.push.apply(result, n.getElementsByClassName(cls));
-    });
+    const walk = (node) => {
+        node.childNodes.forEach(n => {
+            if(n.dynClass) result.push(n);
+            else if(rx.test(n.className)) result.push(n);
+            walk(n);
+        });
+    };
+    walk(this);
     return result;
 };
 

package/malina.js

@@ -19,9 +19,10 @@
     }
 
     function toCamelCase(name) {
-        assert(name[name.length - 1] !== '-', 'Wrong name');
-        return name.replace(/(?<!-)(\-\w)/g, function(part) {
-            return part[1].toUpperCase();
+        assert(last(name) !== '-', 'Wrong name');
+        return name.replace(/(.\-\w)/g, function(part) {
+            if(part[0] == '-') return part;
+            return part[0] + part[2].toUpperCase();
         });
     }
     function Q(s) {
@@ -1248,7 +1249,7 @@
         function walk(node, parent, fn) {
             if(typeof node !== 'object') return;
 
-            if(node._apply) return;
+            if(node._apply && node.type == 'ExpressionStatement') return;
             node._parent = parent;
             let forParent = parent;
             if(node.type) {
@@ -4026,7 +4027,10 @@
                 let n = new Node(e.name, {__node: e});
                 e.attributes.forEach(a => {
                     if(a.name == 'class') {
-                        if(a.value != null) n.className += ' ' + a.value;
+                        if(a.value != null) {
+                            if(a.value.includes('{')) n.dynClass = true;
+                            else n.className += ' ' + a.value;
+                        }
                         n.attributes[a.name] = a.value;
                     } else if(a.name == 'id') n.attributes.id = n.id = a.value;
                     else if(a.name.startsWith('class:')) {
@@ -4103,12 +4107,16 @@
         if(names.length != 1) throw 'Not supported';
         let cls = names[0];
 
+        let rx = RegExp('(^|\\s)' + cls + '(\\s|$)', 'i');
         let result = [];
-        this.childNodes.forEach(n => {
-            let rx = RegExp('(^|\\s)' + cls + '(\\s|$)', 'i');
-            if(rx.test(n.className)) result.push(n);
-            result.push.apply(result, n.getElementsByClassName(cls));
-        });
+        const walk = (node) => {
+            node.childNodes.forEach(n => {
+                if(n.dynClass) result.push(n);
+                else if(rx.test(n.className)) result.push(n);
+                walk(n);
+            });
+        };
+        walk(this);
         return result;
     };
 
@@ -5917,7 +5925,7 @@
         return {event, fn};
     }
 
-    const version = '0.6.56';
+    const version = '0.6.59';
 
 
     async function compile(source, config = {}) {

package/package.json

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