Skip to content

Commit d1ff7d4

Browse files
committed
fix: placeholderData causing wrong type inference, now pass all & correct generics
1 parent 8fd211b commit d1ff7d4

File tree

1 file changed

+17
-14
lines changed

1 file changed

+17
-14
lines changed

src/types.ts

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,23 @@ export type DecorateProcedure<
5353
> = TProcedure extends AnyQueryProcedure
5454
? {
5555
useQuery: <
56-
ResT = inferTransformedProcedureOutput<TProcedure>,
57-
DataE = TRPCClientErrorLike<TProcedure>,
58-
DataT = ResT,
59-
KeyT extends QueryKey = QueryKey,
56+
TQueryFnData,
57+
TError = TRPCClientErrorLike<TProcedure>,
58+
TData = inferTransformedProcedureOutput<TProcedure>,
59+
TQueryData = TQueryFnData,
60+
TQueryKey extends QueryKey = QueryKey,
6061
>(
6162
input: MaybeRefOrGetter<inferProcedureInput<TProcedure>>,
6263
opts?: MaybeRefOrGetter<
63-
Omit<UnwrapRef<UseQueryOptions<ResT, DataT>>, 'queryKey'> & {
64+
Omit<
65+
UnwrapRef<UseQueryOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>>,
66+
'queryKey'
67+
> & {
6468
trpc?: TRPCRequestOptions
65-
queryKey?: KeyT
69+
queryKey?: TQueryKey
6670
}
6771
>,
68-
) => UseQueryReturnType<DataT, DataE>
72+
) => UseQueryReturnType<TData, TError>
6973
query: Resolver<TProcedure>
7074
invalidate: (input?: MaybeRefOrGetter<inferProcedureInput<TProcedure>>) => Promise<void>
7175
setQueryData: (
@@ -78,18 +82,17 @@ export type DecorateProcedure<
7882
? {
7983
mutate: Resolver<TProcedure>
8084
useMutation: <
81-
ResT = inferTransformedProcedureOutput<TProcedure>,
82-
DataE = TRPCClientErrorLike<TProcedure>,
83-
DataT = ResT,
84-
VariablesT = inferProcedureInput<TProcedure>,
85-
ContextT = unknown,
85+
TData = inferTransformedProcedureOutput<TProcedure>,
86+
TError = TRPCClientErrorLike<TProcedure>,
87+
TVariables = inferProcedureInput<TProcedure>,
88+
TContext = unknown,
8689
>(
8790
opts?: MaybeRefOrGetter<
88-
UseMutationOptions<DataT, DataE, VariablesT, ContextT> & {
91+
UseMutationOptions<TData, TError, TVariables, TContext> & {
8992
trpc?: TRPCRequestOptions
9093
}
9194
>,
92-
) => UseMutationReturnType<DataT, DataE, VariablesT, ContextT>
95+
) => UseMutationReturnType<TData, TError, TVariables, TContext>
9396
}
9497
: TProcedure extends AnySubscriptionProcedure
9598
? { subscribe: SubscriptionResolver<TProcedure, TRouter> }

0 commit comments

Comments
 (0)