- Corrected type inference.

- Typescript updated.
OliMe · Mar 25, 2024 · 39b3d86 · 39b3d86
1 parent 6d6e4fb
commit 39b3d86
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "eslint-plugin-standard": "^4.0.0",
     "jest": "^26.6.3",
     "prettier": "^2.6.2",
-    "typescript": "^4.5.5"
+    "typescript": "^5.4.3"
   },
   "repository": {
     "type": "git",

diff --git a/src/toolkit/index.ts b/src/toolkit/index.ts
@@ -10,6 +10,8 @@ import {
   PrepareMessage,
   MessageCreator,
   CreatorReturnType,
+  ExtendedMessageWithoutPayload,
+  ExtendedMessageWithPayload,
 } from './types';
 import { useCache } from './cache';
 
@@ -170,7 +172,7 @@ export function createCommand(
 function createMessage<
   TPayload,
   TResponse,
-  TAdditionalProps,
+  TAdditionalProps extends { [key: string]: any } | undefined,
   TPrepare extends PrepareMessage<TAdditionalProps> | undefined = undefined,
 >(
   messageType: string,
@@ -183,7 +185,12 @@ function createMessage<
       type: messageType,
       payload,
       channelType,
-    } as CreatorReturnType<TAdditionalProps, ExtendedMessage<TPayload, TResponse>>;
+    } as CreatorReturnType<
+      TAdditionalProps,
+      TPayload extends undefined
+        ? ExtendedMessageWithoutPayload<TResponse>
+        : ExtendedMessageWithPayload<TPayload, TResponse>
+    >;
   };
   creator.type = messageType;
   creator.channelType = channelType;

diff --git a/src/toolkit/types.ts b/src/toolkit/types.ts
@@ -45,7 +45,12 @@ export interface MessageCreator<
   TResponse,
   TAdditionalProps extends { [key: string]: any } | undefined,
 > {
-  (payload: TPayload): CreatorReturnType<TAdditionalProps, ExtendedMessage<TPayload, TResponse>>;
+  (payload: TPayload): CreatorReturnType<
+    TAdditionalProps,
+    TPayload extends undefined
+      ? ExtendedMessageWithoutPayload<TResponse>
+      : ExtendedMessageWithPayload<TPayload, TResponse>
+  >;
   type: string;
   channelType: ChannelSegregation;
   toString: () => string;