🚧 Remove lodash from immutadot package

packages/immutadot-lodash/src/array/pull.js

@@ -1,5 +1,5 @@
 import _pull from 'lodash/fp/pull'
-import { convertLodashFp } from 'immutadot/util/convert'
+import { convertLodashFp } from 'util/convertLodashFp'
 
 /**
  * Replaces an array removing all given values from the former array.

packages/immutadot-lodash/src/array/pullAll.js

@@ -1,5 +1,5 @@
 import _pullAll from 'lodash/fp/pullAll'
-import { convertLodashFp } from 'immutadot/util/convert'
+import { convertLodashFp } from 'util/convertLodashFp'
 
 /**
  * This method is like {@link array.pull} except that it accepts an array of values to remove.

packages/immutadot-lodash/src/array/pullAllBy.js

@@ -1,5 +1,5 @@
 import _pullAllBy from 'lodash/fp/pullAllBy'
-import { convertLodashFp } from 'immutadot/util/convert'
+import { convertLodashFp } from 'util/convertLodashFp'
 
 /**
  * This method is like {@link array.pullAll} except that it accepts <code>iteratee</code> to generate the criterion by which each element is compared.

packages/immutadot-lodash/src/array/pullAllWith.js

@@ -1,5 +1,5 @@
 import _pullAllWith from 'lodash/fp/pullAllWith'
-import { convertLodashFp } from 'immutadot/util/convert'
+import { convertLodashFp } from 'util/convertLodashFp'
 
 /**
  * This method is like {@link array.pullAll} except that it accepts <code>comparator</code> to compare elements.

packages/immutadot-lodash/src/array/pullAt.js

@@ -1,5 +1,5 @@
 import _pullAt from 'lodash/fp/pullAt'
-import { convertLodashFp } from 'immutadot/util/convert'
+import { convertLodashFp } from 'util/convertLodashFp'
 
 /**
  * Replaces an array removing the specified indexes from the former array.

packages/immutadot-lodash/src/array/remove.js

@@ -1,5 +1,5 @@
 import _remove from 'lodash/fp/remove'
-import { convertLodashFp } from 'immutadot/util/convert'
+import { convertLodashFp } from 'util/convertLodashFp'
 
 /**
  * Replaces an array removing elements that predicate returns truthy for from the former array.

packages/immutadot-lodash/src/object/defaults.js

@@ -1,5 +1,5 @@
 import _defaults from 'lodash/fp/defaults'
-import { convertLodashFp } from 'immutadot/util/convert'
+import { convertLodashFp } from 'util/convertLodashFp'
 
 /**
  * Replaces by an object assigning own and inherited enumerable string keyed properties of source objects to the destination object for all destination properties that resolve to <code>undefined</code>.<br >

packages/immutadot-lodash/src/object/merge.js

@@ -1,5 +1,5 @@
 import _merge from 'lodash/fp/merge'
-import { convertLodashFp } from 'immutadot/util/convert'
+import { convertLodashFp } from 'util/convertLodashFp'
 
 /**
  * Replaces by an object deeply merging own enumerable string keyed properties of source objects to the former object.<br />

packages/immutadot/src/util/convert.js → packages/immutadot-lodash/src/util/convertLodashFp.js

@@ -1,4 +1,4 @@
-import { convert } from 'core/convert'
+import { convert } from 'immutadot/core/convert'
 import { lodashFpConvert } from './lodashFpConvert'
 
 /**

packages/immutadot/package.json

@@ -29,9 +29,6 @@
     "jsdoc": "^3.5.5"
   },
   "dependencies": {},
-  "peerDependencies": {
-    "lodash": "^4.17.4"
-  },
   "scripts": {
     "generate:flow": "node ../../misc/generate-flow.js",
     "prebuild": "yarn generate:flow",

packages/immutadot/src/array/concat.js

@@ -1,5 +1,4 @@
-import _concat from 'lodash/concat'
-import { convert } from 'core/convert'
+import { convertArrayMethod } from './convertArrayMethod'
 
 /**
  * Replaces an array concatenating the former array with additional arrays and/or values.
@@ -14,5 +13,5 @@ import { convert } from 'core/convert'
  * @since 0.2.0
  * @flow
  */
-const concat = convert(_concat)
+const concat = convertArrayMethod('concat', false, true)
 export { concat }

packages/immutadot/src/array/convertArrayMethod.js

@@ -4,25 +4,39 @@ import {
   isNil,
 } from 'util/lang'
 
-const copyArray = array => {
+const toArray = array => {
+  if (isNil(array)) return []
+  if (Array.isArray(array)) return array
+  return [array]
+}
+
+const toArrayCopy = array => {
   if (isNil(array)) return []
   if (Array.isArray(array)) return [...array]
   return [array]
 }
 
+const callMethodReturnResult = (array, method, args) => array[method](...args)
+
+const callMethodReturnArray = (array, method, args) => {
+  array[method](...args)
+  return array
+}
+
 /**
  * Converts an Array method.
  * @memberof array
  * @param {string} method Array method name.
+ * @param {boolean} [mutating=true] Whether the method mutates the array.
  * @return {function} Returns the wrapped function.
  * @see {@link core.convert|convert} for more information.
  * @since 0.2.0
  * @private
  */
-const convertArrayMethod = method => convert((array, ...args) => {
-  const newArray = copyArray(array)
-  newArray[method](...args)
-  return newArray
-})
+const convertArrayMethod = (method, mutating = true) => {
+  const getArray = mutating ? toArrayCopy : toArray
+  const callMethod = mutating ? callMethodReturnArray : callMethodReturnResult
+  return convert((value, ...args) => callMethod(getArray(value), method, args))
+}
 
 export { convertArrayMethod }

packages/immutadot/src/array/fill.js

@@ -1,5 +1,4 @@
-import _fill from 'lodash/fp/fill'
-import { convertLodashFp } from 'util/convert'
+import { convertArrayMethod } from './convertArrayMethod'
 
 /**
  * Replaces by an array filled with value from start up to, but not including, end.
@@ -16,5 +15,5 @@ import { convertLodashFp } from 'util/convert'
  * @since 0.3.0
  * @flow
  */
-const fill = convertLodashFp(_fill)
+const fill = convertArrayMethod('fill')
 export { fill }

packages/immutadot/src/array/reverse.js

@@ -1,5 +1,4 @@
-import _reverse from 'lodash/fp/reverse'
-import { convertLodashFp } from 'util/convert'
+import { convertArrayMethod } from './convertArrayMethod'
 
 /**
  * Replaces an array reversing the elements from the former array.
@@ -13,5 +12,5 @@ import { convertLodashFp } from 'util/convert'
  * @since 0.3.0
  * @flow
  */
-const reverse = convertLodashFp(_reverse)
+const reverse = convertArrayMethod('reverse')
 export { reverse }

packages/immutadot/src/array/slice.js

@@ -1,5 +1,4 @@
-import _slice from 'lodash/slice'
-import { convert } from 'core/convert'
+import { convertArrayMethod } from './convertArrayMethod'
 
 /**
  * Replaces an array by a slice of the former array from <code>start</code> up to, but not including, <code>end</code>.
@@ -15,5 +14,5 @@ import { convert } from 'core/convert'
  * @since 0.3.0
  * @flow
  */
-const slice = convert(_slice)
+const slice = convertArrayMethod('slice', false, true)
 export { slice }

packages/immutadot/src/core/get.js

@@ -0,0 +1,23 @@
+import { isNil } from 'util/lang'
+import { unsafeToPath } from './toPath'
+
+/**
+* Gets the value at <code>path</code> of <code>obj</code>.
+* @memberof core
+* @param {*} obj The object.
+* @param {string|Array} path The path of the property to get.
+* @param {*} defaultValue The default value.
+* @return {*} Returns the value or <code>defaultValue</code>.
+* @example get({ nested: { prop: 'val' } }, 'nested.prop') // => 'val'
+* @example get({ nested: { prop: 'val' } }, 'nested.unknown', 'default') // => 'default'
+* @since 1.0.0
+ */
+export function get(obj, path, defaultValue) {
+  function walkPath(curObj, remPath) {
+    if (remPath.length === 0) return curObj === undefined ? defaultValue : curObj
+    if (isNil(curObj)) return defaultValue
+    const [prop, ...pathRest] = remPath
+    return walkPath(curObj[prop], pathRest)
+  }
+  return walkPath(obj, unsafeToPath(path))
+}

packages/immutadot/src/core/get.spec.js

@@ -0,0 +1,28 @@
+/* eslint-env jest */
+import { get } from 'core'
+
+describe('Get', () => {
+  const obj = {
+    nested1: { prop: 'val' },
+    nested2: { arr: [{ val: 'arrVal' }] },
+  }
+
+  it('should get a prop', () => {
+    expect(get(obj, 'nested1.prop')).toBe('val')
+    expect(get(obj, 'nested1.prop.length')).toBe(3)
+    expect(get(obj, 'nested2.arr.length')).toBe(1)
+    expect(get(obj, 'nested2.arr[0].val')).toBe('arrVal')
+  })
+
+  it('should return undefined for unexisting path', () => {
+    expect(get(obj, 'nested1.foo')).toBe(undefined)
+    expect(get(obj, 'nested3.val')).toBe(undefined)
+    expect(get(obj, 'nested2.arr[1].val')).toBe(undefined)
+  })
+
+  it('should return defaultValue for unexisting path', () => {
+    expect(get(obj, 'nested1.foo', 'defaultValue')).toBe('defaultValue')
+    expect(get(obj, 'nested3.val', 'defaultValue')).toBe('defaultValue')
+    expect(get(obj, 'nested2.arr[1].val', 'defaultValue')).toBe('defaultValue')
+  })
+})

packages/immutadot/src/core/index.js

@@ -1,18 +1,12 @@
-import { convert } from './convert'
-import { set } from './set'
-import { toPath } from './toPath'
-import { unset } from './unset'
-import { update } from './update'
-
 /**
- * Core functions.
- * @namespace core
- * @since 1.0.0
- */
-export {
-  convert,
-  set,
-  toPath,
-  unset,
-  update,
-}
+* Core functions.
+* @namespace core
+* @since 1.0.0
+*/
+
+export { convert } from './convert'
+export { get } from './get'
+export { set } from './set'
+export { toPath } from './toPath'
+export { unset } from './unset'
+export { update } from './update'

packages/immutadot/src/core/set.js

@@ -3,7 +3,7 @@ import { apply } from './apply'
 const setOperation = (obj, prop, _, value) => { obj[prop] = value }
 
 /**
- * Sets the value at <code>path</code> of <code>object</code>.
+ * Sets the value at <code>path</code> of <code>obj</code>.
  * @function
  * @memberof core
  * @param {*} obj The object to modify.

packages/immutadot/src/core/toPath.js

@@ -6,6 +6,7 @@ import {
 } from './parser.utils'
 
 import {
+  isNil,
   isSymbol,
   toString,
 } from 'util/lang'
@@ -91,8 +92,7 @@ const isSliceIndexString = arg => isSliceIndex(arg ? Number(arg) : undefined)
  */
 const allowingArrays = fn => arg => {
   if (Array.isArray(arg)) return arg.map(toKey)
-
-  return fn(toString(arg))
+  return fn(arg)
 }
 
 const emptyStringParser = str => str.length === 0 ? [] : null
@@ -139,16 +139,7 @@ const pathSegmentEndedByBracketParser = map(
   ([beforeBracket, atBracket]) => [beforeBracket, ...stringToPath(atBracket)],
 )
 
-/**
- * Converts <code>str</code> to a path represented as an array of keys.
- * @function
- * @param {string} str The string to convert
- * @return {Array<string|number|Array>} The path represented as an array of keys
- * @memberof core
- * @private
- * @since 1.0.0
- */
-const stringToPath = race([
+const applyParsers = race([
   emptyStringParser,
   quotedBracketNotationParser,
   incompleteQuotedBracketNotationParser,
@@ -160,6 +151,20 @@ const stringToPath = race([
   str => [str],
 ])
 
+/**
+ * Converts <code>arg</code> to a path represented as an array of keys.
+ * @function
+ * @param {*} arg The value to convert
+ * @return {Array<string|number|Array>} The path represented as an array of keys
+ * @memberof core
+ * @private
+ * @since 1.0.0
+ */
+const stringToPath = arg => {
+  if (isNil(arg)) return []
+  return applyParsers(toString(arg))
+}
+
 const MAX_CACHE_SIZE = 1000
 const cache = new Map()
 

packages/immutadot/src/core/toPath.spec.js

@@ -62,4 +62,9 @@ describe('ToPath', () => {
       '1,2',
     ])
   })
+
+  it('should give empty path for nil values', () => {
+    expect(toPath(null)).toEqual([])
+    expect(toPath(undefined)).toEqual([])
+  })
 })

packages/immutadot/src/math/add.js

@@ -1,4 +1,3 @@
-import _add from 'lodash/add'
 import { convert } from 'core/convert'
 
 /**
@@ -14,5 +13,5 @@ import { convert } from 'core/convert'
  * @since 0.1.7
  * @flow
  */
-const add = convert(_add)
+const add = convert((value, addition) => value + addition)
 export { add }

packages/immutadot/src/math/divide.js

@@ -1,4 +1,3 @@
-import _divide from 'lodash/divide'
 import { convert } from 'core/convert'
 
 /**
@@ -14,5 +13,5 @@ import { convert } from 'core/convert'
  * @since 0.3.0
  * @flow
  */
-const divide = convert(_divide)
+const divide = convert((value, divider) => value / divider)
 export { divide }

packages/immutadot/src/math/multiply.js

@@ -1,4 +1,3 @@
-import _multiply from 'lodash/multiply'
 import { convert } from 'core/convert'
 
 /**
@@ -14,5 +13,5 @@ import { convert } from 'core/convert'
  * @since 0.3.0
  * @flow
  */
-const multiply = convert(_multiply)
+const multiply = convert((value, multiplier) => value * multiplier)
 export { multiply }

packages/immutadot/src/math/subtract.js

@@ -1,4 +1,3 @@
-import _subtract from 'lodash/subtract'
 import { convert } from 'core/convert'
 
 /**
@@ -14,5 +13,5 @@ import { convert } from 'core/convert'
  * @since 0.3.0
  * @flow
  */
-const subtract = convert(_subtract)
+const subtract = convert((value, subtraction) => value - subtraction)
 export { subtract }

packages/immutadot/src/object/assign.js

@@ -1,5 +1,4 @@
-import _assign from 'lodash/fp/assign'
-import { convertLodashFp } from 'util/convert'
+import { convert } from 'core/convert'
 
 /**
  * Replaces by an object assigning own enumerable string keyed properties of source objects to the destination object.<br />
@@ -15,5 +14,5 @@ import { convertLodashFp } from 'util/convert'
  * @since 0.1.12
  * @flow
  */
-const assign = convertLodashFp(_assign)
+const assign = convert((obj, ...args) => Object.assign({ ...obj }, ...args))
 export { assign }