@orpc/server 0.0.0-next.904b0c2 → 0.0.0-next.90a7c1e

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (70) hide show
  1. package/README.md +19 -23
  2. package/dist/adapters/aws-lambda/index.d.mts +46 -0
  3. package/dist/adapters/aws-lambda/index.d.ts +46 -0
  4. package/dist/adapters/aws-lambda/index.mjs +42 -0
  5. package/dist/adapters/bun-ws/index.d.mts +36 -0
  6. package/dist/adapters/bun-ws/index.d.ts +36 -0
  7. package/dist/adapters/bun-ws/index.mjs +47 -0
  8. package/dist/adapters/crossws/index.d.mts +33 -0
  9. package/dist/adapters/crossws/index.d.ts +33 -0
  10. package/dist/adapters/crossws/index.mjs +47 -0
  11. package/dist/adapters/fetch/index.d.mts +35 -10
  12. package/dist/adapters/fetch/index.d.ts +35 -10
  13. package/dist/adapters/fetch/index.mjs +109 -8
  14. package/dist/adapters/message-port/index.d.mts +31 -0
  15. package/dist/adapters/message-port/index.d.ts +31 -0
  16. package/dist/adapters/message-port/index.mjs +41 -0
  17. package/dist/adapters/node/index.d.mts +36 -11
  18. package/dist/adapters/node/index.d.ts +36 -11
  19. package/dist/adapters/node/index.mjs +24 -13
  20. package/dist/adapters/standard/index.d.mts +8 -13
  21. package/dist/adapters/standard/index.d.ts +8 -13
  22. package/dist/adapters/standard/index.mjs +5 -3
  23. package/dist/adapters/standard-peer/index.d.mts +14 -0
  24. package/dist/adapters/standard-peer/index.d.ts +14 -0
  25. package/dist/adapters/standard-peer/index.mjs +7 -0
  26. package/dist/adapters/websocket/index.d.mts +54 -0
  27. package/dist/adapters/websocket/index.d.ts +54 -0
  28. package/dist/adapters/websocket/index.mjs +69 -0
  29. package/dist/adapters/ws/index.d.mts +31 -0
  30. package/dist/adapters/ws/index.d.ts +31 -0
  31. package/dist/adapters/ws/index.mjs +39 -0
  32. package/dist/helpers/index.d.mts +130 -0
  33. package/dist/helpers/index.d.ts +130 -0
  34. package/dist/helpers/index.mjs +182 -0
  35. package/dist/hibernation/index.d.mts +44 -0
  36. package/dist/hibernation/index.d.ts +44 -0
  37. package/dist/hibernation/index.mjs +65 -0
  38. package/dist/index.d.mts +603 -75
  39. package/dist/index.d.ts +603 -75
  40. package/dist/index.mjs +162 -15
  41. package/dist/plugins/index.d.mts +148 -9
  42. package/dist/plugins/index.d.ts +148 -9
  43. package/dist/plugins/index.mjs +180 -11
  44. package/dist/shared/server.B7b2w3_i.d.ts +12 -0
  45. package/dist/shared/server.BEFBl-Cb.d.mts +12 -0
  46. package/dist/shared/server.BU4WI18A.d.mts +32 -0
  47. package/dist/shared/server.BW-nUGgA.mjs +36 -0
  48. package/dist/shared/{server.BMkFIQUb.d.mts → server.Bmh5xd4n.d.ts} +17 -9
  49. package/dist/shared/server.C6Q5sqYw.mjs +20 -0
  50. package/dist/shared/{server.D9QduY95.mjs → server.CIL9uKTN.mjs} +51 -18
  51. package/dist/shared/{server.D0YVcfZk.d.mts → server.CYNGeoCm.d.mts} +64 -13
  52. package/dist/shared/{server.D0YVcfZk.d.ts → server.CYNGeoCm.d.ts} +64 -13
  53. package/dist/shared/server.D0H-iaY3.d.ts +32 -0
  54. package/dist/shared/{server.BVwwTHyO.mjs → server.DZ5BIITo.mjs} +1 -1
  55. package/dist/shared/server.DhJj-1X9.d.mts +42 -0
  56. package/dist/shared/{server.CjWkNG6l.mjs → server.NeumLVdS.mjs} +33 -33
  57. package/dist/shared/{server.ywWqDZgA.d.ts → server.gqRxT-yN.d.mts} +17 -9
  58. package/dist/shared/server.jMTkVNIb.d.ts +42 -0
  59. package/package.json +70 -20
  60. package/dist/adapters/hono/index.d.mts +0 -22
  61. package/dist/adapters/hono/index.d.ts +0 -22
  62. package/dist/adapters/hono/index.mjs +0 -32
  63. package/dist/adapters/next/index.d.mts +0 -29
  64. package/dist/adapters/next/index.d.ts +0 -29
  65. package/dist/adapters/next/index.mjs +0 -29
  66. package/dist/shared/server.89QkKw3a.d.mts +0 -10
  67. package/dist/shared/server.B1S3zwuw.d.mts +0 -8
  68. package/dist/shared/server.BT0gne12.d.ts +0 -8
  69. package/dist/shared/server.Et1O6Bm7.mjs +0 -98
  70. package/dist/shared/server.taqJyaMn.d.ts +0 -10
@@ -1,15 +1,27 @@
1
+ import { toHttpPath, StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
1
2
  import { ORPCError, toORPCError } from '@orpc/client';
2
- import { toArray, intercept, parseEmptyableJSON } from '@orpc/shared';
3
- import { c as createProcedureClient, t as traverseContractProcedures, i as isProcedure, u as unlazy, g as getRouter, a as createContractedProcedure } from './server.CjWkNG6l.mjs';
4
- import { toHttpPath } from '@orpc/client/standard';
3
+ import { toArray, intercept, parseEmptyableJSON, NullProtoObj, value } from '@orpc/shared';
4
+ import { flattenHeader } from '@orpc/standard-server';
5
+ import { c as createProcedureClient, t as traverseContractProcedures, i as isProcedure, u as unlazy, g as getRouter, a as createContractedProcedure } from './server.NeumLVdS.mjs';
6
+
7
+ class CompositeStandardHandlerPlugin {
8
+ plugins;
9
+ constructor(plugins = []) {
10
+ this.plugins = [...plugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
11
+ }
12
+ init(options, router) {
13
+ for (const plugin of this.plugins) {
14
+ plugin.init?.(options, router);
15
+ }
16
+ }
17
+ }
5
18
 
6
19
  class StandardHandler {
7
20
  constructor(router, matcher, codec, options) {
8
21
  this.matcher = matcher;
9
22
  this.codec = codec;
10
- for (const plugin of toArray(options.plugins)) {
11
- plugin.init?.(options);
12
- }
23
+ const plugins = new CompositeStandardHandlerPlugin(options.plugins);
24
+ plugins.init(options, router);
13
25
  this.interceptors = toArray(options.interceptors);
14
26
  this.clientInterceptors = toArray(options.clientInterceptors);
15
27
  this.rootInterceptors = toArray(options.rootInterceptors);
@@ -18,23 +30,24 @@ class StandardHandler {
18
30
  interceptors;
19
31
  clientInterceptors;
20
32
  rootInterceptors;
21
- handle(request, options) {
33
+ async handle(request, options) {
34
+ const prefix = options.prefix?.replace(/\/$/, "") || void 0;
35
+ if (prefix && !request.url.pathname.startsWith(`${prefix}/`) && request.url.pathname !== prefix) {
36
+ return { matched: false, response: void 0 };
37
+ }
22
38
  return intercept(
23
39
  this.rootInterceptors,
24
- { ...options, request },
40
+ { ...options, request, prefix },
25
41
  async (interceptorOptions) => {
26
42
  let isDecoding = false;
27
43
  try {
28
44
  return await intercept(
29
45
  this.interceptors,
30
46
  interceptorOptions,
31
- async ({ request: request2, context, prefix }) => {
47
+ async ({ request: request2, context, prefix: prefix2 }) => {
32
48
  const method = request2.method;
33
49
  const url = request2.url;
34
- if (prefix && !url.pathname.startsWith(prefix)) {
35
- return { matched: false, response: void 0 };
36
- }
37
- const pathname = prefix ? url.pathname.replace(prefix, "") : url.pathname;
50
+ const pathname = prefix2 ? url.pathname.replace(prefix2, "") : url.pathname;
38
51
  const match = await this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`);
39
52
  if (!match) {
40
53
  return { matched: false, response: void 0 };
@@ -47,8 +60,10 @@ class StandardHandler {
47
60
  isDecoding = true;
48
61
  const input = await this.codec.decode(request2, match.params, match.procedure);
49
62
  isDecoding = false;
50
- const lastEventId = Array.isArray(request2.headers["last-event-id"]) ? request2.headers["last-event-id"].at(-1) : request2.headers["last-event-id"];
51
- const output = await client(input, { signal: request2.signal, lastEventId });
63
+ const output = await client(input, {
64
+ signal: request2.signal,
65
+ lastEventId: flattenHeader(request2.headers["last-event-id"])
66
+ });
52
67
  const response = this.codec.encode(output, match.procedure);
53
68
  return {
54
69
  matched: true,
@@ -97,10 +112,18 @@ class StandardRPCCodec {
97
112
  }
98
113
 
99
114
  class StandardRPCMatcher {
100
- tree = {};
115
+ filter;
116
+ tree = new NullProtoObj();
101
117
  pendingRouters = [];
118
+ constructor(options = {}) {
119
+ this.filter = options.filter ?? true;
120
+ }
102
121
  init(router, path = []) {
103
- const laziedOptions = traverseContractProcedures({ router, path }, ({ path: path2, contract }) => {
122
+ const laziedOptions = traverseContractProcedures({ router, path }, (traverseOptions) => {
123
+ if (!value(this.filter, traverseOptions)) {
124
+ return;
125
+ }
126
+ const { path: path2, contract } = traverseOptions;
104
127
  const httpPath = toHttpPath(path2);
105
128
  if (isProcedure(contract)) {
106
129
  this.tree[httpPath] = {
@@ -158,4 +181,14 @@ class StandardRPCMatcher {
158
181
  }
159
182
  }
160
183
 
161
- export { StandardHandler as S, StandardRPCCodec as a, StandardRPCMatcher as b };
184
+ class StandardRPCHandler extends StandardHandler {
185
+ constructor(router, options = {}) {
186
+ const jsonSerializer = new StandardRPCJsonSerializer(options);
187
+ const serializer = new StandardRPCSerializer(jsonSerializer);
188
+ const matcher = new StandardRPCMatcher(options);
189
+ const codec = new StandardRPCCodec(serializer);
190
+ super(router, matcher, codec, options);
191
+ }
192
+ }
193
+
194
+ export { CompositeStandardHandlerPlugin as C, StandardHandler as S, StandardRPCCodec as a, StandardRPCHandler as b, StandardRPCMatcher as c };
@@ -1,8 +1,8 @@
1
1
  import { ORPCErrorCode, ORPCErrorOptions, ORPCError, HTTPPath, ClientContext, Client } from '@orpc/client';
2
- import { MaybeOptionalOptions, Promisable, Interceptor, Value } from '@orpc/shared';
3
2
  import { ErrorMap, ErrorMapItem, InferSchemaInput, AnySchema, Meta, ContractProcedureDef, InferSchemaOutput, ErrorFromErrorMap, AnyContractRouter, ContractProcedure } from '@orpc/contract';
3
+ import { MaybeOptionalOptions, Promisable, Interceptor, PromiseWithError, Value } from '@orpc/shared';
4
4
 
5
- type Context = Record<string, any>;
5
+ type Context = Record<PropertyKey, any>;
6
6
  type MergedInitialContext<TInitial extends Context, TAdditional extends Context, TCurrent extends Context> = TInitial & Omit<TAdditional, keyof TCurrent>;
7
7
  type MergedCurrentContext<T extends Context, U extends Context> = Omit<T, keyof U> & U;
8
8
  declare function mergeCurrentContext<T extends Context, U extends Context>(context: T, other: U): MergedCurrentContext<T, U>;
@@ -28,6 +28,11 @@ interface Lazy<T> {
28
28
  };
29
29
  }
30
30
  type Lazyable<T> = T | Lazy<T>;
31
+ /**
32
+ * Creates a lazy-loaded item.
33
+ *
34
+ * @warning The `prefix` in `meta` only holds metadata and does not apply the prefix to the lazy router, use `os.prefix(...).lazy(...)` instead.
35
+ */
31
36
  declare function lazy<T>(loader: () => Promise<{
32
37
  default: T;
33
38
  }>, meta?: LazyMeta): Lazy<T>;
@@ -56,7 +61,15 @@ interface ProcedureDef<TInitialContext extends Context, TCurrentContext extends
56
61
  outputValidationIndex: number;
57
62
  handler: ProcedureHandler<TCurrentContext, any, any, any, any>;
58
63
  }
64
+ /**
65
+ * This class represents a procedure.
66
+ *
67
+ * @see {@link https://orpc.unnoq.com/docs/procedure Procedure Docs}
68
+ */
59
69
  declare class Procedure<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta> {
70
+ /**
71
+ * This property holds the defined options.
72
+ */
60
73
  '~orpc': ProcedureDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
61
74
  constructor(def: ProcedureDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>);
62
75
  }
@@ -87,6 +100,11 @@ interface MiddlewareOptions<TInContext extends Context, TOutput, TErrorConstruct
87
100
  next: MiddlewareNextFn<TOutput>;
88
101
  errors: TErrorConstructorMap;
89
102
  }
103
+ /**
104
+ * A function that represents a middleware.
105
+ *
106
+ * @see {@link https://orpc.unnoq.com/docs/middleware Middleware Docs}
107
+ */
90
108
  interface Middleware<TInContext extends Context, TOutContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
91
109
  (options: MiddlewareOptions<TInContext, TOutput, TErrorConstructorMap, TMeta>, input: TInput, output: MiddlewareOutputFn<TOutput>): Promisable<MiddlewareResult<TOutContext, TOutput>>;
92
110
  }
@@ -97,47 +115,80 @@ interface MapInputMiddleware<TInput, TMappedInput> {
97
115
  declare function middlewareOutputFn<TOutput>(output: TOutput): MiddlewareResult<Record<never, never>, TOutput>;
98
116
 
99
117
  type ProcedureClient<TClientContext extends ClientContext, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> = Client<TClientContext, InferSchemaInput<TInputSchema>, InferSchemaOutput<TOutputSchema>, ErrorFromErrorMap<TErrorMap>>;
100
- interface ProcedureClientInterceptorOptions<TInitialContext extends Context, TInputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta> {
118
+ interface ProcedureClientInterceptorOptions<TInitialContext extends Context, TErrorMap extends ErrorMap, TMeta extends Meta> {
101
119
  context: TInitialContext;
102
- input: InferSchemaInput<TInputSchema>;
120
+ input: unknown;
103
121
  errors: ORPCErrorConstructorMap<TErrorMap>;
104
122
  path: readonly string[];
105
123
  procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, TMeta>;
106
124
  signal?: AbortSignal;
107
125
  lastEventId: string | undefined;
108
126
  }
109
- /**
110
- * Options for creating a procedure caller with comprehensive type safety
111
- */
112
- type CreateProcedureClientOptions<TInitialContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext> = {
127
+ type CreateProcedureClientOptions<TInitialContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext> = {
113
128
  /**
114
129
  * This is helpful for logging and analytics.
115
130
  */
116
131
  path?: readonly string[];
117
- interceptors?: Interceptor<ProcedureClientInterceptorOptions<TInitialContext, TInputSchema, TErrorMap, TMeta>, InferSchemaOutput<TOutputSchema>, ErrorFromErrorMap<TErrorMap>>[];
132
+ interceptors?: Interceptor<ProcedureClientInterceptorOptions<TInitialContext, TErrorMap, TMeta>, PromiseWithError<InferSchemaOutput<TOutputSchema>, ErrorFromErrorMap<TErrorMap>>>[];
118
133
  } & (Record<never, never> extends TInitialContext ? {
119
- context?: Value<TInitialContext, [clientContext: TClientContext]>;
134
+ context?: Value<Promisable<TInitialContext>, [clientContext: TClientContext]>;
120
135
  } : {
121
- context: Value<TInitialContext, [clientContext: TClientContext]>;
136
+ context: Value<Promisable<TInitialContext>, [clientContext: TClientContext]>;
122
137
  });
123
- declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, TErrorMap, TMeta>>, ...[options]: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, TErrorMap, TMeta, TClientContext>>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, TErrorMap>;
138
+ /**
139
+ * Create Server-side client from a procedure.
140
+ *
141
+ * @see {@link https://orpc.unnoq.com/docs/client/server-side Server-side Client Docs}
142
+ */
143
+ declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, TErrorMap, TMeta>>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TOutputSchema, TErrorMap, TMeta, TClientContext>>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, TErrorMap>;
124
144
 
145
+ /**
146
+ * Represents a router, which defines a hierarchical structure of procedures.
147
+ *
148
+ * @info A procedure is a router too.
149
+ * @see {@link https://orpc.unnoq.com/docs/contract-first/define-contract#contract-router Contract Router Docs}
150
+ */
125
151
  type Router<T extends AnyContractRouter, TInitialContext extends Context> = T extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap, infer UMeta> ? Procedure<TInitialContext, any, UInputSchema, UOutputSchema, UErrorMap, UMeta> : {
126
152
  [K in keyof T]: T[K] extends AnyContractRouter ? Lazyable<Router<T[K], TInitialContext>> : never;
127
153
  };
128
154
  type AnyRouter = Router<any, any>;
129
155
  type InferRouterInitialContext<T extends AnyRouter> = T extends Router<any, infer UInitialContext> ? UInitialContext : never;
156
+ /**
157
+ * Infer all initial context of the router.
158
+ *
159
+ * @info A procedure is a router too.
160
+ * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
161
+ */
130
162
  type InferRouterInitialContexts<T extends AnyRouter> = T extends Procedure<infer UInitialContext, any, any, any, any, any> ? UInitialContext : {
131
163
  [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterInitialContexts<U> : never;
132
164
  };
165
+ /**
166
+ * Infer all current context of the router.
167
+ *
168
+ * @info A procedure is a router too.
169
+ * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
170
+ */
133
171
  type InferRouterCurrentContexts<T extends AnyRouter> = T extends Procedure<any, infer UCurrentContext, any, any, any, any> ? UCurrentContext : {
134
172
  [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterCurrentContexts<U> : never;
135
173
  };
174
+ /**
175
+ * Infer all router inputs
176
+ *
177
+ * @info A procedure is a router too.
178
+ * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
179
+ */
136
180
  type InferRouterInputs<T extends AnyRouter> = T extends Procedure<any, any, infer UInputSchema, any, any, any> ? InferSchemaInput<UInputSchema> : {
137
181
  [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterInputs<U> : never;
138
182
  };
183
+ /**
184
+ * Infer all router outputs
185
+ *
186
+ * @info A procedure is a router too.
187
+ * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
188
+ */
139
189
  type InferRouterOutputs<T extends AnyRouter> = T extends Procedure<any, any, any, infer UOutputSchema, any, any> ? InferSchemaOutput<UOutputSchema> : {
140
190
  [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterOutputs<U> : never;
141
191
  };
142
192
 
143
- export { type AnyProcedure as A, middlewareOutputFn as B, type Context as C, type ProcedureHandlerOptions as D, type ProcedureDef as E, isProcedure as F, createProcedureClient as G, type InferRouterInitialContexts as H, type InferRouterInitialContext as I, type InferRouterCurrentContexts as J, type InferRouterInputs as K, type Lazyable as L, type Middleware as M, type InferRouterOutputs as N, type ORPCErrorConstructorMap as O, type ProcedureClientInterceptorOptions as P, type Router as R, type AnyRouter as a, Procedure as b, type MergedInitialContext as c, type MergedCurrentContext as d, type MapInputMiddleware as e, type CreateProcedureClientOptions as f, type ProcedureClient as g, type AnyMiddleware as h, type Lazy as i, type ProcedureHandler as j, type ORPCErrorConstructorMapItemOptions as k, type ORPCErrorConstructorMapItem as l, mergeCurrentContext as m, createORPCErrorConstructorMap as n, LAZY_SYMBOL as o, type LazyMeta as p, lazy as q, isLazy as r, getLazyMeta as s, type MiddlewareResult as t, unlazy as u, validateORPCError as v, type MiddlewareNextFnOptions as w, type MiddlewareNextFn as x, type MiddlewareOutputFn as y, type MiddlewareOptions as z };
193
+ export { middlewareOutputFn as B, isProcedure as F, createProcedureClient as G, Procedure as P, mergeCurrentContext as m, createORPCErrorConstructorMap as n, LAZY_SYMBOL as o, lazy as q, isLazy as r, getLazyMeta as s, unlazy as u, validateORPCError as v };
194
+ export type { AnyProcedure as A, Context as C, ProcedureHandlerOptions as D, ProcedureDef as E, InferRouterInitialContexts as H, InferRouterInitialContext as I, InferRouterCurrentContexts as J, InferRouterInputs as K, Lazyable as L, MergedInitialContext as M, InferRouterOutputs as N, ORPCErrorConstructorMap as O, Router as R, AnyMiddleware as a, AnyRouter as b, Lazy as c, ProcedureClientInterceptorOptions as d, Middleware as e, MergedCurrentContext as f, MapInputMiddleware as g, CreateProcedureClientOptions as h, ProcedureClient as i, ProcedureHandler as j, ORPCErrorConstructorMapItemOptions as k, ORPCErrorConstructorMapItem as l, LazyMeta as p, MiddlewareResult as t, MiddlewareNextFnOptions as w, MiddlewareNextFn as x, MiddlewareOutputFn as y, MiddlewareOptions as z };
@@ -1,8 +1,8 @@
1
1
  import { ORPCErrorCode, ORPCErrorOptions, ORPCError, HTTPPath, ClientContext, Client } from '@orpc/client';
2
- import { MaybeOptionalOptions, Promisable, Interceptor, Value } from '@orpc/shared';
3
2
  import { ErrorMap, ErrorMapItem, InferSchemaInput, AnySchema, Meta, ContractProcedureDef, InferSchemaOutput, ErrorFromErrorMap, AnyContractRouter, ContractProcedure } from '@orpc/contract';
3
+ import { MaybeOptionalOptions, Promisable, Interceptor, PromiseWithError, Value } from '@orpc/shared';
4
4
 
5
- type Context = Record<string, any>;
5
+ type Context = Record<PropertyKey, any>;
6
6
  type MergedInitialContext<TInitial extends Context, TAdditional extends Context, TCurrent extends Context> = TInitial & Omit<TAdditional, keyof TCurrent>;
7
7
  type MergedCurrentContext<T extends Context, U extends Context> = Omit<T, keyof U> & U;
8
8
  declare function mergeCurrentContext<T extends Context, U extends Context>(context: T, other: U): MergedCurrentContext<T, U>;
@@ -28,6 +28,11 @@ interface Lazy<T> {
28
28
  };
29
29
  }
30
30
  type Lazyable<T> = T | Lazy<T>;
31
+ /**
32
+ * Creates a lazy-loaded item.
33
+ *
34
+ * @warning The `prefix` in `meta` only holds metadata and does not apply the prefix to the lazy router, use `os.prefix(...).lazy(...)` instead.
35
+ */
31
36
  declare function lazy<T>(loader: () => Promise<{
32
37
  default: T;
33
38
  }>, meta?: LazyMeta): Lazy<T>;
@@ -56,7 +61,15 @@ interface ProcedureDef<TInitialContext extends Context, TCurrentContext extends
56
61
  outputValidationIndex: number;
57
62
  handler: ProcedureHandler<TCurrentContext, any, any, any, any>;
58
63
  }
64
+ /**
65
+ * This class represents a procedure.
66
+ *
67
+ * @see {@link https://orpc.unnoq.com/docs/procedure Procedure Docs}
68
+ */
59
69
  declare class Procedure<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta> {
70
+ /**
71
+ * This property holds the defined options.
72
+ */
60
73
  '~orpc': ProcedureDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>;
61
74
  constructor(def: ProcedureDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, TErrorMap, TMeta>);
62
75
  }
@@ -87,6 +100,11 @@ interface MiddlewareOptions<TInContext extends Context, TOutput, TErrorConstruct
87
100
  next: MiddlewareNextFn<TOutput>;
88
101
  errors: TErrorConstructorMap;
89
102
  }
103
+ /**
104
+ * A function that represents a middleware.
105
+ *
106
+ * @see {@link https://orpc.unnoq.com/docs/middleware Middleware Docs}
107
+ */
90
108
  interface Middleware<TInContext extends Context, TOutContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
91
109
  (options: MiddlewareOptions<TInContext, TOutput, TErrorConstructorMap, TMeta>, input: TInput, output: MiddlewareOutputFn<TOutput>): Promisable<MiddlewareResult<TOutContext, TOutput>>;
92
110
  }
@@ -97,47 +115,80 @@ interface MapInputMiddleware<TInput, TMappedInput> {
97
115
  declare function middlewareOutputFn<TOutput>(output: TOutput): MiddlewareResult<Record<never, never>, TOutput>;
98
116
 
99
117
  type ProcedureClient<TClientContext extends ClientContext, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap> = Client<TClientContext, InferSchemaInput<TInputSchema>, InferSchemaOutput<TOutputSchema>, ErrorFromErrorMap<TErrorMap>>;
100
- interface ProcedureClientInterceptorOptions<TInitialContext extends Context, TInputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta> {
118
+ interface ProcedureClientInterceptorOptions<TInitialContext extends Context, TErrorMap extends ErrorMap, TMeta extends Meta> {
101
119
  context: TInitialContext;
102
- input: InferSchemaInput<TInputSchema>;
120
+ input: unknown;
103
121
  errors: ORPCErrorConstructorMap<TErrorMap>;
104
122
  path: readonly string[];
105
123
  procedure: Procedure<Context, Context, AnySchema, AnySchema, ErrorMap, TMeta>;
106
124
  signal?: AbortSignal;
107
125
  lastEventId: string | undefined;
108
126
  }
109
- /**
110
- * Options for creating a procedure caller with comprehensive type safety
111
- */
112
- type CreateProcedureClientOptions<TInitialContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext> = {
127
+ type CreateProcedureClientOptions<TInitialContext extends Context, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext> = {
113
128
  /**
114
129
  * This is helpful for logging and analytics.
115
130
  */
116
131
  path?: readonly string[];
117
- interceptors?: Interceptor<ProcedureClientInterceptorOptions<TInitialContext, TInputSchema, TErrorMap, TMeta>, InferSchemaOutput<TOutputSchema>, ErrorFromErrorMap<TErrorMap>>[];
132
+ interceptors?: Interceptor<ProcedureClientInterceptorOptions<TInitialContext, TErrorMap, TMeta>, PromiseWithError<InferSchemaOutput<TOutputSchema>, ErrorFromErrorMap<TErrorMap>>>[];
118
133
  } & (Record<never, never> extends TInitialContext ? {
119
- context?: Value<TInitialContext, [clientContext: TClientContext]>;
134
+ context?: Value<Promisable<TInitialContext>, [clientContext: TClientContext]>;
120
135
  } : {
121
- context: Value<TInitialContext, [clientContext: TClientContext]>;
136
+ context: Value<Promisable<TInitialContext>, [clientContext: TClientContext]>;
122
137
  });
123
- declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, TErrorMap, TMeta>>, ...[options]: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, TErrorMap, TMeta, TClientContext>>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, TErrorMap>;
138
+ /**
139
+ * Create Server-side client from a procedure.
140
+ *
141
+ * @see {@link https://orpc.unnoq.com/docs/client/server-side Server-side Client Docs}
142
+ */
143
+ declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends AnySchema, TOutputSchema extends AnySchema, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, TErrorMap, TMeta>>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TOutputSchema, TErrorMap, TMeta, TClientContext>>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, TErrorMap>;
124
144
 
145
+ /**
146
+ * Represents a router, which defines a hierarchical structure of procedures.
147
+ *
148
+ * @info A procedure is a router too.
149
+ * @see {@link https://orpc.unnoq.com/docs/contract-first/define-contract#contract-router Contract Router Docs}
150
+ */
125
151
  type Router<T extends AnyContractRouter, TInitialContext extends Context> = T extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap, infer UMeta> ? Procedure<TInitialContext, any, UInputSchema, UOutputSchema, UErrorMap, UMeta> : {
126
152
  [K in keyof T]: T[K] extends AnyContractRouter ? Lazyable<Router<T[K], TInitialContext>> : never;
127
153
  };
128
154
  type AnyRouter = Router<any, any>;
129
155
  type InferRouterInitialContext<T extends AnyRouter> = T extends Router<any, infer UInitialContext> ? UInitialContext : never;
156
+ /**
157
+ * Infer all initial context of the router.
158
+ *
159
+ * @info A procedure is a router too.
160
+ * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
161
+ */
130
162
  type InferRouterInitialContexts<T extends AnyRouter> = T extends Procedure<infer UInitialContext, any, any, any, any, any> ? UInitialContext : {
131
163
  [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterInitialContexts<U> : never;
132
164
  };
165
+ /**
166
+ * Infer all current context of the router.
167
+ *
168
+ * @info A procedure is a router too.
169
+ * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
170
+ */
133
171
  type InferRouterCurrentContexts<T extends AnyRouter> = T extends Procedure<any, infer UCurrentContext, any, any, any, any> ? UCurrentContext : {
134
172
  [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterCurrentContexts<U> : never;
135
173
  };
174
+ /**
175
+ * Infer all router inputs
176
+ *
177
+ * @info A procedure is a router too.
178
+ * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
179
+ */
136
180
  type InferRouterInputs<T extends AnyRouter> = T extends Procedure<any, any, infer UInputSchema, any, any, any> ? InferSchemaInput<UInputSchema> : {
137
181
  [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterInputs<U> : never;
138
182
  };
183
+ /**
184
+ * Infer all router outputs
185
+ *
186
+ * @info A procedure is a router too.
187
+ * @see {@link https://orpc.unnoq.com/docs/router#utilities Router Utilities Docs}
188
+ */
139
189
  type InferRouterOutputs<T extends AnyRouter> = T extends Procedure<any, any, any, infer UOutputSchema, any, any> ? InferSchemaOutput<UOutputSchema> : {
140
190
  [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterOutputs<U> : never;
141
191
  };
142
192
 
143
- export { type AnyProcedure as A, middlewareOutputFn as B, type Context as C, type ProcedureHandlerOptions as D, type ProcedureDef as E, isProcedure as F, createProcedureClient as G, type InferRouterInitialContexts as H, type InferRouterInitialContext as I, type InferRouterCurrentContexts as J, type InferRouterInputs as K, type Lazyable as L, type Middleware as M, type InferRouterOutputs as N, type ORPCErrorConstructorMap as O, type ProcedureClientInterceptorOptions as P, type Router as R, type AnyRouter as a, Procedure as b, type MergedInitialContext as c, type MergedCurrentContext as d, type MapInputMiddleware as e, type CreateProcedureClientOptions as f, type ProcedureClient as g, type AnyMiddleware as h, type Lazy as i, type ProcedureHandler as j, type ORPCErrorConstructorMapItemOptions as k, type ORPCErrorConstructorMapItem as l, mergeCurrentContext as m, createORPCErrorConstructorMap as n, LAZY_SYMBOL as o, type LazyMeta as p, lazy as q, isLazy as r, getLazyMeta as s, type MiddlewareResult as t, unlazy as u, validateORPCError as v, type MiddlewareNextFnOptions as w, type MiddlewareNextFn as x, type MiddlewareOutputFn as y, type MiddlewareOptions as z };
193
+ export { middlewareOutputFn as B, isProcedure as F, createProcedureClient as G, Procedure as P, mergeCurrentContext as m, createORPCErrorConstructorMap as n, LAZY_SYMBOL as o, lazy as q, isLazy as r, getLazyMeta as s, unlazy as u, validateORPCError as v };
194
+ export type { AnyProcedure as A, Context as C, ProcedureHandlerOptions as D, ProcedureDef as E, InferRouterInitialContexts as H, InferRouterInitialContext as I, InferRouterCurrentContexts as J, InferRouterInputs as K, Lazyable as L, MergedInitialContext as M, InferRouterOutputs as N, ORPCErrorConstructorMap as O, Router as R, AnyMiddleware as a, AnyRouter as b, Lazy as c, ProcedureClientInterceptorOptions as d, Middleware as e, MergedCurrentContext as f, MapInputMiddleware as g, CreateProcedureClientOptions as h, ProcedureClient as i, ProcedureHandler as j, ORPCErrorConstructorMapItemOptions as k, ORPCErrorConstructorMapItem as l, LazyMeta as p, MiddlewareResult as t, MiddlewareNextFnOptions as w, MiddlewareNextFn as x, MiddlewareOutputFn as y, MiddlewareOptions as z };
@@ -0,0 +1,32 @@
1
+ import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
2
+ import { b as AnyRouter, C as Context, R as Router } from './server.CYNGeoCm.js';
3
+ import { i as StandardMatcher, h as StandardMatchResult, e as StandardHandlerOptions, f as StandardHandler } from './server.Bmh5xd4n.js';
4
+ import { HTTPPath } from '@orpc/client';
5
+ import { Value } from '@orpc/shared';
6
+ import { T as TraverseContractProcedureCallbackOptions } from './server.jMTkVNIb.js';
7
+
8
+ interface StandardRPCMatcherOptions {
9
+ /**
10
+ * Filter procedures. Return `false` to exclude a procedure from matching.
11
+ *
12
+ * @default true
13
+ */
14
+ filter?: Value<boolean, [options: TraverseContractProcedureCallbackOptions]>;
15
+ }
16
+ declare class StandardRPCMatcher implements StandardMatcher {
17
+ private readonly filter;
18
+ private readonly tree;
19
+ private pendingRouters;
20
+ constructor(options?: StandardRPCMatcherOptions);
21
+ init(router: AnyRouter, path?: readonly string[]): void;
22
+ match(_method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
23
+ }
24
+
25
+ interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions, StandardRPCMatcherOptions {
26
+ }
27
+ declare class StandardRPCHandler<T extends Context> extends StandardHandler<T> {
28
+ constructor(router: Router<any, T>, options?: StandardRPCHandlerOptions<T>);
29
+ }
30
+
31
+ export { StandardRPCHandler as a, StandardRPCMatcher as c };
32
+ export type { StandardRPCHandlerOptions as S, StandardRPCMatcherOptions as b };
@@ -1,7 +1,7 @@
1
1
  function resolveFriendlyStandardHandleOptions(options) {
2
2
  return {
3
3
  ...options,
4
- context: options?.context ?? {}
4
+ context: options.context ?? {}
5
5
  // Context only optional if all fields are optional
6
6
  };
7
7
  }
@@ -0,0 +1,42 @@
1
+ import { ErrorMap, EnhanceRouteOptions, MergedErrorMap, AnyContractRouter, AnyContractProcedure } from '@orpc/contract';
2
+ import { a as AnyMiddleware, L as Lazyable, b as AnyRouter, C as Context, c as Lazy, A as AnyProcedure, P as Procedure, M as MergedInitialContext } from './server.CYNGeoCm.mjs';
3
+
4
+ declare function getRouter<T extends Lazyable<AnyRouter | undefined>>(router: T, path: readonly string[]): T extends Lazy<any> ? Lazy<AnyRouter | undefined> : Lazyable<AnyRouter | undefined>;
5
+ type AccessibleLazyRouter<T extends Lazyable<AnyRouter | undefined>> = T extends Lazy<infer U extends AnyRouter | undefined | Lazy<AnyRouter | undefined>> ? AccessibleLazyRouter<U> : T extends AnyProcedure | undefined ? Lazy<T> : Lazy<T> & {
6
+ [K in keyof T]: T[K] extends Lazyable<AnyRouter> ? AccessibleLazyRouter<T[K]> : never;
7
+ };
8
+ declare function createAccessibleLazyRouter<T extends Lazy<AnyRouter | undefined>>(lazied: T): AccessibleLazyRouter<T>;
9
+ type EnhancedRouter<T extends Lazyable<AnyRouter>, TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap> = T extends Lazy<infer U extends AnyRouter> ? AccessibleLazyRouter<EnhancedRouter<U, TInitialContext, TCurrentContext, TErrorMap>> : T extends Procedure<infer UInitialContext, infer UCurrentContext, infer UInputSchema, infer UOutputSchema, infer UErrorMap, infer UMeta> ? Procedure<MergedInitialContext<TInitialContext, UInitialContext, TCurrentContext>, UCurrentContext, UInputSchema, UOutputSchema, MergedErrorMap<TErrorMap, UErrorMap>, UMeta> : {
10
+ [K in keyof T]: T[K] extends Lazyable<AnyRouter> ? EnhancedRouter<T[K], TInitialContext, TCurrentContext, TErrorMap> : never;
11
+ };
12
+ interface EnhanceRouterOptions<TErrorMap extends ErrorMap> extends EnhanceRouteOptions {
13
+ middlewares: readonly AnyMiddleware[];
14
+ errorMap: TErrorMap;
15
+ dedupeLeadingMiddlewares: boolean;
16
+ }
17
+ declare function enhanceRouter<T extends Lazyable<AnyRouter>, TInitialContext extends Context, TCurrentContext extends Context, TErrorMap extends ErrorMap>(router: T, options: EnhanceRouterOptions<TErrorMap>): EnhancedRouter<T, TInitialContext, TCurrentContext, TErrorMap>;
18
+ interface TraverseContractProceduresOptions {
19
+ router: AnyContractRouter | AnyRouter;
20
+ path: readonly string[];
21
+ }
22
+ interface TraverseContractProcedureCallbackOptions {
23
+ contract: AnyContractProcedure | AnyProcedure;
24
+ path: readonly string[];
25
+ }
26
+ /**
27
+ * @deprecated Use `TraverseContractProcedureCallbackOptions` instead.
28
+ */
29
+ type ContractProcedureCallbackOptions = TraverseContractProcedureCallbackOptions;
30
+ interface LazyTraverseContractProceduresOptions {
31
+ router: Lazy<AnyRouter>;
32
+ path: readonly string[];
33
+ }
34
+ declare function traverseContractProcedures(options: TraverseContractProceduresOptions, callback: (options: TraverseContractProcedureCallbackOptions) => void, lazyOptions?: LazyTraverseContractProceduresOptions[]): LazyTraverseContractProceduresOptions[];
35
+ declare function resolveContractProcedures(options: TraverseContractProceduresOptions, callback: (options: TraverseContractProcedureCallbackOptions) => void): Promise<void>;
36
+ type UnlaziedRouter<T extends AnyRouter> = T extends AnyProcedure ? T : {
37
+ [K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? UnlaziedRouter<U> : never;
38
+ };
39
+ declare function unlazyRouter<T extends AnyRouter>(router: T): Promise<UnlaziedRouter<T>>;
40
+
41
+ export { createAccessibleLazyRouter as c, enhanceRouter as e, getRouter as g, resolveContractProcedures as r, traverseContractProcedures as t, unlazyRouter as u };
42
+ export type { AccessibleLazyRouter as A, ContractProcedureCallbackOptions as C, EnhanceRouterOptions as E, LazyTraverseContractProceduresOptions as L, TraverseContractProcedureCallbackOptions as T, UnlaziedRouter as U, EnhancedRouter as a, TraverseContractProceduresOptions as b };
@@ -1,6 +1,6 @@
1
1
  import { isContractProcedure, ValidationError, mergePrefix, mergeErrorMap, enhanceRoute } from '@orpc/contract';
2
+ import { resolveMaybeOptionalOptions, toArray, value, intercept } from '@orpc/shared';
2
3
  import { fallbackORPCErrorStatus, ORPCError } from '@orpc/client';
3
- import { value, intercept, toError } from '@orpc/shared';
4
4
 
5
5
  const LAZY_SYMBOL = Symbol("ORPC_LAZY_SYMBOL");
6
6
  function lazy(loader, meta = {}) {
@@ -46,6 +46,9 @@ function addMiddleware(middlewares, addition) {
46
46
  }
47
47
 
48
48
  class Procedure {
49
+ /**
50
+ * This property holds the defined options.
51
+ */
49
52
  "~orpc";
50
53
  constructor(def) {
51
54
  this["~orpc"] = def;
@@ -68,14 +71,15 @@ function createORPCErrorConstructorMap(errors) {
68
71
  if (typeof code !== "string") {
69
72
  return Reflect.get(target, code);
70
73
  }
71
- const item = (...[options]) => {
74
+ const item = (...rest) => {
75
+ const options = resolveMaybeOptionalOptions(rest);
72
76
  const config = errors[code];
73
77
  return new ORPCError(code, {
74
78
  defined: Boolean(config),
75
79
  status: config?.status,
76
- message: options?.message ?? config?.message,
77
- data: options?.data,
78
- cause: options?.cause
80
+ message: options.message ?? config?.message,
81
+ data: options.data,
82
+ cause: options.cause
79
83
  });
80
84
  };
81
85
  return item;
@@ -103,16 +107,17 @@ function middlewareOutputFn(output) {
103
107
  return { output, context: {} };
104
108
  }
105
109
 
106
- function createProcedureClient(lazyableProcedure, ...[options]) {
110
+ function createProcedureClient(lazyableProcedure, ...rest) {
111
+ const options = resolveMaybeOptionalOptions(rest);
107
112
  return async (...[input, callerOptions]) => {
108
- const path = options?.path ?? [];
113
+ const path = toArray(options.path);
109
114
  const { default: procedure } = await unlazy(lazyableProcedure);
110
115
  const clientContext = callerOptions?.context ?? {};
111
- const context = await value(options?.context ?? {}, clientContext);
116
+ const context = await value(options.context ?? {}, clientContext);
112
117
  const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
113
118
  try {
114
119
  return await intercept(
115
- options?.interceptors ?? [],
120
+ toArray(options.interceptors),
116
121
  {
117
122
  context,
118
123
  input,
@@ -127,7 +132,7 @@ function createProcedureClient(lazyableProcedure, ...[options]) {
127
132
  );
128
133
  } catch (e) {
129
134
  if (!(e instanceof ORPCError)) {
130
- throw toError(e);
135
+ throw e;
131
136
  }
132
137
  const validated = await validateORPCError(procedure["~orpc"].errorMap, e);
133
138
  throw validated;
@@ -169,35 +174,29 @@ async function executeProcedureInternal(procedure, options) {
169
174
  const middlewares = procedure["~orpc"].middlewares;
170
175
  const inputValidationIndex = Math.min(Math.max(0, procedure["~orpc"].inputValidationIndex), middlewares.length);
171
176
  const outputValidationIndex = Math.min(Math.max(0, procedure["~orpc"].outputValidationIndex), middlewares.length);
172
- let currentIndex = 0;
173
- let currentContext = options.context;
174
- let currentInput = options.input;
175
- const next = async (...[nextOptions]) => {
176
- const index = currentIndex;
177
- const midContext = nextOptions?.context ?? {};
178
- currentIndex += 1;
179
- currentContext = mergeCurrentContext(currentContext, midContext);
177
+ const next = async (index, context, input) => {
178
+ let currentInput = input;
180
179
  if (index === inputValidationIndex) {
181
180
  currentInput = await validateInput(procedure, currentInput);
182
181
  }
183
182
  const mid = middlewares[index];
184
- const result = mid ? {
185
- context: midContext,
186
- output: (await mid({ ...options, context: currentContext, next }, currentInput, middlewareOutputFn)).output
187
- } : {
188
- context: midContext,
189
- output: await procedure["~orpc"].handler({ ...options, context: currentContext, input: currentInput })
190
- };
183
+ const output = mid ? (await mid({
184
+ ...options,
185
+ context,
186
+ next: async (...[nextOptions]) => {
187
+ const nextContext = nextOptions?.context ?? {};
188
+ return {
189
+ output: await next(index + 1, mergeCurrentContext(context, nextContext), currentInput),
190
+ context: nextContext
191
+ };
192
+ }
193
+ }, currentInput, middlewareOutputFn)).output : await procedure["~orpc"].handler({ ...options, context, input: currentInput });
191
194
  if (index === outputValidationIndex) {
192
- const validatedOutput = await validateOutput(procedure, result.output);
193
- return {
194
- context: result.context,
195
- output: validatedOutput
196
- };
195
+ return await validateOutput(procedure, output);
197
196
  }
198
- return result;
197
+ return output;
199
198
  };
200
- return (await next()).output;
199
+ return next(0, options.context, options.input);
201
200
  }
202
201
 
203
202
  const HIDDEN_ROUTER_CONTRACT_SYMBOL = Symbol("ORPC_HIDDEN_ROUTER_CONTRACT");
@@ -364,7 +363,8 @@ function createContractedProcedure(procedure, contract) {
364
363
  });
365
364
  }
366
365
  function call(procedure, input, ...rest) {
367
- return createProcedureClient(procedure, ...rest)(input);
366
+ const options = resolveMaybeOptionalOptions(rest);
367
+ return createProcedureClient(procedure, options)(input, options);
368
368
  }
369
369
 
370
370
  export { LAZY_SYMBOL as L, Procedure as P, createContractedProcedure as a, addMiddleware as b, createProcedureClient as c, isLazy as d, enhanceRouter as e, createAssertedLazyProcedure as f, getRouter as g, createORPCErrorConstructorMap as h, isProcedure as i, getLazyMeta as j, middlewareOutputFn as k, lazy as l, mergeCurrentContext as m, isStartWithMiddlewares as n, mergeMiddlewares as o, call as p, getHiddenRouterContract as q, createAccessibleLazyRouter as r, setHiddenRouterContract as s, traverseContractProcedures as t, unlazy as u, validateORPCError as v, resolveContractProcedures as w, unlazyRouter as x };