@@ -480,29 +480,25 @@ type ActionCallbacks<
480480 TypeAction extends Action ,
481481 Data extends object ,
482482 Headers extends object
483- > = {
484- finally ?: ActionFinally < TypeAction , Data , Headers >
485- resend ?: Resender < TypeAction , Data , Headers >
486- } & (
483+ > = (
487484 | {
488485 access : Authorizer < TypeAction , Data , Headers >
489486 process ?: Processor < TypeAction , Data , Headers >
490487 }
491488 | {
492489 accessAndProcess : Processor < TypeAction , Data , Headers >
493490 }
494- )
491+ ) & {
492+ finally ?: ActionFinally < TypeAction , Data , Headers >
493+ resend ?: Resender < TypeAction , Data , Headers >
494+ }
495495
496496type ChannelCallbacks <
497497 SubscribeAction extends Action ,
498498 Data extends object ,
499499 ChannelParams extends object | string [ ] ,
500500 Headers extends object
501- > = {
502- filter ?: FilterCreator < SubscribeAction , Data , ChannelParams , Headers >
503- finally ?: ChannelFinally < SubscribeAction , Data , ChannelParams , Headers >
504- unsubscribe ?: ChannelUnsubscribe < Data , ChannelParams , Headers >
505- } & (
501+ > = (
506502 | {
507503 access : ChannelAuthorizer < SubscribeAction , Data , ChannelParams , Headers >
508504 load ?: ChannelLoader < SubscribeAction , Data , ChannelParams , Headers >
@@ -515,7 +511,11 @@ type ChannelCallbacks<
515511 Headers
516512 >
517513 }
518- )
514+ ) & {
515+ filter ?: FilterCreator < SubscribeAction , Data , ChannelParams , Headers >
516+ finally ?: ChannelFinally < SubscribeAction , Data , ChannelParams , Headers >
517+ unsubscribe ?: ChannelUnsubscribe < Data , ChannelParams , Headers >
518+ }
519519
520520interface ActionReporter {
521521 action : Readonly < Action >
0 commit comments