Update: Consolidate individual helper modules to a single file

gulpjs · Jun 27, 2016 · ae16385 · ae16385
1 parent 2dda613
commit ae16385
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 92 deletions.
diff --git a/lib/getExtensions.js b/lib/getExtensions.js
diff --git a/lib/helpers.js b/lib/helpers.js
@@ -0,0 +1,63 @@
+'use strict';
+
+var assert = require('assert');
+
+var _ = require('lodash');
+
+function getExtensions(lastArg){
+  if(typeof lastArg !== 'function'){
+    return lastArg;
+  }
+
+  return {};
+}
+
+function buildOnSettled(done){
+  function onSettled(error, result){
+    var settledErrors = _.where(result, { state: 'error' });
+    var settledResults = _.where(result, { state: 'success' });
+
+    var errors;
+    if(settledErrors.length){
+      errors = _.pluck(settledErrors, 'value');
+    }
+
+    var results;
+    if(settledResults.length){
+      results = _.pluck(settledResults, 'value');
+    }
+
+    error = error || errors;
+    if(error){
+      return done(error, results);
+    }
+
+    done(undefined, results);
+  }
+
+  return onSettled;
+}
+
+function verifyArguments(args){
+  args = _.flatten(args);
+
+  assert.ok(args.length, 'A set of functions to combine is required');
+
+  _.forEach(args, function(arg, argIdx){
+    var isFunction = _.isFunction(arg);
+    if(isFunction){
+      return;
+    }
+
+    var msg = 'Only functions can be combined, got ' + typeof arg + ' for argument ' + argIdx;
+    assert.ok(isFunction, msg);
+  });
+
+  return args;
+}
+
+module.exports = {
+  getExtensions: getExtensions,
+  onSettled: buildOnSettled,
+  verifyArguments: verifyArguments
+};
diff --git a/lib/onSettled.js b/lib/onSettled.js
diff --git a/lib/parallel.js b/lib/parallel.js
@@ -4,13 +4,12 @@ var _ = require('lodash');
 var asyncDone = require('async-done');
 var nowAndLater = require('now-and-later');
 
-var getExtensions = require('./getExtensions');
-var verifyArguments = require('./verifyArguments');
+var helpers = require('./helpers');
 
 function buildParallel(){
-  var args = verifyArguments(arguments);
+  var args = helpers.verifyArguments(arguments);
 
-  var extensions = getExtensions(_.last(args));
+  var extensions = helpers.getExtensions(_.last(args));
 
   function parallel(done){
     nowAndLater.parallel(args, asyncDone, extensions, done);

diff --git a/lib/series.js b/lib/series.js
@@ -4,13 +4,12 @@ var _ = require('lodash');
 var asyncDone = require('async-done');
 var nowAndLater = require('now-and-later');
 
-var getExtensions = require('./getExtensions');
-var verifyArguments = require('./verifyArguments');
+var helpers = require('./helpers');
 
 function buildSeries(){
-  var args = verifyArguments(arguments);
+  var args = helpers.verifyArguments(arguments);
 
-  var extensions = getExtensions(_.last(args));
+  var extensions = helpers.getExtensions(_.last(args));
 
   function series(done){
     nowAndLater.series(args, asyncDone, extensions, done);

diff --git a/lib/settleParallel.js b/lib/settleParallel.js
@@ -4,20 +4,18 @@ var _ = require('lodash');
 var asyncSettle = require('async-settle');
 var nowAndLater = require('now-and-later');
 
-var onSettled = require('./onSettled');
-var getExtensions = require('./getExtensions');
-var verifyArguments = require('./verifyArguments');
+var helpers = require('./helpers');
 
-function buildParallel(){
-  var args = verifyArguments(arguments);
+function buildSettleParallel(){
+  var args = helpers.verifyArguments(arguments);
 
-  var extensions = getExtensions(_.last(args));
+  var extensions = helpers.getExtensions(_.last(args));
 
   function settleParallel(done){
-    nowAndLater.parallel(args, asyncSettle, extensions, onSettled(done));
+    nowAndLater.parallel(args, asyncSettle, extensions, helpers.onSettled(done));
   }
 
   return settleParallel;
 }
 
-module.exports = buildParallel;
+module.exports = buildSettleParallel;
diff --git a/lib/settleSeries.js b/lib/settleSeries.js
@@ -4,20 +4,18 @@ var _ = require('lodash');
 var asyncSettle = require('async-settle');
 var nowAndLater = require('now-and-later');
 
-var onSettled = require('./onSettled');
-var getExtensions = require('./getExtensions');
-var verifyArguments = require('./verifyArguments');
+var helpers = require('./helpers');
 
-function buildSeries(){
-  var args = verifyArguments(arguments);
+function buildSettleSeries(){
+  var args = helpers.verifyArguments(arguments);
 
-  var extensions = getExtensions(_.last(args));
+  var extensions = helpers.getExtensions(_.last(args));
 
   function settleSeries(done){
-    nowAndLater.series(args, asyncSettle, extensions, onSettled(done));
+    nowAndLater.series(args, asyncSettle, extensions, helpers.onSettled(done));
   }
 
   return settleSeries;
 }
 
-module.exports = buildSeries;
+module.exports = buildSettleSeries;
diff --git a/lib/verifyArguments.js b/lib/verifyArguments.js
diff --git a/test/verifyArguments.js b/test/verifyArguments.js
@@ -2,7 +2,7 @@
 
 var test = require('tap').test;
 
-var verifyArguments = require('../lib/verifyArguments');
+var verifyArguments = require('../lib/helpers').verifyArguments;
 
 function validArg() {
 }