vm: refactor value validation with internal/validators.js

PR-URL: #31480
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>

Author: lundibundi

lib/vm.js

@@ -22,7 +22,6 @@
 'use strict';
 
 const{
- ArrayIsArray,
  ArrayPrototypeForEach,
  Symbol,
  PromiseReject
@@ -47,7 +46,11 @@ const {
 const{
  validateInt32,
  validateUint32,
- validateString
+ validateString,
+ validateArray,
+ validateBoolean,
+ validateBuffer,
+ validateObject,
 }=require('internal/validators');
 const{
  kVmBreakFirstLineSymbol,
@@ -147,30 +150,14 @@ class Script extends ContextifyScript {
 }
 
 functionvalidateContext(contextifiedObject){
-if(typeofcontextifiedObject!=='object'||contextifiedObject===null){
-thrownewERR_INVALID_ARG_TYPE('contextifiedObject','Object',
-contextifiedObject);
-}
-if(!_isContext(contextifiedObject)){
+if(!isContext(contextifiedObject)){
 thrownewERR_INVALID_ARG_TYPE('contextifiedObject','vm.Context',
 contextifiedObject);
 }
 }
 
-functionvalidateBool(prop,propName){
-if(prop!==undefined&&typeofprop!=='boolean')
-thrownewERR_INVALID_ARG_TYPE(propName,'boolean',prop);
-}
-
-functionvalidateObject(prop,propName){
-if(prop!==undefined&&(typeofprop!=='object'||prop===null))
-thrownewERR_INVALID_ARG_TYPE(propName,'Object',prop);
-}
-
 functiongetRunInContextArgs(options={}){
-if(typeofoptions!=='object'||options===null){
-thrownewERR_INVALID_ARG_TYPE('options','Object',options);
-}
+validateObject(options,'options');
 
 lettimeout=options.timeout;
 if(timeout===undefined){
@@ -185,14 +172,8 @@ function getRunInContextArgs(options = {}) {
 [kVmBreakFirstLineSymbol]: breakFirstLine=false,
 }=options;
 
-if(typeofdisplayErrors!=='boolean'){
-thrownewERR_INVALID_ARG_TYPE('options.displayErrors','boolean',
-displayErrors);
-}
-if(typeofbreakOnSigint!=='boolean'){
-thrownewERR_INVALID_ARG_TYPE('options.breakOnSigint','boolean',
-breakOnSigint);
-}
+validateBoolean(displayErrors,'options.displayErrors');
+validateBoolean(breakOnSigint,'options.breakOnSigint');
 
 return{
  breakOnSigint,
@@ -201,30 +182,28 @@ function getRunInContextArgs(options = {}) {
 }
 
 functiongetContextOptions(options){
-if(options){
+if(!options)
+return{};
+constcontextOptions={
+name: options.contextName,
+origin: options.contextOrigin,
+codeGeneration: undefined,
+};
+if(contextOptions.name!==undefined)
+validateString(contextOptions.name,'options.contextName');
+if(contextOptions.origin!==undefined)
+validateString(contextOptions.origin,'options.contextOrigin');
+if(options.contextCodeGeneration!==undefined){
 validateObject(options.contextCodeGeneration,
 'options.contextCodeGeneration');
-constcontextOptions={
-name: options.contextName,
-origin: options.contextOrigin,
-codeGeneration: typeofoptions.contextCodeGeneration==='object' ? {
-strings: options.contextCodeGeneration.strings,
-wasm: options.contextCodeGeneration.wasm,
-} : undefined,
-};
-if(contextOptions.name!==undefined)
-validateString(contextOptions.name,'options.contextName');
-if(contextOptions.origin!==undefined)
-validateString(contextOptions.origin,'options.contextOrigin');
-if(contextOptions.codeGeneration){
-validateBool(contextOptions.codeGeneration.strings,
-'options.contextCodeGeneration.strings');
-validateBool(contextOptions.codeGeneration.wasm,
-'options.contextCodeGeneration.wasm');
-}
-returncontextOptions;
+const{ strings, wasm }=options.contextCodeGeneration;
+if(strings!==undefined)
+validateBoolean(strings,'options.contextCodeGeneration.strings');
+if(wasm!==undefined)
+validateBoolean(wasm,'options.contextCodeGeneration.wasm');
+contextOptions.codeGeneration={ strings, wasm };
 }
-return{};
+returncontextOptions;
 }
 
 functionisContext(object){
@@ -240,9 +219,7 @@ function createContext(contextObject = {}, options = {}) {
 returncontextObject;
 }
 
-if(typeofoptions!=='object'||options===null){
-thrownewERR_INVALID_ARG_TYPE('options','Object',options);
-}
+validateObject(options,'options');
 
 const{
  name =`VM Context ${defaultContextNameIndex++}`,
@@ -253,14 +230,15 @@ function createContext(contextObject = {}, options = {}) {
 validateString(name,'options.name');
 if(origin!==undefined)
 validateString(origin,'options.origin');
-validateObject(codeGeneration,'options.codeGeneration');
+if(codeGeneration!==undefined)
+validateObject(codeGeneration,'options.codeGeneration');
 
 letstrings=true;
 letwasm=true;
 if(codeGeneration!==undefined){
 ({ strings =true, wasm =true}=codeGeneration);
-validateBool(strings,'options.codeGeneration.strings');
-validateBool(wasm,'options.codeGeneration.wasm');
+validateBoolean(strings,'options.codeGeneration.strings');
+validateBoolean(wasm,'options.codeGeneration.wasm');
 }
 
 makeContext(contextObject,name,origin,strings,wasm);
@@ -322,9 +300,7 @@ function runInThisContext(code, options) {
 functioncompileFunction(code,params,options={}){
 validateString(code,'code');
 if(params!==undefined){
-if(!ArrayIsArray(params)){
-thrownewERR_INVALID_ARG_TYPE('params','Array',params);
-}
+validateArray(params,'params');
 ArrayPrototypeForEach(params,
 (param,i)=>validateString(param,`params[${i}]`));
 }
@@ -342,20 +318,9 @@ function compileFunction(code, params, options = {}) {
 validateString(filename,'options.filename');
 validateUint32(columnOffset,'options.columnOffset');
 validateUint32(lineOffset,'options.lineOffset');
-if(cachedData!==undefined&&!isArrayBufferView(cachedData)){
-thrownewERR_INVALID_ARG_TYPE(
-'options.cachedData',
-['Buffer','TypedArray','DataView'],
-cachedData
-);
-}
-if(typeofproduceCachedData!=='boolean'){
-thrownewERR_INVALID_ARG_TYPE(
-'options.produceCachedData',
-'boolean',
-produceCachedData
-);
-}
+if(cachedData!==undefined)
+validateBuffer(cachedData,'options.cachedData');
+validateBoolean(produceCachedData,'options.produceCachedData');
 if(parsingContext!==undefined){
 if(
 typeofparsingContext!=='object'||
@@ -369,21 +334,10 @@ function compileFunction(code, params, options = {}) {
 );
 }
 }
-if(!ArrayIsArray(contextExtensions)){
-thrownewERR_INVALID_ARG_TYPE(
-'options.contextExtensions',
-'Array',
-contextExtensions
-);
-}
+validateArray(contextExtensions,'options.contextExtensions');
 ArrayPrototypeForEach(contextExtensions,(extension,i)=>{
-if(typeofextension!=='object'){
-thrownewERR_INVALID_ARG_TYPE(
-`options.contextExtensions[${i}]`,
-'object',
-extension
-);
-}
+constname=`options.contextExtensions[${i}]`;
+validateObject(extension,name,{nullable: true});
 });
 
 constresult=_compileFunction(