@tanstack/query-core 5.0.0-alpha.6 → 5.0.0-alpha.63

package/build/lib/queriesObserver.legacy.cjs

@@ -0,0 +1,207 @@
+'use strict';
+
+var _rollupPluginBabelHelpers = require('./_virtual/_rollupPluginBabelHelpers.legacy.cjs');
+var notifyManager = require('./notifyManager.legacy.cjs');
+var queryObserver = require('./queryObserver.legacy.cjs');
+var subscribable = require('./subscribable.legacy.cjs');
+var utils = require('./utils.legacy.cjs');
+
+function difference(array1, array2) {
+  return array1.filter(x => !array2.includes(x));
+}
+function replaceAt(array, index, value) {
+  const copy = array.slice(0);
+  copy[index] = value;
+  return copy;
+}
+var _client = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("client");
+var _result = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("result");
+var _queries = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("queries");
+var _observers = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("observers");
+var _options = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("options");
+var _combinedResult = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("combinedResult");
+var _setResult = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("setResult");
+var _combineResult = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("combineResult");
+var _findMatchingObservers = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("findMatchingObservers");
+var _onUpdate = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("onUpdate");
+var _notify = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("notify");
+class QueriesObserver extends subscribable.Subscribable {
+  constructor(client, _queries2, _options2) {
+    super();
+    Object.defineProperty(this, _notify, {
+      value: _notify2
+    });
+    Object.defineProperty(this, _onUpdate, {
+      value: _onUpdate2
+    });
+    Object.defineProperty(this, _findMatchingObservers, {
+      value: _findMatchingObservers2
+    });
+    Object.defineProperty(this, _combineResult, {
+      value: _combineResult2
+    });
+    Object.defineProperty(this, _setResult, {
+      value: _setResult2
+    });
+    Object.defineProperty(this, _client, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _result, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _queries, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _observers, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _options, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _combinedResult, {
+      writable: true,
+      value: void 0
+    });
+    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client] = client;
+    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _queries)[_queries] = [];
+    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers] = [];
+    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _setResult)[_setResult]([]);
+    this.setQueries(_queries2, _options2);
+  }
+  onSubscribe() {
+    if (this.listeners.size === 1) {
+      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].forEach(observer => {
+        observer.subscribe(result => {
+          _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _onUpdate)[_onUpdate](observer, result);
+        });
+      });
+    }
+  }
+  onUnsubscribe() {
+    if (!this.listeners.size) {
+      this.destroy();
+    }
+  }
+  destroy() {
+    this.listeners = new Set();
+    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].forEach(observer => {
+      observer.destroy();
+    });
+  }
+  setQueries(queries, options, notifyOptions) {
+    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _queries)[_queries] = queries;
+    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _options)[_options] = options;
+    notifyManager.notifyManager.batch(() => {
+      const prevObservers = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers];
+      const newObserverMatches = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _findMatchingObservers)[_findMatchingObservers](_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _queries)[_queries]);
+
+      // 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 newResult = newObservers.map(observer => observer.getCurrentResult());
+      const hasIndexChange = newObservers.some((observer, index) => observer !== prevObservers[index]);
+      if (prevObservers.length === newObservers.length && !hasIndexChange) {
+        return;
+      }
+      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers] = newObservers;
+      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _setResult)[_setResult](newResult);
+      if (!this.hasListeners()) {
+        return;
+      }
+      difference(prevObservers, newObservers).forEach(observer => {
+        observer.destroy();
+      });
+      difference(newObservers, prevObservers).forEach(observer => {
+        observer.subscribe(result => {
+          _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _onUpdate)[_onUpdate](observer, result);
+        });
+      });
+      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _notify)[_notify]();
+    });
+  }
+  getCurrentResult() {
+    return _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _combinedResult)[_combinedResult];
+  }
+  getQueries() {
+    return _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].map(observer => observer.getCurrentQuery());
+  }
+  getObservers() {
+    return _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers];
+  }
+  getOptimisticResult(queries) {
+    const matches = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _findMatchingObservers)[_findMatchingObservers](queries);
+    const result = matches.map(match => match.observer.getOptimisticResult(match.defaultedQueryOptions));
+    return [result, r => {
+      return _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _combineResult)[_combineResult](r != null ? r : result);
+    }, () => {
+      return matches.map((match, index) => {
+        const observerResult = result[index];
+        return !match.defaultedQueryOptions.notifyOnChangeProps ? match.observer.trackResult(observerResult) : observerResult;
+      });
+    }];
+  }
+}
+function _setResult2(value) {
+  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _result)[_result] = value;
+  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _combinedResult)[_combinedResult] = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _combineResult)[_combineResult](value);
+}
+function _combineResult2(input) {
+  var _classPrivateFieldLoo;
+  const combine = (_classPrivateFieldLoo = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _options)[_options]) == null ? void 0 : _classPrivateFieldLoo.combine;
+  if (combine) {
+    return utils.replaceEqualDeep(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _combinedResult)[_combinedResult], combine(input));
+  }
+  return input;
+}
+function _findMatchingObservers2(queries) {
+  const prevObservers = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers];
+  const prevObserversMap = new Map(prevObservers.map(observer => [observer.options.queryHash, observer]));
+  const defaultedQueryOptions = queries.map(options => _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client].defaultQueryOptions(options));
+  const matchingObservers = defaultedQueryOptions.flatMap(defaultedOptions => {
+    const match = prevObserversMap.get(defaultedOptions.queryHash);
+    if (match != null) {
+      return [{
+        defaultedQueryOptions: defaultedOptions,
+        observer: match
+      }];
+    }
+    return [];
+  });
+  const matchedQueryHashes = new Set(matchingObservers.map(match => match.defaultedQueryOptions.queryHash));
+  const unmatchedQueries = defaultedQueryOptions.filter(defaultedOptions => !matchedQueryHashes.has(defaultedOptions.queryHash));
+  const getObserver = options => {
+    const defaultedOptions = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client].defaultQueryOptions(options);
+    const currentObserver = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].find(o => o.options.queryHash === defaultedOptions.queryHash);
+    return currentObserver != null ? currentObserver : new queryObserver.QueryObserver(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client], defaultedOptions);
+  };
+  const newOrReusedObservers = unmatchedQueries.map(options => {
+    return {
+      defaultedQueryOptions: options,
+      observer: getObserver(options)
+    };
+  });
+  const sortMatchesByOrderOfQueries = (a, b) => defaultedQueryOptions.indexOf(a.defaultedQueryOptions) - defaultedQueryOptions.indexOf(b.defaultedQueryOptions);
+  return matchingObservers.concat(newOrReusedObservers).sort(sortMatchesByOrderOfQueries);
+}
+function _onUpdate2(observer, result) {
+  const index = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].indexOf(observer);
+  if (index !== -1) {
+    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _setResult)[_setResult](replaceAt(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _result)[_result], index, result));
+    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _notify)[_notify]();
+  }
+}
+function _notify2() {
+  notifyManager.notifyManager.batch(() => {
+    this.listeners.forEach(listener => {
+      listener(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _result)[_result]);
+    });
+  });
+}
+
+exports.QueriesObserver = QueriesObserver;
+//# sourceMappingURL=queriesObserver.legacy.cjs.map

package/build/lib/queriesObserver.legacy.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"queriesObserver.legacy.cjs","sources":["../../src/queriesObserver.ts"],"sourcesContent":["import { notifyManager } from './notifyManager'\nimport type {\n  QueryObserverOptions,\n  QueryObserverResult,\n  DefaultedQueryObserverOptions,\n} from './types'\nimport type { QueryClient } from './queryClient'\nimport type { NotifyOptions } from './queryObserver'\nimport { QueryObserver } from './queryObserver'\nimport { Subscribable } from './subscribable'\nimport { replaceEqualDeep } from './utils'\n\nfunction difference<T>(array1: T[], array2: T[]): T[] {\n  return array1.filter((x) => !array2.includes(x))\n}\n\nfunction replaceAt<T>(array: T[], index: number, value: T): T[] {\n  const copy = array.slice(0)\n  copy[index] = value\n  return copy\n}\n\ntype QueriesObserverListener = (result: QueryObserverResult[]) => void\n\nexport interface QueriesObserverOptions<\n  TCombinedResult = QueryObserverResult[],\n> {\n  combine?: (result: QueryObserverResult[]) => TCombinedResult\n}\n\nexport class QueriesObserver<\n  TCombinedResult = QueryObserverResult[],\n> extends Subscribable<QueriesObserverListener> {\n  #client: QueryClient\n  #result!: QueryObserverResult[]\n  #queries: QueryObserverOptions[]\n  #observers: QueryObserver[]\n  #options?: QueriesObserverOptions<TCombinedResult>\n  #combinedResult!: TCombinedResult\n\n  constructor(\n    client: QueryClient,\n    queries: QueryObserverOptions[],\n    options?: QueriesObserverOptions<TCombinedResult>,\n  ) {\n    super()\n\n    this.#client = client\n    this.#queries = []\n    this.#observers = []\n\n    this.#setResult([])\n    this.setQueries(queries, options)\n  }\n\n  #setResult(value: QueryObserverResult[]) {\n    this.#result = value\n    this.#combinedResult = this.#combineResult(value)\n  }\n\n  protected onSubscribe(): void {\n    if (this.listeners.size === 1) {\n      this.#observers.forEach((observer) => {\n        observer.subscribe((result) => {\n          this.#onUpdate(observer, result)\n        })\n      })\n    }\n  }\n\n  protected onUnsubscribe(): void {\n    if (!this.listeners.size) {\n      this.destroy()\n    }\n  }\n\n  destroy(): void {\n    this.listeners = new Set()\n    this.#observers.forEach((observer) => {\n      observer.destroy()\n    })\n  }\n\n  setQueries(\n    queries: QueryObserverOptions[],\n    options?: QueriesObserverOptions<TCombinedResult>,\n    notifyOptions?: NotifyOptions,\n  ): void {\n    this.#queries = queries\n    this.#options = options\n\n    notifyManager.batch(() => {\n      const prevObservers = this.#observers\n\n      const newObserverMatches = this.#findMatchingObservers(this.#queries)\n\n      // set options for the new observers to notify of changes\n      newObserverMatches.forEach((match) =>\n        match.observer.setOptions(match.defaultedQueryOptions, notifyOptions),\n      )\n\n      const newObservers = newObserverMatches.map((match) => match.observer)\n      const newResult = newObservers.map((observer) =>\n        observer.getCurrentResult(),\n      )\n\n      const hasIndexChange = newObservers.some(\n        (observer, index) => observer !== prevObservers[index],\n      )\n      if (prevObservers.length === newObservers.length && !hasIndexChange) {\n        return\n      }\n\n      this.#observers = newObservers\n      this.#setResult(newResult)\n\n      if (!this.hasListeners()) {\n        return\n      }\n\n      difference(prevObservers, newObservers).forEach((observer) => {\n        observer.destroy()\n      })\n\n      difference(newObservers, prevObservers).forEach((observer) => {\n        observer.subscribe((result) => {\n          this.#onUpdate(observer, result)\n        })\n      })\n\n      this.#notify()\n    })\n  }\n\n  getCurrentResult(): TCombinedResult {\n    return this.#combinedResult\n  }\n\n  getQueries() {\n    return this.#observers.map((observer) => observer.getCurrentQuery())\n  }\n\n  getObservers() {\n    return this.#observers\n  }\n\n  getOptimisticResult(\n    queries: QueryObserverOptions[],\n  ): [\n    rawResult: QueryObserverResult[],\n    combineResult: (r?: QueryObserverResult[]) => TCombinedResult,\n    trackResult: () => QueryObserverResult[],\n  ] {\n    const matches = this.#findMatchingObservers(queries)\n    const result = matches.map((match) =>\n      match.observer.getOptimisticResult(match.defaultedQueryOptions),\n    )\n\n    return [\n      result,\n      (r?: QueryObserverResult[]) => {\n        return this.#combineResult(r ?? result)\n      },\n      () => {\n        return matches.map((match, index) => {\n          const observerResult = result[index]!\n          return !match.defaultedQueryOptions.notifyOnChangeProps\n            ? match.observer.trackResult(observerResult)\n            : observerResult\n        })\n      },\n    ]\n  }\n\n  #combineResult(input: QueryObserverResult[]): TCombinedResult {\n    const combine = this.#options?.combine\n    if (combine) {\n      return replaceEqualDeep(this.#combinedResult, combine(input))\n    }\n    return input as any\n  }\n\n  #findMatchingObservers(\n    queries: QueryObserverOptions[],\n  ): QueryObserverMatch[] {\n    const prevObservers = this.#observers\n    const prevObserversMap = new Map(\n      prevObservers.map((observer) => [observer.options.queryHash, observer]),\n    )\n\n    const defaultedQueryOptions = queries.map((options) =>\n      this.#client.defaultQueryOptions(options),\n    )\n\n    const matchingObservers: QueryObserverMatch[] =\n      defaultedQueryOptions.flatMap((defaultedOptions) => {\n        const match = prevObserversMap.get(defaultedOptions.queryHash)\n        if (match != null) {\n          return [{ defaultedQueryOptions: defaultedOptions, observer: match }]\n        }\n        return []\n      })\n\n    const matchedQueryHashes = new Set(\n      matchingObservers.map((match) => match.defaultedQueryOptions.queryHash),\n    )\n    const unmatchedQueries = defaultedQueryOptions.filter(\n      (defaultedOptions) => !matchedQueryHashes.has(defaultedOptions.queryHash),\n    )\n\n    const getObserver = (options: QueryObserverOptions): QueryObserver => {\n      const defaultedOptions = this.#client.defaultQueryOptions(options)\n      const currentObserver = this.#observers.find(\n        (o) => o.options.queryHash === defaultedOptions.queryHash,\n      )\n      return (\n        currentObserver ?? new QueryObserver(this.#client, defaultedOptions)\n      )\n    }\n\n    const newOrReusedObservers: QueryObserverMatch[] = unmatchedQueries.map(\n      (options) => {\n        return {\n          defaultedQueryOptions: options,\n          observer: getObserver(options),\n        }\n      },\n    )\n\n    const sortMatchesByOrderOfQueries = (\n      a: QueryObserverMatch,\n      b: QueryObserverMatch,\n    ): number =>\n      defaultedQueryOptions.indexOf(a.defaultedQueryOptions) -\n      defaultedQueryOptions.indexOf(b.defaultedQueryOptions)\n\n    return matchingObservers\n      .concat(newOrReusedObservers)\n      .sort(sortMatchesByOrderOfQueries)\n  }\n\n  #onUpdate(observer: QueryObserver, result: QueryObserverResult): void {\n    const index = this.#observers.indexOf(observer)\n    if (index !== -1) {\n      this.#setResult(replaceAt(this.#result, index, result))\n      this.#notify()\n    }\n  }\n\n  #notify(): void {\n    notifyManager.batch(() => {\n      this.listeners.forEach((listener) => {\n        listener(this.#result)\n      })\n    })\n  }\n}\n\ntype QueryObserverMatch = {\n  defaultedQueryOptions: DefaultedQueryObserverOptions\n  observer: QueryObserver\n}\n"],"names":["difference","array1","array2","filter","x","includes","replaceAt","array","index","value","copy","slice","_client","_classPrivateFieldLooseKey","_result","_queries","_observers","_options","_combinedResult","_setResult","_combineResult","_findMatchingObservers","_onUpdate","_notify","QueriesObserver","Subscribable","constructor","client","queries","options","Object","defineProperty","_notify2","_onUpdate2","_findMatchingObservers2","_combineResult2","_setResult2","writable","_classPrivateFieldLooseBase","setQueries","onSubscribe","listeners","size","forEach","observer","subscribe","result","onUnsubscribe","destroy","Set","notifyOptions","notifyManager","batch","prevObservers","newObserverMatches","match","setOptions","defaultedQueryOptions","newObservers","map","newResult","getCurrentResult","hasIndexChange","some","length","hasListeners","getQueries","getCurrentQuery","getObservers","getOptimisticResult","matches","r","observerResult","notifyOnChangeProps","trackResult","input","_classPrivateFieldLoo","combine","replaceEqualDeep","prevObserversMap","Map","queryHash","defaultQueryOptions","matchingObservers","flatMap","defaultedOptions","get","matchedQueryHashes","unmatchedQueries","has","getObserver","currentObserver","find","o","QueryObserver","newOrReusedObservers","sortMatchesByOrderOfQueries","a","b","indexOf","concat","sort","listener"],"mappings":"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"}

package/build/lib/{queriesObserver.esm.js → queriesObserver.legacy.js}

@@ -1,10 +1,11 @@
-import { classPrivateFieldLooseBase as _classPrivateFieldLooseBase, classPrivateFieldLooseKey as _classPrivateFieldLooseKey } from './_virtual/_rollupPluginBabelHelpers.esm.js';
-import { notifyManager } from './notifyManager.esm.js';
-import { QueryObserver } from './queryObserver.esm.js';
-import { Subscribable } from './subscribable.esm.js';
+import { classPrivateFieldLooseBase as _classPrivateFieldLooseBase, classPrivateFieldLooseKey as _classPrivateFieldLooseKey } from './_virtual/_rollupPluginBabelHelpers.legacy.js';
+import { notifyManager } from './notifyManager.legacy.js';
+import { QueryObserver } from './queryObserver.legacy.js';
+import { Subscribable } from './subscribable.legacy.js';
+import { replaceEqualDeep } from './utils.legacy.js';
 
 function difference(array1, array2) {
-  return array1.filter(x => array2.indexOf(x) === -1);
+  return array1.filter(x => !array2.includes(x));
 }
 function replaceAt(array, index, value) {
   const copy = array.slice(0);
@@ -15,11 +16,15 @@ var _client = /*#__PURE__*/_classPrivateFieldLooseKey("client");
 var _result = /*#__PURE__*/_classPrivateFieldLooseKey("result");
 var _queries = /*#__PURE__*/_classPrivateFieldLooseKey("queries");
 var _observers = /*#__PURE__*/_classPrivateFieldLooseKey("observers");
+var _options = /*#__PURE__*/_classPrivateFieldLooseKey("options");
+var _combinedResult = /*#__PURE__*/_classPrivateFieldLooseKey("combinedResult");
+var _setResult = /*#__PURE__*/_classPrivateFieldLooseKey("setResult");
+var _combineResult = /*#__PURE__*/_classPrivateFieldLooseKey("combineResult");
 var _findMatchingObservers = /*#__PURE__*/_classPrivateFieldLooseKey("findMatchingObservers");
 var _onUpdate = /*#__PURE__*/_classPrivateFieldLooseKey("onUpdate");
 var _notify = /*#__PURE__*/_classPrivateFieldLooseKey("notify");
 class QueriesObserver extends Subscribable {
-  constructor(client, _queries2) {
+  constructor(client, _queries2, _options2) {
     super();
     Object.defineProperty(this, _notify, {
       value: _notify2
@@ -30,6 +35,12 @@ class QueriesObserver extends Subscribable {
     Object.defineProperty(this, _findMatchingObservers, {
       value: _findMatchingObservers2
     });
+    Object.defineProperty(this, _combineResult, {
+      value: _combineResult2
+    });
+    Object.defineProperty(this, _setResult, {
+      value: _setResult2
+    });
     Object.defineProperty(this, _client, {
       writable: true,
       value: void 0
@@ -46,16 +57,22 @@ class QueriesObserver extends Subscribable {
       writable: true,
       value: void 0
     });
+    Object.defineProperty(this, _options, {
+      writable: true,
+      value: void 0
+    });
+    Object.defineProperty(this, _combinedResult, {
+      writable: true,
+      value: void 0
+    });
     _classPrivateFieldLooseBase(this, _client)[_client] = client;
     _classPrivateFieldLooseBase(this, _queries)[_queries] = [];
-    _classPrivateFieldLooseBase(this, _result)[_result] = [];
     _classPrivateFieldLooseBase(this, _observers)[_observers] = [];
-    if (_queries2) {
-      this.setQueries(_queries2);
-    }
+    _classPrivateFieldLooseBase(this, _setResult)[_setResult]([]);
+    this.setQueries(_queries2, _options2);
   }
   onSubscribe() {
-    if (this.listeners.length === 1) {
+    if (this.listeners.size === 1) {
       _classPrivateFieldLooseBase(this, _observers)[_observers].forEach(observer => {
         observer.subscribe(result => {
           _classPrivateFieldLooseBase(this, _onUpdate)[_onUpdate](observer, result);
@@ -64,18 +81,19 @@ class QueriesObserver extends Subscribable {
     }
   }
   onUnsubscribe() {
-    if (!this.listeners.length) {
+    if (!this.listeners.size) {
       this.destroy();
     }
   }
   destroy() {
-    this.listeners = [];
+    this.listeners = new Set();
     _classPrivateFieldLooseBase(this, _observers)[_observers].forEach(observer => {
       observer.destroy();
     });
   }
-  setQueries(queries, notifyOptions) {
+  setQueries(queries, options, notifyOptions) {
     _classPrivateFieldLooseBase(this, _queries)[_queries] = queries;
+    _classPrivateFieldLooseBase(this, _options)[_options] = options;
     notifyManager.batch(() => {
       const prevObservers = _classPrivateFieldLooseBase(this, _observers)[_observers];
       const newObserverMatches = _classPrivateFieldLooseBase(this, _findMatchingObservers)[_findMatchingObservers](_classPrivateFieldLooseBase(this, _queries)[_queries]);
@@ -89,7 +107,7 @@ class QueriesObserver extends Subscribable {
         return;
       }
       _classPrivateFieldLooseBase(this, _observers)[_observers] = newObservers;
-      _classPrivateFieldLooseBase(this, _result)[_result] = newResult;
+      _classPrivateFieldLooseBase(this, _setResult)[_setResult](newResult);
       if (!this.hasListeners()) {
         return;
       }
@@ -105,7 +123,7 @@ class QueriesObserver extends Subscribable {
     });
   }
   getCurrentResult() {
-    return _classPrivateFieldLooseBase(this, _result)[_result];
+    return _classPrivateFieldLooseBase(this, _combinedResult)[_combinedResult];
   }
   getQueries() {
     return _classPrivateFieldLooseBase(this, _observers)[_observers].map(observer => observer.getCurrentQuery());
@@ -114,14 +132,36 @@ class QueriesObserver extends Subscribable {
     return _classPrivateFieldLooseBase(this, _observers)[_observers];
   }
   getOptimisticResult(queries) {
-    return _classPrivateFieldLooseBase(this, _findMatchingObservers)[_findMatchingObservers](queries).map(match => match.observer.getOptimisticResult(match.defaultedQueryOptions));
+    const matches = _classPrivateFieldLooseBase(this, _findMatchingObservers)[_findMatchingObservers](queries);
+    const result = matches.map(match => match.observer.getOptimisticResult(match.defaultedQueryOptions));
+    return [result, r => {
+      return _classPrivateFieldLooseBase(this, _combineResult)[_combineResult](r != null ? r : result);
+    }, () => {
+      return matches.map((match, index) => {
+        const observerResult = result[index];
+        return !match.defaultedQueryOptions.notifyOnChangeProps ? match.observer.trackResult(observerResult) : observerResult;
+      });
+    }];
+  }
+}
+function _setResult2(value) {
+  _classPrivateFieldLooseBase(this, _result)[_result] = value;
+  _classPrivateFieldLooseBase(this, _combinedResult)[_combinedResult] = _classPrivateFieldLooseBase(this, _combineResult)[_combineResult](value);
+}
+function _combineResult2(input) {
+  var _classPrivateFieldLoo;
+  const combine = (_classPrivateFieldLoo = _classPrivateFieldLooseBase(this, _options)[_options]) == null ? void 0 : _classPrivateFieldLoo.combine;
+  if (combine) {
+    return replaceEqualDeep(_classPrivateFieldLooseBase(this, _combinedResult)[_combinedResult], combine(input));
   }
+  return input;
 }
 function _findMatchingObservers2(queries) {
   const prevObservers = _classPrivateFieldLooseBase(this, _observers)[_observers];
+  const prevObserversMap = new Map(prevObservers.map(observer => [observer.options.queryHash, observer]));
   const defaultedQueryOptions = queries.map(options => _classPrivateFieldLooseBase(this, _client)[_client].defaultQueryOptions(options));
   const matchingObservers = defaultedQueryOptions.flatMap(defaultedOptions => {
-    const match = prevObservers.find(observer => observer.options.queryHash === defaultedOptions.queryHash);
+    const match = prevObserversMap.get(defaultedOptions.queryHash);
     if (match != null) {
       return [{
         defaultedQueryOptions: defaultedOptions,
@@ -130,8 +170,8 @@ function _findMatchingObservers2(queries) {
     }
     return [];
   });
-  const matchedQueryHashes = matchingObservers.map(match => match.defaultedQueryOptions.queryHash);
-  const unmatchedQueries = defaultedQueryOptions.filter(defaultedOptions => !matchedQueryHashes.includes(defaultedOptions.queryHash));
+  const matchedQueryHashes = new Set(matchingObservers.map(match => match.defaultedQueryOptions.queryHash));
+  const unmatchedQueries = defaultedQueryOptions.filter(defaultedOptions => !matchedQueryHashes.has(defaultedOptions.queryHash));
   const getObserver = options => {
     const defaultedOptions = _classPrivateFieldLooseBase(this, _client)[_client].defaultQueryOptions(options);
     const currentObserver = _classPrivateFieldLooseBase(this, _observers)[_observers].find(o => o.options.queryHash === defaultedOptions.queryHash);
@@ -149,7 +189,7 @@ function _findMatchingObservers2(queries) {
 function _onUpdate2(observer, result) {
   const index = _classPrivateFieldLooseBase(this, _observers)[_observers].indexOf(observer);
   if (index !== -1) {
-    _classPrivateFieldLooseBase(this, _result)[_result] = replaceAt(_classPrivateFieldLooseBase(this, _result)[_result], index, result);
+    _classPrivateFieldLooseBase(this, _setResult)[_setResult](replaceAt(_classPrivateFieldLooseBase(this, _result)[_result], index, result));
     _classPrivateFieldLooseBase(this, _notify)[_notify]();
   }
 }
@@ -162,4 +202,4 @@ function _notify2() {
 }
 
 export { QueriesObserver };
-//# sourceMappingURL=queriesObserver.esm.js.map
+//# sourceMappingURL=queriesObserver.legacy.js.map

package/build/lib/queriesObserver.legacy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"queriesObserver.legacy.js","sources":["../../src/queriesObserver.ts"],"sourcesContent":["import { notifyManager } from './notifyManager'\nimport type {\n  QueryObserverOptions,\n  QueryObserverResult,\n  DefaultedQueryObserverOptions,\n} from './types'\nimport type { QueryClient } from './queryClient'\nimport type { NotifyOptions } from './queryObserver'\nimport { QueryObserver } from './queryObserver'\nimport { Subscribable } from './subscribable'\nimport { replaceEqualDeep } from './utils'\n\nfunction difference<T>(array1: T[], array2: T[]): T[] {\n  return array1.filter((x) => !array2.includes(x))\n}\n\nfunction replaceAt<T>(array: T[], index: number, value: T): T[] {\n  const copy = array.slice(0)\n  copy[index] = value\n  return copy\n}\n\ntype QueriesObserverListener = (result: QueryObserverResult[]) => void\n\nexport interface QueriesObserverOptions<\n  TCombinedResult = QueryObserverResult[],\n> {\n  combine?: (result: QueryObserverResult[]) => TCombinedResult\n}\n\nexport class QueriesObserver<\n  TCombinedResult = QueryObserverResult[],\n> extends Subscribable<QueriesObserverListener> {\n  #client: QueryClient\n  #result!: QueryObserverResult[]\n  #queries: QueryObserverOptions[]\n  #observers: QueryObserver[]\n  #options?: QueriesObserverOptions<TCombinedResult>\n  #combinedResult!: TCombinedResult\n\n  constructor(\n    client: QueryClient,\n    queries: QueryObserverOptions[],\n    options?: QueriesObserverOptions<TCombinedResult>,\n  ) {\n    super()\n\n    this.#client = client\n    this.#queries = []\n    this.#observers = []\n\n    this.#setResult([])\n    this.setQueries(queries, options)\n  }\n\n  #setResult(value: QueryObserverResult[]) {\n    this.#result = value\n    this.#combinedResult = this.#combineResult(value)\n  }\n\n  protected onSubscribe(): void {\n    if (this.listeners.size === 1) {\n      this.#observers.forEach((observer) => {\n        observer.subscribe((result) => {\n          this.#onUpdate(observer, result)\n        })\n      })\n    }\n  }\n\n  protected onUnsubscribe(): void {\n    if (!this.listeners.size) {\n      this.destroy()\n    }\n  }\n\n  destroy(): void {\n    this.listeners = new Set()\n    this.#observers.forEach((observer) => {\n      observer.destroy()\n    })\n  }\n\n  setQueries(\n    queries: QueryObserverOptions[],\n    options?: QueriesObserverOptions<TCombinedResult>,\n    notifyOptions?: NotifyOptions,\n  ): void {\n    this.#queries = queries\n    this.#options = options\n\n    notifyManager.batch(() => {\n      const prevObservers = this.#observers\n\n      const newObserverMatches = this.#findMatchingObservers(this.#queries)\n\n      // set options for the new observers to notify of changes\n      newObserverMatches.forEach((match) =>\n        match.observer.setOptions(match.defaultedQueryOptions, notifyOptions),\n      )\n\n      const newObservers = newObserverMatches.map((match) => match.observer)\n      const newResult = newObservers.map((observer) =>\n        observer.getCurrentResult(),\n      )\n\n      const hasIndexChange = newObservers.some(\n        (observer, index) => observer !== prevObservers[index],\n      )\n      if (prevObservers.length === newObservers.length && !hasIndexChange) {\n        return\n      }\n\n      this.#observers = newObservers\n      this.#setResult(newResult)\n\n      if (!this.hasListeners()) {\n        return\n      }\n\n      difference(prevObservers, newObservers).forEach((observer) => {\n        observer.destroy()\n      })\n\n      difference(newObservers, prevObservers).forEach((observer) => {\n        observer.subscribe((result) => {\n          this.#onUpdate(observer, result)\n        })\n      })\n\n      this.#notify()\n    })\n  }\n\n  getCurrentResult(): TCombinedResult {\n    return this.#combinedResult\n  }\n\n  getQueries() {\n    return this.#observers.map((observer) => observer.getCurrentQuery())\n  }\n\n  getObservers() {\n    return this.#observers\n  }\n\n  getOptimisticResult(\n    queries: QueryObserverOptions[],\n  ): [\n    rawResult: QueryObserverResult[],\n    combineResult: (r?: QueryObserverResult[]) => TCombinedResult,\n    trackResult: () => QueryObserverResult[],\n  ] {\n    const matches = this.#findMatchingObservers(queries)\n    const result = matches.map((match) =>\n      match.observer.getOptimisticResult(match.defaultedQueryOptions),\n    )\n\n    return [\n      result,\n      (r?: QueryObserverResult[]) => {\n        return this.#combineResult(r ?? result)\n      },\n      () => {\n        return matches.map((match, index) => {\n          const observerResult = result[index]!\n          return !match.defaultedQueryOptions.notifyOnChangeProps\n            ? match.observer.trackResult(observerResult)\n            : observerResult\n        })\n      },\n    ]\n  }\n\n  #combineResult(input: QueryObserverResult[]): TCombinedResult {\n    const combine = this.#options?.combine\n    if (combine) {\n      return replaceEqualDeep(this.#combinedResult, combine(input))\n    }\n    return input as any\n  }\n\n  #findMatchingObservers(\n    queries: QueryObserverOptions[],\n  ): QueryObserverMatch[] {\n    const prevObservers = this.#observers\n    const prevObserversMap = new Map(\n      prevObservers.map((observer) => [observer.options.queryHash, observer]),\n    )\n\n    const defaultedQueryOptions = queries.map((options) =>\n      this.#client.defaultQueryOptions(options),\n    )\n\n    const matchingObservers: QueryObserverMatch[] =\n      defaultedQueryOptions.flatMap((defaultedOptions) => {\n        const match = prevObserversMap.get(defaultedOptions.queryHash)\n        if (match != null) {\n          return [{ defaultedQueryOptions: defaultedOptions, observer: match }]\n        }\n        return []\n      })\n\n    const matchedQueryHashes = new Set(\n      matchingObservers.map((match) => match.defaultedQueryOptions.queryHash),\n    )\n    const unmatchedQueries = defaultedQueryOptions.filter(\n      (defaultedOptions) => !matchedQueryHashes.has(defaultedOptions.queryHash),\n    )\n\n    const getObserver = (options: QueryObserverOptions): QueryObserver => {\n      const defaultedOptions = this.#client.defaultQueryOptions(options)\n      const currentObserver = this.#observers.find(\n        (o) => o.options.queryHash === defaultedOptions.queryHash,\n      )\n      return (\n        currentObserver ?? new QueryObserver(this.#client, defaultedOptions)\n      )\n    }\n\n    const newOrReusedObservers: QueryObserverMatch[] = unmatchedQueries.map(\n      (options) => {\n        return {\n          defaultedQueryOptions: options,\n          observer: getObserver(options),\n        }\n      },\n    )\n\n    const sortMatchesByOrderOfQueries = (\n      a: QueryObserverMatch,\n      b: QueryObserverMatch,\n    ): number =>\n      defaultedQueryOptions.indexOf(a.defaultedQueryOptions) -\n      defaultedQueryOptions.indexOf(b.defaultedQueryOptions)\n\n    return matchingObservers\n      .concat(newOrReusedObservers)\n      .sort(sortMatchesByOrderOfQueries)\n  }\n\n  #onUpdate(observer: QueryObserver, result: QueryObserverResult): void {\n    const index = this.#observers.indexOf(observer)\n    if (index !== -1) {\n      this.#setResult(replaceAt(this.#result, index, result))\n      this.#notify()\n    }\n  }\n\n  #notify(): void {\n    notifyManager.batch(() => {\n      this.listeners.forEach((listener) => {\n        listener(this.#result)\n      })\n    })\n  }\n}\n\ntype QueryObserverMatch = {\n  defaultedQueryOptions: DefaultedQueryObserverOptions\n  observer: QueryObserver\n}\n"],"names":["difference","array1","array2","filter","x","includes","replaceAt","array","index","value","copy","slice","_client","_classPrivateFieldLooseKey","_result","_queries","_observers","_options","_combinedResult","_setResult","_combineResult","_findMatchingObservers","_onUpdate","_notify","QueriesObserver","Subscribable","constructor","client","queries","options","Object","defineProperty","_notify2","_onUpdate2","_findMatchingObservers2","_combineResult2","_setResult2","writable","_classPrivateFieldLooseBase","setQueries","onSubscribe","listeners","size","forEach","observer","subscribe","result","onUnsubscribe","destroy","Set","notifyOptions","notifyManager","batch","prevObservers","newObserverMatches","match","setOptions","defaultedQueryOptions","newObservers","map","newResult","getCurrentResult","hasIndexChange","some","length","hasListeners","getQueries","getCurrentQuery","getObservers","getOptimisticResult","matches","r","observerResult","notifyOnChangeProps","trackResult","input","_classPrivateFieldLoo","combine","replaceEqualDeep","prevObserversMap","Map","queryHash","defaultQueryOptions","matchingObservers","flatMap","defaultedOptions","get","matchedQueryHashes","unmatchedQueries","has","getObserver","currentObserver","find","o","QueryObserver","newOrReusedObservers","sortMatchesByOrderOfQueries","a","b","indexOf","concat","sort","listener"],"mappings":"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"}

package/build/lib/{query.mjs → query.cjs}

@@ -1,13 +1,15 @@
-import { replaceData, noop, timeUntilStale } from './utils.mjs';
-import { notifyManager } from './notifyManager.mjs';
-import { createRetryer, isCancelledError, canFetch } from './retryer.mjs';
-import { Removable } from './removable.mjs';
+'use strict';
+
+var utils = require('./utils.cjs');
+var notifyManager = require('./notifyManager.cjs');
+var retryer = require('./retryer.cjs');
+var removable = require('./removable.cjs');
 
 // TYPES
 
 // CLASS
 
-class Query extends Removable {
+class Query extends removable.Removable {
   #initialState;
   #revertState;
   #cache;
@@ -45,7 +47,7 @@ class Query extends Removable {
     }
   }
   setData(newData, options) {
-    const data = replaceData(this.state.data, newData, this.options);
+    const data = utils.replaceData(this.state.data, newData, this.options);
 
     // Set data and mark it as cached
     this.#dispatch({
@@ -66,7 +68,7 @@ class Query extends Removable {
   cancel(options) {
     const promise = this.#promise;
     this.#retryer?.cancel(options);
-    return promise ? promise.then(noop).catch(noop) : Promise.resolve();
+    return promise ? promise.then(utils.noop).catch(utils.noop) : Promise.resolve();
   }
   destroy() {
     super.destroy();
@@ -88,7 +90,7 @@ class Query extends Removable {
     return this.state.isInvalidated || !this.state.dataUpdatedAt || this.#observers.some(observer => observer.getCurrentResult().isStale);
   }
   isStaleByTime(staleTime = 0) {
-    return this.state.isInvalidated || !this.state.dataUpdatedAt || !timeUntilStale(this.state.dataUpdatedAt, staleTime);
+    return this.state.isInvalidated || !this.state.dataUpdatedAt || !utils.timeUntilStale(this.state.dataUpdatedAt, staleTime);
   }
   onFocus() {
     const observer = this.#observers.find(x => x.shouldFetchOnWindowFocus());
@@ -109,7 +111,7 @@ class Query extends Removable {
     this.#retryer?.continue();
   }
   addObserver(observer) {
-    if (this.#observers.indexOf(observer) === -1) {
+    if (!this.#observers.includes(observer)) {
       this.#observers.push(observer);
 
       // Stop the query from being garbage collected
@@ -122,7 +124,7 @@ class Query extends Removable {
     }
   }
   removeObserver(observer) {
-    if (this.#observers.indexOf(observer) !== -1) {
+    if (this.#observers.includes(observer)) {
       this.#observers = this.#observers.filter(x => x !== observer);
       if (!this.#observers.length) {
         // If the transport layer does not support cancellation
@@ -242,13 +244,13 @@ class Query extends Removable {
     }
     const onError = error => {
       // Optimistically update state if needed
-      if (!(isCancelledError(error) && error.silent)) {
+      if (!(retryer.isCancelledError(error) && error.silent)) {
         this.#dispatch({
           type: 'error',
           error: error
         });
       }
-      if (!isCancelledError(error)) {
+      if (!retryer.isCancelledError(error)) {
         // Notify cache callback
         this.#cache.config.onError?.(error, this);
         this.#cache.config.onSettled?.(this.state.data, error, this);
@@ -261,7 +263,7 @@ class Query extends Removable {
     };
 
     // Try to fetch the data
-    this.#retryer = createRetryer({
+    this.#retryer = retryer.createRetryer({
       fn: context.fetchFn,
       abort: abortController.abort.bind(abortController),
       onSuccess: data => {
@@ -269,7 +271,7 @@ class Query extends Removable {
           if (process.env.NODE_ENV !== 'production') {
             console.error(`Query data cannot be undefined. Please make sure to return a value other than undefined from your query function. Affected query key: ${this.queryHash}`);
           }
-          onError(new Error('undefined'));
+          onError(new Error(`${this.queryHash} data is undefined`));
           return;
         }
         this.setData(data);
@@ -333,7 +335,7 @@ class Query extends Removable {
             fetchFailureCount: 0,
             fetchFailureReason: null,
             fetchMeta: action.meta ?? null,
-            fetchStatus: canFetch(this.options.networkMode) ? 'fetching' : 'paused',
+            fetchStatus: retryer.canFetch(this.options.networkMode) ? 'fetching' : 'paused',
             ...(!state.dataUpdatedAt && {
               error: null,
               status: 'pending'
@@ -356,7 +358,7 @@ class Query extends Removable {
           };
         case 'error':
           const error = action.error;
-          if (isCancelledError(error) && error.revert && this.#revertState) {
+          if (retryer.isCancelledError(error) && error.revert && this.#revertState) {
             return {
               ...this.#revertState
             };
@@ -384,9 +386,9 @@ class Query extends Removable {
       }
     };
     this.state = reducer(this.state);
-    notifyManager.batch(() => {
+    notifyManager.notifyManager.batch(() => {
       this.#observers.forEach(observer => {
-        observer.onQueryUpdate(action);
+        observer.onQueryUpdate();
       });
       this.#cache.notify({
         query: this,
@@ -416,5 +418,5 @@ function getDefaultState(options) {
   };
 }
 
-export { Query };
-//# sourceMappingURL=query.mjs.map
+exports.Query = Query;
+//# sourceMappingURL=query.cjs.map