Makes the lifecycle methods eventemitters

goatslacker · May 5, 2015 · 255509e · 255509e
1 parent 86db9a5
commit 255509e
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 31 deletions.
diff --git a/src/alt/AltStore.js b/src/alt/AltStore.js
@@ -5,6 +5,7 @@ import * as Sym from './symbols/symbols'
 
 const {
   ALL_LISTENERS,
+  HANDLING_ERRORS,
   LIFECYCLE,
   LISTENERS,
   PUBLIC_METHODS,
@@ -17,7 +18,7 @@ const EE = Symbol()
 export default class AltStore {
   constructor(alt, model, state, StoreModel) {
     this[EE] = new EventEmitter()
-    this[LIFECYCLE] = {}
+    this[LIFECYCLE] = model[LIFECYCLE]
     this[STATE_CONTAINER] = state || model
 
     this._storeName = model._storeName
@@ -27,23 +28,20 @@ export default class AltStore {
       this.StoreModel.state = assign({}, StoreModel.state)
     }
 
-    assign(this[LIFECYCLE], model[LIFECYCLE])
     assign(this, model[PUBLIC_METHODS])
 
     // Register dispatcher
     this.dispatchToken = alt.dispatcher.register((payload) => {
-      if (model[LIFECYCLE].beforeEach) {
-        model[LIFECYCLE].beforeEach(payload, this[STATE_CONTAINER])
-      }
+      this[LIFECYCLE].emit('beforeEach', payload, this[STATE_CONTAINER])
 
       if (model[LISTENERS][payload.action]) {
         let result = false
 
         try {
           result = model[LISTENERS][payload.action](payload.data)
         } catch (e) {
-          if (this[LIFECYCLE].error) {
-            this[LIFECYCLE].error(e, payload, this[STATE_CONTAINER])
+          if (model[HANDLING_ERRORS]) {
+            this[LIFECYCLE].emit('error', e, payload, this[STATE_CONTAINER])
           } else {
             throw e
           }
@@ -54,14 +52,10 @@ export default class AltStore {
         }
       }
 
-      if (model[LIFECYCLE].afterEach) {
-        model[LIFECYCLE].afterEach(payload, this[STATE_CONTAINER])
-      }
+      this[LIFECYCLE].emit('afterEach', payload, this[STATE_CONTAINER])
     })
 
-    if (this[LIFECYCLE].init) {
-      this[LIFECYCLE].init()
-    }
+    this[LIFECYCLE].emit('init')
   }
 
   getEventEmitter() {
@@ -78,9 +72,7 @@ export default class AltStore {
   }
 
   unlisten(cb) {
-    if (this[LIFECYCLE].unlisten) {
-      this[LIFECYCLE].unlisten()
-    }
+    this[LIFECYCLE].emit('unlisten')
     this[EE].removeListener('change', cb)
   }
 

diff --git a/src/alt/index.js b/src/alt/index.js
@@ -155,9 +155,7 @@ class Alt {
 
   rollback() {
     setAppState(this, this.serialize(this[LAST_SNAPSHOT]), (store) => {
-      if (store[LIFECYCLE].rollback) {
-        store[LIFECYCLE].rollback()
-      }
+      store[LIFECYCLE].emit('rollback')
       store.emitChange()
     })
   }
@@ -168,9 +166,7 @@ class Alt {
       : this[INIT_SNAPSHOT]
 
     setAppState(this, this.serialize(initialSnapshot), (store) => {
-      if (store[LIFECYCLE].init) {
-        store[LIFECYCLE].init()
-      }
+      store[LIFECYCLE].emit('init')
       store.emitChange()
     })
   }
@@ -183,9 +179,7 @@ class Alt {
 
   bootstrap(data) {
     setAppState(this, data, (store) => {
-      if (store[LIFECYCLE].bootstrap) {
-        store[LIFECYCLE].bootstrap()
-      }
+      store[LIFECYCLE].emit('bootstrap')
       store.emitChange()
     })
   }

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
@@ -29,9 +29,7 @@ export function snapshot(instance, storeNames = []) {
     const storeName = storeHandle.displayName || storeHandle
     const store = instance.stores[storeName]
     const { config } = store.StoreModel
-    if (store[LIFECYCLE].snapshot) {
-      store[LIFECYCLE].snapshot()
-    }
+    store[LIFECYCLE].emit('snapshot')
     const customSnapshot = config.onSerialize &&
       config.onSerialize(store[STATE_CONTAINER])
     obj[storeName] = customSnapshot ? customSnapshot : store.getState()

diff --git a/src/alt/utils/StoreMixins.js b/src/alt/utils/StoreMixins.js
@@ -2,6 +2,7 @@ import Symbol from 'es-symbol'
 import {
   ACTION_KEY,
   ALL_LISTENERS,
+  HANDLING_ERRORS,
   LIFECYCLE,
   LISTENERS,
   PUBLIC_METHODS
@@ -42,7 +43,10 @@ export const StoreMixinEssentials = {
 
 export const StoreMixinListeners = {
   on(lifecycleEvent, handler) {
-    this[LIFECYCLE][lifecycleEvent] = handler.bind(this)
+    if (lifecycleEvent === 'error') {
+      this[HANDLING_ERRORS] = true
+    }
+    this[LIFECYCLE].on(lifecycleEvent, handler.bind(this))
   },
 
   bindAction(symbol, handler) {

diff --git a/src/alt/utils/StoreUtils.js b/src/alt/utils/StoreUtils.js
@@ -1,4 +1,5 @@
 import assign from 'object-assign'
+import EventEmitter from 'eventemitter3'
 
 import AltStore from '../AltStore'
 import { getInternalMethods } from './AltUtils'
@@ -57,7 +58,7 @@ export function createStoreFromObject(alt, StoreModel, key) {
 
   const StoreProto = {}
   StoreProto[ALL_LISTENERS] = []
-  StoreProto[LIFECYCLE] = {}
+  StoreProto[LIFECYCLE] = new EventEmitter()
   StoreProto[LISTENERS] = {}
 
   assign(StoreProto, {
@@ -129,7 +130,7 @@ export function createStoreFromClass(alt, StoreModel, key, ...argsForClass) {
   })
 
   Store.prototype[ALL_LISTENERS] = []
-  Store.prototype[LIFECYCLE] = {}
+  Store.prototype[LIFECYCLE] = new EventEmitter()
   Store.prototype[LISTENERS] = {}
   Store.prototype[PUBLIC_METHODS] = {}