fixup! stream: add stream.compose

nodejs · Aug 23, 2021 · 6e5f6fc · 6e5f6fc
1 parent bb6bedf
commit 6e5f6fc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/lib/internal/streams/compose.js b/lib/internal/streams/compose.js
@@ -9,6 +9,7 @@ const {
   isIterable,
   isReadableNodeStream,
   isWritableNodeStream,
+  isNodeStream,
   isDestroyed,
   isReadableFinished,
   isWritableEnded,

diff --git a/lib/internal/streams/utils.js b/lib/internal/streams/utils.js
@@ -88,7 +88,6 @@ function isWritableEnded(stream) {
   return wState.ended;
 }
 
-<<<<<<< HEAD
 // Have emitted 'finish'.
 function isWritableFinished(stream, strict) {
   if (!isWritableNodeStream(stream)) return null;
@@ -112,8 +111,6 @@ function isReadableEnded(stream) {
   return rState.ended;
 }
 
-=======
->>>>>>> 3980333d56... stream: add stream.compose
 // Have emitted 'end'.
 function isReadableFinished(stream, strict) {
   if (!isReadableNodeStream(stream)) return null;
@@ -126,7 +123,6 @@ function isReadableFinished(stream, strict) {
   );
 }
 
-<<<<<<< HEAD
 function isDisturbed(stream) {
   return !!(stream && (
     stream.readableDidRead ||
@@ -145,21 +141,10 @@ module.exports = {
   isReadable,
   isReadableNodeStream,
   isReadableEnded,
-=======
-module.exports = {
-  isReadable,
-  isStream,
-  isDestroyed,
-  isIterable,
-  isReadableNodeStream,
->>>>>>> 3980333d56... stream: add stream.compose
   isReadableFinished,
   isNodeStream,
   isWritable,
   isWritableNodeStream,
   isWritableEnded,
-<<<<<<< HEAD
   isWritableFinished,
-=======
->>>>>>> 3980333d56... stream: add stream.compose
 };