Add types for QueryFilters which flow down to Query<> and QueryKey/DataTag types

packages/query-core/src/types.ts

@@ -534,11 +534,17 @@ export interface RefetchOptions extends ResultOptions {
   cancelRefetch?: boolean
 }
 
-export interface InvalidateQueryFilters extends QueryFilters {
+export interface InvalidateQueryFilters<TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends QueryFilters<TQueryFnData,
+    TError,
+    TData,
+    TQueryKey> {
   refetchType?: QueryTypeFilter | 'none'
 }
 
-export interface RefetchQueryFilters extends QueryFilters {}
+export interface RefetchQueryFilters<TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> extends QueryFilters<TQueryFnData,
+    TError,
+    TData,
+    TQueryKey> {}
 
 export interface InvalidateOptions extends RefetchOptions {}
 export interface ResetOptions extends RefetchOptions {}

packages/query-core/src/utils.ts

@@ -1,4 +1,5 @@
 import type {
+  DataTag,
   DefaultError,
   Enabled,
   FetchStatus,
@@ -14,7 +15,7 @@ import type { FetchOptions, Query } from './query'
 
 // TYPES
 
-export interface QueryFilters {
+export interface QueryFilters<TQueryFnData = unknown, TError = Error, TData = TQueryFnData, TQueryKey extends QueryKey = QueryKey> {
   /**
    * Filter to active queries, inactive queries or all queries
    */
@@ -26,11 +27,14 @@ export interface QueryFilters {
   /**
    * Include queries matching this predicate function
    */
-  predicate?: (query: Query) => boolean
+  predicate?: (query: Query<TQueryFnData,
+    TError,
+    TData,
+    TQueryKey>) => boolean
   /**
    * Include queries matching this query key
    */
-  queryKey?: QueryKey
+  queryKey?: unknown extends TQueryFnData ? QueryKey : (QueryKey & DataTag<unknown, TQueryFnData>)
   /**
    * Include or exclude stale queries
    */