@orpc/server 0.29.0 → 0.31.0

package/dist/src/router-implementer.d.ts

@@ -1,21 +1,22 @@
 import type { ContractRouter } from '@orpc/contract';
+import type { ContextGuard } from './context';
 import type { FlattenLazy } from './lazy';
 import type { Middleware } from './middleware';
 import type { Router } from './router';
 import type { AdaptedRouter } from './router-builder';
 import type { Context, MergeContext } from './types';
-export interface RouterImplementerDef<TContext extends Context, TExtraContext extends Context, TContract extends ContractRouter> {
-    middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, Record<string, unknown>>[];
+export interface RouterImplementerDef<TContext extends Context, TExtraContext extends Context, TContract extends ContractRouter<any>> {
+    middlewares: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, Record<never, never>>[];
     contract: TContract;
 }
-export declare class RouterImplementer<TContext extends Context, TExtraContext extends Context, TContract extends ContractRouter> {
+export declare class RouterImplementer<TContext extends Context, TExtraContext extends Context, TContract extends ContractRouter<any>> {
     '~type': "RouterImplementer";
     '~orpc': RouterImplementerDef<TContext, TExtraContext, TContract>;
     constructor(def: RouterImplementerDef<TContext, TExtraContext, TContract>);
-    use<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, unknown, unknown, Record<string, unknown>>): RouterImplementer<TContext, MergeContext<TExtraContext, U>, TContract>;
-    router<U extends Router<MergeContext<TContext, TExtraContext>, TContract>>(router: U): AdaptedRouter<TContext, U>;
+    use<U extends Context & ContextGuard<MergeContext<TContext, TExtraContext>>>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, unknown, unknown, Record<never, never>>): RouterImplementer<TContext, MergeContext<TExtraContext, U>, TContract>;
+    router<U extends Router<MergeContext<TContext, TExtraContext>, TContract>>(router: U): AdaptedRouter<TContext, U, Record<never, never>>;
     lazy<U extends Router<MergeContext<TContext, TExtraContext>, TContract>>(loader: () => Promise<{
         default: U;
-    }>): AdaptedRouter<TContext, FlattenLazy<U>>;
+    }>): AdaptedRouter<TContext, FlattenLazy<U>, Record<never, never>>;
 }
 //# sourceMappingURL=router-implementer.d.ts.map

package/dist/src/router.d.ts

@@ -2,8 +2,8 @@ import type { ContractProcedure, ContractRouter, SchemaInput, SchemaOutput } fro
 import type { ANY_LAZY, Lazy, Lazyable } from './lazy';
 import type { ANY_PROCEDURE, Procedure } from './procedure';
 import type { Context } from './types';
-export type Router<TContext extends Context, TContract extends ContractRouter> = Lazyable<TContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap> ? Procedure<TContext, any, UInputSchema, UOutputSchema, any, UErrorMap> : {
-    [K in keyof TContract]: TContract[K] extends ContractRouter ? Router<TContext, TContract[K]> : never;
+export type Router<TContext extends Context, TContract extends ContractRouter<any>> = Lazyable<TContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap> ? Procedure<TContext, any, UInputSchema, UOutputSchema, any, UErrorMap> : {
+    [K in keyof TContract]: TContract[K] extends ContractRouter<any> ? Router<TContext, TContract[K]> : never;
 }>;
 export type ANY_ROUTER = Router<any, any>;
 export type InferRouterInputs<T extends ANY_ROUTER> = T extends Lazy<infer U extends ANY_ROUTER> ? InferRouterInputs<U> : T extends Procedure<any, any, infer UInputSchema, any, any, any> ? SchemaInput<UInputSchema> : {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.29.0",
+  "version": "0.31.0",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -53,8 +53,8 @@
     "next": ">=14.0.0"
   },
   "dependencies": {
-    "@orpc/contract": "0.29.0",
-    "@orpc/shared": "0.29.0"
+    "@orpc/contract": "0.31.0",
+    "@orpc/shared": "0.31.0"
   },
   "scripts": {
     "build": "tsup --onSuccess='tsc -b --noCheck'",