@orpc/shared 1.1.1 → 1.3.0

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.
package/README.md CHANGED
@@ -54,6 +54,7 @@ You can find the full documentation [here](https://orpc.unnoq.com).
54
54
  - [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Build your API contract.
55
55
  - [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build your API or implement API contract.
56
56
  - [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume your API on the client with type-safety.
57
+ - [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Deeply integrate oRPC with NestJS.
57
58
  - [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
58
59
  - [@orpc/react-query](https://www.npmjs.com/package/@orpc/react-query): Integration with [React Query](https://tanstack.com/query/latest/docs/framework/react/overview).
59
60
  - [@orpc/vue-query](https://www.npmjs.com/package/@orpc/vue-query): Integration with [Vue Query](https://tanstack.com/query/latest/docs/framework/vue/overview).
package/dist/index.d.mts CHANGED
@@ -10,11 +10,17 @@ declare function splitInHalf<T>(arr: readonly T[]): [T[], T[]];
10
10
 
11
11
  type AnyFunction = (...args: any[]) => any;
12
12
  declare function once<T extends () => any>(fn: T): () => ReturnType<T>;
13
+ declare function sequential<A extends any[], R>(fn: (...args: A) => Promise<R>): (...args: A) => Promise<R>;
13
14
 
14
15
  type OmitChainMethodDeep<T extends object, K extends keyof any> = {
15
16
  [P in keyof Omit<T, K>]: T[P] extends AnyFunction ? ((...args: Parameters<T[P]>) => OmitChainMethodDeep<ReturnType<T[P]>, K>) : T[P];
16
17
  };
17
18
 
19
+ declare class SequentialIdGenerator {
20
+ private nextId;
21
+ generate(): number;
22
+ }
23
+
18
24
  type SetOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
19
25
  type IntersectPick<T, U> = Pick<T, keyof T & keyof U>;
20
26
  type PromiseWithError<T, TError> = Promise<T> & {
@@ -34,10 +40,10 @@ type ThrowableError = Registry extends {
34
40
  } ? T : Error;
35
41
 
36
42
  type InterceptableOptions = Record<string, any>;
37
- type InterceptorOptions<TOptions extends InterceptableOptions, TResult, TError> = Omit<TOptions, 'next'> & {
38
- next(options?: TOptions): PromiseWithError<TResult, TError>;
43
+ type InterceptorOptions<TOptions extends InterceptableOptions, TResult> = Omit<TOptions, 'next'> & {
44
+ next(options?: TOptions): TResult;
39
45
  };
40
- type Interceptor<TOptions extends InterceptableOptions, TResult, TError> = (options: InterceptorOptions<TOptions, TResult, TError>) => Promisable<TResult>;
46
+ type Interceptor<TOptions extends InterceptableOptions, TResult> = (options: InterceptorOptions<TOptions, TResult>) => TResult;
41
47
  /**
42
48
  * Can used for interceptors or middlewares
43
49
  */
@@ -63,9 +69,13 @@ type OnFinishState<TResult, TError> = [error: TError, data: undefined, isSuccess
63
69
  declare function onFinish<T, TOptions extends {
64
70
  next(): any;
65
71
  }, TRest extends any[]>(callback: NoInfer<(state: OnFinishState<Awaited<ReturnType<TOptions['next']>>, ReturnType<TOptions['next']> extends PromiseWithError<any, infer E> ? E : ThrowableError>, options: TOptions, ...rest: TRest) => Promisable<void>>): (options: TOptions, ...rest: TRest) => T | Promise<Awaited<ReturnType<TOptions['next']>>>;
66
- declare function intercept<TOptions extends InterceptableOptions, TResult, TError>(interceptors: Interceptor<TOptions, TResult, TError>[], options: NoInfer<TOptions>, main: NoInfer<(options: TOptions) => Promisable<TResult>>): Promise<TResult>;
72
+ declare function intercept<TOptions extends InterceptableOptions, TResult>(interceptors: Interceptor<TOptions, TResult>[], options: NoInfer<TOptions>, main: NoInfer<(options: TOptions) => TResult>): TResult;
67
73
 
68
74
  declare function isAsyncIteratorObject(maybe: unknown): maybe is AsyncIteratorObject<any, any, any>;
75
+ interface CreateAsyncIteratorObjectCleanupFn {
76
+ (reason: 'return' | 'throw' | 'next' | 'dispose'): Promise<void>;
77
+ }
78
+ declare function createAsyncIteratorObject<T, TReturn, TNext>(next: () => Promise<IteratorResult<T, TReturn>>, cleanup: CreateAsyncIteratorObjectCleanupFn): AsyncIteratorObject<T, TReturn, TNext> & AsyncGenerator<T, TReturn, TNext>;
69
79
 
70
80
  declare function parseEmptyableJSON(text: string | null | undefined): unknown;
71
81
  declare function stringifyJSON<T>(value: T): undefined extends T ? undefined | string : string;
@@ -85,9 +95,27 @@ declare function isObject(value: unknown): value is Record<PropertyKey, unknown>
85
95
  declare function isTypescriptObject(value: unknown): value is object & Record<PropertyKey, unknown>;
86
96
  declare function clone<T>(value: T): T;
87
97
  declare function get(object: object, path: readonly string[]): unknown;
98
+ declare function isPropertyKey(value: unknown): value is PropertyKey;
99
+
100
+ interface AsyncIdQueueCloseOptions {
101
+ id?: number;
102
+ reason?: Error;
103
+ }
104
+ declare class AsyncIdQueue<T> {
105
+ private readonly openIds;
106
+ private readonly items;
107
+ private readonly pendingPulls;
108
+ get length(): number;
109
+ open(id: number): void;
110
+ isOpen(id: number): boolean;
111
+ push(id: number, item: T): void;
112
+ pull(id: number): Promise<T>;
113
+ close({ id, reason }?: AsyncIdQueueCloseOptions): void;
114
+ assertOpen(id: number): void;
115
+ }
88
116
 
89
- type Value<T, TArgs extends any[] = []> = T | ((...args: TArgs) => Promisable<T>);
90
- declare function value<T, TArgs extends any[]>(value: Value<T, TArgs>, ...args: NoInfer<TArgs>): Promise<T extends Value<infer U, any> ? U : never>;
117
+ type Value<T, TArgs extends any[] = []> = T | ((...args: TArgs) => T);
118
+ declare function value<T, TArgs extends any[]>(value: Value<T, TArgs>, ...args: NoInfer<TArgs>): T extends Value<infer U, any> ? U : never;
91
119
 
92
- export { clone, findDeepMatches, get, intercept, isAsyncIteratorObject, isObject, isTypescriptObject, onError, onFinish, onStart, onSuccess, once, parseEmptyableJSON, resolveMaybeOptionalOptions, splitInHalf, stringifyJSON, toArray, value };
93
- export type { AnyFunction, InterceptableOptions, Interceptor, InterceptorOptions, IntersectPick, MaybeOptionalOptions, OmitChainMethodDeep, OnFinishState, PromiseWithError, Registry, Segment, SetOptional, ThrowableError, Value };
120
+ export { AsyncIdQueue, SequentialIdGenerator, clone, createAsyncIteratorObject, findDeepMatches, get, intercept, isAsyncIteratorObject, isObject, isPropertyKey, isTypescriptObject, onError, onFinish, onStart, onSuccess, once, parseEmptyableJSON, resolveMaybeOptionalOptions, sequential, splitInHalf, stringifyJSON, toArray, value };
121
+ export type { AnyFunction, AsyncIdQueueCloseOptions, CreateAsyncIteratorObjectCleanupFn, InterceptableOptions, Interceptor, InterceptorOptions, IntersectPick, MaybeOptionalOptions, OmitChainMethodDeep, OnFinishState, PromiseWithError, Registry, Segment, SetOptional, ThrowableError, Value };
package/dist/index.d.ts CHANGED
@@ -10,11 +10,17 @@ declare function splitInHalf<T>(arr: readonly T[]): [T[], T[]];
10
10
 
11
11
  type AnyFunction = (...args: any[]) => any;
12
12
  declare function once<T extends () => any>(fn: T): () => ReturnType<T>;
13
+ declare function sequential<A extends any[], R>(fn: (...args: A) => Promise<R>): (...args: A) => Promise<R>;
13
14
 
14
15
  type OmitChainMethodDeep<T extends object, K extends keyof any> = {
15
16
  [P in keyof Omit<T, K>]: T[P] extends AnyFunction ? ((...args: Parameters<T[P]>) => OmitChainMethodDeep<ReturnType<T[P]>, K>) : T[P];
16
17
  };
17
18
 
19
+ declare class SequentialIdGenerator {
20
+ private nextId;
21
+ generate(): number;
22
+ }
23
+
18
24
  type SetOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
19
25
  type IntersectPick<T, U> = Pick<T, keyof T & keyof U>;
20
26
  type PromiseWithError<T, TError> = Promise<T> & {
@@ -34,10 +40,10 @@ type ThrowableError = Registry extends {
34
40
  } ? T : Error;
35
41
 
36
42
  type InterceptableOptions = Record<string, any>;
37
- type InterceptorOptions<TOptions extends InterceptableOptions, TResult, TError> = Omit<TOptions, 'next'> & {
38
- next(options?: TOptions): PromiseWithError<TResult, TError>;
43
+ type InterceptorOptions<TOptions extends InterceptableOptions, TResult> = Omit<TOptions, 'next'> & {
44
+ next(options?: TOptions): TResult;
39
45
  };
40
- type Interceptor<TOptions extends InterceptableOptions, TResult, TError> = (options: InterceptorOptions<TOptions, TResult, TError>) => Promisable<TResult>;
46
+ type Interceptor<TOptions extends InterceptableOptions, TResult> = (options: InterceptorOptions<TOptions, TResult>) => TResult;
41
47
  /**
42
48
  * Can used for interceptors or middlewares
43
49
  */
@@ -63,9 +69,13 @@ type OnFinishState<TResult, TError> = [error: TError, data: undefined, isSuccess
63
69
  declare function onFinish<T, TOptions extends {
64
70
  next(): any;
65
71
  }, TRest extends any[]>(callback: NoInfer<(state: OnFinishState<Awaited<ReturnType<TOptions['next']>>, ReturnType<TOptions['next']> extends PromiseWithError<any, infer E> ? E : ThrowableError>, options: TOptions, ...rest: TRest) => Promisable<void>>): (options: TOptions, ...rest: TRest) => T | Promise<Awaited<ReturnType<TOptions['next']>>>;
66
- declare function intercept<TOptions extends InterceptableOptions, TResult, TError>(interceptors: Interceptor<TOptions, TResult, TError>[], options: NoInfer<TOptions>, main: NoInfer<(options: TOptions) => Promisable<TResult>>): Promise<TResult>;
72
+ declare function intercept<TOptions extends InterceptableOptions, TResult>(interceptors: Interceptor<TOptions, TResult>[], options: NoInfer<TOptions>, main: NoInfer<(options: TOptions) => TResult>): TResult;
67
73
 
68
74
  declare function isAsyncIteratorObject(maybe: unknown): maybe is AsyncIteratorObject<any, any, any>;
75
+ interface CreateAsyncIteratorObjectCleanupFn {
76
+ (reason: 'return' | 'throw' | 'next' | 'dispose'): Promise<void>;
77
+ }
78
+ declare function createAsyncIteratorObject<T, TReturn, TNext>(next: () => Promise<IteratorResult<T, TReturn>>, cleanup: CreateAsyncIteratorObjectCleanupFn): AsyncIteratorObject<T, TReturn, TNext> & AsyncGenerator<T, TReturn, TNext>;
69
79
 
70
80
  declare function parseEmptyableJSON(text: string | null | undefined): unknown;
71
81
  declare function stringifyJSON<T>(value: T): undefined extends T ? undefined | string : string;
@@ -85,9 +95,27 @@ declare function isObject(value: unknown): value is Record<PropertyKey, unknown>
85
95
  declare function isTypescriptObject(value: unknown): value is object & Record<PropertyKey, unknown>;
86
96
  declare function clone<T>(value: T): T;
87
97
  declare function get(object: object, path: readonly string[]): unknown;
98
+ declare function isPropertyKey(value: unknown): value is PropertyKey;
99
+
100
+ interface AsyncIdQueueCloseOptions {
101
+ id?: number;
102
+ reason?: Error;
103
+ }
104
+ declare class AsyncIdQueue<T> {
105
+ private readonly openIds;
106
+ private readonly items;
107
+ private readonly pendingPulls;
108
+ get length(): number;
109
+ open(id: number): void;
110
+ isOpen(id: number): boolean;
111
+ push(id: number, item: T): void;
112
+ pull(id: number): Promise<T>;
113
+ close({ id, reason }?: AsyncIdQueueCloseOptions): void;
114
+ assertOpen(id: number): void;
115
+ }
88
116
 
89
- type Value<T, TArgs extends any[] = []> = T | ((...args: TArgs) => Promisable<T>);
90
- declare function value<T, TArgs extends any[]>(value: Value<T, TArgs>, ...args: NoInfer<TArgs>): Promise<T extends Value<infer U, any> ? U : never>;
117
+ type Value<T, TArgs extends any[] = []> = T | ((...args: TArgs) => T);
118
+ declare function value<T, TArgs extends any[]>(value: Value<T, TArgs>, ...args: NoInfer<TArgs>): T extends Value<infer U, any> ? U : never;
91
119
 
92
- export { clone, findDeepMatches, get, intercept, isAsyncIteratorObject, isObject, isTypescriptObject, onError, onFinish, onStart, onSuccess, once, parseEmptyableJSON, resolveMaybeOptionalOptions, splitInHalf, stringifyJSON, toArray, value };
93
- export type { AnyFunction, InterceptableOptions, Interceptor, InterceptorOptions, IntersectPick, MaybeOptionalOptions, OmitChainMethodDeep, OnFinishState, PromiseWithError, Registry, Segment, SetOptional, ThrowableError, Value };
120
+ export { AsyncIdQueue, SequentialIdGenerator, clone, createAsyncIteratorObject, findDeepMatches, get, intercept, isAsyncIteratorObject, isObject, isPropertyKey, isTypescriptObject, onError, onFinish, onStart, onSuccess, once, parseEmptyableJSON, resolveMaybeOptionalOptions, sequential, splitInHalf, stringifyJSON, toArray, value };
121
+ export type { AnyFunction, AsyncIdQueueCloseOptions, CreateAsyncIteratorObjectCleanupFn, InterceptableOptions, Interceptor, InterceptorOptions, IntersectPick, MaybeOptionalOptions, OmitChainMethodDeep, OnFinishState, PromiseWithError, Registry, Segment, SetOptional, ThrowableError, Value };
package/dist/index.mjs CHANGED
@@ -23,6 +23,26 @@ function once(fn) {
23
23
  return result;
24
24
  };
25
25
  }
26
+ function sequential(fn) {
27
+ let lastOperationPromise = Promise.resolve();
28
+ return (...args) => {
29
+ return lastOperationPromise = lastOperationPromise.catch(() => {
30
+ }).then(() => {
31
+ return fn(...args);
32
+ });
33
+ };
34
+ }
35
+
36
+ class SequentialIdGenerator {
37
+ nextId = 0;
38
+ generate() {
39
+ if (this.nextId === Number.MAX_SAFE_INTEGER) {
40
+ this.nextId = 0;
41
+ return Number.MAX_SAFE_INTEGER;
42
+ }
43
+ return this.nextId++;
44
+ }
45
+ }
26
46
 
27
47
  function onStart(callback) {
28
48
  return async (options, ...rest) => {
@@ -62,13 +82,13 @@ function onFinish(callback) {
62
82
  }
63
83
  };
64
84
  }
65
- async function intercept(interceptors, options, main) {
66
- const next = async (options2, index) => {
85
+ function intercept(interceptors, options, main) {
86
+ const next = (options2, index) => {
67
87
  const interceptor = interceptors[index];
68
88
  if (!interceptor) {
69
- return await main(options2);
89
+ return main(options2);
70
90
  }
71
- return await interceptor({
91
+ return interceptor({
72
92
  ...options2,
73
93
  next: (newOptions = options2) => next(newOptions, index + 1)
74
94
  });
@@ -82,6 +102,62 @@ function isAsyncIteratorObject(maybe) {
82
102
  }
83
103
  return Symbol.asyncIterator in maybe && typeof maybe[Symbol.asyncIterator] === "function";
84
104
  }
105
+ function createAsyncIteratorObject(next, cleanup) {
106
+ let isExecuteComplete = false;
107
+ let isDone = false;
108
+ const iterator = {
109
+ next: sequential(async () => {
110
+ if (isDone) {
111
+ return { done: true, value: void 0 };
112
+ }
113
+ try {
114
+ const result = await next();
115
+ if (result.done) {
116
+ isDone = true;
117
+ }
118
+ return result;
119
+ } catch (err) {
120
+ isDone = true;
121
+ throw err;
122
+ } finally {
123
+ if (isDone && !isExecuteComplete) {
124
+ isExecuteComplete = true;
125
+ await cleanup("next");
126
+ }
127
+ }
128
+ }),
129
+ async return(value) {
130
+ isDone = true;
131
+ if (!isExecuteComplete) {
132
+ isExecuteComplete = true;
133
+ await cleanup("return");
134
+ }
135
+ return { done: true, value };
136
+ },
137
+ async throw(err) {
138
+ isDone = true;
139
+ if (!isExecuteComplete) {
140
+ isExecuteComplete = true;
141
+ await cleanup("throw");
142
+ }
143
+ throw err;
144
+ },
145
+ /**
146
+ * asyncDispose symbol only available in esnext, we should fallback to Symbol.for('asyncDispose')
147
+ */
148
+ async [Symbol.asyncDispose ?? Symbol.for("asyncDispose")]() {
149
+ isDone = true;
150
+ if (!isExecuteComplete) {
151
+ isExecuteComplete = true;
152
+ await cleanup("dispose");
153
+ }
154
+ },
155
+ [Symbol.asyncIterator]() {
156
+ return iterator;
157
+ }
158
+ };
159
+ return iterator;
160
+ }
85
161
 
86
162
  function parseEmptyableJSON(text) {
87
163
  if (!text) {
@@ -141,6 +217,86 @@ function get(object, path) {
141
217
  }
142
218
  return current;
143
219
  }
220
+ function isPropertyKey(value) {
221
+ const type = typeof value;
222
+ return type === "string" || type === "number" || type === "symbol";
223
+ }
224
+
225
+ class AsyncIdQueue {
226
+ openIds = /* @__PURE__ */ new Set();
227
+ items = /* @__PURE__ */ new Map();
228
+ pendingPulls = /* @__PURE__ */ new Map();
229
+ get length() {
230
+ return this.openIds.size;
231
+ }
232
+ open(id) {
233
+ this.openIds.add(id);
234
+ }
235
+ isOpen(id) {
236
+ return this.openIds.has(id);
237
+ }
238
+ push(id, item) {
239
+ this.assertOpen(id);
240
+ const pending = this.pendingPulls.get(id);
241
+ if (pending?.length) {
242
+ pending.shift()[0](item);
243
+ if (pending.length === 0) {
244
+ this.pendingPulls.delete(id);
245
+ }
246
+ } else {
247
+ const items = this.items.get(id);
248
+ if (items) {
249
+ items.push(item);
250
+ } else {
251
+ this.items.set(id, [item]);
252
+ }
253
+ }
254
+ }
255
+ async pull(id) {
256
+ this.assertOpen(id);
257
+ const items = this.items.get(id);
258
+ if (items?.length) {
259
+ const item = items.shift();
260
+ if (items.length === 0) {
261
+ this.items.delete(id);
262
+ }
263
+ return item;
264
+ }
265
+ return new Promise((resolve, reject) => {
266
+ const waitingPulls = this.pendingPulls.get(id);
267
+ const pending = [resolve, reject];
268
+ if (waitingPulls) {
269
+ waitingPulls.push(pending);
270
+ } else {
271
+ this.pendingPulls.set(id, [pending]);
272
+ }
273
+ });
274
+ }
275
+ close({ id, reason } = {}) {
276
+ if (id === void 0) {
277
+ this.pendingPulls.forEach((pendingPulls, id2) => {
278
+ pendingPulls.forEach(([, reject]) => {
279
+ reject(reason ?? new Error(`[AsyncIdQueue] Queue[${id2}] was closed or aborted while waiting for pulling.`));
280
+ });
281
+ });
282
+ this.pendingPulls.clear();
283
+ this.openIds.clear();
284
+ this.items.clear();
285
+ return;
286
+ }
287
+ this.pendingPulls.get(id)?.forEach(([, reject]) => {
288
+ reject(reason ?? new Error(`[AsyncIdQueue] Queue[${id}] was closed or aborted while waiting for pulling.`));
289
+ });
290
+ this.pendingPulls.delete(id);
291
+ this.openIds.delete(id);
292
+ this.items.delete(id);
293
+ }
294
+ assertOpen(id) {
295
+ if (!this.isOpen(id)) {
296
+ throw new Error(`[AsyncIdQueue] Cannot access queue[${id}] because it is not open or aborted.`);
297
+ }
298
+ }
299
+ }
144
300
 
145
301
  function value(value2, ...args) {
146
302
  if (typeof value2 === "function") {
@@ -149,4 +305,4 @@ function value(value2, ...args) {
149
305
  return value2;
150
306
  }
151
307
 
152
- export { clone, findDeepMatches, get, intercept, isAsyncIteratorObject, isObject, isTypescriptObject, onError, onFinish, onStart, onSuccess, once, parseEmptyableJSON, resolveMaybeOptionalOptions, splitInHalf, stringifyJSON, toArray, value };
308
+ export { AsyncIdQueue, SequentialIdGenerator, clone, createAsyncIteratorObject, findDeepMatches, get, intercept, isAsyncIteratorObject, isObject, isPropertyKey, isTypescriptObject, onError, onFinish, onStart, onSuccess, once, parseEmptyableJSON, resolveMaybeOptionalOptions, sequential, splitInHalf, stringifyJSON, toArray, value };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@orpc/shared",
3
3
  "type": "module",
4
- "version": "1.1.1",
4
+ "version": "1.3.0",
5
5
  "license": "MIT",
6
6
  "homepage": "https://orpc.unnoq.com",
7
7
  "repository": {