1 files changed, 71 insertions, 30 deletions

diff --git a/deps/npm/node_modules/aproba/index.js b/deps/npm/node_modules/aproba/index.js
index bb5ac3cda6..bc6ed1f17b 100644
--- a/deps/npm/node_modules/aproba/index.js
+++ b/deps/npm/node_modules/aproba/index.js
@@ -1,36 +1,64 @@
 'use strict'
 
 function isArguments (thingy) {
-  return typeof thingy === 'object' && thingy.hasOwnProperty('callee')
+  return thingy != null && typeof thingy === 'object' && thingy.hasOwnProperty('callee')
 }
 
 var types = {
-  '*': ['any', function () { return true }],
-  A: ['array', function (thingy) { return Array.isArray(thingy) || isArguments(thingy) }],
-  S: ['string', function (thingy) { return typeof thingy === 'string' }],
-  N: ['number', function (thingy) { return typeof thingy === 'number' }],
-  F: ['function', function (thingy) { return typeof thingy === 'function' }],
-  O: ['object', function (thingy) { return typeof thingy === 'object' && !types.A[1](thingy) && !types.E[1](thingy) }],
-  B: ['boolean', function (thingy) { return typeof thingy === 'boolean' }],
-  E: ['error', function (thingy) { return thingy instanceof Error }]
-}
-
-var validate = module.exports = function (schema, args) {
-  if (!schema) throw missingRequiredArg(0, 'schema')
+  '*': {label: 'any', check: function () { return true }},
+  A: {label: 'array', check: function (thingy) { return Array.isArray(thingy) || isArguments(thingy) }},
+  S: {label: 'string', check: function (thingy) { return typeof thingy === 'string' }},
+  N: {label: 'number', check: function (thingy) { return typeof thingy === 'number' }},
+  F: {label: 'function', check: function (thingy) { return typeof thingy === 'function' }},
+  O: {label: 'object', check: function (thingy) { return typeof thingy === 'object' && thingy != null && !types.A.check(thingy) && !types.E.check(thingy) }},
+  B: {label: 'boolean', check: function (thingy) { return typeof thingy === 'boolean' }},
+  E: {label: 'error', check: function (thingy) { return thingy instanceof Error }},
+  Z: {label: 'null', check: function (thingy) { return thingy == null }}
+}
+
+var validate = module.exports = function (rawSchemas, args) {
+  if (arguments.length !== 2) throw wrongNumberOfArgs(['SA'], arguments.length)
+  if (!rawSchemas) throw missingRequiredArg(0, 'rawSchemas')
   if (!args) throw missingRequiredArg(1, 'args')
-  if (!types.S[1](schema)) throw invalidType(0, 'string', schema)
-  if (!types.A[1](args)) throw invalidType(1, 'array', args)
-  for (var ii = 0; ii < schema.length; ++ii) {
-    var type = schema[ii]
-    if (!types[type]) throw unknownType(ii, type)
-    var typeLabel = types[type][0]
-    var typeCheck = types[type][1]
-    if (type === 'E' && args[ii] == null) continue
-    if (args[ii] == null) throw missingRequiredArg(ii)
-    if (!typeCheck(args[ii])) throw invalidType(ii, typeLabel, args[ii])
-    if (type === 'E') return
+  if (!types.S.check(rawSchemas)) throw invalidType(0, ['string'], rawSchemas)
+  if (!types.A.check(args)) throw invalidType(1, ['array'], args)
+  var schemas = rawSchemas.split('|')
+  var arity = {}
+  function addSchema (schema) {
+    var group = arity[schema.length] = arity[schema.length] || []
+    if (group.indexOf(schema) === -1) group.push(schema)
+  }
+  schemas.forEach(function (schema) {
+    for (var ii = 0; ii < schema.length; ++ii) {
+      var type = schema[ii]
+      if (!types[type]) throw unknownType(ii, type)
+    }
+    if (/E.*E/.test(schema)) throw moreThanOneError(schema)
+    addSchema(schema)
+    if (/E/.test(schema)) {
+      addSchema(schema.replace(/E.*$/, 'E'))
+      addSchema(schema.replace(/E/, 'Z'))
+      if (schema.length === 1) addSchema('')
+    }
+  })
+  var matching = arity[args.length]
+  if (!matching) {
+    throw wrongNumberOfArgs(Object.keys(arity), args.length)
+  }
+  for (var ii = 0; ii < args.length; ++ii) {
+    var newMatching = matching.filter(function (schema) {
+      var type = schema[ii]
+      var typeCheck = types[type].check
+      return typeCheck(args[ii])
+    })
+    if (!newMatching.length) {
+      var labels = matching.map(function (schema) {
+        return types[schema[ii]].label
+      }).filter(function (schema) { return schema != null })
+      throw invalidType(ii, labels, args[ii])
+    }
+    matching = newMatching
   }
-  if (schema.length < args.length) throw tooManyArgs(schema.length, args.length)
 }
 
 function missingRequiredArg (num) {
@@ -41,17 +69,30 @@ function unknownType (num, type) {
   return newException('EUNKNOWNTYPE', 'Unknown type ' + type + ' in argument #' + (num + 1))
 }
 
-function invalidType (num, expectedType, value) {
+function invalidType (num, expectedTypes, value) {
   var valueType
   Object.keys(types).forEach(function (typeCode) {
-    if (types[typeCode][1](value)) valueType = types[typeCode][0]
+    if (types[typeCode].check(value)) valueType = types[typeCode].label
   })
   return newException('EINVALIDTYPE', 'Argument #' + (num + 1) + ': Expected ' +
-    expectedType + ' but got ' + valueType)
+    englishList(expectedTypes) + ' but got ' + valueType)
+}
+
+function englishList (list) {
+  return list.join(', ').replace(/, ([^,]+)$/, ' or $1')
+}
+
+function wrongNumberOfArgs (expected, got) {
+  var english = englishList(expected)
+  var args = expected.every(function (ex) { return ex.length === 1 })
+    ? 'argument'
+    : 'arguments'
+  return newException('EWRONGARGCOUNT', 'Expected ' + english + ' ' + args + ' but got ' + got)
 }
 
-function tooManyArgs (expected, got) {
-  return newException('ETOOMANYARGS', 'Too many arguments, expected ' + expected + ' and got ' + got)
+function moreThanOneError (schema) {
+  return newException('ETOOMANYERRORTYPES',
+    'Only one error type per argument signature is allowed, more than one found in "' + schema + '"')
 }
 
 function newException (code, msg) {