fix(): ts typings, reducer now accepts void due to Immer usage

rematch · Sep 20, 2021 · a869a1f · a869a1f
1 parent d8044c4
commit a869a1f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/examples/all-plugins-react-ts/src/models/settings.ts b/examples/all-plugins-react-ts/src/models/settings.ts
@@ -10,7 +10,6 @@ export const settings = createModel<RootModel>()({
 			state.isLightThemeOn = payload
 				? payload === 'light'
 				: !state.isLightThemeOn
-			return state
 		},
 	},
 })
diff --git a/packages/core/src/reduxStore.ts b/packages/core/src/reduxStore.ts
@@ -75,7 +75,13 @@ export function createModelReducer<
 		action: Action
 	): TState => {
 		if (action.type in modelReducers) {
-			return modelReducers[action.type](state, action.payload, action.meta)
+			return modelReducers[action.type](
+				state,
+				action.payload,
+				action.meta
+				// we use augmentation because a reducer can return void due immer plugin,
+				// which makes optional returning the reducer state
+			) as TState
 		}
 
 		return state

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -60,7 +60,7 @@ export type Reducer<TState = any> = (
 	state: TState,
 	payload?: Action['payload'],
 	meta?: Action['meta']
-) => TState
+) => TState | void
 
 /** ************************** Model *************************** */
 
@@ -384,7 +384,7 @@ export type ExtractRematchDispatchersFromReducers<
 export type ExtractRematchDispatcherFromReducer<TState, TReducer> =
 	TReducer extends () => any
 		? RematchDispatcher
-		: TReducer extends (state: TState, ...args: infer TRest) => TState
+		: TReducer extends (state: TState, ...args: infer TRest) => TState | void
 		? TRest extends []
 			? RematchDispatcher
 			: RematchDispatcher<TRest[0], TRest[1]>