stream: move duplicated code to an internal module

Create a utils module for isIterable(), isReadable(), and isStream(). PR-URL: nodejs#37508 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
aduh95 · Sep 1, 2021 · 2bcf3bc · 2bcf3bc
1 parent c4ff5e4
commit 2bcf3bc
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 21 deletions.
diff --git a/lib/internal/streams/pipeline.js b/lib/internal/streams/pipeline.js
@@ -7,7 +7,6 @@ const {
   ArrayIsArray,
   ReflectApply,
   SymbolAsyncIterator,
-  SymbolIterator,
 } = primordials;
 
 let eos;
@@ -22,6 +21,12 @@ const {
   ERR_STREAM_DESTROYED
 } = require('internal/errors').codes;
 
+const {
+  isIterable,
+  isReadable,
+  isStream,
+} = require('internal/streams/utils');
+
 let EE;
 let PassThrough;
 let Readable;
@@ -78,26 +83,6 @@ function popCallback(streams) {
   return streams.pop();
 }
 
-function isReadable(obj) {
-  return !!(obj && typeof obj.pipe === 'function');
-}
-
-function isWritable(obj) {
-  return !!(obj && typeof obj.write === 'function');
-}
-
-function isStream(obj) {
-  return isReadable(obj) || isWritable(obj);
-}
-
-function isIterable(obj, isAsync) {
-  if (!obj) return false;
-  if (isAsync === true) return typeof obj[SymbolAsyncIterator] === 'function';
-  if (isAsync === false) return typeof obj[SymbolIterator] === 'function';
-  return typeof obj[SymbolAsyncIterator] === 'function' ||
-    typeof obj[SymbolIterator] === 'function';
-}
-
 function makeAsyncIterable(val) {
   if (isIterable(val)) {
     return val;

diff --git a/lib/internal/streams/utils.js b/lib/internal/streams/utils.js
@@ -0,0 +1,32 @@
+'use strict';
+
+const {
+  SymbolAsyncIterator,
+  SymbolIterator,
+} = primordials;
+
+function isReadable(obj) {
+  return !!(obj && typeof obj.pipe === 'function');
+}
+
+function isWritable(obj) {
+  return !!(obj && typeof obj.write === 'function');
+}
+
+function isStream(obj) {
+  return isReadable(obj) || isWritable(obj);
+}
+
+function isIterable(obj, isAsync) {
+  if (!obj) return false;
+  if (isAsync === true) return typeof obj[SymbolAsyncIterator] === 'function';
+  if (isAsync === false) return typeof obj[SymbolIterator] === 'function';
+  return typeof obj[SymbolAsyncIterator] === 'function' ||
+    typeof obj[SymbolIterator] === 'function';
+}
+
+module.exports = {
+  isIterable,
+  isReadable,
+  isStream,
+};
diff --git a/node.gyp b/node.gyp
@@ -245,6 +245,7 @@
       'lib/internal/streams/state.js',
       'lib/internal/streams/pipeline.js',
       'lib/internal/streams/end-of-stream.js',
+      'lib/internal/streams/utils.js',
       'deps/v8/tools/splaytree.js',
       'deps/v8/tools/codemap.js',
       'deps/v8/tools/consarray.js',

diff --git a/test/parallel/test-bootstrap-modules.js b/test/parallel/test-bootstrap-modules.js
@@ -79,6 +79,7 @@ const expectedModules = new Set([
   'NativeModule internal/process/warning',
   'NativeModule internal/querystring',
   'NativeModule internal/source_map/source_map_cache',
+  'NativeModule internal/streams/utils',
   'NativeModule internal/timers',
   'NativeModule internal/url',
   'NativeModule internal/util',