effect 4.0.0-beta.65 → 4.0.0-beta.66

package/src/Effect.ts

@@ -129,9 +129,19 @@ import type {
   unassigned
 } from "./Types.ts"
 import type * as Unify from "./Unify.ts"
-import { internalCall, SingleShotGen } from "./Utils.ts"
+import { internalCall } from "./Utils.ts"
 
-const TypeId = core.EffectTypeId
+/**
+ * @category Type identifiers
+ * @since 2.0.0
+ */
+export type TypeId = "~effect/Effect"
+
+/**
+ * @category Type identifiers
+ * @since 2.0.0
+ */
+export const TypeId: TypeId = core.EffectTypeId
 
 /**
  * The `Effect` interface defines a value that lazily describes a workflow or
@@ -170,62 +180,14 @@ const TypeId = core.EffectTypeId
  * @since 2.0.0
  * @category Models
  */
-export interface Effect<out A, out E = never, out R = never>
-  extends Pipeable, Inspectable, Yieldable<Effect<A, E, R>, A, E, R>
-{
+export interface Effect<out A, out E = never, out R = never> extends Pipeable, Inspectable {
   readonly [TypeId]: Variance<A, E, R>
+  [Symbol.iterator](): EffectIterator<Effect<A, E, R>>
   [Unify.typeSymbol]?: unknown
   [Unify.unifySymbol]?: EffectUnify<this>
   [Unify.ignoreSymbol]?: {}
 }
 
-/**
- * A type that can be yielded in an Effect generator function.
- *
- * The `Yieldable` interface allows values to be used with the `yield*` syntax
- * in Effect generator functions, providing a clean way to sequence effectful operations.
- *
- * @example
- * ```ts
- * import { Effect } from "effect"
- *
- * // Effects implement Yieldable and can be used with yield*
- * const effect1 = Effect.succeed(10)
- * const effect2 = Effect.succeed(20)
- *
- * const program = Effect.gen(function*() {
- *   const a = yield* effect1 // yields the Effect which implements Yieldable
- *   const b = yield* effect2
- *   return a + b
- * })
- *
- * Effect.runPromise(program).then(console.log) // 30
- * ```
- *
- * @since 4.0.0
- * @category Yieldable
- */
-export interface Yieldable<
-  out Self extends Yieldable<any, any, any, any>,
-  out A,
-  out E = never,
-  out R = never
-> {
-  asEffect(): Effect<A, E, R>
-  [Symbol.iterator](): EffectIterator<Self>
-}
-
-/**
- * @since 4.0.0
- * @category Yieldable
- */
-export abstract class YieldableClass<A, E = never, R = never> implements Yieldable<any, A, E, R> {
-  [Symbol.iterator](): EffectIterator<this> {
-    return new SingleShotGen(this) as any
-  }
-  abstract asEffect(): Effect<A, E, R>
-}
-
 /**
  * @category Models
  * @since 2.0.0
@@ -318,34 +280,6 @@ export type Error<T> = T extends Effect<infer _A, infer _E, infer _R> ? _E
 export type Services<T> = T extends Effect<infer _A, infer _E, infer _R> ? _R
   : never
 
-/**
- * Namespace containing type utilities for Yieldable values.
- *
- * @since 4.0.0
- * @category Yieldable
- */
-export declare namespace Yieldable {
-  /**
-   * @since 4.0.0
-   * @category Yieldable
-   */
-  export type Any = Yieldable<any, any, any, any>
-
-  /**
-   * @since 4.0.0
-   * @category Yieldable
-   * @example
-   * ```ts
-   * import type { Effect } from "effect"
-   *
-   * // Extract the success type from a Yieldable
-   * type SuccessType = Effect.Yieldable.Success<Effect.Effect<string>> // string
-   * ```
-   */
-  export type Success<T> = T extends Yieldable<infer _Self, infer _A, infer _E, infer _R> ? _A
-    : never
-}
-
 /**
  * Tests if a value is an `Effect`.
  *
@@ -384,10 +318,10 @@ export const isEffect: (u: unknown) => u is Effect<any, any, any> = core.isEffec
  * @since 2.0.0
  * @category Models
  */
-export interface EffectIterator<T extends Yieldable<any, any, any, any>> {
+export interface EffectIterator<T extends Effect<any, any, any>> {
   next(
     ...args: ReadonlyArray<any>
-  ): IteratorResult<T, Yieldable.Success<T>>
+  ): IteratorResult<T, Success<T>>
 }
 
 // ========================================================================
@@ -2022,13 +1956,13 @@ export const gen: {
    * @since 2.0.0
    * @category Creating Effects
    */
-  <Eff extends Yieldable<any, any, any, any>, AEff>(f: () => Generator<Eff, AEff, never>): Effect<
+  <Eff extends Effect<any, any, any>, AEff>(f: () => Generator<Eff, AEff, never>): Effect<
     AEff,
     [Eff] extends [never] ? never
-      : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+      : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
       : never,
     [Eff] extends [never] ? never
-      : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+      : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
       : never
   >
   /**
@@ -2081,7 +2015,7 @@ export const gen: {
    * @since 2.0.0
    * @category Creating Effects
    */
-  <Self, Eff extends Yieldable<any, any, any, any>, AEff>(
+  <Self, Eff extends Effect<any, any, any>, AEff>(
     options: {
       readonly self: Self
     },
@@ -2089,10 +2023,10 @@ export const gen: {
   ): Effect<
     AEff,
     [Eff] extends [never] ? never
-      : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+      : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
       : never,
     [Eff] extends [never] ? never
-      : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+      : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
       : never
   >
 } = internal.gen
@@ -2106,7 +2040,7 @@ export namespace gen {
   /**
    * @since 4.0.0
    */
-  export type Return<A, E = never, R = never> = Generator<Yieldable<any, any, E, R>, A, any>
+  export type Return<A, E = never, R = never> = Generator<Effect<any, E, R>, A, any>
 }
 
 /**
@@ -2467,31 +2401,6 @@ export const fromOption: <A>(
  */
 export const fromNullishOr: <A>(value: A) => Effect<NonNullable<A>, Cause.NoSuchElementError> = internal.fromNullishOr
 
-/**
- * Converts a yieldable value to an Effect.
- *
- * @example
- * ```ts
- * import { Effect } from "effect"
- * import * as Option from "effect/Option"
- *
- * // Option is yieldable in Effect
- * const program = Effect.gen(function*() {
- *   const value = yield* Effect.fromYieldable(Option.some(42))
- *   return value * 2
- * })
- *
- * Effect.runPromise(program).then(console.log)
- * // Output: 84
- * ```
- *
- * @since 4.0.0
- * @category Conversions
- */
-export const fromYieldable: <Self extends Yieldable.Any, A, E, R>(
-  yieldable: Yieldable<Self, A, E, R>
-) => Effect<A, E, R> = internal.fromYieldable
-
 // -----------------------------------------------------------------------------
 // Mapping
 // -----------------------------------------------------------------------------
@@ -16613,92 +16522,92 @@ export namespace fn {
    * @since 3.19.0
    * @category Models
    */
-  export type Return<A, E = never, R = never> = Generator<Yieldable<any, any, E, R>, A, any>
+  export type Return<A, E = never, R = never> = Generator<Effect<any, E, R>, A, any>
 
   /**
    * @since 3.11.0
    * @category Models
    */
   export type Untraced = {
-    <Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>>(
+    <Eff extends Effect<any, any, any>, AEff, Args extends Array<any>>(
       body: (this: unassigned, ...args: Args) => Generator<Eff, AEff, never>
     ): (...args: Args) => Effect<
       AEff,
       [Eff] extends [never] ? never
-        : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+        : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
         : never,
       [Eff] extends [never] ? never
-        : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+        : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
         : never
     >
-    <Self, Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>>(
+    <Self, Eff extends Effect<any, any, any>, AEff, Args extends Array<any>>(
       body: (this: Self, ...args: Args) => Generator<Eff, AEff, never>
     ): (this: Self, ...args: Args) => Effect<
       AEff,
       [Eff] extends [never] ? never
-        : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+        : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
         : never,
       [Eff] extends [never] ? never
-        : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+        : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
         : never
     >
 
-    <Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>, A>(
+    <Eff extends Effect<any, any, any>, AEff, Args extends Array<any>, A>(
       body: (this: unassigned, ...args: Args) => Generator<Eff, AEff, never>,
       a: (
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
       ) => A
     ): (...args: Args) => A
-    <Self, Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>, A>(
+    <Self, Eff extends Effect<any, any, any>, AEff, Args extends Array<any>, A>(
       body: (this: Self, ...args: Args) => Generator<Eff, AEff, never>,
       a: (
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
       ) => A
     ): (this: Self, ...args: Args) => A
-    <Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>, A, B>(
+    <Eff extends Effect<any, any, any>, AEff, Args extends Array<any>, A, B>(
       body: (this: unassigned, ...args: Args) => Generator<Eff, AEff, never>,
       a: (
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
       ) => A,
       b: (_: A, ...args: Args) => B
     ): (...args: Args) => B
-    <Self, Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>, A, B>(
+    <Self, Eff extends Effect<any, any, any>, AEff, Args extends Array<any>, A, B>(
       body: (this: Self, ...args: Args) => Generator<Eff, AEff, never>,
       a: (
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -16706,7 +16615,7 @@ export namespace fn {
       b: (_: A, ...args: Args) => B
     ): (this: Self, ...args: Args) => B
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -16718,10 +16627,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -16731,7 +16640,7 @@ export namespace fn {
     ): (...args: Args) => C
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -16743,10 +16652,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -16755,7 +16664,7 @@ export namespace fn {
       c: (_: B, ...args: Args) => C
     ): (this: Self, ...args: Args) => C
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -16768,10 +16677,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -16782,7 +16691,7 @@ export namespace fn {
     ): (...args: Args) => D
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -16795,10 +16704,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -16808,7 +16717,7 @@ export namespace fn {
       d: (_: C, ...args: Args) => D
     ): (this: Self, ...args: Args) => D
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -16822,10 +16731,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -16837,7 +16746,7 @@ export namespace fn {
     ): (...args: Args) => E
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -16851,10 +16760,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -16865,7 +16774,7 @@ export namespace fn {
       e: (_: D, ...args: Args) => E
     ): (this: Self, ...args: Args) => E
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -16880,10 +16789,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -16896,7 +16805,7 @@ export namespace fn {
     ): (...args: Args) => F
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -16911,10 +16820,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -16926,7 +16835,7 @@ export namespace fn {
       f: (_: E, ...args: Args) => F
     ): (this: Self, ...args: Args) => F
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -16942,10 +16851,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -16959,7 +16868,7 @@ export namespace fn {
     ): (...args: Args) => G
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -16975,10 +16884,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -16991,7 +16900,7 @@ export namespace fn {
       g: (_: F, ...args: Args) => G
     ): (this: Self, ...args: Args) => G
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17008,10 +16917,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17026,7 +16935,7 @@ export namespace fn {
     ): (...args: Args) => H
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17043,10 +16952,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17060,7 +16969,7 @@ export namespace fn {
       h: (_: G, ...args: Args) => H
     ): (this: Self, ...args: Args) => H
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17078,10 +16987,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17097,7 +17006,7 @@ export namespace fn {
     ): (...args: Args) => I
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17115,10 +17024,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17133,7 +17042,7 @@ export namespace fn {
       i: (_: H, ...args: Args) => I
     ): (this: Self, ...args: Args) => I
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17152,10 +17061,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17172,7 +17081,7 @@ export namespace fn {
     ): (...args: Args) => J
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17191,10 +17100,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17210,7 +17119,7 @@ export namespace fn {
       j: (_: I, ...args: Args) => J
     ): (this: Self, ...args: Args) => J
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17230,10 +17139,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17251,7 +17160,7 @@ export namespace fn {
     ): (...args: Args) => K
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17271,10 +17180,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17291,7 +17200,7 @@ export namespace fn {
       k: (_: J, ...args: Args) => K
     ): (this: Self, ...args: Args) => K
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17312,10 +17221,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17334,7 +17243,7 @@ export namespace fn {
     ): (...args: Args) => L
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17355,10 +17264,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17376,7 +17285,7 @@ export namespace fn {
       l: (_: K, ...args: Args) => L
     ): (this: Self, ...args: Args) => L
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17398,10 +17307,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17421,7 +17330,7 @@ export namespace fn {
     ): (...args: Args) => M
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17443,10 +17352,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17465,7 +17374,7 @@ export namespace fn {
       m: (_: L, ...args: Args) => M
     ): (this: Self, ...args: Args) => M
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17488,10 +17397,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17512,7 +17421,7 @@ export namespace fn {
     ): (...args: Args) => N
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17535,10 +17444,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17558,7 +17467,7 @@ export namespace fn {
       n: (_: M, ...args: Args) => N
     ): (this: Self, ...args: Args) => N
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17582,10 +17491,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17607,7 +17516,7 @@ export namespace fn {
     ): (...args: Args) => O
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17631,10 +17540,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17655,7 +17564,7 @@ export namespace fn {
       o: (_: N, ...args: Args) => O
     ): (this: Self, ...args: Args) => O
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17680,10 +17589,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17706,7 +17615,7 @@ export namespace fn {
     ): (...args: Args) => P
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17731,10 +17640,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17756,7 +17665,7 @@ export namespace fn {
       p: (_: O, ...args: Args) => P
     ): (this: Self, ...args: Args) => P
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17782,10 +17691,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17809,7 +17718,7 @@ export namespace fn {
     ): (...args: Args) => Q
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17835,10 +17744,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17861,7 +17770,7 @@ export namespace fn {
       q: (_: P, ...args: Args) => Q
     ): (this: Self, ...args: Args) => Q
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17888,10 +17797,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17916,7 +17825,7 @@ export namespace fn {
     ): (...args: Args) => R
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17943,10 +17852,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -17970,7 +17879,7 @@ export namespace fn {
       r: (_: Q, ...args: Args) => R
     ): (this: Self, ...args: Args) => R
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -17998,10 +17907,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18027,7 +17936,7 @@ export namespace fn {
     ): (...args: Args) => S
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18055,10 +17964,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18083,7 +17992,7 @@ export namespace fn {
       s: (_: R, ...args: Args) => S
     ): (this: Self, ...args: Args) => S
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18112,10 +18021,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18142,7 +18051,7 @@ export namespace fn {
     ): (...args: Args) => T
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18171,10 +18080,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18206,131 +18115,131 @@ export namespace fn {
    * @category Models
    */
   export type Traced = {
-    <Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>>(
+    <Eff extends Effect<any, any, any>, AEff, Args extends Array<any>>(
       body: (this: unassigned, ...args: Args) => Generator<Eff, AEff, never> | (Eff & Effect<AEff, any, any>)
     ): (...args: Args) => Effect<
       AEff,
       [Eff] extends [never] ? never
-        : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+        : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
         : never,
       [Eff] extends [never] ? never
-        : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+        : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
         : never
     >
-    <Self, Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>>(
+    <Self, Eff extends Effect<any, any, any>, AEff, Args extends Array<any>>(
       body: (this: Self, ...args: Args) => Generator<Eff, AEff, never> | (Eff & Effect<AEff, any, any>)
     ): (this: Self, ...args: Args) => Effect<
       AEff,
       [Eff] extends [never] ? never
-        : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+        : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
         : never,
       [Eff] extends [never] ? never
-        : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+        : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
         : never
     >
-    <Self, Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>>(
+    <Self, Eff extends Effect<any, any, any>, AEff, Args extends Array<any>>(
       options: { readonly self: Self },
       body: (this: Self, ...args: Args) => Generator<Eff, AEff, never> | (Eff & Effect<AEff, any, any>)
     ): (...args: Args) => Effect<
       AEff,
       [Eff] extends [never] ? never
-        : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+        : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
         : never,
       [Eff] extends [never] ? never
-        : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+        : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
         : never
     >
 
-    <Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>, A>(
+    <Eff extends Effect<any, any, any>, AEff, Args extends Array<any>, A>(
       body: (this: unassigned, ...args: Args) => Generator<Eff, AEff, never> | (Eff & Effect<AEff, any, any>),
       a: (
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
       ) => A
     ): (...args: Args) => A
-    <Self, Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>, A>(
+    <Self, Eff extends Effect<any, any, any>, AEff, Args extends Array<any>, A>(
       body: (this: Self, ...args: Args) => Generator<Eff, AEff, never> | (Eff & Effect<AEff, any, any>),
       a: (
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
       ) => A
     ): (this: Self, ...args: Args) => A
-    <Self, Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>, A>(
+    <Self, Eff extends Effect<any, any, any>, AEff, Args extends Array<any>, A>(
       options: { readonly self: Self },
       body: (this: Self, ...args: Args) => Generator<Eff, AEff, never> | (Eff & Effect<AEff, any, any>),
       a: (
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
       ) => A
     ): (...args: Args) => A
 
-    <Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>, A, B>(
+    <Eff extends Effect<any, any, any>, AEff, Args extends Array<any>, A, B>(
       body: (this: unassigned, ...args: Args) => Generator<Eff, AEff, never> | (Eff & Effect<AEff, any, any>),
       a: (
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
       ) => A,
       b: (_: A, ...args: Args) => B
     ): (...args: Args) => B
-    <Self, Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>, A, B>(
+    <Self, Eff extends Effect<any, any, any>, AEff, Args extends Array<any>, A, B>(
       body: (this: Self, ...args: Args) => Generator<Eff, AEff, never> | (Eff & Effect<AEff, any, any>),
       a: (
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
       ) => A,
       b: (_: A, ...args: Args) => B
     ): (this: Self, ...args: Args) => B
-    <Self, Eff extends Yieldable<any, any, any, any>, AEff, Args extends Array<any>, A, B>(
+    <Self, Eff extends Effect<any, any, any>, AEff, Args extends Array<any>, A, B>(
       options: { readonly self: Self },
       body: (this: Self, ...args: Args) => Generator<Eff, AEff, never> | (Eff & Effect<AEff, any, any>),
       a: (
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18339,7 +18248,7 @@ export namespace fn {
     ): (...args: Args) => B
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18351,10 +18260,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18364,7 +18273,7 @@ export namespace fn {
     ): (...args: Args) => C
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18376,10 +18285,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18389,7 +18298,7 @@ export namespace fn {
     ): (this: Self, ...args: Args) => C
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18402,10 +18311,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18415,7 +18324,7 @@ export namespace fn {
     ): (...args: Args) => C
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18428,10 +18337,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18442,7 +18351,7 @@ export namespace fn {
     ): (...args: Args) => D
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18455,10 +18364,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18470,7 +18379,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18484,10 +18393,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18498,7 +18407,7 @@ export namespace fn {
     ): (...args: Args) => D
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18512,10 +18421,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18527,7 +18436,7 @@ export namespace fn {
     ): (...args: Args) => E
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18541,10 +18450,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18557,7 +18466,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18572,10 +18481,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18587,7 +18496,7 @@ export namespace fn {
     ): (...args: Args) => E
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18602,10 +18511,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18618,7 +18527,7 @@ export namespace fn {
     ): (...args: Args) => F
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18633,10 +18542,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18650,7 +18559,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18666,10 +18575,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18682,7 +18591,7 @@ export namespace fn {
     ): (...args: Args) => F
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18698,10 +18607,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18715,7 +18624,7 @@ export namespace fn {
     ): (...args: Args) => G
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18731,10 +18640,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18749,7 +18658,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18766,10 +18675,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18783,7 +18692,7 @@ export namespace fn {
     ): (...args: Args) => G
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18800,10 +18709,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18818,7 +18727,7 @@ export namespace fn {
     ): (...args: Args) => H
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18835,10 +18744,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18854,7 +18763,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18872,10 +18781,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18890,7 +18799,7 @@ export namespace fn {
     ): (...args: Args) => H
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18908,10 +18817,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18927,7 +18836,7 @@ export namespace fn {
     ): (...args: Args) => I
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18945,10 +18854,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -18965,7 +18874,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -18984,10 +18893,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19003,7 +18912,7 @@ export namespace fn {
     ): (...args: Args) => I
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19022,10 +18931,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19042,7 +18951,7 @@ export namespace fn {
     ): (...args: Args) => J
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19061,10 +18970,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19082,7 +18991,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19102,10 +19011,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19122,7 +19031,7 @@ export namespace fn {
     ): (...args: Args) => J
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19142,10 +19051,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19163,7 +19072,7 @@ export namespace fn {
     ): (...args: Args) => K
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19183,10 +19092,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19205,7 +19114,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19226,10 +19135,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19247,7 +19156,7 @@ export namespace fn {
     ): (...args: Args) => K
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19268,10 +19177,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19290,7 +19199,7 @@ export namespace fn {
     ): (...args: Args) => L
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19311,10 +19220,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19334,7 +19243,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19356,10 +19265,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19378,7 +19287,7 @@ export namespace fn {
     ): (...args: Args) => L
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19400,10 +19309,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19423,7 +19332,7 @@ export namespace fn {
     ): (...args: Args) => M
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19445,10 +19354,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19469,7 +19378,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19492,10 +19401,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19515,7 +19424,7 @@ export namespace fn {
     ): (...args: Args) => M
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19538,10 +19447,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19562,7 +19471,7 @@ export namespace fn {
     ): (...args: Args) => N
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19585,10 +19494,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19610,7 +19519,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19634,10 +19543,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19658,7 +19567,7 @@ export namespace fn {
     ): (...args: Args) => N
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19682,10 +19591,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19707,7 +19616,7 @@ export namespace fn {
     ): (...args: Args) => O
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19731,10 +19640,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19757,7 +19666,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19782,10 +19691,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19807,7 +19716,7 @@ export namespace fn {
     ): (...args: Args) => O
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19832,10 +19741,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19858,7 +19767,7 @@ export namespace fn {
     ): (...args: Args) => P
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19883,10 +19792,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19910,7 +19819,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19936,10 +19845,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -19962,7 +19871,7 @@ export namespace fn {
     ): (...args: Args) => P
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -19988,10 +19897,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -20015,7 +19924,7 @@ export namespace fn {
     ): (...args: Args) => Q
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -20041,10 +19950,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -20069,7 +19978,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -20096,10 +20005,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -20123,7 +20032,7 @@ export namespace fn {
     ): (...args: Args) => Q
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -20150,10 +20059,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -20178,7 +20087,7 @@ export namespace fn {
     ): (...args: Args) => R
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -20205,10 +20114,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -20234,7 +20143,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -20262,10 +20171,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -20290,7 +20199,7 @@ export namespace fn {
     ): (...args: Args) => R
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -20318,10 +20227,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -20347,7 +20256,7 @@ export namespace fn {
     ): (...args: Args) => S
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -20375,10 +20284,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -20405,7 +20314,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -20434,10 +20343,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -20463,7 +20372,7 @@ export namespace fn {
     ): (...args: Args) => S
 
     <
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -20492,10 +20401,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -20522,7 +20431,7 @@ export namespace fn {
     ): (...args: Args) => T
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -20551,10 +20460,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -20582,7 +20491,7 @@ export namespace fn {
 
     <
       Self,
-      Eff extends Yieldable<any, any, any, any>,
+      Eff extends Effect<any, any, any>,
       AEff,
       Args extends Array<any>,
       A,
@@ -20612,10 +20521,10 @@ export namespace fn {
         _: Effect<
           AEff,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer E, infer _R>] ? E
+            : [Eff] extends [Effect<infer _A, infer E, infer _R>] ? E
             : never,
           [Eff] extends [never] ? never
-            : [Eff] extends [Yieldable<infer _S, infer _A, infer _E, infer R>] ? R
+            : [Eff] extends [Effect<infer _A, infer _E, infer R>] ? R
             : never
         >,
         ...args: Args
@@ -22870,7 +22779,7 @@ function clearTransaction(state: Transaction["Service"]) {
  * ```
  */
 export const txRetry: Effect<never, never, Transaction> = flatMap(
-  Transaction.asEffect(),
+  Transaction,
   (state) => {
     state.retry = true
     return interrupt