Fixes initial state loading when initial state doesn't match model

Author: ctrlplusb

src/__tests__/store.test.js

@@ -237,7 +237,7 @@ test('supports initial state', () => {
     foo: {
       bar: {
         stuff: [3, 4],
-        invalid: 'qux',
+        quxx: 'qux',
       },
     },
   };
@@ -248,6 +248,7 @@ test('supports initial state', () => {
     foo: {
       bar: {
         stuff: [3, 4],
+        quxx: 'qux',
       },
       color: 'red',
     },
@@ -298,3 +299,18 @@ test('redux thunk configured', async () => {
   // assert
   expect(result).toBe('foo');
 });
+
+test('initialState is respected even if not in model', () => {
+  // act
+  const store = createStore(
+    {},
+    {
+      initialState: {
+        foo: 'bar',
+      },
+    },
+  );
+
+  // assert
+  expect(store.getState().foo).toEqual('bar');
+});

src/create-store-internals.js

@@ -35,6 +35,7 @@ export default function createStoreInternals({
   disableInternalSelectFnMemoize,
   initialState,
   injections,
+  isRebind,
   model,
   reducerEnhancer,
   references,
@@ -44,7 +45,7 @@ export default function createStoreInternals({
       ? memoizerific(maxSelectFnMemoize)(x)
       : x;
 
-  const defaultState = {};
+  const defaultState = isRebind ? {} : initialState || {};
   const actionThunks = {};
   const actionCreators = {};
   const actionCreatorDict = {};
@@ -149,12 +150,15 @@ export default function createStoreInternals({
           );
         }
       } else if (isStateObject(value) && Object.keys(value).length > 0) {
-        set(path, defaultState, {});
+        const existing = get(parentPath, defaultState);
+        if (!existing || isRebind) {
+          set(path, defaultState, {});
+        }
         recursiveExtractDefsFromModel(value, path);
       } else {
         // State
         const initialParentRef = get(parentPath, initialState);
-        if (initialParentRef && key in initialParentRef) {
+        if (!isRebind && initialParentRef && key in initialParentRef) {
           set(path, defaultState, initialParentRef[key]);
         } else {
           set(path, defaultState, value);

src/create-store.js

@@ -89,14 +89,15 @@ export default function createStore(model, options = {}) {
       ? window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__
       : reduxCompose);
 
-  const bindStoreInternals = state => {
+  const bindStoreInternals = (state, isRebind = false) => {
     references.internals = createStoreInternals({
       disableInternalSelectFnMemoize,
       initialState: state,
       injections,
       model: modelDefinition,
       reducerEnhancer,
       references,
+      isRebind,
     });
   };
 
@@ -137,7 +138,7 @@ export default function createStore(model, options = {}) {
   bindActionCreators(references.internals.actionCreators);
 
   const rebindStore = () => {
-    bindStoreInternals(store.getState());
+    bindStoreInternals(store.getState(), true);
     store.replaceReducer(references.internals.reducer);
     store.dispatch.replaceState(references.internals.defaultState);
     bindActionCreators(references.internals.actionCreators);