@@ -505,4 +505,44 @@ describe("RequestConfigBuilder", () => {
505505 expect ( config . maxTokens ) . toBe ( 2000 )
506506 } )
507507 } )
508+
509+ describe ( "static merge helpers (canonical abort-signal entry points)" , ( ) => {
510+ it ( "returns undefined from mergeAbortSignalAndTimeout when no external signal and no valid timeout" , ( ) => {
511+ expect ( RequestConfigBuilder . mergeAbortSignalAndTimeout ( undefined , undefined ) ) . toBeUndefined ( )
512+ expect ( RequestConfigBuilder . mergeAbortSignalAndTimeout ( undefined , 0 ) ) . toBeUndefined ( )
513+ expect ( RequestConfigBuilder . mergeAbortSignalAndTimeout ( undefined , - 5 ) ) . toBeUndefined ( )
514+ } )
515+
516+ it ( "returns the external signal directly when no timeout is merged" , ( ) => {
517+ const controller = new AbortController ( )
518+ expect ( RequestConfigBuilder . mergeAbortSignalAndTimeout ( controller . signal , undefined ) ) . toBe (
519+ controller . signal ,
520+ )
521+ expect ( RequestConfigBuilder . mergeAbortSignalAndTimeout ( controller . signal , 0 ) ) . toBe ( controller . signal )
522+ } )
523+
524+ it ( "returns the primary signal directly from mergeAbortSignals when there is no secondary" , ( ) => {
525+ const controller = new AbortController ( )
526+ expect ( RequestConfigBuilder . mergeAbortSignals ( controller . signal ) ) . toBe ( controller . signal )
527+ expect ( RequestConfigBuilder . mergeAbortSignals ( controller . signal , undefined ) ) . toBe ( controller . signal )
528+ } )
529+
530+ it ( "delegates to AbortSignal.any when two distinct signals are merged" , ( ) => {
531+ const a = new AbortController ( )
532+ const b = new AbortController ( )
533+ const merged = RequestConfigBuilder . mergeAbortSignals ( a . signal , b . signal )
534+ expect ( merged . aborted ) . toBe ( false )
535+ b . abort ( )
536+ expect ( merged . aborted ) . toBe ( true )
537+ } )
538+
539+ it ( "aborts the merged signal when the primary signal aborts" , ( ) => {
540+ const a = new AbortController ( )
541+ const b = new AbortController ( )
542+ const merged = RequestConfigBuilder . mergeAbortSignals ( a . signal , b . signal )
543+ expect ( merged . aborted ) . toBe ( false )
544+ a . abort ( )
545+ expect ( merged . aborted ) . toBe ( true )
546+ } )
547+ } )
508548} )
0 commit comments