fix types, a bit unfortunate though

zustandjs · Oct 11, 2024 · 7639422 · 7639422
1 parent 0e2f86d
commit 7639422
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 24 deletions.
diff --git a/src/with-actions.ts b/src/with-actions.ts
@@ -11,36 +11,28 @@ type InferStateActions<Actions> = Actions extends {
 type IsValidActions<State, Actions> =
   Extract<keyof Actions, keyof State> extends never ? Actions : never;
 
+type SetState<T> = (fn: (state: T) => Partial<T>) => void;
+type GetState<T> = () => T;
+
 export function withActions<
   State,
   Actions extends {
     [actionName: string]: (...args: never[]) => (state: State) => void;
   },
 >(
-  config: (set: (fn: (prevState: State) => Partial<State>) => void) => State,
+  config: (set: SetState<State>, get: GetState<State>) => State,
   actions: IsValidActions<State, Actions>,
 ): (
-  set: (
-    fn: (
-      prevState: State & InferStateActions<Actions>,
-    ) => Partial<State & InferStateActions<Actions>>,
-  ) => void,
-  get: () => State & InferStateActions<Actions>,
+  set: SetState<State & InferStateActions<Actions>>,
+  get: GetState<State & InferStateActions<Actions>>,
 ) => State & InferStateActions<Actions> {
-  return ((
-    set: (
-      fn: (
-        prevState: State & InferStateActions<Actions>,
-      ) => Partial<State & InferStateActions<Actions>>,
-    ) => void,
-    get: () => State & InferStateActions<Actions>,
-  ) => {
-    const state: Record<string, unknown> = config(set as never) as never;
+  return (set, get) => {
+    const state: Record<string, unknown> = config(set as never, get) as never;
     for (const [actionName, actionFn] of Object.entries(actions)) {
       state[actionName] = (...args: unknown[]) => {
         actionFn(...(args as never[]))(get());
       };
     }
-    return state;
-  }) as never;
+    return state as never;
+  };
 }
diff --git a/src/with-slices.ts b/src/with-slices.ts
@@ -23,16 +23,18 @@ type HasDuplicatedNames<Configs, Names = never> = Configs extends [
 type ValidConfigs<Configs> =
   HasDuplicatedNames<Configs> extends true ? never : Configs;
 
+type SetState<T> = (fn: (state: T) => Partial<T>) => void;
+type GetState<T> = () => T;
+
 export function withSlices<
   Configs extends SliceConfig<string, unknown, NonNullable<unknown>>[],
 >(
   ...configs: ValidConfigs<Configs>
 ): (
-  set: (fn: (prevState: InferState<Configs>) => InferState<Configs>) => void,
+  set: SetState<InferState<Configs>>,
+  get: GetState<InferState<Configs>>,
 ) => InferState<Configs> {
-  return ((
-    set: (fn: (prevState: InferState<Configs>) => InferState<Configs>) => void,
-  ) => {
+  return (set) => {
     const state: Record<string, unknown> = {};
     type ActionFn = (...args: unknown[]) => (prev: unknown) => unknown;
     for (const config of configs) {
@@ -52,6 +54,6 @@ export function withSlices<
         };
       }
     }
-    return state;
-  }) as never;
+    return state as never;
+  };
 }
diff --git a/tests/02_type.spec.tsx b/tests/02_type.spec.tsx
@@ -66,6 +66,7 @@ describe('withSlices', () => {
         set: (
           fn: (prevState: CountTextState) => Partial<CountTextState>,
         ) => void,
+        get: () => CountTextState,
       ) => CountTextState
     >(slices);