effect 4.0.0-beta.26 → 4.0.0-beta.27

package/src/Layer.ts

@@ -129,7 +129,7 @@ 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)
  *
@@ -161,7 +161,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" }
  *
@@ -340,7 +340,7 @@ class MemoMapImpl implements 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)
  *
@@ -370,7 +370,7 @@ export const makeMemoMapUnsafe = (): MemoMap => new MemoMapImpl()
  *   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)
  *
@@ -422,13 +422,13 @@ export class CurrentMemoMap extends ServiceMap.Service<CurrentMemoMap, MemoMap>(
  *
  *   // 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,
@@ -470,13 +470,13 @@ export 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,
@@ -518,13 +518,13 @@ export 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,
@@ -568,7 +568,7 @@ export 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
@@ -620,7 +620,7 @@ export const build = <RIn, E, ROut>(
  *       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
@@ -661,7 +661,7 @@ export 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
@@ -702,7 +702,7 @@ export 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
@@ -747,11 +747,11 @@ export 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
@@ -790,11 +790,11 @@ export 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
@@ -833,11 +833,11 @@ export 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
@@ -886,7 +886,7 @@ export 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, {
@@ -1211,7 +1211,7 @@ export const effectDiscard = <X, E, R>(effect: Effect<X, E, R>): Layer<never, E,
  * }>()("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)
@@ -1263,10 +1263,10 @@ const mergeAllEffect = <Layers extends [Layer<never, any, any>, ...Array<Layer<n
  * }>()("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)
@@ -1302,10 +1302,10 @@ export const mergeAll = <Layers extends [Layer<never, any, any>, ...Array<Layer<
  * }>()("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)
@@ -1334,10 +1334,10 @@ export 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)
@@ -1366,10 +1366,10 @@ export 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)
@@ -1405,10 +1405,10 @@ export 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)
@@ -1437,10 +1437,10 @@ export 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)
@@ -1507,11 +1507,11 @@ const provideWith = (
  *
  * // 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
@@ -1520,8 +1520,7 @@ const provideWith = (
  *   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}`
@@ -1575,11 +1574,11 @@ export 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
@@ -1588,8 +1587,7 @@ export 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}`
@@ -1643,11 +1641,11 @@ export 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
@@ -1656,8 +1654,7 @@ export 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}`
@@ -1718,11 +1715,11 @@ export 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
@@ -1731,8 +1728,7 @@ export 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}`
@@ -1786,11 +1782,11 @@ export 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
@@ -1799,8 +1795,7 @@ export 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}`
@@ -1864,11 +1859,11 @@ export 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
@@ -1877,8 +1872,7 @@ export 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}`
@@ -1938,11 +1932,11 @@ export 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
@@ -1951,8 +1945,7 @@ export 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}`
@@ -2012,11 +2005,11 @@ export 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
@@ -2025,8 +2018,7 @@ export 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}`
@@ -2093,11 +2085,11 @@ export 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
@@ -2106,8 +2098,7 @@ export 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}`
@@ -2167,11 +2158,11 @@ export 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
@@ -2180,8 +2171,7 @@ export 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}`
@@ -2263,18 +2253,19 @@ export 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
@@ -2333,18 +2324,19 @@ export 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
@@ -2403,18 +2395,19 @@ export 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
@@ -2475,10 +2468,10 @@ export 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
@@ -2682,8 +2675,8 @@ export 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
@@ -2692,11 +2685,12 @@ export 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}`))
+ *         )
  *       })
  *     )
  *   })
@@ -2739,8 +2733,8 @@ export 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
@@ -2749,11 +2743,12 @@ export 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}`))
+   *         )
    *       })
    *     )
    *   })
@@ -2796,8 +2791,8 @@ export 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
@@ -2806,11 +2801,12 @@ export 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}`))
+   *         )
    *       })
    *     )
    *   })
@@ -2925,10 +2921,11 @@ export 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))
  *       )
+ *     )
  *   }
  * }))
  *
@@ -2983,13 +2980,11 @@ export 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"
  *       })
@@ -2997,7 +2992,7 @@ export 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
@@ -3268,7 +3263,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")))
  *
@@ -3327,7 +3322,7 @@ export const span = (
  *     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({
@@ -3367,14 +3362,14 @@ export const parentSpan = (span: Tracer.AnySpan): Layer<Tracer.ParentSpan> =>
  *   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
@@ -3426,14 +3421,14 @@ export 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
@@ -3487,14 +3482,14 @@ export 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
@@ -3576,14 +3571,14 @@ export 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}`))
  *   }
  * }))
  *
@@ -3636,14 +3631,14 @@ export 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}`))
    *   }
    * }))
    *
@@ -3698,14 +3693,14 @@ export 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}`))
    *   }
    * }))
    *