@cilix/lightjs 0.0.10 → 0.0.12

package/core.js

@@ -771,7 +771,7 @@ module.exports = (config, fs, path) => {
       return acc;
     }
 
-    function parse_atom () {
+    function parse_atom (noacc) {
       let unop = tok.data;
       let expr = { pos: tok.pos, file: tok.file };
       if (accept('!') || accept('-')) {
@@ -814,6 +814,9 @@ module.exports = (config, fs, path) => {
       } else {
         unexpected();
       }
+      if (noacc) {
+        return expr;
+      }
       let acc = parse_acc();
       if (acc) {
         acc.unshift(expr);
@@ -990,12 +993,33 @@ 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')) {
+            console.log('YEAHHHHH')
+            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') {
@@ -1012,25 +1036,11 @@ module.exports = (config, fs, path) => {
             } else if (peek("string")) {
               attr[key] = parse_string();
             } else {
-              throw_error({
-                msg: "unexpected " + tok.type,
-                pos: tok.pos,
-                file: tok.file
-              });
+              attr[key] = parse_atom(true);
             }
           } 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;
         }
@@ -1297,7 +1307,13 @@ module.exports = (config, fs, path) => {
       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,

package/package.json

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