Slightly refactoring model reducer and form reducer

Author: davidkpiano

lib/reducers/form-reducer.js

@@ -99,15 +99,20 @@ function createInitialFormState(model) {
 }
 
 function createFormReducer(model) {
+  var modelPath = (0, _toPath2.default)(model);
+
   return function () {
     var state = arguments.length <= 0 || arguments[0] === undefined ? createInitialFormState(model) : arguments[0];
     var action = arguments[1];
 
+    if (!action.model) return state;
+
     var path = (0, _toPath2.default)(action.model);
-    var modelPath = (0, _toPath2.default)(model);
+
     if (!(0, _isEqual2.default)(path.slice(0, modelPath.length), modelPath)) {
       return state;
     }
+
     var localPath = path.slice(modelPath.length);
 
     var form = (0, _cloneDeep2.default)(state);

lib/reducers/model-reducer.js

@@ -25,6 +25,10 @@ var _toPath = require('lodash/toPath');
 
 var _toPath2 = _interopRequireDefault(_toPath);
 
+var _isEqual = require('lodash/isEqual');
+
+var _isEqual2 = _interopRequireDefault(_isEqual);
+
 var _actionTypes = require('../action-types');
 
 var actionTypes = _interopRequireWildcard(_actionTypes);
@@ -46,7 +50,7 @@ function createModelReducer(model) {
 
     var path = (0, _toPath2.default)(action.model);
 
-    if (path[0] !== modelPath[0]) {
+    if (!(0, _isEqual2.default)(path.slice(0, modelPath.length), modelPath)) {
       return state;
     }
 

src/reducers/form-reducer.js

@@ -64,12 +64,17 @@ function createInitialFormState(model) {
 }
 
 function createFormReducer(model) {
+  const modelPath = toPath(model);
+
   return (state = createInitialFormState(model), action) => {
+    if (!action.model) return state;
+    
     let path = toPath(action.model);
-    let modelPath = toPath(model);
+
     if (!isEqual(path.slice(0, modelPath.length), modelPath)) {
       return state;
     }
+
     let localPath = path.slice(modelPath.length);
 
     let form = cloneDeep(state);

src/reducers/model-reducer.js

@@ -3,6 +3,7 @@ import set from 'lodash/set';
 import startsWith from 'lodash/startsWith';
 import cloneDeep from 'lodash/cloneDeep';
 import toPath from 'lodash/toPath';
+import isEqual from 'lodash/isEqual';
 
 import * as actionTypes from '../action-types';
 
@@ -14,7 +15,7 @@ function createModelReducer(model, initialState = {}) {
 
     let path = toPath(action.model);
 
-    if (path[0] !== modelPath[0]) {
+    if (!isEqual(path.slice(0, modelPath.length), modelPath)) {
       return state;
     }
 

test/model-reducer-spec.js

@@ -82,11 +82,15 @@ describe('createModelReducer()', () => {
 
   it('should handle model at deep state path', () => {
     const reducer = createModelReducer('forms.test');
+
     assert.deepEqual(
       reducer(undefined, actions.change('forms.test.foo', 'new')),
       { foo: 'new' }
     );
 
-  })
-
+    assert.deepEqual(
+      reducer(undefined, actions.change('forms.different.foo', 'new')),
+      {},
+      'should only change when base path is equal');
+  });
 });