Merge pull request #1528 from bfred-it/drop-lodash

Drop lodash

Makefile

@@ -9,7 +9,6 @@ PACKAGE = asyncjs
 REQUIRE_NAME = async
 UGLIFY = uglifyjs
 XYZ = support/xyz.sh --repo git@github.com:caolan/async.git
-COPY_ES = sed -E "s/(import.+)lodash/\1lodash-es/g"
 
 BUILDDIR = build
 BUILD_ES = build-es
@@ -95,12 +94,12 @@ build-es: $(ES_MODULES)
 
 $(BUILD_ES)/%.js: lib/%.js
 	mkdir -p "$(@D)"
-	$(COPY_ES) $< > $@
+	cat $< > $@
 
 define COPY_ES_ALIAS
 $A: $(shell node $(SCRIPTS)/get-alias.js $A)
 	mkdir -p "$$(@D)"
-	$(COPY_ES) $$< > $$@
+	cat $$< > $$@
 endef
 $(foreach A,$(ALIAS_ES),$(eval $(COPY_ES_ALIAS)))
 

lib/asyncify.js

@@ -1,4 +1,3 @@
-import isObject from 'lodash/isObject';
 import initialParams from './internal/initialParams';
 import setImmediate from './internal/setImmediate';
 
@@ -67,7 +66,7 @@ export default function asyncify(func) {
             return callback(e);
         }
         // if result is Promise object
-        if (isObject(result) && typeof result.then === 'function') {
+        if (result && typeof result.then === 'function') {
             result.then(function(value) {
                 invokeCallback(callback, null, value);
             }, function(err) {

lib/auto.js

@@ -1,10 +1,6 @@
-import arrayEach from 'lodash/_arrayEach';
-import forOwn from 'lodash/_baseForOwn';
-import indexOf from 'lodash/_baseIndexOf';
-import isArray from 'lodash/isArray';
-import okeys from 'lodash/keys';
-import noop from 'lodash/noop';
+import noop from './internal/noop';
 
+import forOwn from './internal/forOwn';
 import slice from './internal/slice';
 import once from './internal/once';
 import onlyOnce from './internal/onlyOnce';
@@ -96,8 +92,7 @@ export default function (tasks, concurrency, callback) {
         concurrency = null;
     }
     callback = once(callback || noop);
-    var keys = okeys(tasks);
-    var numTasks = keys.length;
+    var numTasks = Object.keys(tasks).length;
     if (!numTasks) {
         return callback(null);
     }
@@ -119,7 +114,7 @@ export default function (tasks, concurrency, callback) {
     var uncheckedDependencies = {};
 
     forOwn(tasks, function (task, key) {
-        if (!isArray(task)) {
+        if (!Array.isArray(task)) {
             // no dependencies
             enqueueTask(key, [task]);
             readyToCheck.push(key);
@@ -135,7 +130,7 @@ export default function (tasks, concurrency, callback) {
         }
         uncheckedDependencies[key] = remainingDependencies;
 
-        arrayEach(dependencies, function (dependencyName) {
+        dependencies.forEach(function (dependencyName) {
             if (!tasks[dependencyName]) {
                 throw new Error('async.auto task `' + key +
                     '` has a non-existent dependency `' +
@@ -182,7 +177,7 @@ export default function (tasks, concurrency, callback) {
 
     function taskComplete(taskName) {
         var taskListeners = listeners[taskName] || [];
-        arrayEach(taskListeners, function (fn) {
+        taskListeners.forEach(function (fn) {
             fn();
         });
         processQueue();
@@ -231,7 +226,7 @@ export default function (tasks, concurrency, callback) {
         while (readyToCheck.length) {
             currentTask = readyToCheck.pop();
             counter++;
-            arrayEach(getDependents(currentTask), function (dependent) {
+            getDependents(currentTask).forEach(function (dependent) {
                 if (--uncheckedDependencies[dependent] === 0) {
                     readyToCheck.push(dependent);
                 }
@@ -248,7 +243,7 @@ export default function (tasks, concurrency, callback) {
     function getDependents(taskName) {
         var result = [];
         forOwn(tasks, function (task, key) {
-            if (isArray(task) && indexOf(task, taskName, 0) >= 0) {
+            if (Array.isArray(task) && task.indexOf(taskName) >= 0) {
                 result.push(key);
             }
         });

lib/autoInject.js

@@ -1,8 +1,5 @@
 import auto from './auto';
-import forOwn from 'lodash/_baseForOwn';
-import arrayMap from 'lodash/_arrayMap';
-import isArray from 'lodash/isArray';
-import trim from 'lodash/trim';
+import forOwn from './internal/forOwn';
 import wrapAsync from './internal/wrapAsync';
 import { isAsync } from './internal/wrapAsync';
 
@@ -16,7 +13,7 @@ function parseParams(func) {
     func = func.match(FN_ARGS)[2].replace(' ', '');
     func = func ? func.split(FN_ARG_SPLIT) : [];
     func = func.map(function (arg){
-        return trim(arg.replace(FN_ARG, ''));
+        return arg.replace(FN_ARG, '').trim();
     });
     return func;
 }
@@ -113,7 +110,7 @@ export default function autoInject(tasks, callback) {
             (!fnIsAsync && taskFn.length === 1) ||
             (fnIsAsync && taskFn.length === 0);
 
-        if (isArray(taskFn)) {
+        if (Array.isArray(taskFn)) {
             params = taskFn.slice(0, -1);
             taskFn = taskFn[taskFn.length - 1];
 
@@ -134,7 +131,7 @@ export default function autoInject(tasks, callback) {
         }
 
         function newTask(results, taskCb) {
-            var newArgs = arrayMap(params, function (name) {
+            var newArgs = params.map(function (name) {
                 return results[name];
             });
             newArgs.push(taskCb);

lib/concatLimit.js

@@ -1,4 +1,4 @@
-import noop from 'lodash/noop';
+import noop from './internal/noop';
 import wrapAsync from './internal/wrapAsync';
 import slice from './internal/slice';
 import mapLimit from './mapLimit';

lib/detect.js

@@ -1,5 +1,4 @@
-import identity from 'lodash/identity';
-
+import identity from './internal/identity';
 import createTester from './internal/createTester';
 import doParallel from './internal/doParallel';
 import findGetResult from './internal/findGetResult';

lib/detectLimit.js

@@ -1,5 +1,4 @@
-import identity from 'lodash/identity';
-
+import identity from './internal/identity';
 import createTester from './internal/createTester';
 import doParallelLimit from './internal/doParallelLimit';
 import findGetResult from './internal/findGetResult';

lib/doDuring.js

@@ -1,4 +1,4 @@
-import noop from 'lodash/noop';
+import noop from './internal/noop';
 import slice from './internal/slice';
 import onlyOnce from './internal/onlyOnce';
 import wrapAsync from './internal/wrapAsync';

lib/doWhilst.js

@@ -1,4 +1,4 @@
-import noop from 'lodash/noop';
+import noop from './internal/noop';
 import slice from './internal/slice';
 
 import onlyOnce from './internal/onlyOnce';

lib/during.js

@@ -1,4 +1,4 @@
-import noop from 'lodash/noop';
+import noop from './internal/noop';
 import onlyOnce from './internal/onlyOnce';
 import wrapAsync from './internal/wrapAsync';
 

lib/eachOf.js

@@ -1,9 +1,8 @@
-import isArrayLike from 'lodash/isArrayLike';
-
+import isArrayLike from './internal/isArrayLike';
 import breakLoop from './internal/breakLoop';
 import eachOfLimit from './eachOfLimit';
 import doLimit from './internal/doLimit';
-import noop from 'lodash/noop';
+import noop from './internal/noop';
 import once from './internal/once';
 import onlyOnce from './internal/onlyOnce';
 import wrapAsync from './internal/wrapAsync';

lib/forever.js

@@ -1,5 +1,4 @@
-import noop from 'lodash/noop';
-
+import noop from './internal/noop';
 import onlyOnce from './internal/onlyOnce';
 import ensureAsync from './ensureAsync';
 import wrapAsync from './internal/wrapAsync';

lib/groupByLimit.js

@@ -1,4 +1,4 @@
-import noop from 'lodash/noop';
+import noop from './internal/noop';
 import mapLimit from './mapLimit';
 import wrapAsync from './internal/wrapAsync';
 /**

lib/internal/consoleFunc.js

@@ -1,4 +1,3 @@
-import arrayEach from 'lodash/_arrayEach';
 import slice from './slice';
 import wrapAsync from './wrapAsync';
 
@@ -13,7 +12,7 @@ export default function consoleFunc(name) {
                         console.error(err);
                     }
                 } else if (console[name]) {
-                    arrayEach(args, function (x) {
+                    args.forEach(function (x) {
                         console[name](x);
                     });
                 }

lib/internal/createTester.js

@@ -1,4 +1,4 @@
-import noop from 'lodash/noop';
+import noop from './noop';
 import breakLoop from './breakLoop';
 
 export default function _createTester(check, getResult) {

lib/internal/eachOfLimit.js

@@ -1,4 +1,4 @@
-import noop from 'lodash/noop';
+import noop from './noop';
 import once from './once';
 
 import iterator from './iterator';

lib/internal/filter.js

@@ -1,7 +1,6 @@
-import arrayMap from 'lodash/_arrayMap';
-import isArrayLike from 'lodash/isArrayLike';
-import property from 'lodash/_baseProperty';
-import noop from 'lodash/noop';
+import isArrayLike from './isArrayLike';
+import property from './property';
+import noop from './noop';
 
 import wrapAsync from './wrapAsync';
 
@@ -39,9 +38,9 @@ function filterGeneric(eachfn, coll, iteratee, callback) {
         if (err) {
             callback(err);
         } else {
-            callback(null, arrayMap(results.sort(function (a, b) {
+            callback(null, results.sort(function (a, b) {
                 return a.index - b.index;
-            }), property('value')));
+            }).map(property('value')));
         }
     });
 }

lib/internal/forOwn.js

@@ -0,0 +1,8 @@
+export default function forOwn(object, callback) {
+    if (!object) {
+        return;
+    }
+    Object.keys(object).forEach(function (key) {
+        callback(object[key], key);
+    });
+}

lib/internal/identity.js

@@ -0,0 +1,3 @@
+export default function identity(value) {
+    return value;
+}

lib/internal/isArrayLike.js

@@ -0,0 +1,6 @@
+export default function isArrayLike(value) {
+    return value &&
+        typeof value.length === 'number' &&
+        value.length >= 0 &&
+        value.length % 1 === 0;
+}

lib/internal/iterator.js

@@ -1,6 +1,5 @@
-import isArrayLike from 'lodash/isArrayLike';
+import isArrayLike from './isArrayLike';
 import getIterator from './getIterator';
-import keys from 'lodash/keys';
 
 function createArrayIterator(coll) {
     var i = -1;
@@ -22,7 +21,7 @@ function createES2015Iterator(iterator) {
 }
 
 function createObjectIterator(obj) {
-    var okeys = keys(obj);
+    var okeys = obj ? Object.keys(obj) : [];
     var i = -1;
     var len = okeys.length;
     return function next() {

lib/internal/map.js

@@ -1,4 +1,4 @@
-import noop from 'lodash/noop';
+import noop from './noop';
 import wrapAsync from './wrapAsync';
 
 export default function _asyncMap(eachfn, arr, iteratee, callback) {

lib/internal/noop.js

@@ -0,0 +1 @@
+export default function noop() {}

lib/internal/parallel.js

@@ -1,5 +1,5 @@
-import noop from 'lodash/noop';
-import isArrayLike from 'lodash/isArrayLike';
+import isArrayLike from './isArrayLike';
+import noop from './noop';
 import slice from './slice';
 import wrapAsync from './wrapAsync';
 

lib/internal/property.js

@@ -0,0 +1,5 @@
+export default function property(property) {
+    return function (object) {
+        return object[property];
+    }
+}

lib/internal/queue.js

@@ -1,7 +1,4 @@
-import indexOf from 'lodash/_baseIndexOf';
-import isArray from 'lodash/isArray';
-import noop from 'lodash/noop';
-
+import noop from './noop';
 import onlyOnce from './onlyOnce';
 import setImmediate from './setImmediate';
 import DLL from './DoublyLinkedList';
@@ -25,7 +22,7 @@ export default function queue(worker, concurrency, payload) {
             throw new Error('task callback must be a function');
         }
         q.started = true;
-        if (!isArray(data)) {
+        if (!Array.isArray(data)) {
             data = [data];
         }
         if (data.length === 0 && q.idle()) {
@@ -64,7 +61,7 @@ export default function queue(worker, concurrency, payload) {
             for (var i = 0, l = tasks.length; i < l; i++) {
                 var task = tasks[i];
 
-                var index = indexOf(workersList, task, 0);
+                var index = workersList.indexOf(task);
                 if (index === 0) {
                     workersList.shift();
                 } else if (index > 0) {

lib/internal/range.js

@@ -0,0 +1,7 @@
+export default function range(size) {
+    var result = Array(size);
+    while (size--) {
+        result[size] = size;
+    }
+    return result;
+}

lib/mapValuesLimit.js

@@ -1,6 +1,6 @@
 import eachOfLimit from './eachOfLimit';
 
-import noop from 'lodash/noop';
+import noop from './internal/noop';
 import once from './internal/once';
 import wrapAsync from './internal/wrapAsync';
 

lib/memoize.js

@@ -1,6 +1,5 @@
-import identity from 'lodash/identity';
+import identity from './internal/identity';
 import slice from './internal/slice';
-
 import setImmediate from './internal/setImmediate';
 import initialParams from './internal/initialParams';
 import wrapAsync from './internal/wrapAsync';

lib/priorityQueue.js

@@ -1,5 +1,4 @@
-import isArray from 'lodash/isArray';
-import noop from 'lodash/noop';
+import noop from './internal/noop';
 
 import setImmediate from './setImmediate';
 
@@ -39,7 +38,7 @@ export default function(worker, concurrency) {
             throw new Error('task callback must be a function');
         }
         q.started = true;
-        if (!isArray(data)) {
+        if (!Array.isArray(data)) {
             data = [data];
         }
         if (data.length === 0) {

lib/race.js

@@ -1,5 +1,4 @@
-import isArray from 'lodash/isArray';
-import noop from 'lodash/noop';
+import noop from './internal/noop';
 import once from './internal/once';
 import wrapAsync from './internal/wrapAsync';
 
@@ -41,7 +40,7 @@ import wrapAsync from './internal/wrapAsync';
  */
 export default function race(tasks, callback) {
     callback = once(callback || noop);
-    if (!isArray(tasks)) return callback(new TypeError('First argument to race must be an array of functions'));
+    if (!Array.isArray(tasks)) return callback(new TypeError('First argument to race must be an array of functions'));
     if (!tasks.length) return callback();
     for (var i = 0, l = tasks.length; i < l; i++) {
         wrapAsync(tasks[i])(callback);