[fix #2982] use DispatcherInterceptor type for Dispatcher#Compose (#2983

)
nodejs · Mar 22, 2024 · 8fce214 · 8fce214
1 parent fcbf6de
commit 8fce214
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 4 deletions.
diff --git a/test/types/dispatcher.test-d.ts b/test/types/dispatcher.test-d.ts
@@ -129,8 +129,34 @@ declare const { body }: Dispatcher.ResponseData;
 
 // compose
 {
-  expectAssignable<Dispatcher.ComposedDispatcher>(new Dispatcher().compose(new Dispatcher().dispatch, new Dispatcher().dispatch))
-  expectAssignable<Dispatcher.ComposedDispatcher>(new Dispatcher().compose([new Dispatcher().dispatch, new Dispatcher().dispatch]))
+  expectAssignable<Dispatcher.ComposedDispatcher>(new Dispatcher().compose(
+    (dispatcher) => {
+      expectAssignable<Dispatcher['dispatch']>(dispatcher);
+      return (opts, handlers) => {
+        expectAssignable<Dispatcher.DispatchOptions>(opts);
+        expectAssignable<Dispatcher.DispatchHandlers>(handlers);
+        return dispatcher(opts, handlers)
+      }
+    }
+  ))
+  expectAssignable<Dispatcher.ComposedDispatcher>(new Dispatcher().compose([
+    (dispatcher) => {
+      expectAssignable<Dispatcher['dispatch']>(dispatcher);
+      return (opts, handlers) => {
+        expectAssignable<Dispatcher.DispatchOptions>(opts);
+        expectAssignable<Dispatcher.DispatchHandlers>(handlers);
+        return dispatcher(opts, handlers)
+      }
+    },
+    (dispatcher) => {
+      expectAssignable<Dispatcher['dispatch']>(dispatcher);
+      return (opts, handlers) => {
+        expectAssignable<Dispatcher.DispatchOptions>(opts);
+        expectAssignable<Dispatcher.DispatchHandlers>(handlers);
+        return dispatcher(opts, handlers)
+      }
+    }
+  ]))
 }
 
 {

diff --git a/types/dispatcher.d.ts b/types/dispatcher.d.ts
@@ -19,8 +19,8 @@ declare class Dispatcher extends EventEmitter {
   connect(options: Dispatcher.ConnectOptions): Promise<Dispatcher.ConnectData>;
   connect(options: Dispatcher.ConnectOptions, callback: (err: Error | null, data: Dispatcher.ConnectData) => void): void;
   /** Compose a chain of dispatchers */
-  compose(dispatchers: Dispatcher['dispatch'][]): Dispatcher.ComposedDispatcher;
-  compose(...dispatchers: Dispatcher['dispatch'][]): Dispatcher.ComposedDispatcher;
+  compose(dispatchers: Dispatcher.DispatcherInterceptor[]): Dispatcher.ComposedDispatcher;
+  compose(...dispatchers: Dispatcher.DispatcherInterceptor[]): Dispatcher.ComposedDispatcher;
   /** Performs an HTTP request. */
   request(options: Dispatcher.RequestOptions): Promise<Dispatcher.ResponseData>;
   request(options: Dispatcher.RequestOptions, callback: (err: Error | null, data: Dispatcher.ResponseData) => void): void;