malinajs 0.7.8 → 0.7.10

package/malina.js

@@ -139,7 +139,7 @@
 
 
   const extractKeywords = (exp) => {
-    let ast = acorn.parse(exp, { sourceType: 'module', ecmaVersion: 12, ecmaVersion: 'latest' });
+    let ast = acorn.parse(exp, { sourceType: 'module', ecmaVersion: 'latest' });
 
     const keys = new Set();
     const rec = (n) => {
@@ -963,48 +963,28 @@
     const reader = new Reader(source);
 
     const readScript = (reader) => {
-      const start = reader.index;
-
-      const readRegExp = () => {
-        assert(reader.read() == '/');
-        let a, p, q;
-        while(true) {
-          p = a;
-          a = reader.read();
-          if(q) {
-            if(a != q) continue;
-            if(p == '\\') continue;
-            q = null;
-            continue;
+      class ScriptParser extends acorn.Parser {
+        readToken_lt_gt(code) {
+          if (this.input.slice(this.pos, this.pos + 9) == '</script>') {
+            return this.finishToken(acorn.tokTypes.eof);
           }
-          if(a == '[' && p != '\\') q = ']';
-          if(a == '/' && p != '\\') return;
+          return super.readToken_lt_gt(code);
         }
-      };
 
-      while(true) {
-        if(reader.probeQuote()) {
-          reader.readString();
-          continue;
-        }
-        if(reader.probe('/')) {
-          if(reader.readIf('//')) {
-            while(reader.read() != '\n');
-            continue;
-          }
-          if(reader.readIf('/*')) {
-            while(true) {
-              if(reader.read() == '*' && reader.readIf('/')) break;
-            }
-            continue;
+        scan() {
+          this.nextToken();
+          while (this.type !== acorn.tokTypes.eof) {
+            this.parseStatement(null, true, null);
           }
-          readRegExp();
-          continue;
+          return this.end;
         }
-        if(reader.readIf('</script>')) {
-          return reader.sub(start, reader.index - 9);
-        } else reader.read();
       }
+
+      let start = reader.index;
+      let parser = new ScriptParser({ ecmaVersion: 'latest', sourceType: 'module' }, reader.source, start);
+      let end = parser.scan();
+      reader.index = end + 9;
+      return reader.sub(start, end);
     };
 
     const readStyle = () => {
@@ -4982,8 +4962,9 @@
 
     this.require('$context');
 
+    let deepChecking = this.config.deepCheckingProps;
     let reference = null;
-    let propsFn = [], propsSetter = [], $class = [], staticProps = true, deepChecking = false;
+    let propsFn = [], propsSetter = [], $class = [], staticProps = true;
     let slotBlocks = [];
     let anchorBlocks = [];
 
@@ -5134,6 +5115,12 @@
         let inner, outer;
         if(name[0] == ':') inner = name.substring(1);
         else inner = name.substring(5);
+        let mods = inner.split('|');
+        inner = mods.shift();
+        mods.forEach(mod => {
+          if (mod == 'deep') deepChecking = true;
+          else throw new Error('Wrong modifier: ' + mod);
+        });
         if(value) outer = unwrapExp(value);
         else outer = inner;
         assert(isSimpleName(inner), `Wrong property: '${inner}'`);
@@ -6865,7 +6852,7 @@
     });
   }
 
-  const version = '0.7.8';
+  const version = '0.7.10';
 
 
   async function compile(source, config = {}) {
@@ -6884,6 +6871,7 @@
       css: true,
       passClass: true,
       immutable: false,
+      deepCheckingProps: false,
       useGroupReferencing: true
     }, config);
 

package/package.json

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