@cilix/lightjs 0.0.4 → 0.0.5

package/core.js

@@ -1447,9 +1447,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 +1475,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 +1489,25 @@ 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') {
+                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 +1526,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 +1810,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': {
@@ -2631,7 +2637,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,7 +2682,8 @@ module.exports = (config) => {
     });
 
     emit('$sync();\n');
-    emit('});\n');
+    // emit('});\n');
+    emit('})();\n');
 
     return out;
   };

package/package.json

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