@@ -41,12 +41,11 @@ const {
41
41
} = require ( 'internal/errors' ) ;
42
42
const {
43
43
converters,
44
+ createInterfaceConverter,
44
45
createSequenceConverter,
45
46
} = require ( 'internal/webidl' ) ;
46
47
47
48
const {
48
- validateAbortSignal,
49
- validateAbortSignalArray,
50
49
validateObject,
51
50
validateUint32,
52
51
kValidateObjectAllowObjects,
@@ -229,11 +228,11 @@ class AbortSignal extends EventTarget {
229
228
* @returns {AbortSignal }
230
229
*/
231
230
static any ( signals ) {
232
- const signalsArray = createSequenceConverter (
233
- converters . any ,
234
- ) ( signals ) ;
231
+ const signalsArray = converters [ 'sequence<AbortSignal>' ] (
232
+ signals ,
233
+ { __proto__ : null , context : 'signals' } ,
234
+ ) ;
235
235
236
- validateAbortSignalArray ( signalsArray , 'signals' ) ;
237
236
const resultSignal = new AbortSignal ( kDontThrowSymbol , { composite : true } ) ;
238
237
if ( ! signalsArray . length ) {
239
238
return resultSignal ;
@@ -353,6 +352,9 @@ class AbortSignal extends EventTarget {
353
352
}
354
353
}
355
354
355
+ converters . AbortSignal = createInterfaceConverter ( 'AbortSignal' , AbortSignal . prototype ) ;
356
+ converters [ 'sequence<AbortSignal>' ] = createSequenceConverter ( converters . AbortSignal ) ;
357
+
356
358
function ClonedAbortSignal ( ) {
357
359
return new AbortSignal ( kDontThrowSymbol , { transferable : true } ) ;
358
360
}
@@ -442,10 +444,7 @@ function transferableAbortController() {
442
444
* @returns {Promise<void> }
443
445
*/
444
446
async function aborted ( signal , resource ) {
445
- if ( signal === undefined ) {
446
- throw new ERR_INVALID_ARG_TYPE ( 'signal' , 'AbortSignal' , signal ) ;
447
- }
448
- validateAbortSignal ( signal , 'signal' ) ;
447
+ converters . AbortSignal ( signal , { __proto__ : null , context : 'signal' } ) ;
449
448
validateObject ( resource , 'resource' , kValidateObjectAllowObjects ) ;
450
449
if ( signal . aborted )
451
450
return PromiseResolve ( ) ;
0 commit comments