Merge 2b8fdd7 into f0e6cc7

tbranyen · Jun 13, 2016 · b2be64f · b2be64f
2 parents f0e6cc7 + 2b8fdd7
commit b2be64f
Show file tree

Hide file tree

Showing 35 changed files with 4,811 additions and 2,858 deletions.
diff --git a/dist/diffhtml-runtime.js b/dist/diffhtml-runtime.js
diff --git a/dist/diffhtml.js b/dist/diffhtml.js
diff --git a/lib/element/make.js b/lib/element/make.js
diff --git a/lib/errors.js b/lib/errors.js
diff --git a/lib/html.js b/lib/html.js
diff --git a/lib/index.js b/lib/index.js
@@ -1,20 +1,15 @@
-import patchNode from './node/patch';
-import releaseNode from './node/release';
-import makeNode from './node/make';
-import { TreeCache } from './node/tree';
-import { states } from './transitions';
+import createTransaction from './node/transaction';
+import { states as transitionStates } from './util/transitions';
 
-// Export the custom Error constructors so that instanceof checks can be made
-// by those publicly consuming this library.
-export { TransitionStateError, DOMException } from './errors';
-import { TransitionStateError, DOMException } from './errors';
+// Export the HTML tagged template helper util.
+export { html } from './util/tagged-template';
+import { html } from './util/tagged-template';
 
-// Export the HTML tagged template helper.
-export { html } from './html';
-import { html } from './html';
+// Export the DOM Node release method.
+export { default as release } from './node/release';
 
-// Export the VTree/Attribute helpers.
-export { createElement, createAttribute } from './util/transform';
+// Export the Virtual Tree Element/Attribute helpers.
+export { createElement, createAttribute } from './tree/helpers';
 
 /**
  * Used to diff the outerHTML contents of the passed element with the markup
@@ -27,7 +22,7 @@ export { createElement, createAttribute } from './util/transform';
  */
 export function outerHTML(element, markup='', options={}) {
   options.inner = false;
-  patchNode(element, markup, options);
+  createTransaction(element, markup, options);
 }
 
 /**
@@ -41,7 +36,7 @@ export function outerHTML(element, markup='', options={}) {
  */
 export function innerHTML(element, markup='', options={}) {
   options.inner = true;
-  patchNode(element, markup, options);
+  createTransaction(element, markup, options);
 }
 
 /**
@@ -54,17 +49,7 @@ export function innerHTML(element, markup='', options={}) {
  * @param options={}
  */
 export function element(element, newElement, options={}) {
-  patchNode(element, newElement, options);
-}
-
-/**
- * Releases the memory allocated to this element. Useful for cleaning up
- * components when removed in tests and applications.
- *
- * @param element
- */
-export function release(element) {
-  releaseNode(element);
+  createTransaction(element, newElement, options);
 }
 
 /**
@@ -93,19 +78,19 @@ export function release(element) {
  */
 export function addTransitionState(state, callback) {
   if (!state) {
-    throw new TransitionStateError('Missing transition state name');
+    throw new Error('Missing transition state name');
   }
 
   if (!callback) {
-    throw new TransitionStateError('Missing transition state callback');
+    throw new Error('Missing transition state callback');
   }
 
   // Not a valid state name.
-  if (Object.keys(states).indexOf(state) === -1) {
-    throw new TransitionStateError('Invalid state name: ' + state);
+  if (Object.keys(transitionStates).indexOf(state) === -1) {
+    throw new Error('Invalid state name: ' + state);
   }
 
-  states[state].push(callback);
+  transitionStates[state].push(callback);
 }
 
 /**
@@ -121,20 +106,20 @@ export function addTransitionState(state, callback) {
  */
 export function removeTransitionState(state, callback) {
   if (!callback && state) {
-    states[state].length = 0;
+    transitionStates[state].length = 0;
   }
   else if (state && callback) {
     // Not a valid state name.
-    if (Object.keys(states).indexOf(state) === -1) {
-      throw new TransitionStateError('Invalid state name ' + state);
+    if (Object.keys(transitionStates).indexOf(state) === -1) {
+      throw new Error('Invalid state name ' + state);
     }
 
-    let index = states[state].indexOf(callback);
-    states[state].splice(index, 1);
+    let index = transitionStates[state].indexOf(callback);
+    transitionStates[state].splice(index, 1);
   }
   else {
-    for (let state in states) {
-      states[state].length = 0;
+    for (let state in transitionStates) {
+      transitionStates[state].length = 0;
     }
   }
 }
@@ -153,14 +138,6 @@ export function enableProllyfill() {
     value: html
   });
 
-  // Exposes the `TransitionStateError` constructor globally so that developers
-  // can instanceof check exception errors.
-  Object.defineProperty(window, 'TransitionStateError', {
-    configurable: true,
-
-    value: TransitionStateError
-  });
-
   // Allows a developer to add transition state callbacks.
   Object.defineProperty(document, 'addTransitionState', {
     configurable: true,