@cilix/lightjs 0.0.5 → 0.0.7

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;
 
   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--;
+    }
+
+    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;
     }
 
-    const parse_tag_list = () => {
+    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);
           }
@@ -1497,11 +1564,13 @@ module.exports = (config) => {
             } else {
               node.children.forEach(walk);
               if (node.data.name === 'head') {
-                emit('<script>');
-                emit(`document.addEventListener('DOMContentLoaded', function () {\n`);
-                emit(`(function (data){${js}})(${JSON.stringify(initial_state)})`);
-                emit('});');
-                emit('<' + '/script>');
+                if (js) {
+                  emit('<script type="module">');
+                  emit(`document.addEventListener('DOMContentLoaded', function () {\n`);
+                  emit(`(function (data){${js}})(${JSON.stringify(initial_state)})`);
+                  emit('});');
+                  emit('<' + '/script>');
+                }
               }
               emit('</');
               emit(node.data.name);
@@ -2189,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 : '/';
       }
     };
 
@@ -2688,28 +2757,30 @@ module.exports = (config) => {
     return out;
   };
 
-  const renderToAst = async (file, actions) => {
-    const fileText = openFile(file);
+  const renderToAst = async (file, actions, _fileText) => {
+    includeRuntime = false;
+    const fileText = file === 'default' ? _fileText : openFile(file);
     const tokens = tokenize(fileText, file);
     const ast = parse(tokens);
-    const runtime = generateRuntime(ast, actions);
     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.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 };
   };
 
@@ -2728,11 +2799,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

@@ -53,6 +53,14 @@ const addParentPaths = (code, p) => {
   return out;
 };
 
+const hideDynamicImports = (code) => {
+  return code.split('import(').join('__IMPORT_PLACEHOLDER__(');
+};
+
+const restoreDynamicImports = (code) => {
+  return code.split('__IMPORT_PLACEHOLDER__(').join('import(');
+};
+
 const esbuild_to_light_error = (e, chunk) => {
   let row = e.location.line - 1;
   let col = e.location.column;
@@ -88,7 +96,8 @@ Light.compile = async (name, opts) => {
     jsTransform: async (chunk) => {
       try {
         const opts = { format: 'cjs', loader: 'ts' };
-        const result = await esbuild.transform(chunk.code, opts);
+        const codeChunk = hideDynamicImports(chunk.code);
+        const result = await esbuild.transform(codeChunk, opts);
         return addParentPaths(result.code, chunk.parent_dir);
       } catch (e) {
         e.origin = 'esbuild';
@@ -106,9 +115,10 @@ Light.compile = async (name, opts) => {
         minify: opts.minify,
         write: false
       });
-      return result.outputFiles[0].text;
+      const output = restoreDynamicImports(result.outputFiles[0].text);
+      return output;
     }
-  });
+  }, fs, path);
   try {
     let html;
     if (opts.cache) {

package/package.json

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