@trpc/server 9.20.3 → 9.21.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 +2 -2
- package/adapters/express/dist/trpc-server-adapters-express.cjs.prod.js +2 -2
- package/adapters/express/dist/trpc-server-adapters-express.esm.js +2 -2
- package/adapters/fastify/dist/trpc-server-adapters-fastify.cjs.dev.js +15 -8
- package/adapters/fastify/dist/trpc-server-adapters-fastify.cjs.prod.js +15 -8
- package/adapters/fastify/dist/trpc-server-adapters-fastify.esm.js +15 -8
- package/adapters/ws/dist/trpc-server-adapters-ws.cjs.dev.js +3 -3
- package/adapters/ws/dist/trpc-server-adapters-ws.cjs.prod.js +3 -3
- package/adapters/ws/dist/trpc-server-adapters-ws.esm.js +3 -3
- package/dist/declarations/src/adapters/fastify/fastifyRequestHandler.d.ts +3 -3
- package/dist/declarations/src/adapters/fastify/fastifyRequestHandler.d.ts.map +1 -1
- package/dist/declarations/src/adapters/fastify/fastifyTRPCPlugin.d.ts.map +1 -1
- package/dist/declarations/src/adapters/next.d.ts +1 -1
- package/dist/declarations/src/adapters/next.d.ts.map +1 -1
- package/dist/declarations/src/internals/procedure.d.ts +37 -30
- package/dist/declarations/src/internals/procedure.d.ts.map +1 -1
- package/dist/declarations/src/router.d.ts +17 -17
- package/dist/declarations/src/router.d.ts.map +1 -1
- package/dist/{subscription-c2e0bfbc.cjs.prod.js → subscription-12fb50be.cjs.prod.js} +1 -1
- package/dist/{subscription-b8831081.cjs.dev.js → subscription-9e007280.cjs.dev.js} +1 -1
- package/dist/{subscription-fbda2888.esm.js → subscription-a81120d6.esm.js} +1 -1
- package/dist/trpc-server.cjs.dev.js +35 -15
- package/dist/trpc-server.cjs.prod.js +35 -15
- package/dist/trpc-server.esm.js +35 -15
- package/package.json +2 -2
- package/src/adapters/express.ts +2 -2
- package/src/adapters/fastify/fastifyRequestHandler.ts +8 -9
- package/src/adapters/fastify/fastifyTRPCPlugin.ts +11 -3
- package/src/adapters/next.ts +5 -1
- package/src/adapters/ws.ts +2 -2
- package/src/internals/procedure.ts +123 -63
- package/src/router.ts +93 -37
- package/src/subscription.ts +1 -1
- package/ws/dist/trpc-server-ws.cjs.dev.js +1 -1
- package/ws/dist/trpc-server-ws.cjs.prod.js +1 -1
- package/ws/dist/trpc-server-ws.esm.js +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"../../../src","sources":["router.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAGL,wBAAwB,EACxB,oCAAoC,EACpC,2BAA2B,EAC3B,yBAAyB,EACzB,SAAS,EAEV,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,cAAc,EAEd,mBAAmB,EACnB,sBAAsB,EACvB,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAC9C,OAAO,EAAE,uBAAuB,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAIrD;;GAEG;AACH,oBAAY,aAAa,GAAG,OAAO,GAAG,UAAU,GAAG,cAAc,CAAC;AAElE;;GAEG;AACH,oBAAY,eAAe,CACzB,aAAa,GAAG,GAAG,EACnB,QAAQ,GAAG,GAAG,EACd,MAAM,GAAG,GAAG,EACZ,YAAY,GAAG,GAAG,EAClB,OAAO,GAAG,GAAG,
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"../../../src","sources":["router.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
5
|
var resolveHTTPResponse = require('./resolveHTTPResponse-3867844c.cjs.dev.js');
|
|
6
|
-
var subscription = require('./subscription-
|
|
6
|
+
var subscription = require('./subscription-9e007280.cjs.dev.js');
|
|
7
7
|
var transformTRPCResponse = require('./transformTRPCResponse-8248515e.cjs.dev.js');
|
|
8
8
|
var adapters_standalone_dist_trpcServerAdaptersStandalone = require('../adapters/standalone/dist/trpc-server-adapters-standalone.cjs.dev.js');
|
|
9
9
|
var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-2cc444d8.cjs.dev.js');
|
|
@@ -61,31 +61,31 @@ async function wrapCallSafe(fn) {
|
|
|
61
61
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
62
62
|
resolveHTTPResponse.assertNotBrowser();
|
|
63
63
|
|
|
64
|
-
function getParseFn(
|
|
65
|
-
const parser =
|
|
64
|
+
function getParseFn(procedureParser) {
|
|
65
|
+
const parser = procedureParser;
|
|
66
66
|
|
|
67
67
|
if (typeof parser === 'function') {
|
|
68
|
-
//
|
|
68
|
+
// ProcedureParserCustomValidatorEsque
|
|
69
69
|
return parser;
|
|
70
70
|
}
|
|
71
71
|
|
|
72
72
|
if (typeof parser.parseAsync === 'function') {
|
|
73
|
-
//
|
|
73
|
+
// ProcedureParserZodEsque
|
|
74
74
|
return parser.parseAsync.bind(parser);
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
if (typeof parser.parse === 'function') {
|
|
78
|
-
//
|
|
78
|
+
// ProcedureParserZodEsque
|
|
79
79
|
return parser.parse.bind(parser);
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
if (typeof parser.validateSync === 'function') {
|
|
83
|
-
//
|
|
83
|
+
// ProcedureParserYupEsque
|
|
84
84
|
return parser.validateSync.bind(parser);
|
|
85
85
|
}
|
|
86
86
|
|
|
87
87
|
if (typeof parser.create === 'function') {
|
|
88
|
-
//
|
|
88
|
+
// ProcedureParserSuperstructEsque
|
|
89
89
|
return parser.create.bind(parser);
|
|
90
90
|
}
|
|
91
91
|
|
|
@@ -101,16 +101,20 @@ class Procedure {
|
|
|
101
101
|
this.middlewares = void 0;
|
|
102
102
|
this.resolver = void 0;
|
|
103
103
|
this.inputParser = void 0;
|
|
104
|
-
this.
|
|
104
|
+
this.parseInputFn = void 0;
|
|
105
|
+
this.outputParser = void 0;
|
|
106
|
+
this.parseOutputFn = void 0;
|
|
105
107
|
this.middlewares = opts.middlewares;
|
|
106
108
|
this.resolver = opts.resolver;
|
|
107
109
|
this.inputParser = opts.inputParser;
|
|
108
|
-
this.
|
|
110
|
+
this.parseInputFn = getParseFn(this.inputParser);
|
|
111
|
+
this.outputParser = opts.outputParser;
|
|
112
|
+
this.parseOutputFn = getParseFn(this.outputParser);
|
|
109
113
|
}
|
|
110
114
|
|
|
111
115
|
async parseInput(rawInput) {
|
|
112
116
|
try {
|
|
113
|
-
return await this.
|
|
117
|
+
return await this.parseInputFn(rawInput);
|
|
114
118
|
} catch (cause) {
|
|
115
119
|
throw new transformTRPCResponse.TRPCError({
|
|
116
120
|
code: 'BAD_REQUEST',
|
|
@@ -118,8 +122,20 @@ class Procedure {
|
|
|
118
122
|
});
|
|
119
123
|
}
|
|
120
124
|
}
|
|
125
|
+
|
|
126
|
+
async parseOutput(rawOutput) {
|
|
127
|
+
try {
|
|
128
|
+
return await this.parseOutputFn(rawOutput);
|
|
129
|
+
} catch (cause) {
|
|
130
|
+
throw new transformTRPCResponse.TRPCError({
|
|
131
|
+
code: 'INTERNAL_SERVER_ERROR',
|
|
132
|
+
cause,
|
|
133
|
+
message: 'Output validation failed'
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
}
|
|
121
137
|
/**
|
|
122
|
-
* Trigger middlewares in order, parse raw input &
|
|
138
|
+
* Trigger middlewares in order, parse raw input, call resolver & parse raw output
|
|
123
139
|
* @internal
|
|
124
140
|
*/
|
|
125
141
|
|
|
@@ -130,10 +146,11 @@ class Procedure {
|
|
|
130
146
|
ctx
|
|
131
147
|
}) => {
|
|
132
148
|
const input = await this.parseInput(opts.rawInput);
|
|
133
|
-
const
|
|
149
|
+
const rawOutput = await this.resolver({ ...opts,
|
|
134
150
|
ctx,
|
|
135
151
|
input
|
|
136
152
|
});
|
|
153
|
+
const data = await this.parseOutput(rawOutput);
|
|
137
154
|
return {
|
|
138
155
|
marker: middlewareMarker,
|
|
139
156
|
ok: true,
|
|
@@ -190,7 +207,8 @@ class Procedure {
|
|
|
190
207
|
const instance = new Constructor({
|
|
191
208
|
middlewares: [...middlewares, ...this.middlewares],
|
|
192
209
|
resolver: this.resolver,
|
|
193
|
-
inputParser: this.inputParser
|
|
210
|
+
inputParser: this.inputParser,
|
|
211
|
+
outputParser: this.outputParser
|
|
194
212
|
});
|
|
195
213
|
return instance;
|
|
196
214
|
}
|
|
@@ -207,10 +225,12 @@ function createProcedure(opts) {
|
|
|
207
225
|
|
|
208
226
|
return undefined;
|
|
209
227
|
};
|
|
228
|
+
const outputParser = 'output' in opts && opts.output ? opts.output : output => output;
|
|
210
229
|
return new Procedure({
|
|
211
230
|
inputParser: inputParser,
|
|
212
231
|
resolver: opts.resolve,
|
|
213
|
-
middlewares: []
|
|
232
|
+
middlewares: [],
|
|
233
|
+
outputParser: outputParser
|
|
214
234
|
});
|
|
215
235
|
}
|
|
216
236
|
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
5
|
var resolveHTTPResponse = require('./resolveHTTPResponse-562c3d62.cjs.prod.js');
|
|
6
|
-
var subscription = require('./subscription-
|
|
6
|
+
var subscription = require('./subscription-12fb50be.cjs.prod.js');
|
|
7
7
|
var transformTRPCResponse = require('./transformTRPCResponse-dcbf66c5.cjs.prod.js');
|
|
8
8
|
var adapters_standalone_dist_trpcServerAdaptersStandalone = require('../adapters/standalone/dist/trpc-server-adapters-standalone.cjs.prod.js');
|
|
9
9
|
var nodeHTTPRequestHandler = require('./nodeHTTPRequestHandler-8ddacc19.cjs.prod.js');
|
|
@@ -61,31 +61,31 @@ async function wrapCallSafe(fn) {
|
|
|
61
61
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
62
62
|
resolveHTTPResponse.assertNotBrowser();
|
|
63
63
|
|
|
64
|
-
function getParseFn(
|
|
65
|
-
const parser =
|
|
64
|
+
function getParseFn(procedureParser) {
|
|
65
|
+
const parser = procedureParser;
|
|
66
66
|
|
|
67
67
|
if (typeof parser === 'function') {
|
|
68
|
-
//
|
|
68
|
+
// ProcedureParserCustomValidatorEsque
|
|
69
69
|
return parser;
|
|
70
70
|
}
|
|
71
71
|
|
|
72
72
|
if (typeof parser.parseAsync === 'function') {
|
|
73
|
-
//
|
|
73
|
+
// ProcedureParserZodEsque
|
|
74
74
|
return parser.parseAsync.bind(parser);
|
|
75
75
|
}
|
|
76
76
|
|
|
77
77
|
if (typeof parser.parse === 'function') {
|
|
78
|
-
//
|
|
78
|
+
// ProcedureParserZodEsque
|
|
79
79
|
return parser.parse.bind(parser);
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
if (typeof parser.validateSync === 'function') {
|
|
83
|
-
//
|
|
83
|
+
// ProcedureParserYupEsque
|
|
84
84
|
return parser.validateSync.bind(parser);
|
|
85
85
|
}
|
|
86
86
|
|
|
87
87
|
if (typeof parser.create === 'function') {
|
|
88
|
-
//
|
|
88
|
+
// ProcedureParserSuperstructEsque
|
|
89
89
|
return parser.create.bind(parser);
|
|
90
90
|
}
|
|
91
91
|
|
|
@@ -101,16 +101,20 @@ class Procedure {
|
|
|
101
101
|
this.middlewares = void 0;
|
|
102
102
|
this.resolver = void 0;
|
|
103
103
|
this.inputParser = void 0;
|
|
104
|
-
this.
|
|
104
|
+
this.parseInputFn = void 0;
|
|
105
|
+
this.outputParser = void 0;
|
|
106
|
+
this.parseOutputFn = void 0;
|
|
105
107
|
this.middlewares = opts.middlewares;
|
|
106
108
|
this.resolver = opts.resolver;
|
|
107
109
|
this.inputParser = opts.inputParser;
|
|
108
|
-
this.
|
|
110
|
+
this.parseInputFn = getParseFn(this.inputParser);
|
|
111
|
+
this.outputParser = opts.outputParser;
|
|
112
|
+
this.parseOutputFn = getParseFn(this.outputParser);
|
|
109
113
|
}
|
|
110
114
|
|
|
111
115
|
async parseInput(rawInput) {
|
|
112
116
|
try {
|
|
113
|
-
return await this.
|
|
117
|
+
return await this.parseInputFn(rawInput);
|
|
114
118
|
} catch (cause) {
|
|
115
119
|
throw new transformTRPCResponse.TRPCError({
|
|
116
120
|
code: 'BAD_REQUEST',
|
|
@@ -118,8 +122,20 @@ class Procedure {
|
|
|
118
122
|
});
|
|
119
123
|
}
|
|
120
124
|
}
|
|
125
|
+
|
|
126
|
+
async parseOutput(rawOutput) {
|
|
127
|
+
try {
|
|
128
|
+
return await this.parseOutputFn(rawOutput);
|
|
129
|
+
} catch (cause) {
|
|
130
|
+
throw new transformTRPCResponse.TRPCError({
|
|
131
|
+
code: 'INTERNAL_SERVER_ERROR',
|
|
132
|
+
cause,
|
|
133
|
+
message: 'Output validation failed'
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
}
|
|
121
137
|
/**
|
|
122
|
-
* Trigger middlewares in order, parse raw input &
|
|
138
|
+
* Trigger middlewares in order, parse raw input, call resolver & parse raw output
|
|
123
139
|
* @internal
|
|
124
140
|
*/
|
|
125
141
|
|
|
@@ -130,10 +146,11 @@ class Procedure {
|
|
|
130
146
|
ctx
|
|
131
147
|
}) => {
|
|
132
148
|
const input = await this.parseInput(opts.rawInput);
|
|
133
|
-
const
|
|
149
|
+
const rawOutput = await this.resolver({ ...opts,
|
|
134
150
|
ctx,
|
|
135
151
|
input
|
|
136
152
|
});
|
|
153
|
+
const data = await this.parseOutput(rawOutput);
|
|
137
154
|
return {
|
|
138
155
|
marker: middlewareMarker,
|
|
139
156
|
ok: true,
|
|
@@ -190,7 +207,8 @@ class Procedure {
|
|
|
190
207
|
const instance = new Constructor({
|
|
191
208
|
middlewares: [...middlewares, ...this.middlewares],
|
|
192
209
|
resolver: this.resolver,
|
|
193
|
-
inputParser: this.inputParser
|
|
210
|
+
inputParser: this.inputParser,
|
|
211
|
+
outputParser: this.outputParser
|
|
194
212
|
});
|
|
195
213
|
return instance;
|
|
196
214
|
}
|
|
@@ -207,10 +225,12 @@ function createProcedure(opts) {
|
|
|
207
225
|
|
|
208
226
|
return undefined;
|
|
209
227
|
};
|
|
228
|
+
const outputParser = 'output' in opts && opts.output ? opts.output : output => output;
|
|
210
229
|
return new Procedure({
|
|
211
230
|
inputParser: inputParser,
|
|
212
231
|
resolver: opts.resolve,
|
|
213
|
-
middlewares: []
|
|
232
|
+
middlewares: [],
|
|
233
|
+
outputParser: outputParser
|
|
214
234
|
});
|
|
215
235
|
}
|
|
216
236
|
|
package/dist/trpc-server.esm.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { a as assertNotBrowser, g as getHTTPStatusCodeFromError } from './resolveHTTPResponse-85f3f5df.esm.js';
|
|
2
2
|
export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-85f3f5df.esm.js';
|
|
3
|
-
export { S as Subscription, s as subscriptionPullFactory } from './subscription-
|
|
3
|
+
export { S as Subscription, s as subscriptionPullFactory } from './subscription-a81120d6.esm.js';
|
|
4
4
|
import { T as TRPCError, g as getErrorFromUnknown } from './transformTRPCResponse-f73dc4a2.esm.js';
|
|
5
5
|
export { T as TRPCError } from './transformTRPCResponse-f73dc4a2.esm.js';
|
|
6
6
|
import { createHTTPServer, createHTTPHandler } from '../adapters/standalone/dist/trpc-server-adapters-standalone.esm.js';
|
|
@@ -59,31 +59,31 @@ async function wrapCallSafe(fn) {
|
|
|
59
59
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
60
60
|
assertNotBrowser();
|
|
61
61
|
|
|
62
|
-
function getParseFn(
|
|
63
|
-
const parser =
|
|
62
|
+
function getParseFn(procedureParser) {
|
|
63
|
+
const parser = procedureParser;
|
|
64
64
|
|
|
65
65
|
if (typeof parser === 'function') {
|
|
66
|
-
//
|
|
66
|
+
// ProcedureParserCustomValidatorEsque
|
|
67
67
|
return parser;
|
|
68
68
|
}
|
|
69
69
|
|
|
70
70
|
if (typeof parser.parseAsync === 'function') {
|
|
71
|
-
//
|
|
71
|
+
// ProcedureParserZodEsque
|
|
72
72
|
return parser.parseAsync.bind(parser);
|
|
73
73
|
}
|
|
74
74
|
|
|
75
75
|
if (typeof parser.parse === 'function') {
|
|
76
|
-
//
|
|
76
|
+
// ProcedureParserZodEsque
|
|
77
77
|
return parser.parse.bind(parser);
|
|
78
78
|
}
|
|
79
79
|
|
|
80
80
|
if (typeof parser.validateSync === 'function') {
|
|
81
|
-
//
|
|
81
|
+
// ProcedureParserYupEsque
|
|
82
82
|
return parser.validateSync.bind(parser);
|
|
83
83
|
}
|
|
84
84
|
|
|
85
85
|
if (typeof parser.create === 'function') {
|
|
86
|
-
//
|
|
86
|
+
// ProcedureParserSuperstructEsque
|
|
87
87
|
return parser.create.bind(parser);
|
|
88
88
|
}
|
|
89
89
|
|
|
@@ -99,16 +99,20 @@ class Procedure {
|
|
|
99
99
|
this.middlewares = void 0;
|
|
100
100
|
this.resolver = void 0;
|
|
101
101
|
this.inputParser = void 0;
|
|
102
|
-
this.
|
|
102
|
+
this.parseInputFn = void 0;
|
|
103
|
+
this.outputParser = void 0;
|
|
104
|
+
this.parseOutputFn = void 0;
|
|
103
105
|
this.middlewares = opts.middlewares;
|
|
104
106
|
this.resolver = opts.resolver;
|
|
105
107
|
this.inputParser = opts.inputParser;
|
|
106
|
-
this.
|
|
108
|
+
this.parseInputFn = getParseFn(this.inputParser);
|
|
109
|
+
this.outputParser = opts.outputParser;
|
|
110
|
+
this.parseOutputFn = getParseFn(this.outputParser);
|
|
107
111
|
}
|
|
108
112
|
|
|
109
113
|
async parseInput(rawInput) {
|
|
110
114
|
try {
|
|
111
|
-
return await this.
|
|
115
|
+
return await this.parseInputFn(rawInput);
|
|
112
116
|
} catch (cause) {
|
|
113
117
|
throw new TRPCError({
|
|
114
118
|
code: 'BAD_REQUEST',
|
|
@@ -116,8 +120,20 @@ class Procedure {
|
|
|
116
120
|
});
|
|
117
121
|
}
|
|
118
122
|
}
|
|
123
|
+
|
|
124
|
+
async parseOutput(rawOutput) {
|
|
125
|
+
try {
|
|
126
|
+
return await this.parseOutputFn(rawOutput);
|
|
127
|
+
} catch (cause) {
|
|
128
|
+
throw new TRPCError({
|
|
129
|
+
code: 'INTERNAL_SERVER_ERROR',
|
|
130
|
+
cause,
|
|
131
|
+
message: 'Output validation failed'
|
|
132
|
+
});
|
|
133
|
+
}
|
|
134
|
+
}
|
|
119
135
|
/**
|
|
120
|
-
* Trigger middlewares in order, parse raw input &
|
|
136
|
+
* Trigger middlewares in order, parse raw input, call resolver & parse raw output
|
|
121
137
|
* @internal
|
|
122
138
|
*/
|
|
123
139
|
|
|
@@ -128,10 +144,11 @@ class Procedure {
|
|
|
128
144
|
ctx
|
|
129
145
|
}) => {
|
|
130
146
|
const input = await this.parseInput(opts.rawInput);
|
|
131
|
-
const
|
|
147
|
+
const rawOutput = await this.resolver({ ...opts,
|
|
132
148
|
ctx,
|
|
133
149
|
input
|
|
134
150
|
});
|
|
151
|
+
const data = await this.parseOutput(rawOutput);
|
|
135
152
|
return {
|
|
136
153
|
marker: middlewareMarker,
|
|
137
154
|
ok: true,
|
|
@@ -188,7 +205,8 @@ class Procedure {
|
|
|
188
205
|
const instance = new Constructor({
|
|
189
206
|
middlewares: [...middlewares, ...this.middlewares],
|
|
190
207
|
resolver: this.resolver,
|
|
191
|
-
inputParser: this.inputParser
|
|
208
|
+
inputParser: this.inputParser,
|
|
209
|
+
outputParser: this.outputParser
|
|
192
210
|
});
|
|
193
211
|
return instance;
|
|
194
212
|
}
|
|
@@ -205,10 +223,12 @@ function createProcedure(opts) {
|
|
|
205
223
|
|
|
206
224
|
return undefined;
|
|
207
225
|
};
|
|
226
|
+
const outputParser = 'output' in opts && opts.output ? opts.output : output => output;
|
|
208
227
|
return new Procedure({
|
|
209
228
|
inputParser: inputParser,
|
|
210
229
|
resolver: opts.resolve,
|
|
211
|
-
middlewares: []
|
|
230
|
+
middlewares: [],
|
|
231
|
+
outputParser: outputParser
|
|
212
232
|
});
|
|
213
233
|
}
|
|
214
234
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trpc/server",
|
|
3
|
-
"version": "9.
|
|
3
|
+
"version": "9.21.0",
|
|
4
4
|
"description": "tRPC Server",
|
|
5
5
|
"author": "KATT",
|
|
6
6
|
"license": "MIT",
|
|
@@ -70,5 +70,5 @@
|
|
|
70
70
|
"yup": "^0.32.8",
|
|
71
71
|
"zod": "^3.0.0"
|
|
72
72
|
},
|
|
73
|
-
"gitHead": "
|
|
73
|
+
"gitHead": "bfcabb55010f3e6612308595a79f6be3637d38d8"
|
|
74
74
|
}
|
package/src/adapters/express.ts
CHANGED
|
@@ -15,10 +15,10 @@ export type CreateExpressContextOptions = NodeHTTPCreateContextFnOptions<
|
|
|
15
15
|
export function createExpressMiddleware<TRouter extends AnyRouter>(
|
|
16
16
|
opts: NodeHTTPHandlerOptions<TRouter, express.Request, express.Response>,
|
|
17
17
|
): express.Handler {
|
|
18
|
-
return (req, res) => {
|
|
18
|
+
return async (req, res) => {
|
|
19
19
|
const endpoint = req.path.slice(1);
|
|
20
20
|
|
|
21
|
-
nodeHTTPRequestHandler({
|
|
21
|
+
await nodeHTTPRequestHandler({
|
|
22
22
|
...opts,
|
|
23
23
|
req,
|
|
24
24
|
res,
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { URLSearchParams } from 'url';
|
|
2
|
-
import { FastifyReply, FastifyRequest } from 'fastify';
|
|
3
1
|
import { assertNotBrowser } from '../../assertNotBrowser';
|
|
4
|
-
import { NodeHTTPCreateContextOption } from '../node-http';
|
|
5
|
-
import { AnyRouter, inferRouterContext } from '../../router';
|
|
6
|
-
import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
|
|
7
2
|
import {
|
|
8
3
|
HTTPBaseHandlerOptions,
|
|
9
4
|
HTTPRequest,
|
|
10
5
|
} from '../../http/internals/types';
|
|
6
|
+
import { resolveHTTPResponse } from '../../http/resolveHTTPResponse';
|
|
7
|
+
import { AnyRouter, inferRouterContext } from '../../router';
|
|
8
|
+
import { NodeHTTPCreateContextOption } from '../node-http';
|
|
9
|
+
import { FastifyReply, FastifyRequest } from 'fastify';
|
|
10
|
+
import { URLSearchParams } from 'url';
|
|
11
11
|
|
|
12
12
|
assertNotBrowser();
|
|
13
13
|
|
|
@@ -67,13 +67,12 @@ export async function fastifyRequestHandler<
|
|
|
67
67
|
if ('status' in result && (!res.statusCode || res.statusCode === 200)) {
|
|
68
68
|
res.statusCode = result.status;
|
|
69
69
|
}
|
|
70
|
-
|
|
71
70
|
for (const [key, value] of Object.entries(result.headers ?? {})) {
|
|
72
71
|
if (typeof value === 'undefined') {
|
|
73
72
|
continue;
|
|
74
73
|
}
|
|
75
|
-
res.header(key, value);
|
|
76
|
-
}
|
|
77
74
|
|
|
78
|
-
|
|
75
|
+
void res.header(key, value);
|
|
76
|
+
}
|
|
77
|
+
await res.send(result.body);
|
|
79
78
|
}
|
|
@@ -30,9 +30,17 @@ export function fastifyTRPCPlugin<TRouter extends AnyRouter>(
|
|
|
30
30
|
},
|
|
31
31
|
);
|
|
32
32
|
|
|
33
|
-
|
|
33
|
+
let prefix = opts.prefix ?? '';
|
|
34
|
+
|
|
35
|
+
// https://github.com/fastify/fastify-plugin/blob/fe079bef6557a83794bf437e14b9b9edb8a74104/plugin.js#L11
|
|
36
|
+
// @ts-expect-error property 'default' does not exists on type ...
|
|
37
|
+
if (typeof fastifyTRPCPlugin.default !== 'function') {
|
|
38
|
+
prefix = ''; // handled by fastify internally
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
fastify.all(`${prefix}/:path`, async (req, res) => {
|
|
34
42
|
const path = (req.params as any).path;
|
|
35
|
-
fastifyRequestHandler({ ...opts.trpcOptions, req, res, path });
|
|
43
|
+
await fastifyRequestHandler({ ...opts.trpcOptions, req, res, path });
|
|
36
44
|
});
|
|
37
45
|
|
|
38
46
|
if (opts.useWSS) {
|
|
@@ -41,7 +49,7 @@ export function fastifyTRPCPlugin<TRouter extends AnyRouter>(
|
|
|
41
49
|
wss: fastify.websocketServer,
|
|
42
50
|
});
|
|
43
51
|
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
44
|
-
fastify.get(
|
|
52
|
+
fastify.get(prefix ?? '/', { websocket: true }, () => {});
|
|
45
53
|
}
|
|
46
54
|
|
|
47
55
|
done();
|
package/src/adapters/next.ts
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
2
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
3
|
-
import type {
|
|
3
|
+
import type {
|
|
4
|
+
NextApiHandler,
|
|
5
|
+
NextApiRequest,
|
|
6
|
+
NextApiResponse,
|
|
7
|
+
} from 'next/types';
|
|
4
8
|
import { AnyRouter } from '../router';
|
|
5
9
|
import { TRPCErrorResponse } from '../rpc';
|
|
6
10
|
import { TRPCError } from '../TRPCError';
|
package/src/adapters/ws.ts
CHANGED
|
@@ -96,7 +96,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
|
|
|
96
96
|
const { wss, createContext, router } = opts;
|
|
97
97
|
|
|
98
98
|
const { transformer } = router._def;
|
|
99
|
-
wss.on('connection', (client, req) => {
|
|
99
|
+
wss.on('connection', async (client, req) => {
|
|
100
100
|
const clientSubscriptions = new Map<
|
|
101
101
|
number | string,
|
|
102
102
|
Subscription<TRouter>
|
|
@@ -285,7 +285,7 @@ export function applyWSSHandler<TRouter extends AnyRouter>(
|
|
|
285
285
|
});
|
|
286
286
|
}
|
|
287
287
|
}
|
|
288
|
-
createContextAsync();
|
|
288
|
+
await createContextAsync();
|
|
289
289
|
});
|
|
290
290
|
|
|
291
291
|
return {
|