@cilix/lightjs 0.0.11 → 0.0.13

package/core.js

@@ -385,8 +385,6 @@ module.exports = (config, fs, path) => {
       return c == '\n' || c == '\r'
     }
 
-    // amazing
-    // https://stackoverflow.com/a/32567789
     function is_letter (c) {
       return c.toLowerCase() != c.toUpperCase();
     }
@@ -706,8 +704,9 @@ module.exports = (config, fs, path) => {
       return false;
     }
 
-    function peek(t) {
-      if (tok.type === t) {
+    function peek(t, forward) {
+      const tk = forward ? tokens[cursor + forward] : tok;
+      if (tk.type === t) {
         return true;
       }
       return false;
@@ -993,12 +992,32 @@ module.exports = (config, fs, path) => {
       };
     }
 
+    function isEventHandler(ident) {
+      const c = ident[2];
+      return ident.indexOf('on') === 0 && c.length === 1 && c === c.toUpperCase() && c !== c.toLowerCase();
+    }
+
     function parse_attributes() {
       let attr = {};
       let events = [];
       while (true) {
         let key = tok.data;
-        if (accept("ident") || accept("as")) {
+        if (peek("on") || (peek('ident') && isEventHandler(tok.data))) {
+          includeRuntime = true;
+          let handler;
+          let evt;
+          if (accept('on')) {
+            expect(":");
+            evt = tok.data;
+          } else {
+            evt = tok.data.replace('on', '').toLowerCase();
+          }
+          expect("ident");
+          expect("=");
+          handler = parse_strict_string();
+          let nosync = accept('nosync');
+          events.push({ type: evt, handler: handler, sync: !nosync });
+        } else if (accept("ident") || accept("as")) {
           // allow ':' in attribute names
           while (accept(':')) {
             if (key === 'bind') {
@@ -1020,16 +1039,6 @@ module.exports = (config, fs, path) => {
           } else {
             attr[key] = { type: "bool", data: true };
           }
-        } else if (accept("on")) {
-          includeRuntime = true;
-          expect(":");
-          let handler;
-          let evt = tok.data;
-          expect("ident");
-          expect("=");
-          handler = parse_strict_string();
-          let nosync = accept('nosync');
-          events.push({ type: evt, handler: handler, sync: !nosync });
         } else {
           break;
         }
@@ -1177,6 +1186,10 @@ module.exports = (config, fs, path) => {
       parent = current;
     }
 
+    function isAssignment() {
+      return peek('let') || (peek('ident') && peek(':', 1));
+    }
+
     function parse_tag_list() {
       if (accept("if")) {
         parse_if_statement();
@@ -1211,6 +1224,9 @@ module.exports = (config, fs, path) => {
       } else if (accept("when")) {
         parse_when_statement();
         parse_tag_list();
+      } else if (parse_state.in_tag && isAssignment()) {
+        parse_assignment();
+        parse_tag_list();
       } else if (peek("ident")) {
         parse_tag();
         parse_tag_list();
@@ -1222,9 +1238,6 @@ module.exports = (config, fs, path) => {
         ast_node('yield', { pos: tok.pos, file: tok.file });
         next();
         parse_tag_list();
-      } else if (parse_state.in_tag && (peek('global') || peek('const') || peek('let'))) {
-        parse_assignment();
-        parse_tag_list();
       } else if (parse_state.in_tag && peek('js_context')) {
         includeRuntime = true;
         parent.js = tok.data;
@@ -1293,10 +1306,18 @@ module.exports = (config, fs, path) => {
 
     function parse_assignment () {
       const global = tok.data === 'global';
-      next();
+      if (peek('global') || peek('let')) {
+        next();
+      }
       let dst = { data: tok.data, pos: tok.pos, file: tok.file };
       expect('ident');
-      accept("=");
+      if (!accept("=") && !accept(':')) {
+        throw_error({
+          msg: 'expected assignment',
+          pos: tok.pos,
+          file: tok.file
+        });
+      }
       let val = parse_rhs();
       ast_node('set', {
         global,
@@ -1358,12 +1379,12 @@ module.exports = (config, fs, path) => {
             pos: pos,
             file: file
           });
+        } else if (isAssignment() || peek('global')) {
+          parse_assignment();
         } else if (tok.type === "ident") {
           parse_tag_list();
         } else if (peek("tag")) {
           parse_custom_tag();
-        } else if (peek('const') || peek('let') || peek('global')) {
-          parse_assignment();
         } else if (peek('js_context')) {
           includeRuntime = true;
           ast_node('js', { js: tok.data, pos: tok.pos, file: tok.file });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cilix/lightjs",
-  "version": "0.0.11",
+  "version": "0.0.13",
   "description": "A new kind of JavaScript framework",
   "main": "index.js",
   "scripts": {