@trpc/server 10.0.0-proxy-beta.15 → 10.0.0-proxy-beta.16
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/dist/adapters/aws-lambda/index.d.ts +1 -1
- package/dist/adapters/aws-lambda/index.d.ts.map +1 -1
- package/dist/adapters/aws-lambda/index.js +24 -18
- package/dist/adapters/aws-lambda/index.mjs +20 -20
- package/dist/adapters/aws-lambda/utils.d.ts +4 -1
- package/dist/adapters/aws-lambda/utils.d.ts.map +1 -1
- package/dist/adapters/express.js +3 -3
- package/dist/adapters/express.mjs +4 -4
- package/dist/adapters/fastify/index.js +2 -2
- package/dist/adapters/fastify/index.mjs +3 -3
- package/dist/adapters/fetch/index.js +2 -2
- package/dist/adapters/fetch/index.mjs +3 -3
- package/dist/adapters/next.js +3 -3
- package/dist/adapters/next.mjs +4 -4
- package/dist/adapters/node-http/index.js +3 -3
- package/dist/adapters/node-http/index.mjs +4 -4
- package/dist/adapters/node-http/types.d.ts +3 -2
- package/dist/adapters/node-http/types.d.ts.map +1 -1
- package/dist/adapters/standalone.js +3 -3
- package/dist/adapters/standalone.mjs +4 -4
- package/dist/adapters/ws.js +2 -2
- package/dist/adapters/ws.mjs +3 -3
- package/dist/core/initTRPC.d.ts +22 -28
- package/dist/core/initTRPC.d.ts.map +1 -1
- package/dist/core/internals/__generated__/mergeRoutersGeneric.d.ts +40 -100
- package/dist/core/internals/__generated__/mergeRoutersGeneric.d.ts.map +1 -1
- package/dist/core/internals/config.d.ts +33 -11
- package/dist/core/internals/config.d.ts.map +1 -1
- package/dist/core/internals/mergeRouters.d.ts.map +1 -1
- package/dist/core/internals/procedureBuilder.d.ts +16 -21
- package/dist/core/internals/procedureBuilder.d.ts.map +1 -1
- package/dist/core/middleware.d.ts +10 -18
- package/dist/core/middleware.d.ts.map +1 -1
- package/dist/core/procedure.d.ts +2 -13
- package/dist/core/procedure.d.ts.map +1 -1
- package/dist/core/router.d.ts +26 -40
- package/dist/core/router.d.ts.map +1 -1
- package/dist/core/types.d.ts +3 -3
- package/dist/core/types.d.ts.map +1 -1
- package/dist/deprecated/interop.d.ts +18 -13
- package/dist/deprecated/interop.d.ts.map +1 -1
- package/dist/error/TRPCError.d.ts +1 -1
- package/dist/http/internals/types.d.ts +3 -3
- package/dist/http/internals/types.d.ts.map +1 -1
- package/dist/{index-5a6a2e91.mjs → index-0332d528.mjs} +1 -1
- package/dist/index.js +53 -30
- package/dist/index.mjs +51 -28
- package/dist/internals/transformTRPCResponse.d.ts.map +1 -1
- package/dist/internals/types.d.ts +2 -3
- package/dist/internals/types.d.ts.map +1 -1
- package/dist/{nodeHTTPRequestHandler-efc38711.js → nodeHTTPRequestHandler-0e40a231.js} +1 -1
- package/dist/{nodeHTTPRequestHandler-205f7545.mjs → nodeHTTPRequestHandler-bb607c2b.mjs} +1 -1
- package/dist/{resolveHTTPResponse-bf4c6ceb.js → resolveHTTPResponse-92daf326.js} +2 -2
- package/dist/{resolveHTTPResponse-4ceb1785.mjs → resolveHTTPResponse-9dff3dcc.mjs} +2 -2
- package/dist/shared/index.mjs +1 -1
- package/dist/{transformTRPCResponse-959de787.mjs → transformTRPCResponse-23e99f82.mjs} +20 -40
- package/dist/{transformTRPCResponse-05aa84c1.js → transformTRPCResponse-92c79c47.js} +18 -39
- package/package.json +7 -7
- package/src/adapters/aws-lambda/index.ts +5 -54
- package/src/adapters/aws-lambda/utils.ts +59 -1
- package/src/adapters/node-http/nodeHTTPRequestHandler.ts +2 -2
- package/src/adapters/node-http/types.ts +3 -2
- package/src/adapters/ws.ts +1 -1
- package/src/core/initTRPC.ts +48 -38
- package/src/core/internals/__generated__/mergeRoutersGeneric.ts +40 -100
- package/src/core/internals/config.ts +35 -15
- package/src/core/internals/mergeRouters.ts +19 -7
- package/src/core/internals/procedureBuilder.ts +31 -34
- package/src/core/middleware.ts +7 -9
- package/src/core/procedure.ts +2 -15
- package/src/core/router.ts +56 -92
- package/src/core/types.ts +3 -3
- package/src/deprecated/interop.ts +49 -39
- package/src/http/internals/types.ts +8 -3
- package/src/http/resolveHTTPResponse.ts +1 -1
- package/src/internals/transformTRPCResponse.ts +4 -2
- package/src/internals/types.ts +2 -3
package/dist/core/router.d.ts
CHANGED
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
import { TRPCError } from '../error/TRPCError';
|
|
2
|
-
import {
|
|
3
|
-
import { TRPCErrorShape } from '../rpc';
|
|
4
|
-
import { CombinedDataTransformer } from '../transformer';
|
|
5
|
-
import { RootConfig } from './internals/config';
|
|
2
|
+
import { AnyRootConfig } from './internals/config';
|
|
6
3
|
import { ProcedureCallOptions } from './internals/procedureBuilder';
|
|
7
4
|
import { AnyMutationProcedure, AnyProcedure, AnyQueryProcedure, AnySubscriptionProcedure, ProcedureArgs } from './procedure';
|
|
8
5
|
import { ProcedureType, inferHandlerInput, inferProcedureOutput } from './types';
|
|
@@ -11,47 +8,44 @@ export declare type ProcedureRecord = Record<string, AnyProcedure>;
|
|
|
11
8
|
export interface ProcedureRouterRecord {
|
|
12
9
|
[key: string]: AnyProcedure | AnyRouter;
|
|
13
10
|
}
|
|
14
|
-
|
|
11
|
+
/**
|
|
12
|
+
* @deprecated
|
|
13
|
+
*/
|
|
14
|
+
interface DeprecatedProcedureRouterRecord {
|
|
15
15
|
queries: Record<string, AnyQueryProcedure>;
|
|
16
16
|
mutations: Record<string, AnyMutationProcedure>;
|
|
17
17
|
subscriptions: Record<string, AnySubscriptionProcedure>;
|
|
18
|
-
procedures: ProcedureRecord;
|
|
19
18
|
}
|
|
20
|
-
export interface RouterDef<
|
|
19
|
+
export interface RouterDef<TConfig extends AnyRootConfig, TRecord extends ProcedureRouterRecord,
|
|
20
|
+
/**
|
|
21
|
+
* @deprecated
|
|
22
|
+
*/
|
|
23
|
+
TOld extends DeprecatedProcedureRouterRecord = {
|
|
24
|
+
queries: {};
|
|
25
|
+
mutations: {};
|
|
26
|
+
subscriptions: {};
|
|
27
|
+
}> {
|
|
28
|
+
_config: TConfig;
|
|
21
29
|
router: true;
|
|
22
|
-
/**
|
|
23
|
-
* @internal
|
|
24
|
-
*/
|
|
25
|
-
_ctx: TContext;
|
|
26
|
-
/**
|
|
27
|
-
* @internal
|
|
28
|
-
*/
|
|
29
|
-
_errorShape: TErrorShape;
|
|
30
|
-
/**
|
|
31
|
-
* @internal
|
|
32
|
-
*/
|
|
33
|
-
_meta: TMeta;
|
|
34
|
-
errorFormatter: ErrorFormatter<TContext, TErrorShape>;
|
|
35
|
-
transformer: CombinedDataTransformer;
|
|
36
30
|
procedures: TRecord;
|
|
37
31
|
record: TRecord;
|
|
38
32
|
/**
|
|
39
33
|
* V9 queries
|
|
40
34
|
* @deprecated
|
|
41
35
|
*/
|
|
42
|
-
queries:
|
|
36
|
+
queries: TOld['queries'];
|
|
43
37
|
/**
|
|
44
38
|
* V9 mutations
|
|
45
39
|
* @deprecated
|
|
46
40
|
*/
|
|
47
|
-
mutations:
|
|
41
|
+
mutations: TOld['mutations'];
|
|
48
42
|
/**
|
|
49
43
|
* V9 subscriptions
|
|
50
44
|
* @deprecated
|
|
51
45
|
*/
|
|
52
|
-
subscriptions:
|
|
46
|
+
subscriptions: TOld['subscriptions'];
|
|
53
47
|
}
|
|
54
|
-
export declare type AnyRouterDef<
|
|
48
|
+
export declare type AnyRouterDef<TConfig extends AnyRootConfig = AnyRootConfig, TOld extends DeprecatedProcedureRouterRecord = any> = RouterDef<TConfig, any, TOld>;
|
|
55
49
|
/**
|
|
56
50
|
* @internal
|
|
57
51
|
*/
|
|
@@ -66,7 +60,7 @@ declare type DecoratedProcedureRecord<TProcedures extends ProcedureRouterRecord>
|
|
|
66
60
|
/**
|
|
67
61
|
* @internal
|
|
68
62
|
*/
|
|
69
|
-
declare type RouterCaller<TDef extends AnyRouterDef> = (ctx: TDef['
|
|
63
|
+
declare type RouterCaller<TDef extends AnyRouterDef> = (ctx: TDef['_config']['$types']['ctx']) => {
|
|
70
64
|
/**
|
|
71
65
|
* @deprecated
|
|
72
66
|
*/
|
|
@@ -82,36 +76,28 @@ declare type RouterCaller<TDef extends AnyRouterDef> = (ctx: TDef['_ctx']) => {
|
|
|
82
76
|
} & DecoratedProcedureRecord<TDef['record']>;
|
|
83
77
|
export interface Router<TDef extends AnyRouterDef> {
|
|
84
78
|
_def: TDef;
|
|
85
|
-
/** @deprecated **/
|
|
86
|
-
errorFormatter: TDef['errorFormatter'];
|
|
87
|
-
/** @deprecated **/
|
|
88
|
-
transformer: TDef['transformer'];
|
|
89
79
|
createCaller: RouterCaller<TDef>;
|
|
90
80
|
getErrorShape(opts: {
|
|
91
81
|
error: TRPCError;
|
|
92
82
|
type: ProcedureType | 'unknown';
|
|
93
83
|
path: string | undefined;
|
|
94
84
|
input: unknown;
|
|
95
|
-
ctx: undefined | TDef['
|
|
96
|
-
}): TDef['
|
|
85
|
+
ctx: undefined | TDef['_config']['$types']['ctx'];
|
|
86
|
+
}): TDef['_config']['$types']['errorShape'];
|
|
97
87
|
}
|
|
98
88
|
/**
|
|
99
89
|
* @internal
|
|
100
90
|
*/
|
|
101
|
-
export declare type
|
|
102
|
-
|
|
103
|
-
* @internal
|
|
104
|
-
*/
|
|
105
|
-
export declare type RouterBuildOptions<TContext> = Partial<Pick<AnyRouterDef<TContext>, 'procedures'>>;
|
|
106
|
-
export declare type AnyRouter = Router<any>;
|
|
91
|
+
export declare type RouterBuildOptions<TConfig extends AnyRootConfig> = Partial<Pick<AnyRouterDef<TConfig>, 'procedures'>>;
|
|
92
|
+
export declare type AnyRouter = Router<AnyRouterDef>;
|
|
107
93
|
/**
|
|
108
94
|
* @internal
|
|
109
95
|
*/
|
|
110
|
-
export declare type CreateRouterInner<TConfig extends
|
|
96
|
+
export declare type CreateRouterInner<TConfig extends AnyRootConfig, TProcRouterRecord extends ProcedureRouterRecord> = Router<RouterDef<TConfig, TProcRouterRecord>> & TProcRouterRecord;
|
|
111
97
|
/**
|
|
112
98
|
* @internal
|
|
113
99
|
*/
|
|
114
|
-
export declare function createRouterFactory<TConfig extends
|
|
100
|
+
export declare function createRouterFactory<TConfig extends AnyRootConfig>(config: TConfig): <TProcRouterRecord extends ProcedureRouterRecord>(procedures: TProcRouterRecord) => CreateRouterInner<TConfig, TProcRouterRecord>;
|
|
115
101
|
/**
|
|
116
102
|
* @internal
|
|
117
103
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/core/router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/core/router.ts"],"names":[],"mappings":"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"}
|
package/dist/core/types.d.ts
CHANGED
|
@@ -2,9 +2,9 @@ import { inferObservableValue } from '../observable';
|
|
|
2
2
|
import { AnyProcedure, ProcedureArgs } from './procedure';
|
|
3
3
|
import { AnyRouter, AnyRouterDef, Router } from './router';
|
|
4
4
|
export declare type inferRouterDef<TRouter extends AnyRouter> = TRouter extends Router<infer TParams> ? TParams extends AnyRouterDef<any> ? TParams : never : never;
|
|
5
|
-
export declare type inferRouterContext<TRouter extends AnyRouter> = inferRouterDef<TRouter>['
|
|
6
|
-
export declare type inferRouterError<TRouter extends AnyRouter> = inferRouterDef<TRouter>['
|
|
7
|
-
export declare type inferRouterMeta<TRouter extends AnyRouter> = inferRouterDef<TRouter>['
|
|
5
|
+
export declare type inferRouterContext<TRouter extends AnyRouter> = inferRouterDef<TRouter>['_config']['$types']['ctx'];
|
|
6
|
+
export declare type inferRouterError<TRouter extends AnyRouter> = inferRouterDef<TRouter>['_config']['$types']['errorShape'];
|
|
7
|
+
export declare type inferRouterMeta<TRouter extends AnyRouter> = inferRouterDef<TRouter>['_config']['$types']['meta'];
|
|
8
8
|
export declare const procedureTypes: readonly ["query", "mutation", "subscription"];
|
|
9
9
|
/**
|
|
10
10
|
* @public
|
package/dist/core/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAE3D,oBAAY,cAAc,CAAC,OAAO,SAAS,SAAS,IAAI,OAAO,SAAS,MAAM,CAC5E,MAAM,OAAO,CACd,GACG,OAAO,SAAS,YAAY,CAAC,GAAG,CAAC,GAC/B,OAAO,GACP,KAAK,GACP,KAAK,CAAC;AAEV,oBAAY,kBAAkB,CAAC,OAAO,SAAS,SAAS,IACtD,cAAc,CAAC,OAAO,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/core/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAE3D,oBAAY,cAAc,CAAC,OAAO,SAAS,SAAS,IAAI,OAAO,SAAS,MAAM,CAC5E,MAAM,OAAO,CACd,GACG,OAAO,SAAS,YAAY,CAAC,GAAG,CAAC,GAC/B,OAAO,GACP,KAAK,GACP,KAAK,CAAC;AAEV,oBAAY,kBAAkB,CAAC,OAAO,SAAS,SAAS,IACtD,cAAc,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC;AACtD,oBAAY,gBAAgB,CAAC,OAAO,SAAS,SAAS,IACpD,cAAc,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,YAAY,CAAC,CAAC;AAC7D,oBAAY,eAAe,CAAC,OAAO,SAAS,SAAS,IACnD,cAAc,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvD,eAAO,MAAM,cAAc,gDAAiD,CAAC;AAC7E;;GAEG;AACH,oBAAY,aAAa,GAAG,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC;AAE1D,oBAAY,iBAAiB,CAAC,UAAU,SAAS,YAAY,IAAI,aAAa,CAC5E,oBAAoB,CAAC,UAAU,CAAC,CACjC,CAAC;AAEF,oBAAY,mBAAmB,CAAC,UAAU,SAAS,YAAY,IAC7D,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AAEnC,oBAAY,oBAAoB,CAAC,UAAU,IAAI,UAAU,SAAS,YAAY,GAC1E,UAAU,CAAC,MAAM,CAAC,GAClB,KAAK,CAAC;AACV,oBAAY,oBAAoB,CAAC,UAAU,IACzC,oBAAoB,CAAC,UAAU,CAAC,CAAC,aAAa,CAAC,CAAC;AAElD,oBAAY,uBAAuB,CACjC,OAAO,SAAS,SAAS,EACzB,KAAK,SAAS,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,GAAG,MAAM,IAC3D,oBAAoB,CACtB,oBAAoB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,CAAC,CAC9D,CAAC;AAEF,oBAAY,yBAAyB,CAAC,UAAU,SAAS,YAAY,IACnE,oBAAoB,CAAC,UAAU,CAAC,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,CAAC;AAE5D,oBAAY,mBAAmB,CAAC,OAAO,SAAS,SAAS,IAAI;KAC1D,IAAI,IAAI,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,kBAAkB,GACvG,kBAAkB,SAAS,SAAS,GAClC,mBAAmB,CAAC,kBAAkB,CAAC,GACvC,kBAAkB,SAAS,YAAY,GACvC;QACE,KAAK,EAAE,mBAAmB,CAAC,kBAAkB,CAAC,CAAC;QAC/C,MAAM,EAAE,oBAAoB,CAAC,kBAAkB,CAAC,CAAC;KAClD,GACD,KAAK,GACP,KAAK;CACV,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
1
|
+
import { DefaultDataTransformer, ProcedureParams, ProcedureType } from '..';
|
|
2
|
+
import { AnyRootConfig, RootConfig } from '../core/internals/config';
|
|
3
3
|
import { Procedure } from '../core/procedure';
|
|
4
4
|
import { Router as NewRouter, RouterDef } from '../core/router';
|
|
5
5
|
import { AnyRouter as AnyOldRouter, Router as OldRouter } from '../deprecated/router';
|
|
@@ -7,31 +7,36 @@ import { TRPCErrorShape } from '../rpc';
|
|
|
7
7
|
import { Procedure as OldProcedure } from './internals/procedure';
|
|
8
8
|
import { ProcedureRecord } from './router';
|
|
9
9
|
declare type AnyOldProcedure = OldProcedure<any, any, any, any, any, any, any, any>;
|
|
10
|
-
declare type convertProcedureParams<TConfig extends
|
|
11
|
-
declare type MigrateProcedure<TConfig extends
|
|
12
|
-
export declare type MigrateProcedureRecord<TConfig extends
|
|
10
|
+
declare type convertProcedureParams<TConfig extends AnyRootConfig, TProcedure extends AnyOldProcedure> = TProcedure extends OldProcedure<infer _TInputContext, infer TContext, infer TMeta, infer TInput, infer TParsedInput, infer TOutput, infer _TParsedOutput, infer TFinalInput> ? ProcedureParams<TConfig, TContext, TInput, TParsedInput, TOutput, TFinalInput, TMeta> : never;
|
|
11
|
+
declare type MigrateProcedure<TConfig extends AnyRootConfig, TProcedure extends AnyOldProcedure, TType extends ProcedureType> = Procedure<TType, convertProcedureParams<TConfig, TProcedure>>;
|
|
12
|
+
export declare type MigrateProcedureRecord<TConfig extends AnyRootConfig, TProcedureRecord extends ProcedureRecord<any>, TType extends ProcedureType> = {
|
|
13
13
|
[K in keyof TProcedureRecord]: MigrateProcedure<TConfig, TProcedureRecord[K], TType>;
|
|
14
14
|
};
|
|
15
|
-
export declare type MigrateRouter<TInputContext extends Record<string, any>, TContext, TMeta extends Record<string, any>, TQueries extends ProcedureRecord<TInputContext, TContext, any, any, any, any, any>, TMutations extends ProcedureRecord<TInputContext, TContext, any, any, any, any, any>, TSubscriptions extends ProcedureRecord<TInputContext, TContext, unknown, unknown, any, unknown, unknown>, TErrorShape extends TRPCErrorShape<any>> = NewRouter<{
|
|
16
|
-
|
|
15
|
+
export declare type MigrateRouter<TInputContext extends Record<string, any>, TContext, TMeta extends Record<string, any>, TQueries extends ProcedureRecord<TInputContext, TContext, any, any, any, any, any>, TMutations extends ProcedureRecord<TInputContext, TContext, any, any, any, any, any>, TSubscriptions extends ProcedureRecord<TInputContext, TContext, unknown, unknown, any, unknown, unknown>, TErrorShape extends TRPCErrorShape<any>> = NewRouter<RouterDef<RootConfig<{
|
|
16
|
+
ctx: TInputContext;
|
|
17
|
+
errorShape: TErrorShape;
|
|
18
|
+
meta: TMeta;
|
|
19
|
+
transformer: DefaultDataTransformer;
|
|
20
|
+
}>, {}, {
|
|
21
|
+
queries: MigrateProcedureRecord<RootConfig<{
|
|
17
22
|
ctx: TInputContext;
|
|
18
23
|
errorShape: TErrorShape;
|
|
19
24
|
meta: TMeta;
|
|
20
|
-
transformer:
|
|
25
|
+
transformer: DefaultDataTransformer;
|
|
21
26
|
}>, TQueries, 'query'>;
|
|
22
|
-
mutations: MigrateProcedureRecord<
|
|
27
|
+
mutations: MigrateProcedureRecord<RootConfig<{
|
|
23
28
|
ctx: TInputContext;
|
|
24
29
|
errorShape: TErrorShape;
|
|
25
30
|
meta: TMeta;
|
|
26
|
-
transformer:
|
|
31
|
+
transformer: DefaultDataTransformer;
|
|
27
32
|
}>, TMutations, 'mutation'>;
|
|
28
|
-
subscriptions: MigrateProcedureRecord<
|
|
33
|
+
subscriptions: MigrateProcedureRecord<RootConfig<{
|
|
29
34
|
ctx: TInputContext;
|
|
30
35
|
errorShape: TErrorShape;
|
|
31
36
|
meta: TMeta;
|
|
32
|
-
transformer:
|
|
37
|
+
transformer: DefaultDataTransformer;
|
|
33
38
|
}>, TSubscriptions, 'subscription'>;
|
|
34
|
-
}
|
|
39
|
+
}>>;
|
|
35
40
|
export declare type MigrateOldRouter<TRouter extends AnyOldRouter> = TRouter extends OldRouter<infer TInputContext, infer TContext, infer TMeta, infer TQueries, infer TMutations, infer TSubscriptions, infer TErrorShape> ? MigrateRouter<TInputContext, TContext, TMeta, TQueries, TMutations, TSubscriptions, TErrorShape> : never;
|
|
36
41
|
export declare function migrateRouter<TOldRouter extends AnyOldRouter>(oldRouter: TOldRouter): MigrateOldRouter<TOldRouter>;
|
|
37
42
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interop.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/deprecated/interop.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"interop.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/deprecated/interop.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { TRPC_ERROR_CODE_KEY } from '../rpc/codes';
|
|
2
2
|
export declare class TRPCError extends Error {
|
|
3
3
|
readonly cause?: Error | undefined;
|
|
4
|
-
readonly code: "
|
|
4
|
+
readonly code: "INTERNAL_SERVER_ERROR" | "PARSE_ERROR" | "BAD_REQUEST" | "UNAUTHORIZED" | "FORBIDDEN" | "NOT_FOUND" | "METHOD_NOT_SUPPORTED" | "TIMEOUT" | "CONFLICT" | "PRECONDITION_FAILED" | "PAYLOAD_TOO_LARGE" | "TOO_MANY_REQUESTS" | "CLIENT_CLOSED_REQUEST";
|
|
5
5
|
constructor(opts: {
|
|
6
6
|
message?: string;
|
|
7
7
|
code: TRPC_ERROR_CODE_KEY;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AnyRouter, ProcedureType,
|
|
1
|
+
import { AnyRouter, ProcedureType, inferRouterContext, inferRouterError } from '../../core';
|
|
2
2
|
import { TRPCError } from '../../error/TRPCError';
|
|
3
3
|
import { BaseHandlerOptions } from '../../internals/types';
|
|
4
4
|
import { TRPCResponse } from '../../rpc';
|
|
@@ -20,8 +20,8 @@ export interface HTTPRequest {
|
|
|
20
20
|
* @internal
|
|
21
21
|
*/
|
|
22
22
|
export declare type ResponseMetaFn<TRouter extends AnyRouter> = (opts: {
|
|
23
|
-
data: TRPCResponse<unknown,
|
|
24
|
-
ctx?:
|
|
23
|
+
data: TRPCResponse<unknown, inferRouterError<TRouter>>[];
|
|
24
|
+
ctx?: inferRouterContext<TRouter>;
|
|
25
25
|
/**
|
|
26
26
|
* The different tRPC paths requested
|
|
27
27
|
**/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/http/internals/types.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../packages/server/src/http/internals/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EACT,aAAa,EACb,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,oBAAY,WAAW,GAAG,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;AAElD,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,WAAW,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,eAAe,CAAC;IACvB,OAAO,EAAE,WAAW,CAAC;IACrB,IAAI,EAAE,OAAO,CAAC;CACf;AAED;;GAEG;AACH,oBAAY,cAAc,CAAC,OAAO,SAAS,SAAS,IAAI,CAAC,IAAI,EAAE;IAC7D,IAAI,EAAE,YAAY,CAAC,OAAO,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;IACzD,GAAG,CAAC,EAAE,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAClC;;QAEI;IACJ,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;IAChC,MAAM,EAAE,SAAS,EAAE,CAAC;CACrB,KAAK,YAAY,CAAC;AAEnB;;GAEG;AACH,MAAM,WAAW,sBAAsB,CAAC,OAAO,SAAS,SAAS,EAAE,QAAQ,CACzE,SAAQ,kBAAkB,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC7C;;;;OAIG;IACH,YAAY,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;CACxC"}
|
package/dist/index.js
CHANGED
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var resolveHTTPResponse = require('./resolveHTTPResponse-
|
|
6
|
-
var transformTRPCResponse = require('./transformTRPCResponse-
|
|
5
|
+
var resolveHTTPResponse = require('./resolveHTTPResponse-92daf326.js');
|
|
6
|
+
var transformTRPCResponse = require('./transformTRPCResponse-92c79c47.js');
|
|
7
7
|
var TRPCError = require('./TRPCError-fe9113e5.js');
|
|
8
8
|
var codes = require('./codes-76c38a34.js');
|
|
9
|
-
require('./index-62d46c97.js');
|
|
9
|
+
var index = require('./index-62d46c97.js');
|
|
10
10
|
|
|
11
11
|
/**
|
|
12
12
|
* @internal
|
|
@@ -73,29 +73,48 @@ function isPlainObject(obj) {
|
|
|
73
73
|
return outputMiddleware;
|
|
74
74
|
}
|
|
75
75
|
|
|
76
|
+
/**
|
|
77
|
+
* Ensures there are no duplicate keys when building a procedure.
|
|
78
|
+
*/ function mergeWithoutOverrides(obj1, ...objs) {
|
|
79
|
+
const newObj = Object.assign(Object.create(null), obj1);
|
|
80
|
+
for (const overrides of objs){
|
|
81
|
+
for(const key in overrides){
|
|
82
|
+
if (key in newObj && newObj[key] !== overrides[key]) {
|
|
83
|
+
throw new Error(`Duplicate key ${key}`);
|
|
84
|
+
}
|
|
85
|
+
newObj[key] = overrides[key];
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
return newObj;
|
|
89
|
+
}
|
|
90
|
+
|
|
76
91
|
function mergeRouters(...routerList) {
|
|
77
|
-
const record =
|
|
92
|
+
const record = mergeWithoutOverrides({}, ...routerList.map((r)=>r._def.record));
|
|
78
93
|
const errorFormatter = routerList.reduce((currentErrorFormatter, nextRouter)=>{
|
|
79
|
-
if (nextRouter.errorFormatter && nextRouter.errorFormatter !== transformTRPCResponse.defaultFormatter) {
|
|
80
|
-
if (currentErrorFormatter !== transformTRPCResponse.defaultFormatter && currentErrorFormatter !== nextRouter.errorFormatter) {
|
|
94
|
+
if (nextRouter._def._config.errorFormatter && nextRouter._def._config.errorFormatter !== transformTRPCResponse.defaultFormatter) {
|
|
95
|
+
if (currentErrorFormatter !== transformTRPCResponse.defaultFormatter && currentErrorFormatter !== nextRouter._def._config.errorFormatter) {
|
|
81
96
|
throw new Error('You seem to have several error formatters');
|
|
82
97
|
}
|
|
83
|
-
return nextRouter.errorFormatter;
|
|
98
|
+
return nextRouter._def._config.errorFormatter;
|
|
84
99
|
}
|
|
85
100
|
return currentErrorFormatter;
|
|
86
101
|
}, transformTRPCResponse.defaultFormatter);
|
|
87
102
|
const transformer = routerList.reduce((prev, current)=>{
|
|
88
|
-
if (current.transformer && current.transformer !== transformTRPCResponse.defaultTransformer) {
|
|
89
|
-
if (prev !== transformTRPCResponse.defaultTransformer && prev !== current.transformer) {
|
|
103
|
+
if (current._def._config.transformer && current._def._config.transformer !== transformTRPCResponse.defaultTransformer) {
|
|
104
|
+
if (prev !== transformTRPCResponse.defaultTransformer && prev !== current._def._config.transformer) {
|
|
90
105
|
throw new Error('You seem to have several transformers');
|
|
91
106
|
}
|
|
92
|
-
return current.transformer;
|
|
107
|
+
return current._def._config.transformer;
|
|
93
108
|
}
|
|
94
109
|
return prev;
|
|
95
110
|
}, transformTRPCResponse.defaultTransformer);
|
|
96
111
|
const router = transformTRPCResponse.createRouterFactory({
|
|
97
112
|
errorFormatter,
|
|
98
|
-
transformer
|
|
113
|
+
transformer,
|
|
114
|
+
isDev: routerList.some((r)=>r._def._config.isDev),
|
|
115
|
+
allowOutsideOfServer: routerList.some((r)=>r._def._config.allowOutsideOfServer),
|
|
116
|
+
isServer: routerList.some((r)=>r._def._config.isServer),
|
|
117
|
+
$types: routerList[0]?._def._config.$types
|
|
99
118
|
})(record);
|
|
100
119
|
return router;
|
|
101
120
|
}
|
|
@@ -146,7 +165,7 @@ function createNewBuilder(def1, def2) {
|
|
|
146
165
|
const { middlewares =[] , inputs , ...rest } = def2;
|
|
147
166
|
// TODO: maybe have a fn here to warn about calls
|
|
148
167
|
return createBuilder({
|
|
149
|
-
...
|
|
168
|
+
...mergeWithoutOverrides(def1, rest),
|
|
150
169
|
inputs: [
|
|
151
170
|
...def1.inputs,
|
|
152
171
|
...inputs ?? []
|
|
@@ -326,27 +345,33 @@ function createProcedureCaller(_def) {
|
|
|
326
345
|
* Initialize tRPC - be done exactly once per backend
|
|
327
346
|
*/ const initTRPC = new TRPCBuilder();
|
|
328
347
|
function createTRPCInner() {
|
|
329
|
-
return function initTRPCInner(
|
|
348
|
+
return function initTRPCInner(runtime) {
|
|
349
|
+
const errorFormatter = runtime?.errorFormatter ?? transformTRPCResponse.defaultFormatter;
|
|
350
|
+
const transformer = transformTRPCResponse.getDataTransformer(runtime?.transformer ?? transformTRPCResponse.defaultTransformer);
|
|
351
|
+
const config = {
|
|
352
|
+
transformer,
|
|
353
|
+
isDev: runtime?.isDev ?? process.env.NODE_ENV !== 'production',
|
|
354
|
+
allowOutsideOfServer: runtime?.allowOutsideOfServer ?? false,
|
|
355
|
+
errorFormatter,
|
|
356
|
+
isServer: runtime?.isServer ?? transformTRPCResponse.isServerDefault,
|
|
357
|
+
/**
|
|
358
|
+
* @internal
|
|
359
|
+
*/ $types: index.createFlatProxy((key)=>{
|
|
360
|
+
throw new Error(`Tried to access "$types.${key}" which is not available at runtime`);
|
|
361
|
+
})
|
|
362
|
+
};
|
|
330
363
|
{
|
|
331
364
|
// Server check
|
|
332
|
-
const isServer =
|
|
333
|
-
if (!isServer &&
|
|
365
|
+
const isServer = runtime?.isServer ?? transformTRPCResponse.isServerDefault;
|
|
366
|
+
if (!isServer && runtime?.allowOutsideOfServer !== true) {
|
|
334
367
|
throw new Error(`You're trying to use @trpc/server in a non-server environment. This is not supported by default.`);
|
|
335
368
|
}
|
|
336
369
|
}
|
|
337
|
-
const errorFormatter = options?.errorFormatter ?? transformTRPCResponse.defaultFormatter;
|
|
338
|
-
const transformer = transformTRPCResponse.getDataTransformer(options?.transformer ?? transformTRPCResponse.defaultTransformer);
|
|
339
|
-
const _config = {
|
|
340
|
-
transformer,
|
|
341
|
-
errorShape: null,
|
|
342
|
-
ctx: null,
|
|
343
|
-
meta: null
|
|
344
|
-
};
|
|
345
370
|
return {
|
|
346
371
|
/**
|
|
347
372
|
* These are just types, they can't be used
|
|
348
373
|
* @internal
|
|
349
|
-
*/ _config,
|
|
374
|
+
*/ _config: config,
|
|
350
375
|
/**
|
|
351
376
|
* Builder object for creating procedures
|
|
352
377
|
*/ procedure: createBuilder(),
|
|
@@ -355,10 +380,7 @@ function createTRPCInner() {
|
|
|
355
380
|
*/ middleware: createMiddlewareFactory(),
|
|
356
381
|
/**
|
|
357
382
|
* Create a router
|
|
358
|
-
*/ router: transformTRPCResponse.createRouterFactory(
|
|
359
|
-
errorFormatter,
|
|
360
|
-
transformer
|
|
361
|
-
}),
|
|
383
|
+
*/ router: transformTRPCResponse.createRouterFactory(config),
|
|
362
384
|
/**
|
|
363
385
|
* Merge Routers
|
|
364
386
|
*/ mergeRouters: mergeRoutersGeneric
|
|
@@ -579,10 +601,11 @@ function migrateRouter(oldRouter) {
|
|
|
579
601
|
for (const [name2, procedure2] of Object.entries(oldRouter._def.subscriptions)){
|
|
580
602
|
subscriptions[name2] = migrateProcedure(procedure2, 'subscription');
|
|
581
603
|
}
|
|
582
|
-
const procedures =
|
|
604
|
+
const procedures = mergeWithoutOverrides(queries, mutations, subscriptions);
|
|
583
605
|
const newRouter = transformTRPCResponse.createRouterFactory({
|
|
584
606
|
transformer,
|
|
585
|
-
errorFormatter
|
|
607
|
+
errorFormatter,
|
|
608
|
+
isDev: process.env.NODE_ENV !== 'production'
|
|
586
609
|
})(procedures);
|
|
587
610
|
return newRouter;
|
|
588
611
|
}
|
package/dist/index.mjs
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
export { r as resolveHTTPResponse } from './resolveHTTPResponse-
|
|
2
|
-
import {
|
|
3
|
-
export { e as callProcedure, a as defaultTransformer, g as getDataTransformer, p as procedureTypes } from './transformTRPCResponse-
|
|
1
|
+
export { r as resolveHTTPResponse } from './resolveHTTPResponse-9dff3dcc.mjs';
|
|
2
|
+
import { d as defaultFormatter, a as defaultTransformer, c as createRouterFactory, g as getDataTransformer$1, i as isServerDefault, b as getHTTPStatusCodeFromError } from './transformTRPCResponse-23e99f82.mjs';
|
|
3
|
+
export { e as callProcedure, a as defaultTransformer, g as getDataTransformer, p as procedureTypes } from './transformTRPCResponse-23e99f82.mjs';
|
|
4
4
|
import { T as TRPCError, g as getCauseFromUnknown, a as getTRPCErrorFromUnknown } from './TRPCError-e99e7cbe.mjs';
|
|
5
5
|
export { T as TRPCError } from './TRPCError-e99e7cbe.mjs';
|
|
6
6
|
import { T as TRPC_ERROR_CODES_BY_KEY } from './codes-7d21f749.mjs';
|
|
7
|
-
import './index-
|
|
7
|
+
import { c as createFlatProxy } from './index-0332d528.mjs';
|
|
8
8
|
|
|
9
9
|
/**
|
|
10
10
|
* @internal
|
|
@@ -71,29 +71,48 @@ function isPlainObject(obj) {
|
|
|
71
71
|
return outputMiddleware;
|
|
72
72
|
}
|
|
73
73
|
|
|
74
|
+
/**
|
|
75
|
+
* Ensures there are no duplicate keys when building a procedure.
|
|
76
|
+
*/ function mergeWithoutOverrides(obj1, ...objs) {
|
|
77
|
+
const newObj = Object.assign(Object.create(null), obj1);
|
|
78
|
+
for (const overrides of objs){
|
|
79
|
+
for(const key in overrides){
|
|
80
|
+
if (key in newObj && newObj[key] !== overrides[key]) {
|
|
81
|
+
throw new Error(`Duplicate key ${key}`);
|
|
82
|
+
}
|
|
83
|
+
newObj[key] = overrides[key];
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
return newObj;
|
|
87
|
+
}
|
|
88
|
+
|
|
74
89
|
function mergeRouters(...routerList) {
|
|
75
90
|
const record = mergeWithoutOverrides({}, ...routerList.map((r)=>r._def.record));
|
|
76
91
|
const errorFormatter = routerList.reduce((currentErrorFormatter, nextRouter)=>{
|
|
77
|
-
if (nextRouter.errorFormatter && nextRouter.errorFormatter !== defaultFormatter) {
|
|
78
|
-
if (currentErrorFormatter !== defaultFormatter && currentErrorFormatter !== nextRouter.errorFormatter) {
|
|
92
|
+
if (nextRouter._def._config.errorFormatter && nextRouter._def._config.errorFormatter !== defaultFormatter) {
|
|
93
|
+
if (currentErrorFormatter !== defaultFormatter && currentErrorFormatter !== nextRouter._def._config.errorFormatter) {
|
|
79
94
|
throw new Error('You seem to have several error formatters');
|
|
80
95
|
}
|
|
81
|
-
return nextRouter.errorFormatter;
|
|
96
|
+
return nextRouter._def._config.errorFormatter;
|
|
82
97
|
}
|
|
83
98
|
return currentErrorFormatter;
|
|
84
99
|
}, defaultFormatter);
|
|
85
100
|
const transformer = routerList.reduce((prev, current)=>{
|
|
86
|
-
if (current.transformer && current.transformer !== defaultTransformer) {
|
|
87
|
-
if (prev !== defaultTransformer && prev !== current.transformer) {
|
|
101
|
+
if (current._def._config.transformer && current._def._config.transformer !== defaultTransformer) {
|
|
102
|
+
if (prev !== defaultTransformer && prev !== current._def._config.transformer) {
|
|
88
103
|
throw new Error('You seem to have several transformers');
|
|
89
104
|
}
|
|
90
|
-
return current.transformer;
|
|
105
|
+
return current._def._config.transformer;
|
|
91
106
|
}
|
|
92
107
|
return prev;
|
|
93
108
|
}, defaultTransformer);
|
|
94
109
|
const router = createRouterFactory({
|
|
95
110
|
errorFormatter,
|
|
96
|
-
transformer
|
|
111
|
+
transformer,
|
|
112
|
+
isDev: routerList.some((r)=>r._def._config.isDev),
|
|
113
|
+
allowOutsideOfServer: routerList.some((r)=>r._def._config.allowOutsideOfServer),
|
|
114
|
+
isServer: routerList.some((r)=>r._def._config.isServer),
|
|
115
|
+
$types: routerList[0]?._def._config.$types
|
|
97
116
|
})(record);
|
|
98
117
|
return router;
|
|
99
118
|
}
|
|
@@ -324,27 +343,33 @@ function createProcedureCaller(_def) {
|
|
|
324
343
|
* Initialize tRPC - be done exactly once per backend
|
|
325
344
|
*/ const initTRPC = new TRPCBuilder();
|
|
326
345
|
function createTRPCInner() {
|
|
327
|
-
return function initTRPCInner(
|
|
346
|
+
return function initTRPCInner(runtime) {
|
|
347
|
+
const errorFormatter = runtime?.errorFormatter ?? defaultFormatter;
|
|
348
|
+
const transformer = getDataTransformer$1(runtime?.transformer ?? defaultTransformer);
|
|
349
|
+
const config = {
|
|
350
|
+
transformer,
|
|
351
|
+
isDev: runtime?.isDev ?? process.env.NODE_ENV !== 'production',
|
|
352
|
+
allowOutsideOfServer: runtime?.allowOutsideOfServer ?? false,
|
|
353
|
+
errorFormatter,
|
|
354
|
+
isServer: runtime?.isServer ?? isServerDefault,
|
|
355
|
+
/**
|
|
356
|
+
* @internal
|
|
357
|
+
*/ $types: createFlatProxy((key)=>{
|
|
358
|
+
throw new Error(`Tried to access "$types.${key}" which is not available at runtime`);
|
|
359
|
+
})
|
|
360
|
+
};
|
|
328
361
|
{
|
|
329
362
|
// Server check
|
|
330
|
-
const isServer =
|
|
331
|
-
if (!isServer &&
|
|
363
|
+
const isServer = runtime?.isServer ?? isServerDefault;
|
|
364
|
+
if (!isServer && runtime?.allowOutsideOfServer !== true) {
|
|
332
365
|
throw new Error(`You're trying to use @trpc/server in a non-server environment. This is not supported by default.`);
|
|
333
366
|
}
|
|
334
367
|
}
|
|
335
|
-
const errorFormatter = options?.errorFormatter ?? defaultFormatter;
|
|
336
|
-
const transformer = getDataTransformer$1(options?.transformer ?? defaultTransformer);
|
|
337
|
-
const _config = {
|
|
338
|
-
transformer,
|
|
339
|
-
errorShape: null,
|
|
340
|
-
ctx: null,
|
|
341
|
-
meta: null
|
|
342
|
-
};
|
|
343
368
|
return {
|
|
344
369
|
/**
|
|
345
370
|
* These are just types, they can't be used
|
|
346
371
|
* @internal
|
|
347
|
-
*/ _config,
|
|
372
|
+
*/ _config: config,
|
|
348
373
|
/**
|
|
349
374
|
* Builder object for creating procedures
|
|
350
375
|
*/ procedure: createBuilder(),
|
|
@@ -353,10 +378,7 @@ function createTRPCInner() {
|
|
|
353
378
|
*/ middleware: createMiddlewareFactory(),
|
|
354
379
|
/**
|
|
355
380
|
* Create a router
|
|
356
|
-
*/ router: createRouterFactory(
|
|
357
|
-
errorFormatter,
|
|
358
|
-
transformer
|
|
359
|
-
}),
|
|
381
|
+
*/ router: createRouterFactory(config),
|
|
360
382
|
/**
|
|
361
383
|
* Merge Routers
|
|
362
384
|
*/ mergeRouters: mergeRoutersGeneric
|
|
@@ -580,7 +602,8 @@ function migrateRouter(oldRouter) {
|
|
|
580
602
|
const procedures = mergeWithoutOverrides(queries, mutations, subscriptions);
|
|
581
603
|
const newRouter = createRouterFactory({
|
|
582
604
|
transformer,
|
|
583
|
-
errorFormatter
|
|
605
|
+
errorFormatter,
|
|
606
|
+
isDev: process.env.NODE_ENV !== 'production'
|
|
584
607
|
})(procedures);
|
|
585
608
|
return newRouter;
|
|
586
609
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformTRPCResponse.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/internals/transformTRPCResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"transformTRPCResponse.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/internals/transformTRPCResponse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AA2B3D;;IAEI;AACJ,wBAAgB,qBAAqB,CACnC,SAAS,SACL,YAAY,GACZ,YAAY,EAAE,GACd,mBAAmB,GACnB,mBAAmB,EAAE,EACzB,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS;;kTAI1C"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { ProcedureType } from '../core';
|
|
1
|
+
import { ProcedureType, inferRouterContext } from '../core';
|
|
3
2
|
import { AnyRouter } from '../core/router';
|
|
4
3
|
import { TRPCError } from '../error/TRPCError';
|
|
5
4
|
/**
|
|
@@ -18,6 +17,6 @@ export declare type OnErrorFunction<TRouter extends AnyRouter, TRequest> = (opts
|
|
|
18
17
|
path: string | undefined;
|
|
19
18
|
req: TRequest;
|
|
20
19
|
input: unknown;
|
|
21
|
-
ctx: undefined |
|
|
20
|
+
ctx: undefined | inferRouterContext<TRouter>;
|
|
22
21
|
}) => void;
|
|
23
22
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/internals/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../packages/server/src/internals/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C;;GAEG;AACH,MAAM,WAAW,kBAAkB,CAAC,OAAO,SAAS,SAAS,EAAE,QAAQ;IACrE,OAAO,CAAC,EAAE,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE;QACT,OAAO,EAAE,OAAO,CAAC;KAClB,CAAC;IACF,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,oBAAY,eAAe,CAAC,OAAO,SAAS,SAAS,EAAE,QAAQ,IAAI,CAAC,IAAI,EAAE;IACxE,KAAK,EAAE,SAAS,CAAC;IACjB,IAAI,EAAE,aAAa,GAAG,SAAS,CAAC;IAChC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,GAAG,EAAE,QAAQ,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,GAAG,EAAE,SAAS,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;CAC9C,KAAK,IAAI,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var resolveHTTPResponse = require('./resolveHTTPResponse-
|
|
3
|
+
var resolveHTTPResponse = require('./resolveHTTPResponse-92daf326.js');
|
|
4
4
|
var TRPCError = require('./TRPCError-fe9113e5.js');
|
|
5
5
|
|
|
6
6
|
async function getPostBody({ req , maxBodySize }) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { r as resolveHTTPResponse } from './resolveHTTPResponse-
|
|
1
|
+
import { r as resolveHTTPResponse } from './resolveHTTPResponse-9dff3dcc.mjs';
|
|
2
2
|
import { T as TRPCError } from './TRPCError-e99e7cbe.mjs';
|
|
3
3
|
|
|
4
4
|
async function getPostBody({ req , maxBodySize }) {
|