make isAnyOf friendly for mapped matchers, but making argument optional

reduxjs · Jan 28, 2023 · f5d7d15 · f5d7d15
1 parent d2d0f70
commit f5d7d15
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 8 deletions.
diff --git 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
@@ -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)
+}