Wrapping get and toPath to be compatible with latest Lodash

Author: davidkpiano

src/actions/field-actions.js

@@ -1,4 +1,4 @@
-import _get from 'lodash/get';
+import _get from '../utils/get';
 import mapValues from '../utils/map-values';
 
 import actionTypes from '../action-types';

src/actions/model-actions.js

@@ -1,4 +1,4 @@
-import _get from 'lodash/get';
+import _get from '../utils/get';
 import endsWith from 'lodash/endsWith';
 import isEqual from 'lodash/isEqual';
 import icepick from 'icepick';

src/components/control-component.js

@@ -1,6 +1,6 @@
 import { Component, createElement, cloneElement, PropTypes } from 'react';
 import connect from 'react-redux/lib/components/connect';
-import _get from 'lodash/get';
+import _get from '../utils/get';
 import merge from 'lodash/merge';
 
 import { invertValidity, getFieldFromState, getValidity } from '../utils';

src/components/errors-component.js

@@ -1,6 +1,6 @@
 import React, { Component, PropTypes } from 'react';
 import connect from 'react-redux/lib/components/connect';
-import _get from 'lodash/get';
+import _get from '../utils/get';
 import map from 'lodash/map';
 import compact from 'lodash/compact';
 import iteratee from 'lodash/iteratee';

src/components/field-component.js

@@ -2,7 +2,7 @@ import React, { Component, PropTypes } from 'react';
 import shallowCompare from 'react/lib/shallowCompare';
 import connect from 'react-redux/lib/components/connect';
 
-import _get from 'lodash/get';
+import _get from '../utils/get';
 import identity from 'lodash/identity';
 import isEqual from 'lodash/isEqual';
 import omit from 'lodash/omit';

src/components/form-component.js

@@ -1,6 +1,6 @@
 import React, { Component, PropTypes } from 'react';
 import connect from 'react-redux/lib/components/connect';
-import _get from 'lodash/get';
+import _get from '../utils/get';
 import mapValues from '../utils/map-values';
 import merge from 'lodash/merge';
 

src/reducers/form-reducer.js

@@ -1,12 +1,12 @@
-import _get from 'lodash/get';
+import _get from '../utils/get';
 import every from 'lodash/every';
 import icepick from 'icepick';
 import isBoolean from 'lodash/isBoolean';
 import isEqual from 'lodash/isEqual';
 import isPlainObject from 'lodash/isPlainObject';
 import map from 'lodash/map';
 import mapValues from '../utils/map-values';
-import toPath from 'lodash/toPath';
+import toPath from '../utils/to-path';
 import startsWith from 'lodash/startsWith';
 import flatten from 'flat';
 
@@ -282,7 +282,9 @@ function _createFormReducer(model, initialState) {
 
       case actionTypes.SET_FIELDS_VALIDITY:
         return map(action.fieldsValidity, (fieldValidity, field) =>
-          actions.setValidity(`${model}.${field}`, fieldValidity, action.options)
+          actions.setValidity(field.length
+            ? `${model}.${field}`
+            : model, fieldValidity, action.options)
         ).reduce(formReducer, state);
 
       case actionTypes.SET_ERRORS: {

src/reducers/model-reducer.js

@@ -1,7 +1,7 @@
-import _get from 'lodash/get';
+import _get from '../utils/get';
 import icepick from 'icepick';
 import isEqual from 'lodash/isEqual';
-import toPath from 'lodash/toPath';
+import toPath from '../utils/to-path';
 
 import actionTypes from '../action-types';
 

src/utils/get.js

@@ -0,0 +1,14 @@
+import _get from 'lodash/get';
+import endsWith from 'lodash/endsWith';
+
+export default function get(object, path, defaultValue) {
+  let modelString = path;
+
+  if (endsWith(modelString, '.')) {
+    modelString = modelString.slice(0, -1);
+  } else if (endsWith(modelString, '[]')) {
+    modelString = modelString.slice(0, -2);
+  }
+
+  return _get(object, modelString, defaultValue);
+}

src/utils/index.js

@@ -4,8 +4,8 @@ import isPlainObject from 'lodash/isPlainObject';
 import every from 'lodash/every';
 import some from 'lodash/some';
 import findKey from 'lodash/findKey';
-import get from 'lodash/get';
-import toPath from 'lodash/toPath';
+import _get from '../utils/get';
+import toPath from '../utils/to-path';
 import startsWith from 'lodash/startsWith';
 import memoize from 'lodash/memoize';
 
@@ -64,7 +64,7 @@ const getFormStateKey = memoize((state, model) => {
 function getForm(state, model) {
   const formStateKey = getFormStateKey(state, model);
 
-  return get(state, formStateKey);
+  return _get(state, formStateKey);
 }
 
 function getFieldFromState(state, model) {
@@ -74,6 +74,7 @@ function getFieldFromState(state, model) {
 
   const formPath = toPath(form.model);
   const fieldPath = toPath(model).slice(formPath.length);
+
   return getField(form, fieldPath.length ? [fieldPath.join('.')] : []);
 }
 
@@ -119,6 +120,12 @@ function isInvalid(errors) {
   return !!errors;
 }
 
+function getModelPath(model, field = '') {
+  return field.length
+    ? `${model}.${field}`
+    : model;
+}
+
 export {
   isFocused,
   isMulti,
@@ -133,4 +140,5 @@ export {
   getFieldFromState,
   invertValidators,
   invertValidity,
+  getModelPath,
 };