From 0e24641cb8cc4624fc792adb3abb7325cd8df866 Mon Sep 17 00:00:00 2001 From: John-David Dalton Date: Tue, 3 Jan 2017 23:07:06 -0800 Subject: [PATCH] Continue to use more ES2015. --- _setToPairs.js | 10 +++++----- partition.js | 5 ++--- union.js | 5 +++-- unionBy.js | 4 ++-- xor.js | 5 +++-- xorBy.js | 4 ++-- zipWith.js | 9 ++++----- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/_setToPairs.js b/_setToPairs.js index f0d123bfc..eeb1bdde9 100644 --- a/_setToPairs.js +++ b/_setToPairs.js @@ -6,12 +6,12 @@ * @returns {Array} Returns the value-value pairs. */ function setToPairs(set) { - var index = -1, - result = Array(set.size); + let index = -1; + const result = Array(set.size); - set.forEach(function(value) { - result[++index] = [value, value]; - }); + set.forEach(value => + result[++index] = [value, value] + ); return result; } diff --git a/partition.js b/partition.js index a58b6de4f..5993de0df 100644 --- a/partition.js +++ b/partition.js @@ -36,8 +36,7 @@ import createAggregator from './_createAggregator.js'; * _.partition(users, 'active'); * // => objects for [['fred'], ['barney', 'pebbles']] */ -var partition = createAggregator(function(result, value, key) { - result[key ? 0 : 1].push(value); -}, function() { return [[], []]; }); +const partition = createAggregator((result, value, key) => + result[key ? 0 : 1].push(value), () => [[], []]); export default partition; diff --git a/union.js b/union.js index 145cacc9c..9d75fbe94 100644 --- a/union.js +++ b/union.js @@ -18,7 +18,8 @@ import isArrayLikeObject from './isArrayLikeObject.js'; * _.union([2], [1, 2]); * // => [2, 1] */ -const union = (...arrays) => - baseUniq(baseFlatten(arrays, 1, isArrayLikeObject, true)); +function union(...arrays) { + return baseUniq(baseFlatten(arrays, 1, isArrayLikeObject, true)); +} export default union; diff --git a/unionBy.js b/unionBy.js index a81c48961..9e0491c99 100644 --- a/unionBy.js +++ b/unionBy.js @@ -27,12 +27,12 @@ import last from './last.js'; * _.unionBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x'); * // => [{ 'x': 1 }, { 'x': 2 }] */ -const unionBy = (...arrays) => { +function unionBy(...arrays) { let iteratee = last(arrays); if (isArrayLikeObject(iteratee)) { iteratee = undefined; } return baseUniq(baseFlatten(arrays, 1, isArrayLikeObject, true), baseIteratee(iteratee, 2)); -}; +} export default unionBy; diff --git a/xor.js b/xor.js index 8fd4d0f7f..849ea7547 100644 --- a/xor.js +++ b/xor.js @@ -20,7 +20,8 @@ import isArrayLikeObject from './isArrayLikeObject.js'; * _.xor([2, 1], [2, 3]); * // => [1, 3] */ -const xor = (...arrays) => - baseXor(arrayFilter(arrays, isArrayLikeObject)); +function xor(...arrays) { + return baseXor(arrayFilter(arrays, isArrayLikeObject)); +} export default xor; diff --git a/xorBy.js b/xorBy.js index 5afbb53fb..32ca346a5 100644 --- a/xorBy.js +++ b/xorBy.js @@ -27,12 +27,12 @@ import last from './last.js'; * _.xorBy([{ 'x': 1 }], [{ 'x': 2 }, { 'x': 1 }], 'x'); * // => [{ 'x': 2 }] */ -const xorBy = (...arrays) => { +function xorBy(...arrays) { let iteratee = last(arrays); if (isArrayLikeObject(iteratee)) { iteratee = undefined; } return baseXor(arrayFilter(arrays, isArrayLikeObject), baseIteratee(iteratee, 2)); -}; +} export default xorBy; diff --git a/zipWith.js b/zipWith.js index fe9d7a2e6..581294405 100644 --- a/zipWith.js +++ b/zipWith.js @@ -1,4 +1,3 @@ -import baseRest from './_baseRest.js'; import unzipWith from './unzipWith.js'; /** @@ -21,12 +20,12 @@ import unzipWith from './unzipWith.js'; * }); * // => [111, 222] */ -var zipWith = baseRest(function(arrays) { - var length = arrays.length, - iteratee = length > 1 ? arrays[length - 1] : undefined; +function zipWith(...arrays) { + const length = arrays.length; + let iteratee = length > 1 ? arrays[length - 1] : undefined; iteratee = typeof iteratee == 'function' ? (arrays.pop(), iteratee) : undefined; return unzipWith(arrays, iteratee); -}); +} export default zipWith;