Consolidate aggregate modules.

Author: jdalton

.internal/arrayAggregator.js

@@ -1,5 +1,5 @@
 import baseAssignValue from './.internal/baseAssignValue.js';
-import createAggregator from './.internal/createAggregator.js';
+import reduce from './reduce.js';
 
 /** Used to check objects for own properties. */
 const hasOwnProperty = Object.prototype.hasOwnProperty;
@@ -20,12 +20,15 @@ const hasOwnProperty = Object.prototype.hasOwnProperty;
  * countBy([6.1, 4.2, 6.3], Math.floor);
  * // => { '4': 1, '6': 2 }
  */
-const countBy = createAggregator((result, value, key) => {
-  if (hasOwnProperty.call(result, key)) {
-    ++result[key];
-  } else {
-    baseAssignValue(result, key, 1);
-  }
-});
+function countBy(collection, iteratee) {
+  return reduce(collection, (result, value, key) => {
+    if (hasOwnProperty.call(result, key)) {
+      ++result[key];
+    } else {
+      baseAssignValue(result, key, 1);
+    }
+    return result;
+  }, {});
+}
 
 export default countBy;

.internal/baseAggregator.js

@@ -1,5 +1,5 @@
 import baseAssignValue from './.internal/baseAssignValue.js';
-import createAggregator from './.internal/createAggregator.js';
+import reduce from './reduce.js';
 
 /** Used to check objects for own properties. */
 const hasOwnProperty = Object.prototype.hasOwnProperty;
@@ -21,12 +21,15 @@ const hasOwnProperty = Object.prototype.hasOwnProperty;
  * groupBy([6.1, 4.2, 6.3], Math.floor);
  * // => { '4': [4.2], '6': [6.1, 6.3] }
  */
-const groupBy = createAggregator((result, value, key) => {
-  if (hasOwnProperty.call(result, key)) {
-    result[key].push(value);
-  } else {
-    baseAssignValue(result, key, [value]);
-  }
-});
+function groupBy(collection, iteratee) {
+  return reduce(collection, (result, value, key) => {
+    if (hasOwnProperty.call(result, key)) {
+      result[key].push(value);
+    } else {
+      baseAssignValue(result, key, [value]);
+    }
+    return result;
+  }, {});
+}
 
 export default groupBy;

.internal/createAggregator.js

@@ -1,5 +1,5 @@
 import baseAssignValue from './.internal/baseAssignValue.js';
-import createAggregator from './.internal/createAggregator.js';
+import reduce from './reduce.js';
 
 /**
  * Creates an object composed of keys generated from the results of running
@@ -19,16 +19,13 @@ import createAggregator from './.internal/createAggregator.js';
  *   { 'dir': 'right', 'code': 100 }
  * ];
  *
- * keyBy(array, function(o) {
- *   return String.fromCharCode(o.code);
- * });
+ * keyBy(array, ({ code }) => String.fromCharCode(code));
  * // => { 'a': { 'dir': 'left', 'code': 97 }, 'd': { 'dir': 'right', 'code': 100 } }
- *
- * keyBy(array, 'dir');
- * // => { 'left': { 'dir': 'left', 'code': 97 }, 'right': { 'dir': 'right', 'code': 100 } }
  */
-const keyBy = createAggregator((result, value, key) => {
-  baseAssignValue(result, key, value);
-});
+function keyBy(collection, iteratee) {
+  return reduce(collection, (result, value, key) => (
+    baseAssignValue(result, key, value)
+  ), {});
+}
 
 export default keyBy;

countBy.js

@@ -1,4 +1,4 @@
-import createAggregator from './.internal/createAggregator.js';
+import reduce from './reduce.js';
 
 /**
  * Creates an array of elements split into two groups, the first of which
@@ -19,10 +19,13 @@ import createAggregator from './.internal/createAggregator.js';
  *   { 'user': 'pebbles', 'age': 1,  'active': false }
  * ];
  *
- * partition(users, o => o.active);
+ * partition(users, ({ active }) => active);
  * // => objects for [['fred'], ['barney', 'pebbles']]
  */
-const partition = createAggregator((result, value, key) =>
-  result[key ? 0 : 1].push(value), () => [[], []]);
+function partition(collection, predicate) {
+  return reduce(collection, (result, value, key) => (
+    result[key ? 0 : 1].push(value)
+  ), [[], []]);
+}
 
 export default partition;