split up generator

dist/moon.js

@@ -42,8 +42,6 @@
     }
   };
 
-  var mapReduce = function (arr, fn) { return arr.reduce(function (result, current) { return result + fn(current); }, ""); };
-
   var expressionRE = /"[^"]*"|'[^']*'|\d+[a-zA-Z$_]\w*|\.[a-zA-Z$_]\w*|[a-zA-Z$_]\w*:|([a-zA-Z$_]\w*)/g;
   var escapeRE = /(?:(?:&(?:amp|gt|lt|nbsp|quot);)|"|\\|\n)/g;
   var escapeMap = {
@@ -206,6 +204,8 @@
     return root;
   };
 
+  var mapReduce = function (arr, fn) { return arr.reduce(function (result, current) { return result + fn(current); }, ""); };
+
   var generateCreate = function (element) {
     switch (element.type) {
       case "m-fragment":
@@ -256,7 +256,7 @@
   };
 
   var generate = function (tree) {
-    return new Function(("return [function () {var m = this.m;" + (generateCreate(tree)) + "}, function (root) {var m = this.m;" + (generateMount(tree, "root")) + "}, function () {var m = this.m;" + (tree.dependencies.map(function (dependency) { return ("var " + dependency + " = this.data." + dependency + ";"); })) + (generateUpdate(tree)) + "}]"))();
+    return new Function(("return [function () {var m = this.m;" + (generateCreate(tree)) + "}, function (root) {var m = this.m;" + (generateMount(tree, "root")) + "}, function () {var m = this.m;" + (mapReduce(tree.dependencies, function (dependency) { return ("var " + dependency + " = this.data." + dependency + ";"); })) + (generateUpdate(tree)) + "}]"))();
   };
 
   var compile = function (input) {

src/compiler/compiler.js

@@ -1,5 +1,5 @@
 import { parse } from "./parser/parser";
-import { generate } from "./generator";
+import { generate } from "./generator/generator";
 
 export const compile = (input) => {
   return generate(parse(input));

src/compiler/generator/create.js

@@ -0,0 +1,17 @@
+import { mapReduce } from "./util";
+
+export const generateCreate = (element) => {
+  switch (element.type) {
+    case "m-fragment":
+      return mapReduce(element.children, generateCreate);
+      break;
+    case "m-expression":
+      return `m[${element.index}] = m.ct("");`;
+      break;
+    case "m-text":
+      return `m[${element.index}] = m.ct("${element.content}");`;
+      break;
+    default:
+      return `${mapReduce(element.children, generateCreate)}m[${element.index}] = m.ce("${element.type}");`;
+  }
+};

src/compiler/generator/generator.js

@@ -0,0 +1,8 @@
+import { mapReduce } from "./util";
+import { generateCreate } from "./create";
+import { generateMount } from "./mount";
+import { generateUpdate } from "./update";
+
+export const generate = (tree) => {
+  return new Function(`return [function () {var m = this.m;${generateCreate(tree)}}, function (root) {var m = this.m;${generateMount(tree, "root")}}, function () {var m = this.m;${mapReduce(tree.dependencies, (dependency) => `var ${dependency} = this.data.${dependency};`)}${generateUpdate(tree)}}]`)();
+};

src/compiler/generator/mount.js

@@ -0,0 +1,21 @@
+import { mapReduce } from "./util";
+
+export const generateMount = (element, parent) => {
+  let generatedMount = "";
+
+  switch (element.type) {
+    case "m-fragment":
+      return mapReduce(element.children, (child) => generateMount(child, parent));
+      break;
+    default:
+      const elementPath = `m[${element.index}]`;
+
+      if (element.type !== "m-text" && element.type !== "m-expression") {
+        generatedMount += mapReduce(element.children, (child) => generateMount(child, elementPath));
+      }
+
+      generatedMount += `m.ma(${elementPath}, ${parent});`;
+  }
+
+  return generatedMount;
+};

src/compiler/generator/update.js

@@ -0,0 +1,14 @@
+import { mapReduce } from "./util";
+
+export const generateUpdate = (element) => {
+  switch (element.type) {
+    case "m-expression":
+      return `m.ut(m[${element.index}], ${element.content});`;
+      break;
+    case "m-text":
+      return "";
+      break;
+    default:
+      return mapReduce(element.children, generateUpdate);
+  }
+};

src/compiler/generator/util.js

@@ -0,0 +1 @@
+export const mapReduce = (arr, fn) => arr.reduce((result, current) => result + fn(current), "");

src/util/util.js

@@ -5,5 +5,3 @@ export const error = (message) => {
     console.error("[Moon] ERROR: " + message);
   }
 };
-
-export const mapReduce = (arr, fn) => arr.reduce((result, current) => result + fn(current), "");