lib: remove ERR_INVALID_OPT_VALUE and ERR_INVALID_OPT_VALUE_ENCODING

This will be a start to generalize all argument validation errors. As currently we throw ARG/OPT, OUT_OF_RANGE, and other more specific errors. The OPT errors didn't bring much to the errors as it's just another variant of ARG error which is sometimes more confusing (some of our code used OPT errors to denote just argument validation errors presumably because of similarity of OPT to 'option' and not 'options-object') and they don't specify the name of the options object where the invalid value is located. Much better approach would be to just specify path to the invalid value in the name of the value as it is done in this PR (i.e. 'options.format', 'options.publicKey.type' etc) Also since this decreases a variety of errors we have it'd be easier to reuse validation code across the codebase. Refs: #31251 Refs: #34070 (comment) Signed-off-by: Denys Otrishko <[email protected]> PR-URL: #34682 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Rich Trott <[email protected]>

Author: lundibundi

doc/api/buffer.md

@@ -288,6 +288,10 @@ It can be constructed in a variety of ways.
 <!-- YAML
 added: v5.10.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/34682
+ description: Throw ERR_INVALID_ARG_VALUE instead of ERR_INVALID_OPT_VALUE
+ for invalid input arguments.
  - version: v10.0.0
  pr-url: https://github.com/nodejs/node/pull/18129
  description: Attempting to fill a non-zero length buffer with a zero length
@@ -319,7 +323,7 @@ console.log(buf);
 ```
 
 If `size` is larger than
-[`buffer.constants.MAX_LENGTH`][] or smaller than 0, [`ERR_INVALID_OPT_VALUE`][]
+[`buffer.constants.MAX_LENGTH`][] or smaller than 0, [`ERR_INVALID_ARG_VALUE`][]
 is thrown.
 
 If `fill` is specified, the allocated `Buffer` will be initialized by calling
@@ -353,6 +357,10 @@ A `TypeError` will be thrown if `size` is not a number.
 <!-- YAML
 added: v5.10.0
 changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/34682
+ description: Throw ERR_INVALID_ARG_VALUE instead of ERR_INVALID_OPT_VALUE
+ for invalid input arguments.
  - version: v7.0.0
  pr-url: https://github.com/nodejs/node/pull/7079
  description: Passing a negative `size` will now throw an error.
@@ -361,7 +369,7 @@ changes:
 *`size`{integer} The desired length of the new `Buffer`.
 
 Allocates a new `Buffer` of `size` bytes. If `size` is larger than
-[`buffer.constants.MAX_LENGTH`][] or smaller than 0, [`ERR_INVALID_OPT_VALUE`][]
+[`buffer.constants.MAX_LENGTH`][] or smaller than 0, [`ERR_INVALID_ARG_VALUE`][]
 is thrown.
 
 The underlying memory for `Buffer` instances created in this way is *not
@@ -401,12 +409,17 @@ additional performance that [`Buffer.allocUnsafe()`][] provides.
 ### Static method: `Buffer.allocUnsafeSlow(size)`
 <!-- YAML
 added: v5.12.0
+changes:
+ - version: REPLACEME
+ pr-url: https://github.com/nodejs/node/pull/34682
+ description: Throw ERR_INVALID_ARG_VALUE instead of ERR_INVALID_OPT_VALUE
+ for invalid input arguments.
 -->
 
 *`size`{integer} The desired length of the new `Buffer`.
 
 Allocates a new `Buffer` of `size` bytes. If `size` is larger than
-[`buffer.constants.MAX_LENGTH`][] or smaller than 0, [`ERR_INVALID_OPT_VALUE`][]
+[`buffer.constants.MAX_LENGTH`][] or smaller than 0, [`ERR_INVALID_ARG_VALUE`][]
 is thrown. A zero-length `Buffer` is created if `size` is 0.
 
 The underlying memory for `Buffer` instances created in this way is *not
@@ -3274,7 +3287,7 @@ introducing security vulnerabilities into an application.
 [`Buffer.poolSize`]: #buffer_class_property_buffer_poolsize
 [`DataView`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/DataView
 [`ERR_INVALID_BUFFER_SIZE`]: errors.html#ERR_INVALID_BUFFER_SIZE
-[`ERR_INVALID_OPT_VALUE`]: errors.html#ERR_INVALID_OPT_VALUE
+[`ERR_INVALID_ARG_VALUE`]: errors.html#ERR_INVALID_ARG_VALUE
 [`ERR_OUT_OF_RANGE`]: errors.html#ERR_OUT_OF_RANGE
 [`JSON.stringify()`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/stringify
 [`SharedArrayBuffer`]: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer

doc/api/errors.md

@@ -1378,16 +1378,6 @@ An IP address is not valid.
 The imported module string is an invalid URL, package name, or package subpath
 specifier.
 
-<aid="ERR_INVALID_OPT_VALUE"></a>
-### `ERR_INVALID_OPT_VALUE`
-
-An invalid or unexpected value was passed in an options object.
-
-<aid="ERR_INVALID_OPT_VALUE_ENCODING"></a>
-### `ERR_INVALID_OPT_VALUE_ENCODING`
-
-An invalid or unknown file encoding was passed.
-
 <aid="ERR_INVALID_PACKAGE_CONFIG"></a>
 ### `ERR_INVALID_PACKAGE_CONFIG`
 
@@ -2391,6 +2381,24 @@ Used when an invalid character is found in an HTTP response status message
 -->
 A given index was out of the accepted range (e.g. negative offsets).
 
+<aid="ERR_INVALID_OPT_VALUE"></a>
+### `ERR_INVALID_OPT_VALUE`
+<!-- YAML
+added: v8.0.0
+removed: REPLACEME
+-->
+
+An invalid or unexpected value was passed in an options object.
+
+<aid="ERR_INVALID_OPT_VALUE_ENCODING"></a>
+### `ERR_INVALID_OPT_VALUE_ENCODING`
+<!-- YAML
+added: v9.0.0
+removed: REPLACEME
+-->
+
+An invalid or unknown file encoding was passed.
+
 <aid="ERR_MISSING_MESSAGE_PORT_IN_TRANSFER_LIST"></a>
 ### `ERR_MISSING_MESSAGE_PORT_IN_TRANSFER_LIST`
 <!-- YAML

lib/_http_agent.js

@@ -98,7 +98,7 @@ function Agent(options){
 this.maxTotalSockets=this.options.maxTotalSockets;
 this.totalSocketCount=0;
 
-validateOneOf(this.scheduling,'scheduling',['fifo','lifo'],true);
+validateOneOf(this.scheduling,'scheduling',['fifo','lifo']);
 
 if(this.maxTotalSockets!==undefined){
 validateNumber(this.maxTotalSockets,'maxTotalSockets');

lib/_tls_common.js

@@ -32,7 +32,7 @@ const tls = require('tls');
 const{
 ERR_CRYPTO_CUSTOM_ENGINE_NOT_SUPPORTED,
 ERR_INVALID_ARG_TYPE,
-ERR_INVALID_OPT_VALUE,
+ERR_INVALID_ARG_VALUE,
 ERR_TLS_INVALID_PROTOCOL_VERSION,
 ERR_TLS_PROTOCOL_VERSION_CONFLICT,
 }=require('internal/errors').codes;
@@ -157,7 +157,7 @@ exports.createSecureContext = function createSecureContext(options){
 }
 
 if(sigalgs===''){
-thrownewERR_INVALID_OPT_VALUE('sigalgs',sigalgs);
+thrownewERR_INVALID_ARG_VALUE('options.sigalgs',sigalgs);
 }
 
 c.context.setSigalgs(sigalgs);
@@ -167,12 +167,12 @@ exports.createSecureContext = function createSecureContext(options){
 if(privateKeyIdentifier!==undefined){
 if(privateKeyEngine===undefined){
 // Engine is required when privateKeyIdentifier is present
-thrownewERR_INVALID_OPT_VALUE('privateKeyEngine',
+thrownewERR_INVALID_ARG_VALUE('options.privateKeyEngine',
 privateKeyEngine);
 }
 if(key){
 // Both data key and engine key can't be set at the same time
-thrownewERR_INVALID_OPT_VALUE('privateKeyIdentifier',
+thrownewERR_INVALID_ARG_VALUE('options.privateKeyIdentifier',
 privateKeyIdentifier);
 }
 
@@ -210,7 +210,7 @@ exports.createSecureContext = function createSecureContext(options){
 if(cipherSuites===''&&cipherList===''){
 // Specifying empty cipher suites for both TLS1.2 and TLS1.3 is invalid, its
 // not possible to handshake with no suites.
-thrownewERR_INVALID_OPT_VALUE('ciphers',ciphers);
+thrownewERR_INVALID_ARG_VALUE('options.ciphers',ciphers);
 }
 
 c.context.setCipherSuites(cipherSuites);

lib/buffer.js

@@ -86,7 +86,6 @@ const{
 ERR_INVALID_ARG_TYPE,
 ERR_INVALID_ARG_VALUE,
 ERR_INVALID_BUFFER_SIZE,
-ERR_INVALID_OPT_VALUE,
 ERR_OUT_OF_RANGE,
 ERR_UNKNOWN_ENCODING
 },
@@ -342,7 +341,7 @@ const assertSize = hideStackFrames((size) =>{
 thrownewERR_INVALID_ARG_TYPE('size','number',size);
 }
 if(!(size>=0&&size<=kMaxLength)){
-thrownewERR_INVALID_OPT_VALUE.RangeError('size',size);
+thrownewERR_INVALID_ARG_VALUE.RangeError('size',size);
 }
 });
 

lib/dns.js

@@ -42,8 +42,8 @@ const{
 }=require('internal/dns/utils');
 const{
 ERR_INVALID_ARG_TYPE,
+ERR_INVALID_ARG_VALUE,
 ERR_INVALID_CALLBACK,
-ERR_INVALID_OPT_VALUE,
 ERR_MISSING_ARGS,
 }=errors.codes;
 const{
@@ -115,7 +115,7 @@ function lookup(hostname, options, callback){
 family=options>>>0;
 }
 
-validateOneOf(family,'family',[0,4,6],true);
+validateOneOf(family,'family',[0,4,6]);
 
 if(!hostname){
 emitInvalidHostnameWarning(hostname);
@@ -171,7 +171,7 @@ function lookupService(address, port, callback){
 thrownewERR_MISSING_ARGS('address','port','callback');
 
 if(isIP(address)===0)
-thrownewERR_INVALID_OPT_VALUE('address',address);
+thrownewERR_INVALID_ARG_VALUE('address',address);
 
 validatePort(port);
 
@@ -262,7 +262,7 @@ function resolve(hostname, rrtype, callback){
 if(typeofresolver==='function'){
 returnresolver.call(this,hostname,callback);
 }
-thrownewERR_INVALID_OPT_VALUE('rrtype',rrtype);
+thrownewERR_INVALID_ARG_VALUE('rrtype',rrtype);
 }
 
 functiondefaultResolverSetServers(servers){

lib/internal/child_process.js

@@ -11,8 +11,8 @@ const{
  errnoException,
 codes: {
 ERR_INVALID_ARG_TYPE,
+ERR_INVALID_ARG_VALUE,
 ERR_INVALID_HANDLE_TYPE,
-ERR_INVALID_OPT_VALUE,
 ERR_INVALID_SYNC_FORK_INPUT,
 ERR_IPC_CHANNEL_CLOSED,
 ERR_IPC_DISCONNECTED,
@@ -226,7 +226,7 @@ function stdioStringToArray(stdio, channel){
 case'pipe': options.push(stdio,stdio,stdio);break;
 case'inherit': options.push(0,1,2);break;
 default:
-thrownewERR_INVALID_OPT_VALUE('stdio',stdio);
+thrownewERR_INVALID_ARG_VALUE('stdio',stdio);
 }
 
 if(channel)options.push(channel);
@@ -347,7 +347,7 @@ ChildProcess.prototype.spawn = function(options){
 
 
 validateOneOf(options.serialization,'options.serialization',
-[undefined,'json','advanced'],true);
+[undefined,'json','advanced']);
 constserialization=options.serialization||'json';
 
 if(ipc!==undefined){
@@ -934,7 +934,7 @@ function getValidStdio(stdio, sync){
 if(typeofstdio==='string'){
 stdio=stdioStringToArray(stdio);
 }elseif(!ArrayIsArray(stdio)){
-thrownewERR_INVALID_OPT_VALUE('stdio',stdio);
+thrownewERR_INVALID_ARG_VALUE('stdio',stdio);
 }
 
 // At least 3 stdio will be created
@@ -1019,7 +1019,7 @@ function getValidStdio(stdio, sync){
 }else{
 // Cleanup
 cleanup();
-thrownewERR_INVALID_OPT_VALUE('stdio',stdio);
+thrownewERR_INVALID_ARG_VALUE('stdio',stdio);
 }
 
 returnacc;

lib/internal/crypto/cipher.js

@@ -12,7 +12,7 @@ const{
 const{
 ERR_CRYPTO_INVALID_STATE,
 ERR_INVALID_ARG_TYPE,
-ERR_INVALID_OPT_VALUE
+ERR_INVALID_ARG_VALUE
 }=require('internal/errors').codes;
 const{ validateEncoding, validateString }=require('internal/validators');
 
@@ -87,7 +87,7 @@ function getUIntOption(options, key){
 letvalue;
 if(options&&(value=options[key])!=null){
 if(value>>>0!==value)
-thrownewERR_INVALID_OPT_VALUE(key,value);
+thrownewERR_INVALID_ARG_VALUE(`options.${key}`,value);
 returnvalue;
 }
 return-1;

lib/internal/crypto/diffiehellman.js

@@ -12,7 +12,7 @@ const{
 ERR_CRYPTO_INCOMPATIBLE_KEY,
 ERR_CRYPTO_INVALID_KEY_OBJECT_TYPE,
 ERR_INVALID_ARG_TYPE,
-ERR_INVALID_OPT_VALUE
+ERR_INVALID_ARG_VALUE,
 }=require('internal/errors').codes;
 const{
  validateString,
@@ -258,10 +258,10 @@ function diffieHellman(options){
 
 const{ privateKey, publicKey }=options;
 if(!(privateKeyinstanceofKeyObject))
-thrownewERR_INVALID_OPT_VALUE('privateKey',privateKey);
+thrownewERR_INVALID_ARG_VALUE('options.privateKey',privateKey);
 
 if(!(publicKeyinstanceofKeyObject))
-thrownewERR_INVALID_OPT_VALUE('publicKey',publicKey);
+thrownewERR_INVALID_ARG_VALUE('options.publicKey',publicKey);
 
 if(privateKey.type!=='private')
 thrownewERR_CRYPTO_INVALID_KEY_OBJECT_TYPE(privateKey.type,'private');