Upgrade Ava to v4

node_modules/merge2/index.js

@@ -3,7 +3,7 @@
  * merge2
  * https://github.com/teambition/merge2
  *
- * Copyright (c) 2014-2016 Teambition
+ * Copyright (c) 2014-2020 Teambition
  * Licensed under the MIT license.
  */
 const Stream = require('stream')
@@ -14,16 +14,24 @@ module.exports = merge2
 
 function merge2 () {
   const streamsQueue = []
-  let merging = false
   const args = slice.call(arguments)
+  let merging = false
   let options = args[args.length - 1]
 
-  if (options && !Array.isArray(options) && options.pipe == null) args.pop()
-  else options = {}
+  if (options && !Array.isArray(options) && options.pipe == null) {
+    args.pop()
+  } else {
+    options = {}
+  }
 
   const doEnd = options.end !== false
-  if (options.objectMode == null) options.objectMode = true
-  if (options.highWaterMark == null) options.highWaterMark = 64 * 1024
+  const doPipeError = options.pipeError === true
+  if (options.objectMode == null) {
+    options.objectMode = true
+  }
+  if (options.highWaterMark == null) {
+    options.highWaterMark = 64 * 1024
+  }
   const mergedStream = PassThrough(options)
 
   function addStream () {
@@ -35,7 +43,9 @@ function merge2 () {
   }
 
   function mergeStream () {
-    if (merging) return
+    if (merging) {
+      return
+    }
     merging = true
 
     let streams = streamsQueue.shift()
@@ -43,12 +53,16 @@ function merge2 () {
       process.nextTick(endStream)
       return
     }
-    if (!Array.isArray(streams)) streams = [streams]
+    if (!Array.isArray(streams)) {
+      streams = [streams]
+    }
 
     let pipesCount = streams.length + 1
 
     function next () {
-      if (--pipesCount > 0) return
+      if (--pipesCount > 0) {
+        return
+      }
       merging = false
       mergeStream()
     }
@@ -57,19 +71,34 @@ function merge2 () {
       function onend () {
         stream.removeListener('merge2UnpipeEnd', onend)
         stream.removeListener('end', onend)
+        if (doPipeError) {
+          stream.removeListener('error', onerror)
+        }
         next()
       }
+      function onerror (err) {
+        mergedStream.emit('error', err)
+      }
       // skip ended stream
-      if (stream._readableState.endEmitted) return next()
+      if (stream._readableState.endEmitted) {
+        return next()
+      }
 
       stream.on('merge2UnpipeEnd', onend)
       stream.on('end', onend)
+
+      if (doPipeError) {
+        stream.on('error', onerror)
+      }
+
       stream.pipe(mergedStream, { end: false })
       // compatible for old stream
       stream.resume()
     }
 
-    for (let i = 0; i < streams.length; i++) pipe(streams[i])
+    for (let i = 0; i < streams.length; i++) {
+      pipe(streams[i])
+    }
 
     next()
   }
@@ -78,7 +107,9 @@ function merge2 () {
     merging = false
     // emit 'queueDrain' when all streams merged.
     mergedStream.emit('queueDrain')
-    return doEnd && mergedStream.end()
+    if (doEnd) {
+      mergedStream.end()
+    }
   }
 
   mergedStream.setMaxListeners(0)
@@ -87,7 +118,9 @@ function merge2 () {
     stream.emit('merge2UnpipeEnd')
   })
 
-  if (args.length) addStream.apply(null, args)
+  if (args.length) {
+    addStream.apply(null, args)
+  }
   return mergedStream
 }
 
@@ -95,13 +128,17 @@ function merge2 () {
 function pauseStreams (streams, options) {
   if (!Array.isArray(streams)) {
     // Backwards-compat with old-style streams
-    if (!streams._readableState && streams.pipe) streams = streams.pipe(PassThrough(options))
+    if (!streams._readableState && streams.pipe) {
+      streams = streams.pipe(PassThrough(options))
+    }
     if (!streams._readableState || !streams.pause || !streams.pipe) {
       throw new Error('Only readable stream can be merged.')
     }
     streams.pause()
   } else {
-    for (let i = 0, len = streams.length; i < len; i++) streams[i] = pauseStreams(streams[i], options)
+    for (let i = 0, len = streams.length; i < len; i++) {
+      streams[i] = pauseStreams(streams[i], options)
+    }
   }
   return streams
 }