@tanstack/react-query 4.25.0 → 4.26.1

package/build/umd/index.development.js

@@ -1105,10 +1105,11 @@
         }
 
         if (!isCancelledError(error)) {
-          var _this$cache$config$on, _this$cache$config;
+          var _this$cache$config$on, _this$cache$config, _this$cache$config$on2, _this$cache$config2;
 
           // Notify cache callback
           (_this$cache$config$on = (_this$cache$config = this.cache.config).onError) == null ? void 0 : _this$cache$config$on.call(_this$cache$config, error, this);
+          (_this$cache$config$on2 = (_this$cache$config2 = this.cache.config).onSettled) == null ? void 0 : _this$cache$config$on2.call(_this$cache$config2, this.state.data, error, this);
 
           {
             this.logger.error(error);
@@ -1128,7 +1129,7 @@
         fn: context.fetchFn,
         abort: abortController == null ? void 0 : abortController.abort.bind(abortController),
         onSuccess: data => {
-          var _this$cache$config$on2, _this$cache$config2;
+          var _this$cache$config$on3, _this$cache$config3, _this$cache$config$on4, _this$cache$config4;
 
           if (typeof data === 'undefined') {
             {
@@ -1141,7 +1142,8 @@
 
           this.setData(data); // Notify cache callback
 
-          (_this$cache$config$on2 = (_this$cache$config2 = this.cache.config).onSuccess) == null ? void 0 : _this$cache$config$on2.call(_this$cache$config2, data, this);
+          (_this$cache$config$on3 = (_this$cache$config3 = this.cache.config).onSuccess) == null ? void 0 : _this$cache$config$on3.call(_this$cache$config3, data, this);
+          (_this$cache$config$on4 = (_this$cache$config4 = this.cache.config).onSettled) == null ? void 0 : _this$cache$config$on4.call(_this$cache$config4, data, this.state.error, this);
 
           if (!this.isFetchingOptimistic) {
             // Schedule query gc after fetching
@@ -1411,18 +1413,23 @@
   class Mutation extends Removable {
     constructor(config) {
       super();
-      this.options = { ...config.defaultOptions,
-        ...config.options
-      };
+      this.defaultOptions = config.defaultOptions;
       this.mutationId = config.mutationId;
       this.mutationCache = config.mutationCache;
       this.logger = config.logger || defaultLogger;
       this.observers = [];
       this.state = config.state || getDefaultState();
-      this.updateCacheTime(this.options.cacheTime);
+      this.setOptions(config.options);
       this.scheduleGc();
     }
 
+    setOptions(options) {
+      this.options = { ...this.defaultOptions,
+        ...options
+      };
+      this.updateCacheTime(this.options.cacheTime);
+    }
+
     get meta() {
       return this.options.meta;
     }
@@ -1512,7 +1519,7 @@
       const restored = this.state.status === 'loading';
 
       try {
-        var _this$mutationCache$c3, _this$mutationCache$c4, _this$options$onSucce, _this$options2, _this$options$onSettl, _this$options3;
+        var _this$mutationCache$c3, _this$mutationCache$c4, _this$options$onSucce, _this$options2, _this$mutationCache$c5, _this$mutationCache$c6, _this$options$onSettl, _this$options3;
 
         if (!restored) {
           var _this$mutationCache$c, _this$mutationCache$c2, _this$options$onMutat, _this$options;
@@ -1537,7 +1544,9 @@
         const data = await executeMutation(); // Notify cache callback
 
         await ((_this$mutationCache$c3 = (_this$mutationCache$c4 = this.mutationCache.config).onSuccess) == null ? void 0 : _this$mutationCache$c3.call(_this$mutationCache$c4, data, this.state.variables, this.state.context, this));
-        await ((_this$options$onSucce = (_this$options2 = this.options).onSuccess) == null ? void 0 : _this$options$onSucce.call(_this$options2, data, this.state.variables, this.state.context));
+        await ((_this$options$onSucce = (_this$options2 = this.options).onSuccess) == null ? void 0 : _this$options$onSucce.call(_this$options2, data, this.state.variables, this.state.context)); // Notify cache callback
+
+        await ((_this$mutationCache$c5 = (_this$mutationCache$c6 = this.mutationCache.config).onSettled) == null ? void 0 : _this$mutationCache$c5.call(_this$mutationCache$c6, data, null, this.state.variables, this.state.context, this));
         await ((_this$options$onSettl = (_this$options3 = this.options).onSettled) == null ? void 0 : _this$options$onSettl.call(_this$options3, data, null, this.state.variables, this.state.context));
         this.dispatch({
           type: 'success',
@@ -1546,16 +1555,18 @@
         return data;
       } catch (error) {
         try {
-          var _this$mutationCache$c5, _this$mutationCache$c6, _this$options$onError, _this$options4, _this$options$onSettl2, _this$options5;
+          var _this$mutationCache$c7, _this$mutationCache$c8, _this$options$onError, _this$options4, _this$mutationCache$c9, _this$mutationCache$c10, _this$options$onSettl2, _this$options5;
 
           // Notify cache callback
-          await ((_this$mutationCache$c5 = (_this$mutationCache$c6 = this.mutationCache.config).onError) == null ? void 0 : _this$mutationCache$c5.call(_this$mutationCache$c6, error, this.state.variables, this.state.context, this));
+          await ((_this$mutationCache$c7 = (_this$mutationCache$c8 = this.mutationCache.config).onError) == null ? void 0 : _this$mutationCache$c7.call(_this$mutationCache$c8, error, this.state.variables, this.state.context, this));
 
           if ("development" !== 'production') {
             this.logger.error(error);
           }
 
-          await ((_this$options$onError = (_this$options4 = this.options).onError) == null ? void 0 : _this$options$onError.call(_this$options4, error, this.state.variables, this.state.context));
+          await ((_this$options$onError = (_this$options4 = this.options).onError) == null ? void 0 : _this$options$onError.call(_this$options4, error, this.state.variables, this.state.context)); // Notify cache callback
+
+          await ((_this$mutationCache$c9 = (_this$mutationCache$c10 = this.mutationCache.config).onSettled) == null ? void 0 : _this$mutationCache$c9.call(_this$mutationCache$c10, undefined, error, this.state.variables, this.state.context, this));
           await ((_this$options$onSettl2 = (_this$options5 = this.options).onSettled) == null ? void 0 : _this$options$onSettl2.call(_this$options5, undefined, error, this.state.variables, this.state.context));
           throw error;
         } finally {
@@ -2992,6 +3003,8 @@
     }
 
     setOptions(options) {
+      var _this$currentMutation;
+
       const prevOptions = this.options;
       this.options = this.client.defaultMutationOptions(options);
 
@@ -3002,13 +3015,15 @@
           observer: this
         });
       }
+
+      (_this$currentMutation = this.currentMutation) == null ? void 0 : _this$currentMutation.setOptions(this.options);
     }
 
     onUnsubscribe() {
       if (!this.listeners.length) {
-        var _this$currentMutation;
+        var _this$currentMutation2;
 
-        (_this$currentMutation = this.currentMutation) == null ? void 0 : _this$currentMutation.removeObserver(this);
+        (_this$currentMutation2 = this.currentMutation) == null ? void 0 : _this$currentMutation2.removeObserver(this);
       }
     }