@trpc/next 11.0.0-next-beta.242 → 11.0.0-next-beta.248
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/app-dir/server.d.ts +2 -2
- package/dist/app-dir/server.d.ts.map +1 -1
- package/dist/app-dir/shared.d.ts +7 -7
- package/dist/app-dir/shared.d.ts.map +1 -1
- package/dist/app-dir/types.d.ts +3 -3
- package/dist/app-dir/types.d.ts.map +1 -1
- package/dist/bundle-analysis.json +9 -9
- package/dist/createTRPCNext.d.ts +2 -2
- package/dist/createTRPCNext.d.ts.map +1 -1
- package/package.json +8 -8
- package/src/app-dir/server.ts +2 -2
- package/src/app-dir/shared.ts +32 -15
- package/src/app-dir/types.ts +9 -11
- package/src/createTRPCNext.tsx +2 -2
package/dist/app-dir/server.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { AnyProcedure, AnyRootTypes, AnyRouter, inferProcedureInput, MaybePromise, RootConfig, Simplify, TRPCResponse } from '@trpc/server/unstable-core-do-not-import';
|
|
2
2
|
import type { ActionHandlerDef, CreateTRPCNextAppRouterOptions, inferActionDef } from './shared';
|
|
3
|
-
import type {
|
|
4
|
-
export declare function experimental_createTRPCNextAppDirServer<TRouter extends AnyRouter>(opts: CreateTRPCNextAppRouterOptions<TRouter>):
|
|
3
|
+
import type { NextAppDirDecorateRouterRecord } from './types';
|
|
4
|
+
export declare function experimental_createTRPCNextAppDirServer<TRouter extends AnyRouter>(opts: CreateTRPCNextAppRouterOptions<TRouter>): NextAppDirDecorateRouterRecord<TRouter["_def"]["_config"]["$types"], TRouter["_def"]["record"]>;
|
|
5
5
|
/**
|
|
6
6
|
* @internal
|
|
7
7
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/app-dir/server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,mBAAmB,EACnB,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,YAAY,EACb,MAAM,0CAA0C,CAAC;AAWlD,OAAO,KAAK,EACV,gBAAgB,EAChB,8BAA8B,EAC9B,cAAc,EACf,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../src/app-dir/server.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,mBAAmB,EACnB,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,YAAY,EACb,MAAM,0CAA0C,CAAC;AAWlD,OAAO,KAAK,EACV,gBAAgB,EAChB,8BAA8B,EAC9B,cAAc,EACf,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,SAAS,CAAC;AAG9D,wBAAgB,uCAAuC,CACrD,OAAO,SAAS,SAAS,EACzB,IAAI,EAAE,8BAA8B,CAAC,OAAO,CAAC,mGA2B9C;AAED;;GAEG;AACH,MAAM,MAAM,iBAAiB,CAAC,IAAI,SAAS,gBAAgB,IAAI,CAC7D,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAC5B,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;AAE/D,wBAAgB,sCAAsC,CACpD,SAAS,SAAS;IAChB,OAAO,EAAE,UAAU,CAAC,YAAY,CAAC,CAAC;CACnC,EAED,CAAC,EAAE,SAAS,EACZ,IAAI,EAAE;IACJ,aAAa,EAAE,MAAM,YAAY,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACzE;;;OAGG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B;;;;GAoEF;AAGD,wBAAsB,+BAA+B,CAAC,GAAG,EAAE,OAAO,qBAiBjE"}
|
package/dist/app-dir/shared.d.ts
CHANGED
|
@@ -1,22 +1,22 @@
|
|
|
1
1
|
import type { CreateTRPCClientOptions, Resolver, TRPCUntypedClient } from '@trpc/client';
|
|
2
|
-
import type { AnyProcedure, AnyQueryProcedure, AnyRootTypes, AnyRouter,
|
|
2
|
+
import type { AnyProcedure, AnyQueryProcedure, AnyRootTypes, AnyRouter, inferProcedureInput, ProtectedIntersection, RouterRecord } from '@trpc/server/unstable-core-do-not-import';
|
|
3
3
|
/**
|
|
4
4
|
* @internal
|
|
5
5
|
*/
|
|
6
|
-
export type UseProcedureRecord<
|
|
7
|
-
[TKey in keyof
|
|
6
|
+
export type UseProcedureRecord<TRoot extends AnyRootTypes, TRecord extends RouterRecord> = {
|
|
7
|
+
[TKey in keyof TRecord]: TRecord[TKey] extends infer $Value ? $Value extends RouterRecord ? UseProcedureRecord<TRoot, $Value> : $Value extends AnyQueryProcedure ? Resolver<TRoot, $Value> : never : never;
|
|
8
8
|
};
|
|
9
|
-
export declare function createUseProxy<TRouter extends AnyRouter>(client: TRPCUntypedClient<TRouter>): UseProcedureRecord<TRouter>;
|
|
9
|
+
export declare function createUseProxy<TRouter extends AnyRouter>(client: TRPCUntypedClient<TRouter>): UseProcedureRecord<TRouter["_def"]["_config"]["$types"], TRouter["_def"]["record"]>;
|
|
10
10
|
type NextAppRouterUse<TRouter extends AnyRouter> = {
|
|
11
|
-
<TData extends Promise<unknown>[]>(cb: (t: UseProcedureRecord<TRouter>) => [...TData]): {
|
|
11
|
+
<TData extends Promise<unknown>[]>(cb: (t: UseProcedureRecord<TRouter['_def']['_config']['$types'], TRouter['_def']['record']>) => [...TData]): {
|
|
12
12
|
[TKey in keyof TData]: Awaited<TData[TKey]>;
|
|
13
13
|
};
|
|
14
|
-
<TData extends Promise<unknown>>(cb: (t: UseProcedureRecord<TRouter>) => TData): Awaited<TData>;
|
|
14
|
+
<TData extends Promise<unknown>>(cb: (t: UseProcedureRecord<TRouter['_def']['_config']['$types'], TRouter['_def']['record']>) => TData): Awaited<TData>;
|
|
15
15
|
};
|
|
16
16
|
type CreateTRPCNextAppRouterBase<TRouter extends AnyRouter> = {
|
|
17
17
|
use: NextAppRouterUse<TRouter>;
|
|
18
18
|
};
|
|
19
|
-
export type CreateTRPCNextAppRouter<TRouter extends AnyRouter> = ProtectedIntersection<CreateTRPCNextAppRouterBase<TRouter>, UseProcedureRecord<TRouter>>;
|
|
19
|
+
export type CreateTRPCNextAppRouter<TRouter extends AnyRouter> = ProtectedIntersection<CreateTRPCNextAppRouterBase<TRouter>, UseProcedureRecord<TRouter['_def']['_config']['$types'], TRouter['_def']['record']>>;
|
|
20
20
|
/**
|
|
21
21
|
* @internal
|
|
22
22
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/app-dir/shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,uBAAuB,EACvB,QAAQ,EACR,iBAAiB,EAClB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,SAAS,EACT,
|
|
1
|
+
{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/app-dir/shared.ts"],"names":[],"mappings":"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"}
|
package/dist/app-dir/types.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Resolver } from '@trpc/client';
|
|
2
|
-
import type { AnyMutationProcedure, AnyProcedure, AnyQueryProcedure, AnyRootTypes,
|
|
2
|
+
import type { AnyMutationProcedure, AnyProcedure, AnyQueryProcedure, AnyRootTypes, AnySubscriptionProcedure, inferProcedureInput, RouterRecord } from '@trpc/server/unstable-core-do-not-import';
|
|
3
3
|
export type DecorateProcedureServer<TRoot extends AnyRootTypes, TProcedure extends AnyProcedure> = TProcedure extends AnyQueryProcedure ? {
|
|
4
4
|
query: Resolver<TRoot, TProcedure>;
|
|
5
5
|
revalidate: (input?: inferProcedureInput<TProcedure>) => Promise<{
|
|
@@ -13,7 +13,7 @@ export type DecorateProcedureServer<TRoot extends AnyRootTypes, TProcedure exten
|
|
|
13
13
|
} : TProcedure extends AnySubscriptionProcedure ? {
|
|
14
14
|
subscribe: Resolver<TRoot, TProcedure>;
|
|
15
15
|
} : never;
|
|
16
|
-
export type
|
|
17
|
-
[TKey in keyof
|
|
16
|
+
export type NextAppDirDecorateRouterRecord<TRoot extends AnyRootTypes, TRecord extends RouterRecord> = {
|
|
17
|
+
[TKey in keyof TRecord]: TRecord[TKey] extends infer $Value ? $Value extends RouterRecord ? NextAppDirDecorateRouterRecord<TRoot, $Value> : $Value extends AnyProcedure ? DecorateProcedureServer<TRoot, $Value> : never : never;
|
|
18
18
|
};
|
|
19
19
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/app-dir/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,KAAK,EACV,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/app-dir/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,KAAK,EACV,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,YAAY,EACZ,wBAAwB,EACxB,mBAAmB,EACnB,YAAY,EACb,MAAM,0CAA0C,CAAC;AAElD,MAAM,MAAM,uBAAuB,CACjC,KAAK,SAAS,YAAY,EAC1B,UAAU,SAAS,YAAY,IAC7B,UAAU,SAAS,iBAAiB,GACpC;IACE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;IACnC,UAAU,EAAE,CACV,KAAK,CAAC,EAAE,mBAAmB,CAAC,UAAU,CAAC,KACpC,OAAO,CACV;QAAE,WAAW,EAAE,KAAK,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG;QAAE,WAAW,EAAE,IAAI,CAAA;KAAE,CAC9D,CAAC;CACH,GACD,UAAU,SAAS,oBAAoB,GACvC;IACE,MAAM,EAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;CACrC,GACD,UAAU,SAAS,wBAAwB,GAC3C;IACE,SAAS,EAAE,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;CACxC,GACD,KAAK,CAAC;AAEV,MAAM,MAAM,8BAA8B,CACxC,KAAK,SAAS,YAAY,EAC1B,OAAO,SAAS,YAAY,IAC1B;KACD,IAAI,IAAI,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,MAAM,MAAM,GACvD,MAAM,SAAS,YAAY,GACzB,8BAA8B,CAAC,KAAK,EAAE,MAAM,CAAC,GAC7C,MAAM,SAAS,YAAY,GAC3B,uBAAuB,CAAC,KAAK,EAAE,MAAM,CAAC,GACtC,KAAK,GACP,KAAK;CACV,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"bundleSize": 22209,
|
|
3
|
-
"bundleOrigSize":
|
|
4
|
-
"bundleReduction": 32.
|
|
3
|
+
"bundleOrigSize": 32981,
|
|
4
|
+
"bundleReduction": 32.66,
|
|
5
5
|
"modules": [
|
|
6
6
|
{
|
|
7
7
|
"id": "/src/withTRPC.tsx",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
{
|
|
22
22
|
"id": "/src/app-dir/server.ts",
|
|
23
23
|
"size": 3822,
|
|
24
|
-
"origSize":
|
|
24
|
+
"origSize": 4908,
|
|
25
25
|
"renderedExports": [
|
|
26
26
|
"experimental_createTRPCNextAppDirServer",
|
|
27
27
|
"experimental_createServerActionHandler",
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
"removedExports": [],
|
|
31
31
|
"dependents": [],
|
|
32
32
|
"percent": 17.21,
|
|
33
|
-
"reduction": 22.
|
|
33
|
+
"reduction": 22.13
|
|
34
34
|
},
|
|
35
35
|
{
|
|
36
36
|
"id": "/src/app-dir/create-action-hook.tsx",
|
|
@@ -86,7 +86,7 @@
|
|
|
86
86
|
{
|
|
87
87
|
"id": "/src/createTRPCNext.tsx",
|
|
88
88
|
"size": 1073,
|
|
89
|
-
"origSize":
|
|
89
|
+
"origSize": 2698,
|
|
90
90
|
"renderedExports": [
|
|
91
91
|
"createTRPCNext"
|
|
92
92
|
],
|
|
@@ -95,7 +95,7 @@
|
|
|
95
95
|
"/src/index.ts"
|
|
96
96
|
],
|
|
97
97
|
"percent": 4.83,
|
|
98
|
-
"reduction": 60.
|
|
98
|
+
"reduction": 60.23
|
|
99
99
|
},
|
|
100
100
|
{
|
|
101
101
|
"id": "/src/app-dir/formDataToObject.ts",
|
|
@@ -114,7 +114,7 @@
|
|
|
114
114
|
{
|
|
115
115
|
"id": "/src/app-dir/shared.ts",
|
|
116
116
|
"size": 335,
|
|
117
|
-
"origSize":
|
|
117
|
+
"origSize": 2822,
|
|
118
118
|
"renderedExports": [
|
|
119
119
|
"generateCacheTag",
|
|
120
120
|
"isFormData"
|
|
@@ -124,12 +124,12 @@
|
|
|
124
124
|
],
|
|
125
125
|
"dependents": [
|
|
126
126
|
"/src/app-dir/server.ts",
|
|
127
|
-
"/src/app-dir/links/nextCache.ts",
|
|
128
127
|
"/src/app-dir/links/nextHttp.ts",
|
|
128
|
+
"/src/app-dir/links/nextCache.ts",
|
|
129
129
|
"/src/app-dir/create-action-hook.tsx"
|
|
130
130
|
],
|
|
131
131
|
"percent": 1.51,
|
|
132
|
-
"reduction":
|
|
132
|
+
"reduction": 88.13
|
|
133
133
|
},
|
|
134
134
|
{
|
|
135
135
|
"id": "/src/index.ts",
|
package/dist/createTRPCNext.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { CreateReactUtils,
|
|
1
|
+
import type { CreateReactUtils, DecorateRouterRecord, TRPCUseQueries, TRPCUseSuspenseQueries } from '@trpc/react-query/shared';
|
|
2
2
|
import type { AnyRouter, ProtectedIntersection } from '@trpc/server/unstable-core-do-not-import';
|
|
3
3
|
import type { NextPageContext } from 'next/types';
|
|
4
4
|
import type { WithTRPCNoSSROptions, WithTRPCSSROptions } from './withTRPC';
|
|
@@ -24,6 +24,6 @@ export interface CreateTRPCNextBase<TRouter extends AnyRouter, TSSRContext exten
|
|
|
24
24
|
/**
|
|
25
25
|
* @internal
|
|
26
26
|
*/
|
|
27
|
-
export type CreateTRPCNext<TRouter extends AnyRouter, TSSRContext extends NextPageContext, TFlags> = ProtectedIntersection<CreateTRPCNextBase<TRouter, TSSRContext>,
|
|
27
|
+
export type CreateTRPCNext<TRouter extends AnyRouter, TSSRContext extends NextPageContext, TFlags> = ProtectedIntersection<CreateTRPCNextBase<TRouter, TSSRContext>, DecorateRouterRecord<TRouter['_def']['_config']['$types'], TRouter['_def']['record'], TFlags>>;
|
|
28
28
|
export declare function createTRPCNext<TRouter extends AnyRouter, TSSRContext extends NextPageContext = NextPageContext, TFlags = null>(opts: WithTRPCNoSSROptions<TRouter> | WithTRPCSSROptions<TRouter>): CreateTRPCNext<TRouter, TSSRContext, TFlags>;
|
|
29
29
|
//# sourceMappingURL=createTRPCNext.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createTRPCNext.d.ts","sourceRoot":"","sources":["../src/createTRPCNext.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,
|
|
1
|
+
{"version":3,"file":"createTRPCNext.d.ts","sourceRoot":"","sources":["../src/createTRPCNext.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,EACd,sBAAsB,EACvB,MAAM,0BAA0B,CAAC;AAMlC,OAAO,KAAK,EACV,SAAS,EACT,qBAAqB,EACtB,MAAM,0CAA0C,CAAC;AAElD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,KAAK,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC;;GAEG;AACH,MAAM,WAAW,kBAAkB,CACjC,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe;IAEnC;;;;OAIG;IACH,UAAU,IAAI,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACrD;;OAEG;IACH,QAAQ,IAAI,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACnD,QAAQ,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;IAC5D,UAAU,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;IACpC,kBAAkB,EAAE,sBAAsB,CAAC,OAAO,CAAC,CAAC;CACrD;AAED;;GAEG;AACH,MAAM,MAAM,cAAc,CACxB,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,EACnC,MAAM,IACJ,qBAAqB,CACvB,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,EACxC,oBAAoB,CAClB,OAAO,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,EACpC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,EACzB,MAAM,CACP,CACF,CAAC;AAEF,wBAAgB,cAAc,CAC5B,OAAO,SAAS,SAAS,EACzB,WAAW,SAAS,eAAe,GAAG,eAAe,EACrD,MAAM,GAAG,IAAI,EAEb,IAAI,EAAE,oBAAoB,CAAC,OAAO,CAAC,GAAG,kBAAkB,CAAC,OAAO,CAAC,GAChE,cAAc,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,CA+B9C"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trpc/next",
|
|
3
|
-
"version": "11.0.0-next-beta.
|
|
3
|
+
"version": "11.0.0-next-beta.248+05798dd78",
|
|
4
4
|
"description": "The tRPC Next.js library",
|
|
5
5
|
"author": "KATT",
|
|
6
6
|
"license": "MIT",
|
|
@@ -67,9 +67,9 @@
|
|
|
67
67
|
],
|
|
68
68
|
"peerDependencies": {
|
|
69
69
|
"@tanstack/react-query": "^5.0.0",
|
|
70
|
-
"@trpc/client": "11.0.0-next-beta.
|
|
71
|
-
"@trpc/react-query": "11.0.0-next-beta.
|
|
72
|
-
"@trpc/server": "11.0.0-next-beta.
|
|
70
|
+
"@trpc/client": "11.0.0-next-beta.248+05798dd78",
|
|
71
|
+
"@trpc/react-query": "11.0.0-next-beta.248+05798dd78",
|
|
72
|
+
"@trpc/server": "11.0.0-next-beta.248+05798dd78",
|
|
73
73
|
"next": "*",
|
|
74
74
|
"react": ">=16.8.0",
|
|
75
75
|
"react-dom": ">=16.8.0"
|
|
@@ -84,9 +84,9 @@
|
|
|
84
84
|
},
|
|
85
85
|
"devDependencies": {
|
|
86
86
|
"@tanstack/react-query": "^5.0.0",
|
|
87
|
-
"@trpc/client": "11.0.0-next-beta.
|
|
88
|
-
"@trpc/react-query": "11.0.0-next-beta.
|
|
89
|
-
"@trpc/server": "11.0.0-next-beta.
|
|
87
|
+
"@trpc/client": "11.0.0-next-beta.248+05798dd78",
|
|
88
|
+
"@trpc/react-query": "11.0.0-next-beta.248+05798dd78",
|
|
89
|
+
"@trpc/server": "11.0.0-next-beta.248+05798dd78",
|
|
90
90
|
"@types/express": "^4.17.17",
|
|
91
91
|
"@types/node": "^20.10.0",
|
|
92
92
|
"@types/react": "^18.2.33",
|
|
@@ -106,5 +106,5 @@
|
|
|
106
106
|
"funding": [
|
|
107
107
|
"https://trpc.io/sponsor"
|
|
108
108
|
],
|
|
109
|
-
"gitHead": "
|
|
109
|
+
"gitHead": "05798dd78fd304612172fcccb622559954a0f578"
|
|
110
110
|
}
|
package/src/app-dir/server.ts
CHANGED
|
@@ -29,7 +29,7 @@ import type {
|
|
|
29
29
|
inferActionDef,
|
|
30
30
|
} from './shared';
|
|
31
31
|
import { generateCacheTag, isFormData } from './shared';
|
|
32
|
-
import type {
|
|
32
|
+
import type { NextAppDirDecorateRouterRecord } from './types';
|
|
33
33
|
|
|
34
34
|
// ts-prune-ignore-next
|
|
35
35
|
export function experimental_createTRPCNextAppDirServer<
|
|
@@ -57,7 +57,7 @@ export function experimental_createTRPCNextAppDirServer<
|
|
|
57
57
|
}
|
|
58
58
|
|
|
59
59
|
return (client[procedureType] as any)(procedurePath, ...callOpts.args);
|
|
60
|
-
}) as
|
|
60
|
+
}) as NextAppDirDecorateRouterRecord<
|
|
61
61
|
TRouter['_def']['_config']['$types'],
|
|
62
62
|
TRouter['_def']['record']
|
|
63
63
|
>;
|
package/src/app-dir/shared.ts
CHANGED
|
@@ -8,25 +8,26 @@ import type {
|
|
|
8
8
|
AnyQueryProcedure,
|
|
9
9
|
AnyRootTypes,
|
|
10
10
|
AnyRouter,
|
|
11
|
-
Filter,
|
|
12
11
|
inferProcedureInput,
|
|
13
12
|
ProtectedIntersection,
|
|
13
|
+
RouterRecord,
|
|
14
14
|
} from '@trpc/server/unstable-core-do-not-import';
|
|
15
15
|
import { createRecursiveProxy } from '@trpc/server/unstable-core-do-not-import';
|
|
16
16
|
|
|
17
17
|
/**
|
|
18
18
|
* @internal
|
|
19
19
|
*/
|
|
20
|
-
export type UseProcedureRecord<
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
?
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
20
|
+
export type UseProcedureRecord<
|
|
21
|
+
TRoot extends AnyRootTypes,
|
|
22
|
+
TRecord extends RouterRecord,
|
|
23
|
+
> = {
|
|
24
|
+
[TKey in keyof TRecord]: TRecord[TKey] extends infer $Value
|
|
25
|
+
? $Value extends RouterRecord
|
|
26
|
+
? UseProcedureRecord<TRoot, $Value>
|
|
27
|
+
: $Value extends AnyQueryProcedure
|
|
28
|
+
? Resolver<TRoot, $Value>
|
|
29
|
+
: never
|
|
30
|
+
: never;
|
|
30
31
|
};
|
|
31
32
|
|
|
32
33
|
export function createUseProxy<TRouter extends AnyRouter>(
|
|
@@ -36,17 +37,30 @@ export function createUseProxy<TRouter extends AnyRouter>(
|
|
|
36
37
|
const path = opts.path.join('.');
|
|
37
38
|
|
|
38
39
|
return client.query(path, ...opts.args);
|
|
39
|
-
}) as UseProcedureRecord<
|
|
40
|
+
}) as UseProcedureRecord<
|
|
41
|
+
TRouter['_def']['_config']['$types'],
|
|
42
|
+
TRouter['_def']['record']
|
|
43
|
+
>;
|
|
40
44
|
}
|
|
41
45
|
|
|
42
46
|
type NextAppRouterUse<TRouter extends AnyRouter> = {
|
|
43
47
|
<TData extends Promise<unknown>[]>(
|
|
44
|
-
cb: (
|
|
48
|
+
cb: (
|
|
49
|
+
t: UseProcedureRecord<
|
|
50
|
+
TRouter['_def']['_config']['$types'],
|
|
51
|
+
TRouter['_def']['record']
|
|
52
|
+
>,
|
|
53
|
+
) => [...TData],
|
|
45
54
|
): {
|
|
46
55
|
[TKey in keyof TData]: Awaited<TData[TKey]>;
|
|
47
56
|
};
|
|
48
57
|
<TData extends Promise<unknown>>(
|
|
49
|
-
cb: (
|
|
58
|
+
cb: (
|
|
59
|
+
t: UseProcedureRecord<
|
|
60
|
+
TRouter['_def']['_config']['$types'],
|
|
61
|
+
TRouter['_def']['record']
|
|
62
|
+
>,
|
|
63
|
+
) => TData,
|
|
50
64
|
): Awaited<TData>;
|
|
51
65
|
};
|
|
52
66
|
type CreateTRPCNextAppRouterBase<TRouter extends AnyRouter> = {
|
|
@@ -55,7 +69,10 @@ type CreateTRPCNextAppRouterBase<TRouter extends AnyRouter> = {
|
|
|
55
69
|
export type CreateTRPCNextAppRouter<TRouter extends AnyRouter> =
|
|
56
70
|
ProtectedIntersection<
|
|
57
71
|
CreateTRPCNextAppRouterBase<TRouter>,
|
|
58
|
-
UseProcedureRecord<
|
|
72
|
+
UseProcedureRecord<
|
|
73
|
+
TRouter['_def']['_config']['$types'],
|
|
74
|
+
TRouter['_def']['record']
|
|
75
|
+
>
|
|
59
76
|
>;
|
|
60
77
|
|
|
61
78
|
/**
|
package/src/app-dir/types.ts
CHANGED
|
@@ -4,10 +4,9 @@ import type {
|
|
|
4
4
|
AnyProcedure,
|
|
5
5
|
AnyQueryProcedure,
|
|
6
6
|
AnyRootTypes,
|
|
7
|
-
AnyRouter,
|
|
8
7
|
AnySubscriptionProcedure,
|
|
9
8
|
inferProcedureInput,
|
|
10
|
-
|
|
9
|
+
RouterRecord,
|
|
11
10
|
} from '@trpc/server/unstable-core-do-not-import';
|
|
12
11
|
|
|
13
12
|
export type DecorateProcedureServer<
|
|
@@ -32,16 +31,15 @@ export type DecorateProcedureServer<
|
|
|
32
31
|
}
|
|
33
32
|
: never;
|
|
34
33
|
|
|
35
|
-
export type
|
|
34
|
+
export type NextAppDirDecorateRouterRecord<
|
|
36
35
|
TRoot extends AnyRootTypes,
|
|
37
|
-
|
|
36
|
+
TRecord extends RouterRecord,
|
|
38
37
|
> = {
|
|
39
|
-
[TKey in keyof
|
|
40
|
-
?
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
>
|
|
44
|
-
|
|
45
|
-
? DecorateProcedureServer<TRoot, TProcedures[TKey]>
|
|
38
|
+
[TKey in keyof TRecord]: TRecord[TKey] extends infer $Value
|
|
39
|
+
? $Value extends RouterRecord
|
|
40
|
+
? NextAppDirDecorateRouterRecord<TRoot, $Value>
|
|
41
|
+
: $Value extends AnyProcedure
|
|
42
|
+
? DecorateProcedureServer<TRoot, $Value>
|
|
43
|
+
: never
|
|
46
44
|
: never;
|
|
47
45
|
};
|
package/src/createTRPCNext.tsx
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// We're testing this through E2E-testing
|
|
3
3
|
import type {
|
|
4
4
|
CreateReactUtils,
|
|
5
|
-
|
|
5
|
+
DecorateRouterRecord,
|
|
6
6
|
TRPCUseQueries,
|
|
7
7
|
TRPCUseSuspenseQueries,
|
|
8
8
|
} from '@trpc/react-query/shared';
|
|
@@ -52,7 +52,7 @@ export type CreateTRPCNext<
|
|
|
52
52
|
TFlags,
|
|
53
53
|
> = ProtectedIntersection<
|
|
54
54
|
CreateTRPCNextBase<TRouter, TSSRContext>,
|
|
55
|
-
|
|
55
|
+
DecorateRouterRecord<
|
|
56
56
|
TRouter['_def']['_config']['$types'],
|
|
57
57
|
TRouter['_def']['record'],
|
|
58
58
|
TFlags
|