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

package/src/unstable/http/HttpRouter.ts

@@ -2,6 +2,7 @@
  * @since 4.0.0
  */
 import * as Arr from "../../Array.ts"
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import { compose, dual, identity } from "../../Function.ts"
 import * as Layer from "../../Layer.ts"
@@ -10,7 +11,6 @@ import type { ReadonlyRecord } from "../../Record.ts"
 import * as Schema from "../../Schema.ts"
 import type { ParseOptions } from "../../SchemaAST.ts"
 import * as Scope from "../../Scope.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Tracer from "../../Tracer.ts"
 import type * as Types from "../../Types.ts"
 import * as FindMyWay from "./FindMyWay.ts"
@@ -80,7 +80,7 @@ export interface HttpRouter {
  * @since 4.0.0
  * @category HttpRouter
  */
-export const HttpRouter: ServiceMap.Service<HttpRouter, HttpRouter> = ServiceMap.Service<HttpRouter>(
+export const HttpRouter: Context.Service<HttpRouter, HttpRouter> = Context.Service<HttpRouter>(
   "effect/http/HttpRouter"
 )
 
@@ -100,8 +100,8 @@ export const make = Effect.gen(function*() {
     | Request.From<"Requires", Exclude<Route.Context<Routes[number]>, Provided>>
     | Request.From<"Error", Route.Error<Routes[number]>>
   > =>
-    Effect.servicesWith((services: ServiceMap.ServiceMap<never>) => {
-      const middleware = getMiddleware(services)
+    Effect.contextWith((context: Context.Context<never>) => {
+      const middleware = getMiddleware(context)
       const applyMiddleware = (effect: Effect.Effect<HttpServerResponse.HttpServerResponse>) => {
         for (let i = 0; i < middleware.length; i++) {
           effect = middleware[i](effect)
@@ -163,7 +163,7 @@ export const make = Effect.gen(function*() {
       }),
     asHttpEffect() {
       let handler = Effect.withFiber<HttpServerResponse.HttpServerResponse, unknown>((fiber) => {
-        const contextMap = new Map(fiber.services.mapUnsafe)
+        const contextMap = new Map(fiber.context.mapUnsafe)
         const request = contextMap.get(HttpServerRequest.HttpServerRequest.key) as HttpServerRequest.HttpServerRequest
         let result = router.find(request.method, request.url)
         if (result === undefined && request.method === "HEAD") {
@@ -190,14 +190,14 @@ export const make = Effect.gen(function*() {
         if (span && span._tag === "Span") {
           span.attribute("http.route", route.path)
         }
-        return Effect.provideServices(
+        return Effect.provideContext(
           (route.uninterruptible ?
             route.handler :
             Effect.interruptible(route.handler)) as Effect.Effect<
               HttpServerResponse.HttpServerResponse,
               unknown
             >,
-          ServiceMap.makeUnsafe(contextMap)
+          Context.makeUnsafe(contextMap)
         )
       })
       if (middleware.size === 0) return handler
@@ -218,7 +218,7 @@ function sliceRequestUrl(request: HttpServerRequest.HttpServerRequest, prefix: s
  * @since 4.0.0
  * @category Configuration
  */
-export const RouterConfig = ServiceMap.Reference<Partial<FindMyWay.RouterConfig>>(
+export const RouterConfig = Context.Reference<Partial<FindMyWay.RouterConfig>>(
   "effect/http/HttpRouter/RouterConfig",
   { defaultValue: () => ({}) }
 )
@@ -227,7 +227,7 @@ export const RouterConfig = ServiceMap.Reference<Partial<FindMyWay.RouterConfig>
  * @since 4.0.0
  * @category RouteContext
  */
-export class RouteContext extends ServiceMap.Service<RouteContext, {
+export class RouteContext extends Context.Service<RouteContext, {
   readonly params: Readonly<Record<string, string | undefined>>
   readonly route: Route<unknown, unknown>
 }>()("effect/http/HttpRouter/RouteContext") {}
@@ -268,15 +268,15 @@ export const schemaJson = <
   HttpServerRequest.HttpServerRequest | HttpServerRequest.ParsedSearchParams | RouteContext | RD
 > => {
   const parse = Schema.decodeUnknownEffect(schema)
-  return Effect.servicesWith(
+  return Effect.contextWith(
     (
-      services: ServiceMap.ServiceMap<
+      context: Context.Context<
         HttpServerRequest.HttpServerRequest | HttpServerRequest.ParsedSearchParams | RouteContext
       >
     ) => {
-      const request = ServiceMap.get(services, HttpServerRequest.HttpServerRequest)
-      const searchParams = ServiceMap.get(services, HttpServerRequest.ParsedSearchParams)
-      const routeContext = ServiceMap.get(services, RouteContext)
+      const request = Context.get(context, HttpServerRequest.HttpServerRequest)
+      const searchParams = Context.get(context, HttpServerRequest.ParsedSearchParams)
+      const routeContext = Context.get(context, RouteContext)
       return Effect.flatMap(request.json, (body) =>
         parse({
           method: request.method,
@@ -316,15 +316,15 @@ export const schemaNoBody = <
   HttpServerRequest.HttpServerRequest | HttpServerRequest.ParsedSearchParams | RouteContext | RD
 > => {
   const parse = Schema.decodeUnknownEffect(schema)
-  return Effect.servicesWith(
+  return Effect.contextWith(
     (
-      services: ServiceMap.ServiceMap<
+      context: Context.Context<
         HttpServerRequest.HttpServerRequest | HttpServerRequest.ParsedSearchParams | RouteContext
       >
     ) => {
-      const request = ServiceMap.get(services, HttpServerRequest.HttpServerRequest)
-      const searchParams = ServiceMap.get(services, HttpServerRequest.ParsedSearchParams)
-      const routeContext = ServiceMap.get(services, RouteContext)
+      const request = Context.get(context, HttpServerRequest.HttpServerRequest)
+      const searchParams = Context.get(context, HttpServerRequest.ParsedSearchParams)
+      const routeContext = Context.get(context, RouteContext)
       return parse({
         method: request.method,
         url: request.url,
@@ -346,9 +346,9 @@ export const schemaParams = <A, I extends Readonly<Record<string, string | Reado
   options?: ParseOptions | undefined
 ): Effect.Effect<A, Schema.SchemaError, HttpServerRequest.ParsedSearchParams | RouteContext | RD> => {
   const parse = Schema.decodeUnknownEffect(schema)
-  return Effect.servicesWith((services: ServiceMap.ServiceMap<HttpServerRequest.ParsedSearchParams | RouteContext>) => {
-    const searchParams = ServiceMap.get(services, HttpServerRequest.ParsedSearchParams)
-    const routeContext = ServiceMap.get(services, RouteContext)
+  return Effect.contextWith((context: Context.Context<HttpServerRequest.ParsedSearchParams | RouteContext>) => {
+    const searchParams = Context.get(context, HttpServerRequest.ParsedSearchParams)
+    const routeContext = Context.get(context, RouteContext)
     return parse({ ...searchParams, ...routeContext.params }, options)
   })
 }
@@ -484,7 +484,7 @@ export const toHttpEffect = <A, E, R>(
 > =>
   Effect.gen(function*() {
     const context = yield* Layer.build(Layer.provideMerge(appLayer, layer))
-    const router = ServiceMap.get(context, HttpRouter)
+    const router = Context.get(context, HttpRouter)
     // @effect-diagnostics effect/returnEffectInGen:off
     return router.asHttpEffect()
   }) as any
@@ -737,7 +737,7 @@ export interface Middleware<
  * ```ts
  * import { Effect } from "effect"
  * import * as Layer from "effect/Layer"
- * import * as ServiceMap from "effect/ServiceMap"
+ * import * as Context from "effect/Context"
  * import * as HttpMiddleware from "effect/unstable/http/HttpMiddleware"
  * import * as HttpRouter from "effect/unstable/http/HttpRouter"
  * import * as HttpServerResponse from "effect/unstable/http/HttpServerResponse"
@@ -746,7 +746,7 @@ export interface Middleware<
  * const CorsMiddleware = HttpRouter.middleware(HttpMiddleware.cors()).layer
  * // You can also use HttpRouter.cors() to create a CORS middleware
  *
- * class CurrentSession extends ServiceMap.Service<CurrentSession, {
+ * class CurrentSession extends Context.Service<CurrentSession, {
  *   readonly token: string
  * }>()("CurrentSession") {}
  *
@@ -815,8 +815,8 @@ const makeMiddleware = (middleware: any, options?: {
     }))
     : new MiddlewareImpl(
       Effect.isEffect(middleware) ?
-        Layer.effectServices(Effect.map(middleware, (fn) => ServiceMap.makeUnsafe(new Map([[fnContextKey, fn]])))) :
-        Layer.succeedServices(ServiceMap.makeUnsafe(new Map([[fnContextKey, middleware]]))) as any
+        Layer.effectContext(Effect.map(middleware, (fn) => Context.makeUnsafe(new Map([[fnContextKey, fn]])))) :
+        Layer.succeedContext(Context.makeUnsafe(new Map([[fnContextKey, middleware]]))) as any
     )
 
 let middlewareId = 0
@@ -844,16 +844,16 @@ class MiddlewareImpl<
     this.layerFn = layerFn
     this.dependencies = dependencies
     const contextKey = `effect/http/HttpRouter/Middleware-${++middlewareId}` as const
-    this.layer = Layer.effectServices(Effect.gen({ self: this }, function*() {
-      const context = yield* Effect.services<Scope.Scope>()
+    this.layer = Layer.effectContext(Effect.gen({ self: this }, function*() {
+      const context = yield* Effect.context<Scope.Scope>()
       const stack = [context.mapUnsafe.get(fnContextKey)]
       if (this.dependencies) {
         const memoMap = yield* Layer.CurrentMemoMap
-        const scope = ServiceMap.get(context, Scope.Scope)
+        const scope = Context.get(context, Scope.Scope)
         const depsContext = yield* Layer.buildWithMemoMap(this.dependencies, memoMap, scope)
         stack.push(...getMiddleware(depsContext))
       }
-      return ServiceMap.makeUnsafe<never>(new Map([[contextKey, stack]]))
+      return Context.makeUnsafe<never>(new Map([[contextKey, stack]]))
     })).pipe(Layer.provide(this.layerFn))
   }
 
@@ -876,8 +876,8 @@ class MiddlewareImpl<
   }
 }
 
-const middlewareCache = new WeakMap<ServiceMap.ServiceMap<never>, any>()
-const getMiddleware = (context: ServiceMap.ServiceMap<never>): Array<middleware.Fn> => {
+const middlewareCache = new WeakMap<Context.Context<never>, any>()
+const getMiddleware = (context: Context.Context<never>): Array<middleware.Fn> => {
   let arr = middlewareCache.get(context)
   if (arr) return arr
   const topLevel = Arr.empty<Array<middleware.Fn>>()
@@ -1062,7 +1062,7 @@ export const provideRequest =
       middleware<{ provides: A2 }>()(Effect.gen(function*() {
         const services = yield* Layer.build(layer as Layer.Layer<A2>)
         return (effect) =>
-          Effect.provideServices(effect, services) as Effect.Effect<
+          Effect.provideContext(effect, services) as Effect.Effect<
             HttpServerResponse.HttpServerResponse,
             Types.unhandled
           >
@@ -1172,8 +1172,8 @@ export const toWebHandler = <
   }
 ): {
   readonly handler: [HR] extends [never]
-    ? ((request: globalThis.Request, context?: ServiceMap.ServiceMap<never> | undefined) => Promise<Response>)
-    : ((request: globalThis.Request, context: ServiceMap.ServiceMap<HR>) => Promise<Response>)
+    ? ((request: globalThis.Request, context?: Context.Context<never> | undefined) => Promise<Response>)
+    : ((request: globalThis.Request, context: Context.Context<HR>) => Promise<Response>)
   readonly dispose: () => Promise<void>
 } => {
   let middleware: any = options?.middleware
@@ -1184,7 +1184,7 @@ export const toWebHandler = <
     ? Layer.provide(layer, Layer.succeed(RouterConfig)(options.routerConfig))
     : layer
   return HttpEffect.toWebHandlerLayerWith(Layer.provideMerge(appLayer, RouterLayer) as Layer.Layer<A | HttpRouter, E>, {
-    toHandler: (s) => Effect.succeed(ServiceMap.get(s, HttpRouter).asHttpEffect()),
+    toHandler: (s) => Effect.succeed(Context.get(s, HttpRouter).asHttpEffect()),
     middleware,
     memoMap: options?.memoMap
   })

package/src/unstable/http/HttpServer.ts

@@ -1,13 +1,13 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as FileSystem from "../../FileSystem.ts"
 import { dual } from "../../Function.ts"
 import * as Layer from "../../Layer.ts"
 import * as Path from "../../Path.ts"
 import type * as Scope from "../../Scope.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Etag from "./Etag.ts"
 import * as HttpClient from "./HttpClient.ts"
 import * as ClientRequest from "./HttpClientRequest.ts"
@@ -20,7 +20,7 @@ import type { HttpServerResponse } from "./HttpServerResponse.ts"
  * @since 4.0.0
  * @category models
  */
-export class HttpServer extends ServiceMap.Service<HttpServer, {
+export class HttpServer extends Context.Service<HttpServer, {
   readonly serve: {
     <E, R>(effect: Effect.Effect<HttpServerResponse, E, R>): Effect.Effect<
       void,

package/src/unstable/http/HttpServerError.ts

@@ -2,6 +2,7 @@
  * @since 4.0.0
  */
 import * as Cause from "../../Cause.ts"
+import * as Context from "../../Context.ts"
 import * as Data from "../../Data.ts"
 import * as Effect from "../../Effect.ts"
 import * as ErrorReporter from "../../ErrorReporter.ts"
@@ -9,7 +10,6 @@ import type * as Exit from "../../Exit.ts"
 import { constUndefined } from "../../Function.ts"
 import * as Option from "../../Option.ts"
 import { hasProperty } from "../../Predicate.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type * as Request from "./HttpServerRequest.ts"
 import * as Respondable from "./HttpServerRespondable.ts"
 import * as Response from "./HttpServerResponse.ts"
@@ -189,9 +189,9 @@ export class ServeError extends Data.TaggedError("ServeError")<{
  * @since 4.0.0
  * @category Annotations
  */
-export class ClientAbort extends ServiceMap.Service<ClientAbort, true>()("effect/http/HttpServerError/ClientAbort") {
-  static annotation = this.serviceMap(true).pipe(
-    ServiceMap.add(Cause.StackTrace, {
+export class ClientAbort extends Context.Service<ClientAbort, true>()("effect/http/HttpServerError/ClientAbort") {
+  static annotation = this.context(true).pipe(
+    Context.add(Cause.StackTrace, {
       name: "ClientAbort",
       stack: constUndefined,
       parent: undefined

package/src/unstable/http/HttpServerRequest.ts

@@ -3,6 +3,7 @@
  */
 import type * as Arr from "../../Array.ts"
 import * as Channel from "../../Channel.ts"
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import type * as FileSystem from "../../FileSystem.ts"
 import * as Inspectable from "../../Inspectable.ts"
@@ -13,7 +14,6 @@ import * as Result from "../../Result.ts"
 import * as Schema from "../../Schema.ts"
 import type { ParseOptions } from "../../SchemaAST.ts"
 import type * as Scope from "../../Scope.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Stream from "../../Stream.ts"
 import * as Socket from "../socket/Socket.ts"
 import * as Cookies from "./Cookies.ts"
@@ -74,7 +74,7 @@ export interface HttpServerRequest extends HttpIncomingMessage.HttpIncomingMessa
  * @since 4.0.0
  * @category context
  */
-export const HttpServerRequest: ServiceMap.Service<HttpServerRequest, HttpServerRequest> = ServiceMap.Service(
+export const HttpServerRequest: Context.Service<HttpServerRequest, HttpServerRequest> = Context.Service(
   "effect/http/HttpServerRequest"
 )
 
@@ -82,7 +82,7 @@ export const HttpServerRequest: ServiceMap.Service<HttpServerRequest, HttpServer
  * @since 4.0.0
  * @category search params
  */
-export class ParsedSearchParams extends ServiceMap.Service<
+export class ParsedSearchParams extends Context.Service<
   ParsedSearchParams,
   ReadonlyRecord<string, string | Array<string>>
 >()("effect/http/ParsedSearchParams") {}
@@ -897,7 +897,7 @@ export const toURL = (self: HttpServerRequest): Option.Option<URL> => {
  */
 export const toWebResult = (self: HttpServerRequest, options?: {
   readonly signal?: AbortSignal | undefined
-  readonly services?: ServiceMap.ServiceMap<never> | undefined
+  readonly context?: Context.Context<never> | undefined
 }): Result.Result<Request, RequestError> => {
   if (self.source instanceof Request) {
     return Result.succeed(self.source)
@@ -919,7 +919,7 @@ export const toWebResult = (self: HttpServerRequest, options?: {
     requestInit.signal = options.signal
   }
   if (hasBody(self.method)) {
-    requestInit.body = Stream.toReadableStreamWith(self.stream, options?.services ?? ServiceMap.empty())
+    requestInit.body = Stream.toReadableStreamWith(self.stream, options?.context ?? Context.empty())
     ;(requestInit as any).duplex = "half"
   }
   return Result.succeed(new Request(url.value, requestInit))
@@ -932,9 +932,9 @@ export const toWebResult = (self: HttpServerRequest, options?: {
 export const toWeb = (self: HttpServerRequest, options?: {
   readonly signal?: AbortSignal | undefined
 }): Effect.Effect<Request, RequestError> =>
-  Effect.servicesWith((services) =>
+  Effect.contextWith((context) =>
     toWebResult(self, {
-      services,
+      context,
       signal: options?.signal
     }).asEffect()
   )

package/src/unstable/http/HttpServerResponse.ts

@@ -1,6 +1,7 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as ErrorReporter from "../../ErrorReporter.ts"
 import type * as FileSystem from "../../FileSystem.ts"
@@ -14,7 +15,6 @@ import { hasProperty } from "../../Predicate.ts"
 import { redact } from "../../Redactable.ts"
 import type * as Schema from "../../Schema.ts"
 import type { ParseOptions } from "../../SchemaAST.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Stream from "../../Stream.ts"
 import type { Mutable } from "../../Types.ts"
 import * as Cookies from "./Cookies.ts"
@@ -207,10 +207,10 @@ export const htmlStream = <
   Template.Interpolated.Context<A[number]>
 > =>
   Effect.map(
-    Effect.services<Template.Interpolated.Context<A[number]>>(),
+    Effect.context<Template.Interpolated.Context<A[number]>>(),
     (context) =>
       stream(
-        Stream.provideServices(
+        Stream.provideContext(
           Stream.encodeText(Template.stream(strings, ...args)),
           context
         ),
@@ -360,7 +360,7 @@ export const stream = <E>(
   })
 }
 
-const HttpPlatformKey = ServiceMap.Service<
+const HttpPlatformKey = Context.Service<
   HttpPlatform,
   HttpPlatform["Service"]
 >("effect/http/HttpPlatform" satisfies typeof HttpPlatform.key)
@@ -847,7 +847,7 @@ export const toWeb = (
   response: HttpServerResponse,
   options?: {
     readonly withoutBody?: boolean | undefined
-    readonly services?: ServiceMap.ServiceMap<never> | undefined
+    readonly context?: Context.Context<never> | undefined
   }
 ): Response => {
   const headers = new globalThis.Headers(response.headers)
@@ -898,7 +898,7 @@ export const toWeb = (
       return new Response(
         Stream.toReadableStreamWith(
           body.stream,
-          options?.services ?? ServiceMap.empty()
+          options?.context ?? Context.empty()
         ),
         {
           status: response.status,
@@ -1089,8 +1089,8 @@ class ServerHttpClientResponse extends Inspectable.Class implements HttpClientRe
     if (body._tag === "FormData") {
       return Effect.succeed(body.formData)
     }
-    return Effect.servicesWith((services: ServiceMap.ServiceMap<never>) => {
-      const readableStream = Stream.toReadableStreamWith(this.stream, services)
+    return Effect.contextWith((context: Context.Context<never>) => {
+      const readableStream = Stream.toReadableStreamWith(this.stream, context)
       return Effect.tryPromise({
         try: () => new Response(readableStream, { headers: this.headers }).formData(),
         catch: (cause) => this.decodeError(cause)

package/src/unstable/http/Multipart.ts

@@ -4,6 +4,7 @@
 import * as Arr from "../../Array.ts"
 import * as Cause from "../../Cause.ts"
 import * as Channel from "../../Channel.ts"
+import * as Context from "../../Context.ts"
 import * as Data from "../../Data.ts"
 import * as Effect from "../../Effect.ts"
 import * as Exit from "../../Exit.ts"
@@ -18,7 +19,6 @@ import * as Schema from "../../Schema.ts"
 import type { ParseOptions } from "../../SchemaAST.ts"
 import * as Transformation from "../../SchemaTransformation.ts"
 import type * as Scope from "../../Scope.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Stream from "../../Stream.ts"
 import * as UndefinedOr from "../../UndefinedOr.ts"
 import * as IncomingMessage from "./HttpIncomingMessage.ts"
@@ -260,7 +260,7 @@ export const makeConfig = (
   headers: Record<string, string>
 ): Effect.Effect<MP.BaseConfig> =>
   Effect.withFiber((fiber) => {
-    const mimeTypes = ServiceMap.get(fiber.services, FieldMimeTypes)
+    const mimeTypes = Context.get(fiber.context, FieldMimeTypes)
     return Effect.succeed<MP.BaseConfig>({
       headers,
       maxParts: fiber.getRef(MaxParts),
@@ -569,7 +569,7 @@ export const limitsServices = (options: {
   readonly maxFileSize?: FileSystem.SizeInput | undefined
   readonly maxTotalSize?: FileSystem.SizeInput | undefined
   readonly fieldMimeTypes?: ReadonlyArray<string> | undefined
-}): ServiceMap.ServiceMap<never> => {
+}): Context.Context<never> => {
   const map = new Map<string, unknown>()
   if (options.maxParts !== undefined) {
     map.set(MaxParts.key, options.maxParts)
@@ -586,7 +586,7 @@ export const limitsServices = (options: {
   if (options.fieldMimeTypes !== undefined) {
     map.set(FieldMimeTypes.key, options.fieldMimeTypes)
   }
-  return ServiceMap.makeUnsafe(map)
+  return Context.makeUnsafe(map)
 }
 
 /**
@@ -611,7 +611,7 @@ export declare namespace withLimits {
  * @since 4.0.0
  * @category References
  */
-export const MaxParts = ServiceMap.Reference<number | undefined>("effect/http/Multipart/MaxParts", {
+export const MaxParts = Context.Reference<number | undefined>("effect/http/Multipart/MaxParts", {
   defaultValue: () => undefined
 })
 
@@ -619,7 +619,7 @@ export const MaxParts = ServiceMap.Reference<number | undefined>("effect/http/Mu
  * @since 4.0.0
  * @category References
  */
-export const MaxFieldSize = ServiceMap.Reference<FileSystem.SizeInput>("effect/http/Multipart/MaxFieldSize", {
+export const MaxFieldSize = Context.Reference<FileSystem.SizeInput>("effect/http/Multipart/MaxFieldSize", {
   defaultValue: constant(FileSystem.Size(10 * 1024 * 1024))
 })
 
@@ -627,7 +627,7 @@ export const MaxFieldSize = ServiceMap.Reference<FileSystem.SizeInput>("effect/h
  * @since 4.0.0
  * @category References
  */
-export const MaxFileSize = ServiceMap.Reference<FileSystem.SizeInput | undefined>(
+export const MaxFileSize = Context.Reference<FileSystem.SizeInput | undefined>(
   "effect/http/Multipart/MaxFileSize",
   { defaultValue: () => undefined }
 )
@@ -636,6 +636,6 @@ export const MaxFileSize = ServiceMap.Reference<FileSystem.SizeInput | undefined
  * @since 4.0.0
  * @category References
  */
-export const FieldMimeTypes = ServiceMap.Reference<ReadonlyArray<string>>("effect/http/Multipart/FieldMimeTypes", {
+export const FieldMimeTypes = Context.Reference<ReadonlyArray<string>>("effect/http/Multipart/FieldMimeTypes", {
   defaultValue: constant(["application/json"])
 })

package/src/unstable/httpapi/HttpApi.ts

@@ -2,12 +2,12 @@
  * @since 4.0.0
  */
 import type { NonEmptyReadonlyArray } from "../../Array.ts"
+import * as Context from "../../Context.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Record from "../../Record.ts"
 import type * as Schema from "../../Schema.ts"
 import type * as AST from "../../SchemaAST.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type { Mutable } from "../../Types.ts"
 import type { PathInput } from "../http/HttpRouter.ts"
 import * as HttpApiEndpoint from "./HttpApiEndpoint.ts"
@@ -40,7 +40,7 @@ export interface HttpApi<
   readonly [TypeId]: typeof TypeId
   readonly identifier: Id
   readonly groups: Record.ReadonlyRecord<string, Groups>
-  readonly annotations: ServiceMap.ServiceMap<never>
+  readonly annotations: Context.Context<never>
 
   /**
    * Add a `HttpApiGroup` to the `HttpApi`.
@@ -67,18 +67,18 @@ export interface HttpApi<
    * api is called.
    */
   middleware<I extends HttpApiMiddleware.AnyId, S>(
-    middleware: ServiceMap.Key<I, S>
+    middleware: Context.Key<I, S>
   ): HttpApi<Id, HttpApiGroup.AddMiddleware<Groups, I>>
 
   /**
    * Annotate the `HttpApi`.
    */
-  annotate<I, S>(tag: ServiceMap.Key<I, S>, value: S): HttpApi<Id, Groups>
+  annotate<I, S>(tag: Context.Key<I, S>, value: S): HttpApi<Id, Groups>
 
   /**
-   * Annotate the `HttpApi` with a ServiceMap.
+   * Annotate the `HttpApi` with a Context.
    */
-  annotateMerge<I>(context: ServiceMap.ServiceMap<I>): HttpApi<Id, Groups>
+  annotateMerge<I>(context: Context.Context<I>): HttpApi<Id, Groups>
 }
 
 /**
@@ -121,7 +121,7 @@ const Proto = {
     const newGroups = { ...this.groups }
     for (const key in api.groups) {
       const newGroup: Mutable<HttpApiGroup.AnyWithProps> = api.groups[key]
-      newGroup.annotations = ServiceMap.merge(api.annotations, newGroup.annotations)
+      newGroup.annotations = Context.merge(api.annotations, newGroup.annotations)
       newGroups[key] = newGroup as any
     }
     return makeProto({
@@ -144,18 +144,18 @@ const Proto = {
       annotations: this.annotations
     })
   },
-  annotate(this: AnyWithProps, key: ServiceMap.Key<any, any>, value: any) {
+  annotate(this: AnyWithProps, key: Context.Key<any, any>, value: any) {
     return makeProto({
       identifier: this.identifier,
       groups: this.groups,
-      annotations: ServiceMap.add(this.annotations, key, value)
+      annotations: Context.add(this.annotations, key, value)
     })
   },
-  annotateMerge(this: AnyWithProps, annotations: ServiceMap.ServiceMap<never>) {
+  annotateMerge(this: AnyWithProps, annotations: Context.Context<never>) {
     return makeProto({
       identifier: this.identifier,
       groups: this.groups,
-      annotations: ServiceMap.merge(this.annotations, annotations)
+      annotations: Context.merge(this.annotations, annotations)
     })
   }
 }
@@ -164,7 +164,7 @@ const makeProto = <Id extends string, Groups extends HttpApiGroup.Any>(
   options: {
     readonly identifier: Id
     readonly groups: Record.ReadonlyRecord<string, Groups>
-    readonly annotations: ServiceMap.ServiceMap<never>
+    readonly annotations: Context.Context<never>
   }
 ): HttpApi<Id, Groups> => {
   function HttpApi() {}
@@ -188,7 +188,7 @@ export const make = <const Id extends string>(identifier: Id): HttpApi<Id, never
   makeProto({
     identifier,
     groups: new Map() as any,
-    annotations: ServiceMap.empty()
+    annotations: Context.empty()
   })
 
 /**
@@ -206,12 +206,12 @@ export const reflect = <Id extends string, Groups extends HttpApiGroup.Any>(
       | undefined
     readonly onGroup: (options: {
       readonly group: HttpApiGroup.AnyWithProps
-      readonly mergedAnnotations: ServiceMap.ServiceMap<never>
+      readonly mergedAnnotations: Context.Context<never>
     }) => void
     readonly onEndpoint: (options: {
       readonly group: HttpApiGroup.AnyWithProps
       readonly endpoint: HttpApiEndpoint.AnyWithProps
-      readonly mergedAnnotations: ServiceMap.ServiceMap<never>
+      readonly mergedAnnotations: Context.Context<never>
       readonly middleware: ReadonlySet<HttpApiMiddleware.AnyService>
       readonly successes: ReadonlyMap<number, readonly [Schema.Top, ...Array<Schema.Top>]>
       readonly errors: ReadonlyMap<number, readonly [Schema.Top, ...Array<Schema.Top>]>
@@ -220,7 +220,7 @@ export const reflect = <Id extends string, Groups extends HttpApiGroup.Any>(
 ) => {
   const groups = Object.values(self.groups) as any as Array<HttpApiGroup.AnyWithProps>
   for (const group of groups) {
-    const groupAnnotations = ServiceMap.merge(self.annotations, group.annotations)
+    const groupAnnotations = Context.merge(self.annotations, group.annotations)
     options.onGroup({
       group,
       mergedAnnotations: groupAnnotations
@@ -238,7 +238,7 @@ export const reflect = <Id extends string, Groups extends HttpApiGroup.Any>(
         group,
         endpoint,
         middleware: endpoint.middlewares as any,
-        mergedAnnotations: ServiceMap.merge(groupAnnotations, endpoint.annotations),
+        mergedAnnotations: Context.merge(groupAnnotations, endpoint.annotations),
         successes: extractResponseContent(
           HttpApiEndpoint.getSuccessSchemas(endpoint),
           HttpApiSchema.getStatusSuccess
@@ -283,7 +283,7 @@ const extractResponseContent = (
  * @since 4.0.0
  * @category tags
  */
-export class AdditionalSchemas extends ServiceMap.Service<
+export class AdditionalSchemas extends Context.Service<
   AdditionalSchemas,
   ReadonlyArray<Schema.Top>
 >()("effect/httpapi/HttpApi/AdditionalSchemas") {}