@tanstack/query-core 5.90.14 → 5.90.15

package/src/mutation.ts

@@ -278,14 +278,22 @@ export class Mutation<
           this as Mutation<unknown, unknown, unknown, unknown>,
           mutationFnContext,
         )
+      } catch (e) {
+        void Promise.reject(e)
+      }
 
+      try {
         await this.options.onError?.(
           error as TError,
           variables,
           this.state.context,
           mutationFnContext,
         )
+      } catch (e) {
+        void Promise.reject(e)
+      }
 
+      try {
         // Notify cache callback
         await this.#mutationCache.config.onSettled?.(
           undefined,
@@ -295,7 +303,11 @@ export class Mutation<
           this as Mutation<unknown, unknown, unknown, unknown>,
           mutationFnContext,
         )
+      } catch (e) {
+        void Promise.reject(e)
+      }
 
+      try {
         await this.options.onSettled?.(
           undefined,
           error as TError,
@@ -303,10 +315,12 @@ export class Mutation<
           this.state.context,
           mutationFnContext,
         )
-        throw error
-      } finally {
-        this.#dispatch({ type: 'error', error: error as TError })
+      } catch (e) {
+        void Promise.reject(e)
       }
+
+      this.#dispatch({ type: 'error', error: error as TError })
+      throw error
     } finally {
       this.#mutationCache.runNext(this)
     }

package/src/mutationObserver.ts

@@ -172,33 +172,49 @@ export class MutationObserver<
         } satisfies MutationFunctionContext
 
         if (action?.type === 'success') {
-          this.#mutateOptions.onSuccess?.(
-            action.data,
-            variables,
-            onMutateResult,
-            context,
-          )
-          this.#mutateOptions.onSettled?.(
-            action.data,
-            null,
-            variables,
-            onMutateResult,
-            context,
-          )
+          try {
+            this.#mutateOptions.onSuccess?.(
+              action.data,
+              variables,
+              onMutateResult,
+              context,
+            )
+          } catch (e) {
+            void Promise.reject(e)
+          }
+          try {
+            this.#mutateOptions.onSettled?.(
+              action.data,
+              null,
+              variables,
+              onMutateResult,
+              context,
+            )
+          } catch (e) {
+            void Promise.reject(e)
+          }
         } else if (action?.type === 'error') {
-          this.#mutateOptions.onError?.(
-            action.error,
-            variables,
-            onMutateResult,
-            context,
-          )
-          this.#mutateOptions.onSettled?.(
-            undefined,
-            action.error,
-            variables,
-            onMutateResult,
-            context,
-          )
+          try {
+            this.#mutateOptions.onError?.(
+              action.error,
+              variables,
+              onMutateResult,
+              context,
+            )
+          } catch (e) {
+            void Promise.reject(e)
+          }
+          try {
+            this.#mutateOptions.onSettled?.(
+              undefined,
+              action.error,
+              variables,
+              onMutateResult,
+              context,
+            )
+          } catch (e) {
+            void Promise.reject(e)
+          }
         }
       }
 

package/src/query.ts

@@ -658,6 +658,9 @@ export class Query<
             fetchFailureReason: error,
             fetchStatus: 'idle',
             status: 'error',
+            // flag existing data as invalidated if we get a background error
+            // note that "no data" always means stale so we can set unconditionally here
+            isInvalidated: true,
           }
         case 'invalidate':
           return {