Skip to content

Commit 783ae4e

Browse files
authored
fix(server)!: remove input type in client interceptors (#309)
Type input in interceptors is not safe since this input is not validated and may diff as expected type in remote call like server action envs <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **Refactor** - Streamlined procedure action configurations by removing redundant input schema specifications. - Enhanced consistency and simplicity across client and server interactions, improving overall developer experience. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
1 parent 9486ab5 commit 783ae4e

File tree

8 files changed

+4
-14
lines changed

8 files changed

+4
-14
lines changed

packages/react/src/action-form.ts

-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export function createFormAction<
3232
...rest: MaybeOptionalOptions<
3333
CreateProcedureClientOptions<
3434
TInitialContext,
35-
TInputSchema,
3635
TOutputSchema,
3736
TErrorMap,
3837
TMeta,

packages/server/src/adapters/standard/handler.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export interface StandardHandlerOptions<TContext extends Context> {
4343
* Interceptors for procedure client.
4444
*/
4545
clientInterceptors?: Interceptor<
46-
ProcedureClientInterceptorOptions<TContext, AnySchema, Record<never, never>, Meta>,
46+
ProcedureClientInterceptorOptions<TContext, Record<never, never>, Meta>,
4747
InferSchemaOutput<AnySchema>,
4848
ErrorFromErrorMap<Record<never, never>>
4949
>[]

packages/server/src/implementer-procedure.ts

-2
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ export interface ImplementedProcedure<
6464
...rest: MaybeOptionalOptions<
6565
CreateProcedureClientOptions<
6666
TInitialContext,
67-
TInputSchema,
6867
TOutputSchema,
6968
TErrorMap,
7069
TMeta,
@@ -81,7 +80,6 @@ export interface ImplementedProcedure<
8180
...rest: MaybeOptionalOptions<
8281
CreateProcedureClientOptions<
8382
TInitialContext,
84-
TInputSchema,
8583
TOutputSchema,
8684
TErrorMap,
8785
TMeta,

packages/server/src/procedure-client.test-d.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ describe('createProcedureClient', () => {
9696
expectTypeOf(path).toEqualTypeOf<readonly string[]>()
9797
expectTypeOf(errors).toEqualTypeOf<ORPCErrorConstructorMap<typeof baseErrorMap>>()
9898
expectTypeOf(context).toEqualTypeOf<{ db: string }>()
99-
expectTypeOf(input).toEqualTypeOf<{ input: number }>()
99+
expectTypeOf(input).toEqualTypeOf<unknown>()
100100

101101
const output = await next()
102102

packages/server/src/procedure-client.ts

+2-5
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,11 @@ export type ProcedureClient<
2525

2626
export interface ProcedureClientInterceptorOptions<
2727
TInitialContext extends Context,
28-
TInputSchema extends AnySchema,
2928
TErrorMap extends ErrorMap,
3029
TMeta extends Meta,
3130
> {
3231
context: TInitialContext
33-
input: InferSchemaInput<TInputSchema>
32+
input: unknown
3433
errors: ORPCErrorConstructorMap<TErrorMap>
3534
path: readonly string[]
3635
procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, TMeta>
@@ -43,7 +42,6 @@ export interface ProcedureClientInterceptorOptions<
4342
*/
4443
export type CreateProcedureClientOptions<
4544
TInitialContext extends Context,
46-
TInputSchema extends AnySchema,
4745
TOutputSchema extends AnySchema,
4846
TErrorMap extends ErrorMap,
4947
TMeta extends Meta,
@@ -56,7 +54,7 @@ export type CreateProcedureClientOptions<
5654
path?: readonly string[]
5755

5856
interceptors?: Interceptor<
59-
ProcedureClientInterceptorOptions<TInitialContext, TInputSchema, TErrorMap, TMeta>,
57+
ProcedureClientInterceptorOptions<TInitialContext, TErrorMap, TMeta>,
6058
InferSchemaOutput<TOutputSchema>,
6159
ErrorFromErrorMap<TErrorMap>
6260
>[]
@@ -79,7 +77,6 @@ export function createProcedureClient<
7977
...[options]: MaybeOptionalOptions<
8078
CreateProcedureClientOptions<
8179
TInitialContext,
82-
TInputSchema,
8380
TOutputSchema,
8481
TErrorMap,
8582
TMeta,

packages/server/src/procedure-decorated.ts

-2
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ export class DecoratedProcedure<
118118
...rest: MaybeOptionalOptions<
119119
CreateProcedureClientOptions<
120120
TInitialContext,
121-
TInputSchema,
122121
TOutputSchema,
123122
TErrorMap,
124123
TMeta,
@@ -147,7 +146,6 @@ export class DecoratedProcedure<
147146
...rest: MaybeOptionalOptions<
148147
CreateProcedureClientOptions<
149148
TInitialContext,
150-
TInputSchema,
151149
TOutputSchema,
152150
TErrorMap,
153151
TMeta,

packages/server/src/procedure-utils.ts

-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ export function call<
6060
...rest: MaybeOptionalOptions<
6161
CreateProcedureClientOptions<
6262
TInitialContext,
63-
TInputSchema,
6463
TOutputSchema,
6564
TErrorMap,
6665
TMeta,

packages/server/src/router-client.ts

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ export function createRouterClient<T extends AnyRouter, TClientContext extends C
2424
CreateProcedureClientOptions<
2525
InferRouterInitialContext<T>,
2626
Schema<unknown, unknown>,
27-
Schema<unknown, unknown>,
2827
ErrorMap,
2928
Meta,
3029
TClientContext

0 commit comments

Comments
 (0)