@cilix/lightjs 0.0.4 → 0.0.6

package/core.js

@@ -19,11 +19,9 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-const fs = require('fs');
-const path = require("path");
-
-module.exports = (config) => {
+module.exports = (config, fs, path) => {
   const _files = {};
+  let includeRuntime = false;
 
   function throw_error (err) {
     err.origin = 'light';
@@ -351,7 +349,9 @@ module.exports = (config) => {
       "let",
       "nosync",
       "as",
-      "global"
+      "global",
+      "when",
+      "catch"
     ];
 
     let symbols = [
@@ -661,10 +661,15 @@ module.exports = (config) => {
   const parse = (tokens) => {
     let tok = tokens[0];
     let cursor = 0;
-    let in_tag = false;
     let ast = { type: 'file', data: { file: tok.file }, children: [] };
     let parent = ast;
 
+    const parse_state = {
+      in_tag: false,
+      if_depth: 0,
+      each_depth: 0
+    };
+
     function ast_node(type, data) {
       let node = { type, data, children: [] };
       parent.children.push(node);
@@ -1014,6 +1019,7 @@ module.exports = (config) => {
             attr[key] = { type: "bool", data: true };
           }
         } else if (accept("on")) {
+          includeRuntime = true;
           expect(":");
           let handler;
           let evt = tok.data;
@@ -1030,9 +1036,9 @@ module.exports = (config) => {
     }
 
     function parse_custom_tag_body () {
-      in_tag = true;
+      parse_state.in_tag = true;
       parse_tag_list();
-      in_tag = false;
+      parse_state.in_tag = false;
     }
 
     function parse_tag() {
@@ -1084,6 +1090,7 @@ module.exports = (config) => {
     }
 
     function parse_if_statement() {
+      parse_state.if_depth++;
       expect("(");
       let condition = parse_expr();
       expect(")");
@@ -1112,13 +1119,68 @@ module.exports = (config) => {
         }
       }
       parent = current;
+      parse_state.if_depth--;
     }
 
-    const parse_tag_list = () => {
+    function parse_when_statement() {
+      if (parse_state.each_depth > 0) {
+        throw_error({
+          msg: 'when cannot be nested in each',
+          pos: tok.pos,
+          file: tok.file
+        });
+      }
+      if (parse_state.if_depth > 0) {
+        throw_error({
+          msg: 'when cannot be nested in if',
+          pos: tok.pos,
+          file: tok.file
+        });
+      }
+      expect("(");
+      let condition = parse_expr();
+      expect(")");
+      let current = parent;
+      let node = ast_node('when', condition);
+      parent = node;
+      let pass = ast_node('block');
+      parent = pass;
+      if (accept("[")) {
+        parse_tag_list();
+        expect("]");
+      } else {
+        parse_tag();
+      }
+      expect("else");
+      parent = node;
+      let fail = ast_node('block');
+      parent = fail;
+      if (accept("[")) {
+        parse_tag_list();
+        expect("]");
+      } else {
+        parse_tag();
+      }
+      parent = current;
+      expect("catch");
+      parent = node;
+      let catchBlock = ast_node('block');
+      parent = catchBlock;
+      if (accept("[")) {
+        parse_tag_list();
+        expect("]");
+      } else {
+        parse_tag();
+      }
+      parent = current;
+    }
+
+    function parse_tag_list() {
       if (accept("if")) {
         parse_if_statement();
         parse_tag_list();
       } else if (accept("each")) {
+        parse_state.each_depth++;
         expect("(");
         let it1, it0 = tok.data;
         expect("ident");
@@ -1142,6 +1204,10 @@ module.exports = (config) => {
           parse_tag();
         }
         parent = current;
+        parse_state.each_depth--;
+        parse_tag_list();
+      } else if (accept("when")) {
+        parse_when_statement();
         parse_tag_list();
       } else if (peek("ident")) {
         parse_tag();
@@ -1154,10 +1220,11 @@ module.exports = (config) => {
         ast_node('yield', { pos: tok.pos, file: tok.file });
         next();
         parse_tag_list();
-      } else if (in_tag && (peek('global') || peek('const') || peek('let'))) {
+      } else if (parse_state.in_tag && (peek('global') || peek('const') || peek('let'))) {
         parse_assignment();
         parse_tag_list();
-      } else if (in_tag && peek('js_context')) {
+      } else if (parse_state.in_tag && peek('js_context')) {
+        includeRuntime = true;
         parent.js = tok.data;
         ast_node('js', { js: tok.data, pos: tok.pos, file: tok.file });
         next();
@@ -1296,6 +1363,7 @@ module.exports = (config) => {
         } 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 });
           js_found = true;
           next();
@@ -1320,7 +1388,7 @@ module.exports = (config) => {
     let inScript = false;
     let inStyle = false;
 
-    const found = { head: false, head: false, body: false };
+    const found = { head: false, html: false, body: false };
 
     const emit = flush ? (txt) => {
       if (html.length > 100) {
@@ -1432,7 +1500,6 @@ module.exports = (config) => {
             ctx.pop();
             break;
           }
-          // todo: html -> head, body enforcement
           if (valid_tags.indexOf(node.data.name) === -1) {
             err(`Invalid tag: ${node.data.name}`, node.data);
           }
@@ -1447,9 +1514,11 @@ module.exports = (config) => {
           }
           emit('<');
           emit(node.data.name);
+          let innerText = null;
           for (let a in attr) {
             let val = evaluate(attr[a]);
             const t = getType(val);
+            if (a === 'innerHTML') innerText = val;
             if (val !== false || a === 'innerHTML') {
               emit(' ');
               emit(a.replace('bind:', ''));
@@ -1473,11 +1542,13 @@ module.exports = (config) => {
           emit('>');
           if (void_tags.indexOf(node.data.name) === -1) {
             if (node.data.name === 'html') {
+              if (innerText) err('cannot set innerHTML of html tag');
               if (found.html) err('html tag may only be used once', node.data);
               found.html = true;
             } else if (!found.html) {
               err('html tag must be the first tag printed', node.data);
             } else if (node.data.name === 'head') {
+              if (innerText) err('cannot set innerHTML of head tag');
               if (found.head) err('head tag may only be used once', node.data);
               found.head = true;
             } else if (node.data.name === 'body') {
@@ -1485,23 +1556,27 @@ module.exports = (config) => {
               if (found.body) err('body tag may only be used once', node.data);
               found.body = true;
             }
-            node.children.forEach(walk);
-            if (node.data.name === 'head') {
-              if (js) {
-                emit('<script>(function (data) {');
-                emit(js);
-                emit('})(');
-                emit(JSON.stringify(initial_state));
-                emit(');<' + '/' + 'script>');
-              } else {
-                const rt = `(function (data){${js}})(${JSON.stringify(initial_state)})`;
-                emit('<script>' + rt + '<' + '/script>');
+            if (innerText) {
+              emit(innerText);
+              emit('</');
+              emit(node.data.name);
+              emit('>');
+            } else {
+              node.children.forEach(walk);
+              if (node.data.name === 'head') {
+                if (includeRuntime) {
+                  emit('<script>');
+                  emit(`document.addEventListener('DOMContentLoaded', function () {\n`);
+                  emit(`(function (data){${js}})(${JSON.stringify(initial_state)})`);
+                  emit('});');
+                  emit('<' + '/script>');
+                }
               }
+              emit('</');
+              emit(node.data.name);
+              emit('>');
+              inScript = false;
             }
-            emit('</');
-            emit(node.data.name);
-            emit('>');
-            inScript = false;
           }
         } break;
         case 'if': {
@@ -1520,14 +1595,14 @@ module.exports = (config) => {
           if (t === 'array' || t === 'string') {
             for (let i = 0; i < val.length; i++) {
               s[it[0]] = val[i];
-              s[it[1]] = i;
+              if (it[1]) s[it[1]] = i;
               node.children.forEach(walk);
             }
           } else if (t === 'object') {
             const keys = Object.keys(val);
             for (let i = 0; i < keys.length; i++) {
               s[it[0]] = keys[i];
-              s[it[1]] = val[keys[i]];
+              if (it[1]) s[it[1]] = val[keys[i]];
               node.children.forEach(walk);
             }
           } else {
@@ -1804,7 +1879,7 @@ module.exports = (config) => {
               if (t === 'object' || t === 'null' || t === 'array') {
                 stack.push(JSON.stringify(val));
               } else {
-                stack.push(e.toString());
+                stack.push(val.toString());
               }
             } break;
             case 'join': {
@@ -2183,7 +2258,7 @@ module.exports = (config) => {
       out[out.length - 1].code += txt;
       if (fileIdx > -1) {
         const n = fileList[fileIdx].name;
-        out[out.length - 1].parent_dir = getPathInfo(n).parent;
+        out[out.length - 1].parent_dir = path ? getPathInfo(n).parent : '/';
       }
     };
 
@@ -2631,7 +2706,8 @@ module.exports = (config) => {
 
     createFileList(ast);
 
-    emit(`document.addEventListener('DOMContentLoaded', function () {\n`);
+    // emit(`document.addEventListener('DOMContentLoaded', function () {\n`);
+    emit('(function () {')
     emit(`${light_runtime}`);
     emit('var $sync = function () {};\n');
     for (let g in globals) {
@@ -2675,33 +2751,35 @@ module.exports = (config) => {
     });
 
     emit('$sync();\n');
-    emit('});\n');
+    // emit('});\n');
+    emit('})();\n');
 
     return out;
   };
 
-  const renderToAst = async (file, actions) => {
-    const fileText = openFile(file);
+  const renderToAst = async (file, actions, _fileText) => {
+    const fileText = file === 'default' ? _fileText : openFile(file);
     const tokens = tokenize(fileText, file);
     const ast = parse(tokens);
-    const runtime = generateRuntime(ast, actions);
-    let js;
-
-    if (config.jsTransform) {
-      js = (await Promise.all(runtime.map(async (chunk) => {
-        if (chunk.transform) {
-          return await config.jsTransform(chunk);
-        }
-        return chunk.code;
-      }))).join('\n');
-    } else {
-      js = runtime.map((chunk) => chunk.code).join('\n');
-    }
+    let js = '';
+    if (includeRuntime) {
+      const runtime = generateRuntime(ast, actions);
+
+      if (config.jsTransform) {
+        js = (await Promise.all(runtime.map(async (chunk) => {
+          if (chunk.transform) {
+            return await config.jsTransform(chunk);
+          }
+          return chunk.code;
+        }))).join('\n');
+      } else {
+        js = runtime.map((chunk) => chunk.code).join('\n');
+      }
 
-    if (config.jsPostProcess) {
-      js = await config.jsPostProcess(js);
+      if (config.jsPostProcess) {
+        js = await config.jsPostProcess(js);
+      }
     }
-
     return { ast, js };
   };
 
@@ -2720,11 +2798,19 @@ module.exports = (config) => {
     return html;
   };
 
+  const renderString = async (fileText, data) => {
+    _files.default = fileText;
+    const result = await renderToAst('default', [], fileText);
+    const html = renderToHTML(result, data);
+
+    return html;
+  };
+
   const renderToCache = async (file, actions) => {
     const result = await renderToAst(file, actions);
     return JSON.stringify(result);
   };
 
-  return { render, renderToCache, renderToHTML, printError };
+  return { render, renderString, renderToCache, renderToHTML, printError };
 };
 

package/index.js

@@ -108,7 +108,7 @@ Light.compile = async (name, opts) => {
       });
       return result.outputFiles[0].text;
     }
-  });
+  }, fs, path);
   try {
     let html;
     if (opts.cache) {

package/package.json

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