Shortening icepick -> i, using updateParentForms in validity/pending reducers, adding tests

Author: davidkpiano

src/actions/model-actions.js

@@ -1,6 +1,6 @@
 import _get from '../utils/get';
 import identity from 'lodash/identity';
-import icepick from 'icepick';
+import i from 'icepick';
 
 import getValue from '../utils/get-value';
 import isMulti from '../utils/is-multi';
@@ -11,10 +11,10 @@ import { trackable } from '../utils/track';
 const defaultStrategies = {
   get: _get,
   getValue,
-  splice: icepick.splice,
-  merge: icepick.merge,
-  remove: icepick.dissoc,
-  push: icepick.push,
+  splice: i.splice,
+  merge: i.merge,
+  remove: i.dissoc,
+  push: i.push,
   length: (value) => value.length,
   object: {},
   array: [],

src/components/control-component.js

@@ -7,7 +7,7 @@ import _get from '../utils/get';
 import merge from '../utils/merge';
 import mapValues from '../utils/map-values';
 import isPlainObject from 'lodash/isPlainObject';
-import icepick from 'icepick';
+import i from 'icepick';
 import omit from 'lodash/omit';
 import handleFocus from '../utils/handle-focus';
 
@@ -213,7 +213,7 @@ class Control extends Component {
     };
 
     if (isPlainObject(mapProps)) {
-      return icepick.merge(originalProps,
+      return i.merge(originalProps,
         mapValues(mapProps, (value, key) => {
           if (typeof value === 'function' && key !== 'component') {
             return value(originalProps);
@@ -294,7 +294,7 @@ class Control extends Component {
         (validator, key) => dispatch(actions.asyncSetValidity(model,
           (_, done) => {
             const outerDone = (valid) => {
-              const validity = icepick.merge(fieldValue.validity, { [key]: valid });
+              const validity = i.merge(fieldValue.validity, { [key]: valid });
 
               done(validity);
             };

src/constants/control-props-map.js

@@ -1,12 +1,12 @@
 import isMulti from '../utils/is-multi';
-import icepick from 'icepick';
+import i from 'icepick';
 import actions from '../actions';
 
 const defaultStrategies = {
   array: [],
   object: {},
   length: (val) => val.length,
-  push: icepick.push,
+  push: i.push,
 };
 
 function createControlPropsMap(s = defaultStrategies) {

src/reducers/form-reducer.js

@@ -1,5 +1,5 @@
 import _get from '../utils/get';
-import icepick from 'icepick';
+import i from 'icepick';
 import arraysEqual from '../utils/arrays-equal';
 import isPlainObject from 'lodash/isPlainObject';
 import isArray from 'lodash/isArray';
@@ -68,22 +68,22 @@ export function createInitialState(model, state, customInitialFieldState = {}) {
     initialState = mapValues(state, (subState, subModel) =>
       createInitialState(getSubModelString(model, subModel), subState, customInitialFieldState));
   } else {
-    return icepick.merge(initialFieldState, {
+    return i.merge(initialFieldState, {
       initialValue: state,
       value: state,
       model,
       ...customInitialFieldState,
     });
   }
 
-  const initialForm = icepick.merge(initialFieldState, {
+  const initialForm = i.merge(initialFieldState, {
     initialValue: state,
     value: state,
     model,
     ...customInitialFieldState,
   });
 
-  return icepick.set(initialState, '$form', initialForm);
+  return i.set(initialState, '$form', initialForm);
 }
 
 function wrapFormReducer(plugin, modelPath, initialState) {

src/reducers/form/change-action-reducer.js

@@ -1,5 +1,5 @@
 import actionTypes from '../../action-types';
-import icepick from 'icepick';
+import i from 'icepick';
 import get from '../../utils/get';
 import shallowEqual from '../../utils/shallow-equal';
 import isPlainObject from 'lodash/isPlainObject';
@@ -20,10 +20,10 @@ function updateFieldValue(field, action) {
   };
 
   if (shallowEqual(field.value, value)) {
-    return icepick.merge(field, changedFieldProps);
+    return i.merge(field, changedFieldProps);
   }
 
-  if (silent) return icepick.set(field, 'value', value);
+  if (silent) return i.set(field, 'value', value);
 
   if (removeKeys) {
     const valueIsArray = Array.isArray(field.$form.value);
@@ -42,7 +42,7 @@ function updateFieldValue(field, action) {
         result[key] = field[key];
       });
 
-      return icepick.set(compact(result), '$form', field.$form);
+      return i.set(compact(result), '$form', field.$form);
     }
 
     result = { ...field };
@@ -57,7 +57,7 @@ function updateFieldValue(field, action) {
   }
 
   if (!Array.isArray(value) && !isPlainObject(value)) {
-    return icepick.merge(field, icepick.set(changedFieldProps, 'value', value));
+    return i.merge(field, i.set(changedFieldProps, 'value', value));
   }
 
   const updatedField = mapValues(value, (subValue, index) => {
@@ -71,16 +71,16 @@ function updateFieldValue(field, action) {
       return subField;
     }
 
-    return icepick.merge(subField, icepick.set(changedFieldProps, 'value', subValue));
+    return i.merge(subField, i.set(changedFieldProps, 'value', subValue));
   });
 
-  const dirtyFormState = icepick.merge(field.$form || initialFieldState,
-    icepick.set(changedFieldProps, 'retouched',
+  const dirtyFormState = i.merge(field.$form || initialFieldState,
+    i.set(changedFieldProps, 'retouched',
       field.submitted || (field.$form && field.$form.retouched)));
 
 
-  return icepick.set(updatedField, '$form',
-    icepick.set(dirtyFormState, 'value', value));
+  return i.set(updatedField, '$form',
+    i.set(dirtyFormState, 'value', value));
 }
 
 export default function changeActionReducer(state, action, localPath) {
@@ -92,5 +92,5 @@ export default function changeActionReducer(state, action, localPath) {
 
   if (!localPath.length) return updatedField;
 
-  return icepick.setIn(state, localPath, updatedField);
+  return i.setIn(state, localPath, updatedField);
 }

src/reducers/form/pending-action-reducer.js

@@ -1,15 +1,20 @@
 import actionTypes from '../../action-types';
 import updateField from '../../utils/update-field';
+import updateParentForms from '../../utils/update-parent-forms';
 
 export default function pendingActionReducer(state, action, localPath) {
   if (action.type !== actionTypes.SET_PENDING) {
     return state;
   }
 
-  return updateField(state, localPath, () => ({
+  const newState = updateField(state, localPath, {
     pending: action.pending,
     submitted: false,
     submitFailed: false,
     retouched: false,
-  }));
+  });
+
+  return updateParentForms(newState, localPath, {
+    pending: action.pending,
+  });
 }

src/reducers/form/set-pristine-action-reducer.js

@@ -8,13 +8,13 @@ export default function setPristineActionReducer(state, action, localPath) {
     return state;
   }
 
-  const updatedField = updateField(state, localPath, {
+  const newState = updateField(state, localPath, {
     pristine: true,
   }, {
     pristine: true,
   });
 
-  return updateParentForms(updatedField, localPath, (form) => ({
+  return updateParentForms(newState, localPath, (form) => ({
     pristine: isPristine(form),
   }));
 }

src/reducers/form/set-validity-action-reducer.js

@@ -10,8 +10,7 @@ import toPath from '../../utils/to-path';
 import isValid from '../../form/is-valid';
 import isValidityValid from '../../utils/is-validity-valid';
 import isValidityInvalid from '../../utils/is-validity-invalid';
-
-import icepick from 'icepick';
+import updateParentForms from '../../utils/update-parent-forms';
 
 export default function setValidityActionReducer(state, action, localPath) {
   if (action.type === actionTypes.SET_FIELDS_VALIDITY) {
@@ -43,19 +42,17 @@ export default function setValidityActionReducer(state, action, localPath) {
     ? mapValues(validity, inverse)
     : !validity;
 
-  return updateField(state, localPath, {
+  const newState = updateField(state, localPath, {
     [isErrors ? 'errors' : 'validity']: validity,
     [isErrors ? 'validity' : 'errors']: inverseValidity,
     validating: false,
     validated: true,
     valid: isErrors
       ? !isValidityInvalid(validity)
       : isValidityValid(validity),
-  }, null, (node) => {
-    if (node.$form) {
-      return icepick.setIn(node, ['$form', 'valid'], isValid(node));
-    }
-
-    return icepick.set(node, 'valid', isValid(node));
   });
+
+  return updateParentForms(newState, localPath, (form) => ({
+    valid: isValid(form),
+  }));
 }

src/reducers/model-reducer.js

@@ -1,13 +1,13 @@
 import _get from '../utils/get';
-import icepick from 'icepick';
+import i from 'icepick';
 import arraysEqual from '../utils/arrays-equal';
 import toPath from '../utils/to-path';
 
 import actionTypes from '../action-types';
 import createBatchReducer from '../enhancers/batched-enhancer';
 
 function icepickSet(state, path, value) {
-  return icepick.setIn(state, path, value);
+  return i.setIn(state, path, value);
 }
 
 const defaultStrategy = {

src/utils/update-field.js

@@ -1,18 +1,18 @@
-import icepick from 'icepick';
+import i from 'icepick';
 import get from './get';
 import mapValues from './map-values';
 import { createInitialState } from '../reducers/form-reducer';
 
 function assocIn(state, path, value, fn) {
-  if (!fn) return icepick.assocIn(state, path, value);
+  if (!fn) return i.assocIn(state, path, value);
 
   const key0 = path[0];
 
   if (path.length === 1) {
-    return fn(icepick.assoc(state, key0, value));
+    return fn(i.assoc(state, key0, value));
   }
 
-  return fn(icepick.assoc(state, key0, assocIn(state[key0] || {}, path.slice(1), value, fn)));
+  return fn(i.assoc(state, key0, assocIn(state[key0] || {}, path.slice(1), value, fn)));
 }
 
 function tempInitialState(path) {
@@ -28,7 +28,7 @@ export default function updateField(state, path, newState, newSubState, updater)
   let fullState = state;
 
   if (!field) {
-    fullState = icepick.merge(state, createInitialState(
+    fullState = i.merge(state, createInitialState(
       state.$form.model,
       tempInitialState(path)));
 
@@ -37,7 +37,7 @@ export default function updateField(state, path, newState, newSubState, updater)
 
   const isForm = field.hasOwnProperty('$form');
   const fieldPath = isForm
-    ? icepick.push(path, '$form')
+    ? i.push(path, '$form')
     : path;
 
   const fieldState = isForm
@@ -51,7 +51,7 @@ export default function updateField(state, path, newState, newSubState, updater)
   if (isForm && newSubState) {
     const formState = mapValues(field, (subState, key) => {
       if (key === '$form') {
-        return icepick.assign(
+        return i.assign(
           fieldState,
           updatedFieldState);
       }
@@ -60,15 +60,15 @@ export default function updateField(state, path, newState, newSubState, updater)
         ? newSubState(subState, updatedFieldState)
         : newSubState;
 
-      return icepick.assign(subState, updatedSubState);
+      return i.assign(subState, updatedSubState);
     });
 
     if (!path.length) return formState;
 
     return assocIn(fullState, path, formState, updater);
   }
 
-  return assocIn(fullState, fieldPath, icepick.assign(
+  return assocIn(fullState, fieldPath, i.assign(
     fieldState,
     updatedFieldState), updater);
 }