diff --git a/packages/query-core/src/query.ts b/packages/query-core/src/query.ts index 6005bda0d3..b29b64c0e3 100644 --- a/packages/query-core/src/query.ts +++ b/packages/query-core/src/query.ts @@ -389,7 +389,7 @@ export class Query< ): Promise { if ( this.state.fetchStatus !== 'idle' && - // If the promise in the retyer is already rejected, we have to definitely + // If the promise in the retryer is already rejected, we have to definitely // re-start the fetch; there is a chance that the query is still in a // pending state when that happens this.#retryer?.status() !== 'rejected' @@ -735,7 +735,7 @@ function getDefaultState< const initialDataUpdatedAt = hasData ? typeof options.initialDataUpdatedAt === 'function' - ? (options.initialDataUpdatedAt as () => number | undefined)() + ? options.initialDataUpdatedAt() : options.initialDataUpdatedAt : 0 diff --git a/packages/query-core/src/queryObserver.ts b/packages/query-core/src/queryObserver.ts index c05c25450c..463407a073 100644 --- a/packages/query-core/src/queryObserver.ts +++ b/packages/query-core/src/queryObserver.ts @@ -26,7 +26,6 @@ import type { QueryObserverBaseResult, QueryObserverOptions, QueryObserverResult, - QueryOptions, RefetchOptions, } from './types' @@ -341,7 +340,7 @@ export class QueryObserver< // Fetch let promise: Promise = this.#currentQuery.fetch( - this.options as QueryOptions, + this.options, fetchOptions, ) @@ -545,7 +544,7 @@ export class QueryObserver< } if (this.#selectError) { - error = this.#selectError as any + error = this.#selectError data = this.#selectResult errorUpdatedAt = Date.now() status = 'error' diff --git a/packages/query-devtools/src/Devtools.tsx b/packages/query-devtools/src/Devtools.tsx index cceec7a3de..f21ff143a4 100644 --- a/packages/query-devtools/src/Devtools.tsx +++ b/packages/query-devtools/src/Devtools.tsx @@ -76,7 +76,6 @@ import type { Query, QueryCache, QueryCacheNotifyEvent, - QueryState, } from '@tanstack/query-core' import type { StorageObject, StorageSetter } from '@solid-primitives/storage' import type { Accessor, Component, JSX, Setter } from 'solid-js' @@ -1963,7 +1962,7 @@ const QueryDetails = () => { ...activeQueryVal.state.fetchMeta, __previousQueryOptions, } as any, - } as QueryState) + }) } const restoreQueryAfterLoadingOrError = () => { @@ -2199,7 +2198,7 @@ const QueryDetails = () => { ...activeQueryVal.state.fetchMeta, __previousQueryOptions, } as any, - } as QueryState) + }) } }} >