@@ -3,11 +3,13 @@ import {
33 injectQuery ,
44 injectMutation ,
55 injectInfiniteQuery ,
6- injectQueryClient ,
6+ QueryClient ,
77 type CreateQueryOptions ,
88 type CreateMutationOptions ,
99 type CreateInfiniteQueryOptions ,
1010 type InfiniteData ,
11+ CreateInfiniteQueryResult ,
12+ QueryKey ,
1113} from '@tanstack/angular-query-v5' ;
1214import type { ModelMeta } from '@zenstackhq/runtime/cross' ;
1315import { inject , InjectionToken } from '@angular/core' ;
@@ -43,14 +45,14 @@ export function provideAngularQueryContext(context: APIContext) {
4345 * Hooks context.
4446 */
4547export function getHooksContext ( ) {
46- const context = inject ( AngularQueryContextKey , {
47- optional : true
48+ const context = inject ( AngularQueryContextKey , {
49+ optional : true ,
4850 } ) || {
4951 endpoint : DEFAULT_QUERY_ENDPOINT ,
5052 fetch : undefined ,
5153 logging : false ,
5254 } ;
53-
55+
5456 const { endpoint, ...rest } = context ;
5557 return { endpoint : endpoint ?? DEFAULT_QUERY_ENDPOINT , ...rest } ;
5658}
@@ -71,7 +73,7 @@ export function useModelQuery<TQueryFnData, TData, TError>(
7173 args ?: unknown ,
7274 options ?: Omit < CreateQueryOptions < TQueryFnData , TError , TData > , 'queryKey' > & ExtraQueryOptions ,
7375 fetch ?: FetchFn
74- ) : any {
76+ ) {
7577 const reqUrl = makeUrl ( url , args ) ;
7678 const queryKey = getQueryKey ( model , url , args , {
7779 infinite : false ,
@@ -101,9 +103,12 @@ export function useInfiniteModelQuery<TQueryFnData, TData, TError>(
101103 model : string ,
102104 url : string ,
103105 args : unknown ,
104- options : Omit < CreateInfiniteQueryOptions < TQueryFnData , TError , InfiniteData < TData > > , 'queryKey' | 'initialPageParam' > ,
106+ options : Omit <
107+ CreateInfiniteQueryOptions < TQueryFnData , TError , InfiniteData < TData > > ,
108+ 'queryKey' | 'initialPageParam'
109+ > ,
105110 fetch ?: FetchFn
106- ) : any {
111+ ) : CreateInfiniteQueryResult < InfiniteData < TData > , TError > & { queryKey : QueryKey } {
107112 const queryKey = getQueryKey ( model , url , args , { infinite : true , optimisticUpdate : false } ) ;
108113 return {
109114 queryKey,
@@ -144,9 +149,9 @@ export function useModelMutation<
144149 options ?: Omit < CreateMutationOptions < Result , TError , TArgs > , 'mutationFn' > & ExtraMutationOptions ,
145150 fetch ?: FetchFn ,
146151 checkReadBack ?: C
147- ) : any {
148- const queryClient = injectQueryClient ( ) ;
149- const mutationFn = ( data : any ) => {
152+ ) {
153+ const queryClient = inject ( QueryClient ) ;
154+ const mutationFn = ( data : unknown ) => {
150155 const reqUrl = method === 'DELETE' ? makeUrl ( url , data ) : url ;
151156 const fetchInit : RequestInit = {
152157 method,
@@ -199,4 +204,4 @@ export function useModelMutation<
199204 }
200205
201206 return injectMutation ( ( ) => finalOptions ) ;
202- }
207+ }
0 commit comments