malinajs 0.7.16 → 0.7.18

package/malina.js

@@ -972,7 +972,21 @@
   function parseHTML(source) {
     const reader = new Reader(source);
 
-    const readScript = (reader) => {
+    const readScript = (reader, tag) => {
+      tag.type = 'script';
+
+      let isJS = true;
+      for (let a of tag.attributes) {
+        if (a.name == 'lang' || a.name == 'language' || a.name == 'type') {
+          isJS = a.value.indexOf('javascript') >= 0 || a.value.indexOf('ecmascript') >= 0;
+          tag.lang = a.value;
+          break;
+        }
+      }
+      tag.content = isJS ? readScriptJS(reader) : readScriptRaw();
+    };
+
+    const readScriptJS = (reader) => {
       class ScriptParser extends acorn__default["default"].Parser {
         readToken_lt_gt(code) {
           if (this.input.slice(this.pos, this.pos + 9) == '</script>') {
@@ -997,6 +1011,10 @@
       return reader.sub(start, end);
     };
 
+    const readScriptRaw = () => {
+      return reader.read(/^(.*?)<\/script>/s);
+    };
+
     const readStyle = () => {
       return reader.read(/^(.*?)<\/style>/s);
     };
@@ -1054,8 +1072,7 @@
           let tag = readTag(reader);
           push(tag);
           if(tag.name === 'script') {
-            tag.type = 'script';
-            tag.content = readScript(reader);
+            readScript(reader, tag);
             continue;
           } else if(tag.name === 'template') {
             tag.type = 'template';
@@ -5194,17 +5211,18 @@
         return;
       } else if(this.config.passClass && (name == 'class' || name.startsWith('class:'))) {
         let metaClass, args = name.split(':');
-        if(args.length == 1) {
+        if (args.length == 1) {
           metaClass = '$$main';
         } else {
           assert(args.length == 2);
           metaClass = args[1];
           assert(metaClass);
+          if (!value) value = metaClass;
         }
         assert(value);
         this.css.passingClass = true;
 
-        const parsed = this.parseText(prop.value);
+        const parsed = this.parseText(value);
         this.detectDependency(parsed);
         let exp = parsed.result;
         $class.push(`${metaClass}: $$resolveClass(${exp})`);
@@ -6887,7 +6905,7 @@
     });
   }
 
-  const version = '0.7.16';
+  const version = '0.7.18';
 
 
   async function compile(source, config = {}) {

package/package.json

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