@tanstack/query-core - npm Package Compare versions

Comparing version 5.28.2 to 5.28.4

build/legacy/hydration.d.ts

@@ -1,2 +0,2 @@
-import { p as Mutation, o as Query, K as QueryOptions, aw as MutationOptions, b as QueryClient, as as MutationKey, q as MutationState, au as MutationMeta, t as QueryKey, n as QueryState, F as QueryMeta } from './queryClient-UWB6EkqM.js';
+import { p as Mutation, o as Query, K as QueryOptions, aw as MutationOptions, b as QueryClient, as as MutationKey, q as MutationState, au as MutationMeta, t as QueryKey, n as QueryState, F as QueryMeta } from './queryClient-6vLRMq5C.js';
 import './removable.js';
@@ -3,0 +3,0 @@ import './subscribable.js';

build/legacy/index.d.ts

@@ -1,2 +0,2 @@
-export { aI as CancelOptions, C as CancelledError, v as DataTag, D as DefaultError, aH as DefaultOptions, _ as DefaultedInfiniteQueryObserverOptions, Y as DefaultedQueryObserverOptions, aq as DefinedInfiniteQueryObserverResult, ai as DefinedQueryObserverResult, a0 as EnsureQueryDataOptions, a1 as FetchInfiniteQueryOptions, a8 as FetchNextPageOptions, a9 as FetchPreviousPageOptions, $ as FetchQueryOptions, ab as FetchStatus, B as GetNextPageParamFunction, G as GetPreviousPageParamFunction, E as InfiniteData, ak as InfiniteQueryObserverBaseResult, an as InfiniteQueryObserverLoadingErrorResult, am as InfiniteQueryObserverLoadingResult, Z as InfiniteQueryObserverOptions, al as InfiniteQueryObserverPendingResult, ao as InfiniteQueryObserverRefetchErrorResult, ar as InfiniteQueryObserverResult, ap as InfiniteQueryObserverSuccessResult, O as InfiniteQueryPageParamsOptions, I as InitialDataFunction, L as InitialPageParam, a6 as InvalidateOptions, a4 as InvalidateQueryFilters, az as MutateFunction, ay as MutateOptions, p as Mutation, M as MutationCache, d as MutationCacheNotifyEvent, g as MutationFilters, av as MutationFunction, as as MutationKey, au as MutationMeta, e as MutationObserver, aA as MutationObserverBaseResult, aD as MutationObserverErrorResult, aB as MutationObserverIdleResult, aC as MutationObserverLoadingResult, ax as MutationObserverOptions, aF as MutationObserverResult, aE as MutationObserverSuccessResult, aw as MutationOptions, q as MutationState, at as MutationStatus, H as NetworkMode, N as NoInfer, aL as NotifyEvent, aK as NotifyEventType, J as NotifyOnChangeProps, X as Optional, P as PlaceholderDataFunction, z as QueriesPlaceholderDataFunction, o as Query, Q as QueryCache, a as QueryCacheNotifyEvent, b as QueryClient, aG as QueryClientConfig, j as QueryFilters, w as QueryFunction, y as QueryFunctionContext, t as QueryKey, A as QueryKeyHashFunction, F as QueryMeta, c as QueryObserver, ac as QueryObserverBaseResult, af as QueryObserverLoadingErrorResult, ae as QueryObserverLoadingResult, V as QueryObserverOptions, ad as QueryObserverPendingResult, ag as QueryObserverRefetchErrorResult, aj as QueryObserverResult, ah as QueryObserverSuccessResult, K as QueryOptions, x as QueryPersister, n as QueryState, aa as QueryStatus, a3 as RefetchOptions, a5 as RefetchQueryFilters, R as Register, a7 as ResetOptions, a2 as ResultOptions, aJ as SetDataOptions, S as SkipToken, T as ThrowOnError, U as Updater, W as WithRequired, u as dataTagSymbol, h as hashKey, l as isCancelledError, i as isServer, k as keepPreviousData, f as matchMutation, m as matchQuery, r as replaceEqualDeep, s as skipToken } from './queryClient-UWB6EkqM.js';
+export { aI as CancelOptions, C as CancelledError, v as DataTag, D as DefaultError, aH as DefaultOptions, _ as DefaultedInfiniteQueryObserverOptions, Y as DefaultedQueryObserverOptions, aq as DefinedInfiniteQueryObserverResult, ai as DefinedQueryObserverResult, a0 as EnsureQueryDataOptions, a1 as FetchInfiniteQueryOptions, a8 as FetchNextPageOptions, a9 as FetchPreviousPageOptions, $ as FetchQueryOptions, ab as FetchStatus, B as GetNextPageParamFunction, G as GetPreviousPageParamFunction, E as InfiniteData, ak as InfiniteQueryObserverBaseResult, an as InfiniteQueryObserverLoadingErrorResult, am as InfiniteQueryObserverLoadingResult, Z as InfiniteQueryObserverOptions, al as InfiniteQueryObserverPendingResult, ao as InfiniteQueryObserverRefetchErrorResult, ar as InfiniteQueryObserverResult, ap as InfiniteQueryObserverSuccessResult, O as InfiniteQueryPageParamsOptions, I as InitialDataFunction, L as InitialPageParam, a6 as InvalidateOptions, a4 as InvalidateQueryFilters, az as MutateFunction, ay as MutateOptions, p as Mutation, M as MutationCache, d as MutationCacheNotifyEvent, g as MutationFilters, av as MutationFunction, as as MutationKey, au as MutationMeta, e as MutationObserver, aA as MutationObserverBaseResult, aD as MutationObserverErrorResult, aB as MutationObserverIdleResult, aC as MutationObserverLoadingResult, ax as MutationObserverOptions, aF as MutationObserverResult, aE as MutationObserverSuccessResult, aw as MutationOptions, q as MutationState, at as MutationStatus, H as NetworkMode, N as NoInfer, aL as NotifyEvent, aK as NotifyEventType, J as NotifyOnChangeProps, X as Optional, P as PlaceholderDataFunction, z as QueriesPlaceholderDataFunction, o as Query, Q as QueryCache, a as QueryCacheNotifyEvent, b as QueryClient, aG as QueryClientConfig, j as QueryFilters, w as QueryFunction, y as QueryFunctionContext, t as QueryKey, A as QueryKeyHashFunction, F as QueryMeta, c as QueryObserver, ac as QueryObserverBaseResult, af as QueryObserverLoadingErrorResult, ae as QueryObserverLoadingResult, V as QueryObserverOptions, ad as QueryObserverPendingResult, ag as QueryObserverRefetchErrorResult, aj as QueryObserverResult, ah as QueryObserverSuccessResult, K as QueryOptions, x as QueryPersister, n as QueryState, aa as QueryStatus, a3 as RefetchOptions, a5 as RefetchQueryFilters, R as Register, a7 as ResetOptions, a2 as ResultOptions, aJ as SetDataOptions, S as SkipToken, T as ThrowOnError, U as Updater, W as WithRequired, u as dataTagSymbol, h as hashKey, l as isCancelledError, i as isServer, k as keepPreviousData, f as matchMutation, m as matchQuery, r as replaceEqualDeep, s as skipToken } from './queryClient-6vLRMq5C.js';
 export { QueriesObserver, QueriesObserverOptions } from './queriesObserver.js';
@@ -3,0 +3,0 @@ export { InfiniteQueryObserver } from './infiniteQueryObserver.js';

build/legacy/infiniteQueryBehavior.d.ts

@@ -1,2 +0,2 @@
-import { aM as QueryBehavior, E as InfiniteData, O as InfiniteQueryPageParamsOptions } from './queryClient-UWB6EkqM.js';
+import { aM as QueryBehavior, E as InfiniteData, O as InfiniteQueryPageParamsOptions } from './queryClient-6vLRMq5C.js';
 import './removable.js';
@@ -3,0 +3,0 @@ import './subscribable.js';

build/legacy/infiniteQueryObserver.d.ts

@@ -1,2 +0,2 @@
-import { D as DefaultError, E as InfiniteData, t as QueryKey, c as QueryObserver, ar as InfiniteQueryObserverResult, aN as ObserverFetchOptions, b as QueryClient, Z as InfiniteQueryObserverOptions, aO as NotifyOptions, _ as DefaultedInfiniteQueryObserverOptions, a8 as FetchNextPageOptions, a9 as FetchPreviousPageOptions, o as Query } from './queryClient-UWB6EkqM.js';
+import { D as DefaultError, E as InfiniteData, t as QueryKey, c as QueryObserver, ar as InfiniteQueryObserverResult, aN as ObserverFetchOptions, b as QueryClient, Z as InfiniteQueryObserverOptions, aO as NotifyOptions, _ as DefaultedInfiniteQueryObserverOptions, a8 as FetchNextPageOptions, a9 as FetchPreviousPageOptions, o as Query } from './queryClient-6vLRMq5C.js';
 import './removable.js';
@@ -3,0 +3,0 @@ import './subscribable.js';

build/legacy/mutation.d.ts

 import './removable.js';
-export { b1 as Action, p as Mutation, q as MutationState, b2 as getDefaultState } from './queryClient-UWB6EkqM.js';
+export { b1 as Action, p as Mutation, q as MutationState, b2 as getDefaultState } from './queryClient-6vLRMq5C.js';
 import './subscribable.js';

build/legacy/mutationCache.d.ts

@@ -1,3 +0,3 @@
-export { M as MutationCache, d as MutationCacheNotifyEvent } from './queryClient-UWB6EkqM.js';
+export { M as MutationCache, d as MutationCacheNotifyEvent } from './queryClient-6vLRMq5C.js';
 import './subscribable.js';
 import './removable.js';

build/legacy/mutationObserver.d.ts

 import './subscribable.js';
-export { e as MutationObserver } from './queryClient-UWB6EkqM.js';
+export { e as MutationObserver } from './queryClient-6vLRMq5C.js';
 import './removable.js';

build/legacy/queriesObserver.d.ts

@@ -1,2 +0,2 @@
-import { aj as QueryObserverResult, b as QueryClient, V as QueryObserverOptions, aO as NotifyOptions, o as Query, t as QueryKey, c as QueryObserver } from './queryClient-UWB6EkqM.js';
+import { aj as QueryObserverResult, b as QueryClient, V as QueryObserverOptions, aO as NotifyOptions, o as Query, t as QueryKey, c as QueryObserver } from './queryClient-6vLRMq5C.js';
 import { Subscribable } from './subscribable.js';
@@ -3,0 +3,0 @@ import './removable.js';

build/legacy/query.d.ts

 import './removable.js';
-export { bc as Action, b8 as FetchContext, b9 as FetchDirection, ba as FetchMeta, bb as FetchOptions, o as Query, aM as QueryBehavior, n as QueryState, bd as SetStateOptions } from './queryClient-UWB6EkqM.js';
+export { bc as Action, b8 as FetchContext, b9 as FetchDirection, ba as FetchMeta, bb as FetchOptions, o as Query, aM as QueryBehavior, n as QueryState, bd as SetStateOptions, be as fetchState } from './queryClient-6vLRMq5C.js';
 import './subscribable.js';

build/legacy/query.js

@@ -322,10 +322,4 @@ import {
           ...state,
-          fetchFailureCount: 0,
-          fetchFailureReason: null,
-          fetchMeta: action.meta ?? null,
-          fetchStatus: canFetch(this.options.networkMode) ? "fetching" : "paused",
-          ...state.data === void 0 && {
-            error: null,
-            status: "pending"
-          }
+          ...fetchState(state.data, this.options),
+          fetchMeta: action.meta ?? null
         };
@@ -382,2 +376,13 @@ case "success":
 };
+function fetchState(data, options) {
+  return {
+    fetchFailureCount: 0,
+    fetchFailureReason: null,
+    fetchStatus: canFetch(options.networkMode) ? "fetching" : "paused",
+    ...data === void 0 && {
+      error: null,
+      status: "pending"
+    }
+  };
+}
 function getDefaultState(options) {
@@ -403,4 +408,5 @@ const data = typeof options.initialData === "function" ? options.initialData() : options.initialData;
 export {
-  Query
+  Query,
+  fetchState
 };
 //# sourceMappingURL=query.js.map

build/legacy/queryCache.d.ts

@@ -1,3 +0,3 @@
-export { Q as QueryCache, a as QueryCacheNotifyEvent, be as QueryStore } from './queryClient-UWB6EkqM.js';
+export { Q as QueryCache, a as QueryCacheNotifyEvent, bf as QueryStore } from './queryClient-6vLRMq5C.js';
 import './subscribable.js';
 import './removable.js';

build/legacy/queryClient.d.ts

@@ -1,3 +0,3 @@
-export { b as QueryClient } from './queryClient-UWB6EkqM.js';
+export { b as QueryClient } from './queryClient-6vLRMq5C.js';
 import './removable.js';
 import './subscribable.js';

build/legacy/queryObserver.d.ts

 import './subscribable.js';
-export { aO as NotifyOptions, aN as ObserverFetchOptions, c as QueryObserver } from './queryClient-UWB6EkqM.js';
+export { aO as NotifyOptions, aN as ObserverFetchOptions, c as QueryObserver } from './queryClient-6vLRMq5C.js';
 import './removable.js';

build/legacy/queryObserver.js

@@ -20,3 +20,3 @@ import {
 import { Subscribable } from "./subscribable.js";
-import { canFetch } from "./retryer.js";
+import { fetchState } from "./query.js";
 var _client, _currentQuery, _currentQueryInitialState, _currentResult, _currentResultState, _currentResultOptions, _selectError, _selectFn, _selectResult, _lastQueryWithDefinedData, _staleTimeoutId, _refetchIntervalId, _currentRefetchInterval, _trackedProps, _executeFetch, executeFetch_fn, _updateStaleTimeout, updateStaleTimeout_fn, _computeRefetchInterval, computeRefetchInterval_fn, _updateRefetchInterval, updateRefetchInterval_fn, _updateTimers, updateTimers_fn, _clearStaleTimeout, clearStaleTimeout_fn, _clearRefetchInterval, clearRefetchInterval_fn, _updateQuery, updateQuery_fn, _notify, notify_fn;
@@ -194,3 +194,3 @@ var QueryObserver = class extends Subscribable {
     const { state } = query;
-    let { error, errorUpdatedAt, fetchStatus, status } = state;
+    let newState = { ...state };
     let isPlaceholderData = false;
@@ -203,13 +203,14 @@ let data;
       if (fetchOnMount || fetchOptionally) {
-        fetchStatus = canFetch(query.options.networkMode) ? "fetching" : "paused";
-        if (state.data === void 0) {
-          status = "pending";
-        }
+        newState = {
+          ...newState,
+          ...fetchState(state.data, query.options)
+        };
       }
       if (options._optimisticResults === "isRestoring") {
-        fetchStatus = "idle";
+        newState.fetchStatus = "idle";
       }
     }
-    if (options.select && state.data !== void 0) {
-      if (prevResult && state.data === (prevResultState == null ? void 0 : prevResultState.data) && options.select === __privateGet(this, _selectFn)) {
+    let { error, errorUpdatedAt, status } = newState;
+    if (options.select && newState.data !== void 0) {
+      if (prevResult && newState.data === (prevResultState == null ? void 0 : prevResultState.data) && options.select === __privateGet(this, _selectFn)) {
         data = __privateGet(this, _selectResult);
@@ -219,3 +220,3 @@ } else {
           __privateSet(this, _selectFn, options.select);
-          data = options.select(state.data);
+          data = options.select(newState.data);
           data = replaceData(prevResult == null ? void 0 : prevResult.data, data, options);
@@ -229,3 +230,3 @@ __privateSet(this, _selectResult, data);
     } else {
-      data = state.data;
+      data = newState.data;
     }
@@ -266,10 +267,10 @@ if (options.placeholderData !== void 0 && data === void 0 && status === "pending") {
     }
-    const isFetching = fetchStatus === "fetching";
+    const isFetching = newState.fetchStatus === "fetching";
     const isPending = status === "pending";
     const isError = status === "error";
     const isLoading = isPending && isFetching;
-    const hasData = state.data !== void 0;
+    const hasData = data !== void 0;
     const result = {
       status,
-      fetchStatus,
+      fetchStatus: newState.fetchStatus,
       isPending,
@@ -281,14 +282,14 @@ isSuccess: status === "success",
       data,
-      dataUpdatedAt: state.dataUpdatedAt,
+      dataUpdatedAt: newState.dataUpdatedAt,
       error,
       errorUpdatedAt,
-      failureCount: state.fetchFailureCount,
-      failureReason: state.fetchFailureReason,
-      errorUpdateCount: state.errorUpdateCount,
-      isFetched: state.dataUpdateCount > 0 || state.errorUpdateCount > 0,
-      isFetchedAfterMount: state.dataUpdateCount > queryInitialState.dataUpdateCount || state.errorUpdateCount > queryInitialState.errorUpdateCount,
+      failureCount: newState.fetchFailureCount,
+      failureReason: newState.fetchFailureReason,
+      errorUpdateCount: newState.errorUpdateCount,
+      isFetched: newState.dataUpdateCount > 0 || newState.errorUpdateCount > 0,
+      isFetchedAfterMount: newState.dataUpdateCount > queryInitialState.dataUpdateCount || newState.errorUpdateCount > queryInitialState.errorUpdateCount,
       isFetching,
       isRefetching: isFetching && !isPending,
       isLoadingError: isError && !hasData,
-      isPaused: fetchStatus === "paused",
+      isPaused: newState.fetchStatus === "paused",
       isPlaceholderData,
@@ -295,0 +296,0 @@ isRefetchError: isError && hasData,

build/legacy/retryer.d.ts

@@ -1,3 +0,3 @@
-export { C as CancelledError, b5 as RetryDelayValue, b4 as RetryValue, b3 as Retryer, b6 as canFetch, b7 as createRetryer, l as isCancelledError } from './queryClient-UWB6EkqM.js';
+export { C as CancelledError, b5 as RetryDelayValue, b4 as RetryValue, b3 as Retryer, b6 as canFetch, b7 as createRetryer, l as isCancelledError } from './queryClient-6vLRMq5C.js';
 import './removable.js';
 import './subscribable.js';

build/legacy/types.d.ts

@@ -1,3 +0,3 @@
-export { aI as CancelOptions, v as DataTag, D as DefaultError, aH as DefaultOptions, _ as DefaultedInfiniteQueryObserverOptions, Y as DefaultedQueryObserverOptions, aq as DefinedInfiniteQueryObserverResult, ai as DefinedQueryObserverResult, a0 as EnsureQueryDataOptions, a1 as FetchInfiniteQueryOptions, a8 as FetchNextPageOptions, a9 as FetchPreviousPageOptions, $ as FetchQueryOptions, ab as FetchStatus, B as GetNextPageParamFunction, G as GetPreviousPageParamFunction, E as InfiniteData, ak as InfiniteQueryObserverBaseResult, an as InfiniteQueryObserverLoadingErrorResult, am as InfiniteQueryObserverLoadingResult, Z as InfiniteQueryObserverOptions, al as InfiniteQueryObserverPendingResult, ao as InfiniteQueryObserverRefetchErrorResult, ar as InfiniteQueryObserverResult, ap as InfiniteQueryObserverSuccessResult, O as InfiniteQueryPageParamsOptions, I as InitialDataFunction, L as InitialPageParam, a6 as InvalidateOptions, a4 as InvalidateQueryFilters, az as MutateFunction, ay as MutateOptions, av as MutationFunction, as as MutationKey, au as MutationMeta, aA as MutationObserverBaseResult, aD as MutationObserverErrorResult, aB as MutationObserverIdleResult, aC as MutationObserverLoadingResult, ax as MutationObserverOptions, aF as MutationObserverResult, aE as MutationObserverSuccessResult, aw as MutationOptions, at as MutationStatus, H as NetworkMode, N as NoInfer, aL as NotifyEvent, aK as NotifyEventType, J as NotifyOnChangeProps, X as Optional, P as PlaceholderDataFunction, z as QueriesPlaceholderDataFunction, aG as QueryClientConfig, w as QueryFunction, y as QueryFunctionContext, t as QueryKey, A as QueryKeyHashFunction, F as QueryMeta, ac as QueryObserverBaseResult, af as QueryObserverLoadingErrorResult, ae as QueryObserverLoadingResult, V as QueryObserverOptions, ad as QueryObserverPendingResult, ag as QueryObserverRefetchErrorResult, aj as QueryObserverResult, ah as QueryObserverSuccessResult, K as QueryOptions, x as QueryPersister, aa as QueryStatus, a3 as RefetchOptions, a5 as RefetchQueryFilters, R as Register, a7 as ResetOptions, a2 as ResultOptions, aJ as SetDataOptions, T as ThrowOnError, W as WithRequired, u as dataTagSymbol } from './queryClient-UWB6EkqM.js';
+export { aI as CancelOptions, v as DataTag, D as DefaultError, aH as DefaultOptions, _ as DefaultedInfiniteQueryObserverOptions, Y as DefaultedQueryObserverOptions, aq as DefinedInfiniteQueryObserverResult, ai as DefinedQueryObserverResult, a0 as EnsureQueryDataOptions, a1 as FetchInfiniteQueryOptions, a8 as FetchNextPageOptions, a9 as FetchPreviousPageOptions, $ as FetchQueryOptions, ab as FetchStatus, B as GetNextPageParamFunction, G as GetPreviousPageParamFunction, E as InfiniteData, ak as InfiniteQueryObserverBaseResult, an as InfiniteQueryObserverLoadingErrorResult, am as InfiniteQueryObserverLoadingResult, Z as InfiniteQueryObserverOptions, al as InfiniteQueryObserverPendingResult, ao as InfiniteQueryObserverRefetchErrorResult, ar as InfiniteQueryObserverResult, ap as InfiniteQueryObserverSuccessResult, O as InfiniteQueryPageParamsOptions, I as InitialDataFunction, L as InitialPageParam, a6 as InvalidateOptions, a4 as InvalidateQueryFilters, az as MutateFunction, ay as MutateOptions, av as MutationFunction, as as MutationKey, au as MutationMeta, aA as MutationObserverBaseResult, aD as MutationObserverErrorResult, aB as MutationObserverIdleResult, aC as MutationObserverLoadingResult, ax as MutationObserverOptions, aF as MutationObserverResult, aE as MutationObserverSuccessResult, aw as MutationOptions, at as MutationStatus, H as NetworkMode, N as NoInfer, aL as NotifyEvent, aK as NotifyEventType, J as NotifyOnChangeProps, X as Optional, P as PlaceholderDataFunction, z as QueriesPlaceholderDataFunction, aG as QueryClientConfig, w as QueryFunction, y as QueryFunctionContext, t as QueryKey, A as QueryKeyHashFunction, F as QueryMeta, ac as QueryObserverBaseResult, af as QueryObserverLoadingErrorResult, ae as QueryObserverLoadingResult, V as QueryObserverOptions, ad as QueryObserverPendingResult, ag as QueryObserverRefetchErrorResult, aj as QueryObserverResult, ah as QueryObserverSuccessResult, K as QueryOptions, x as QueryPersister, aa as QueryStatus, a3 as RefetchOptions, a5 as RefetchQueryFilters, R as Register, a7 as ResetOptions, a2 as ResultOptions, aJ as SetDataOptions, T as ThrowOnError, W as WithRequired, u as dataTagSymbol } from './queryClient-6vLRMq5C.js';
 import './removable.js';
 import './subscribable.js';

build/legacy/utils.d.ts

@@ -1,3 +0,3 @@
-export { g as MutationFilters, j as QueryFilters, aP as QueryTypeFilter, S as SkipToken, U as Updater, a$ as addToEnd, b0 as addToStart, aR as functionalUpdate, h as hashKey, aU as hashQueryKeyByOptions, aX as isPlainArray, aY as isPlainObject, i as isServer, aS as isValidTimeout, k as keepPreviousData, f as matchMutation, m as matchQuery, aQ as noop, aV as partialMatchKey, a_ as replaceData, r as replaceEqualDeep, aW as shallowEqualObjects, s as skipToken, aZ as sleep, aT as timeUntilStale } from './queryClient-UWB6EkqM.js';
+export { g as MutationFilters, j as QueryFilters, aP as QueryTypeFilter, S as SkipToken, U as Updater, a$ as addToEnd, b0 as addToStart, aR as functionalUpdate, h as hashKey, aU as hashQueryKeyByOptions, aX as isPlainArray, aY as isPlainObject, i as isServer, aS as isValidTimeout, k as keepPreviousData, f as matchMutation, m as matchQuery, aQ as noop, aV as partialMatchKey, a_ as replaceData, r as replaceEqualDeep, aW as shallowEqualObjects, s as skipToken, aZ as sleep, aT as timeUntilStale } from './queryClient-6vLRMq5C.js';
 import './removable.js';
 import './subscribable.js';

build/modern/hydration.d.ts

@@ -1,2 +0,2 @@
-import { p as Mutation, o as Query, K as QueryOptions, aw as MutationOptions, b as QueryClient, as as MutationKey, q as MutationState, au as MutationMeta, t as QueryKey, n as QueryState, F as QueryMeta } from './queryClient-UWB6EkqM.js';
+import { p as Mutation, o as Query, K as QueryOptions, aw as MutationOptions, b as QueryClient, as as MutationKey, q as MutationState, au as MutationMeta, t as QueryKey, n as QueryState, F as QueryMeta } from './queryClient-6vLRMq5C.js';
 import './removable.js';
@@ -3,0 +3,0 @@ import './subscribable.js';

build/modern/index.d.ts

@@ -1,2 +0,2 @@
-export { aI as CancelOptions, C as CancelledError, v as DataTag, D as DefaultError, aH as DefaultOptions, _ as DefaultedInfiniteQueryObserverOptions, Y as DefaultedQueryObserverOptions, aq as DefinedInfiniteQueryObserverResult, ai as DefinedQueryObserverResult, a0 as EnsureQueryDataOptions, a1 as FetchInfiniteQueryOptions, a8 as FetchNextPageOptions, a9 as FetchPreviousPageOptions, $ as FetchQueryOptions, ab as FetchStatus, B as GetNextPageParamFunction, G as GetPreviousPageParamFunction, E as InfiniteData, ak as InfiniteQueryObserverBaseResult, an as InfiniteQueryObserverLoadingErrorResult, am as InfiniteQueryObserverLoadingResult, Z as InfiniteQueryObserverOptions, al as InfiniteQueryObserverPendingResult, ao as InfiniteQueryObserverRefetchErrorResult, ar as InfiniteQueryObserverResult, ap as InfiniteQueryObserverSuccessResult, O as InfiniteQueryPageParamsOptions, I as InitialDataFunction, L as InitialPageParam, a6 as InvalidateOptions, a4 as InvalidateQueryFilters, az as MutateFunction, ay as MutateOptions, p as Mutation, M as MutationCache, d as MutationCacheNotifyEvent, g as MutationFilters, av as MutationFunction, as as MutationKey, au as MutationMeta, e as MutationObserver, aA as MutationObserverBaseResult, aD as MutationObserverErrorResult, aB as MutationObserverIdleResult, aC as MutationObserverLoadingResult, ax as MutationObserverOptions, aF as MutationObserverResult, aE as MutationObserverSuccessResult, aw as MutationOptions, q as MutationState, at as MutationStatus, H as NetworkMode, N as NoInfer, aL as NotifyEvent, aK as NotifyEventType, J as NotifyOnChangeProps, X as Optional, P as PlaceholderDataFunction, z as QueriesPlaceholderDataFunction, o as Query, Q as QueryCache, a as QueryCacheNotifyEvent, b as QueryClient, aG as QueryClientConfig, j as QueryFilters, w as QueryFunction, y as QueryFunctionContext, t as QueryKey, A as QueryKeyHashFunction, F as QueryMeta, c as QueryObserver, ac as QueryObserverBaseResult, af as QueryObserverLoadingErrorResult, ae as QueryObserverLoadingResult, V as QueryObserverOptions, ad as QueryObserverPendingResult, ag as QueryObserverRefetchErrorResult, aj as QueryObserverResult, ah as QueryObserverSuccessResult, K as QueryOptions, x as QueryPersister, n as QueryState, aa as QueryStatus, a3 as RefetchOptions, a5 as RefetchQueryFilters, R as Register, a7 as ResetOptions, a2 as ResultOptions, aJ as SetDataOptions, S as SkipToken, T as ThrowOnError, U as Updater, W as WithRequired, u as dataTagSymbol, h as hashKey, l as isCancelledError, i as isServer, k as keepPreviousData, f as matchMutation, m as matchQuery, r as replaceEqualDeep, s as skipToken } from './queryClient-UWB6EkqM.js';
+export { aI as CancelOptions, C as CancelledError, v as DataTag, D as DefaultError, aH as DefaultOptions, _ as DefaultedInfiniteQueryObserverOptions, Y as DefaultedQueryObserverOptions, aq as DefinedInfiniteQueryObserverResult, ai as DefinedQueryObserverResult, a0 as EnsureQueryDataOptions, a1 as FetchInfiniteQueryOptions, a8 as FetchNextPageOptions, a9 as FetchPreviousPageOptions, $ as FetchQueryOptions, ab as FetchStatus, B as GetNextPageParamFunction, G as GetPreviousPageParamFunction, E as InfiniteData, ak as InfiniteQueryObserverBaseResult, an as InfiniteQueryObserverLoadingErrorResult, am as InfiniteQueryObserverLoadingResult, Z as InfiniteQueryObserverOptions, al as InfiniteQueryObserverPendingResult, ao as InfiniteQueryObserverRefetchErrorResult, ar as InfiniteQueryObserverResult, ap as InfiniteQueryObserverSuccessResult, O as InfiniteQueryPageParamsOptions, I as InitialDataFunction, L as InitialPageParam, a6 as InvalidateOptions, a4 as InvalidateQueryFilters, az as MutateFunction, ay as MutateOptions, p as Mutation, M as MutationCache, d as MutationCacheNotifyEvent, g as MutationFilters, av as MutationFunction, as as MutationKey, au as MutationMeta, e as MutationObserver, aA as MutationObserverBaseResult, aD as MutationObserverErrorResult, aB as MutationObserverIdleResult, aC as MutationObserverLoadingResult, ax as MutationObserverOptions, aF as MutationObserverResult, aE as MutationObserverSuccessResult, aw as MutationOptions, q as MutationState, at as MutationStatus, H as NetworkMode, N as NoInfer, aL as NotifyEvent, aK as NotifyEventType, J as NotifyOnChangeProps, X as Optional, P as PlaceholderDataFunction, z as QueriesPlaceholderDataFunction, o as Query, Q as QueryCache, a as QueryCacheNotifyEvent, b as QueryClient, aG as QueryClientConfig, j as QueryFilters, w as QueryFunction, y as QueryFunctionContext, t as QueryKey, A as QueryKeyHashFunction, F as QueryMeta, c as QueryObserver, ac as QueryObserverBaseResult, af as QueryObserverLoadingErrorResult, ae as QueryObserverLoadingResult, V as QueryObserverOptions, ad as QueryObserverPendingResult, ag as QueryObserverRefetchErrorResult, aj as QueryObserverResult, ah as QueryObserverSuccessResult, K as QueryOptions, x as QueryPersister, n as QueryState, aa as QueryStatus, a3 as RefetchOptions, a5 as RefetchQueryFilters, R as Register, a7 as ResetOptions, a2 as ResultOptions, aJ as SetDataOptions, S as SkipToken, T as ThrowOnError, U as Updater, W as WithRequired, u as dataTagSymbol, h as hashKey, l as isCancelledError, i as isServer, k as keepPreviousData, f as matchMutation, m as matchQuery, r as replaceEqualDeep, s as skipToken } from './queryClient-6vLRMq5C.js';
 export { QueriesObserver, QueriesObserverOptions } from './queriesObserver.js';
@@ -3,0 +3,0 @@ export { InfiniteQueryObserver } from './infiniteQueryObserver.js';

build/modern/infiniteQueryBehavior.d.ts

@@ -1,2 +0,2 @@
-import { aM as QueryBehavior, E as InfiniteData, O as InfiniteQueryPageParamsOptions } from './queryClient-UWB6EkqM.js';
+import { aM as QueryBehavior, E as InfiniteData, O as InfiniteQueryPageParamsOptions } from './queryClient-6vLRMq5C.js';
 import './removable.js';
@@ -3,0 +3,0 @@ import './subscribable.js';

build/modern/infiniteQueryObserver.d.ts

@@ -1,2 +0,2 @@
-import { D as DefaultError, E as InfiniteData, t as QueryKey, c as QueryObserver, ar as InfiniteQueryObserverResult, aN as ObserverFetchOptions, b as QueryClient, Z as InfiniteQueryObserverOptions, aO as NotifyOptions, _ as DefaultedInfiniteQueryObserverOptions, a8 as FetchNextPageOptions, a9 as FetchPreviousPageOptions, o as Query } from './queryClient-UWB6EkqM.js';
+import { D as DefaultError, E as InfiniteData, t as QueryKey, c as QueryObserver, ar as InfiniteQueryObserverResult, aN as ObserverFetchOptions, b as QueryClient, Z as InfiniteQueryObserverOptions, aO as NotifyOptions, _ as DefaultedInfiniteQueryObserverOptions, a8 as FetchNextPageOptions, a9 as FetchPreviousPageOptions, o as Query } from './queryClient-6vLRMq5C.js';
 import './removable.js';
@@ -3,0 +3,0 @@ import './subscribable.js';

build/modern/mutation.d.ts

 import './removable.js';
-export { b1 as Action, p as Mutation, q as MutationState, b2 as getDefaultState } from './queryClient-UWB6EkqM.js';
+export { b1 as Action, p as Mutation, q as MutationState, b2 as getDefaultState } from './queryClient-6vLRMq5C.js';
 import './subscribable.js';

build/modern/mutationCache.d.ts

@@ -1,3 +0,3 @@
-export { M as MutationCache, d as MutationCacheNotifyEvent } from './queryClient-UWB6EkqM.js';
+export { M as MutationCache, d as MutationCacheNotifyEvent } from './queryClient-6vLRMq5C.js';
 import './subscribable.js';
 import './removable.js';

build/modern/mutationObserver.d.ts

 import './subscribable.js';
-export { e as MutationObserver } from './queryClient-UWB6EkqM.js';
+export { e as MutationObserver } from './queryClient-6vLRMq5C.js';
 import './removable.js';

build/modern/queriesObserver.d.ts

@@ -1,2 +0,2 @@
-import { aj as QueryObserverResult, b as QueryClient, V as QueryObserverOptions, aO as NotifyOptions, o as Query, t as QueryKey, c as QueryObserver } from './queryClient-UWB6EkqM.js';
+import { aj as QueryObserverResult, b as QueryClient, V as QueryObserverOptions, aO as NotifyOptions, o as Query, t as QueryKey, c as QueryObserver } from './queryClient-6vLRMq5C.js';
 import { Subscribable } from './subscribable.js';
@@ -3,0 +3,0 @@ import './removable.js';

build/modern/query.d.ts

 import './removable.js';
-export { bc as Action, b8 as FetchContext, b9 as FetchDirection, ba as FetchMeta, bb as FetchOptions, o as Query, aM as QueryBehavior, n as QueryState, bd as SetStateOptions } from './queryClient-UWB6EkqM.js';
+export { bc as Action, b8 as FetchContext, b9 as FetchDirection, ba as FetchMeta, bb as FetchOptions, o as Query, aM as QueryBehavior, n as QueryState, bd as SetStateOptions, be as fetchState } from './queryClient-6vLRMq5C.js';
 import './subscribable.js';

build/modern/query.js

@@ -295,10 +295,4 @@ // src/query.ts
             ...state,
-            fetchFailureCount: 0,
-            fetchFailureReason: null,
-            fetchMeta: action.meta ?? null,
-            fetchStatus: canFetch(this.options.networkMode) ? "fetching" : "paused",
-            ...state.data === void 0 && {
-              error: null,
-              status: "pending"
-            }
+            ...fetchState(state.data, this.options),
+            fetchMeta: action.meta ?? null
           };
@@ -356,2 +350,13 @@ case "success":
 };
+function fetchState(data, options) {
+  return {
+    fetchFailureCount: 0,
+    fetchFailureReason: null,
+    fetchStatus: canFetch(options.networkMode) ? "fetching" : "paused",
+    ...data === void 0 && {
+      error: null,
+      status: "pending"
+    }
+  };
+}
 function getDefaultState(options) {
@@ -377,4 +382,5 @@ const data = typeof options.initialData === "function" ? options.initialData() : options.initialData;
 export {
-  Query
+  Query,
+  fetchState
 };
 //# sourceMappingURL=query.js.map

build/modern/queryCache.d.ts

@@ -1,3 +0,3 @@
-export { Q as QueryCache, a as QueryCacheNotifyEvent, be as QueryStore } from './queryClient-UWB6EkqM.js';
+export { Q as QueryCache, a as QueryCacheNotifyEvent, bf as QueryStore } from './queryClient-6vLRMq5C.js';
 import './subscribable.js';
 import './removable.js';

build/modern/queryClient.d.ts

@@ -1,3 +0,3 @@
-export { b as QueryClient } from './queryClient-UWB6EkqM.js';
+export { b as QueryClient } from './queryClient-6vLRMq5C.js';
 import './removable.js';
 import './subscribable.js';

build/modern/queryObserver.d.ts

 import './subscribable.js';
-export { aO as NotifyOptions, aN as ObserverFetchOptions, c as QueryObserver } from './queryClient-UWB6EkqM.js';
+export { aO as NotifyOptions, aN as ObserverFetchOptions, c as QueryObserver } from './queryClient-6vLRMq5C.js';
 import './removable.js';

build/modern/queryObserver.js

@@ -13,3 +13,3 @@ // src/queryObserver.ts
 import { Subscribable } from "./subscribable.js";
-import { canFetch } from "./retryer.js";
+import { fetchState } from "./query.js";
 var QueryObserver = class extends Subscribable {
@@ -234,3 +234,3 @@ constructor(client, options) {
     const { state } = query;
-    let { error, errorUpdatedAt, fetchStatus, status } = state;
+    let newState = { ...state };
     let isPlaceholderData = false;
@@ -243,13 +243,14 @@ let data;
       if (fetchOnMount || fetchOptionally) {
-        fetchStatus = canFetch(query.options.networkMode) ? "fetching" : "paused";
-        if (state.data === void 0) {
-          status = "pending";
-        }
+        newState = {
+          ...newState,
+          ...fetchState(state.data, query.options)
+        };
       }
       if (options._optimisticResults === "isRestoring") {
-        fetchStatus = "idle";
+        newState.fetchStatus = "idle";
       }
     }
-    if (options.select && state.data !== void 0) {
-      if (prevResult && state.data === prevResultState?.data && options.select === this.#selectFn) {
+    let { error, errorUpdatedAt, status } = newState;
+    if (options.select && newState.data !== void 0) {
+      if (prevResult && newState.data === prevResultState?.data && options.select === this.#selectFn) {
         data = this.#selectResult;
@@ -259,3 +260,3 @@ } else {
           this.#selectFn = options.select;
-          data = options.select(state.data);
+          data = options.select(newState.data);
           data = replaceData(prevResult?.data, data, options);
@@ -269,3 +270,3 @@ this.#selectResult = data;
     } else {
-      data = state.data;
+      data = newState.data;
     }
@@ -306,10 +307,10 @@ if (options.placeholderData !== void 0 && data === void 0 && status === "pending") {
     }
-    const isFetching = fetchStatus === "fetching";
+    const isFetching = newState.fetchStatus === "fetching";
     const isPending = status === "pending";
     const isError = status === "error";
     const isLoading = isPending && isFetching;
-    const hasData = state.data !== void 0;
+    const hasData = data !== void 0;
     const result = {
       status,
-      fetchStatus,
+      fetchStatus: newState.fetchStatus,
       isPending,
@@ -321,14 +322,14 @@ isSuccess: status === "success",
       data,
-      dataUpdatedAt: state.dataUpdatedAt,
+      dataUpdatedAt: newState.dataUpdatedAt,
       error,
       errorUpdatedAt,
-      failureCount: state.fetchFailureCount,
-      failureReason: state.fetchFailureReason,
-      errorUpdateCount: state.errorUpdateCount,
-      isFetched: state.dataUpdateCount > 0 || state.errorUpdateCount > 0,
-      isFetchedAfterMount: state.dataUpdateCount > queryInitialState.dataUpdateCount || state.errorUpdateCount > queryInitialState.errorUpdateCount,
+      failureCount: newState.fetchFailureCount,
+      failureReason: newState.fetchFailureReason,
+      errorUpdateCount: newState.errorUpdateCount,
+      isFetched: newState.dataUpdateCount > 0 || newState.errorUpdateCount > 0,
+      isFetchedAfterMount: newState.dataUpdateCount > queryInitialState.dataUpdateCount || newState.errorUpdateCount > queryInitialState.errorUpdateCount,
       isFetching,
       isRefetching: isFetching && !isPending,
       isLoadingError: isError && !hasData,
-      isPaused: fetchStatus === "paused",
+      isPaused: newState.fetchStatus === "paused",
       isPlaceholderData,
@@ -335,0 +336,0 @@ isRefetchError: isError && hasData,

build/modern/retryer.d.ts

@@ -1,3 +0,3 @@
-export { C as CancelledError, b5 as RetryDelayValue, b4 as RetryValue, b3 as Retryer, b6 as canFetch, b7 as createRetryer, l as isCancelledError } from './queryClient-UWB6EkqM.js';
+export { C as CancelledError, b5 as RetryDelayValue, b4 as RetryValue, b3 as Retryer, b6 as canFetch, b7 as createRetryer, l as isCancelledError } from './queryClient-6vLRMq5C.js';
 import './removable.js';
 import './subscribable.js';

build/modern/types.d.ts

@@ -1,3 +0,3 @@
-export { aI as CancelOptions, v as DataTag, D as DefaultError, aH as DefaultOptions, _ as DefaultedInfiniteQueryObserverOptions, Y as DefaultedQueryObserverOptions, aq as DefinedInfiniteQueryObserverResult, ai as DefinedQueryObserverResult, a0 as EnsureQueryDataOptions, a1 as FetchInfiniteQueryOptions, a8 as FetchNextPageOptions, a9 as FetchPreviousPageOptions, $ as FetchQueryOptions, ab as FetchStatus, B as GetNextPageParamFunction, G as GetPreviousPageParamFunction, E as InfiniteData, ak as InfiniteQueryObserverBaseResult, an as InfiniteQueryObserverLoadingErrorResult, am as InfiniteQueryObserverLoadingResult, Z as InfiniteQueryObserverOptions, al as InfiniteQueryObserverPendingResult, ao as InfiniteQueryObserverRefetchErrorResult, ar as InfiniteQueryObserverResult, ap as InfiniteQueryObserverSuccessResult, O as InfiniteQueryPageParamsOptions, I as InitialDataFunction, L as InitialPageParam, a6 as InvalidateOptions, a4 as InvalidateQueryFilters, az as MutateFunction, ay as MutateOptions, av as MutationFunction, as as MutationKey, au as MutationMeta, aA as MutationObserverBaseResult, aD as MutationObserverErrorResult, aB as MutationObserverIdleResult, aC as MutationObserverLoadingResult, ax as MutationObserverOptions, aF as MutationObserverResult, aE as MutationObserverSuccessResult, aw as MutationOptions, at as MutationStatus, H as NetworkMode, N as NoInfer, aL as NotifyEvent, aK as NotifyEventType, J as NotifyOnChangeProps, X as Optional, P as PlaceholderDataFunction, z as QueriesPlaceholderDataFunction, aG as QueryClientConfig, w as QueryFunction, y as QueryFunctionContext, t as QueryKey, A as QueryKeyHashFunction, F as QueryMeta, ac as QueryObserverBaseResult, af as QueryObserverLoadingErrorResult, ae as QueryObserverLoadingResult, V as QueryObserverOptions, ad as QueryObserverPendingResult, ag as QueryObserverRefetchErrorResult, aj as QueryObserverResult, ah as QueryObserverSuccessResult, K as QueryOptions, x as QueryPersister, aa as QueryStatus, a3 as RefetchOptions, a5 as RefetchQueryFilters, R as Register, a7 as ResetOptions, a2 as ResultOptions, aJ as SetDataOptions, T as ThrowOnError, W as WithRequired, u as dataTagSymbol } from './queryClient-UWB6EkqM.js';
+export { aI as CancelOptions, v as DataTag, D as DefaultError, aH as DefaultOptions, _ as DefaultedInfiniteQueryObserverOptions, Y as DefaultedQueryObserverOptions, aq as DefinedInfiniteQueryObserverResult, ai as DefinedQueryObserverResult, a0 as EnsureQueryDataOptions, a1 as FetchInfiniteQueryOptions, a8 as FetchNextPageOptions, a9 as FetchPreviousPageOptions, $ as FetchQueryOptions, ab as FetchStatus, B as GetNextPageParamFunction, G as GetPreviousPageParamFunction, E as InfiniteData, ak as InfiniteQueryObserverBaseResult, an as InfiniteQueryObserverLoadingErrorResult, am as InfiniteQueryObserverLoadingResult, Z as InfiniteQueryObserverOptions, al as InfiniteQueryObserverPendingResult, ao as InfiniteQueryObserverRefetchErrorResult, ar as InfiniteQueryObserverResult, ap as InfiniteQueryObserverSuccessResult, O as InfiniteQueryPageParamsOptions, I as InitialDataFunction, L as InitialPageParam, a6 as InvalidateOptions, a4 as InvalidateQueryFilters, az as MutateFunction, ay as MutateOptions, av as MutationFunction, as as MutationKey, au as MutationMeta, aA as MutationObserverBaseResult, aD as MutationObserverErrorResult, aB as MutationObserverIdleResult, aC as MutationObserverLoadingResult, ax as MutationObserverOptions, aF as MutationObserverResult, aE as MutationObserverSuccessResult, aw as MutationOptions, at as MutationStatus, H as NetworkMode, N as NoInfer, aL as NotifyEvent, aK as NotifyEventType, J as NotifyOnChangeProps, X as Optional, P as PlaceholderDataFunction, z as QueriesPlaceholderDataFunction, aG as QueryClientConfig, w as QueryFunction, y as QueryFunctionContext, t as QueryKey, A as QueryKeyHashFunction, F as QueryMeta, ac as QueryObserverBaseResult, af as QueryObserverLoadingErrorResult, ae as QueryObserverLoadingResult, V as QueryObserverOptions, ad as QueryObserverPendingResult, ag as QueryObserverRefetchErrorResult, aj as QueryObserverResult, ah as QueryObserverSuccessResult, K as QueryOptions, x as QueryPersister, aa as QueryStatus, a3 as RefetchOptions, a5 as RefetchQueryFilters, R as Register, a7 as ResetOptions, a2 as ResultOptions, aJ as SetDataOptions, T as ThrowOnError, W as WithRequired, u as dataTagSymbol } from './queryClient-6vLRMq5C.js';
 import './removable.js';
 import './subscribable.js';

build/modern/utils.d.ts

@@ -1,3 +0,3 @@
-export { g as MutationFilters, j as QueryFilters, aP as QueryTypeFilter, S as SkipToken, U as Updater, a$ as addToEnd, b0 as addToStart, aR as functionalUpdate, h as hashKey, aU as hashQueryKeyByOptions, aX as isPlainArray, aY as isPlainObject, i as isServer, aS as isValidTimeout, k as keepPreviousData, f as matchMutation, m as matchQuery, aQ as noop, aV as partialMatchKey, a_ as replaceData, r as replaceEqualDeep, aW as shallowEqualObjects, s as skipToken, aZ as sleep, aT as timeUntilStale } from './queryClient-UWB6EkqM.js';
+export { g as MutationFilters, j as QueryFilters, aP as QueryTypeFilter, S as SkipToken, U as Updater, a$ as addToEnd, b0 as addToStart, aR as functionalUpdate, h as hashKey, aU as hashQueryKeyByOptions, aX as isPlainArray, aY as isPlainObject, i as isServer, aS as isValidTimeout, k as keepPreviousData, f as matchMutation, m as matchQuery, aQ as noop, aV as partialMatchKey, a_ as replaceData, r as replaceEqualDeep, aW as shallowEqualObjects, s as skipToken, aZ as sleep, aT as timeUntilStale } from './queryClient-6vLRMq5C.js';
 import './removable.js';
 import './subscribable.js';

package.json

 {
   "name": "@tanstack/query-core",
-  "version": "5.28.2",
+  "version": "5.28.4",
   "description": "The framework agnostic core that powers TanStack Query",
@@ -5,0 +5,0 @@ "author": "tannerlinsley",

src/query.ts

@@ -555,12 +555,4 @@ import { noop, replaceData, skipToken, timeUntilStale } from './utils'
             ...state,
-            fetchFailureCount: 0,
-            fetchFailureReason: null,
+            ...fetchState(state.data, this.options),
             fetchMeta: action.meta ?? null,
-            fetchStatus: canFetch(this.options.networkMode)
-              ? 'fetching'
-              : 'paused',
-            ...(state.data === undefined && {
-              error: null,
-              status: 'pending',
-            }),
           }
@@ -624,2 +616,23 @@ case 'success':
 
+export function fetchState<
+  TQueryFnData,
+  TError,
+  TData,
+  TQueryKey extends QueryKey,
+>(
+  data: TData | undefined,
+  options: QueryOptions<TQueryFnData, TError, TData, TQueryKey>,
+) {
+  return {
+    fetchFailureCount: 0,
+    fetchFailureReason: null,
+    fetchStatus: canFetch(options.networkMode) ? 'fetching' : 'paused',
+    ...(data === undefined &&
+      ({
+        error: null,
+        status: 'pending',
+      } as const)),
+  } as const
+}
+
 function getDefaultState<
@@ -626,0 +639,0 @@ TQueryFnData,

src/queryObserver.ts

@@ -12,5 +12,5 @@ import {
 import { Subscribable } from './subscribable'
-import { canFetch } from './retryer'
+import { fetchState } from './query'
+import type { FetchOptions, Query, QueryState } from './query'
 import type { QueryClient } from './queryClient'
-import type { FetchOptions, Query, QueryState } from './query'
 import type {
@@ -441,3 +441,3 @@ DefaultError,
     const { state } = query
-    let { error, errorUpdatedAt, fetchStatus, status } = state
+    let newState = { ...state }
     let isPlaceholderData = false
@@ -456,20 +456,20 @@ let data: TData | undefined
       if (fetchOnMount || fetchOptionally) {
-        fetchStatus = canFetch(query.options.networkMode)
-          ? 'fetching'
-          : 'paused'
-        if (state.data === undefined) {
-          status = 'pending'
+        newState = {
+          ...newState,
+          ...fetchState(state.data, query.options),
         }
       }
       if (options._optimisticResults === 'isRestoring') {
-        fetchStatus = 'idle'
+        newState.fetchStatus = 'idle'
       }
     }
 
+    let { error, errorUpdatedAt, status } = newState
+
     // Select data if needed
-    if (options.select && state.data !== undefined) {
+    if (options.select && newState.data !== undefined) {
       // Memoize select result
       if (
         prevResult &&
-        state.data === prevResultState?.data &&
+        newState.data === prevResultState?.data &&
         options.select === this.#selectFn
@@ -481,3 +481,3 @@ ) {
           this.#selectFn = options.select
-          data = options.select(state.data)
+          data = options.select(newState.data)
           data = replaceData(prevResult?.data, data, options)
@@ -493,3 +493,3 @@ this.#selectResult = data
     else {
-      data = state.data as unknown as TData
+      data = newState.data as unknown as TData
     }
@@ -549,3 +549,3 @@
 
-    const isFetching = fetchStatus === 'fetching'
+    const isFetching = newState.fetchStatus === 'fetching'
     const isPending = status === 'pending'
@@ -555,7 +555,7 @@ const isError = status === 'error'
     const isLoading = isPending && isFetching
-    const hasData = state.data !== undefined
+    const hasData = data !== undefined
 
     const result: QueryObserverBaseResult<TData, TError> = {
       status,
-      fetchStatus,
+      fetchStatus: newState.fetchStatus,
       isPending,
@@ -567,16 +567,16 @@ isSuccess: status === 'success',
       data,
-      dataUpdatedAt: state.dataUpdatedAt,
+      dataUpdatedAt: newState.dataUpdatedAt,
       error,
       errorUpdatedAt,
-      failureCount: state.fetchFailureCount,
-      failureReason: state.fetchFailureReason,
-      errorUpdateCount: state.errorUpdateCount,
-      isFetched: state.dataUpdateCount > 0 || state.errorUpdateCount > 0,
+      failureCount: newState.fetchFailureCount,
+      failureReason: newState.fetchFailureReason,
+      errorUpdateCount: newState.errorUpdateCount,
+      isFetched: newState.dataUpdateCount > 0 || newState.errorUpdateCount > 0,
       isFetchedAfterMount:
-        state.dataUpdateCount > queryInitialState.dataUpdateCount ||
-        state.errorUpdateCount > queryInitialState.errorUpdateCount,
+        newState.dataUpdateCount > queryInitialState.dataUpdateCount ||
+        newState.errorUpdateCount > queryInitialState.errorUpdateCount,
       isFetching,
       isRefetching: isFetching && !isPending,
       isLoadingError: isError && !hasData,
-      isPaused: fetchStatus === 'paused',
+      isPaused: newState.fetchStatus === 'paused',
       isPlaceholderData,
@@ -583,0 +583,0 @@ isRefetchError: isError && hasData,

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1857482

increased by0.21%

Lines of code

26454

increased by0.21%

No dependency changes