@tanstack/react-query 5.0.0-alpha.1 → 5.0.0-alpha.3

package/build/umd/index.development.js

@@ -908,6 +908,7 @@
         if (!isCancelledError(error)) {
           // Notify cache callback
           this.#cache.config.onError?.(error, this);
+          this.#cache.config.onSettled?.(this.state.data, error, this);
         }
         if (!this.isFetchingOptimistic) {
           // Schedule query gc after fetching
@@ -932,6 +933,7 @@
 
           // Notify cache callback
           this.#cache.config.onSuccess?.(data, this);
+          this.#cache.config.onSettled?.(data, this.state.error, this);
           if (!this.isFetchingOptimistic) {
             // Schedule query gc after fetching
             this.scheduleGc();
@@ -1171,18 +1173,26 @@
 
   class Mutation extends Removable {
     #observers;
+    #defaultOptions;
     #mutationCache;
     #retryer;
     constructor(config) {
       super();
-      this.options = config.options;
       this.mutationId = config.mutationId;
+      this.#defaultOptions = config.defaultOptions;
       this.#mutationCache = config.mutationCache;
       this.#observers = [];
       this.state = config.state || getDefaultState();
-      this.updateGcTime(this.options.gcTime);
+      this.setOptions(config.options);
       this.scheduleGc();
     }
+    setOptions(options) {
+      this.options = {
+        ...this.#defaultOptions,
+        ...options
+      };
+      this.updateGcTime(this.options.gcTime);
+    }
     get meta() {
       return this.options.meta;
     }
@@ -1277,6 +1287,9 @@
         // Notify cache callback
         await this.#mutationCache.config.onSuccess?.(data, variables, this.state.context, this);
         await this.options.onSuccess?.(data, variables, this.state.context);
+
+        // Notify cache callback
+        await this.#mutationCache.config.onSettled?.(data, null, this.state.variables, this.state.context, this);
         await this.options.onSettled?.(data, null, variables, this.state.context);
         this.#dispatch({
           type: 'success',
@@ -1288,6 +1301,9 @@
           // Notify cache callback
           await this.#mutationCache.config.onError?.(error, variables, this.state.context, this);
           await this.options.onError?.(error, variables, this.state.context);
+
+          // Notify cache callback
+          await this.#mutationCache.config.onSettled?.(undefined, error, this.state.variables, this.state.context, this);
           await this.options.onSettled?.(undefined, error, variables, this.state.context);
           throw error;
         } finally {
@@ -2285,14 +2301,12 @@
     #result;
     #queries;
     #observers;
-    #observersMap;
     constructor(client, queries) {
       super();
       this.#client = client;
       this.#queries = [];
       this.#result = [];
       this.#observers = [];
-      this.#observersMap = {};
       if (queries) {
         this.setQueries(queries);
       }
@@ -2326,14 +2340,12 @@
         // set options for the new observers to notify of changes
         newObserverMatches.forEach(match => match.observer.setOptions(match.defaultedQueryOptions, notifyOptions));
         const newObservers = newObserverMatches.map(match => match.observer);
-        const newObserversMap = Object.fromEntries(newObservers.map(observer => [observer.options.queryHash, observer]));
         const newResult = newObservers.map(observer => observer.getCurrentResult());
         const hasIndexChange = newObservers.some((observer, index) => observer !== prevObservers[index]);
         if (prevObservers.length === newObservers.length && !hasIndexChange) {
           return;
         }
         this.#observers = newObservers;
-        this.#observersMap = newObserversMap;
         this.#result = newResult;
         if (!this.hasListeners()) {
           return;
@@ -2378,7 +2390,7 @@
       const unmatchedQueries = defaultedQueryOptions.filter(defaultedOptions => !matchedQueryHashes.includes(defaultedOptions.queryHash));
       const getObserver = options => {
         const defaultedOptions = this.#client.defaultQueryOptions(options);
-        const currentObserver = this.#observersMap[defaultedOptions.queryHash];
+        const currentObserver = this.#observers.find(o => o.options.queryHash === defaultedOptions.queryHash);
         return currentObserver ?? new QueryObserver(this.#client, defaultedOptions);
       };
       const newOrReusedObservers = unmatchedQueries.map(options => {
@@ -2508,6 +2520,7 @@
           observer: this
         });
       }
+      this.#currentMutation?.setOptions(this.options);
     }
     onUnsubscribe() {
       if (!this.listeners.length) {
@@ -3008,6 +3021,7 @@
   exports.isCancelledError = isCancelledError;
   exports.isServer = isServer;
   exports.keepPreviousData = keepPreviousData;
+  exports.matchQuery = matchQuery;
   exports.notifyManager = notifyManager;
   exports.onlineManager = onlineManager;
   exports.replaceEqualDeep = replaceEqualDeep;