stream: refactor to use validateFunction

PR-URL: #46007 Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
nodejs · Jan 4, 2023 · 57274a8 · 57274a8
1 parent 8e96c99
commit 57274a8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/lib/internal/webstreams/adapters.js b/lib/internal/webstreams/adapters.js
@@ -64,6 +64,7 @@ const {
 
 const {
   validateBoolean,
+  validateFunction,
   validateObject,
 } = require('internal/validators');
 
@@ -924,8 +925,7 @@ function newReadableStreamFromStreamBase(streamBase, strategy, options = kEmptyO
   if (typeof streamBase.onread === 'function')
     throw new ERR_INVALID_STATE('StreamBase already has a consumer');
 
-  if (typeof ondone !== 'function')
-    throw new ERR_INVALID_ARG_TYPE('options.ondone', 'Function', ondone);
+  validateFunction(ondone, 'options.ondone');
 
   let controller;
 

diff --git a/lib/internal/webstreams/util.js b/lib/internal/webstreams/util.js
@@ -19,7 +19,6 @@ const {
 
 const {
   codes: {
-    ERR_INVALID_ARG_TYPE,
     ERR_INVALID_ARG_VALUE,
     ERR_OPERATION_FAILED,
   },
@@ -48,6 +47,10 @@ const {
 const assert = require('internal/assert');
 const { isArrayBufferDetached } = require('internal/util');
 
+const {
+  validateFunction,
+} = require('internal/validators');
+
 const kState = Symbol('kState');
 const kType = Symbol('kType');
 
@@ -78,8 +81,7 @@ function extractHighWaterMark(value, defaultHWM) {
 
 function extractSizeAlgorithm(size) {
   if (size === undefined) return () => 1;
-  if (typeof size !== 'function')
-    throw new ERR_INVALID_ARG_TYPE('strategy.size', 'Function', size);
+  validateFunction(size, 'strategy.size');
   return size;
 }