effect 4.0.0-beta.4 → 4.0.0-beta.41

package/dist/Layer.d.ts

@@ -19,12 +19,14 @@
  */
 import type { NonEmptyReadonlyArray } from "./Array.ts";
 import type * as Cause from "./Cause.ts";
+import type * as Channel from "./Channel.ts";
 import type { Effect } from "./Effect.ts";
 import type * as Exit from "./Exit.ts";
 import type { LazyArg } from "./Function.ts";
 import { type Pipeable } from "./Pipeable.ts";
 import * as Scope from "./Scope.ts";
 import * as ServiceMap from "./ServiceMap.ts";
+import type * as Stream from "./Stream.ts";
 import * as Tracer from "./Tracer.ts";
 import type * as Types from "./Types.ts";
 declare const TypeId = "~effect/Layer";
@@ -112,7 +114,7 @@ declare const MemoMapTypeId = "~effect/Layer/MemoMap";
  *   const scope = yield* Effect.scope
  *
  *   const dbLayer = Layer.succeed(Database)({
- *     query: (sql: string) => Effect.succeed("result")
+ *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  *   })
  *   const services = yield* Layer.buildWithMemoMap(dbLayer, memoMap, scope)
  *
@@ -139,7 +141,7 @@ export interface MemoMap {
  * }>()("Database") {}
  *
  * const dbLayer = Layer.succeed(Database)({
- *   query: (sql: string) => Effect.succeed("result")
+ *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  * })
  * const notALayer = { someProperty: "value" }
  *
@@ -223,7 +225,7 @@ export declare const fromBuildMemo: <ROut, E, RIn>(build: (memoMap: MemoMap, sco
  *   const scope = yield* Effect.scope
  *
  *   const dbLayer = Layer.succeed(Database)({
- *     query: (sql: string) => Effect.succeed("result")
+ *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  *   })
  *   const services = yield* Layer.buildWithMemoMap(dbLayer, memoMap, scope)
  *
@@ -252,7 +254,7 @@ export declare const makeMemoMapUnsafe: () => MemoMap;
  *   const scope = yield* Effect.scope
  *
  *   const dbLayer = Layer.succeed(Database)({
- *     query: (sql: string) => Effect.succeed("result")
+ *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  *   })
  *   const services = yield* Layer.buildWithMemoMap(dbLayer, memoMap, scope)
  *
@@ -300,13 +302,13 @@ export declare class CurrentMemoMap extends CurrentMemoMap_base {
  *
  *   // Build database layer with memoization
  *   const dbLayer = Layer.succeed(Database)({
- *     query: (sql: string) => Effect.succeed("result")
+ *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  *   })
  *   const dbServices = yield* Layer.buildWithMemoMap(dbLayer, memoMap, scope)
  *
  *   // Build logger layer with same memoization (reuses memo if same layer)
  *   const loggerLayer = Layer.succeed(Logger)({
- *     log: (msg: string) => Effect.sync(() => console.log(msg))
+ *     log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
  *   })
  *   const loggerServices = yield* Layer.buildWithMemoMap(
  *     loggerLayer,
@@ -348,13 +350,13 @@ export declare const buildWithMemoMap: {
      *
      *   // Build database layer with memoization
      *   const dbLayer = Layer.succeed(Database)({
-     *     query: (sql: string) => Effect.succeed("result")
+     *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
      *   })
      *   const dbServices = yield* Layer.buildWithMemoMap(dbLayer, memoMap, scope)
      *
      *   // Build logger layer with same memoization (reuses memo if same layer)
      *   const loggerLayer = Layer.succeed(Logger)({
-     *     log: (msg: string) => Effect.sync(() => console.log(msg))
+     *     log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
      *   })
      *   const loggerServices = yield* Layer.buildWithMemoMap(
      *     loggerLayer,
@@ -396,13 +398,13 @@ export declare const buildWithMemoMap: {
      *
      *   // Build database layer with memoization
      *   const dbLayer = Layer.succeed(Database)({
-     *     query: (sql: string) => Effect.succeed("result")
+     *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
      *   })
      *   const dbServices = yield* Layer.buildWithMemoMap(dbLayer, memoMap, scope)
      *
      *   // Build logger layer with same memoization (reuses memo if same layer)
      *   const loggerLayer = Layer.succeed(Logger)({
-     *     log: (msg: string) => Effect.sync(() => console.log(msg))
+     *     log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
      *   })
      *   const loggerServices = yield* Layer.buildWithMemoMap(
      *     loggerLayer,
@@ -436,7 +438,7 @@ export declare const buildWithMemoMap: {
  * // Build a layer to get its services
  * const program = Effect.gen(function*() {
  *   const dbLayer = Layer.succeed(Database)({
- *     query: (sql: string) => Effect.succeed("result")
+ *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  *   })
  *
  *   // Build the layer into ServiceMap - automatically manages scope and memoization
@@ -478,7 +480,7 @@ export declare const build: <RIn, E, ROut>(self: Layer<ROut, E, RIn>) => Effect<
  *       scope,
  *       Effect.sync(() => console.log("Database closed"))
  *     )
- *     return { query: (sql: string) => Effect.succeed(`Result: ${sql}`) }
+ *     return { query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Result: ${sql}`)) }
  *   }))
  *
  *   // Build with specific scope - resources tied to this scope
@@ -519,7 +521,7 @@ export declare const buildWithScope: {
      *       scope,
      *       Effect.sync(() => console.log("Database closed"))
      *     )
-     *     return { query: (sql: string) => Effect.succeed(`Result: ${sql}`) }
+     *     return { query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Result: ${sql}`)) }
      *   }))
      *
      *   // Build with specific scope - resources tied to this scope
@@ -560,7 +562,7 @@ export declare const buildWithScope: {
      *       scope,
      *       Effect.sync(() => console.log("Database closed"))
      *     )
-     *     return { query: (sql: string) => Effect.succeed(`Result: ${sql}`) }
+     *     return { query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Result: ${sql}`)) }
      *   }))
      *
      *   // Build with specific scope - resources tied to this scope
@@ -594,11 +596,11 @@ export declare const buildWithScope: {
  *
  * // Create layers from concrete service implementations
  * const databaseLayer = Layer.succeed(Database)({
- *   query: (sql: string) => Effect.succeed(`Query result: ${sql}`)
+ *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Query result: ${sql}`))
  * })
  *
  * const loggerLayer = Layer.succeed(Logger)({
- *   log: (msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`))
+ *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
  * })
  *
  * // Use the layers in a program
@@ -637,11 +639,11 @@ export declare const succeed: {
      *
      * // Create layers from concrete service implementations
      * const databaseLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed(`Query result: ${sql}`)
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Query result: ${sql}`))
      * })
      *
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
      * })
      *
      * // Use the layers in a program
@@ -662,7 +664,7 @@ export declare const succeed: {
      * @since 2.0.0
      * @category constructors
      */
-    <I, S>(service: ServiceMap.Service<I, S>): (resource: S) => Layer<I>;
+    <I, S>(service: ServiceMap.Key<I, S>): (resource: S) => Layer<I>;
     /**
      * Constructs a layer from the specified value.
      *
@@ -680,11 +682,11 @@ export declare const succeed: {
      *
      * // Create layers from concrete service implementations
      * const databaseLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed(`Query result: ${sql}`)
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Query result: ${sql}`))
      * })
      *
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
      * })
      *
      * // Use the layers in a program
@@ -705,7 +707,7 @@ export declare const succeed: {
      * @since 2.0.0
      * @category constructors
      */
-    <I, S>(service: ServiceMap.Service<I, S>, resource: Types.NoInfer<S>): Layer<I>;
+    <I, S>(service: ServiceMap.Key<I, S>, resource: Types.NoInfer<S>): Layer<I>;
 };
 /**
  * Constructs a layer from the specified value, which must return one or more
@@ -727,7 +729,7 @@ export declare const succeed: {
  * }>()("Logger") {}
  *
  * const services = ServiceMap.make(Database, {
- *   query: (sql: string) => Effect.succeed("result")
+ *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  * })
  *   .pipe(
  *     ServiceMap.add(Logger, {
@@ -804,7 +806,7 @@ export declare const sync: {
      * @since 2.0.0
      * @category constructors
      */
-    <I, S>(service: ServiceMap.Service<I, S>): (evaluate: LazyArg<S>) => Layer<I>;
+    <I, S>(service: ServiceMap.Key<I, S>): (evaluate: LazyArg<S>) => Layer<I>;
     /**
      * Lazily constructs a layer from the specified value.
      *
@@ -827,7 +829,7 @@ export declare const sync: {
      * @since 2.0.0
      * @category constructors
      */
-    <I, S>(service: ServiceMap.Service<I, S>, evaluate: LazyArg<S>): Layer<I>;
+    <I, S>(service: ServiceMap.Key<I, S>, evaluate: LazyArg<S>): Layer<I>;
 };
 /**
  * Lazily constructs a layer from the specified value, which must return one or more
@@ -918,7 +920,7 @@ export declare const effect: {
      * @since 2.0.0
      * @category constructors
      */
-    <I, S>(service: ServiceMap.Service<I, S>): <E, R>(effect: Effect<S, E, R>) => Layer<I, E, Exclude<R, Scope.Scope>>;
+    <I, S>(service: ServiceMap.Key<I, S>): <E, R>(effect: Effect<S, E, R>) => Layer<I, E, Exclude<R, Scope.Scope>>;
     /**
      * Constructs a layer from the specified scoped effect.
      *
@@ -950,7 +952,7 @@ export declare const effect: {
      * @since 2.0.0
      * @category constructors
      */
-    <I, S, E, R>(service: ServiceMap.Service<I, S>, effect: Effect<S, E, R>): Layer<I, E, Exclude<R, Scope.Scope>>;
+    <I, S, E, R>(service: ServiceMap.Key<I, S>, effect: Effect<S, E, R>): Layer<I, E, Exclude<R, Scope.Scope>>;
 };
 /**
  * Constructs a layer from the specified scoped effect, which must return one
@@ -1022,7 +1024,7 @@ export declare const effectDiscard: <X, E, R>(effect: Effect<X, E, R>) => Layer<
  * }>()("Database") {}
  *
  * const layerEffect = Effect.succeed(
- *   Layer.succeed(Database)({ query: (sql: string) => Effect.succeed("result") })
+ *   Layer.succeed(Database)({ query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result")) })
  * )
  *
  * const unwrappedLayer = Layer.unwrap(layerEffect)
@@ -1051,10 +1053,10 @@ export declare const unwrap: <A, E1, R1, E, R>(self: Effect<Layer<A, E1, R1>, E,
  * }>()("Logger") {}
  *
  * const dbLayer = Layer.succeed(Database)({
- *   query: (sql: string) => Effect.succeed("result")
+ *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  * })
  * const loggerLayer = Layer.succeed(Logger)({
- *   log: (msg: string) => Effect.sync(() => console.log(msg))
+ *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
  * })
  *
  * const mergedLayer = Layer.mergeAll(dbLayer, loggerLayer)
@@ -1083,10 +1085,10 @@ export declare const mergeAll: <Layers extends [Layer<never, any, any>, ...Array
  * }>()("Logger") {}
  *
  * const dbLayer = Layer.succeed(Database)({
- *   query: (sql: string) => Effect.succeed("result")
+ *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
  * })
  * const loggerLayer = Layer.succeed(Logger)({
- *   log: (msg: string) => Effect.sync(() => console.log(msg))
+ *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
  * })
  *
  * const mergedLayer = Layer.merge(dbLayer, loggerLayer)
@@ -1115,10 +1117,10 @@ export declare const merge: {
      * }>()("Logger") {}
      *
      * const dbLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed("result")
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
      * })
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(msg))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
      * })
      *
      * const mergedLayer = Layer.merge(dbLayer, loggerLayer)
@@ -1147,10 +1149,10 @@ export declare const merge: {
      * }>()("Logger") {}
      *
      * const dbLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed("result")
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
      * })
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(msg))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
      * })
      *
      * const mergedLayer = Layer.merge(dbLayer, loggerLayer)
@@ -1179,10 +1181,10 @@ export declare const merge: {
      * }>()("Logger") {}
      *
      * const dbLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed("result")
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
      * })
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(msg))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
      * })
      *
      * const mergedLayer = Layer.merge(dbLayer, loggerLayer)
@@ -1211,10 +1213,10 @@ export declare const merge: {
      * }>()("Logger") {}
      *
      * const dbLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed("result")
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed("result"))
      * })
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(msg))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
      * })
      *
      * const mergedLayer = Layer.merge(dbLayer, loggerLayer)
@@ -1251,11 +1253,11 @@ export declare const merge: {
  *
  * // Create dependency layers
  * const databaseLayer = Layer.succeed(Database)({
- *   query: (sql: string) => Effect.succeed(`DB: ${sql}`)
+ *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
  * })
  *
  * const loggerLayer = Layer.succeed(Logger)({
- *   log: (msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`))
+ *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
  * })
  *
  * // UserService depends on Database and Logger
@@ -1264,8 +1266,7 @@ export declare const merge: {
  *   const logger = yield* Logger
  *
  *   return {
- *     getUser: (id: string) =>
- *       Effect.gen(function*() {
+ *     getUser: Effect.fn("UserService.getUser")(function*(id: string) {
  *         yield* logger.log(`Looking up user ${id}`)
  *         const result = yield* database.query(
  *           `SELECT * FROM users WHERE id = ${id}`
@@ -1319,11 +1320,11 @@ export declare const provide: {
      *
      * // Create dependency layers
      * const databaseLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed(`DB: ${sql}`)
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
      * })
      *
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
      * })
      *
      * // UserService depends on Database and Logger
@@ -1332,8 +1333,7 @@ export declare const provide: {
      *   const logger = yield* Logger
      *
      *   return {
-     *     getUser: (id: string) =>
-     *       Effect.gen(function*() {
+     *     getUser: Effect.fn("UserService.getUser")(function*(id: string) {
      *         yield* logger.log(`Looking up user ${id}`)
      *         const result = yield* database.query(
      *           `SELECT * FROM users WHERE id = ${id}`
@@ -1387,11 +1387,11 @@ export declare const provide: {
      *
      * // Create dependency layers
      * const databaseLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed(`DB: ${sql}`)
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
      * })
      *
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
      * })
      *
      * // UserService depends on Database and Logger
@@ -1400,8 +1400,7 @@ export declare const provide: {
      *   const logger = yield* Logger
      *
      *   return {
-     *     getUser: (id: string) =>
-     *       Effect.gen(function*() {
+     *     getUser: Effect.fn("UserService.getUser")(function*(id: string) {
      *         yield* logger.log(`Looking up user ${id}`)
      *         const result = yield* database.query(
      *           `SELECT * FROM users WHERE id = ${id}`
@@ -1455,11 +1454,11 @@ export declare const provide: {
      *
      * // Create dependency layers
      * const databaseLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed(`DB: ${sql}`)
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
      * })
      *
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
      * })
      *
      * // UserService depends on Database and Logger
@@ -1468,8 +1467,7 @@ export declare const provide: {
      *   const logger = yield* Logger
      *
      *   return {
-     *     getUser: (id: string) =>
-     *       Effect.gen(function*() {
+     *     getUser: Effect.fn("UserService.getUser")(function*(id: string) {
      *         yield* logger.log(`Looking up user ${id}`)
      *         const result = yield* database.query(
      *           `SELECT * FROM users WHERE id = ${id}`
@@ -1523,11 +1521,11 @@ export declare const provide: {
      *
      * // Create dependency layers
      * const databaseLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed(`DB: ${sql}`)
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
      * })
      *
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
      * })
      *
      * // UserService depends on Database and Logger
@@ -1536,8 +1534,7 @@ export declare const provide: {
      *   const logger = yield* Logger
      *
      *   return {
-     *     getUser: (id: string) =>
-     *       Effect.gen(function*() {
+     *     getUser: Effect.fn("UserService.getUser")(function*(id: string) {
      *         yield* logger.log(`Looking up user ${id}`)
      *         const result = yield* database.query(
      *           `SELECT * FROM users WHERE id = ${id}`
@@ -1592,11 +1589,11 @@ export declare const provide: {
  *
  * // Create dependency layers
  * const databaseLayer = Layer.succeed(Database)({
- *   query: (sql: string) => Effect.succeed(`DB: ${sql}`)
+ *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
  * })
  *
  * const loggerLayer = Layer.succeed(Logger)({
- *   log: (msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`))
+ *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
  * })
  *
  * // UserService depends on Database and Logger
@@ -1605,8 +1602,7 @@ export declare const provide: {
  *   const logger = yield* Logger
  *
  *   return {
- *     getUser: (id: string) =>
- *       Effect.gen(function*() {
+ *     getUser: Effect.fn("UserService.getUser")(function*(id: string) {
  *         yield* logger.log(`Looking up user ${id}`)
  *         const result = yield* database.query(
  *           `SELECT * FROM users WHERE id = ${id}`
@@ -1666,11 +1662,11 @@ export declare const provideMerge: {
      *
      * // Create dependency layers
      * const databaseLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed(`DB: ${sql}`)
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
      * })
      *
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
      * })
      *
      * // UserService depends on Database and Logger
@@ -1679,8 +1675,7 @@ export declare const provideMerge: {
      *   const logger = yield* Logger
      *
      *   return {
-     *     getUser: (id: string) =>
-     *       Effect.gen(function*() {
+     *     getUser: Effect.fn("UserService.getUser")(function*(id: string) {
      *         yield* logger.log(`Looking up user ${id}`)
      *         const result = yield* database.query(
      *           `SELECT * FROM users WHERE id = ${id}`
@@ -1740,11 +1735,11 @@ export declare const provideMerge: {
      *
      * // Create dependency layers
      * const databaseLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed(`DB: ${sql}`)
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
      * })
      *
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
      * })
      *
      * // UserService depends on Database and Logger
@@ -1753,8 +1748,7 @@ export declare const provideMerge: {
      *   const logger = yield* Logger
      *
      *   return {
-     *     getUser: (id: string) =>
-     *       Effect.gen(function*() {
+     *     getUser: Effect.fn("UserService.getUser")(function*(id: string) {
      *         yield* logger.log(`Looking up user ${id}`)
      *         const result = yield* database.query(
      *           `SELECT * FROM users WHERE id = ${id}`
@@ -1814,11 +1808,11 @@ export declare const provideMerge: {
      *
      * // Create dependency layers
      * const databaseLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed(`DB: ${sql}`)
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
      * })
      *
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
      * })
      *
      * // UserService depends on Database and Logger
@@ -1827,8 +1821,7 @@ export declare const provideMerge: {
      *   const logger = yield* Logger
      *
      *   return {
-     *     getUser: (id: string) =>
-     *       Effect.gen(function*() {
+     *     getUser: Effect.fn("UserService.getUser")(function*(id: string) {
      *         yield* logger.log(`Looking up user ${id}`)
      *         const result = yield* database.query(
      *           `SELECT * FROM users WHERE id = ${id}`
@@ -1888,11 +1881,11 @@ export declare const provideMerge: {
      *
      * // Create dependency layers
      * const databaseLayer = Layer.succeed(Database)({
-     *   query: (sql: string) => Effect.succeed(`DB: ${sql}`)
+     *   query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
      * })
      *
      * const loggerLayer = Layer.succeed(Logger)({
-     *   log: (msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(`[LOG] ${msg}`)))
      * })
      *
      * // UserService depends on Database and Logger
@@ -1901,8 +1894,7 @@ export declare const provideMerge: {
      *   const logger = yield* Logger
      *
      *   return {
-     *     getUser: (id: string) =>
-     *       Effect.gen(function*() {
+     *     getUser: Effect.fn("UserService.getUser")(function*(id: string) {
      *         yield* logger.log(`Looking up user ${id}`)
      *         const result = yield* database.query(
      *           `SELECT * FROM users WHERE id = ${id}`
@@ -1970,18 +1962,19 @@ export declare const provideMerge: {
  *
  *     // Create database layer based on config
  *     const dbLayer = Layer.succeed(Database)({
- *       query: (sql: string) =>
+ *       query: Effect.fn("Database.query")((sql: string) =>
  *         Effect.succeed(
  *           `Querying ${config.dbUrl}: ${sql}`
- *         )
+ *         ))
  *     })
  *
  *     // Create logger layer based on config
  *     const loggerLayer = Layer.succeed(Logger)({
- *       log: (msg: string) =>
+ *       log: Effect.fn("Logger.log")((msg: string) =>
  *         config.logLevel === "debug"
  *           ? Effect.sync(() => console.log(`[DEBUG] ${msg}`))
  *           : Effect.sync(() => console.log(msg))
+ *       )
  *     })
  *
  *     // Return combined layer
@@ -2040,18 +2033,19 @@ export declare const flatMap: {
      *
      *     // Create database layer based on config
      *     const dbLayer = Layer.succeed(Database)({
-     *       query: (sql: string) =>
+     *       query: Effect.fn("Database.query")((sql: string) =>
      *         Effect.succeed(
      *           `Querying ${config.dbUrl}: ${sql}`
-     *         )
+     *         ))
      *     })
      *
      *     // Create logger layer based on config
      *     const loggerLayer = Layer.succeed(Logger)({
-     *       log: (msg: string) =>
+     *       log: Effect.fn("Logger.log")((msg: string) =>
      *         config.logLevel === "debug"
      *           ? Effect.sync(() => console.log(`[DEBUG] ${msg}`))
      *           : Effect.sync(() => console.log(msg))
+     *       )
      *     })
      *
      *     // Return combined layer
@@ -2110,18 +2104,19 @@ export declare const flatMap: {
      *
      *     // Create database layer based on config
      *     const dbLayer = Layer.succeed(Database)({
-     *       query: (sql: string) =>
+     *       query: Effect.fn("Database.query")((sql: string) =>
      *         Effect.succeed(
      *           `Querying ${config.dbUrl}: ${sql}`
-     *         )
+     *         ))
      *     })
      *
      *     // Create logger layer based on config
      *     const loggerLayer = Layer.succeed(Logger)({
-     *       log: (msg: string) =>
+     *       log: Effect.fn("Logger.log")((msg: string) =>
      *         config.logLevel === "debug"
      *           ? Effect.sync(() => console.log(`[DEBUG] ${msg}`))
      *           : Effect.sync(() => console.log(msg))
+     *       )
      *     })
      *
      *     // Return combined layer
@@ -2148,6 +2143,90 @@ export declare const flatMap: {
      */
     <A, E, R, A2, E2, R2>(self: Layer<A, E, R>, f: (context: ServiceMap.ServiceMap<A>) => Layer<A2, E2, R2>): Layer<A2, E | E2, R | R2>;
 };
+/**
+ * Performs the specified effect if this layer succeeds.
+ *
+ * @since 4.0.0
+ * @category sequencing
+ */
+export declare const tap: {
+    /**
+     * Performs the specified effect if this layer succeeds.
+     *
+     * @since 4.0.0
+     * @category sequencing
+     */
+    <ROut, XR extends ROut, RIn2, E2, X>(f: (context: ServiceMap.ServiceMap<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.
+     *
+     * @since 4.0.0
+     * @category sequencing
+     */
+    <RIn, E, ROut, XR extends ROut, RIn2, E2, X>(self: Layer<ROut, E, RIn>, f: (context: ServiceMap.ServiceMap<XR>) => Effect<X, E2, RIn2>): Layer<ROut, E | E2, RIn | Exclude<RIn2, Scope.Scope>>;
+};
+/**
+ * Performs the specified effect if this layer fails.
+ *
+ * @since 4.0.0
+ * @category sequencing
+ */
+export declare const tapError: {
+    /**
+     * Performs the specified effect if this layer fails.
+     *
+     * @since 4.0.0
+     * @category sequencing
+     */
+    <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.
+     *
+     * @since 4.0.0
+     * @category sequencing
+     */
+    <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>>;
+};
+/**
+ * Performs the specified effect if this layer fails.
+ *
+ * **Previously Known As**
+ *
+ * This API replaces the following from Effect 3.x:
+ *
+ * - `Layer.tapErrorCause`
+ *
+ * @since 4.0.0
+ * @category sequencing
+ */
+export declare const tapCause: {
+    /**
+     * Performs the specified effect if this layer fails.
+     *
+     * **Previously Known As**
+     *
+     * This API replaces the following from Effect 3.x:
+     *
+     * - `Layer.tapErrorCause`
+     *
+     * @since 4.0.0
+     * @category sequencing
+     */
+    <E, XE extends E, RIn2, E2, X>(f: (cause: Cause.Cause<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.
+     *
+     * **Previously Known As**
+     *
+     * This API replaces the following from Effect 3.x:
+     *
+     * - `Layer.tapErrorCause`
+     *
+     * @since 4.0.0
+     * @category sequencing
+     */
+    <RIn, E, XE extends E, ROut, RIn2, E2, X>(self: Layer<ROut, E, RIn>, f: (cause: Cause.Cause<XE>) => Effect<X, E2, RIn2>): Layer<ROut, E | E2, RIn | Exclude<RIn2, Scope.Scope>>;
+};
 /**
  * Translates effect failure into death of the fiber, making all failures
  * unchecked and not a part of the type of the layer.
@@ -2169,10 +2248,10 @@ export declare const flatMap: {
  *   // Simulate a database connection that might fail
  *   const shouldFail = Math.random() > 0.5
  *   if (shouldFail) {
- *     yield* Effect.fail(new DatabaseError({ message: "Connection failed" }))
+ *     return yield* new DatabaseError({ message: "Connection failed" })
  *   }
  *
- *   return { query: (sql: string) => Effect.succeed(`Result: ${sql}`) }
+ *   return { query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Result: ${sql}`)) }
  * }))
  *
  * // Convert failures to fiber death - removes error from type
@@ -2310,8 +2389,8 @@ export declare const catchTag: {
  *
  * // Primary database layer that might fail
  * const primaryDatabaseLayer = Layer.effect(Database)(Effect.gen(function*() {
- *   yield* Effect.fail(new DatabaseError({ message: "Primary DB unreachable" }))
- *   return { query: (sql: string) => Effect.succeed(`Primary: ${sql}`) }
+ *   return yield* new DatabaseError({ message: "Primary DB unreachable" })
+ *   return { query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Primary: ${sql}`)) }
  * }))
  *
  * // Fallback layers for different error causes
@@ -2320,11 +2399,12 @@ export declare const catchTag: {
  *     // For any cause/error, fallback to in-memory database
  *     return Layer.mergeAll(
  *       Layer.succeed(Database)({
- *         query: (sql: string) => Effect.succeed(`Memory: ${sql}`)
+ *         query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Memory: ${sql}`))
  *       }),
  *       Layer.succeed(Logger)({
- *         log: (msg: string) =>
+ *         log: Effect.fn("Logger.log")((msg: string) =>
  *           Effect.sync(() => console.log(`[FALLBACK] ${msg}`))
+ *         )
  *       })
  *     )
  *   })
@@ -2367,8 +2447,8 @@ export declare const catchCause: {
      *
      * // Primary database layer that might fail
      * const primaryDatabaseLayer = Layer.effect(Database)(Effect.gen(function*() {
-     *   yield* Effect.fail(new DatabaseError({ message: "Primary DB unreachable" }))
-     *   return { query: (sql: string) => Effect.succeed(`Primary: ${sql}`) }
+     *   return yield* new DatabaseError({ message: "Primary DB unreachable" })
+     *   return { query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Primary: ${sql}`)) }
      * }))
      *
      * // Fallback layers for different error causes
@@ -2377,11 +2457,12 @@ export declare const catchCause: {
      *     // For any cause/error, fallback to in-memory database
      *     return Layer.mergeAll(
      *       Layer.succeed(Database)({
-     *         query: (sql: string) => Effect.succeed(`Memory: ${sql}`)
+     *         query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Memory: ${sql}`))
      *       }),
      *       Layer.succeed(Logger)({
-     *         log: (msg: string) =>
+     *         log: Effect.fn("Logger.log")((msg: string) =>
      *           Effect.sync(() => console.log(`[FALLBACK] ${msg}`))
+     *         )
      *       })
      *     )
      *   })
@@ -2424,8 +2505,8 @@ export declare const catchCause: {
      *
      * // Primary database layer that might fail
      * const primaryDatabaseLayer = Layer.effect(Database)(Effect.gen(function*() {
-     *   yield* Effect.fail(new DatabaseError({ message: "Primary DB unreachable" }))
-     *   return { query: (sql: string) => Effect.succeed(`Primary: ${sql}`) }
+     *   return yield* new DatabaseError({ message: "Primary DB unreachable" })
+     *   return { query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Primary: ${sql}`)) }
      * }))
      *
      * // Fallback layers for different error causes
@@ -2434,11 +2515,12 @@ export declare const catchCause: {
      *     // For any cause/error, fallback to in-memory database
      *     return Layer.mergeAll(
      *       Layer.succeed(Database)({
-     *         query: (sql: string) => Effect.succeed(`Memory: ${sql}`)
+     *         query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Memory: ${sql}`))
      *       }),
      *       Layer.succeed(Logger)({
-     *         log: (msg: string) =>
+     *         log: Effect.fn("Logger.log")((msg: string) =>
      *           Effect.sync(() => console.log(`[FALLBACK] ${msg}`))
+     *         )
      *       })
      *     )
      *   })
@@ -2494,7 +2576,7 @@ export declare const updateService: {
      * @since 3.13.0
      * @category utils
      */
-    <I, A>(service: ServiceMap.Service<I, A>, f: (a: A) => A): <A1, E1, R1>(layer: Layer<A1, E1, R1>) => Layer<A1, E1, I | R1>;
+    <I, A>(service: ServiceMap.Key<I, A>, f: (a: A) => A): <A1, E1, R1>(layer: Layer<A1, E1, R1>) => Layer<A1, E1, I | R1>;
     /**
      * Updates a service in the context with a new implementation.
      *
@@ -2513,7 +2595,7 @@ export declare const updateService: {
      * @since 3.13.0
      * @category utils
      */
-    <A1, E1, R1, I, A>(layer: Layer<A1, E1, R1>, service: ServiceMap.Service<I, A>, f: (a: A) => A): Layer<A1, E1, I | R1>;
+    <A1, E1, R1, I, A>(layer: Layer<A1, E1, R1>, service: ServiceMap.Key<I, A>, f: (a: A) => A): Layer<A1, E1, I | R1>;
 };
 /**
  * Creates a fresh version of this layer that will not be shared.
@@ -2532,10 +2614,11 @@ export declare const updateService: {
  *   const ref = yield* Ref.make(0)
  *   return {
  *     count: 0,
- *     increment: () =>
+ *     increment: Effect.fn("Counter.increment")(() =>
  *       Ref.update(ref, (n) => n + 1).pipe(
  *         Effect.flatMap(() => Ref.get(ref))
  *       )
+ *     )
  *   }
  * }))
  *
@@ -2588,13 +2671,11 @@ export declare const fresh: <A, E, R>(self: Layer<A, E, R>) => Layer<A, E, R>;
  *   yield* Console.log("Starting HTTP server...")
  *
  *   return {
- *     start: () =>
- *       Effect.gen(function*() {
+ *     start: Effect.fn("HttpServer.start")(function*() {
  *         yield* Console.log("Server listening on port 3000")
  *         return "Server started"
  *       }),
- *     stop: () =>
- *       Effect.gen(function*() {
+ *     stop: Effect.fn("HttpServer.stop")(function*() {
  *         yield* Console.log("Server stopped gracefully")
  *         return "Server stopped"
  *       })
@@ -2602,7 +2683,7 @@ export declare const fresh: <A, E, R>(self: Layer<A, E, R>) => Layer<A, E, R>;
  * }))
  *
  * const loggerLayer = Layer.succeed(Logger)({
- *   log: (msg: string) => Console.log(`[LOG] ${msg}`)
+ *   log: Effect.fn("Logger.log")((msg: string) => Console.log(`[LOG] ${msg}`))
  * })
  *
  * // Application layer combining all services
@@ -2634,10 +2715,11 @@ export declare const launch: <RIn, E, ROut>(self: Layer<ROut, E, RIn>) => Effect
  * @category Testing
  */
 export type PartialEffectful<A extends object> = Types.Simplify<{
-    [K in keyof A as A[K] extends Effect<any, any, any> | ((...args: any) => Effect<any, any, any>) ? K : never]?: A[K];
+    [K in keyof A as A[K] extends AnyEffectOrStream ? K : never]?: A[K];
 } & {
-    [K in keyof A as A[K] extends Effect<any, any, any> | ((...args: any) => Effect<any, any, any>) ? never : K]: A[K];
+    [K in keyof A as A[K] extends AnyEffectOrStream ? never : K]: A[K];
 }>;
+type AnyEffectOrStream = Effect<any, any, any> | Stream.Stream<any, any, any> | Channel.Channel<any, any, any, any, any, any, any> | ((...args: any) => Effect<any, any, any>) | ((...args: any) => Stream.Stream<any, any, any>) | ((...args: any) => Channel.Channel<any, any, any, any, any, any, any>);
 /**
  * Creates a mock layer for testing purposes. You can provide a partial
  * implementation of the service, and any methods not provided will
@@ -2660,7 +2742,7 @@ export type PartialEffectful<A extends object> = Types.Simplify<{
  * }>()("UserService") {}
  *
  * // Create a partial mock - only implement what you need for testing
- * const testUserLayer = Layer.mock(UserService)({
+ * const testUserLayer = Layer.mock(UserService, {
  *   config: { apiUrl: "https://test-api.com" }, // Required - non-Effect property
  *   getUser: (id: string) => Effect.succeed({ id, name: "Test User" }) // Mock implementation
  *   // deleteUser and updateUser are omitted - will throw UnimplementedError if called
@@ -2684,7 +2766,102 @@ export type PartialEffectful<A extends object> = Types.Simplify<{
  * @since 4.0.0
  * @category Testing
  */
-export declare const mock: <I, S extends object>(service: ServiceMap.Service<I, S>) => (implementation: PartialEffectful<S>) => Layer<I>;
+export declare const mock: {
+    /**
+     * Creates a mock layer for testing purposes. You can provide a partial
+     * implementation of the service, and any methods not provided will
+     * throw an unimplemented defect when called.
+     *
+     * @example
+     * ```ts
+     * import { Effect, Layer, ServiceMap } from "effect"
+     *
+     * class UserService extends ServiceMap.Service<UserService, {
+     *   readonly config: { apiUrl: string }
+     *   readonly getUser: (
+     *     id: string
+     *   ) => Effect.Effect<{ id: string; name: string }, Error>
+     *   readonly deleteUser: (id: string) => Effect.Effect<void, Error>
+     *   readonly updateUser: (
+     *     id: string,
+     *     data: object
+     *   ) => Effect.Effect<{ id: string; name: string }, Error>
+     * }>()("UserService") {}
+     *
+     * // Create a partial mock - only implement what you need for testing
+     * const testUserLayer = Layer.mock(UserService, {
+     *   config: { apiUrl: "https://test-api.com" }, // Required - non-Effect property
+     *   getUser: (id: string) => Effect.succeed({ id, name: "Test User" }) // Mock implementation
+     *   // deleteUser and updateUser are omitted - will throw UnimplementedError if called
+     * })
+     *
+     * // Use in tests
+     * const testProgram = Effect.gen(function*() {
+     *   const userService = yield* UserService
+     *
+     *   // This works - we provided an implementation
+     *   const user = yield* userService.getUser("123")
+     *   console.log(user.name) // "Test User"
+     *
+     *   // This would throw - we didn't implement deleteUser
+     *   // yield* userService.deleteUser("123") // UnimplementedError
+     * }).pipe(
+     *   Effect.provide(testUserLayer)
+     * )
+     * ```
+     *
+     * @since 4.0.0
+     * @category Testing
+     */
+    <I, S extends object>(service: ServiceMap.Key<I, S>): (implementation: PartialEffectful<S>) => Layer<I>;
+    /**
+     * Creates a mock layer for testing purposes. You can provide a partial
+     * implementation of the service, and any methods not provided will
+     * throw an unimplemented defect when called.
+     *
+     * @example
+     * ```ts
+     * import { Effect, Layer, ServiceMap } from "effect"
+     *
+     * class UserService extends ServiceMap.Service<UserService, {
+     *   readonly config: { apiUrl: string }
+     *   readonly getUser: (
+     *     id: string
+     *   ) => Effect.Effect<{ id: string; name: string }, Error>
+     *   readonly deleteUser: (id: string) => Effect.Effect<void, Error>
+     *   readonly updateUser: (
+     *     id: string,
+     *     data: object
+     *   ) => Effect.Effect<{ id: string; name: string }, Error>
+     * }>()("UserService") {}
+     *
+     * // Create a partial mock - only implement what you need for testing
+     * const testUserLayer = Layer.mock(UserService, {
+     *   config: { apiUrl: "https://test-api.com" }, // Required - non-Effect property
+     *   getUser: (id: string) => Effect.succeed({ id, name: "Test User" }) // Mock implementation
+     *   // deleteUser and updateUser are omitted - will throw UnimplementedError if called
+     * })
+     *
+     * // Use in tests
+     * const testProgram = Effect.gen(function*() {
+     *   const userService = yield* UserService
+     *
+     *   // This works - we provided an implementation
+     *   const user = yield* userService.getUser("123")
+     *   console.log(user.name) // "Test User"
+     *
+     *   // This would throw - we didn't implement deleteUser
+     *   // yield* userService.deleteUser("123") // UnimplementedError
+     * }).pipe(
+     *   Effect.provide(testUserLayer)
+     * )
+     * ```
+     *
+     * @since 4.0.0
+     * @category Testing
+     */
+    <I, S extends object>(service: ServiceMap.Key<I, S>, implementation: Types.NoInfer<PartialEffectful<S>>): Layer<I>;
+};
 /**
  * Ensures that an layer's success type extends a given type `ROut`.
  *
@@ -2815,7 +2992,7 @@ export interface SpanOptions extends Tracer.SpanOptions {
  *   yield* Console.log((parentSpan as Tracer.Span).name) // "database-init"
  *
  *   return {
- *     query: (sql: string) => Effect.succeed(`Result: ${sql}`)
+ *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Result: ${sql}`))
  *   }
  * })).pipe(Layer.provide(Layer.span("database-init")))
  *
@@ -2859,7 +3036,7 @@ export declare const span: (name: string, options?: SpanOptions) => Layer<Tracer
  *     yield* Console.log(parentSpan.spanId) // "42"
  *
  *     return {
- *       query: (sql: string) => Effect.succeed(`Result: ${sql}`)
+ *       query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Result: ${sql}`))
  *     }
  *   })
  * ).pipe(Layer.provide(Layer.parentSpan(Tracer.externalSpan({
@@ -2897,14 +3074,14 @@ export declare const parentSpan: (span: Tracer.AnySpan) => Layer<Tracer.ParentSp
  *   yield* Effect.log("Connecting to database")
  *   yield* Effect.sleep("100 millis")
  *   return {
- *     query: (sql: string) => Effect.succeed(`Result: ${sql}`)
+ *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Result: ${sql}`))
  *   }
  * })).pipe(Layer.withSpan("database-initialization", {
  *   attributes: { dbType: "postgres" }
  * }))
  *
  * const loggerLayer = Layer.succeed(Logger, {
- *   log: (msg: string) => Effect.sync(() => console.log(msg))
+ *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
  * }).pipe(Layer.withSpan("logger-initialization"))
  *
  * // Combine traced layers
@@ -2956,14 +3133,14 @@ export declare const withSpan: {
      *   yield* Effect.log("Connecting to database")
      *   yield* Effect.sleep("100 millis")
      *   return {
-     *     query: (sql: string) => Effect.succeed(`Result: ${sql}`)
+     *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Result: ${sql}`))
      *   }
      * })).pipe(Layer.withSpan("database-initialization", {
      *   attributes: { dbType: "postgres" }
      * }))
      *
      * const loggerLayer = Layer.succeed(Logger, {
-     *   log: (msg: string) => Effect.sync(() => console.log(msg))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
      * }).pipe(Layer.withSpan("logger-initialization"))
      *
      * // Combine traced layers
@@ -3015,14 +3192,14 @@ export declare const withSpan: {
      *   yield* Effect.log("Connecting to database")
      *   yield* Effect.sleep("100 millis")
      *   return {
-     *     query: (sql: string) => Effect.succeed(`Result: ${sql}`)
+     *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`Result: ${sql}`))
      *   }
      * })).pipe(Layer.withSpan("database-initialization", {
      *   attributes: { dbType: "postgres" }
      * }))
      *
      * const loggerLayer = Layer.succeed(Logger, {
-     *   log: (msg: string) => Effect.sync(() => console.log(msg))
+     *   log: Effect.fn("Logger.log")((msg: string) => Effect.sync(() => console.log(msg)))
      * }).pipe(Layer.withSpan("logger-initialization"))
      *
      * // Combine traced layers
@@ -3073,14 +3250,14 @@ export declare const withSpan: {
  * const DatabaseLayer = Layer.effect(Database, Effect.gen(function*() {
  *   yield* Effect.log("Connecting to database")
  *   return {
- *     query: (sql: string) => Effect.succeed(`DB: ${sql}`)
+ *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
  *   }
  * }))
  *
  * const CacheLayer = Layer.effect(Cache, Effect.gen(function*() {
  *   yield* Effect.log("Connecting to cache")
  *   return {
- *     get: (key: string) => Effect.succeed(`Cache: ${key}`)
+ *     get: Effect.fn("Cache.get")((key: string) => Effect.succeed(`Cache: ${key}`))
  *   }
  * }))
  *
@@ -3133,14 +3310,14 @@ export declare const withParentSpan: {
      * const DatabaseLayer = Layer.effect(Database, Effect.gen(function*() {
      *   yield* Effect.log("Connecting to database")
      *   return {
-     *     query: (sql: string) => Effect.succeed(`DB: ${sql}`)
+     *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
      *   }
      * }))
      *
      * const CacheLayer = Layer.effect(Cache, Effect.gen(function*() {
      *   yield* Effect.log("Connecting to cache")
      *   return {
-     *     get: (key: string) => Effect.succeed(`Cache: ${key}`)
+     *     get: Effect.fn("Cache.get")((key: string) => Effect.succeed(`Cache: ${key}`))
      *   }
      * }))
      *
@@ -3193,14 +3370,14 @@ export declare const withParentSpan: {
      * const DatabaseLayer = Layer.effect(Database, Effect.gen(function*() {
      *   yield* Effect.log("Connecting to database")
      *   return {
-     *     query: (sql: string) => Effect.succeed(`DB: ${sql}`)
+     *     query: Effect.fn("Database.query")((sql: string) => Effect.succeed(`DB: ${sql}`))
      *   }
      * }))
      *
      * const CacheLayer = Layer.effect(Cache, Effect.gen(function*() {
      *   yield* Effect.log("Connecting to cache")
      *   return {
-     *     get: (key: string) => Effect.succeed(`Cache: ${key}`)
+     *     get: Effect.fn("Cache.get")((key: string) => Effect.succeed(`Cache: ${key}`))
      *   }
      * }))
      *