stream: refactor to use more validators

Use more validators where appropriate for consistency. PR-URL: nodejs#41871 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Darshan Sen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Mestery <[email protected]> Reviewed-By: Minwoo Jung <[email protected]>
bengl · Feb 21, 2022 · a4b1a09 · a4b1a09
1 parent 251279c
commit a4b1a09
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/lib/internal/streams/operators.js b/lib/internal/streams/operators.js
@@ -13,6 +13,7 @@ const {
 const {
   validateAbortSignal,
   validateInteger,
+  validateObject,
 } = require('internal/validators');
 const { kWeakHandler } = require('internal/event_target');
 const { finished } = require('internal/streams/end-of-stream');
@@ -36,8 +37,8 @@ function map(fn, options) {
     throw new ERR_INVALID_ARG_TYPE(
       'fn', ['Function', 'AsyncFunction'], fn);
   }
-  if (options != null && typeof options !== 'object') {
-    throw new ERR_INVALID_ARG_TYPE('options', ['Object']);
+  if (options != null) {
+    validateObject(options, 'options');
   }
   if (options?.signal != null) {
     validateAbortSignal(options.signal, 'options.signal');
@@ -167,8 +168,8 @@ function map(fn, options) {
 }
 
 function asIndexedPairs(options = undefined) {
-  if (options != null && typeof options !== 'object') {
-    throw new ERR_INVALID_ARG_TYPE('options', ['Object']);
+  if (options != null) {
+    validateObject(options, 'options');
   }
   if (options?.signal != null) {
     validateAbortSignal(options.signal, 'options.signal');
@@ -252,8 +253,8 @@ async function reduce(reducer, initialValue, options) {
     throw new ERR_INVALID_ARG_TYPE(
       'reducer', ['Function', 'AsyncFunction'], reducer);
   }
-  if (options != null && typeof options !== 'object') {
-    throw new ERR_INVALID_ARG_TYPE('options', ['Object']);
+  if (options != null) {
+    validateObject(options, 'options');
   }
   if (options?.signal != null) {
     validateAbortSignal(options.signal, 'options.signal');
@@ -296,8 +297,8 @@ async function reduce(reducer, initialValue, options) {
 }
 
 async function toArray(options) {
-  if (options != null && typeof options !== 'object') {
-    throw new ERR_INVALID_ARG_TYPE('options', ['Object']);
+  if (options != null) {
+    validateObject(options, 'options');
   }
   if (options?.signal != null) {
     validateAbortSignal(options.signal, 'options.signal');
@@ -336,8 +337,8 @@ function toIntegerOrInfinity(number) {
 }
 
 function drop(number, options = undefined) {
-  if (options != null && typeof options !== 'object') {
-    throw new ERR_INVALID_ARG_TYPE('options', ['Object']);
+  if (options != null) {
+    validateObject(options, 'options');
   }
   if (options?.signal != null) {
     validateAbortSignal(options.signal, 'options.signal');
@@ -360,8 +361,8 @@ function drop(number, options = undefined) {
 }
 
 function take(number, options = undefined) {
-  if (options != null && typeof options !== 'object') {
-    throw new ERR_INVALID_ARG_TYPE('options', ['Object']);
+  if (options != null) {
+    validateObject(options, 'options');
   }
   if (options?.signal != null) {
     validateAbortSignal(options.signal, 'options.signal');