diff options
author | Florian Dold <florian.dold@gmail.com> | 2016-11-03 01:33:53 +0100 |
---|---|---|
committer | Florian Dold <florian.dold@gmail.com> | 2016-11-03 01:33:53 +0100 |
commit | d1291f67551c58168af43698a359cb5ddfd266b0 (patch) | |
tree | 55a13ed29fe1915e3f42f1b1b7038dafa2e975a7 /node_modules/async/internal | |
parent | d0a0695fb5d34996850723f7d4b1b59c3df909c2 (diff) |
node_modules
Diffstat (limited to 'node_modules/async/internal')
-rw-r--r-- | node_modules/async/internal/DoublyLinkedList.js | 2 | ||||
-rw-r--r-- | node_modules/async/internal/applyEach.js | 6 | ||||
-rw-r--r-- | node_modules/async/internal/breakLoop.js | 9 | ||||
-rw-r--r-- | node_modules/async/internal/concat.js | 2 | ||||
-rw-r--r-- | node_modules/async/internal/consoleFunc.js | 8 | ||||
-rw-r--r-- | node_modules/async/internal/createTester.js | 29 | ||||
-rw-r--r-- | node_modules/async/internal/doLimit.js | 2 | ||||
-rw-r--r-- | node_modules/async/internal/eachOfLimit.js | 9 | ||||
-rw-r--r-- | node_modules/async/internal/findGetResult.js | 2 | ||||
-rw-r--r-- | node_modules/async/internal/initialParams.js | 6 | ||||
-rw-r--r-- | node_modules/async/internal/notId.js | 2 | ||||
-rw-r--r-- | node_modules/async/internal/once.js | 2 | ||||
-rw-r--r-- | node_modules/async/internal/onlyOnce.js | 2 | ||||
-rw-r--r-- | node_modules/async/internal/parallel.js | 6 | ||||
-rw-r--r-- | node_modules/async/internal/queue.js | 32 | ||||
-rw-r--r-- | node_modules/async/internal/setImmediate.js | 6 | ||||
-rw-r--r-- | node_modules/async/internal/withoutIndex.js | 2 |
17 files changed, 70 insertions, 57 deletions
diff --git a/node_modules/async/internal/DoublyLinkedList.js b/node_modules/async/internal/DoublyLinkedList.js index 7af3b5ffc..796d1230b 100644 --- a/node_modules/async/internal/DoublyLinkedList.js +++ b/node_modules/async/internal/DoublyLinkedList.js @@ -60,4 +60,4 @@ DLL.prototype.shift = function () { DLL.prototype.pop = function () { return this.tail && this.removeLink(this.tail); }; -module.exports = exports['default'];
\ No newline at end of file +module.exports = exports["default"];
\ No newline at end of file diff --git a/node_modules/async/internal/applyEach.js b/node_modules/async/internal/applyEach.js index 4035bfb3d..bfe97e686 100644 --- a/node_modules/async/internal/applyEach.js +++ b/node_modules/async/internal/applyEach.js @@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = applyEach; -var _rest = require('lodash/rest'); +var _baseRest = require('lodash/_baseRest'); -var _rest2 = _interopRequireDefault(_rest); +var _baseRest2 = _interopRequireDefault(_baseRest); var _initialParams = require('./initialParams'); @@ -16,7 +16,7 @@ var _initialParams2 = _interopRequireDefault(_initialParams); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function applyEach(eachfn) { - return (0, _rest2.default)(function (fns, args) { + return (0, _baseRest2.default)(function (fns, args) { var go = (0, _initialParams2.default)(function (args, callback) { var that = this; return eachfn(fns, function (fn, cb) { diff --git a/node_modules/async/internal/breakLoop.js b/node_modules/async/internal/breakLoop.js new file mode 100644 index 000000000..106505824 --- /dev/null +++ b/node_modules/async/internal/breakLoop.js @@ -0,0 +1,9 @@ +"use strict"; + +Object.defineProperty(exports, "__esModule", { + value: true +}); +// A temporary value used to identify if the loop should be broken. +// See #1064, #1293 +exports.default = {}; +module.exports = exports["default"];
\ No newline at end of file diff --git a/node_modules/async/internal/concat.js b/node_modules/async/internal/concat.js index 220308740..f2ffb5379 100644 --- a/node_modules/async/internal/concat.js +++ b/node_modules/async/internal/concat.js @@ -15,4 +15,4 @@ function concat(eachfn, arr, fn, callback) { callback(err, result); }); } -module.exports = exports['default'];
\ No newline at end of file +module.exports = exports["default"];
\ No newline at end of file diff --git a/node_modules/async/internal/consoleFunc.js b/node_modules/async/internal/consoleFunc.js index f7befa8ca..0fdab2fa0 100644 --- a/node_modules/async/internal/consoleFunc.js +++ b/node_modules/async/internal/consoleFunc.js @@ -9,15 +9,15 @@ var _arrayEach = require('lodash/_arrayEach'); var _arrayEach2 = _interopRequireDefault(_arrayEach); -var _rest = require('lodash/rest'); +var _baseRest = require('lodash/_baseRest'); -var _rest2 = _interopRequireDefault(_rest); +var _baseRest2 = _interopRequireDefault(_baseRest); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function consoleFunc(name) { - return (0, _rest2.default)(function (fn, args) { - fn.apply(null, args.concat([(0, _rest2.default)(function (err, args) { + return (0, _baseRest2.default)(function (fn, args) { + fn.apply(null, args.concat([(0, _baseRest2.default)(function (err, args) { if (typeof console === 'object') { if (err) { if (console.error) { diff --git a/node_modules/async/internal/createTester.js b/node_modules/async/internal/createTester.js index 4ec5db360..5330c38a3 100644 --- a/node_modules/async/internal/createTester.js +++ b/node_modules/async/internal/createTester.js @@ -9,32 +9,31 @@ var _noop = require('lodash/noop'); var _noop2 = _interopRequireDefault(_noop); +var _breakLoop = require('./breakLoop'); + +var _breakLoop2 = _interopRequireDefault(_breakLoop); + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _createTester(eachfn, check, getResult) { return function (arr, limit, iteratee, cb) { - function done(err) { + function done() { if (cb) { - if (err) { - cb(err); - } else { - cb(null, getResult(false)); - } + cb(null, getResult(false)); } } function wrappedIteratee(x, _, callback) { if (!cb) return callback(); iteratee(x, function (err, v) { - if (cb) { - if (err) { - cb(err); - cb = iteratee = false; - } else if (check(v)) { - cb(null, getResult(true, x)); - cb = iteratee = false; - } + // Check cb as another iteratee may have resolved with a + // value or error since we started this iteratee + if (cb && (err || check(v))) { + if (err) cb(err);else cb(err, getResult(true, x)); + cb = iteratee = false; + callback(err, _breakLoop2.default); + } else { + callback(); } - callback(); }); } if (arguments.length > 3) { diff --git a/node_modules/async/internal/doLimit.js b/node_modules/async/internal/doLimit.js index 5bd5a75c0..963c6088f 100644 --- a/node_modules/async/internal/doLimit.js +++ b/node_modules/async/internal/doLimit.js @@ -9,4 +9,4 @@ function doLimit(fn, limit) { return fn(iterable, limit, iteratee, callback); }; } -module.exports = exports['default'];
\ No newline at end of file +module.exports = exports["default"];
\ No newline at end of file diff --git a/node_modules/async/internal/eachOfLimit.js b/node_modules/async/internal/eachOfLimit.js index 27a94bfb8..e4c74bb12 100644 --- a/node_modules/async/internal/eachOfLimit.js +++ b/node_modules/async/internal/eachOfLimit.js @@ -21,6 +21,10 @@ var _onlyOnce = require('./onlyOnce'); var _onlyOnce2 = _interopRequireDefault(_onlyOnce); +var _breakLoop = require('./breakLoop'); + +var _breakLoop2 = _interopRequireDefault(_breakLoop); + function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } function _eachOfLimit(limit) { @@ -33,12 +37,13 @@ function _eachOfLimit(limit) { var done = false; var running = 0; - function iterateeCallback(err) { + function iterateeCallback(err, value) { running -= 1; if (err) { done = true; callback(err); - } else if (done && running <= 0) { + } else if (value === _breakLoop2.default || done && running <= 0) { + done = true; return callback(null); } else { replenish(); diff --git a/node_modules/async/internal/findGetResult.js b/node_modules/async/internal/findGetResult.js index e686a70a1..f8d3fe063 100644 --- a/node_modules/async/internal/findGetResult.js +++ b/node_modules/async/internal/findGetResult.js @@ -7,4 +7,4 @@ exports.default = _findGetResult; function _findGetResult(v, x) { return x; } -module.exports = exports['default'];
\ No newline at end of file +module.exports = exports["default"];
\ No newline at end of file diff --git a/node_modules/async/internal/initialParams.js b/node_modules/async/internal/initialParams.js index 244932094..0142132ff 100644 --- a/node_modules/async/internal/initialParams.js +++ b/node_modules/async/internal/initialParams.js @@ -5,15 +5,15 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = function (fn) { - return (0, _rest2.default)(function (args /*..., callback*/) { + return (0, _baseRest2.default)(function (args /*..., callback*/) { var callback = args.pop(); fn.call(this, args, callback); }); }; -var _rest = require('lodash/rest'); +var _baseRest = require('lodash/_baseRest'); -var _rest2 = _interopRequireDefault(_rest); +var _baseRest2 = _interopRequireDefault(_baseRest); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } diff --git a/node_modules/async/internal/notId.js b/node_modules/async/internal/notId.js index e0b471d47..0106c92c0 100644 --- a/node_modules/async/internal/notId.js +++ b/node_modules/async/internal/notId.js @@ -7,4 +7,4 @@ exports.default = notId; function notId(v) { return !v; } -module.exports = exports['default'];
\ No newline at end of file +module.exports = exports["default"];
\ No newline at end of file diff --git a/node_modules/async/internal/once.js b/node_modules/async/internal/once.js index a0e46cdf6..f0c379f75 100644 --- a/node_modules/async/internal/once.js +++ b/node_modules/async/internal/once.js @@ -12,4 +12,4 @@ function once(fn) { callFn.apply(this, arguments); }; } -module.exports = exports['default'];
\ No newline at end of file +module.exports = exports["default"];
\ No newline at end of file diff --git a/node_modules/async/internal/onlyOnce.js b/node_modules/async/internal/onlyOnce.js index 9892f96c9..f2e3001dc 100644 --- a/node_modules/async/internal/onlyOnce.js +++ b/node_modules/async/internal/onlyOnce.js @@ -12,4 +12,4 @@ function onlyOnce(fn) { callFn.apply(this, arguments); }; } -module.exports = exports['default'];
\ No newline at end of file +module.exports = exports["default"];
\ No newline at end of file diff --git a/node_modules/async/internal/parallel.js b/node_modules/async/internal/parallel.js index f04888c70..3915b20f5 100644 --- a/node_modules/async/internal/parallel.js +++ b/node_modules/async/internal/parallel.js @@ -13,9 +13,9 @@ var _isArrayLike = require('lodash/isArrayLike'); var _isArrayLike2 = _interopRequireDefault(_isArrayLike); -var _rest = require('lodash/rest'); +var _baseRest = require('lodash/_baseRest'); -var _rest2 = _interopRequireDefault(_rest); +var _baseRest2 = _interopRequireDefault(_baseRest); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -24,7 +24,7 @@ function _parallel(eachfn, tasks, callback) { var results = (0, _isArrayLike2.default)(tasks) ? [] : {}; eachfn(tasks, function (task, key, callback) { - task((0, _rest2.default)(function (err, args) { + task((0, _baseRest2.default)(function (err, args) { if (args.length <= 1) { args = args[0]; } diff --git a/node_modules/async/internal/queue.js b/node_modules/async/internal/queue.js index e54a6d7c9..6d53cc2e0 100644 --- a/node_modules/async/internal/queue.js +++ b/node_modules/async/internal/queue.js @@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", { }); exports.default = queue; -var _arrayEach = require('lodash/_arrayEach'); +var _baseIndexOf = require('lodash/_baseIndexOf'); -var _arrayEach2 = _interopRequireDefault(_arrayEach); +var _baseIndexOf2 = _interopRequireDefault(_baseIndexOf); var _isArray = require('lodash/isArray'); @@ -17,9 +17,9 @@ var _noop = require('lodash/noop'); var _noop2 = _interopRequireDefault(_noop); -var _rest = require('lodash/rest'); +var _baseRest = require('lodash/_baseRest'); -var _rest2 = _interopRequireDefault(_rest); +var _baseRest2 = _interopRequireDefault(_baseRest); var _onlyOnce = require('./onlyOnce'); @@ -56,9 +56,10 @@ function queue(worker, concurrency, payload) { q.drain(); }); } - (0, _arrayEach2.default)(data, function (task) { + + for (var i = 0, l = data.length; i < l; i++) { var item = { - data: task, + data: data[i], callback: callback || _noop2.default }; @@ -67,28 +68,27 @@ function queue(worker, concurrency, payload) { } else { q._tasks.push(item); } - }); + } (0, _setImmediate2.default)(q.process); } function _next(tasks) { - return (0, _rest2.default)(function (args) { + return (0, _baseRest2.default)(function (args) { workers -= 1; - (0, _arrayEach2.default)(tasks, function (task) { - (0, _arrayEach2.default)(workersList, function (worker, index) { - if (worker === task) { - workersList.splice(index, 1); - return false; - } - }); + for (var i = 0, l = tasks.length; i < l; i++) { + var task = tasks[i]; + var index = (0, _baseIndexOf2.default)(workersList, task, 0); + if (index >= 0) { + workersList.splice(index); + } task.callback.apply(task, args); if (args[0] != null) { q.error(args[0], task.data); } - }); + } if (workers <= q.concurrency - q.buffer) { q.unsaturated(); diff --git a/node_modules/async/internal/setImmediate.js b/node_modules/async/internal/setImmediate.js index 6d7e7fd15..18f170d60 100644 --- a/node_modules/async/internal/setImmediate.js +++ b/node_modules/async/internal/setImmediate.js @@ -7,9 +7,9 @@ exports.hasNextTick = exports.hasSetImmediate = undefined; exports.fallback = fallback; exports.wrap = wrap; -var _rest = require('lodash/rest'); +var _baseRest = require('lodash/_baseRest'); -var _rest2 = _interopRequireDefault(_rest); +var _baseRest2 = _interopRequireDefault(_baseRest); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } @@ -21,7 +21,7 @@ function fallback(fn) { } function wrap(defer) { - return (0, _rest2.default)(function (fn, args) { + return (0, _baseRest2.default)(function (fn, args) { defer(function () { fn.apply(null, args); }); diff --git a/node_modules/async/internal/withoutIndex.js b/node_modules/async/internal/withoutIndex.js index 240a840af..2bd35796a 100644 --- a/node_modules/async/internal/withoutIndex.js +++ b/node_modules/async/internal/withoutIndex.js @@ -9,4 +9,4 @@ function _withoutIndex(iteratee) { return iteratee(value, callback); }; } -module.exports = exports['default'];
\ No newline at end of file +module.exports = exports["default"];
\ No newline at end of file |