@effect/platform 0.67.0 → 0.68.0

package/src/HttpClient.ts

@@ -1,9 +1,6 @@
 /**
  * @since 1.0.0
  */
-import type { ParseOptions } from "@effect/schema/AST"
-import type * as ParseResult from "@effect/schema/ParseResult"
-import type * as Schema from "@effect/schema/Schema"
 import type * as Context from "effect/Context"
 import type * as Effect from "effect/Effect"
 import type { RuntimeFiber } from "effect/Fiber"
@@ -37,17 +34,38 @@ export type TypeId = typeof TypeId
  * @since 1.0.0
  * @category models
  */
-export interface HttpClient<A = ClientResponse.HttpClientResponse, E = never, R = never> extends Pipeable, Inspectable {
+export interface HttpClient<E = Error.HttpClientError, R = Scope.Scope> extends Pipeable, Inspectable {
   readonly [TypeId]: TypeId
-  readonly execute: (request: ClientRequest.HttpClientRequest) => Effect.Effect<A, E, R>
-
-  readonly get: (url: string | URL, options?: ClientRequest.Options.NoBody) => Effect.Effect<A, E, R>
-  readonly head: (url: string | URL, options?: ClientRequest.Options.NoBody) => Effect.Effect<A, E, R>
-  readonly post: (url: string | URL, options?: ClientRequest.Options.NoUrl) => Effect.Effect<A, E, R>
-  readonly patch: (url: string | URL, options?: ClientRequest.Options.NoUrl) => Effect.Effect<A, E, R>
-  readonly put: (url: string | URL, options?: ClientRequest.Options.NoUrl) => Effect.Effect<A, E, R>
-  readonly del: (url: string | URL, options?: ClientRequest.Options.NoUrl) => Effect.Effect<A, E, R>
-  readonly options: (url: string | URL, options?: ClientRequest.Options.NoUrl) => Effect.Effect<A, E, R>
+  readonly execute: (request: ClientRequest.HttpClientRequest) => Effect.Effect<ClientResponse.HttpClientResponse, E, R>
+
+  readonly get: (
+    url: string | URL,
+    options?: ClientRequest.Options.NoBody
+  ) => Effect.Effect<ClientResponse.HttpClientResponse, E, R>
+  readonly head: (
+    url: string | URL,
+    options?: ClientRequest.Options.NoBody
+  ) => Effect.Effect<ClientResponse.HttpClientResponse, E, R>
+  readonly post: (
+    url: string | URL,
+    options?: ClientRequest.Options.NoUrl
+  ) => Effect.Effect<ClientResponse.HttpClientResponse, E, R>
+  readonly patch: (
+    url: string | URL,
+    options?: ClientRequest.Options.NoUrl
+  ) => Effect.Effect<ClientResponse.HttpClientResponse, E, R>
+  readonly put: (
+    url: string | URL,
+    options?: ClientRequest.Options.NoUrl
+  ) => Effect.Effect<ClientResponse.HttpClientResponse, E, R>
+  readonly del: (
+    url: string | URL,
+    options?: ClientRequest.Options.NoUrl
+  ) => Effect.Effect<ClientResponse.HttpClientResponse, E, R>
+  readonly options: (
+    url: string | URL,
+    options?: ClientRequest.Options.NoUrl
+  ) => Effect.Effect<ClientResponse.HttpClientResponse, E, R>
 }
 
 /**
@@ -66,28 +84,116 @@ export declare namespace HttpClient {
    * @since 1.0.0
    * @category models
    */
-  export type Postprocess<A, E = never, R = never> = (
+  export type Postprocess<E = never, R = never> = (
     request: Effect.Effect<ClientRequest.HttpClientRequest, E, R>
-  ) => Effect.Effect<A, E, R>
-
-  /**
-   * @since 1.0.0
-   * @category models
-   */
-  export type WithResponse<E = never, R = never> = HttpClient<ClientResponse.HttpClientResponse, E, R>
-
-  /**
-   * @since 1.0.0
-   * @category models
-   */
-  export type Service = WithResponse<Error.HttpClientError, Scope.Scope>
+  ) => Effect.Effect<ClientResponse.HttpClientResponse, E, R>
 }
 
 /**
  * @since 1.0.0
  * @category tags
  */
-export const HttpClient: Context.Tag<HttpClient.Service, HttpClient.Service> = internal.tag
+export const HttpClient: Context.Tag<HttpClient, HttpClient> = internal.tag
+
+/**
+ * @since 1.0.0
+ * @category accessors
+ */
+export const execute: (
+  request: ClientRequest.HttpClientRequest
+) => Effect.Effect<ClientResponse.HttpClientResponse, Error.HttpClientError, Scope.Scope | HttpClient> =
+  internal.execute
+
+/**
+ * @since 1.0.0
+ * @category accessors
+ */
+export const get: (
+  url: string | URL,
+  options?: ClientRequest.Options.NoBody | undefined
+) => Effect.Effect<
+  ClientResponse.HttpClientResponse,
+  Error.HttpClientError,
+  Scope.Scope | HttpClient
+> = internal.get
+
+/**
+ * @since 1.0.0
+ * @category accessors
+ */
+export const head: (
+  url: string | URL,
+  options?: ClientRequest.Options.NoBody | undefined
+) => Effect.Effect<
+  ClientResponse.HttpClientResponse,
+  Error.HttpClientError,
+  Scope.Scope | HttpClient
+> = internal.head
+
+/**
+ * @since 1.0.0
+ * @category accessors
+ */
+export const post: (
+  url: string | URL,
+  options?: ClientRequest.Options.NoUrl | undefined
+) => Effect.Effect<
+  ClientResponse.HttpClientResponse,
+  Error.HttpClientError,
+  Scope.Scope | HttpClient
+> = internal.post
+
+/**
+ * @since 1.0.0
+ * @category accessors
+ */
+export const patch: (
+  url: string | URL,
+  options?: ClientRequest.Options.NoUrl | undefined
+) => Effect.Effect<
+  ClientResponse.HttpClientResponse,
+  Error.HttpClientError,
+  Scope.Scope | HttpClient
+> = internal.patch
+
+/**
+ * @since 1.0.0
+ * @category accessors
+ */
+export const put: (
+  url: string | URL,
+  options?: ClientRequest.Options.NoUrl | undefined
+) => Effect.Effect<
+  ClientResponse.HttpClientResponse,
+  Error.HttpClientError,
+  Scope.Scope | HttpClient
+> = internal.put
+
+/**
+ * @since 1.0.0
+ * @category accessors
+ */
+export const del: (
+  url: string | URL,
+  options?: ClientRequest.Options.NoUrl | undefined
+) => Effect.Effect<
+  ClientResponse.HttpClientResponse,
+  Error.HttpClientError,
+  Scope.Scope | HttpClient
+> = internal.del
+
+/**
+ * @since 1.0.0
+ * @category accessors
+ */
+export const options: (
+  url: string | URL,
+  options?: ClientRequest.Options.NoUrl | undefined
+) => Effect.Effect<
+  ClientResponse.HttpClientResponse,
+  Error.HttpClientError,
+  Scope.Scope | HttpClient
+> = internal.options
 
 /**
  * @since 1.0.0
@@ -98,17 +204,14 @@ export const catchAll: {
    * @since 1.0.0
    * @category error handling
    */
-  <E, E2, R2, A2>(
-    f: (e: E) => Effect.Effect<A2, E2, R2>
-  ): <A, R>(self: HttpClient<A, E, R>) => HttpClient<A2 | A, E2, R2 | R>
+  <E, E2, R2>(
+    f: (e: E) => Effect.Effect<ClientResponse.HttpClientResponse, E2, R2>
+  ): <R>(self: HttpClient<E, R>) => HttpClient<E2, R2 | R>
   /**
    * @since 1.0.0
    * @category error handling
    */
-  <A, E, R, A2, E2, R2>(
-    self: HttpClient<A, E, R>,
-    f: (e: E) => Effect.Effect<A2, E2, R2>
-  ): HttpClient<A | A2, E2, R | R2>
+  <E, R, A2, E2, R2>(self: HttpClient<E, R>, f: (e: E) => Effect.Effect<A2, E2, R2>): HttpClient<E2, R | R2>
 } = internal.catchAll
 
 /**
@@ -120,19 +223,19 @@ export const catchTag: {
    * @since 1.0.0
    * @category error handling
    */
-  <E extends { _tag: string }, K extends E["_tag"] & string, A1, E1, R1>(
+  <K extends E extends { _tag: string } ? E["_tag"] : never, E, E1, R1>(
     tag: K,
-    f: (e: Extract<E, { _tag: K }>) => Effect.Effect<A1, E1, R1>
-  ): <A, R>(self: HttpClient<A, E, R>) => HttpClient<A1 | A, E1 | Exclude<E, { _tag: K }>, R1 | R>
+    f: (e: Extract<E, { _tag: K }>) => Effect.Effect<ClientResponse.HttpClientResponse, E1, R1>
+  ): <R>(self: HttpClient<E, R>) => HttpClient<E1 | Exclude<E, { _tag: K }>, R1 | R>
   /**
    * @since 1.0.0
    * @category error handling
    */
-  <A, E extends { _tag: string }, R, K extends E["_tag"] & string, A1, E1, R1>(
-    self: HttpClient<A, E, R>,
+  <R, E, K extends E extends { _tag: string } ? E["_tag"] : never, R1, E1>(
+    self: HttpClient<E, R>,
     tag: K,
-    f: (e: Extract<E, { _tag: K }>) => Effect.Effect<A1, E1, R1>
-  ): HttpClient<A | A1, E1 | Exclude<E, { _tag: K }>, R | R1>
+    f: (e: Extract<E, { _tag: K }>) => Effect.Effect<ClientResponse.HttpClientResponse, E1, R1>
+  ): HttpClient<E1 | Exclude<E, { _tag: K }>, R1 | R>
 } = internal.catchTag
 
 /**
@@ -145,15 +248,17 @@ export const catchTags: {
    * @category error handling
    */
   <
-    E extends { _tag: string },
-    Cases extends { [K in E["_tag"]]+?: ((error: Extract<E, { _tag: K }>) => Effect.Effect<any, any, any>) | undefined }
-  >(cases: Cases): <A, R>(
-    self: HttpClient<A, E, R>
+    E,
+    Cases extends
+      & {
+        [K in Extract<E, { _tag: string }>["_tag"]]+?: (
+          error: Extract<E, { _tag: K }>
+        ) => Effect.Effect<ClientResponse.HttpClientResponse, any, any>
+      }
+      & (unknown extends E ? {} : { [K in Exclude<keyof Cases, Extract<E, { _tag: string }>["_tag"]>]: never })
+  >(cases: Cases): <R>(
+    self: HttpClient<E, R>
   ) => HttpClient<
-    | A
-    | {
-      [K in keyof Cases]: Cases[K] extends (...args: Array<any>) => Effect.Effect<infer A, any, any> ? A : never
-    }[keyof Cases],
     | Exclude<E, { _tag: keyof Cases }>
     | {
       [K in keyof Cases]: Cases[K] extends (...args: Array<any>) => Effect.Effect<any, infer E, any> ? E : never
@@ -168,15 +273,16 @@ export const catchTags: {
    * @category error handling
    */
   <
-    A,
     E extends { _tag: string },
     R,
-    Cases extends { [K in E["_tag"]]+?: ((error: Extract<E, { _tag: K }>) => Effect.Effect<any, any, any>) | undefined }
-  >(self: HttpClient<A, E, R>, cases: Cases): HttpClient<
-    | A
-    | {
-      [K in keyof Cases]: Cases[K] extends (...args: Array<any>) => Effect.Effect<infer A, any, any> ? A : never
-    }[keyof Cases],
+    Cases extends
+      & {
+        [K in Extract<E, { _tag: string }>["_tag"]]+?: (
+          error: Extract<E, { _tag: K }>
+        ) => Effect.Effect<ClientResponse.HttpClientResponse, any, any>
+      }
+      & (unknown extends E ? {} : { [K in Exclude<keyof Cases, Extract<E, { _tag: string }>["_tag"]>]: never })
+  >(self: HttpClient<E, R>, cases: Cases): HttpClient<
     | Exclude<E, { _tag: keyof Cases }>
     | {
       [K in keyof Cases]: Cases[K] extends (...args: Array<any>) => Effect.Effect<any, infer E, any> ? E : never
@@ -201,44 +307,21 @@ export const filterOrElse: {
    * @since 1.0.0
    * @category filters
    */
-  <A, B extends A, C, E2, R2>(
-    refinement: Predicate.Refinement<NoInfer<A>, B>,
-    orElse: (a: NoInfer<A>) => Effect.Effect<C, E2, R2>
-  ): <E, R>(self: HttpClient<A, E, R>) => HttpClient<B | C, E | E2, R | R2>
-  /**
-   * Filters the result of a response, or runs an alternative effect if the predicate fails.
-   *
-   * @since 1.0.0
-   * @category filters
-   */
-  <A, B, E2, R2>(
-    predicate: Predicate.Predicate<NoInfer<A>>,
-    orElse: (a: NoInfer<A>) => Effect.Effect<B, E2, R2>
-  ): <E, R>(
-    self: HttpClient<A, E, R>
-  ) => HttpClient<A | B, E2 | E, R2 | R>
-  /**
-   * Filters the result of a response, or runs an alternative effect if the predicate fails.
-   *
-   * @since 1.0.0
-   * @category filters
-   */
-  <A, E, R, B extends A, C, E2, R2>(
-    self: HttpClient<A, E, R>,
-    refinement: Predicate.Refinement<A, B>,
-    orElse: (a: A) => Effect.Effect<C, E2, R2>
-  ): HttpClient<B | C, E | E2, R | R2>
+  <E2, R2>(
+    predicate: Predicate.Predicate<ClientResponse.HttpClientResponse>,
+    orElse: (response: ClientResponse.HttpClientResponse) => Effect.Effect<ClientResponse.HttpClientResponse, E2, R2>
+  ): <E, R>(self: HttpClient<E, R>) => HttpClient<E2 | E, R2 | R>
   /**
    * Filters the result of a response, or runs an alternative effect if the predicate fails.
    *
    * @since 1.0.0
    * @category filters
    */
-  <A, E, R, B, E2, R2>(
-    self: HttpClient<A, E, R>,
-    predicate: Predicate.Predicate<A>,
-    orElse: (a: A) => Effect.Effect<B, E2, R2>
-  ): HttpClient<A | B, E2 | E, R2 | R>
+  <E, R, E2, R2>(
+    self: HttpClient<E, R>,
+    predicate: Predicate.Predicate<ClientResponse.HttpClientResponse>,
+    orElse: (response: ClientResponse.HttpClientResponse) => Effect.Effect<ClientResponse.HttpClientResponse, E2, R2>
+  ): HttpClient<E2 | E, R2 | R>
 } = internal.filterOrElse
 
 /**
@@ -254,42 +337,21 @@ export const filterOrFail: {
    * @since 1.0.0
    * @category filters
    */
-  <A, B extends A, E2>(
-    refinement: Predicate.Refinement<NoInfer<A>, B>,
-    orFailWith: (a: NoInfer<A>) => E2
-  ): <E, R>(self: HttpClient<A, E, R>) => HttpClient<B, E | E2, R>
-  /**
-   * Filters the result of a response, or throws an error if the predicate fails.
-   *
-   * @since 1.0.0
-   * @category filters
-   */
-  <A, E2>(
-    predicate: Predicate.Predicate<NoInfer<A>>,
-    orFailWith: (a: NoInfer<A>) => E2
-  ): <E, R>(self: HttpClient<A, E, R>) => HttpClient<A, E2 | E, R>
+  <E2>(
+    predicate: Predicate.Predicate<ClientResponse.HttpClientResponse>,
+    orFailWith: (response: ClientResponse.HttpClientResponse) => E2
+  ): <E, R>(self: HttpClient<E, R>) => HttpClient<E2 | E, R>
   /**
    * Filters the result of a response, or throws an error if the predicate fails.
    *
    * @since 1.0.0
    * @category filters
    */
-  <A, B extends A, E, R, E2>(
-    self: HttpClient<A, E, R>,
-    refinement: Predicate.Refinement<A, B>,
-    orFailWith: (a: A) => E2
-  ): HttpClient<B, E2 | E, R>
-  /**
-   * Filters the result of a response, or throws an error if the predicate fails.
-   *
-   * @since 1.0.0
-   * @category filters
-   */
-  <A, E, R, E2>(
-    self: HttpClient<A, E, R>,
-    predicate: Predicate.Predicate<A>,
-    orFailWith: (a: A) => E2
-  ): HttpClient<A, E2 | E, R>
+  <E, R, E2>(
+    self: HttpClient<E, R>,
+    predicate: Predicate.Predicate<ClientResponse.HttpClientResponse>,
+    orFailWith: (response: ClientResponse.HttpClientResponse) => E2
+  ): HttpClient<E2 | E, R>
 } = internal.filterOrFail
 
 /**
@@ -305,19 +367,14 @@ export const filterStatus: {
    * @since 1.0.0
    * @category filters
    */
-  (
-    f: (status: number) => boolean
-  ): <E, R>(self: HttpClient.WithResponse<E, R>) => HttpClient.WithResponse<E | Error.ResponseError, R>
+  (f: (status: number) => boolean): <E, R>(self: HttpClient<E, R>) => HttpClient<E | Error.ResponseError, R>
   /**
    * Filters responses by HTTP status code.
    *
    * @since 1.0.0
    * @category filters
    */
-  <E, R>(
-    self: HttpClient.WithResponse<E, R>,
-    f: (status: number) => boolean
-  ): HttpClient.WithResponse<Error.ResponseError | E, R>
+  <E, R>(self: HttpClient<E, R>, f: (status: number) => boolean): HttpClient<E | Error.ResponseError, R>
 } = internal.filterStatus
 
 /**
@@ -326,31 +383,32 @@ export const filterStatus: {
  * @since 1.0.0
  * @category filters
  */
-export const filterStatusOk: <E, R>(
-  self: HttpClient.WithResponse<E, R>
-) => HttpClient.WithResponse<Error.ResponseError | E, R> = internal.filterStatusOk
+export const filterStatusOk: <E, R>(self: HttpClient<E, R>) => HttpClient<E | Error.ResponseError, R> =
+  internal.filterStatusOk
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const make: <A, E, R, E2, R2>(
-  execute: (request: Effect.Effect<ClientRequest.HttpClientRequest, E2, R2>) => Effect.Effect<A, E, R>,
+export const makeWith: <E2, R2, E, R>(
+  postprocess: (
+    request: Effect.Effect<ClientRequest.HttpClientRequest, E2, R2>
+  ) => Effect.Effect<ClientResponse.HttpClientResponse, E, R>,
   preprocess: HttpClient.Preprocess<E2, R2>
-) => HttpClient<A, E, R> = internal.make
+) => HttpClient<E, R> = internal.makeWith
 
 /**
  * @since 1.0.0
  * @category constructors
  */
-export const makeService: (
+export const make: (
   f: (
     request: ClientRequest.HttpClientRequest,
     url: URL,
     signal: AbortSignal,
     fiber: RuntimeFiber<ClientResponse.HttpClientResponse, Error.HttpClientError>
   ) => Effect.Effect<ClientResponse.HttpClientResponse, Error.HttpClientError, Scope.Scope>
-) => HttpClient.Service = internal.makeService
+) => HttpClient = internal.make
 
 /**
  * @since 1.0.0
@@ -361,17 +419,23 @@ export const transform: {
    * @since 1.0.0
    * @category mapping & sequencing
    */
-  <A, E, R, A1, E1, R1>(
-    f: (effect: Effect.Effect<A, E, R>, request: ClientRequest.HttpClientRequest) => Effect.Effect<A1, E1, R1>
-  ): (self: HttpClient<A, E, R>) => HttpClient<A1, E | E1, R | R1>
+  <E, R, E1, R1>(
+    f: (
+      effect: Effect.Effect<ClientResponse.HttpClientResponse, E, R>,
+      request: ClientRequest.HttpClientRequest
+    ) => Effect.Effect<ClientResponse.HttpClientResponse, E1, R1>
+  ): (self: HttpClient<E, R>) => HttpClient<E | E1, R | R1>
   /**
    * @since 1.0.0
    * @category mapping & sequencing
    */
-  <A, E, R, A1, E1, R1>(
-    self: HttpClient<A, E, R>,
-    f: (effect: Effect.Effect<A, E, R>, request: ClientRequest.HttpClientRequest) => Effect.Effect<A1, E1, R1>
-  ): HttpClient<A1, E | E1, R | R1>
+  <E, R, E1, R1>(
+    self: HttpClient<E, R>,
+    f: (
+      effect: Effect.Effect<ClientResponse.HttpClientResponse, E, R>,
+      request: ClientRequest.HttpClientRequest
+    ) => Effect.Effect<ClientResponse.HttpClientResponse, E1, R1>
+  ): HttpClient<E | E1, R | R1>
 } = internal.transform
 
 /**
@@ -383,67 +447,23 @@ export const transformResponse: {
    * @since 1.0.0
    * @category mapping & sequencing
    */
-  <A, E, R, A1, E1, R1>(
-    f: (effect: Effect.Effect<A, E, R>) => Effect.Effect<A1, E1, R1>
-  ): (self: HttpClient<A, E, R>) => HttpClient<A1, E1, R1>
+  <E, R, E1, R1>(
+    f: (
+      effect: Effect.Effect<ClientResponse.HttpClientResponse, E, R>
+    ) => Effect.Effect<ClientResponse.HttpClientResponse, E1, R1>
+  ): (self: HttpClient<E, R>) => HttpClient<E1, R1>
   /**
    * @since 1.0.0
    * @category mapping & sequencing
    */
-  <A, E, R, A1, E1, R1>(
-    self: HttpClient<A, E, R>,
-    f: (effect: Effect.Effect<A, E, R>) => Effect.Effect<A1, E1, R1>
-  ): HttpClient<A1, E1, R1>
+  <E, R, E1, R1>(
+    self: HttpClient<E, R>,
+    f: (
+      effect: Effect.Effect<ClientResponse.HttpClientResponse, E, R>
+    ) => Effect.Effect<ClientResponse.HttpClientResponse, E1, R1>
+  ): HttpClient<E1, R1>
 } = internal.transformResponse
 
-/**
- * Transforms the result of a request.
- *
- * @since 1.0.0
- * @category mapping & sequencing
- */
-export const map: {
-  /**
-   * Transforms the result of a request.
-   *
-   * @since 1.0.0
-   * @category mapping & sequencing
-   */
-  <A, B>(f: (a: A) => B): <E, R>(self: HttpClient<A, E, R>) => HttpClient<B, E, R>
-  /**
-   * Transforms the result of a request.
-   *
-   * @since 1.0.0
-   * @category mapping & sequencing
-   */
-  <A, E, R, B>(self: HttpClient<A, E, R>, f: (a: A) => B): HttpClient<B, E, R>
-} = internal.map
-
-/**
- * Transforms the result of a request using an effectful function.
- *
- * @since 1.0.0
- * @category mapping & sequencing
- */
-export const mapEffect: {
-  /**
-   * Transforms the result of a request using an effectful function.
-   *
-   * @since 1.0.0
-   * @category mapping & sequencing
-   */
-  <A, B, E2, R2>(
-    f: (a: A) => Effect.Effect<B, E2, R2>
-  ): <E, R>(self: HttpClient<A, E, R>) => HttpClient<B, E2 | E, R2 | R>
-  /**
-   * Transforms the result of a request using an effectful function.
-   *
-   * @since 1.0.0
-   * @category mapping & sequencing
-   */
-  <A, E, R, B, E2, R2>(self: HttpClient<A, E, R>, f: (a: A) => Effect.Effect<B, E2, R2>): HttpClient<B, E | E2, R2 | R>
-} = internal.mapEffect
-
 /**
  * Appends a transformation of the request object before sending it.
  *
@@ -459,17 +479,17 @@ export const mapRequest: {
    */
   (
     f: (a: ClientRequest.HttpClientRequest) => ClientRequest.HttpClientRequest
-  ): <A, E, R>(self: HttpClient<A, E, R>) => HttpClient<A, E, R>
+  ): <E, R>(self: HttpClient<E, R>) => HttpClient<E, R>
   /**
    * Appends a transformation of the request object before sending it.
    *
    * @since 1.0.0
    * @category mapping & sequencing
    */
-  <A, E, R>(
-    self: HttpClient<A, E, R>,
+  <E, R>(
+    self: HttpClient<E, R>,
     f: (a: ClientRequest.HttpClientRequest) => ClientRequest.HttpClientRequest
-  ): HttpClient<A, E, R>
+  ): HttpClient<E, R>
 } = internal.mapRequest
 
 /**
@@ -487,17 +507,17 @@ export const mapRequestEffect: {
    */
   <E2, R2>(
     f: (a: ClientRequest.HttpClientRequest) => Effect.Effect<ClientRequest.HttpClientRequest, E2, R2>
-  ): <A, E, R>(self: HttpClient<A, E, R>) => HttpClient<A, E2 | E, R2 | R>
+  ): <E, R>(self: HttpClient<E, R>) => HttpClient<E | E2, R | R2>
   /**
    * Appends an effectful transformation of the request object before sending it.
    *
    * @since 1.0.0
    * @category mapping & sequencing
    */
-  <A, E, R, E2, R2>(
-    self: HttpClient<A, E, R>,
+  <E, R, E2, R2>(
+    self: HttpClient<E, R>,
     f: (a: ClientRequest.HttpClientRequest) => Effect.Effect<ClientRequest.HttpClientRequest, E2, R2>
-  ): HttpClient<A, E | E2, R | R2>
+  ): HttpClient<E | E2, R | R2>
 } = internal.mapRequestEffect
 
 /**
@@ -515,17 +535,17 @@ export const mapRequestInput: {
    */
   (
     f: (a: ClientRequest.HttpClientRequest) => ClientRequest.HttpClientRequest
-  ): <A, E, R>(self: HttpClient<A, E, R>) => HttpClient<A, E, R>
+  ): <E, R>(self: HttpClient<E, R>) => HttpClient<E, R>
   /**
    * Prepends a transformation of the request object before sending it.
    *
    * @since 1.0.0
    * @category mapping & sequencing
    */
-  <A, E, R>(
-    self: HttpClient<A, E, R>,
+  <E, R>(
+    self: HttpClient<E, R>,
     f: (a: ClientRequest.HttpClientRequest) => ClientRequest.HttpClientRequest
-  ): HttpClient<A, E, R>
+  ): HttpClient<E, R>
 } = internal.mapRequestInput
 
 /**
@@ -543,17 +563,17 @@ export const mapRequestInputEffect: {
    */
   <E2, R2>(
     f: (a: ClientRequest.HttpClientRequest) => Effect.Effect<ClientRequest.HttpClientRequest, E2, R2>
-  ): <A, E, R>(self: HttpClient<A, E, R>) => HttpClient<A, E2 | E, R2 | R>
+  ): <E, R>(self: HttpClient<E, R>) => HttpClient<E | E2, R | R2>
   /**
    * Prepends an effectful transformation of the request object before sending it.
    *
    * @since 1.0.0
    * @category mapping & sequencing
    */
-  <A, E, R, E2, R2>(
-    self: HttpClient<A, E, R>,
+  <E, R, E2, R2>(
+    self: HttpClient<E, R>,
     f: (a: ClientRequest.HttpClientRequest) => Effect.Effect<ClientRequest.HttpClientRequest, E2, R2>
-  ): HttpClient<A, E | E2, R2 | R>
+  ): HttpClient<E | E2, R | R2>
 } = internal.mapRequestInputEffect
 
 /**
@@ -565,8 +585,7 @@ export declare namespace Retry {
    * @since 1.0.0
    * @category error handling
    */
-  export type Return<R, E, A, O extends Effect.Retry.Options<E>> = HttpClient<
-    A,
+  export type Return<R, E, O extends Effect.Retry.Options<E>> = HttpClient<
     | (O extends { schedule: Schedule.Schedule<infer _O, infer _I, infer _R> } ? E
       : O extends { until: Predicate.Refinement<E, infer E2> } ? E2
       : E)
@@ -592,30 +611,28 @@ export const retry: {
    * @since 1.0.0
    * @category error handling
    */
-  <E, O extends Effect.Retry.Options<E>>(options: O): <A, R>(self: HttpClient<A, E, R>) => Retry.Return<R, E, A, O>
+  <E, O extends Effect.Retry.Options<E>>(options: O): <R>(self: HttpClient<E, R>) => Retry.Return<R, E, O>
   /**
    * Retries the request based on a provided schedule or policy.
    *
    * @since 1.0.0
    * @category error handling
    */
-  <B, E, R1>(
-    policy: Schedule.Schedule<B, NoInfer<E>, R1>
-  ): <A, R>(self: HttpClient<A, E, R>) => HttpClient<A, E, R1 | R>
+  <B, E, R1>(policy: Schedule.Schedule<B, NoInfer<E>, R1>): <R>(self: HttpClient<E, R>) => HttpClient<E, R1 | R>
   /**
    * Retries the request based on a provided schedule or policy.
    *
    * @since 1.0.0
    * @category error handling
    */
-  <A, E, R, O extends Effect.Retry.Options<E>>(self: HttpClient<A, E, R>, options: O): Retry.Return<R, E, A, O>
+  <E, R, O extends Effect.Retry.Options<E>>(self: HttpClient<E, R>, options: O): Retry.Return<R, E, O>
   /**
    * Retries the request based on a provided schedule or policy.
    *
    * @since 1.0.0
    * @category error handling
    */
-  <A, E, R, B, R1>(self: HttpClient<A, E, R>, policy: Schedule.Schedule<B, E, R1>): HttpClient<A, E, R1 | R>
+  <E, R, B, R1>(self: HttpClient<E, R>, policy: Schedule.Schedule<B, E, R1>): HttpClient<E, R1 | R>
 } = internal.retry
 
 /**
@@ -635,62 +652,21 @@ export const retryTransient: {
     options:
       | { readonly schedule?: Schedule.Schedule<B, NoInfer<E>, R1>; readonly times?: number }
       | Schedule.Schedule<B, NoInfer<E>, R1>
-  ): <A, R>(self: HttpClient<A, E, R>) => HttpClient<A, E, R1 | R>
+  ): <R>(self: HttpClient<E, R>) => HttpClient<E, R1 | R>
   /**
    * Retries common transient errors, such as rate limiting or network issues.
    *
    * @since 1.0.0
    * @category error handling
    */
-  <A, E, R, B, R1 = never>(
-    self: HttpClient<A, E, R>,
+  <E, R, B, R1 = never>(
+    self: HttpClient<E, R>,
     options:
       | { readonly schedule?: Schedule.Schedule<B, NoInfer<E>, R1>; readonly times?: number }
       | Schedule.Schedule<B, NoInfer<E>, R1>
-  ): HttpClient<A, E, R1 | R>
+  ): HttpClient<E, R1 | R>
 } = internal.retryTransient
 
-/**
- * Ensures resources are properly scoped and released after execution.
- *
- * @since 1.0.0
- * @category resources & finalizers
- */
-export const scoped: <A, E, R>(self: HttpClient<A, E, R>) => HttpClient<A, E, Exclude<R, Scope.Scope>> = internal.scoped
-
-/**
- * Creates a function that validates request data against a schema before sending it.
- *
- * @since 1.0.0
- * @category schema
- */
-export const schemaFunction: {
-  /**
-   * Creates a function that validates request data against a schema before sending it.
-   *
-   * @since 1.0.0
-   * @category schema
-   */
-  <SA, SI, SR>(schema: Schema.Schema<SA, SI, SR>, options?: ParseOptions | undefined): <A, E, R>(
-    self: HttpClient<A, E, R>
-  ) => (
-    request: ClientRequest.HttpClientRequest
-  ) => (a: SA) => Effect.Effect<A, Error.RequestError | E | ParseResult.ParseError, SR | R>
-  /**
-   * Creates a function that validates request data against a schema before sending it.
-   *
-   * @since 1.0.0
-   * @category schema
-   */
-  <A, E, R, SA, SI, SR>(
-    self: HttpClient<A, E, R>,
-    schema: Schema.Schema<SA, SI, SR>,
-    options?: ParseOptions | undefined
-  ): (
-    request: ClientRequest.HttpClientRequest
-  ) => (a: SA) => Effect.Effect<A, Error.RequestError | ParseResult.ParseError | E, R | SR>
-} = internal.schemaFunction
-
 /**
  * Performs an additional effect after a successful request.
  *
@@ -704,16 +680,19 @@ export const tap: {
    * @since 1.0.0
    * @category mapping & sequencing
    */
-  <A, _, E2, R2>(
-    f: (a: A) => Effect.Effect<_, E2, R2>
-  ): <E, R>(self: HttpClient<A, E, R>) => HttpClient<A, E2 | E, R2 | R>
+  <_, E2, R2>(
+    f: (response: ClientResponse.HttpClientResponse) => Effect.Effect<_, E2, R2>
+  ): <E, R>(self: HttpClient<E, R>) => HttpClient<E | E2, R | R2>
   /**
    * Performs an additional effect after a successful request.
    *
    * @since 1.0.0
    * @category mapping & sequencing
    */
-  <A, E, R, _, E2, R2>(self: HttpClient<A, E, R>, f: (a: A) => Effect.Effect<_, E2, R2>): HttpClient<A, E | E2, R2 | R>
+  <E, R, _, E2, R2>(
+    self: HttpClient<E, R>,
+    f: (response: ClientResponse.HttpClientResponse) => Effect.Effect<_, E2, R2>
+  ): HttpClient<E | E2, R | R2>
 } = internal.tap
 
 /**
@@ -731,17 +710,17 @@ export const tapRequest: {
    */
   <_, E2, R2>(
     f: (a: ClientRequest.HttpClientRequest) => Effect.Effect<_, E2, R2>
-  ): <A, E, R>(self: HttpClient<A, E, R>) => HttpClient<A, E2 | E, R2 | R>
+  ): <E, R>(self: HttpClient<E, R>) => HttpClient<E | E2, R | R2>
   /**
    * Performs an additional effect on the request before sending it.
    *
    * @since 1.0.0
    * @category mapping & sequencing
    */
-  <A, E, R, _, E2, R2>(
-    self: HttpClient<A, E, R>,
+  <E, R, _, E2, R2>(
+    self: HttpClient<E, R>,
     f: (a: ClientRequest.HttpClientRequest) => Effect.Effect<_, E2, R2>
-  ): HttpClient<A, E | E2, R | R2>
+  ): HttpClient<E | E2, R | R2>
 } = internal.tapRequest
 
 /**
@@ -757,14 +736,14 @@ export const withCookiesRef: {
    * @since 1.0.0
    * @category cookies
    */
-  (ref: Ref<Cookies>): <E, R>(self: HttpClient.WithResponse<E, R>) => HttpClient.WithResponse<E, R>
+  (ref: Ref<Cookies>): <E, R>(self: HttpClient<E, R>) => HttpClient<E, R>
   /**
    * Associates a `Ref` of cookies with the client for handling cookies across requests.
    *
    * @since 1.0.0
    * @category cookies
    */
-  <E, R>(self: HttpClient.WithResponse<E, R>, ref: Ref<Cookies>): HttpClient.WithResponse<E, R>
+  <E, R>(self: HttpClient<E, R>, ref: Ref<Cookies>): HttpClient<E, R>
 } = internal.withCookiesRef
 
 /**
@@ -780,14 +759,14 @@ export const followRedirects: {
    * @since 1.0.0
    * @category redirects
    */
-  (maxRedirects?: number | undefined): <E, R>(self: HttpClient.WithResponse<E, R>) => HttpClient.WithResponse<E, R>
+  (maxRedirects?: number | undefined): <E, R>(self: HttpClient<E, R>) => HttpClient<E, R>
   /**
    * Follows HTTP redirects up to a specified number of times.
    *
    * @since 1.0.0
    * @category redirects
    */
-  <E, R>(self: HttpClient.WithResponse<E, R>, maxRedirects?: number | undefined): HttpClient.WithResponse<E, R>
+  <E, R>(self: HttpClient<E, R>, maxRedirects?: number | undefined): HttpClient<E, R>
 } = internal.followRedirects
 
 /**
@@ -858,5 +837,5 @@ export const withTracerPropagation: {
  * @since 1.0.0
  */
 export const layerMergedContext: <E, R>(
-  effect: Effect.Effect<HttpClient.Service, E, R>
-) => Layer<HttpClient.Service, E, R> = internal.layerMergedContext
+  effect: Effect.Effect<HttpClient, E, R>
+) => Layer<HttpClient, E, R> = internal.layerMergedContext