effect 4.0.0-beta.5 → 4.0.0-beta.7

package/src/Schedule.ts

@@ -36,8 +36,9 @@ import * as Duration from "./Duration.ts"
 import type { Effect } from "./Effect.ts"
 import type { LazyArg } from "./Function.ts"
 import { constant, dual, identity } from "./Function.ts"
-
+import { isEffect } from "./internal/core.ts"
 import * as effect from "./internal/effect.ts"
+import * as random from "./internal/random.ts"
 import { type Pipeable, pipeArguments } from "./Pipeable.ts"
 import { hasProperty } from "./Predicate.ts"
 import * as Pull from "./Pull.ts"
@@ -47,6 +48,8 @@ import type { Contravariant, Covariant, Mutable } from "./Types.ts"
 
 const TypeId = "~effect/Schedule"
 
+const randomNext: Effect<number> = random.Random.useSync((random) => random.nextDoubleUnsafe())
+
 /**
  * A Schedule defines a strategy for repeating or retrying effects based on some policy.
  *
@@ -747,7 +750,7 @@ export const addDelay: {
    * @since 2.0.0
    * @category utils
    */
-  <Output, Error2 = never, Env2 = never>(f: (output: Output) => Effect<Duration.DurationInput, Error2, Env2>): <Input, Error, Env>(
+  <Output, Error2 = never, Env2 = never>(f: (output: Output) => Effect<Duration.Input, Error2, Env2>): <Input, Error, Env>(
     self: Schedule<Output, Input, Error, Env>
   ) => Schedule<Output, Input, Error | Error2, Env | Env2>
   /**
@@ -868,17 +871,16 @@ export const addDelay: {
    */
   <Output, Input, Error, Env, Error2 = never, Env2 = never>(
     self: Schedule<Output, Input, Error, Env>,
-    f: (output: Output) => Effect<Duration.DurationInput, Error2, Env2>
+    f: (output: Output) => Effect<Duration.Input, Error2, Env2>
   ): Schedule<Output, Input, Error | Error2, Env | Env2>
 } = dual(2, <Output, Input, Error, Env, Error2 = never, Env2 = never>(
   self: Schedule<Output, Input, Error, Env>,
-  f: (output: Output) => Effect<Duration.DurationInput, Error2, Env2>
+  f: (output: Output) => Effect<Duration.Input, Error2, Env2>
 ): Schedule<Output, Input, Error | Error2, Env | Env2> =>
   modifyDelay(
     self,
     (output, delay) =>
-      effect.map(f(output), (d) =>
-        Duration.sum(Duration.fromDurationInputUnsafe(d), Duration.fromDurationInputUnsafe(delay)))
+      effect.map(f(output), (d) => Duration.sum(Duration.fromInputUnsafe(d), Duration.fromInputUnsafe(delay)))
   ))
 
 /**
@@ -1140,116 +1142,211 @@ export const andThenResult: {
 } = dual(2, <Output, Input, Error, Env, Output2, Input2, Error2, Env2>(
   self: Schedule<Output, Input, Error, Env>,
   other: Schedule<Output2, Input2, Error2, Env2>
-): Schedule<Result.Result<Output2, Output>, Input & Input2, Error | Error2, Env | Env2> =>
-  fromStep(effect.map(
-    effect.zip(toStep(self), toStep(other)),
-    ([leftStep, rightStep]) => {
-      let currentStep: (now: number, input: Input & Input2) => Pull.Pull<
-        [Output | Output2, Duration.Duration],
+): Schedule<Result.Result<Output, Output2>, Input & Input2, Error | Error2, Env | Env2> =>
+  fromStep(effect.sync(() => {
+    let currentSide = 0
+    let currentStep:
+      | undefined
+      | ((now: number, input: Input & Input2) => Pull.Pull<
+        [Result.Result<Output, Output2>, Duration.Duration],
         Error | Error2,
-        Output | Output2,
+        Result.Result<Output, Output2>,
         Env | Env2
-      > = leftStep
-      let toResult: (output: Output | Output2) => Result.Result<Output2, Output> = Result.fail as any
-      return (now, input) =>
-        Pull.matchEffect(currentStep(now, input), {
-          onSuccess: ([output, duration]) =>
-            effect.succeed</**
-             * Returns a new `Schedule` that will first execute the left (i.e. `self`)
-             * schedule to completion. Once the left schedule is complete, the right (i.e.
-             * `other`) schedule will be executed to completion.
-             *
-             * The output of the resulting schedule is a `Result` where outputs of the
-             * left schedule are emitted as `Result.Err<Output>` and outputs of the right
-             * schedule are emitted as `Result.Ok<Output>`.
-             *
-             * @example
-             * ```ts
-             * import { Console, Effect, Result, Schedule } from "effect"
-             *
-             * // Track which phase of the schedule we're in
-             * const phaseTracker = Schedule.andThenResult(
-             *   Schedule.exponential("100 millis").pipe(Schedule.take(2)),
-             *   Schedule.spaced("500 millis").pipe(Schedule.take(2))
-             * )
-             *
-             * const program = Effect.gen(function*() {
-             *   yield* Effect.repeat(
-             *     Effect.gen(function*() {
-             *       yield* Console.log("Task executed")
-             *       return "task-result"
-             *     }),
-             *     phaseTracker.pipe(
-             *       Schedule.tapOutput((result) =>
-             *         Result.match(result, {
-             *           onFailure: (phase1Output) => Console.log(`Phase 1: ${phase1Output}`),
-             *           onSuccess: (phase2Output) => Console.log(`Phase 2: ${phase2Output}`)
-             *         })
-             *       )
-             *     )
-             *   )
-             * })
-             * ```
-             *
-             * @since 2.0.0
-             * @category sequencing
-             */
-            [Result.Result<Output2, Output>, Duration.Duration]>([toResult(output), duration]),
-          onFailure: effect.failCause,
-          onDone: (output) =>
-            effect.suspend(() => {
-              const pull = effect.succeed</**
-               * Returns a new `Schedule` that will first execute the left (i.e. `self`)
-               * schedule to completion. Once the left schedule is complete, the right (i.e.
-               * `other`) schedule will be executed to completion.
-               *
-               * The output of the resulting schedule is a `Result` where outputs of the
-               * left schedule are emitted as `Result.Err<Output>` and outputs of the right
-               * schedule are emitted as `Result.Ok<Output>`.
-               *
-               * @example
-               * ```ts
-               * import { Console, Effect, Result, Schedule } from "effect"
-               *
-               * // Track which phase of the schedule we're in
-               * const phaseTracker = Schedule.andThenResult(
-               *   Schedule.exponential("100 millis").pipe(Schedule.take(2)),
-               *   Schedule.spaced("500 millis").pipe(Schedule.take(2))
-               * )
-               *
-               * const program = Effect.gen(function*() {
-               *   yield* Effect.repeat(
-               *     Effect.gen(function*() {
-               *       yield* Console.log("Task executed")
-               *       return "task-result"
-               *     }),
-               *     phaseTracker.pipe(
-               *       Schedule.tapOutput((result) =>
-               *         Result.match(result, {
-               *           onFailure: (phase1Output) => Console.log(`Phase 1: ${phase1Output}`),
-               *           onSuccess: (phase2Output) => Console.log(`Phase 2: ${phase2Output}`)
-               *         })
-               *       )
-               *     )
-               *   )
-               * })
-               * ```
-               *
-               * @since 2.0.0
-               * @category sequencing
-               */
-              [Result.Result<Output2, Output>, Duration.Duration]>(
-                [toResult(output), Duration.zero]
-              )
-              if (currentStep === leftStep) {
-                currentStep = rightStep
-                toResult = Result.succeed as any
-              }
-              return pull
-            })
-        });
-    }
-  )))
+      >)
+    const left = map(self, Result.succeed)
+    const right = map(other, Result.fail)
+    return function recur(
+      now,
+      input
+    ): Pull.Pull<
+      [Result.Result<Output, Output2>, Duration.Duration],
+      Error | Error2,
+      Result.Result<Output, Output2>,
+      Env | Env2
+    > {
+      if (currentStep) return currentStep(now, input)
+      return toStep<
+        /**
+         * Returns a new `Schedule` that will first execute the left (i.e. `self`)
+         * schedule to completion. Once the left schedule is complete, the right (i.e.
+         * `other`) schedule will be executed to completion.
+         *
+         * The output of the resulting schedule is a `Result` where outputs of the
+         * left schedule are emitted as `Result.Err<Output>` and outputs of the right
+         * schedule are emitted as `Result.Ok<Output>`.
+         *
+         * @example
+         * ```ts
+         * import { Console, Effect, Result, Schedule } from "effect"
+         *
+         * // Track which phase of the schedule we're in
+         * const phaseTracker = Schedule.andThenResult(
+         *   Schedule.exponential("100 millis").pipe(Schedule.take(2)),
+         *   Schedule.spaced("500 millis").pipe(Schedule.take(2))
+         * )
+         *
+         * const program = Effect.gen(function*() {
+         *   yield* Effect.repeat(
+         *     Effect.gen(function*() {
+         *       yield* Console.log("Task executed")
+         *       return "task-result"
+         *     }),
+         *     phaseTracker.pipe(
+         *       Schedule.tapOutput((result) =>
+         *         Result.match(result, {
+         *           onFailure: (phase1Output) => Console.log(`Phase 1: ${phase1Output}`),
+         *           onSuccess: (phase2Output) => Console.log(`Phase 2: ${phase2Output}`)
+         *         })
+         *       )
+         *     )
+         *   )
+         * })
+         * ```
+         *
+         * @since 2.0.0
+         * @category sequencing
+         */
+        Result.Result<Output, Output2>,
+        /**
+         * Returns a new `Schedule` that will first execute the left (i.e. `self`)
+         * schedule to completion. Once the left schedule is complete, the right (i.e.
+         * `other`) schedule will be executed to completion.
+         *
+         * The output of the resulting schedule is a `Result` where outputs of the
+         * left schedule are emitted as `Result.Err<Output>` and outputs of the right
+         * schedule are emitted as `Result.Ok<Output>`.
+         *
+         * @example
+         * ```ts
+         * import { Console, Effect, Result, Schedule } from "effect"
+         *
+         * // Track which phase of the schedule we're in
+         * const phaseTracker = Schedule.andThenResult(
+         *   Schedule.exponential("100 millis").pipe(Schedule.take(2)),
+         *   Schedule.spaced("500 millis").pipe(Schedule.take(2))
+         * )
+         *
+         * const program = Effect.gen(function*() {
+         *   yield* Effect.repeat(
+         *     Effect.gen(function*() {
+         *       yield* Console.log("Task executed")
+         *       return "task-result"
+         *     }),
+         *     phaseTracker.pipe(
+         *       Schedule.tapOutput((result) =>
+         *         Result.match(result, {
+         *           onFailure: (phase1Output) => Console.log(`Phase 1: ${phase1Output}`),
+         *           onSuccess: (phase2Output) => Console.log(`Phase 2: ${phase2Output}`)
+         *         })
+         *       )
+         *     )
+         *   )
+         * })
+         * ```
+         *
+         * @since 2.0.0
+         * @category sequencing
+         */
+        Input & Input2,
+        /**
+         * Returns a new `Schedule` that will first execute the left (i.e. `self`)
+         * schedule to completion. Once the left schedule is complete, the right (i.e.
+         * `other`) schedule will be executed to completion.
+         *
+         * The output of the resulting schedule is a `Result` where outputs of the
+         * left schedule are emitted as `Result.Err<Output>` and outputs of the right
+         * schedule are emitted as `Result.Ok<Output>`.
+         *
+         * @example
+         * ```ts
+         * import { Console, Effect, Result, Schedule } from "effect"
+         *
+         * // Track which phase of the schedule we're in
+         * const phaseTracker = Schedule.andThenResult(
+         *   Schedule.exponential("100 millis").pipe(Schedule.take(2)),
+         *   Schedule.spaced("500 millis").pipe(Schedule.take(2))
+         * )
+         *
+         * const program = Effect.gen(function*() {
+         *   yield* Effect.repeat(
+         *     Effect.gen(function*() {
+         *       yield* Console.log("Task executed")
+         *       return "task-result"
+         *     }),
+         *     phaseTracker.pipe(
+         *       Schedule.tapOutput((result) =>
+         *         Result.match(result, {
+         *           onFailure: (phase1Output) => Console.log(`Phase 1: ${phase1Output}`),
+         *           onSuccess: (phase2Output) => Console.log(`Phase 2: ${phase2Output}`)
+         *         })
+         *       )
+         *     )
+         *   )
+         * })
+         * ```
+         *
+         * @since 2.0.0
+         * @category sequencing
+         */
+        Error | Error2,
+        /**
+         * Returns a new `Schedule` that will first execute the left (i.e. `self`)
+         * schedule to completion. Once the left schedule is complete, the right (i.e.
+         * `other`) schedule will be executed to completion.
+         *
+         * The output of the resulting schedule is a `Result` where outputs of the
+         * left schedule are emitted as `Result.Err<Output>` and outputs of the right
+         * schedule are emitted as `Result.Ok<Output>`.
+         *
+         * @example
+         * ```ts
+         * import { Console, Effect, Result, Schedule } from "effect"
+         *
+         * // Track which phase of the schedule we're in
+         * const phaseTracker = Schedule.andThenResult(
+         *   Schedule.exponential("100 millis").pipe(Schedule.take(2)),
+         *   Schedule.spaced("500 millis").pipe(Schedule.take(2))
+         * )
+         *
+         * const program = Effect.gen(function*() {
+         *   yield* Effect.repeat(
+         *     Effect.gen(function*() {
+         *       yield* Console.log("Task executed")
+         *       return "task-result"
+         *     }),
+         *     phaseTracker.pipe(
+         *       Schedule.tapOutput((result) =>
+         *         Result.match(result, {
+         *           onFailure: (phase1Output) => Console.log(`Phase 1: ${phase1Output}`),
+         *           onSuccess: (phase2Output) => Console.log(`Phase 2: ${phase2Output}`)
+         *         })
+         *       )
+         *     )
+         *   )
+         * })
+         * ```
+         *
+         * @since 2.0.0
+         * @category sequencing
+         */
+        Env | Env2
+      >(currentSide === 0 ? left : right).pipe(
+        effect.flatMap((step) => {
+          currentSide++
+          if (currentSide === 1) {
+            currentStep = (now, input) =>
+              Pull.catchDone(step(now, input), (_) => {
+                currentStep = undefined
+                return recur(now, input)
+              })
+            return currentStep(now, input)
+          }
+          currentStep = step
+          return currentStep(now, input)
+        })
+      );
+    };
+  })))
 
 /**
  * Combines two `Schedule`s by recurring if both of the two schedules want
@@ -2925,8 +3022,8 @@ export const delays = <Out, In, E, R>(self: Schedule<Out, In, E, R>): Schedule<D
  * @since 2.0.0
  * @category constructors
  */
-export const duration = (durationInput: Duration.DurationInput): Schedule<Duration.Duration> => {
-  const duration = Duration.fromDurationInputUnsafe(durationInput)
+export const duration = (durationInput: Duration.Input): Schedule<Duration.Duration> => {
+  const duration = Duration.fromInputUnsafe(durationInput)
   return fromStepWithMetadata(effect.succeed((meta) =>
     meta.attempt === 1
       ? effect.succeed([duration, duration])
@@ -3019,10 +3116,10 @@ export const duration = (durationInput: Duration.DurationInput): Schedule<Durati
  * @since 4.0.0
  * @category constructors
  */
-export const during = (duration: Duration.DurationInput): Schedule<Duration.Duration> =>
+export const during = (duration: Duration.Input): Schedule<Duration.Duration> =>
   while_(
     elapsed,
-    ({ output }) => effect.succeed(Duration.isLessThanOrEqualTo(output, Duration.fromDurationInputUnsafe(duration)))
+    ({ output }) => effect.succeed(Duration.isLessThanOrEqualTo(output, Duration.fromInputUnsafe(duration)))
   )
 
 /**
@@ -3762,10 +3859,10 @@ export const elapsed: Schedule<Duration.Duration> = fromStepWithMetadata(
  * @category constructors
  */
 export const exponential = (
-  base: Duration.DurationInput,
+  base: Duration.Input,
   factor: number = 2
 ): Schedule<Duration.Duration> => {
-  const baseMillis = Duration.toMillis(Duration.fromDurationInputUnsafe(base))
+  const baseMillis = Duration.toMillis(Duration.fromInputUnsafe(base))
   return fromStepWithMetadata(effect.succeed((meta) => {
     const duration = Duration.millis(baseMillis * Math.pow(factor, meta.attempt - 1))
     return effect.succeed([duration, duration])
@@ -3836,8 +3933,8 @@ export const exponential = (
  * @since 2.0.0
  * @category constructors
  */
-export const fibonacci = (one: Duration.DurationInput): Schedule<Duration.Duration> => {
-  const oneMillis = Duration.toMillis(Duration.fromDurationInputUnsafe(one))
+export const fibonacci = (one: Duration.Input): Schedule<Duration.Duration> => {
+  const oneMillis = Duration.toMillis(Duration.fromInputUnsafe(one))
   return fromStep(effect.sync(() => {
     let a = 0
     let b = oneMillis
@@ -3913,8 +4010,8 @@ export const fibonacci = (one: Duration.DurationInput): Schedule<Duration.Durati
  * @since 2.0.0
  * @category constructors
  */
-export const fixed = (interval: Duration.DurationInput): Schedule<number> => {
-  const window = Duration.toMillis(Duration.fromDurationInputUnsafe(interval))
+export const fixed = (interval: Duration.Input): Schedule<number> => {
+  const window = Duration.toMillis(Duration.fromInputUnsafe(interval))
   return fromStepWithMetadata(effect.succeed((meta) =>
     effect.succeed([
       meta.attempt - 1,
@@ -4050,7 +4147,7 @@ export const map: {
    * @since 2.0.0
    * @category mapping
    */
-  <Output, Output2, Error2 = never, Env2 = never>(f: (output: Output) => Effect<Output2, Error2, Env2>): <Input, Error, Env>(
+  <Output, Output2, Error2 = never, Env2 = never>(f: (output: Output) => Output2 | Effect<Output2, Error2, Env2>): <Input, Error, Env>(
     self: Schedule<Output, Input, Error, Env>
   ) => Schedule<Output2, Input, Error | Error2, Env | Env2>
   /**
@@ -4117,17 +4214,24 @@ export const map: {
    */
   <Output, Input, Error, Env, Output2, Error2 = never, Env2 = never>(
     self: Schedule<Output, Input, Error, Env>,
-    f: (output: Output) => Effect<Output2, Error2, Env2>
+    f: (output: Output) => Output2 | Effect<Output2, Error2, Env2>
   ): Schedule<Output2, Input, Error | Error2, Env | Env2>
 } = dual(2, <Output, Input, Error, Env, Output2, Error2 = never, Env2 = never>(
   self: Schedule<Output, Input, Error, Env>,
-  f: (output: Output) => Effect<Output2, Error2, Env2>
+  f: (output: Output) => Output2 | Effect<Output2, Error2, Env2>
 ): Schedule<Output2, Input, Error | Error2, Env | Env2> => {
   const handle = Pull.matchEffect({
-    onSuccess: ([output, duration]: [Output, Duration.Duration]) =>
-      effect.map(f(output), (output) => [output, duration] as [Output2, Duration.Duration]),
+    onSuccess: ([output, duration]: [Output, Duration.Duration]) => {
+      const result = f(output)
+      if (!isEffect(result)) return effect.succeed([result, duration] as [Output2, Duration.Duration])
+      return effect.map(result, (output) => [output, duration] as [Output2, Duration.Duration])
+    },
     onFailure: effect.failCause<Error>,
-    onDone: (output: Output) => effect.flatMap(f(output), Cause.done)
+    onDone: (output: Output) => {
+      const result = f(output)
+      if (!isEffect(result)) return Cause.done(result as Output2)
+      return effect.flatMap(result, Cause.done)
+    }
   })
   return fromStep(effect.map(toStep(self), (step) => (now, input) => handle(step(now, input))))
 })
@@ -4201,7 +4305,7 @@ export const modifyDelay: {
     f: (
       output: Output,
       delay: Duration.Duration
-    ) => Effect<Duration.DurationInput, Error2, Env2>
+    ) => Effect<Duration.Input, Error2, Env2>
   ): <Input, Error, Env>(
     self: Schedule<Output, Input, Error, Env>
   ) => Schedule<Output, Input, Error | Error2, Env | Env2>
@@ -4241,22 +4345,39 @@ export const modifyDelay: {
     self: Schedule<Output, Input, Error, Env>,
     f: (
       output: Output,
-      delay: Duration.DurationInput
-    ) => Effect<Duration.DurationInput, Error2, Env2>
+      delay: Duration.Input
+    ) => Effect<Duration.Input, Error2, Env2>
   ): Schedule<Output, Input, Error | Error2, Env | Env2>
 } = dual(2, <Output, Input, Error, Env, Error2 = never, Env2 = never>(
   self: Schedule<Output, Input, Error, Env>,
   f: (
     output: Output,
-    delay: Duration.DurationInput
-  ) => Effect<Duration.DurationInput, Error2, Env2>
+    delay: Duration.Input
+  ) => Effect<Duration.Input, Error2, Env2>
 ): Schedule<Output, Input, Error | Error2, Env | Env2> =>
   fromStep(effect.map(toStep(self), (step) => (now, input) =>
     effect.flatMap(
       step(now, input),
-      ([output, delay]) => effect.map(f(output, delay), (delay) => [output, Duration.fromDurationInputUnsafe(delay)])
+      ([output, delay]) => effect.map(f(output, delay), (delay) => [output, Duration.fromInputUnsafe(delay)])
     ))))
 
+/**
+ * Returns a new `Schedule` that randomly adjusts each recurrence delay.
+ *
+ * Delays are jittered between `80%` and `120%` of the original delay.
+ *
+ * @since 2.0.0
+ * @category utilities
+ */
+export const jittered = <Output, Input, Error, Env>(
+  self: Schedule<Output, Input, Error, Env>
+): Schedule<Output, Input, Error, Env> =>
+  modifyDelay(self, (_, delay) =>
+    effect.map(randomNext, (random) => {
+      const millis = Duration.toMillis(Duration.fromInputUnsafe(delay))
+      return Duration.millis(millis * 0.8 * (1 - random) + millis * 1.2 * random)
+    }))
+
 /**
  * Returns a new `Schedule` that outputs the inputs of the specified schedule.
  *
@@ -4765,8 +4886,8 @@ export const reduce: {
  * @since 2.0.0
  * @category constructors
  */
-export const spaced = (duration: Duration.DurationInput): Schedule<number> => {
-  const decoded = Duration.fromDurationInputUnsafe(duration)
+export const spaced = (duration: Duration.Input): Schedule<number> => {
+  const decoded = Duration.fromInputUnsafe(duration)
   return fromStepWithMetadata(effect.succeed((meta) => effect.succeed([meta.attempt - 1, decoded])))
 }
 
@@ -5856,8 +5977,8 @@ export {
  * @since 2.0.0
  * @category constructors
  */
-export const windowed = (interval: Duration.DurationInput): Schedule<number> => {
-  const window = Duration.toMillis(Duration.fromDurationInputUnsafe(interval))
+export const windowed = (interval: Duration.Input): Schedule<number> => {
+  const window = Duration.toMillis(Duration.fromInputUnsafe(interval))
   return fromStepWithMetadata(effect.succeed((meta) =>
     effect.sync(() => [
       meta.attempt - 1,