Merge pull request #56 from mamcgrath/fix_handle_multiple_nested_paths

Fix handling of nested paths

Author: ashbhir

lib/getStateFromCookies.js

@@ -1,6 +1,6 @@
 {
   "name": "redux-cookies-middleware",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "redux-cookies-middleware is a redux middleware which watches for changes in redux state & store them to browser cookie.",
   "keywords": [
     "redux",
@@ -57,6 +57,7 @@
     "webpack": "^3.3.0"
   },
   "dependencies": {
-    "js-cookie": "^2.1.4"
+    "js-cookie": "^2.1.4",
+    "lodash": "^4.17.15"
   }
 }

lib/getStateFromCookies.js.map

@@ -1,3 +1,4 @@
+import merge from 'lodash/merge';
 import { getCookie as getBrowserCookie } from './cookieApi';
 
 /**
@@ -45,7 +46,7 @@ const getStateFromCookies = (
         return getStateFromPath(path, valueFromCookie);
     });
     return pathStates
-        .reduce((finalState, pathState) => ({ ...finalState, ...pathState }), preloadedState);
+        .reduce((finalState, pathState) => (merge({}, finalState, pathState)), preloadedState);
 };
 
 export default getStateFromCookies;

package.json

@@ -5,6 +5,7 @@ import { getStateFromCookies } from '../src';
 describe('getStateFromCookies', () => {
     const userId = 1;
     const authToken = 'xxxxx';
+    const key = 'xxx';
     const geolocation = {
         lat: 12.34,
         lon: 56.78
@@ -23,7 +24,8 @@ describe('getStateFromCookies', () => {
         initialState = {
             userId: null,
             auth: {
-                authToken: null
+                authToken: null,
+                key: null
             },
             geolocation: {},
             ui: {
@@ -33,6 +35,7 @@ describe('getStateFromCookies', () => {
 
         jsCookie.set('userId', JSON.stringify(userId));
         jsCookie.set('authToken', JSON.stringify(authToken));
+        jsCookie.set('key', JSON.stringify(key));
         jsCookie.set('geolocation', JSON.stringify(geolocation));
         jsCookie.set('checkout', JSON.stringify(checkout));
     });
@@ -42,6 +45,7 @@ describe('getStateFromCookies', () => {
             userId: { name: 'userId' },
             geolocation: { name: 'geolocation' },
             'auth.authToken': { name: 'authToken' },
+            'auth.key': { name: 'key' },
             'ui.checkout': { name: 'checkout' }
         };
 
@@ -50,6 +54,7 @@ describe('getStateFromCookies', () => {
         // expectations
         expect(value.userId).toEqual(userId);
         expect(value.auth.authToken).toEqual(authToken);
+        expect(value.auth.key).toEqual(key);
         expect(value.geolocation).toEqual(geolocation);
         expect(value.ui.checkout).toEqual(checkout);
     });

src/getStateFromCookies.js

@@ -2908,6 +2908,11 @@ lodash@^4.0.1, lodash@^4.14.0, lodash@^4.16.6, lodash@^4.17.4, lodash@^4.2.0, lo
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
 
+lodash@^4.17.15:
+  version "4.17.15"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
+  integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
+
 [email protected]:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.5.tgz#7ae4ec257302fd790d557cb10c97100d857b0056"