@tanstack/query-core 5.0.0-alpha.7 → 5.0.0-alpha.81

package/build/lib/queryObserver.js

@@ -1,128 +1,31 @@
-'use strict';
+import { shallowEqualObjects, noop, isServer, isValidTimeout, timeUntilStale, replaceData } from './utils.js';
+import { notifyManager } from './notifyManager.js';
+import { focusManager } from './focusManager.js';
+import { Subscribable } from './subscribable.js';
+import { canFetch } from './retryer.js';
 
-var _rollupPluginBabelHelpers = require('./_virtual/_rollupPluginBabelHelpers.js');
-var utils = require('./utils.js');
-var notifyManager = require('./notifyManager.js');
-var focusManager = require('./focusManager.js');
-var subscribable = require('./subscribable.js');
-var retryer = require('./retryer.js');
-
-var _client = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("client");
-var _currentQuery = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("currentQuery");
-var _currentQueryInitialState = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("currentQueryInitialState");
-var _currentResult = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("currentResult");
-var _currentResultState = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("currentResultState");
-var _currentResultOptions = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("currentResultOptions");
-var _previousQueryResult = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("previousQueryResult");
-var _selectError = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("selectError");
-var _selectFn = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("selectFn");
-var _selectResult = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("selectResult");
-var _staleTimeoutId = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("staleTimeoutId");
-var _refetchIntervalId = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("refetchIntervalId");
-var _currentRefetchInterval = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("currentRefetchInterval");
-var _trackedProps = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("trackedProps");
-var _executeFetch = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("executeFetch");
-var _updateStaleTimeout = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("updateStaleTimeout");
-var _computeRefetchInterval = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("computeRefetchInterval");
-var _updateRefetchInterval = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("updateRefetchInterval");
-var _updateTimers = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("updateTimers");
-var _clearStaleTimeout = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("clearStaleTimeout");
-var _clearRefetchInterval = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("clearRefetchInterval");
-var _updateResult = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("updateResult");
-var _updateQuery = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("updateQuery");
-var _notify = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("notify");
-class QueryObserver extends subscribable.Subscribable {
+class QueryObserver extends Subscribable {
+  #client;
+  #currentQuery = undefined;
+  #currentQueryInitialState = undefined;
+  #currentResult = undefined;
+  #currentResultState;
+  #currentResultOptions;
+  #selectError;
+  #selectFn;
+  #selectResult;
+  // This property keeps track of the last query with defined data.
+  // It will be used to pass the previous data and query to the placeholder function between renders.
+  #lastQueryWithDefinedData;
+  #staleTimeoutId;
+  #refetchIntervalId;
+  #currentRefetchInterval;
+  #trackedProps = new Set();
   constructor(client, options) {
     super();
-    Object.defineProperty(this, _notify, {
-      value: _notify2
-    });
-    Object.defineProperty(this, _updateQuery, {
-      value: _updateQuery2
-    });
-    Object.defineProperty(this, _updateResult, {
-      value: _updateResult2
-    });
-    Object.defineProperty(this, _clearRefetchInterval, {
-      value: _clearRefetchInterval2
-    });
-    Object.defineProperty(this, _clearStaleTimeout, {
-      value: _clearStaleTimeout2
-    });
-    Object.defineProperty(this, _updateTimers, {
-      value: _updateTimers2
-    });
-    Object.defineProperty(this, _updateRefetchInterval, {
-      value: _updateRefetchInterval2
-    });
-    Object.defineProperty(this, _computeRefetchInterval, {
-      value: _computeRefetchInterval2
-    });
-    Object.defineProperty(this, _updateStaleTimeout, {
-      value: _updateStaleTimeout2
-    });
-    Object.defineProperty(this, _executeFetch, {
-      value: _executeFetch2
-    });
-    Object.defineProperty(this, _client, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _currentQuery, {
-      writable: true,
-      value: undefined
-    });
-    Object.defineProperty(this, _currentQueryInitialState, {
-      writable: true,
-      value: undefined
-    });
-    Object.defineProperty(this, _currentResult, {
-      writable: true,
-      value: undefined
-    });
-    Object.defineProperty(this, _currentResultState, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _currentResultOptions, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _previousQueryResult, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _selectError, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _selectFn, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _selectResult, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _staleTimeoutId, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _refetchIntervalId, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _currentRefetchInterval, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _trackedProps, {
-      writable: true,
-      value: new Set()
-    });
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client] = client;
+    this.#client = client;
     this.options = options;
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _selectError)[_selectError] = null;
+    this.#selectError = null;
     this.bindMethods();
     this.setOptions(options);
   }
@@ -130,39 +33,39 @@ class QueryObserver extends subscribable.Subscribable {
     this.refetch = this.refetch.bind(this);
   }
   onSubscribe() {
-    if (this.listeners.length === 1) {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery].addObserver(this);
-      if (shouldFetchOnMount(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery], this.options)) {
-        _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _executeFetch)[_executeFetch]();
+    if (this.listeners.size === 1) {
+      this.#currentQuery.addObserver(this);
+      if (shouldFetchOnMount(this.#currentQuery, this.options)) {
+        this.#executeFetch();
       }
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _updateTimers)[_updateTimers]();
+      this.#updateTimers();
     }
   }
   onUnsubscribe() {
-    if (!this.listeners.length) {
+    if (!this.hasListeners()) {
       this.destroy();
     }
   }
   shouldFetchOnReconnect() {
-    return shouldFetchOn(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery], this.options, this.options.refetchOnReconnect);
+    return shouldFetchOn(this.#currentQuery, this.options, this.options.refetchOnReconnect);
   }
   shouldFetchOnWindowFocus() {
-    return shouldFetchOn(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery], this.options, this.options.refetchOnWindowFocus);
+    return shouldFetchOn(this.#currentQuery, this.options, this.options.refetchOnWindowFocus);
   }
   destroy() {
-    this.listeners = [];
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _clearStaleTimeout)[_clearStaleTimeout]();
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _clearRefetchInterval)[_clearRefetchInterval]();
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery].removeObserver(this);
+    this.listeners = new Set();
+    this.#clearStaleTimeout();
+    this.#clearRefetchInterval();
+    this.#currentQuery.removeObserver(this);
   }
   setOptions(options, notifyOptions) {
     const prevOptions = this.options;
-    const prevQuery = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery];
-    this.options = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client].defaultQueryOptions(options);
-    if (!utils.shallowEqualObjects(prevOptions, this.options)) {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client].getQueryCache().notify({
+    const prevQuery = this.#currentQuery;
+    this.options = this.#client.defaultQueryOptions(options);
+    if (!shallowEqualObjects(prevOptions, this.options)) {
+      this.#client.getQueryCache().notify({
         type: 'observerOptionsUpdated',
-        query: _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery],
+        query: this.#currentQuery,
         observer: this
       });
     }
@@ -174,34 +77,56 @@ class QueryObserver extends subscribable.Subscribable {
     if (!this.options.queryKey) {
       this.options.queryKey = prevOptions.queryKey;
     }
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _updateQuery)[_updateQuery]();
+    this.#updateQuery();
     const mounted = this.hasListeners();
 
     // Fetch if there are subscribers
-    if (mounted && shouldFetchOptionally(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery], prevQuery, this.options, prevOptions)) {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _executeFetch)[_executeFetch]();
+    if (mounted && shouldFetchOptionally(this.#currentQuery, prevQuery, this.options, prevOptions)) {
+      this.#executeFetch();
     }
 
     // Update result
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _updateResult)[_updateResult](notifyOptions);
+    this.updateResult(notifyOptions);
 
     // Update stale interval if needed
-    if (mounted && (_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery] !== prevQuery || this.options.enabled !== prevOptions.enabled || this.options.staleTime !== prevOptions.staleTime)) {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _updateStaleTimeout)[_updateStaleTimeout]();
+    if (mounted && (this.#currentQuery !== prevQuery || this.options.enabled !== prevOptions.enabled || this.options.staleTime !== prevOptions.staleTime)) {
+      this.#updateStaleTimeout();
     }
-    const nextRefetchInterval = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _computeRefetchInterval)[_computeRefetchInterval]();
+    const nextRefetchInterval = this.#computeRefetchInterval();
 
     // Update refetch interval if needed
-    if (mounted && (_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery] !== prevQuery || this.options.enabled !== prevOptions.enabled || nextRefetchInterval !== _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentRefetchInterval)[_currentRefetchInterval])) {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _updateRefetchInterval)[_updateRefetchInterval](nextRefetchInterval);
+    if (mounted && (this.#currentQuery !== prevQuery || this.options.enabled !== prevOptions.enabled || nextRefetchInterval !== this.#currentRefetchInterval)) {
+      this.#updateRefetchInterval(nextRefetchInterval);
     }
   }
   getOptimisticResult(options) {
-    const query = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client].getQueryCache().build(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client], options);
-    return this.createResult(query, options);
+    const query = this.#client.getQueryCache().build(this.#client, options);
+    const result = this.createResult(query, options);
+    if (shouldAssignObserverCurrentProperties(this, result)) {
+      // this assigns the optimistic result to the current Observer
+      // because if the query function changes, useQuery will be performing
+      // an effect where it would fetch again.
+      // When the fetch finishes, we perform a deep data cloning in order
+      // to reuse objects references. This deep data clone is performed against
+      // the `observer.currentResult.data` property
+      // When QueryKey changes, we refresh the query and get new `optimistic`
+      // result, while we leave the `observer.currentResult`, so when new data
+      // arrives, it finds the old `observer.currentResult` which is related
+      // to the old QueryKey. Which means that currentResult and selectData are
+      // out of sync already.
+      // To solve this, we move the cursor of the currentResult everytime
+      // an observer reads an optimistic value.
+
+      // When keeping the previous data, the result doesn't change until new
+      // data arrives.
+      this.#currentResult = result;
+      this.#currentResultOptions = this.options;
+      this.#currentResultState = this.#currentQuery.state;
+    }
+    return result;
   }
   getCurrentResult() {
-    return _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult];
+    return this.#currentResult;
   }
   trackResult(result) {
     const trackedResult = {};
@@ -210,7 +135,7 @@ class QueryObserver extends subscribable.Subscribable {
         configurable: false,
         enumerable: true,
         get: () => {
-          _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _trackedProps)[_trackedProps].add(key);
+          this.#trackedProps.add(key);
           return result[key];
         }
       });
@@ -218,7 +143,7 @@ class QueryObserver extends subscribable.Subscribable {
     return trackedResult;
   }
   getCurrentQuery() {
-    return _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery];
+    return this.#currentQuery;
   }
   refetch({
     ...options
@@ -228,30 +153,86 @@ class QueryObserver extends subscribable.Subscribable {
     });
   }
   fetchOptimistic(options) {
-    const defaultedOptions = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client].defaultQueryOptions(options);
-    const query = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client].getQueryCache().build(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client], defaultedOptions);
+    const defaultedOptions = this.#client.defaultQueryOptions(options);
+    const query = this.#client.getQueryCache().build(this.#client, defaultedOptions);
     query.isFetchingOptimistic = true;
     return query.fetch().then(() => this.createResult(query, defaultedOptions));
   }
   fetch(fetchOptions) {
-    var _fetchOptions$cancelR;
-    return _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _executeFetch)[_executeFetch]({
+    return this.#executeFetch({
       ...fetchOptions,
-      cancelRefetch: (_fetchOptions$cancelR = fetchOptions.cancelRefetch) != null ? _fetchOptions$cancelR : true
+      cancelRefetch: fetchOptions.cancelRefetch ?? true
     }).then(() => {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _updateResult)[_updateResult]();
-      return _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult];
+      this.updateResult();
+      return this.#currentResult;
     });
   }
+  #executeFetch(fetchOptions) {
+    // Make sure we reference the latest query as the current one might have been removed
+    this.#updateQuery();
+
+    // Fetch
+    let promise = this.#currentQuery.fetch(this.options, fetchOptions);
+    if (!fetchOptions?.throwOnError) {
+      promise = promise.catch(noop);
+    }
+    return promise;
+  }
+  #updateStaleTimeout() {
+    this.#clearStaleTimeout();
+    if (isServer || this.#currentResult.isStale || !isValidTimeout(this.options.staleTime)) {
+      return;
+    }
+    const time = timeUntilStale(this.#currentResult.dataUpdatedAt, this.options.staleTime);
+
+    // The timeout is sometimes triggered 1 ms before the stale time expiration.
+    // To mitigate this issue we always add 1 ms to the timeout.
+    const timeout = time + 1;
+    this.#staleTimeoutId = setTimeout(() => {
+      if (!this.#currentResult.isStale) {
+        this.updateResult();
+      }
+    }, timeout);
+  }
+  #computeRefetchInterval() {
+    return (typeof this.options.refetchInterval === 'function' ? this.options.refetchInterval(this.#currentResult.data, this.#currentQuery) : this.options.refetchInterval) ?? false;
+  }
+  #updateRefetchInterval(nextInterval) {
+    this.#clearRefetchInterval();
+    this.#currentRefetchInterval = nextInterval;
+    if (isServer || this.options.enabled === false || !isValidTimeout(this.#currentRefetchInterval) || this.#currentRefetchInterval === 0) {
+      return;
+    }
+    this.#refetchIntervalId = setInterval(() => {
+      if (this.options.refetchIntervalInBackground || focusManager.isFocused()) {
+        this.#executeFetch();
+      }
+    }, this.#currentRefetchInterval);
+  }
+  #updateTimers() {
+    this.#updateStaleTimeout();
+    this.#updateRefetchInterval(this.#computeRefetchInterval());
+  }
+  #clearStaleTimeout() {
+    if (this.#staleTimeoutId) {
+      clearTimeout(this.#staleTimeoutId);
+      this.#staleTimeoutId = undefined;
+    }
+  }
+  #clearRefetchInterval() {
+    if (this.#refetchIntervalId) {
+      clearInterval(this.#refetchIntervalId);
+      this.#refetchIntervalId = undefined;
+    }
+  }
   createResult(query, options) {
-    const prevQuery = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery];
+    const prevQuery = this.#currentQuery;
     const prevOptions = this.options;
-    const prevResult = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult];
-    const prevResultState = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResultState)[_currentResultState];
-    const prevResultOptions = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResultOptions)[_currentResultOptions];
+    const prevResult = this.#currentResult;
+    const prevResultState = this.#currentResultState;
+    const prevResultOptions = this.#currentResultOptions;
     const queryChange = query !== prevQuery;
-    const queryInitialState = queryChange ? query.state : _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQueryInitialState)[_currentQueryInitialState];
-    const prevQueryResult = queryChange ? _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult] : _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _previousQueryResult)[_previousQueryResult];
+    const queryInitialState = queryChange ? query.state : this.#currentQueryInitialState;
     const {
       state
     } = query;
@@ -270,7 +251,7 @@ class QueryObserver extends subscribable.Subscribable {
       const fetchOnMount = !mounted && shouldFetchOnMount(query, options);
       const fetchOptionally = mounted && shouldFetchOptionally(query, prevQuery, options, prevOptions);
       if (fetchOnMount || fetchOptionally) {
-        fetchStatus = retryer.canFetch(query.options.networkMode) ? 'fetching' : 'paused';
+        fetchStatus = canFetch(query.options.networkMode) ? 'fetching' : 'paused';
         if (!state.dataUpdatedAt) {
           status = 'pending';
         }
@@ -283,17 +264,17 @@ class QueryObserver extends subscribable.Subscribable {
     // Select data if needed
     if (options.select && typeof state.data !== 'undefined') {
       // Memoize select result
-      if (prevResult && state.data === (prevResultState == null ? void 0 : prevResultState.data) && options.select === _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _selectFn)[_selectFn]) {
-        data = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _selectResult)[_selectResult];
+      if (prevResult && state.data === prevResultState?.data && options.select === this.#selectFn) {
+        data = this.#selectResult;
       } else {
         try {
-          _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _selectFn)[_selectFn] = options.select;
+          this.#selectFn = options.select;
           data = options.select(state.data);
-          data = utils.replaceData(prevResult == null ? void 0 : prevResult.data, data, options);
-          _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _selectResult)[_selectResult] = data;
-          _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _selectError)[_selectError] = null;
+          data = replaceData(prevResult?.data, data, options);
+          this.#selectResult = data;
+          this.#selectError = null;
         } catch (selectError) {
-          _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _selectError)[_selectError] = selectError;
+          this.#selectError = selectError;
         }
       }
     }
@@ -307,28 +288,28 @@ class QueryObserver extends subscribable.Subscribable {
       let placeholderData;
 
       // Memoize placeholder data
-      if (prevResult != null && prevResult.isPlaceholderData && options.placeholderData === (prevResultOptions == null ? void 0 : prevResultOptions.placeholderData)) {
+      if (prevResult?.isPlaceholderData && options.placeholderData === prevResultOptions?.placeholderData) {
         placeholderData = prevResult.data;
       } else {
-        placeholderData = typeof options.placeholderData === 'function' ? options.placeholderData(prevQueryResult == null ? void 0 : prevQueryResult.data) : options.placeholderData;
+        placeholderData = typeof options.placeholderData === 'function' ? options.placeholderData(this.#lastQueryWithDefinedData?.state.data, this.#lastQueryWithDefinedData) : options.placeholderData;
         if (options.select && typeof placeholderData !== 'undefined') {
           try {
             placeholderData = options.select(placeholderData);
-            _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _selectError)[_selectError] = null;
+            this.#selectError = null;
           } catch (selectError) {
-            _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _selectError)[_selectError] = selectError;
+            this.#selectError = selectError;
           }
         }
       }
       if (typeof placeholderData !== 'undefined') {
         status = 'success';
-        data = utils.replaceData(prevResult == null ? void 0 : prevResult.data, placeholderData, options);
+        data = replaceData(prevResult?.data, placeholderData, options);
         isPlaceholderData = true;
       }
     }
-    if (_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _selectError)[_selectError]) {
-      error = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _selectError)[_selectError];
-      data = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _selectResult)[_selectResult];
+    if (this.#selectError) {
+      error = this.#selectError;
+      data = this.#selectResult;
       errorUpdatedAt = Date.now();
       status = 'error';
     }
@@ -364,160 +345,86 @@ class QueryObserver extends subscribable.Subscribable {
     };
     return result;
   }
-  onQueryUpdate(action) {
-    const notifyOptions = {};
-    if (action.type === 'success') {
-      notifyOptions.onSuccess = !action.manual;
-    } else if (action.type === 'error' && !retryer.isCancelledError(action.error)) {
-      notifyOptions.onError = true;
-    }
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _updateResult)[_updateResult](notifyOptions);
-    if (this.hasListeners()) {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _updateTimers)[_updateTimers]();
-    }
-  }
-}
-function _executeFetch2(fetchOptions) {
-  // Make sure we reference the latest query as the current one might have been removed
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _updateQuery)[_updateQuery]();
+  updateResult(notifyOptions) {
+    const prevResult = this.#currentResult;
+    const nextResult = this.createResult(this.#currentQuery, this.options);
+    this.#currentResultState = this.#currentQuery.state;
+    this.#currentResultOptions = this.options;
 
-  // Fetch
-  let promise = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery].fetch(this.options, fetchOptions);
-  if (!(fetchOptions != null && fetchOptions.throwOnError)) {
-    promise = promise.catch(utils.noop);
-  }
-  return promise;
-}
-function _updateStaleTimeout2() {
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _clearStaleTimeout)[_clearStaleTimeout]();
-  if (utils.isServer || _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult].isStale || !utils.isValidTimeout(this.options.staleTime)) {
-    return;
-  }
-  const time = utils.timeUntilStale(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult].dataUpdatedAt, this.options.staleTime);
-
-  // The timeout is sometimes triggered 1 ms before the stale time expiration.
-  // To mitigate this issue we always add 1 ms to the timeout.
-  const timeout = time + 1;
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _staleTimeoutId)[_staleTimeoutId] = setTimeout(() => {
-    if (!_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult].isStale) {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _updateResult)[_updateResult]();
+    // Only notify and update result if something has changed
+    if (shallowEqualObjects(nextResult, prevResult)) {
+      return;
     }
-  }, timeout);
-}
-function _computeRefetchInterval2() {
-  var _this$options$refetch;
-  return typeof this.options.refetchInterval === 'function' ? this.options.refetchInterval(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult].data, _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery]) : (_this$options$refetch = this.options.refetchInterval) != null ? _this$options$refetch : false;
-}
-function _updateRefetchInterval2(nextInterval) {
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _clearRefetchInterval)[_clearRefetchInterval]();
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentRefetchInterval)[_currentRefetchInterval] = nextInterval;
-  if (utils.isServer || this.options.enabled === false || !utils.isValidTimeout(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentRefetchInterval)[_currentRefetchInterval]) || _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentRefetchInterval)[_currentRefetchInterval] === 0) {
-    return;
-  }
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _refetchIntervalId)[_refetchIntervalId] = setInterval(() => {
-    if (this.options.refetchIntervalInBackground || focusManager.focusManager.isFocused()) {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _executeFetch)[_executeFetch]();
+    if (this.#currentResultState.data !== undefined) {
+      this.#lastQueryWithDefinedData = this.#currentQuery;
     }
-  }, _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentRefetchInterval)[_currentRefetchInterval]);
-}
-function _updateTimers2() {
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _updateStaleTimeout)[_updateStaleTimeout]();
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _updateRefetchInterval)[_updateRefetchInterval](_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _computeRefetchInterval)[_computeRefetchInterval]());
-}
-function _clearStaleTimeout2() {
-  if (_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _staleTimeoutId)[_staleTimeoutId]) {
-    clearTimeout(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _staleTimeoutId)[_staleTimeoutId]);
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _staleTimeoutId)[_staleTimeoutId] = undefined;
-  }
-}
-function _clearRefetchInterval2() {
-  if (_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _refetchIntervalId)[_refetchIntervalId]) {
-    clearInterval(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _refetchIntervalId)[_refetchIntervalId]);
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _refetchIntervalId)[_refetchIntervalId] = undefined;
-  }
-}
-function _updateResult2(notifyOptions) {
-  const prevResult = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult];
-  const nextResult = this.createResult(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery], this.options);
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResultState)[_currentResultState] = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery].state;
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResultOptions)[_currentResultOptions] = this.options;
+    this.#currentResult = nextResult;
 
-  // Only notify and update result if something has changed
-  if (utils.shallowEqualObjects(nextResult, prevResult)) {
-    return;
-  }
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult] = nextResult;
-
-  // Determine which callbacks to trigger
-  const defaultNotifyOptions = {};
-  const shouldNotifyListeners = () => {
-    if (!prevResult) {
-      return true;
-    }
-    const {
-      notifyOnChangeProps
-    } = this.options;
-    if (notifyOnChangeProps === 'all' || !notifyOnChangeProps && !_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _trackedProps)[_trackedProps].size) {
-      return true;
-    }
-    const includedProps = new Set(notifyOnChangeProps != null ? notifyOnChangeProps : _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _trackedProps)[_trackedProps]);
-    if (this.options.throwErrors) {
-      includedProps.add('error');
+    // Determine which callbacks to trigger
+    const defaultNotifyOptions = {};
+    const shouldNotifyListeners = () => {
+      if (!prevResult) {
+        return true;
+      }
+      const {
+        notifyOnChangeProps
+      } = this.options;
+      if (notifyOnChangeProps === 'all' || !notifyOnChangeProps && !this.#trackedProps.size) {
+        return true;
+      }
+      const includedProps = new Set(notifyOnChangeProps ?? this.#trackedProps);
+      if (this.options.throwOnError) {
+        includedProps.add('error');
+      }
+      return Object.keys(this.#currentResult).some(key => {
+        const typedKey = key;
+        const changed = this.#currentResult[typedKey] !== prevResult[typedKey];
+        return changed && includedProps.has(typedKey);
+      });
+    };
+    if (notifyOptions?.listeners !== false && shouldNotifyListeners()) {
+      defaultNotifyOptions.listeners = true;
     }
-    return Object.keys(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult]).some(key => {
-      const typedKey = key;
-      const changed = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult][typedKey] !== prevResult[typedKey];
-      return changed && includedProps.has(typedKey);
+    this.#notify({
+      ...defaultNotifyOptions,
+      ...notifyOptions
     });
-  };
-  if ((notifyOptions == null ? void 0 : notifyOptions.listeners) !== false && shouldNotifyListeners()) {
-    defaultNotifyOptions.listeners = true;
   }
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _notify)[_notify]({
-    ...defaultNotifyOptions,
-    ...notifyOptions
-  });
-}
-function _updateQuery2() {
-  const query = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client].getQueryCache().build(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client], this.options);
-  if (query === _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery]) {
-    return;
-  }
-  const prevQuery = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery];
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery] = query;
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQueryInitialState)[_currentQueryInitialState] = query.state;
-  _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _previousQueryResult)[_previousQueryResult] = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult];
-  if (this.hasListeners()) {
-    prevQuery == null ? void 0 : prevQuery.removeObserver(this);
-    query.addObserver(this);
+  #updateQuery() {
+    const query = this.#client.getQueryCache().build(this.#client, this.options);
+    if (query === this.#currentQuery) {
+      return;
+    }
+    const prevQuery = this.#currentQuery;
+    this.#currentQuery = query;
+    this.#currentQueryInitialState = query.state;
+    if (this.hasListeners()) {
+      prevQuery?.removeObserver(this);
+      query.addObserver(this);
+    }
   }
-}
-function _notify2(notifyOptions) {
-  notifyManager.notifyManager.batch(() => {
-    // First trigger the configuration callbacks
-    if (notifyOptions.onSuccess) {
-      var _this$options$onSucce, _this$options, _this$options$onSettl, _this$options2;
-      (_this$options$onSucce = (_this$options = this.options).onSuccess) == null ? void 0 : _this$options$onSucce.call(_this$options, _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult].data);
-      (_this$options$onSettl = (_this$options2 = this.options).onSettled) == null ? void 0 : _this$options$onSettl.call(_this$options2, _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult].data, null);
-    } else if (notifyOptions.onError) {
-      var _this$options$onError, _this$options3, _this$options$onSettl2, _this$options4;
-      (_this$options$onError = (_this$options3 = this.options).onError) == null ? void 0 : _this$options$onError.call(_this$options3, _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult].error);
-      (_this$options$onSettl2 = (_this$options4 = this.options).onSettled) == null ? void 0 : _this$options$onSettl2.call(_this$options4, undefined, _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult].error);
+  onQueryUpdate() {
+    this.updateResult();
+    if (this.hasListeners()) {
+      this.#updateTimers();
     }
+  }
+  #notify(notifyOptions) {
+    notifyManager.batch(() => {
+      // First, trigger the listeners
+      if (notifyOptions.listeners) {
+        this.listeners.forEach(listener => {
+          listener(this.#currentResult);
+        });
+      }
 
-    // Then trigger the listeners
-    if (notifyOptions.listeners) {
-      this.listeners.forEach(listener => {
-        listener(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentResult)[_currentResult]);
+      // Then the cache listeners
+      this.#client.getQueryCache().notify({
+        query: this.#currentQuery,
+        type: 'observerResultsUpdated'
       });
-    }
-
-    // Then the cache listeners
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _client)[_client].getQueryCache().notify({
-      query: _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _currentQuery)[_currentQuery],
-      type: 'observerResultsUpdated'
     });
-  });
+  }
 }
 function shouldLoadOnMount(query, options) {
   return options.enabled !== false && !query.state.dataUpdatedAt && !(query.state.status === 'error' && options.retryOnMount === false);
@@ -539,5 +446,18 @@ function isStale(query, options) {
   return query.isStaleByTime(options.staleTime);
 }
 
-exports.QueryObserver = QueryObserver;
+// this function would decide if we will update the observer's 'current'
+// properties after an optimistic reading via getOptimisticResult
+function shouldAssignObserverCurrentProperties(observer, optimisticResult) {
+  // if the newly created result isn't what the observer is holding as current,
+  // then we'll need to update the properties as well
+  if (observer.getCurrentResult() !== optimisticResult) {
+    return true;
+  }
+
+  // basically, just keep previous properties if nothing changed
+  return false;
+}
+
+export { QueryObserver };
 //# sourceMappingURL=queryObserver.js.map