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

package/build/lib/query.js

@@ -1,108 +1,72 @@
-'use strict';
-
-var _rollupPluginBabelHelpers = require('./_virtual/_rollupPluginBabelHelpers.js');
-var utils = require('./utils.js');
-var notifyManager = require('./notifyManager.js');
-var retryer = require('./retryer.js');
-var removable = require('./removable.js');
+import { replaceData, noop, timeUntilStale } from './utils.js';
+import { notifyManager } from './notifyManager.js';
+import { createRetryer, isCancelledError, canFetch } from './retryer.js';
+import { Removable } from './removable.js';
 
 // TYPES
-var _initialState = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("initialState");
-var _revertState = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("revertState");
-var _cache = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("cache");
-var _promise = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("promise");
-var _retryer = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("retryer");
-var _observers = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("observers");
-var _defaultOptions = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("defaultOptions");
-var _abortSignalConsumed = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("abortSignalConsumed");
-var _setOptions = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("setOptions");
-var _dispatch = /*#__PURE__*/_rollupPluginBabelHelpers.classPrivateFieldLooseKey("dispatch");
+
 // CLASS
 
-class Query extends removable.Removable {
+class Query extends Removable {
+  #initialState;
+  #revertState;
+  #cache;
+  #promise;
+  #retryer;
+  #observers;
+  #defaultOptions;
+  #abortSignalConsumed;
   constructor(config) {
     super();
-    Object.defineProperty(this, _dispatch, {
-      value: _dispatch2
-    });
-    Object.defineProperty(this, _setOptions, {
-      value: _setOptions2
-    });
-    Object.defineProperty(this, _initialState, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _revertState, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _cache, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _promise, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _retryer, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _observers, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _defaultOptions, {
-      writable: true,
-      value: void 0
-    });
-    Object.defineProperty(this, _abortSignalConsumed, {
-      writable: true,
-      value: void 0
-    });
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _abortSignalConsumed)[_abortSignalConsumed] = false;
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _defaultOptions)[_defaultOptions] = config.defaultOptions;
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _setOptions)[_setOptions](config.options);
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers] = [];
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _cache)[_cache] = config.cache;
+    this.#abortSignalConsumed = false;
+    this.#defaultOptions = config.defaultOptions;
+    this.#setOptions(config.options);
+    this.#observers = [];
+    this.#cache = config.cache;
     this.queryKey = config.queryKey;
     this.queryHash = config.queryHash;
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _initialState)[_initialState] = config.state || getDefaultState(this.options);
-    this.state = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _initialState)[_initialState];
+    this.#initialState = config.state || getDefaultState(this.options);
+    this.state = this.#initialState;
     this.scheduleGc();
   }
   get meta() {
     return this.options.meta;
   }
+  #setOptions(options) {
+    this.options = {
+      ...this.#defaultOptions,
+      ...options
+    };
+    this.updateGcTime(this.options.gcTime);
+  }
   optionalRemove() {
-    if (!_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].length && this.state.fetchStatus === 'idle') {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _cache)[_cache].remove(this);
+    if (!this.#observers.length && this.state.fetchStatus === 'idle') {
+      this.#cache.remove(this);
     }
   }
   setData(newData, options) {
-    const data = utils.replaceData(this.state.data, newData, this.options);
+    const data = replaceData(this.state.data, newData, this.options);
 
     // Set data and mark it as cached
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _dispatch)[_dispatch]({
+    this.#dispatch({
       data,
       type: 'success',
-      dataUpdatedAt: options == null ? void 0 : options.updatedAt,
-      manual: options == null ? void 0 : options.manual
+      dataUpdatedAt: options?.updatedAt,
+      manual: options?.manual
     });
     return data;
   }
   setState(state, setStateOptions) {
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _dispatch)[_dispatch]({
+    this.#dispatch({
       type: 'setState',
       state,
       setStateOptions
     });
   }
   cancel(options) {
-    var _classPrivateFieldLoo;
-    const promise = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _promise)[_promise];
-    (_classPrivateFieldLoo = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _retryer)[_retryer]) == null ? void 0 : _classPrivateFieldLoo.cancel(options);
-    return promise ? promise.then(utils.noop).catch(utils.noop) : Promise.resolve();
+    const promise = this.#promise;
+    this.#retryer?.cancel(options);
+    return promise ? promise.then(noop).catch(noop) : Promise.resolve();
   }
   destroy() {
     super.destroy();
@@ -112,47 +76,45 @@ class Query extends removable.Removable {
   }
   reset() {
     this.destroy();
-    this.setState(_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _initialState)[_initialState]);
+    this.setState(this.#initialState);
   }
   isActive() {
-    return _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].some(observer => observer.options.enabled !== false);
+    return this.#observers.some(observer => observer.options.enabled !== false);
   }
   isDisabled() {
     return this.getObserversCount() > 0 && !this.isActive();
   }
   isStale() {
-    return this.state.isInvalidated || !this.state.dataUpdatedAt || _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].some(observer => observer.getCurrentResult().isStale);
+    return this.state.isInvalidated || !this.state.dataUpdatedAt || this.#observers.some(observer => observer.getCurrentResult().isStale);
   }
   isStaleByTime(staleTime = 0) {
-    return this.state.isInvalidated || !this.state.dataUpdatedAt || !utils.timeUntilStale(this.state.dataUpdatedAt, staleTime);
+    return this.state.isInvalidated || !this.state.dataUpdatedAt || !timeUntilStale(this.state.dataUpdatedAt, staleTime);
   }
   onFocus() {
-    var _classPrivateFieldLoo2;
-    const observer = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].find(x => x.shouldFetchOnWindowFocus());
-    observer == null ? void 0 : observer.refetch({
+    const observer = this.#observers.find(x => x.shouldFetchOnWindowFocus());
+    observer?.refetch({
       cancelRefetch: false
     });
 
     // Continue fetch if currently paused
-    (_classPrivateFieldLoo2 = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _retryer)[_retryer]) == null ? void 0 : _classPrivateFieldLoo2.continue();
+    this.#retryer?.continue();
   }
   onOnline() {
-    var _classPrivateFieldLoo3;
-    const observer = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].find(x => x.shouldFetchOnReconnect());
-    observer == null ? void 0 : observer.refetch({
+    const observer = this.#observers.find(x => x.shouldFetchOnReconnect());
+    observer?.refetch({
       cancelRefetch: false
     });
 
     // Continue fetch if currently paused
-    (_classPrivateFieldLoo3 = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _retryer)[_retryer]) == null ? void 0 : _classPrivateFieldLoo3.continue();
+    this.#retryer?.continue();
   }
   addObserver(observer) {
-    if (_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].indexOf(observer) === -1) {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].push(observer);
+    if (!this.#observers.includes(observer)) {
+      this.#observers.push(observer);
 
       // Stop the query from being garbage collected
       this.clearGcTimeout();
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _cache)[_cache].notify({
+      this.#cache.notify({
         type: 'observerAdded',
         query: this,
         observer
@@ -160,23 +122,23 @@ class Query extends removable.Removable {
     }
   }
   removeObserver(observer) {
-    if (_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].indexOf(observer) !== -1) {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers] = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].filter(x => x !== observer);
-      if (!_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].length) {
+    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
         // we'll let the query continue so the result can be cached
-        if (_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _retryer)[_retryer]) {
-          if (_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _abortSignalConsumed)[_abortSignalConsumed]) {
-            _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _retryer)[_retryer].cancel({
+        if (this.#retryer) {
+          if (this.#abortSignalConsumed) {
+            this.#retryer.cancel({
               revert: true
             });
           } else {
-            _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _retryer)[_retryer].cancelRetry();
+            this.#retryer.cancelRetry();
           }
         }
         this.scheduleGc();
       }
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _cache)[_cache].notify({
+      this.#cache.notify({
         type: 'observerRemoved',
         query: this,
         observer
@@ -184,43 +146,41 @@ class Query extends removable.Removable {
     }
   }
   getObserversCount() {
-    return _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].length;
+    return this.#observers.length;
   }
   invalidate() {
     if (!this.state.isInvalidated) {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _dispatch)[_dispatch]({
+      this.#dispatch({
         type: 'invalidate'
       });
     }
   }
   fetch(options, fetchOptions) {
-    var _this$options$behavio, _context$fetchOptions;
     if (this.state.fetchStatus !== 'idle') {
-      if (this.state.dataUpdatedAt && fetchOptions != null && fetchOptions.cancelRefetch) {
+      if (this.state.dataUpdatedAt && fetchOptions?.cancelRefetch) {
         // Silently cancel current fetch if the user wants to cancel refetches
         this.cancel({
           silent: true
         });
-      } else if (_rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _promise)[_promise]) {
-        var _classPrivateFieldLoo4;
+      } else if (this.#promise) {
         // make sure that retries that were potentially cancelled due to unmounts can continue
-        (_classPrivateFieldLoo4 = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _retryer)[_retryer]) == null ? void 0 : _classPrivateFieldLoo4.continueRetry();
+        this.#retryer?.continueRetry();
         // Return current promise if we are already fetching
-        return _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _promise)[_promise];
+        return this.#promise;
       }
     }
 
     // Update config if passed, otherwise the config from the last execution is used
     if (options) {
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _setOptions)[_setOptions](options);
+      this.#setOptions(options);
     }
 
     // Use the options from the first observer with a query function if no function is found.
     // This can happen when the query is hydrated or created with setQueryData.
     if (!this.options.queryFn) {
-      const observer = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].find(x => x.options.queryFn);
+      const observer = this.#observers.find(x => x.options.queryFn);
       if (observer) {
-        _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _setOptions)[_setOptions](observer.options);
+        this.#setOptions(observer.options);
       }
     }
     if (process.env.NODE_ENV !== 'production') {
@@ -243,7 +203,7 @@ class Query extends removable.Removable {
       Object.defineProperty(object, 'signal', {
         enumerable: true,
         get: () => {
-          _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _abortSignalConsumed)[_abortSignalConsumed] = true;
+          this.#abortSignalConsumed = true;
           return abortController.signal;
         }
       });
@@ -253,9 +213,9 @@ class Query extends removable.Removable {
     // Create fetch function
     const fetchFn = () => {
       if (!this.options.queryFn) {
-        return Promise.reject(new Error('Missing queryFn'));
+        return Promise.reject(new Error(`Missing queryFn: '${this.options.queryHash}'`));
       }
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _abortSignalConsumed)[_abortSignalConsumed] = false;
+      this.#abortSignalConsumed = false;
       return this.options.queryFn(queryFnContext);
     };
 
@@ -268,32 +228,30 @@ class Query extends removable.Removable {
       fetchFn
     };
     addSignalProperty(context);
-    (_this$options$behavio = this.options.behavior) == null ? void 0 : _this$options$behavio.onFetch(context);
+    this.options.behavior?.onFetch(context);
 
     // Store state in case the current fetch needs to be reverted
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _revertState)[_revertState] = this.state;
+    this.#revertState = this.state;
 
     // Set to fetching state if not already in it
-    if (this.state.fetchStatus === 'idle' || this.state.fetchMeta !== ((_context$fetchOptions = context.fetchOptions) == null ? void 0 : _context$fetchOptions.meta)) {
-      var _context$fetchOptions2;
-      _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _dispatch)[_dispatch]({
+    if (this.state.fetchStatus === 'idle' || this.state.fetchMeta !== context.fetchOptions?.meta) {
+      this.#dispatch({
         type: 'fetch',
-        meta: (_context$fetchOptions2 = context.fetchOptions) == null ? void 0 : _context$fetchOptions2.meta
+        meta: context.fetchOptions?.meta
       });
     }
     const onError = error => {
       // Optimistically update state if needed
-      if (!(retryer.isCancelledError(error) && error.silent)) {
-        _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _dispatch)[_dispatch]({
+      if (!(isCancelledError(error) && error.silent)) {
+        this.#dispatch({
           type: 'error',
           error: error
         });
       }
-      if (!retryer.isCancelledError(error)) {
-        var _classPrivateFieldLoo5, _classPrivateFieldLoo6, _classPrivateFieldLoo7, _classPrivateFieldLoo8;
+      if (!isCancelledError(error)) {
         // Notify cache callback
-        (_classPrivateFieldLoo5 = (_classPrivateFieldLoo6 = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _cache)[_cache].config).onError) == null ? void 0 : _classPrivateFieldLoo5.call(_classPrivateFieldLoo6, error, this);
-        (_classPrivateFieldLoo7 = (_classPrivateFieldLoo8 = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _cache)[_cache].config).onSettled) == null ? void 0 : _classPrivateFieldLoo7.call(_classPrivateFieldLoo8, this.state.data, error, this);
+        this.#cache.config.onError?.(error, this);
+        this.#cache.config.onSettled?.(this.state.data, error, this);
       }
       if (!this.isFetchingOptimistic) {
         // Schedule query gc after fetching
@@ -303,23 +261,22 @@ class Query extends removable.Removable {
     };
 
     // Try to fetch the data
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _retryer)[_retryer] = retryer.createRetryer({
+    this.#retryer = createRetryer({
       fn: context.fetchFn,
       abort: abortController.abort.bind(abortController),
       onSuccess: data => {
-        var _classPrivateFieldLoo9, _classPrivateFieldLoo10, _classPrivateFieldLoo11, _classPrivateFieldLoo12;
         if (typeof data === 'undefined') {
           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);
 
         // Notify cache callback
-        (_classPrivateFieldLoo9 = (_classPrivateFieldLoo10 = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _cache)[_cache].config).onSuccess) == null ? void 0 : _classPrivateFieldLoo9.call(_classPrivateFieldLoo10, data, this);
-        (_classPrivateFieldLoo11 = (_classPrivateFieldLoo12 = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _cache)[_cache].config).onSettled) == null ? void 0 : _classPrivateFieldLoo11.call(_classPrivateFieldLoo12, data, this.state.error, this);
+        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();
@@ -328,19 +285,19 @@ class Query extends removable.Removable {
       },
       onError,
       onFail: (failureCount, error) => {
-        _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _dispatch)[_dispatch]({
+        this.#dispatch({
           type: 'failed',
           failureCount,
           error
         });
       },
       onPause: () => {
-        _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _dispatch)[_dispatch]({
+        this.#dispatch({
           type: 'pause'
         });
       },
       onContinue: () => {
-        _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _dispatch)[_dispatch]({
+        this.#dispatch({
           type: 'continue'
         });
       },
@@ -348,104 +305,96 @@ class Query extends removable.Removable {
       retryDelay: context.options.retryDelay,
       networkMode: context.options.networkMode
     });
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _promise)[_promise] = _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _retryer)[_retryer].promise;
-    return _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _promise)[_promise];
+    this.#promise = this.#retryer.promise;
+    return this.#promise;
   }
-}
-function _setOptions2(options) {
-  this.options = {
-    ..._rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _defaultOptions)[_defaultOptions],
-    ...options
-  };
-  this.updateGcTime(this.options.gcTime);
-}
-function _dispatch2(action) {
-  const reducer = state => {
-    var _action$meta, _action$dataUpdatedAt;
-    switch (action.type) {
-      case 'failed':
-        return {
-          ...state,
-          fetchFailureCount: action.failureCount,
-          fetchFailureReason: action.error
-        };
-      case 'pause':
-        return {
-          ...state,
-          fetchStatus: 'paused'
-        };
-      case 'continue':
-        return {
-          ...state,
-          fetchStatus: 'fetching'
-        };
-      case 'fetch':
-        return {
-          ...state,
-          fetchFailureCount: 0,
-          fetchFailureReason: null,
-          fetchMeta: (_action$meta = action.meta) != null ? _action$meta : null,
-          fetchStatus: retryer.canFetch(this.options.networkMode) ? 'fetching' : 'paused',
-          ...(!state.dataUpdatedAt && {
+  #dispatch(action) {
+    const reducer = state => {
+      switch (action.type) {
+        case 'failed':
+          return {
+            ...state,
+            fetchFailureCount: action.failureCount,
+            fetchFailureReason: action.error
+          };
+        case 'pause':
+          return {
+            ...state,
+            fetchStatus: 'paused'
+          };
+        case 'continue':
+          return {
+            ...state,
+            fetchStatus: 'fetching'
+          };
+        case 'fetch':
+          return {
+            ...state,
+            fetchFailureCount: 0,
+            fetchFailureReason: null,
+            fetchMeta: action.meta ?? null,
+            fetchStatus: canFetch(this.options.networkMode) ? 'fetching' : 'paused',
+            ...(!state.dataUpdatedAt && {
+              error: null,
+              status: 'pending'
+            })
+          };
+        case 'success':
+          return {
+            ...state,
+            data: action.data,
+            dataUpdateCount: state.dataUpdateCount + 1,
+            dataUpdatedAt: action.dataUpdatedAt ?? Date.now(),
             error: null,
-            status: 'pending'
-          })
-        };
-      case 'success':
-        return {
-          ...state,
-          data: action.data,
-          dataUpdateCount: state.dataUpdateCount + 1,
-          dataUpdatedAt: (_action$dataUpdatedAt = action.dataUpdatedAt) != null ? _action$dataUpdatedAt : Date.now(),
-          error: null,
-          isInvalidated: false,
-          status: 'success',
-          ...(!action.manual && {
+            isInvalidated: false,
+            status: 'success',
+            ...(!action.manual && {
+              fetchStatus: 'idle',
+              fetchFailureCount: 0,
+              fetchFailureReason: null
+            })
+          };
+        case 'error':
+          const error = action.error;
+          if (isCancelledError(error) && error.revert && this.#revertState) {
+            return {
+              ...this.#revertState
+            };
+          }
+          return {
+            ...state,
+            error: error,
+            errorUpdateCount: state.errorUpdateCount + 1,
+            errorUpdatedAt: Date.now(),
+            fetchFailureCount: state.fetchFailureCount + 1,
+            fetchFailureReason: error,
             fetchStatus: 'idle',
-            fetchFailureCount: 0,
-            fetchFailureReason: null
-          })
-        };
-      case 'error':
-        const error = action.error;
-        if (retryer.isCancelledError(error) && error.revert && _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _revertState)[_revertState]) {
+            status: 'error'
+          };
+        case 'invalidate':
           return {
-            ..._rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _revertState)[_revertState]
+            ...state,
+            isInvalidated: true
           };
-        }
-        return {
-          ...state,
-          error: error,
-          errorUpdateCount: state.errorUpdateCount + 1,
-          errorUpdatedAt: Date.now(),
-          fetchFailureCount: state.fetchFailureCount + 1,
-          fetchFailureReason: error,
-          fetchStatus: 'idle',
-          status: 'error'
-        };
-      case 'invalidate':
-        return {
-          ...state,
-          isInvalidated: true
-        };
-      case 'setState':
-        return {
-          ...state,
-          ...action.state
-        };
-    }
-  };
-  this.state = reducer(this.state);
-  notifyManager.notifyManager.batch(() => {
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _observers)[_observers].forEach(observer => {
-      observer.onQueryUpdate(action);
-    });
-    _rollupPluginBabelHelpers.classPrivateFieldLooseBase(this, _cache)[_cache].notify({
-      query: this,
-      type: 'updated',
-      action
+        case 'setState':
+          return {
+            ...state,
+            ...action.state
+          };
+      }
+    };
+    this.state = reducer(this.state);
+    notifyManager.batch(() => {
+      this.#observers.forEach(observer => {
+        observer.onQueryUpdate();
+      });
+      this.#cache.notify({
+        query: this,
+        type: 'updated',
+        action
+      });
     });
-  });
+  }
 }
 function getDefaultState(options) {
   const data = typeof options.initialData === 'function' ? options.initialData() : options.initialData;
@@ -454,7 +403,7 @@ function getDefaultState(options) {
   return {
     data,
     dataUpdateCount: 0,
-    dataUpdatedAt: hasData ? initialDataUpdatedAt != null ? initialDataUpdatedAt : Date.now() : 0,
+    dataUpdatedAt: hasData ? initialDataUpdatedAt ?? Date.now() : 0,
     error: null,
     errorUpdateCount: 0,
     errorUpdatedAt: 0,
@@ -467,5 +416,5 @@ function getDefaultState(options) {
   };
 }
 
-exports.Query = Query;
+export { Query };
 //# sourceMappingURL=query.js.map