diff options
Diffstat (limited to 'node_modules/merge-stream')
| -rw-r--r-- | node_modules/merge-stream/README.md | 12 | ||||
| -rw-r--r-- | node_modules/merge-stream/index.js | 1 | ||||
| -rw-r--r-- | node_modules/merge-stream/package.json | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/node_modules/merge-stream/README.md b/node_modules/merge-stream/README.md index 862c3a330..966bde69c 100644 --- a/node_modules/merge-stream/README.md +++ b/node_modules/merge-stream/README.md @@ -24,11 +24,17 @@ This is adapted from [event-stream](https://github.com/dominictarr/event-stream) ## API -`merged.add` +### `mergeStream` -A method to dynamically add more sources to the stream. +Type: `function` -`merged.isEmpty` +Merges an arbitrary number of streams. Returns a merged stream. + +#### `merged.add` + +A method to dynamically add more sources to the stream. The argument supplied to `add` can be either a source or an array of sources. + +#### `merged.isEmpty` A method that tells you if the merged stream is empty. diff --git a/node_modules/merge-stream/index.js b/node_modules/merge-stream/index.js index dff2dd8ec..f907ad65a 100644 --- a/node_modules/merge-stream/index.js +++ b/node_modules/merge-stream/index.js @@ -25,6 +25,7 @@ module.exports = function (/*streams...*/) { sources.push(source); source.once('end', remove.bind(null, source)) + source.once('error', output.emit.bind(output, 'error')) source.pipe(output, {end: false}) return this } diff --git a/node_modules/merge-stream/package.json b/node_modules/merge-stream/package.json index 47b6a86fe..722df5491 100644 --- a/node_modules/merge-stream/package.json +++ b/node_modules/merge-stream/package.json @@ -1,8 +1,7 @@ { "name": "merge-stream", - "version": "1.0.0", + "version": "1.0.1", "description": "Create a stream that emits events from multiple other streams", - "main": "index.js", "files": [ "index.js" ], |