eliminate HttpApiEndpoint context in .handle

Effect-TS · Oct 25, 2024 · 2362779 · 2362779
1 parent d58bd18
commit 2362779
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/.changeset/lemon-fishes-think.md b/.changeset/lemon-fishes-think.md
@@ -0,0 +1,5 @@
+---
+"@effect/platform": patch
+---
+
+eliminate HttpApiEndpoint context in .handle
diff --git a/packages/platform/src/HttpApiBuilder.ts b/packages/platform/src/HttpApiBuilder.ts
@@ -222,7 +222,15 @@ export interface Handlers<
   ): Handlers<
     E,
     Provides,
-    R | Exclude<HttpApiEndpoint.HttpApiEndpoint.ExcludeProvided<Endpoints, Name, R1>, Provides>,
+    | R
+    | Exclude<
+      HttpApiEndpoint.HttpApiEndpoint.ExcludeProvided<
+        Endpoints,
+        Name,
+        R1 | HttpApiEndpoint.HttpApiEndpoint.ContextWithName<Endpoints, Name>
+      >,
+      Provides
+    >,
     HttpApiEndpoint.HttpApiEndpoint.ExcludeName<Endpoints, Name>
   >
 
@@ -236,7 +244,15 @@ export interface Handlers<
   ): Handlers<
     E,
     Provides,
-    R | Exclude<HttpApiEndpoint.HttpApiEndpoint.ExcludeProvided<Endpoints, Name, R1>, Provides>,
+    | R
+    | Exclude<
+      HttpApiEndpoint.HttpApiEndpoint.ExcludeProvided<
+        Endpoints,
+        Name,
+        R1 | HttpApiEndpoint.HttpApiEndpoint.ContextWithName<Endpoints, Name>
+      >,
+      Provides
+    >,
     HttpApiEndpoint.HttpApiEndpoint.ExcludeName<Endpoints, Name>
   >
 }

diff --git a/packages/platform/src/HttpApiGroup.ts b/packages/platform/src/HttpApiGroup.ts
@@ -227,12 +227,8 @@ export declare namespace HttpApiGroup {
    */
   export type Context<Group> = Group extends
     HttpApiGroup<infer _Name, infer _Endpoints, infer _Error, infer _R, infer _TopLevel> ?
-      | HttpApiMiddleware.HttpApiMiddleware.Only<_R>
-      | Exclude<
-        HttpApiEndpoint.HttpApiEndpoint.Context<_Endpoints>,
-        HttpApiMiddleware.HttpApiMiddleware.ExtractProvides<HttpApiEndpoint.HttpApiEndpoint.Context<_Endpoints> | _R>
-      >
-    : never
+    HttpApiMiddleware.HttpApiMiddleware.Only<_R> :
+    never
 
   /**
    * @since 1.0.0