From f5d7d15758e4a599cbc2bf6df571486b99f59f8a Mon Sep 17 00:00:00 2001
From: Alex Pimenov <apimenov@Alexs-MacBook-Pro.local>
Date: Thu, 26 Jan 2023 13:40:19 +0100
Subject: [PATCH] make isAnyOf friendly for mapped matchers, but making
 argument optional

---
 packages/toolkit/src/matchers.ts                | 14 ++++++--------
 packages/toolkit/src/tests/matchers.typetest.ts | 17 +++++++++++++++++
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/packages/toolkit/src/matchers.ts b/packages/toolkit/src/matchers.ts
index fca137e87d..e8ca651077 100644
--- a/packages/toolkit/src/matchers.ts
+++ b/packages/toolkit/src/matchers.ts
@@ -12,14 +12,12 @@ import type {
 } from './createAsyncThunk'
 
 /** @public */
-export type ActionMatchingAnyOf<
-  Matchers extends [Matcher<any>, ...Matcher<any>[]]
-> = ActionFromMatcher<Matchers[number]>
+export type ActionMatchingAnyOf<Matchers extends [...Matcher<any>[]]> =
+  ActionFromMatcher<Matchers[number]>
 
 /** @public */
-export type ActionMatchingAllOf<
-  Matchers extends [Matcher<any>, ...Matcher<any>[]]
-> = UnionToIntersection<ActionMatchingAnyOf<Matchers>>
+export type ActionMatchingAllOf<Matchers extends [...Matcher<any>[]]> =
+  UnionToIntersection<ActionMatchingAnyOf<Matchers>>
 
 const matches = (matcher: Matcher<any>, action: any) => {
   if (hasMatchFunction(matcher)) {
@@ -38,7 +36,7 @@ const matches = (matcher: Matcher<any>, action: any) => {
  *
  * @public
  */
-export function isAnyOf<Matchers extends [Matcher<any>, ...Matcher<any>[]]>(
+export function isAnyOf<Matchers extends [...Matcher<any>[]]>(
   ...matchers: Matchers
 ) {
   return (action: any): action is ActionMatchingAnyOf<Matchers> => {
@@ -55,7 +53,7 @@ export function isAnyOf<Matchers extends [Matcher<any>, ...Matcher<any>[]]>(
  *
  * @public
  */
-export function isAllOf<Matchers extends [Matcher<any>, ...Matcher<any>[]]>(
+export function isAllOf<Matchers extends [...Matcher<any>[]]>(
   ...matchers: Matchers
 ) {
   return (action: any): action is ActionMatchingAllOf<Matchers> => {
diff --git a/packages/toolkit/src/tests/matchers.typetest.ts b/packages/toolkit/src/tests/matchers.typetest.ts
index e2b6ee8bf1..8770983f01 100644
--- a/packages/toolkit/src/tests/matchers.typetest.ts
+++ b/packages/toolkit/src/tests/matchers.typetest.ts
@@ -312,3 +312,20 @@ function isRejectedWithValueTest(action: AnyAction) {
     expectExactType<SerializedError>(action.error)
   }
 }
+
+function matchersAcceptSpreadArguments() {
+  const thunk1 = createAsyncThunk('a', () => 'a')
+  const thunk2 = createAsyncThunk('b', () => 'b')
+  const interestingThunks = [thunk1, thunk2]
+  const interestingPendingThunks = interestingThunks.map(
+    (thunk) => thunk.pending
+  )
+  const interestingFulfilledThunks = interestingThunks.map(
+    (thunk) => thunk.fulfilled
+  )
+
+  const isLoading = isAnyOf(...interestingPendingThunks)
+  const isNotLoading = isAnyOf(...interestingFulfilledThunks)
+
+  const isAllLoading = isAllOf(...interestingPendingThunks)
+}