effect 4.0.0-beta.67 → 4.0.0-beta.69

package/dist/Layer.d.ts

@@ -104,7 +104,7 @@ export interface Any {
  * Extracts the service dependencies (RIn) from a Layer type.
  *
  * @category type-level
- * @since 2.0.0
+ * @since 4.0.0
  */
 export type Services<T extends Any> = T extends infer L ? L extends Layer<infer _ROut, infer _E, infer _RIn> ? _RIn : never : never;
 /**
@@ -131,7 +131,7 @@ declare const MemoMapTypeId = "~effect/Layer/MemoMap";
  * **Example** (Sharing layer construction with a memo map)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -165,7 +165,7 @@ export interface MemoMap {
  * **Example** (Checking whether a value is a layer)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -193,7 +193,7 @@ export declare const isLayer: (u: unknown) => u is Layer<unknown, unknown, unkno
  * **Example** (Constructing a layer from a build function)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -222,7 +222,7 @@ export declare const fromBuild: <ROut, E, RIn>(build: (memoMap: MemoMap, scope:
  * **Example** (Memoizing layer construction)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -247,7 +247,7 @@ export declare const fromBuildMemo: <ROut, E, RIn>(build: (memoMap: MemoMap, sco
  * **Example** (Creating a memo map unsafely)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -275,8 +275,8 @@ export declare const makeMemoMapUnsafe: () => MemoMap;
  * Constructs a child `MemoMap` that can reuse layers already memoized in the
  * parent while isolating any new layer allocations to the child map.
  *
- * @since 4.0.0
  * @category memo map
+ * @since 4.0.0
  */
 export declare const forkMemoMapUnsafe: (parent: MemoMap) => MemoMap;
 /**
@@ -285,7 +285,7 @@ export declare const forkMemoMapUnsafe: (parent: MemoMap) => MemoMap;
  * **Example** (Creating a memo map in an effect)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -313,8 +313,8 @@ export declare const makeMemoMap: Effect<MemoMap>;
  * Constructs a child `MemoMap` that can reuse layers already memoized in the
  * parent while isolating any new layer allocations to the child map.
  *
- * @since 4.0.0
  * @category memo map
+ * @since 4.0.0
  */
 export declare const forkMemoMap: (parent: MemoMap) => Effect<MemoMap>;
 declare const CurrentMemoMap_base: Context.ServiceClass<CurrentMemoMap, "effect/Layer/CurrentMemoMap", MemoMap>;
@@ -337,7 +337,7 @@ export declare class CurrentMemoMap extends CurrentMemoMap_base {
  * **Example** (Building layers with an explicit memo map)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -386,7 +386,7 @@ export declare const buildWithMemoMap: {
      * **Example** (Building layers with an explicit memo map)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -435,7 +435,7 @@ export declare const buildWithMemoMap: {
      * **Example** (Building layers with an explicit memo map)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -484,7 +484,7 @@ export declare const buildWithMemoMap: {
  * **Example** (Building a layer into a context)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -520,7 +520,7 @@ export declare const build: <RIn, E, ROut>(self: Layer<ROut, E, RIn>) => Effect<
  * **Example** (Building a layer with an explicit scope)
  *
  * ```ts
- * import { Effect, Layer, Scope, Context } from "effect"
+ * import { Context, Effect, Layer, Scope } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -562,7 +562,7 @@ export declare const buildWithScope: {
      * **Example** (Building a layer with an explicit scope)
      *
      * ```ts
-     * import { Effect, Layer, Scope, Context } from "effect"
+     * import { Context, Effect, Layer, Scope } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -604,7 +604,7 @@ export declare const buildWithScope: {
      * **Example** (Building a layer with an explicit scope)
      *
      * ```ts
-     * import { Effect, Layer, Scope, Context } from "effect"
+     * import { Context, Effect, Layer, Scope } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -643,7 +643,7 @@ export declare const buildWithScope: {
  * **Example** (Providing services from values)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -687,7 +687,7 @@ export declare const succeed: {
      * **Example** (Providing services from values)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -731,7 +731,7 @@ export declare const succeed: {
      * **Example** (Providing services from values)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -780,7 +780,7 @@ export declare const succeed: {
  * **Example** (Providing multiple services from a context)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -832,7 +832,7 @@ export declare const empty: Layer<never>;
  * **Example** (Lazily providing a service)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -856,7 +856,7 @@ export declare const sync: {
      * **Example** (Lazily providing a service)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -880,7 +880,7 @@ export declare const sync: {
      * **Example** (Lazily providing a service)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -906,7 +906,7 @@ export declare const sync: {
  * **Example** (Lazily providing a context)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -930,16 +930,10 @@ export declare const syncContext: <A>(evaluate: LazyArg<Context.Context<A>>) =>
  * The Effect is executed in the scope of the layer, allowing for proper
  * resource management.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Layer.scoped`
- *
  * **Example** (Creating a layer from an effect)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -963,16 +957,10 @@ export declare const effect: {
      * The Effect is executed in the scope of the layer, allowing for proper
      * resource management.
      *
-     * **Previously Known As**
-     *
-     * This API replaces the following from Effect 3.x:
-     *
-     * - `Layer.scoped`
-     *
      * **Example** (Creating a layer from an effect)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -996,16 +984,10 @@ export declare const effect: {
      * The Effect is executed in the scope of the layer, allowing for proper
      * resource management.
      *
-     * **Previously Known As**
-     *
-     * This API replaces the following from Effect 3.x:
-     *
-     * - `Layer.scoped`
-     *
      * **Example** (Creating a layer from an effect)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1033,7 +1015,7 @@ export declare const effect: {
  * **Example** (Creating a layer from an effectful context)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<
  *   Database,
@@ -1057,12 +1039,6 @@ export declare const effectContext: <A, E, R>(effect: Effect<Context.Context<A>,
  * This is useful when you want to run an Effect for its side effects during
  * layer construction, but don't need to provide any services.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Layer.scopedDiscard`
- *
  * **Example** (Running an effect during layer construction)
  *
  * ```ts
@@ -1088,7 +1064,7 @@ export declare const effectDiscard: <X, E, R>(effect: Effect<X, E, R>) => Layer<
  * **Example** (Choosing a layer lazily)
  *
  * ```ts
- * import { Layer, Context } from "effect"
+ * import { Context, Layer } from "effect"
  *
  * class Config extends Context.Service<Config, string>()("Config") {}
  *
@@ -1102,7 +1078,7 @@ export declare const effectDiscard: <X, E, R>(effect: Effect<X, E, R>) => Layer<
  * ```
  *
  * @category constructors
- * @since 4.0.0
+ * @since 2.0.0
  */
 export declare const suspend: <A, E, R>(evaluate: LazyArg<Layer<A, E, R>>) => Layer<A, E, R>;
 /**
@@ -1115,7 +1091,7 @@ export declare const suspend: <A, E, R>(evaluate: LazyArg<Layer<A, E, R>>) => La
  * **Example** (Unwrapping an effectful layer)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1141,7 +1117,7 @@ export declare const unwrap: <A, E1, R1, E, R>(self: Effect<Layer<A, E1, R1>, E,
  * **Example** (Merging independent layers)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1174,7 +1150,7 @@ export declare const mergeAll: <Layers extends [Layer<never, any, any>, ...Array
  * **Example** (Merging two layers)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1207,7 +1183,7 @@ export declare const merge: {
      * **Example** (Merging two layers)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1240,7 +1216,7 @@ export declare const merge: {
      * **Example** (Merging two layers)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1273,7 +1249,7 @@ export declare const merge: {
      * **Example** (Merging two layers)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1306,7 +1282,7 @@ export declare const merge: {
      * **Example** (Merging two layers)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1339,7 +1315,7 @@ export declare const merge: {
  * **Example** (Providing layer dependencies)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1407,7 +1383,7 @@ export declare const provide: {
      * **Example** (Providing layer dependencies)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1475,7 +1451,7 @@ export declare const provide: {
      * **Example** (Providing layer dependencies)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1543,7 +1519,7 @@ export declare const provide: {
      * **Example** (Providing layer dependencies)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1611,7 +1587,7 @@ export declare const provide: {
      * **Example** (Providing layer dependencies)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1680,7 +1656,7 @@ export declare const provide: {
  * **Example** (Providing dependencies while retaining services)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1754,7 +1730,7 @@ export declare const provideMerge: {
      * **Example** (Providing dependencies while retaining services)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1828,7 +1804,7 @@ export declare const provideMerge: {
      * **Example** (Providing dependencies while retaining services)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1902,7 +1878,7 @@ export declare const provideMerge: {
      * **Example** (Providing dependencies while retaining services)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -1976,7 +1952,7 @@ export declare const provideMerge: {
      * **Example** (Providing dependencies while retaining services)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -2049,7 +2025,7 @@ export declare const provideMerge: {
  * **Example** (Creating services from layer output)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Config extends Context.Service<Config, {
  *   readonly dbUrl: string
@@ -2121,7 +2097,7 @@ export declare const flatMap: {
      * **Example** (Creating services from layer output)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Config extends Context.Service<Config, {
      *   readonly dbUrl: string
@@ -2193,7 +2169,7 @@ export declare const flatMap: {
      * **Example** (Creating services from layer output)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Config extends Context.Service<Config, {
      *   readonly dbUrl: string
@@ -2264,21 +2240,21 @@ export declare const flatMap: {
  * Performs the specified effect if this layer succeeds.
  *
  * @category sequencing
- * @since 4.0.0
+ * @since 2.0.0
  */
 export declare const tap: {
     /**
      * Performs the specified effect if this layer succeeds.
      *
      * @category sequencing
-     * @since 4.0.0
+     * @since 2.0.0
      */
     <ROut, XR extends ROut, RIn2, E2, X>(f: (context: Context.Context<XR>) => Effect<X, E2, RIn2>): <RIn, E>(self: Layer<ROut, E, RIn>) => Layer<ROut, E | E2, RIn | Exclude<RIn2, Scope.Scope>>;
     /**
      * Performs the specified effect if this layer succeeds.
      *
      * @category sequencing
-     * @since 4.0.0
+     * @since 2.0.0
      */
     <RIn, E, ROut, XR extends ROut, RIn2, E2, X>(self: Layer<ROut, E, RIn>, f: (context: Context.Context<XR>) => Effect<X, E2, RIn2>): Layer<ROut, E | E2, RIn | Exclude<RIn2, Scope.Scope>>;
 };
@@ -2286,21 +2262,21 @@ export declare const tap: {
  * Performs the specified effect if this layer fails.
  *
  * @category sequencing
- * @since 4.0.0
+ * @since 2.0.0
  */
 export declare const tapError: {
     /**
      * Performs the specified effect if this layer fails.
      *
      * @category sequencing
-     * @since 4.0.0
+     * @since 2.0.0
      */
     <E, XE extends E, RIn2, E2, X>(f: (e: XE) => Effect<X, E2, RIn2>): <RIn, ROut>(self: Layer<ROut, E, RIn>) => Layer<ROut, E | E2, RIn | Exclude<RIn2, Scope.Scope>>;
     /**
      * Performs the specified effect if this layer fails.
      *
      * @category sequencing
-     * @since 4.0.0
+     * @since 2.0.0
      */
     <RIn, E, XE extends E, ROut, RIn2, E2, X>(self: Layer<ROut, E, RIn>, f: (e: XE) => Effect<X, E2, RIn2>): Layer<ROut, E | E2, RIn | Exclude<RIn2, Scope.Scope>>;
 };
@@ -2313,12 +2289,6 @@ export declare const tapError: {
  * fails again with the original cause; if the callback fails, that failure is
  * added to the layer's error type.
  *
- * **Previously Known As**
- *
- * This API replaces the following from Effect 3.x:
- *
- * - `Layer.tapErrorCause`
- *
  * @category sequencing
  * @since 4.0.0
  */
@@ -2332,12 +2302,6 @@ export declare const tapCause: {
      * fails again with the original cause; if the callback fails, that failure is
      * added to the layer's error type.
      *
-     * **Previously Known As**
-     *
-     * This API replaces the following from Effect 3.x:
-     *
-     * - `Layer.tapErrorCause`
-     *
      * @category sequencing
      * @since 4.0.0
      */
@@ -2351,12 +2315,6 @@ export declare const tapCause: {
      * fails again with the original cause; if the callback fails, that failure is
      * added to the layer's error type.
      *
-     * **Previously Known As**
-     *
-     * This API replaces the following from Effect 3.x:
-     *
-     * - `Layer.tapErrorCause`
-     *
      * @category sequencing
      * @since 4.0.0
      */
@@ -2369,7 +2327,7 @@ export declare const tapCause: {
  * **Example** (Converting layer failures to defects)
  *
  * ```ts
- * import { Data, Effect, Layer, Context } from "effect"
+ * import { Context, Data, Effect, Layer } from "effect"
  *
  * class DatabaseError extends Data.TaggedError("DatabaseError")<{
  *   message: string
@@ -2422,7 +2380,7 @@ catch_ as catch };
  * **Example** (Recovering from tagged layer errors)
  *
  * ```ts
- * import { Data, Effect, Layer, Context } from "effect"
+ * import { Context, Data, Effect, Layer } from "effect"
  *
  * class ConfigError extends Data.TaggedError("ConfigError") {}
  *
@@ -2449,7 +2407,7 @@ export declare const catchTag: {
      * **Example** (Recovering from tagged layer errors)
      *
      * ```ts
-     * import { Data, Effect, Layer, Context } from "effect"
+     * import { Context, Data, Effect, Layer } from "effect"
      *
      * class ConfigError extends Data.TaggedError("ConfigError") {}
      *
@@ -2476,7 +2434,7 @@ export declare const catchTag: {
      * **Example** (Recovering from tagged layer errors)
      *
      * ```ts
-     * import { Data, Effect, Layer, Context } from "effect"
+     * import { Context, Data, Effect, Layer } from "effect"
      *
      * class ConfigError extends Data.TaggedError("ConfigError") {}
      *
@@ -2509,7 +2467,7 @@ export declare const catchTag: {
  * **Example** (Recovering from layer failures by cause)
  *
  * ```ts
- * import { Data, Effect, Layer, Context } from "effect"
+ * import { Context, Data, Effect, Layer } from "effect"
  *
  * class DatabaseError extends Data.TaggedError("DatabaseError")<{
  *   message: string
@@ -2544,7 +2502,7 @@ export declare const catchTag: {
  * ```
  *
  * @category error handling
- * @since 2.0.0
+ * @since 4.0.0
  */
 export declare const catchCause: {
     /**
@@ -2558,7 +2516,7 @@ export declare const catchCause: {
      * **Example** (Recovering from layer failures by cause)
      *
      * ```ts
-     * import { Data, Effect, Layer, Context } from "effect"
+     * import { Context, Data, Effect, Layer } from "effect"
      *
      * class DatabaseError extends Data.TaggedError("DatabaseError")<{
      *   message: string
@@ -2593,7 +2551,7 @@ export declare const catchCause: {
      * ```
      *
      * @category error handling
-     * @since 2.0.0
+     * @since 4.0.0
      */
     <E, RIn2, E2, ROut2>(onError: (cause: Cause.Cause<E>) => Layer<ROut2, E2, RIn2>): <RIn, ROut>(self: Layer<ROut, E, RIn>) => Layer<ROut & ROut2, E2, RIn2 | RIn>;
     /**
@@ -2607,7 +2565,7 @@ export declare const catchCause: {
      * **Example** (Recovering from layer failures by cause)
      *
      * ```ts
-     * import { Data, Effect, Layer, Context } from "effect"
+     * import { Context, Data, Effect, Layer } from "effect"
      *
      * class DatabaseError extends Data.TaggedError("DatabaseError")<{
      *   message: string
@@ -2642,7 +2600,7 @@ export declare const catchCause: {
      * ```
      *
      * @category error handling
-     * @since 2.0.0
+     * @since 4.0.0
      */
     <RIn, E, ROut, RIn2, E2, ROut22>(self: Layer<ROut, E, RIn>, onError: (cause: Cause.Cause<E>) => Layer<ROut22, E2, RIn2>): Layer<ROut & ROut22, E2, RIn | RIn2>;
 };
@@ -2710,7 +2668,7 @@ export declare const updateService: {
  * **Example** (Creating non-shared layer instances)
  *
  * ```ts
- * import { Effect, Layer, Ref, Context } from "effect"
+ * import { Context, Effect, Layer, Ref } from "effect"
  *
  * class Counter extends Context.Service<Counter, {
  *   readonly id: number
@@ -2784,7 +2742,7 @@ export declare const fresh: <A, E, R>(self: Layer<A, E, R>) => Layer<A, E, R>;
  * **Example** (Launching an application layer)
  *
  * ```ts
- * import { Console, Effect, Layer, Context } from "effect"
+ * import { Console, Context, Effect, Layer } from "effect"
  *
  * class HttpServer extends Context.Service<HttpServer, {
  *   readonly start: () => Effect.Effect<string>
@@ -2829,7 +2787,7 @@ export declare const fresh: <A, E, R>(self: Layer<A, E, R>) => Layer<A, E, R>;
  * // Effect.runFork(application)
  * ```
  *
- * @category conversions
+ * @category converting
  * @since 2.0.0
  */
 export declare const launch: <RIn, E, ROut>(self: Layer<ROut, E, RIn>) => Effect<never, E, RIn>;
@@ -2841,7 +2799,7 @@ export declare const launch: <RIn, E, ROut>(self: Layer<ROut, E, RIn>) => Effect
  * only the methods you need to test while leaving others unimplemented.
  *
  * @category Testing
- * @since 4.0.0
+ * @since 3.17.0
  */
 export type PartialEffectful<A extends object> = Types.Simplify<{
     [K in keyof A as A[K] extends AnyEffectOrStream ? K : never]?: A[K];
@@ -2857,7 +2815,7 @@ type AnyEffectOrStream = Effect<any, any, any> | Stream.Stream<any, any, any> |
  * **Example** (Mocking services for tests)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class UserService extends Context.Service<UserService, {
  *   readonly config: { apiUrl: string }
@@ -2894,7 +2852,7 @@ type AnyEffectOrStream = Effect<any, any, any> | Stream.Stream<any, any, any> |
  * ```
  *
  * @category Testing
- * @since 4.0.0
+ * @since 3.17.0
  */
 export declare const mock: {
     /**
@@ -2905,7 +2863,7 @@ export declare const mock: {
      * **Example** (Mocking services for tests)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class UserService extends Context.Service<UserService, {
      *   readonly config: { apiUrl: string }
@@ -2942,7 +2900,7 @@ export declare const mock: {
      * ```
      *
      * @category Testing
-     * @since 4.0.0
+     * @since 3.17.0
      */
     <I, S extends object>(service: Context.Key<I, S>): (implementation: PartialEffectful<S>) => Layer<I>;
     /**
@@ -2953,7 +2911,7 @@ export declare const mock: {
      * **Example** (Mocking services for tests)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class UserService extends Context.Service<UserService, {
      *   readonly config: { apiUrl: string }
@@ -2990,7 +2948,7 @@ export declare const mock: {
      * ```
      *
      * @category Testing
-     * @since 4.0.0
+     * @since 3.17.0
      */
     <I, S extends object>(service: Context.Key<I, S>, implementation: Types.NoInfer<PartialEffectful<S>>): Layer<I>;
 };
@@ -3089,7 +3047,7 @@ export declare const satisfiesServicesType: <RIn>() => <ROut, E, RIn2 extends RI
  * Represents options that can be used to control the behavior of spans created
  * for layers.
  *
- * @category Models
+ * @category models
  * @since 4.0.0
  */
 export interface SpanOptions extends Tracer.SpanOptions {
@@ -3110,7 +3068,8 @@ export interface SpanOptions extends Tracer.SpanOptions {
  * **Example** (Tracing layer construction with a span)
  *
  * ```ts
- * import { Console, Effect, Layer, Context, type Tracer } from "effect"
+ * import { Console, Context, Effect, Layer } from "effect"
+ * import type { Tracer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -3143,7 +3102,7 @@ export interface SpanOptions extends Tracer.SpanOptions {
  * ```
  *
  * @category tracing
- * @since 4.0.0
+ * @since 2.0.0
  */
 export declare const span: (name: string, options?: SpanOptions) => Layer<Tracer.ParentSpan>;
 /**
@@ -3157,7 +3116,7 @@ export declare const span: (name: string, options?: SpanOptions) => Layer<Tracer
  * **Example** (Using an existing parent span)
  *
  * ```ts
- * import { Console, Effect, Layer, Context, Tracer } from "effect"
+ * import { Console, Context, Effect, Layer, Tracer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -3183,7 +3142,7 @@ export declare const span: (name: string, options?: SpanOptions) => Layer<Tracer
  * ```
  *
  * @category tracing
- * @since 4.0.0
+ * @since 2.0.0
  */
 export declare const parentSpan: (span: Tracer.AnySpan) => Layer<Tracer.ParentSpan>;
 /**
@@ -3197,7 +3156,7 @@ export declare const parentSpan: (span: Tracer.AnySpan) => Layer<Tracer.ParentSp
  * **Example** (Wrapping a layer with a span)
  *
  * ```ts
- * import { Effect, Layer, Context } from "effect"
+ * import { Context, Effect, Layer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -3243,7 +3202,7 @@ export declare const parentSpan: (span: Tracer.AnySpan) => Layer<Tracer.ParentSp
  * ```
  *
  * @category tracing
- * @since 4.0.0
+ * @since 2.0.0
  */
 export declare const withSpan: {
     /**
@@ -3257,7 +3216,7 @@ export declare const withSpan: {
      * **Example** (Wrapping a layer with a span)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -3303,7 +3262,7 @@ export declare const withSpan: {
      * ```
      *
      * @category tracing
-     * @since 4.0.0
+     * @since 2.0.0
      */
     (name: string, options?: SpanOptions): <A, E, R>(self: Layer<A, E, R>) => Layer<A, E, Exclude<R, Tracer.ParentSpan>>;
     /**
@@ -3317,7 +3276,7 @@ export declare const withSpan: {
      * **Example** (Wrapping a layer with a span)
      *
      * ```ts
-     * import { Effect, Layer, Context } from "effect"
+     * import { Context, Effect, Layer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -3363,7 +3322,7 @@ export declare const withSpan: {
      * ```
      *
      * @category tracing
-     * @since 4.0.0
+     * @since 2.0.0
      */
     <A, E, R>(self: Layer<A, E, R>, name: string, options?: SpanOptions): Layer<A, E, Exclude<R, Tracer.ParentSpan>>;
 };
@@ -3378,7 +3337,7 @@ export declare const withSpan: {
  * **Example** (Attaching layers to an existing parent span)
  *
  * ```ts
- * import { Effect, Layer, Context, Tracer } from "effect"
+ * import { Context, Effect, Layer, Tracer } from "effect"
  *
  * class Database extends Context.Service<Database, {
  *   readonly query: (sql: string) => Effect.Effect<string>
@@ -3426,7 +3385,7 @@ export declare const withSpan: {
  * ```
  *
  * @category tracing
- * @since 4.0.0
+ * @since 2.0.0
  */
 export declare const withParentSpan: {
     /**
@@ -3440,7 +3399,7 @@ export declare const withParentSpan: {
      * **Example** (Attaching layers to an existing parent span)
      *
      * ```ts
-     * import { Effect, Layer, Context, Tracer } from "effect"
+     * import { Context, Effect, Layer, Tracer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -3488,7 +3447,7 @@ export declare const withParentSpan: {
      * ```
      *
      * @category tracing
-     * @since 4.0.0
+     * @since 2.0.0
      */
     (span: Tracer.AnySpan, options?: Tracer.TraceOptions): <A, E, R>(self: Layer<A, E, R>) => Layer<A, E, Exclude<R, Tracer.ParentSpan>>;
     /**
@@ -3502,7 +3461,7 @@ export declare const withParentSpan: {
      * **Example** (Attaching layers to an existing parent span)
      *
      * ```ts
-     * import { Effect, Layer, Context, Tracer } from "effect"
+     * import { Context, Effect, Layer, Tracer } from "effect"
      *
      * class Database extends Context.Service<Database, {
      *   readonly query: (sql: string) => Effect.Effect<string>
@@ -3550,7 +3509,7 @@ export declare const withParentSpan: {
      * ```
      *
      * @category tracing
-     * @since 4.0.0
+     * @since 2.0.0
      */
     <A, E, R>(self: Layer<A, E, R>, span: Tracer.AnySpan, options?: Tracer.TraceOptions): Layer<A, E, Exclude<R, Tracer.ParentSpan>>;
 };