fix restrict context

unnoq · Jan 31, 2025 · 4e7d1c1 · 4e7d1c1
1 parent 84fa778
commit 4e7d1c1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/packages/server/src/context.ts b/packages/server/src/context.ts
@@ -2,6 +2,8 @@ import type { IsNever } from '@orpc/shared'
 
 export type Context = Record<string, any>
 
+export type TypeInitialContext<T extends Context> = (type: T) => unknown
+
 export type MergedContext<T extends Context, U extends Context> = T & U
 
 export function mergeContext<T extends Context, U extends Context>(

diff --git a/packages/server/src/procedure.ts b/packages/server/src/procedure.ts
@@ -1,6 +1,6 @@
 import type { AbortSignal, ContractProcedureDef, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract'
 import type { Promisable } from '@orpc/shared'
-import type { Context } from './context'
+import type { Context, TypeInitialContext } from './context'
 import type { AnyMiddleware } from './middleware'
 import { isContractProcedure } from '@orpc/contract'
 
@@ -40,7 +40,7 @@ export interface ProcedureDef<
   TErrorMap extends ErrorMap,
   TMeta extends Meta,
 > extends ContractProcedureDef<TInputSchema, TOutputSchema, TErrorMap, TMeta> {
-  __initialContext?(type: TInitialContext): unknown
+  __initialContext: TypeInitialContext<TInitialContext>
   middlewares: AnyMiddleware[]
   inputValidationIndex: number
   outputValidationIndex: number

diff --git a/packages/server/src/router.test-d.ts b/packages/server/src/router.test-d.ts
@@ -13,8 +13,7 @@ describe('Router', () => {
     expectTypeOf(pong).toMatchTypeOf<Router<InitialContext, any>>()
     expectTypeOf(router).toMatchTypeOf<Router<InitialContext, any>>()
 
-    // FIX: make bellow line work
-    // expectTypeOf(ping).not.toMatchTypeOf<Router<Context, any>>()
+    expectTypeOf(ping).not.toMatchTypeOf<Router<Context, any>>()
   })
 })