@cilix/lightjs 0.0.13 → 0.0.15

package/core.js

@@ -397,7 +397,7 @@ module.exports = (config, fs, path) => {
       let in_expr = false;
       let pos = cursor;
       while (i < max) {
-        if (text[i] === "{" && text[i+1] === "{" && in_expr === false) {
+        if (text[i] === "{" && text[i+1] === "{" && in_expr === false && text[i-1] !== '\\') {
           in_expr = true;
           chunks.push({ type: "chunk", data: chunk, pos: pos, file: file });
           chunk = "{{";
@@ -589,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 === "'") {

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.13",
+  "version": "0.0.15",
   "description": "A new kind of JavaScript framework",
   "main": "index.js",
   "scripts": {