effect 3.15.4 → 3.16.0

package/src/Effect.ts

@@ -12,6 +12,7 @@ import type * as Deferred from "./Deferred.js"
 import type * as Duration from "./Duration.js"
 import type * as Either from "./Either.js"
 import type { Equivalence } from "./Equivalence.js"
+import type { ExecutionPlan } from "./ExecutionPlan.js"
 import type { ExecutionStrategy } from "./ExecutionStrategy.js"
 import type * as Exit from "./Exit.js"
 import type * as Fiber from "./Fiber.js"
@@ -32,6 +33,7 @@ import * as effect from "./internal/core-effect.js"
 import * as core from "./internal/core.js"
 import * as defaultServices from "./internal/defaultServices.js"
 import * as circular from "./internal/effect/circular.js"
+import * as internalExecutionPlan from "./internal/executionPlan.js"
 import * as fiberRuntime from "./internal/fiberRuntime.js"
 import * as layer from "./internal/layer.js"
 import * as option_ from "./internal/option.js"
@@ -253,6 +255,15 @@ export declare namespace Effect {
    * @category Effect Type Extractors
    */
   export type Success<T extends Effect<any, any, any>> = [T] extends [Effect<infer _A, infer _E, infer _R>] ? _A : never
+  /**
+   * @since 3.15.5
+   * @category Effect Type Extractors
+   */
+  export type AsEffect<T extends Effect<any, any, any>> = Effect<
+    T extends Effect<infer _A, infer _E, infer _R> ? _A : never,
+    T extends Effect<infer _A, infer _E, infer _R> ? _E : never,
+    T extends Effect<infer _A, infer _E, infer _R> ? _R : never
+  >
 }
 
 /**
@@ -8111,9 +8122,7 @@ export const retry: {
    * @since 2.0.0
    * @category Error handling
    */
-  <E, O extends NoExcessProperties<Retry.Options<E>, O>>(options: O): <A, R>(
-    self: Effect<A, E, R>
-  ) => Retry.Return<R, E, A, O>
+  <E, O extends NoExcessProperties<Retry.Options<E>, O>>(options: O): <A, R>(self: Effect<A, E, R>) => Retry.Return<R, E, A, O>
   /**
    * Retries a failing effect based on a defined retry policy.
    *
@@ -8470,9 +8479,43 @@ export const retry: {
    * @since 2.0.0
    * @category Error handling
    */
-  <A, E, R, B, R1>(self: Effect<A, E, R>, policy: Schedule.Schedule<B, E, R1>): Effect<A, E, R1 | R>
+  <A, E, R, B, R1>(self: Effect<A, E, R>, policy: Schedule.Schedule<B, NoInfer<E>, R1>): Effect<A, E, R1 | R>
 } = schedule_.retry_combined
 
+/**
+ * Apply an `ExecutionPlan` to the effect, which allows you to fallback to
+ * different resources in case of failure.
+ *
+ * @since 3.16.0
+ * @category Error handling
+ * @experimental
+ */
+export const withExecutionPlan: {
+  /**
+   * Apply an `ExecutionPlan` to the effect, which allows you to fallback to
+   * different resources in case of failure.
+   *
+   * @since 3.16.0
+   * @category Error handling
+   * @experimental
+   */
+  <Input, Provides, PlanE, PlanR>(
+    plan: ExecutionPlan<{ provides: Provides; input: Input; error: PlanE; requirements: PlanR }>
+  ): <A, E extends Input, R>(effect: Effect<A, E, R>) => Effect<A, E | PlanE, Exclude<R, Provides> | PlanR>
+  /**
+   * Apply an `ExecutionPlan` to the effect, which allows you to fallback to
+   * different resources in case of failure.
+   *
+   * @since 3.16.0
+   * @category Error handling
+   * @experimental
+   */
+  <A, E extends Input, R, Provides, Input, PlanE, PlanR>(
+    effect: Effect<A, E, R>,
+    plan: ExecutionPlan<{ provides: Provides; input: Input; error: PlanE; requirements: PlanR }>
+  ): Effect<A, E | PlanE, Exclude<R, Provides> | PlanR>
+} = internalExecutionPlan.withExecutionPlan
+
 /**
  * Retries a failing effect and runs a fallback effect if retries are exhausted.
  *
@@ -22262,7 +22305,7 @@ export const scheduleForked: {
    * @category Repetition / Recursion
    */
   <A, E, R, Out, R2>(self: Effect<A, E, R>, schedule: Schedule.Schedule<Out, unknown, R2>): Effect<Fiber.RuntimeFiber<Out, E>, never, Scope.Scope | R | R2>
-} = circular.scheduleForked
+} = schedule_.scheduleForked
 
 /**
  * Runs an effect repeatedly according to a schedule, starting from a specified
@@ -27753,14 +27796,18 @@ export const Service: <Self = never>() => [Self] extends [never] ? MissingSelfGe
     const Key extends string,
     const Make extends
       | {
-        readonly scoped: Effect<Service.AllowedType<Key, Make>, any, any>
+        readonly scoped:
+          | Effect<Service.AllowedType<Key, Make>, any, any>
+          | ((...args: any) => Effect<Service.AllowedType<Key, Make>, any, any>)
         readonly dependencies?: ReadonlyArray<Layer.Layer.Any>
         readonly accessors?: boolean
         /** @deprecated */
         readonly ಠ_ಠ: never
       }
       | {
-        readonly effect: Effect<Service.AllowedType<Key, Make>, any, any>
+        readonly effect:
+          | Effect<Service.AllowedType<Key, Make>, any, any>
+          | ((...args: any) => Effect<Service.AllowedType<Key, Make>, any, any>)
         readonly dependencies?: ReadonlyArray<Layer.Layer.Any>
         readonly accessors?: boolean
         /** @deprecated */
@@ -27787,7 +27834,9 @@ export const Service: <Self = never>() => [Self] extends [never] ? MissingSelfGe
   <
     const Key extends string,
     const Make extends NoExcessProperties<{
-      readonly scoped: Effect<Service.AllowedType<Key, Make>, any, any>
+      readonly scoped:
+        | Effect<Service.AllowedType<Key, Make>, any, any>
+        | ((...args: any) => Effect<Service.AllowedType<Key, Make>, any, any>)
       readonly dependencies?: ReadonlyArray<Layer.Layer.Any>
       readonly accessors?: boolean
     }, Make>
@@ -27798,7 +27847,9 @@ export const Service: <Self = never>() => [Self] extends [never] ? MissingSelfGe
   <
     const Key extends string,
     const Make extends NoExcessProperties<{
-      readonly effect: Effect<Service.AllowedType<Key, Make>, any, any>
+      readonly effect:
+        | Effect<Service.AllowedType<Key, Make>, any, any>
+        | ((...args: any) => Effect<Service.AllowedType<Key, Make>, any, any>)
       readonly dependencies?: ReadonlyArray<Layer.Layer.Any>
       readonly accessors?: boolean
     }, Make>
@@ -27881,15 +27932,28 @@ export const Service: <Self = never>() => [Self] extends [never] ? MissingSelfGe
     const hasDeps = "dependencies" in maker && maker.dependencies.length > 0
     const layerName = hasDeps ? "DefaultWithoutDependencies" : "Default"
     let layerCache: Layer.Layer.Any | undefined
+    let isFunction = false
     if ("effect" in maker) {
+      isFunction = typeof maker.effect === "function"
       Object.defineProperty(TagClass, layerName, {
         get(this: any) {
+          if (isFunction) {
+            return function(this: typeof TagClass) {
+              return layer.fromEffect(TagClass, map(maker.effect.apply(null, arguments), (_) => new this(_)))
+            }.bind(this)
+          }
           return layerCache ??= layer.fromEffect(TagClass, map(maker.effect, (_) => new this(_)))
         }
       })
     } else if ("scoped" in maker) {
+      isFunction = typeof maker.scoped === "function"
       Object.defineProperty(TagClass, layerName, {
         get(this: any) {
+          if (isFunction) {
+            return function(this: typeof TagClass) {
+              return layer.scoped(TagClass, map(maker.scoped.apply(null, arguments), (_) => new this(_)))
+            }.bind(this)
+          }
           return layerCache ??= layer.scoped(TagClass, map(maker.scoped, (_) => new this(_)))
         }
       })
@@ -27911,6 +27975,14 @@ export const Service: <Self = never>() => [Self] extends [never] ? MissingSelfGe
       let layerWithDepsCache: Layer.Layer.Any | undefined
       Object.defineProperty(TagClass, "Default", {
         get(this: any) {
+          if (isFunction) {
+            return function(this: typeof TagClass) {
+              return layer.provide(
+                this.DefaultWithoutDependencies.apply(null, arguments),
+                maker.dependencies
+              )
+            }
+          }
           return layerWithDepsCache ??= layer.provide(
             this.DefaultWithoutDependencies,
             maker.dependencies
@@ -27983,16 +28055,27 @@ export declare namespace Service {
     & { key: Key }
     & (MakeAccessors<Make> extends true ? Tag.Proxy<Self, MakeService<Make>> : {})
     & (MakeDeps<Make> extends never ? {
-        readonly Default: Layer.Layer<Self, MakeError<Make>, MakeContext<Make>>
+        readonly Default: HasArguments<Make> extends true ?
+          (...args: MakeArguments<Make>) => Layer.Layer<Self, MakeError<Make>, MakeContext<Make>>
+          : Layer.Layer<Self, MakeError<Make>, MakeContext<Make>>
       } :
       {
-        readonly DefaultWithoutDependencies: Layer.Layer<Self, MakeError<Make>, MakeContext<Make>>
-        readonly Default: Layer.Layer<
-          Self,
-          MakeError<Make> | MakeDepsE<Make>,
-          | Exclude<MakeContext<Make>, MakeDepsOut<Make>>
-          | MakeDepsIn<Make>
-        >
+        readonly DefaultWithoutDependencies: HasArguments<Make> extends true
+          ? (...args: MakeArguments<Make>) => Layer.Layer<Self, MakeError<Make>, MakeContext<Make>>
+          : Layer.Layer<Self, MakeError<Make>, MakeContext<Make>>
+
+        readonly Default: HasArguments<Make> extends true ? (...args: MakeArguments<Make>) => Layer.Layer<
+            Self,
+            MakeError<Make> | MakeDepsE<Make>,
+            | Exclude<MakeContext<Make>, MakeDepsOut<Make>>
+            | MakeDepsIn<Make>
+          > :
+          Layer.Layer<
+            Self,
+            MakeError<Make> | MakeDepsE<Make>,
+            | Exclude<MakeContext<Make>, MakeDepsOut<Make>>
+            | MakeDepsIn<Make>
+          >
       })
 
   /**
@@ -28000,6 +28083,8 @@ export declare namespace Service {
    */
   export type MakeService<Make> = Make extends { readonly effect: Effect<infer _A, infer _E, infer _R> } ? _A
     : Make extends { readonly scoped: Effect<infer _A, infer _E, infer _R> } ? _A
+    : Make extends { readonly effect: (...args: infer _Args) => Effect<infer _A, infer _E, infer _R> } ? _A
+    : Make extends { readonly scoped: (...args: infer _Args) => Effect<infer _A, infer _E, infer _R> } ? _A
     : Make extends { readonly sync: LazyArg<infer A> } ? A
     : Make extends { readonly succeed: infer A } ? A
     : never
@@ -28009,6 +28094,8 @@ export declare namespace Service {
    */
   export type MakeError<Make> = Make extends { readonly effect: Effect<infer _A, infer _E, infer _R> } ? _E
     : Make extends { readonly scoped: Effect<infer _A, infer _E, infer _R> } ? _E
+    : Make extends { readonly effect: (...args: infer _Args) => Effect<infer _A, infer _E, infer _R> } ? _E
+    : Make extends { readonly scoped: (...args: infer _Args) => Effect<infer _A, infer _E, infer _R> } ? _E
     : never
 
   /**
@@ -28016,6 +28103,9 @@ export declare namespace Service {
    */
   export type MakeContext<Make> = Make extends { readonly effect: Effect<infer _A, infer _E, infer _R> } ? _R
     : Make extends { readonly scoped: Effect<infer _A, infer _E, infer _R> } ? Exclude<_R, Scope.Scope>
+    : Make extends { readonly effect: (...args: infer _Args) => Effect<infer _A, infer _E, infer _R> } ? _R
+    : Make extends { readonly scoped: (...args: infer _Args) => Effect<infer _A, infer _E, infer _R> } ?
+      Exclude<_R, Scope.Scope>
     : never
 
   /**
@@ -28045,6 +28135,25 @@ export declare namespace Service {
    */
   export type MakeAccessors<Make> = Make extends { readonly accessors: true } ? true
     : false
+
+  /**
+   * @since 3.16.0
+   */
+  export type MakeArguments<Make> = Make extends
+    { readonly effect: (...args: infer Args) => Effect<infer _A, infer _E, infer _R> } ? Args
+    : Make extends { readonly scoped: (...args: infer Args) => Effect<infer _A, infer _E, infer _R> } ? Args
+    : never
+
+  /**
+   * @since 3.16.0
+   */
+  export type HasArguments<Make> = Make extends {
+    readonly scoped: (...args: ReadonlyArray<any>) => Effect<infer _A, infer _E, infer _R>
+  } ? true :
+    Make extends {
+      readonly effect: (...args: ReadonlyArray<any>) => Effect<infer _A, infer _E, infer _R>
+    } ? true :
+    false
 }
 
 /**
@@ -28080,7 +28189,7 @@ export namespace fn {
         >,
         ...args: NoInfer<Args>
       ) => A
-    ): (this: Self, ...args: Args) => A
+    ): (this: Self, ...args: Args) => Effect.AsEffect<A>
     <
       Self,
       Eff extends YieldWrap<Effect<any, any, any>>,
@@ -28099,7 +28208,7 @@ export namespace fn {
         ...args: NoInfer<Args>
       ) => A,
       b: (_: A, ...args: NoInfer<Args>) => B
-    ): (this: Self, ...args: Args) => B
+    ): (this: Self, ...args: Args) => Effect.AsEffect<B>
     <
       Self,
       Eff extends YieldWrap<Effect<any, any, any>>,
@@ -28120,7 +28229,7 @@ export namespace fn {
       ) => A,
       b: (_: A, ...args: NoInfer<Args>) => B,
       c: (_: B, ...args: NoInfer<Args>) => C
-    ): (this: Self, ...args: Args) => C
+    ): (this: Self, ...args: Args) => Effect.AsEffect<C>
     <
       Self,
       Eff extends YieldWrap<Effect<any, any, any>>,
@@ -28143,7 +28252,7 @@ export namespace fn {
       b: (_: A, ...args: NoInfer<Args>) => B,
       c: (_: B, ...args: NoInfer<Args>) => C,
       d: (_: C, ...args: NoInfer<Args>) => D
-    ): (this: Self, ...args: Args) => D
+    ): (this: Self, ...args: Args) => Effect.AsEffect<D>
     <
       Self,
       Eff extends YieldWrap<Effect<any, any, any>>,
@@ -28168,7 +28277,7 @@ export namespace fn {
       c: (_: B, ...args: NoInfer<Args>) => C,
       d: (_: C, ...args: NoInfer<Args>) => D,
       e: (_: D, ...args: NoInfer<Args>) => E
-    ): (this: Self, ...args: Args) => E
+    ): (this: Self, ...args: Args) => Effect.AsEffect<E>
     <
       Self,
       Eff extends YieldWrap<Effect<any, any, any>>,
@@ -28195,7 +28304,7 @@ export namespace fn {
       d: (_: C, ...args: NoInfer<Args>) => D,
       e: (_: D, ...args: NoInfer<Args>) => E,
       f: (_: E, ...args: NoInfer<Args>) => F
-    ): (this: Self, ...args: Args) => F
+    ): (this: Self, ...args: Args) => Effect.AsEffect<F>
     <
       Self,
       Eff extends YieldWrap<Effect<any, any, any>>,
@@ -28224,7 +28333,7 @@ export namespace fn {
       e: (_: D, ...args: NoInfer<Args>) => E,
       f: (_: E, ...args: NoInfer<Args>) => F,
       g: (_: F, ...args: NoInfer<Args>) => G
-    ): (this: Self, ...args: Args) => G
+    ): (this: Self, ...args: Args) => Effect.AsEffect<G>
     <
       Self,
       Eff extends YieldWrap<Effect<any, any, any>>,
@@ -28255,7 +28364,7 @@ export namespace fn {
       f: (_: E, ...args: NoInfer<Args>) => F,
       g: (_: F, ...args: NoInfer<Args>) => G,
       h: (_: G, ...args: NoInfer<Args>) => H
-    ): (this: Self, ...args: Args) => H
+    ): (this: Self, ...args: Args) => Effect.AsEffect<H>
     <
       Self,
       Eff extends YieldWrap<Effect<any, any, any>>,
@@ -28288,7 +28397,7 @@ export namespace fn {
       g: (_: F, ...args: NoInfer<Args>) => G,
       h: (_: G, ...args: NoInfer<Args>) => H,
       i: (_: H, ...args: NoInfer<Args>) => I
-    ): (this: Self, ...args: Args) => I
+    ): (this: Self, ...args: Args) => Effect.AsEffect<I>
   }
 
   /**
@@ -28298,29 +28407,29 @@ export namespace fn {
   export type NonGen = {
     <Self, Eff extends Effect<any, any, any>, Args extends Array<any>>(
       body: (this: Self, ...args: Args) => Eff
-    ): (this: Self, ...args: Args) => Eff
+    ): (this: Self, ...args: Args) => Effect.AsEffect<Eff>
     <Self, Eff extends Effect<any, any, any>, A, Args extends Array<any>>(
       body: (this: Self, ...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => Eff
-    ): (this: Self, ...args: Args) => Eff
+    ): (this: Self, ...args: Args) => Effect.AsEffect<Eff>
     <Self, Eff extends Effect<any, any, any>, A, B, Args extends Array<any>>(
       body: (this: Self, ...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => Eff
-    ): (this: Self, ...args: Args) => Eff
+    ): (this: Self, ...args: Args) => Effect.AsEffect<Eff>
     <Self, Eff extends Effect<any, any, any>, A, B, C, Args extends Array<any>>(
       body: (this: Self, ...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => C,
       c: (_: C, ...args: NoInfer<Args>) => Eff
-    ): (this: Self, ...args: Args) => Eff
+    ): (this: Self, ...args: Args) => Effect.AsEffect<Eff>
     <Self, Eff extends Effect<any, any, any>, A, B, C, D, Args extends Array<any>>(
       body: (this: Self, ...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
       b: (_: B, ...args: NoInfer<Args>) => C,
       c: (_: C, ...args: NoInfer<Args>) => D,
       d: (_: D, ...args: NoInfer<Args>) => Eff
-    ): (this: Self, ...args: Args) => Eff
+    ): (this: Self, ...args: Args) => Effect.AsEffect<Eff>
     <Self, Eff extends Effect<any, any, any>, A, B, C, D, E, Args extends Array<any>>(
       body: (this: Self, ...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
@@ -28328,7 +28437,7 @@ export namespace fn {
       c: (_: C, ...args: NoInfer<Args>) => D,
       d: (_: D, ...args: NoInfer<Args>) => E,
       e: (_: E, ...args: NoInfer<Args>) => Eff
-    ): (this: Self, ...args: Args) => Eff
+    ): (this: Self, ...args: Args) => Effect.AsEffect<Eff>
     <Self, Eff extends Effect<any, any, any>, A, B, C, D, E, F, Args extends Array<any>>(
       body: (this: Self, ...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
@@ -28337,7 +28446,7 @@ export namespace fn {
       d: (_: D, ...args: NoInfer<Args>) => E,
       e: (_: E, ...args: NoInfer<Args>) => F,
       f: (_: F, ...args: NoInfer<Args>) => Eff
-    ): (this: Self, ...args: Args) => Eff
+    ): (this: Self, ...args: Args) => Effect.AsEffect<Eff>
     <Self, Eff extends Effect<any, any, any>, A, B, C, D, E, F, G, Args extends Array<any>>(
       body: (this: Self, ...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
@@ -28347,7 +28456,7 @@ export namespace fn {
       e: (_: E, ...args: NoInfer<Args>) => F,
       f: (_: F, ...args: NoInfer<Args>) => G,
       g: (_: G, ...args: NoInfer<Args>) => Eff
-    ): (this: Self, ...args: Args) => Eff
+    ): (this: Self, ...args: Args) => Effect.AsEffect<Eff>
     <Self, Eff extends Effect<any, any, any>, A, B, C, D, E, F, G, H, Args extends Array<any>>(
       body: (this: Self, ...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
@@ -28358,7 +28467,7 @@ export namespace fn {
       f: (_: F, ...args: NoInfer<Args>) => G,
       g: (_: G, ...args: NoInfer<Args>) => H,
       h: (_: H, ...args: NoInfer<Args>) => Eff
-    ): (this: Self, ...args: Args) => Eff
+    ): (this: Self, ...args: Args) => Effect.AsEffect<Eff>
     <Self, Eff extends Effect<any, any, any>, A, B, C, D, E, F, G, H, I, Args extends Array<any>>(
       body: (this: Self, ...args: Args) => A,
       a: (_: A, ...args: NoInfer<Args>) => B,
@@ -28370,7 +28479,7 @@ export namespace fn {
       g: (_: G, ...args: NoInfer<Args>) => H,
       h: (_: H, ...args: NoInfer<Args>) => I,
       i: (_: H, ...args: NoInfer<Args>) => Eff
-    ): (this: Self, ...args: Args) => Eff
+    ): (this: Self, ...args: Args) => Effect.AsEffect<Eff>
   }
 
   /**