enforce Rpc.fromTaggedRequest

Effect-TS · Feb 8, 2025 · 5f15c4d · 5f15c4d
1 parent 4e68a8b
commit 5f15c4d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/packages/rpc/src/Rpc.ts b/packages/rpc/src/Rpc.ts
@@ -421,13 +421,6 @@ export type ExcludeProvides<Env, R extends Any, Tag extends string> = Exclude<
   ExtractProvides<R, Tag>
 >
 
-/**
- * @since 1.0.0
- * @category models
- */
-export type FromInput<S extends AnyTaggedRequestSchema | Any> = S extends AnyTaggedRequestSchema ? From<S>
-  : S
-
 /**
  * @since 1.0.0
  * @category models

diff --git a/packages/rpc/src/RpcGroup.ts b/packages/rpc/src/RpcGroup.ts
@@ -40,9 +40,9 @@ export interface RpcGroup<in out Rpcs extends Rpc.Any> extends Pipeable {
   /**
    * Add one or more procedures to the group.
    */
-  add<const Rpcs2 extends ReadonlyArray<Rpc.Any | Rpc.AnyTaggedRequestSchema>>(
+  add<const Rpcs2 extends ReadonlyArray<Rpc.Any>>(
     ...rpcs: Rpcs2
-  ): RpcGroup<Rpcs | Rpc.FromInput<Rpcs2[number]>>
+  ): RpcGroup<Rpcs | Rpcs2[number]>
 
   /**
    * Merge this group with another group.
@@ -226,10 +226,10 @@ const makeProto = <Rpcs extends Rpc.Any>(options: {
     annotations: options.annotations
   }) as any
 
-const resolveInput = <Rpcs extends ReadonlyArray<Rpc.Any | Rpc.AnyTaggedRequestSchema>>(
+const resolveInput = <Rpcs extends ReadonlyArray<Rpc.Any>>(
   ...rpcs: Rpcs
-): ReadonlyMap<string, Rpc.FromInput<Rpcs[number]>> => {
-  const requests = new Map<string, Rpc.FromInput<Rpcs[number]>>()
+): ReadonlyMap<string, Rpcs[number]> => {
+  const requests = new Map<string, Rpcs[number]>()
   for (const rpc of rpcs) {
     requests.set(rpc._tag, Schema.isSchema(rpc) ? Rpc.fromTaggedRequest(rpc as any) : rpc as any)
   }
@@ -240,9 +240,9 @@ const resolveInput = <Rpcs extends ReadonlyArray<Rpc.Any | Rpc.AnyTaggedRequestS
  * @since 1.0.0
  * @category groups
  */
-export const make = <const Rpcs extends ReadonlyArray<Rpc.Any | Rpc.AnyTaggedRequestSchema>>(
+export const make = <const Rpcs extends ReadonlyArray<Rpc.Any>>(
   ...rpcs: Rpcs
-): RpcGroup<Rpc.FromInput<Rpcs[number]>> =>
+): RpcGroup<Rpcs[number]> =>
   makeProto({
     requests: resolveInput(...rpcs),
     annotations: Context.empty()

diff --git a/packages/rpc/test/fixtures/schemas.ts b/packages/rpc/test/fixtures/schemas.ts
@@ -37,7 +37,7 @@ export const UserRpcs = RpcGroup
       success: User,
       payload: { id: Schema.String }
     }),
-    StreamUsers,
+    Rpc.fromTaggedRequest(StreamUsers),
     Rpc.make("GetInterrupts", {
       success: Schema.Number
     }),