From 338189ff6f65ccdb0fe8d9b62a767ac1a8b0b131 Mon Sep 17 00:00:00 2001 From: Voltrex Date: Fri, 13 Aug 2021 03:11:20 +0430 Subject: [PATCH] lib: simplify validators Some of the validators can be simplified by removing unnecessary object parameters and using validators in another validators to keep consistency. PR-URL: https://github.com/nodejs/node/pull/39753 Reviewed-By: James M Snell Reviewed-By: Antoine du Hamel Reviewed-By: Zijian Liu --- lib/internal/validators.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/internal/validators.js b/lib/internal/validators.js index 3878e17b843774..e20e66cc7e8a76 100644 --- a/lib/internal/validators.js +++ b/lib/internal/validators.js @@ -164,7 +164,7 @@ const validateObject = hideStackFrames( } }); -const validateArray = hideStackFrames((value, name, { minLength = 0 } = {}) => { +const validateArray = hideStackFrames((value, name, minLength = 0) => { if (!ArrayIsArray(value)) { throw new ERR_INVALID_ARG_TYPE(name, 'Array', value); } @@ -175,8 +175,7 @@ const validateArray = hideStackFrames((value, name, { minLength = 0 } = {}) => { }); function validateSignalName(signal, name = 'signal') { - if (typeof signal !== 'string') - throw new ERR_INVALID_ARG_TYPE(name, 'string', signal); + validateString(signal, name); if (signals[signal] === undefined) { if (signals[signal.toUpperCase()] !== undefined) { @@ -208,7 +207,7 @@ function validateEncoding(data, encoding) { // Check that the port number is not NaN when coerced to a number, // is an integer and that it falls within the legal range of port numbers. -function validatePort(port, name = 'Port', { allowZero = true } = {}) { +function validatePort(port, name = 'Port', allowZero = true) { if ((typeof port !== 'number' && typeof port !== 'string') || (typeof port === 'string' && port.trim().length === 0) || +port !== (+port >>> 0) ||