Skip to content

fix(server)!: remove input type in client interceptors #309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dinwwwh merged 1 commit into from
Mar 30, 2025
Merged

fix(server)!: remove input type in client interceptors #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/react/src/action-form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ export function createFormAction<
...rest: MaybeOptionalOptions<
CreateProcedureClientOptions<
TInitialContext,
TInputSchema,
TOutputSchema,
TErrorMap,
TMeta,
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/adapters/standard/handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export interface StandardHandlerOptions<TContext extends Context> {
* Interceptors for procedure client.
*/
clientInterceptors?: Interceptor<
ProcedureClientInterceptorOptions<TContext, AnySchema, Record<never, never>, Meta>,
ProcedureClientInterceptorOptions<TContext, Record<never, never>, Meta>,
InferSchemaOutput<AnySchema>,
ErrorFromErrorMap<Record<never, never>>
>[]
Expand Down
2 changes: 0 additions & 2 deletions packages/server/src/implementer-procedure.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ export interface ImplementedProcedure<
...rest: MaybeOptionalOptions<
CreateProcedureClientOptions<
TInitialContext,
TInputSchema,
TOutputSchema,
TErrorMap,
TMeta,
Expand All @@ -81,7 +80,6 @@ export interface ImplementedProcedure<
...rest: MaybeOptionalOptions<
CreateProcedureClientOptions<
TInitialContext,
TInputSchema,
TOutputSchema,
TErrorMap,
TMeta,
Expand Down
2 changes: 1 addition & 1 deletion packages/server/src/procedure-client.test-d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ describe('createProcedureClient', () => {
expectTypeOf(path).toEqualTypeOf<readonly string[]>()
expectTypeOf(errors).toEqualTypeOf<ORPCErrorConstructorMap<typeof baseErrorMap>>()
expectTypeOf(context).toEqualTypeOf<{ db: string }>()
expectTypeOf(input).toEqualTypeOf<{ input: number }>()
expectTypeOf(input).toEqualTypeOf<unknown>()

const output = await next()

Expand Down
7 changes: 2 additions & 5 deletions packages/server/src/procedure-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@ export type ProcedureClient<

export interface ProcedureClientInterceptorOptions<
TInitialContext extends Context,
TInputSchema extends AnySchema,
TErrorMap extends ErrorMap,
TMeta extends Meta,
> {
context: TInitialContext
input: InferSchemaInput<TInputSchema>
input: unknown
errors: ORPCErrorConstructorMap<TErrorMap>
path: readonly string[]
procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, TMeta>
Expand All @@ -43,7 +42,6 @@ export interface ProcedureClientInterceptorOptions<
*/
export type CreateProcedureClientOptions<
TInitialContext extends Context,
TInputSchema extends AnySchema,
TOutputSchema extends AnySchema,
TErrorMap extends ErrorMap,
TMeta extends Meta,
Expand All @@ -56,7 +54,7 @@ export type CreateProcedureClientOptions<
path?: readonly string[]

interceptors?: Interceptor<
ProcedureClientInterceptorOptions<TInitialContext, TInputSchema, TErrorMap, TMeta>,
ProcedureClientInterceptorOptions<TInitialContext, TErrorMap, TMeta>,
InferSchemaOutput<TOutputSchema>,
ErrorFromErrorMap<TErrorMap>
>[]
Expand All @@ -79,7 +77,6 @@ export function createProcedureClient<
...[options]: MaybeOptionalOptions<
CreateProcedureClientOptions<
TInitialContext,
TInputSchema,
TOutputSchema,
TErrorMap,
TMeta,
Expand Down
2 changes: 0 additions & 2 deletions packages/server/src/procedure-decorated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ export class DecoratedProcedure<
...rest: MaybeOptionalOptions<
CreateProcedureClientOptions<
TInitialContext,
TInputSchema,
TOutputSchema,
TErrorMap,
TMeta,
Expand Down Expand Up @@ -147,7 +146,6 @@ export class DecoratedProcedure<
...rest: MaybeOptionalOptions<
CreateProcedureClientOptions<
TInitialContext,
TInputSchema,
TOutputSchema,
TErrorMap,
TMeta,
Expand Down
1 change: 0 additions & 1 deletion packages/server/src/procedure-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ export function call<
...rest: MaybeOptionalOptions<
CreateProcedureClientOptions<
TInitialContext,
TInputSchema,
TOutputSchema,
TErrorMap,
TMeta,
Expand Down
1 change: 0 additions & 1 deletion packages/server/src/router-client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export function createRouterClient<T extends AnyRouter, TClientContext extends C
CreateProcedureClientOptions<
InferRouterInitialContext<T>,
Schema<unknown, unknown>,
Schema<unknown, unknown>,
ErrorMap,
Meta,
TClientContext
Expand Down