fix(store): call metareducer with the user's config initial state

ngrx · Jan 4, 2019 · 541d8df · 541d8df
1 parent 6b73060
commit 541d8df
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/modules/store/src/utils.ts b/modules/store/src/utils.ts
@@ -4,6 +4,7 @@ import {
   ActionReducerFactory,
   ActionReducerMap,
   MetaReducer,
+  InitialState,
 } from './models';
 
 export function combineReducers<T, V extends Action = Action>(
@@ -92,10 +93,17 @@ export function createReducerFactory<T, V extends Action = Action>(
   metaReducers?: MetaReducer<T, V>[]
 ): ActionReducerFactory<T, V> {
   if (Array.isArray(metaReducers) && metaReducers.length > 0) {
-    return compose.apply(null, [...metaReducers, reducerFactory]);
+    reducerFactory = compose.apply(null, [...metaReducers, reducerFactory]);
   }
 
-  return reducerFactory;
+  return (rm: ActionReducerMap<T, V>, initialState?: InitialState<T>) => {
+    const reducer = reducerFactory(rm, initialState);
+
+    return (state: T | undefined, action: V) => {
+      state = state === undefined ? (initialState as T) : state;
+      return typeof reducer === 'function' ? reducer(state, action) : state;
+    };
+  };
 }
 
 export function createFeatureReducerFactory<T, V extends Action = Action>(