Merge pull request #2629 from dokmic/bugfix/dispatch-type-inference

reduxjs · Oct 6, 2022 · 1cd4bb2 · 1cd4bb2
2 parents 7c3129c + 6687a38
commit 1cd4bb2
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/packages/toolkit/src/tests/configureStore.typetest.ts b/packages/toolkit/src/tests/configureStore.typetest.ts
@@ -13,6 +13,7 @@ import {
   configureStore,
   getDefaultMiddleware,
   createSlice,
+  ConfigureStoreOptions,
 } from '@reduxjs/toolkit'
 import type { ThunkMiddleware, ThunkAction, ThunkDispatch } from 'redux-thunk'
 import thunk from 'redux-thunk'
@@ -304,6 +305,18 @@ const _anyMiddleware: any = () => () => () => {}
     // @ts-expect-error
     const result2: string = store.dispatch(5)
   }
+  /**
+   * Test: read-only middleware tuple
+   */
+  {
+    const store = configureStore({
+      reducer: reducerA,
+      middleware: [] as any as readonly [Middleware<(a: StateA) => boolean, StateA>],
+    })
+    const result: boolean = store.dispatch(5)
+    // @ts-expect-error
+    const result2: string = store.dispatch(5)
+  }
   /**
    * Test: multiple custom middleware
    */
@@ -473,6 +486,32 @@ const _anyMiddleware: any = () => () => () => {}
     expectNotAny(store.dispatch)
   }
 
+  /**
+   * Test: decorated `configureStore` won't make `dispatch` `never`
+   */
+  {
+    const someSlice = createSlice({
+      name: 'something',
+      initialState: null as any,
+      reducers: {
+        set(state) {
+          return state;
+        },
+      },
+    });
+
+    function configureMyStore<S>(options: Omit<ConfigureStoreOptions<S>, 'reducer'>) {
+      return configureStore({
+        ...options,
+        reducer: someSlice.reducer,
+      });
+    }
+
+    const store = configureMyStore({});
+
+    expectType<Function>(store.dispatch);
+  }
+
   {
     interface CounterState {
       value: number

diff --git a/packages/toolkit/src/tsHelpers.ts b/packages/toolkit/src/tsHelpers.ts
@@ -88,7 +88,7 @@ export type ExtractDispatchExtensions<M> = M extends MiddlewareArray<
   infer MiddlewareTuple
 >
   ? ExtractDispatchFromMiddlewareTuple<MiddlewareTuple, {}>
-  : M extends Middleware[]
+  : M extends ReadonlyArray<Middleware>
   ? ExtractDispatchFromMiddlewareTuple<[...M], {}>
   : never