@orpc/server 0.37.0 → 0.39.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/dist/{chunk-BFGSRNYZ.js → chunk-DAUWED3D.js} +3 -3
- package/dist/chunk-N2FJGXSJ.js +32 -0
- package/dist/{chunk-XFBAK67J.js → chunk-XI6WGCB3.js} +2 -5
- package/dist/{chunk-EDQKEHUX.js → chunk-XP6YRLY2.js} +3 -2
- package/dist/fetch.js +6 -12
- package/dist/hono.js +6 -12
- package/dist/index.js +1 -1
- package/dist/next.js +6 -12
- package/dist/node.js +7 -146
- package/dist/plugins.js +1 -1
- package/dist/src/adapters/fetch/index.d.ts +0 -1
- package/dist/src/adapters/fetch/rpc-handler.d.ts +3 -2
- package/dist/src/adapters/fetch/types.d.ts +3 -2
- package/dist/src/adapters/hono/middleware.d.ts +2 -3
- package/dist/src/adapters/next/serve.d.ts +2 -3
- package/dist/src/adapters/node/index.d.ts +0 -1
- package/dist/src/adapters/node/rpc-handler.d.ts +3 -2
- package/dist/src/adapters/node/types.d.ts +3 -2
- package/dist/src/adapters/standard/handler.d.ts +7 -7
- package/dist/src/adapters/standard/rpc-codec.d.ts +2 -1
- package/dist/src/adapters/standard/types.d.ts +1 -25
- package/dist/src/implementer-procedure.d.ts +5 -4
- package/dist/src/middleware.d.ts +2 -3
- package/dist/src/procedure-client.d.ts +5 -6
- package/dist/src/procedure-decorated.d.ts +5 -4
- package/dist/src/procedure-utils.d.ts +3 -2
- package/dist/src/router-client.d.ts +6 -6
- package/dist/src/router.d.ts +1 -0
- package/dist/standard.js +3 -3
- package/package.json +6 -3
- package/dist/chunk-2OH4QMZ4.js +0 -145
- package/dist/src/adapters/fetch/utils.d.ts +0 -5
- package/dist/src/adapters/node/utils.d.ts +0 -5
@@ -6,10 +6,10 @@ import {
|
|
6
6
|
getRouterChild,
|
7
7
|
isProcedure,
|
8
8
|
unlazy
|
9
|
-
} from "./chunk-
|
9
|
+
} from "./chunk-XP6YRLY2.js";
|
10
10
|
import {
|
11
11
|
CompositePlugin
|
12
|
-
} from "./chunk-
|
12
|
+
} from "./chunk-XI6WGCB3.js";
|
13
13
|
|
14
14
|
// src/adapters/standard/handler.ts
|
15
15
|
import { toORPCError } from "@orpc/contract";
|
@@ -316,4 +316,4 @@ export {
|
|
316
316
|
RPCCodec,
|
317
317
|
RPCMatcher
|
318
318
|
};
|
319
|
-
//# sourceMappingURL=chunk-
|
319
|
+
//# sourceMappingURL=chunk-DAUWED3D.js.map
|
@@ -0,0 +1,32 @@
|
|
1
|
+
import {
|
2
|
+
RPCCodec,
|
3
|
+
RPCMatcher,
|
4
|
+
StandardHandler
|
5
|
+
} from "./chunk-DAUWED3D.js";
|
6
|
+
|
7
|
+
// src/adapters/fetch/rpc-handler.ts
|
8
|
+
import { toFetchResponse, toStandardRequest } from "@orpc/server-standard-fetch";
|
9
|
+
var RPCHandler = class {
|
10
|
+
standardHandler;
|
11
|
+
constructor(router, options) {
|
12
|
+
const matcher = options?.matcher ?? new RPCMatcher();
|
13
|
+
const codec = options?.codec ?? new RPCCodec();
|
14
|
+
this.standardHandler = new StandardHandler(router, matcher, codec, options);
|
15
|
+
}
|
16
|
+
async handle(request, ...rest) {
|
17
|
+
const standardRequest = toStandardRequest(request);
|
18
|
+
const result = await this.standardHandler.handle(standardRequest, ...rest);
|
19
|
+
if (!result.matched) {
|
20
|
+
return result;
|
21
|
+
}
|
22
|
+
return {
|
23
|
+
matched: true,
|
24
|
+
response: toFetchResponse(result.response)
|
25
|
+
};
|
26
|
+
}
|
27
|
+
};
|
28
|
+
|
29
|
+
export {
|
30
|
+
RPCHandler
|
31
|
+
};
|
32
|
+
//# sourceMappingURL=chunk-N2FJGXSJ.js.map
|
@@ -21,12 +21,9 @@ var CORSPlugin = class {
|
|
21
21
|
options;
|
22
22
|
constructor(options) {
|
23
23
|
const defaults = {
|
24
|
-
origin:
|
24
|
+
origin: (origin) => origin,
|
25
25
|
allowMethods: ["GET", "HEAD", "PUT", "POST", "DELETE", "PATCH"]
|
26
26
|
};
|
27
|
-
if (options?.credentials) {
|
28
|
-
defaults.origin = (origin) => origin;
|
29
|
-
}
|
30
27
|
this.options = {
|
31
28
|
...defaults,
|
32
29
|
...options
|
@@ -125,4 +122,4 @@ export {
|
|
125
122
|
CORSPlugin,
|
126
123
|
ResponseHeadersPlugin
|
127
124
|
};
|
128
|
-
//# sourceMappingURL=chunk-
|
125
|
+
//# sourceMappingURL=chunk-XI6WGCB3.js.map
|
@@ -68,7 +68,8 @@ function createProcedureClient(lazyableProcedure, ...[options]) {
|
|
68
68
|
return async (...[input, callerOptions]) => {
|
69
69
|
const path = options?.path ?? [];
|
70
70
|
const { default: procedure } = await unlazy(lazyableProcedure);
|
71
|
-
const
|
71
|
+
const clientContext = callerOptions?.context ?? {};
|
72
|
+
const context = await value(options?.context ?? {}, clientContext);
|
72
73
|
const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
|
73
74
|
try {
|
74
75
|
return await intercept(
|
@@ -374,4 +375,4 @@ export {
|
|
374
375
|
convertPathToHttpPath,
|
375
376
|
createContractedProcedure
|
376
377
|
};
|
377
|
-
//# sourceMappingURL=chunk-
|
378
|
+
//# sourceMappingURL=chunk-XP6YRLY2.js.map
|
package/dist/fetch.js
CHANGED
@@ -1,16 +1,10 @@
|
|
1
1
|
import {
|
2
|
-
RPCHandler
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
import "./chunk-BFGSRNYZ.js";
|
8
|
-
import "./chunk-EDQKEHUX.js";
|
9
|
-
import "./chunk-XFBAK67J.js";
|
2
|
+
RPCHandler
|
3
|
+
} from "./chunk-N2FJGXSJ.js";
|
4
|
+
import "./chunk-DAUWED3D.js";
|
5
|
+
import "./chunk-XP6YRLY2.js";
|
6
|
+
import "./chunk-XI6WGCB3.js";
|
10
7
|
export {
|
11
|
-
RPCHandler
|
12
|
-
fetchReToStandardBody,
|
13
|
-
fetchRequestToStandardRequest,
|
14
|
-
standardResponseToFetchResponse
|
8
|
+
RPCHandler
|
15
9
|
};
|
16
10
|
//# sourceMappingURL=fetch.js.map
|
package/dist/hono.js
CHANGED
@@ -1,12 +1,9 @@
|
|
1
1
|
import {
|
2
|
-
RPCHandler
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
import "./chunk-BFGSRNYZ.js";
|
8
|
-
import "./chunk-EDQKEHUX.js";
|
9
|
-
import "./chunk-XFBAK67J.js";
|
2
|
+
RPCHandler
|
3
|
+
} from "./chunk-N2FJGXSJ.js";
|
4
|
+
import "./chunk-DAUWED3D.js";
|
5
|
+
import "./chunk-XP6YRLY2.js";
|
6
|
+
import "./chunk-XI6WGCB3.js";
|
10
7
|
|
11
8
|
// src/adapters/hono/middleware.ts
|
12
9
|
import { value } from "@orpc/shared";
|
@@ -32,9 +29,6 @@ function createMiddleware(handler, ...[options]) {
|
|
32
29
|
}
|
33
30
|
export {
|
34
31
|
RPCHandler,
|
35
|
-
createMiddleware
|
36
|
-
fetchReToStandardBody,
|
37
|
-
fetchRequestToStandardRequest,
|
38
|
-
standardResponseToFetchResponse
|
32
|
+
createMiddleware
|
39
33
|
};
|
40
34
|
//# sourceMappingURL=hono.js.map
|
package/dist/index.js
CHANGED
@@ -21,7 +21,7 @@ import {
|
|
21
21
|
middlewareOutputFn,
|
22
22
|
setRouterContract,
|
23
23
|
unlazy
|
24
|
-
} from "./chunk-
|
24
|
+
} from "./chunk-XP6YRLY2.js";
|
25
25
|
|
26
26
|
// src/builder.ts
|
27
27
|
import { mergeErrorMap as mergeErrorMap2, mergeMeta as mergeMeta2, mergePrefix, mergeRoute as mergeRoute2, mergeTags } from "@orpc/contract";
|
package/dist/next.js
CHANGED
@@ -1,12 +1,9 @@
|
|
1
1
|
import {
|
2
|
-
RPCHandler
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
import "./chunk-BFGSRNYZ.js";
|
8
|
-
import "./chunk-EDQKEHUX.js";
|
9
|
-
import "./chunk-XFBAK67J.js";
|
2
|
+
RPCHandler
|
3
|
+
} from "./chunk-N2FJGXSJ.js";
|
4
|
+
import "./chunk-DAUWED3D.js";
|
5
|
+
import "./chunk-XP6YRLY2.js";
|
6
|
+
import "./chunk-XI6WGCB3.js";
|
10
7
|
|
11
8
|
// src/adapters/next/serve.ts
|
12
9
|
import { value } from "@orpc/shared";
|
@@ -29,9 +26,6 @@ function serve(handler, ...[options]) {
|
|
29
26
|
}
|
30
27
|
export {
|
31
28
|
RPCHandler,
|
32
|
-
|
33
|
-
fetchRequestToStandardRequest,
|
34
|
-
serve,
|
35
|
-
standardResponseToFetchResponse
|
29
|
+
serve
|
36
30
|
};
|
37
31
|
//# sourceMappingURL=next.js.map
|
package/dist/node.js
CHANGED
@@ -2,149 +2,12 @@ import {
|
|
2
2
|
RPCCodec,
|
3
3
|
RPCMatcher,
|
4
4
|
StandardHandler
|
5
|
-
} from "./chunk-
|
6
|
-
import "./chunk-
|
7
|
-
import "./chunk-
|
8
|
-
|
9
|
-
// src/adapters/node/utils.ts
|
10
|
-
import { Buffer, File } from "node:buffer";
|
11
|
-
import { Readable } from "node:stream";
|
12
|
-
import { once } from "@orpc/shared";
|
13
|
-
import { contentDisposition, parse as parseContentDisposition } from "@tinyhttp/content-disposition";
|
14
|
-
function nodeHttpToStandardRequest(req, res) {
|
15
|
-
const method = req.method ?? "GET";
|
16
|
-
const protocol = "encrypted" in req.socket && req.socket.encrypted ? "https:" : "http:";
|
17
|
-
const host = req.headers.host ?? "localhost";
|
18
|
-
const url = new URL(req.originalUrl ?? req.url ?? "/", `${protocol}//${host}`);
|
19
|
-
return {
|
20
|
-
raw: { request: req, response: res },
|
21
|
-
method,
|
22
|
-
url,
|
23
|
-
headers: req.headers,
|
24
|
-
body: once(() => {
|
25
|
-
return nodeHttpRequestToStandardBody(req);
|
26
|
-
}),
|
27
|
-
get signal() {
|
28
|
-
const signal = nodeHttpResponseToAbortSignal(res);
|
29
|
-
Object.defineProperty(this, "signal", { value: signal, writable: true });
|
30
|
-
return signal;
|
31
|
-
},
|
32
|
-
set signal(value) {
|
33
|
-
Object.defineProperty(this, "signal", { value, writable: true });
|
34
|
-
}
|
35
|
-
};
|
36
|
-
}
|
37
|
-
function nodeHttpResponseSendStandardResponse(res, standardResponse) {
|
38
|
-
return new Promise((resolve, reject) => {
|
39
|
-
res.on("error", reject);
|
40
|
-
res.on("finish", resolve);
|
41
|
-
const resHeaders = standardResponse.headers;
|
42
|
-
delete resHeaders["content-type"];
|
43
|
-
delete resHeaders["content-disposition"];
|
44
|
-
if (standardResponse.body === void 0) {
|
45
|
-
res.writeHead(standardResponse.status, standardResponse.headers);
|
46
|
-
res.end();
|
47
|
-
return;
|
48
|
-
}
|
49
|
-
if (standardResponse.body instanceof Blob) {
|
50
|
-
resHeaders["content-type"] = standardResponse.body.type;
|
51
|
-
resHeaders["content-length"] = standardResponse.body.size.toString();
|
52
|
-
resHeaders["content-disposition"] = contentDisposition(
|
53
|
-
standardResponse.body instanceof File ? standardResponse.body.name : "blob",
|
54
|
-
{ type: "inline" }
|
55
|
-
);
|
56
|
-
res.writeHead(standardResponse.status, resHeaders);
|
57
|
-
Readable.fromWeb(
|
58
|
-
standardResponse.body.stream()
|
59
|
-
// Conflict between types=node and lib=dom so we need to cast it
|
60
|
-
).pipe(res);
|
61
|
-
return;
|
62
|
-
}
|
63
|
-
if (standardResponse.body instanceof FormData) {
|
64
|
-
const response = new Response(standardResponse.body);
|
65
|
-
resHeaders["content-type"] = response.headers.get("content-type");
|
66
|
-
res.writeHead(standardResponse.status, resHeaders);
|
67
|
-
Readable.fromWeb(
|
68
|
-
response.body
|
69
|
-
// Conflict between types=node and lib=dom so we need to cast it
|
70
|
-
).pipe(res);
|
71
|
-
return;
|
72
|
-
}
|
73
|
-
if (standardResponse.body instanceof URLSearchParams) {
|
74
|
-
resHeaders["content-type"] = "application/x-www-form-urlencoded";
|
75
|
-
res.writeHead(standardResponse.status, resHeaders);
|
76
|
-
res.end(standardResponse.body.toString());
|
77
|
-
return;
|
78
|
-
}
|
79
|
-
resHeaders["content-type"] = "application/json";
|
80
|
-
res.writeHead(standardResponse.status, resHeaders);
|
81
|
-
res.end(JSON.stringify(standardResponse.body));
|
82
|
-
});
|
83
|
-
}
|
84
|
-
async function nodeHttpRequestToStandardBody(req) {
|
85
|
-
const method = req.method ?? "GET";
|
86
|
-
if (method === "GET" || method === "HEAD") {
|
87
|
-
return void 0;
|
88
|
-
}
|
89
|
-
const contentDisposition2 = req.headers["content-disposition"];
|
90
|
-
const contentType = req.headers["content-type"];
|
91
|
-
if (contentDisposition2) {
|
92
|
-
const fileName = parseContentDisposition(contentDisposition2).parameters.filename;
|
93
|
-
if (typeof fileName === "string") {
|
94
|
-
return await streamToFile(req, fileName, contentType || "application/octet-stream");
|
95
|
-
}
|
96
|
-
}
|
97
|
-
if (!contentType || contentType.startsWith("application/json")) {
|
98
|
-
const text = await streamToString(req);
|
99
|
-
if (!text) {
|
100
|
-
return void 0;
|
101
|
-
}
|
102
|
-
return JSON.parse(text);
|
103
|
-
}
|
104
|
-
if (contentType.startsWith("multipart/form-data")) {
|
105
|
-
return await streamToFormData(req, contentType);
|
106
|
-
}
|
107
|
-
if (contentType.startsWith("application/x-www-form-urlencoded")) {
|
108
|
-
const text = await streamToString(req);
|
109
|
-
return new URLSearchParams(text);
|
110
|
-
}
|
111
|
-
if (contentType.startsWith("text/")) {
|
112
|
-
return await streamToString(req);
|
113
|
-
}
|
114
|
-
return streamToFile(req, "blob", contentType);
|
115
|
-
}
|
116
|
-
function streamToFormData(stream, contentType) {
|
117
|
-
const response = new Response(stream, {
|
118
|
-
// Conflict between types=node and lib=dom so we need to cast it
|
119
|
-
headers: {
|
120
|
-
"content-type": contentType
|
121
|
-
}
|
122
|
-
});
|
123
|
-
return response.formData();
|
124
|
-
}
|
125
|
-
async function streamToString(stream) {
|
126
|
-
let string = "";
|
127
|
-
for await (const chunk of stream) {
|
128
|
-
string += chunk.toString();
|
129
|
-
}
|
130
|
-
return string;
|
131
|
-
}
|
132
|
-
async function streamToFile(stream, fileName, contentType) {
|
133
|
-
const chunks = [];
|
134
|
-
for await (const chunk of stream) {
|
135
|
-
chunks.push(chunk);
|
136
|
-
}
|
137
|
-
return new File([Buffer.concat(chunks)], fileName, { type: contentType });
|
138
|
-
}
|
139
|
-
function nodeHttpResponseToAbortSignal(res) {
|
140
|
-
const controller = new AbortController();
|
141
|
-
res.on("close", () => {
|
142
|
-
controller.abort();
|
143
|
-
});
|
144
|
-
return controller.signal;
|
145
|
-
}
|
5
|
+
} from "./chunk-DAUWED3D.js";
|
6
|
+
import "./chunk-XP6YRLY2.js";
|
7
|
+
import "./chunk-XI6WGCB3.js";
|
146
8
|
|
147
9
|
// src/adapters/node/rpc-handler.ts
|
10
|
+
import { sendStandardResponse, toStandardRequest } from "@orpc/server-standard-node";
|
148
11
|
var RPCHandler = class {
|
149
12
|
standardHandler;
|
150
13
|
constructor(router, options) {
|
@@ -153,18 +16,16 @@ var RPCHandler = class {
|
|
153
16
|
this.standardHandler = new StandardHandler(router, matcher, codec, options);
|
154
17
|
}
|
155
18
|
async handle(req, res, ...rest) {
|
156
|
-
const standardRequest =
|
19
|
+
const standardRequest = toStandardRequest(req, res);
|
157
20
|
const result = await this.standardHandler.handle(standardRequest, ...rest);
|
158
21
|
if (!result.matched) {
|
159
22
|
return { matched: false };
|
160
23
|
}
|
161
|
-
await
|
24
|
+
await sendStandardResponse(res, result.response);
|
162
25
|
return { matched: true };
|
163
26
|
}
|
164
27
|
};
|
165
28
|
export {
|
166
|
-
RPCHandler
|
167
|
-
nodeHttpResponseSendStandardResponse,
|
168
|
-
nodeHttpToStandardRequest
|
29
|
+
RPCHandler
|
169
30
|
};
|
170
31
|
//# sourceMappingURL=node.js.map
|
package/dist/plugins.js
CHANGED
@@ -1,10 +1,11 @@
|
|
1
|
+
import type { MaybeOptionalOptions } from '@orpc/shared';
|
1
2
|
import type { Context } from '../../context';
|
2
3
|
import type { Router } from '../../router';
|
3
|
-
import type { RPCHandlerOptions,
|
4
|
+
import type { RPCHandlerOptions, StandardHandleOptions } from '../standard';
|
4
5
|
import type { FetchHandler, FetchHandleResult } from './types';
|
5
6
|
export declare class RPCHandler<T extends Context> implements FetchHandler<T> {
|
6
7
|
private readonly standardHandler;
|
7
8
|
constructor(router: Router<T, any>, options?: NoInfer<RPCHandlerOptions<T>>);
|
8
|
-
handle(request: Request, ...rest:
|
9
|
+
handle(request: Request, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<FetchHandleResult>;
|
9
10
|
}
|
10
11
|
//# sourceMappingURL=rpc-handler.d.ts.map
|
@@ -1,5 +1,6 @@
|
|
1
|
+
import type { MaybeOptionalOptions } from '@orpc/shared';
|
1
2
|
import type { Context } from '../../context';
|
2
|
-
import type {
|
3
|
+
import type { StandardHandleOptions } from '../standard';
|
3
4
|
export type FetchHandleResult = {
|
4
5
|
matched: true;
|
5
6
|
response: Response;
|
@@ -8,6 +9,6 @@ export type FetchHandleResult = {
|
|
8
9
|
response: undefined;
|
9
10
|
};
|
10
11
|
export interface FetchHandler<T extends Context> {
|
11
|
-
handle(request: Request, ...rest:
|
12
|
+
handle(request: Request, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<FetchHandleResult>;
|
12
13
|
}
|
13
14
|
//# sourceMappingURL=types.d.ts.map
|
@@ -1,13 +1,12 @@
|
|
1
|
+
import type { MaybeOptionalOptions, Value } from '@orpc/shared';
|
1
2
|
import type { Context as HonoContext, MiddlewareHandler } from 'hono';
|
2
3
|
import type { Context } from '../../context';
|
3
4
|
import type { FetchHandler } from '../fetch';
|
4
5
|
import type { StandardHandleOptions } from '../standard';
|
5
|
-
import { type Value } from '@orpc/shared';
|
6
6
|
export type CreateMiddlewareOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
7
7
|
context?: Value<T, [HonoContext]>;
|
8
8
|
} : {
|
9
9
|
context: Value<T, [HonoContext]>;
|
10
10
|
});
|
11
|
-
export
|
12
|
-
export declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: CreateMiddlewareRest<T>): MiddlewareHandler;
|
11
|
+
export declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<CreateMiddlewareOptions<T>>): MiddlewareHandler;
|
13
12
|
//# sourceMappingURL=middleware.d.ts.map
|
@@ -1,14 +1,13 @@
|
|
1
|
+
import type { MaybeOptionalOptions, Value } from '@orpc/shared';
|
1
2
|
import type { NextRequest } from 'next/server';
|
2
3
|
import type { Context } from '../../context';
|
3
4
|
import type { FetchHandler } from '../fetch';
|
4
5
|
import type { StandardHandleOptions } from '../standard';
|
5
|
-
import { type Value } from '@orpc/shared';
|
6
6
|
export type ServeOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
7
7
|
context?: Value<T, [NextRequest]>;
|
8
8
|
} : {
|
9
9
|
context: Value<T, [NextRequest]>;
|
10
10
|
});
|
11
|
-
export type ServeRest<T extends Context> = [options: ServeOptions<T>] | (Record<never, never> extends T ? [] : never);
|
12
11
|
export interface ServeResult {
|
13
12
|
GET(req: NextRequest): Promise<Response>;
|
14
13
|
POST(req: NextRequest): Promise<Response>;
|
@@ -16,5 +15,5 @@ export interface ServeResult {
|
|
16
15
|
PATCH(req: NextRequest): Promise<Response>;
|
17
16
|
DELETE(req: NextRequest): Promise<Response>;
|
18
17
|
}
|
19
|
-
export declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]:
|
18
|
+
export declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<ServeOptions<T>>): ServeResult;
|
20
19
|
//# sourceMappingURL=serve.d.ts.map
|
@@ -1,10 +1,11 @@
|
|
1
|
+
import type { MaybeOptionalOptions } from '@orpc/shared';
|
1
2
|
import type { Context } from '../../context';
|
2
3
|
import type { Router } from '../../router';
|
3
|
-
import type { RPCHandlerOptions,
|
4
|
+
import type { RPCHandlerOptions, StandardHandleOptions } from '../standard';
|
4
5
|
import type { NodeHttpHandler, NodeHttpHandleResult, NodeHttpRequest, NodeHttpResponse } from './types';
|
5
6
|
export declare class RPCHandler<T extends Context> implements NodeHttpHandler<T> {
|
6
7
|
private readonly standardHandler;
|
7
8
|
constructor(router: Router<T, any>, options?: NoInfer<RPCHandlerOptions<T>>);
|
8
|
-
handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest:
|
9
|
+
handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<NodeHttpHandleResult>;
|
9
10
|
}
|
10
11
|
//# sourceMappingURL=rpc-handler.d.ts.map
|
@@ -1,7 +1,8 @@
|
|
1
|
+
import type { MaybeOptionalOptions } from '@orpc/shared';
|
1
2
|
import type { IncomingMessage, ServerResponse } from 'node:http';
|
2
3
|
import type { Http2ServerRequest, Http2ServerResponse } from 'node:http2';
|
3
4
|
import type { Context } from '../../context';
|
4
|
-
import type {
|
5
|
+
import type { StandardHandleOptions } from '../standard';
|
5
6
|
export type NodeHttpRequest = (IncomingMessage | Http2ServerRequest) & {
|
6
7
|
/**
|
7
8
|
* Replace `req.url` with `req.originalUrl` when `req.originalUrl` is available.
|
@@ -16,6 +17,6 @@ export type NodeHttpHandleResult = {
|
|
16
17
|
matched: false;
|
17
18
|
};
|
18
19
|
export interface NodeHttpHandler<T extends Context> {
|
19
|
-
handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest:
|
20
|
+
handle(req: NodeHttpRequest, res: NodeHttpResponse, ...rest: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<NodeHttpHandleResult>;
|
20
21
|
}
|
21
22
|
//# sourceMappingURL=types.d.ts.map
|
@@ -1,10 +1,11 @@
|
|
1
1
|
import type { ErrorMap, HTTPPath, Meta, Schema } from '@orpc/contract';
|
2
|
-
import type {
|
2
|
+
import type { StandardRequest, StandardResponse } from '@orpc/server-standard';
|
3
|
+
import type { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
|
3
4
|
import type { Context } from '../../context';
|
4
5
|
import type { Plugin } from '../../plugins';
|
5
6
|
import type { CreateProcedureClientOptions } from '../../procedure-client';
|
6
7
|
import type { Router } from '../../router';
|
7
|
-
import type { StandardCodec, StandardMatcher
|
8
|
+
import type { StandardCodec, StandardMatcher } from './types';
|
8
9
|
export type StandardHandleOptions<T extends Context> = {
|
9
10
|
prefix?: HTTPPath;
|
10
11
|
} & (Record<never, never> extends T ? {
|
@@ -15,7 +16,6 @@ export type StandardHandleOptions<T extends Context> = {
|
|
15
16
|
export type WellStandardHandleOptions<T extends Context> = StandardHandleOptions<T> & {
|
16
17
|
context: T;
|
17
18
|
};
|
18
|
-
export type StandardHandleRest<T extends Context> = [options: StandardHandleOptions<T>] | (Record<never, never> extends T ? [] : never);
|
19
19
|
export type StandardHandleResult = {
|
20
20
|
matched: true;
|
21
21
|
response: StandardResponse;
|
@@ -26,7 +26,7 @@ export type StandardHandleResult = {
|
|
26
26
|
export type StandardHandlerInterceptorOptions<TContext extends Context> = WellStandardHandleOptions<TContext> & {
|
27
27
|
request: StandardRequest;
|
28
28
|
};
|
29
|
-
export type WellCreateProcedureClientOptions<TContext extends Context> = CreateProcedureClientOptions<TContext, Schema, Schema, unknown, ErrorMap, Meta,
|
29
|
+
export type WellCreateProcedureClientOptions<TContext extends Context> = CreateProcedureClientOptions<TContext, Schema, Schema, unknown, ErrorMap, Meta, Record<never, never>> & {
|
30
30
|
context: TContext;
|
31
31
|
};
|
32
32
|
export interface StandardHandlerOptions<TContext extends Context> {
|
@@ -40,12 +40,12 @@ export interface StandardHandlerOptions<TContext extends Context> {
|
|
40
40
|
*/
|
41
41
|
interceptorsRoot?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, unknown>[];
|
42
42
|
}
|
43
|
-
export declare class StandardHandler<
|
43
|
+
export declare class StandardHandler<T extends Context> {
|
44
44
|
private readonly matcher;
|
45
45
|
private readonly codec;
|
46
46
|
private readonly options;
|
47
47
|
private readonly plugin;
|
48
|
-
constructor(router: Router<
|
49
|
-
handle(request: StandardRequest, ...[options]:
|
48
|
+
constructor(router: Router<T, any>, matcher: StandardMatcher, codec: StandardCodec, options?: NoInfer<StandardHandlerOptions<T>>);
|
49
|
+
handle(request: StandardRequest, ...[options]: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<StandardHandleResult>;
|
50
50
|
}
|
51
51
|
//# sourceMappingURL=handler.d.ts.map
|
@@ -1,6 +1,7 @@
|
|
1
1
|
import type { ORPCError } from '@orpc/contract';
|
2
|
+
import type { StandardRequest, StandardResponse } from '@orpc/server-standard';
|
2
3
|
import type { AnyProcedure } from '../../procedure';
|
3
|
-
import type { StandardCodec, StandardParams
|
4
|
+
import type { StandardCodec, StandardParams } from './types';
|
4
5
|
import { RPCSerializer } from './rpc-serializer';
|
5
6
|
export interface StandardCodecOptions {
|
6
7
|
serializer?: RPCSerializer;
|
@@ -1,31 +1,7 @@
|
|
1
1
|
import type { HTTPPath, ORPCError } from '@orpc/contract';
|
2
|
-
import type {
|
2
|
+
import type { StandardRequest, StandardResponse } from '@orpc/server-standard';
|
3
3
|
import type { AnyProcedure } from '../../procedure';
|
4
4
|
import type { AnyRouter } from '../../router';
|
5
|
-
export interface StandardHeaders {
|
6
|
-
[key: string]: string | string[] | undefined;
|
7
|
-
}
|
8
|
-
export type StandardBody = undefined | JsonValue | Blob | URLSearchParams | FormData;
|
9
|
-
export interface StandardRequest {
|
10
|
-
/**
|
11
|
-
* Can be { request: Request } or { request: IncomingMessage, response: ServerResponse } based on the adapter.
|
12
|
-
*/
|
13
|
-
raw: Record<string, unknown>;
|
14
|
-
method: string;
|
15
|
-
url: URL;
|
16
|
-
headers: StandardHeaders;
|
17
|
-
/**
|
18
|
-
* The body has been parsed base on the content-type header.
|
19
|
-
* This method can safely call multiple times (cached).
|
20
|
-
*/
|
21
|
-
body(): Promise<StandardBody>;
|
22
|
-
signal?: AbortSignal;
|
23
|
-
}
|
24
|
-
export interface StandardResponse {
|
25
|
-
status: number;
|
26
|
-
headers: StandardHeaders;
|
27
|
-
body: StandardBody;
|
28
|
-
}
|
29
5
|
export type StandardParams = Record<string, string>;
|
30
6
|
export type StandardMatchResult = {
|
31
7
|
path: string[];
|
@@ -1,9 +1,10 @@
|
|
1
|
-
import type { ClientRest, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
|
1
|
+
import type { ClientContext, ClientRest, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
|
2
|
+
import type { MaybeOptionalOptions } from '@orpc/shared';
|
2
3
|
import type { BuilderDef } from './builder';
|
3
4
|
import type { ConflictContextGuard, Context, MergedContext } from './context';
|
4
5
|
import type { MapInputMiddleware, Middleware } from './middleware';
|
5
6
|
import type { Procedure, ProcedureHandler } from './procedure';
|
6
|
-
import type {
|
7
|
+
import type { CreateProcedureClientOptions, ProcedureClient } from './procedure-client';
|
7
8
|
import type { DecoratedProcedure } from './procedure-decorated';
|
8
9
|
/**
|
9
10
|
* Like `DecoratedProcedure`, but removed all method that can change the contract.
|
@@ -13,11 +14,11 @@ export interface ImplementedProcedure<TInitialContext extends Context, TCurrentC
|
|
13
14
|
/**
|
14
15
|
* Make this procedure callable (works like a function while still being a procedure).
|
15
16
|
*/
|
16
|
-
callable<TClientContext>(...rest:
|
17
|
+
callable<TClientContext extends ClientContext>(...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>>): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> & ProcedureClient<TClientContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
|
17
18
|
/**
|
18
19
|
* Make this procedure compatible with server action (the same as .callable, but the type is compatible with server action).
|
19
20
|
*/
|
20
|
-
actionable<TClientContext>(...rest:
|
21
|
+
actionable<TClientContext extends ClientContext>(...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>>): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> & ((...rest: ClientRest<TClientContext, SchemaInput<TInputSchema>>) => Promise<SchemaOutput<TOutputSchema, THandlerOutput>>);
|
21
22
|
}
|
22
23
|
/**
|
23
24
|
* Like `ProcedureBuilderWithoutHandler`, but removed all method that can change the contract.
|
package/dist/src/middleware.d.ts
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
import type { ErrorMap, Meta, ORPCErrorConstructorMap, Schema } from '@orpc/contract';
|
2
|
-
import type { Promisable } from '@orpc/shared';
|
2
|
+
import type { MaybeOptionalOptions, Promisable } from '@orpc/shared';
|
3
3
|
import type { Context } from './context';
|
4
4
|
import type { Procedure } from './procedure';
|
5
5
|
export type MiddlewareResult<TOutContext extends Context, TOutput> = Promisable<{
|
@@ -11,9 +11,8 @@ export type MiddlewareNextFnOptions<TOutContext extends Context> = Record<never,
|
|
11
11
|
} : {
|
12
12
|
context: TOutContext;
|
13
13
|
};
|
14
|
-
export type MiddlewareNextFnRest<TOutContext extends Context> = [options: MiddlewareNextFnOptions<TOutContext>] | (Record<never, never> extends TOutContext ? [] : never);
|
15
14
|
export interface MiddlewareNextFn<TInContext extends Context, TOutput> {
|
16
|
-
<U extends Context & Partial<TInContext> = Record<never, never>>(...rest:
|
15
|
+
<U extends Context & Partial<TInContext> = Record<never, never>>(...rest: MaybeOptionalOptions<MiddlewareNextFnOptions<U>>): MiddlewareResult<U, TOutput>;
|
17
16
|
}
|
18
17
|
export interface MiddlewareOutputFn<TOutput> {
|
19
18
|
(output: TOutput): MiddlewareResult<Record<never, never>, TOutput>;
|
@@ -1,9 +1,9 @@
|
|
1
|
-
import type { Client, ErrorFromErrorMap, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
|
2
|
-
import type { Interceptor, Value } from '@orpc/shared';
|
1
|
+
import type { Client, ClientContext, ErrorFromErrorMap, ErrorMap, Meta, ORPCErrorConstructorMap, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
|
2
|
+
import type { Interceptor, MaybeOptionalOptions, Value } from '@orpc/shared';
|
3
3
|
import type { Context } from './context';
|
4
4
|
import type { Lazyable } from './lazy';
|
5
5
|
import type { Procedure } from './procedure';
|
6
|
-
export type ProcedureClient<TClientContext, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> = Client<TClientContext, SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, ErrorFromErrorMap<TErrorMap>>;
|
6
|
+
export type ProcedureClient<TClientContext extends ClientContext, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap> = Client<TClientContext, SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, ErrorFromErrorMap<TErrorMap>>;
|
7
7
|
export interface ProcedureClientInterceptorOptions<TInitialContext extends Context, TInputSchema extends Schema, TErrorMap extends ErrorMap, TMeta extends Meta> {
|
8
8
|
context: TInitialContext;
|
9
9
|
input: SchemaInput<TInputSchema>;
|
@@ -15,7 +15,7 @@ export interface ProcedureClientInterceptorOptions<TInitialContext extends Conte
|
|
15
15
|
/**
|
16
16
|
* Options for creating a procedure caller with comprehensive type safety
|
17
17
|
*/
|
18
|
-
export type CreateProcedureClientOptions<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext> = {
|
18
|
+
export type CreateProcedureClientOptions<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext> = {
|
19
19
|
/**
|
20
20
|
* This is helpful for logging and analytics.
|
21
21
|
*/
|
@@ -26,6 +26,5 @@ export type CreateProcedureClientOptions<TInitialContext extends Context, TInput
|
|
26
26
|
} : {
|
27
27
|
context: Value<TInitialContext, [clientContext: TClientContext]>;
|
28
28
|
});
|
29
|
-
export
|
30
|
-
export declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta>>, ...[options]: CreateProcedureClientRest<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
|
29
|
+
export declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext>(lazyableProcedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta>>, ...[options]: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>>): ProcedureClient<TClientContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
|
31
30
|
//# sourceMappingURL=procedure-client.d.ts.map
|
@@ -1,7 +1,8 @@
|
|
1
|
-
import type { ClientRest, ErrorMap, MergedErrorMap, Meta, ORPCErrorConstructorMap, Route, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
|
1
|
+
import type { ClientContext, ClientRest, ErrorMap, MergedErrorMap, Meta, ORPCErrorConstructorMap, Route, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
|
2
|
+
import type { MaybeOptionalOptions } from '@orpc/shared';
|
2
3
|
import type { ConflictContextGuard, Context, MergedContext } from './context';
|
3
4
|
import type { MapInputMiddleware, Middleware } from './middleware';
|
4
|
-
import type {
|
5
|
+
import type { CreateProcedureClientOptions, ProcedureClient } from './procedure-client';
|
5
6
|
import { Procedure } from './procedure';
|
6
7
|
export declare class DecoratedProcedure<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta> extends Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> {
|
7
8
|
errors<U extends ErrorMap>(errors: U): DecoratedProcedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, MergedErrorMap<TErrorMap, U>, TMeta>;
|
@@ -12,10 +13,10 @@ export declare class DecoratedProcedure<TInitialContext extends Context, TCurren
|
|
12
13
|
/**
|
13
14
|
* Make this procedure callable (works like a function while still being a procedure).
|
14
15
|
*/
|
15
|
-
callable<TClientContext>(...rest:
|
16
|
+
callable<TClientContext extends ClientContext>(...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>>): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> & ProcedureClient<TClientContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap>;
|
16
17
|
/**
|
17
18
|
* Make this procedure compatible with server action (the same as .callable, but the type is compatible with server action).
|
18
19
|
*/
|
19
|
-
actionable<TClientContext>(...rest:
|
20
|
+
actionable<TClientContext extends ClientContext>(...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, TClientContext>>): Procedure<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta> & ((...rest: ClientRest<TClientContext, SchemaInput<TInputSchema>>) => Promise<SchemaOutput<TOutputSchema, THandlerOutput>>);
|
20
21
|
}
|
21
22
|
//# sourceMappingURL=procedure-decorated.d.ts.map
|
@@ -1,8 +1,9 @@
|
|
1
1
|
import type { ClientPromiseResult, ErrorFromErrorMap, ErrorMap, Meta, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
|
2
|
+
import type { MaybeOptionalOptions } from '@orpc/shared';
|
2
3
|
import type { Context } from './context';
|
3
4
|
import type { Lazyable } from './lazy';
|
4
5
|
import type { Procedure } from './procedure';
|
5
|
-
import {
|
6
|
+
import type { CreateProcedureClientOptions } from './procedure-client';
|
6
7
|
/**
|
7
8
|
* Directly call a procedure without creating a client.
|
8
9
|
*
|
@@ -13,5 +14,5 @@ import { type CreateProcedureClientRest } from './procedure-client';
|
|
13
14
|
* ```
|
14
15
|
*
|
15
16
|
*/
|
16
|
-
export declare function call<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta>(procedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta>>, input: SchemaInput<TInputSchema>, ...rest:
|
17
|
+
export declare function call<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>, TErrorMap extends ErrorMap, TMeta extends Meta>(procedure: Lazyable<Procedure<TInitialContext, any, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta>>, input: SchemaInput<TInputSchema>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<TInitialContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta, Record<never, never>>>): ClientPromiseResult<SchemaOutput<TOutputSchema, THandlerOutput>, ErrorFromErrorMap<TErrorMap>>;
|
17
18
|
//# sourceMappingURL=procedure-utils.d.ts.map
|
@@ -1,11 +1,11 @@
|
|
1
|
-
import type { ErrorMap, Meta } from '@orpc/contract';
|
1
|
+
import type { ClientContext, ErrorMap, Meta } from '@orpc/contract';
|
2
|
+
import type { MaybeOptionalOptions } from '@orpc/shared';
|
2
3
|
import type { Lazy } from './lazy';
|
3
4
|
import type { Procedure } from './procedure';
|
4
|
-
import type {
|
5
|
-
import type { AnyRouter,
|
6
|
-
export type RouterClient<TRouter extends AnyRouter, TClientContext> = TRouter extends Lazy<infer U extends AnyRouter> ? RouterClient<U, TClientContext> : TRouter extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput, infer UErrorMap, any> ? ProcedureClient<TClientContext, UInputSchema, UOutputSchema, UFuncOutput, UErrorMap> : {
|
5
|
+
import type { CreateProcedureClientOptions, ProcedureClient } from './procedure-client';
|
6
|
+
import type { AnyRouter, InferRouterInitialContext } from './router';
|
7
|
+
export type RouterClient<TRouter extends AnyRouter, TClientContext extends ClientContext> = TRouter extends Lazy<infer U extends AnyRouter> ? RouterClient<U, TClientContext> : TRouter extends Procedure<any, any, infer UInputSchema, infer UOutputSchema, infer UFuncOutput, infer UErrorMap, any> ? ProcedureClient<TClientContext, UInputSchema, UOutputSchema, UFuncOutput, UErrorMap> : {
|
7
8
|
[K in keyof TRouter]: TRouter[K] extends AnyRouter ? RouterClient<TRouter[K], TClientContext> : never;
|
8
9
|
};
|
9
|
-
export
|
10
|
-
export declare function createRouterClient<TRouter extends AnyRouter, TClientContext>(router: TRouter | Lazy<undefined>, ...rest: CreateRouterClientRest<TRouter, TClientContext>): RouterClient<TRouter, TClientContext>;
|
10
|
+
export declare function createRouterClient<TRouter extends AnyRouter, TClientContext extends ClientContext>(router: TRouter | Lazy<undefined>, ...rest: MaybeOptionalOptions<CreateProcedureClientOptions<InferRouterInitialContext<TRouter>, undefined, undefined, unknown, ErrorMap, Meta, TClientContext>>): RouterClient<TRouter, TClientContext>;
|
11
11
|
//# sourceMappingURL=router-client.d.ts.map
|
package/dist/src/router.d.ts
CHANGED
@@ -9,6 +9,7 @@ export type Router<TInitialContext extends Context, TContract extends AnyContrac
|
|
9
9
|
[K in keyof TContract]: TContract[K] extends AnyContractRouter ? Router<TInitialContext, TContract[K]> : never;
|
10
10
|
}>;
|
11
11
|
export type AnyRouter = Router<any, any>;
|
12
|
+
export type InferRouterInitialContext<T extends AnyRouter> = T extends Router<infer UInitialContext, any> ? UInitialContext : never;
|
12
13
|
export type InferRouterInputs<T extends AnyRouter> = T extends Lazy<infer U extends AnyRouter> ? InferRouterInputs<U> : T extends Procedure<any, any, infer UInputSchema, any, any, any, any> ? SchemaInput<UInputSchema> : {
|
13
14
|
[K in keyof T]: T[K] extends AnyRouter ? InferRouterInputs<T[K]> : never;
|
14
15
|
};
|
package/dist/standard.js
CHANGED
@@ -4,9 +4,9 @@ import {
|
|
4
4
|
RPCSerializer,
|
5
5
|
StandardHandler,
|
6
6
|
serializeRPCJson
|
7
|
-
} from "./chunk-
|
8
|
-
import "./chunk-
|
9
|
-
import "./chunk-
|
7
|
+
} from "./chunk-DAUWED3D.js";
|
8
|
+
import "./chunk-XP6YRLY2.js";
|
9
|
+
import "./chunk-XI6WGCB3.js";
|
10
10
|
export {
|
11
11
|
RPCCodec,
|
12
12
|
RPCMatcher,
|
package/package.json
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
{
|
2
2
|
"name": "@orpc/server",
|
3
3
|
"type": "module",
|
4
|
-
"version": "0.
|
4
|
+
"version": "0.39.0",
|
5
5
|
"license": "MIT",
|
6
6
|
"homepage": "https://orpc.unnoq.com",
|
7
7
|
"repository": {
|
@@ -63,9 +63,12 @@
|
|
63
63
|
"next": ">=14.0.0"
|
64
64
|
},
|
65
65
|
"dependencies": {
|
66
|
+
"@orpc/server-standard": "^0.0.0",
|
67
|
+
"@orpc/server-standard-fetch": "^0.0.0",
|
68
|
+
"@orpc/server-standard-node": "^0.0.0",
|
66
69
|
"@tinyhttp/content-disposition": "^2.2.2",
|
67
|
-
"@orpc/contract": "0.
|
68
|
-
"@orpc/shared": "0.
|
70
|
+
"@orpc/contract": "0.39.0",
|
71
|
+
"@orpc/shared": "0.39.0"
|
69
72
|
},
|
70
73
|
"devDependencies": {
|
71
74
|
"light-my-request": "^6.5.1"
|
package/dist/chunk-2OH4QMZ4.js
DELETED
@@ -1,145 +0,0 @@
|
|
1
|
-
import {
|
2
|
-
RPCCodec,
|
3
|
-
RPCMatcher,
|
4
|
-
StandardHandler
|
5
|
-
} from "./chunk-BFGSRNYZ.js";
|
6
|
-
|
7
|
-
// src/adapters/fetch/utils.ts
|
8
|
-
import { once } from "@orpc/shared";
|
9
|
-
import { contentDisposition, parse as parseContentDisposition } from "@tinyhttp/content-disposition";
|
10
|
-
function fetchHeadersToStandardHeaders(headers) {
|
11
|
-
const standardHeaders = {};
|
12
|
-
for (const [key, value] of headers) {
|
13
|
-
if (Array.isArray(standardHeaders[key])) {
|
14
|
-
standardHeaders[key].push(value);
|
15
|
-
} else if (standardHeaders[key] !== void 0) {
|
16
|
-
standardHeaders[key] = [standardHeaders[key], value];
|
17
|
-
} else {
|
18
|
-
standardHeaders[key] = value;
|
19
|
-
}
|
20
|
-
}
|
21
|
-
return standardHeaders;
|
22
|
-
}
|
23
|
-
async function fetchReToStandardBody(re) {
|
24
|
-
if (!re.body) {
|
25
|
-
return void 0;
|
26
|
-
}
|
27
|
-
const contentDisposition2 = re.headers.get("content-disposition");
|
28
|
-
if (contentDisposition2) {
|
29
|
-
const fileName = parseContentDisposition(contentDisposition2).parameters.filename;
|
30
|
-
if (typeof fileName === "string") {
|
31
|
-
const blob2 = await re.blob();
|
32
|
-
return new File([blob2], fileName, {
|
33
|
-
type: blob2.type
|
34
|
-
});
|
35
|
-
}
|
36
|
-
}
|
37
|
-
const contentType = re.headers.get("content-type");
|
38
|
-
if (!contentType || contentType.startsWith("application/json")) {
|
39
|
-
const text = await re.text();
|
40
|
-
if (!text) {
|
41
|
-
return void 0;
|
42
|
-
}
|
43
|
-
return JSON.parse(text);
|
44
|
-
}
|
45
|
-
if (contentType.startsWith("multipart/form-data")) {
|
46
|
-
return await re.formData();
|
47
|
-
}
|
48
|
-
if (contentType.startsWith("application/x-www-form-urlencoded")) {
|
49
|
-
return new URLSearchParams(await re.text());
|
50
|
-
}
|
51
|
-
if (contentType.startsWith("text/")) {
|
52
|
-
return await re.text();
|
53
|
-
}
|
54
|
-
const blob = await re.blob();
|
55
|
-
return new File([blob], "blob", {
|
56
|
-
type: blob.type
|
57
|
-
});
|
58
|
-
}
|
59
|
-
function fetchRequestToStandardRequest(request) {
|
60
|
-
const url = new URL(request.url);
|
61
|
-
return {
|
62
|
-
raw: { request },
|
63
|
-
url,
|
64
|
-
signal: request.signal,
|
65
|
-
method: request.method,
|
66
|
-
body: once(() => {
|
67
|
-
return fetchReToStandardBody(request);
|
68
|
-
}),
|
69
|
-
get headers() {
|
70
|
-
const headers = fetchHeadersToStandardHeaders(request.headers);
|
71
|
-
Object.defineProperty(this, "headers", { value: headers, writable: true });
|
72
|
-
return headers;
|
73
|
-
},
|
74
|
-
set headers(value) {
|
75
|
-
Object.defineProperty(this, "headers", { value, writable: true });
|
76
|
-
}
|
77
|
-
};
|
78
|
-
}
|
79
|
-
function standardResponseToFetchHeaders(response) {
|
80
|
-
const fetchHeaders = new Headers();
|
81
|
-
for (const [key, value] of Object.entries(response.headers)) {
|
82
|
-
if (Array.isArray(value)) {
|
83
|
-
for (const v of value) {
|
84
|
-
fetchHeaders.append(key, v);
|
85
|
-
}
|
86
|
-
} else if (value !== void 0) {
|
87
|
-
fetchHeaders.append(key, value);
|
88
|
-
}
|
89
|
-
}
|
90
|
-
return fetchHeaders;
|
91
|
-
}
|
92
|
-
function standardResponseToFetchResponse(response) {
|
93
|
-
const resHeaders = standardResponseToFetchHeaders(response);
|
94
|
-
resHeaders.delete("content-type");
|
95
|
-
resHeaders.delete("content-disposition");
|
96
|
-
if (response.body === void 0) {
|
97
|
-
return new Response(void 0, { headers: resHeaders, status: response.status });
|
98
|
-
}
|
99
|
-
if (response.body instanceof Blob) {
|
100
|
-
resHeaders.set("content-type", response.body.type);
|
101
|
-
resHeaders.set("content-length", response.body.size.toString());
|
102
|
-
resHeaders.set(
|
103
|
-
"content-disposition",
|
104
|
-
contentDisposition(response.body instanceof File ? response.body.name : "blob", { type: "inline" })
|
105
|
-
);
|
106
|
-
return new Response(response.body, { headers: resHeaders, status: response.status });
|
107
|
-
}
|
108
|
-
if (response.body instanceof FormData) {
|
109
|
-
return new Response(response.body, { headers: resHeaders, status: response.status });
|
110
|
-
}
|
111
|
-
if (response.body instanceof URLSearchParams) {
|
112
|
-
return new Response(response.body, { headers: resHeaders, status: response.status });
|
113
|
-
}
|
114
|
-
resHeaders.set("content-type", "application/json");
|
115
|
-
return new Response(JSON.stringify(response.body), { headers: resHeaders, status: response.status });
|
116
|
-
}
|
117
|
-
|
118
|
-
// src/adapters/fetch/rpc-handler.ts
|
119
|
-
var RPCHandler = class {
|
120
|
-
standardHandler;
|
121
|
-
constructor(router, options) {
|
122
|
-
const matcher = options?.matcher ?? new RPCMatcher();
|
123
|
-
const codec = options?.codec ?? new RPCCodec();
|
124
|
-
this.standardHandler = new StandardHandler(router, matcher, codec, options);
|
125
|
-
}
|
126
|
-
async handle(request, ...rest) {
|
127
|
-
const standardRequest = fetchRequestToStandardRequest(request);
|
128
|
-
const result = await this.standardHandler.handle(standardRequest, ...rest);
|
129
|
-
if (!result.matched) {
|
130
|
-
return result;
|
131
|
-
}
|
132
|
-
return {
|
133
|
-
matched: true,
|
134
|
-
response: standardResponseToFetchResponse(result.response)
|
135
|
-
};
|
136
|
-
}
|
137
|
-
};
|
138
|
-
|
139
|
-
export {
|
140
|
-
fetchReToStandardBody,
|
141
|
-
fetchRequestToStandardRequest,
|
142
|
-
standardResponseToFetchResponse,
|
143
|
-
RPCHandler
|
144
|
-
};
|
145
|
-
//# sourceMappingURL=chunk-2OH4QMZ4.js.map
|
@@ -1,5 +0,0 @@
|
|
1
|
-
import type { StandardBody, StandardRequest, StandardResponse } from '../standard';
|
2
|
-
export declare function fetchReToStandardBody(re: Request | Response): Promise<StandardBody>;
|
3
|
-
export declare function fetchRequestToStandardRequest(request: Request): StandardRequest;
|
4
|
-
export declare function standardResponseToFetchResponse(response: StandardResponse): Response;
|
5
|
-
//# sourceMappingURL=utils.d.ts.map
|
@@ -1,5 +0,0 @@
|
|
1
|
-
import type { StandardRequest, StandardResponse } from '../standard';
|
2
|
-
import type { NodeHttpRequest, NodeHttpResponse } from './types';
|
3
|
-
export declare function nodeHttpToStandardRequest(req: NodeHttpRequest, res: NodeHttpResponse): StandardRequest;
|
4
|
-
export declare function nodeHttpResponseSendStandardResponse(res: NodeHttpResponse, standardResponse: StandardResponse): Promise<void>;
|
5
|
-
//# sourceMappingURL=utils.d.ts.map
|