effect 4.0.0-beta.43 → 4.0.0-beta.45

package/src/unstable/http/Etag.ts

@@ -1,11 +1,11 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import type * as FileSystem from "../../FileSystem.ts"
 import * as Layer from "../../Layer.ts"
 import * as Option from "../../Option.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type * as Body from "./HttpBody.ts"
 
 /**
@@ -49,7 +49,7 @@ export const toString = (self: Etag): string => {
  * @since 4.0.0
  * @category models
  */
-export class Generator extends ServiceMap.Service<Generator, {
+export class Generator extends Context.Service<Generator, {
   readonly fromFileInfo: (info: FileSystem.File.Info) => Effect.Effect<Etag>
   readonly fromFileWeb: (file: Body.HttpBody.FileLike) => Effect.Effect<Etag>
 }>()("effect/http/Etag/Generator") {}

package/src/unstable/http/FetchHttpClient.ts

@@ -1,9 +1,9 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import type * as Layer from "../../Layer.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Stream from "../../Stream.ts"
 import * as Headers from "./Headers.ts"
 import * as HttpClient from "./HttpClient.ts"
@@ -14,7 +14,7 @@ import * as HttpClientResponse from "./HttpClientResponse.ts"
  * @since 4.0.0
  * @category tags
  */
-export const Fetch = ServiceMap.Reference<typeof globalThis.fetch>("effect/http/FetchHttpClient/Fetch", {
+export const Fetch = Context.Reference<typeof globalThis.fetch>("effect/http/FetchHttpClient/Fetch", {
   defaultValue: () => globalThis.fetch
 })
 
@@ -22,13 +22,13 @@ export const Fetch = ServiceMap.Reference<typeof globalThis.fetch>("effect/http/
  * @since 4.0.0
  * @category tags
  */
-export class RequestInit extends ServiceMap.Service<RequestInit, globalThis.RequestInit>()(
+export class RequestInit extends Context.Service<RequestInit, globalThis.RequestInit>()(
   "effect/http/FetchHttpClient/RequestInit"
 ) {}
 
 const fetch: HttpClient.HttpClient = HttpClient.make((request, url, signal, fiber) => {
   const fetch = fiber.getRef(Fetch)
-  const options: globalThis.RequestInit = fiber.services.mapUnsafe.get(RequestInit.key) ?? {}
+  const options: globalThis.RequestInit = fiber.context.mapUnsafe.get(RequestInit.key) ?? {}
   const headers = options.headers ? Headers.merge(Headers.fromInput(options.headers), request.headers) : request.headers
   const send = (body: BodyInit | undefined) =>
     Effect.map(
@@ -68,4 +68,4 @@ const fetch: HttpClient.HttpClient = HttpClient.make((request, url, signal, fibe
  * @since 4.0.0
  * @category layers
  */
-export const layer: Layer.Layer<HttpClient.HttpClient> = HttpClient.layerMergedServices(Effect.succeed(fetch))
+export const layer: Layer.Layer<HttpClient.HttpClient> = HttpClient.layerMergedContext(Effect.succeed(fetch))

package/src/unstable/http/Headers.ts

@@ -1,6 +1,7 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Equal from "../../Equal.ts"
 import * as Equ from "../../Equivalence.ts"
 import { dual } from "../../Function.ts"
@@ -13,7 +14,6 @@ import * as Redactable from "../../Redactable.ts"
 import * as Redacted from "../../Redacted.ts"
 import * as Schema from "../../Schema.ts"
 import * as Transformation from "../../SchemaTransformation.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type { Mutable } from "../../Types.ts"
 
 /**
@@ -52,8 +52,8 @@ Object.defineProperties(Proto, {
     value: TypeId
   },
   [Redactable.symbolRedactable]: {
-    value(this: Headers, context: ServiceMap.ServiceMap<never>): Record<string, string | Redacted.Redacted<string>> {
-      return redact(this, ServiceMap.get(context, CurrentRedactedNames))
+    value(this: Headers, context: Context.Context<never>): Record<string, string | Redacted.Redacted<string>> {
+      return redact(this, Context.get(context, CurrentRedactedNames))
     }
   },
   toJSON: {
@@ -438,7 +438,7 @@ export const redact: {
  * @since 4.0.0
  * @category fiber refs
  */
-export const CurrentRedactedNames = ServiceMap.Reference<
+export const CurrentRedactedNames = Context.Reference<
   ReadonlyArray<string | RegExp>
 >("effect/Headers/CurrentRedactedNames", {
   defaultValue: () => [

package/src/unstable/http/HttpClient.ts

@@ -4,6 +4,7 @@
 import type { NonEmptyReadonlyArray } from "../../Array.ts"
 import * as Cause from "../../Cause.ts"
 import { Clock } from "../../Clock.ts"
+import * as Context from "../../Context.ts"
 import * as Duration from "../../Duration.ts"
 import * as Effect from "../../Effect.ts"
 import * as Fiber from "../../Fiber.ts"
@@ -17,7 +18,6 @@ import * as Ref from "../../Ref.ts"
 import * as Result from "../../Result.ts"
 import * as Schedule from "../../Schedule.ts"
 import type * as Scope from "../../Scope.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Stream from "../../Stream.ts"
 import * as Tracer from "../../Tracer.ts"
 import type { EqualsWith, ExcludeTag, ExtractTag, NoExcessProperties, NoInfer, Tags } from "../../Types.ts"
@@ -113,7 +113,7 @@ export declare namespace HttpClient {
  * @since 4.0.0
  * @category tags
  */
-export const HttpClient: ServiceMap.Service<HttpClient, HttpClient> = ServiceMap.Service<HttpClient, HttpClient>(
+export const HttpClient: Context.Service<HttpClient, HttpClient> = Context.Service<HttpClient, HttpClient>(
   "effect/HttpClient"
 )
 
@@ -874,6 +874,7 @@ export declare namespace Retry {
    */
   export type Return<R, E, O extends NoExcessProperties<Effect.Retry.Options<E>, O>> = HttpClient.With<
     | (O extends { schedule: Schedule.Schedule<infer _O, infer _I, infer _E, infer _R> } ? E | _E
+      : O extends { times: number } ? E
       : O extends { until: Predicate.Refinement<E, infer E2> } ? E2
       : E)
     | (O extends { while: (...args: Array<any>) => Effect.Effect<infer _A, infer E, infer _R> } ? E : never)
@@ -1589,7 +1590,7 @@ export const followRedirects: {
  * @since 4.0.0
  * @category References
  */
-export const TracerDisabledWhen = ServiceMap.Reference<
+export const TracerDisabledWhen = Context.Reference<
   Predicate.Predicate<HttpClientRequest.HttpClientRequest>
 >("effect/http/HttpClient/TracerDisabledWhen", {
   defaultValue: () => constFalse
@@ -1599,7 +1600,7 @@ export const TracerDisabledWhen = ServiceMap.Reference<
  * @since 4.0.0
  * @category References
  */
-export const TracerPropagationEnabled = ServiceMap.Reference<boolean>("effect/HttpClient/TracerPropagationEnabled", {
+export const TracerPropagationEnabled = Context.Reference<boolean>("effect/HttpClient/TracerPropagationEnabled", {
   defaultValue: constTrue
 })
 
@@ -1607,7 +1608,7 @@ export const TracerPropagationEnabled = ServiceMap.Reference<boolean>("effect/Ht
  * @since 4.0.0
  * @category References
  */
-export const SpanNameGenerator = ServiceMap.Reference<
+export const SpanNameGenerator = Context.Reference<
   (request: HttpClientRequest.HttpClientRequest) => string
 >("effect/http/HttpClient/SpanNameGenerator", {
   defaultValue: () => (request) => `http.client ${request.method}`
@@ -1616,15 +1617,15 @@ export const SpanNameGenerator = ServiceMap.Reference<
 /**
  * @since 4.0.0
  */
-export const layerMergedServices = <E, R>(
+export const layerMergedContext = <E, R>(
   effect: Effect.Effect<HttpClient, E, R>
 ): Layer.Layer<HttpClient, E, R> =>
   Layer.effect(HttpClient)(
-    Effect.servicesWith((services: ServiceMap.ServiceMap<never>) =>
+    Effect.contextWith((context: Context.Context<never>) =>
       Effect.map(effect, (client) =>
         transformResponse(
           client,
-          Effect.updateServices((input: ServiceMap.ServiceMap<never>) => ServiceMap.merge(services, input))
+          Effect.updateContext((input: Context.Context<never>) => Context.merge(context, input))
         ))
     )
   )

package/src/unstable/http/HttpClientRequest.ts

@@ -1,6 +1,7 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import type * as FileSystem from "../../FileSystem.ts"
 import { dual } from "../../Function.ts"
@@ -15,7 +16,6 @@ import type * as Redacted from "../../Redacted.ts"
 import * as Result from "../../Result.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 * as Headers from "./Headers.ts"
 import * as HttpBody from "./HttpBody.ts"
@@ -994,7 +994,7 @@ const parseContentLength = (contentLength: string | null): number | undefined =>
  */
 export const toWebResult = (self: HttpClientRequest, options?: {
   readonly signal?: AbortSignal | undefined
-  readonly services?: ServiceMap.ServiceMap<never> | undefined
+  readonly context?: Context.Context<never> | undefined
 }): Result.Result<Request, UrlParams.UrlParamsError> => {
   const url = UrlParams.makeUrl(self.url, self.urlParams, Option.getOrUndefined(self.hash))
   if (Result.isFailure(url)) {
@@ -1028,7 +1028,7 @@ export const toWebResult = (self: HttpClientRequest, options?: {
         break
       }
       case "Stream": {
-        requestInit.body = Stream.toReadableStreamWith(self.body.stream, options?.services ?? ServiceMap.empty())
+        requestInit.body = Stream.toReadableStreamWith(self.body.stream, options?.context ?? Context.empty())
         ;(requestInit as any).duplex = "half"
         break
       }
@@ -1050,9 +1050,9 @@ const isReadableStream = (u: unknown): u is ReadableStream<Uint8Array> =>
 export const toWeb = (self: HttpClientRequest, options?: {
   readonly signal?: AbortSignal | undefined
 }): Effect.Effect<Request, UrlParams.UrlParamsError> =>
-  Effect.servicesWith((services) =>
+  Effect.contextWith((context) =>
     toWebResult(self, {
-      services,
+      context: context,
       signal: options?.signal
     }).asEffect()
   )

package/src/unstable/http/HttpEffect.ts

@@ -2,6 +2,7 @@
  * @since 4.0.0
  */
 import type * as Cause from "../../Cause.ts"
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import * as Exit from "../../Exit.ts"
 import * as Fiber from "../../Fiber.ts"
@@ -9,7 +10,6 @@ import { dual } from "../../Function.ts"
 import { reportCauseUnsafe } from "../../internal/effect.ts"
 import * as Layer from "../../Layer.ts"
 import * as Scope from "../../Scope.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Stream from "../../Stream.ts"
 import * as HttpBody from "./HttpBody.ts"
 import { type HttpMiddleware, tracer } from "./HttpMiddleware.ts"
@@ -36,7 +36,7 @@ export const toHandled = <E, R, EH, RH>(
     Effect.flatMapEager(causeResponse(cause), ([response, cause]) => {
       const fiber = Fiber.getCurrent()!
       reportCauseUnsafe(fiber, cause)
-      const request = ServiceMap.getUnsafe(fiber.services, HttpServerRequest)
+      const request = Context.getUnsafe(fiber.context, HttpServerRequest)
       const handler = requestPreResponseHandlers.get(request.source)
       const cont = cause.reasons.length === 0 ? Effect.succeed(response) : Effect.failCause(cause)
       if (handler === undefined) {
@@ -59,7 +59,7 @@ export const toHandled = <E, R, EH, RH>(
   const responded = Effect.matchCauseEffect(self, {
     onSuccess: (response) => {
       const fiber = Fiber.getCurrent()!
-      const request = ServiceMap.getUnsafe(fiber.services, HttpServerRequest)
+      const request = Context.getUnsafe(fiber.context, HttpServerRequest)
       const handler = requestPreResponseHandlers.get(request.source)
       if (handler === undefined) {
         ;(request as any)[handledSymbol] = true
@@ -83,7 +83,7 @@ export const toHandled = <E, R, EH, RH>(
       onFailure(cause): Effect.Effect<void, EH, RH> {
         const fiber = Fiber.getCurrent()!
         reportCauseUnsafe(fiber, cause)
-        const request = ServiceMap.getUnsafe(fiber.services, HttpServerRequest)
+        const request = Context.getUnsafe(fiber.context, HttpServerRequest)
         if (handledSymbol in request) return Effect.void
         return Effect.matchCauseEffectEager(causeResponse(cause), {
           onFailure(_) {
@@ -96,7 +96,7 @@ export const toHandled = <E, R, EH, RH>(
       },
       onSuccess(response): Effect.Effect<void, EH, RH> {
         const fiber = Fiber.getCurrent()!
-        const request = ServiceMap.getUnsafe(fiber.services, Request.HttpServerRequest)
+        const request = Context.getUnsafe(fiber.context, Request.HttpServerRequest)
         return handledSymbol in request ? Effect.void : handleResponse(request, response)
       }
     })
@@ -128,7 +128,7 @@ export const scopeTransferToStream = (
     return response
   }
   const fiber = Fiber.getCurrent()!
-  const scope = ServiceMap.getUnsafe(fiber.services, Scope.Scope) as Scope.Closeable
+  const scope = Context.getUnsafe(fiber.context, Scope.Scope) as Scope.Closeable
   scopeDisableClose(scope)
   return Response.setBody(
     response,
@@ -145,10 +145,10 @@ const scopeEjected = Symbol.for("effect/http/HttpEffect/scopeEjected")
 const scoped = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
   Effect.withFiber((fiber) => {
     const scope = Scope.makeUnsafe()
-    const prevServices = fiber.services
-    fiber.setServices(ServiceMap.add(fiber.services, Scope.Scope, scope))
+    const prevServices = fiber.context
+    fiber.setContext(Context.add(fiber.context, Scope.Scope, scope))
     return Effect.onExitPrimitive(effect, (exit) => {
-      fiber.setServices(prevServices)
+      fiber.setContext(prevServices)
       if (scopeEjected in scope) return undefined
       return Scope.closeUnsafe(scope, exit)
     }, true)
@@ -218,35 +218,35 @@ export const withPreResponseHandler: {
  * @category conversions
  */
 export const toWebHandlerWith = <Provided, R = never, ReqR = Exclude<R, Provided | Scope.Scope | HttpServerRequest>>(
-  services: ServiceMap.ServiceMap<Provided>
+  context: Context.Context<Provided>
 ) =>
 <E>(
   self: Effect.Effect<HttpServerResponse, E, R>,
   middleware?: HttpMiddleware | undefined
 ): [ReqR] extends [never] ?
-  (request: Request, services?: ServiceMap.ServiceMap<never> | undefined) => Promise<globalThis.Response>
-  : (request: Request, services: ServiceMap.ServiceMap<ReqR>) => Promise<globalThis.Response> =>
+  (request: Request, context?: Context.Context<never> | undefined) => Promise<globalThis.Response>
+  : (request: Request, context: Context.Context<ReqR>) => Promise<globalThis.Response> =>
 {
   const resolveSymbol = Symbol.for("@effect/platform/HttpApp/resolve")
   const httpApp = toHandled(self, (request, response) => {
     response = scopeTransferToStream(response)
     ;(request as any)[resolveSymbol](
-      Response.toWeb(response, { withoutBody: request.method === "HEAD", services })
+      Response.toWeb(response, { withoutBody: request.method === "HEAD", context })
     )
     return Effect.void
   }, middleware)
-  return (request: Request, reqServices?: ServiceMap.ServiceMap<never> | undefined): Promise<globalThis.Response> =>
+  return (request: Request, reqContext?: Context.Context<never> | undefined): Promise<globalThis.Response> =>
     new Promise((resolve) => {
-      const contextMap = new Map<string, any>(services.mapUnsafe)
-      if (ServiceMap.isServiceMap(reqServices)) {
-        for (const [key, value] of reqServices.mapUnsafe) {
+      const contextMap = new Map<string, any>(context.mapUnsafe)
+      if (Context.isContext(reqContext)) {
+        for (const [key, value] of reqContext.mapUnsafe) {
           contextMap.set(key, value)
         }
       }
       const httpServerRequest = Request.fromWeb(request)
       contextMap.set(HttpServerRequest.key, httpServerRequest)
       ;(httpServerRequest as any)[resolveSymbol] = resolve
-      const fiber = Effect.runForkWith(ServiceMap.makeUnsafe(contextMap))(httpApp as any)
+      const fiber = Effect.runForkWith(Context.makeUnsafe(contextMap))(httpApp as any)
       request.signal?.addEventListener("abort", () => {
         fiber.interruptUnsafe(undefined, ClientAbort.annotation)
       }, { once: true })
@@ -260,8 +260,8 @@ export const toWebHandlerWith = <Provided, R = never, ReqR = Exclude<R, Provided
 export const toWebHandler: <E>(
   self: Effect.Effect<HttpServerResponse, E, HttpServerRequest | Scope.Scope>,
   middleware?: HttpMiddleware | undefined
-) => (request: Request, services?: ServiceMap.ServiceMap<never> | undefined) => Promise<globalThis.Response> =
-  toWebHandlerWith(ServiceMap.empty())
+) => (request: Request, context?: Context.Context<never> | undefined) => Promise<globalThis.Response> =
+  toWebHandlerWith(Context.empty())
 
 /**
  * @since 4.0.0
@@ -277,7 +277,7 @@ export const toWebHandlerLayerWith = <
   layer: Layer.Layer<Provided, LE>,
   options: {
     readonly toHandler: (
-      services: ServiceMap.ServiceMap<Provided>
+      context: Context.Context<Provided>
     ) => Effect.Effect<Effect.Effect<HttpServerResponse, E, R>, LE>
     readonly middleware?: HttpMiddleware | undefined
     readonly memoMap?: Layer.MemoMap | undefined
@@ -286,39 +286,39 @@ export const toWebHandlerLayerWith = <
   readonly dispose: () => Promise<void>
   readonly handler: [ReqR] extends [never] ? (
       request: Request,
-      services?: ServiceMap.ServiceMap<never> | undefined
+      context?: Context.Context<never> | undefined
     ) => Promise<globalThis.Response>
     : (
       request: Request,
-      services: ServiceMap.ServiceMap<ReqR>
+      context: Context.Context<ReqR>
     ) => Promise<globalThis.Response>
 } => {
   const scope = Scope.makeUnsafe()
   const dispose = () => Effect.runPromise(Scope.close(scope, Exit.void))
 
   let handlerCache:
-    | ((request: Request, services?: ServiceMap.ServiceMap<ReqR> | undefined) => Promise<globalThis.Response>)
+    | ((request: Request, context?: Context.Context<ReqR> | undefined) => Promise<globalThis.Response>)
     | undefined
   let handlerPromise:
-    | Promise<(request: Request, services?: ServiceMap.ServiceMap<ReqR> | undefined) => Promise<globalThis.Response>>
+    | Promise<(request: Request, context?: Context.Context<ReqR> | undefined) => Promise<globalThis.Response>>
     | undefined
   function handler(
     request: Request,
-    services?: ServiceMap.ServiceMap<ReqR> | undefined
+    context?: Context.Context<ReqR> | undefined
   ): Promise<globalThis.Response> {
     if (handlerCache) {
-      return handlerCache(request, services)
+      return handlerCache(request, context)
     }
     handlerPromise ??= Effect.runPromise(Effect.gen(function*() {
-      const services = yield* (options.memoMap
+      const context = yield* (options.memoMap
         ? Layer.buildWithMemoMap(layer, options.memoMap, scope)
         : Layer.buildWithScope(layer, scope))
-      return handlerCache = toWebHandlerWith<Provided, R>(services)(
-        yield* options.toHandler(services),
+      return handlerCache = toWebHandlerWith<Provided, R>(context)(
+        yield* options.toHandler(context),
         options.middleware
       ) as any
     }))
-    return handlerPromise.then((f) => f(request, services))
+    return handlerPromise.then((f) => f(request, context))
   }
   return { dispose, handler: handler as any } as const
 }
@@ -337,10 +337,10 @@ export const toWebHandlerLayer = <E, R, Provided, LE, ReqR = Exclude<R, Provided
 ): {
   readonly dispose: () => Promise<void>
   readonly handler: [ReqR] extends [never]
-    ? (request: Request, services?: ServiceMap.ServiceMap<never> | undefined) => Promise<globalThis.Response>
+    ? (request: Request, context?: Context.Context<never> | undefined) => Promise<globalThis.Response>
     : (
       request: Request,
-      services: ServiceMap.ServiceMap<ReqR>
+      context: Context.Context<ReqR>
     ) => Promise<globalThis.Response>
 } =>
   toWebHandlerLayerWith(layer, {
@@ -357,10 +357,10 @@ export const fromWebHandler = (
 ): Effect.Effect<HttpServerResponse, HttpServerError, HttpServerRequest> =>
   Effect.callback((resume, signal) => {
     const fiber = Fiber.getCurrent()!
-    const request = ServiceMap.getUnsafe(fiber.services, HttpServerRequest)
+    const request = Context.getUnsafe(fiber.context, HttpServerRequest)
     const requestResult = Request.toWebResult(request, {
       signal,
-      services: fiber.services
+      context: fiber.context
     })
     if (requestResult._tag === "Failure") {
       return resume(Effect.fail(new HttpServerError({ reason: requestResult.failure })))

package/src/unstable/http/HttpIncomingMessage.ts

@@ -1,6 +1,7 @@
 /**
  * @since 4.0.0
  */
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import type * as FileSystem from "../../FileSystem.ts"
 import type * as Inspectable from "../../Inspectable.ts"
@@ -9,7 +10,6 @@ import { hasProperty } from "../../Predicate.ts"
 import { redact } from "../../Redactable.ts"
 import * as Schema from "../../Schema.ts"
 import type { ParseOptions } from "../../SchemaAST.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import type * as Stream from "../../Stream.ts"
 import type * as Headers from "./Headers.ts"
 import * as UrlParams from "./UrlParams.ts"
@@ -90,7 +90,7 @@ export const schemaHeaders = <A, I extends Readonly<Record<string, string | unde
  * @since 4.0.0
  * @category References
  */
-export const MaxBodySize = ServiceMap.Reference<FileSystem.Size | undefined>(
+export const MaxBodySize = Context.Reference<FileSystem.Size | undefined>(
   "effect/http/HttpIncomingMessage/MaxBodySize",
   { defaultValue: () => undefined }
 )

package/src/unstable/http/HttpMiddleware.ts

@@ -2,6 +2,7 @@
  * @since 4.0.0
  */
 import { Clock } from "../../Clock.ts"
+import * as Context from "../../Context.ts"
 import * as Effect from "../../Effect.ts"
 import { constant, constFalse } from "../../Function.ts"
 import * as internalEffect from "../../internal/effect.ts"
@@ -10,7 +11,6 @@ import * as Option from "../../Option.ts"
 import type { Predicate } from "../../Predicate.ts"
 import type { ReadonlyRecord } from "../../Record.ts"
 import { TracerEnabled } from "../../References.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import { ParentSpan } from "../../Tracer.ts"
 import * as Headers from "./Headers.ts"
 import { causeResponseStripped, exitResponse } from "./HttpServerError.ts"
@@ -49,13 +49,26 @@ export const make = <M extends HttpMiddleware>(middleware: M): M => middleware
 
 const loggerDisabledRequests = new WeakSet<object>()
 
+const stripSearchAndHash = (url: string): string => {
+  const queryIndex = url.indexOf("?")
+  const hashIndex = url.indexOf("#")
+
+  if (queryIndex === -1) {
+    return hashIndex === -1 ? url : url.slice(0, hashIndex)
+  }
+  if (hashIndex === -1) {
+    return url.slice(0, queryIndex)
+  }
+  return url.slice(0, Math.min(queryIndex, hashIndex))
+}
+
 /**
  * @since 4.0.0
  * @category Logger
  */
 export const withLoggerDisabled = <A, E, R>(self: Effect.Effect<A, E, R>): Effect.Effect<A, E, R | HttpServerRequest> =>
   Effect.withFiber((fiber) => {
-    const request = ServiceMap.getUnsafe(fiber.services, HttpServerRequest)
+    const request = Context.getUnsafe(fiber.context, HttpServerRequest)
     loggerDisabledRequests.add(request.source)
     return self
   })
@@ -64,7 +77,7 @@ export const withLoggerDisabled = <A, E, R>(self: Effect.Effect<A, E, R>): Effec
  * @since 4.0.0
  * @category Tracer
  */
-export const TracerDisabledWhen = ServiceMap.Reference<Predicate<HttpServerRequest>>(
+export const TracerDisabledWhen = Context.Reference<Predicate<HttpServerRequest>>(
   "effect/http/HttpMiddleware/TracerDisabledWhen",
   { defaultValue: () => constFalse }
 )
@@ -81,7 +94,7 @@ export const layerTracerDisabledForUrls = (
  * @since 4.0.0
  * @category Tracer
  */
-export const SpanNameGenerator = ServiceMap.Reference<(request: HttpServerRequest) => string>(
+export const SpanNameGenerator = Context.Reference<(request: HttpServerRequest) => string>(
   "@effect/platform/HttpMiddleware/SpanNameGenerator",
   { defaultValue: () => (request) => `http.server ${request.method}` }
 )
@@ -95,7 +108,8 @@ export const logger: <E, R>(
 ) => Effect.Effect<HttpServerResponse, E, HttpServerRequest | R> = make((httpApp) => {
   let counter = 0
   return Effect.withFiber((fiber) => {
-    const request = ServiceMap.getUnsafe(fiber.services, HttpServerRequest)
+    const request = Context.getUnsafe(fiber.context, HttpServerRequest)
+    const path = stripSearchAndHash(request.url)
     return Effect.withLogSpan(
       Effect.flatMap(Effect.exit(httpApp), (exit) => {
         if (loggerDisabledRequests.has(request.source)) {
@@ -105,7 +119,7 @@ export const logger: <E, R>(
           return Effect.andThen(
             Effect.annotateLogs(Effect.log(Option.getOrElse(cause, () => "Sent HTTP Response")), {
               "http.method": request.method,
-              "http.url": request.url,
+              "http.url": path,
               "http.status": response.status
             }),
             exit
@@ -114,7 +128,7 @@ export const logger: <E, R>(
         return Effect.andThen(
           Effect.annotateLogs(Effect.log("Sent HTTP response"), {
             "http.method": request.method,
-            "http.url": request.url,
+            "http.url": path,
             "http.status": exit.value.status
           }),
           exit
@@ -133,7 +147,7 @@ export const tracer: <E, R>(
   httpApp: Effect.Effect<HttpServerResponse, E, HttpServerRequest | R>
 ) => Effect.Effect<HttpServerResponse, E, HttpServerRequest | R> = make((httpApp) =>
   Effect.withFiber((fiber) => {
-    const request = ServiceMap.getUnsafe(fiber.services, HttpServerRequest)
+    const request = Context.getUnsafe(fiber.context, HttpServerRequest)
     const disabled = !fiber.getRef(TracerEnabled) || fiber.getRef(TracerDisabledWhen)(request)
     if (disabled) {
       return httpApp
@@ -143,10 +157,10 @@ export const tracer: <E, R>(
       parent: Option.getOrUndefined(TraceContext.fromHeaders(request.headers)),
       kind: "server"
     })
-    const prevServices = fiber.services
-    fiber.setServices(ServiceMap.add(fiber.services, ParentSpan, span))
+    const prevServices = fiber.context
+    fiber.setContext(Context.add(fiber.context, ParentSpan, span))
     return Effect.onExitPrimitive(httpApp, (exit) => {
-      fiber.setServices(prevServices)
+      fiber.setContext(prevServices)
       const endTime = fiber.getRef(Clock).currentTimeNanosUnsafe()
       fiber.currentDispatcher.scheduleTask(() => {
         const url = Request.toURL(request)
@@ -214,8 +228,8 @@ export const searchParamsParser = <E, R>(
   httpApp: Effect.Effect<HttpServerResponse, E, R>
 ): Effect.Effect<Response.HttpServerResponse, E, HttpServerRequest | Exclude<R, Request.ParsedSearchParams>> =>
   Effect.withFiber((fiber) => {
-    const services = fiber.services
-    const request = ServiceMap.getUnsafe(services, HttpServerRequest)
+    const services = fiber.context
+    const request = Context.getUnsafe(services, HttpServerRequest)
     const params = Request.searchParamsFromURL(new URL(request.originalUrl))
     return Effect.provideService(
       httpApp,
@@ -332,7 +346,7 @@ export const cors = (options?: {
     httpApp: Effect.Effect<HttpServerResponse, E, R>
   ): Effect.Effect<HttpServerResponse, E, R | HttpServerRequest> =>
     Effect.withFiber((fiber) => {
-      const request = ServiceMap.getUnsafe(fiber.services, HttpServerRequest)
+      const request = Context.getUnsafe(fiber.context, HttpServerRequest)
       if (request.method === "OPTIONS") {
         return Effect.succeed(Response.empty({
           status: 204,

package/src/unstable/http/HttpPlatform.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 { identity } from "../../Function.ts"
 import * as Layer from "../../Layer.ts"
 import * as Option from "../../Option.ts"
 import type { PlatformError } from "../../PlatformError.ts"
-import * as ServiceMap from "../../ServiceMap.ts"
 import * as Stream from "../../Stream.ts"
 import * as Etag from "./Etag.ts"
 import * as Headers from "./Headers.ts"
@@ -18,7 +18,7 @@ import * as Response from "./HttpServerResponse.ts"
  * @since 4.0.0
  * @category tags
  */
-export class HttpPlatform extends ServiceMap.Service<HttpPlatform, {
+export class HttpPlatform extends Context.Service<HttpPlatform, {
   readonly fileResponse: (
     path: string,
     options?: Response.Options.WithContent & {