@trpc/server 10.0.0-alpha.36 → 10.0.0-alpha.39
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +79 -1
- package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.dev.js +20 -0
- package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.cjs.prod.js +20 -0
- package/adapters/aws-lambda/dist/trpc-server-adapters-aws-lambda.esm.js +20 -0
- package/dist/adapters/aws-lambda/index.d.ts.map +1 -1
- package/dist/adapters/aws-lambda/utils.d.ts +4 -3
- package/dist/adapters/aws-lambda/utils.d.ts.map +1 -1
- package/dist/adapters/fastify/index.js +1 -1
- package/dist/adapters/fastify/index.mjs +1 -1
- package/dist/adapters/ws.js +1 -1
- package/dist/adapters/ws.mjs +1 -1
- package/dist/core/index.d.ts +2 -1
- package/dist/core/index.d.ts.map +1 -1
- package/dist/core/initTRPC.d.ts +1 -1
- package/dist/core/internals/procedureBuilder.d.ts +37 -13
- package/dist/core/internals/procedureBuilder.d.ts.map +1 -1
- package/dist/core/middleware.d.ts +1 -1
- package/dist/core/procedure.d.ts +12 -8
- package/dist/core/procedure.d.ts.map +1 -1
- package/dist/core/router.d.ts +17 -3
- package/dist/core/router.d.ts.map +1 -1
- package/dist/core/types.d.ts +3 -1
- package/dist/core/types.d.ts.map +1 -1
- package/dist/deprecated/router.d.ts.map +1 -1
- package/dist/index-1a25ccbd.js +33 -0
- package/dist/index-a3bd54c7.mjs +31 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +189 -194
- package/dist/index.mjs +188 -195
- package/dist/internals.d.ts +11 -0
- package/dist/internals.d.ts.map +1 -0
- package/dist/observable/index.js +1 -1
- package/dist/observable/index.mjs +1 -1
- package/dist/observable/internals/pipe.d.ts.map +1 -1
- package/dist/{observable-3aa4d911.js → observable-341a0506.js} +1 -0
- package/dist/{observable-137ea1bd.mjs → observable-cfedfa30.mjs} +1 -0
- package/dist/shared/index.js +2 -28
- package/dist/shared/index.mjs +1 -31
- package/dist/subscription.js +1 -1
- package/dist/subscription.mjs +1 -1
- package/dist/types.d.ts +10 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/adapters/aws-lambda/index.ts +17 -0
- package/src/adapters/aws-lambda/utils.ts +2 -1
- package/src/core/index.ts +2 -1
- package/src/core/internals/procedureBuilder.ts +264 -28
- package/src/core/procedure.ts +17 -10
- package/src/core/router.ts +79 -78
- package/src/core/types.ts +5 -1
- package/src/deprecated/internals/procedure.ts +1 -1
- package/src/deprecated/interop.ts +4 -4
- package/src/deprecated/router.ts +3 -4
- package/src/http/resolveHTTPResponse.ts +1 -1
- package/src/index.ts +1 -0
- package/src/internals.ts +14 -0
- package/src/observable/internals/pipe.ts +2 -1
- package/src/observable/observable.test.ts +3 -3
- package/src/observable/operators/share.test.ts +2 -2
- package/src/types.ts +12 -0
- package/dist/core/internals/internalProcedure.d.ts +0 -78
- package/dist/core/internals/internalProcedure.d.ts.map +0 -1
- package/src/core/internals/internalProcedure.ts +0 -296
|
@@ -1,296 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* This is the actual internal representation of a builder
|
|
3
|
-
* FIXME - I want to get rid of this and use the public API instead
|
|
4
|
-
*/
|
|
5
|
-
import { TRPCError } from '../../error/TRPCError';
|
|
6
|
-
import { getCauseFromUnknown } from '../../error/utils';
|
|
7
|
-
import { getErrorFromUnknown } from '../../error/utils';
|
|
8
|
-
import { MaybePromise } from '../../types';
|
|
9
|
-
import { MiddlewareFunction, MiddlewareResult } from '../middleware';
|
|
10
|
-
import { Parser } from '../parser';
|
|
11
|
-
import { ProcedureType } from '../types';
|
|
12
|
-
import { ParseFn, getParseFn } from './getParseFn';
|
|
13
|
-
import { mergeWithoutOverrides } from './mergeWithoutOverrides';
|
|
14
|
-
import { ResolveOptions, middlewareMarker } from './utils';
|
|
15
|
-
|
|
16
|
-
export interface InternalProcedureCallOptions {
|
|
17
|
-
ctx: unknown;
|
|
18
|
-
rawInput: unknown;
|
|
19
|
-
input?: unknown;
|
|
20
|
-
path: string;
|
|
21
|
-
type: ProcedureType;
|
|
22
|
-
}
|
|
23
|
-
export interface InternalProcedure {
|
|
24
|
-
_def: ProcedureBuilderInternal['_def'];
|
|
25
|
-
/**
|
|
26
|
-
* @deprecated use `._def.meta` instead
|
|
27
|
-
*/
|
|
28
|
-
meta: ProcedureBuilderInternal['_def']['meta'];
|
|
29
|
-
mutation?: boolean;
|
|
30
|
-
query?: boolean;
|
|
31
|
-
subscription?: boolean;
|
|
32
|
-
(opts: InternalProcedureCallOptions): Promise<unknown>;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
type ProcedureBuilderInternalResolver = (
|
|
36
|
-
opts: ResolveOptions<any>,
|
|
37
|
-
) => Promise<unknown>;
|
|
38
|
-
|
|
39
|
-
export type ProcedureBuilderInternalMiddleware = MiddlewareFunction<any, any>;
|
|
40
|
-
type TResolver = (opts: ResolveOptions<any>) => MaybePromise<any>;
|
|
41
|
-
|
|
42
|
-
interface ProcedureBuilderInternal {
|
|
43
|
-
_def: {
|
|
44
|
-
input?: Parser;
|
|
45
|
-
output?: Parser;
|
|
46
|
-
meta?: Record<string, unknown>;
|
|
47
|
-
resolver?: ProcedureBuilderInternalResolver;
|
|
48
|
-
middlewares: ProcedureBuilderInternalMiddleware[];
|
|
49
|
-
mutation?: boolean;
|
|
50
|
-
query?: boolean;
|
|
51
|
-
subscription?: boolean;
|
|
52
|
-
};
|
|
53
|
-
/**
|
|
54
|
-
* @internal
|
|
55
|
-
*/
|
|
56
|
-
input: (parser: Parser) => ProcedureBuilderInternal;
|
|
57
|
-
/**
|
|
58
|
-
* @internal
|
|
59
|
-
*/
|
|
60
|
-
output: (parser: Parser) => ProcedureBuilderInternal;
|
|
61
|
-
/**
|
|
62
|
-
* @internal
|
|
63
|
-
*/
|
|
64
|
-
unstable_concat: (proc: ProcedureBuilderInternal) => ProcedureBuilderInternal;
|
|
65
|
-
/**
|
|
66
|
-
* @internal
|
|
67
|
-
*/
|
|
68
|
-
use: (fn: MiddlewareFunction<any, any>) => ProcedureBuilderInternal;
|
|
69
|
-
/**
|
|
70
|
-
* @internal
|
|
71
|
-
*/
|
|
72
|
-
meta: (meta: Record<string, unknown>) => ProcedureBuilderInternal;
|
|
73
|
-
/** @deprecated **/
|
|
74
|
-
resolve: (resolver: TResolver) => InternalProcedure;
|
|
75
|
-
/**
|
|
76
|
-
* @internal
|
|
77
|
-
*/
|
|
78
|
-
query: (resolver: TResolver) => InternalProcedure;
|
|
79
|
-
/**
|
|
80
|
-
* @internal
|
|
81
|
-
*/
|
|
82
|
-
mutation: (resolver: TResolver) => InternalProcedure;
|
|
83
|
-
|
|
84
|
-
/**
|
|
85
|
-
* @internal
|
|
86
|
-
*/
|
|
87
|
-
subscription: (resolver: TResolver) => InternalProcedure;
|
|
88
|
-
}
|
|
89
|
-
function createNewInternalBuilder(
|
|
90
|
-
def1: ProcedureBuilderInternal['_def'],
|
|
91
|
-
def2: Partial<ProcedureBuilderInternal['_def']>,
|
|
92
|
-
): ProcedureBuilderInternal {
|
|
93
|
-
const { middlewares = [], ...rest } = def2;
|
|
94
|
-
|
|
95
|
-
// TODO: maybe have a fn here to warn about calls
|
|
96
|
-
return createInternalBuilder({
|
|
97
|
-
...mergeWithoutOverrides(def1, rest),
|
|
98
|
-
middlewares: [...def1.middlewares, ...middlewares],
|
|
99
|
-
});
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
const codeblock = `
|
|
103
|
-
If you want to call this function on the server, you do the following:
|
|
104
|
-
This is a client-only function.
|
|
105
|
-
|
|
106
|
-
const caller = appRouter.createCaller({
|
|
107
|
-
/* ... your context */
|
|
108
|
-
});
|
|
109
|
-
|
|
110
|
-
const result = await caller.call('myProcedure', input);
|
|
111
|
-
`.trim();
|
|
112
|
-
|
|
113
|
-
function createProcedureCaller(
|
|
114
|
-
_def: InternalProcedure['_def'],
|
|
115
|
-
): InternalProcedure {
|
|
116
|
-
const procedure = async function resolve(opts: InternalProcedureCallOptions) {
|
|
117
|
-
if (!opts || !('rawInput' in opts)) {
|
|
118
|
-
throw new Error(codeblock);
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
// run the middlewares recursively with the resolver as the last one
|
|
122
|
-
const callRecursive = async (
|
|
123
|
-
callOpts: { ctx: any; index: number; input?: unknown } = {
|
|
124
|
-
index: 0,
|
|
125
|
-
ctx: opts.ctx,
|
|
126
|
-
},
|
|
127
|
-
): Promise<MiddlewareResult<any>> => {
|
|
128
|
-
try {
|
|
129
|
-
const middleware = _def.middlewares[callOpts.index];
|
|
130
|
-
const result = await middleware({
|
|
131
|
-
ctx: callOpts.ctx,
|
|
132
|
-
type: opts.type,
|
|
133
|
-
path: opts.path,
|
|
134
|
-
rawInput: opts.rawInput,
|
|
135
|
-
meta: _def.meta,
|
|
136
|
-
input: callOpts.input,
|
|
137
|
-
next: async (nextOpts?: { ctx: any; input?: any }) => {
|
|
138
|
-
return await callRecursive({
|
|
139
|
-
index: callOpts.index + 1,
|
|
140
|
-
ctx:
|
|
141
|
-
nextOpts && 'ctx' in nextOpts
|
|
142
|
-
? { ...callOpts.ctx, ...nextOpts.ctx }
|
|
143
|
-
: callOpts.ctx,
|
|
144
|
-
input:
|
|
145
|
-
nextOpts && 'input' in nextOpts
|
|
146
|
-
? nextOpts.input
|
|
147
|
-
: callOpts.input,
|
|
148
|
-
});
|
|
149
|
-
},
|
|
150
|
-
});
|
|
151
|
-
return result;
|
|
152
|
-
} catch (cause) {
|
|
153
|
-
return {
|
|
154
|
-
ok: false,
|
|
155
|
-
error: getErrorFromUnknown(cause),
|
|
156
|
-
marker: middlewareMarker,
|
|
157
|
-
};
|
|
158
|
-
}
|
|
159
|
-
};
|
|
160
|
-
|
|
161
|
-
// there's always at least one "next" since we wrap this.resolver in a middleware
|
|
162
|
-
const result = await callRecursive();
|
|
163
|
-
|
|
164
|
-
if (!result) {
|
|
165
|
-
throw new TRPCError({
|
|
166
|
-
code: 'INTERNAL_SERVER_ERROR',
|
|
167
|
-
message:
|
|
168
|
-
'No result from middlewares - did you forget to `return next()`?',
|
|
169
|
-
});
|
|
170
|
-
}
|
|
171
|
-
if (!result.ok) {
|
|
172
|
-
// re-throw original error
|
|
173
|
-
throw result.error;
|
|
174
|
-
}
|
|
175
|
-
return result.data;
|
|
176
|
-
};
|
|
177
|
-
procedure._def = _def;
|
|
178
|
-
procedure.meta = _def.meta;
|
|
179
|
-
|
|
180
|
-
return procedure;
|
|
181
|
-
}
|
|
182
|
-
|
|
183
|
-
export function createInputMiddleware<T>(
|
|
184
|
-
parse: ParseFn<T>,
|
|
185
|
-
): ProcedureBuilderInternalMiddleware {
|
|
186
|
-
return async function inputMiddleware({ next, rawInput }) {
|
|
187
|
-
let input: ReturnType<typeof parse>;
|
|
188
|
-
try {
|
|
189
|
-
input = await parse(rawInput);
|
|
190
|
-
} catch (cause) {
|
|
191
|
-
throw new TRPCError({
|
|
192
|
-
code: 'BAD_REQUEST',
|
|
193
|
-
cause: getCauseFromUnknown(cause),
|
|
194
|
-
});
|
|
195
|
-
}
|
|
196
|
-
// TODO fix this typing?
|
|
197
|
-
return next({ input } as any);
|
|
198
|
-
};
|
|
199
|
-
}
|
|
200
|
-
|
|
201
|
-
export function createOutputMiddleware<T>(
|
|
202
|
-
parse: ParseFn<T>,
|
|
203
|
-
): ProcedureBuilderInternalMiddleware {
|
|
204
|
-
return async function outputMiddleware({ next }) {
|
|
205
|
-
const result = await next();
|
|
206
|
-
if (!result.ok) {
|
|
207
|
-
// pass through failures without validating
|
|
208
|
-
return result;
|
|
209
|
-
}
|
|
210
|
-
try {
|
|
211
|
-
const data = await parse(result.data);
|
|
212
|
-
return {
|
|
213
|
-
...result,
|
|
214
|
-
data,
|
|
215
|
-
};
|
|
216
|
-
} catch (cause) {
|
|
217
|
-
throw new TRPCError({
|
|
218
|
-
message: 'Output validation failed',
|
|
219
|
-
code: 'INTERNAL_SERVER_ERROR',
|
|
220
|
-
cause: getCauseFromUnknown(cause),
|
|
221
|
-
});
|
|
222
|
-
}
|
|
223
|
-
};
|
|
224
|
-
}
|
|
225
|
-
|
|
226
|
-
function createResolver(
|
|
227
|
-
_def: ProcedureBuilderInternal['_def'],
|
|
228
|
-
resolver: TResolver,
|
|
229
|
-
) {
|
|
230
|
-
const finalBuilder = createNewInternalBuilder(_def, {
|
|
231
|
-
resolver,
|
|
232
|
-
middlewares: [
|
|
233
|
-
async function resolveMiddleware(opts) {
|
|
234
|
-
const data = await resolver(opts);
|
|
235
|
-
return {
|
|
236
|
-
marker: middlewareMarker,
|
|
237
|
-
ok: true,
|
|
238
|
-
data,
|
|
239
|
-
ctx: opts.ctx,
|
|
240
|
-
} as const;
|
|
241
|
-
},
|
|
242
|
-
],
|
|
243
|
-
});
|
|
244
|
-
|
|
245
|
-
return createProcedureCaller(finalBuilder._def);
|
|
246
|
-
}
|
|
247
|
-
export function createInternalBuilder(
|
|
248
|
-
initDef?: ProcedureBuilderInternal['_def'],
|
|
249
|
-
): ProcedureBuilderInternal {
|
|
250
|
-
const _def: ProcedureBuilderInternal['_def'] = initDef || {
|
|
251
|
-
middlewares: [],
|
|
252
|
-
};
|
|
253
|
-
|
|
254
|
-
return {
|
|
255
|
-
_def,
|
|
256
|
-
// _call: createProcedureCaller(_def),
|
|
257
|
-
input(input: Parser) {
|
|
258
|
-
const parser = getParseFn(input);
|
|
259
|
-
return createNewInternalBuilder(_def, {
|
|
260
|
-
input,
|
|
261
|
-
middlewares: [createInputMiddleware(parser)],
|
|
262
|
-
});
|
|
263
|
-
},
|
|
264
|
-
output(output: Parser) {
|
|
265
|
-
const parseOutput = getParseFn(output);
|
|
266
|
-
return createNewInternalBuilder(_def, {
|
|
267
|
-
output,
|
|
268
|
-
middlewares: [createOutputMiddleware(parseOutput)],
|
|
269
|
-
});
|
|
270
|
-
},
|
|
271
|
-
meta(meta) {
|
|
272
|
-
return createNewInternalBuilder(_def, { meta });
|
|
273
|
-
},
|
|
274
|
-
/** @deprecated **/
|
|
275
|
-
resolve(resolver) {
|
|
276
|
-
return createResolver(_def, resolver);
|
|
277
|
-
},
|
|
278
|
-
unstable_concat(builder) {
|
|
279
|
-
return createNewInternalBuilder(_def, builder._def);
|
|
280
|
-
},
|
|
281
|
-
use(middleware) {
|
|
282
|
-
return createNewInternalBuilder(_def, {
|
|
283
|
-
middlewares: [middleware],
|
|
284
|
-
});
|
|
285
|
-
},
|
|
286
|
-
query(resolver) {
|
|
287
|
-
return createResolver({ ..._def, query: true }, resolver);
|
|
288
|
-
},
|
|
289
|
-
mutation(resolver) {
|
|
290
|
-
return createResolver({ ..._def, mutation: true }, resolver);
|
|
291
|
-
},
|
|
292
|
-
subscription(resolver) {
|
|
293
|
-
return createResolver({ ..._def, subscription: true }, resolver);
|
|
294
|
-
},
|
|
295
|
-
};
|
|
296
|
-
}
|