@effect/platform 0.57.7 → 0.58.0

package/src/{Http/ClientRequest.ts → HttpClientRequest.ts}

@@ -8,22 +8,22 @@ import type { Inspectable } from "effect/Inspectable"
 import type * as Option from "effect/Option"
 import type { Scope } from "effect/Scope"
 import type * as Stream from "effect/Stream"
-import type * as PlatformError from "../Error.js"
-import type * as FileSystem from "../FileSystem.js"
-import * as internal from "../internal/http/clientRequest.js"
-import type * as Body from "./Body.js"
-import type { Client } from "./Client.js"
-import type { HttpClientError } from "./ClientError.js"
-import type { ClientResponse } from "./ClientResponse.js"
+import type * as PlatformError from "./Error.js"
+import type * as FileSystem from "./FileSystem.js"
 import type * as Headers from "./Headers.js"
-import type { Method } from "./Method.js"
+import type * as Body from "./HttpBody.js"
+import type { HttpClient } from "./HttpClient.js"
+import type { HttpClientError } from "./HttpClientError.js"
+import type { HttpClientResponse } from "./HttpClientResponse.js"
+import type { HttpMethod } from "./HttpMethod.js"
+import * as internal from "./internal/httpClientRequest.js"
 import type * as UrlParams from "./UrlParams.js"
 
 /**
  * @since 1.0.0
  * @category type ids
  */
-export const TypeId: unique symbol = Symbol.for("@effect/platform/Http/ClientRequest")
+export const TypeId: unique symbol = Symbol.for("@effect/platform/HttpClientRequest")
 
 /**
  * @since 1.0.0
@@ -35,16 +35,16 @@ export type TypeId = typeof TypeId
  * @since 1.0.0
  * @category models
  */
-export interface ClientRequest
-  extends Effect.Effect<ClientResponse, HttpClientError, Client.Default | Scope>, Inspectable
+export interface HttpClientRequest
+  extends Effect.Effect<HttpClientResponse, HttpClientError, HttpClient.Default | Scope>, Inspectable
 {
   readonly [TypeId]: TypeId
-  readonly method: Method
+  readonly method: HttpMethod
   readonly url: string
   readonly urlParams: UrlParams.UrlParams
   readonly hash: Option.Option<string>
   readonly headers: Headers.Headers
-  readonly body: Body.Body
+  readonly body: Body.HttpBody
 }
 
 /**
@@ -52,12 +52,12 @@ export interface ClientRequest
  * @category models
  */
 export interface Options {
-  readonly method?: Method | undefined
+  readonly method?: HttpMethod | undefined
   readonly url?: string | URL | undefined
   readonly urlParams?: UrlParams.Input | undefined
   readonly hash?: string | undefined
   readonly headers?: Headers.Input | undefined
-  readonly body?: Body.Body | undefined
+  readonly body?: Body.HttpBody | undefined
   readonly accept?: string | undefined
   readonly acceptJson?: boolean | undefined
 }
@@ -83,62 +83,62 @@ export declare namespace Options {
  * @since 1.0.0
  * @category constructors
  */
-export const make: <M extends Method>(
+export const make: <M extends HttpMethod>(
   method: M
 ) => (
   url: string | URL,
   options?: (M extends "GET" | "HEAD" ? Options.NoBody : Options.NoUrl) | undefined
-) => ClientRequest = internal.make
+) => HttpClientRequest = internal.make
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const get: (url: string | URL, options?: Options.NoBody) => ClientRequest = internal.get
+export const get: (url: string | URL, options?: Options.NoBody) => HttpClientRequest = internal.get
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const post: (url: string | URL, options?: Options.NoUrl) => ClientRequest = internal.post
+export const post: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = internal.post
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const patch: (url: string | URL, options?: Options.NoUrl) => ClientRequest = internal.patch
+export const patch: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = internal.patch
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const put: (url: string | URL, options?: Options.NoUrl) => ClientRequest = internal.put
+export const put: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = internal.put
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const del: (url: string | URL, options?: Options.NoUrl) => ClientRequest = internal.del
+export const del: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = internal.del
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const head: (url: string | URL, options?: Options.NoBody) => ClientRequest = internal.head
+export const head: (url: string | URL, options?: Options.NoBody) => HttpClientRequest = internal.head
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const options: (url: string | URL, options?: Options.NoUrl) => ClientRequest = internal.options
+export const options: (url: string | URL, options?: Options.NoUrl) => HttpClientRequest = internal.options
 
 /**
  * @since 1.0.0
  * @category combinators
  */
 export const modify: {
-  (options: Options): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, options: Options): ClientRequest
+  (options: Options): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, options: Options): HttpClientRequest
 } = internal.modify
 
 /**
@@ -146,8 +146,8 @@ export const modify: {
  * @category combinators
  */
 export const setMethod: {
-  (method: Method): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, method: Method): ClientRequest
+  (method: HttpMethod): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, method: HttpMethod): HttpClientRequest
 } = internal.setMethod
 
 /**
@@ -155,8 +155,8 @@ export const setMethod: {
  * @category combinators
  */
 export const setHeader: {
-  (key: string, value: string): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, key: string, value: string): ClientRequest
+  (key: string, value: string): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, key: string, value: string): HttpClientRequest
 } = internal.setHeader
 
 /**
@@ -164,8 +164,8 @@ export const setHeader: {
  * @category combinators
  */
 export const setHeaders: {
-  (input: Headers.Input): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, input: Headers.Input): ClientRequest
+  (input: Headers.Input): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, input: Headers.Input): HttpClientRequest
 } = internal.setHeaders
 
 /**
@@ -173,8 +173,8 @@ export const setHeaders: {
  * @category combinators
  */
 export const basicAuth: {
-  (username: string, password: string): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, username: string, password: string): ClientRequest
+  (username: string, password: string): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, username: string, password: string): HttpClientRequest
 } = internal.basicAuth
 
 /**
@@ -182,8 +182,8 @@ export const basicAuth: {
  * @category combinators
  */
 export const bearerToken: {
-  (token: string): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, token: string): ClientRequest
+  (token: string): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, token: string): HttpClientRequest
 } = internal.bearerToken
 
 /**
@@ -191,23 +191,23 @@ export const bearerToken: {
  * @category combinators
  */
 export const accept: {
-  (mediaType: string): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, mediaType: string): ClientRequest
+  (mediaType: string): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, mediaType: string): HttpClientRequest
 } = internal.accept
 
 /**
  * @since 1.0.0
  * @category combinators
  */
-export const acceptJson: (self: ClientRequest) => ClientRequest = internal.acceptJson
+export const acceptJson: (self: HttpClientRequest) => HttpClientRequest = internal.acceptJson
 
 /**
  * @since 1.0.0
  * @category combinators
  */
 export const setUrl: {
-  (url: string | URL): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, url: string | URL): ClientRequest
+  (url: string | URL): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, url: string | URL): HttpClientRequest
 } = internal.setUrl
 
 /**
@@ -215,8 +215,8 @@ export const setUrl: {
  * @category combinators
  */
 export const prependUrl: {
-  (path: string): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, path: string): ClientRequest
+  (path: string): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, path: string): HttpClientRequest
 } = internal.prependUrl
 
 /**
@@ -224,8 +224,8 @@ export const prependUrl: {
  * @category combinators
  */
 export const appendUrl: {
-  (path: string): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, path: string): ClientRequest
+  (path: string): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, path: string): HttpClientRequest
 } = internal.appendUrl
 
 /**
@@ -233,8 +233,8 @@ export const appendUrl: {
  * @category combinators
  */
 export const updateUrl: {
-  (f: (url: string) => string): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, f: (url: string) => string): ClientRequest
+  (f: (url: string) => string): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, f: (url: string) => string): HttpClientRequest
 } = internal.updateUrl
 
 /**
@@ -242,8 +242,8 @@ export const updateUrl: {
  * @category combinators
  */
 export const setUrlParam: {
-  (key: string, value: string): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, key: string, value: string): ClientRequest
+  (key: string, value: string): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, key: string, value: string): HttpClientRequest
 } = internal.setUrlParam
 
 /**
@@ -251,8 +251,8 @@ export const setUrlParam: {
  * @category combinators
  */
 export const setUrlParams: {
-  (input: UrlParams.Input): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, input: UrlParams.Input): ClientRequest
+  (input: UrlParams.Input): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, input: UrlParams.Input): HttpClientRequest
 } = internal.setUrlParams
 
 /**
@@ -260,8 +260,8 @@ export const setUrlParams: {
  * @category combinators
  */
 export const appendUrlParam: {
-  (key: string, value: string): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, key: string, value: string): ClientRequest
+  (key: string, value: string): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, key: string, value: string): HttpClientRequest
 } = internal.appendUrlParam
 
 /**
@@ -269,8 +269,8 @@ export const appendUrlParam: {
  * @category combinators
  */
 export const appendUrlParams: {
-  (input: UrlParams.Input): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, input: UrlParams.Input): ClientRequest
+  (input: UrlParams.Input): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, input: UrlParams.Input): HttpClientRequest
 } = internal.appendUrlParams
 
 /**
@@ -278,23 +278,23 @@ export const appendUrlParams: {
  * @category combinators
  */
 export const setHash: {
-  (hash: string): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, hash: string): ClientRequest
+  (hash: string): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, hash: string): HttpClientRequest
 } = internal.setHash
 
 /**
  * @since 1.0.0
  * @category combinators
  */
-export const removeHash: (self: ClientRequest) => ClientRequest = internal.removeHash
+export const removeHash: (self: HttpClientRequest) => HttpClientRequest = internal.removeHash
 
 /**
  * @since 1.0.0
  * @category combinators
  */
 export const setBody: {
-  (body: Body.Body): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, body: Body.Body): ClientRequest
+  (body: Body.HttpBody): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, body: Body.HttpBody): HttpClientRequest
 } = internal.setBody
 
 /**
@@ -302,8 +302,8 @@ export const setBody: {
  * @category combinators
  */
 export const uint8ArrayBody: {
-  (body: Uint8Array, contentType?: string): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, body: Uint8Array, contentType?: string): ClientRequest
+  (body: Uint8Array, contentType?: string): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, body: Uint8Array, contentType?: string): HttpClientRequest
 } = internal.uint8ArrayBody
 
 /**
@@ -311,8 +311,8 @@ export const uint8ArrayBody: {
  * @category combinators
  */
 export const textBody: {
-  (body: string, contentType?: string): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, body: string, contentType?: string): ClientRequest
+  (body: string, contentType?: string): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, body: string, contentType?: string): HttpClientRequest
 } = internal.textBody
 
 /**
@@ -320,8 +320,8 @@ export const textBody: {
  * @category combinators
  */
 export const jsonBody: {
-  (body: unknown): (self: ClientRequest) => Effect.Effect<ClientRequest, Body.BodyError>
-  (self: ClientRequest, body: unknown): Effect.Effect<ClientRequest, Body.BodyError>
+  (body: unknown): (self: HttpClientRequest) => Effect.Effect<HttpClientRequest, Body.HttpBodyError>
+  (self: HttpClientRequest, body: unknown): Effect.Effect<HttpClientRequest, Body.HttpBodyError>
 } = internal.jsonBody
 
 /**
@@ -329,8 +329,8 @@ export const jsonBody: {
  * @category combinators
  */
 export const unsafeJsonBody: {
-  (body: unknown): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, body: unknown): ClientRequest
+  (body: unknown): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, body: unknown): HttpClientRequest
 } = internal.unsafeJsonBody
 
 /**
@@ -341,8 +341,8 @@ export const schemaBody: <A, I, R>(
   schema: Schema.Schema<A, I, R>,
   options?: ParseOptions | undefined
 ) => {
-  (body: A): (self: ClientRequest) => Effect.Effect<ClientRequest, Body.BodyError, R>
-  (self: ClientRequest, body: A): Effect.Effect<ClientRequest, Body.BodyError, R>
+  (body: A): (self: HttpClientRequest) => Effect.Effect<HttpClientRequest, Body.HttpBodyError, R>
+  (self: HttpClientRequest, body: A): Effect.Effect<HttpClientRequest, Body.HttpBodyError, R>
 } = internal.schemaBody
 
 /**
@@ -350,8 +350,8 @@ export const schemaBody: <A, I, R>(
  * @category combinators
  */
 export const urlParamsBody: {
-  (input: UrlParams.Input): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, input: UrlParams.Input): ClientRequest
+  (input: UrlParams.Input): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, input: UrlParams.Input): HttpClientRequest
 } = internal.urlParamsBody
 
 /**
@@ -359,8 +359,8 @@ export const urlParamsBody: {
  * @category combinators
  */
 export const formDataBody: {
-  (body: FormData): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, body: FormData): ClientRequest
+  (body: FormData): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, body: FormData): HttpClientRequest
 } = internal.formDataBody
 
 /**
@@ -371,12 +371,12 @@ export const streamBody: {
   (
     body: Stream.Stream<Uint8Array, unknown>,
     options?: { readonly contentType?: string | undefined; readonly contentLength?: number | undefined } | undefined
-  ): (self: ClientRequest) => ClientRequest
+  ): (self: HttpClientRequest) => HttpClientRequest
   (
-    self: ClientRequest,
+    self: HttpClientRequest,
     body: Stream.Stream<Uint8Array, unknown>,
     options?: { readonly contentType?: string | undefined; readonly contentLength?: number | undefined } | undefined
-  ): ClientRequest
+  ): HttpClientRequest
 } = internal.streamBody
 
 /**
@@ -387,12 +387,12 @@ export const fileBody: {
   (
     path: string,
     options?: FileSystem.StreamOptions & { readonly contentType?: string }
-  ): (self: ClientRequest) => Effect.Effect<ClientRequest, PlatformError.PlatformError, FileSystem.FileSystem>
+  ): (self: HttpClientRequest) => Effect.Effect<HttpClientRequest, PlatformError.PlatformError, FileSystem.FileSystem>
   (
-    self: ClientRequest,
+    self: HttpClientRequest,
     path: string,
     options?: FileSystem.StreamOptions & { readonly contentType?: string }
-  ): Effect.Effect<ClientRequest, PlatformError.PlatformError, FileSystem.FileSystem>
+  ): Effect.Effect<HttpClientRequest, PlatformError.PlatformError, FileSystem.FileSystem>
 } = internal.fileBody
 
 /**
@@ -400,6 +400,6 @@ export const fileBody: {
  * @category combinators
  */
 export const fileWebBody: {
-  (file: Body.Body.FileLike): (self: ClientRequest) => ClientRequest
-  (self: ClientRequest, file: Body.Body.FileLike): ClientRequest
+  (file: Body.HttpBody.FileLike): (self: HttpClientRequest) => HttpClientRequest
+  (self: HttpClientRequest, file: Body.HttpBody.FileLike): HttpClientRequest
 } = internal.fileWebBody

package/src/{Http/ClientResponse.ts → HttpClientResponse.ts}

@@ -7,11 +7,11 @@ import type * as Schema from "@effect/schema/Schema"
 import type * as Effect from "effect/Effect"
 import type * as Scope from "effect/Scope"
 import type * as Stream from "effect/Stream"
-import * as internal from "../internal/http/clientResponse.js"
-import type * as Error from "./ClientError.js"
-import type * as ClientRequest from "./ClientRequest.js"
 import type * as Cookies from "./Cookies.js"
-import type * as IncomingMessage from "./IncomingMessage.js"
+import type * as Error from "./HttpClientError.js"
+import type * as ClientRequest from "./HttpClientRequest.js"
+import type * as IncomingMessage from "./HttpIncomingMessage.js"
+import * as internal from "./internal/httpClientResponse.js"
 import type * as UrlParams from "./UrlParams.js"
 
 export {
@@ -45,7 +45,7 @@ export {
    * @category schema
    */
   schemaHeadersScoped
-} from "./IncomingMessage.js"
+} from "./HttpIncomingMessage.js"
 
 /**
  * @since 1.0.0
@@ -63,7 +63,7 @@ export type TypeId = typeof TypeId
  * @since 1.0.0
  * @category models
  */
-export interface ClientResponse extends IncomingMessage.IncomingMessage<Error.ResponseError> {
+export interface HttpClientResponse extends IncomingMessage.HttpIncomingMessage<Error.ResponseError> {
   readonly [TypeId]: TypeId
   readonly status: number
   readonly cookies: Cookies.Cookies
@@ -74,7 +74,8 @@ export interface ClientResponse extends IncomingMessage.IncomingMessage<Error.Re
  * @since 1.0.0
  * @category constructors
  */
-export const fromWeb: (request: ClientRequest.ClientRequest, source: Response) => ClientResponse = internal.fromWeb
+export const fromWeb: (request: ClientRequest.HttpClientRequest, source: Response) => HttpClientResponse =
+  internal.fromWeb
 
 /**
  * @since 1.0.0
@@ -91,7 +92,8 @@ export const schemaJson: <
 >(
   schema: Schema.Schema<A, I, R>,
   options?: ParseOptions | undefined
-) => (self: ClientResponse) => Effect.Effect<A, Error.ResponseError | ParseResult.ParseError, R> = internal.schemaJson
+) => (self: HttpClientResponse) => Effect.Effect<A, Error.ResponseError | ParseResult.ParseError, R> =
+  internal.schemaJson
 
 /**
  * @since 1.0.0
@@ -107,14 +109,14 @@ export const schemaNoBody: <
 >(
   schema: Schema.Schema<A, I, R>,
   options?: ParseOptions | undefined
-) => (self: ClientResponse) => Effect.Effect<A, ParseResult.ParseError, R> = internal.schemaNoBody
+) => (self: HttpClientResponse) => Effect.Effect<A, ParseResult.ParseError, R> = internal.schemaNoBody
 
 /**
  * @since 1.0.0
  * @category accessors
  */
 export const arrayBuffer: <E, R>(
-  effect: Effect.Effect<ClientResponse, E, R>
+  effect: Effect.Effect<HttpClientResponse, E, R>
 ) => Effect.Effect<ArrayBuffer, Error.ResponseError | E, Exclude<R, Scope.Scope>> = internal.arrayBuffer
 
 /**
@@ -122,7 +124,7 @@ export const arrayBuffer: <E, R>(
  * @category accessors
  */
 export const formData: <E, R>(
-  effect: Effect.Effect<ClientResponse, E, R>
+  effect: Effect.Effect<HttpClientResponse, E, R>
 ) => Effect.Effect<FormData, Error.ResponseError | E, Exclude<R, Scope.Scope>> = internal.formData
 
 /**
@@ -130,11 +132,12 @@ export const formData: <E, R>(
  * @category accessors
  */
 export const json: <E, R>(
-  effect: Effect.Effect<ClientResponse, E, R>
+  effect: Effect.Effect<HttpClientResponse, E, R>
 ) => Effect.Effect<unknown, Error.ResponseError | E, Exclude<R, Scope.Scope>> = internal.json
 
-const void_: <E, R>(effect: Effect.Effect<ClientResponse, E, R>) => Effect.Effect<void, E, Exclude<R, Scope.Scope>> =
-  internal.void_
+const void_: <E, R>(
+  effect: Effect.Effect<HttpClientResponse, E, R>
+) => Effect.Effect<void, E, Exclude<R, Scope.Scope>> = internal.void_
 export {
   /**
    * @since 1.0.0
@@ -148,7 +151,7 @@ export {
  * @category accessors
  */
 export const stream: <E, R>(
-  effect: Effect.Effect<ClientResponse, E, R>
+  effect: Effect.Effect<HttpClientResponse, E, R>
 ) => Stream.Stream<Uint8Array, Error.ResponseError | E, Exclude<R, Scope.Scope>> = internal.stream
 
 /**
@@ -156,7 +159,7 @@ export const stream: <E, R>(
  * @category accessors
  */
 export const text: <E, R>(
-  effect: Effect.Effect<ClientResponse, E, R>
+  effect: Effect.Effect<HttpClientResponse, E, R>
 ) => Effect.Effect<string, Error.ResponseError | E, Exclude<R, Scope.Scope>> = internal.text
 
 /**
@@ -164,7 +167,7 @@ export const text: <E, R>(
  * @category accessors
  */
 export const urlParamsBody: <E, R>(
-  effect: Effect.Effect<ClientResponse, E, R>
+  effect: Effect.Effect<HttpClientResponse, E, R>
 ) => Effect.Effect<UrlParams.UrlParams, Error.ResponseError | E, Exclude<R, Scope.Scope>> = internal.urlParamsBody
 
 /**
@@ -183,7 +186,7 @@ export const schemaJsonScoped: <
   schema: Schema.Schema<A, I, R>,
   options?: ParseOptions | undefined
 ) => <E, R2>(
-  effect: Effect.Effect<ClientResponse, E, R2>
+  effect: Effect.Effect<HttpClientResponse, E, R2>
 ) => Effect.Effect<
   A,
   E | Error.ResponseError | ParseResult.ParseError,
@@ -205,6 +208,6 @@ export const schemaNoBodyScoped: <
   schema: Schema.Schema<A, I, R>,
   options?: ParseOptions | undefined
 ) => <E, R2>(
-  effect: Effect.Effect<ClientResponse, E, R2>
+  effect: Effect.Effect<HttpClientResponse, E, R2>
 ) => Effect.Effect<A, E | ParseResult.ParseError, Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>> =
   internal.schemaNoBodyScoped

package/src/{Http/IncomingMessage.ts → HttpIncomingMessage.ts}

@@ -12,7 +12,7 @@ import type { Inspectable } from "effect/Inspectable"
 import * as Option from "effect/Option"
 import type * as Scope from "effect/Scope"
 import type * as Stream from "effect/Stream"
-import * as FileSystem from "../FileSystem.js"
+import * as FileSystem from "./FileSystem.js"
 import type * as Headers from "./Headers.js"
 import type * as UrlParams from "./UrlParams.js"
 
@@ -20,7 +20,7 @@ import type * as UrlParams from "./UrlParams.js"
  * @since 1.0.0
  * @category type ids
  */
-export const TypeId: unique symbol = Symbol.for("@effect/platform/Http/IncomingMessage")
+export const TypeId: unique symbol = Symbol.for("@effect/platform/HttpIncomingMessage")
 
 /**
  * @since 1.0.0
@@ -32,7 +32,7 @@ export type TypeId = typeof TypeId
  * @since 1.0.0
  * @category models
  */
-export interface IncomingMessage<E> extends Inspectable {
+export interface HttpIncomingMessage<E> extends Inspectable {
   readonly [TypeId]: TypeId
   readonly headers: Headers.Headers
   readonly remoteAddress: Option.Option<string>
@@ -49,7 +49,7 @@ export interface IncomingMessage<E> extends Inspectable {
  */
 export const schemaBodyJson = <A, I, R>(schema: Schema.Schema<A, I, R>, options?: ParseOptions | undefined) => {
   const parse = Schema.decodeUnknown(schema, options)
-  return <E>(self: IncomingMessage<E>): Effect.Effect<A, E | ParseResult.ParseError, R> =>
+  return <E>(self: HttpIncomingMessage<E>): Effect.Effect<A, E | ParseResult.ParseError, R> =>
     Effect.flatMap(self.json, parse)
 }
 
@@ -60,7 +60,7 @@ export const schemaBodyJson = <A, I, R>(schema: Schema.Schema<A, I, R>, options?
 export const schemaBodyJsonScoped = <A, I, R>(schema: Schema.Schema<A, I, R>, options?: ParseOptions | undefined) => {
   const decode = schemaBodyJson(schema, options)
   return <E, E2, R2>(
-    effect: Effect.Effect<IncomingMessage<E>, E2, R2>
+    effect: Effect.Effect<HttpIncomingMessage<E>, E2, R2>
   ): Effect.Effect<A, ParseResult.ParseError | E | E2, Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>> =>
     Effect.scoped(Effect.flatMap(effect, decode))
 }
@@ -74,7 +74,7 @@ export const schemaBodyUrlParams = <A, I extends Readonly<Record<string, string>
   options?: ParseOptions | undefined
 ) => {
   const parse = Schema.decodeUnknown(schema, options)
-  return <E>(self: IncomingMessage<E>): Effect.Effect<A, E | ParseResult.ParseError, R> =>
+  return <E>(self: HttpIncomingMessage<E>): Effect.Effect<A, E | ParseResult.ParseError, R> =>
     Effect.flatMap(self.urlParamsBody, (_) => parse(Object.fromEntries(_)))
 }
 
@@ -88,7 +88,7 @@ export const schemaBodyUrlParamsScoped = <A, I extends Readonly<Record<string, s
 ) => {
   const decode = schemaBodyUrlParams(schema, options)
   return <E, E2, R2>(
-    effect: Effect.Effect<IncomingMessage<E>, E2, R2>
+    effect: Effect.Effect<HttpIncomingMessage<E>, E2, R2>
   ): Effect.Effect<A, ParseResult.ParseError | E | E2, Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>> =>
     Effect.scoped(Effect.flatMap(effect, decode))
 }
@@ -102,7 +102,7 @@ export const schemaHeaders = <A, I extends Readonly<Record<string, string | unde
   options?: ParseOptions | undefined
 ) => {
   const parse = Schema.decodeUnknown(schema, options)
-  return <E>(self: IncomingMessage<E>): Effect.Effect<A, ParseResult.ParseError, R> => parse(self.headers)
+  return <E>(self: HttpIncomingMessage<E>): Effect.Effect<A, ParseResult.ParseError, R> => parse(self.headers)
 }
 
 /**
@@ -115,7 +115,7 @@ export const schemaHeadersScoped = <A, I extends Readonly<Record<string, string>
 ) => {
   const decode = schemaHeaders(schema, options)
   return <E, E2, R2>(
-    effect: Effect.Effect<IncomingMessage<E>, E2, R2>
+    effect: Effect.Effect<HttpIncomingMessage<E>, E2, R2>
   ): Effect.Effect<A, ParseResult.ParseError | E2, Exclude<R, Scope.Scope> | Exclude<R2, Scope.Scope>> =>
     Effect.scoped(Effect.flatMap(effect, decode))
 }
@@ -125,7 +125,7 @@ export const schemaHeadersScoped = <A, I extends Readonly<Record<string, string>
  * @category fiber refs
  */
 export const maxBodySize: FiberRef.FiberRef<Option.Option<FileSystem.Size>> = Global.globalValue(
-  "@effect/platform/Http/ImcomingMessage/maxBodySize",
+  "@effect/platform/HttpIncomingMessage/maxBodySize",
   () => FiberRef.unsafeMake(Option.none<FileSystem.Size>())
 )
 
@@ -141,7 +141,7 @@ export const withMaxBodySize = dual<
 /**
  * @since 1.0.0
  */
-export const inspect = <E>(self: IncomingMessage<E>, that: object): object => {
+export const inspect = <E>(self: HttpIncomingMessage<E>, that: object): object => {
   const contentType = self.headers["content-type"] ?? ""
   let body: unknown
   if (contentType.includes("application/json")) {