@orpc/server 0.0.0-next.bc9d3dd → 0.0.0-next.c0088c7
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 +118 -0
- package/dist/adapters/fetch/index.d.mts +26 -0
- package/dist/adapters/fetch/index.d.ts +26 -0
- package/dist/adapters/fetch/index.mjs +9 -0
- package/dist/adapters/hono/index.d.mts +19 -0
- package/dist/adapters/hono/index.d.ts +19 -0
- package/dist/{hono.js → adapters/hono/index.mjs} +11 -19
- package/dist/adapters/next/index.d.mts +26 -0
- package/dist/adapters/next/index.d.ts +26 -0
- package/dist/{next.js → adapters/next/index.mjs} +11 -19
- package/dist/adapters/node/index.d.mts +34 -0
- package/dist/adapters/node/index.d.ts +34 -0
- package/dist/adapters/node/index.mjs +31 -0
- package/dist/adapters/standard/index.d.mts +25 -0
- package/dist/adapters/standard/index.d.ts +25 -0
- package/dist/adapters/standard/index.mjs +6 -0
- package/dist/index.d.mts +255 -0
- package/dist/index.d.ts +255 -0
- package/dist/{index.js → index.mjs} +41 -112
- package/dist/plugins/index.d.mts +31 -0
- package/dist/plugins/index.d.ts +31 -0
- package/dist/{chunk-XFBAK67J.js → plugins/index.mjs} +17 -42
- package/dist/shared/server.BHIDiY4a.mjs +28 -0
- package/dist/shared/server.CtBp-i4f.d.mts +77 -0
- package/dist/shared/server.DKrKGnk2.mjs +161 -0
- package/dist/shared/server.Drm1Lma3.d.ts +77 -0
- package/dist/shared/server.Q6ZmnTgO.mjs +12 -0
- package/dist/{chunk-SV6DBVXJ.js → shared/server.V6zT5iYQ.mjs} +84 -82
- package/dist/shared/server.ptXwNGQr.d.mts +158 -0
- package/dist/shared/server.ptXwNGQr.d.ts +158 -0
- package/package.json +29 -31
- package/dist/chunk-4IQKTPXM.js +0 -145
- package/dist/chunk-SD2T3J2Z.js +0 -319
- package/dist/fetch.js +0 -16
- package/dist/node.js +0 -170
- package/dist/plugins.js +0 -11
- package/dist/src/adapters/fetch/index.d.ts +0 -4
- package/dist/src/adapters/fetch/rpc-handler.d.ts +0 -10
- package/dist/src/adapters/fetch/types.d.ts +0 -13
- package/dist/src/adapters/fetch/utils.d.ts +0 -5
- package/dist/src/adapters/hono/index.d.ts +0 -3
- package/dist/src/adapters/hono/middleware.d.ts +0 -13
- package/dist/src/adapters/next/index.d.ts +0 -3
- package/dist/src/adapters/next/serve.d.ts +0 -20
- package/dist/src/adapters/node/index.d.ts +0 -4
- package/dist/src/adapters/node/rpc-handler.d.ts +0 -10
- package/dist/src/adapters/node/types.d.ts +0 -21
- package/dist/src/adapters/node/utils.d.ts +0 -5
- package/dist/src/adapters/standard/handler.d.ts +0 -51
- package/dist/src/adapters/standard/index.d.ts +0 -7
- package/dist/src/adapters/standard/rpc-codec.d.ts +0 -15
- package/dist/src/adapters/standard/rpc-handler.d.ts +0 -8
- package/dist/src/adapters/standard/rpc-matcher.d.ts +0 -10
- package/dist/src/adapters/standard/rpc-serializer.d.ts +0 -16
- package/dist/src/adapters/standard/types.d.ts +0 -44
- package/dist/src/builder-variants.d.ts +0 -74
- package/dist/src/builder.d.ts +0 -57
- package/dist/src/config.d.ts +0 -6
- package/dist/src/context.d.ts +0 -9
- package/dist/src/hidden.d.ts +0 -8
- package/dist/src/implementer-procedure.d.ts +0 -30
- package/dist/src/implementer-variants.d.ts +0 -17
- package/dist/src/implementer.d.ts +0 -28
- package/dist/src/index.d.ts +0 -23
- package/dist/src/lazy-utils.d.ts +0 -6
- package/dist/src/lazy.d.ts +0 -22
- package/dist/src/middleware-decorated.d.ts +0 -10
- package/dist/src/middleware-utils.d.ts +0 -5
- package/dist/src/middleware.d.ts +0 -37
- package/dist/src/plugins/base.d.ts +0 -13
- package/dist/src/plugins/cors.d.ts +0 -19
- package/dist/src/plugins/index.d.ts +0 -4
- package/dist/src/plugins/response-headers.d.ts +0 -10
- package/dist/src/procedure-client.d.ts +0 -31
- package/dist/src/procedure-decorated.d.ts +0 -21
- package/dist/src/procedure-utils.d.ts +0 -17
- package/dist/src/procedure.d.ts +0 -29
- package/dist/src/router-accessible-lazy.d.ts +0 -8
- package/dist/src/router-client.d.ts +0 -11
- package/dist/src/router.d.ts +0 -29
- package/dist/src/utils.d.ts +0 -24
- package/dist/standard.js +0 -17
@@ -0,0 +1,161 @@
|
|
1
|
+
import { ORPCError, toORPCError } from '@orpc/client';
|
2
|
+
import { intercept, trim, parseEmptyableJSON } from '@orpc/shared';
|
3
|
+
import { C as CompositePlugin } from './server.Q6ZmnTgO.mjs';
|
4
|
+
import { c as createProcedureClient, e as eachContractProcedure, a as convertPathToHttpPath, i as isProcedure, u as unlazy, g as getRouterChild, b as createContractedProcedure } from './server.V6zT5iYQ.mjs';
|
5
|
+
|
6
|
+
class StandardHandler {
|
7
|
+
constructor(router, matcher, codec, options) {
|
8
|
+
this.matcher = matcher;
|
9
|
+
this.codec = codec;
|
10
|
+
this.options = options;
|
11
|
+
this.plugin = new CompositePlugin(options.plugins);
|
12
|
+
this.plugin.init(this.options);
|
13
|
+
this.matcher.init(router);
|
14
|
+
}
|
15
|
+
plugin;
|
16
|
+
handle(request, ...[options]) {
|
17
|
+
return intercept(
|
18
|
+
this.options.rootInterceptors ?? [],
|
19
|
+
{
|
20
|
+
request,
|
21
|
+
...options,
|
22
|
+
context: options?.context ?? {}
|
23
|
+
// context is optional only when all fields are optional so we can safely force it to have a context
|
24
|
+
},
|
25
|
+
async (interceptorOptions) => {
|
26
|
+
let isDecoding = false;
|
27
|
+
try {
|
28
|
+
return await intercept(
|
29
|
+
this.options.interceptors ?? [],
|
30
|
+
interceptorOptions,
|
31
|
+
async (interceptorOptions2) => {
|
32
|
+
const method = interceptorOptions2.request.method;
|
33
|
+
const url = interceptorOptions2.request.url;
|
34
|
+
const pathname = `/${trim(url.pathname.replace(interceptorOptions2.prefix ?? "", ""), "/")}`;
|
35
|
+
const match = await this.matcher.match(method, pathname);
|
36
|
+
if (!match) {
|
37
|
+
return { matched: false, response: void 0 };
|
38
|
+
}
|
39
|
+
const client = createProcedureClient(match.procedure, {
|
40
|
+
context: interceptorOptions2.context,
|
41
|
+
path: match.path,
|
42
|
+
interceptors: this.options.clientInterceptors
|
43
|
+
});
|
44
|
+
isDecoding = true;
|
45
|
+
const input = await this.codec.decode(request, match.params, match.procedure);
|
46
|
+
isDecoding = false;
|
47
|
+
const lastEventId = Array.isArray(request.headers["last-event-id"]) ? request.headers["last-event-id"].at(-1) : request.headers["last-event-id"];
|
48
|
+
const output = await client(input, { signal: request.signal, lastEventId });
|
49
|
+
const response = this.codec.encode(output, match.procedure);
|
50
|
+
return {
|
51
|
+
matched: true,
|
52
|
+
response
|
53
|
+
};
|
54
|
+
}
|
55
|
+
);
|
56
|
+
} catch (e) {
|
57
|
+
const error = isDecoding ? new ORPCError("BAD_REQUEST", {
|
58
|
+
message: `Malformed request. Ensure the request body is properly formatted and the 'Content-Type' header is set correctly.`,
|
59
|
+
cause: e
|
60
|
+
}) : toORPCError(e);
|
61
|
+
const response = this.codec.encodeError(error);
|
62
|
+
return {
|
63
|
+
matched: true,
|
64
|
+
response
|
65
|
+
};
|
66
|
+
}
|
67
|
+
}
|
68
|
+
);
|
69
|
+
}
|
70
|
+
}
|
71
|
+
|
72
|
+
class RPCCodec {
|
73
|
+
constructor(serializer) {
|
74
|
+
this.serializer = serializer;
|
75
|
+
}
|
76
|
+
async decode(request, _params, _procedure) {
|
77
|
+
const serialized = request.method === "GET" ? parseEmptyableJSON(request.url.searchParams.getAll("data").at(-1)) : await request.body();
|
78
|
+
return this.serializer.deserialize(serialized);
|
79
|
+
}
|
80
|
+
encode(output, _procedure) {
|
81
|
+
return {
|
82
|
+
status: 200,
|
83
|
+
headers: {},
|
84
|
+
body: this.serializer.serialize(output)
|
85
|
+
};
|
86
|
+
}
|
87
|
+
encodeError(error) {
|
88
|
+
return {
|
89
|
+
status: error.status,
|
90
|
+
headers: {},
|
91
|
+
body: this.serializer.serialize(error.toJSON())
|
92
|
+
};
|
93
|
+
}
|
94
|
+
}
|
95
|
+
|
96
|
+
class RPCMatcher {
|
97
|
+
tree = {};
|
98
|
+
pendingRouters = [];
|
99
|
+
init(router, path = []) {
|
100
|
+
const laziedOptions = eachContractProcedure({
|
101
|
+
router,
|
102
|
+
path
|
103
|
+
}, ({ path: path2, contract }) => {
|
104
|
+
const httpPath = convertPathToHttpPath(path2);
|
105
|
+
if (isProcedure(contract)) {
|
106
|
+
this.tree[httpPath] = {
|
107
|
+
path: path2,
|
108
|
+
contract,
|
109
|
+
procedure: contract,
|
110
|
+
// this mean dev not used contract-first so we can used contract as procedure directly
|
111
|
+
router
|
112
|
+
};
|
113
|
+
} else {
|
114
|
+
this.tree[httpPath] = {
|
115
|
+
path: path2,
|
116
|
+
contract,
|
117
|
+
procedure: void 0,
|
118
|
+
router
|
119
|
+
};
|
120
|
+
}
|
121
|
+
});
|
122
|
+
this.pendingRouters.push(...laziedOptions.map((option) => ({
|
123
|
+
...option,
|
124
|
+
httpPathPrefix: convertPathToHttpPath(option.path)
|
125
|
+
})));
|
126
|
+
}
|
127
|
+
async match(_method, pathname) {
|
128
|
+
if (this.pendingRouters.length) {
|
129
|
+
const newPendingRouters = [];
|
130
|
+
for (const pendingRouter of this.pendingRouters) {
|
131
|
+
if (pathname.startsWith(pendingRouter.httpPathPrefix)) {
|
132
|
+
const { default: router } = await unlazy(pendingRouter.lazied);
|
133
|
+
this.init(router, pendingRouter.path);
|
134
|
+
} else {
|
135
|
+
newPendingRouters.push(pendingRouter);
|
136
|
+
}
|
137
|
+
}
|
138
|
+
this.pendingRouters = newPendingRouters;
|
139
|
+
}
|
140
|
+
const match = this.tree[pathname];
|
141
|
+
if (!match) {
|
142
|
+
return void 0;
|
143
|
+
}
|
144
|
+
if (!match.procedure) {
|
145
|
+
const { default: maybeProcedure } = await unlazy(getRouterChild(match.router, ...match.path));
|
146
|
+
if (!isProcedure(maybeProcedure)) {
|
147
|
+
throw new Error(`
|
148
|
+
[Contract-First] Missing or invalid implementation for procedure at path: ${convertPathToHttpPath(match.path)}.
|
149
|
+
Ensure that the procedure is correctly defined and matches the expected contract.
|
150
|
+
`);
|
151
|
+
}
|
152
|
+
match.procedure = createContractedProcedure(match.contract, maybeProcedure);
|
153
|
+
}
|
154
|
+
return {
|
155
|
+
path: match.path,
|
156
|
+
procedure: match.procedure
|
157
|
+
};
|
158
|
+
}
|
159
|
+
}
|
160
|
+
|
161
|
+
export { RPCCodec as R, StandardHandler as S, RPCMatcher as a };
|
@@ -0,0 +1,77 @@
|
|
1
|
+
import { HTTPPath, Schema, Meta, SchemaOutput, ErrorFromErrorMap } from '@orpc/contract';
|
2
|
+
import { Interceptor, MaybeOptionalOptions } from '@orpc/shared';
|
3
|
+
import { StandardResponse, StandardLazyRequest } from '@orpc/standard-server';
|
4
|
+
import { a as AnyRouter, A as AnyProcedure, C as Context, P as ProcedureClientInterceptorOptions, R as Router } from './server.ptXwNGQr.js';
|
5
|
+
import { ORPCError } from '@orpc/client';
|
6
|
+
|
7
|
+
type StandardParams = Record<string, string>;
|
8
|
+
type StandardMatchResult = {
|
9
|
+
path: string[];
|
10
|
+
procedure: AnyProcedure;
|
11
|
+
params?: StandardParams;
|
12
|
+
} | undefined;
|
13
|
+
interface StandardMatcher {
|
14
|
+
init(router: AnyRouter): void;
|
15
|
+
match(method: string, pathname: HTTPPath): Promise<StandardMatchResult>;
|
16
|
+
}
|
17
|
+
interface StandardCodec {
|
18
|
+
encode(output: unknown, procedure: AnyProcedure): StandardResponse;
|
19
|
+
encodeError(error: ORPCError<any, any>): StandardResponse;
|
20
|
+
decode(request: StandardLazyRequest, params: StandardParams | undefined, procedure: AnyProcedure): Promise<unknown>;
|
21
|
+
}
|
22
|
+
|
23
|
+
type StandardHandleOptions<T extends Context> = {
|
24
|
+
prefix?: HTTPPath;
|
25
|
+
} & (Record<never, never> extends T ? {
|
26
|
+
context?: T;
|
27
|
+
} : {
|
28
|
+
context: T;
|
29
|
+
});
|
30
|
+
type WellStandardHandleOptions<T extends Context> = StandardHandleOptions<T> & {
|
31
|
+
context: T;
|
32
|
+
};
|
33
|
+
type StandardHandleResult = {
|
34
|
+
matched: true;
|
35
|
+
response: StandardResponse;
|
36
|
+
} | {
|
37
|
+
matched: false;
|
38
|
+
response: undefined;
|
39
|
+
};
|
40
|
+
type StandardHandlerInterceptorOptions<TContext extends Context> = WellStandardHandleOptions<TContext> & {
|
41
|
+
request: StandardLazyRequest;
|
42
|
+
};
|
43
|
+
interface StandardHandlerOptions<TContext extends Context> {
|
44
|
+
plugins?: Plugin<TContext>[];
|
45
|
+
/**
|
46
|
+
* Interceptors at the request level, helpful when you want catch errors
|
47
|
+
*/
|
48
|
+
interceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, unknown>[];
|
49
|
+
/**
|
50
|
+
* Interceptors at the root level, helpful when you want override the request/response
|
51
|
+
*/
|
52
|
+
rootInterceptors?: Interceptor<StandardHandlerInterceptorOptions<TContext>, StandardHandleResult, unknown>[];
|
53
|
+
/**
|
54
|
+
*
|
55
|
+
* Interceptors for procedure client.
|
56
|
+
*/
|
57
|
+
clientInterceptors?: Interceptor<ProcedureClientInterceptorOptions<TContext, Schema, Record<never, never>, Meta>, SchemaOutput<Schema, unknown>, ErrorFromErrorMap<Record<never, never>>>[];
|
58
|
+
}
|
59
|
+
declare class StandardHandler<T extends Context> {
|
60
|
+
private readonly matcher;
|
61
|
+
private readonly codec;
|
62
|
+
private readonly options;
|
63
|
+
private readonly plugin;
|
64
|
+
constructor(router: Router<T, any>, matcher: StandardMatcher, codec: StandardCodec, options: NoInfer<StandardHandlerOptions<T>>);
|
65
|
+
handle(request: StandardLazyRequest, ...[options]: MaybeOptionalOptions<StandardHandleOptions<T>>): Promise<StandardHandleResult>;
|
66
|
+
}
|
67
|
+
|
68
|
+
interface Plugin<TContext extends Context> {
|
69
|
+
init?(options: StandardHandlerOptions<TContext>): void;
|
70
|
+
}
|
71
|
+
declare class CompositePlugin<TContext extends Context> implements Plugin<TContext> {
|
72
|
+
private readonly plugins;
|
73
|
+
constructor(plugins?: Plugin<TContext>[]);
|
74
|
+
init(options: StandardHandlerOptions<TContext>): void;
|
75
|
+
}
|
76
|
+
|
77
|
+
export { CompositePlugin as C, type Plugin as P, type StandardHandleOptions as S, type WellStandardHandleOptions as W, type StandardHandlerInterceptorOptions as a, type StandardHandlerOptions as b, type StandardCodec as c, type StandardParams as d, type StandardMatcher as e, type StandardMatchResult as f, type StandardHandleResult as g, StandardHandler as h };
|
@@ -1,5 +1,8 @@
|
|
1
|
-
|
2
|
-
|
1
|
+
import { fallbackORPCErrorStatus, ORPCError } from '@orpc/client';
|
2
|
+
import { isContractProcedure, ValidationError, mergePrefix, mergeErrorMap, adaptRoute } from '@orpc/contract';
|
3
|
+
import { value, intercept, toError } from '@orpc/shared';
|
4
|
+
|
5
|
+
const LAZY_LOADER_SYMBOL = Symbol("ORPC_LAZY_LOADER");
|
3
6
|
function lazy(loader) {
|
4
7
|
return {
|
5
8
|
[LAZY_LOADER_SYMBOL]: loader
|
@@ -12,14 +15,12 @@ function unlazy(lazied) {
|
|
12
15
|
return isLazy(lazied) ? lazied[LAZY_LOADER_SYMBOL]() : Promise.resolve({ default: lazied });
|
13
16
|
}
|
14
17
|
|
15
|
-
|
16
|
-
import { isContractProcedure } from "@orpc/contract";
|
17
|
-
var Procedure = class {
|
18
|
+
class Procedure {
|
18
19
|
"~orpc";
|
19
20
|
constructor(def) {
|
20
21
|
this["~orpc"] = def;
|
21
22
|
}
|
22
|
-
}
|
23
|
+
}
|
23
24
|
function isProcedure(item) {
|
24
25
|
if (item instanceof Procedure) {
|
25
26
|
return true;
|
@@ -27,7 +28,6 @@ function isProcedure(item) {
|
|
27
28
|
return isContractProcedure(item) && "middlewares" in item["~orpc"] && "inputValidationIndex" in item["~orpc"] && "outputValidationIndex" in item["~orpc"] && "handler" in item["~orpc"];
|
28
29
|
}
|
29
30
|
|
30
|
-
// src/lazy-utils.ts
|
31
31
|
function flatLazy(lazied) {
|
32
32
|
const flattenLoader = async () => {
|
33
33
|
let current = await unlazy(lazied);
|
@@ -56,19 +56,71 @@ function createLazyProcedureFormAnyLazy(lazied) {
|
|
56
56
|
return lazyProcedure;
|
57
57
|
}
|
58
58
|
|
59
|
-
|
59
|
+
function dedupeMiddlewares(compare, middlewares) {
|
60
|
+
let min = 0;
|
61
|
+
for (let i = 0; i < middlewares.length; i++) {
|
62
|
+
const index = compare.indexOf(middlewares[i], min);
|
63
|
+
if (index === -1) {
|
64
|
+
return middlewares.slice(i);
|
65
|
+
}
|
66
|
+
min = index + 1;
|
67
|
+
}
|
68
|
+
return [];
|
69
|
+
}
|
70
|
+
function mergeMiddlewares(first, second) {
|
71
|
+
return [...first, ...dedupeMiddlewares(first, second)];
|
72
|
+
}
|
73
|
+
function addMiddleware(middlewares, addition) {
|
74
|
+
return [...middlewares, addition];
|
75
|
+
}
|
76
|
+
|
77
|
+
function createORPCErrorConstructorMap(errors) {
|
78
|
+
const proxy = new Proxy(errors, {
|
79
|
+
get(target, code) {
|
80
|
+
if (typeof code !== "string") {
|
81
|
+
return Reflect.get(target, code);
|
82
|
+
}
|
83
|
+
const item = (...[options]) => {
|
84
|
+
const config = errors[code];
|
85
|
+
return new ORPCError(code, {
|
86
|
+
defined: Boolean(config),
|
87
|
+
status: config?.status,
|
88
|
+
message: options?.message ?? config?.message,
|
89
|
+
data: options?.data,
|
90
|
+
cause: options?.cause
|
91
|
+
});
|
92
|
+
};
|
93
|
+
return item;
|
94
|
+
}
|
95
|
+
});
|
96
|
+
return proxy;
|
97
|
+
}
|
98
|
+
async function validateORPCError(map, error) {
|
99
|
+
const { code, status, message, data, cause, defined } = error;
|
100
|
+
const config = map?.[error.code];
|
101
|
+
if (!config || fallbackORPCErrorStatus(error.code, config.status) !== error.status) {
|
102
|
+
return defined ? new ORPCError(code, { defined: false, status, message, data, cause }) : error;
|
103
|
+
}
|
104
|
+
if (!config.data) {
|
105
|
+
return defined ? error : new ORPCError(code, { defined: true, status, message, data, cause });
|
106
|
+
}
|
107
|
+
const validated = await config.data["~standard"].validate(error.data);
|
108
|
+
if (validated.issues) {
|
109
|
+
return defined ? new ORPCError(code, { defined: false, status, message, data, cause }) : error;
|
110
|
+
}
|
111
|
+
return new ORPCError(code, { defined: true, status, message, data: validated.value, cause });
|
112
|
+
}
|
113
|
+
|
60
114
|
function middlewareOutputFn(output) {
|
61
115
|
return { output, context: {} };
|
62
116
|
}
|
63
117
|
|
64
|
-
// src/procedure-client.ts
|
65
|
-
import { createORPCErrorConstructorMap, ORPCError, validateORPCError, ValidationError } from "@orpc/contract";
|
66
|
-
import { intercept, toError, value } from "@orpc/shared";
|
67
118
|
function createProcedureClient(lazyableProcedure, ...[options]) {
|
68
119
|
return async (...[input, callerOptions]) => {
|
69
120
|
const path = options?.path ?? [];
|
70
121
|
const { default: procedure } = await unlazy(lazyableProcedure);
|
71
|
-
const
|
122
|
+
const clientContext = callerOptions?.context ?? {};
|
123
|
+
const context = await value(options?.context ?? {}, clientContext);
|
72
124
|
const errors = createORPCErrorConstructorMap(procedure["~orpc"].errorMap);
|
73
125
|
try {
|
74
126
|
return await intercept(
|
@@ -80,7 +132,8 @@ function createProcedureClient(lazyableProcedure, ...[options]) {
|
|
80
132
|
errors,
|
81
133
|
path,
|
82
134
|
procedure,
|
83
|
-
signal: callerOptions?.signal
|
135
|
+
signal: callerOptions?.signal,
|
136
|
+
lastEventId: callerOptions?.lastEventId
|
84
137
|
},
|
85
138
|
(interceptorOptions) => executeProcedureInternal(interceptorOptions.procedure, interceptorOptions)
|
86
139
|
);
|
@@ -152,8 +205,7 @@ async function executeProcedureInternal(procedure, options) {
|
|
152
205
|
return (await next({})).output;
|
153
206
|
}
|
154
207
|
|
155
|
-
|
156
|
-
var ROUTER_CONTRACT_SYMBOL = Symbol("ORPC_ROUTER_CONTRACT");
|
208
|
+
const ROUTER_CONTRACT_SYMBOL = Symbol("ORPC_ROUTER_CONTRACT");
|
157
209
|
function setRouterContract(obj, contract) {
|
158
210
|
return new Proxy(obj, {
|
159
211
|
get(target, key) {
|
@@ -167,7 +219,7 @@ function setRouterContract(obj, contract) {
|
|
167
219
|
function getRouterContract(obj) {
|
168
220
|
return obj[ROUTER_CONTRACT_SYMBOL];
|
169
221
|
}
|
170
|
-
|
222
|
+
const LAZY_ROUTER_PREFIX_SYMBOL = Symbol("ORPC_LAZY_ROUTER_PREFIX");
|
171
223
|
function deepSetLazyRouterPrefix(router, prefix) {
|
172
224
|
return new Proxy(router, {
|
173
225
|
get(target, key) {
|
@@ -186,29 +238,20 @@ function getLazyRouterPrefix(obj) {
|
|
186
238
|
return obj[LAZY_ROUTER_PREFIX_SYMBOL];
|
187
239
|
}
|
188
240
|
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
return middlewares.slice(i);
|
241
|
+
function createAccessibleLazyRouter(lazied) {
|
242
|
+
const flattenLazy = flatLazy(lazied);
|
243
|
+
const recursive = new Proxy(flattenLazy, {
|
244
|
+
get(target, key) {
|
245
|
+
if (typeof key !== "string") {
|
246
|
+
return Reflect.get(target, key);
|
247
|
+
}
|
248
|
+
const next = getRouterChild(flattenLazy, key);
|
249
|
+
return createAccessibleLazyRouter(next);
|
199
250
|
}
|
200
|
-
|
201
|
-
|
202
|
-
return [];
|
203
|
-
}
|
204
|
-
function mergeMiddlewares(first, second) {
|
205
|
-
return [...first, ...dedupeMiddlewares(first, second)];
|
206
|
-
}
|
207
|
-
function addMiddleware(middlewares, addition) {
|
208
|
-
return [...middlewares, addition];
|
251
|
+
});
|
252
|
+
return recursive;
|
209
253
|
}
|
210
254
|
|
211
|
-
// src/router.ts
|
212
255
|
function adaptRouter(router, options) {
|
213
256
|
if (isLazy(router)) {
|
214
257
|
const adapted2 = lazy(async () => {
|
@@ -272,23 +315,6 @@ function getRouterChild(router, ...path) {
|
|
272
315
|
return current;
|
273
316
|
}
|
274
317
|
|
275
|
-
// src/router-accessible-lazy.ts
|
276
|
-
function createAccessibleLazyRouter(lazied) {
|
277
|
-
const flattenLazy = flatLazy(lazied);
|
278
|
-
const recursive = new Proxy(flattenLazy, {
|
279
|
-
get(target, key) {
|
280
|
-
if (typeof key !== "string") {
|
281
|
-
return Reflect.get(target, key);
|
282
|
-
}
|
283
|
-
const next = getRouterChild(flattenLazy, key);
|
284
|
-
return createAccessibleLazyRouter(next);
|
285
|
-
}
|
286
|
-
});
|
287
|
-
return recursive;
|
288
|
-
}
|
289
|
-
|
290
|
-
// src/utils.ts
|
291
|
-
import { isContractProcedure as isContractProcedure2 } from "@orpc/contract";
|
292
318
|
function eachContractProcedure(options, callback, laziedOptions = []) {
|
293
319
|
const hiddenContract = getRouterContract(options.router);
|
294
320
|
if (hiddenContract) {
|
@@ -306,7 +332,7 @@ function eachContractProcedure(options, callback, laziedOptions = []) {
|
|
306
332
|
lazied: options.router,
|
307
333
|
path: options.path
|
308
334
|
});
|
309
|
-
} else if (
|
335
|
+
} else if (isContractProcedure(options.router)) {
|
310
336
|
callback({
|
311
337
|
contract: options.router,
|
312
338
|
path: options.path
|
@@ -329,10 +355,10 @@ async function eachAllContractProcedure(options, callback) {
|
|
329
355
|
const pending = [options];
|
330
356
|
for (const item of pending) {
|
331
357
|
const lazies = eachContractProcedure(item, callback);
|
332
|
-
for (const
|
333
|
-
const { default: router } = await unlazy(
|
358
|
+
for (const lazy of lazies) {
|
359
|
+
const { default: router } = await unlazy(lazy.lazied);
|
334
360
|
pending.push({
|
335
|
-
path:
|
361
|
+
path: lazy.path,
|
336
362
|
router
|
337
363
|
});
|
338
364
|
}
|
@@ -350,28 +376,4 @@ function createContractedProcedure(contract, procedure) {
|
|
350
376
|
});
|
351
377
|
}
|
352
378
|
|
353
|
-
export {
|
354
|
-
LAZY_LOADER_SYMBOL,
|
355
|
-
lazy,
|
356
|
-
isLazy,
|
357
|
-
unlazy,
|
358
|
-
Procedure,
|
359
|
-
isProcedure,
|
360
|
-
flatLazy,
|
361
|
-
createLazyProcedureFormAnyLazy,
|
362
|
-
addMiddleware,
|
363
|
-
middlewareOutputFn,
|
364
|
-
createProcedureClient,
|
365
|
-
setRouterContract,
|
366
|
-
getRouterContract,
|
367
|
-
deepSetLazyRouterPrefix,
|
368
|
-
getLazyRouterPrefix,
|
369
|
-
createAccessibleLazyRouter,
|
370
|
-
adaptRouter,
|
371
|
-
getRouterChild,
|
372
|
-
eachContractProcedure,
|
373
|
-
eachAllContractProcedure,
|
374
|
-
convertPathToHttpPath,
|
375
|
-
createContractedProcedure
|
376
|
-
};
|
377
|
-
//# sourceMappingURL=chunk-SV6DBVXJ.js.map
|
379
|
+
export { LAZY_LOADER_SYMBOL as L, Procedure as P, convertPathToHttpPath as a, createContractedProcedure as b, createProcedureClient as c, addMiddleware as d, eachContractProcedure as e, adaptRouter as f, getRouterChild as g, flatLazy as h, isProcedure as i, isLazy as j, createLazyProcedureFormAnyLazy as k, lazy as l, getRouterContract as m, deepSetLazyRouterPrefix as n, getLazyRouterPrefix as o, middlewareOutputFn as p, createAccessibleLazyRouter as q, eachAllContractProcedure as r, setRouterContract as s, unlazy as u };
|
@@ -0,0 +1,158 @@
|
|
1
|
+
import { ORPCErrorCode, ORPCErrorOptions, ORPCError, ClientContext, Client } from '@orpc/client';
|
2
|
+
import { IsNever, MaybeOptionalOptions, Promisable, Interceptor, Value } from '@orpc/shared';
|
3
|
+
import { ErrorMap, ErrorMapItem, SchemaInput, HTTPPath, Meta, Schema, ContractProcedureDef, SchemaOutput, ErrorFromErrorMap, AnyContractRouter, ContractProcedure, MergedErrorMap } from '@orpc/contract';
|
4
|
+
|
5
|
+
type Context = Record<string, any>;
|
6
|
+
type MergedContext<T extends Context, U extends Context> = T & U;
|
7
|
+
declare function mergeContext<T extends Context, U extends Context>(context: T, other: U): MergedContext<T, U>;
|
8
|
+
type ConflictContextGuard<T extends Context> = true extends IsNever<T> | {
|
9
|
+
[K in keyof T]: IsNever<T[K]>;
|
10
|
+
}[keyof T] ? never : unknown;
|
11
|
+
|
12
|
+
type ORPCErrorConstructorMapItemOptions<TData> = Omit<ORPCErrorOptions<TData>, 'defined' | 'status'>;
|
13
|
+
type ORPCErrorConstructorMapItem<TCode extends ORPCErrorCode, TInData> = (...rest: MaybeOptionalOptions<ORPCErrorConstructorMapItemOptions<TInData>>) => ORPCError<TCode, TInData>;
|
14
|
+
type ORPCErrorConstructorMap<T extends ErrorMap> = {
|
15
|
+
[K in keyof T]: K extends ORPCErrorCode ? T[K] extends ErrorMapItem<infer UInputSchema> ? ORPCErrorConstructorMapItem<K, SchemaInput<UInputSchema>> : never : never;
|
16
|
+
};
|
17
|
+
|
18
|
+
declare const LAZY_LOADER_SYMBOL: unique symbol;
|
19
|
+
interface LazyMeta {
|
20
|
+
prefix?: HTTPPath;
|
21
|
+
}
|
22
|
+
interface Lazy<T> {
|
23
|
+
[LAZY_LOADER_SYMBOL](): Promise<{
|
24
|
+
default: T;
|
25
|
+
}>;
|
26
|
+
}
|
27
|
+
type Lazyable<T> = T | Lazy<T>;
|
28
|
+
interface LazyOptions {
|
29
|
+
prefix?: HTTPPath;
|
30
|
+
}
|
31
|
+
declare function lazy<T>(loader: () => Promise<{
|
32
|
+
default: T;
|
33
|
+
}>): Lazy<T>;
|
34
|
+
declare function isLazy(item: unknown): item is Lazy<any>;
|
35
|
+
declare function unlazy<T extends Lazyable<any>>(lazied: T): Promise<{
|
36
|
+
default: T extends Lazy<infer U> ? U : T;
|
37
|
+
}>;
|
38
|
+
|
39
|
+
type MiddlewareResult<TOutContext extends Context, TOutput> = Promisable<{
|
40
|
+
output: TOutput;
|
41
|
+
context: TOutContext;
|
42
|
+
}>;
|
43
|
+
type MiddlewareNextFnOptions<TOutContext extends Context> = Record<never, never> extends TOutContext ? {
|
44
|
+
context?: TOutContext;
|
45
|
+
} : {
|
46
|
+
context: TOutContext;
|
47
|
+
};
|
48
|
+
interface MiddlewareNextFn<TInContext extends Context, TOutput> {
|
49
|
+
<U extends Context & Partial<TInContext> = Record<never, never>>(...rest: MaybeOptionalOptions<MiddlewareNextFnOptions<U>>): MiddlewareResult<U, TOutput>;
|
50
|
+
}
|
51
|
+
interface MiddlewareOutputFn<TOutput> {
|
52
|
+
(output: TOutput): MiddlewareResult<Record<never, never>, TOutput>;
|
53
|
+
}
|
54
|
+
interface MiddlewareOptions<TInContext extends Context, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
|
55
|
+
context: TInContext;
|
56
|
+
path: string[];
|
57
|
+
procedure: Procedure<Context, Context, Schema, Schema, unknown, ErrorMap, TMeta>;
|
58
|
+
signal?: AbortSignal;
|
59
|
+
lastEventId: string | undefined;
|
60
|
+
next: MiddlewareNextFn<TInContext, TOutput>;
|
61
|
+
errors: TErrorConstructorMap;
|
62
|
+
}
|
63
|
+
interface Middleware<TInContext extends Context, TOutContext extends Context, TInput, TOutput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
|
64
|
+
(options: MiddlewareOptions<TInContext, TOutput, TErrorConstructorMap, TMeta>, input: TInput, output: MiddlewareOutputFn<TOutput>): Promisable<MiddlewareResult<TOutContext, TOutput>>;
|
65
|
+
}
|
66
|
+
type AnyMiddleware = Middleware<any, any, any, any, any, any>;
|
67
|
+
interface MapInputMiddleware<TInput, TMappedInput> {
|
68
|
+
(input: TInput): TMappedInput;
|
69
|
+
}
|
70
|
+
declare function middlewareOutputFn<TOutput>(output: TOutput): MiddlewareResult<Record<never, never>, TOutput>;
|
71
|
+
|
72
|
+
interface ProcedureHandlerOptions<TCurrentContext extends Context, TInput, TErrorConstructorMap extends ORPCErrorConstructorMap<any>, TMeta extends Meta> {
|
73
|
+
context: TCurrentContext;
|
74
|
+
input: TInput;
|
75
|
+
path: string[];
|
76
|
+
procedure: Procedure<Context, Context, Schema, Schema, unknown, ErrorMap, TMeta>;
|
77
|
+
signal?: AbortSignal;
|
78
|
+
lastEventId: string | undefined;
|
79
|
+
errors: TErrorConstructorMap;
|
80
|
+
}
|
81
|
+
interface ProcedureHandler<TCurrentContext extends Context, TInput, THandlerOutput, TErrorMap extends ErrorMap, TMeta extends Meta> {
|
82
|
+
(opt: ProcedureHandlerOptions<TCurrentContext, TInput, ORPCErrorConstructorMap<TErrorMap>, TMeta>): Promisable<THandlerOutput>;
|
83
|
+
}
|
84
|
+
interface ProcedureDef<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput, TErrorMap extends ErrorMap, TMeta extends Meta> extends ContractProcedureDef<TInputSchema, TOutputSchema, TErrorMap, TMeta> {
|
85
|
+
__initialContext?: (type: TInitialContext) => unknown;
|
86
|
+
middlewares: AnyMiddleware[];
|
87
|
+
inputValidationIndex: number;
|
88
|
+
outputValidationIndex: number;
|
89
|
+
handler: ProcedureHandler<TCurrentContext, any, THandlerOutput, any, any>;
|
90
|
+
}
|
91
|
+
declare class Procedure<TInitialContext extends Context, TCurrentContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput, TErrorMap extends ErrorMap, TMeta extends Meta> {
|
92
|
+
'~orpc': ProcedureDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta>;
|
93
|
+
constructor(def: ProcedureDef<TInitialContext, TCurrentContext, TInputSchema, TOutputSchema, THandlerOutput, TErrorMap, TMeta>);
|
94
|
+
}
|
95
|
+
type AnyProcedure = Procedure<any, any, any, any, any, any, any>;
|
96
|
+
declare function isProcedure(item: unknown): item is AnyProcedure;
|
97
|
+
|
98
|
+
type ProcedureClient<TClientContext extends ClientContext, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput, TErrorMap extends ErrorMap> = Client<TClientContext, SchemaInput<TInputSchema>, SchemaOutput<TOutputSchema, THandlerOutput>, ErrorFromErrorMap<TErrorMap>>;
|
99
|
+
interface ProcedureClientInterceptorOptions<TInitialContext extends Context, TInputSchema extends Schema, TErrorMap extends ErrorMap, TMeta extends Meta> {
|
100
|
+
context: TInitialContext;
|
101
|
+
input: SchemaInput<TInputSchema>;
|
102
|
+
errors: ORPCErrorConstructorMap<TErrorMap>;
|
103
|
+
path: string[];
|
104
|
+
procedure: Procedure<Context, Context, Schema, Schema, unknown, ErrorMap, TMeta>;
|
105
|
+
signal?: AbortSignal;
|
106
|
+
lastEventId: string | undefined;
|
107
|
+
}
|
108
|
+
/**
|
109
|
+
* Options for creating a procedure caller with comprehensive type safety
|
110
|
+
*/
|
111
|
+
type CreateProcedureClientOptions<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput, TErrorMap extends ErrorMap, TMeta extends Meta, TClientContext extends ClientContext> = {
|
112
|
+
/**
|
113
|
+
* This is helpful for logging and analytics.
|
114
|
+
*/
|
115
|
+
path?: string[];
|
116
|
+
interceptors?: Interceptor<ProcedureClientInterceptorOptions<TInitialContext, TInputSchema, TErrorMap, TMeta>, SchemaOutput<TOutputSchema, THandlerOutput>, ErrorFromErrorMap<TErrorMap>>[];
|
117
|
+
} & (Record<never, never> extends TInitialContext ? {
|
118
|
+
context?: Value<TInitialContext, [clientContext: TClientContext]>;
|
119
|
+
} : {
|
120
|
+
context: Value<TInitialContext, [clientContext: TClientContext]>;
|
121
|
+
});
|
122
|
+
declare function createProcedureClient<TInitialContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput, 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>;
|
123
|
+
|
124
|
+
type AccessibleLazyRouter<T extends AnyRouter | undefined | Lazy<AnyRouter | undefined>> = T extends Lazy<infer U extends AnyRouter | undefined | Lazy<AnyRouter | undefined>> ? AccessibleLazyRouter<U> : Lazy<T> & (T extends AnyProcedure | undefined ? unknown : {
|
125
|
+
[K in keyof T]: T[K] extends AnyRouter ? AccessibleLazyRouter<T[K]> : never;
|
126
|
+
});
|
127
|
+
declare function createAccessibleLazyRouter<T extends Lazy<AnyRouter | undefined>>(lazied: T): AccessibleLazyRouter<T>;
|
128
|
+
|
129
|
+
type Router<TInitialContext extends Context, TContract extends AnyContractRouter> = Lazyable<TContract extends ContractProcedure<infer UInputSchema, infer UOutputSchema, infer UErrorMap, infer UMeta> ? Procedure<TInitialContext, any, UInputSchema, UOutputSchema, any, UErrorMap, UMeta> : {
|
130
|
+
[K in keyof TContract]: TContract[K] extends AnyContractRouter ? Router<TInitialContext, TContract[K]> : never;
|
131
|
+
}>;
|
132
|
+
type AnyRouter = Router<any, any>;
|
133
|
+
type InferRouterInitialContext<T extends AnyRouter> = T extends Router<infer UInitialContext, any> ? UInitialContext : never;
|
134
|
+
type InferRouterInitialContexts<T extends AnyRouter> = T extends Lazy<infer U extends AnyRouter> ? InferRouterInitialContexts<U> : T extends Procedure<infer UInitialContext, any, any, any, any, any, any> ? UInitialContext : {
|
135
|
+
[K in keyof T]: T[K] extends AnyRouter ? InferRouterInitialContexts<T[K]> : never;
|
136
|
+
};
|
137
|
+
type InferRouterCurrentContexts<T extends AnyRouter> = T extends Lazy<infer U extends AnyRouter> ? InferRouterCurrentContexts<U> : T extends Procedure<any, infer UCurrentContext, any, any, any, any, any> ? UCurrentContext : {
|
138
|
+
[K in keyof T]: T[K] extends AnyRouter ? InferRouterCurrentContexts<T[K]> : never;
|
139
|
+
};
|
140
|
+
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> : {
|
141
|
+
[K in keyof T]: T[K] extends AnyRouter ? InferRouterInputs<T[K]> : never;
|
142
|
+
};
|
143
|
+
type InferRouterOutputs<T extends AnyRouter> = T extends Lazy<infer U extends AnyRouter> ? InferRouterOutputs<U> : T extends Procedure<any, any, any, infer UOutputSchema, infer UFuncOutput, any, any> ? SchemaOutput<UOutputSchema, UFuncOutput> : {
|
144
|
+
[K in keyof T]: T[K] extends AnyRouter ? InferRouterOutputs<T[K]> : never;
|
145
|
+
};
|
146
|
+
type AdaptedRouter<TRouter extends AnyRouter, TInitialContext extends Context, TErrorMap extends ErrorMap> = TRouter extends Lazy<infer U extends AnyRouter> ? AccessibleLazyRouter<AdaptedRouter<U, TInitialContext, TErrorMap>> : TRouter extends Procedure<any, infer UCurrentContext, infer UInputSchema, infer UOutputSchema, infer UFuncOutput, infer UErrorMap, infer UMeta> ? Procedure<TInitialContext, UCurrentContext, UInputSchema, UOutputSchema, UFuncOutput, MergedErrorMap<TErrorMap, UErrorMap>, UMeta> : {
|
147
|
+
[K in keyof TRouter]: TRouter[K] extends AnyRouter ? AdaptedRouter<TRouter[K], TInitialContext, TErrorMap> : never;
|
148
|
+
};
|
149
|
+
interface AdaptRouterOptions<TErrorMap extends ErrorMap> {
|
150
|
+
middlewares: AnyMiddleware[];
|
151
|
+
tags?: readonly string[];
|
152
|
+
prefix?: HTTPPath;
|
153
|
+
errorMap: TErrorMap;
|
154
|
+
}
|
155
|
+
declare function adaptRouter<TRouter extends AnyRouter, TInitialContext extends Context, TErrorMap extends ErrorMap>(router: TRouter, options: AdaptRouterOptions<TErrorMap>): AdaptedRouter<TRouter, TInitialContext, TErrorMap>;
|
156
|
+
declare function getRouterChild<T extends AnyRouter | Lazy<undefined>>(router: T, ...path: string[]): T extends Lazy<any> ? Lazy<AnyProcedure> | Lazy<Record<string, AnyRouter>> | Lazy<undefined> : AnyRouter | Lazy<undefined> | undefined;
|
157
|
+
|
158
|
+
export { type AnyProcedure as A, type ProcedureDef as B, type Context as C, isProcedure as D, createProcedureClient as E, type InferRouterInitialContexts as F, type InferRouterCurrentContexts as G, type InferRouterInputs as H, type InferRouterInitialContext as I, type InferRouterOutputs as J, adaptRouter as K, type Lazy as L, type Middleware as M, getRouterChild as N, type ORPCErrorConstructorMap as O, type ProcedureClientInterceptorOptions as P, type AccessibleLazyRouter as Q, type Router as R, createAccessibleLazyRouter as S, type AnyRouter as a, Procedure as b, type ConflictContextGuard as c, type MergedContext as d, type MapInputMiddleware as e, type CreateProcedureClientOptions as f, type ProcedureClient as g, type ProcedureHandler as h, type AdaptRouterOptions as i, type AdaptedRouter as j, type AnyMiddleware as k, type Lazyable as l, mergeContext as m, LAZY_LOADER_SYMBOL as n, type LazyMeta as o, type LazyOptions as p, lazy as q, isLazy as r, type MiddlewareResult as s, type MiddlewareNextFnOptions as t, unlazy as u, type MiddlewareNextFn as v, type MiddlewareOutputFn as w, type MiddlewareOptions as x, middlewareOutputFn as y, type ProcedureHandlerOptions as z };
|