Skip to content
This repository has been archived by the owner on Jul 16, 2024. It is now read-only.

Commit

Permalink
support Refinements in \*Until apis (#672)
Browse files Browse the repository at this point in the history
  • Loading branch information
tim-smart committed Sep 17, 2023
1 parent 4c1cdc3 commit be3c23f
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 7 deletions.
5 changes: 5 additions & 0 deletions .changeset/rich-crabs-obey.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@effect/io": patch
---

support Refinements in \*Until apis
4 changes: 4 additions & 0 deletions docs/modules/Effect.ts.md
Original file line number Diff line number Diff line change
Expand Up @@ -2504,7 +2504,9 @@ Retries this effect until its error satisfies the specified predicate.
```ts
export declare const retryUntil: {
<E, E2 extends E>(f: Refinement<E, E2>): <R, A>(self: Effect<R, E, A>) => Effect<R, E2, A>
<E>(f: Predicate<E>): <R, A>(self: Effect<R, E, A>) => Effect<R, E, A>
<R, E, A, E2 extends E>(self: Effect<R, E, A>, f: Refinement<E, E2>): Effect<R, E2, A>
<R, E, A>(self: Effect<R, E, A>, f: Predicate<E>): Effect<R, E, A>
}
```
Expand Down Expand Up @@ -4420,7 +4422,9 @@ until the first failure.
```ts
export declare const repeatUntil: {
<A, B extends A>(f: Refinement<A, B>): <R, E>(self: Effect<R, E, A>) => Effect<R, E, B>
<A>(f: Predicate<A>): <R, E>(self: Effect<R, E, A>) => Effect<R, E, A>
<R, E, A, B extends A>(self: Effect<R, E, A>, f: Predicate<A>): Effect<R, E, B>
<R, E, A>(self: Effect<R, E, A>, f: Predicate<A>): Effect<R, E, A>
}
```
Expand Down
4 changes: 4 additions & 0 deletions src/Effect.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1772,7 +1772,9 @@ export const retryOrElse: {
* @category error handling
*/
export const retryUntil: {
<E, E2 extends E>(f: Refinement<E, E2>): <R, A>(self: Effect<R, E, A>) => Effect<R, E2, A>
<E>(f: Predicate<E>): <R, A>(self: Effect<R, E, A>) => Effect<R, E, A>
<R, E, A, E2 extends E>(self: Effect<R, E, A>, f: Refinement<E, E2>): Effect<R, E2, A>
<R, E, A>(self: Effect<R, E, A>, f: Predicate<E>): Effect<R, E, A>
} = _schedule.retryUntil_Effect

Expand Down Expand Up @@ -3918,7 +3920,9 @@ export const repeatOrElse: {
* @category repetition / recursion
*/
export const repeatUntil: {
<A, B extends A>(f: Refinement<A, B>): <R, E>(self: Effect<R, E, A>) => Effect<R, E, B>
<A>(f: Predicate<A>): <R, E>(self: Effect<R, E, A>) => Effect<R, E, A>
<R, E, A, B extends A>(self: Effect<R, E, A>, f: Predicate<A>): Effect<R, E, B>
<R, E, A>(self: Effect<R, E, A>, f: Predicate<A>): Effect<R, E, A>
} = _schedule.repeatUntil_Effect

Expand Down
30 changes: 23 additions & 7 deletions src/internal/schedule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import type { LazyArg } from "@effect/data/Function"
import { constVoid, dual, pipe } from "@effect/data/Function"
import * as Option from "@effect/data/Option"
import { pipeArguments } from "@effect/data/Pipeable"
import type { Predicate } from "@effect/data/Predicate"
import type { Predicate, Refinement } from "@effect/data/Predicate"
import type * as Cause from "@effect/io/Cause"
import * as Clock from "@effect/io/Clock"
import type * as Effect from "@effect/io/Effect"
Expand Down Expand Up @@ -1830,9 +1830,19 @@ const repeatOrElseEffectLoop = <R, E, A extends A0, A0, R1, B, R2, E2, C>(

/** @internal */
export const repeatUntil_Effect = dual<
<A>(f: Predicate<A>) => <R, E>(self: Effect.Effect<R, E, A>) => Effect.Effect<R, E, A>,
<R, E, A>(self: Effect.Effect<R, E, A>, f: Predicate<A>) => Effect.Effect<R, E, A>
>(2, (self, f) => repeatUntilEffect_Effect(self, (a) => core.sync(() => f(a))))
{
<A, B extends A>(f: Refinement<A, B>): <R, E>(self: Effect.Effect<R, E, A>) => Effect.Effect<R, E, B>
<A>(f: Predicate<A>): <R, E>(self: Effect.Effect<R, E, A>) => Effect.Effect<R, E, A>
},
{
<R, E, A, B extends A>(self: Effect.Effect<R, E, A>, f: Predicate<A>): Effect.Effect<R, E, B>
<R, E, A>(self: Effect.Effect<R, E, A>, f: Predicate<A>): Effect.Effect<R, E, A>
}
>(
2,
<R, E, A>(self: Effect.Effect<R, E, A>, f: Predicate<A>) =>
repeatUntilEffect_Effect(self, (a) => core.sync(() => f(a)))
)

/** @internal */
export const repeatUntilEffect_Effect: {
Expand Down Expand Up @@ -1946,9 +1956,15 @@ const retryOrElse_EffectLoop = <R, E, A, R1, A1, R2, E2, A2>(

/** @internal */
export const retryUntil_Effect = dual<
<E>(f: Predicate<E>) => <R, A>(self: Effect.Effect<R, E, A>) => Effect.Effect<R, E, A>,
<R, E, A>(self: Effect.Effect<R, E, A>, f: Predicate<E>) => Effect.Effect<R, E, A>
>(2, (self, f) =>
{
<E, E2 extends E>(f: Refinement<E, E2>): <R, A>(self: Effect.Effect<R, E, A>) => Effect.Effect<R, E2, A>
<E>(f: Predicate<E>): <R, A>(self: Effect.Effect<R, E, A>) => Effect.Effect<R, E, A>
},
{
<R, E, A, E2 extends E>(self: Effect.Effect<R, E, A>, f: Refinement<E, E2>): Effect.Effect<R, E2, A>
<R, E, A>(self: Effect.Effect<R, E, A>, f: Predicate<E>): Effect.Effect<R, E, A>
}
>(2, <R, E, A>(self: Effect.Effect<R, E, A>, f: Predicate<E>) =>
retryUntilEffect_Effect(
self,
(e) => core.sync(() => f(e))
Expand Down

0 comments on commit be3c23f

Please sign in to comment.