stream: refactor to use more validators
Use more validators where appropriate for consistency. PR-URL: https://github.com/nodejs/node/pull/41871 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Robert Nagy <ronagy@icloud.com> Reviewed-By: Darshan Sen <raisinten@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Mestery <mestery@protonmail.com> Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
This commit is contained in:
parent
ad6cd7fa9c
commit
717de17fad
@ -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');
|
||||
|
Loading…
x
Reference in New Issue
Block a user