malinajs 0.6.48 → 0.6.52

package/compile.js

@@ -24,10 +24,10 @@ function toCamelCase(name) {
     });
 }
 function Q(s) {
-    return s.replace(/`/g, '\\`').replace(/\\/g, '\\\\');
+    return s.replace(/\\/g, '\\\\').replace(/`/g, '\\`');
 }
 function Q2(s) {
-    return s.replace(/`/g, '\\`').replace(/\\/g, '\\\\').replace(/\n/g, '\\n');
+    return s.replace(/\\/g, '\\\\').replace(/`/g, '\\`').replace(/\n/g, '\\n');
 }
 function unwrapExp(e) {
     assert(e, 'Empty expression');
@@ -4023,8 +4023,10 @@ function makeDom(data) {
             //if(e.name[0].match(/[A-Z]/)) return;
             let n = new Node(e.name, {__node: e});
             e.attributes.forEach(a => {
-                if(a.name == 'class') n.className += ' ' + a.value;
-                else if(a.name == 'id') n.id = a.value;
+                if(a.name == 'class') {
+                    if(a.value != null) 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:')) {
                     n.className += ' ' + a.name.substring(6);
                 } else n.attributes[a.name] = a.value;
@@ -4066,6 +4068,10 @@ Node.prototype.getAttribute = function(n) {
     return this.attributes[n];
 };
 
+Node.prototype.hasAttribute = function(n) {
+    return n in this.attributes;
+};
+
 Node.prototype.appendChild = function(n) {
     n.parentElement = this;
     this.childNodes.push(n);
@@ -4291,6 +4297,7 @@ function makeComponent(node, element) {
         let value = prop.value;
         if(name == '@@') {
             forwardAllEvents = true;
+            this.require('$events');
             return false;
         } else if(name == 'this') {
             dynamicComponent = unwrapExp(value);
@@ -4559,6 +4566,7 @@ function bindProp(prop, node, element) {
                 // spread operator
                 name = name.substring(3);
                 assert(detectExpressionType(name) == 'identifier');
+                this.detectDependency(name);
                 return node.spreading.push(`...${name}`);
             } else {
                 prop.value = prop.name;
@@ -5345,7 +5353,7 @@ function makeFragment(node) {
             svg: block.svg
         })
     }, (ctx, n) => {
-        ctx.write(true, `function $fragment_${n.name}($cd, label, $props, $events, $$fragmentSlot) {\n`);
+        ctx.write(true, `function $fragment_${n.name}($cd, $$label, $props, $events, $$fragmentSlot) {\n`);
         ctx.indent++;
 
         if(n.props?.length) {
@@ -5360,7 +5368,7 @@ function makeFragment(node) {
 
         ctx.build(n.template);
         ctx.build(n.source);
-        ctx.writeLine(`$runtime.insertAfter(label, $parentElement);`);
+        ctx.writeLine(`$runtime.insertAfter($$label, $parentElement);`);
 
         ctx.indent--;
         ctx.writeLine('}');
@@ -5483,15 +5491,15 @@ function attachFragment(node, element) {
             ctx.write(missed, ',\n');
             missed = '';
             if(n.slot.source) {
-                ctx.writeLine(`($cd, label) => {`);
+                ctx.writeLine(`($cd, $$label) => {`);
                 ctx.goIndent(() => {
                     ctx.build(n.slot.template);
                     ctx.build(n.slot.source);
-                    ctx.writeLine(`$runtime.insertAfter(label, $parentElement);`);
+                    ctx.writeLine(`$runtime.insertAfter($$label, $parentElement);`);
                 });
                 ctx.write(true, `}`);
             } else {
-                ctx.write(true, `($cd, label) => $runtime.insertAfter(label, `);
+                ctx.write(true, `($cd, $$label) => $runtime.insertAfter($$label, `);
                 ctx.build(n.slot.template);
                 ctx.write(`)\n`);
             }

package/malina-esbuild.js

@@ -11,11 +11,9 @@ process.argv.includes('-w') ? process.env.WATCH = 1 : null;
 
 const esbuildConfigPath = path.join(process.cwd(),'esbuild.config.js');
 const derverConfigPath = path.join(process.cwd(),'derver.config.js');
-const malinaConfigPath = path.join(process.cwd(),'malina.config.js');
 
 const esbuildConfig = fs.existsSync(esbuildConfigPath) ? require(esbuildConfigPath) : {};
 const derverConfig = fs.existsSync(derverConfigPath) ? require(derverConfigPath) : {};
-const malinaConfig = fs.existsSync(malinaConfigPath) ? require(malinaConfigPath) : {};
 
 // Executable
 
@@ -60,11 +58,6 @@ function malinaPlugin(options={}){
 
     const cssModules = new Map();
 
-    options = {
-        ...malinaConfig,
-        ...options
-    }
-
     if(options.displayVersion !== false) console.log('! Malina.js', malina.version);
     
     return {
@@ -77,18 +70,19 @@ function malinaPlugin(options={}){
                     let source = await fsp.readFile(args.path, 'utf8');
 
                     let ctx = await malina.compile(source,{
+                        path: args.path,
                         name: args.path.match(/([^/\\]+)\.\w+$/)[1],
                         ...options
                     });
 
                     let code = ctx.result;
-                    
-                    if(!options.css && ctx.css.result){
+
+                    if(ctx.css.result){
                         const cssPath = args.path.replace(/\.\w+$/, ".malina.css").replace(/\\/g, "/");
                         cssModules.set(cssPath,ctx.css.result);
                         code += `\nimport "${cssPath}";`
                     }
-                    
+
                     return { contents: code }
                 }
             );

package/malina.js

@@ -25,10 +25,10 @@
         });
     }
     function Q(s) {
-        return s.replace(/`/g, '\\`').replace(/\\/g, '\\\\');
+        return s.replace(/\\/g, '\\\\').replace(/`/g, '\\`');
     }
     function Q2(s) {
-        return s.replace(/`/g, '\\`').replace(/\\/g, '\\\\').replace(/\n/g, '\\n');
+        return s.replace(/\\/g, '\\\\').replace(/`/g, '\\`').replace(/\n/g, '\\n');
     }
     function unwrapExp(e) {
         assert(e, 'Empty expression');
@@ -4024,8 +4024,10 @@
                 //if(e.name[0].match(/[A-Z]/)) return;
                 let n = new Node(e.name, {__node: e});
                 e.attributes.forEach(a => {
-                    if(a.name == 'class') n.className += ' ' + a.value;
-                    else if(a.name == 'id') n.id = a.value;
+                    if(a.name == 'class') {
+                        if(a.value != null) 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:')) {
                         n.className += ' ' + a.name.substring(6);
                     } else n.attributes[a.name] = a.value;
@@ -4067,6 +4069,10 @@
         return this.attributes[n];
     };
 
+    Node.prototype.hasAttribute = function(n) {
+        return n in this.attributes;
+    };
+
     Node.prototype.appendChild = function(n) {
         n.parentElement = this;
         this.childNodes.push(n);
@@ -4292,6 +4298,7 @@
             let value = prop.value;
             if(name == '@@') {
                 forwardAllEvents = true;
+                this.require('$events');
                 return false;
             } else if(name == 'this') {
                 dynamicComponent = unwrapExp(value);
@@ -4560,6 +4567,7 @@
                     // spread operator
                     name = name.substring(3);
                     assert(detectExpressionType(name) == 'identifier');
+                    this.detectDependency(name);
                     return node.spreading.push(`...${name}`);
                 } else {
                     prop.value = prop.name;
@@ -5346,7 +5354,7 @@
                 svg: block.svg
             })
         }, (ctx, n) => {
-            ctx.write(true, `function $fragment_${n.name}($cd, label, $props, $events, $$fragmentSlot) {\n`);
+            ctx.write(true, `function $fragment_${n.name}($cd, $$label, $props, $events, $$fragmentSlot) {\n`);
             ctx.indent++;
 
             if(n.props?.length) {
@@ -5361,7 +5369,7 @@
 
             ctx.build(n.template);
             ctx.build(n.source);
-            ctx.writeLine(`$runtime.insertAfter(label, $parentElement);`);
+            ctx.writeLine(`$runtime.insertAfter($$label, $parentElement);`);
 
             ctx.indent--;
             ctx.writeLine('}');
@@ -5484,15 +5492,15 @@
                 ctx.write(missed, ',\n');
                 missed = '';
                 if(n.slot.source) {
-                    ctx.writeLine(`($cd, label) => {`);
+                    ctx.writeLine(`($cd, $$label) => {`);
                     ctx.goIndent(() => {
                         ctx.build(n.slot.template);
                         ctx.build(n.slot.source);
-                        ctx.writeLine(`$runtime.insertAfter(label, $parentElement);`);
+                        ctx.writeLine(`$runtime.insertAfter($$label, $parentElement);`);
                     });
                     ctx.write(true, `}`);
                 } else {
-                    ctx.write(true, `($cd, label) => $runtime.insertAfter(label, `);
+                    ctx.write(true, `($cd, $$label) => $runtime.insertAfter($$label, `);
                     ctx.build(n.slot.template);
                     ctx.write(`)\n`);
                 }
@@ -5883,7 +5891,7 @@
         return {event, fn};
     }
 
-    const version = '0.6.48';
+    const version = '0.6.52';
 
 
     async function compile(source, config = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "malinajs",
-  "version": "0.6.48",
+  "version": "0.6.52",
   "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) {