effect 4.0.0-beta.43 → 4.0.0-beta.44

package/src/ErrorReporter.ts

@@ -49,6 +49,7 @@
  * @since 4.0.0
  */
 import type * as Cause from "./Cause.ts"
+import type * as Context from "./Context.ts"
 import * as Effect from "./Effect.ts"
 import type * as Fiber from "./Fiber.ts"
 import * as effect from "./internal/effect.ts"
@@ -58,7 +59,6 @@ import * as LogLevel from "./LogLevel.ts"
 import type { Severity } from "./LogLevel.ts"
 import type { ReadonlyRecord } from "./Record.ts"
 import type * as Scope from "./Scope.ts"
-import type * as ServiceMap from "./ServiceMap.ts"
 
 /**
  * @since 4.0.0
@@ -155,7 +155,7 @@ export const make = (
 }
 
 /**
- * A `ServiceMap.Reference` holding the set of active `ErrorReporter`s for the
+ * A `Context.Reference` holding the set of active `ErrorReporter`s for the
  * current fiber. Defaults to an empty set (no reporting).
  *
  * Prefer {@link layer} to configure reporters via the `Layer` API. Use this
@@ -165,7 +165,7 @@ export const make = (
  * @since 4.0.0
  * @category References
  */
-export const CurrentErrorReporters: ServiceMap.Reference<ReadonlySet<ErrorReporter>> = references.CurrentErrorReporters
+export const CurrentErrorReporters: Context.Reference<ReadonlySet<ErrorReporter>> = references.CurrentErrorReporters
 
 /**
  * Creates a `Layer` that registers one or more `ErrorReporter`s.

package/src/ExecutionPlan.ts

@@ -2,6 +2,7 @@
  * @since 3.16.0
  */
 import type { NonEmptyReadonlyArray } from "./Array.ts"
+import * as Context from "./Context.ts"
 import type * as Effect from "./Effect.ts"
 import { constant } from "./Function.ts"
 import * as effect from "./internal/effect.ts"
@@ -10,7 +11,6 @@ import type { Pipeable } from "./Pipeable.ts"
 import { pipeArguments } from "./Pipeable.ts"
 import * as Predicate from "./Predicate.ts"
 import type * as Schedule from "./Schedule.ts"
-import * as ServiceMap from "./ServiceMap.ts"
 
 /**
  * @since 3.16.0
@@ -84,7 +84,7 @@ export interface ExecutionPlan<
   readonly [TypeId]: TypeId
   readonly steps: NonEmptyReadonlyArray<{
     readonly provide:
-      | ServiceMap.ServiceMap<Config["provides"]>
+      | Context.Context<Config["provides"]>
       | Layer.Layer<Config["provides"], Config["error"], Config["requirements"]>
     readonly attempts?: number | undefined
     readonly while?:
@@ -169,7 +169,7 @@ export const make = <const Steps extends NonEmptyReadonlyArray<make.Step>>(
   provides: make.StepProvides<Steps>
   input: make.StepInput<Steps>
   error:
-    | (Steps[number]["provide"] extends ServiceMap.ServiceMap<infer _P> | Layer.Layer<infer _P, infer E, infer _R> ? E
+    | (Steps[number]["provide"] extends Context.Context<infer _P> | Layer.Layer<infer _P, infer E, infer _R> ? E
       : never)
     | (Steps[number]["while"] extends (input: infer _I) => Effect.Effect<infer _A, infer _E, infer _R> ? _E : never)
   requirements:
@@ -203,7 +203,7 @@ export declare namespace make {
    * @since 3.16.0
    */
   export type Step = {
-    readonly provide: ServiceMap.ServiceMap<any> | ServiceMap.ServiceMap<never> | Layer.Any
+    readonly provide: Context.Context<any> | Context.Context<never> | Layer.Any
     readonly attempts?: number | undefined
     readonly while?: ((input: any) => boolean | Effect.Effect<boolean, any, any>) | undefined
     readonly schedule?: Schedule.Schedule<any, any, any> | undefined
@@ -217,8 +217,7 @@ export declare namespace make {
       Rest,
       & Out
       & (
-        (Step extends { readonly provide: ServiceMap.ServiceMap<infer P> | Layer.Layer<infer P, infer _E, infer _R> } ?
-          P
+        (Step extends { readonly provide: Context.Context<infer P> | Layer.Layer<infer P, infer _E, infer _R> } ? P
           : unknown)
       )
     > :
@@ -259,11 +258,11 @@ const Proto: Omit<ExecutionPlan<any>, "steps"> = {
   [TypeId]: TypeId,
   get withRequirements() {
     const self = this as any as ExecutionPlan<any>
-    return effect.servicesWith((services: ServiceMap.ServiceMap<any>) =>
+    return effect.contextWith((context: Context.Context<any>) =>
       effect.succeed(makeProto(self.steps.map((step) => ({
         ...step,
         provide: Layer.isLayer(step.provide)
-          ? Layer.provide(step.provide, Layer.succeedServices(services))
+          ? Layer.provide(step.provide, Layer.succeedContext(context))
           : step.provide
       })) as any))
     )
@@ -312,7 +311,7 @@ export interface Metadata {
  * @since 4.0.0
  * @category Metadata
  */
-export const CurrentMetadata = ServiceMap.Reference<Metadata>("effect/ExecutionPlan/CurrentMetadata", {
+export const CurrentMetadata = Context.Reference<Metadata>("effect/ExecutionPlan/CurrentMetadata", {
   defaultValue: constant({
     attempt: 0,
     stepIndex: 0

package/src/Fiber.ts

@@ -73,6 +73,7 @@
  * @since 2.0.0
  */
 import type * as Arr from "./Array.ts"
+import type * as Context from "./Context.ts"
 import type { Effect } from "./Effect.ts"
 import type { Exit } from "./Exit.ts"
 import * as effect from "./internal/effect.ts"
@@ -83,7 +84,6 @@ import { hasProperty } from "./Predicate.ts"
 import type { StackFrame } from "./References.ts"
 import type { Scheduler, SchedulerDispatcher } from "./Scheduler.ts"
 import type { Scope } from "./Scope.ts"
-import type * as ServiceMap from "./ServiceMap.ts"
 import type { AnySpan } from "./Tracer.ts"
 import type { Covariant } from "./Types.ts"
 
@@ -119,9 +119,9 @@ export interface Fiber<out A, out E = never> extends Pipeable {
 
   readonly id: number
   readonly currentOpCount: number
-  readonly getRef: <A>(ref: ServiceMap.Reference<A>) => A
-  readonly services: ServiceMap.ServiceMap<never>
-  setServices(services: ServiceMap.ServiceMap<never>): void
+  readonly getRef: <A>(ref: Context.Reference<A>) => A
+  readonly context: Context.Context<never>
+  setContext(context: Context.Context<never>): void
   readonly currentScheduler: Scheduler
   readonly currentDispatcher: SchedulerDispatcher
   readonly currentSpan?: AnySpan | undefined
@@ -133,7 +133,7 @@ export interface Fiber<out A, out E = never> extends Pipeable {
   readonly addObserver: (cb: (exit: Exit<A, E>) => void) => () => void
   readonly interruptUnsafe: (
     fiberId?: number | undefined,
-    annotations?: ServiceMap.ServiceMap<never> | undefined
+    annotations?: Context.Context<never> | undefined
   ) => void
   readonly pollUnsafe: () => Exit<A, E> | undefined
 }
@@ -342,7 +342,7 @@ export const interruptAs: {
    */
   (
     fiberId: number | undefined,
-    annotations?: ServiceMap.ServiceMap<never> | undefined
+    annotations?: Context.Context<never> | undefined
   ): <A, E>(self: Fiber<A, E>) => Effect<void>
   /**
    * Interrupts a fiber with a specific fiber ID as the interruptor. This allows
@@ -369,7 +369,7 @@ export const interruptAs: {
   <A, E>(
     self: Fiber<A, E>,
     fiberId: number | undefined,
-    annotations?: ServiceMap.ServiceMap<never> | undefined
+    annotations?: Context.Context<never> | undefined
   ): Effect<void>
 } = effect.fiberInterruptAs
 

package/src/FiberHandle.ts

@@ -2,6 +2,7 @@
  * @since 2.0.0
  */
 import * as Cause from "./Cause.ts"
+import type { Context } from "./Context.ts"
 import * as Deferred from "./Deferred.ts"
 import * as Effect from "./Effect.ts"
 import * as Exit from "./Exit.ts"
@@ -15,7 +16,6 @@ import type { Pipeable } from "./Pipeable.ts"
 import * as Predicate from "./Predicate.ts"
 import type { Scheduler } from "./Scheduler.ts"
 import type * as Scope from "./Scope.ts"
-import type { ServiceMap } from "./ServiceMap.ts"
 
 const TypeId = "~effect/FiberHandle"
 
@@ -681,7 +681,7 @@ const runImpl = <A, E, R, XE extends E, XA extends A>(
     } else if (self.state.fiber !== undefined && options?.onlyIfMissing === true) {
       return Effect.sync(constInterruptedFiber)
     }
-    const fiber = Effect.runForkWith(parent.services as ServiceMap<R>)(effect)
+    const fiber = Effect.runForkWith(parent.context as Context<R>)(effect)
     setUnsafe(self, fiber, options)
     return Effect.succeed(fiber)
   })
@@ -691,12 +691,12 @@ const runImpl = <A, E, R, XE extends E, XA extends A>(
  *
  * @example
  * ```ts
- * import { Effect, FiberHandle, ServiceMap } from "effect"
+ * import { Effect, FiberHandle, Context } from "effect"
  *
  * interface Users {
  *   readonly _: unique symbol
  * }
- * const Users = ServiceMap.Service<Users, {
+ * const Users = Context.Service<Users, {
  *   getAll: Effect.Effect<Array<unknown>>
  * }>("Users")
  *
@@ -735,7 +735,7 @@ export const runtime: <A, E>(
   R
 > = <A, E>(self: FiberHandle<A, E>) => <R>() =>
   Effect.map(
-    Effect.services<R>(),
+    Effect.context<R>(),
     (services) => {
       const runFork = Effect.runForkWith(services)
       return <XE extends E, XA extends A>(

package/src/FiberMap.ts

@@ -2,6 +2,7 @@
  * @since 2.0.0
  */
 import * as Cause from "./Cause.ts"
+import type { Context } from "./Context.ts"
 import * as Deferred from "./Deferred.ts"
 import * as Effect from "./Effect.ts"
 import * as Exit from "./Exit.ts"
@@ -16,7 +17,6 @@ import * as Option from "./Option.ts"
 import type { Pipeable } from "./Pipeable.ts"
 import * as Predicate from "./Predicate.ts"
 import type * as Scope from "./Scope.ts"
-import type { ServiceMap } from "./ServiceMap.ts"
 
 const TypeId = "~effect/FiberMap"
 
@@ -1147,7 +1147,7 @@ const runImpl = <K, A, E, R, XE extends E, XA extends A>(
     } else if (options?.onlyIfMissing === true && hasUnsafe(self, key)) {
       return Effect.sync(constInterruptedFiber)
     }
-    const fiber = Effect.runForkWith(parent.services as ServiceMap<R>)(effect)
+    const fiber = Effect.runForkWith(parent.context as Context<R>)(effect)
     setUnsafe(self, key, fiber, options)
     return Effect.succeed(fiber)
   })
@@ -1157,12 +1157,12 @@ const runImpl = <K, A, E, R, XE extends E, XA extends A>(
  *
  * @example
  * ```ts
- * import { Effect, FiberMap, ServiceMap } from "effect"
+ * import { Effect, FiberMap, Context } from "effect"
  *
  * interface Users {
  *   readonly _: unique symbol
  * }
- * const Users = ServiceMap.Service<Users, {
+ * const Users = Context.Service<Users, {
  *   getAll: Effect.Effect<Array<unknown>>
  * }>("Users")
  *
@@ -1198,7 +1198,7 @@ export const runtime: <K, A, E>(
   R
 > = <K, A, E>(self: FiberMap<K, A, E>) => <R>() =>
   Effect.map(
-    Effect.services<R>(),
+    Effect.context<R>(),
     (services) => {
       const runFork = Effect.runForkWith(services)
       return <XE extends E, XA extends A>(

package/src/FiberSet.ts

@@ -2,6 +2,7 @@
  * @since 2.0.0
  */
 import * as Cause from "./Cause.ts"
+import type { Context } from "./Context.ts"
 import * as Deferred from "./Deferred.ts"
 import * as Effect from "./Effect.ts"
 import * as Exit from "./Exit.ts"
@@ -14,7 +15,6 @@ import * as Iterable from "./Iterable.ts"
 import type { Pipeable } from "./Pipeable.ts"
 import * as Predicate from "./Predicate.ts"
 import type * as Scope from "./Scope.ts"
-import type { ServiceMap } from "./ServiceMap.ts"
 
 const TypeId = "~effect/FiberSet"
 
@@ -588,7 +588,7 @@ const runImpl = <A, E, R, XE extends E, XA extends A>(
     if (self.state._tag === "Closed") {
       return Effect.sync(constInterruptedFiber)
     }
-    const fiber = Effect.runForkWith(parent.services as ServiceMap<R>)(effect)
+    const fiber = Effect.runForkWith(parent.context as Context<R>)(effect)
     addUnsafe(self, fiber, options)
     return Effect.succeed(fiber)
   })
@@ -598,12 +598,12 @@ const runImpl = <A, E, R, XE extends E, XA extends A>(
  *
  * @example
  * ```ts
- * import { Effect, FiberSet, ServiceMap } from "effect"
+ * import { Effect, FiberSet, Context } from "effect"
  *
  * interface Users {
  *   readonly _: unique symbol
  * }
- * const Users = ServiceMap.Service<Users, {
+ * const Users = Context.Service<Users, {
  *   getAll: Effect.Effect<Array<unknown>>
  * }>("Users")
  *
@@ -634,7 +634,7 @@ export const runtime: <A, E>(
   R
 > = <A, E>(self: FiberSet<A, E>) => <R>() =>
   Effect.map(
-    Effect.services<R>(),
+    Effect.context<R>(),
     (services) => {
       const runFork = Effect.runForkWith(services)
       return <XE extends E, XA extends A>(

package/src/FileSystem.ts

@@ -38,6 +38,7 @@
 import * as Arr from "./Array.ts"
 import * as Brand from "./Brand.ts"
 import * as Cause from "./Cause.ts"
+import * as Context from "./Context.ts"
 import * as Effect from "./Effect.ts"
 import { pipe } from "./Function.ts"
 import * as Layer from "./Layer.ts"
@@ -46,7 +47,6 @@ import { badArgument, type PlatformError, systemError } from "./PlatformError.ts
 import { hasProperty } from "./Predicate.ts"
 import type * as Pull from "./Pull.ts"
 import type { Scope } from "./Scope.ts"
-import * as ServiceMap from "./ServiceMap.ts"
 import * as Sink from "./Sink.ts"
 import * as Stream from "./Stream.ts"
 
@@ -711,7 +711,7 @@ export type OpenFlag =
  * @since 4.0.0
  * @category tag
  */
-export const FileSystem: ServiceMap.Service<FileSystem, FileSystem> = ServiceMap.Service("effect/platform/FileSystem")
+export const FileSystem: Context.Service<FileSystem, FileSystem> = Context.Service("effect/platform/FileSystem")
 
 /**
  * Creates a FileSystem implementation from a partial implementation.
@@ -1258,6 +1258,6 @@ export declare namespace WatchEvent {
  * @since 4.0.0
  * @category file watcher
  */
-export class WatchBackend extends ServiceMap.Service<WatchBackend, {
+export class WatchBackend extends Context.Service<WatchBackend, {
   readonly register: (path: string, stat: File.Info) => Option.Option<Stream.Stream<WatchEvent, PlatformError>>
 }>()("effect/platform/FileSystem/WatchBackend") {}