fix context

effect-app · Nov 6, 2024 · fe019f1 · fe019f1
1 parent 29ea487
commit fe019f1
Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/.changeset/famous-planes-wait.md b/.changeset/famous-planes-wait.md
@@ -0,0 +1,5 @@
+---
+"@effect-app/infra": patch
+---
+
+fix context
diff --git a/packages/infra/src/api/routing7.ts b/packages/infra/src/api/routing7.ts
@@ -768,17 +768,31 @@ export const makeRouter = <
           Handler<
             Filter<Rsc>[K],
             "d",
-            Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R
-              : Impl[K] extends Effect<any, any, infer R> ? R
-              : never
+            Exclude<
+              | Context
+              | Exclude<
+                Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R
+                  : Impl[K] extends Effect<any, any, infer R> ? R
+                  : never,
+                GetEffectContext<CTXMap, Rsc[K]["config"]>
+              >,
+              HttpRouter.HttpRouter.Provided
+            >
           >
         >
         : Handler<
           Filter<Rsc>[K],
           "d",
-          Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R
-            : Impl[K] extends Effect<any, any, infer R> ? R
-            : never
+          Exclude<
+            | Context
+            | Exclude<
+              Impl[K] extends (...args: any[]) => Effect<any, any, infer R> ? R
+                : Impl[K] extends Effect<any, any, infer R> ? R
+                : never,
+              GetEffectContext<CTXMap, Rsc[K]["config"]>
+            >,
+            HttpRouter.HttpRouter.Provided
+          >
         >
     } = (obj: Record<keyof Filtered, any>) =>
       typedKeysOf(obj).reduce((acc, cur) => {