merge-readable 1.0.0 → 1.1.0

package/index.js

@@ -2,34 +2,63 @@ const { Readable } = require('streamx')
 
 const PREMATURE_CLOSE = new Error('Premature close')
 
-function merge(stream, ...streams) {
-  const all = Array.isArray(stream) ? [...stream, ...streams] : [stream, ...streams]
-  const map = all.length && typeof all[all.length - 1] === 'function' ? all.pop() : null
+function mergeAll(streams, opts = {}) {
   const output = new Readable({
-    map
+    map: opts.map
   })
 
-  let active = all.length
-
-  if (active === 0) {
+  if (streams.length === 0) {
     output.end()
     return output
   }
 
-  for (const source of all) {
-    source.on('data', (data) => {
-      output.push(data)
-    })
+  if (opts.sequential) {
+    for (const s of streams) {
+      s.pause()
+    }
+
+    let index = 0
 
-    source.on('end', () => {
-      active--
-      if (active === 0) {
+    function readNext() {
+      if (index >= streams.length) {
         output.push(null)
+        return
       }
-    })
 
-    source.on('error', onerror)
-    source.on('close', onclose.bind(null, source))
+      const source = streams[index]
+
+      source.on('data', (data) => {
+        output.push(data)
+      })
+
+      source.on('end', () => {
+        index++
+        readNext()
+      })
+
+      source.on('error', onerror)
+      source.on('close', onclose.bind(null, source))
+
+      source.resume()
+    }
+
+    readNext()
+  } else {
+    let active = streams.length
+
+    for (const source of streams) {
+      source.on('data', (data) => {
+        output.push(data)
+      })
+      source.on('end', () => {
+        active--
+        if (active === 0) {
+          output.push(null)
+        }
+      })
+      source.on('error', onerror)
+      source.on('close', onclose.bind(null, source))
+    }
   }
 
   return output
@@ -41,11 +70,29 @@ function merge(stream, ...streams) {
   }
 
   function onerror(err) {
-    for (const s of all) {
+    for (const s of streams) {
       s.destroy(err)
     }
     output.destroy(err)
   }
 }
 
+function getArgs(stream, ...streams) {
+  const all = Array.isArray(stream) ? [...stream, ...streams] : [stream, ...streams]
+  const map = all.length && typeof all[all.length - 1] === 'function' ? all.pop() : null
+
+  return { all, map }
+}
+
+function mergeSequential(stream, ...streams) {
+  const { all, map } = getArgs(stream, ...streams)
+  return mergeAll(all, { map, sequential: true })
+}
+
+function merge(stream, ...streams) {
+  const { all, map } = getArgs(stream, ...streams)
+  return mergeAll(all, { map })
+}
+
 module.exports = merge
+module.exports.mergeSequential = mergeSequential

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merge-readable",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "merge-readable",
   "main": "index.js",
   "exports": {