feat(lib): fixes bugs with proposed provided-store logic

Author: derrickpelletier

Diff for: src/components/ngRedux.js

@@ -2,6 +2,7 @@ import Connector from './connector';
 import invariant from 'invariant';
 import {createStore, applyMiddleware, compose, combineReducers} from 'redux';
 import digestMiddleware from './digestMiddleware';
+import providedStoreMiddleware from './providedStoreMiddleware';
 import wrapStore from './storeWrapper';
 
 import curry from 'lodash.curry';
@@ -25,6 +26,8 @@ export default function ngReduxProvider() {
 
   this.provideStore = (store) => {
     _providedStore = store;
+    _reducer = (state, action) => action.payload;
+    _middlewares = [providedStoreMiddleware(_providedStore)];
   }
 
   this.createStoreWith = (reducer, middlewares, storeEnhancers, initialState) => {
@@ -48,56 +51,46 @@ export default function ngReduxProvider() {
   };
 
   this.$get = ($injector) => {
-    if (_providedStore) {
-      const emptyStore = createNgReduxStore($injector, [], [], state => state, undefined);
+    const resolveMiddleware = middleware => isString(middleware)
+      ? $injector.get(middleware)
+      : middleware;
 
-      return wrapStore(_providedStore, emptyStore);
-    }
-
-    return createNgReduxStore($injector, _middlewares, _storeEnhancers, _reducer, _initialState);
-
-  };
-
-  this.$get.$inject = ['$injector'];
-}
+    const resolvedMiddleware = map(_middlewares, resolveMiddleware);
 
-function createNgReduxStore($injector, _middlewares, _storeEnhancers, _reducer, _initialState) {
-  const resolveMiddleware = middleware => isString(middleware)
-    ? $injector.get(middleware)
-    : middleware;
+    const resolveStoreEnhancer = storeEnhancer => isString(storeEnhancer)
+      ? $injector.get(storeEnhancer)
+      : storeEnhancer;
 
-  const resolvedMiddleware = map(_middlewares, resolveMiddleware);
+    const resolvedStoreEnhancer = map(_storeEnhancers, resolveStoreEnhancer);
 
-  const resolveStoreEnhancer = storeEnhancer => isString(storeEnhancer)
-    ? $injector.get(storeEnhancer)
-    : storeEnhancer;
+    if(_reducerIsObject) {
+      const getReducerKey = key => isString(_reducer[key])
+        ? $injector.get(_reducer[key])
+        : _reducer[key];
 
-  const resolvedStoreEnhancer = map(_storeEnhancers, resolveStoreEnhancer);
+      const resolveReducerKey = (result, key) => assign({}, result,
+        { [key]: getReducerKey(key) }
+      );
 
-  if(_reducerIsObject) {
-    const getReducerKey = key => isString(_reducer[key])
-      ? $injector.get(_reducer[key])
-      : _reducer[key];
+      const reducersObj = Object
+        .keys(_reducer)
+        .reduce(resolveReducerKey, {});
 
-    const resolveReducerKey = (result, key) => assign({}, result,
-      { [key]: getReducerKey(key) }
-    );
-
-    const reducersObj = Object
-      .keys(_reducer)
-      .reduce(resolveReducerKey, {});
+      _reducer = combineReducers(reducersObj);
+    }
 
-    _reducer = combineReducers(reducersObj);
-  }
+    const finalCreateStore = resolvedStoreEnhancer ? compose(...resolvedStoreEnhancer)(createStore) : createStore;
 
-  const finalCreateStore = resolvedStoreEnhancer ? compose(...resolvedStoreEnhancer)(createStore) : createStore;
+    //digestMiddleware needs to be the last one.
+    resolvedMiddleware.push(digestMiddleware($injector.get('$rootScope')));
 
-  //digestMiddleware needs to be the last one.
-  resolvedMiddleware.push(digestMiddleware($injector.get('$rootScope')));
+    const store = applyMiddleware(...resolvedMiddleware)(finalCreateStore)(_reducer, _initialState || undefined)
+    const mergedStore = assign({}, store, { connect: Connector(store) });
+    
+    if (_providedStore) wrapStore(_providedStore, mergedStore)
 
-  const store = _initialState
-    ? applyMiddleware(...resolvedMiddleware)(finalCreateStore)(_reducer, _initialState)
-    : applyMiddleware(...resolvedMiddleware)(finalCreateStore)(_reducer);
+    return mergedStore;
+  };
 
-  return assign({}, store, { connect: Connector(store) });
+  this.$get.$inject = ['$injector'];
 }

Diff for: src/components/providedStoreMiddleware.js

@@ -0,0 +1,11 @@
+/**
+ * middleware for the empty store that ng-redux uses when a external store is provided
+ * Provides two cases:
+ * 1. NGREDUX_PASSTHROUGH, where data is coming IN to the "fake" store
+ * 2. all other, where actions are dispatched out, and proxied to the true store
+ */
+export default _providedStore => store => next => action => {
+  return action.type === '@@NGREDUX_PASSTHROUGH'
+    ? next(action)
+    : _providedStore.dispatch(action)
+}

Diff for: src/components/storeWrapper.js

@@ -2,15 +2,10 @@ export default function wrapStore(providedStore, ngReduxStore) {
   const unsubscribe = providedStore
     .subscribe(() => {
       let newState = providedStore.getState();
-
-      ngReduxStore.dispatch(newState);
-    })
-  ;
-
-  return Object.assign({},
-    providedStore,
-    {
-      subscribe: ngReduxStore.subscribe
+      ngReduxStore.dispatch({
+        type: '@@NGREDUX_PASSTHROUGH',
+        payload: newState
+      });
     })
   ;
 }