effect 4.0.0-beta.42 → 4.0.0-beta.44

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") {}

package/src/unstable/httpapi/HttpApiBuilder.ts

@@ -1,6 +1,7 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as Encoding from "../../Encoding.ts"
 import * as Fiber from "../../Fiber.ts"
@@ -18,7 +19,6 @@ import type * as AST from "../../SchemaAST.ts"
 import * as Issue from "../../SchemaIssue.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 type { Covariant, NoInfer } from "../../Types.ts"
 import * as UndefinedOr from "../../UndefinedOr.ts"
@@ -64,7 +64,7 @@ export const layer = <Id extends string, Groups extends HttpApiGroup.Any>(
   | HttpApiGroup.ToService<Id, Groups>
 > =>
   HttpRouter.use(Effect.fnUntraced(function*(router) {
-    const services = yield* Effect.services<
+    const services = yield* Effect.context<
       | Etag.Generator
       | HttpRouter.HttpRouter
       | FileSystem
@@ -119,8 +119,8 @@ export const group = <
   Handlers.Error<Return>,
   Exclude<Handlers.Context<Return>, Scope.Scope>
 > =>
-  Layer.effectServices(Effect.gen(function*() {
-    const services = yield* Effect.services<any>()
+  Layer.effectContext(Effect.gen(function*() {
+    const services = yield* Effect.context<any>()
     const group = api.groups[groupName]!
     const result = build(makeHandlers(group))
     const handlers: Handlers<any, any> = Effect.isEffect(result)
@@ -130,7 +130,7 @@ export const group = <
     for (const item of handlers.handlers) {
       routes.push(handlerToRoute(group as any, item, services))
     }
-    return ServiceMap.makeUnsafe(new Map([[group.key, routes]]))
+    return Context.makeUnsafe(new Map([[group.key, routes]]))
   })) as any
 
 /**
@@ -330,10 +330,10 @@ export const endpoint = <
   | HttpPlatform
   | Path
 > =>
-  Effect.servicesWith((services: ServiceMap.ServiceMap<any>) => {
+  Effect.contextWith((context: Context.Context<any>) => {
     const group = api.groups[groupName] as unknown as HttpApiGroup.AnyWithProps
     const endpoint = group.endpoints[endpointName] as unknown as HttpApiEndpoint.AnyWithProps
-    return Effect.succeed(handlerToHttpEffect(group, endpoint, services, handler as any, false))
+    return Effect.succeed(handlerToHttpEffect(group, endpoint, context, handler as any, false))
   })
 
 /**
@@ -521,14 +521,14 @@ function decodePayload(
         return Effect.flatMap(
           Effect.orDie(UndefinedOr.match(existing.limits, {
             onUndefined: () => httpRequest.multipart,
-            onDefined: (limits) => Effect.provideServices(httpRequest.multipart, Multipart.limitsServices(limits))
+            onDefined: (limits) => Effect.provideContext(httpRequest.multipart, Multipart.limitsServices(limits))
           })),
           decode
         )
       }
       return Effect.succeed(UndefinedOr.match(existing.limits, {
         onUndefined: () => httpRequest.multipartStream,
-        onDefined: (limits) => Stream.provideServices(httpRequest.multipartStream, Multipart.limitsServices(limits))
+        onDefined: (limits) => Stream.provideContext(httpRequest.multipartStream, Multipart.limitsServices(limits))
       }))
     }
     case "Json":
@@ -552,7 +552,7 @@ function decodePayload(
 function handlerToHttpEffect(
   group: HttpApiGroup.AnyWithProps,
   endpoint: HttpApiEndpoint.AnyWithProps,
-  services: ServiceMap.ServiceMap<any>,
+  context: Context.Context<any>,
   handler: HttpApiEndpoint.Handler<any, any, any>,
   isRaw: boolean
 ) {
@@ -568,13 +568,13 @@ function handlerToHttpEffect(
   return applyMiddleware(
     group,
     endpoint,
-    services,
+    context,
     Effect.gen(function*() {
       const fiber = Fiber.getCurrent()!
-      const services = fiber.services
-      const httpRequest = ServiceMap.getUnsafe(services, HttpServerRequest)
-      const routeContext = ServiceMap.getUnsafe(services, HttpRouter.RouteContext)
-      const query = ServiceMap.getUnsafe(services, Request.ParsedSearchParams)
+      const context = fiber.context
+      const httpRequest = Context.getUnsafe(context, HttpServerRequest)
+      const routeContext = Context.getUnsafe(context, HttpRouter.RouteContext)
+      const query = Context.getUnsafe(context, Request.ParsedSearchParams)
       const request: any = {
         request: httpRequest,
         endpoint,
@@ -604,20 +604,20 @@ function handlerToHttpEffect(
   ).pipe(
     Effect.withErrorReporting,
     Effect.catch((error) => Effect.orDie(encodeError(error))),
-    Effect.provideServices(services)
+    Effect.provideContext(context)
   )
 }
 
 function handlerToRoute(
   group: HttpApiGroup.AnyWithProps,
   handler: Handlers.Item<any>,
-  services: ServiceMap.ServiceMap<any>
+  context: Context.Context<any>
 ): HttpRouter.Route<any, any> {
   const endpoint = handler.endpoint
   return HttpRouter.route(
     endpoint.method,
     endpoint.path as HttpRouter.PathInput,
-    handlerToHttpEffect(group, endpoint, services, handler.handler, handler.isRaw),
+    handlerToHttpEffect(group, endpoint, context, handler.handler, handler.isRaw),
     { uninterruptible: handler.uninterruptible }
   )
 }
@@ -636,13 +636,13 @@ const getRequestMediaType = (request: HttpServerRequest): string => {
 const applyMiddleware = <A extends Effect.Effect<any, any, any>>(
   group: HttpApiGroup.AnyWithProps,
   endpoint: HttpApiEndpoint.AnyWithProps,
-  services: ServiceMap.ServiceMap<any>,
+  context: Context.Context<any>,
   handler: A
 ) => {
   const options = { group, endpoint }
   for (const key_ of endpoint.middlewares) {
     const key = key_ as any as HttpApiMiddleware.AnyService
-    const service = ServiceMap.getUnsafe(services, key as any) as HttpApiMiddleware.HttpApiMiddleware<any, any, any>
+    const service = Context.getUnsafe(context, key as any) as HttpApiMiddleware.HttpApiMiddleware<any, any, any>
     const apply = HttpApiMiddleware.isSecurity(key)
       ? makeSecurityMiddleware(key, service as any)
       : service

package/src/unstable/httpapi/HttpApiClient.ts

@@ -3,6 +3,7 @@
  */
 import * as Arr from "../../Array.ts"
 import * as Cause from "../../Cause.ts"
+import type * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import { identity } from "../../Function.ts"
 import * as Option from "../../Option.ts"
@@ -11,7 +12,6 @@ import * as Schema from "../../Schema.ts"
 import * as AST from "../../SchemaAST.ts"
 import * as Issue from "../../SchemaIssue.ts"
 import * as Transformation from "../../SchemaTransformation.ts"
-import type * as ServiceMap from "../../ServiceMap.ts"
 import type { Simplify } from "../../Types.ts"
 import * as UndefinedOr from "../../UndefinedOr.ts"
 import * as HttpBody from "../http/HttpBody.ts"
@@ -186,12 +186,12 @@ const makeClient = <ApiId extends string, Groups extends HttpApiGroup.Any, E, R>
     }>
     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>]>
@@ -204,7 +204,7 @@ const makeClient = <ApiId extends string, Groups extends HttpApiGroup.Any, E, R>
   }
 ): Effect.Effect<void, unknown, unknown> =>
   Effect.gen(function*() {
-    const services = yield* Effect.services<any>()
+    const services = yield* Effect.context<any>()
 
     const httpClient = options.httpClient.pipe(
       options?.baseUrl === undefined

package/src/unstable/httpapi/HttpApiEndpoint.ts

@@ -3,12 +3,12 @@
  */
 import * as Arr from "../../Array.ts"
 import type { Brand } from "../../Brand.ts"
+import * as Context from "../../Context.ts"
 import type { Effect } from "../../Effect.ts"
 import { identity } from "../../Function.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type * as Stream from "../../Stream.ts"
 import type * as Types from "../../Types.ts"
 import type { HttpMethod } from "../http/HttpMethod.ts"
@@ -77,8 +77,8 @@ export interface HttpApiEndpoint<
   readonly payload: PayloadMap
   readonly success: ReadonlySet<Schema.Top>
   readonly error: ReadonlySet<Schema.Top>
-  readonly annotations: ServiceMap.ServiceMap<never>
-  readonly middlewares: ReadonlySet<ServiceMap.Key<Middleware, any>>
+  readonly annotations: Context.Context<never>
+  readonly middlewares: ReadonlySet<Context.Key<Middleware, any>>
 
   /**
    * Add a prefix to the path of the endpoint.
@@ -102,7 +102,7 @@ export interface HttpApiEndpoint<
   /**
    * Add an `HttpApiMiddleware` to the endpoint.
    */
-  middleware<I extends HttpApiMiddleware.AnyId, S>(middleware: ServiceMap.Key<I, S>): HttpApiEndpoint<
+  middleware<I extends HttpApiMiddleware.AnyId, S>(middleware: Context.Key<I, S>): HttpApiEndpoint<
     Name,
     Method,
     Path,
@@ -120,7 +120,7 @@ export interface HttpApiEndpoint<
    * Add an annotation on the endpoint.
    */
   annotate<I, S>(
-    key: ServiceMap.Key<I, S>,
+    key: Context.Key<I, S>,
     value: Types.NoInfer<S>
   ): HttpApiEndpoint<
     Name,
@@ -137,10 +137,10 @@ export interface HttpApiEndpoint<
   >
 
   /**
-   * Merge the annotations of the endpoint with the provided service map.
+   * Merge the annotations of the endpoint with the provided context.
    */
   annotateMerge<I>(
-    annotations: ServiceMap.ServiceMap<I>
+    annotations: Context.Context<I>
   ): HttpApiEndpoint<
     Name,
     Method,
@@ -800,16 +800,16 @@ const Proto = {
       middlewares: new Set([...this.middlewares, middleware as any])
     })
   },
-  annotate(this: AnyWithProps, key: ServiceMap.Key<any, any>, value: any) {
+  annotate(this: AnyWithProps, key: Context.Key<any, any>, value: any) {
     return makeProto({
       ...this,
-      annotations: ServiceMap.add(this.annotations, key, value)
+      annotations: Context.add(this.annotations, key, value)
     })
   },
-  annotateMerge(this: AnyWithProps, annotations: ServiceMap.ServiceMap<any>) {
+  annotateMerge(this: AnyWithProps, annotations: Context.Context<any>) {
     return makeProto({
       ...this,
-      annotations: ServiceMap.merge(this.annotations, annotations)
+      annotations: Context.merge(this.annotations, annotations)
     })
   }
 }
@@ -836,8 +836,8 @@ function makeProto<
   readonly payload: PayloadMap
   readonly success: ReadonlySet<Schema.Top>
   readonly error: ReadonlySet<Schema.Top>
-  readonly annotations: ServiceMap.ServiceMap<never>
-  readonly middlewares: ReadonlySet<ServiceMap.Key<Middleware, any>>
+  readonly annotations: Context.Context<never>
+  readonly middlewares: ReadonlySet<Context.Key<Middleware, any>>
 }): HttpApiEndpoint<
   Name,
   Method,
@@ -1032,7 +1032,7 @@ export const make = <Method extends HttpMethod>(method: Method): {
     payload: getPayload(options?.payload, method, disableCodecs),
     success: getResponse(options?.success, disableCodecs),
     error: getResponse(options?.error, disableCodecs),
-    annotations: ServiceMap.empty(),
+    annotations: Context.empty(),
     middlewares: new Set()
   })
 }