HandlersContext helpers

Effect-TS · Jan 30, 2025 · b7e371f · b7e371f
1 parent b789dc0
commit b7e371f
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/packages/rpc/src/RpcGroup.ts b/packages/rpc/src/RpcGroup.ts
@@ -75,19 +75,7 @@ export interface RpcGroup<Rpcs extends Rpc.Any> extends Pipeable {
     Rpc.ToHandler<Rpcs>,
     EX,
     | Exclude<RX, Scope>
-    | (
-      keyof Handlers extends infer K ? K extends keyof Handlers & string ? Handlers[K] extends (...args: any) =>
-            | Stream.Stream<infer _A, infer _E, infer _R>
-            | Effect.Effect<
-              ReadonlyMailbox<infer _A, infer _E>,
-              infer _EX,
-              infer _R
-            > ? Exclude<Rpc.ExcludeProvides<_R, Rpcs, K>, Scope> :
-          Handlers[K] extends (...args: any) => Effect.Effect<infer _A, infer _E, infer _R> ? _R
-          : never
-        : never
-        : never
-    )
+    | HandlersContext<Rpcs, Handlers>
   >
 
   /**
@@ -123,6 +111,23 @@ export type HandlersFrom<Rpc extends Rpc.Any> = {
     >
 }
 
+/**
+ * @since 1.0.0
+ * @category groups
+ */
+export type HandlersContext<Rpcs extends Rpc.Any, Handlers> = keyof Handlers extends infer K ?
+  K extends keyof Handlers & string ? Handlers[K] extends (...args: any) =>
+      | Stream.Stream<infer _A, infer _E, infer _R>
+      | Effect.Effect<
+        ReadonlyMailbox<infer _A, infer _E>,
+        infer _EX,
+        infer _R
+      > ? Exclude<Rpc.ExcludeProvides<_R, Rpcs, K>, Scope> :
+    Handlers[K] extends (...args: any) => Effect.Effect<infer _A, infer _E, infer _R> ? _R
+    : never
+  : never
+  : never
+
 const RpcGroupProto = {
   add(this: RpcGroup<any>, ...rpcs: Array<any>) {
     return makeProto({