@trpc/server 10.0.0-alpha.49 → 10.0.0-alpha.51

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.
Files changed (17) hide show
  1. package/dist/adapters/aws-lambda/index.js +1 -1
  2. package/dist/adapters/aws-lambda/index.mjs +1 -1
  3. package/dist/core/internals/procedureBuilder.d.ts +7 -5
  4. package/dist/core/internals/procedureBuilder.d.ts.map +1 -1
  5. package/dist/deprecated/router.d.ts +2 -2
  6. package/dist/deprecated/router.d.ts.map +1 -1
  7. package/dist/index.js +1 -1
  8. package/dist/index.mjs +2 -2
  9. package/dist/{router-f21b6d06.mjs → router-2b8c6fe4.mjs} +24 -7
  10. package/dist/{router-8372703e.js → router-af26eaf1.js} +24 -7
  11. package/dist/types.d.ts +2 -2
  12. package/dist/types.d.ts.map +1 -1
  13. package/package.json +2 -2
  14. package/src/core/internals/procedureBuilder.ts +43 -11
  15. package/src/deprecated/interop.ts +1 -1
  16. package/src/deprecated/router.ts +4 -4
  17. package/src/types.ts +5 -5
package/dist/adapters/aws-lambda/index.js CHANGED
@@ -2,7 +2,7 @@
2
2
 
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
- require('../../router-8372703e.js');
5
+ require('../../router-af26eaf1.js');
6
6
  var TRPCError = require('../../TRPCError-9c7830b4.js');
7
7
  var resolveHTTPResponse = require('../../resolveHTTPResponse-b486996d.js');
8
8
  require('../../codes-1c24d919.js');
package/dist/adapters/aws-lambda/index.mjs CHANGED
@@ -1,4 +1,4 @@
1
- import '../../router-f21b6d06.mjs';
1
+ import '../../router-2b8c6fe4.mjs';
2
2
  import { T as TRPCError } from '../../TRPCError-6f61762c.mjs';
3
3
  import { r as resolveHTTPResponse } from '../../resolveHTTPResponse-83703ee8.mjs';
4
4
  import '../../codes-aaa7d554.mjs';
package/dist/core/internals/procedureBuilder.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { MaybePromise } from '../../types';
1
+ import { FlatOverwrite, MaybePromise } from '../../types';
2
2
  import { MiddlewareFunction } from '../middleware';
3
3
  import { Parser, inferParser } from '../parser';
4
4
  import { MutationProcedure, ProcedureParams, QueryProcedure, SubscriptionProcedure } from '../procedure';
@@ -17,17 +17,19 @@ declare type CreateProcedureReturnInput<TPrev extends ProcedureParams, TNext ext
17
17
  _output_in: FallbackValue<TNext['_output_in'], TPrev['_output_in']>;
18
18
  _output_out: FallbackValue<TNext['_output_out'], TPrev['_output_out']>;
19
19
  }>;
20
+ declare type OverwriteIfDefined<T, K> = UnsetMarker extends T ? K : FlatOverwrite<T, K>;
21
+ declare type ErrorMessage<T extends string> = T;
20
22
  export interface ProcedureBuilder<TParams extends ProcedureParams> {
21
23
  /**
22
24
  * Add an input parser to the procedure.
23
25
  */
24
- input<$TParser extends Parser>(schema: $TParser): ProcedureBuilder<{
26
+ input<$TParser extends Parser>(schema: TParams['_input_out'] extends UnsetMarker ? $TParser : inferParser<$TParser>['out'] extends Record<string, unknown> ? TParams['_input_out'] extends Record<string, unknown> ? $TParser : ErrorMessage<'All input parsers did not resolve to an object'> : ErrorMessage<'All input parsers did not resolve to an object'>): ProcedureBuilder<{
25
27
  _config: TParams['_config'];
26
28
  _meta: TParams['_meta'];
27
29
  _ctx_in: TParams['_ctx_in'];
28
30
  _ctx_out: TParams['_ctx_out'];
29
- _input_in: inferParser<$TParser>['in'];
30
- _input_out: inferParser<$TParser>['out'];
31
+ _input_in: OverwriteIfDefined<TParams['_input_in'], inferParser<$TParser>['in']>;
32
+ _input_out: OverwriteIfDefined<TParams['_input_out'], inferParser<$TParser>['out']>;
31
33
  _output_in: TParams['_output_in'];
32
34
  _output_out: TParams['_output_out'];
33
35
  }>;
@@ -82,7 +84,7 @@ export interface ProcedureBuilder<TParams extends ProcedureParams> {
82
84
  * @internal
83
85
  */
84
86
  _def: {
85
- input?: Parser;
87
+ inputs: Parser[];
86
88
  output?: Parser;
87
89
  meta?: Record<string, unknown>;
88
90
  resolver?: ProcedureBuilderResolver;
package/dist/core/internals/procedureBuilder.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"procedureBuilder.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/core/internals/procedureBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"procedureBuilder.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/core/internals/procedureBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAoB,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EACL,iBAAiB,EAEjB,eAAe,EACf,cAAc,EACd,qBAAqB,EACtB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,OAAO,EAAE,OAAO,EAAc,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAE,cAAc,EAAoB,MAAM,SAAS,CAAC;AAC3D,OAAO,EAAE,YAAY,IAAI,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEhF,aAAK,0BAA0B,CAC7B,KAAK,SAAS,eAAe,EAC7B,KAAK,SAAS,eAAe,IAC3B,gBAAgB,CAAC;IACnB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1B,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;IACtB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAC1B,QAAQ,EAAE,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IAC1D,SAAS,EAAE,aAAa,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;IACjE,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;IACpE,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;IACpE,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;CACxE,CAAC,CAAC;AAEH,aAAK,kBAAkB,CAAC,CAAC,EAAE,CAAC,IAAI,WAAW,SAAS,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAEhF,aAAK,YAAY,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,CAAC;AAExC,MAAM,WAAW,gBAAgB,CAAC,OAAO,SAAS,eAAe;IAC/D;;OAEG;IACH,KAAK,CAAC,QAAQ,SAAS,MAAM,EAC3B,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,SAAS,WAAW,GAC7C,QAAQ,GACR,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC5D,OAAO,CAAC,YAAY,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACnD,QAAQ,GACR,YAAY,CAAC,gDAAgD,CAAC,GAChE,YAAY,CAAC,gDAAgD,CAAC,GACjE,gBAAgB,CAAC;QAClB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACxB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5B,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9B,SAAS,EAAE,kBAAkB,CAC3B,OAAO,CAAC,WAAW,CAAC,EACpB,WAAW,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAC5B,CAAC;QACF,UAAU,EAAE,kBAAkB,CAC5B,OAAO,CAAC,YAAY,CAAC,EACrB,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAC7B,CAAC;QACF,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAClC,WAAW,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;KACrC,CAAC,CAAC;IACH;;OAEG;IACH,MAAM,CAAC,QAAQ,SAAS,MAAM,EAC5B,MAAM,EAAE,QAAQ,GACf,gBAAgB,CAAC;QAClB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACxB,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5B,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAC9B,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAChC,UAAU,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;QAClC,UAAU,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;QACxC,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC;KAC3C,CAAC,CAAC;IACH;;OAEG;IACH,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACxD;;OAEG;IACH,GAAG,CAAC,QAAQ,SAAS,eAAe,EAClC,EAAE,EAAE,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC,GACxC,0BAA0B,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACjD;;;OAGG;IACH,eAAe,CAAC,qBAAqB,SAAS,mBAAmB,EAC/D,IAAI,EAAE,qBAAqB,GAC1B,qBAAqB,SAAS,gBAAgB,CAAC,MAAM,QAAQ,CAAC,GAC7D,0BAA0B,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC7C,KAAK,CAAC;IACV;;OAEG;IACH,KAAK,CAAC,QAAQ,EACZ,QAAQ,EAAE,CACR,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,KAC1B,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,CAAC,GAChE,WAAW,SAAS,OAAO,CAAC,aAAa,CAAC,GACzC,cAAc,CACZ,SAAS,CACP,OAAO,EACP;QACE,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;KACvB,CACF,CACF,GACD,cAAc,CAAC,OAAO,CAAC,CAAC;IAE5B;;OAEG;IACH,QAAQ,CAAC,QAAQ,EACf,QAAQ,EAAE,CACR,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,KAC1B,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,CAAC,GAChE,WAAW,SAAS,OAAO,CAAC,aAAa,CAAC,GACzC,iBAAiB,CACf,SAAS,CACP,OAAO,EACP;QACE,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;KACvB,CACF,CACF,GACD,iBAAiB,CAAC,OAAO,CAAC,CAAC;IAE/B;;OAEG;IACH,YAAY,CAAC,QAAQ,EACnB,QAAQ,EAAE,CACR,IAAI,EAAE,cAAc,CAAC,OAAO,CAAC,KAC1B,YAAY,CAAC,aAAa,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,CAAC,GAChE,WAAW,SAAS,OAAO,CAAC,aAAa,CAAC,GACzC,qBAAqB,CACnB,SAAS,CACP,OAAO,EACP;QACE,UAAU,EAAE,QAAQ,CAAC;QACrB,WAAW,EAAE,QAAQ,CAAC;KACvB,CACF,CACF,GACD,qBAAqB,CAAC,OAAO,CAAC,CAAC;IACnC;;OAEG;IACH,IAAI,EAAE;QACJ,MAAM,EAAE,MAAM,EAAE,CAAC;QACjB,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC/B,QAAQ,CAAC,EAAE,wBAAwB,CAAC;QACpC,WAAW,EAAE,0BAA0B,EAAE,CAAC;QAC1C,QAAQ,CAAC,EAAE,OAAO,CAAC;QACnB,KAAK,CAAC,EAAE,OAAO,CAAC;QAChB,YAAY,CAAC,EAAE,OAAO,CAAC;KACxB,CAAC;CACH;AAED,aAAK,mBAAmB,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;AACjD,oBAAY,mBAAmB,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;AAE9D,oBAAY,0BAA0B,GAAG,kBAAkB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAEtE,oBAAY,wBAAwB,GAAG,CACrC,IAAI,EAAE,cAAc,CAAC,GAAG,CAAC,KACtB,OAAO,CAAC,OAAO,CAAC,CAAC;AAgBtB,wBAAgB,aAAa,CAAC,OAAO,SAAS,UAAU,EACtD,OAAO,CAAC,EAAE,mBAAmB,GAC5B,gBAAgB,CAAC;IAClB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACxB,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACzB,SAAS,EAAE,WAAW,CAAC;IACvB,UAAU,EAAE,WAAW,CAAC;IACxB,UAAU,EAAE,WAAW,CAAC;IACxB,WAAW,EAAE,WAAW,CAAC;IACzB,KAAK,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CACxB,CAAC,CAsDD;AAMD,wBAAgB,qBAAqB,CAAC,CAAC,EACrC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,GAChB,0BAA0B,CAwB5B;AAED,wBAAgB,sBAAsB,CAAC,CAAC,EACtC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,GAChB,0BAA0B,CAqB5B;AAwBD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,aAAa,CAAC;CACrB"}
package/dist/deprecated/router.d.ts CHANGED
@@ -2,7 +2,7 @@ import { TRPCError } from '../error/TRPCError';
2
2
  import { Observable, inferObservableValue } from '../observable';
3
3
  import { TRPCErrorShape, TRPC_ERROR_CODE_KEY, TRPC_ERROR_CODE_NUMBER } from '../rpc';
4
4
  import { CombinedDataTransformer, DataTransformerOptions } from '../transformer';
5
- import { Prefixer, ThenArg, flatten } from '../types';
5
+ import { FlatOverwrite, Prefixer, ThenArg } from '../types';
6
6
  import { MiddlewareFunction } from './internals/middlewares';
7
7
  import { CreateProcedureWithInput, CreateProcedureWithInputOutputParser, CreateProcedureWithoutInput, Procedure, inferProcedureFromOptions } from './internals/procedure';
8
8
  import { MigrateRouter } from './interop';
@@ -181,7 +181,7 @@ export declare class Router<TInputContext, TContext, TMeta extends Record<string
181
181
  *
182
182
  * @alpha
183
183
  */
184
- flat(): Router<TInputContext, TContext, TMeta, flatten<{}, TQueries>, flatten<{}, TMutations>, flatten<{}, TSubscriptions>, TErrorShape>;
184
+ flat(): Router<TInputContext, TContext, TMeta, FlatOverwrite<{}, TQueries>, FlatOverwrite<{}, TMutations>, FlatOverwrite<{}, TSubscriptions>, TErrorShape>;
185
185
  /**
186
186
  * Interop mode for v9.x -> v10.x
187
187
  */
package/dist/deprecated/router.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/deprecated/router.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/deprecated/router.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, '__esModule', { value: true });
4
4
 
5
5
  var resolveHTTPResponse = require('./resolveHTTPResponse-b486996d.js');
6
- var router = require('./router-8372703e.js');
6
+ var router = require('./router-af26eaf1.js');
7
7
  var TRPCError = require('./TRPCError-9c7830b4.js');
8
8
  require('./transformTRPCResponse-11ac69cc.js');
9
9
  require('./codes-1c24d919.js');
package/dist/index.mjs CHANGED
@@ -1,6 +1,6 @@
1
1
  export { a as assertNotBrowser, r as resolveHTTPResponse } from './resolveHTTPResponse-83703ee8.mjs';
2
- import { m as mergeWithoutOverrides, d as defaultFormatter, a as defaultTransformer, c as createRouterFactory, g as getDataTransformer, b as createBuilder } from './router-f21b6d06.mjs';
3
- export { e as callProcedure, a as defaultTransformer, g as getDataTransformer, p as procedureTypes, r as router } from './router-f21b6d06.mjs';
2
+ import { m as mergeWithoutOverrides, d as defaultFormatter, a as defaultTransformer, c as createRouterFactory, g as getDataTransformer, b as createBuilder } from './router-2b8c6fe4.mjs';
3
+ export { e as callProcedure, a as defaultTransformer, g as getDataTransformer, p as procedureTypes, r as router } from './router-2b8c6fe4.mjs';
4
4
  export { T as TRPCError } from './TRPCError-6f61762c.mjs';
5
5
  import './transformTRPCResponse-c8138d5f.mjs';
6
6
  import './codes-aaa7d554.mjs';
package/dist/{router-f21b6d06.mjs → router-2b8c6fe4.mjs} RENAMED
@@ -265,10 +265,14 @@ function getParseFn(procedureParser) {
265
265
  */ const middlewareMarker = 'middlewareMarker';
266
266
 
267
267
  function createNewBuilder(def1, def2) {
268
- const { middlewares =[] , ...rest } = def2;
268
+ const { middlewares =[] , inputs , ...rest } = def2;
269
269
  // TODO: maybe have a fn here to warn about calls
270
270
  return createBuilder({
271
271
  ...mergeWithoutOverrides(def1, rest),
272
+ inputs: [
273
+ ...def1.inputs,
274
+ ...inputs ?? []
275
+ ],
272
276
  middlewares: [
273
277
  ...def1.middlewares,
274
278
  ...middlewares
@@ -277,6 +281,7 @@ function createNewBuilder(def1, def2) {
277
281
  }
278
282
  function createBuilder(initDef) {
279
283
  const _def = initDef || {
284
+ inputs: [],
280
285
  middlewares: []
281
286
  };
282
287
  return {
@@ -284,7 +289,9 @@ function createBuilder(initDef) {
284
289
  input (input) {
285
290
  const parser = getParseFn(input);
286
291
  return createNewBuilder(_def, {
287
- input,
292
+ inputs: [
293
+ input
294
+ ],
288
295
  middlewares: [
289
296
  createInputMiddleware(parser)
290
297
  ]
@@ -334,20 +341,28 @@ function createBuilder(initDef) {
334
341
  }
335
342
  };
336
343
  }
344
+ function isPlainObject(obj) {
345
+ return obj && typeof obj === 'object' && !Array.isArray(obj);
346
+ }
337
347
  function createInputMiddleware(parse) {
338
- return async function inputMiddleware({ next , rawInput }) {
339
- let input;
348
+ return async function inputMiddleware({ next , rawInput , input }) {
349
+ let parsedInput;
340
350
  try {
341
- input = await parse(rawInput);
351
+ parsedInput = await parse(rawInput);
342
352
  } catch (cause) {
343
353
  throw new TRPCError({
344
354
  code: 'BAD_REQUEST',
345
355
  cause: getCauseFromUnknown(cause)
346
356
  });
347
357
  }
358
+ // Multiple input parsers
359
+ const combinedInput = isPlainObject(input) && isPlainObject(parsedInput) ? {
360
+ ...input,
361
+ ...parsedInput
362
+ } : parsedInput;
348
363
  // TODO fix this typing?
349
364
  return next({
350
- input
365
+ input: combinedInput
351
366
  });
352
367
  };
353
368
  }
@@ -613,7 +628,9 @@ function migrateProcedure(oldProc, type) {
613
628
  const outputParser = getParseFnOrPassThrough(def.outputParser);
614
629
  const inputMiddleware = createInputMiddleware(inputParser);
615
630
  const builder = createBuilder({
616
- input: def.inputParser,
631
+ inputs: [
632
+ def.inputParser
633
+ ],
617
634
  middlewares: [
618
635
  ...def.middlewares,
619
636
  inputMiddleware,
package/dist/{router-8372703e.js → router-af26eaf1.js} RENAMED
@@ -267,10 +267,14 @@ function getParseFn(procedureParser) {
267
267
  */ const middlewareMarker = 'middlewareMarker';
268
268
 
269
269
  function createNewBuilder(def1, def2) {
270
- const { middlewares =[] , ...rest } = def2;
270
+ const { middlewares =[] , inputs , ...rest } = def2;
271
271
  // TODO: maybe have a fn here to warn about calls
272
272
  return createBuilder({
273
273
  ...mergeWithoutOverrides(def1, rest),
274
+ inputs: [
275
+ ...def1.inputs,
276
+ ...inputs ?? []
277
+ ],
274
278
  middlewares: [
275
279
  ...def1.middlewares,
276
280
  ...middlewares
@@ -279,6 +283,7 @@ function createNewBuilder(def1, def2) {
279
283
  }
280
284
  function createBuilder(initDef) {
281
285
  const _def = initDef || {
286
+ inputs: [],
282
287
  middlewares: []
283
288
  };
284
289
  return {
@@ -286,7 +291,9 @@ function createBuilder(initDef) {
286
291
  input (input) {
287
292
  const parser = getParseFn(input);
288
293
  return createNewBuilder(_def, {
289
- input,
294
+ inputs: [
295
+ input
296
+ ],
290
297
  middlewares: [
291
298
  createInputMiddleware(parser)
292
299
  ]
@@ -336,20 +343,28 @@ function createBuilder(initDef) {
336
343
  }
337
344
  };
338
345
  }
346
+ function isPlainObject(obj) {
347
+ return obj && typeof obj === 'object' && !Array.isArray(obj);
348
+ }
339
349
  function createInputMiddleware(parse) {
340
- return async function inputMiddleware({ next , rawInput }) {
341
- let input;
350
+ return async function inputMiddleware({ next , rawInput , input }) {
351
+ let parsedInput;
342
352
  try {
343
- input = await parse(rawInput);
353
+ parsedInput = await parse(rawInput);
344
354
  } catch (cause) {
345
355
  throw new TRPCError.TRPCError({
346
356
  code: 'BAD_REQUEST',
347
357
  cause: TRPCError.getCauseFromUnknown(cause)
348
358
  });
349
359
  }
360
+ // Multiple input parsers
361
+ const combinedInput = isPlainObject(input) && isPlainObject(parsedInput) ? {
362
+ ...input,
363
+ ...parsedInput
364
+ } : parsedInput;
350
365
  // TODO fix this typing?
351
366
  return next({
352
- input
367
+ input: combinedInput
353
368
  });
354
369
  };
355
370
  }
@@ -615,7 +630,9 @@ function migrateProcedure(oldProc, type) {
615
630
  const outputParser = getParseFnOrPassThrough(def.outputParser);
616
631
  const inputMiddleware = createInputMiddleware(inputParser);
617
632
  const builder = createBuilder({
618
- input: def.inputParser,
633
+ inputs: [
634
+ def.inputParser
635
+ ],
619
636
  middlewares: [
620
637
  ...def.middlewares,
621
638
  inputMiddleware,
package/dist/types.d.ts CHANGED
@@ -9,8 +9,8 @@ export declare type identity<T> = T;
9
9
  /**
10
10
  * @internal
11
11
  */
12
- export declare type flatten<T, Q> = identity<{
13
- [k in keyof T | keyof Q]: k extends keyof T ? T[k] : k extends keyof Q ? Q[k] : never;
12
+ export declare type FlatOverwrite<T, K> = identity<{
13
+ [TKey in keyof K | keyof T]: TKey extends keyof K ? K[TKey] : TKey extends keyof T ? T[TKey] : never;
14
14
  }>;
15
15
  /**
16
16
  * @internal
package/dist/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;AAEpE;;GAEG;AACH,oBAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC;KAClC,CAAC,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,MAAM,CAAC,GACvC,CAAC,CAAC,CAAC,CAAC,GACJ,CAAC,SAAS,MAAM,CAAC,GACjB,CAAC,CAAC,CAAC,CAAC,GACJ,KAAK;CACV,CAAC,CAAC;AAEH;;GAEG;AACH,oBAAY,QAAQ,CAClB,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,OAAO,SAAS,MAAM,IACpB;KACD,CAAC,IAAI,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,oBAAY,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAE5C;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEzE;;GAEG;AACH,oBAAY,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;AAEpD;;GAEG;AACH,oBAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE7C;;;;;GAKG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAExD;;GAEG;AACH,oBAAY,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,IACtE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;AAEjC,aAAK,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI;KACpC,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,GAAG,KAAK;CACpD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAEpE;;GAEG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI;KACxB,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,KAAK;CACxD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX;;GAEG;AACH,oBAAY,aAAa,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;AAEpE;;GAEG;AACH,oBAAY,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC;AAE5B;;GAEG;AACH,oBAAY,aAAa,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC;KACxC,IAAI,IAAI,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,IAAI,SAAS,MAAM,CAAC,GAC7C,CAAC,CAAC,IAAI,CAAC,GACP,IAAI,SAAS,MAAM,CAAC,GACpB,CAAC,CAAC,IAAI,CAAC,GACP,KAAK;CACV,CAAC,CAAC;AAEH;;GAEG;AACH,oBAAY,QAAQ,CAClB,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAChC,OAAO,SAAS,MAAM,IACpB;KACD,CAAC,IAAI,MAAM,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;CAC1D,CAAC;AAEF;;GAEG;AACH,oBAAY,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,SAAS,GAAG,IAAI,CAAC;AAE5C;;GAEG;AACH,oBAAY,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;AAEzE;;GAEG;AACH,oBAAY,IAAI,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;AAEpD;;GAEG;AACH,oBAAY,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAE7C;;;;;GAKG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI,CAAC,GAAG;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAExD;;GAEG;AACH,oBAAY,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,IACtE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;AAEjC,aAAK,UAAU,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI;KACpC,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,GAAG,KAAK;CACpD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX;;GAEG;AACH,oBAAY,MAAM,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAEpE;;GAEG;AACH,oBAAY,SAAS,CAAC,CAAC,IAAI;KACxB,IAAI,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,GAAG,IAAI,GAAG,KAAK;CACxD,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX;;GAEG;AACH,oBAAY,aAAa,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@trpc/server",
3
- "version": "10.0.0-alpha.49",
3
+ "version": "10.0.0-alpha.51",
4
4
  "description": "tRPC Server",
5
5
  "author": "KATT",
6
6
  "license": "MIT",
@@ -136,5 +136,5 @@
136
136
  "yup": "^0.32.8",
137
137
  "zod": "^3.0.0"
138
138
  },
139
- "gitHead": "6debc556a75f0f92396fc98630b8d93840965bc7"
139
+ "gitHead": "b16490d4ad0523b8380e6fb5e2446da3cfe9e273"
140
140
  }
package/src/core/internals/procedureBuilder.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { TRPCError } from '../../error/TRPCError';
2
2
  import { getCauseFromUnknown, getErrorFromUnknown } from '../../error/utils';
3
- import { MaybePromise } from '../../types';
3
+ import { FlatOverwrite, MaybePromise } from '../../types';
4
4
  import { MiddlewareFunction, MiddlewareResult } from '../middleware';
5
5
  import { Parser, inferParser } from '../parser';
6
6
  import {
@@ -31,19 +31,35 @@ type CreateProcedureReturnInput<
31
31
  _output_out: FallbackValue<TNext['_output_out'], TPrev['_output_out']>;
32
32
  }>;
33
33
 
34
+ type OverwriteIfDefined<T, K> = UnsetMarker extends T ? K : FlatOverwrite<T, K>;
35
+
36
+ type ErrorMessage<T extends string> = T;
37
+
34
38
  export interface ProcedureBuilder<TParams extends ProcedureParams> {
35
39
  /**
36
40
  * Add an input parser to the procedure.
37
41
  */
38
42
  input<$TParser extends Parser>(
39
- schema: $TParser,
43
+ schema: TParams['_input_out'] extends UnsetMarker
44
+ ? $TParser
45
+ : inferParser<$TParser>['out'] extends Record<string, unknown>
46
+ ? TParams['_input_out'] extends Record<string, unknown>
47
+ ? $TParser
48
+ : ErrorMessage<'All input parsers did not resolve to an object'>
49
+ : ErrorMessage<'All input parsers did not resolve to an object'>,
40
50
  ): ProcedureBuilder<{
41
51
  _config: TParams['_config'];
42
52
  _meta: TParams['_meta'];
43
53
  _ctx_in: TParams['_ctx_in'];
44
54
  _ctx_out: TParams['_ctx_out'];
45
- _input_in: inferParser<$TParser>['in'];
46
- _input_out: inferParser<$TParser>['out'];
55
+ _input_in: OverwriteIfDefined<
56
+ TParams['_input_in'],
57
+ inferParser<$TParser>['in']
58
+ >;
59
+ _input_out: OverwriteIfDefined<
60
+ TParams['_input_out'],
61
+ inferParser<$TParser>['out']
62
+ >;
47
63
  _output_in: TParams['_output_in'];
48
64
  _output_out: TParams['_output_out'];
49
65
  }>;
@@ -141,7 +157,7 @@ export interface ProcedureBuilder<TParams extends ProcedureParams> {
141
157
  * @internal
142
158
  */
143
159
  _def: {
144
- input?: Parser;
160
+ inputs: Parser[];
145
161
  output?: Parser;
146
162
  meta?: Record<string, unknown>;
147
163
  resolver?: ProcedureBuilderResolver;
@@ -165,11 +181,12 @@ function createNewBuilder(
165
181
  def1: ProcedureBuilderDef,
166
182
  def2: Partial<ProcedureBuilderDef>,
167
183
  ) {
168
- const { middlewares = [], ...rest } = def2;
184
+ const { middlewares = [], inputs, ...rest } = def2;
169
185
 
170
186
  // TODO: maybe have a fn here to warn about calls
171
187
  return createBuilder({
172
188
  ...mergeWithoutOverrides(def1, rest),
189
+ inputs: [...def1.inputs, ...(inputs ?? [])],
173
190
  middlewares: [...def1.middlewares, ...middlewares],
174
191
  } as any);
175
192
  }
@@ -187,6 +204,7 @@ export function createBuilder<TConfig extends RootConfig>(
187
204
  _meta: TConfig['meta'];
188
205
  }> {
189
206
  const _def: ProcedureBuilderDef = initDef || {
207
+ inputs: [],
190
208
  middlewares: [],
191
209
  };
192
210
 
@@ -195,7 +213,7 @@ export function createBuilder<TConfig extends RootConfig>(
195
213
  input(input) {
196
214
  const parser = getParseFn(input);
197
215
  return createNewBuilder(_def, {
198
- input,
216
+ inputs: [input],
199
217
  middlewares: [createInputMiddleware(parser)],
200
218
  }) as AnyProcedureBuilder;
201
219
  },
@@ -240,21 +258,35 @@ export function createBuilder<TConfig extends RootConfig>(
240
258
  };
241
259
  }
242
260
 
261
+ function isPlainObject(obj: unknown) {
262
+ return obj && typeof obj === 'object' && !Array.isArray(obj);
263
+ }
264
+
243
265
  export function createInputMiddleware<T>(
244
266
  parse: ParseFn<T>,
245
267
  ): ProcedureBuilderMiddleware {
246
- return async function inputMiddleware({ next, rawInput }) {
247
- let input: ReturnType<typeof parse>;
268
+ return async function inputMiddleware({ next, rawInput, input }) {
269
+ let parsedInput: ReturnType<typeof parse>;
248
270
  try {
249
- input = await parse(rawInput);
271
+ parsedInput = await parse(rawInput);
250
272
  } catch (cause) {
251
273
  throw new TRPCError({
252
274
  code: 'BAD_REQUEST',
253
275
  cause: getCauseFromUnknown(cause),
254
276
  });
255
277
  }
278
+
279
+ // Multiple input parsers
280
+ const combinedInput =
281
+ isPlainObject(input) && isPlainObject(parsedInput)
282
+ ? {
283
+ ...input,
284
+ ...parsedInput,
285
+ }
286
+ : parsedInput;
287
+
256
288
  // TODO fix this typing?
257
- return next({ input } as any);
289
+ return next({ input: combinedInput } as any);
258
290
  };
259
291
  }
260
292
 
package/src/deprecated/interop.ts CHANGED
@@ -219,7 +219,7 @@ function migrateProcedure<
219
219
  const inputMiddleware = createInputMiddleware(inputParser);
220
220
 
221
221
  const builder = createBuilder({
222
- input: def.inputParser,
222
+ inputs: [def.inputParser],
223
223
  middlewares: [
224
224
  ...(def.middlewares as any),
225
225
  inputMiddleware,
package/src/deprecated/router.ts CHANGED
@@ -15,7 +15,7 @@ import {
15
15
  DataTransformerOptions,
16
16
  defaultTransformer,
17
17
  } from '../transformer';
18
- import { Prefixer, ThenArg, flatten } from '../types';
18
+ import { FlatOverwrite, Prefixer, ThenArg } from '../types';
19
19
  import { MiddlewareFunction } from './internals/middlewares';
20
20
  import {
21
21
  CreateProcedureOptions,
@@ -851,9 +851,9 @@ export class Router<
851
851
  TInputContext,
852
852
  TContext,
853
853
  TMeta,
854
- flatten<{}, TQueries>,
855
- flatten<{}, TMutations>,
856
- flatten<{}, TSubscriptions>,
854
+ FlatOverwrite<{}, TQueries>,
855
+ FlatOverwrite<{}, TMutations>,
856
+ FlatOverwrite<{}, TSubscriptions>,
857
857
  TErrorShape
858
858
  > {
859
859
  return this as any;
package/src/types.ts CHANGED
@@ -13,11 +13,11 @@ export type identity<T> = T;
13
13
  /**
14
14
  * @internal
15
15
  */
16
- export type flatten<T, Q> = identity<{
17
- [k in keyof T | keyof Q]: k extends keyof T
18
- ? T[k]
19
- : k extends keyof Q
20
- ? Q[k]
16
+ export type FlatOverwrite<T, K> = identity<{
17
+ [TKey in keyof K | keyof T]: TKey extends keyof K
18
+ ? K[TKey]
19
+ : TKey extends keyof T
20
+ ? T[TKey]
21
21
  : never;
22
22
  }>;
23
23