timers: fix validation

PR-URL: #54404
Reviewed-By: Claudio Wunder <cwunder@gnome.org>

Author: ShogunPanda

doc/api/timers.md

@@ -528,9 +528,8 @@ added:
 An experimental API defined by the [Scheduling APIs][] draft specification
 being developed as a standard Web Platform API.
 
-Calling `timersPromises.scheduler.wait(delay, options)` is roughly equivalent
-to calling `timersPromises.setTimeout(delay, undefined, options)` except that
-the `ref` option is not supported.
+Calling `timersPromises.scheduler.wait(delay, options)` is equivalent
+to calling `timersPromises.setTimeout(delay, undefined, options)`.
 
 ```mjs
 import { scheduler } from'node:timers/promises';

lib/timers/promises.js

@@ -24,7 +24,6 @@ const {
  AbortError,
 codes: {
 ERR_ILLEGAL_CONSTRUCTOR,
-ERR_INVALID_ARG_TYPE,
 ERR_INVALID_THIS,
 },
 }=require('internal/errors');
@@ -33,6 +32,7 @@ const {
  validateAbortSignal,
  validateBoolean,
  validateObject,
+ validateNumber,
 }=require('internal/validators');
 
 const{
@@ -50,34 +50,33 @@ function cancelListenerHandler(clear, reject, signal) {
 }
 
 functionsetTimeout(after,value,options=kEmptyObject){
-constargs=value!==undefined ? [value] : value;
-if(options==null||typeofoptions!=='object'){
-returnPromiseReject(
-newERR_INVALID_ARG_TYPE(
-'options',
-'Object',
-options));
-}
-const{ signal, ref =true}=options;
 try{
-validateAbortSignal(signal,'options.signal');
+if(typeofafter!=='undefined'){
+validateNumber(after,'delay');
+}
+
+validateObject(options,'options');
+
+if(typeofoptions?.signal!=='undefined'){
+validateAbortSignal(options.signal,'options.signal');
+}
+
+if(typeofoptions?.ref!=='undefined'){
+validateBoolean(options.ref,'options.ref');
+}
 }catch(err){
 returnPromiseReject(err);
 }
-if(typeofref!=='boolean'){
-returnPromiseReject(
-newERR_INVALID_ARG_TYPE(
-'options.ref',
-'boolean',
-ref));
-}
+
+const{ signal, ref =true}=options;
 
 if(signal?.aborted){
 returnPromiseReject(newAbortError(undefined,{cause: signal.reason}));
 }
+
 letoncancel;
 constret=newPromise((resolve,reject)=>{
-consttimeout=newTimeout(resolve,after,args,false,ref);
+consttimeout=newTimeout(resolve,after,[value],false,ref);
 insert(timeout,timeout._idleTimeout);
 if(signal){
 oncancel=FunctionPrototypeBind(cancelListenerHandler,
@@ -93,30 +92,26 @@ function setTimeout(after, value, options = kEmptyObject) {
 }
 
 functionsetImmediate(value,options=kEmptyObject){
-if(options==null||typeofoptions!=='object'){
-returnPromiseReject(
-newERR_INVALID_ARG_TYPE(
-'options',
-'Object',
-options));
-}
-const{ signal, ref =true}=options;
 try{
-validateAbortSignal(signal,'options.signal');
+validateObject(options,'options');
+
+if(typeofoptions?.signal!=='undefined'){
+validateAbortSignal(options.signal,'options.signal');
+}
+
+if(typeofoptions?.ref!=='undefined'){
+validateBoolean(options.ref,'options.ref');
+}
 }catch(err){
 returnPromiseReject(err);
 }
-if(typeofref!=='boolean'){
-returnPromiseReject(
-newERR_INVALID_ARG_TYPE(
-'options.ref',
-'boolean',
-ref));
-}
+
+const{ signal, ref =true}=options;
 
 if(signal?.aborted){
 returnPromiseReject(newAbortError(undefined,{cause: signal.reason}));
 }
+
 letoncancel;
 constret=newPromise((resolve,reject)=>{
 constimmediate=newImmediate(resolve,[value]);
@@ -136,13 +131,29 @@ function setImmediate(value, options = kEmptyObject) {
 }
 
 asyncfunction*setInterval(after,value,options=kEmptyObject){
-validateObject(options,'options');
+try{
+if(typeofafter!=='undefined'){
+validateNumber(after,'delay');
+}
+
+validateObject(options,'options');
+
+if(typeofoptions?.signal!=='undefined'){
+validateAbortSignal(options.signal,'options.signal');
+}
+
+if(typeofoptions?.ref!=='undefined'){
+validateBoolean(options.ref,'options.ref');
+}
+}catch(err){
+returnPromiseReject(err);
+}
+
 const{ signal, ref =true}=options;
-validateAbortSignal(signal,'options.signal');
-validateBoolean(ref,'options.ref');
 
-if(signal?.aborted)
+if(signal?.aborted){
 thrownewAbortError(undefined,{cause: signal?.reason});
+}
 
 letonCancel;
 letinterval;
@@ -216,7 +227,7 @@ class Scheduler {
 wait(delay,options){
 if(!this[kScheduler])
 thrownewERR_INVALID_THIS('Scheduler');
-returnsetTimeout(delay,undefined,{signal: options?.signal});
+returnsetTimeout(delay,undefined,options);
 }
 }
 

test/parallel/test-timers-timeout-promisified.js

@@ -63,29 +63,21 @@ process.on('multipleResolves', common.mustNotCall());
 }
 
 {
-Promise.all(
-[1,'',false,Infinity].map(
-(i)=>assert.rejects(setPromiseTimeout(10,null,i),{
-code: 'ERR_INVALID_ARG_TYPE'
-})
-)
-).then(common.mustCall());
-
-Promise.all(
-[1,'',false,Infinity,null,{}].map(
-(signal)=>assert.rejects(setPromiseTimeout(10,null,{ signal }),{
-code: 'ERR_INVALID_ARG_TYPE'
-})
-)
-).then(common.mustCall());
-
-Promise.all(
-[1,'',Infinity,null,{}].map(
-(ref)=>assert.rejects(setPromiseTimeout(10,null,{ ref }),{
-code: 'ERR_INVALID_ARG_TYPE'
-})
-)
-).then(common.mustCall());
+for(constdelayof['',false]){
+assert.rejects(()=>setPromiseTimeout(delay,null,{}),/ERR_INVALID_ARG_TYPE/).then(common.mustCall());
+}
+
+for(constoptionsof[1,'',false,Infinity]){
+assert.rejects(()=>setPromiseTimeout(10,null,options),/ERR_INVALID_ARG_TYPE/).then(common.mustCall());
+}
+
+for(constsignalof[1,'',false,Infinity,null,{}]){
+assert.rejects(()=>setPromiseTimeout(10,null,{ signal }),/ERR_INVALID_ARG_TYPE/).then(common.mustCall());
+}
+
+for(constrefof[1,'',Infinity,null,{}]){
+assert.rejects(()=>setPromiseTimeout(10,null,{ ref }),/ERR_INVALID_ARG_TYPE/).then(common.mustCall());
+}
 }
 
 {