@orpc/trpc 2.0.0-beta.47 → 2.0.0-beta.49
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 +6 -7
- package/dist/index.d.ts +2 -52
- package/dist/index.js +2 -0
- package/dist/to-orpc-router.d.ts +16 -0
- package/dist/to-orpc-router.js +125 -0
- package/dist/to-trpc-meta.d.ts +31 -0
- package/dist/to-trpc-meta.js +34 -0
- package/package.json +30 -32
- package/dist/index.d.mts +0 -52
- package/dist/index.mjs +0 -105
package/README.md
CHANGED
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
<img alt="codecov" src="https://codecov.io/gh/middleapi/orpc/branch/main/graph/badge.svg">
|
|
6
6
|
</a>
|
|
7
7
|
<a href="https://www.npmjs.com/package/@orpc/trpc">
|
|
8
|
-
<img alt="
|
|
8
|
+
<img alt="monthly downloads" src="https://img.shields.io/npm/dm/%40orpc%2Ftrpc?logo=npm" />
|
|
9
9
|
</a>
|
|
10
10
|
<a href="https://app.codspeed.io/middleapi/orpc?utm_source=badge">
|
|
11
11
|
<img alt="CodSpeed" src="https://img.shields.io/endpoint?url=https://codspeed.io/badge.json" />
|
|
@@ -41,10 +41,11 @@ export const router = {
|
|
|
41
41
|
Then call them from a client that knows every input and output, without generating anything:
|
|
42
42
|
|
|
43
43
|
```ts
|
|
44
|
-
import type { RouterClient } from '@orpc/server'
|
|
45
|
-
import type { router } from './router'
|
|
46
44
|
import { createORPCClient } from '@orpc/client'
|
|
47
45
|
import { RPCLink } from '@orpc/client/fetch'
|
|
46
|
+
import type { RouterClient } from '@orpc/server'
|
|
47
|
+
|
|
48
|
+
import type { router } from './router'
|
|
48
49
|
|
|
49
50
|
const link = new RPCLink({ origin: 'http://localhost:3000', url: '/rpc' })
|
|
50
51
|
const client: RouterClient<typeof router> = createORPCClient(link)
|
|
@@ -191,15 +192,14 @@ Like what we build over at [middleapi](https://github.com/middleapi)? You can he
|
|
|
191
192
|
<td align="center"><a href="https://kellychan.im/?ref=middleapi&utm_source=middleapi&utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Kelly Peilin Chan"><img src="https://avatars.githubusercontent.com/u/520852?u=6b0f7105f694e7b5cacf410a3f04c7044b469dc8&v=4" width="139" alt="Kelly Peilin Chan"/><br />Kelly Peilin Chan</a></td>
|
|
192
193
|
<td align="center"><a href="https://guyariely.com/?ref=middleapi&utm_source=middleapi&utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Guy Ariely"><img src="https://avatars.githubusercontent.com/u/42813496?u=edb6b7f563bf28e160a290832e7da57c0506f8ca&v=4" width="139" alt="Guy Ariely"/><br />Guy Ariely</a></td>
|
|
193
194
|
<td align="center"><a href="https://paulsenon.com/?ref=middleapi&utm_source=middleapi&utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="PaulSenon"><img src="https://avatars.githubusercontent.com/u/19531087?u=6385741eb91d200b8c513ec6045482e301767ca6&v=4" width="139" alt="PaulSenon"/><br />PaulSenon</a></td>
|
|
194
|
-
<td align="center"><a href="https://
|
|
195
|
+
<td align="center"><a href="https://piscis.dev/?ref=middleapi&utm_source=middleapi&utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Alex"><img src="https://avatars.githubusercontent.com/u/326163?u=b245f368bd940cf51d08c0b6bf55f8257f359437&v=4" width="139" alt="Alex"/><br />Alex</a></td>
|
|
195
196
|
</tr>
|
|
196
197
|
<tr>
|
|
197
|
-
<td align="center"><a href="https://piscis.dev/?ref=middleapi&utm_source=middleapi&utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Alex"><img src="https://avatars.githubusercontent.com/u/326163?u=b245f368bd940cf51d08c0b6bf55f8257f359437&v=4" width="139" alt="Alex"/><br />Alex</a></td>
|
|
198
198
|
<td align="center"><a href="https://opensource.gubanov.eu/?ref=middleapi&utm_source=middleapi&utm_medium=sponsor" target="_blank" rel="noopener sponsored" title="Andrey Gubanov"><img src="https://avatars.githubusercontent.com/u/1082083?u=c5f2daf7ebece498e85c83367bb37b4e10e2649d&v=4" width="139" alt="Andrey Gubanov"/><br />Andrey Gubanov</a></td>
|
|
199
199
|
</tr>
|
|
200
200
|
</table>
|
|
201
201
|
|
|
202
|
-
With thanks to [
|
|
202
|
+
With thanks to [40 past sponsors](https://orpc.dev/sponsors#past-sponsors) who helped get oRPC here.
|
|
203
203
|
|
|
204
204
|
## Open Source Programs
|
|
205
205
|
|
|
@@ -209,7 +209,6 @@ With thanks to [39 past sponsors](https://orpc.dev/sponsors#past-sponsors) who h
|
|
|
209
209
|
<tr>
|
|
210
210
|
<td align="center"><a href="https://claude.com/contact-sales/claude-for-oss" target="_blank" rel="noopener" title="Claude for Open Source"><img src="https://cdn.simpleicons.org/claude" width="64" alt="Claude"/><br />Claude</a></td>
|
|
211
211
|
<td align="center"><a href="https://pullfrog.com/for-oss" target="_blank" rel="noopener" title="Pullfrog for OSS"><img src="https://avatars.githubusercontent.com/in/1768019?s=128&v=4" width="64" alt="Pullfrog"/><br />Pullfrog</a></td>
|
|
212
|
-
<td align="center"><a href="https://macroscope.com/open-source" target="_blank" rel="noopener" title="Macroscope for Open Source"><img src="https://avatars.githubusercontent.com/in/900172?s=128&v=4" width="64" alt="Macroscope"/><br />Macroscope</a></td>
|
|
213
212
|
</tr>
|
|
214
213
|
</table>
|
|
215
214
|
|
package/dist/index.d.ts
CHANGED
|
@@ -1,52 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
import * as ORPC from '@orpc/server';
|
|
4
|
-
import { AnyMetaPlugin } from '@orpc/contract';
|
|
5
|
-
|
|
6
|
-
type ToORPCOutput<T> = T extends AsyncIterable<infer TData, infer TReturn, infer TNext> ? AsyncIteratorClass<TData, TReturn, TNext> : T;
|
|
7
|
-
type ToORPCRouterResult<TContext extends ORPC.Context, TRecord extends Record<string, any>> = {
|
|
8
|
-
[K in keyof TRecord]: TRecord[K] extends AnyProcedure ? ORPC.Procedure<TContext, object, ORPC.Schema<TRecord[K]['_def']['$types']['input'], unknown>, ORPC.Schema<unknown, ToORPCOutput<TRecord[K]['_def']['$types']['output']>>, object> : TRecord[K] extends Record<string, any> ? ToORPCRouterResult<TContext, TRecord[K]> : never;
|
|
9
|
-
};
|
|
10
|
-
/**
|
|
11
|
-
* Converts a tRPC router into an oRPC router that works with any oRPC feature.
|
|
12
|
-
*
|
|
13
|
-
* @remarks
|
|
14
|
-
* **Note**: tRPC Error Formatting is not supported — errors thrown by tRPC are wrapped in `ORPCError`.
|
|
15
|
-
*
|
|
16
|
-
* @see {@link https://orpc.dev/docs/integrations/trpc | tRPC Integration}
|
|
17
|
-
*/
|
|
18
|
-
declare function toORPCRouter<T extends AnyRouter>(router: T): ToORPCRouterResult<inferRouterContext<T>, T['_def']['record']>;
|
|
19
|
-
|
|
20
|
-
/**
|
|
21
|
-
* Resolve oRPC meta plugins into a plain meta object usable as tRPC meta.
|
|
22
|
-
*
|
|
23
|
-
* This simulates how oRPC builders apply meta plugins, so well-known plugins
|
|
24
|
-
* like `openapi` from `@orpc/openapi` can be used with tRPC builders.
|
|
25
|
-
*
|
|
26
|
-
* @remarks
|
|
27
|
-
* **Warning**: Chained tRPC `.meta` calls merge shallowly, so oRPC metadata merge logic
|
|
28
|
-
* (e.g. accumulating openapi `tags`) only works within a single `toTRPCMeta` call.
|
|
29
|
-
*
|
|
30
|
-
* @example
|
|
31
|
-
* ```ts
|
|
32
|
-
* const example = t.procedure
|
|
33
|
-
* .meta(toTRPCMeta(openapi({ path: '/hello' })))
|
|
34
|
-
* .query(() => 'Hello, World!')
|
|
35
|
-
*
|
|
36
|
-
* const merged = t.procedure
|
|
37
|
-
* .meta({
|
|
38
|
-
* ...toTRPCMeta(
|
|
39
|
-
* openapi({ path: '/hello' }),
|
|
40
|
-
* openapi({ method: 'POST' }),
|
|
41
|
-
* ),
|
|
42
|
-
* other: 'value',
|
|
43
|
-
* })
|
|
44
|
-
* .mutation(() => 'Hello, World!')
|
|
45
|
-
* ```
|
|
46
|
-
*
|
|
47
|
-
* @see {@link https://orpc.dev/docs/integrations/trpc | tRPC Integration}
|
|
48
|
-
*/
|
|
49
|
-
declare function toTRPCMeta(...plugins: AnyMetaPlugin[]): Record<string, any>;
|
|
50
|
-
|
|
51
|
-
export { toORPCRouter, toTRPCMeta };
|
|
52
|
-
export type { ToORPCOutput, ToORPCRouterResult };
|
|
1
|
+
export * from './to-orpc-router.ts';
|
|
2
|
+
export * from './to-trpc-meta.ts';
|
package/dist/index.js
ADDED
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import * as ORPC from '@orpc/server';
|
|
2
|
+
import type { AsyncIteratorClass } from '@orpc/shared';
|
|
3
|
+
import type { AnyProcedure, AnyRouter, inferRouterContext } from '@trpc/server';
|
|
4
|
+
export type ToORPCOutput<T> = T extends AsyncIterable<infer TData, infer TReturn, infer TNext> ? AsyncIteratorClass<TData, TReturn, TNext> : T;
|
|
5
|
+
export type ToORPCRouterResult<TContext extends ORPC.Context, TRecord extends Record<string, any>> = {
|
|
6
|
+
[K in keyof TRecord]: TRecord[K] extends AnyProcedure ? ORPC.Procedure<TContext, object, ORPC.Schema<TRecord[K]['_def']['$types']['input'], unknown>, ORPC.Schema<unknown, ToORPCOutput<TRecord[K]['_def']['$types']['output']>>, object> : TRecord[K] extends Record<string, any> ? ToORPCRouterResult<TContext, TRecord[K]> : never;
|
|
7
|
+
};
|
|
8
|
+
/**
|
|
9
|
+
* Converts a tRPC router into an oRPC router that works with any oRPC feature.
|
|
10
|
+
*
|
|
11
|
+
* @remarks
|
|
12
|
+
* **Note**: tRPC Error Formatting is not supported — errors thrown by tRPC are wrapped in `ORPCError`.
|
|
13
|
+
*
|
|
14
|
+
* @see {@link https://orpc.dev/docs/integrations/trpc | tRPC Integration}
|
|
15
|
+
*/
|
|
16
|
+
export declare function toORPCRouter<T extends AnyRouter>(router: T): ToORPCRouterResult<inferRouterContext<T>, T['_def']['record']>;
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
import * as ORPC from '@orpc/server';
|
|
2
|
+
import { isNonPrimitive, set, wrapAsyncIterator } from '@orpc/shared';
|
|
3
|
+
import { isTrackedEnvelope, TRPCError } from '@trpc/server';
|
|
4
|
+
import { isAsyncIterable, isObject } from '@trpc/server/unstable-core-do-not-import';
|
|
5
|
+
/**
|
|
6
|
+
* Converts a tRPC router into an oRPC router that works with any oRPC feature.
|
|
7
|
+
*
|
|
8
|
+
* @remarks
|
|
9
|
+
* **Note**: tRPC Error Formatting is not supported — errors thrown by tRPC are wrapped in `ORPCError`.
|
|
10
|
+
*
|
|
11
|
+
* @see {@link https://orpc.dev/docs/integrations/trpc | tRPC Integration}
|
|
12
|
+
*/
|
|
13
|
+
export function toORPCRouter(router) {
|
|
14
|
+
const result = recordToORPCRouterRecord(router._def.record);
|
|
15
|
+
for (const [key, item] of Object.entries(router._def.lazy)) {
|
|
16
|
+
set(result, key.split('.'), new ORPC.Lazy({
|
|
17
|
+
meta: {},
|
|
18
|
+
loader: async () => {
|
|
19
|
+
const router = await item.ref();
|
|
20
|
+
return { default: toORPCRouter(router) };
|
|
21
|
+
},
|
|
22
|
+
}));
|
|
23
|
+
}
|
|
24
|
+
return result;
|
|
25
|
+
}
|
|
26
|
+
function recordToORPCRouterRecord(records) {
|
|
27
|
+
const orpcRouter = {};
|
|
28
|
+
for (const key of Object.keys(records)) {
|
|
29
|
+
const item = records[key];
|
|
30
|
+
if (typeof item === 'function') {
|
|
31
|
+
orpcRouter[key] = toORPCProcedure(item);
|
|
32
|
+
}
|
|
33
|
+
else {
|
|
34
|
+
orpcRouter[key] = recordToORPCRouterRecord(item);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
return orpcRouter;
|
|
38
|
+
}
|
|
39
|
+
function toORPCProcedure(procedure) {
|
|
40
|
+
const inputSchema = toStandardSchema(procedure._def.inputs.at(-1));
|
|
41
|
+
const outputSchema = toStandardSchema(procedure._def.output);
|
|
42
|
+
const meta = (procedure._def.meta ?? {});
|
|
43
|
+
return new ORPC.Procedure({
|
|
44
|
+
errorMap: {},
|
|
45
|
+
meta,
|
|
46
|
+
// `.router` (and similar) rebuilds meta from its own meta + the procedure's meta plugins,
|
|
47
|
+
// so the tRPC meta must be a plugin too, otherwise it would be dropped.
|
|
48
|
+
metaPlugins: [toTRPCMetaPlugin(meta)],
|
|
49
|
+
orderedMiddlewares: [],
|
|
50
|
+
inputSchemas: inputSchema ? [inputSchema] : undefined,
|
|
51
|
+
outputSchemas: outputSchema ? [outputSchema] : undefined,
|
|
52
|
+
// tRPC procedure calling already validates the input/output
|
|
53
|
+
disableInputValidation: true,
|
|
54
|
+
disableOutputValidation: true,
|
|
55
|
+
handler: async ({ context, signal, path, input, lastEventId }) => {
|
|
56
|
+
try {
|
|
57
|
+
const trpcInput = lastEventId !== undefined && (input === undefined || isObject(input))
|
|
58
|
+
? { ...input, lastEventId }
|
|
59
|
+
: input;
|
|
60
|
+
const output = await procedure({
|
|
61
|
+
ctx: context,
|
|
62
|
+
signal,
|
|
63
|
+
path: path.join('.'),
|
|
64
|
+
type: procedure._def.type,
|
|
65
|
+
// Only the raw input: tRPC merges `input` into the parsed input, so passing it would keep keys the schema strips
|
|
66
|
+
getRawInput: async () => trpcInput,
|
|
67
|
+
// TODO: this should infer from context when using oRPC Batch Plugin
|
|
68
|
+
batchIndex: 0,
|
|
69
|
+
});
|
|
70
|
+
if (isAsyncIterable(output)) {
|
|
71
|
+
return wrapAsyncIterator(output[Symbol.asyncIterator](), {
|
|
72
|
+
mapResult: (result) => {
|
|
73
|
+
if (isTrackedEnvelope(result.value)) {
|
|
74
|
+
const [id, data] = result.value;
|
|
75
|
+
return {
|
|
76
|
+
done: result.done,
|
|
77
|
+
value: ORPC.withEventMeta({
|
|
78
|
+
id,
|
|
79
|
+
data,
|
|
80
|
+
}, {
|
|
81
|
+
id,
|
|
82
|
+
}),
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
return result;
|
|
86
|
+
},
|
|
87
|
+
mapError: toORPCError,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
return output;
|
|
91
|
+
}
|
|
92
|
+
catch (cause) {
|
|
93
|
+
throw toORPCError(cause);
|
|
94
|
+
}
|
|
95
|
+
},
|
|
96
|
+
});
|
|
97
|
+
}
|
|
98
|
+
/**
|
|
99
|
+
* Re-applies tRPC meta on top of the incoming meta, shallow merged like tRPC `.meta` calls.
|
|
100
|
+
*/
|
|
101
|
+
function toTRPCMetaPlugin(trpcMeta) {
|
|
102
|
+
return {
|
|
103
|
+
name: '~trpc',
|
|
104
|
+
init: (meta) => ({ ...meta, ...trpcMeta }),
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
function toORPCError(error) {
|
|
108
|
+
if (error instanceof TRPCError) {
|
|
109
|
+
return new ORPC.ORPCError(error.code, {
|
|
110
|
+
message: error.message,
|
|
111
|
+
cause: error,
|
|
112
|
+
});
|
|
113
|
+
}
|
|
114
|
+
return error;
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* Ensures the parser is a standard schema before exposing it to oRPC,
|
|
118
|
+
* so schemas remain usable for type inference and OpenAPI generation.
|
|
119
|
+
*/
|
|
120
|
+
function toStandardSchema(schema) {
|
|
121
|
+
if (!isNonPrimitive(schema) || !('~standard' in schema) || !isNonPrimitive(schema['~standard'])) {
|
|
122
|
+
return undefined;
|
|
123
|
+
}
|
|
124
|
+
return schema;
|
|
125
|
+
}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import type { AnyMetaPlugin } from '@orpc/contract';
|
|
2
|
+
/**
|
|
3
|
+
* Resolve oRPC meta plugins into a plain meta object usable as tRPC meta.
|
|
4
|
+
*
|
|
5
|
+
* This simulates how oRPC builders apply meta plugins, so well-known plugins
|
|
6
|
+
* like `openapi` from `@orpc/openapi` can be used with tRPC builders.
|
|
7
|
+
*
|
|
8
|
+
* @remarks
|
|
9
|
+
* **Warning**: Chained tRPC `.meta` calls merge shallowly, so oRPC metadata merge logic
|
|
10
|
+
* (e.g. accumulating openapi `tags`) only works within a single `toTRPCMeta` call.
|
|
11
|
+
*
|
|
12
|
+
* @example
|
|
13
|
+
* ```ts
|
|
14
|
+
* const example = t.procedure
|
|
15
|
+
* .meta(toTRPCMeta(openapi({ path: '/hello' })))
|
|
16
|
+
* .query(() => 'Hello, World!')
|
|
17
|
+
*
|
|
18
|
+
* const merged = t.procedure
|
|
19
|
+
* .meta({
|
|
20
|
+
* ...toTRPCMeta(
|
|
21
|
+
* openapi({ path: '/hello' }),
|
|
22
|
+
* openapi({ method: 'POST' }),
|
|
23
|
+
* ),
|
|
24
|
+
* other: 'value',
|
|
25
|
+
* })
|
|
26
|
+
* .mutation(() => 'Hello, World!')
|
|
27
|
+
* ```
|
|
28
|
+
*
|
|
29
|
+
* @see {@link https://orpc.dev/docs/integrations/trpc | tRPC Integration}
|
|
30
|
+
*/
|
|
31
|
+
export declare function toTRPCMeta(...plugins: AnyMetaPlugin[]): Record<string, any>;
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { resolveMetaPlugins } from '@orpc/contract';
|
|
2
|
+
/**
|
|
3
|
+
* Resolve oRPC meta plugins into a plain meta object usable as tRPC meta.
|
|
4
|
+
*
|
|
5
|
+
* This simulates how oRPC builders apply meta plugins, so well-known plugins
|
|
6
|
+
* like `openapi` from `@orpc/openapi` can be used with tRPC builders.
|
|
7
|
+
*
|
|
8
|
+
* @remarks
|
|
9
|
+
* **Warning**: Chained tRPC `.meta` calls merge shallowly, so oRPC metadata merge logic
|
|
10
|
+
* (e.g. accumulating openapi `tags`) only works within a single `toTRPCMeta` call.
|
|
11
|
+
*
|
|
12
|
+
* @example
|
|
13
|
+
* ```ts
|
|
14
|
+
* const example = t.procedure
|
|
15
|
+
* .meta(toTRPCMeta(openapi({ path: '/hello' })))
|
|
16
|
+
* .query(() => 'Hello, World!')
|
|
17
|
+
*
|
|
18
|
+
* const merged = t.procedure
|
|
19
|
+
* .meta({
|
|
20
|
+
* ...toTRPCMeta(
|
|
21
|
+
* openapi({ path: '/hello' }),
|
|
22
|
+
* openapi({ method: 'POST' }),
|
|
23
|
+
* ),
|
|
24
|
+
* other: 'value',
|
|
25
|
+
* })
|
|
26
|
+
* .mutation(() => 'Hello, World!')
|
|
27
|
+
* ```
|
|
28
|
+
*
|
|
29
|
+
* @see {@link https://orpc.dev/docs/integrations/trpc | tRPC Integration}
|
|
30
|
+
*/
|
|
31
|
+
export function toTRPCMeta(...plugins) {
|
|
32
|
+
const [meta] = resolveMetaPlugins({}, undefined, plugins);
|
|
33
|
+
return meta;
|
|
34
|
+
}
|
package/package.json
CHANGED
|
@@ -1,55 +1,53 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@orpc/trpc",
|
|
3
|
-
"
|
|
4
|
-
"version": "2.0.0-beta.47",
|
|
3
|
+
"version": "2.0.0-beta.49",
|
|
5
4
|
"description": "tRPC interop for oRPC: reuse existing tRPC routers with oRPC clients and OpenAPI",
|
|
6
|
-
"
|
|
7
|
-
|
|
8
|
-
"
|
|
9
|
-
"
|
|
5
|
+
"keywords": [
|
|
6
|
+
"interop",
|
|
7
|
+
"migration",
|
|
8
|
+
"openapi",
|
|
9
|
+
"orpc",
|
|
10
|
+
"rpc",
|
|
11
|
+
"trpc",
|
|
12
|
+
"typesafe",
|
|
13
|
+
"typescript"
|
|
10
14
|
],
|
|
11
15
|
"homepage": "https://orpc.dev",
|
|
16
|
+
"license": "MIT",
|
|
12
17
|
"repository": {
|
|
13
18
|
"type": "git",
|
|
14
19
|
"url": "git+https://github.com/middleapi/orpc.git",
|
|
15
20
|
"directory": "packages/trpc"
|
|
16
21
|
},
|
|
17
|
-
"
|
|
18
|
-
"
|
|
19
|
-
"
|
|
20
|
-
"interop",
|
|
21
|
-
"migration",
|
|
22
|
-
"rpc",
|
|
23
|
-
"openapi",
|
|
24
|
-
"typescript",
|
|
25
|
-
"typesafe"
|
|
22
|
+
"funding": [
|
|
23
|
+
"https://github.com/sponsors/dinwwwh",
|
|
24
|
+
"https://opencollective.com/middleapi"
|
|
26
25
|
],
|
|
26
|
+
"files": [
|
|
27
|
+
"dist"
|
|
28
|
+
],
|
|
29
|
+
"type": "module",
|
|
27
30
|
"sideEffects": false,
|
|
28
31
|
"exports": {
|
|
29
32
|
"./package.json": "./package.json",
|
|
30
33
|
".": {
|
|
31
|
-
"types": "./dist/index.d.
|
|
32
|
-
"import": "./dist/index.
|
|
33
|
-
"default": "./dist/index.
|
|
34
|
+
"types": "./dist/index.d.ts",
|
|
35
|
+
"import": "./dist/index.js",
|
|
36
|
+
"default": "./dist/index.js"
|
|
34
37
|
}
|
|
35
38
|
},
|
|
36
|
-
"files": [
|
|
37
|
-
"dist"
|
|
38
|
-
],
|
|
39
|
-
"peerDependencies": {
|
|
40
|
-
"@trpc/server": ">=11.4.2"
|
|
41
|
-
},
|
|
42
39
|
"dependencies": {
|
|
43
|
-
"@orpc/contract": "2.0.0-beta.
|
|
44
|
-
"@orpc/server": "2.0.0-beta.
|
|
45
|
-
"@orpc/shared": "2.0.0-beta.
|
|
40
|
+
"@orpc/contract": "2.0.0-beta.49",
|
|
41
|
+
"@orpc/server": "2.0.0-beta.49",
|
|
42
|
+
"@orpc/shared": "2.0.0-beta.49"
|
|
46
43
|
},
|
|
47
44
|
"devDependencies": {
|
|
48
|
-
"@orpc/openapi": "2.0.0-beta.
|
|
49
|
-
"@trpc/server": "^11.
|
|
45
|
+
"@orpc/openapi": "2.0.0-beta.49",
|
|
46
|
+
"@trpc/server": "^11.23.0",
|
|
50
47
|
"zod": "^4.6.7"
|
|
51
48
|
},
|
|
52
|
-
"
|
|
53
|
-
"
|
|
54
|
-
}
|
|
49
|
+
"peerDependencies": {
|
|
50
|
+
"@trpc/server": ">=11.4.2"
|
|
51
|
+
},
|
|
52
|
+
"scripts": {}
|
|
55
53
|
}
|
package/dist/index.d.mts
DELETED
|
@@ -1,52 +0,0 @@
|
|
|
1
|
-
import { AsyncIteratorClass } from '@orpc/shared';
|
|
2
|
-
import { AnyProcedure, AnyRouter, inferRouterContext } from '@trpc/server';
|
|
3
|
-
import * as ORPC from '@orpc/server';
|
|
4
|
-
import { AnyMetaPlugin } from '@orpc/contract';
|
|
5
|
-
|
|
6
|
-
type ToORPCOutput<T> = T extends AsyncIterable<infer TData, infer TReturn, infer TNext> ? AsyncIteratorClass<TData, TReturn, TNext> : T;
|
|
7
|
-
type ToORPCRouterResult<TContext extends ORPC.Context, TRecord extends Record<string, any>> = {
|
|
8
|
-
[K in keyof TRecord]: TRecord[K] extends AnyProcedure ? ORPC.Procedure<TContext, object, ORPC.Schema<TRecord[K]['_def']['$types']['input'], unknown>, ORPC.Schema<unknown, ToORPCOutput<TRecord[K]['_def']['$types']['output']>>, object> : TRecord[K] extends Record<string, any> ? ToORPCRouterResult<TContext, TRecord[K]> : never;
|
|
9
|
-
};
|
|
10
|
-
/**
|
|
11
|
-
* Converts a tRPC router into an oRPC router that works with any oRPC feature.
|
|
12
|
-
*
|
|
13
|
-
* @remarks
|
|
14
|
-
* **Note**: tRPC Error Formatting is not supported — errors thrown by tRPC are wrapped in `ORPCError`.
|
|
15
|
-
*
|
|
16
|
-
* @see {@link https://orpc.dev/docs/integrations/trpc | tRPC Integration}
|
|
17
|
-
*/
|
|
18
|
-
declare function toORPCRouter<T extends AnyRouter>(router: T): ToORPCRouterResult<inferRouterContext<T>, T['_def']['record']>;
|
|
19
|
-
|
|
20
|
-
/**
|
|
21
|
-
* Resolve oRPC meta plugins into a plain meta object usable as tRPC meta.
|
|
22
|
-
*
|
|
23
|
-
* This simulates how oRPC builders apply meta plugins, so well-known plugins
|
|
24
|
-
* like `openapi` from `@orpc/openapi` can be used with tRPC builders.
|
|
25
|
-
*
|
|
26
|
-
* @remarks
|
|
27
|
-
* **Warning**: Chained tRPC `.meta` calls merge shallowly, so oRPC metadata merge logic
|
|
28
|
-
* (e.g. accumulating openapi `tags`) only works within a single `toTRPCMeta` call.
|
|
29
|
-
*
|
|
30
|
-
* @example
|
|
31
|
-
* ```ts
|
|
32
|
-
* const example = t.procedure
|
|
33
|
-
* .meta(toTRPCMeta(openapi({ path: '/hello' })))
|
|
34
|
-
* .query(() => 'Hello, World!')
|
|
35
|
-
*
|
|
36
|
-
* const merged = t.procedure
|
|
37
|
-
* .meta({
|
|
38
|
-
* ...toTRPCMeta(
|
|
39
|
-
* openapi({ path: '/hello' }),
|
|
40
|
-
* openapi({ method: 'POST' }),
|
|
41
|
-
* ),
|
|
42
|
-
* other: 'value',
|
|
43
|
-
* })
|
|
44
|
-
* .mutation(() => 'Hello, World!')
|
|
45
|
-
* ```
|
|
46
|
-
*
|
|
47
|
-
* @see {@link https://orpc.dev/docs/integrations/trpc | tRPC Integration}
|
|
48
|
-
*/
|
|
49
|
-
declare function toTRPCMeta(...plugins: AnyMetaPlugin[]): Record<string, any>;
|
|
50
|
-
|
|
51
|
-
export { toORPCRouter, toTRPCMeta };
|
|
52
|
-
export type { ToORPCOutput, ToORPCRouterResult };
|
package/dist/index.mjs
DELETED
|
@@ -1,105 +0,0 @@
|
|
|
1
|
-
import * as ORPC from '@orpc/server';
|
|
2
|
-
import { set, wrapAsyncIterator, isTypescriptObject } from '@orpc/shared';
|
|
3
|
-
import { isTrackedEnvelope, TRPCError } from '@trpc/server';
|
|
4
|
-
import { isObject, isAsyncIterable } from '@trpc/server/unstable-core-do-not-import';
|
|
5
|
-
import { resolveMetaPlugins } from '@orpc/contract';
|
|
6
|
-
|
|
7
|
-
function toORPCRouter(router) {
|
|
8
|
-
const result = recordToORPCRouterRecord(router._def.record);
|
|
9
|
-
for (const [key, item] of Object.entries(router._def.lazy)) {
|
|
10
|
-
set(result, key.split("."), new ORPC.Lazy({
|
|
11
|
-
meta: {},
|
|
12
|
-
loader: async () => {
|
|
13
|
-
const router2 = await item.ref();
|
|
14
|
-
return { default: toORPCRouter(router2) };
|
|
15
|
-
}
|
|
16
|
-
}));
|
|
17
|
-
}
|
|
18
|
-
return result;
|
|
19
|
-
}
|
|
20
|
-
function recordToORPCRouterRecord(records) {
|
|
21
|
-
const orpcRouter = {};
|
|
22
|
-
for (const key of Object.keys(records)) {
|
|
23
|
-
const item = records[key];
|
|
24
|
-
if (typeof item === "function") {
|
|
25
|
-
orpcRouter[key] = toORPCProcedure(item);
|
|
26
|
-
} else {
|
|
27
|
-
orpcRouter[key] = recordToORPCRouterRecord(item);
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
return orpcRouter;
|
|
31
|
-
}
|
|
32
|
-
function toORPCProcedure(procedure) {
|
|
33
|
-
const inputSchema = toStandardSchema(procedure._def.inputs.at(-1));
|
|
34
|
-
const outputSchema = toStandardSchema(procedure._def.output);
|
|
35
|
-
return new ORPC.Procedure({
|
|
36
|
-
errorMap: {},
|
|
37
|
-
meta: procedure._def.meta ?? {},
|
|
38
|
-
orderedMiddlewares: [],
|
|
39
|
-
inputSchemas: inputSchema ? [inputSchema] : void 0,
|
|
40
|
-
outputSchemas: outputSchema ? [outputSchema] : void 0,
|
|
41
|
-
// tRPC procedure calling already validates the input/output
|
|
42
|
-
disableInputValidation: true,
|
|
43
|
-
disableOutputValidation: true,
|
|
44
|
-
handler: async ({ context, signal, path, input, lastEventId }) => {
|
|
45
|
-
try {
|
|
46
|
-
const trpcInput = lastEventId !== void 0 && (input === void 0 || isObject(input)) ? { ...input, lastEventId } : input;
|
|
47
|
-
const output = await procedure({
|
|
48
|
-
ctx: context,
|
|
49
|
-
signal,
|
|
50
|
-
path: path.join("."),
|
|
51
|
-
type: procedure._def.type,
|
|
52
|
-
// Only the raw input: tRPC merges `input` into the parsed input, so passing it would keep keys the schema strips
|
|
53
|
-
getRawInput: async () => trpcInput,
|
|
54
|
-
// TODO: this should infer from context when using oRPC Batch Plugin
|
|
55
|
-
batchIndex: 0
|
|
56
|
-
});
|
|
57
|
-
if (isAsyncIterable(output)) {
|
|
58
|
-
return wrapAsyncIterator(output[Symbol.asyncIterator](), {
|
|
59
|
-
mapResult: (result) => {
|
|
60
|
-
if (isTrackedEnvelope(result.value)) {
|
|
61
|
-
const [id, data] = result.value;
|
|
62
|
-
return {
|
|
63
|
-
done: result.done,
|
|
64
|
-
value: ORPC.withEventMeta({
|
|
65
|
-
id,
|
|
66
|
-
data
|
|
67
|
-
}, {
|
|
68
|
-
id
|
|
69
|
-
})
|
|
70
|
-
};
|
|
71
|
-
}
|
|
72
|
-
return result;
|
|
73
|
-
},
|
|
74
|
-
mapError: toORPCError
|
|
75
|
-
});
|
|
76
|
-
}
|
|
77
|
-
return output;
|
|
78
|
-
} catch (cause) {
|
|
79
|
-
throw toORPCError(cause);
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
});
|
|
83
|
-
}
|
|
84
|
-
function toORPCError(error) {
|
|
85
|
-
if (error instanceof TRPCError) {
|
|
86
|
-
return new ORPC.ORPCError(error.code, {
|
|
87
|
-
message: error.message,
|
|
88
|
-
cause: error
|
|
89
|
-
});
|
|
90
|
-
}
|
|
91
|
-
return error;
|
|
92
|
-
}
|
|
93
|
-
function toStandardSchema(schema) {
|
|
94
|
-
if (!isTypescriptObject(schema) || !("~standard" in schema) || !isTypescriptObject(schema["~standard"])) {
|
|
95
|
-
return void 0;
|
|
96
|
-
}
|
|
97
|
-
return schema;
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
function toTRPCMeta(...plugins) {
|
|
101
|
-
const [meta] = resolveMetaPlugins({}, void 0, plugins);
|
|
102
|
-
return meta;
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
export { toORPCRouter, toTRPCMeta };
|