@trpc/server 10.43.5 → 10.43.7
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/fetch/fetchRequestHandler.d.ts.map +1 -1
- package/dist/adapters/fetch/index.js +1 -1
- package/dist/adapters/fetch/index.mjs +1 -1
- package/dist/core/initTRPC.d.ts +11 -7
- package/dist/core/initTRPC.d.ts.map +1 -1
- package/dist/core/internals/procedureBuilder.d.ts +7 -7
- package/dist/core/internals/procedureBuilder.d.ts.map +1 -1
- package/dist/core/internals/utils.d.ts +1 -1
- package/dist/core/internals/utils.d.ts.map +1 -1
- package/dist/core/middleware.d.ts +11 -11
- package/dist/core/middleware.d.ts.map +1 -1
- package/dist/types.d.ts +8 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/adapters/fetch/fetchRequestHandler.ts +3 -1
- package/src/core/initTRPC.ts +4 -4
- package/src/core/internals/procedureBuilder.ts +7 -9
- package/src/core/internals/utils.ts +2 -1
- package/src/core/middleware.ts +12 -11
- package/src/types.ts +8 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetchRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/fetchRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,mBAAmB,CAAC,OAAO,CAAC,GAAG;IAC7B,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEJ,wBAAsB,mBAAmB,CAAC,OAAO,SAAS,SAAS,EACjE,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,GACxC,OAAO,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"fetchRequestHandler.d.ts","sourceRoot":"","sources":["../../../src/adapters/fetch/fetchRequestHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAE9C,MAAM,MAAM,0BAA0B,CAAC,OAAO,SAAS,SAAS,IAC9D,mBAAmB,CAAC,OAAO,CAAC,GAAG;IAC7B,GAAG,EAAE,OAAO,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEJ,wBAAsB,mBAAmB,CAAC,OAAO,SAAS,SAAS,EACjE,IAAI,EAAE,0BAA0B,CAAC,OAAO,CAAC,GACxC,OAAO,CAAC,QAAQ,CAAC,CAqGnB"}
|
|
@@ -20,7 +20,7 @@ async function fetchRequestHandler(opts) {
|
|
|
20
20
|
});
|
|
21
21
|
};
|
|
22
22
|
const url = new URL(opts.req.url);
|
|
23
|
-
const path = url.pathname.slice(opts.endpoint.length + 1);
|
|
23
|
+
const path = url.pathname.slice(opts.endpoint.length + (opts.endpoint.endsWith('/') ? 0 : 1));
|
|
24
24
|
const req = {
|
|
25
25
|
query: url.searchParams,
|
|
26
26
|
method: opts.req.method,
|
|
@@ -16,7 +16,7 @@ async function fetchRequestHandler(opts) {
|
|
|
16
16
|
});
|
|
17
17
|
};
|
|
18
18
|
const url = new URL(opts.req.url);
|
|
19
|
-
const path = url.pathname.slice(opts.endpoint.length + 1);
|
|
19
|
+
const path = url.pathname.slice(opts.endpoint.length + (opts.endpoint.endsWith('/') ? 0 : 1));
|
|
20
20
|
const req = {
|
|
21
21
|
query: url.searchParams,
|
|
22
22
|
method: opts.req.method,
|
package/dist/core/initTRPC.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DefaultErrorShape, ErrorFormatter, ErrorFormatterShape } from '../error/formatter';
|
|
2
2
|
import { DataTransformerOptions, DefaultDataTransformer } from '../transformer';
|
|
3
|
-
import {
|
|
3
|
+
import { Unwrap } from '../types';
|
|
4
4
|
import { CreateRootConfigTypes, RootConfig, RootConfigTypes, RuntimeConfig } from './internals/config';
|
|
5
5
|
import { mergeRouters } from './internals/mergeRouters';
|
|
6
6
|
import { PickFirstDefined, ValidateShape } from './internals/utils';
|
|
@@ -18,12 +18,16 @@ type CreateRootConfigTypesFromPartial<TTypes extends PartialRootConfigTypes> = C
|
|
|
18
18
|
* - Doesn't need to be a class but it doesn't really hurt either
|
|
19
19
|
*/
|
|
20
20
|
declare class TRPCBuilder<TParams extends PartialRootConfigTypes = object> {
|
|
21
|
-
context<TNewContext extends RootConfigTypes['ctx'] | ((...args: unknown[]) => RootConfigTypes['ctx'])>(): TRPCBuilder<
|
|
21
|
+
context<TNewContext extends RootConfigTypes['ctx'] | ((...args: unknown[]) => RootConfigTypes['ctx'])>(): TRPCBuilder<TParams extends object ? { [K in "ctx" | keyof import("../types").WithoutIndexSignature<TParams>]: K extends "ctx" ? {
|
|
22
22
|
ctx: Unwrap<TNewContext>;
|
|
23
|
-
}
|
|
24
|
-
|
|
23
|
+
}[K] : K extends keyof TParams ? TParams[K] : never; } : {
|
|
24
|
+
ctx: Unwrap<TNewContext>;
|
|
25
|
+
}>;
|
|
26
|
+
meta<TNewMeta extends RootConfigTypes['meta']>(): TRPCBuilder<TParams extends object ? { [K in "meta" | keyof import("../types").WithoutIndexSignature<TParams>]: K extends "meta" ? {
|
|
27
|
+
meta: TNewMeta;
|
|
28
|
+
}[K] : K extends keyof TParams ? TParams[K] : never; } : {
|
|
25
29
|
meta: TNewMeta;
|
|
26
|
-
}
|
|
30
|
+
}>;
|
|
27
31
|
create<TOptions extends Partial<RuntimeConfig<CreateRootConfigTypesFromPartial<TParams>>>>(options?: ValidateShape<TOptions, Partial<RuntimeConfig<CreateRootConfigTypesFromPartial<TParams>>>> | undefined): {
|
|
28
32
|
/**
|
|
29
33
|
* These are just types, they can't be used
|
|
@@ -63,7 +67,7 @@ declare class TRPCBuilder<TParams extends PartialRootConfigTypes = object> {
|
|
|
63
67
|
transformer: TOptions["transformer"] extends DataTransformerOptions ? TOptions["transformer"] : DefaultDataTransformer;
|
|
64
68
|
}>;
|
|
65
69
|
_ctx_out: {};
|
|
66
|
-
_input_out:
|
|
70
|
+
_input_out: typeof import("./internals/utils").unsetMarker;
|
|
67
71
|
_input_in: unknown;
|
|
68
72
|
_output_in: unknown;
|
|
69
73
|
_output_out: unknown;
|
|
@@ -76,7 +80,7 @@ declare class TRPCBuilder<TParams extends PartialRootConfigTypes = object> {
|
|
|
76
80
|
transformer: TOptions["transformer"] extends DataTransformerOptions ? TOptions["transformer"] : DefaultDataTransformer;
|
|
77
81
|
}>;
|
|
78
82
|
_ctx_out: {};
|
|
79
|
-
_input_out:
|
|
83
|
+
_input_out: typeof import("./internals/utils").unsetMarker;
|
|
80
84
|
_input_in: unknown;
|
|
81
85
|
_output_in: unknown;
|
|
82
86
|
_output_out: unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initTRPC.d.ts","sourceRoot":"","sources":["../../src/core/initTRPC.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAEjB,cAAc,EACd,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EAGvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"initTRPC.d.ts","sourceRoot":"","sources":["../../src/core/initTRPC.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAEjB,cAAc,EACd,mBAAmB,EACpB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EAGvB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EACL,qBAAqB,EAErB,UAAU,EACV,eAAe,EACf,aAAa,EACd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAa,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAI/E,KAAK,sBAAsB,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAEvD,KAAK,gCAAgC,CAAC,MAAM,SAAS,sBAAsB,IACzE,qBAAqB,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,eAAe,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;IAC3E,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,eAAe,CAAC,MAAM,CAAC,GAChD,MAAM,CAAC,MAAM,CAAC,GACd,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IACjC,WAAW,EAAE,sBAAsB,CAAC;CACrC,CAAC,CAAC;AAEL;;;;;GAKG;AAEH,cAAM,WAAW,CAAC,OAAO,SAAS,sBAAsB,GAAG,MAAM;IAC/D,OAAO,CACL,WAAW,SACP,eAAe,CAAC,KAAK,CAAC,GACtB,CAAC,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,eAAe,CAAC,KAAK,CAAC,CAAC;aAER,OAAO,WAAW,CAAC;;aAAnB,OAAO,WAAW,CAAC;;IAKjE,IAAI,CAAC,QAAQ,SAAS,eAAe,CAAC,MAAM,CAAC;cACE,QAAQ;;cAAR,QAAQ;;IAKvD,MAAM,CACJ,QAAQ,SAAS,OAAO,CACtB,aAAa,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CACzD,EAED,OAAO,CAAC,EACJ,aAAa,CACX,QAAQ,EACR,OAAO,CAAC,aAAa,CAAC,gCAAgC,CAAC,OAAO,CAAC,CAAC,CAAC,CAClE,GACD,SAAS;QAsEX;;;WAGG;;;;;;;QAEH;;WAEG;;;;;;;;;;;;;;;QAIH;;WAEG;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAEH;;WAEG;;;;;;;QAEH;;WAEG;;;CAvFR;AAED;;GAEG;AACH,eAAO,MAAM,QAAQ,qBAAoB,CAAC"}
|
|
@@ -4,15 +4,15 @@ import { inferParser, Parser } from '../parser';
|
|
|
4
4
|
import { Procedure, ProcedureParams } from '../procedure';
|
|
5
5
|
import { ProcedureType } from '../types';
|
|
6
6
|
import { AnyRootConfig } from './config';
|
|
7
|
-
import { DefaultValue
|
|
7
|
+
import { DefaultValue, Overwrite, OverwriteKnown, ResolveOptions, UnsetMarker } from './utils';
|
|
8
8
|
type CreateProcedureReturnInput<TPrev extends ProcedureParams, TNext extends ProcedureParams> = ProcedureBuilder<{
|
|
9
9
|
_config: TPrev['_config'];
|
|
10
10
|
_meta: TPrev['_meta'];
|
|
11
11
|
_ctx_out: Overwrite<TPrev['_ctx_out'], TNext['_ctx_out']>;
|
|
12
|
-
_input_in:
|
|
12
|
+
_input_in: TPrev['_input_in'];
|
|
13
13
|
_input_out: UnsetMarker extends TNext['_input_out'] ? TPrev['_input_out'] : Overwrite<TPrev['_input_out'], TNext['_input_out']>;
|
|
14
|
-
_output_in:
|
|
15
|
-
_output_out:
|
|
14
|
+
_output_in: DefaultValue<TNext['_output_in'], TPrev['_output_in']>;
|
|
15
|
+
_output_out: DefaultValue<TNext['_output_out'], TPrev['_output_out']>;
|
|
16
16
|
}>;
|
|
17
17
|
/**
|
|
18
18
|
* @internal
|
|
@@ -76,15 +76,15 @@ export interface ProcedureBuilder<TParams extends ProcedureParams> {
|
|
|
76
76
|
/**
|
|
77
77
|
* Query procedure
|
|
78
78
|
*/
|
|
79
|
-
query<$Output>(resolver: (opts: ResolveOptions<TParams>) => MaybePromise<
|
|
79
|
+
query<$Output>(resolver: (opts: ResolveOptions<TParams>) => MaybePromise<DefaultValue<TParams['_output_in'], $Output>>): BuildProcedure<'query', TParams, $Output>;
|
|
80
80
|
/**
|
|
81
81
|
* Mutation procedure
|
|
82
82
|
*/
|
|
83
|
-
mutation<$Output>(resolver: (opts: ResolveOptions<TParams>) => MaybePromise<
|
|
83
|
+
mutation<$Output>(resolver: (opts: ResolveOptions<TParams>) => MaybePromise<DefaultValue<TParams['_output_in'], $Output>>): BuildProcedure<'mutation', TParams, $Output>;
|
|
84
84
|
/**
|
|
85
85
|
* Mutation procedure
|
|
86
86
|
*/
|
|
87
|
-
subscription<$Output>(resolver: (opts: ResolveOptions<TParams>) => MaybePromise<
|
|
87
|
+
subscription<$Output>(resolver: (opts: ResolveOptions<TParams>) => MaybePromise<DefaultValue<TParams['_output_in'], $Output>>): BuildProcedure<'subscription', TParams, $Output>;
|
|
88
88
|
/**
|
|
89
89
|
* @internal
|
|
90
90
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"procedureBuilder.d.ts","sourceRoot":"","sources":["../../../src/core/internals/procedureBuilder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAGL,iBAAiB,EACjB,kBAAkB,EAEnB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAKL,SAAS,EACT,eAAe,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,OAAO,EACL,YAAY,
|
|
1
|
+
{"version":3,"file":"procedureBuilder.d.ts","sourceRoot":"","sources":["../../../src/core/internals/procedureBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ export type Overwrite<TType, TWith> = TWith extends any ? TType extends object ?
|
|
|
12
12
|
[key: string]: TWith[string];
|
|
13
13
|
} : number extends keyof TWith ? {
|
|
14
14
|
[key: number]: TWith[number];
|
|
15
|
-
} :
|
|
15
|
+
} : {}) : TWith : never;
|
|
16
16
|
/**
|
|
17
17
|
* @internal
|
|
18
18
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/core/internals/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,MAAM,SAAS,CAAC,KAAK,EAAE,KAAK,IAAI,KAAK,SAAS,GAAG,GACnD,KAAK,SAAS,MAAM,GAClB;KACG,CAAC,IACE,MAAM,qBAAqB,CAAC,KAAK,CAAC,GAClC,MAAM,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,MAAM,KAAK,GAC1D,KAAK,CAAC,CAAC,CAAC,GACR,CAAC,SAAS,MAAM,KAAK,GACrB,KAAK,CAAC,CAAC,CAAC,GACR,KAAK;CACV,GAAG,CAAC,MAAM,SAAS,MAAM,KAAK,GAC3B;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAA;CAAE,GAChC,MAAM,SAAS,MAAM,KAAK,GAC1B;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/core/internals/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C;;;;;GAKG;AACH,MAAM,MAAM,SAAS,CAAC,KAAK,EAAE,KAAK,IAAI,KAAK,SAAS,GAAG,GACnD,KAAK,SAAS,MAAM,GAClB;KACG,CAAC,IACE,MAAM,qBAAqB,CAAC,KAAK,CAAC,GAClC,MAAM,qBAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,MAAM,KAAK,GAC1D,KAAK,CAAC,CAAC,CAAC,GACR,CAAC,SAAS,MAAM,KAAK,GACrB,KAAK,CAAC,CAAC,CAAC,GACR,KAAK;CACV,GAAG,CAAC,MAAM,SAAS,MAAM,KAAK,GAC3B;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAA;CAAE,GAChC,MAAM,SAAS,MAAM,KAAK,GAC1B;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,CAAA;CAAE,GAEhC,EAAE,CAAC,GACP,KAAK,GACP,KAAK,CAAC;AAEV;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,KAAK,EAAE,KAAK,IAAI;KACxC,CAAC,IAAI,MAAM,KAAK,GAAG,CAAC,SAAS,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC;CAChE,CAAC;AACF;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,MAAM,EAAE,SAAS,IAAI,WAAW,SAAS,MAAM,GACpE,SAAS,GACT,MAAM,CAAC;AAEX;;GAEG;AACH,eAAO,MAAM,gBAAgB;aAClB,kBAAkB;CAC5B,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,OAAO,gBAAgB,CAAC;AAEvD;;GAEG;AACH,eAAO,MAAM,WAAW,eAAwB,CAAC;AACjD;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG,OAAO,WAAW,CAAC;AAE7C;;GAEG;AACH,MAAM,WAAW,cAAc,CAAC,OAAO,SAAS,eAAe;IAC7D,GAAG,EAAE,QAAQ,CACX,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CACpE,CAAC;IACF,KAAK,EAAE,OAAO,CAAC,YAAY,CAAC,SAAS,WAAW,GAC5C,SAAS,GACT,OAAO,CAAC,YAAY,CAAC,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,YAAY,EAAE,cAAc,IACpD,YAAY,SAAS,cAAc,GAC/B,OAAO,CAAC,MAAM,YAAY,EAAE,MAAM,cAAc,CAAC,SAAS,KAAK,GAC7D,YAAY,GACZ,cAAc,GAChB,KAAK,CAAC;AAEZ;;GAEG;AACH,MAAM,MAAM,gBAAgB,CAAC,KAAK,EAAE,KAAK,IAAI,SAAS,SAAS,KAAK,GAChE,SAAS,SAAS,KAAK,GACrB,KAAK,GACL,KAAK,GACP,KAAK,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { Simplify } from '../types';
|
|
|
3
3
|
import { AnyRootConfig, RootConfig } from './internals/config';
|
|
4
4
|
import { ParseFn } from './internals/getParseFn';
|
|
5
5
|
import { ProcedureBuilderMiddleware } from './internals/procedureBuilder';
|
|
6
|
-
import { DefaultValue
|
|
6
|
+
import { DefaultValue, MiddlewareMarker, Overwrite, UnsetMarker } from './internals/utils';
|
|
7
7
|
import { ProcedureParams } from './procedure';
|
|
8
8
|
import { ProcedureType } from './types';
|
|
9
9
|
/**
|
|
@@ -45,10 +45,10 @@ export interface MiddlewareBuilder<TRoot extends ProcedureParams, TNewParams ext
|
|
|
45
45
|
_config: TRoot['_config'];
|
|
46
46
|
_meta: TRoot['_meta'];
|
|
47
47
|
_ctx_out: Overwrite<TRoot['_ctx_out'], TNewParams['_ctx_out']>;
|
|
48
|
-
_input_in:
|
|
49
|
-
_input_out:
|
|
50
|
-
_output_in:
|
|
51
|
-
_output_out:
|
|
48
|
+
_input_in: DefaultValue<TRoot['_input_in'], TNewParams['_input_in']>;
|
|
49
|
+
_input_out: DefaultValue<TRoot['_input_out'], TNewParams['_input_out']>;
|
|
50
|
+
_output_in: DefaultValue<TRoot['_output_in'], TNewParams['_output_in']>;
|
|
51
|
+
_output_out: DefaultValue<TRoot['_output_out'], TNewParams['_output_out']>;
|
|
52
52
|
} extends infer OParams extends ProcedureParams ? MiddlewareBuilder<OParams, $Params> | MiddlewareFunction<OParams, $Params> : never): CreateMiddlewareReturnInput<TRoot, TNewParams, Overwrite<TNewParams, $Params>>;
|
|
53
53
|
/**
|
|
54
54
|
* List of middlewares within this middleware builder
|
|
@@ -63,10 +63,10 @@ type CreateMiddlewareReturnInput<TRoot extends ProcedureParams, TPrev extends Pr
|
|
|
63
63
|
_config: TPrev['_config'];
|
|
64
64
|
_meta: TPrev['_meta'];
|
|
65
65
|
_ctx_out: Overwrite<TPrev['_ctx_out'], TNext['_ctx_out']>;
|
|
66
|
-
_input_in:
|
|
67
|
-
_input_out:
|
|
68
|
-
_output_in:
|
|
69
|
-
_output_out:
|
|
66
|
+
_input_in: DefaultValue<TNext['_input_in'], TPrev['_input_in']>;
|
|
67
|
+
_input_out: DefaultValue<TNext['_input_out'], TPrev['_input_out']>;
|
|
68
|
+
_output_in: DefaultValue<TNext['_output_in'], TPrev['_output_in']>;
|
|
69
|
+
_output_out: DefaultValue<TNext['_output_out'], TPrev['_output_out']>;
|
|
70
70
|
}>;
|
|
71
71
|
/**
|
|
72
72
|
* @internal
|
|
@@ -74,7 +74,7 @@ type CreateMiddlewareReturnInput<TRoot extends ProcedureParams, TPrev extends Pr
|
|
|
74
74
|
type deriveParamsFromConfig<TConfig extends AnyRootConfig, TInputIn = unknown> = {
|
|
75
75
|
_config: TConfig;
|
|
76
76
|
_ctx_out: {};
|
|
77
|
-
_input_out:
|
|
77
|
+
_input_out: UnsetMarker;
|
|
78
78
|
_input_in: TInputIn;
|
|
79
79
|
_output_in: unknown;
|
|
80
80
|
_output_out: unknown;
|
|
@@ -88,7 +88,7 @@ export type MiddlewareFunction<TParams extends ProcedureParams, TParamsAfter ext
|
|
|
88
88
|
ctx: Simplify<Overwrite<TParams['_config']['$types']['ctx'], TParams['_ctx_out']>>;
|
|
89
89
|
type: ProcedureType;
|
|
90
90
|
path: string;
|
|
91
|
-
input: TParams['
|
|
91
|
+
input: TParams['_input_in'];
|
|
92
92
|
rawInput: unknown;
|
|
93
93
|
meta: TParams['_meta'] | undefined;
|
|
94
94
|
next: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/core/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EACL,YAAY,
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/core/middleware.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -1,13 +1,21 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @internal
|
|
3
|
+
* @deprecated
|
|
3
4
|
*/
|
|
4
5
|
export type identity<TType> = TType;
|
|
6
|
+
/**
|
|
7
|
+
* @deprecated
|
|
8
|
+
*/
|
|
5
9
|
export type InferOptional<TType, TKeys extends keyof TType> = Omit<TType, TKeys> & Partial<Pick<TType, TKeys>>;
|
|
10
|
+
/**
|
|
11
|
+
* @deprecated
|
|
12
|
+
*/
|
|
6
13
|
export type UndefinedKeys<TType> = {
|
|
7
14
|
[K in keyof TType]: undefined extends TType[K] ? K : never;
|
|
8
15
|
}[keyof TType];
|
|
9
16
|
/**
|
|
10
17
|
* @internal
|
|
18
|
+
* @deprecated
|
|
11
19
|
*/
|
|
12
20
|
export type FlatOverwrite<TType, TWith> = InferOptional<{
|
|
13
21
|
[TKey in keyof TType | keyof TWith]: TKey extends keyof TWith ? TWith[TKey] : TKey extends keyof TType ? TType[TKey] : never;
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,MAAM,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC;AAEpC;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,KAAK,EAAE,KAAK,SAAS,MAAM,KAAK,IAAI,IAAI,CAChE,KAAK,EACL,KAAK,CACN,GACC,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;AAE9B;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,KAAK,IAAI;KAChC,CAAC,IAAI,MAAM,KAAK,GAAG,SAAS,SAAS,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK;CAC3D,CAAC,MAAM,KAAK,CAAC,CAAC;AAEf;;;GAGG;AACH,MAAM,MAAM,aAAa,CAAC,KAAK,EAAE,KAAK,IAAI,aAAa,CACrD;KACG,IAAI,IAAI,MAAM,KAAK,GAAG,MAAM,KAAK,GAAG,IAAI,SAAS,MAAM,KAAK,GACzD,KAAK,CAAC,IAAI,CAAC,GACX,IAAI,SAAS,MAAM,KAAK,GACxB,KAAK,CAAC,IAAI,CAAC,GACX,KAAK;CACV,EACD,aAAa,CAAC,KAAK,CAAC,GAAG,aAAa,CAAC,KAAK,CAAC,CAC5C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,IAAI,SAAS,MAAM,IAC/C,iBAAiB,IAAI,oGAAoG,CAAC;AAE5H;;GAEG;AACH,MAAM,MAAM,qBAAqB,CAAC,KAAK,EAAE,KAAK,IAAI,MAAM,KAAK,GAC3D,MAAM,KAAK,SAAS,KAAK,GACvB,KAAK,GAAG,KAAK,GACb,iBAAiB,CAAC,MAAM,GAAG,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,CAAC;AAE1D;;GAEG;AACH,MAAM,MAAM,KAAK,CAAC,KAAK,IAAI,KAAK,GAAG,IAAI,GAAG,SAAS,CAAC;AAEpD;;GAEG;AACH,MAAM,MAAM,OAAO,CAAC,KAAK,IAAI,KAAK,SAAS,WAAW,CAAC,MAAM,CAAC,CAAC,GAC3D,OAAO,CAAC,CAAC,CAAC,GACV,KAAK,CAAC;AAEV;;;GAGG;AACH,MAAM,MAAM,QAAQ,CAAC,KAAK,IAAI,KAAK,SAAS,GAAG,EAAE,GAAG,IAAI,GACpD,KAAK,GACL;KAAG,CAAC,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC;CAAE,CAAC;AACrC;;GAEG;AACH,MAAM,MAAM,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,KAAK,GAAG,SAAS,CAAC,CAAC;AAE5D;;GAEG;AACH,MAAM,MAAM,YAAY,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC;AAEzD;;;;;GAKG;AACH,MAAM,MAAM,SAAS,CAAC,KAAK,IAAI,KAAK,GAAG;KACpC,OAAO,IAAI,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC;CACzC,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,oBAAoB,CAAC,SAAS,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,KAAK,GAAG,IACtE,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;AAEjC,MAAM,MAAM,UAAU,CAAC,IAAI,SAAS,MAAM,EAAE,OAAO,IAAI;KACpD,IAAI,IAAI,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,OAAO,GAAG,IAAI,GAAG,KAAK;CAChE,CAAC,MAAM,IAAI,CAAC,CAAC;AAEd;;GAEG;AACH,MAAM,MAAM,MAAM,CAAC,IAAI,SAAS,MAAM,EAAE,OAAO,IAAI,IAAI,CACrD,IAAI,EACJ,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,CAC1B,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,MAAM,CAAC,KAAK,IAAI,KAAK,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,GACjE,OAAO,CAAC,CAAC,CAAC,GACV,KAAK,CAAC;AAEV;;;GAGG;AACH,MAAM,MAAM,WAAW,CAAC,OAAO,IAAI,OAAO,SAAS,MAAM,GACrD;KACG,CAAC,IAAI,MAAM,OAAO,CAAC,CAAC,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;CAC/C,GACD,OAAO,CAAC;AAEZ;;;;;;GAMG;AACH,MAAM,MAAM,qBAAqB,CAAC,IAAI,IAAI;KACvC,CAAC,IAAI,MAAM,IAAI,IAAI,MAAM,SAAS,CAAC,GAChC,KAAK,GACL,MAAM,SAAS,CAAC,GAChB,KAAK,GACL,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;CAChB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trpc/server",
|
|
3
|
-
"version": "10.43.
|
|
3
|
+
"version": "10.43.7",
|
|
4
4
|
"description": "The tRPC server library",
|
|
5
5
|
"author": "KATT",
|
|
6
6
|
"license": "MIT",
|
|
@@ -167,7 +167,7 @@
|
|
|
167
167
|
"tslib": "^2.5.0",
|
|
168
168
|
"tsx": "^4.0.0",
|
|
169
169
|
"typescript": "^5.1.3",
|
|
170
|
-
"valibot": "^0.
|
|
170
|
+
"valibot": "^0.21.0",
|
|
171
171
|
"vitest": "^0.32.0",
|
|
172
172
|
"ws": "^8.0.0",
|
|
173
173
|
"yup": "^1.0.0",
|
|
@@ -176,5 +176,5 @@
|
|
|
176
176
|
"funding": [
|
|
177
177
|
"https://trpc.io/sponsor"
|
|
178
178
|
],
|
|
179
|
-
"gitHead": "
|
|
179
|
+
"gitHead": "6fd5f45ad8fdda2faa73fc0f834fc8e89b63935c"
|
|
180
180
|
}
|
|
@@ -20,7 +20,9 @@ export async function fetchRequestHandler<TRouter extends AnyRouter>(
|
|
|
20
20
|
};
|
|
21
21
|
|
|
22
22
|
const url = new URL(opts.req.url);
|
|
23
|
-
const path = url.pathname.slice(
|
|
23
|
+
const path = url.pathname.slice(
|
|
24
|
+
opts.endpoint.length + (opts.endpoint.endsWith('/') ? 0 : 1),
|
|
25
|
+
);
|
|
24
26
|
const req: HTTPRequest = {
|
|
25
27
|
query: url.searchParams,
|
|
26
28
|
method: opts.req.method,
|
package/src/core/initTRPC.ts
CHANGED
|
@@ -11,7 +11,7 @@ import {
|
|
|
11
11
|
defaultTransformer,
|
|
12
12
|
getDataTransformer,
|
|
13
13
|
} from '../transformer';
|
|
14
|
-
import {
|
|
14
|
+
import { Unwrap } from '../types';
|
|
15
15
|
import {
|
|
16
16
|
CreateRootConfigTypes,
|
|
17
17
|
isServerDefault,
|
|
@@ -21,7 +21,7 @@ import {
|
|
|
21
21
|
} from './internals/config';
|
|
22
22
|
import { mergeRouters } from './internals/mergeRouters';
|
|
23
23
|
import { createBuilder } from './internals/procedureBuilder';
|
|
24
|
-
import { PickFirstDefined, ValidateShape } from './internals/utils';
|
|
24
|
+
import { Overwrite, PickFirstDefined, ValidateShape } from './internals/utils';
|
|
25
25
|
import { createMiddlewareFactory } from './middleware';
|
|
26
26
|
import { createRouterFactory } from './router';
|
|
27
27
|
|
|
@@ -50,13 +50,13 @@ class TRPCBuilder<TParams extends PartialRootConfigTypes = object> {
|
|
|
50
50
|
| RootConfigTypes['ctx']
|
|
51
51
|
| ((...args: unknown[]) => RootConfigTypes['ctx']),
|
|
52
52
|
>() {
|
|
53
|
-
type NextParams =
|
|
53
|
+
type NextParams = Overwrite<TParams, { ctx: Unwrap<TNewContext> }>;
|
|
54
54
|
|
|
55
55
|
return new TRPCBuilder<NextParams>();
|
|
56
56
|
}
|
|
57
57
|
|
|
58
58
|
meta<TNewMeta extends RootConfigTypes['meta']>() {
|
|
59
|
-
type NextParams =
|
|
59
|
+
type NextParams = Overwrite<TParams, { meta: TNewMeta }>;
|
|
60
60
|
|
|
61
61
|
return new TRPCBuilder<NextParams>();
|
|
62
62
|
}
|
|
@@ -21,7 +21,7 @@ import { AnyRootConfig } from './config';
|
|
|
21
21
|
import { getParseFn } from './getParseFn';
|
|
22
22
|
import { mergeWithoutOverrides } from './mergeWithoutOverrides';
|
|
23
23
|
import {
|
|
24
|
-
DefaultValue
|
|
24
|
+
DefaultValue,
|
|
25
25
|
middlewareMarker,
|
|
26
26
|
Overwrite,
|
|
27
27
|
OverwriteKnown,
|
|
@@ -36,14 +36,12 @@ type CreateProcedureReturnInput<
|
|
|
36
36
|
_config: TPrev['_config'];
|
|
37
37
|
_meta: TPrev['_meta'];
|
|
38
38
|
_ctx_out: Overwrite<TPrev['_ctx_out'], TNext['_ctx_out']>;
|
|
39
|
-
_input_in:
|
|
40
|
-
? TPrev['_input_in']
|
|
41
|
-
: Overwrite<TPrev['_input_in'], TNext['_input_in']>;
|
|
39
|
+
_input_in: TPrev['_input_in'];
|
|
42
40
|
_input_out: UnsetMarker extends TNext['_input_out']
|
|
43
41
|
? TPrev['_input_out']
|
|
44
42
|
: Overwrite<TPrev['_input_out'], TNext['_input_out']>;
|
|
45
|
-
_output_in:
|
|
46
|
-
_output_out:
|
|
43
|
+
_output_in: DefaultValue<TNext['_output_in'], TPrev['_output_in']>;
|
|
44
|
+
_output_out: DefaultValue<TNext['_output_out'], TPrev['_output_out']>;
|
|
47
45
|
}>;
|
|
48
46
|
|
|
49
47
|
/**
|
|
@@ -158,7 +156,7 @@ export interface ProcedureBuilder<TParams extends ProcedureParams> {
|
|
|
158
156
|
query<$Output>(
|
|
159
157
|
resolver: (
|
|
160
158
|
opts: ResolveOptions<TParams>,
|
|
161
|
-
) => MaybePromise<
|
|
159
|
+
) => MaybePromise<DefaultValue<TParams['_output_in'], $Output>>,
|
|
162
160
|
): BuildProcedure<'query', TParams, $Output>;
|
|
163
161
|
|
|
164
162
|
/**
|
|
@@ -167,7 +165,7 @@ export interface ProcedureBuilder<TParams extends ProcedureParams> {
|
|
|
167
165
|
mutation<$Output>(
|
|
168
166
|
resolver: (
|
|
169
167
|
opts: ResolveOptions<TParams>,
|
|
170
|
-
) => MaybePromise<
|
|
168
|
+
) => MaybePromise<DefaultValue<TParams['_output_in'], $Output>>,
|
|
171
169
|
): BuildProcedure<'mutation', TParams, $Output>;
|
|
172
170
|
|
|
173
171
|
/**
|
|
@@ -176,7 +174,7 @@ export interface ProcedureBuilder<TParams extends ProcedureParams> {
|
|
|
176
174
|
subscription<$Output>(
|
|
177
175
|
resolver: (
|
|
178
176
|
opts: ResolveOptions<TParams>,
|
|
179
|
-
) => MaybePromise<
|
|
177
|
+
) => MaybePromise<DefaultValue<TParams['_output_in'], $Output>>,
|
|
180
178
|
): BuildProcedure<'subscription', TParams, $Output>;
|
|
181
179
|
/**
|
|
182
180
|
* @internal
|
|
@@ -21,7 +21,8 @@ export type Overwrite<TType, TWith> = TWith extends any
|
|
|
21
21
|
? { [key: string]: TWith[string] }
|
|
22
22
|
: number extends keyof TWith
|
|
23
23
|
? { [key: number]: TWith[number] }
|
|
24
|
-
:
|
|
24
|
+
: // eslint-disable-next-line @typescript-eslint/ban-types
|
|
25
|
+
{})
|
|
25
26
|
: TWith
|
|
26
27
|
: never;
|
|
27
28
|
|
package/src/core/middleware.ts
CHANGED
|
@@ -4,9 +4,10 @@ import { AnyRootConfig, RootConfig } from './internals/config';
|
|
|
4
4
|
import { ParseFn } from './internals/getParseFn';
|
|
5
5
|
import { ProcedureBuilderMiddleware } from './internals/procedureBuilder';
|
|
6
6
|
import {
|
|
7
|
-
DefaultValue
|
|
7
|
+
DefaultValue,
|
|
8
8
|
MiddlewareMarker,
|
|
9
9
|
Overwrite,
|
|
10
|
+
UnsetMarker,
|
|
10
11
|
} from './internals/utils';
|
|
11
12
|
import { ProcedureParams } from './procedure';
|
|
12
13
|
import { ProcedureType } from './types';
|
|
@@ -63,10 +64,10 @@ export interface MiddlewareBuilder<
|
|
|
63
64
|
_config: TRoot['_config'];
|
|
64
65
|
_meta: TRoot['_meta'];
|
|
65
66
|
_ctx_out: Overwrite<TRoot['_ctx_out'], TNewParams['_ctx_out']>;
|
|
66
|
-
_input_in:
|
|
67
|
-
_input_out:
|
|
68
|
-
_output_in:
|
|
69
|
-
_output_out:
|
|
67
|
+
_input_in: DefaultValue<TRoot['_input_in'], TNewParams['_input_in']>;
|
|
68
|
+
_input_out: DefaultValue<TRoot['_input_out'], TNewParams['_input_out']>;
|
|
69
|
+
_output_in: DefaultValue<TRoot['_output_in'], TNewParams['_output_in']>;
|
|
70
|
+
_output_out: DefaultValue<
|
|
70
71
|
TRoot['_output_out'],
|
|
71
72
|
TNewParams['_output_out']
|
|
72
73
|
>;
|
|
@@ -101,10 +102,10 @@ type CreateMiddlewareReturnInput<
|
|
|
101
102
|
_config: TPrev['_config'];
|
|
102
103
|
_meta: TPrev['_meta'];
|
|
103
104
|
_ctx_out: Overwrite<TPrev['_ctx_out'], TNext['_ctx_out']>;
|
|
104
|
-
_input_in:
|
|
105
|
-
_input_out:
|
|
106
|
-
_output_in:
|
|
107
|
-
_output_out:
|
|
105
|
+
_input_in: DefaultValue<TNext['_input_in'], TPrev['_input_in']>;
|
|
106
|
+
_input_out: DefaultValue<TNext['_input_out'], TPrev['_input_out']>;
|
|
107
|
+
_output_in: DefaultValue<TNext['_output_in'], TPrev['_output_in']>;
|
|
108
|
+
_output_out: DefaultValue<TNext['_output_out'], TPrev['_output_out']>;
|
|
108
109
|
}
|
|
109
110
|
>;
|
|
110
111
|
|
|
@@ -118,7 +119,7 @@ type deriveParamsFromConfig<
|
|
|
118
119
|
_config: TConfig;
|
|
119
120
|
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
120
121
|
_ctx_out: {};
|
|
121
|
-
_input_out:
|
|
122
|
+
_input_out: UnsetMarker;
|
|
122
123
|
_input_in: TInputIn;
|
|
123
124
|
_output_in: unknown;
|
|
124
125
|
_output_out: unknown;
|
|
@@ -137,7 +138,7 @@ export type MiddlewareFunction<
|
|
|
137
138
|
>;
|
|
138
139
|
type: ProcedureType;
|
|
139
140
|
path: string;
|
|
140
|
-
input: TParams['
|
|
141
|
+
input: TParams['_input_in'];
|
|
141
142
|
rawInput: unknown;
|
|
142
143
|
meta: TParams['_meta'] | undefined;
|
|
143
144
|
next: {
|
package/src/types.ts
CHANGED
|
@@ -1,20 +1,28 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @internal
|
|
3
|
+
* @deprecated
|
|
3
4
|
*/
|
|
4
5
|
export type identity<TType> = TType;
|
|
5
6
|
|
|
7
|
+
/**
|
|
8
|
+
* @deprecated
|
|
9
|
+
*/
|
|
6
10
|
export type InferOptional<TType, TKeys extends keyof TType> = Omit<
|
|
7
11
|
TType,
|
|
8
12
|
TKeys
|
|
9
13
|
> &
|
|
10
14
|
Partial<Pick<TType, TKeys>>;
|
|
11
15
|
|
|
16
|
+
/**
|
|
17
|
+
* @deprecated
|
|
18
|
+
*/
|
|
12
19
|
export type UndefinedKeys<TType> = {
|
|
13
20
|
[K in keyof TType]: undefined extends TType[K] ? K : never;
|
|
14
21
|
}[keyof TType];
|
|
15
22
|
|
|
16
23
|
/**
|
|
17
24
|
* @internal
|
|
25
|
+
* @deprecated
|
|
18
26
|
*/
|
|
19
27
|
export type FlatOverwrite<TType, TWith> = InferOptional<
|
|
20
28
|
{
|