zlib: simplify validators

PR-URL: #54442
Reviewed-By: James M Snell <jasnell@gmail.com>

Author: anonrig

lib/internal/validators.js

@@ -7,6 +7,7 @@ const {
  ArrayPrototypeIncludes,
  ArrayPrototypeJoin,
  ArrayPrototypeMap,
+ NumberIsFinite,
  NumberIsInteger,
  NumberIsNaN,
  NumberMAX_SAFE_INTEGER,
@@ -567,6 +568,46 @@ const validateLinkHeaderValue = hideStackFrames((hints) => {
 );
 });
 
+// 1. Returns false for undefined and NaN
+// 2. Returns true for finite numbers
+// 3. Throws ERR_INVALID_ARG_TYPE for non-numbers
+// 4. Throws ERR_OUT_OF_RANGE for infinite numbers
+constvalidateFiniteNumber=hideStackFrames((number,name)=>{
+// Common case
+if(number===undefined){
+returnfalse;
+}
+
+if(NumberIsFinite(number)){
+returntrue;// Is a valid number
+}
+
+if(NumberIsNaN(number)){
+returnfalse;
+}
+
+validateNumber(number,name);
+
+// Infinite numbers
+thrownewERR_OUT_OF_RANGE(name,'a finite number',number);
+});
+
+// 1. Returns def for number when it's undefined or NaN
+// 2. Returns number for finite numbers >= lower and <= upper
+// 3. Throws ERR_INVALID_ARG_TYPE for non-numbers
+// 4. Throws ERR_OUT_OF_RANGE for infinite numbers or numbers > upper or < lower
+constcheckRangesOrGetDefault=hideStackFrames(
+(number,name,lower,upper,def)=>{
+if(!validateFiniteNumber(number,name)){
+returndef;
+}
+if(number<lower||number>upper){
+thrownewERR_OUT_OF_RANGE(name,`>= ${lower} and <= ${upper}`,number);
+}
+returnnumber;
+},
+);
+
 module.exports={
  isInt32,
  isUint32,
@@ -601,4 +642,6 @@ module.exports = {
  validateAbortSignal,
  validateLinkHeaderValue,
  validateInternalField,
+ validateFiniteNumber,
+ checkRangesOrGetDefault,
 };

lib/zlib.js

@@ -28,7 +28,6 @@ const {
  ArrayPrototypePush,
  FunctionPrototypeBind,
  MathMaxApply,
- NumberIsFinite,
  NumberIsNaN,
  ObjectDefineProperties,
  ObjectDefineProperty,
@@ -51,7 +50,6 @@ const {
 ERR_ZLIB_INITIALIZATION_FAILED,
 },
  genericNodeError,
- hideStackFrames,
 }=require('internal/errors');
 const{ Transform, finished }=require('stream');
 const{
@@ -71,9 +69,10 @@ const {
 }=require('buffer');
 const{ owner_symbol }=require('internal/async_hooks').symbols;
 const{
+ checkRangesOrGetDefault,
  validateFunction,
- validateNumber,
  validateUint32,
+ validateFiniteNumber,
 }=require('internal/validators');
 
 constkFlushFlag=Symbol('kFlushFlag');
@@ -195,47 +194,6 @@ function zlibOnError(message, errno, code) {
 self[kError]=error;
 }
 
-// 1. Returns false for undefined and NaN
-// 2. Returns true for finite numbers
-// 3. Throws ERR_INVALID_ARG_TYPE for non-numbers
-// 4. Throws ERR_OUT_OF_RANGE for infinite numbers
-constcheckFiniteNumber=hideStackFrames((number,name)=>{
-// Common case
-if(number===undefined){
-returnfalse;
-}
-
-if(NumberIsFinite(number)){
-returntrue;// Is a valid number
-}
-
-if(NumberIsNaN(number)){
-returnfalse;
-}
-
-validateNumber.withoutStackTrace(number,name);
-
-// Infinite numbers
-thrownewERR_OUT_OF_RANGE.HideStackFramesError(name,'a finite number',number);
-});
-
-// 1. Returns def for number when it's undefined or NaN
-// 2. Returns number for finite numbers >= lower and <= upper
-// 3. Throws ERR_INVALID_ARG_TYPE for non-numbers
-// 4. Throws ERR_OUT_OF_RANGE for infinite numbers or numbers > upper or < lower
-constcheckRangesOrGetDefault=hideStackFrames(
-(number,name,lower,upper,def)=>{
-if(!checkFiniteNumber.withoutStackTrace(number,name)){
-returndef;
-}
-if(number<lower||number>upper){
-thrownewERR_OUT_OF_RANGE.HideStackFramesError(name,
-`>= ${lower} and <= ${upper}`,number);
-}
-returnnumber;
-},
-);
-
 constFLUSH_BOUND=[
 [Z_NO_FLUSH,Z_BLOCK],
 [BROTLI_OPERATION_PROCESS,BROTLI_OPERATION_EMIT_METADATA],
@@ -261,7 +219,7 @@ function ZlibBase(opts, mode, handle, { flush, finishFlush, fullFlush }) {
 
 if(opts){
 chunkSize=opts.chunkSize;
-if(!checkFiniteNumber(chunkSize,'options.chunkSize')){
+if(!validateFiniteNumber(chunkSize,'options.chunkSize')){
 chunkSize=Z_DEFAULT_CHUNK;
 }elseif(chunkSize<Z_MIN_CHUNK){
 thrownewERR_OUT_OF_RANGE('options.chunkSize',