@orpc/server 0.0.0-next.73eb96a → 0.0.0-next.7e55b05

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.
@@ -0,0 +1,303 @@
1
+ import {
2
+ __export,
3
+ createProcedureClient,
4
+ getRouterChild,
5
+ isProcedure,
6
+ unlazy
7
+ } from "./chunk-E7GUWVR4.js";
8
+
9
+ // src/adapters/fetch/super-json.ts
10
+ var super_json_exports = {};
11
+ __export(super_json_exports, {
12
+ deserialize: () => deserialize,
13
+ serialize: () => serialize
14
+ });
15
+
16
+ // ../../node_modules/.pnpm/is-what@5.0.2/node_modules/is-what/dist/getType.js
17
+ function getType(payload) {
18
+ return Object.prototype.toString.call(payload).slice(8, -1);
19
+ }
20
+
21
+ // ../../node_modules/.pnpm/is-what@5.0.2/node_modules/is-what/dist/isPlainObject.js
22
+ function isPlainObject(payload) {
23
+ if (getType(payload) !== "Object")
24
+ return false;
25
+ const prototype = Object.getPrototypeOf(payload);
26
+ return !!prototype && prototype.constructor === Object && prototype === Object.prototype;
27
+ }
28
+
29
+ // src/adapters/fetch/super-json.ts
30
+ function serialize(value, segments = [], meta = []) {
31
+ if (typeof value === "bigint") {
32
+ meta.push(["bigint", segments]);
33
+ return { data: value.toString(), meta };
34
+ }
35
+ if (value instanceof Date) {
36
+ meta.push(["date", segments]);
37
+ const data = Number.isNaN(value.getTime()) ? "Invalid Date" : value.toISOString();
38
+ return { data, meta };
39
+ }
40
+ if (Number.isNaN(value)) {
41
+ meta.push(["nan", segments]);
42
+ return { data: "NaN", meta };
43
+ }
44
+ if (value instanceof RegExp) {
45
+ meta.push(["regexp", segments]);
46
+ return { data: value.toString(), meta };
47
+ }
48
+ if (value instanceof URL) {
49
+ meta.push(["url", segments]);
50
+ return { data: value.toString(), meta };
51
+ }
52
+ if (isPlainObject(value)) {
53
+ const data = {};
54
+ for (const k in value) {
55
+ data[k] = serialize(value[k], [...segments, k], meta).data;
56
+ }
57
+ return { data, meta };
58
+ }
59
+ if (Array.isArray(value)) {
60
+ const data = value.map((v, i) => {
61
+ if (v === void 0) {
62
+ meta.push(["undefined", [...segments, i]]);
63
+ return null;
64
+ }
65
+ return serialize(v, [...segments, i], meta).data;
66
+ });
67
+ return { data, meta };
68
+ }
69
+ if (value instanceof Set) {
70
+ const result = serialize(Array.from(value), segments, meta);
71
+ meta.push(["set", segments]);
72
+ return result;
73
+ }
74
+ if (value instanceof Map) {
75
+ const result = serialize(Array.from(value.entries()), segments, meta);
76
+ meta.push(["map", segments]);
77
+ return result;
78
+ }
79
+ return { data: value, meta };
80
+ }
81
+ function deserialize({
82
+ data,
83
+ meta
84
+ }) {
85
+ if (meta.length === 0) {
86
+ return data;
87
+ }
88
+ const ref = { data };
89
+ for (const [type, segments] of meta) {
90
+ let currentRef = ref;
91
+ let preSegment = "data";
92
+ for (let i = 0; i < segments.length; i++) {
93
+ currentRef = currentRef[preSegment];
94
+ preSegment = segments[i];
95
+ }
96
+ switch (type) {
97
+ case "nan":
98
+ currentRef[preSegment] = Number.NaN;
99
+ break;
100
+ case "bigint":
101
+ currentRef[preSegment] = BigInt(currentRef[preSegment]);
102
+ break;
103
+ case "date":
104
+ currentRef[preSegment] = new Date(currentRef[preSegment]);
105
+ break;
106
+ case "regexp": {
107
+ const [, pattern, flags] = currentRef[preSegment].match(/^\/(.*)\/([a-z]*)$/);
108
+ currentRef[preSegment] = new RegExp(pattern, flags);
109
+ break;
110
+ }
111
+ case "url":
112
+ currentRef[preSegment] = new URL(currentRef[preSegment]);
113
+ break;
114
+ case "undefined":
115
+ currentRef[preSegment] = void 0;
116
+ break;
117
+ case "map":
118
+ currentRef[preSegment] = new Map(currentRef[preSegment]);
119
+ break;
120
+ case "set":
121
+ currentRef[preSegment] = new Set(currentRef[preSegment]);
122
+ break;
123
+ /* v8 ignore next 3 */
124
+ default: {
125
+ const _expected = type;
126
+ }
127
+ }
128
+ }
129
+ return ref.data;
130
+ }
131
+
132
+ // src/adapters/fetch/orpc-payload-codec.ts
133
+ import { findDeepMatches, set } from "@orpc/shared";
134
+ import { ORPCError } from "@orpc/shared/error";
135
+ var ORPCPayloadCodec = class {
136
+ /**
137
+ * If method is GET, the payload will be encoded as query string.
138
+ * If method is GET and payload contain file, the method will be fallback to fallbackMethod. (fallbackMethod = GET will force to use GET method)
139
+ */
140
+ encode(payload, method = "POST", fallbackMethod = "POST") {
141
+ const { data, meta } = serialize(payload);
142
+ const { maps, values } = findDeepMatches((v) => v instanceof Blob, data);
143
+ if (method === "GET" && (values.length === 0 || fallbackMethod === "GET")) {
144
+ const query = new URLSearchParams({
145
+ data: JSON.stringify(data),
146
+ meta: JSON.stringify(meta)
147
+ });
148
+ return {
149
+ query,
150
+ method: "GET"
151
+ };
152
+ }
153
+ const nonGETMethod = method === "GET" ? fallbackMethod : method;
154
+ if (values.length > 0) {
155
+ const form = new FormData();
156
+ if (data !== void 0) {
157
+ form.append("data", JSON.stringify(data));
158
+ }
159
+ form.append("meta", JSON.stringify(meta));
160
+ form.append("maps", JSON.stringify(maps));
161
+ for (const i in values) {
162
+ const value = values[i];
163
+ form.append(i, value);
164
+ }
165
+ return {
166
+ body: form,
167
+ method: nonGETMethod
168
+ };
169
+ }
170
+ return {
171
+ body: JSON.stringify({ data, meta }),
172
+ headers: new Headers({
173
+ "content-type": "application/json"
174
+ }),
175
+ method: nonGETMethod
176
+ };
177
+ }
178
+ async decode(re) {
179
+ try {
180
+ if ("method" in re && re.method === "GET") {
181
+ const url = new URL(re.url);
182
+ const query = url.searchParams;
183
+ const data = JSON.parse(query.getAll("data").at(-1));
184
+ const meta = JSON.parse(query.getAll("meta").at(-1));
185
+ return deserialize({
186
+ data,
187
+ meta
188
+ });
189
+ }
190
+ if (re.headers.get("content-type")?.startsWith("multipart/form-data")) {
191
+ const form = await re.formData();
192
+ const rawData = form.get("data");
193
+ const rawMeta = form.get("meta");
194
+ const rawMaps = form.get("maps");
195
+ let data = JSON.parse(rawData);
196
+ const meta = JSON.parse(rawMeta);
197
+ const maps = JSON.parse(rawMaps);
198
+ for (const i in maps) {
199
+ data = set(data, maps[i], form.get(i));
200
+ }
201
+ return deserialize({
202
+ data,
203
+ meta
204
+ });
205
+ }
206
+ const json = await re.json();
207
+ return deserialize(json);
208
+ } catch (e) {
209
+ throw new ORPCError({
210
+ code: "BAD_REQUEST",
211
+ message: "Cannot parse request/response. Please check the request/response body and Content-Type header.",
212
+ cause: e
213
+ });
214
+ }
215
+ }
216
+ };
217
+
218
+ // src/adapters/fetch/orpc-procedure-matcher.ts
219
+ import { trim } from "@orpc/shared";
220
+ var ORPCProcedureMatcher = class {
221
+ constructor(router) {
222
+ this.router = router;
223
+ }
224
+ async match(pathname) {
225
+ const path = trim(pathname, "/").split("/").map(decodeURIComponent);
226
+ const match = getRouterChild(this.router, ...path);
227
+ const { default: maybeProcedure } = await unlazy(match);
228
+ if (!isProcedure(maybeProcedure)) {
229
+ return void 0;
230
+ }
231
+ return {
232
+ procedure: maybeProcedure,
233
+ path
234
+ };
235
+ }
236
+ };
237
+
238
+ // src/adapters/fetch/orpc-handler.ts
239
+ import { executeWithHooks, ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE, trim as trim2 } from "@orpc/shared";
240
+ import { ORPCError as ORPCError2 } from "@orpc/shared/error";
241
+ var ORPCHandler = class {
242
+ constructor(router, options) {
243
+ this.router = router;
244
+ this.options = options;
245
+ this.procedureMatcher = options?.procedureMatcher ?? new ORPCProcedureMatcher(router);
246
+ this.payloadCodec = options?.payloadCodec ?? new ORPCPayloadCodec();
247
+ }
248
+ procedureMatcher;
249
+ payloadCodec;
250
+ condition(request) {
251
+ return Boolean(request.headers.get(ORPC_HANDLER_HEADER)?.includes(ORPC_HANDLER_VALUE));
252
+ }
253
+ async fetch(request, ...[options]) {
254
+ const context = options?.context;
255
+ const execute = async () => {
256
+ const url = new URL(request.url);
257
+ const pathname = `/${trim2(url.pathname.replace(options?.prefix ?? "", ""), "/")}`;
258
+ const match = await this.procedureMatcher.match(pathname);
259
+ if (!match) {
260
+ throw new ORPCError2({ code: "NOT_FOUND", message: "Not found" });
261
+ }
262
+ const input = await this.payloadCodec.decode(request);
263
+ const client = createProcedureClient({
264
+ context,
265
+ procedure: match.procedure,
266
+ path: match.path
267
+ });
268
+ const output = await client(input, { signal: options?.signal });
269
+ const { body, headers } = this.payloadCodec.encode(output);
270
+ return new Response(body, { headers });
271
+ };
272
+ try {
273
+ return await executeWithHooks({
274
+ context,
275
+ execute,
276
+ input: request,
277
+ hooks: this.options,
278
+ meta: {
279
+ signal: options?.signal
280
+ }
281
+ });
282
+ } catch (e) {
283
+ const error = e instanceof ORPCError2 ? e : new ORPCError2({
284
+ code: "INTERNAL_SERVER_ERROR",
285
+ message: "Internal server error",
286
+ cause: e
287
+ });
288
+ const { body, headers } = this.payloadCodec.encode(error.toJSON());
289
+ return new Response(body, {
290
+ headers,
291
+ status: error.status
292
+ });
293
+ }
294
+ }
295
+ };
296
+
297
+ export {
298
+ super_json_exports,
299
+ ORPCPayloadCodec,
300
+ ORPCProcedureMatcher,
301
+ ORPCHandler
302
+ };
303
+ //# sourceMappingURL=chunk-6BY63WA5.js.map
@@ -74,12 +74,13 @@ function createProcedureClient(options) {
74
74
  };
75
75
  const executeWithValidation = async () => {
76
76
  const validInput = await validateInput(procedure, input);
77
- const output = await executeMiddlewareChain(
78
- procedure,
79
- validInput,
77
+ const output = await executeMiddlewareChain({
80
78
  context,
81
- meta
82
- );
79
+ input: validInput,
80
+ path,
81
+ procedure,
82
+ signal: callerOptions?.signal
83
+ });
83
84
  return validateOutput(procedure, output);
84
85
  };
85
86
  return executeWithHooks({
@@ -119,23 +120,19 @@ async function validateOutput(procedure, output) {
119
120
  }
120
121
  return result.value;
121
122
  }
122
- async function executeMiddlewareChain(procedure, input, context, meta) {
123
- const middlewares = procedure["~orpc"].middlewares ?? [];
123
+ async function executeMiddlewareChain(opt) {
124
+ const middlewares = opt.procedure["~orpc"].middlewares ?? [];
124
125
  let currentMidIndex = 0;
125
- let currentContext = context;
126
+ let currentContext = opt.context;
126
127
  const next = async (nextOptions) => {
127
128
  const mid = middlewares[currentMidIndex];
128
129
  currentMidIndex += 1;
129
130
  currentContext = mergeContext(currentContext, nextOptions.context);
130
131
  if (mid) {
131
- return await mid(input, currentContext, {
132
- ...meta,
133
- next,
134
- output: (output) => ({ output, context: void 0 })
135
- });
132
+ return await mid({ ...opt, context: currentContext, next }, opt.input, (output) => ({ output, context: void 0 }));
136
133
  }
137
134
  const result = {
138
- output: await procedure["~orpc"].handler(input, currentContext, meta),
135
+ output: await opt.procedure["~orpc"].handler({ ...opt, context: currentContext }),
139
136
  context: currentContext
140
137
  };
141
138
  return result;
@@ -186,4 +183,4 @@ export {
186
183
  createProcedureClient,
187
184
  getRouterChild
188
185
  };
189
- //# sourceMappingURL=chunk-6A7XHEBH.js.map
186
+ //# sourceMappingURL=chunk-E7GUWVR4.js.map
package/dist/fetch.js CHANGED
@@ -1,12 +1,12 @@
1
1
  import {
2
- __export,
3
- createProcedureClient,
4
- getRouterChild,
5
- isProcedure,
6
- unlazy
7
- } from "./chunk-6A7XHEBH.js";
2
+ ORPCHandler,
3
+ ORPCPayloadCodec,
4
+ ORPCProcedureMatcher,
5
+ super_json_exports
6
+ } from "./chunk-6BY63WA5.js";
7
+ import "./chunk-E7GUWVR4.js";
8
8
 
9
- // src/fetch/composite-handler.ts
9
+ // src/adapters/fetch/composite-handler.ts
10
10
  var CompositeHandler = class {
11
11
  constructor(handlers) {
12
12
  this.handlers = handlers;
@@ -22,298 +22,6 @@ var CompositeHandler = class {
22
22
  });
23
23
  }
24
24
  };
25
-
26
- // src/fetch/orpc-handler.ts
27
- import { executeWithHooks, ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE, trim as trim2 } from "@orpc/shared";
28
- import { ORPCError as ORPCError2 } from "@orpc/shared/error";
29
-
30
- // src/fetch/orpc-payload-codec.ts
31
- import { findDeepMatches, set } from "@orpc/shared";
32
- import { ORPCError } from "@orpc/shared/error";
33
-
34
- // src/fetch/super-json.ts
35
- var super_json_exports = {};
36
- __export(super_json_exports, {
37
- deserialize: () => deserialize,
38
- serialize: () => serialize
39
- });
40
-
41
- // ../../node_modules/.pnpm/is-what@5.0.2/node_modules/is-what/dist/getType.js
42
- function getType(payload) {
43
- return Object.prototype.toString.call(payload).slice(8, -1);
44
- }
45
-
46
- // ../../node_modules/.pnpm/is-what@5.0.2/node_modules/is-what/dist/isPlainObject.js
47
- function isPlainObject(payload) {
48
- if (getType(payload) !== "Object")
49
- return false;
50
- const prototype = Object.getPrototypeOf(payload);
51
- return !!prototype && prototype.constructor === Object && prototype === Object.prototype;
52
- }
53
-
54
- // src/fetch/super-json.ts
55
- function serialize(value, segments = [], meta = []) {
56
- if (typeof value === "bigint") {
57
- meta.push(["bigint", segments]);
58
- return { data: value.toString(), meta };
59
- }
60
- if (value instanceof Date) {
61
- meta.push(["date", segments]);
62
- const data = Number.isNaN(value.getTime()) ? "Invalid Date" : value.toISOString();
63
- return { data, meta };
64
- }
65
- if (Number.isNaN(value)) {
66
- meta.push(["nan", segments]);
67
- return { data: "NaN", meta };
68
- }
69
- if (value instanceof RegExp) {
70
- meta.push(["regexp", segments]);
71
- return { data: value.toString(), meta };
72
- }
73
- if (value instanceof URL) {
74
- meta.push(["url", segments]);
75
- return { data: value.toString(), meta };
76
- }
77
- if (isPlainObject(value)) {
78
- const data = {};
79
- for (const k in value) {
80
- data[k] = serialize(value[k], [...segments, k], meta).data;
81
- }
82
- return { data, meta };
83
- }
84
- if (Array.isArray(value)) {
85
- const data = value.map((v, i) => {
86
- if (v === void 0) {
87
- meta.push(["undefined", [...segments, i]]);
88
- return null;
89
- }
90
- return serialize(v, [...segments, i], meta).data;
91
- });
92
- return { data, meta };
93
- }
94
- if (value instanceof Set) {
95
- const result = serialize(Array.from(value), segments, meta);
96
- meta.push(["set", segments]);
97
- return result;
98
- }
99
- if (value instanceof Map) {
100
- const result = serialize(Array.from(value.entries()), segments, meta);
101
- meta.push(["map", segments]);
102
- return result;
103
- }
104
- return { data: value, meta };
105
- }
106
- function deserialize({
107
- data,
108
- meta
109
- }) {
110
- if (meta.length === 0) {
111
- return data;
112
- }
113
- const ref = { data };
114
- for (const [type, segments] of meta) {
115
- let currentRef = ref;
116
- let preSegment = "data";
117
- for (let i = 0; i < segments.length; i++) {
118
- currentRef = currentRef[preSegment];
119
- preSegment = segments[i];
120
- }
121
- switch (type) {
122
- case "nan":
123
- currentRef[preSegment] = Number.NaN;
124
- break;
125
- case "bigint":
126
- currentRef[preSegment] = BigInt(currentRef[preSegment]);
127
- break;
128
- case "date":
129
- currentRef[preSegment] = new Date(currentRef[preSegment]);
130
- break;
131
- case "regexp": {
132
- const [, pattern, flags] = currentRef[preSegment].match(/^\/(.*)\/([a-z]*)$/);
133
- currentRef[preSegment] = new RegExp(pattern, flags);
134
- break;
135
- }
136
- case "url":
137
- currentRef[preSegment] = new URL(currentRef[preSegment]);
138
- break;
139
- case "undefined":
140
- currentRef[preSegment] = void 0;
141
- break;
142
- case "map":
143
- currentRef[preSegment] = new Map(currentRef[preSegment]);
144
- break;
145
- case "set":
146
- currentRef[preSegment] = new Set(currentRef[preSegment]);
147
- break;
148
- /* v8 ignore next 3 */
149
- default: {
150
- const _expected = type;
151
- }
152
- }
153
- }
154
- return ref.data;
155
- }
156
-
157
- // src/fetch/orpc-payload-codec.ts
158
- var ORPCPayloadCodec = class {
159
- /**
160
- * If method is GET, the payload will be encoded as query string.
161
- * If method is GET and payload contain file, the method will be fallback to fallbackMethod. (fallbackMethod = GET will force to use GET method)
162
- */
163
- encode(payload, method = "POST", fallbackMethod = "POST") {
164
- const { data, meta } = serialize(payload);
165
- const { maps, values } = findDeepMatches((v) => v instanceof Blob, data);
166
- if (method === "GET" && (values.length === 0 || fallbackMethod === "GET")) {
167
- const query = new URLSearchParams({
168
- data: JSON.stringify(data),
169
- meta: JSON.stringify(meta)
170
- });
171
- return {
172
- query,
173
- method: "GET"
174
- };
175
- }
176
- const nonGETMethod = method === "GET" ? fallbackMethod : method;
177
- if (values.length > 0) {
178
- const form = new FormData();
179
- if (data !== void 0) {
180
- form.append("data", JSON.stringify(data));
181
- }
182
- form.append("meta", JSON.stringify(meta));
183
- form.append("maps", JSON.stringify(maps));
184
- for (const i in values) {
185
- const value = values[i];
186
- form.append(i, value);
187
- }
188
- return {
189
- body: form,
190
- method: nonGETMethod
191
- };
192
- }
193
- return {
194
- body: JSON.stringify({ data, meta }),
195
- headers: new Headers({
196
- "content-type": "application/json"
197
- }),
198
- method: nonGETMethod
199
- };
200
- }
201
- async decode(re) {
202
- try {
203
- if ("method" in re && re.method === "GET") {
204
- const url = new URL(re.url);
205
- const query = url.searchParams;
206
- const data = JSON.parse(query.getAll("data").at(-1));
207
- const meta = JSON.parse(query.getAll("meta").at(-1));
208
- return deserialize({
209
- data,
210
- meta
211
- });
212
- }
213
- if (re.headers.get("content-type")?.startsWith("multipart/form-data")) {
214
- const form = await re.formData();
215
- const rawData = form.get("data");
216
- const rawMeta = form.get("meta");
217
- const rawMaps = form.get("maps");
218
- let data = JSON.parse(rawData);
219
- const meta = JSON.parse(rawMeta);
220
- const maps = JSON.parse(rawMaps);
221
- for (const i in maps) {
222
- data = set(data, maps[i], form.get(i));
223
- }
224
- return deserialize({
225
- data,
226
- meta
227
- });
228
- }
229
- const json = await re.json();
230
- return deserialize(json);
231
- } catch (e) {
232
- throw new ORPCError({
233
- code: "BAD_REQUEST",
234
- message: "Cannot parse request/response. Please check the request/response body and Content-Type header.",
235
- cause: e
236
- });
237
- }
238
- }
239
- };
240
-
241
- // src/fetch/orpc-procedure-matcher.ts
242
- import { trim } from "@orpc/shared";
243
- var ORPCProcedureMatcher = class {
244
- constructor(router) {
245
- this.router = router;
246
- }
247
- async match(pathname) {
248
- const path = trim(pathname, "/").split("/").map(decodeURIComponent);
249
- const match = getRouterChild(this.router, ...path);
250
- const { default: maybeProcedure } = await unlazy(match);
251
- if (!isProcedure(maybeProcedure)) {
252
- return void 0;
253
- }
254
- return {
255
- procedure: maybeProcedure,
256
- path
257
- };
258
- }
259
- };
260
-
261
- // src/fetch/orpc-handler.ts
262
- var ORPCHandler = class {
263
- constructor(router, options) {
264
- this.router = router;
265
- this.options = options;
266
- this.procedureMatcher = options?.procedureMatcher ?? new ORPCProcedureMatcher(router);
267
- this.payloadCodec = options?.payloadCodec ?? new ORPCPayloadCodec();
268
- }
269
- procedureMatcher;
270
- payloadCodec;
271
- condition(request) {
272
- return Boolean(request.headers.get(ORPC_HANDLER_HEADER)?.includes(ORPC_HANDLER_VALUE));
273
- }
274
- async fetch(request, ...[options]) {
275
- const context = options?.context;
276
- const execute = async () => {
277
- const url = new URL(request.url);
278
- const pathname = `/${trim2(url.pathname.replace(options?.prefix ?? "", ""), "/")}`;
279
- const match = await this.procedureMatcher.match(pathname);
280
- if (!match) {
281
- throw new ORPCError2({ code: "NOT_FOUND", message: "Not found" });
282
- }
283
- const input = await this.payloadCodec.decode(request);
284
- const client = createProcedureClient({
285
- context,
286
- procedure: match.procedure,
287
- path: match.path
288
- });
289
- const output = await client(input, { signal: options?.signal });
290
- const { body, headers } = this.payloadCodec.encode(output);
291
- return new Response(body, { headers });
292
- };
293
- try {
294
- return await executeWithHooks({
295
- context,
296
- execute,
297
- input: request,
298
- hooks: this.options,
299
- meta: {
300
- signal: options?.signal
301
- }
302
- });
303
- } catch (e) {
304
- const error = e instanceof ORPCError2 ? e : new ORPCError2({
305
- code: "INTERNAL_SERVER_ERROR",
306
- message: "Internal server error",
307
- cause: e
308
- });
309
- const { body, headers } = this.payloadCodec.encode(error.toJSON());
310
- return new Response(body, {
311
- headers,
312
- status: error.status
313
- });
314
- }
315
- }
316
- };
317
25
  export {
318
26
  CompositeHandler,
319
27
  ORPCHandler,
package/dist/index.js CHANGED
@@ -9,7 +9,7 @@ import {
9
9
  lazy,
10
10
  mergeContext,
11
11
  unlazy
12
- } from "./chunk-6A7XHEBH.js";
12
+ } from "./chunk-E7GUWVR4.js";
13
13
 
14
14
  // src/builder.ts
15
15
  import { ContractProcedure } from "@orpc/contract";
@@ -23,17 +23,17 @@ function decorateMiddleware(middleware) {
23
23
  const decorated = middleware;
24
24
  decorated.mapInput = (mapInput) => {
25
25
  const mapped = decorateMiddleware(
26
- (input, ...rest) => middleware(mapInput(input), ...rest)
26
+ (options, input, ...rest) => middleware(options, mapInput(input), ...rest)
27
27
  );
28
28
  return mapped;
29
29
  };
30
30
  decorated.concat = (concatMiddleware, mapInput) => {
31
31
  const mapped = mapInput ? decorateMiddleware(concatMiddleware).mapInput(mapInput) : concatMiddleware;
32
- const concatted = decorateMiddleware((input, context, meta, ...rest) => {
33
- const next = async (options) => {
34
- return mapped(input, mergeContext(context, options.context), meta, ...rest);
32
+ const concatted = decorateMiddleware((options, input, output, ...rest) => {
33
+ const next = async (nextOptions) => {
34
+ return mapped({ ...options, context: mergeContext(nextOptions.context, options.context) }, input, output, ...rest);
35
35
  };
36
- const merged = middleware(input, context, { ...meta, next }, ...rest);
36
+ const merged = middleware({ ...options, next }, input, output, ...rest);
37
37
  return merged;
38
38
  });
39
39
  return concatted;
@@ -486,6 +486,7 @@ function createRouterClient(options) {
486
486
  }
487
487
 
488
488
  // src/index.ts
489
+ import { configGlobal, fallbackToGlobalConfig } from "@orpc/contract";
489
490
  export * from "@orpc/shared/error";
490
491
  var os = new Builder({});
491
492
  export {
@@ -496,6 +497,7 @@ export {
496
497
  ProcedureImplementer,
497
498
  RouterBuilder,
498
499
  RouterImplementer,
500
+ configGlobal,
499
501
  createChainableImplementer,
500
502
  createProcedureClient,
501
503
  createRouterClient,
@@ -503,6 +505,7 @@ export {
503
505
  decorateMiddleware,
504
506
  decorateProcedure,
505
507
  deepSetLazyRouterPrefix,
508
+ fallbackToGlobalConfig,
506
509
  flatLazy,
507
510
  getLazyRouterPrefix,
508
511
  getRouterChild,
package/dist/node.js ADDED
@@ -0,0 +1,45 @@
1
+ import {
2
+ ORPCHandler
3
+ } from "./chunk-6BY63WA5.js";
4
+ import "./chunk-E7GUWVR4.js";
5
+
6
+ // src/adapters/node/composite-handler.ts
7
+ var CompositeHandler = class {
8
+ constructor(handlers) {
9
+ this.handlers = handlers;
10
+ }
11
+ async handle(req, res, ...opt) {
12
+ for (const handler of this.handlers) {
13
+ if (handler.condition(req)) {
14
+ return handler.handle(req, res, ...opt);
15
+ }
16
+ }
17
+ res.statusCode = 404;
18
+ res.end("None of the handlers can handle the request.");
19
+ }
20
+ };
21
+
22
+ // src/adapters/node/orpc-handler.ts
23
+ import { createRequest, sendResponse } from "@mjackson/node-fetch-server";
24
+ import { ORPC_HANDLER_HEADER, ORPC_HANDLER_VALUE } from "@orpc/shared";
25
+ var ORPCHandler2 = class {
26
+ orpcFetchHandler;
27
+ constructor(router, options) {
28
+ this.orpcFetchHandler = new ORPCHandler(router, options);
29
+ }
30
+ condition(request) {
31
+ return Boolean(request.headers[ORPC_HANDLER_HEADER]?.includes(ORPC_HANDLER_VALUE));
32
+ }
33
+ async handle(req, res, ...[options]) {
34
+ const request = createRequest(req, res, options);
35
+ const castedOptions = options ?? {};
36
+ const response = await this.orpcFetchHandler.fetch(request, castedOptions);
37
+ await options?.beforeSend?.(response, castedOptions.context);
38
+ return await sendResponse(res, response);
39
+ }
40
+ };
41
+ export {
42
+ CompositeHandler,
43
+ ORPCHandler2 as ORPCHandler
44
+ };
45
+ //# sourceMappingURL=node.js.map
@@ -1,4 +1,4 @@
1
- import type { Context } from '../types';
1
+ import type { Context } from '../../types';
2
2
  import type { ConditionalFetchHandler, FetchHandler, FetchOptions } from './types';
3
3
  export declare class CompositeHandler<T extends Context> implements FetchHandler<T> {
4
4
  private readonly handlers;
@@ -1,6 +1,6 @@
1
1
  import type { Hooks } from '@orpc/shared';
2
- import type { Router } from '../router';
3
- import type { Context, WithSignal } from '../types';
2
+ import type { Router } from '../../router';
3
+ import type { Context, WithSignal } from '../../types';
4
4
  import type { ConditionalFetchHandler, FetchOptions } from './types';
5
5
  import { type PublicORPCPayloadCodec } from './orpc-payload-codec';
6
6
  import { type PublicORPCProcedureMatcher } from './orpc-procedure-matcher';
@@ -1,5 +1,5 @@
1
- import type { ANY_PROCEDURE } from '../procedure';
2
- import { type ANY_ROUTER } from '../router';
1
+ import type { ANY_PROCEDURE } from '../../procedure';
2
+ import { type ANY_ROUTER } from '../../router';
3
3
  export declare class ORPCProcedureMatcher {
4
4
  private readonly router;
5
5
  constructor(router: ANY_ROUTER);
@@ -1,5 +1,5 @@
1
1
  import type { HTTPPath } from '@orpc/contract';
2
- import type { Context, WithSignal } from '../types';
2
+ import type { Context, WithSignal } from '../../types';
3
3
  export type FetchOptions<T extends Context> = WithSignal & {
4
4
  prefix?: HTTPPath;
5
5
  } & (undefined extends T ? {
@@ -0,0 +1,9 @@
1
+ import type { IncomingMessage, ServerResponse } from 'node:http';
2
+ import type { Context } from '../../types';
3
+ import type { ConditionalRequestHandler, RequestHandler, RequestOptions } from './types';
4
+ export declare class CompositeHandler<T extends Context> implements RequestHandler<T> {
5
+ private readonly handlers;
6
+ constructor(handlers: ConditionalRequestHandler<T>[]);
7
+ handle(req: IncomingMessage, res: ServerResponse, ...opt: [options: RequestOptions<T>] | (undefined extends T ? [] : never)): Promise<void>;
8
+ }
9
+ //# sourceMappingURL=composite-handler.d.ts.map
@@ -0,0 +1,5 @@
1
+ export * from './composite-handler';
2
+ export * from './orpc-handler';
3
+ export * from './orpc-handler';
4
+ export * from './types';
5
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1,12 @@
1
+ import type { IncomingMessage, ServerResponse } from 'node:http';
2
+ import type { Router } from '../../router';
3
+ import type { Context } from '../../types';
4
+ import type { ORPCHandlerOptions } from '../fetch/orpc-handler';
5
+ import type { ConditionalRequestHandler, RequestOptions } from './types';
6
+ export declare class ORPCHandler<T extends Context> implements ConditionalRequestHandler<T> {
7
+ private readonly orpcFetchHandler;
8
+ constructor(router: Router<T, any>, options?: NoInfer<ORPCHandlerOptions<T>>);
9
+ condition(request: IncomingMessage): boolean;
10
+ handle(req: IncomingMessage, res: ServerResponse, ...[options]: [options: RequestOptions<T>] | (undefined extends T ? [] : never)): Promise<void>;
11
+ }
12
+ //# sourceMappingURL=orpc-handler.d.ts.map
@@ -0,0 +1,21 @@
1
+ import type { RequestOptions as BaseRequestOptions } from '@mjackson/node-fetch-server';
2
+ import type { HTTPPath } from '@orpc/contract';
3
+ import type { Promisable } from '@orpc/shared';
4
+ import type { IncomingMessage, ServerResponse } from 'node:http';
5
+ import type { Context, WithSignal } from '../../types';
6
+ export type RequestOptions<T extends Context> = BaseRequestOptions & WithSignal & {
7
+ prefix?: HTTPPath;
8
+ } & (undefined extends T ? {
9
+ context?: T;
10
+ } : {
11
+ context: T;
12
+ }) & {
13
+ beforeSend?: (response: Response, context: T) => Promisable<void>;
14
+ };
15
+ export interface RequestHandler<T extends Context> {
16
+ handle: (req: IncomingMessage, res: ServerResponse, ...opt: [options: RequestOptions<T>] | (undefined extends T ? [] : never)) => void;
17
+ }
18
+ export interface ConditionalRequestHandler<T extends Context> extends RequestHandler<T> {
19
+ condition: (request: IncomingMessage) => boolean;
20
+ }
21
+ //# sourceMappingURL=types.d.ts.map
@@ -6,7 +6,7 @@ import type { Router } from './router';
6
6
  import type { AdaptedRouter } from './router-builder';
7
7
  import type { Context, MergeContext, WELL_CONTEXT } from './types';
8
8
  import { type ChainableImplementer } from './implementer-chainable';
9
- import { type ProcedureFunc } from './procedure';
9
+ import { type ProcedureHandler } from './procedure';
10
10
  import { ProcedureBuilder } from './procedure-builder';
11
11
  import { type DecoratedProcedure } from './procedure-decorated';
12
12
  import { RouterBuilder } from './router-builder';
@@ -23,7 +23,7 @@ export declare class Builder<TContext extends Context, TExtraContext extends Con
23
23
  route(route: RouteOptions): ProcedureBuilder<TContext, TExtraContext, undefined, undefined>;
24
24
  input<USchema extends Schema = undefined>(schema: USchema, example?: SchemaInput<USchema>): ProcedureBuilder<TContext, TExtraContext, USchema, undefined>;
25
25
  output<USchema extends Schema = undefined>(schema: USchema, example?: SchemaOutput<USchema>): ProcedureBuilder<TContext, TExtraContext, undefined, USchema>;
26
- handler<UFuncOutput = undefined>(handler: ProcedureFunc<TContext, TExtraContext, undefined, undefined, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput>;
26
+ handler<UFuncOutput = undefined>(handler: ProcedureHandler<TContext, TExtraContext, undefined, undefined, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, undefined, undefined, UFuncOutput>;
27
27
  prefix(prefix: HTTPPath): RouterBuilder<TContext, TExtraContext>;
28
28
  tag(...tags: string[]): RouterBuilder<TContext, TExtraContext>;
29
29
  router<U extends Router<MergeContext<TContext, TExtraContext>, any>>(router: U): AdaptedRouter<TContext, U>;
@@ -18,6 +18,7 @@ export * from './router-client';
18
18
  export * from './router-implementer';
19
19
  export * from './types';
20
20
  export * from './utils';
21
+ export { configGlobal, fallbackToGlobalConfig } from '@orpc/contract';
21
22
  export * from '@orpc/shared/error';
22
23
  export declare const os: Builder<WELL_CONTEXT, undefined>;
23
24
  //# sourceMappingURL=index.d.ts.map
@@ -1,19 +1,29 @@
1
1
  import type { Promisable } from '@orpc/shared';
2
- import type { Context, Meta } from './types';
2
+ import type { ANY_PROCEDURE } from './procedure';
3
+ import type { Context } from './types';
3
4
  export type MiddlewareResult<TExtraContext extends Context, TOutput> = Promisable<{
4
5
  output: TOutput;
5
6
  context: TExtraContext;
6
7
  }>;
7
- export interface MiddlewareMeta<TOutput> extends Meta {
8
- next: <UExtraContext extends Context = undefined>(options: UExtraContext extends undefined ? {
8
+ export interface MiddlewareNextFn<TOutput> {
9
+ <UExtraContext extends Context = undefined>(options: UExtraContext extends undefined ? {
9
10
  context?: UExtraContext;
10
11
  } : {
11
12
  context: UExtraContext;
12
- }) => MiddlewareResult<UExtraContext, TOutput>;
13
- output: <UOutput>(output: UOutput) => MiddlewareResult<undefined, UOutput>;
13
+ }): MiddlewareResult<UExtraContext, TOutput>;
14
+ }
15
+ export interface MiddlewareOutputFn<TOutput> {
16
+ (output: TOutput): MiddlewareResult<undefined, TOutput>;
17
+ }
18
+ export interface MiddlewareOptions<TContext extends Context, TOutput> {
19
+ context: TContext;
20
+ path: string[];
21
+ procedure: ANY_PROCEDURE;
22
+ signal?: AbortSignal;
23
+ next: MiddlewareNextFn<TOutput>;
14
24
  }
15
25
  export interface Middleware<TContext extends Context, TExtraContext extends Context, TInput, TOutput> {
16
- (input: TInput, context: TContext, meta: MiddlewareMeta<TOutput>): Promisable<MiddlewareResult<TExtraContext, TOutput>>;
26
+ (options: MiddlewareOptions<TContext, TOutput>, input: TInput, output: MiddlewareOutputFn<TOutput>): Promisable<MiddlewareResult<TExtraContext, TOutput>>;
17
27
  }
18
28
  export type ANY_MIDDLEWARE = Middleware<any, any, any, any>;
19
29
  export interface MapInputMiddleware<TInput, TMappedInput> {
@@ -2,7 +2,7 @@ import type { MapInputMiddleware, Middleware } from './middleware';
2
2
  import type { DecoratedProcedure } from './procedure-decorated';
3
3
  import type { Context, MergeContext } from './types';
4
4
  import { type ContractProcedure, type RouteOptions, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
5
- import { type ProcedureFunc } from './procedure';
5
+ import { type ProcedureHandler } from './procedure';
6
6
  import { ProcedureImplementer } from './procedure-implementer';
7
7
  export interface ProcedureBuilderDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema> {
8
8
  contract: ContractProcedure<TInputSchema, TOutputSchema>;
@@ -17,6 +17,6 @@ export declare class ProcedureBuilder<TContext extends Context, TExtraContext ex
17
17
  output<U extends Schema = undefined>(schema: U, example?: SchemaOutput<U>): ProcedureBuilder<TContext, TExtraContext, TInputSchema, U>;
18
18
  use<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>>): ProcedureImplementer<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema>;
19
19
  use<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema>;
20
- handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
20
+ handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
21
21
  }
22
22
  //# sourceMappingURL=procedure-builder.d.ts.map
@@ -1,6 +1,6 @@
1
1
  import type { ContractProcedure, Schema, SchemaInput, SchemaOutput } from '@orpc/contract';
2
2
  import type { MapInputMiddleware, Middleware } from './middleware';
3
- import type { ProcedureFunc } from './procedure';
3
+ import type { ProcedureHandler } from './procedure';
4
4
  import type { DecoratedProcedure } from './procedure-decorated';
5
5
  import type { Context, MergeContext } from './types';
6
6
  export type ProcedureImplementerDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema> = {
@@ -13,6 +13,6 @@ export declare class ProcedureImplementer<TContext extends Context, TExtraContex
13
13
  constructor(def: ProcedureImplementerDef<TContext, TExtraContext, TInputSchema, TOutputSchema>);
14
14
  use<U extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined>(middleware: Middleware<MergeContext<TContext, TExtraContext>, U, SchemaOutput<TInputSchema>, SchemaInput<TOutputSchema>>): ProcedureImplementer<TContext, MergeContext<TExtraContext, U>, TInputSchema, TOutputSchema>;
15
15
  use<UExtra extends Context & Partial<MergeContext<TContext, TExtraContext>> | undefined = undefined, UInput = unknown>(middleware: Middleware<MergeContext<TContext, TExtraContext>, UExtra, UInput, SchemaInput<TOutputSchema>>, mapInput: MapInputMiddleware<SchemaOutput<TInputSchema>, UInput>): ProcedureImplementer<TContext, MergeContext<TExtraContext, UExtra>, TInputSchema, TOutputSchema>;
16
- handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
16
+ handler<UFuncOutput extends SchemaInput<TOutputSchema>>(handler: ProcedureHandler<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>): DecoratedProcedure<TContext, TExtraContext, TInputSchema, TOutputSchema, UFuncOutput>;
17
17
  }
18
18
  //# sourceMappingURL=procedure-implementer.d.ts.map
@@ -1,15 +1,22 @@
1
1
  import type { Promisable } from '@orpc/shared';
2
2
  import type { Lazy } from './lazy';
3
3
  import type { Middleware } from './middleware';
4
- import type { Context, MergeContext, Meta } from './types';
4
+ import type { AbortSignal, Context, MergeContext } from './types';
5
5
  import { type ContractProcedure, type Schema, type SchemaInput, type SchemaOutput } from '@orpc/contract';
6
- export interface ProcedureFunc<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
7
- (input: SchemaOutput<TInputSchema>, context: MergeContext<TContext, TExtraContext>, meta: Meta): Promisable<SchemaInput<TOutputSchema, THandlerOutput>>;
6
+ export interface ProcedureHandlerOptions<TContext extends Context, TInput> {
7
+ context: TContext;
8
+ input: TInput;
9
+ path: string[];
10
+ procedure: ANY_PROCEDURE;
11
+ signal?: AbortSignal;
12
+ }
13
+ export interface ProcedureHandler<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
14
+ (opt: ProcedureHandlerOptions<MergeContext<TContext, TExtraContext>, SchemaOutput<TInputSchema>>): Promisable<SchemaInput<TOutputSchema, THandlerOutput>>;
8
15
  }
9
16
  export interface ProcedureDef<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
10
17
  middlewares?: Middleware<MergeContext<TContext, TExtraContext>, Partial<TExtraContext> | undefined, SchemaOutput<TInputSchema>, any>[];
11
18
  contract: ContractProcedure<TInputSchema, TOutputSchema>;
12
- handler: ProcedureFunc<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
19
+ handler: ProcedureHandler<TContext, TExtraContext, TInputSchema, TOutputSchema, THandlerOutput>;
13
20
  }
14
21
  export declare class Procedure<TContext extends Context, TExtraContext extends Context, TInputSchema extends Schema, TOutputSchema extends Schema, THandlerOutput extends SchemaInput<TOutputSchema>> {
15
22
  '~type': "Procedure";
@@ -1,7 +1,9 @@
1
+ import type { FindGlobalInstanceType } from '@orpc/shared';
1
2
  import type { ANY_PROCEDURE } from './procedure';
2
3
  export type Context = Record<string, any> | undefined;
3
4
  export type WELL_CONTEXT = Record<string, unknown> | undefined;
4
5
  export type MergeContext<TA extends Context, TB extends Context> = TA extends undefined ? TB : TB extends undefined ? TA : TA & TB;
6
+ export type AbortSignal = FindGlobalInstanceType<'AbortSignal'>;
5
7
  export interface WithSignal {
6
8
  signal?: AbortSignal;
7
9
  }
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.73eb96a",
4
+ "version": "0.0.0-next.7e55b05",
5
5
  "license": "MIT",
6
6
  "homepage": "https://orpc.unnoq.com",
7
7
  "repository": {
@@ -20,10 +20,15 @@
20
20
  "default": "./dist/index.js"
21
21
  },
22
22
  "./fetch": {
23
- "types": "./dist/src/fetch/index.d.ts",
23
+ "types": "./dist/src/adapters/fetch/index.d.ts",
24
24
  "import": "./dist/fetch.js",
25
25
  "default": "./dist/fetch.js"
26
26
  },
27
+ "./node": {
28
+ "types": "./dist/src/adapters/node/index.d.ts",
29
+ "import": "./dist/node.js",
30
+ "default": "./dist/node.js"
31
+ },
27
32
  "./🔒/*": {
28
33
  "types": "./dist/src/*.d.ts"
29
34
  }
@@ -34,14 +39,15 @@
34
39
  "dist"
35
40
  ],
36
41
  "dependencies": {
37
- "@orpc/contract": "0.0.0-next.73eb96a",
38
- "@orpc/shared": "0.0.0-next.73eb96a"
42
+ "@mjackson/node-fetch-server": "^0.5.0",
43
+ "@orpc/contract": "0.0.0-next.7e55b05",
44
+ "@orpc/shared": "0.0.0-next.7e55b05"
39
45
  },
40
46
  "devDependencies": {
41
47
  "zod": "^3.24.1"
42
48
  },
43
49
  "scripts": {
44
- "build": "tsup --clean --sourcemap --entry.index=src/index.ts --entry.fetch=src/fetch/index.ts --format=esm --onSuccess='tsc -b --noCheck'",
50
+ "build": "tsup --clean --sourcemap --entry.index=src/index.ts --entry.fetch=src/adapters/fetch/index.ts --entry.node=src/adapters/node/index.ts --format=esm --onSuccess='tsc -b --noCheck'",
45
51
  "build:watch": "pnpm run build --watch",
46
52
  "type:check": "tsc -b"
47
53
  }
File without changes