@orpc/client 0.0.0-next.904b0c2 → 0.0.0-next.907c00c

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 (29) hide show
  1. package/README.md +23 -22
  2. package/dist/adapters/fetch/index.d.mts +31 -11
  3. package/dist/adapters/fetch/index.d.ts +31 -11
  4. package/dist/adapters/fetch/index.mjs +26 -13
  5. package/dist/adapters/message-port/index.d.mts +59 -0
  6. package/dist/adapters/message-port/index.d.ts +59 -0
  7. package/dist/adapters/message-port/index.mjs +72 -0
  8. package/dist/adapters/standard/index.d.mts +7 -5
  9. package/dist/adapters/standard/index.d.ts +7 -5
  10. package/dist/adapters/standard/index.mjs +3 -2
  11. package/dist/adapters/websocket/index.d.mts +29 -0
  12. package/dist/adapters/websocket/index.d.ts +29 -0
  13. package/dist/adapters/websocket/index.mjs +46 -0
  14. package/dist/index.d.mts +105 -27
  15. package/dist/index.d.ts +105 -27
  16. package/dist/index.mjs +60 -14
  17. package/dist/plugins/index.d.mts +163 -21
  18. package/dist/plugins/index.d.ts +163 -21
  19. package/dist/plugins/index.mjs +334 -53
  20. package/dist/shared/{client.D9lmRwGB.d.mts → client.BG98rYdO.d.ts} +20 -14
  21. package/dist/shared/{client.87WXDX8t.d.mts → client.BOYsZIRq.d.mts} +13 -16
  22. package/dist/shared/{client.87WXDX8t.d.ts → client.BOYsZIRq.d.ts} +13 -16
  23. package/dist/shared/{client.BaocqKnn.d.ts → client.Bwgm6dgk.d.mts} +20 -14
  24. package/dist/shared/{client.CZFIVTQj.d.ts → client.CVVVqf1Y.d.ts} +13 -25
  25. package/dist/shared/client.CaZT8YGA.mjs +208 -0
  26. package/dist/shared/{client.BC0T26HA.d.mts → client._Y_enhib.d.mts} +13 -25
  27. package/dist/shared/{client.D77bw0hs.mjs → client.uRjpm-dw.mjs} +94 -30
  28. package/package.json +16 -5
  29. package/dist/shared/client.jKEwIsRd.mjs +0 -175
@@ -1,5 +1,260 @@
1
- import { isAsyncIteratorObject, value } from '@orpc/shared';
2
- import { getEventMeta } from '@orpc/standard-server';
1
+ import { isAsyncIteratorObject, defer, value, splitInHalf, toArray, stringifyJSON, overlayProxy, AsyncIteratorClass } from '@orpc/shared';
2
+ import { toBatchRequest, parseBatchResponse, toBatchAbortSignal } from '@orpc/standard-server/batch';
3
+ import { replicateStandardLazyResponse, getEventMeta } from '@orpc/standard-server';
4
+
5
+ class BatchLinkPlugin {
6
+ groups;
7
+ maxSize;
8
+ batchUrl;
9
+ maxUrlLength;
10
+ batchHeaders;
11
+ mapRequestItem;
12
+ exclude;
13
+ mode;
14
+ pending;
15
+ order = 5e6;
16
+ constructor(options) {
17
+ this.groups = options.groups;
18
+ this.pending = /* @__PURE__ */ new Map();
19
+ this.maxSize = options.maxSize ?? 10;
20
+ this.maxUrlLength = options.maxUrlLength ?? 2083;
21
+ this.mode = options.mode ?? "streaming";
22
+ this.batchUrl = options.url ?? (([options2]) => `${options2.request.url.origin}${options2.request.url.pathname}/__batch__`);
23
+ this.batchHeaders = options.headers ?? (([options2, ...rest]) => {
24
+ const headers = {};
25
+ for (const [key, value2] of Object.entries(options2.request.headers)) {
26
+ if (rest.every((item) => item.request.headers[key] === value2)) {
27
+ headers[key] = value2;
28
+ }
29
+ }
30
+ return headers;
31
+ });
32
+ this.mapRequestItem = options.mapRequestItem ?? (({ request, batchHeaders }) => {
33
+ const headers = {};
34
+ for (const [key, value2] of Object.entries(request.headers)) {
35
+ if (batchHeaders[key] !== value2) {
36
+ headers[key] = value2;
37
+ }
38
+ }
39
+ return {
40
+ method: request.method,
41
+ url: request.url,
42
+ headers,
43
+ body: request.body,
44
+ signal: request.signal
45
+ };
46
+ });
47
+ this.exclude = options.exclude ?? (() => false);
48
+ }
49
+ init(options) {
50
+ options.clientInterceptors ??= [];
51
+ options.clientInterceptors.push((options2) => {
52
+ if (options2.request.headers["x-orpc-batch"] !== "1") {
53
+ return options2.next();
54
+ }
55
+ return options2.next({
56
+ ...options2,
57
+ request: {
58
+ ...options2.request,
59
+ headers: {
60
+ ...options2.request.headers,
61
+ "x-orpc-batch": void 0
62
+ }
63
+ }
64
+ });
65
+ });
66
+ options.clientInterceptors.push((options2) => {
67
+ if (this.exclude(options2) || options2.request.body instanceof Blob || options2.request.body instanceof FormData || isAsyncIteratorObject(options2.request.body) || options2.request.signal?.aborted) {
68
+ return options2.next();
69
+ }
70
+ const group = this.groups.find((group2) => group2.condition(options2));
71
+ if (!group) {
72
+ return options2.next();
73
+ }
74
+ return new Promise((resolve, reject) => {
75
+ this.#enqueueRequest(group, options2, resolve, reject);
76
+ defer(() => this.#processPendingBatches());
77
+ });
78
+ });
79
+ }
80
+ #enqueueRequest(group, options, resolve, reject) {
81
+ const items = this.pending.get(group);
82
+ if (items) {
83
+ items.push([options, resolve, reject]);
84
+ } else {
85
+ this.pending.set(group, [[options, resolve, reject]]);
86
+ }
87
+ }
88
+ async #processPendingBatches() {
89
+ const pending = this.pending;
90
+ this.pending = /* @__PURE__ */ new Map();
91
+ for (const [group, items] of pending) {
92
+ const getItems = items.filter(([options]) => options.request.method === "GET");
93
+ const restItems = items.filter(([options]) => options.request.method !== "GET");
94
+ this.#executeBatch("GET", group, getItems);
95
+ this.#executeBatch("POST", group, restItems);
96
+ }
97
+ }
98
+ async #executeBatch(method, group, groupItems) {
99
+ if (!groupItems.length) {
100
+ return;
101
+ }
102
+ const batchItems = groupItems;
103
+ if (batchItems.length === 1) {
104
+ batchItems[0][0].next().then(batchItems[0][1]).catch(batchItems[0][2]);
105
+ return;
106
+ }
107
+ try {
108
+ const options = batchItems.map(([options2]) => options2);
109
+ const maxSize = await value(this.maxSize, options);
110
+ if (batchItems.length > maxSize) {
111
+ const [first, second] = splitInHalf(batchItems);
112
+ this.#executeBatch(method, group, first);
113
+ this.#executeBatch(method, group, second);
114
+ return;
115
+ }
116
+ const batchUrl = new URL(await value(this.batchUrl, options));
117
+ const batchHeaders = await value(this.batchHeaders, options);
118
+ const mappedItems = batchItems.map(([options2]) => this.mapRequestItem({ ...options2, batchUrl, batchHeaders }));
119
+ const batchRequest = toBatchRequest({
120
+ method,
121
+ url: batchUrl,
122
+ headers: batchHeaders,
123
+ requests: mappedItems
124
+ });
125
+ const maxUrlLength = await value(this.maxUrlLength, options);
126
+ if (batchRequest.url.toString().length > maxUrlLength) {
127
+ const [first, second] = splitInHalf(batchItems);
128
+ this.#executeBatch(method, group, first);
129
+ this.#executeBatch(method, group, second);
130
+ return;
131
+ }
132
+ const mode = value(this.mode, options);
133
+ try {
134
+ const lazyResponse = await options[0].next({
135
+ request: { ...batchRequest, headers: { ...batchRequest.headers, "x-orpc-batch": mode } },
136
+ signal: batchRequest.signal,
137
+ context: group.context,
138
+ input: group.input,
139
+ path: toArray(group.path)
140
+ });
141
+ const parsed = parseBatchResponse({ ...lazyResponse, body: await lazyResponse.body() });
142
+ for await (const item of parsed) {
143
+ batchItems[item.index]?.[1]({ ...item, body: () => Promise.resolve(item.body) });
144
+ }
145
+ } catch (err) {
146
+ if (batchRequest.signal?.aborted && batchRequest.signal.reason === err) {
147
+ for (const [{ signal }, , reject] of batchItems) {
148
+ if (signal?.aborted) {
149
+ reject(signal.reason);
150
+ }
151
+ }
152
+ }
153
+ throw err;
154
+ }
155
+ throw new Error("Something went wrong make batch response not contains enough responses. This can be a bug please report it.");
156
+ } catch (error) {
157
+ for (const [, , reject] of batchItems) {
158
+ reject(error);
159
+ }
160
+ }
161
+ }
162
+ }
163
+
164
+ class DedupeRequestsPlugin {
165
+ #groups;
166
+ #filter;
167
+ order = 4e6;
168
+ // make sure execute before batch plugin
169
+ #queue = /* @__PURE__ */ new Map();
170
+ constructor(options) {
171
+ this.#groups = options.groups;
172
+ this.#filter = options.filter ?? (({ request }) => request.method === "GET");
173
+ }
174
+ init(options) {
175
+ options.clientInterceptors ??= [];
176
+ options.clientInterceptors.push((options2) => {
177
+ if (options2.request.body instanceof Blob || options2.request.body instanceof FormData || options2.request.body instanceof URLSearchParams || isAsyncIteratorObject(options2.request.body) || !this.#filter(options2)) {
178
+ return options2.next();
179
+ }
180
+ const group = this.#groups.find((group2) => group2.condition(options2));
181
+ if (!group) {
182
+ return options2.next();
183
+ }
184
+ return new Promise((resolve, reject) => {
185
+ this.#enqueue(group, options2, resolve, reject);
186
+ defer(() => this.#dequeue());
187
+ });
188
+ });
189
+ }
190
+ #enqueue(group, options, resolve, reject) {
191
+ let queue = this.#queue.get(group);
192
+ if (!queue) {
193
+ this.#queue.set(group, queue = []);
194
+ }
195
+ const matched = queue.find((item) => {
196
+ const requestString1 = stringifyJSON({
197
+ body: item.options.request.body,
198
+ headers: item.options.request.headers,
199
+ method: item.options.request.method,
200
+ url: item.options.request.url
201
+ });
202
+ const requestString2 = stringifyJSON({
203
+ body: options.request.body,
204
+ headers: options.request.headers,
205
+ method: options.request.method,
206
+ url: options.request.url
207
+ });
208
+ return requestString1 === requestString2;
209
+ });
210
+ if (matched) {
211
+ matched.signals.push(options.request.signal);
212
+ matched.resolves.push(resolve);
213
+ matched.rejects.push(reject);
214
+ } else {
215
+ queue.push({
216
+ options,
217
+ signals: [options.request.signal],
218
+ resolves: [resolve],
219
+ rejects: [reject]
220
+ });
221
+ }
222
+ }
223
+ async #dequeue() {
224
+ const promises = [];
225
+ for (const [group, items] of this.#queue) {
226
+ for (const { options, signals, resolves, rejects } of items) {
227
+ promises.push(
228
+ this.#execute(group, options, signals, resolves, rejects)
229
+ );
230
+ }
231
+ }
232
+ this.#queue.clear();
233
+ await Promise.all(promises);
234
+ }
235
+ async #execute(group, options, signals, resolves, rejects) {
236
+ try {
237
+ const dedupedRequest = {
238
+ ...options.request,
239
+ signal: toBatchAbortSignal(signals)
240
+ };
241
+ const response = await options.next({
242
+ ...options,
243
+ request: dedupedRequest,
244
+ signal: dedupedRequest.signal,
245
+ context: group.context
246
+ });
247
+ const replicatedResponses = replicateStandardLazyResponse(response, resolves.length);
248
+ for (const resolve of resolves) {
249
+ resolve(replicatedResponses.shift());
250
+ }
251
+ } catch (error) {
252
+ for (const reject of rejects) {
253
+ reject(error);
254
+ }
255
+ }
256
+ }
257
+ }
3
258
 
4
259
  class ClientRetryPluginInvalidEventIteratorRetryResponse extends Error {
5
260
  }
@@ -8,6 +263,7 @@ class ClientRetryPlugin {
8
263
  defaultRetryDelay;
9
264
  defaultShouldRetry;
10
265
  defaultOnRetry;
266
+ order = 18e5;
11
267
  constructor(options = {}) {
12
268
  this.defaultRetry = options.default?.retry ?? 0;
13
269
  this.defaultRetryDelay = options.default?.retryDelay ?? ((o) => o.lastEventRetry ?? 2e3);
@@ -17,71 +273,57 @@ class ClientRetryPlugin {
17
273
  init(options) {
18
274
  options.interceptors ??= [];
19
275
  options.interceptors.push(async (interceptorOptions) => {
20
- const maxAttempts = interceptorOptions.options.context.retry ?? this.defaultRetry;
21
- const retryDelay = interceptorOptions.options.context.retryDelay ?? this.defaultRetryDelay;
22
- const shouldRetry = interceptorOptions.options.context.shouldRetry ?? this.defaultShouldRetry;
23
- const onRetry = interceptorOptions.options.context.onRetry ?? this.defaultOnRetry;
276
+ const maxAttempts = await value(
277
+ interceptorOptions.context.retry ?? this.defaultRetry,
278
+ interceptorOptions
279
+ );
280
+ const retryDelay = interceptorOptions.context.retryDelay ?? this.defaultRetryDelay;
281
+ const shouldRetry = interceptorOptions.context.shouldRetry ?? this.defaultShouldRetry;
282
+ const onRetry = interceptorOptions.context.onRetry ?? this.defaultOnRetry;
24
283
  if (maxAttempts <= 0) {
25
284
  return interceptorOptions.next();
26
285
  }
27
- let lastEventId = interceptorOptions.options.lastEventId;
286
+ let lastEventId = interceptorOptions.lastEventId;
28
287
  let lastEventRetry;
29
- let unsubscribe;
288
+ let callback;
30
289
  let attemptIndex = 0;
31
- const next = async (initial) => {
32
- let current = initial;
290
+ const next = async (initialError) => {
291
+ let currentError = initialError;
33
292
  while (true) {
34
- const newClientOptions = { ...interceptorOptions.options, lastEventId };
35
- if (current) {
293
+ const updatedInterceptorOptions = { ...interceptorOptions, lastEventId };
294
+ if (currentError) {
36
295
  if (attemptIndex >= maxAttempts) {
37
- throw current.error;
296
+ throw currentError.error;
38
297
  }
39
298
  const attemptOptions = {
299
+ ...updatedInterceptorOptions,
40
300
  attemptIndex,
41
- error: current.error,
42
- lastEventId,
301
+ error: currentError.error,
43
302
  lastEventRetry
44
303
  };
45
304
  const shouldRetryBool = await value(
46
305
  shouldRetry,
47
- attemptOptions,
48
- newClientOptions,
49
- interceptorOptions.path,
50
- interceptorOptions.input
306
+ attemptOptions
51
307
  );
52
308
  if (!shouldRetryBool) {
53
- throw current.error;
309
+ throw currentError.error;
54
310
  }
55
- unsubscribe = onRetry?.(
56
- attemptOptions,
57
- newClientOptions,
58
- interceptorOptions.path,
59
- interceptorOptions.input
60
- );
61
- const retryDelayMs = await value(
62
- retryDelay,
63
- attemptOptions,
64
- newClientOptions,
65
- interceptorOptions.path,
66
- interceptorOptions.input
67
- );
311
+ callback = onRetry?.(attemptOptions);
312
+ const retryDelayMs = await value(retryDelay, attemptOptions);
68
313
  await new Promise((resolve) => setTimeout(resolve, retryDelayMs));
69
314
  attemptIndex++;
70
315
  }
71
316
  try {
72
- const output2 = await interceptorOptions.next({
73
- ...interceptorOptions,
74
- options: newClientOptions
75
- });
76
- return output2;
317
+ currentError = void 0;
318
+ return await interceptorOptions.next(updatedInterceptorOptions);
77
319
  } catch (error) {
78
- if (newClientOptions.signal?.aborted === true) {
320
+ currentError = { error };
321
+ if (updatedInterceptorOptions.signal?.aborted) {
79
322
  throw error;
80
323
  }
81
- current = { error };
82
324
  } finally {
83
- unsubscribe?.();
84
- unsubscribe = void 0;
325
+ callback?.(!currentError);
326
+ callback = void 0;
85
327
  }
86
328
  }
87
329
  };
@@ -89,19 +331,17 @@ class ClientRetryPlugin {
89
331
  if (!isAsyncIteratorObject(output)) {
90
332
  return output;
91
333
  }
92
- return async function* () {
93
- let current = output;
94
- try {
334
+ let current = output;
335
+ let isIteratorAborted = false;
336
+ return overlayProxy(() => current, new AsyncIteratorClass(
337
+ async () => {
95
338
  while (true) {
96
339
  try {
97
340
  const item = await current.next();
98
341
  const meta = getEventMeta(item.value);
99
342
  lastEventId = meta?.id ?? lastEventId;
100
343
  lastEventRetry = meta?.retry ?? lastEventRetry;
101
- if (item.done) {
102
- return item.value;
103
- }
104
- yield item.value;
344
+ return item;
105
345
  } catch (error) {
106
346
  const meta = getEventMeta(error);
107
347
  lastEventId = meta?.id ?? lastEventId;
@@ -113,14 +353,55 @@ class ClientRetryPlugin {
113
353
  );
114
354
  }
115
355
  current = maybeEventIterator;
356
+ if (isIteratorAborted) {
357
+ await current.return?.();
358
+ throw error;
359
+ }
116
360
  }
117
361
  }
118
- } finally {
119
- await current.return?.();
362
+ },
363
+ async (reason) => {
364
+ isIteratorAborted = true;
365
+ if (reason !== "next") {
366
+ await current.return?.();
367
+ }
368
+ }
369
+ ));
370
+ });
371
+ }
372
+ }
373
+
374
+ class SimpleCsrfProtectionLinkPlugin {
375
+ headerName;
376
+ headerValue;
377
+ exclude;
378
+ constructor(options = {}) {
379
+ this.headerName = options.headerName ?? "x-csrf-token";
380
+ this.headerValue = options.headerValue ?? "orpc";
381
+ this.exclude = options.exclude ?? false;
382
+ }
383
+ order = 8e6;
384
+ init(options) {
385
+ options.clientInterceptors ??= [];
386
+ options.clientInterceptors.push(async (options2) => {
387
+ const excluded = await value(this.exclude, options2);
388
+ if (excluded) {
389
+ return options2.next();
390
+ }
391
+ const headerName = await value(this.headerName, options2);
392
+ const headerValue = await value(this.headerValue, options2);
393
+ return options2.next({
394
+ ...options2,
395
+ request: {
396
+ ...options2.request,
397
+ headers: {
398
+ ...options2.request.headers,
399
+ [headerName]: headerValue
400
+ }
120
401
  }
121
- }();
402
+ });
122
403
  });
123
404
  }
124
405
  }
125
406
 
126
- export { ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse };
407
+ export { BatchLinkPlugin, ClientRetryPlugin, ClientRetryPluginInvalidEventIteratorRetryResponse, DedupeRequestsPlugin, SimpleCsrfProtectionLinkPlugin };
@@ -1,6 +1,16 @@
1
1
  import { Interceptor } from '@orpc/shared';
2
2
  import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
3
- import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.87WXDX8t.mjs';
3
+ import { b as ClientContext, c as ClientOptions, C as ClientLink } from './client.BOYsZIRq.js';
4
+
5
+ interface StandardLinkPlugin<T extends ClientContext> {
6
+ order?: number;
7
+ init?(options: StandardLinkOptions<T>): void;
8
+ }
9
+ declare class CompositeStandardLinkPlugin<T extends ClientContext, TPlugin extends StandardLinkPlugin<T>> implements StandardLinkPlugin<T> {
10
+ protected readonly plugins: TPlugin[];
11
+ constructor(plugins?: readonly TPlugin[]);
12
+ init(options: StandardLinkOptions<T>): void;
13
+ }
4
14
 
5
15
  interface StandardLinkCodec<T extends ClientContext> {
6
16
  encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
@@ -10,24 +20,19 @@ interface StandardLinkClient<T extends ClientContext> {
10
20
  call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
11
21
  }
12
22
 
13
- declare class InvalidEventIteratorRetryResponse extends Error {
23
+ interface StandardLinkInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
24
+ path: readonly string[];
25
+ input: unknown;
14
26
  }
15
- interface StandardLinkPlugin<T extends ClientContext> {
16
- init?(options: StandardLinkOptions<T>): void;
27
+ interface StandardLinkClientInterceptorOptions<T extends ClientContext> extends StandardLinkInterceptorOptions<T> {
28
+ request: StandardRequest;
17
29
  }
18
30
  interface StandardLinkOptions<T extends ClientContext> {
19
- interceptors?: Interceptor<{
20
- path: readonly string[];
21
- input: unknown;
22
- options: ClientOptions<T>;
23
- }, unknown, unknown>[];
24
- clientInterceptors?: Interceptor<{
25
- request: StandardRequest;
26
- }, StandardLazyResponse, unknown>[];
31
+ interceptors?: Interceptor<StandardLinkInterceptorOptions<T>, Promise<unknown>>[];
32
+ clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, Promise<StandardLazyResponse>>[];
27
33
  plugins?: StandardLinkPlugin<T>[];
28
34
  }
29
35
  declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
30
- #private;
31
36
  readonly codec: StandardLinkCodec<T>;
32
37
  readonly sender: StandardLinkClient<T>;
33
38
  private readonly interceptors;
@@ -36,4 +41,5 @@ declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
36
41
  call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
37
42
  }
38
43
 
39
- export { InvalidEventIteratorRetryResponse as I, type StandardLinkPlugin as S, type StandardLinkOptions as a, StandardLink as b, type StandardLinkCodec as c, type StandardLinkClient as d };
44
+ export { CompositeStandardLinkPlugin as C, StandardLink as d };
45
+ export type { StandardLinkClientInterceptorOptions as S, StandardLinkPlugin as a, StandardLinkOptions as b, StandardLinkInterceptorOptions as c, StandardLinkCodec as e, StandardLinkClient as f };
@@ -1,32 +1,29 @@
1
+ import { PromiseWithError } from '@orpc/shared';
2
+
1
3
  type HTTPPath = `/${string}`;
2
- type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
3
- type ClientContext = Record<string, any>;
4
- type FriendlyClientOptions<TClientContext extends ClientContext> = {
4
+ type HTTPMethod = 'HEAD' | 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
5
+ type ClientContext = Record<PropertyKey, any>;
6
+ interface ClientOptions<T extends ClientContext> {
5
7
  signal?: AbortSignal;
6
8
  lastEventId?: string | undefined;
7
- } & (Record<never, never> extends TClientContext ? {
8
- context?: TClientContext;
9
+ context: T;
10
+ }
11
+ type FriendlyClientOptions<T extends ClientContext> = Omit<ClientOptions<T>, 'context'> & (Record<never, never> extends T ? {
12
+ context?: T;
9
13
  } : {
10
- context: TClientContext;
14
+ context: T;
11
15
  });
12
16
  type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options: FriendlyClientOptions<TClientContext>];
13
- type ClientPromiseResult<TOutput, TError extends Error> = Promise<TOutput> & {
14
- __error?: {
15
- type: TError;
16
- };
17
- };
18
- interface Client<TClientContext extends ClientContext, TInput, TOutput, TError extends Error> {
17
+ type ClientPromiseResult<TOutput, TError> = PromiseWithError<TOutput, TError>;
18
+ interface Client<TClientContext extends ClientContext, TInput, TOutput, TError> {
19
19
  (...rest: ClientRest<TClientContext, TInput>): ClientPromiseResult<TOutput, TError>;
20
20
  }
21
21
  type NestedClient<TClientContext extends ClientContext> = Client<TClientContext, any, any, any> | {
22
22
  [k: string]: NestedClient<TClientContext>;
23
23
  };
24
24
  type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
25
- type ClientOptions<TClientContext extends ClientContext> = FriendlyClientOptions<TClientContext> & {
26
- context: TClientContext;
27
- };
28
25
  interface ClientLink<TClientContext extends ClientContext> {
29
26
  call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
30
27
  }
31
28
 
32
- export type { ClientLink as C, FriendlyClientOptions as F, HTTPPath as H, InferClientContext as I, NestedClient as N, ClientContext as a, ClientOptions as b, ClientPromiseResult as c, HTTPMethod as d, ClientRest as e, Client as f };
29
+ export type { ClientLink as C, FriendlyClientOptions as F, HTTPPath as H, InferClientContext as I, NestedClient as N, ClientPromiseResult as a, ClientContext as b, ClientOptions as c, Client as d, ClientRest as e, HTTPMethod as f };
@@ -1,32 +1,29 @@
1
+ import { PromiseWithError } from '@orpc/shared';
2
+
1
3
  type HTTPPath = `/${string}`;
2
- type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
3
- type ClientContext = Record<string, any>;
4
- type FriendlyClientOptions<TClientContext extends ClientContext> = {
4
+ type HTTPMethod = 'HEAD' | 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH';
5
+ type ClientContext = Record<PropertyKey, any>;
6
+ interface ClientOptions<T extends ClientContext> {
5
7
  signal?: AbortSignal;
6
8
  lastEventId?: string | undefined;
7
- } & (Record<never, never> extends TClientContext ? {
8
- context?: TClientContext;
9
+ context: T;
10
+ }
11
+ type FriendlyClientOptions<T extends ClientContext> = Omit<ClientOptions<T>, 'context'> & (Record<never, never> extends T ? {
12
+ context?: T;
9
13
  } : {
10
- context: TClientContext;
14
+ context: T;
11
15
  });
12
16
  type ClientRest<TClientContext extends ClientContext, TInput> = Record<never, never> extends TClientContext ? undefined extends TInput ? [input?: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options?: FriendlyClientOptions<TClientContext>] : [input: TInput, options: FriendlyClientOptions<TClientContext>];
13
- type ClientPromiseResult<TOutput, TError extends Error> = Promise<TOutput> & {
14
- __error?: {
15
- type: TError;
16
- };
17
- };
18
- interface Client<TClientContext extends ClientContext, TInput, TOutput, TError extends Error> {
17
+ type ClientPromiseResult<TOutput, TError> = PromiseWithError<TOutput, TError>;
18
+ interface Client<TClientContext extends ClientContext, TInput, TOutput, TError> {
19
19
  (...rest: ClientRest<TClientContext, TInput>): ClientPromiseResult<TOutput, TError>;
20
20
  }
21
21
  type NestedClient<TClientContext extends ClientContext> = Client<TClientContext, any, any, any> | {
22
22
  [k: string]: NestedClient<TClientContext>;
23
23
  };
24
24
  type InferClientContext<T extends NestedClient<any>> = T extends NestedClient<infer U> ? U : never;
25
- type ClientOptions<TClientContext extends ClientContext> = FriendlyClientOptions<TClientContext> & {
26
- context: TClientContext;
27
- };
28
25
  interface ClientLink<TClientContext extends ClientContext> {
29
26
  call: (path: readonly string[], input: unknown, options: ClientOptions<TClientContext>) => Promise<unknown>;
30
27
  }
31
28
 
32
- export type { ClientLink as C, FriendlyClientOptions as F, HTTPPath as H, InferClientContext as I, NestedClient as N, ClientContext as a, ClientOptions as b, ClientPromiseResult as c, HTTPMethod as d, ClientRest as e, Client as f };
29
+ export type { ClientLink as C, FriendlyClientOptions as F, HTTPPath as H, InferClientContext as I, NestedClient as N, ClientPromiseResult as a, ClientContext as b, ClientOptions as c, Client as d, ClientRest as e, HTTPMethod as f };
@@ -1,6 +1,16 @@
1
1
  import { Interceptor } from '@orpc/shared';
2
2
  import { StandardRequest, StandardLazyResponse } from '@orpc/standard-server';
3
- import { a as ClientContext, b as ClientOptions, C as ClientLink } from './client.87WXDX8t.js';
3
+ import { b as ClientContext, c as ClientOptions, C as ClientLink } from './client.BOYsZIRq.mjs';
4
+
5
+ interface StandardLinkPlugin<T extends ClientContext> {
6
+ order?: number;
7
+ init?(options: StandardLinkOptions<T>): void;
8
+ }
9
+ declare class CompositeStandardLinkPlugin<T extends ClientContext, TPlugin extends StandardLinkPlugin<T>> implements StandardLinkPlugin<T> {
10
+ protected readonly plugins: TPlugin[];
11
+ constructor(plugins?: readonly TPlugin[]);
12
+ init(options: StandardLinkOptions<T>): void;
13
+ }
4
14
 
5
15
  interface StandardLinkCodec<T extends ClientContext> {
6
16
  encode(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<StandardRequest>;
@@ -10,24 +20,19 @@ interface StandardLinkClient<T extends ClientContext> {
10
20
  call(request: StandardRequest, options: ClientOptions<T>, path: readonly string[], input: unknown): Promise<StandardLazyResponse>;
11
21
  }
12
22
 
13
- declare class InvalidEventIteratorRetryResponse extends Error {
23
+ interface StandardLinkInterceptorOptions<T extends ClientContext> extends ClientOptions<T> {
24
+ path: readonly string[];
25
+ input: unknown;
14
26
  }
15
- interface StandardLinkPlugin<T extends ClientContext> {
16
- init?(options: StandardLinkOptions<T>): void;
27
+ interface StandardLinkClientInterceptorOptions<T extends ClientContext> extends StandardLinkInterceptorOptions<T> {
28
+ request: StandardRequest;
17
29
  }
18
30
  interface StandardLinkOptions<T extends ClientContext> {
19
- interceptors?: Interceptor<{
20
- path: readonly string[];
21
- input: unknown;
22
- options: ClientOptions<T>;
23
- }, unknown, unknown>[];
24
- clientInterceptors?: Interceptor<{
25
- request: StandardRequest;
26
- }, StandardLazyResponse, unknown>[];
31
+ interceptors?: Interceptor<StandardLinkInterceptorOptions<T>, Promise<unknown>>[];
32
+ clientInterceptors?: Interceptor<StandardLinkClientInterceptorOptions<T>, Promise<StandardLazyResponse>>[];
27
33
  plugins?: StandardLinkPlugin<T>[];
28
34
  }
29
35
  declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
30
- #private;
31
36
  readonly codec: StandardLinkCodec<T>;
32
37
  readonly sender: StandardLinkClient<T>;
33
38
  private readonly interceptors;
@@ -36,4 +41,5 @@ declare class StandardLink<T extends ClientContext> implements ClientLink<T> {
36
41
  call(path: readonly string[], input: unknown, options: ClientOptions<T>): Promise<unknown>;
37
42
  }
38
43
 
39
- export { InvalidEventIteratorRetryResponse as I, type StandardLinkPlugin as S, type StandardLinkOptions as a, StandardLink as b, type StandardLinkCodec as c, type StandardLinkClient as d };
44
+ export { CompositeStandardLinkPlugin as C, StandardLink as d };
45
+ export type { StandardLinkClientInterceptorOptions as S, StandardLinkPlugin as a, StandardLinkOptions as b, StandardLinkInterceptorOptions as c, StandardLinkCodec as e, StandardLinkClient as f };