Makes the lifecycle methods eventemitters

goatslacker · May 8, 2015 · cf226f5 · cf226f5
1 parent 9bf17f0
commit cf226f5
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 30 deletions.
diff --git a/src/alt/index.js b/src/alt/index.js
@@ -136,9 +136,7 @@ class Alt {
       this,
       this.serialize(this[Sym.LAST_SNAPSHOT]),
       storeInst => {
-        if (storeInst[Sym.LIFECYCLE].rollback) {
-          storeInst[Sym.LIFECYCLE].rollback()
-        }
+        storeInst[Sym.LIFECYCLE].emit('rollback')
         storeInst.emitChange()
       }
     )
@@ -157,9 +155,7 @@ class Alt {
       this,
       this.serialize(initialSnapshot),
       (storeInst) => {
-        if (storeInst[Sym.LIFECYCLE].init) {
-          storeInst[Sym.LIFECYCLE].init()
-        }
+        storeInst[Sym.LIFECYCLE].emit('init')
         storeInst.emitChange()
       }
     )
@@ -173,9 +169,7 @@ class Alt {
 
   bootstrap(data) {
     StateFunctions.setAppState(this, data, (storeInst) => {
-      if (storeInst[Sym.LIFECYCLE].bootstrap) {
-        storeInst[Sym.LIFECYCLE].bootstrap()
-      }
+      storeInst[Sym.LIFECYCLE].emit('bootstrap')
       storeInst.emitChange()
     })
   }

diff --git a/src/alt/store/AltStore.js b/src/alt/store/AltStore.js
@@ -10,7 +10,7 @@ const EE = Symbol()
 class AltStore {
   constructor(alt, model, state, StoreModel) {
     this[EE] = new EventEmitter()
-    this[Sym.LIFECYCLE] = {}
+    this[Sym.LIFECYCLE] = model[Sym.LIFECYCLE]
     this[Sym.STATE_CONTAINER] = state || model
 
     this._storeName = model._storeName
@@ -20,23 +20,29 @@ class AltStore {
       this.StoreModel.state = assign({}, StoreModel.state)
     }
 
-    assign(this[Sym.LIFECYCLE], model[Sym.LIFECYCLE])
     assign(this, model[Sym.PUBLIC_METHODS])
 
     // Register dispatcher
     this.dispatchToken = alt.dispatcher.register((payload) => {
-      if (model[Sym.LIFECYCLE].beforeEach) {
-        model[Sym.LIFECYCLE].beforeEach(payload, this[Sym.STATE_CONTAINER])
-      }
+      this[Sym.LIFECYCLE].emit(
+        'beforeEach',
+        payload,
+        this[Sym.STATE_CONTAINER]
+      )
 
       if (model[Sym.LISTENERS][payload.action]) {
         let result = false
 
         try {
           result = model[Sym.LISTENERS][payload.action](payload.data)
         } catch (e) {
-          if (this[Sym.LIFECYCLE].error) {
-            this[Sym.LIFECYCLE].error(e, payload, this[Sym.STATE_CONTAINER])
+          if (model[Sym.HANDLING_ERRORS]) {
+            this[Sym.LIFECYCLE].emit(
+              'error',
+              e,
+              payload,
+              this[Sym.STATE_CONTAINER]
+            )
           } else {
             throw e
           }
@@ -47,14 +53,14 @@ class AltStore {
         }
       }
 
-      if (model[Sym.LIFECYCLE].afterEach) {
-        model[Sym.LIFECYCLE].afterEach(payload, this[Sym.STATE_CONTAINER])
-      }
+      this[Sym.LIFECYCLE].emit(
+        'afterEach',
+        payload,
+        this[Sym.STATE_CONTAINER]
+      )
     })
 
-    if (this[Sym.LIFECYCLE].init) {
-      this[Sym.LIFECYCLE].init()
-    }
+    this[Sym.LIFECYCLE].emit('init')
   }
 
   getEventEmitter() {
@@ -71,9 +77,7 @@ class AltStore {
   }
 
   unlisten(cb) {
-    if (this[Sym.LIFECYCLE].unlisten) {
-      this[Sym.LIFECYCLE].unlisten()
-    }
+    this[Sym.LIFECYCLE].emit('unlisten')
     this[EE].removeListener('change', cb)
   }
 

diff --git a/src/alt/store/StoreMixin.js b/src/alt/store/StoreMixin.js
@@ -34,7 +34,10 @@ const StoreMixin = {
   },
 
   on(lifecycleEvent, handler) {
-    this[Sym.LIFECYCLE][lifecycleEvent] = handler.bind(this)
+    if (lifecycleEvent === 'error') {
+      this[Sym.HANDLING_ERRORS] = true
+    }
+    this[Sym.LIFECYCLE].on(lifecycleEvent, handler.bind(this))
   },
 
   bindAction(symbol, handler) {

diff --git a/src/alt/store/index.js b/src/alt/store/index.js
@@ -1,4 +1,5 @@
 import assign from 'object-assign'
+import EventEmitter from 'eventemitter3'
 
 import * as Sym from '../symbols/symbols'
 import * as utils from '../utils/AltUtils'
@@ -29,7 +30,7 @@ function doSetState(store, storeInstance, state) {
 
 function createPrototype(proto, alt, key, extras) {
   proto[Sym.ALL_LISTENERS] = []
-  proto[Sym.LIFECYCLE] = {}
+  proto[Sym.LIFECYCLE] = new EventEmitter()
   proto[Sym.LISTENERS] = {}
   proto[Sym.PUBLIC_METHODS] = {}
 

diff --git a/src/alt/symbols/symbols.js b/src/alt/symbols/symbols.js
@@ -15,6 +15,9 @@ export const ACTION_UID = Symbol()
 // store all of a store's listeners
 export const ALL_LISTENERS = Symbol()
 
+// are we handling our own errors
+export const HANDLING_ERRORS = Symbol()
+
 // initial snapshot
 export const INIT_SNAPSHOT = Symbol()
 

diff --git a/src/alt/utils/StateFunctions.js b/src/alt/utils/StateFunctions.js
@@ -23,9 +23,7 @@ export function snapshot(instance, storeNames = []) {
     const storeName = storeHandle.displayName || storeHandle
     const store = instance.stores[storeName]
     const { config } = store.StoreModel
-    if (store[Sym.LIFECYCLE].snapshot) {
-      store[Sym.LIFECYCLE].snapshot()
-    }
+    store[Sym.LIFECYCLE].emit('snapshot')
     const customSnapshot = config.onSerialize &&
       config.onSerialize(store[Sym.STATE_CONTAINER])
     obj[storeName] = customSnapshot ? customSnapshot : store.getState()