consistent modules

packages/moon/dist/moon.js

@@ -22,19 +22,21 @@
 	 * should be fast, pure, functions that are cheap to call and easy to optimize
 	 * through caching and memoization.
 	 */
+	function driver(data) {
+		return {
+			input: function input() {
+				// Return the stored data as input.
+				return data;
+			},
+			output: function output(dataNew) {
+				// Update the stored data when it is an output.
+				data = dataNew;
+			}
+		};
+	}
+
 	var data = {
-		driver: function driver(data) {
-			return {
-				input: function input() {
-					// Return the stored data as input.
-					return data;
-				},
-				output: function output(dataNew) {
-					// Update the stored data when it is an output.
-					data = dataNew;
-				}
-			};
-		}
+		driver: driver
 	};
 
 	/**
@@ -144,41 +146,29 @@
 		}
 	}
 
-	/**
-	 * Cache for default property values
-	 */
-	var removeDataPropertyCache = {};
 	/**
 	 * Old Node Constructor
 	 */
-
 	function NodeOld(node, element, children) {
 		this.node = node;
 		this.element = element;
 		this.children = children;
 	}
+
 	/**
 	 * New Node Constructor
 	 */
-
 	function NodeNew(type, name, data, children) {
 		this.type = type;
 		this.name = name;
 		this.data = data;
 		this.children = children;
 	}
+
 	/**
-	 * Returns a new node.
-	 *
-	 * @param {number} type
-	 * @param {string} name
-	 * @param {Object} data
-	 * @param {Array} children
+	 * Cache for default property values
 	 */
-
-	function m(type, name, data, children) {
-		return new NodeNew(type, name, data, children);
-	}
+	var removeDataPropertyCache = {};
 	/**
 	 * Update an ariaset, dataset, or style property.
 	 *
@@ -490,37 +480,52 @@
 	 */
 
 
+	function driver$1(root) {
+		// Accept query strings as well as DOM elements.
+		if (typeof root === "string") {
+			root = document.querySelector(root);
+		} // Capture old data from the root element's attributes.
+
+
+		var rootAttributes = root.attributes;
+		var dataOld = {};
+
+		for (var i = 0; i < rootAttributes.length; i++) {
+			var rootAttribute = rootAttributes[i];
+			dataOld[rootAttribute.name] = rootAttribute.value;
+		} // Create an old node from the root element.
+
+
+		var viewOld = new NodeOld(new NodeNew(types.element, root.tagName.toLowerCase(), dataOld, []), root, []);
+		return {
+			input: function input() {
+				// Return the current event data as input.
+				return viewEvent;
+			},
+			output: function output(viewNew) {
+				// When given a new view, patch the old view into the new one,
+				// updating the DOM in the process.
+				viewPatch(viewOld, viewNew);
+			}
+		};
+	}
+
+	/**
+	 * Returns a new node.
+	 *
+	 * @param {number} type
+	 * @param {string} name
+	 * @param {Object} data
+	 * @param {Array} children
+	 */
+
+	function m(type, name, data, children) {
+		return new NodeNew(type, name, data, children);
+	}
+
 	var view = {
-		m: m,
-		driver: function driver(root) {
-			// Accept query strings as well as DOM elements.
-			if (typeof root === "string") {
-				root = document.querySelector(root);
-			} // Capture old data from the root element's attributes.
-
-
-			var rootAttributes = root.attributes;
-			var dataOld = {};
-
-			for (var i = 0; i < rootAttributes.length; i++) {
-				var rootAttribute = rootAttributes[i];
-				dataOld[rootAttribute.name] = rootAttribute.value;
-			} // Create an old node from the root element.
-
-
-			var viewOld = new NodeOld(new NodeNew(types.element, root.tagName.toLowerCase(), dataOld, []), root, []);
-			return {
-				input: function input() {
-					// Return the current event data as input.
-					return viewEvent;
-				},
-				output: function output(viewNew) {
-					// When given a new view, patch the old view into the new one,
-					// updating the DOM in the process.
-					viewPatch(viewOld, viewNew);
-				}
-			};
-		}
+		driver: driver$1,
+		m: m
 	};
 
 	var index = {

packages/moon/src/data/data.js → packages/moon/src/data/driver.js

@@ -7,17 +7,15 @@
  * should be fast, pure, functions that are cheap to call and easy to optimize
  * through caching and memoization.
  */
-export default {
-	driver(data) {
-		return {
-			input() {
-				// Return the stored data as input.
-				return data;
-			},
-			output(dataNew) {
-				// Update the stored data when it is an output.
-				data = dataNew;
-			}
-		};
-	}
-};
+export default function driver(data) {
+	return {
+		input() {
+			// Return the stored data as input.
+			return data;
+		},
+		output(dataNew) {
+			// Update the stored data when it is an output.
+			data = dataNew;
+		}
+	};
+}

packages/moon/src/data/index.js

@@ -0,0 +1,5 @@
+import driver from "moon/src/data/driver";
+
+export default {
+	driver
+};

packages/moon/src/index.js

@@ -1,5 +1,5 @@
-import data from "moon/src/data/data";
-import view from "moon/src/view/view";
+import data from "moon/src/data/index";
+import view from "moon/src/view/index";
 import { use } from "moon/src/use";
 import run from "moon/src/run";
 

packages/moon/src/view/NodeNew.js

@@ -0,0 +1,9 @@
+/**
+ * New Node Constructor
+ */
+export default function NodeNew(type, name, data, children) {
+	this.type = type;
+	this.name = name;
+	this.data = data;
+	this.children = children;
+}

packages/moon/src/view/NodeOld.js

@@ -0,0 +1,8 @@
+/**
+ * Old Node Constructor
+ */
+export default function NodeOld(node, element, children) {
+	this.node = node;
+	this.element = element;
+	this.children = children;
+}

packages/moon/src/view/view.js → packages/moon/src/view/driver.js

@@ -1,5 +1,7 @@
 import run from "moon/src/run";
-import { m, NodeNew, NodeOld, removeDataProperty, removeDataSet, updateDataSet } from "moon/src/view/util/util";
+import NodeOld from "moon/src/view/NodeOld";
+import NodeNew from "moon/src/view/NodeNew";
+import { removeDataProperty, removeDataSet, updateDataSet } from "moon/src/view/util";
 import { types } from "util/util";
 
 /**
@@ -266,45 +268,42 @@ function viewPatch(nodeOld, nodeNew) {
  * JavaScript engines, and immutability opens up the opportunity to use
  * standard functional techniques for caching.
  */
-export default {
-	m,
-	driver(root) {
-		// Accept query strings as well as DOM elements.
-		if (typeof root === "string") {
-			root = document.querySelector(root);
-		}
+export default function driver(root) {
+	// Accept query strings as well as DOM elements.
+	if (typeof root === "string") {
+		root = document.querySelector(root);
+	}
 
-		// Capture old data from the root element's attributes.
-		const rootAttributes = root.attributes;
-		const dataOld = {};
+	// Capture old data from the root element's attributes.
+	const rootAttributes = root.attributes;
+	const dataOld = {};
 
-		for (let i = 0; i < rootAttributes.length; i++) {
-			const rootAttribute = rootAttributes[i];
-			dataOld[rootAttribute.name] = rootAttribute.value;
-		}
+	for (let i = 0; i < rootAttributes.length; i++) {
+		const rootAttribute = rootAttributes[i];
+		dataOld[rootAttribute.name] = rootAttribute.value;
+	}
 
-		// Create an old node from the root element.
-		const viewOld = new NodeOld(
-			new NodeNew(
-				types.element,
-				root.tagName.toLowerCase(),
-				dataOld,
-				[]
-			),
-			root,
+	// Create an old node from the root element.
+	const viewOld = new NodeOld(
+		new NodeNew(
+			types.element,
+			root.tagName.toLowerCase(),
+			dataOld,
 			[]
-		);
-
-		return {
-			input() {
-				// Return the current event data as input.
-				return viewEvent;
-			},
-			output(viewNew) {
-				// When given a new view, patch the old view into the new one,
-				// updating the DOM in the process.
-				viewPatch(viewOld, viewNew);
-			}
-		};
-	}
-};
+		),
+		root,
+		[]
+	);
+
+	return {
+		input() {
+			// Return the current event data as input.
+			return viewEvent;
+		},
+		output(viewNew) {
+			// When given a new view, patch the old view into the new one,
+			// updating the DOM in the process.
+			viewPatch(viewOld, viewNew);
+		}
+	};
+}

packages/moon/src/view/index.js

@@ -0,0 +1,7 @@
+import driver from "moon/src/view/driver";
+import m from "moon/src/view/m";
+
+export default {
+	driver,
+	m
+};

packages/moon/src/view/m.js

@@ -0,0 +1,13 @@
+import NodeNew from "moon/src/view/NodeNew";
+
+/**
+ * Returns a new node.
+ *
+ * @param {number} type
+ * @param {string} name
+ * @param {Object} data
+ * @param {Array} children
+ */
+export default function m(type, name, data, children) {
+	return new NodeNew(type, name, data, children);
+}

packages/moon/src/view/util/util.js → packages/moon/src/view/util.js

@@ -3,37 +3,6 @@
  */
 const removeDataPropertyCache = {};
 
-/**
- * Old Node Constructor
- */
-export function NodeOld(node, element, children) {
-	this.node = node;
-	this.element = element;
-	this.children = children;
-}
-
-/**
- * New Node Constructor
- */
-export function NodeNew(type, name, data, children) {
-	this.type = type;
-	this.name = name;
-	this.data = data;
-	this.children = children;
-}
-
-/**
- * Returns a new node.
- *
- * @param {number} type
- * @param {string} name
- * @param {Object} data
- * @param {Array} children
- */
-export function m(type, name, data, children) {
-	return new NodeNew(type, name, data, children);
-}
-
 /**
  * Update an ariaset, dataset, or style property.
  *