Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/sweet-maps-return.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"effect": minor
---

allow catching multiple different tags in Effect.catchTag
14 changes: 6 additions & 8 deletions packages/effect/src/Effect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3861,15 +3861,13 @@ export const catchSomeDefect: {
* @category Error handling
*/
export const catchTag: {
<K extends E extends { _tag: string } ? E["_tag"] : never, E, A1, E1, R1>(
k: K,
f: (e: NoInfer<Extract<E, { _tag: K }>>) => Effect<A1, E1, R1>
): <A, R>(self: Effect<A, E, R>) => Effect<A1 | A, E1 | Exclude<E, { _tag: K }>, R1 | R>
<A, E, R, K extends E extends { _tag: string } ? E["_tag"] : never, R1, E1, A1>(
<E, const K extends RA.NonEmptyReadonlyArray<E extends { _tag: string } ? E["_tag"] : never>, A1, E1, R1>(
...args: [...tags: K, f: (e: Extract<NoInfer<E>, { _tag: K[number] }>) => Effect<A1, E1, R1>]
): <A, R>(self: Effect<A, E, R>) => Effect<A | A1, Exclude<E, { _tag: K[number] }> | E1, R | R1>
<A, E, R, const K extends RA.NonEmptyReadonlyArray<E extends { _tag: string } ? E["_tag"] : never>, R1, E1, A1>(
self: Effect<A, E, R>,
k: K,
f: (e: Extract<E, { _tag: K }>) => Effect<A1, E1, R1>
): Effect<A | A1, E1 | Exclude<E, { _tag: K }>, R | R1>
...args: [...tags: K, f: (e: Extract<NoInfer<E>, { _tag: K[number] }>) => Effect<A1, E1, R1>]
): Effect<A | A1, Exclude<E, { _tag: K[number] }> | E1, R | R1>
} = effect.catchTag

/**
Expand Down
43 changes: 29 additions & 14 deletions packages/effect/src/internal/core-effect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -237,21 +237,36 @@ export const catchSomeDefect = dual<

/* @internal */
export const catchTag = dual<
<K extends (E extends { _tag: string } ? E["_tag"] : never), E, A1, E1, R1>(
k: K,
f: (e: Extract<E, { _tag: K }>) => Effect.Effect<A1, E1, R1>
) => <A, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A | A1, Exclude<E, { _tag: K }> | E1, R | R1>,
<A, E, R, K extends (E extends { _tag: string } ? E["_tag"] : never), R1, E1, A1>(
<E, const K extends Arr.NonEmptyReadonlyArray<E extends { _tag: string } ? E["_tag"] : never>, A1, E1, R1>(
...args: [...tags: K, f: (e: Extract<NoInfer<E>, { _tag: K[number] }>) => Effect.Effect<A1, E1, R1>]
) => <A, R>(self: Effect.Effect<A, E, R>) => Effect.Effect<A | A1, Exclude<E, { _tag: K[number] }> | E1, R | R1>,
<A, E, R, const K extends Arr.NonEmptyReadonlyArray<E extends { _tag: string } ? E["_tag"] : never>, R1, E1, A1>(
self: Effect.Effect<A, E, R>,
k: K,
f: (e: Extract<E, { _tag: K }>) => Effect.Effect<A1, E1, R1>
) => Effect.Effect<A | A1, Exclude<E, { _tag: K }> | E1, R | R1>
>(3, <A, E, R, K extends (E extends { _tag: string } ? E["_tag"] : never), R1, E1, A1>(
self: Effect.Effect<A, E, R>,
k: K,
f: (e: Extract<E, { _tag: K }>) => Effect.Effect<A1, E1, R1>
): Effect.Effect<A | A1, Exclude<E, { _tag: K }> | E1, R | R1> =>
core.catchIf(self, Predicate.isTagged(k) as Predicate.Refinement<E, Extract<E, { _tag: K }>>, f) as any)
...args: [...tags: K, f: (e: Extract<NoInfer<E>, { _tag: K[number] }>) => Effect.Effect<A1, E1, R1>]
) => Effect.Effect<A | A1, Exclude<E, { _tag: K[number] }> | E1, R | R1>
>(
(args: any) => core.isEffect(args[0]),
<A, E, R, const K extends Arr.NonEmptyReadonlyArray<E extends { _tag: string } ? E["_tag"] : never>, R1, E1, A1>(
self: Effect.Effect<A, E, R>,
...args: [...tags: K, f: (e: Extract<NoInfer<E>, { _tag: K[number] }>) => Effect.Effect<A1, E1, R1>]
): Effect.Effect<A | A1, Exclude<E, { _tag: K[number] }> | E1, R | R1> => {
const f = args[args.length - 1] as any
let predicate: Predicate.Predicate<E>
if (args.length === 2) {
predicate = Predicate.isTagged(args[0] as string)
} else {
predicate = (e) => {
const tag = Predicate.hasProperty(e, "_tag") ? e["_tag"] : undefined
if (!tag) return false
for (let i = 0; i < args.length - 1; i++) {
if (args[i] === tag) return true
}
return false
}
}
return core.catchIf(self, predicate as Predicate.Refinement<E, Extract<E, { _tag: K[number] }>>, f) as any
}
)

/** @internal */
export const catchTags: {
Expand Down