@effect/platform 0.66.1 → 0.66.3

package/src/UrlParams.ts

@@ -71,7 +71,15 @@ export const empty: UrlParams = []
  * @category combinators
  */
 export const getAll: {
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (key: string): (self: UrlParams) => ReadonlyArray<string>
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (self: UrlParams, key: string): ReadonlyArray<string>
 } = dual(
   2,
@@ -89,7 +97,15 @@ export const getAll: {
  * @category combinators
  */
 export const getFirst: {
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (key: string): (self: UrlParams) => Option.Option<string>
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (self: UrlParams, key: string): Option.Option<string>
 } = dual(2, (self: UrlParams, key: string): Option.Option<string> =>
   Option.map(
@@ -102,7 +118,15 @@ export const getFirst: {
  * @category combinators
  */
 export const getLast: {
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (key: string): (self: UrlParams) => Option.Option<string>
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (self: UrlParams, key: string): Option.Option<string>
 } = dual(2, (self: UrlParams, key: string): Option.Option<string> =>
   Option.map(
@@ -115,7 +139,15 @@ export const getLast: {
  * @category combinators
  */
 export const set: {
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (key: string, value: Coercible): (self: UrlParams) => UrlParams
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (self: UrlParams, key: string, value: Coercible): UrlParams
 } = dual(3, (self: UrlParams, key: string, value: Coercible): UrlParams =>
   Arr.append(
@@ -128,7 +160,15 @@ export const set: {
  * @category combinators
  */
 export const setAll: {
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (input: Input): (self: UrlParams) => UrlParams
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (self: UrlParams, input: Input): UrlParams
 } = dual(2, (self: UrlParams, input: Input): UrlParams => {
   const toSet = fromInput(input)
@@ -144,7 +184,15 @@ export const setAll: {
  * @category combinators
  */
 export const append: {
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (key: string, value: Coercible): (self: UrlParams) => UrlParams
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (self: UrlParams, key: string, value: Coercible): UrlParams
 } = dual(3, (self: UrlParams, key: string, value: Coercible): UrlParams =>
   Arr.append(
@@ -157,7 +205,15 @@ export const append: {
  * @category combinators
  */
 export const appendAll: {
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (input: Input): (self: UrlParams) => UrlParams
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (self: UrlParams, input: Input): UrlParams
 } = dual(2, (self: UrlParams, input: Input): UrlParams => Arr.appendAll(self, fromInput(input)))
 
@@ -166,7 +222,15 @@ export const appendAll: {
  * @category combinators
  */
 export const remove: {
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (key: string): (self: UrlParams) => UrlParams
+  /**
+   * @since 1.0.0
+   * @category combinators
+   */
   (self: UrlParams, key: string): UrlParams
 } = dual(2, (self: UrlParams, key: string): UrlParams => Arr.filter(self, ([k]) => k !== key))
 

package/src/internal/httpClient.ts

@@ -12,7 +12,7 @@ import * as Layer from "effect/Layer"
 import { pipeArguments } from "effect/Pipeable"
 import * as Predicate from "effect/Predicate"
 import * as Ref from "effect/Ref"
-import type * as Schedule from "effect/Schedule"
+import * as Schedule from "effect/Schedule"
 import * as Scope from "effect/Scope"
 import * as Cookies from "../Cookies.js"
 import * as Headers from "../Headers.js"
@@ -24,6 +24,7 @@ import * as TraceContext from "../HttpTraceContext.js"
 import * as UrlParams from "../UrlParams.js"
 import * as internalBody from "./httpBody.js"
 import * as internalRequest from "./httpClientRequest.js"
+import * as internalResponse from "./httpClientResponse.js"
 
 /** @internal */
 export const TypeId: Client.TypeId = Symbol.for(
@@ -235,36 +236,13 @@ export const filterStatus = dual<
     self: Client.HttpClient.WithResponse<E, R>,
     f: (status: number) => boolean
   ) => Client.HttpClient.WithResponse<E | Error.ResponseError, R>
->(2, (self, f) =>
-  transform(self, (effect, request) =>
-    Effect.filterOrFail(
-      effect,
-      (response) => f(response.status),
-      (response) =>
-        new Error.ResponseError({
-          request,
-          response,
-          reason: "StatusCode",
-          description: "invalid status code"
-        })
-    )))
+>(2, (self, f) => transformResponse(self, Effect.flatMap(internalResponse.filterStatus(f))))
 
 /** @internal */
 export const filterStatusOk = <E, R>(
   self: Client.HttpClient.WithResponse<E, R>
 ): Client.HttpClient.WithResponse<E | Error.ResponseError, R> =>
-  transform(self, (effect, request) =>
-    Effect.filterOrFail(
-      effect,
-      (response) => response.status >= 200 && response.status < 300,
-      (response) =>
-        new Error.ResponseError({
-          request,
-          response,
-          reason: "StatusCode",
-          description: "non 2xx status code"
-        })
-    ))
+  transformResponse(self, Effect.flatMap(internalResponse.filterStatusOk))
 
 /** @internal */
 export const transformResponse = dual<
@@ -653,6 +631,43 @@ export const retry: {
   ): Client.HttpClient<A, E, R | R1> => transformResponse(self, Effect.retry(policy))
 )
 
+/** @internal */
+export const retryTransient: {
+  <B, E, R1 = never>(
+    options: {
+      readonly schedule?: Schedule.Schedule<B, NoInfer<E>, R1>
+      readonly times?: number
+    } | Schedule.Schedule<B, NoInfer<E>, R1>
+  ): <A, R>(self: Client.HttpClient<A, E, R>) => Client.HttpClient<A, E, R1 | R>
+  <A, E, R, B, R1 = never>(
+    self: Client.HttpClient<A, E, R>,
+    options: {
+      readonly schedule?: Schedule.Schedule<B, NoInfer<E>, R1>
+      readonly times?: number
+    } | Schedule.Schedule<B, NoInfer<E>, R1>
+  ): Client.HttpClient<A, E, R1 | R>
+} = dual(
+  2,
+  <A, E extends E0, E0, R, B, R1 = never>(
+    self: Client.HttpClient<A, E, R>,
+    options: {
+      readonly schedule?: Schedule.Schedule<B, NoInfer<E>, R1>
+      readonly times?: number
+    } | Schedule.Schedule<B, NoInfer<E>, R1>
+  ): Client.HttpClient<A, E, R | R1> =>
+    transformResponse(
+      self,
+      Effect.retry({
+        while: (error) =>
+          Error.isHttpClientError(error) &&
+          ((error._tag === "RequestError" && error.reason === "Transport") ||
+            (error._tag === "ResponseError" && error.response.status >= 429)),
+        schedule: Schedule.ScheduleTypeId in options ? options : options.schedule,
+        times: Schedule.ScheduleTypeId in options ? undefined : options.times
+      })
+    )
+)
+
 /** @internal */
 export const schemaFunction = dual<
   <SA, SI, SR>(

package/src/internal/httpClientResponse.ts

@@ -29,7 +29,7 @@ class ClientResponseImpl extends Inspectable.Class implements ClientResponse.Htt
   readonly [TypeId]: ClientResponse.TypeId
 
   constructor(
-    private readonly request: ClientRequest.HttpClientRequest,
+    readonly request: ClientRequest.HttpClientRequest,
     private readonly source: globalThis.Response
   ) {
     super()
@@ -240,3 +240,42 @@ export const matchStatus = dual<
   }
   return cases.orElse(self)
 })
+
+/** @internal */
+export const filterStatus = dual<
+  (
+    f: (status: number) => boolean
+  ) => (
+    self: ClientResponse.HttpClientResponse
+  ) => Effect.Effect<ClientResponse.HttpClientResponse, Error.ResponseError>,
+  (
+    self: ClientResponse.HttpClientResponse,
+    f: (status: number) => boolean
+  ) => Effect.Effect<ClientResponse.HttpClientResponse, Error.ResponseError>
+>(
+  2,
+  (self, f) =>
+    Effect.suspend(() =>
+      f(self.status) ? Effect.succeed(self) : Effect.fail(
+        new Error.ResponseError({
+          response: self,
+          request: self.request,
+          reason: "StatusCode",
+          description: "invalid status code"
+        })
+      )
+    )
+)
+
+/** @internal */
+export const filterStatusOk = (
+  self: ClientResponse.HttpClientResponse
+): Effect.Effect<ClientResponse.HttpClientResponse, Error.ResponseError> =>
+  self.status >= 200 && self.status < 300 ? Effect.succeed(self) : Effect.fail(
+    new Error.ResponseError({
+      response: self,
+      request: self.request,
+      reason: "StatusCode",
+      description: "non 2xx status code"
+    })
+  )