1 files changed, 114 insertions, 22 deletions

diff --git a/deps/npm/node_modules/figgy-pudding/index.js b/deps/npm/node_modules/figgy-pudding/index.js
index a3c9c94ebf..7991e69fc8 100644
--- a/deps/npm/node_modules/figgy-pudding/index.js
+++ b/deps/npm/node_modules/figgy-pudding/index.js
@@ -3,8 +3,22 @@
 class FiggyPudding {
   constructor (specs, opts, providers) {
     this.__specs = specs || {}
-    this.__opts = opts || (() => false)
-    this.__providers = reverse((providers || []).filter(
+    Object.keys(this.__specs).forEach(alias => {
+      if (typeof this.__specs[alias] === 'string') {
+        const key = this.__specs[alias]
+        const realSpec = this.__specs[key]
+        if (realSpec) {
+          const aliasArr = realSpec.aliases || []
+          aliasArr.push(alias, key)
+          realSpec.aliases = [...(new Set(aliasArr))]
+          this.__specs[alias] = realSpec
+        } else {
+          throw new Error(`Alias refers to invalid key: ${key} -> ${alias}`)
+        }
+      }
+    })
+    this.__opts = opts || {}
+    this.__providers = reverse((providers).filter(
       x => x != null && typeof x === 'object'
     ))
     this.__isFiggyPudding = true
@@ -12,33 +26,92 @@ class FiggyPudding {
   get (key) {
     return pudGet(this, key, true)
   }
+  get [Symbol.toStringTag] () { return 'FiggyPudding' }
+  forEach (fn, thisArg = this) {
+    for (let [key, value] of this.entries()) {
+      fn.call(thisArg, value, key, this)
+    }
+  }
+  toJSON () {
+    const obj = {}
+    this.forEach((val, key) => {
+      obj[key] = val
+    })
+    return obj
+  }
+  * entries (_matcher) {
+    for (let key of Object.keys(this.__specs)) {
+      yield [key, this.get(key)]
+    }
+    const matcher = _matcher || this.__opts.other
+    if (matcher) {
+      const seen = new Set()
+      for (let p of this.__providers) {
+        const iter = p.entries ? p.entries(matcher) : Object.entries(p)
+        for (let [key, val] of iter) {
+          if (matcher(key) && !seen.has(key)) {
+            seen.add(key)
+            yield [key, val]
+          }
+        }
+      }
+    }
+  }
+  * [Symbol.iterator] () {
+    for (let [key, value] of this.entries()) {
+      yield [key, value]
+    }
+  }
+  * keys () {
+    for (let [key] of this.entries()) {
+      yield key
+    }
+  }
+  * values () {
+    for (let [, value] of this.entries()) {
+      yield value
+    }
+  }
   concat (...moreConfig) {
-    return new FiggyPudding(
+    return new Proxy(new FiggyPudding(
       this.__specs,
       this.__opts,
       reverse(this.__providers).concat(moreConfig)
-    )
+    ), proxyHandler)
   }
 }
+try {
+  const util = require('util')
+  FiggyPudding.prototype[util.inspect.custom] = function (depth, opts) {
+    return (
+      this[Symbol.toStringTag] + ' '
+    ) + util.inspect(this.toJSON(), opts)
+  }
+} catch (e) {}
+
+function BadKeyError (key) {
+  throw Object.assign(new Error(
+    `invalid config key requested: ${key}`
+  ), {code: 'EBADKEY'})
+}
 
 function pudGet (pud, key, validate) {
   let spec = pud.__specs[key]
-  if (typeof spec === 'string') {
-    key = spec
-    spec = pud.__specs[key]
-  }
   if (validate && !spec && (!pud.__opts.other || !pud.__opts.other(key))) {
-    throw new Error(`invalid config key requested: ${key}`)
+    BadKeyError(key)
   } else {
     if (!spec) { spec = {} }
     let ret
     for (let p of pud.__providers) {
-      if (p.__isFiggyPudding) {
-        ret = pudGet(p, key, false)
-      } else if (typeof p.get === 'function') {
-        ret = p.get(key)
-      } else {
-        ret = p[key]
+      ret = tryGet(key, p)
+      if (ret === undefined && spec.aliases && spec.aliases.length) {
+        for (let alias of spec.aliases) {
+          if (alias === key) { continue }
+          ret = tryGet(alias, p)
+          if (ret !== undefined) {
+            break
+          }
+        }
       }
       if (ret !== undefined) {
         break
@@ -46,7 +119,7 @@ function pudGet (pud, key, validate) {
     }
     if (ret === undefined && spec.default !== undefined) {
       if (typeof spec.default === 'function') {
-        return spec.default()
+        return spec.default(pud)
       } else {
         return spec.default
       }
@@ -56,28 +129,47 @@ function pudGet (pud, key, validate) {
   }
 }
 
+function tryGet (key, p) {
+  let ret
+  if (p.__isFiggyPudding) {
+    ret = pudGet(p, key, false)
+  } else if (typeof p.get === 'function') {
+    ret = p.get(key)
+  } else {
+    ret = p[key]
+  }
+  return ret
+}
+
 const proxyHandler = {
   has (obj, prop) {
-    return pudGet(obj, prop, false) !== undefined
+    return prop in obj.__specs && pudGet(obj, prop, false) !== undefined
+  },
+  ownKeys (obj) {
+    return Object.keys(obj.__specs)
   },
   get (obj, prop) {
     if (
-      prop === 'concat' ||
-      prop === 'get' ||
-      prop.slice(0, 2) === '__'
+      typeof prop === 'symbol' ||
+      prop.slice(0, 2) === '__' ||
+      prop in FiggyPudding.prototype
     ) {
       return obj[prop]
     }
     return obj.get(prop)
   },
   set (obj, prop, value) {
-    if (prop.slice(0, 2) === '__') {
+    if (
+      typeof prop === 'symbol' ||
+      prop.slice(0, 2) === '__'
+    ) {
       obj[prop] = value
+      return true
     } else {
       throw new Error('figgyPudding options cannot be modified. Use .concat() instead.')
     }
   },
-  delete () {
+  deleteProperty () {
     throw new Error('figgyPudding options cannot be deleted. Use .concat() and shadow them instead.')
   }
 }