@orpc/server 0.0.0-next.aac73c2 → 0.0.0-next.ac2c329
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/adapters/fetch/index.d.mts +14 -10
- package/dist/adapters/fetch/index.d.ts +14 -10
- package/dist/adapters/fetch/index.mjs +104 -8
- package/dist/adapters/node/index.d.mts +14 -10
- package/dist/adapters/node/index.d.ts +14 -10
- package/dist/adapters/node/index.mjs +17 -12
- package/dist/adapters/standard/index.d.mts +4 -4
- package/dist/adapters/standard/index.d.ts +4 -4
- package/dist/adapters/standard/index.mjs +6 -4
- package/dist/index.d.mts +27 -27
- package/dist/index.d.ts +27 -27
- package/dist/index.mjs +7 -7
- package/dist/plugins/index.d.mts +100 -6
- package/dist/plugins/index.d.ts +100 -6
- package/dist/plugins/index.mjs +147 -2
- package/dist/shared/server.B5yVxwZh.d.mts +17 -0
- package/dist/shared/server.BW-nUGgA.mjs +36 -0
- package/dist/shared/server.By38lRwX.d.ts +17 -0
- package/dist/shared/{server.CjWkNG6l.mjs → server.C37gDhSZ.mjs} +18 -24
- package/dist/shared/{server.DNoBYd3E.d.ts → server.ClO23hLW.d.mts} +15 -8
- package/dist/shared/{server.CBh2jYIX.d.mts → server.Cqam9L0P.d.mts} +2 -2
- package/dist/shared/{server.B0kTII1X.d.ts → server.CuXY46Yy.d.ts} +2 -2
- package/dist/shared/{server.D9QduY95.mjs → server.DFuJLDuo.mjs} +43 -14
- package/dist/shared/{server.CYBq7eu_.d.mts → server.DQJX4Gnf.d.mts} +2 -2
- package/dist/shared/{server.CYBq7eu_.d.ts → server.DQJX4Gnf.d.ts} +2 -2
- package/dist/shared/{server.DHBkTokD.d.mts → server.DsVSuKTu.d.ts} +15 -8
- package/package.json +7 -21
- package/dist/adapters/hono/index.d.mts +0 -22
- package/dist/adapters/hono/index.d.ts +0 -22
- package/dist/adapters/hono/index.mjs +0 -32
- package/dist/adapters/next/index.d.mts +0 -29
- package/dist/adapters/next/index.d.ts +0 -29
- package/dist/adapters/next/index.mjs +0 -29
- package/dist/shared/server.DatI0acO.d.mts +0 -8
- package/dist/shared/server.Et1O6Bm7.mjs +0 -98
- package/dist/shared/server.uEHRR3Pg.d.ts +0 -8
@@ -0,0 +1,17 @@
|
|
1
|
+
import { C as Context, R as Router } from './server.DQJX4Gnf.mjs';
|
2
|
+
import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
|
3
|
+
import { b as StandardHandlerOptions, i as StandardHandler } from './server.ClO23hLW.mjs';
|
4
|
+
|
5
|
+
interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
|
6
|
+
/**
|
7
|
+
* Enables or disables the StrictGetMethodPlugin.
|
8
|
+
*
|
9
|
+
* @default true
|
10
|
+
*/
|
11
|
+
strictGetMethodPluginEnabled?: boolean;
|
12
|
+
}
|
13
|
+
declare class StandardRPCHandler<T extends Context> extends StandardHandler<T> {
|
14
|
+
constructor(router: Router<any, T>, options: StandardRPCHandlerOptions<T>);
|
15
|
+
}
|
16
|
+
|
17
|
+
export { type StandardRPCHandlerOptions as S, StandardRPCHandler as a };
|
@@ -0,0 +1,36 @@
|
|
1
|
+
import { ORPCError, fallbackContractConfig } from '@orpc/contract';
|
2
|
+
|
3
|
+
const STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT_SYMBOL = Symbol("STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT");
|
4
|
+
class StrictGetMethodPlugin {
|
5
|
+
error;
|
6
|
+
order = 7e6;
|
7
|
+
constructor(options = {}) {
|
8
|
+
this.error = options.error ?? new ORPCError("METHOD_NOT_SUPPORTED");
|
9
|
+
}
|
10
|
+
init(options) {
|
11
|
+
options.rootInterceptors ??= [];
|
12
|
+
options.clientInterceptors ??= [];
|
13
|
+
options.rootInterceptors.unshift((options2) => {
|
14
|
+
const isGetMethod = options2.request.method === "GET";
|
15
|
+
return options2.next({
|
16
|
+
...options2,
|
17
|
+
context: {
|
18
|
+
...options2.context,
|
19
|
+
[STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT_SYMBOL]: isGetMethod
|
20
|
+
}
|
21
|
+
});
|
22
|
+
});
|
23
|
+
options.clientInterceptors.unshift((options2) => {
|
24
|
+
if (typeof options2.context[STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT_SYMBOL] !== "boolean") {
|
25
|
+
throw new TypeError("[StrictGetMethodPlugin] strict GET method context has been corrupted or modified by another plugin or interceptor");
|
26
|
+
}
|
27
|
+
const procedureMethod = fallbackContractConfig("defaultMethod", options2.procedure["~orpc"].route.method);
|
28
|
+
if (options2.context[STRICT_GET_METHOD_PLUGIN_IS_GET_METHOD_CONTEXT_SYMBOL] && procedureMethod !== "GET") {
|
29
|
+
throw this.error;
|
30
|
+
}
|
31
|
+
return options2.next();
|
32
|
+
});
|
33
|
+
}
|
34
|
+
}
|
35
|
+
|
36
|
+
export { StrictGetMethodPlugin as S };
|
@@ -0,0 +1,17 @@
|
|
1
|
+
import { C as Context, R as Router } from './server.DQJX4Gnf.js';
|
2
|
+
import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
|
3
|
+
import { b as StandardHandlerOptions, i as StandardHandler } from './server.DsVSuKTu.js';
|
4
|
+
|
5
|
+
interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
|
6
|
+
/**
|
7
|
+
* Enables or disables the StrictGetMethodPlugin.
|
8
|
+
*
|
9
|
+
* @default true
|
10
|
+
*/
|
11
|
+
strictGetMethodPluginEnabled?: boolean;
|
12
|
+
}
|
13
|
+
declare class StandardRPCHandler<T extends Context> extends StandardHandler<T> {
|
14
|
+
constructor(router: Router<any, T>, options: StandardRPCHandlerOptions<T>);
|
15
|
+
}
|
16
|
+
|
17
|
+
export { type StandardRPCHandlerOptions as S, StandardRPCHandler as a };
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import { isContractProcedure, ValidationError, mergePrefix, mergeErrorMap, enhanceRoute } from '@orpc/contract';
|
2
2
|
import { fallbackORPCErrorStatus, ORPCError } from '@orpc/client';
|
3
|
-
import { value, intercept
|
3
|
+
import { value, intercept } from '@orpc/shared';
|
4
4
|
|
5
5
|
const LAZY_SYMBOL = Symbol("ORPC_LAZY_SYMBOL");
|
6
6
|
function lazy(loader, meta = {}) {
|
@@ -127,7 +127,7 @@ function createProcedureClient(lazyableProcedure, ...[options]) {
|
|
127
127
|
);
|
128
128
|
} catch (e) {
|
129
129
|
if (!(e instanceof ORPCError)) {
|
130
|
-
throw
|
130
|
+
throw e;
|
131
131
|
}
|
132
132
|
const validated = await validateORPCError(procedure["~orpc"].errorMap, e);
|
133
133
|
throw validated;
|
@@ -169,35 +169,29 @@ async function executeProcedureInternal(procedure, options) {
|
|
169
169
|
const middlewares = procedure["~orpc"].middlewares;
|
170
170
|
const inputValidationIndex = Math.min(Math.max(0, procedure["~orpc"].inputValidationIndex), middlewares.length);
|
171
171
|
const outputValidationIndex = Math.min(Math.max(0, procedure["~orpc"].outputValidationIndex), middlewares.length);
|
172
|
-
|
173
|
-
|
174
|
-
let currentInput = options.input;
|
175
|
-
const next = async (...[nextOptions]) => {
|
176
|
-
const index = currentIndex;
|
177
|
-
const midContext = nextOptions?.context ?? {};
|
178
|
-
currentIndex += 1;
|
179
|
-
currentContext = mergeCurrentContext(currentContext, midContext);
|
172
|
+
const next = async (index, context, input) => {
|
173
|
+
let currentInput = input;
|
180
174
|
if (index === inputValidationIndex) {
|
181
175
|
currentInput = await validateInput(procedure, currentInput);
|
182
176
|
}
|
183
177
|
const mid = middlewares[index];
|
184
|
-
const
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
178
|
+
const output = mid ? (await mid({
|
179
|
+
...options,
|
180
|
+
context,
|
181
|
+
next: async (...[nextOptions]) => {
|
182
|
+
const nextContext = nextOptions?.context ?? {};
|
183
|
+
return {
|
184
|
+
output: await next(index + 1, mergeCurrentContext(context, nextContext), currentInput),
|
185
|
+
context: nextContext
|
186
|
+
};
|
187
|
+
}
|
188
|
+
}, currentInput, middlewareOutputFn)).output : await procedure["~orpc"].handler({ ...options, context, input: currentInput });
|
191
189
|
if (index === outputValidationIndex) {
|
192
|
-
|
193
|
-
return {
|
194
|
-
context: result.context,
|
195
|
-
output: validatedOutput
|
196
|
-
};
|
190
|
+
return await validateOutput(procedure, output);
|
197
191
|
}
|
198
|
-
return
|
192
|
+
return output;
|
199
193
|
};
|
200
|
-
return (
|
194
|
+
return next(0, options.context, options.input);
|
201
195
|
}
|
202
196
|
|
203
197
|
const HIDDEN_ROUTER_CONTRACT_SYMBOL = Symbol("ORPC_HIDDEN_ROUTER_CONTRACT");
|
@@ -1,8 +1,8 @@
|
|
1
1
|
import { HTTPPath, ORPCError } from '@orpc/client';
|
2
2
|
import { Meta, InferSchemaOutput, AnySchema, ErrorFromErrorMap } from '@orpc/contract';
|
3
|
-
import { Interceptor } from '@orpc/shared';
|
3
|
+
import { Interceptor, ThrowableError } from '@orpc/shared';
|
4
4
|
import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
|
5
|
-
import {
|
5
|
+
import { f as AnyRouter, h as AnyProcedure, C as Context, F as ProcedureClientInterceptorOptions, R as Router } from './server.DQJX4Gnf.mjs';
|
6
6
|
|
7
7
|
type StandardParams = Record<string, string>;
|
8
8
|
type StandardMatchResult = {
|
@@ -20,6 +20,16 @@ interface StandardCodec {
|
|
20
20
|
decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
|
21
21
|
}
|
22
22
|
|
23
|
+
interface StandardHandlerPlugin<TContext extends Context> {
|
24
|
+
order?: number;
|
25
|
+
init?(options: StandardHandlerOptions<TContext>): void;
|
26
|
+
}
|
27
|
+
declare class CompositeStandardHandlerPlugin<T extends Context, TPlugin extends StandardHandlerPlugin<T>> implements StandardHandlerPlugin<T> {
|
28
|
+
protected readonly plugins: TPlugin[];
|
29
|
+
constructor(plugins?: readonly TPlugin[]);
|
30
|
+
init(options: StandardHandlerOptions<T>): void;
|
31
|
+
}
|
32
|
+
|
23
33
|
interface StandardHandleOptions<T extends Context> {
|
24
34
|
prefix?: HTTPPath;
|
25
35
|
context: T;
|
@@ -31,9 +41,6 @@ type StandardHandleResult = {
|
|
31
41
|
matched: false;
|
32
42
|
response: undefined;
|
33
43
|
};
|
34
|
-
interface StandardHandlerPlugin<TContext extends Context> {
|
35
|
-
init?(options: StandardHandlerOptions<TContext>): void;
|
36
|
-
}
|
37
44
|
interface StandardHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
|
38
45
|
request: StandardLazyRequest;
|
39
46
|
}
|
@@ -42,11 +49,11 @@ interface StandardHandlerOptions<TContext extends Context> {
|
|
42
49
|
/**
|
43
50
|
* Interceptors at the request level, helpful when you want catch errors
|
44
51
|
*/
|
45
|
-
interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult,
|
52
|
+
interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, ThrowableError>[];
|
46
53
|
/**
|
47
54
|
* Interceptors at the root level, helpful when you want override the request/response
|
48
55
|
*/
|
49
|
-
rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult,
|
56
|
+
rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, ThrowableError>[];
|
50
57
|
/**
|
51
58
|
*
|
52
59
|
* Interceptors for procedure client.
|
@@ -63,4 +70,4 @@ declare class StandardHandler<T extends Context> {
|
|
63
70
|
handle(request: StandardLazyRequest, options: StandardHandleOptions<T>): Promise<StandardHandleResult>;
|
64
71
|
}
|
65
72
|
|
66
|
-
export { type
|
73
|
+
export { CompositeStandardHandlerPlugin as C, type StandardHandlerInterceptorOptions as S, type StandardHandlerPlugin as a, type StandardHandlerOptions as b, type StandardCodec as c, type StandardParams as d, type StandardMatcher as e, type StandardMatchResult as f, type StandardHandleOptions as g, type StandardHandleResult as h, StandardHandler as i };
|
@@ -1,5 +1,5 @@
|
|
1
|
-
import { C as Context } from './server.
|
2
|
-
import {
|
1
|
+
import { C as Context } from './server.DQJX4Gnf.mjs';
|
2
|
+
import { g as StandardHandleOptions } from './server.ClO23hLW.mjs';
|
3
3
|
|
4
4
|
type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
5
5
|
context?: T;
|
@@ -1,5 +1,5 @@
|
|
1
|
-
import { C as Context } from './server.
|
2
|
-
import {
|
1
|
+
import { C as Context } from './server.DQJX4Gnf.js';
|
2
|
+
import { g as StandardHandleOptions } from './server.DsVSuKTu.js';
|
3
3
|
|
4
4
|
type FriendlyStandardHandleOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
5
5
|
context?: T;
|
@@ -1,15 +1,28 @@
|
|
1
|
-
import {
|
1
|
+
import { toHttpPath, StandardRPCJsonSerializer, StandardRPCSerializer } from '@orpc/client/standard';
|
2
2
|
import { toArray, intercept, parseEmptyableJSON } from '@orpc/shared';
|
3
|
-
import
|
4
|
-
import {
|
3
|
+
import '@orpc/standard-server/batch';
|
4
|
+
import { ORPCError, toORPCError } from '@orpc/client';
|
5
|
+
import { S as StrictGetMethodPlugin } from './server.BW-nUGgA.mjs';
|
6
|
+
import { c as createProcedureClient, t as traverseContractProcedures, i as isProcedure, u as unlazy, g as getRouter, a as createContractedProcedure } from './server.C37gDhSZ.mjs';
|
7
|
+
|
8
|
+
class CompositeStandardHandlerPlugin {
|
9
|
+
plugins;
|
10
|
+
constructor(plugins = []) {
|
11
|
+
this.plugins = [...plugins].sort((a, b) => (a.order ?? 0) - (b.order ?? 0));
|
12
|
+
}
|
13
|
+
init(options) {
|
14
|
+
for (const plugin of this.plugins) {
|
15
|
+
plugin.init?.(options);
|
16
|
+
}
|
17
|
+
}
|
18
|
+
}
|
5
19
|
|
6
20
|
class StandardHandler {
|
7
21
|
constructor(router, matcher, codec, options) {
|
8
22
|
this.matcher = matcher;
|
9
23
|
this.codec = codec;
|
10
|
-
|
11
|
-
|
12
|
-
}
|
24
|
+
const plugins = new CompositeStandardHandlerPlugin(options.plugins);
|
25
|
+
plugins.init(options);
|
13
26
|
this.interceptors = toArray(options.interceptors);
|
14
27
|
this.clientInterceptors = toArray(options.clientInterceptors);
|
15
28
|
this.rootInterceptors = toArray(options.rootInterceptors);
|
@@ -18,23 +31,24 @@ class StandardHandler {
|
|
18
31
|
interceptors;
|
19
32
|
clientInterceptors;
|
20
33
|
rootInterceptors;
|
21
|
-
handle(request, options) {
|
34
|
+
async handle(request, options) {
|
35
|
+
const prefix = options.prefix?.replace(/\/$/, "") || void 0;
|
36
|
+
if (prefix && !request.url.pathname.startsWith(`${prefix}/`) && request.url.pathname !== prefix) {
|
37
|
+
return { matched: false, response: void 0 };
|
38
|
+
}
|
22
39
|
return intercept(
|
23
40
|
this.rootInterceptors,
|
24
|
-
{ ...options, request },
|
41
|
+
{ ...options, request, prefix },
|
25
42
|
async (interceptorOptions) => {
|
26
43
|
let isDecoding = false;
|
27
44
|
try {
|
28
45
|
return await intercept(
|
29
46
|
this.interceptors,
|
30
47
|
interceptorOptions,
|
31
|
-
async ({ request: request2, context, prefix }) => {
|
48
|
+
async ({ request: request2, context, prefix: prefix2 }) => {
|
32
49
|
const method = request2.method;
|
33
50
|
const url = request2.url;
|
34
|
-
|
35
|
-
return { matched: false, response: void 0 };
|
36
|
-
}
|
37
|
-
const pathname = prefix ? url.pathname.replace(prefix, "") : url.pathname;
|
51
|
+
const pathname = prefix2 ? url.pathname.replace(prefix2, "") : url.pathname;
|
38
52
|
const match = await this.matcher.match(method, `/${pathname.replace(/^\/|\/$/g, "")}`);
|
39
53
|
if (!match) {
|
40
54
|
return { matched: false, response: void 0 };
|
@@ -158,4 +172,19 @@ class StandardRPCMatcher {
|
|
158
172
|
}
|
159
173
|
}
|
160
174
|
|
161
|
-
|
175
|
+
class StandardRPCHandler extends StandardHandler {
|
176
|
+
constructor(router, options) {
|
177
|
+
options.plugins ??= [];
|
178
|
+
const strictGetMethodPluginEnabled = options.strictGetMethodPluginEnabled ?? true;
|
179
|
+
if (strictGetMethodPluginEnabled) {
|
180
|
+
options.plugins.push(new StrictGetMethodPlugin());
|
181
|
+
}
|
182
|
+
const jsonSerializer = new StandardRPCJsonSerializer(options);
|
183
|
+
const serializer = new StandardRPCSerializer(jsonSerializer);
|
184
|
+
const matcher = new StandardRPCMatcher();
|
185
|
+
const codec = new StandardRPCCodec(serializer);
|
186
|
+
super(router, matcher, codec, options);
|
187
|
+
}
|
188
|
+
}
|
189
|
+
|
190
|
+
export { CompositeStandardHandlerPlugin as C, StandardHandler as S, StandardRPCCodec as a, StandardRPCHandler as b, StandardRPCMatcher as c };
|
@@ -2,7 +2,7 @@ import { ORPCErrorCode, ORPCErrorOptions, ORPCError, HTTPPath, ClientContext, Cl
|
|
2
2
|
import { MaybeOptionalOptions, Promisable, Interceptor, Value } from '@orpc/shared';
|
3
3
|
import { ErrorMap, ErrorMapItem, InferSchemaInput, AnySchema, Meta, ContractProcedureDef, InferSchemaOutput, ErrorFromErrorMap, AnyContractRouter, ContractProcedure } from '@orpc/contract';
|
4
4
|
|
5
|
-
type Context = Record<
|
5
|
+
type Context = Record<PropertyKey, any>;
|
6
6
|
type MergedInitialContext<TInitial extends Context, TAdditional extends Context, TCurrent extends Context> = TInitial & Omit<TAdditional, keyof TCurrent>;
|
7
7
|
type MergedCurrentContext<T extends Context, U extends Context> = Omit<T, keyof U> & U;
|
8
8
|
declare function mergeCurrentContext<T extends Context, U extends Context>(context: T, other: U): MergedCurrentContext<T, U>;
|
@@ -140,4 +140,4 @@ type InferRouterOutputs<T extends AnyRouter> = T extends Procedure<any, any, any
|
|
140
140
|
[K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterOutputs<U> : never;
|
141
141
|
};
|
142
142
|
|
143
|
-
export { type
|
143
|
+
export { type AnyMiddleware as A, type ProcedureHandlerOptions as B, type Context as C, type ProcedureDef as D, isProcedure as E, type ProcedureClientInterceptorOptions as F, createProcedureClient as G, type InferRouterInitialContexts as H, type InferRouterInitialContext as I, type InferRouterCurrentContexts as J, type InferRouterInputs as K, type Lazyable as L, type Middleware as M, type InferRouterOutputs as N, type ORPCErrorConstructorMap as O, Procedure as P, type Router as R, type MergedInitialContext as a, type MergedCurrentContext as b, type MapInputMiddleware as c, type CreateProcedureClientOptions as d, type ProcedureClient as e, type AnyRouter as f, type Lazy as g, type AnyProcedure as h, type ProcedureHandler as i, type ORPCErrorConstructorMapItemOptions as j, type ORPCErrorConstructorMapItem as k, createORPCErrorConstructorMap as l, mergeCurrentContext as m, LAZY_SYMBOL as n, type LazyMeta as o, lazy as p, isLazy as q, getLazyMeta as r, type MiddlewareResult as s, type MiddlewareNextFnOptions as t, unlazy as u, validateORPCError as v, type MiddlewareNextFn as w, type MiddlewareOutputFn as x, type MiddlewareOptions as y, middlewareOutputFn as z };
|
@@ -2,7 +2,7 @@ import { ORPCErrorCode, ORPCErrorOptions, ORPCError, HTTPPath, ClientContext, Cl
|
|
2
2
|
import { MaybeOptionalOptions, Promisable, Interceptor, Value } from '@orpc/shared';
|
3
3
|
import { ErrorMap, ErrorMapItem, InferSchemaInput, AnySchema, Meta, ContractProcedureDef, InferSchemaOutput, ErrorFromErrorMap, AnyContractRouter, ContractProcedure } from '@orpc/contract';
|
4
4
|
|
5
|
-
type Context = Record<
|
5
|
+
type Context = Record<PropertyKey, any>;
|
6
6
|
type MergedInitialContext<TInitial extends Context, TAdditional extends Context, TCurrent extends Context> = TInitial & Omit<TAdditional, keyof TCurrent>;
|
7
7
|
type MergedCurrentContext<T extends Context, U extends Context> = Omit<T, keyof U> & U;
|
8
8
|
declare function mergeCurrentContext<T extends Context, U extends Context>(context: T, other: U): MergedCurrentContext<T, U>;
|
@@ -140,4 +140,4 @@ type InferRouterOutputs<T extends AnyRouter> = T extends Procedure<any, any, any
|
|
140
140
|
[K in keyof T]: T[K] extends Lazyable<infer U extends AnyRouter> ? InferRouterOutputs<U> : never;
|
141
141
|
};
|
142
142
|
|
143
|
-
export { type
|
143
|
+
export { type AnyMiddleware as A, type ProcedureHandlerOptions as B, type Context as C, type ProcedureDef as D, isProcedure as E, type ProcedureClientInterceptorOptions as F, createProcedureClient as G, type InferRouterInitialContexts as H, type InferRouterInitialContext as I, type InferRouterCurrentContexts as J, type InferRouterInputs as K, type Lazyable as L, type Middleware as M, type InferRouterOutputs as N, type ORPCErrorConstructorMap as O, Procedure as P, type Router as R, type MergedInitialContext as a, type MergedCurrentContext as b, type MapInputMiddleware as c, type CreateProcedureClientOptions as d, type ProcedureClient as e, type AnyRouter as f, type Lazy as g, type AnyProcedure as h, type ProcedureHandler as i, type ORPCErrorConstructorMapItemOptions as j, type ORPCErrorConstructorMapItem as k, createORPCErrorConstructorMap as l, mergeCurrentContext as m, LAZY_SYMBOL as n, type LazyMeta as o, lazy as p, isLazy as q, getLazyMeta as r, type MiddlewareResult as s, type MiddlewareNextFnOptions as t, unlazy as u, validateORPCError as v, type MiddlewareNextFn as w, type MiddlewareOutputFn as x, type MiddlewareOptions as y, middlewareOutputFn as z };
|
@@ -1,8 +1,8 @@
|
|
1
1
|
import { HTTPPath, ORPCError } from '@orpc/client';
|
2
2
|
import { Meta, InferSchemaOutput, AnySchema, ErrorFromErrorMap } from '@orpc/contract';
|
3
|
-
import { Interceptor } from '@orpc/shared';
|
3
|
+
import { Interceptor, ThrowableError } from '@orpc/shared';
|
4
4
|
import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
|
5
|
-
import {
|
5
|
+
import { f as AnyRouter, h as AnyProcedure, C as Context, F as ProcedureClientInterceptorOptions, R as Router } from './server.DQJX4Gnf.js';
|
6
6
|
|
7
7
|
type StandardParams = Record<string, string>;
|
8
8
|
type StandardMatchResult = {
|
@@ -20,6 +20,16 @@ interface StandardCodec {
|
|
20
20
|
decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
|
21
21
|
}
|
22
22
|
|
23
|
+
interface StandardHandlerPlugin<TContext extends Context> {
|
24
|
+
order?: number;
|
25
|
+
init?(options: StandardHandlerOptions<TContext>): void;
|
26
|
+
}
|
27
|
+
declare class CompositeStandardHandlerPlugin<T extends Context, TPlugin extends StandardHandlerPlugin<T>> implements StandardHandlerPlugin<T> {
|
28
|
+
protected readonly plugins: TPlugin[];
|
29
|
+
constructor(plugins?: readonly TPlugin[]);
|
30
|
+
init(options: StandardHandlerOptions<T>): void;
|
31
|
+
}
|
32
|
+
|
23
33
|
interface StandardHandleOptions<T extends Context> {
|
24
34
|
prefix?: HTTPPath;
|
25
35
|
context: T;
|
@@ -31,9 +41,6 @@ type StandardHandleResult = {
|
|
31
41
|
matched: false;
|
32
42
|
response: undefined;
|
33
43
|
};
|
34
|
-
interface StandardHandlerPlugin<TContext extends Context> {
|
35
|
-
init?(options: StandardHandlerOptions<TContext>): void;
|
36
|
-
}
|
37
44
|
interface StandardHandlerInterceptorOptions<T extends Context> extends StandardHandleOptions<T> {
|
38
45
|
request: StandardLazyRequest;
|
39
46
|
}
|
@@ -42,11 +49,11 @@ interface StandardHandlerOptions<TContext extends Context> {
|
|
42
49
|
/**
|
43
50
|
* Interceptors at the request level, helpful when you want catch errors
|
44
51
|
*/
|
45
|
-
interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult,
|
52
|
+
interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, ThrowableError>[];
|
46
53
|
/**
|
47
54
|
* Interceptors at the root level, helpful when you want override the request/response
|
48
55
|
*/
|
49
|
-
rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult,
|
56
|
+
rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, ThrowableError>[];
|
50
57
|
/**
|
51
58
|
*
|
52
59
|
* Interceptors for procedure client.
|
@@ -63,4 +70,4 @@ declare class StandardHandler<T extends Context> {
|
|
63
70
|
handle(request: StandardLazyRequest, options: StandardHandleOptions<T>): Promise<StandardHandleResult>;
|
64
71
|
}
|
65
72
|
|
66
|
-
export { type
|
73
|
+
export { CompositeStandardHandlerPlugin as C, type StandardHandlerInterceptorOptions as S, type StandardHandlerPlugin as a, type StandardHandlerOptions as b, type StandardCodec as c, type StandardParams as d, type StandardMatcher as e, type StandardMatchResult as f, type StandardHandleOptions as g, type StandardHandleResult as h, StandardHandler as i };
|
package/package.json
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
{
|
2
2
|
"name": "@orpc/server",
|
3
3
|
"type": "module",
|
4
|
-
"version": "0.0.0-next.
|
4
|
+
"version": "0.0.0-next.ac2c329",
|
5
5
|
"license": "MIT",
|
6
6
|
"homepage": "https://orpc.unnoq.com",
|
7
7
|
"repository": {
|
@@ -34,16 +34,6 @@
|
|
34
34
|
"import": "./dist/adapters/fetch/index.mjs",
|
35
35
|
"default": "./dist/adapters/fetch/index.mjs"
|
36
36
|
},
|
37
|
-
"./hono": {
|
38
|
-
"types": "./dist/adapters/hono/index.d.mts",
|
39
|
-
"import": "./dist/adapters/hono/index.mjs",
|
40
|
-
"default": "./dist/adapters/hono/index.mjs"
|
41
|
-
},
|
42
|
-
"./next": {
|
43
|
-
"types": "./dist/adapters/next/index.d.mts",
|
44
|
-
"import": "./dist/adapters/next/index.mjs",
|
45
|
-
"default": "./dist/adapters/next/index.mjs"
|
46
|
-
},
|
47
37
|
"./node": {
|
48
38
|
"types": "./dist/adapters/node/index.d.mts",
|
49
39
|
"import": "./dist/adapters/node/index.mjs",
|
@@ -53,17 +43,13 @@
|
|
53
43
|
"files": [
|
54
44
|
"dist"
|
55
45
|
],
|
56
|
-
"peerDependencies": {
|
57
|
-
"hono": ">=4.6.0",
|
58
|
-
"next": ">=14.0.0"
|
59
|
-
},
|
60
46
|
"dependencies": {
|
61
|
-
"@orpc/
|
62
|
-
"@orpc/contract": "0.0.0-next.
|
63
|
-
"@orpc/
|
64
|
-
"@orpc/standard-server
|
65
|
-
"@orpc/standard-server": "0.0.0-next.
|
66
|
-
"@orpc/standard-server-
|
47
|
+
"@orpc/shared": "0.0.0-next.ac2c329",
|
48
|
+
"@orpc/contract": "0.0.0-next.ac2c329",
|
49
|
+
"@orpc/client": "0.0.0-next.ac2c329",
|
50
|
+
"@orpc/standard-server": "0.0.0-next.ac2c329",
|
51
|
+
"@orpc/standard-server-node": "0.0.0-next.ac2c329",
|
52
|
+
"@orpc/standard-server-fetch": "0.0.0-next.ac2c329"
|
67
53
|
},
|
68
54
|
"devDependencies": {
|
69
55
|
"supertest": "^7.0.0"
|
@@ -1,22 +0,0 @@
|
|
1
|
-
import { FetchHandler } from '../fetch/index.mjs';
|
2
|
-
export { BodyLimitPlugin, BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.mjs';
|
3
|
-
import { Value, MaybeOptionalOptions } from '@orpc/shared';
|
4
|
-
import { Context as Context$1, MiddlewareHandler } from 'hono';
|
5
|
-
import { C as Context } from '../../shared/server.CYBq7eu_.mjs';
|
6
|
-
import { S as StandardHandleOptions } from '../../shared/server.DHBkTokD.mjs';
|
7
|
-
import '../../shared/server.CBh2jYIX.mjs';
|
8
|
-
import '@orpc/standard-server-fetch';
|
9
|
-
import '../../shared/server.DatI0acO.mjs';
|
10
|
-
import '@orpc/client/standard';
|
11
|
-
import '@orpc/client';
|
12
|
-
import '@orpc/contract';
|
13
|
-
import '@orpc/standard-server';
|
14
|
-
|
15
|
-
type CreateMiddlewareOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
16
|
-
context?: Value<T, [Context$1]>;
|
17
|
-
} : {
|
18
|
-
context: Value<T, [Context$1]>;
|
19
|
-
});
|
20
|
-
declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<CreateMiddlewareOptions<T>>): MiddlewareHandler;
|
21
|
-
|
22
|
-
export { type CreateMiddlewareOptions, FetchHandler, createMiddleware };
|
@@ -1,22 +0,0 @@
|
|
1
|
-
import { FetchHandler } from '../fetch/index.js';
|
2
|
-
export { BodyLimitPlugin, BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.js';
|
3
|
-
import { Value, MaybeOptionalOptions } from '@orpc/shared';
|
4
|
-
import { Context as Context$1, MiddlewareHandler } from 'hono';
|
5
|
-
import { C as Context } from '../../shared/server.CYBq7eu_.js';
|
6
|
-
import { S as StandardHandleOptions } from '../../shared/server.DNoBYd3E.js';
|
7
|
-
import '../../shared/server.B0kTII1X.js';
|
8
|
-
import '@orpc/standard-server-fetch';
|
9
|
-
import '../../shared/server.uEHRR3Pg.js';
|
10
|
-
import '@orpc/client/standard';
|
11
|
-
import '@orpc/client';
|
12
|
-
import '@orpc/contract';
|
13
|
-
import '@orpc/standard-server';
|
14
|
-
|
15
|
-
type CreateMiddlewareOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
16
|
-
context?: Value<T, [Context$1]>;
|
17
|
-
} : {
|
18
|
-
context: Value<T, [Context$1]>;
|
19
|
-
});
|
20
|
-
declare function createMiddleware<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<CreateMiddlewareOptions<T>>): MiddlewareHandler;
|
21
|
-
|
22
|
-
export { type CreateMiddlewareOptions, FetchHandler, createMiddleware };
|
@@ -1,32 +0,0 @@
|
|
1
|
-
export { B as BodyLimitPlugin, F as FetchHandler, R as RPCHandler } from '../../shared/server.Et1O6Bm7.mjs';
|
2
|
-
import { value } from '@orpc/shared';
|
3
|
-
import '@orpc/client';
|
4
|
-
import '@orpc/client/standard';
|
5
|
-
import '../../shared/server.D9QduY95.mjs';
|
6
|
-
import '../../shared/server.CjWkNG6l.mjs';
|
7
|
-
import '@orpc/contract';
|
8
|
-
import '@orpc/standard-server-fetch';
|
9
|
-
import '../../shared/server.BVwwTHyO.mjs';
|
10
|
-
|
11
|
-
function createMiddleware(handler, ...[options]) {
|
12
|
-
return async (c, next) => {
|
13
|
-
const bodyProps = /* @__PURE__ */ new Set(["arrayBuffer", "blob", "formData", "json", "text"]);
|
14
|
-
const request = c.req.method === "GET" || c.req.method === "HEAD" ? c.req.raw : new Proxy(c.req.raw, {
|
15
|
-
// https://github.com/honojs/middleware/blob/main/packages/trpc-server/src/index.ts#L39
|
16
|
-
get(target, prop) {
|
17
|
-
if (bodyProps.has(prop)) {
|
18
|
-
return () => c.req[prop]();
|
19
|
-
}
|
20
|
-
return Reflect.get(target, prop, target);
|
21
|
-
}
|
22
|
-
});
|
23
|
-
const context = await value(options?.context ?? {}, c);
|
24
|
-
const { matched, response } = await handler.handle(request, { ...options, context });
|
25
|
-
if (matched) {
|
26
|
-
return c.newResponse(response.body, response);
|
27
|
-
}
|
28
|
-
await next();
|
29
|
-
};
|
30
|
-
}
|
31
|
-
|
32
|
-
export { createMiddleware };
|
@@ -1,29 +0,0 @@
|
|
1
|
-
import { FetchHandler } from '../fetch/index.mjs';
|
2
|
-
export { BodyLimitPlugin, BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.mjs';
|
3
|
-
import { Value, MaybeOptionalOptions } from '@orpc/shared';
|
4
|
-
import { NextRequest } from 'next/server';
|
5
|
-
import { C as Context } from '../../shared/server.CYBq7eu_.mjs';
|
6
|
-
import { S as StandardHandleOptions } from '../../shared/server.DHBkTokD.mjs';
|
7
|
-
import '../../shared/server.CBh2jYIX.mjs';
|
8
|
-
import '@orpc/standard-server-fetch';
|
9
|
-
import '../../shared/server.DatI0acO.mjs';
|
10
|
-
import '@orpc/client/standard';
|
11
|
-
import '@orpc/client';
|
12
|
-
import '@orpc/contract';
|
13
|
-
import '@orpc/standard-server';
|
14
|
-
|
15
|
-
type ServeOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
16
|
-
context?: Value<T, [NextRequest]>;
|
17
|
-
} : {
|
18
|
-
context: Value<T, [NextRequest]>;
|
19
|
-
});
|
20
|
-
interface ServeResult {
|
21
|
-
GET(req: NextRequest): Promise<Response>;
|
22
|
-
POST(req: NextRequest): Promise<Response>;
|
23
|
-
PUT(req: NextRequest): Promise<Response>;
|
24
|
-
PATCH(req: NextRequest): Promise<Response>;
|
25
|
-
DELETE(req: NextRequest): Promise<Response>;
|
26
|
-
}
|
27
|
-
declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<ServeOptions<T>>): ServeResult;
|
28
|
-
|
29
|
-
export { FetchHandler, type ServeOptions, type ServeResult, serve };
|
@@ -1,29 +0,0 @@
|
|
1
|
-
import { FetchHandler } from '../fetch/index.js';
|
2
|
-
export { BodyLimitPlugin, BodyLimitPluginOptions, FetchHandleResult, FetchHandlerInterceptorOptions, FetchHandlerOptions, FetchHandlerPlugin, RPCHandler } from '../fetch/index.js';
|
3
|
-
import { Value, MaybeOptionalOptions } from '@orpc/shared';
|
4
|
-
import { NextRequest } from 'next/server';
|
5
|
-
import { C as Context } from '../../shared/server.CYBq7eu_.js';
|
6
|
-
import { S as StandardHandleOptions } from '../../shared/server.DNoBYd3E.js';
|
7
|
-
import '../../shared/server.B0kTII1X.js';
|
8
|
-
import '@orpc/standard-server-fetch';
|
9
|
-
import '../../shared/server.uEHRR3Pg.js';
|
10
|
-
import '@orpc/client/standard';
|
11
|
-
import '@orpc/client';
|
12
|
-
import '@orpc/contract';
|
13
|
-
import '@orpc/standard-server';
|
14
|
-
|
15
|
-
type ServeOptions<T extends Context> = Omit<StandardHandleOptions<T>, 'context'> & (Record<never, never> extends T ? {
|
16
|
-
context?: Value<T, [NextRequest]>;
|
17
|
-
} : {
|
18
|
-
context: Value<T, [NextRequest]>;
|
19
|
-
});
|
20
|
-
interface ServeResult {
|
21
|
-
GET(req: NextRequest): Promise<Response>;
|
22
|
-
POST(req: NextRequest): Promise<Response>;
|
23
|
-
PUT(req: NextRequest): Promise<Response>;
|
24
|
-
PATCH(req: NextRequest): Promise<Response>;
|
25
|
-
DELETE(req: NextRequest): Promise<Response>;
|
26
|
-
}
|
27
|
-
declare function serve<T extends Context>(handler: FetchHandler<T>, ...[options]: MaybeOptionalOptions<ServeOptions<T>>): ServeResult;
|
28
|
-
|
29
|
-
export { FetchHandler, type ServeOptions, type ServeResult, serve };
|
@@ -1,29 +0,0 @@
|
|
1
|
-
export { B as BodyLimitPlugin, F as FetchHandler, R as RPCHandler } from '../../shared/server.Et1O6Bm7.mjs';
|
2
|
-
import { value } from '@orpc/shared';
|
3
|
-
import '@orpc/client';
|
4
|
-
import '@orpc/client/standard';
|
5
|
-
import '../../shared/server.D9QduY95.mjs';
|
6
|
-
import '../../shared/server.CjWkNG6l.mjs';
|
7
|
-
import '@orpc/contract';
|
8
|
-
import '@orpc/standard-server-fetch';
|
9
|
-
import '../../shared/server.BVwwTHyO.mjs';
|
10
|
-
|
11
|
-
function serve(handler, ...[options]) {
|
12
|
-
const main = async (req) => {
|
13
|
-
const context = await value(options?.context ?? {}, req);
|
14
|
-
const { matched, response } = await handler.handle(req, { ...options, context });
|
15
|
-
if (matched) {
|
16
|
-
return response;
|
17
|
-
}
|
18
|
-
return new Response(`Cannot find a matching procedure for ${req.url}`, { status: 404 });
|
19
|
-
};
|
20
|
-
return {
|
21
|
-
GET: main,
|
22
|
-
POST: main,
|
23
|
-
PUT: main,
|
24
|
-
PATCH: main,
|
25
|
-
DELETE: main
|
26
|
-
};
|
27
|
-
}
|
28
|
-
|
29
|
-
export { serve };
|
@@ -1,8 +0,0 @@
|
|
1
|
-
import { StandardRPCJsonSerializerOptions } from '@orpc/client/standard';
|
2
|
-
import { C as Context } from './server.CYBq7eu_.mjs';
|
3
|
-
import { a as StandardHandlerOptions } from './server.DHBkTokD.mjs';
|
4
|
-
|
5
|
-
interface StandardRPCHandlerOptions<T extends Context> extends StandardHandlerOptions<T>, StandardRPCJsonSerializerOptions {
|
6
|
-
}
|
7
|
-
|
8
|
-
export type { StandardRPCHandlerOptions as S };
|