fix: TReqIn and TReqOut usage

nichitaa · Feb 8, 2024 · 28ee7bd · 28ee7bd
1 parent 84eb054
commit 28ee7bd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/.changeset/thirty-games-whisper.md b/.changeset/thirty-games-whisper.md
@@ -0,0 +1,5 @@
+---
+"@nichitaa/rxjs-ws": patch
+---
+
+fix types for `TReqIn` and `TReqOut`
diff --git a/src/core/types.ts b/src/core/types.ts
@@ -47,7 +47,7 @@ export interface StreamResponse<TRes, TReqOut, TErr> {
 export interface StreamHandlerParams<TEvent, TRes = TEvent, TReqIn = unknown, TReqOut = TReqIn> {
   default: TRes;
   transformRequests: TransformOperator<
-    SendRequestParams<TEvent, TRes, TReqIn>,
+    SendRequestParams<TEvent, TRes, TReqIn, TReqOut>,
     SendRequestParams<TEvent, TRes, TReqOut>
   >;
   resetResponseOnNextRequest: boolean;
@@ -64,7 +64,7 @@ export interface StreamHandler<
 > {
   $: BehaviorSubject<StreamResponse<TRes, TReqOut, TErr>>;
 
-  send(params: SendRequestParams<TEvent, TRes, TReqIn>): void;
+  send(params: SendRequestParams<TEvent, TRes, TReqIn, TReqOut>): void;
 }
 
 export type TransformResponse<TEvent, TRes = TEvent, TReqOut = unknown> = (

diff --git a/src/core/web-socket-connector.ts b/src/core/web-socket-connector.ts
@@ -168,7 +168,7 @@ export class WebSocketConnector {
     params: Partial<StreamHandlerParams<TEvent, TRes, TReqIn, TReqOut>> = {},
   ): StreamHandler<TEvent, TRes, TReqIn, TReqOut, TErr> => {
     const defaultTransformRequest = identity as TransformOperator<
-      SendRequestParams<TEvent, TRes, TReqIn>,
+      SendRequestParams<TEvent, TRes, TReqIn, TReqOut>,
       SendRequestParams<TEvent, TRes, TReqOut>
     >;
 
@@ -180,9 +180,9 @@ export class WebSocketConnector {
       awaitReadyStatusBeforeNextRequest = true,
     } = params;
 
-    const requests$ = new BehaviorSubject<undefined | SendRequestParams<TEvent, TRes, TReqIn>>(
-      undefined,
-    );
+    const requests$ = new BehaviorSubject<
+      undefined | SendRequestParams<TEvent, TRes, TReqIn, TReqOut>
+    >(undefined);
     const uninitializedValue: StreamResponse<TRes, TReqOut, TErr> = {
       status: STREAM_STATUS.uninitialized,
       response: defaultResponse,
@@ -282,7 +282,7 @@ export class WebSocketConnector {
         },
       });
 
-    const send = (params: SendRequestParams<TEvent, TRes, TReqIn>) => {
+    const send = (params: SendRequestParams<TEvent, TRes, TReqIn, TReqOut>) => {
       // create a shallow copy of the send request params to referentially check it in nextRequest$
       requests$.next({ ...params });
     };