cleanup, remove noop and unused internal functionsawaitable

18 files changed, 15 insertions, 46 deletions

diff --git a/lib/concatLimit.js b/lib/concatLimit.js
index e85a257..34c35df 100644
--- a/lib/concatLimit.js
+++ b/lib/concatLimit.js
@@ -1,4 +1,3 @@
-import noop from './internal/noop';
 import wrapAsync from './internal/wrapAsync';
 import mapLimit from './mapLimit';
 import awaitify from './internal/awaitify'
@@ -23,7 +22,6 @@ import awaitify from './internal/awaitify'
  * @returns A Promise, if no callback is passed
  */
 function concatLimit(coll, limit, iteratee, callback) {
-    callback = callback || noop;
     var _iteratee = wrapAsync(iteratee);
     return mapLimit(coll, limit, (val, iterCb) => {
         _iteratee(val, (err, ...args) => {
diff --git a/lib/eachOf.js b/lib/eachOf.js
index bb12235..0b847ae 100644
--- a/lib/eachOf.js
+++ b/lib/eachOf.js
@@ -1,7 +1,6 @@
 import isArrayLike from './internal/isArrayLike';
 import breakLoop from './internal/breakLoop';
 import eachOfLimit from './eachOfLimit';
-import noop from './internal/noop';
 import once from './internal/once';
 import onlyOnce from './internal/onlyOnce';
 import wrapAsync from './internal/wrapAsync';
@@ -9,7 +8,7 @@ import awaitify from './internal/awaitify'
 
 // eachOf implementation optimized for array-likes
 function eachOfArrayLike(coll, iteratee, callback) {
-    callback = once(callback || noop);
+    callback = once(callback);
     var index = 0,
         completed = 0,
         {length} = coll,
diff --git a/lib/groupByLimit.js b/lib/groupByLimit.js
index 5663637..24d5c40 100644
--- a/lib/groupByLimit.js
+++ b/lib/groupByLimit.js
@@ -1,4 +1,3 @@
-import noop from './internal/noop';
 import mapLimit from './mapLimit';
 import wrapAsync from './internal/wrapAsync';
 import awaitify from './internal/awaitify'
@@ -24,7 +23,6 @@ import awaitify from './internal/awaitify'
  * @returns {Promise} a promise, if no callback is passed
  */
 function groupByLimit(coll, limit, iteratee, callback) {
-    callback = callback || noop;
     var _iteratee = wrapAsync(iteratee);
     return mapLimit(coll, limit, (val, iterCb) => {
         _iteratee(val, (err, key) => {
diff --git a/lib/internal/createTester.js b/lib/internal/createTester.js
index 909679d..5858702 100644
--- a/lib/internal/createTester.js
+++ b/lib/internal/createTester.js
@@ -1,10 +1,8 @@
-import noop from './noop';
 import breakLoop from './breakLoop';
 import wrapAsync from './wrapAsync'
 
 export default function _createTester(check, getResult) {
     return (eachfn, arr, _iteratee, cb) => {
-        cb = cb || noop;
         var testPassed = false;
         var testResult;
         const iteratee = wrapAsync(_iteratee)
diff --git a/lib/internal/doLimit.js b/lib/internal/doLimit.js
deleted file mode 100644
index 70fb495..0000000
--- a/lib/internal/doLimit.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function doLimit(fn, limit) {
-    return (iterable, iteratee, cb) => fn(iterable, limit, iteratee, cb)
-}
diff --git a/lib/internal/doParallel.js b/lib/internal/doParallel.js
deleted file mode 100644
index 2b76b68..0000000
--- a/lib/internal/doParallel.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import eachOf from '../eachOf';
-import wrapAsync from './wrapAsync';
-
-export default function doParallel(fn) {
-    return (obj, iteratee, cb) => fn(eachOf, obj, wrapAsync(iteratee), cb);
-}
diff --git a/lib/internal/doParallelLimit.js b/lib/internal/doParallelLimit.js
deleted file mode 100644
index 5e2703a..0000000
--- a/lib/internal/doParallelLimit.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import eachOfLimit from './eachOfLimit';
-import wrapAsync from './wrapAsync';
-
-export default function doParallelLimit(fn) {
-    return (obj, limit, iteratee, cb) => fn(eachOfLimit(limit), obj, wrapAsync(iteratee), cb);
-}
diff --git a/lib/internal/eachOfLimit.js b/lib/internal/eachOfLimit.js
index 999cbfa..ec6c8be 100644
--- a/lib/internal/eachOfLimit.js
+++ b/lib/internal/eachOfLimit.js
@@ -1,4 +1,3 @@
-import noop from './noop';
 import once from './once';
 
 import iterator from './iterator';
@@ -10,7 +9,7 @@ import breakLoop from './breakLoop';
 
 export default (limit) => {
     return (obj, iteratee, callback) => {
-        callback = once(callback || noop);
+        callback = once(callback);
         if (limit <= 0) {
             throw new RangeError('concurrency limit cannot be less than 1')
         }
diff --git a/lib/internal/filter.js b/lib/internal/filter.js
index ab37390..15d7ae3 100644
--- a/lib/internal/filter.js
+++ b/lib/internal/filter.js
@@ -1,5 +1,4 @@
 import isArrayLike from './isArrayLike';
-import noop from './noop';
 
 import wrapAsync from './wrapAsync';
 
@@ -40,5 +39,5 @@ function filterGeneric(eachfn, coll, iteratee, callback) {
 
 export default function _filter(eachfn, coll, iteratee, callback) {
     var filter = isArrayLike(coll) ? filterArray : filterGeneric;
-    return filter(eachfn, coll, wrapAsync(iteratee), callback || noop);
+    return filter(eachfn, coll, wrapAsync(iteratee), callback);
 }
diff --git a/lib/internal/map.js b/lib/internal/map.js
index 3da8d9c..092f76d 100644
--- a/lib/internal/map.js
+++ b/lib/internal/map.js
@@ -1,8 +1,6 @@
-import noop from './noop';
 import wrapAsync from './wrapAsync';
 
 export default function _asyncMap(eachfn, arr, iteratee, callback) {
-    callback = callback || noop;
     arr = arr || [];
     var results = [];
     var counter = 0;
diff --git a/lib/internal/noop.js b/lib/internal/noop.js
deleted file mode 100644
index ca6a744..0000000
--- a/lib/internal/noop.js
+++ /dev/null
@@ -1 +0,0 @@
-export default function noop() {}
diff --git a/lib/internal/queue.js b/lib/internal/queue.js
index 4c1f5cc..751b562 100644
--- a/lib/internal/queue.js
+++ b/lib/internal/queue.js
@@ -1,9 +1,10 @@
-import noop from './noop';
 import onlyOnce from './onlyOnce';
 import setImmediate from './setImmediate';
 import DLL from './DoublyLinkedList';
 import wrapAsync from './wrapAsync';
 
+const noop = () => {}
+
 export default function queue(worker, concurrency, payload) {
     if (concurrency == null) {
         concurrency = 1;
diff --git a/lib/mapValuesLimit.js b/lib/mapValuesLimit.js
index b88a1d8..af56f25 100644
--- a/lib/mapValuesLimit.js
+++ b/lib/mapValuesLimit.js
@@ -1,6 +1,5 @@
 import eachOfLimit from './internal/eachOfLimit'
 import awaitify from './internal/awaitify'
-import noop from './internal/noop';
 import once from './internal/once';
 import wrapAsync from './internal/wrapAsync';
 
@@ -27,7 +26,7 @@ import wrapAsync from './internal/wrapAsync';
  * @returns {Promise} a promise, if no callback is passed
  */
 function mapValuesLimit(obj, limit, iteratee, callback) {
-    callback = once(callback || noop);
+    callback = once(callback);
     var newObj = {};
     var _iteratee = wrapAsync(iteratee)
     return eachOfLimit(limit)(obj, (val, key, next) => {
diff --git a/lib/priorityQueue.js b/lib/priorityQueue.js
index aa9b578..4eaea38 100644
--- a/lib/priorityQueue.js
+++ b/lib/priorityQueue.js
@@ -1,7 +1,4 @@
-import noop from './internal/noop';
-
 import setImmediate from './setImmediate';
-
 import queue from './queue';
 
 /**
@@ -32,8 +29,7 @@ export default function(worker, concurrency) {
     var q = queue(worker, concurrency);
 
     // Override push to accept second parameter representing priority
-    q.push = function(data, priority, callback) {
-        if (callback == null) callback = noop;
+    q.push = function(data, priority = 0, callback = () => {}) {
         if (typeof callback !== 'function') {
             throw new Error('task callback must be a function');
         }
@@ -46,7 +42,6 @@ export default function(worker, concurrency) {
             return setImmediate(() => q.drain());
         }
 
-        priority = priority || 0;
         var nextNode = q._tasks.head;
         while (nextNode && priority >= nextNode.priority) {
             nextNode = nextNode.next;
diff --git a/lib/reduce.js b/lib/reduce.js
index b7434f0..571bc5a 100644
--- a/lib/reduce.js
+++ b/lib/reduce.js
@@ -1,5 +1,4 @@
 import eachOfSeries from './eachOfSeries';
-import noop from './internal/noop';
 import once from './internal/once';
 import wrapAsync from './internal/wrapAsync';
 import awaitify from './internal/awaitify'
@@ -46,7 +45,7 @@ import awaitify from './internal/awaitify'
  * });
  */
 function reduce(coll, memo, iteratee, callback) {
-    callback = once(callback || noop);
+    callback = once(callback);
     var _iteratee = wrapAsync(iteratee);
     return eachOfSeries(coll, (x, i, iterCb) => {
         _iteratee(memo, x, (err, v) => {
diff --git a/lib/tryEach.js b/lib/tryEach.js
index 98ecbd4..6677c9d 100644
--- a/lib/tryEach.js
+++ b/lib/tryEach.js
@@ -1,5 +1,4 @@
 import eachSeries from './eachSeries';
-import noop from './internal/noop';
 import wrapAsync from './internal/wrapAsync';
 import awaitify from './internal/awaitify'
 
@@ -44,7 +43,6 @@ import awaitify from './internal/awaitify'
 function tryEach(tasks, callback) {
     var error = null;
     var result;
-    callback = callback || noop;
     return eachSeries(tasks, (task, taskCb) => {
         wrapAsync(task)((err, ...args) => {
             if (args.length < 2) {
diff --git a/lib/whilst.js b/lib/whilst.js
index 2a7babd..1013d37 100644
--- a/lib/whilst.js
+++ b/lib/whilst.js
@@ -1,5 +1,3 @@
-import noop from './internal/noop';
-
 import onlyOnce from './internal/onlyOnce';
 import wrapAsync from './internal/wrapAsync';
 import awaitify from './internal/awaitify';
@@ -39,7 +37,7 @@ import awaitify from './internal/awaitify';
  * );
  */
 function whilst(test, iteratee, callback) {
-    callback = onlyOnce(callback || noop);
+    callback = onlyOnce(callback);
     var _fn = wrapAsync(iteratee);
     var _test = wrapAsync(test);
     var results
diff --git a/test/es2017/awaitableFunctions.js b/test/es2017/awaitableFunctions.js
index e226187..b45b56c 100644
--- a/test/es2017/awaitableFunctions.js
+++ b/test/es2017/awaitableFunctions.js
@@ -570,4 +570,10 @@ module.exports = function () {
         ], 2)
         expect(calls).to.eql([1, 2, 3, 4])
     });
+
+    /*
+     * Util
+     */
+
+
 };