Skip to content

perf(server): make augmented router types cheaper to type-check #2453

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

Open
dinwwwh wants to merge 1 commit into
base: main
Choose a base branch
from
+33 −31
Open

perf(server): make augmented router types cheaper to type-check #2453

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
64 changes: 33 additions & 31 deletions packages/server/src/router-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,62 +13,64 @@ import type { Context, MergedInitialContext } from './context'
import type { Lazyable } from './lazy'
import { Lazy, unlazy } from './lazy'
import type { AnyMiddleware } from './middleware'
import type { AnyProcedure, ProcedureConfig } from './procedure'
import type { AnyProcedure, ProcedureConfig, ProcedureDefinition } from './procedure'
import { Procedure } from './procedure'
import { createContractProcedure } from './procedure-utils'
import type { AnyRouter } from './router'
import { getHiddenRouterContract } from './router-hidden'

export type AugmentedRouter<T extends AnyRouter, TErrorMap extends ErrorMap> =
T extends Procedure<
export type AugmentedRouter<T extends AnyRouter, TErrorMap extends ErrorMap> = T extends {
'~orpc': ProcedureDefinition<
infer $InitialContext,
infer $CurrentContext,
infer $InputSchema,
infer $OutputSchema,
infer $ErrorMap
>
? Procedure<
$InitialContext,
$CurrentContext,
$InputSchema,
$OutputSchema,
MergedErrorMap<TErrorMap, $ErrorMap>
>
: {
[K in keyof T]: T[K] extends Lazy<infer $ extends AnyRouter>
}
? Procedure<
$InitialContext,
$CurrentContext,
$InputSchema,
$OutputSchema,
MergedErrorMap<TErrorMap, $ErrorMap>
>
: {
[K in keyof T]: T[K] extends AnyRouter
? AugmentedRouter<T[K], TErrorMap>
: T[K] extends Lazy<infer $ extends AnyRouter>
Comment thread
dinwwwh marked this conversation as resolved.
Resolved
? Lazy<AugmentedRouter<$, TErrorMap>>
: T[K] extends AnyRouter
? AugmentedRouter<T[K], TErrorMap>
: never
}
: never
}

export type AugmentedRouterWithMiddlewares<
T extends AnyRouter,
TInitialContext extends Context,
TInjectedContext extends Context,
TErrorMap extends ErrorMap,
> =
T extends Procedure<
> = T extends {
'~orpc': ProcedureDefinition<
infer $InitialContext,
infer $CurrentContext,
infer $InputSchema,
infer $OutputSchema,
infer $ErrorMap
>
? Procedure<
MergedInitialContext<TInitialContext, TInjectedContext, $InitialContext>,
$CurrentContext,
$InputSchema,
$OutputSchema,
MergedErrorMap<TErrorMap, $ErrorMap>
>
: {
[K in keyof T]: T[K] extends Lazy<infer $ extends AnyRouter>
}
? Procedure<
MergedInitialContext<TInitialContext, TInjectedContext, $InitialContext>,
$CurrentContext,
$InputSchema,
$OutputSchema,
MergedErrorMap<TErrorMap, $ErrorMap>
>
: {
[K in keyof T]: T[K] extends AnyRouter
? AugmentedRouterWithMiddlewares<T[K], TInitialContext, TInjectedContext, TErrorMap>
: T[K] extends Lazy<infer $ extends AnyRouter>
? Lazy<AugmentedRouterWithMiddlewares<$, TInitialContext, TInjectedContext, TErrorMap>>
: T[K] extends AnyRouter
? AugmentedRouterWithMiddlewares<T[K], TInitialContext, TInjectedContext, TErrorMap>
: never
}
: never
}

interface AugmentRouterOptions<TErrorMap extends ErrorMap>
extends AugmentContractRouterOptions<TErrorMap>, ProcedureConfig {
Expand Down
Loading