@tanstack/query-core 5.61.5 → 5.62.1

package/src/queryClient.ts

@@ -39,6 +39,7 @@ import type {
   RefetchQueryFilters,
   ResetOptions,
   SetDataOptions,
+  UnsetMarker,
 } from './types'
 import type { QueryState } from './query'
 import type { MutationFilters, QueryFilters, Updater } from './utils'
@@ -119,7 +120,8 @@ export class QueryClient {
     TTaggedQueryKey extends QueryKey = QueryKey,
     TInferredQueryFnData = TTaggedQueryKey extends DataTag<
       unknown,
-      infer TaggedValue
+      infer TaggedValue,
+      unknown
     >
       ? TaggedValue
       : TQueryFnData,
@@ -169,7 +171,8 @@ export class QueryClient {
     TTaggedQueryKey extends QueryKey = QueryKey,
     TInferredQueryFnData = TTaggedQueryKey extends DataTag<
       unknown,
-      infer TaggedValue
+      infer TaggedValue,
+      unknown
     >
       ? TaggedValue
       : TQueryFnData,
@@ -225,16 +228,27 @@ export class QueryClient {
     TTaggedQueryKey extends QueryKey = QueryKey,
     TInferredQueryFnData = TTaggedQueryKey extends DataTag<
       unknown,
-      infer TaggedValue
+      infer TaggedValue,
+      unknown
     >
       ? TaggedValue
       : TQueryFnData,
+    TInferredError = TTaggedQueryKey extends DataTag<
+      unknown,
+      unknown,
+      infer TaggedError
+    >
+      ? TaggedError extends UnsetMarker
+        ? TError
+        : TaggedError
+      : TError,
   >(
     queryKey: TTaggedQueryKey,
-  ): QueryState<TInferredQueryFnData, TError> | undefined {
+  ): QueryState<TInferredQueryFnData, TInferredError> | undefined {
     const options = this.defaultQueryOptions({ queryKey })
-    return this.#queryCache.get<TInferredQueryFnData, TError>(options.queryHash)
-      ?.state
+    return this.#queryCache.get<TInferredQueryFnData, TInferredError>(
+      options.queryHash,
+    )?.state
   }
 
   removeQueries(filters?: QueryFilters): void {

package/src/types.ts

@@ -43,8 +43,12 @@ export type DefaultError = Register extends {
 export type QueryKey = ReadonlyArray<unknown>
 
 export declare const dataTagSymbol: unique symbol
-export type DataTag<TType, TValue> = TType & {
+export declare const dataTagErrorSymbol: unique symbol
+export declare const unsetMarker: unique symbol
+export type UnsetMarker = typeof unsetMarker
+export type DataTag<TType, TValue, TError = UnsetMarker> = TType & {
   [dataTagSymbol]: TValue
+  [dataTagErrorSymbol]: TError
 }
 
 export type QueryFunction<
@@ -536,7 +540,7 @@ export interface RefetchOptions extends ResultOptions {
 
 export interface InvalidateQueryFilters<
   TQueryFnData = unknown,
-  TError = Error,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 > extends QueryFilters<TQueryFnData, TError, TData, TQueryKey> {
@@ -545,7 +549,7 @@ export interface InvalidateQueryFilters<
 
 export interface RefetchQueryFilters<
   TQueryFnData = unknown,
-  TError = Error,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 > extends QueryFilters<TQueryFnData, TError, TData, TQueryKey> {}

package/src/utils.ts

@@ -17,7 +17,7 @@ import type { FetchOptions, Query } from './query'
 
 export interface QueryFilters<
   TQueryFnData = unknown,
-  TError = Error,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 > {
@@ -38,7 +38,7 @@ export interface QueryFilters<
    */
   queryKey?: unknown extends TQueryFnData
     ? QueryKey
-    : QueryKey & DataTag<unknown, TQueryFnData>
+    : QueryKey & DataTag<unknown, TQueryFnData, TError>
   /**
    * Include or exclude stale queries
    */