@cilix/lightjs 0.0.12 → 0.0.14

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();
     }
@@ -591,8 +589,21 @@ module.exports = (config, fs, path) => {
           });
         }
         text = lines.join('\n');
+        /* TODO - error reporting within an interpolation is
+         * bad (incorrect token position) due to newline magic above */
+        tokens.push({ type: 'string', pos: offs + cursor, file: file });
+        let chunks = break_into_chunks(text, cursor);
+        if (chunks.length > 1) {
+          chunks.forEach(function(c) {
+            tokens.push(c);
+          });
+        } else {
+          tokens.push({ type: 'chunk', data: text, pos: offs + cursor, file: file })
+        }
+        /*
         tokens.push({ type: 'string', pos: offs + cursor, file: file });
         tokens.push({ type: 'chunk', data: text, pos: offs + cursor, file: file })
+        */
         cursor = i;
         continue;
       } else if (c === '"' || c === "'") {
@@ -706,8 +717,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;
@@ -1008,7 +1020,6 @@ module.exports = (config, fs, path) => {
           let handler;
           let evt;
           if (accept('on')) {
-            console.log('YEAHHHHH')
             expect(":");
             evt = tok.data;
           } else {
@@ -1188,6 +1199,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();
@@ -1222,6 +1237,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();
@@ -1233,9 +1251,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;
@@ -1304,7 +1319,9 @@ 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');
       if (!accept("=") && !accept(':')) {
@@ -1375,12 +1392,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/index.js

@@ -236,7 +236,14 @@ function matchRoute (istr, mstr) {
     if (last[last.length - 1] !== '*') {
       return null;
     }
-  } else if (p0.length !== p1.length) return null;
+  } else if (p0.length === p1.length - 1) {
+    const last = p1[p1.length - 1];
+    if (last[last.length - 1] !== '?') {
+      return null;
+    }
+  } else if (p0.length !== p1.length) {
+    return null;
+  }
   for (let i = 0; i < p1.length; i++) {
     const p = p1[i];
     if (p[0] !== ':') {
@@ -249,7 +256,13 @@ function matchRoute (istr, mstr) {
         out[p.slice(1, -1)] += `/${p0[j]}`;
       }
     } else {
-      out[p.slice(1)] = p0[i];
+      if (p[p.length - 1] === '?') {
+        if (p0[i]) {
+          out[p.slice(1, -1)] = p0[i];
+        }
+      } else {
+        out[p.slice(1)] = p0[i];
+      }
     }
   }
   return out;
@@ -329,6 +342,7 @@ Light.router = function (opts) {
     if (!matchedRoute) {
       if (next) {
         next();
+        return;
       } else {
         res.writeHead(404, { 'Content-type': 'text/html; charset=utf-8' });
         res.end('<h1>404 - Not Found</h1>');

package/package.json

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