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

package/src/Terminal.ts

@@ -2,6 +2,7 @@
  * @since 4.0.0
  */
 import type * as Cause from "./Cause.ts"
+import * as Context from "./Context.ts"
 import type * as Effect from "./Effect.ts"
 import type * as Option from "./Option.ts"
 import type { PlatformError } from "./PlatformError.ts"
@@ -9,7 +10,6 @@ import * as Predicate from "./Predicate.ts"
 import type * as Queue from "./Queue.ts"
 import * as Schema from "./Schema.ts"
 import type * as Scope from "./Scope.ts"
-import * as ServiceMap from "./ServiceMap.ts"
 
 const TypeId = "~effect/platform/Terminal"
 
@@ -88,7 +88,7 @@ const QuitErrorTypeId = "effect/platform/Terminal/QuitError"
  * @since 4.0.0
  * @category QuitError
  */
-export class QuitError extends Schema.ErrorClass("QuitError")({
+export class QuitError extends Schema.ErrorClass<QuitError>("QuitError")({
   _tag: Schema.tag("QuitError")
 }) {
   /**
@@ -107,7 +107,7 @@ export const isQuitError = (u: unknown): u is QuitError => Predicate.hasProperty
  * @since 4.0.0
  * @category Services
  */
-export const Terminal: ServiceMap.Service<Terminal, Terminal> = ServiceMap.Service("effect/platform/Terminal")
+export const Terminal: Context.Service<Terminal, Terminal> = Context.Service("effect/platform/Terminal")
 
 /**
  * Creates a Terminal implementation

package/src/Tracer.ts

@@ -1,13 +1,13 @@
 /**
  * @since 2.0.0
  */
+import * as Context from "./Context.ts"
 import type * as Exit from "./Exit.ts"
 import type { Fiber } from "./Fiber.ts"
 import { constFalse, type LazyArg } from "./Function.ts"
 import type * as core from "./internal/core.ts"
 import type { LogLevel } from "./LogLevel.ts"
 import * as Option from "./Option.ts"
-import * as ServiceMap from "./ServiceMap.ts"
 
 /**
  * @since 2.0.0
@@ -17,7 +17,7 @@ export interface Tracer {
   span(this: Tracer, options: {
     readonly name: string
     readonly parent: Option.Option<AnySpan>
-    readonly annotations: ServiceMap.ServiceMap<never>
+    readonly annotations: Context.Context<never>
     readonly links: Array<SpanLink>
     readonly startTime: bigint
     readonly kind: SpanKind
@@ -101,7 +101,7 @@ export type AnySpan = Span | ExternalSpan
  * ```ts
  * import { Tracer } from "effect"
  *
- * // The key used to identify parent spans in the service map
+ * // The key used to identify parent spans in the context
  * console.log(Tracer.ParentSpanKey) // "effect/Tracer/ParentSpan"
  * ```
  */
@@ -121,7 +121,7 @@ export const ParentSpanKey = "effect/Tracer/ParentSpan"
  * })
  * ```
  */
-export class ParentSpan extends ServiceMap.Service<ParentSpan, AnySpan>()(ParentSpanKey) {}
+export class ParentSpan extends Context.Service<ParentSpan, AnySpan>()(ParentSpanKey) {}
 
 /**
  * @since 2.0.0
@@ -129,7 +129,7 @@ export class ParentSpan extends ServiceMap.Service<ParentSpan, AnySpan>()(Parent
  * @example
  * ```ts
  * import type { Tracer } from "effect"
- * import { ServiceMap } from "effect"
+ * import { Context } from "effect"
  *
  * // Create an external span from another tracing system
  * const externalSpan: Tracer.ExternalSpan = {
@@ -137,7 +137,7 @@ export class ParentSpan extends ServiceMap.Service<ParentSpan, AnySpan>()(Parent
  *   spanId: "span-abc-123",
  *   traceId: "trace-xyz-789",
  *   sampled: true,
- *   annotations: ServiceMap.empty()
+ *   annotations: Context.empty()
  * }
  *
  * console.log(`External span: ${externalSpan.spanId}`)
@@ -148,7 +148,7 @@ export interface ExternalSpan {
   readonly spanId: string
   readonly traceId: string
   readonly sampled: boolean
-  readonly annotations: ServiceMap.ServiceMap<never>
+  readonly annotations: Context.Context<never>
 }
 
 /**
@@ -183,7 +183,7 @@ export interface SpanOptionsNoTrace {
   readonly links?: ReadonlyArray<SpanLink> | undefined
   readonly parent?: AnySpan | undefined
   readonly root?: boolean | undefined
-  readonly annotations?: ServiceMap.ServiceMap<never> | undefined
+  readonly annotations?: Context.Context<never> | undefined
   readonly kind?: SpanKind | undefined
   readonly sampled?: boolean | undefined
   readonly level?: LogLevel | undefined
@@ -243,7 +243,7 @@ export interface Span {
   readonly spanId: string
   readonly traceId: string
   readonly parent: Option.Option<AnySpan>
-  readonly annotations: ServiceMap.ServiceMap<never>
+  readonly annotations: Context.Context<never>
   readonly status: SpanStatus
   readonly attributes: ReadonlyMap<string, unknown>
   readonly links: ReadonlyArray<SpanLink>
@@ -314,14 +314,14 @@ export const externalSpan = (
     readonly spanId: string
     readonly traceId: string
     readonly sampled?: boolean | undefined
-    readonly annotations?: ServiceMap.ServiceMap<never> | undefined
+    readonly annotations?: Context.Context<never> | undefined
   }
 ): ExternalSpan => ({
   _tag: "ExternalSpan",
   spanId: options.spanId,
   traceId: options.traceId,
   sampled: options.sampled ?? true,
-  annotations: options.annotations ?? ServiceMap.empty()
+  annotations: options.annotations ?? Context.empty()
 })
 
 /**
@@ -339,7 +339,7 @@ export const externalSpan = (
  * )
  * ```
  */
-export const DisablePropagation = ServiceMap.Reference<boolean>(
+export const DisablePropagation = Context.Reference<boolean>(
   "effect/Tracer/DisablePropagation",
   { defaultValue: constFalse }
 )
@@ -350,7 +350,7 @@ export const DisablePropagation = ServiceMap.Reference<boolean>(
  * @category references
  * @since 4.0.0
  */
-export const CurrentTraceLevel: ServiceMap.Reference<LogLevel> = ServiceMap.Reference<LogLevel>(
+export const CurrentTraceLevel: Context.Reference<LogLevel> = Context.Reference<LogLevel>(
   "effect/Tracer/CurrentTraceLevel",
   { defaultValue: () => "Info" }
 )
@@ -363,7 +363,7 @@ export const CurrentTraceLevel: ServiceMap.Reference<LogLevel> = ServiceMap.Refe
  * @category references
  * @since 4.0.0
  */
-export const MinimumTraceLevel = ServiceMap.Reference<
+export const MinimumTraceLevel = Context.Reference<
   LogLevel
 >("effect/Tracer/MinimumTraceLevel", { defaultValue: () => "All" })
 
@@ -393,7 +393,7 @@ export const TracerKey = "effect/Tracer"
  * })
  * ```
  */
-export const Tracer: ServiceMap.Reference<Tracer> = ServiceMap.Reference<Tracer>(TracerKey, {
+export const Tracer: Context.Reference<Tracer> = Context.Reference<Tracer>(TracerKey, {
   defaultValue: () =>
     make({
       span: (options) => new NativeSpan(options)
@@ -412,7 +412,7 @@ export class NativeSpan implements Span {
 
   readonly name: string
   readonly parent: Option.Option<AnySpan>
-  readonly annotations: ServiceMap.ServiceMap<never>
+  readonly annotations: Context.Context<never>
   readonly links: Array<SpanLink>
   readonly startTime: bigint
   readonly kind: SpanKind
@@ -424,7 +424,7 @@ export class NativeSpan implements Span {
   constructor(options: {
     readonly name: string
     readonly parent: Option.Option<AnySpan>
-    readonly annotations: ServiceMap.ServiceMap<never>
+    readonly annotations: Context.Context<never>
     readonly links: Array<SpanLink>
     readonly startTime: bigint
     readonly kind: SpanKind

package/src/Unify.ts

@@ -142,8 +142,11 @@ export type ignoreSymbol = typeof ignoreSymbol
 
 type MaybeReturn<F> = F extends () => infer R ? R : NonNullable<F>
 
+type Keys<X extends [any, any]> = X extends [infer A, infer Ignore] ? Exclude<keyof A, Ignore>
+  : never
+
 type Values<X extends [any, any]> = X extends [infer A, infer Ignore]
-  ? Exclude<keyof A, Ignore> extends infer k ? k extends keyof A ? MaybeReturn<A[k]> : never : never
+  ? Keys<[A, Ignore]> extends infer K ? K extends keyof A ? MaybeReturn<A[K]> : never : never
   : never
 
 type Ignore<X> = X extends { [ignoreSymbol]?: infer Obj } ? keyof NonNullable<Obj>
@@ -159,6 +162,13 @@ type ExtractTypes<
 
 type FilterIn<A> = A extends any ? typeSymbol extends keyof A ? A : never : never
 
+type FilterInUnmatched<A, K> = A extends any
+  ? typeSymbol extends keyof A
+    ? A extends { [unifySymbol]?: infer U } ? [Extract<keyof NonNullable<U>, K>] extends [never] ? A : never
+    : A
+  : never
+  : never
+
 type FilterOut<A> = A extends any ? typeSymbol extends keyof A ? never : A : never
 
 /**
@@ -201,7 +211,21 @@ export type Unify<A> = Values<
       & { [typeSymbol]: A }
     )
   >
-> extends infer Z ? Z | Exclude<A, Z> | FilterOut<A> : never
+> extends infer Z ?
+    | Z
+    | FilterInUnmatched<
+      A,
+      Keys<
+        ExtractTypes<
+          (
+            & FilterIn<A>
+            & { [typeSymbol]: A }
+          )
+        >
+      >
+    >
+    | FilterOut<A>
+  : never
 
 /**
  * Unifies the return type of a function or value.

package/src/index.ts

@@ -523,7 +523,7 @@ export * as Combiner from "./Combiner.ts"
  * - **parse** – instance method on every `Config` that takes a provider and
  *   returns `Effect<T, ConfigError>`.
  * - **Yieldable** – every `Config` can be yielded inside `Effect.gen`. It
- *   automatically resolves the current `ConfigProvider` from the service map.
+ *   automatically resolves the current `ConfigProvider` from the context.
  *
  * ## Common tasks
  *
@@ -596,7 +596,7 @@ export * as Config from "./Config.ts"
  *   (e.g. `["database", "host"]`).
  * - **ConfigProvider** – an object with a `load(path)` method that resolves a
  *   path to a `Node | undefined`. Providers can be composed and transformed.
- * - **ServiceMap.Reference** – `ConfigProvider` is registered as a reference
+ * - **Context.Reference** – `ConfigProvider` is registered as a reference
  *   service that defaults to `fromEnv()`, so it works without explicit
  *   provision.
  * - **SourceError** – the typed error returned when a backing store is
@@ -737,6 +737,20 @@ export * as ConfigProvider from "./ConfigProvider.ts"
  */
 export * as Console from "./Console.ts"
 
+/**
+ * This module provides a data structure called `Context` that can be used
+ * for dependency injection in effectful programs. It is essentially a table
+ * mapping `Service`s identifiers to their implementations, and can be used to
+ * manage dependencies in a type-safe way. The `Context` data structure is
+ * essentially a way of providing access to a set of related services that can
+ * be passed around as a single unit. This module provides functions to create,
+ * modify, and query the contents of a `Context`, as well as a number of
+ * utility types for working with a `Context`.
+ *
+ * @since 4.0.0
+ */
+export * as Context from "./Context.ts"
+
 /**
  * @since 2.0.0
  */
@@ -2943,6 +2957,71 @@ export * as RcRef from "./RcRef.ts"
 export * as Record from "./Record.ts"
 
 /**
+ * Context-aware redaction for sensitive values.
+ *
+ * The `Redactable` module provides a protocol for objects that need to present
+ * alternative representations of themselves depending on the runtime context.
+ * Typical use cases include masking secrets, tokens, or personal data in logs, traces,
+ * and serialized output.
+ *
+ * ## Mental model
+ *
+ * - **Redactable** - an object that implements `[symbolRedactable]`, a method
+ *   that receives the current `Context` and returns a replacement value.
+ * - **symbolRedactable** - the well-known `Symbol` key that marks an object as
+ *   redactable.
+ * - **redact** - the primary entry point: pass any value and get back either its
+ *   redacted form (if it is `Redactable`) or the original value unchanged.
+ * - **getRedacted** - lower-level helper that calls `[symbolRedactable]` directly
+ *   on a value already known to be `Redactable`.
+ * - The `Context` passed to `[symbolRedactable]` comes from the current fiber.
+ *   If no fiber is active, an empty `Context` is used.
+ *
+ * ## Common tasks
+ *
+ * - **Make a value redactable**: implement the {@link Redactable} interface by
+ *   adding a `[symbolRedactable]` method.
+ * - **Redact an unknown value**: call {@link redact} - it returns the original
+ *   value when it is not redactable.
+ * - **Check if a value is redactable**: use {@link isRedactable}.
+ * - **Get the redacted form of a known `Redactable`**: use {@link getRedacted}.
+ *
+ * ## Gotchas
+ *
+ * - `[symbolRedactable]` receives the fiber's `Context` as its argument.
+ * - Outside of an Effect runtime (no current fiber), `getRedacted` still works
+ *   but passes an empty `Context`, so service lookups will not find anything.
+ * - `redact` is not recursive: if a redactable object contains nested
+ *   redactable values, only the outermost redaction is applied.
+ *
+ * ## Quickstart
+ *
+ * **Example** (Masking an API key)
+ *
+ * ```ts
+ * import { Context, Redactable } from "effect"
+ *
+ * class ApiKey {
+ *   constructor(readonly raw: string) {}
+ *
+ *   [Redactable.symbolRedactable](_ctx: Context.Context<never>) {
+ *     return this.raw.slice(0, 4) + "..."
+ *   }
+ * }
+ *
+ * const key = new ApiKey("sk-1234567890abcdef")
+ *
+ * console.log(Redactable.isRedactable(key))  // true
+ * console.log(Redactable.redact(key))         // "sk-1..."
+ * console.log(Redactable.redact("plain"))     // "plain"
+ * ```
+ *
+ * ## See also
+ *
+ * - {@link Redactable} - the interface to implement
+ * - {@link symbolRedactable} - the symbol key
+ * - {@link redact} - the main redaction entry point
+ *
  * @since 4.0.0
  */
 export * as Redactable from "./Redactable.ts"
@@ -3711,6 +3790,7 @@ export * as SchemaRepresentation from "./SchemaRepresentation.ts"
  * - Trim/case strings → {@link trim}, {@link toLowerCase}, {@link toUpperCase}, {@link capitalize}, {@link uncapitalize}, {@link snakeToCamel}
  * - Parse key-value strings → {@link splitKeyValue}
  * - Coerce string ↔ number/bigint → {@link numberFromString}, {@link bigintFromString}
+ * - Coerce string ↔ Date → {@link dateFromString}
  * - Decode durations → {@link durationFromNanos}, {@link durationFromMillis}
  * - Wrap nullable/optional as Option → {@link optionFromNullOr}, {@link optionFromOptionalKey}, {@link optionFromOptional}
  * - Parse URLs → {@link urlFromString}
@@ -3796,20 +3876,6 @@ export * as ScopedRef from "./ScopedRef.ts"
  */
 export * as Semaphore from "./Semaphore.ts"
 
-/**
- * This module provides a data structure called `ServiceMap` that can be used
- * for dependency injection in effectful programs. It is essentially a table
- * mapping `Service`s identifiers to their implementations, and can be used to
- * manage dependencies in a type-safe way. The `ServiceMap` data structure is
- * essentially a way of providing access to a set of related services that can
- * be passed around as a single unit. This module provides functions to create,
- * modify, and query the contents of a `ServiceMap`, as well as a number of
- * utility types for working with a `ServiceMap`.
- *
- * @since 4.0.0
- */
-export * as ServiceMap from "./ServiceMap.ts"
-
 /**
  * @since 2.0.0
  */

package/src/internal/core.ts

@@ -1,4 +1,5 @@
 import type * as Cause from "../Cause.ts"
+import type * as Context from "../Context.ts"
 import type * as Effect from "../Effect.ts"
 import * as Equal from "../Equal.ts"
 import type * as Exit from "../Exit.ts"
@@ -9,7 +10,6 @@ import { NodeInspectSymbol } from "../Inspectable.ts"
 import { pipeArguments } from "../Pipeable.ts"
 import { hasProperty } from "../Predicate.ts"
 import type { StackFrame } from "../References.ts"
-import type * as ServiceMap from "../ServiceMap.ts"
 import type * as Types from "../Types.ts"
 import { SingleShotGen } from "../Utils.ts"
 import type { FiberImpl } from "./effect.ts"
@@ -224,7 +224,7 @@ export abstract class ReasonBase<Tag extends string> implements Cause.Cause.Reas
   }
 
   annotate(
-    annotations: ServiceMap.ServiceMap<never>,
+    annotations: Context.Context<never>,
     options?: { readonly overwrite?: boolean | undefined }
   ): this {
     if (annotations.mapUnsafe.size === 0) return this
@@ -341,14 +341,14 @@ export const causeDie = (defect: unknown): Cause.Cause<never> => new CauseImpl([
 /** @internal */
 export const causeAnnotate: {
   (
-    annotations: ServiceMap.ServiceMap<never>,
+    annotations: Context.Context<never>,
     options?: {
       readonly overwrite?: boolean | undefined
     }
   ): <E>(self: Cause.Cause<E>) => Cause.Cause<E>
   <E>(
     self: Cause.Cause<E>,
-    annotations: ServiceMap.ServiceMap<never>,
+    annotations: Context.Context<never>,
     options?: {
       readonly overwrite?: boolean | undefined
     }
@@ -357,7 +357,7 @@ export const causeAnnotate: {
   (args) => isCause(args[0]),
   <E>(
     self: Cause.Cause<E>,
-    annotations: ServiceMap.ServiceMap<never>,
+    annotations: Context.Context<never>,
     options?: {
       readonly overwrite?: boolean | undefined
     }
@@ -535,12 +535,12 @@ export const exitSucceed: <A>(a: A) => Exit.Exit<A> = makeExit({
 /** @internal */
 export const StackTraceKey = {
   key: "effect/Cause/StackTrace" satisfies typeof Cause.StackTrace.key
-} as ServiceMap.Service<Cause.StackTrace, StackFrame>
+} as Context.Service<Cause.StackTrace, StackFrame>
 
 /** @internal */
 export const InterruptorStackTrace = {
   key: "effect/Cause/InterruptorStackTrace" satisfies typeof Cause.InterruptorStackTrace.key
-} as ServiceMap.Service<Cause.InterruptorStackTrace, StackFrame>
+} as Context.Service<Cause.InterruptorStackTrace, StackFrame>
 
 /** @internal */
 export const exitFailCause: <E>(cause: Cause.Cause<E>) => Exit.Exit<never, E> = makeExit({