fix(core): fixed mutation typing for unknown payload type

andrewcourtice · Feb 11, 2021 · 438459a · 438459a · vercel · Feb 11, 2021
1 parent e9fb5b6
commit 438459a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/core/src/internal-store.ts b/core/src/internal-store.ts
@@ -89,7 +89,7 @@ export default class Store<T extends object = any> implements InternalStore<T> {
         return output;
     };
 
-    private mutate<U>(name: string, sender: string, mutator: Mutator<T, U>, payload?: U): void {
+    private mutate<U>(name: string, sender: string, mutator: Mutator<T, U>, payload: U): void {
         const eventData: MutationEventData = {
             payload,
             mutation: name
@@ -114,11 +114,11 @@ export default class Store<T extends object = any> implements InternalStore<T> {
 
         this.mutations.add(name);
 
-        return (payload?: U) => this.mutate(name, SENDER, mutator, payload);
+        return ((payload: U) => this.mutate(name, SENDER, mutator, payload)) as Mutation<U>;
     }
 
     public exec(name: string, sender: string, mutator: Mutator<T, undefined>): void {
-        this.mutate(name, sender, mutator);
+        this.mutate(name, sender, mutator, undefined);
     }
 
 }
diff --git a/core/src/types.ts b/core/src/types.ts
@@ -8,8 +8,8 @@ import type {
 export type ReadState<T> = DeepReadonly<T>;
 export type WriteState<T> = UnwrapRef<T>;
 export type Getter<T, U> = (state: ReadState<T>) => U;
-export type Mutator<T, U> = (state: WriteState<T>, payload?: U) => void;
-export type Mutation<T> = (payload?: T) => void;
+export type Mutator<T, U> = (state: WriteState<T>, payload: U) => void;
+export type Mutation<T> = undefined extends T ? (payload?: T) => void : (payload: T) => void;
 export type InternalStores = Map<string, InternalStore<any>>;
 export type EventHandler<T = any> = (payload?: EventPayload<T>) => void;