Merge pull request #3906 from reduxjs/listener-fixes

Author: markerikson

packages/toolkit/src/listenerMiddleware/tests/listenerMiddleware.test.ts

@@ -3,7 +3,7 @@ import {
   createAction,
   createSlice,
   isAnyOf,
-  isFSA,
+  isFluxStandardAction,
 } from '@reduxjs/toolkit'
 import type { Mock } from 'vitest'
 import { vi } from 'vitest'
@@ -1521,7 +1521,9 @@ describe('createListenerMiddleware', () => {
           currentState,
           previousState
         ): action is PayloadAction<number> => {
-          return isFSA(action) && typeof action.payload === 'boolean'
+          return (
+            isFluxStandardAction(action) && typeof action.payload === 'boolean'
+          )
         },
         effect: (action, listenerApi) => {
           expectExactType<PayloadAction<number>>(action)
@@ -1530,7 +1532,9 @@ describe('createListenerMiddleware', () => {
 
       startListening({
         predicate: (action, currentState) => {
-          return isFSA(action) && typeof action.payload === 'number'
+          return (
+            isFluxStandardAction(action) && typeof action.payload === 'number'
+          )
         },
         effect: (action, listenerApi) => {
           expectExactType<UnknownAction>(action)

packages/toolkit/src/listenerMiddleware/types.ts

@@ -8,6 +8,7 @@ import type {
 } from 'redux'
 import type { ThunkDispatch } from 'redux-thunk'
 import type { TaskAbortError } from './exceptions'
+import { NoInfer } from '../tsHelpers'
 
 /**
  * @internal
@@ -444,7 +445,7 @@ export interface AddListenerOverloads<
   ): Return
 
   /** Accepts an RTK matcher function, such as `incrementByAmount.match` */
-  <MA extends ReduxAction, M extends MatchFunction<MA>>(
+  <M extends MatchFunction<UnknownAction>>(
     options: {
       actionCreator?: never
       type?: never
@@ -581,10 +582,7 @@ export type FallbackAddListenerOptions = {
  */
 
 /** @public */
-export type GuardedType<T> = T extends (
-  x: any,
-  ...args: unknown[]
-) => x is infer T
+export type GuardedType<T> = T extends (x: any, ...args: any[]) => x is infer T
   ? T
   : never