@trpc/tanstack-react-query 0.0.0-alpha.3 → 10.8.0-alpha-tmp-02-12-response-types-idea.853
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +12 -11
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/internals/Context.d.ts +15 -8
- package/dist/internals/Context.d.ts.map +1 -1
- package/dist/internals/Context.js +19 -4
- package/dist/internals/Context.mjs +19 -4
- package/dist/internals/createOptionsProxy.d.ts +105 -41
- package/dist/internals/createOptionsProxy.d.ts.map +1 -1
- package/dist/internals/createOptionsProxy.js +43 -32
- package/dist/internals/createOptionsProxy.mjs +45 -34
- package/dist/internals/infiniteQueryOptions.d.ts +37 -28
- package/dist/internals/infiniteQueryOptions.d.ts.map +1 -1
- package/dist/internals/infiniteQueryOptions.js +3 -3
- package/dist/internals/infiniteQueryOptions.mjs +4 -4
- package/dist/internals/mutationOptions.d.ts +8 -3
- package/dist/internals/mutationOptions.d.ts.map +1 -1
- package/dist/internals/mutationOptions.js +3 -1
- package/dist/internals/mutationOptions.mjs +3 -1
- package/dist/internals/queryOptions.d.ts +9 -15
- package/dist/internals/queryOptions.d.ts.map +1 -1
- package/dist/internals/queryOptions.js +5 -3
- package/dist/internals/queryOptions.mjs +6 -4
- package/dist/internals/subscriptionOptions.d.ts +13 -17
- package/dist/internals/subscriptionOptions.d.ts.map +1 -1
- package/dist/internals/subscriptionOptions.js +44 -38
- package/dist/internals/subscriptionOptions.mjs +44 -38
- package/dist/internals/types.d.ts +44 -2
- package/dist/internals/types.d.ts.map +1 -1
- package/dist/internals/utils.d.ts +10 -2
- package/dist/internals/utils.d.ts.map +1 -1
- package/dist/internals/utils.js +10 -4
- package/dist/internals/utils.mjs +10 -4
- package/package.json +30 -27
- package/src/index.ts +4 -3
- package/src/internals/Context.tsx +41 -12
- package/src/internals/createOptionsProxy.ts +250 -117
- package/src/internals/infiniteQueryOptions.ts +53 -27
- package/src/internals/mutationOptions.ts +23 -6
- package/src/internals/queryOptions.ts +20 -5
- package/src/internals/subscriptionOptions.ts +62 -46
- package/src/internals/types.ts +48 -1
- package/src/internals/utils.ts +15 -4
|
@@ -1,27 +1,22 @@
|
|
|
1
1
|
import { TRPCUntypedClient, getUntypedClient } from '@trpc/client';
|
|
2
|
-
import {
|
|
3
|
-
import { createRecursiveProxy } from '@trpc/server/unstable-core-do-not-import';
|
|
2
|
+
import { createTRPCRecursiveProxy, callTRPCProcedure } from '@trpc/server';
|
|
4
3
|
import { trpcInfiniteQueryOptions } from './infiniteQueryOptions.mjs';
|
|
5
4
|
import { trpcMutationOptions } from './mutationOptions.mjs';
|
|
6
5
|
import { trpcQueryOptions } from './queryOptions.mjs';
|
|
7
6
|
import { trpcSubscriptionOptions } from './subscriptionOptions.mjs';
|
|
8
|
-
import { getMutationKeyInternal, unwrapLazyArg
|
|
7
|
+
import { getQueryKeyInternal, getMutationKeyInternal, unwrapLazyArg } from './utils.mjs';
|
|
9
8
|
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
};
|
|
17
|
-
return map[method];
|
|
18
|
-
}
|
|
19
|
-
function createTRPCOptionsProxy(opts) {
|
|
9
|
+
/**
|
|
10
|
+
* Create a typed proxy from your router types. Can also be used on the server.
|
|
11
|
+
*
|
|
12
|
+
* @see https://trpc.io/docs/client/tanstack-react-query/setup#3b-setup-without-react-context
|
|
13
|
+
* @see https://trpc.io/docs/client/tanstack-react-query/server-components#5-create-a-trpc-caller-for-server-components
|
|
14
|
+
*/ function createTRPCOptionsProxy(opts) {
|
|
20
15
|
const callIt = (type)=>{
|
|
21
16
|
return (path, input, trpcOpts)=>{
|
|
22
17
|
if ('router' in opts) {
|
|
23
|
-
return Promise.resolve(unwrapLazyArg(opts.ctx)).then((ctx)=>
|
|
24
|
-
|
|
18
|
+
return Promise.resolve(unwrapLazyArg(opts.ctx)).then((ctx)=>callTRPCProcedure({
|
|
19
|
+
router: opts.router,
|
|
25
20
|
path: path,
|
|
26
21
|
getRawInput: async ()=>input,
|
|
27
22
|
ctx: ctx,
|
|
@@ -33,47 +28,60 @@ function createTRPCOptionsProxy(opts) {
|
|
|
33
28
|
return untypedClient[type](path, input, trpcOpts);
|
|
34
29
|
};
|
|
35
30
|
};
|
|
36
|
-
return
|
|
31
|
+
return createTRPCRecursiveProxy(({ args, path: _path })=>{
|
|
37
32
|
const path = [
|
|
38
33
|
..._path
|
|
39
34
|
];
|
|
40
35
|
const utilName = path.pop();
|
|
41
36
|
const [arg1, arg2] = args;
|
|
42
|
-
function getQueryKey() {
|
|
43
|
-
const queryType = getQueryType(utilName);
|
|
44
|
-
return getQueryKeyInternal(path, arg1, queryType ?? 'any');
|
|
45
|
-
}
|
|
46
37
|
const contextMap = {
|
|
47
38
|
'~types': undefined,
|
|
48
|
-
|
|
49
|
-
return
|
|
39
|
+
pathKey: ()=>{
|
|
40
|
+
return getQueryKeyInternal(path);
|
|
41
|
+
},
|
|
42
|
+
pathFilter: ()=>{
|
|
43
|
+
return {
|
|
44
|
+
...arg1,
|
|
45
|
+
queryKey: getQueryKeyInternal(path)
|
|
46
|
+
};
|
|
47
|
+
},
|
|
48
|
+
queryOptions: ()=>{
|
|
49
|
+
return trpcQueryOptions({
|
|
50
|
+
input: arg1,
|
|
51
|
+
opts: arg2,
|
|
52
|
+
path,
|
|
53
|
+
queryClient: opts.queryClient,
|
|
54
|
+
queryKey: getQueryKeyInternal(path, arg1, 'query'),
|
|
55
|
+
query: callIt('query')
|
|
56
|
+
});
|
|
50
57
|
},
|
|
51
58
|
queryKey: ()=>{
|
|
52
|
-
return
|
|
59
|
+
return getQueryKeyInternal(path, arg1, 'query');
|
|
53
60
|
},
|
|
54
61
|
queryFilter: ()=>{
|
|
55
62
|
return {
|
|
56
63
|
...arg2,
|
|
57
|
-
queryKey:
|
|
64
|
+
queryKey: getQueryKeyInternal(path, arg1, 'query')
|
|
58
65
|
};
|
|
59
66
|
},
|
|
60
67
|
infiniteQueryOptions: ()=>{
|
|
61
68
|
return trpcInfiniteQueryOptions({
|
|
69
|
+
input: arg1,
|
|
62
70
|
opts: arg2,
|
|
63
71
|
path,
|
|
64
72
|
queryClient: opts.queryClient,
|
|
65
|
-
queryKey:
|
|
73
|
+
queryKey: getQueryKeyInternal(path, arg1, 'infinite'),
|
|
66
74
|
query: callIt('query')
|
|
67
75
|
});
|
|
68
76
|
},
|
|
69
|
-
|
|
70
|
-
return
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
}
|
|
77
|
+
infiniteQueryKey: ()=>{
|
|
78
|
+
return getQueryKeyInternal(path, arg1, 'infinite');
|
|
79
|
+
},
|
|
80
|
+
infiniteQueryFilter: ()=>{
|
|
81
|
+
return {
|
|
82
|
+
...arg2,
|
|
83
|
+
queryKey: getQueryKeyInternal(path, arg1, 'infinite')
|
|
84
|
+
};
|
|
77
85
|
},
|
|
78
86
|
mutationOptions: ()=>{
|
|
79
87
|
return trpcMutationOptions({
|
|
@@ -84,11 +92,14 @@ function createTRPCOptionsProxy(opts) {
|
|
|
84
92
|
overrides: opts.overrides?.mutations
|
|
85
93
|
});
|
|
86
94
|
},
|
|
95
|
+
mutationKey: ()=>{
|
|
96
|
+
return getMutationKeyInternal(path);
|
|
97
|
+
},
|
|
87
98
|
subscriptionOptions: ()=>{
|
|
88
99
|
return trpcSubscriptionOptions({
|
|
89
100
|
opts: arg2,
|
|
90
101
|
path,
|
|
91
|
-
queryKey:
|
|
102
|
+
queryKey: getQueryKeyInternal(path, arg1, 'any'),
|
|
92
103
|
subscribe: callIt('subscription')
|
|
93
104
|
});
|
|
94
105
|
}
|
|
@@ -1,52 +1,61 @@
|
|
|
1
|
-
import type { DataTag, DefinedInitialDataInfiniteOptions,
|
|
2
|
-
import { type QueryClient, type SkipToken } from '@tanstack/react-query';
|
|
1
|
+
import type { DataTag, DefinedInitialDataInfiniteOptions, QueryClient, SkipToken, UndefinedInitialDataInfiniteOptions, UnusedSkipTokenInfiniteOptions } from '@tanstack/react-query';
|
|
3
2
|
import type { TRPCClientErrorLike, TRPCUntypedClient } from '@trpc/client';
|
|
4
3
|
import type { DistributiveOmit } from '@trpc/server/unstable-core-do-not-import';
|
|
5
|
-
import type { ExtractCursorType, ResolverDef, TRPCQueryBaseOptions, TRPCQueryKey, TRPCQueryOptionsResult } from './types';
|
|
4
|
+
import type { ExtractCursorType, ResolverDef, TRPCInfiniteData, TRPCQueryBaseOptions, TRPCQueryKey, TRPCQueryOptionsResult } from './types';
|
|
6
5
|
type ReservedOptions = 'queryKey' | 'queryFn' | 'queryHashFn' | 'queryHash' | 'initialPageParam';
|
|
7
|
-
interface UndefinedTRPCInfiniteQueryOptionsIn<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<UndefinedInitialDataInfiniteOptions<TQueryFnData, TError,
|
|
6
|
+
interface UndefinedTRPCInfiniteQueryOptionsIn<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<UndefinedInitialDataInfiniteOptions<TQueryFnData, TError, TRPCInfiniteData<TInput, TData>, TRPCQueryKey, NonNullable<ExtractCursorType<TInput>> | null>, ReservedOptions>, TRPCQueryBaseOptions {
|
|
8
7
|
initialCursor?: NonNullable<ExtractCursorType<TInput>> | null;
|
|
9
8
|
}
|
|
10
|
-
interface UndefinedTRPCInfiniteQueryOptionsOut<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<UndefinedInitialDataInfiniteOptions<TQueryFnData, TError,
|
|
11
|
-
queryKey: DataTag<TRPCQueryKey,
|
|
9
|
+
interface UndefinedTRPCInfiniteQueryOptionsOut<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<UndefinedInitialDataInfiniteOptions<TQueryFnData, TError, TRPCInfiniteData<TInput, TData>, TRPCQueryKey, NonNullable<ExtractCursorType<TInput>> | null>, 'initialPageParam'>, TRPCQueryOptionsResult {
|
|
10
|
+
queryKey: DataTag<TRPCQueryKey, TRPCInfiniteData<TInput, TData>, TError>;
|
|
12
11
|
initialPageParam: NonNullable<ExtractCursorType<TInput>> | null;
|
|
13
12
|
}
|
|
14
|
-
interface DefinedTRPCInfiniteQueryOptionsIn<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<DefinedInitialDataInfiniteOptions<TQueryFnData, TError,
|
|
13
|
+
interface DefinedTRPCInfiniteQueryOptionsIn<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<DefinedInitialDataInfiniteOptions<TQueryFnData, TError, TRPCInfiniteData<TInput, TData>, TRPCQueryKey, NonNullable<ExtractCursorType<TInput>> | null>, ReservedOptions>, TRPCQueryBaseOptions {
|
|
15
14
|
initialCursor?: NonNullable<ExtractCursorType<TInput>> | null;
|
|
16
15
|
}
|
|
17
|
-
interface DefinedTRPCInfiniteQueryOptionsOut<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<DefinedInitialDataInfiniteOptions<TQueryFnData, TError,
|
|
18
|
-
queryKey: DataTag<TRPCQueryKey,
|
|
16
|
+
interface DefinedTRPCInfiniteQueryOptionsOut<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<DefinedInitialDataInfiniteOptions<TQueryFnData, TError, TRPCInfiniteData<TInput, TData>, TRPCQueryKey, NonNullable<ExtractCursorType<TInput>> | null>, 'initialPageParam'>, TRPCQueryOptionsResult {
|
|
17
|
+
queryKey: DataTag<TRPCQueryKey, TRPCInfiniteData<TInput, TData>, TError>;
|
|
19
18
|
initialPageParam: NonNullable<ExtractCursorType<TInput>> | null;
|
|
20
19
|
}
|
|
21
|
-
interface UnusedSkipTokenTRPCInfiniteQueryOptionsIn<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<UnusedSkipTokenInfiniteOptions<TQueryFnData, TError,
|
|
20
|
+
interface UnusedSkipTokenTRPCInfiniteQueryOptionsIn<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<UnusedSkipTokenInfiniteOptions<TQueryFnData, TError, TRPCInfiniteData<TInput, TData>, TRPCQueryKey, NonNullable<ExtractCursorType<TInput>> | null>, ReservedOptions>, TRPCQueryBaseOptions {
|
|
22
21
|
initialCursor?: NonNullable<ExtractCursorType<TInput>> | null;
|
|
23
22
|
}
|
|
24
|
-
interface UnusedSkipTokenTRPCInfiniteQueryOptionsOut<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<UnusedSkipTokenInfiniteOptions<TQueryFnData, TError,
|
|
25
|
-
queryKey: DataTag<TRPCQueryKey,
|
|
23
|
+
interface UnusedSkipTokenTRPCInfiniteQueryOptionsOut<TInput, TQueryFnData, TData, TError> extends DistributiveOmit<UnusedSkipTokenInfiniteOptions<TQueryFnData, TError, TRPCInfiniteData<TInput, TData>, TRPCQueryKey, NonNullable<ExtractCursorType<TInput>> | null>, 'initialPageParam'>, TRPCQueryOptionsResult {
|
|
24
|
+
queryKey: DataTag<TRPCQueryKey, TRPCInfiniteData<TInput, TData>, TError>;
|
|
26
25
|
initialPageParam: NonNullable<ExtractCursorType<TInput>> | null;
|
|
27
26
|
}
|
|
28
27
|
export interface TRPCInfiniteQueryOptions<TDef extends ResolverDef> {
|
|
29
|
-
<TQueryFnData extends TDef['output'], TData = TQueryFnData>(input: TDef['input'] | SkipToken, opts: DefinedTRPCInfiniteQueryOptionsIn<TDef['input'], TQueryFnData, TData, TRPCClientErrorLike<
|
|
30
|
-
|
|
31
|
-
|
|
28
|
+
<TQueryFnData extends TDef['output'], TData = TQueryFnData>(input: TDef['input'] | SkipToken, opts: DefinedTRPCInfiniteQueryOptionsIn<TDef['input'], TQueryFnData, TData, TRPCClientErrorLike<{
|
|
29
|
+
transformer: TDef['transformer'];
|
|
30
|
+
errorShape: TDef['errorShape'];
|
|
31
|
+
}>>): DefinedTRPCInfiniteQueryOptionsOut<TDef['input'], TQueryFnData, TData, TRPCClientErrorLike<{
|
|
32
|
+
transformer: TDef['transformer'];
|
|
33
|
+
errorShape: TDef['errorShape'];
|
|
34
|
+
}>>;
|
|
35
|
+
<TQueryFnData extends TDef['output'], TData = TQueryFnData>(input: TDef['input'], opts: UnusedSkipTokenTRPCInfiniteQueryOptionsIn<TDef['input'], TQueryFnData, TData, TRPCClientErrorLike<{
|
|
36
|
+
transformer: TDef['transformer'];
|
|
37
|
+
errorShape: TDef['errorShape'];
|
|
38
|
+
}>>): UnusedSkipTokenTRPCInfiniteQueryOptionsOut<TDef['input'], TQueryFnData, TData, TRPCClientErrorLike<{
|
|
39
|
+
transformer: TDef['transformer'];
|
|
40
|
+
errorShape: TDef['errorShape'];
|
|
41
|
+
}>>;
|
|
42
|
+
<TQueryFnData extends TDef['output'], TData = TQueryFnData>(input: TDef['input'] | SkipToken, opts?: UndefinedTRPCInfiniteQueryOptionsIn<TDef['input'], TQueryFnData, TData, TRPCClientErrorLike<{
|
|
43
|
+
transformer: TDef['transformer'];
|
|
44
|
+
errorShape: TDef['errorShape'];
|
|
45
|
+
}>>): UndefinedTRPCInfiniteQueryOptionsOut<TDef['input'], TQueryFnData, TData, TRPCClientErrorLike<{
|
|
46
|
+
transformer: TDef['transformer'];
|
|
47
|
+
errorShape: TDef['errorShape'];
|
|
48
|
+
}>>;
|
|
32
49
|
}
|
|
50
|
+
type AnyTRPCInfiniteQueryOptionsIn = DefinedTRPCInfiniteQueryOptionsIn<any, any, any, any> | UnusedSkipTokenTRPCInfiniteQueryOptionsIn<any, any, any, any> | UndefinedTRPCInfiniteQueryOptionsIn<any, any, any, any>;
|
|
51
|
+
type AnyTRPCInfiniteQueryOptionsOut = DefinedTRPCInfiniteQueryOptionsOut<any, any, any, any> | UnusedSkipTokenTRPCInfiniteQueryOptionsOut<any, any, any, any> | UndefinedTRPCInfiniteQueryOptionsOut<any, any, any, any>;
|
|
33
52
|
export declare function trpcInfiniteQueryOptions(args: {
|
|
53
|
+
input: unknown;
|
|
34
54
|
query: typeof TRPCUntypedClient.prototype.query;
|
|
35
55
|
queryClient: QueryClient | (() => QueryClient);
|
|
36
56
|
path: readonly string[];
|
|
37
57
|
queryKey: TRPCQueryKey;
|
|
38
|
-
opts:
|
|
39
|
-
}):
|
|
40
|
-
initialData?: InfiniteData<unknown, {} | null> | import("@tanstack/react-query").InitialDataFunction<InfiniteData<unknown, {} | null>> | undefined;
|
|
41
|
-
} & {
|
|
42
|
-
queryKey: TRPCQueryKey & {
|
|
43
|
-
[dataTagSymbol]: InfiniteData<unknown, unknown>;
|
|
44
|
-
[dataTagErrorSymbol]: unknown;
|
|
45
|
-
};
|
|
46
|
-
} & {
|
|
47
|
-
trpc: {
|
|
48
|
-
path: string;
|
|
49
|
-
};
|
|
50
|
-
};
|
|
58
|
+
opts: AnyTRPCInfiniteQueryOptionsIn;
|
|
59
|
+
}): AnyTRPCInfiniteQueryOptionsOut;
|
|
51
60
|
export {};
|
|
52
61
|
//# sourceMappingURL=infiniteQueryOptions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"infiniteQueryOptions.d.ts","sourceRoot":"","sources":["../../src/internals/infiniteQueryOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,iCAAiC,EACjC,
|
|
1
|
+
{"version":3,"file":"infiniteQueryOptions.d.ts","sourceRoot":"","sources":["../../src/internals/infiniteQueryOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,8 @@ var reactQuery = require('@tanstack/react-query');
|
|
|
4
4
|
var utils = require('./utils.js');
|
|
5
5
|
|
|
6
6
|
function trpcInfiniteQueryOptions(args) {
|
|
7
|
-
const { query, path, queryKey, opts } = args;
|
|
8
|
-
const inputIsSkipToken =
|
|
7
|
+
const { input, query, path, queryKey, opts } = args;
|
|
8
|
+
const inputIsSkipToken = input === reactQuery.skipToken;
|
|
9
9
|
const queryFn = async (queryFnContext)=>{
|
|
10
10
|
const actualOpts = {
|
|
11
11
|
...opts,
|
|
@@ -28,7 +28,7 @@ function trpcInfiniteQueryOptions(args) {
|
|
|
28
28
|
...opts,
|
|
29
29
|
queryKey,
|
|
30
30
|
queryFn: inputIsSkipToken ? reactQuery.skipToken : queryFn,
|
|
31
|
-
initialPageParam: opts?.initialCursor ??
|
|
31
|
+
initialPageParam: opts?.initialCursor ?? input?.cursor
|
|
32
32
|
}), {
|
|
33
33
|
trpc: utils.createTRPCOptionsResult({
|
|
34
34
|
path
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { infiniteQueryOptions, skipToken } from '@tanstack/react-query';
|
|
2
2
|
import { createTRPCOptionsResult, getClientArgs } from './utils.mjs';
|
|
3
3
|
|
|
4
4
|
function trpcInfiniteQueryOptions(args) {
|
|
5
|
-
const { query, path, queryKey, opts } = args;
|
|
6
|
-
const inputIsSkipToken =
|
|
5
|
+
const { input, query, path, queryKey, opts } = args;
|
|
6
|
+
const inputIsSkipToken = input === skipToken;
|
|
7
7
|
const queryFn = async (queryFnContext)=>{
|
|
8
8
|
const actualOpts = {
|
|
9
9
|
...opts,
|
|
@@ -26,7 +26,7 @@ function trpcInfiniteQueryOptions(args) {
|
|
|
26
26
|
...opts,
|
|
27
27
|
queryKey,
|
|
28
28
|
queryFn: inputIsSkipToken ? skipToken : queryFn,
|
|
29
|
-
initialPageParam: opts?.initialCursor ??
|
|
29
|
+
initialPageParam: opts?.initialCursor ?? input?.cursor
|
|
30
30
|
}), {
|
|
31
31
|
trpc: createTRPCOptionsResult({
|
|
32
32
|
path
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { QueryClient, UseMutationOptions } from '@tanstack/react-query';
|
|
2
2
|
import type { TRPCClientErrorLike, TRPCUntypedClient } from '@trpc/client';
|
|
3
3
|
import type { DistributiveOmit, MaybePromise } from '@trpc/server/unstable-core-do-not-import';
|
|
4
4
|
import type { ResolverDef, TRPCMutationKey, TRPCQueryBaseOptions, TRPCQueryOptionsResult } from './types';
|
|
@@ -27,12 +27,17 @@ export interface MutationOptionsOverride {
|
|
|
27
27
|
meta: Record<string, unknown>;
|
|
28
28
|
}) => MaybePromise<unknown>;
|
|
29
29
|
}
|
|
30
|
+
type AnyTRPCMutationOptionsIn = TRPCMutationOptionsIn<unknown, unknown, unknown, unknown>;
|
|
31
|
+
type AnyTRPCMutationOptionsOut = TRPCMutationOptionsOut<unknown, unknown, unknown, unknown>;
|
|
32
|
+
/**
|
|
33
|
+
* @internal
|
|
34
|
+
*/
|
|
30
35
|
export declare function trpcMutationOptions(args: {
|
|
31
36
|
mutate: typeof TRPCUntypedClient.prototype.mutation;
|
|
32
37
|
queryClient: QueryClient | (() => QueryClient);
|
|
33
38
|
path: readonly string[];
|
|
34
|
-
opts:
|
|
39
|
+
opts: AnyTRPCMutationOptionsIn;
|
|
35
40
|
overrides: MutationOptionsOverride | undefined;
|
|
36
|
-
}):
|
|
41
|
+
}): AnyTRPCMutationOptionsOut;
|
|
37
42
|
export {};
|
|
38
43
|
//# sourceMappingURL=mutationOptions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mutationOptions.d.ts","sourceRoot":"","sources":["../../src/internals/mutationOptions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"mutationOptions.d.ts","sourceRoot":"","sources":["../../src/internals/mutationOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,WAAW,EACX,kBAAkB,EACnB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC3E,OAAO,KAAK,EACV,gBAAgB,EAChB,YAAY,EACb,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EACV,WAAW,EACX,eAAe,EACf,oBAAoB,EACpB,sBAAsB,EACvB,MAAM,SAAS,CAAC;AAQjB,KAAK,eAAe,GAAG,aAAa,GAAG,YAAY,CAAC;AAEpD,UAAU,qBAAqB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAC/D,SAAQ,gBAAgB,CACpB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EACrD,eAAe,CAChB,EACD,oBAAoB;CAAG;AAE3B,UAAU,sBAAsB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,CAChE,SAAQ,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,EAC3D,sBAAsB;IACxB,WAAW,EAAE,eAAe,CAAC;CAC9B;AAED,MAAM,WAAW,mBAAmB,CAAC,IAAI,SAAS,WAAW;IAC3D,CAAC,QAAQ,GAAG,OAAO,EACjB,IAAI,CAAC,EAAE,qBAAqB,CAC1B,IAAI,CAAC,OAAO,CAAC,EACb,mBAAmB,CAAC,IAAI,CAAC,EACzB,IAAI,CAAC,QAAQ,CAAC,EACd,QAAQ,CACT,GACA,sBAAsB,CACvB,IAAI,CAAC,OAAO,CAAC,EACb,mBAAmB,CAAC,IAAI,CAAC,EACzB,IAAI,CAAC,QAAQ,CAAC,EACd,QAAQ,CACT,CAAC;CACH;AAED;;GAEG;AACH,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,CAAC,IAAI,EAAE;QAChB;;WAEG;QACH,UAAU,EAAE,MAAM,YAAY,CAAC,OAAO,CAAC,CAAC;QACxC,WAAW,EAAE,WAAW,CAAC;QACzB;;WAEG;QACH,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;KAC/B,KAAK,YAAY,CAAC,OAAO,CAAC,CAAC;CAC7B;AAED,KAAK,wBAAwB,GAAG,qBAAqB,CACnD,OAAO,EACP,OAAO,EACP,OAAO,EACP,OAAO,CACR,CAAC;AAEF,KAAK,yBAAyB,GAAG,sBAAsB,CACrD,OAAO,EACP,OAAO,EACP,OAAO,EACP,OAAO,CACR,CAAC;AAEF;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE;IACxC,MAAM,EAAE,OAAO,iBAAiB,CAAC,SAAS,CAAC,QAAQ,CAAC;IACpD,WAAW,EAAE,WAAW,GAAG,CAAC,MAAM,WAAW,CAAC,CAAC;IAC/C,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACxB,IAAI,EAAE,wBAAwB,CAAC;IAC/B,SAAS,EAAE,uBAAuB,GAAG,SAAS,CAAC;CAChD,GAAG,yBAAyB,CAmC5B"}
|
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
var utils = require('./utils.js');
|
|
4
4
|
|
|
5
|
-
|
|
5
|
+
/**
|
|
6
|
+
* @internal
|
|
7
|
+
*/ function trpcMutationOptions(args) {
|
|
6
8
|
const { mutate, path, opts, overrides } = args;
|
|
7
9
|
const queryClient = utils.unwrapLazyArg(args.queryClient);
|
|
8
10
|
const mutationKey = utils.getMutationKeyInternal(path);
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { unwrapLazyArg, getMutationKeyInternal, createTRPCOptionsResult, getClientArgs } from './utils.mjs';
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
/**
|
|
4
|
+
* @internal
|
|
5
|
+
*/ function trpcMutationOptions(args) {
|
|
4
6
|
const { mutate, path, opts, overrides } = args;
|
|
5
7
|
const queryClient = unwrapLazyArg(args.queryClient);
|
|
6
8
|
const mutationKey = getMutationKeyInternal(path);
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import type { DataTag, DefinedInitialDataOptions, QueryClient, UndefinedInitialDataOptions, UnusedSkipTokenOptions } from '@tanstack/react-query';
|
|
2
|
-
import { type SkipToken } from '@tanstack/react-query';
|
|
1
|
+
import type { DataTag, DefinedInitialDataOptions, QueryClient, SkipToken, UndefinedInitialDataOptions, UnusedSkipTokenOptions } from '@tanstack/react-query';
|
|
3
2
|
import type { TRPCClientErrorLike, TRPCUntypedClient } from '@trpc/client';
|
|
4
3
|
import type { coerceAsyncIterableToArray, DistributiveOmit } from '@trpc/server/unstable-core-do-not-import';
|
|
5
4
|
import type { ResolverDef, TRPCQueryBaseOptions, TRPCQueryKey, TRPCQueryOptionsResult } from './types';
|
|
@@ -42,23 +41,18 @@ export interface TRPCQueryOptions<TDef extends ResolverDef> {
|
|
|
42
41
|
errorShape: TDef['errorShape'];
|
|
43
42
|
}>>;
|
|
44
43
|
}
|
|
44
|
+
type AnyTRPCQueryOptionsIn = DefinedTRPCQueryOptionsIn<unknown, unknown, unknown> | UnusedSkipTokenTRPCQueryOptionsIn<unknown, unknown, unknown> | UndefinedTRPCQueryOptionsIn<unknown, unknown, unknown>;
|
|
45
|
+
type AnyTRPCQueryOptionsOut = DefinedTRPCQueryOptionsOut<unknown, unknown, unknown> | UnusedSkipTokenTRPCQueryOptionsOut<unknown, unknown, unknown> | UndefinedTRPCQueryOptionsOut<unknown, unknown, unknown>;
|
|
46
|
+
/**
|
|
47
|
+
* @internal
|
|
48
|
+
*/
|
|
45
49
|
export declare function trpcQueryOptions(args: {
|
|
50
|
+
input: unknown;
|
|
46
51
|
query: typeof TRPCUntypedClient.prototype.query;
|
|
47
52
|
queryClient: QueryClient | (() => QueryClient);
|
|
48
53
|
path: readonly string[];
|
|
49
54
|
queryKey: TRPCQueryKey;
|
|
50
|
-
opts:
|
|
51
|
-
}):
|
|
52
|
-
initialData?: unknown;
|
|
53
|
-
} & {
|
|
54
|
-
queryKey: TRPCQueryKey & {
|
|
55
|
-
[dataTagSymbol]: unknown;
|
|
56
|
-
[dataTagErrorSymbol]: unknown;
|
|
57
|
-
};
|
|
58
|
-
} & {
|
|
59
|
-
trpc: {
|
|
60
|
-
path: string;
|
|
61
|
-
};
|
|
62
|
-
};
|
|
55
|
+
opts: AnyTRPCQueryOptionsIn;
|
|
56
|
+
}): AnyTRPCQueryOptionsOut;
|
|
63
57
|
export {};
|
|
64
58
|
//# sourceMappingURL=queryOptions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queryOptions.d.ts","sourceRoot":"","sources":["../../src/internals/queryOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,OAAO,EACP,yBAAyB,EACzB,WAAW,EAEX,2BAA2B,EAC3B,sBAAsB,EACvB,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"queryOptions.d.ts","sourceRoot":"","sources":["../../src/internals/queryOptions.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,12 @@ var reactQuery = require('@tanstack/react-query');
|
|
|
4
4
|
var unstableCoreDoNotImport = require('@trpc/server/unstable-core-do-not-import');
|
|
5
5
|
var utils = require('./utils.js');
|
|
6
6
|
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
/**
|
|
8
|
+
* @internal
|
|
9
|
+
*/ function trpcQueryOptions(args) {
|
|
10
|
+
const { input, query, path, queryKey, opts } = args;
|
|
9
11
|
const queryClient = utils.unwrapLazyArg(args.queryClient);
|
|
10
|
-
const inputIsSkipToken =
|
|
12
|
+
const inputIsSkipToken = input === reactQuery.skipToken;
|
|
11
13
|
const queryFn = async (queryFnContext)=>{
|
|
12
14
|
const actualOpts = {
|
|
13
15
|
...opts,
|
|
@@ -1,11 +1,13 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { queryOptions, skipToken } from '@tanstack/react-query';
|
|
2
2
|
import { isAsyncIterable } from '@trpc/server/unstable-core-do-not-import';
|
|
3
3
|
import { unwrapLazyArg, createTRPCOptionsResult, getClientArgs, buildQueryFromAsyncIterable } from './utils.mjs';
|
|
4
4
|
|
|
5
|
-
|
|
6
|
-
|
|
5
|
+
/**
|
|
6
|
+
* @internal
|
|
7
|
+
*/ function trpcQueryOptions(args) {
|
|
8
|
+
const { input, query, path, queryKey, opts } = args;
|
|
7
9
|
const queryClient = unwrapLazyArg(args.queryClient);
|
|
8
|
-
const inputIsSkipToken =
|
|
10
|
+
const inputIsSkipToken = input === skipToken;
|
|
9
11
|
const queryFn = async (queryFnContext)=>{
|
|
10
12
|
const actualOpts = {
|
|
11
13
|
...opts,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { SkipToken } from '@tanstack/react-query';
|
|
2
2
|
import type { TRPCClientErrorLike, TRPCUntypedClient } from '@trpc/client';
|
|
3
3
|
import type { TRPCConnectionState } from '@trpc/client/unstable-internals';
|
|
4
4
|
import type { Unsubscribable } from '@trpc/server/observable';
|
|
@@ -7,14 +7,15 @@ import type { ResolverDef, TRPCQueryKey, TRPCQueryOptionsResult } from './types'
|
|
|
7
7
|
interface BaseTRPCSubscriptionOptionsIn<TOutput, TError> {
|
|
8
8
|
enabled?: boolean;
|
|
9
9
|
onStarted?: () => void;
|
|
10
|
-
onData
|
|
10
|
+
onData?: (data: inferAsyncIterableYield<TOutput>) => void;
|
|
11
11
|
onError?: (err: TError) => void;
|
|
12
|
+
onConnectionStateChange?: (state: TRPCConnectionState<TError>) => void;
|
|
12
13
|
}
|
|
13
14
|
interface UnusedSkipTokenTRPCSubscriptionOptionsIn<TOutput, TError> {
|
|
14
15
|
onStarted?: () => void;
|
|
15
|
-
onData
|
|
16
|
+
onData?: (data: inferAsyncIterableYield<TOutput>) => void;
|
|
16
17
|
onError?: (err: TError) => void;
|
|
17
|
-
onConnectionStateChange
|
|
18
|
+
onConnectionStateChange?: (state: TRPCConnectionState<TError>) => void;
|
|
18
19
|
}
|
|
19
20
|
interface TRPCSubscriptionOptionsOut<TOutput, TError> extends UnusedSkipTokenTRPCSubscriptionOptionsIn<TOutput, TError>, TRPCQueryOptionsResult {
|
|
20
21
|
enabled: boolean;
|
|
@@ -47,7 +48,7 @@ export interface TRPCSubscriptionConnectingResult<TOutput, TError> extends TRPCS
|
|
|
47
48
|
}
|
|
48
49
|
export interface TRPCSubscriptionPendingResult<TOutput> extends TRPCSubscriptionBaseResult<TOutput, undefined> {
|
|
49
50
|
status: 'pending';
|
|
50
|
-
data: TOutput;
|
|
51
|
+
data: TOutput | undefined;
|
|
51
52
|
error: null;
|
|
52
53
|
}
|
|
53
54
|
export interface TRPCSubscriptionErrorResult<TOutput, TError> extends TRPCSubscriptionBaseResult<TOutput, TError> {
|
|
@@ -56,22 +57,17 @@ export interface TRPCSubscriptionErrorResult<TOutput, TError> extends TRPCSubscr
|
|
|
56
57
|
error: TError;
|
|
57
58
|
}
|
|
58
59
|
export type TRPCSubscriptionResult<TOutput, TError> = TRPCSubscriptionIdleResult<TOutput> | TRPCSubscriptionConnectingResult<TOutput, TError> | TRPCSubscriptionErrorResult<TOutput, TError> | TRPCSubscriptionPendingResult<TOutput>;
|
|
60
|
+
type AnyTRPCSubscriptionOptionsIn = BaseTRPCSubscriptionOptionsIn<unknown, unknown> | UnusedSkipTokenTRPCSubscriptionOptionsIn<unknown, unknown>;
|
|
61
|
+
type AnyTRPCSubscriptionOptionsOut = TRPCSubscriptionOptionsOut<unknown, unknown>;
|
|
62
|
+
/**
|
|
63
|
+
* @internal
|
|
64
|
+
*/
|
|
59
65
|
export declare const trpcSubscriptionOptions: (args: {
|
|
60
66
|
subscribe: typeof TRPCUntypedClient.prototype.subscription;
|
|
61
67
|
path: readonly string[];
|
|
62
68
|
queryKey: TRPCQueryKey;
|
|
63
|
-
opts:
|
|
64
|
-
}) =>
|
|
65
|
-
enabled: boolean;
|
|
66
|
-
subscribe: (innerOpts: UnusedSkipTokenTRPCSubscriptionOptionsIn<any, TRPCClientErrorLike<any>>) => Unsubscribable;
|
|
67
|
-
queryKey: TRPCQueryKey;
|
|
68
|
-
trpc: {
|
|
69
|
-
path: string;
|
|
70
|
-
};
|
|
71
|
-
onStarted?: () => void;
|
|
72
|
-
onData?: ((data: unknown) => void) | undefined;
|
|
73
|
-
onError?: ((err: unknown) => void) | undefined;
|
|
74
|
-
};
|
|
69
|
+
opts: AnyTRPCSubscriptionOptionsIn;
|
|
70
|
+
}) => AnyTRPCSubscriptionOptionsOut;
|
|
75
71
|
export declare function useSubscription<TOutput, TError>(opts: TRPCSubscriptionOptionsOut<TOutput, TError>): TRPCSubscriptionResult<TOutput, TError>;
|
|
76
72
|
export {};
|
|
77
73
|
//# sourceMappingURL=subscriptionOptions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscriptionOptions.d.ts","sourceRoot":"","sources":["../../src/internals/subscriptionOptions.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"subscriptionOptions.d.ts","sourceRoot":"","sources":["../../src/internals/subscriptionOptions.ts"],"names":[],"mappings":"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"}
|