@trpc/server 9.21.0 → 9.23.1-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/adapters/express/dist/trpc-server-adapters-express.cjs.dev.js +4 -4
- package/adapters/express/dist/trpc-server-adapters-express.cjs.prod.js +4 -4
- package/adapters/express/dist/trpc-server-adapters-express.esm.js +4 -4
- package/adapters/fastify/dist/trpc-server-adapters-fastify.cjs.dev.js +4 -4
- package/adapters/fastify/dist/trpc-server-adapters-fastify.cjs.prod.js +4 -4
- package/adapters/fastify/dist/trpc-server-adapters-fastify.esm.js +4 -4
- package/adapters/next/dist/trpc-server-adapters-next.cjs.dev.js +4 -4
- package/adapters/next/dist/trpc-server-adapters-next.cjs.prod.js +4 -4
- package/adapters/next/dist/trpc-server-adapters-next.esm.js +4 -4
- package/adapters/node-http/dist/trpc-server-adapters-node-http.cjs.dev.js +4 -4
- package/adapters/node-http/dist/trpc-server-adapters-node-http.cjs.prod.js +4 -4
- package/adapters/node-http/dist/trpc-server-adapters-node-http.esm.js +4 -4
- package/adapters/standalone/dist/trpc-server-adapters-standalone.cjs.dev.js +4 -4
- package/adapters/standalone/dist/trpc-server-adapters-standalone.cjs.prod.js +4 -4
- package/adapters/standalone/dist/trpc-server-adapters-standalone.esm.js +4 -4
- package/adapters/ws/dist/trpc-server-adapters-ws.cjs.dev.js +2 -2
- package/adapters/ws/dist/trpc-server-adapters-ws.cjs.prod.js +2 -2
- package/adapters/ws/dist/trpc-server-adapters-ws.esm.js +2 -2
- package/dist/{codes-33cef953.cjs.dev.js → codes-130e62df.cjs.dev.js} +2 -0
- package/dist/{codes-fe07bf82.esm.js → codes-5678cc97.esm.js} +2 -0
- package/dist/{codes-e0df67c4.cjs.prod.js → codes-aff770a3.cjs.prod.js} +2 -0
- package/dist/declarations/src/TRPCError.d.ts +1 -1
- package/dist/declarations/src/TRPCError.d.ts.map +1 -1
- package/dist/declarations/src/adapters/fastify/fastifyRequestHandler.d.ts +1 -1
- package/dist/declarations/src/adapters/fastify/fastifyRequestHandler.d.ts.map +1 -1
- package/dist/declarations/src/adapters/fastify/fastifyTRPCPlugin.d.ts +1 -1
- package/dist/declarations/src/adapters/fastify/fastifyTRPCPlugin.d.ts.map +1 -1
- package/dist/declarations/src/adapters/next.d.ts.map +1 -1
- package/dist/declarations/src/adapters/node-http/nodeHTTPRequestHandler.d.ts +1 -1
- package/dist/declarations/src/adapters/node-http/nodeHTTPRequestHandler.d.ts.map +1 -1
- package/dist/declarations/src/adapters/standalone.d.ts.map +1 -1
- package/dist/declarations/src/adapters/ws.d.ts.map +1 -1
- package/dist/declarations/src/deprecated/createHttpServer.d.ts +1 -1
- package/dist/declarations/src/deprecated/createHttpServer.d.ts.map +1 -1
- package/dist/declarations/src/deprecated/requestHandler.d.ts +1 -1
- package/dist/declarations/src/deprecated/requestHandler.d.ts.map +1 -1
- package/dist/declarations/src/http/internals/getHTTPStatusCode.d.ts +2 -1
- package/dist/declarations/src/http/internals/getHTTPStatusCode.d.ts.map +1 -1
- package/dist/declarations/src/http/internals/types.d.ts +1 -1
- package/dist/declarations/src/http/internals/types.d.ts.map +1 -1
- package/dist/declarations/src/http/resolveHTTPResponse.d.ts +2 -2
- package/dist/declarations/src/http/resolveHTTPResponse.d.ts.map +1 -1
- package/dist/declarations/src/internals/BaseHandlerOptions.d.ts +1 -1
- package/dist/declarations/src/internals/BaseHandlerOptions.d.ts.map +1 -1
- package/dist/declarations/src/internals/OnErrorFunction.d.ts +1 -1
- package/dist/declarations/src/internals/OnErrorFunction.d.ts.map +1 -1
- package/dist/declarations/src/internals/middlewares.d.ts +3 -2
- package/dist/declarations/src/internals/middlewares.d.ts.map +1 -1
- package/dist/declarations/src/internals/procedure.d.ts +20 -14
- package/dist/declarations/src/internals/procedure.d.ts.map +1 -1
- package/dist/declarations/src/router.d.ts +33 -29
- package/dist/declarations/src/router.d.ts.map +1 -1
- package/dist/declarations/src/rpc/codes.d.ts +2 -0
- package/dist/declarations/src/rpc/codes.d.ts.map +1 -1
- package/dist/declarations/src/types.d.ts +8 -0
- package/dist/declarations/src/types.d.ts.map +1 -1
- package/dist/{nodeHTTPRequestHandler-2cc444d8.cjs.dev.js → nodeHTTPRequestHandler-36ddaba2.cjs.dev.js} +2 -2
- package/dist/{nodeHTTPRequestHandler-d00c1126.esm.js → nodeHTTPRequestHandler-372a4a4f.esm.js} +2 -2
- package/dist/{nodeHTTPRequestHandler-8ddacc19.cjs.prod.js → nodeHTTPRequestHandler-91e7ca3d.cjs.prod.js} +2 -2
- package/dist/{resolveHTTPResponse-562c3d62.cjs.prod.js → resolveHTTPResponse-02e61299.cjs.prod.js} +3 -2
- package/dist/{resolveHTTPResponse-3867844c.cjs.dev.js → resolveHTTPResponse-55b2c9bd.cjs.dev.js} +3 -2
- package/dist/{resolveHTTPResponse-85f3f5df.esm.js → resolveHTTPResponse-ddb56677.esm.js} +3 -2
- package/dist/{subscription-a81120d6.esm.js → subscription-2ea469a3.esm.js} +1 -1
- package/dist/{subscription-9e007280.cjs.dev.js → subscription-7de48383.cjs.dev.js} +1 -1
- package/dist/{subscription-12fb50be.cjs.prod.js → subscription-f03bec71.cjs.prod.js} +1 -1
- package/dist/{transformTRPCResponse-8248515e.cjs.dev.js → transformTRPCResponse-1e125b28.cjs.prod.js} +38 -38
- package/dist/{transformTRPCResponse-f73dc4a2.esm.js → transformTRPCResponse-45c225c3.esm.js} +38 -38
- package/dist/{transformTRPCResponse-dcbf66c5.cjs.prod.js → transformTRPCResponse-c654ea92.cjs.dev.js} +38 -38
- package/dist/trpc-server.cjs.dev.js +13 -7
- package/dist/trpc-server.cjs.prod.js +13 -7
- package/dist/trpc-server.esm.js +15 -9
- package/package.json +4 -4
- package/rpc/dist/trpc-server-rpc.cjs.dev.js +1 -1
- package/rpc/dist/trpc-server-rpc.cjs.prod.js +1 -1
- package/rpc/dist/trpc-server-rpc.esm.js +1 -1
- package/src/TRPCError.ts +1 -1
- package/src/adapters/fastify/fastifyRequestHandler.ts +2 -2
- package/src/adapters/fastify/fastifyTRPCPlugin.ts +3 -3
- package/src/adapters/next.ts +1 -1
- package/src/adapters/node-http/internals/getPostBody.test.ts +2 -1
- package/src/adapters/node-http/nodeHTTPRequestHandler.ts +5 -5
- package/src/adapters/standalone.ts +1 -0
- package/src/adapters/ws.ts +2 -2
- package/src/deprecated/createHttpServer.ts +2 -2
- package/src/deprecated/requestHandler.ts +2 -2
- package/src/http/internals/getHTTPStatusCode.ts +2 -1
- package/src/http/internals/types.ts +2 -2
- package/src/http/resolveHTTPResponse.ts +3 -3
- package/src/internals/BaseHandlerOptions.ts +1 -1
- package/src/internals/OnErrorFunction.ts +1 -1
- package/src/internals/middlewares.ts +3 -2
- package/src/internals/procedure.ts +64 -16
- package/src/router.ts +96 -32
- package/src/rpc/codes.ts +1 -0
- package/src/types.ts +7 -0
- package/ws/dist/trpc-server-ws.cjs.dev.js +2 -2
- package/ws/dist/trpc-server-ws.cjs.prod.js +2 -2
- package/ws/dist/trpc-server-ws.esm.js +2 -2
package/dist/{transformTRPCResponse-f73dc4a2.esm.js → transformTRPCResponse-45c225c3.esm.js}
RENAMED
|
@@ -1,27 +1,31 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
path,
|
|
5
|
-
input
|
|
6
|
-
} = opts;
|
|
7
|
-
const caller = opts.router.createCaller(opts.ctx);
|
|
8
|
-
|
|
9
|
-
if (type === 'query') {
|
|
10
|
-
return caller.query(path, input);
|
|
1
|
+
function getMessageFromUnkownError(err, fallback) {
|
|
2
|
+
if (typeof err === 'string') {
|
|
3
|
+
return err;
|
|
11
4
|
}
|
|
12
5
|
|
|
13
|
-
if (
|
|
14
|
-
return
|
|
6
|
+
if (err instanceof Error && typeof err.message === 'string') {
|
|
7
|
+
return err.message;
|
|
15
8
|
}
|
|
16
9
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
10
|
+
return fallback;
|
|
11
|
+
}
|
|
12
|
+
function getErrorFromUnknown(cause) {
|
|
13
|
+
// this should ideally be an `instanceof TRPCError` but for some reason that isn't working
|
|
14
|
+
// ref https://github.com/trpc/trpc/issues/331
|
|
15
|
+
if (cause instanceof Error && cause.name === 'TRPCError') {
|
|
16
|
+
return cause;
|
|
20
17
|
}
|
|
21
|
-
/* istanbul ignore next */
|
|
22
18
|
|
|
19
|
+
const err = new TRPCError({
|
|
20
|
+
code: 'INTERNAL_SERVER_ERROR',
|
|
21
|
+
cause
|
|
22
|
+
}); // take stack trace from cause
|
|
23
23
|
|
|
24
|
-
|
|
24
|
+
if (cause instanceof Error) {
|
|
25
|
+
err.stack = cause.stack;
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
return err;
|
|
25
29
|
}
|
|
26
30
|
|
|
27
31
|
class TRPCError extends Error {
|
|
@@ -50,34 +54,30 @@ class TRPCError extends Error {
|
|
|
50
54
|
|
|
51
55
|
}
|
|
52
56
|
|
|
53
|
-
function
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
+
async function callProcedure(opts) {
|
|
58
|
+
const {
|
|
59
|
+
type,
|
|
60
|
+
path,
|
|
61
|
+
input
|
|
62
|
+
} = opts;
|
|
63
|
+
const caller = opts.router.createCaller(opts.ctx);
|
|
57
64
|
|
|
58
|
-
if (
|
|
59
|
-
return
|
|
65
|
+
if (type === 'query') {
|
|
66
|
+
return caller.query(path, input);
|
|
60
67
|
}
|
|
61
68
|
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
function getErrorFromUnknown(cause) {
|
|
65
|
-
// this should ideally be an `instanceof TRPCError` but for some reason that isn't working
|
|
66
|
-
// ref https://github.com/trpc/trpc/issues/331
|
|
67
|
-
if (cause instanceof Error && cause.name === 'TRPCError') {
|
|
68
|
-
return cause;
|
|
69
|
+
if (type === 'mutation') {
|
|
70
|
+
return caller.mutation(path, input);
|
|
69
71
|
}
|
|
70
72
|
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
}); // take stack trace from cause
|
|
75
|
-
|
|
76
|
-
if (cause instanceof Error) {
|
|
77
|
-
err.stack = cause.stack;
|
|
73
|
+
if (type === 'subscription') {
|
|
74
|
+
const sub = await caller.subscription(path, input);
|
|
75
|
+
return sub;
|
|
78
76
|
}
|
|
77
|
+
/* istanbul ignore next */
|
|
79
78
|
|
|
80
|
-
|
|
79
|
+
|
|
80
|
+
throw new Error(`Unknown procedure type ${type}`);
|
|
81
81
|
}
|
|
82
82
|
|
|
83
83
|
function transformTRPCResponseItem(router, item) {
|
|
@@ -1,29 +1,33 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
path,
|
|
7
|
-
input
|
|
8
|
-
} = opts;
|
|
9
|
-
const caller = opts.router.createCaller(opts.ctx);
|
|
10
|
-
|
|
11
|
-
if (type === 'query') {
|
|
12
|
-
return caller.query(path, input);
|
|
3
|
+
function getMessageFromUnkownError(err, fallback) {
|
|
4
|
+
if (typeof err === 'string') {
|
|
5
|
+
return err;
|
|
13
6
|
}
|
|
14
7
|
|
|
15
|
-
if (
|
|
16
|
-
return
|
|
8
|
+
if (err instanceof Error && typeof err.message === 'string') {
|
|
9
|
+
return err.message;
|
|
17
10
|
}
|
|
18
11
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
12
|
+
return fallback;
|
|
13
|
+
}
|
|
14
|
+
function getErrorFromUnknown(cause) {
|
|
15
|
+
// this should ideally be an `instanceof TRPCError` but for some reason that isn't working
|
|
16
|
+
// ref https://github.com/trpc/trpc/issues/331
|
|
17
|
+
if (cause instanceof Error && cause.name === 'TRPCError') {
|
|
18
|
+
return cause;
|
|
22
19
|
}
|
|
23
|
-
/* istanbul ignore next */
|
|
24
20
|
|
|
21
|
+
const err = new TRPCError({
|
|
22
|
+
code: 'INTERNAL_SERVER_ERROR',
|
|
23
|
+
cause
|
|
24
|
+
}); // take stack trace from cause
|
|
25
25
|
|
|
26
|
-
|
|
26
|
+
if (cause instanceof Error) {
|
|
27
|
+
err.stack = cause.stack;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
return err;
|
|
27
31
|
}
|
|
28
32
|
|
|
29
33
|
class TRPCError extends Error {
|
|
@@ -52,34 +56,30 @@ class TRPCError extends Error {
|
|
|
52
56
|
|
|
53
57
|
}
|
|
54
58
|
|
|
55
|
-
function
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
+
async function callProcedure(opts) {
|
|
60
|
+
const {
|
|
61
|
+
type,
|
|
62
|
+
path,
|
|
63
|
+
input
|
|
64
|
+
} = opts;
|
|
65
|
+
const caller = opts.router.createCaller(opts.ctx);
|
|
59
66
|
|
|
60
|
-
if (
|
|
61
|
-
return
|
|
67
|
+
if (type === 'query') {
|
|
68
|
+
return caller.query(path, input);
|
|
62
69
|
}
|
|
63
70
|
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
function getErrorFromUnknown(cause) {
|
|
67
|
-
// this should ideally be an `instanceof TRPCError` but for some reason that isn't working
|
|
68
|
-
// ref https://github.com/trpc/trpc/issues/331
|
|
69
|
-
if (cause instanceof Error && cause.name === 'TRPCError') {
|
|
70
|
-
return cause;
|
|
71
|
+
if (type === 'mutation') {
|
|
72
|
+
return caller.mutation(path, input);
|
|
71
73
|
}
|
|
72
74
|
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
}); // take stack trace from cause
|
|
77
|
-
|
|
78
|
-
if (cause instanceof Error) {
|
|
79
|
-
err.stack = cause.stack;
|
|
75
|
+
if (type === 'subscription') {
|
|
76
|
+
const sub = await caller.subscription(path, input);
|
|
77
|
+
return sub;
|
|
80
78
|
}
|
|
79
|
+
/* istanbul ignore next */
|
|
81
80
|
|
|
82
|
-
|
|
81
|
+
|
|
82
|
+
throw new Error(`Unknown procedure type ${type}`);
|
|
83
83
|
}
|
|
84
84
|
|
|
85
85
|
function transformTRPCResponseItem(router, item) {
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var resolveHTTPResponse = require('./resolveHTTPResponse-
|
|
6
|
-
var subscription = require('./subscription-
|
|
7
|
-
var transformTRPCResponse = require('./transformTRPCResponse-
|
|
5
|
+
var resolveHTTPResponse = require('./resolveHTTPResponse-55b2c9bd.cjs.dev.js');
|
|
6
|
+
var subscription = require('./subscription-7de48383.cjs.dev.js');
|
|
7
|
+
var transformTRPCResponse = require('./transformTRPCResponse-c654ea92.cjs.dev.js');
|
|
8
8
|
var adapters_standalone_dist_trpcServerAdaptersStandalone = require('../adapters/standalone/dist/trpc-server-adapters-standalone.cjs.dev.js');
|
|
9
|
-
var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-
|
|
10
|
-
var codes = require('./codes-
|
|
9
|
+
var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-36ddaba2.cjs.dev.js');
|
|
10
|
+
var codes = require('./codes-130e62df.cjs.dev.js');
|
|
11
11
|
require('events');
|
|
12
12
|
require('http');
|
|
13
13
|
require('url');
|
|
@@ -32,6 +32,7 @@ const createHttpHandler = adapters_standalone_dist_trpcServerAdaptersStandalone.
|
|
|
32
32
|
/**
|
|
33
33
|
* @deprecated use `nodeHTTPRequestHandler` from `@trpc/server/adapters/node-http`
|
|
34
34
|
*/
|
|
35
|
+
|
|
35
36
|
const requestHandler = nodeHTTPRequestHandler.nodeHTTPRequestHandler;
|
|
36
37
|
/**
|
|
37
38
|
* @deprecated use `NodeHTTPCreateContextFn` from `@trpc/server/adapters/node-http`
|
|
@@ -104,12 +105,14 @@ class Procedure {
|
|
|
104
105
|
this.parseInputFn = void 0;
|
|
105
106
|
this.outputParser = void 0;
|
|
106
107
|
this.parseOutputFn = void 0;
|
|
108
|
+
this.meta = void 0;
|
|
107
109
|
this.middlewares = opts.middlewares;
|
|
108
110
|
this.resolver = opts.resolver;
|
|
109
111
|
this.inputParser = opts.inputParser;
|
|
110
112
|
this.parseInputFn = getParseFn(this.inputParser);
|
|
111
113
|
this.outputParser = opts.outputParser;
|
|
112
114
|
this.parseOutputFn = getParseFn(this.outputParser);
|
|
115
|
+
this.meta = opts.meta;
|
|
113
116
|
}
|
|
114
117
|
|
|
115
118
|
async parseInput(rawInput) {
|
|
@@ -166,6 +169,7 @@ class Procedure {
|
|
|
166
169
|
type: opts.type,
|
|
167
170
|
path: opts.path,
|
|
168
171
|
rawInput: opts.rawInput,
|
|
172
|
+
meta: this.meta,
|
|
169
173
|
next: nextFns[index + 1]
|
|
170
174
|
}));
|
|
171
175
|
|
|
@@ -208,7 +212,8 @@ class Procedure {
|
|
|
208
212
|
middlewares: [...middlewares, ...this.middlewares],
|
|
209
213
|
resolver: this.resolver,
|
|
210
214
|
inputParser: this.inputParser,
|
|
211
|
-
outputParser: this.outputParser
|
|
215
|
+
outputParser: this.outputParser,
|
|
216
|
+
meta: this.meta
|
|
212
217
|
});
|
|
213
218
|
return instance;
|
|
214
219
|
}
|
|
@@ -230,7 +235,8 @@ function createProcedure(opts) {
|
|
|
230
235
|
inputParser: inputParser,
|
|
231
236
|
resolver: opts.resolve,
|
|
232
237
|
middlewares: [],
|
|
233
|
-
outputParser: outputParser
|
|
238
|
+
outputParser: outputParser,
|
|
239
|
+
meta: opts.meta
|
|
234
240
|
});
|
|
235
241
|
}
|
|
236
242
|
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var resolveHTTPResponse = require('./resolveHTTPResponse-
|
|
6
|
-
var subscription = require('./subscription-
|
|
7
|
-
var transformTRPCResponse = require('./transformTRPCResponse-
|
|
5
|
+
var resolveHTTPResponse = require('./resolveHTTPResponse-02e61299.cjs.prod.js');
|
|
6
|
+
var subscription = require('./subscription-f03bec71.cjs.prod.js');
|
|
7
|
+
var transformTRPCResponse = require('./transformTRPCResponse-1e125b28.cjs.prod.js');
|
|
8
8
|
var adapters_standalone_dist_trpcServerAdaptersStandalone = require('../adapters/standalone/dist/trpc-server-adapters-standalone.cjs.prod.js');
|
|
9
|
-
var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-
|
|
10
|
-
var codes = require('./codes-
|
|
9
|
+
var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-91e7ca3d.cjs.prod.js');
|
|
10
|
+
var codes = require('./codes-aff770a3.cjs.prod.js');
|
|
11
11
|
require('events');
|
|
12
12
|
require('http');
|
|
13
13
|
require('url');
|
|
@@ -32,6 +32,7 @@ const createHttpHandler = adapters_standalone_dist_trpcServerAdaptersStandalone.
|
|
|
32
32
|
/**
|
|
33
33
|
* @deprecated use `nodeHTTPRequestHandler` from `@trpc/server/adapters/node-http`
|
|
34
34
|
*/
|
|
35
|
+
|
|
35
36
|
const requestHandler = nodeHTTPRequestHandler.nodeHTTPRequestHandler;
|
|
36
37
|
/**
|
|
37
38
|
* @deprecated use `NodeHTTPCreateContextFn` from `@trpc/server/adapters/node-http`
|
|
@@ -104,12 +105,14 @@ class Procedure {
|
|
|
104
105
|
this.parseInputFn = void 0;
|
|
105
106
|
this.outputParser = void 0;
|
|
106
107
|
this.parseOutputFn = void 0;
|
|
108
|
+
this.meta = void 0;
|
|
107
109
|
this.middlewares = opts.middlewares;
|
|
108
110
|
this.resolver = opts.resolver;
|
|
109
111
|
this.inputParser = opts.inputParser;
|
|
110
112
|
this.parseInputFn = getParseFn(this.inputParser);
|
|
111
113
|
this.outputParser = opts.outputParser;
|
|
112
114
|
this.parseOutputFn = getParseFn(this.outputParser);
|
|
115
|
+
this.meta = opts.meta;
|
|
113
116
|
}
|
|
114
117
|
|
|
115
118
|
async parseInput(rawInput) {
|
|
@@ -166,6 +169,7 @@ class Procedure {
|
|
|
166
169
|
type: opts.type,
|
|
167
170
|
path: opts.path,
|
|
168
171
|
rawInput: opts.rawInput,
|
|
172
|
+
meta: this.meta,
|
|
169
173
|
next: nextFns[index + 1]
|
|
170
174
|
}));
|
|
171
175
|
|
|
@@ -208,7 +212,8 @@ class Procedure {
|
|
|
208
212
|
middlewares: [...middlewares, ...this.middlewares],
|
|
209
213
|
resolver: this.resolver,
|
|
210
214
|
inputParser: this.inputParser,
|
|
211
|
-
outputParser: this.outputParser
|
|
215
|
+
outputParser: this.outputParser,
|
|
216
|
+
meta: this.meta
|
|
212
217
|
});
|
|
213
218
|
return instance;
|
|
214
219
|
}
|
|
@@ -230,7 +235,8 @@ function createProcedure(opts) {
|
|
|
230
235
|
inputParser: inputParser,
|
|
231
236
|
resolver: opts.resolve,
|
|
232
237
|
middlewares: [],
|
|
233
|
-
outputParser: outputParser
|
|
238
|
+
outputParser: outputParser,
|
|
239
|
+
meta: opts.meta
|
|
234
240
|
});
|
|
235
241
|
}
|
|
236
242
|
|
package/dist/trpc-server.esm.js
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-
|
|
2
|
-
export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-
|
|
3
|
-
export { S as Subscription, s as subscriptionPullFactory } from './subscription-
|
|
4
|
-
import { T as TRPCError, g as getErrorFromUnknown } from './transformTRPCResponse-
|
|
5
|
-
export { T as TRPCError } from './transformTRPCResponse-
|
|
1
|
+
import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-ddb56677.esm.js';
|
|
2
|
+
export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-ddb56677.esm.js';
|
|
3
|
+
export { S as Subscription, s as subscriptionPullFactory } from './subscription-2ea469a3.esm.js';
|
|
4
|
+
import { T as TRPCError, g as getErrorFromUnknown } from './transformTRPCResponse-45c225c3.esm.js';
|
|
5
|
+
export { T as TRPCError } from './transformTRPCResponse-45c225c3.esm.js';
|
|
6
6
|
import { createHTTPServer, createHTTPHandler } from '../adapters/standalone/dist/trpc-server-adapters-standalone.esm.js';
|
|
7
|
-
import { n as nodeHTTPRequestHandler } from './nodeHTTPRequestHandler-
|
|
8
|
-
import { T as TRPC_ERROR_CODES_BY_KEY } from './codes-
|
|
7
|
+
import { n as nodeHTTPRequestHandler } from './nodeHTTPRequestHandler-372a4a4f.esm.js';
|
|
8
|
+
import { T as TRPC_ERROR_CODES_BY_KEY } from './codes-5678cc97.esm.js';
|
|
9
9
|
import 'events';
|
|
10
10
|
import 'http';
|
|
11
11
|
import 'url';
|
|
@@ -30,6 +30,7 @@ const createHttpHandler = createHTTPHandler;
|
|
|
30
30
|
/**
|
|
31
31
|
* @deprecated use `nodeHTTPRequestHandler` from `@trpc/server/adapters/node-http`
|
|
32
32
|
*/
|
|
33
|
+
|
|
33
34
|
const requestHandler = nodeHTTPRequestHandler;
|
|
34
35
|
/**
|
|
35
36
|
* @deprecated use `NodeHTTPCreateContextFn` from `@trpc/server/adapters/node-http`
|
|
@@ -102,12 +103,14 @@ class Procedure {
|
|
|
102
103
|
this.parseInputFn = void 0;
|
|
103
104
|
this.outputParser = void 0;
|
|
104
105
|
this.parseOutputFn = void 0;
|
|
106
|
+
this.meta = void 0;
|
|
105
107
|
this.middlewares = opts.middlewares;
|
|
106
108
|
this.resolver = opts.resolver;
|
|
107
109
|
this.inputParser = opts.inputParser;
|
|
108
110
|
this.parseInputFn = getParseFn(this.inputParser);
|
|
109
111
|
this.outputParser = opts.outputParser;
|
|
110
112
|
this.parseOutputFn = getParseFn(this.outputParser);
|
|
113
|
+
this.meta = opts.meta;
|
|
111
114
|
}
|
|
112
115
|
|
|
113
116
|
async parseInput(rawInput) {
|
|
@@ -164,6 +167,7 @@ class Procedure {
|
|
|
164
167
|
type: opts.type,
|
|
165
168
|
path: opts.path,
|
|
166
169
|
rawInput: opts.rawInput,
|
|
170
|
+
meta: this.meta,
|
|
167
171
|
next: nextFns[index + 1]
|
|
168
172
|
}));
|
|
169
173
|
|
|
@@ -206,7 +210,8 @@ class Procedure {
|
|
|
206
210
|
middlewares: [...middlewares, ...this.middlewares],
|
|
207
211
|
resolver: this.resolver,
|
|
208
212
|
inputParser: this.inputParser,
|
|
209
|
-
outputParser: this.outputParser
|
|
213
|
+
outputParser: this.outputParser,
|
|
214
|
+
meta: this.meta
|
|
210
215
|
});
|
|
211
216
|
return instance;
|
|
212
217
|
}
|
|
@@ -228,7 +233,8 @@ function createProcedure(opts) {
|
|
|
228
233
|
inputParser: inputParser,
|
|
229
234
|
resolver: opts.resolve,
|
|
230
235
|
middlewares: [],
|
|
231
|
-
outputParser: outputParser
|
|
236
|
+
outputParser: outputParser,
|
|
237
|
+
meta: opts.meta
|
|
232
238
|
});
|
|
233
239
|
}
|
|
234
240
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trpc/server",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.23.1-alpha.0",
|
|
4
4
|
"description": "tRPC Server",
|
|
5
5
|
"author": "KATT",
|
|
6
6
|
"license": "MIT",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"devDependencies": {
|
|
49
49
|
"@testing-library/jest-dom": "^5.14.1",
|
|
50
50
|
"@testing-library/react": "^12.0.0",
|
|
51
|
-
"@testing-library/user-event": "^
|
|
51
|
+
"@testing-library/user-event": "^14.1.0",
|
|
52
52
|
"@types/express": "^4.17.12",
|
|
53
53
|
"@types/hash-sum": "^1.0.0",
|
|
54
54
|
"@types/ws": "^8.2.0",
|
|
@@ -62,7 +62,7 @@
|
|
|
62
62
|
"jest": "^27.1.0",
|
|
63
63
|
"konn": "^0.7.0",
|
|
64
64
|
"myzod": "^1.3.1",
|
|
65
|
-
"next": "
|
|
65
|
+
"next": "12.1.4",
|
|
66
66
|
"node-fetch": "^2.6.1",
|
|
67
67
|
"superstruct": "^0.15.2",
|
|
68
68
|
"typescript": "4.4.4",
|
|
@@ -70,5 +70,5 @@
|
|
|
70
70
|
"yup": "^0.32.8",
|
|
71
71
|
"zod": "^3.0.0"
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "17ba7402893584f606e6181d92f8ef27d5e1638e"
|
|
74
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export { T as TRPC_ERROR_CODES_BY_KEY, a as TRPC_ERROR_CODES_BY_NUMBER } from '../../dist/codes-
|
|
1
|
+
export { T as TRPC_ERROR_CODES_BY_KEY, a as TRPC_ERROR_CODES_BY_NUMBER } from '../../dist/codes-5678cc97.esm.js';
|
package/src/TRPCError.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import { FastifyReply, FastifyRequest } from 'fastify';
|
|
2
|
+
import { URLSearchParams } from 'url';
|
|
1
3
|
import { assertNotBrowser } from '../../assertNotBrowser';
|
|
2
4
|
import {
|
|
3
5
|
HTTPBaseHandlerOptions,
|
|
@@ -6,8 +8,6 @@ import {
|
|
|
6
8
|
import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
|
|
7
9
|
import { AnyRouter, inferRouterContext } from '../../router';
|
|
8
10
|
import { NodeHTTPCreateContextOption } from '../node-http';
|
|
9
|
-
import { FastifyReply, FastifyRequest } from 'fastify';
|
|
10
|
-
import { URLSearchParams } from 'url';
|
|
11
11
|
|
|
12
12
|
assertNotBrowser();
|
|
13
13
|
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/// <reference types="fastify-websocket" />
|
|
2
2
|
import { FastifyInstance, FastifyReply, FastifyRequest } from 'fastify';
|
|
3
|
-
import { fastifyRequestHandler } from './fastifyRequestHandler';
|
|
4
|
-
import { NodeHTTPCreateContextFnOptions } from '../node-http';
|
|
5
|
-
import { applyWSSHandler, WSSHandlerOptions } from '../ws';
|
|
6
3
|
import { FastifyHandlerOptions } from '.';
|
|
7
4
|
import { AnyRouter } from '../..';
|
|
5
|
+
import { NodeHTTPCreateContextFnOptions } from '../node-http';
|
|
6
|
+
import { WSSHandlerOptions, applyWSSHandler } from '../ws';
|
|
7
|
+
import { fastifyRequestHandler } from './fastifyRequestHandler';
|
|
8
8
|
|
|
9
9
|
export interface FastifyTRPCPluginOptions<TRouter extends AnyRouter> {
|
|
10
10
|
prefix?: string;
|
package/src/adapters/next.ts
CHANGED
|
@@ -5,9 +5,9 @@ import type {
|
|
|
5
5
|
NextApiRequest,
|
|
6
6
|
NextApiResponse,
|
|
7
7
|
} from 'next/types';
|
|
8
|
+
import { TRPCError } from '../TRPCError';
|
|
8
9
|
import { AnyRouter } from '../router';
|
|
9
10
|
import { TRPCErrorResponse } from '../rpc';
|
|
10
|
-
import { TRPCError } from '../TRPCError';
|
|
11
11
|
import { nodeHTTPRequestHandler } from './node-http';
|
|
12
12
|
import {
|
|
13
13
|
NodeHTTPCreateContextFnOptions,
|
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
2
2
|
import { URLSearchParams } from 'url';
|
|
3
3
|
import { assertNotBrowser } from '../../assertNotBrowser';
|
|
4
|
+
import { HTTPRequest } from '../../http/internals/types';
|
|
5
|
+
import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
|
|
6
|
+
import { AnyRouter, inferRouterContext } from '../../router';
|
|
7
|
+
import { getPostBody } from './internals/getPostBody';
|
|
4
8
|
import {
|
|
9
|
+
NodeHTTPHandlerOptions,
|
|
5
10
|
NodeHTTPRequest,
|
|
6
11
|
NodeHTTPResponse,
|
|
7
|
-
NodeHTTPHandlerOptions,
|
|
8
12
|
} from './types';
|
|
9
|
-
import { AnyRouter, inferRouterContext } from '../../router';
|
|
10
|
-
import { getPostBody } from './internals/getPostBody';
|
|
11
|
-
import { HTTPRequest } from '../../http/internals/types';
|
|
12
|
-
import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
|
|
13
13
|
|
|
14
14
|
assertNotBrowser();
|
|
15
15
|
|
package/src/adapters/ws.ts
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import http from 'http';
|
|
2
2
|
import ws from 'ws';
|
|
3
|
+
import { TRPCError } from '../TRPCError';
|
|
3
4
|
import { BaseHandlerOptions } from '../internals/BaseHandlerOptions';
|
|
4
5
|
import { callProcedure } from '../internals/callProcedure';
|
|
5
6
|
import { getErrorFromUnknown } from '../internals/errors';
|
|
6
7
|
import { transformTRPCResponse } from '../internals/transformTRPCResponse';
|
|
7
|
-
import { AnyRouter,
|
|
8
|
+
import { AnyRouter, ProcedureType, inferRouterContext } from '../router';
|
|
8
9
|
import {
|
|
9
10
|
TRPCErrorResponse,
|
|
10
11
|
TRPCReconnectNotification,
|
|
@@ -13,7 +14,6 @@ import {
|
|
|
13
14
|
} from '../rpc';
|
|
14
15
|
import { Subscription } from '../subscription';
|
|
15
16
|
import { CombinedDataTransformer } from '../transformer';
|
|
16
|
-
import { TRPCError } from '../TRPCError';
|
|
17
17
|
import { NodeHTTPCreateContextOption } from './node-http';
|
|
18
18
|
|
|
19
19
|
/* istanbul ignore next */
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
// this has been moved to separate package
|
|
2
2
|
import {
|
|
3
|
-
|
|
3
|
+
CreateHTTPContextOptions,
|
|
4
4
|
CreateHTTPHandlerOptions,
|
|
5
|
+
createHTTPHandler,
|
|
5
6
|
createHTTPServer,
|
|
6
|
-
CreateHTTPContextOptions,
|
|
7
7
|
} from '../adapters/standalone';
|
|
8
8
|
import { AnyRouter } from '../router';
|
|
9
9
|
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import type { AnyRouter } from '../';
|
|
1
2
|
import {
|
|
2
|
-
nodeHTTPRequestHandler as requestHandlerInner,
|
|
3
3
|
NodeHTTPCreateContextFn,
|
|
4
4
|
NodeHTTPCreateContextFnOptions,
|
|
5
|
+
nodeHTTPRequestHandler as requestHandlerInner,
|
|
5
6
|
} from '../adapters/node-http';
|
|
6
|
-
import type { AnyRouter } from '../';
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
* @deprecated use `nodeHTTPRequestHandler` from `@trpc/server/adapters/node-http`
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { TRPCResponse, TRPC_ERROR_CODES_BY_KEY } from '../../rpc';
|
|
2
1
|
import { TRPCError } from '../../TRPCError';
|
|
3
2
|
import { invert } from '../../internals/invert';
|
|
3
|
+
import { TRPCResponse, TRPC_ERROR_CODES_BY_KEY } from '../../rpc';
|
|
4
4
|
|
|
5
5
|
export const TRPC_ERROR_CODES_BY_NUMBER = invert(TRPC_ERROR_CODES_BY_KEY);
|
|
6
6
|
type ValueOf<T> = T[keyof T];
|
|
@@ -17,6 +17,7 @@ const JSONRPC2_TO_HTTP_CODE: Record<
|
|
|
17
17
|
UNAUTHORIZED: 401,
|
|
18
18
|
FORBIDDEN: 403,
|
|
19
19
|
TIMEOUT: 408,
|
|
20
|
+
CONFLICT: 409,
|
|
20
21
|
CLIENT_CLOSED_REQUEST: 499,
|
|
21
22
|
PRECONDITION_FAILED: 412,
|
|
22
23
|
PAYLOAD_TOO_LARGE: 413,
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import {
|
|
2
2
|
AnyRouter,
|
|
3
3
|
Dict,
|
|
4
|
-
inferRouterContext,
|
|
5
|
-
inferRouterError,
|
|
6
4
|
ProcedureType,
|
|
7
5
|
ResponseMeta,
|
|
8
6
|
TRPCError,
|
|
7
|
+
inferRouterContext,
|
|
8
|
+
inferRouterError,
|
|
9
9
|
} from '@trpc/server';
|
|
10
10
|
import { URLSearchParams } from 'url';
|
|
11
11
|
import { BaseHandlerOptions } from '../../internals/BaseHandlerOptions';
|
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-non-null-assertion */
|
|
2
2
|
import { Maybe } from '@trpc/server';
|
|
3
|
+
import { TRPCError } from '../TRPCError';
|
|
3
4
|
import { callProcedure } from '../internals/callProcedure';
|
|
4
5
|
import { getErrorFromUnknown } from '../internals/errors';
|
|
5
6
|
import { transformTRPCResponse } from '../internals/transformTRPCResponse';
|
|
6
7
|
import {
|
|
7
8
|
AnyRouter,
|
|
9
|
+
ProcedureType,
|
|
8
10
|
inferRouterContext,
|
|
9
11
|
inferRouterError,
|
|
10
|
-
ProcedureType,
|
|
11
12
|
} from '../router';
|
|
12
13
|
import { TRPCErrorResponse, TRPCResponse, TRPCResultResponse } from '../rpc';
|
|
13
|
-
import { TRPCError } from '../TRPCError';
|
|
14
14
|
import { getHTTPStatusCode } from './internals/getHTTPStatusCode';
|
|
15
15
|
import {
|
|
16
|
+
HTTPBaseHandlerOptions,
|
|
16
17
|
HTTPHeaders,
|
|
17
18
|
HTTPRequest,
|
|
18
19
|
HTTPResponse,
|
|
19
|
-
HTTPBaseHandlerOptions,
|
|
20
20
|
} from './internals/types';
|
|
21
21
|
|
|
22
22
|
const HTTP_METHOD_PROCEDURE_TYPE_MAP: Record<
|