@tanstack/query-core 5.0.0-alpha.31 → 5.0.0-alpha.33

package/build/umd/index.development.js

@@ -6,19 +6,19 @@
 
   class Subscribable {
     constructor() {
-      this.listeners = [];
+      this.listeners = new Set();
       this.subscribe = this.subscribe.bind(this);
     }
     subscribe(listener) {
-      this.listeners.push(listener);
+      this.listeners.add(listener);
       this.onSubscribe();
       return () => {
-        this.listeners = this.listeners.filter(x => x !== listener);
+        this.listeners.delete(listener);
         this.onUnsubscribe();
       };
     }
     hasListeners() {
-      return this.listeners.length > 0;
+      return this.listeners.size > 0;
     }
     onSubscribe() {
       // Do nothing
@@ -1875,7 +1875,7 @@
       this.refetch = this.refetch.bind(this);
     }
     onSubscribe() {
-      if (this.listeners.length === 1) {
+      if (this.listeners.size === 1) {
         this.#currentQuery.addObserver(this);
         if (shouldFetchOnMount(this.#currentQuery, this.options)) {
           this.#executeFetch();
@@ -1884,7 +1884,7 @@
       }
     }
     onUnsubscribe() {
-      if (!this.listeners.length) {
+      if (!this.hasListeners()) {
         this.destroy();
       }
     }
@@ -1895,7 +1895,7 @@
       return shouldFetchOn(this.#currentQuery, this.options, this.options.refetchOnWindowFocus);
     }
     destroy() {
-      this.listeners = [];
+      this.listeners = new Set();
       this.#clearStaleTimeout();
       this.#clearRefetchInterval();
       this.#currentQuery.removeObserver(this);
@@ -2279,18 +2279,22 @@
     #result;
     #queries;
     #observers;
-    constructor(client, queries) {
+    #options;
+    #combinedResult;
+    constructor(client, queries, options) {
       super();
       this.#client = client;
       this.#queries = [];
-      this.#result = [];
       this.#observers = [];
-      if (queries) {
-        this.setQueries(queries);
-      }
+      this.#setResult([]);
+      this.setQueries(queries, options);
+    }
+    #setResult(value) {
+      this.#result = value;
+      this.#combinedResult = this.#combineResult(value);
     }
     onSubscribe() {
-      if (this.listeners.length === 1) {
+      if (this.listeners.size === 1) {
         this.#observers.forEach(observer => {
           observer.subscribe(result => {
             this.#onUpdate(observer, result);
@@ -2299,18 +2303,19 @@
       }
     }
     onUnsubscribe() {
-      if (!this.listeners.length) {
+      if (!this.listeners.size) {
         this.destroy();
       }
     }
     destroy() {
-      this.listeners = [];
+      this.listeners = new Set();
       this.#observers.forEach(observer => {
         observer.destroy();
       });
     }
-    setQueries(queries, notifyOptions) {
+    setQueries(queries, options, notifyOptions) {
       this.#queries = queries;
+      this.#options = options;
       notifyManager.batch(() => {
         const prevObservers = this.#observers;
         const newObserverMatches = this.#findMatchingObservers(this.#queries);
@@ -2324,7 +2329,7 @@
           return;
         }
         this.#observers = newObservers;
-        this.#result = newResult;
+        this.#setResult(newResult);
         if (!this.hasListeners()) {
           return;
         }
@@ -2340,7 +2345,7 @@
       });
     }
     getCurrentResult() {
-      return this.#result;
+      return this.#combinedResult;
     }
     getQueries() {
       return this.#observers.map(observer => observer.getCurrentQuery());
@@ -2349,7 +2354,23 @@
       return this.#observers;
     }
     getOptimisticResult(queries) {
-      return this.#findMatchingObservers(queries).map(match => match.observer.getOptimisticResult(match.defaultedQueryOptions));
+      const matches = this.#findMatchingObservers(queries);
+      const result = matches.map(match => match.observer.getOptimisticResult(match.defaultedQueryOptions));
+      return [result, r => {
+        return this.#combineResult(r ?? result);
+      }, () => {
+        return matches.map((match, index) => {
+          const observerResult = result[index];
+          return !match.defaultedQueryOptions.notifyOnChangeProps ? match.observer.trackResult(observerResult) : observerResult;
+        });
+      }];
+    }
+    #combineResult(input) {
+      const combine = this.#options?.combine;
+      if (combine) {
+        return replaceEqualDeep(this.#combinedResult, combine(input));
+      }
+      return input;
     }
     #findMatchingObservers(queries) {
       const prevObservers = this.#observers;
@@ -2384,7 +2405,7 @@
     #onUpdate(observer, result) {
       const index = this.#observers.indexOf(observer);
       if (index !== -1) {
-        this.#result = replaceAt(this.#result, index, result);
+        this.#setResult(replaceAt(this.#result, index, result));
         this.#notify();
       }
     }
@@ -2500,7 +2521,7 @@
       this.#currentMutation?.setOptions(this.options);
     }
     onUnsubscribe() {
-      if (!this.listeners.length) {
+      if (!this.hasListeners()) {
         this.#currentMutation?.removeObserver(this);
       }
     }