@tanstack/query-core 5.91.0 → 5.94.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/query-core",
-  "version": "5.91.0",
+  "version": "5.94.4",
   "description": "The framework agnostic core that powers TanStack Query",
   "author": "tannerlinsley",
   "license": "MIT",

package/src/query.ts

@@ -260,9 +260,13 @@ export class Query<
     this.cancel({ silent: true })
   }
 
+  get resetState(): QueryState<TData, TError> {
+    return this.#initialState
+  }
+
   reset(): void {
     this.destroy()
-    this.setState(this.#initialState)
+    this.setState(this.resetState)
   }
 
   isActive(): boolean {
@@ -276,10 +280,11 @@ export class Query<
       return !this.isActive()
     }
     // if a query has no observers, it should still be considered disabled if it never attempted a fetch
-    return (
-      this.options.queryFn === skipToken ||
-      this.state.dataUpdateCount + this.state.errorUpdateCount === 0
-    )
+    return this.options.queryFn === skipToken || !this.isFetched()
+  }
+
+  isFetched() {
+    return this.state.dataUpdateCount + this.state.errorUpdateCount > 0
   }
 
   isStatic(): boolean {
@@ -359,7 +364,7 @@ export class Query<
         // If the transport layer does not support cancellation
         // we'll let the query continue so the result can be cached
         if (this.#retryer) {
-          if (this.#abortSignalConsumed) {
+          if (this.#abortSignalConsumed || this.#isInitialPausedFetch()) {
             this.#retryer.cancel({ revert: true })
           } else {
             this.#retryer.cancelRetry()
@@ -377,6 +382,12 @@ export class Query<
     return this.observers.length
   }
 
+  #isInitialPausedFetch(): boolean {
+    return (
+      this.state.fetchStatus === 'paused' && this.state.status === 'pending'
+    )
+  }
+
   invalidate(): void {
     if (!this.state.isInvalidated) {
       this.#dispatch({ type: 'invalidate' })

package/src/queryObserver.ts

@@ -576,7 +576,7 @@ export class QueryObserver<
       failureCount: newState.fetchFailureCount,
       failureReason: newState.fetchFailureReason,
       errorUpdateCount: newState.errorUpdateCount,
-      isFetched: newState.dataUpdateCount > 0 || newState.errorUpdateCount > 0,
+      isFetched: query.isFetched(),
       isFetchedAfterMount:
         newState.dataUpdateCount > queryInitialState.dataUpdateCount ||
         newState.errorUpdateCount > queryInitialState.errorUpdateCount,

package/src/streamedQuery.ts

@@ -66,12 +66,10 @@ export function streamedQuery<
     const query = context.client
       .getQueryCache()
       .find({ queryKey: context.queryKey, exact: true })
-    const isRefetch = !!query && query.state.data !== undefined
+    const isRefetch = !!query && query.isFetched()
     if (isRefetch && refetchMode === 'reset') {
       query.setState({
-        status: 'pending',
-        data: undefined,
-        error: null,
+        ...query.resetState,
         fetchStatus: 'fetching',
       })
     }