chore!: Rework extension helper to get options

gulpjs · Aug 25, 2022 · 89857b6 · 89857b6
1 parent a1ba61d
commit 89857b6
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 37 deletions.
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -2,7 +2,10 @@
 
 function noop() {}
 
-function getExtensions(lastArg) {
+function getOptions(args) {
+  // TODO: use `.at(-1)` when the API is available
+  var lastArg = args.slice(-1)[0];
+
   if (typeof lastArg !== 'function') {
     return lastArg;
   }
@@ -85,7 +88,7 @@ function verifyEachArg(arg, argIdx, args) {
 }
 
 module.exports = {
-  getExtensions: getExtensions,
+  getOptions: getOptions,
   onSettled: buildOnSettled,
   verifyArguments: verifyArguments,
 };
diff --git a/lib/parallel.js b/lib/parallel.js
@@ -12,15 +12,14 @@ function iterator(fn, key, cb) {
 function buildParallel() {
   var args = helpers.verifyArguments(arguments);
 
-  // TODO: use `.at(-1)` when the API is available
-  var extensions = helpers.getExtensions(args.slice(-1)[0]);
+  var options = helpers.getOptions(args);
 
-  if (extensions) {
+  if (options) {
     args = args.slice(0, -1);
   }
 
   function parallel(done) {
-    nowAndLater.map(args, iterator, extensions, done);
+    nowAndLater.map(args, iterator, options, done);
   }
 
   return parallel;

diff --git a/lib/series.js b/lib/series.js
@@ -12,15 +12,14 @@ function iterator(fn, key, cb) {
 function buildSeries() {
   var args = helpers.verifyArguments(arguments);
 
-  // TODO: use `.at(-1)` when the API is available
-  var extensions = helpers.getExtensions(args.slice(-1)[0]);
+  var options = helpers.getOptions(args);
 
-  if (extensions) {
+  if (options) {
     args = args.slice(0, -1);
   }
 
   function series(done) {
-    nowAndLater.mapSeries(args, iterator, extensions, done);
+    nowAndLater.mapSeries(args, iterator, options, done);
   }
 
   return series;

diff --git a/lib/settleParallel.js b/lib/settleParallel.js
@@ -12,16 +12,15 @@ function iterator(fn, key, cb) {
 function buildSettleParallel() {
   var args = helpers.verifyArguments(arguments);
 
-  // TODO: use `.at(-1)` when the API is available
-  var extensions = helpers.getExtensions(args.slice(-1)[0]);
+  var options = helpers.getOptions(args);
 
-  if (extensions) {
+  if (options) {
     args = args.slice(0, -1);
   }
 
   function settleParallel(done) {
     var onSettled = helpers.onSettled(done);
-    nowAndLater.map(args, iterator, extensions, onSettled);
+    nowAndLater.map(args, iterator, options, onSettled);
   }
 
   return settleParallel;

diff --git a/lib/settleSeries.js b/lib/settleSeries.js
@@ -12,16 +12,15 @@ function iterator(fn, key, cb) {
 function buildSettleSeries() {
   var args = helpers.verifyArguments(arguments);
 
-  // TODO: use `.at(-1)` when the API is available
-  var extensions = helpers.getExtensions(args.slice(-1)[0]);
+  var options = helpers.getOptions(args);
 
-  if (extensions) {
+  if (options) {
     args = args.slice(0, -1);
   }
 
   function settleSeries(done) {
     var onSettled = helpers.onSettled(done);
-    nowAndLater.mapSeries(args, iterator, extensions, onSettled);
+    nowAndLater.mapSeries(args, iterator, options, onSettled);
   }
 
   return settleSeries;

diff --git a/test/getExtensions.js b/test/getExtensions.js
diff --git a/test/getOptions.js b/test/getOptions.js
@@ -0,0 +1,19 @@
+'use strict';
+
+var expect = require('expect');
+
+var getOptions = require('../lib/helpers').getOptions;
+
+describe('getOptions', function () {
+  it('should return the argument if it is an object', function (done) {
+    var args = [{}];
+    expect(getOptions(args)).toEqual({});
+    done();
+  });
+
+  it('should return undefined if argument is not an object', function (done) {
+    var args = [function () {}];
+    expect(getOptions(args)).toEqual(undefined);
+    done();
+  });
+});