From e0d21a54c8323728fbb75a32f4820a9996257809 Mon Sep 17 00:00:00 2001
From: Sebastian Lorenz <fubhy@fubhy.com>
Date: Thu, 12 Sep 2024 22:56:50 +0200
Subject: [PATCH] add filter refinement overloads to http client (#3595)

---
 .changeset/thick-coats-buy.md                |  5 +++
 packages/platform/src/HttpClient.ts          | 38 ++++++++++++----
 packages/platform/src/internal/httpClient.ts | 46 ++++++++++++++------
 3 files changed, 66 insertions(+), 23 deletions(-)
 create mode 100644 .changeset/thick-coats-buy.md

diff --git a/.changeset/thick-coats-buy.md b/.changeset/thick-coats-buy.md
new file mode 100644
index 0000000000..8cc5fdb2e0
--- /dev/null
+++ b/.changeset/thick-coats-buy.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform": patch
+---
+
+Added refinement overloads to `HttpClient.filterOrFail` and `HttpClient.filterOrElse`
diff --git a/packages/platform/src/HttpClient.ts b/packages/platform/src/HttpClient.ts
index 45f8b3d819..d89b55738e 100644
--- a/packages/platform/src/HttpClient.ts
+++ b/packages/platform/src/HttpClient.ts
@@ -174,15 +174,26 @@ export const catchTags: {
  * @category filters
  */
 export const filterOrElse: {
+  <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>
   <A, B, E2, R2>(
-    f: Predicate.Predicate<A>,
-    orElse: (a: A) => Effect.Effect<B, E2, R2>
-  ): <E, R>(self: HttpClient<A, E, R>) => HttpClient<A | B, E2 | E, R2 | R>
+    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>
+  <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>
   <A, E, R, B, E2, R2>(
     self: HttpClient<A, E, R>,
-    f: Predicate.Predicate<A>,
+    predicate: Predicate.Predicate<A>,
     orElse: (a: A) => Effect.Effect<B, E2, R2>
-  ): HttpClient<A | B, E | E2, R | R2>
+  ): HttpClient<A | B, E2 | E, R2 | R>
 } = internal.filterOrElse
 
 /**
@@ -190,15 +201,24 @@ export const filterOrElse: {
  * @category filters
  */
 export const filterOrFail: {
+  <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>
   <A, E2>(
-    f: Predicate.Predicate<A>,
-    orFailWith: (a: A) => E2
+    predicate: Predicate.Predicate<NoInfer<A>>,
+    orFailWith: (a: NoInfer<A>) => E2
   ): <E, R>(self: HttpClient<A, E, R>) => HttpClient<A, E2 | E, R>
+  <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>
   <A, E, R, E2>(
     self: HttpClient<A, E, R>,
-    f: Predicate.Predicate<A>,
+    predicate: Predicate.Predicate<A>,
     orFailWith: (a: A) => E2
-  ): HttpClient<A, E | E2, R>
+  ): HttpClient<A, E2 | E, R>
 } = internal.filterOrFail
 
 /**
diff --git a/packages/platform/src/internal/httpClient.ts b/packages/platform/src/internal/httpClient.ts
index 8fc588308f..3398146422 100644
--- a/packages/platform/src/internal/httpClient.ts
+++ b/packages/platform/src/internal/httpClient.ts
@@ -476,32 +476,50 @@ export const catchAll: {
 )
 
 /** @internal */
-export const filterOrElse = dual<
+export const filterOrElse: {
+  <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: Client.HttpClient<A, E, R>) => Client.HttpClient<B | C, E | E2, R | R2>
   <A, B, E2, R2>(
-    f: Predicate.Predicate<A>,
-    orElse: (a: A) => Effect.Effect<B, E2, R2>
-  ) => <E, R>(
+    predicate: Predicate.Predicate<NoInfer<A>>,
+    orElse: (a: NoInfer<A>) => Effect.Effect<B, E2, R2>
+  ): <E, R>(
     self: Client.HttpClient<A, E, R>
-  ) => Client.HttpClient<A | B, E2 | E, R2 | R>,
+  ) => Client.HttpClient<A | B, E2 | E, R2 | R>
+  <A, E, R, B extends A, C, E2, R2>(
+    self: Client.HttpClient<A, E, R>,
+    refinement: Predicate.Refinement<A, B>,
+    orElse: (a: A) => Effect.Effect<C, E2, R2>
+  ): Client.HttpClient<B | C, E | E2, R | R2>
   <A, E, R, B, E2, R2>(
     self: Client.HttpClient<A, E, R>,
-    f: Predicate.Predicate<A>,
+    predicate: Predicate.Predicate<A>,
     orElse: (a: A) => Effect.Effect<B, E2, R2>
-  ) => Client.HttpClient<A | B, E2 | E, R2 | R>
->(3, (self, f, orElse) => transformResponse(self, Effect.filterOrElse(f, orElse)))
+  ): Client.HttpClient<A | B, E2 | E, R2 | R>
+} = dual(3, (self, f, orElse) => transformResponse(self, Effect.filterOrElse(f, orElse)))
 
 /** @internal */
-export const filterOrFail = dual<
+export const filterOrFail: {
+  <A, B extends A, E2>(
+    refinement: Predicate.Refinement<NoInfer<A>, B>,
+    orFailWith: (a: NoInfer<A>) => E2
+  ): <E, R>(self: Client.HttpClient<A, E, R>) => Client.HttpClient<B, E | E2, R>
   <A, E2>(
-    f: Predicate.Predicate<A>,
+    predicate: Predicate.Predicate<NoInfer<A>>,
+    orFailWith: (a: NoInfer<A>) => E2
+  ): <E, R>(self: Client.HttpClient<A, E, R>) => Client.HttpClient<A, E2 | E, R>
+  <A, B extends A, E, R, E2>(
+    self: Client.HttpClient<A, E, R>,
+    refinement: Predicate.Refinement<A, B>,
     orFailWith: (a: A) => E2
-  ) => <E, R>(self: Client.HttpClient<A, E, R>) => Client.HttpClient<A, E2 | E, R>,
+  ): Client.HttpClient<B, E2 | E, R>
   <A, E, R, E2>(
     self: Client.HttpClient<A, E, R>,
-    f: Predicate.Predicate<A>,
+    predicate: Predicate.Predicate<A>,
     orFailWith: (a: A) => E2
-  ) => Client.HttpClient<A, E2 | E, R>
->(3, (self, f, orFailWith) => transformResponse(self, Effect.filterOrFail(f, orFailWith)))
+  ): Client.HttpClient<A, E2 | E, R>
+} = dual(3, (self, f, orFailWith) => transformResponse(self, Effect.filterOrFail(f, orFailWith)))
 
 /** @internal */
 export const map = dual<