From 36927bff8bd6c2c6b536e31aed9daa10237590ac Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Wed, 11 Jan 2017 10:39:30 -0800 Subject: [PATCH] Consolidate `invert` modules. --- .internal/baseInverter.js | 21 --------------------- .internal/createInverter.js | 14 -------------- invert.js | 14 ++++++++------ invertBy.js | 21 +++++++++++++-------- 4 files changed, 21 insertions(+), 49 deletions(-) delete mode 100644 .internal/baseInverter.js delete mode 100644 .internal/createInverter.js diff --git a/.internal/baseInverter.js b/.internal/baseInverter.js deleted file mode 100644 index 0e43f1f04..000000000 --- a/.internal/baseInverter.js +++ /dev/null @@ -1,21 +0,0 @@ -import baseForOwn from './baseForOwn.js'; - -/** - * The base implementation of `invert` and `invertBy` which inverts - * `object` with values transformed by `iteratee` and set by `setter`. - * - * @private - * @param {Object} object The object to iterate over. - * @param {Function} setter The function to set `accumulator` values. - * @param {Function} iteratee The iteratee to transform values. - * @param {Object} accumulator The initial inverted object. - * @returns {Function} Returns `accumulator`. - */ -function baseInverter(object, setter, iteratee, accumulator) { - baseForOwn(object, (value, key, object) => { - setter(accumulator, iteratee(value), key, object); - }); - return accumulator; -} - -export default baseInverter; diff --git a/.internal/createInverter.js b/.internal/createInverter.js deleted file mode 100644 index 65893950b..000000000 --- a/.internal/createInverter.js +++ /dev/null @@ -1,14 +0,0 @@ -import baseInverter from './.internal/baseInverter.js'; - -/** - * Creates a function like `invertBy`. - * - * @private - * @param {Function} setter The function to set accumulator values. - * @returns {Function} Returns the new inverter function. - */ -function createInverter(setter) { - return (object, iteratee) => baseInverter(object, setter, iteratee, {}); -} - -export default createInverter; diff --git a/invert.js b/invert.js index 3934c70a7..ce40e967d 100644 --- a/invert.js +++ b/invert.js @@ -1,6 +1,4 @@ -import constant from './constant.js'; -import createInverter from './.internal/createInverter.js'; -import identity from './identity.js'; +import baseForOwn from './baseForOwn.js'; /** * Creates an object composed of the inverted keys and values of `object`. @@ -18,8 +16,12 @@ import identity from './identity.js'; * invert(object); * // => { '1': 'c', '2': 'b' } */ -const invert = createInverter((result, value, key) => { - result[value] = key; -}); +function invert(object) { + const result = {}; + baseForOwn(object, (value, key) => { + result[value] = key; + }); + return result; +} export default invert; diff --git a/invertBy.js b/invertBy.js index 335d6b7cc..3f9e8702b 100644 --- a/invertBy.js +++ b/invertBy.js @@ -1,4 +1,4 @@ -import createInverter from './.internal/createInverter.js'; +import baseForOwn from './baseForOwn.js'; /** Used to check objects for own properties. */ const hasOwnProperty = Object.prototype.hasOwnProperty; @@ -22,12 +22,17 @@ const hasOwnProperty = Object.prototype.hasOwnProperty; * invertBy(object, value => `group${ value }`); * // => { 'group1': ['a', 'c'], 'group2': ['b'] } */ -const invertBy = createInverter((result, value, key) => { - if (hasOwnProperty.call(result, value)) { - result[value].push(key); - } else { - result[value] = [key]; - } -}); +function invertBy(object, iteratee) { + const result = {}; + baseForOwn(object, (value, key) => { + value = iteratee(value); + if (hasOwnProperty.call(result, value)) { + result[value].push(key); + } else { + result[value] = [key]; + } + }); + return result; +} export default invertBy;