@tanstack/query-core 4.24.3 → 4.24.6

package/package.json

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

package/src/mutation.ts

@@ -159,12 +159,8 @@ export class Mutation<
     }
   }
 
-  continue(): Promise<TData> {
-    if (this.retryer) {
-      this.retryer.continue()
-      return this.retryer.promise
-    }
-    return this.execute()
+  continue(): Promise<unknown> {
+    return this.retryer?.continue() ?? this.execute()
   }
 
   async execute(): Promise<TData> {

package/src/mutationCache.ts

@@ -79,7 +79,7 @@ export class MutationCache extends Subscribable<MutationCacheListener> {
 
   private mutations: Mutation<any, any, any, any>[]
   private mutationId: number
-  private resuming: Promise<void> | undefined
+  private resuming: Promise<unknown> | undefined
 
   constructor(config?: MutationCacheConfig) {
     super()
@@ -153,21 +153,21 @@ export class MutationCache extends Subscribable<MutationCacheListener> {
     })
   }
 
-  resumePausedMutations(): Promise<void> {
-    if (!this.resuming) {
-      const pausedMutations = this.mutations.filter((x) => x.state.isPaused)
-      this.resuming = notifyManager
-        .batch(() =>
+  resumePausedMutations(): Promise<unknown> {
+    this.resuming = (this.resuming ?? Promise.resolve())
+      .then(() => {
+        const pausedMutations = this.mutations.filter((x) => x.state.isPaused)
+        return notifyManager.batch(() =>
           pausedMutations.reduce(
             (promise, mutation) =>
               promise.then(() => mutation.continue().catch(noop)),
-            Promise.resolve(),
+            Promise.resolve() as Promise<unknown>,
           ),
         )
-        .then(() => {
-          this.resuming = undefined
-        })
-    }
+      })
+      .then(() => {
+        this.resuming = undefined
+      })
 
     return this.resuming
   }

package/src/queryCache.ts

@@ -149,10 +149,10 @@ export class QueryCache extends Subscribable<QueryCacheListener> {
     TQueryFnData = unknown,
     TError = unknown,
     TData = TQueryFnData,
-    TQueyKey extends QueryKey = QueryKey,
+    TQueryKey extends QueryKey = QueryKey,
   >(
     queryHash: string,
-  ): Query<TQueryFnData, TError, TData, TQueyKey> | undefined {
+  ): Query<TQueryFnData, TError, TData, TQueryKey> | undefined {
     return this.queriesMap[queryHash]
   }
 

package/src/queryClient.ts

@@ -594,7 +594,7 @@ export class QueryClient {
       .catch(noop)
   }
 
-  resumePausedMutations(): Promise<void> {
+  resumePausedMutations(): Promise<unknown> {
     return this.mutationCache.resumePausedMutations()
   }
 

package/src/retryer.ts

@@ -21,7 +21,7 @@ interface RetryerConfig<TData = unknown, TError = unknown> {
 export interface Retryer<TData = unknown> {
   promise: Promise<TData>
   cancel: (cancelOptions?: CancelOptions) => void
-  continue: () => void
+  continue: () => Promise<unknown>
   cancelRetry: () => void
   continueRetry: () => void
 }
@@ -69,7 +69,7 @@ export function createRetryer<TData = unknown, TError = unknown>(
   let isRetryCancelled = false
   let failureCount = 0
   let isResolved = false
-  let continueFn: ((value?: unknown) => void) | undefined
+  let continueFn: ((value?: unknown) => boolean) | undefined
   let promiseResolve: (data: TData) => void
   let promiseReject: (error: TError) => void
 
@@ -118,9 +118,11 @@ export function createRetryer<TData = unknown, TError = unknown>(
   const pause = () => {
     return new Promise((continueResolve) => {
       continueFn = (value) => {
-        if (isResolved || !shouldPause()) {
-          return continueResolve(value)
+        const canContinue = isResolved || !shouldPause()
+        if (canContinue) {
+          continueResolve(value)
         }
+        return canContinue
       }
       config.onPause?.()
     }).then(() => {
@@ -208,7 +210,8 @@ export function createRetryer<TData = unknown, TError = unknown>(
     promise,
     cancel,
     continue: () => {
-      continueFn?.()
+      const didContinue = continueFn?.()
+      return didContinue ? promise : Promise.resolve()
     },
     cancelRetry,
     continueRetry,

package/src/tests/queryClient.test.tsx

@@ -1541,8 +1541,6 @@ describe('queryClient', () => {
         expect(observer2.getCurrentResult().status).toBe('success')
       })
 
-      console.log('orders', orders)
-
       expect(orders).toEqual(['1start', '1end', '2start', '2end'])
     })