Skip to content

Commit b147391

Browse files
committed
simplify types
1 parent fd88413 commit b147391

File tree

3 files changed

+8
-34
lines changed

3 files changed

+8
-34
lines changed

src/middleware/devtools.ts

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,8 @@ type StoreDevtools<S> = S extends {
5858
? {
5959
setState<R extends boolean | undefined>(
6060
partial:
61-
| (R extends true
62-
? T
63-
: R extends false | undefined
64-
? Partial<T>
65-
: T | Partial<T>)
66-
| ((
67-
state: T
68-
) => R extends true
69-
? T
70-
: R extends false | undefined
71-
? Partial<T>
72-
: T | Partial<T>),
61+
| (R extends true ? T : T | Partial<T>)
62+
| ((state: T) => R extends true ? T : T | Partial<T>),
7363
replace?: R,
7464
action?: string | { type: unknown }
7565
): Sr
@@ -81,11 +71,7 @@ type StoreDevtools<S> = S extends {
8171
? {
8272
setState<R extends boolean | undefined>(
8373
nextStateOrUpdater:
84-
| (R extends true
85-
? T
86-
: R extends false | undefined
87-
? Partial<T>
88-
: T | Partial<T>)
74+
| (R extends true ? T : T | Partial<T>)
8975
| ((state: Draft<T>) => void),
9076
shouldReplace?: R,
9177
action?: string | { type: unknown }

src/middleware/immer.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,9 @@ type StoreImmer<S> = S extends {
4141
}
4242
? {
4343
setState<R extends boolean | undefined = false>(
44-
nextStateOrUpdater: R extends true
45-
? T
46-
: R extends false | undefined
47-
? Partial<T>
48-
: T | Partial<T> | ((state: Draft<T>) => void),
44+
nextStateOrUpdater:
45+
| (R extends true ? T : T | Partial<T>)
46+
| ((state: Draft<T>) => void),
4947
shouldReplace?: R,
5048
...a: SkipTwo<A>
5149
): Sr

src/vanilla.ts

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,8 @@ export type Subscribe<T extends State> = {
1616
export type SetState<T extends State> = {
1717
_<R extends boolean | undefined = false>(
1818
partial:
19-
| (R extends true
20-
? T
21-
: R extends false | undefined
22-
? Partial<T>
23-
: T | Partial<T>)
24-
| ((
25-
state: T
26-
) => R extends true
27-
? T
28-
: R extends false | undefined
29-
? Partial<T>
30-
: T | Partial<T>),
19+
| (R extends true ? T : T | Partial<T>)
20+
| ((state: T) => R extends true ? T : T | Partial<T>),
3121
replace?: R
3222
): void
3323
}['_']

0 commit comments

Comments
 (0)