Skip to content

try out simplifying matcher code #4386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 9, 2024
Merged

try out simplifying matcher code #4386

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7db3085
try out simplifying matcher code
EskiMojo14 May 2, 2024
6cabf37
try removing identical return statement
EskiMojo14 May 2, 2024
9376ac8
add if condition back to prevent call stack issue
EskiMojo14 May 2, 2024
bbb3f22
use flatMap instead of for loop
EskiMojo14 May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 10 additions & 70 deletions packages/toolkit/src/matchers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import type {
} from './createAsyncThunk'

/** @public */
export type ActionMatchingAnyOf<Matchers extends [...Matcher<any>[]]> =
export type ActionMatchingAnyOf<Matchers extends Matcher<any>[]> =
ActionFromMatcher<Matchers[number]>

/** @public */
export type ActionMatchingAllOf<Matchers extends [...Matcher<any>[]]> =
export type ActionMatchingAllOf<Matchers extends Matcher<any>[]> =
UnionToIntersection<ActionMatchingAnyOf<Matchers>>

const matches = (matcher: Matcher<any>, action: any) => {
Expand All @@ -36,7 +36,7 @@ const matches = (matcher: Matcher<any>, action: any) => {
*
* @public
*/
export function isAnyOf<Matchers extends [...Matcher<any>[]]>(
export function isAnyOf<Matchers extends Matcher<any>[]>(
...matchers: Matchers
) {
return (action: any): action is ActionMatchingAnyOf<Matchers> => {
Expand All @@ -53,7 +53,7 @@ export function isAnyOf<Matchers extends [...Matcher<any>[]]>(
*
* @public
*/
export function isAllOf<Matchers extends [...Matcher<any>[]]>(
export function isAllOf<Matchers extends Matcher<any>[]>(
...matchers: Matchers
) {
return (action: any): action is ActionMatchingAllOf<Matchers> => {
Expand Down Expand Up @@ -136,18 +136,7 @@ export function isPending<
return isPending()(asyncThunks[0])
}

return (
action: any,
): action is PendingActionFromAsyncThunk<AsyncThunks[number]> => {
// note: this type will be correct because we have at least 1 asyncThunk
const matchers: [Matcher<any>, ...Matcher<any>[]] = asyncThunks.map(
(asyncThunk) => asyncThunk.pending,
) as any

const combinedMatcher = isAnyOf(...matchers)

return combinedMatcher(action)
}
return isAnyOf(...asyncThunks.map((asyncThunk) => asyncThunk.pending))
}

export type UnknownAsyncThunkRejectedAction = ReturnType<
Expand Down Expand Up @@ -199,18 +188,7 @@ export function isRejected<
return isRejected()(asyncThunks[0])
}

return (
action: any,
): action is RejectedActionFromAsyncThunk<AsyncThunks[number]> => {
// note: this type will be correct because we have at least 1 asyncThunk
const matchers: [Matcher<any>, ...Matcher<any>[]] = asyncThunks.map(
(asyncThunk) => asyncThunk.rejected,
) as any

const combinedMatcher = isAnyOf(...matchers)

return combinedMatcher(action)
}
return isAnyOf(...asyncThunks.map((asyncThunk) => asyncThunk.rejected))
}

export type UnknownAsyncThunkRejectedWithValueAction = ReturnType<
Expand Down Expand Up @@ -264,24 +242,14 @@ export function isRejectedWithValue<
}

if (asyncThunks.length === 0) {
return (action: any) => {
const combinedMatcher = isAllOf(isRejected(...asyncThunks), hasFlag)

return combinedMatcher(action)
}
return isAllOf(isRejected(...asyncThunks), hasFlag)
}

if (!isAsyncThunkArray(asyncThunks)) {
return isRejectedWithValue()(asyncThunks[0])
}

return (
action: any,
): action is RejectedActionFromAsyncThunk<AsyncThunks[number]> => {
const combinedMatcher = isAllOf(isRejected(...asyncThunks), hasFlag)

return combinedMatcher(action)
}
return isAllOf(isRejected(...asyncThunks), hasFlag)
}

export type UnknownAsyncThunkFulfilledAction = ReturnType<
Expand Down Expand Up @@ -333,18 +301,7 @@ export function isFulfilled<
return isFulfilled()(asyncThunks[0])
}

return (
action: any,
): action is FulfilledActionFromAsyncThunk<AsyncThunks[number]> => {
// note: this type will be correct because we have at least 1 asyncThunk
const matchers: [Matcher<any>, ...Matcher<any>[]] = asyncThunks.map(
(asyncThunk) => asyncThunk.fulfilled,
) as any

const combinedMatcher = isAnyOf(...matchers)

return combinedMatcher(action)
}
return isAnyOf(...asyncThunks.map((asyncThunk) => asyncThunk.fulfilled))
}

export type UnknownAsyncThunkAction =
Expand Down Expand Up @@ -404,22 +361,5 @@ export function isAsyncThunkAction<
return isAsyncThunkAction()(asyncThunks[0])
}

return (
action: any,
): action is ActionsFromAsyncThunk<AsyncThunks[number]> => {
// note: this type will be correct because we have at least 1 asyncThunk
const matchers: [Matcher<any>, ...Matcher<any>[]] = [] as any

for (const asyncThunk of asyncThunks) {
matchers.push(
asyncThunk.pending,
asyncThunk.rejected,
asyncThunk.fulfilled,
)
}

const combinedMatcher = isAnyOf(...matchers)

return combinedMatcher(action)
}
return isAnyOf(...asyncThunks.flatMap(asyncThunk => [asyncThunk.pending, asyncThunk.rejected, asyncThunk.fulfilled]))
}