From 061ccc4f51194f4513ae333c940621e1f92eba58 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Wed, 2 Aug 2017 13:42:23 -0700 Subject: [PATCH] Upgrade: Update now-and-later dependency & add iterator wrapper to handle new signature (closes #31) --- lib/parallel.js | 6 +++++- lib/series.js | 6 +++++- lib/settleParallel.js | 6 +++++- lib/settleSeries.js | 6 +++++- package.json | 2 +- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/lib/parallel.js b/lib/parallel.js index d375d5b..133a5c1 100644 --- a/lib/parallel.js +++ b/lib/parallel.js @@ -7,6 +7,10 @@ var nowAndLater = require('now-and-later'); var helpers = require('./helpers'); +function iterator(fn, key, cb) { + return asyncDone(fn, cb); +} + function buildParallel() { var args = helpers.verifyArguments(arguments); @@ -17,7 +21,7 @@ function buildParallel() { } function parallel(done) { - nowAndLater.map(args, asyncDone, extensions, done); + nowAndLater.map(args, iterator, extensions, done); } return parallel; diff --git a/lib/series.js b/lib/series.js index b59f76e..8b9f284 100644 --- a/lib/series.js +++ b/lib/series.js @@ -7,6 +7,10 @@ var nowAndLater = require('now-and-later'); var helpers = require('./helpers'); +function iterator(fn, key, cb) { + return asyncDone(fn, cb); +} + function buildSeries() { var args = helpers.verifyArguments(arguments); @@ -17,7 +21,7 @@ function buildSeries() { } function series(done) { - nowAndLater.mapSeries(args, asyncDone, extensions, done); + nowAndLater.mapSeries(args, iterator, extensions, done); } return series; diff --git a/lib/settleParallel.js b/lib/settleParallel.js index 4b9a361..a022e16 100644 --- a/lib/settleParallel.js +++ b/lib/settleParallel.js @@ -7,6 +7,10 @@ var nowAndLater = require('now-and-later'); var helpers = require('./helpers'); +function iterator(fn, key, cb) { + return asyncSettle(fn, cb); +} + function buildSettleParallel() { var args = helpers.verifyArguments(arguments); @@ -18,7 +22,7 @@ function buildSettleParallel() { function settleParallel(done) { var onSettled = helpers.onSettled(done); - nowAndLater.map(args, asyncSettle, extensions, onSettled); + nowAndLater.map(args, iterator, extensions, onSettled); } return settleParallel; diff --git a/lib/settleSeries.js b/lib/settleSeries.js index 25c2dbd..727ada6 100644 --- a/lib/settleSeries.js +++ b/lib/settleSeries.js @@ -7,6 +7,10 @@ var nowAndLater = require('now-and-later'); var helpers = require('./helpers'); +function iterator(fn, key, cb) { + return asyncSettle(fn, cb); +} + function buildSettleSeries() { var args = helpers.verifyArguments(arguments); @@ -18,7 +22,7 @@ function buildSettleSeries() { function settleSeries(done) { var onSettled = helpers.onSettled(done); - nowAndLater.mapSeries(args, asyncSettle, extensions, onSettled); + nowAndLater.mapSeries(args, iterator, extensions, onSettled); } return settleSeries; diff --git a/package.json b/package.json index dd179e0..206c77b 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "array-last": "^1.1.1", "async-done": "^1.2.2", "async-settle": "^1.0.0", - "now-and-later": "^1.0.0" + "now-and-later": "^2.0.0" }, "devDependencies": { "eslint": "^1.7.3",