@orpc/server 0.0.0-next.22ccd98 → 0.0.0-next.23aa4be

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

@@ -1,15 +1,17 @@
-import type { ContractProcedure, ContractRouter, SchemaInput, SchemaOutput } from '@orpc/contract';
+import type { ContractProcedure, ContractRouter, ErrorFromErrorMap, SchemaInput, SchemaOutput } from '@orpc/contract';
 import type { Hooks, Value } from '@orpc/shared';
 import type { Lazy } from './lazy';
 import type { Procedure } from './procedure';
-import type { ProcedureClient } from './procedure-client';
+import type { CreateProcedureClientRest, ProcedureClient } from './procedure-client';
 import type { Meta } from './types';
 import { type ANY_ROUTER, type Router } from './router';
-export type RouterClient<TRouter extends ANY_ROUTER | ContractRouter, TClientContext> = TRouter extends Lazy<infer U extends ANY_ROUTER | ContractRouter> ? RouterClient<U, TClientContext> : TRouter extends ContractProcedure<infer UInputSchema, infer UOutputSchema> | Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput> ? ProcedureClient<SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>, TClientContext> : {
+/**
+ * FIXME: separate RouterClient and ContractRouterClient, don't mix them
+ */
+export type RouterClient<TRouter extends ANY_ROUTER | ContractRouter, TClientContext> = TRouter extends Lazy<infer U extends ANY_ROUTER | ContractRouter> ? RouterClient<U, TClientContext> : TRouter extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap> | Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput, infer UErrorMap> ? ProcedureClient<TClientContext, SchemaInput<UInputSchema>, SchemaOutput<UOutputSchema, UFuncOutput>, ErrorFromErrorMap<UErrorMap>> : {
     [K in keyof TRouter]: TRouter[K] extends ANY_ROUTER | ContractRouter ? RouterClient<TRouter[K], TClientContext> : never;
 };
 export type CreateRouterClientOptions<TRouter extends ANY_ROUTER> = {
-    router: TRouter | Lazy<undefined>;
     /**
      * This is helpful for logging and analytics.
      *
@@ -21,5 +23,5 @@ export type CreateRouterClientOptions<TRouter extends ANY_ROUTER> = {
 } : {
     context: Value<UContext>;
 } : never) & Hooks<unknown, unknown, TRouter extends Router<infer UContext, any> ? UContext : never, Meta>;
-export declare function createRouterClient<TRouter extends ANY_ROUTER>(options: CreateRouterClientOptions<TRouter>): RouterClient<TRouter, unknown>;
+export declare function createRouterClient<TRouter extends ANY_ROUTER, TClientContext>(router: TRouter | Lazy<undefined>, ...rest: CreateProcedureClientRest<TRouter extends Router<infer UContext, any> ? UContext : never, undefined, unknown, TClientContext>): RouterClient<TRouter, TClientContext>;
 //# sourceMappingURL=router-client.d.ts.map

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

@@ -5,14 +5,14 @@ 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>[];
+    middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, unknown, any, Record<string, unknown>>[];
     contract: TContract;
 }
 export declare class RouterImplementer<TContext extends Context, TExtraContext extends Context, TContract extends ContractRouter> {
     '~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>): RouterImplementer<TContext, MergeContext<TExtraContext, U>, 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>;
     lazy<U extends Router<MergeContext<TContext, TExtraContext>, TContract>>(loader: () => Promise<{
         default: U;

package/dist/src/router.d.ts

@@ -2,15 +2,15 @@ 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> ? Procedure<TContext, any, UInputSchema, UOutputSchema, any> : {
+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 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> ? SchemaInput<UInputSchema> : {
+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> : {
     [K in keyof T]: T[K] extends ANY_ROUTER ? InferRouterInputs<T[K]> : never;
 };
-export type InferRouterOutputs<T extends ANY_ROUTER> = T extends Lazy<infer U extends ANY_ROUTER> ? InferRouterOutputs<U> : T extends Procedure<any, any, any, infer UOutputSchema, infer UFuncOutput> ? SchemaOutput<UOutputSchema, UFuncOutput> : {
+export type InferRouterOutputs<T extends ANY_ROUTER> = T extends Lazy<infer U extends ANY_ROUTER> ? InferRouterOutputs<U> : T extends Procedure<any, any, any, infer UOutputSchema, infer UFuncOutput, any> ? SchemaOutput<UOutputSchema, UFuncOutput> : {
     [K in keyof T]: T[K] extends ANY_ROUTER ? InferRouterOutputs<T[K]> : never;
 };
-export declare function getRouterChild<T extends ANY_ROUTER | Lazy<undefined>>(router: T, ...path: string[]): T extends ANY_LAZY ? Lazy<ANY_PROCEDURE | Record<string, ANY_ROUTER> | undefined> : ANY_ROUTER | Lazy<undefined> | undefined;
+export declare function getRouterChild<T extends ANY_ROUTER | Lazy<undefined>>(router: T, ...path: string[]): T extends ANY_LAZY ? Lazy<ANY_PROCEDURE> | Lazy<Record<string, ANY_ROUTER>> | Lazy<undefined> : ANY_ROUTER | Lazy<undefined> | undefined;
 //# sourceMappingURL=router.d.ts.map

package/dist/src/types.d.ts

@@ -1,7 +1,9 @@
+import type { FindGlobalInstanceType } from '@orpc/shared';
 import type { ANY_PROCEDURE } from './procedure';
 export type Context = Record<string, any> | undefined;
 export type WELL_CONTEXT = Record<string, unknown> | undefined;
 export type MergeContext<TA extends Context, TB extends Context> = TA extends undefined ? TB : TB extends undefined ? TA : TA & TB;
+export type AbortSignal = FindGlobalInstanceType<'AbortSignal'>;
 export interface WithSignal {
     signal?: AbortSignal;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/server",
   "type": "module",
-  "version": "0.0.0-next.22ccd98",
+  "version": "0.0.0-next.23aa4be",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -24,6 +24,16 @@
       "import": "./dist/fetch.js",
       "default": "./dist/fetch.js"
     },
+    "./hono": {
+      "types": "./dist/src/adapters/hono/index.d.ts",
+      "import": "./dist/hono.js",
+      "default": "./dist/hono.js"
+    },
+    "./next": {
+      "types": "./dist/src/adapters/next/index.d.ts",
+      "import": "./dist/next.js",
+      "default": "./dist/next.js"
+    },
     "./node": {
       "types": "./dist/src/adapters/node/index.d.ts",
       "import": "./dist/node.js",
@@ -38,16 +48,16 @@
     "!**/*.tsbuildinfo",
     "dist"
   ],
-  "dependencies": {
-    "@mjackson/node-fetch-server": "^0.5.0",
-    "@orpc/contract": "0.0.0-next.22ccd98",
-    "@orpc/shared": "0.0.0-next.22ccd98"
+  "peerDependencies": {
+    "hono": ">=4.6.0",
+    "next": ">=14.0.0"
   },
-  "devDependencies": {
-    "zod": "^3.24.1"
+  "dependencies": {
+    "@orpc/contract": "0.0.0-next.23aa4be",
+    "@orpc/shared": "0.0.0-next.23aa4be"
   },
   "scripts": {
-    "build": "tsup --clean --sourcemap --entry.index=src/index.ts --entry.fetch=src/adapters/fetch/index.ts --entry.node=src/adapters/node/index.ts --format=esm --onSuccess='tsc -b --noCheck'",
+    "build": "tsup --onSuccess='tsc -b --noCheck'",
     "build:watch": "pnpm run build --watch",
     "type:check": "tsc -b"
   }

package/dist/src/adapters/fetch/composite-handler.d.ts

@@ -1,8 +0,0 @@
-import type { Context } from '../../types';
-import type { ConditionalFetchHandler, FetchHandler, FetchOptions } from './types';
-export declare class CompositeHandler<T extends Context> implements FetchHandler<T> {
-    private readonly handlers;
-    constructor(handlers: ConditionalFetchHandler<T>[]);
-    fetch(request: Request, ...opt: [options: FetchOptions<T>] | (undefined extends T ? [] : never)): Promise<Response>;
-}
-//# sourceMappingURL=composite-handler.d.ts.map

package/dist/src/adapters/node/composite-handler.d.ts

@@ -1,9 +0,0 @@
-import type { IncomingMessage, ServerResponse } from 'node:http';
-import type { Context } from '../../types';
-import type { ConditionalRequestHandler, RequestHandler, RequestOptions } from './types';
-export declare class CompositeHandler<T extends Context> implements RequestHandler<T> {
-    private readonly handlers;
-    constructor(handlers: ConditionalRequestHandler<T>[]);
-    handle(req: IncomingMessage, res: ServerResponse, ...opt: [options: RequestOptions<T>] | (undefined extends T ? [] : never)): Promise<void>;
-}
-//# sourceMappingURL=composite-handler.d.ts.map