Skip to content

Commit 7ea2cec

Browse files
committed
Update built files
1 parent bef7bef commit 7ea2cec

File tree

2 files changed

+51
-49
lines changed

2 files changed

+51
-49
lines changed

dist/async.js

+50-48
Original file line numberDiff line numberDiff line change
@@ -1512,12 +1512,11 @@
15121512
res(args);
15131513
}
15141514

1515-
var item = {
1515+
var item = q._createTaskItem(
15161516
data,
1517-
callback: rejectOnError ?
1518-
promiseCallback :
1517+
rejectOnError ? promiseCallback :
15191518
(callback || promiseCallback)
1520-
};
1519+
);
15211520

15221521
if (insertAtFront) {
15231522
q._tasks.unshift(item);
@@ -1599,6 +1598,12 @@
15991598
var isProcessing = false;
16001599
var q = {
16011600
_tasks: new DLL(),
1601+
_createTaskItem (data, callback) {
1602+
return {
1603+
data,
1604+
callback
1605+
};
1606+
},
16021607
*[Symbol.iterator] () {
16031608
yield* q._tasks[Symbol.iterator]();
16041609
},
@@ -2348,7 +2353,7 @@
23482353
* Result will be the first item in the array that passes the truth test
23492354
* (iteratee) or the value `undefined` if none passed. Invoked with
23502355
* (err, result).
2351-
* @returns A Promise, if no callback is passed
2356+
* @returns {Promise} a promise, if a callback is omitted
23522357
* @example
23532358
*
23542359
* // dir1 is a directory that contains file1.txt, file2.txt
@@ -2420,7 +2425,7 @@
24202425
* Result will be the first item in the array that passes the truth test
24212426
* (iteratee) or the value `undefined` if none passed. Invoked with
24222427
* (err, result).
2423-
* @returns a Promise if no callback is passed
2428+
* @returns {Promise} a promise, if a callback is omitted
24242429
*/
24252430
function detectLimit(coll, limit, iteratee, callback) {
24262431
return _createTester(bool => bool, (res, item) => item)(eachOfLimit(limit), coll, iteratee, callback)
@@ -2446,7 +2451,7 @@
24462451
* Result will be the first item in the array that passes the truth test
24472452
* (iteratee) or the value `undefined` if none passed. Invoked with
24482453
* (err, result).
2449-
* @returns a Promise if no callback is passed
2454+
* @returns {Promise} a promise, if a callback is omitted
24502455
*/
24512456
function detectSeries(coll, iteratee, callback) {
24522457
return _createTester(bool => bool, (res, item) => item)(eachOfLimit(1), coll, iteratee, callback)
@@ -3662,7 +3667,7 @@
36623667

36633668
var nextTick = wrap(_defer$1);
36643669

3665-
var _parallel = awaitify((eachfn, tasks, callback) => {
3670+
var parallel = awaitify((eachfn, tasks, callback) => {
36663671
var results = isArrayLike(tasks) ? [] : {};
36673672

36683673
eachfn(tasks, (task, key, taskCb) => {
@@ -3835,8 +3840,8 @@
38353840
* }
38363841
*
38373842
*/
3838-
function parallel(tasks, callback) {
3839-
return _parallel(eachOf$1, tasks, callback);
3843+
function parallel$1(tasks, callback) {
3844+
return parallel(eachOf$1, tasks, callback);
38403845
}
38413846

38423847
/**
@@ -3860,7 +3865,7 @@
38603865
* @returns {Promise} a promise, if a callback is not passed
38613866
*/
38623867
function parallelLimit(tasks, limit, callback) {
3863-
return _parallel(eachOfLimit(limit), tasks, callback);
3868+
return parallel(eachOfLimit(limit), tasks, callback);
38643869
}
38653870

38663871
/**
@@ -4144,54 +4149,51 @@
41444149
* @param {number} concurrency - An `integer` for determining how many `worker`
41454150
* functions should be run in parallel. If omitted, the concurrency defaults to
41464151
* `1`. If the concurrency is `0`, an error is thrown.
4147-
* @returns {module:ControlFlow.QueueObject} A priorityQueue object to manage the tasks. There are two
4152+
* @returns {module:ControlFlow.QueueObject} A priorityQueue object to manage the tasks. There are three
41484153
* differences between `queue` and `priorityQueue` objects:
41494154
* * `push(task, priority, [callback])` - `priority` should be a number. If an
41504155
* array of `tasks` is given, all tasks will be assigned the same priority.
4151-
* * The `unshift` method was removed.
4156+
* * `pushAsync(task, priority, [callback])` - the same as `priorityQueue.push`,
4157+
* except this returns a promise that rejects if an error occurs.
4158+
* * The `unshift` and `unshiftAsync` methods were removed.
41524159
*/
41534160
function priorityQueue(worker, concurrency) {
41544161
// Start with a normal queue
41554162
var q = queue$1(worker, concurrency);
4156-
var processingScheduled = false;
4163+
4164+
var {
4165+
push,
4166+
pushAsync
4167+
} = q;
41574168

41584169
q._tasks = new Heap();
4170+
q._createTaskItem = ({data, priority}, callback) => {
4171+
return {
4172+
data,
4173+
priority,
4174+
callback
4175+
};
4176+
};
41594177

4160-
// Override push to accept second parameter representing priority
4161-
q.push = function(data, priority = 0, callback = () => {}) {
4162-
if (typeof callback !== 'function') {
4163-
throw new Error('task callback must be a function');
4178+
function createDataItems(tasks, priority) {
4179+
if (!Array.isArray(tasks)) {
4180+
return {data: tasks, priority};
41644181
}
4165-
q.started = true;
4166-
if (!Array.isArray(data)) {
4167-
data = [data];
4168-
}
4169-
if (data.length === 0 && q.idle()) {
4170-
// call drain immediately if there are no tasks
4171-
return setImmediate$1(() => q.drain());
4172-
}
4173-
4174-
for (var i = 0, l = data.length; i < l; i++) {
4175-
var item = {
4176-
data: data[i],
4177-
priority,
4178-
callback
4179-
};
4182+
return tasks.map(data => { return {data, priority}; });
4183+
}
41804184

4181-
q._tasks.push(item);
4182-
}
4185+
// Override push to accept second parameter representing priority
4186+
q.push = function(data, priority = 0, callback) {
4187+
return push(createDataItems(data, priority), callback);
4188+
};
41834189

4184-
if (!processingScheduled) {
4185-
processingScheduled = true;
4186-
setImmediate$1(() => {
4187-
processingScheduled = false;
4188-
q.process();
4189-
});
4190-
}
4190+
q.pushAsync = function(data, priority = 0, callback) {
4191+
return pushAsync(createDataItems(data, priority), callback);
41914192
};
41924193

4193-
// Remove unshift function
4194+
// Remove unshift functions
41944195
delete q.unshift;
4196+
delete q.unshiftAsync;
41954197

41964198
return q;
41974199
}
@@ -4212,7 +4214,7 @@
42124214
* @param {Function} callback - A callback to run once any of the functions have
42134215
* completed. This function gets an error or result from the first function that
42144216
* completed. Invoked with (err, result).
4215-
* @returns undefined
4217+
* @returns {Promise} a promise, if a callback is omitted
42164218
* @example
42174219
*
42184220
* async.race([
@@ -4905,7 +4907,7 @@
49054907
*
49064908
*/
49074909
function series(tasks, callback) {
4908-
return _parallel(eachOfSeries$1, tasks, callback);
4910+
return parallel(eachOfSeries$1, tasks, callback);
49094911
}
49104912

49114913
/**
@@ -5737,7 +5739,7 @@
57375739
* @param {Function} [callback] - An optional callback to run once all the
57385740
* functions have completed. This will be passed the results of the last task's
57395741
* callback. Invoked with (err, [results]).
5740-
* @returns undefined
5742+
* @returns {Promise} a promise, if a callback is omitted
57415743
* @example
57425744
*
57435745
* async.waterfall([
@@ -5885,7 +5887,7 @@
58855887
mapValuesSeries,
58865888
memoize,
58875889
nextTick,
5888-
parallel,
5890+
parallel: parallel$1,
58895891
parallelLimit,
58905892
priorityQueue,
58915893
queue: queue$1,
@@ -5993,7 +5995,7 @@
59935995
exports.mapValuesSeries = mapValuesSeries;
59945996
exports.memoize = memoize;
59955997
exports.nextTick = nextTick;
5996-
exports.parallel = parallel;
5998+
exports.parallel = parallel$1;
59975999
exports.parallelLimit = parallelLimit;
59986000
exports.priorityQueue = priorityQueue;
59996001
exports.queue = queue$1;

0 commit comments

Comments
 (0)