@tanstack/preact-query 5.101.4 → 5.102.0

package/build/modern/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils.ts"],"sourcesContent":["import { useEffect, useLayoutEffect, useRef, useState } from 'preact/hooks'\n\n/**\n * This is taken from https://github.com/preactjs/preact/blob/main/compat/src/hooks.js#L8-L54\n * which is taken from https://github.com/facebook/react/blob/main/packages/use-sync-external-store/src/useSyncExternalStoreShimClient.js#L84\n * on a high level this cuts out the warnings, ... and attempts a smaller implementation.\n * This way we don't have to import preact/compat with side effects\n */\ntype InternalStore = {\n  _value: any\n  _getSnapshot: () => any\n}\ntype StoreRef = {\n  _instance: InternalStore\n}\nexport function useSyncExternalStore(\n  subscribe: (onStoreChange: () => void) => () => void,\n  getSnapshot: () => any,\n) {\n  const value = getSnapshot()\n\n  const [{ _instance }, forceUpdate] = useState<StoreRef>({\n    _instance: { _value: value, _getSnapshot: getSnapshot },\n  })\n\n  useLayoutEffect(() => {\n    _instance._value = value\n    _instance._getSnapshot = getSnapshot\n\n    if (didSnapshotChange(_instance)) {\n      forceUpdate({ _instance })\n    }\n  }, [subscribe, value, getSnapshot])\n\n  useEffect(() => {\n    if (didSnapshotChange(_instance)) {\n      forceUpdate({ _instance })\n    }\n\n    return subscribe(() => {\n      if (didSnapshotChange(_instance)) {\n        forceUpdate({ _instance })\n      }\n    })\n  }, [subscribe])\n\n  return value\n}\n\nfunction didSnapshotChange(inst: {\n  _getSnapshot: () => any\n  _value: any\n}): boolean {\n  const latestGetSnapshot = inst._getSnapshot\n  const prevValue = inst._value\n  try {\n    const nextValue = latestGetSnapshot()\n    return !Object.is(prevValue, nextValue)\n    // eslint-disable-next-line no-unused-vars\n  } catch (_error) {\n    return true\n  }\n}\n\nexport function useSyncExternalStoreWithSelector<TSnapshot, TSelected>(\n  subscribe: (onStoreChange: () => void) => () => void,\n  getSnapshot: () => TSnapshot,\n  selector: (snapshot: TSnapshot) => TSelected,\n  isEqual: (a: TSelected, b: TSelected) => boolean,\n): TSelected {\n  const selectedSnapshotRef = useRef<TSelected | undefined>()\n\n  const getSelectedSnapshot = () => {\n    const snapshot = getSnapshot()\n    const selected = selector(snapshot)\n\n    if (\n      selectedSnapshotRef.current === undefined ||\n      !isEqual(selectedSnapshotRef.current, selected)\n    ) {\n      selectedSnapshotRef.current = selected\n    }\n\n    return selectedSnapshotRef.current\n  }\n\n  return useSyncExternalStore(subscribe, getSelectedSnapshot)\n}\n"],"mappings":";AAAA,SAAS,WAAW,iBAAiB,QAAQ,gBAAgB;AAetD,SAAS,qBACd,WACA,aACA;AACA,QAAM,QAAQ,YAAY;AAE1B,QAAM,CAAC,EAAE,UAAU,GAAG,WAAW,IAAI,SAAmB;AAAA,IACtD,WAAW,EAAE,QAAQ,OAAO,cAAc,YAAY;AAAA,EACxD,CAAC;AAED,kBAAgB,MAAM;AACpB,cAAU,SAAS;AACnB,cAAU,eAAe;AAEzB,QAAI,kBAAkB,SAAS,GAAG;AAChC,kBAAY,EAAE,UAAU,CAAC;AAAA,IAC3B;AAAA,EACF,GAAG,CAAC,WAAW,OAAO,WAAW,CAAC;AAElC,YAAU,MAAM;AACd,QAAI,kBAAkB,SAAS,GAAG;AAChC,kBAAY,EAAE,UAAU,CAAC;AAAA,IAC3B;AAEA,WAAO,UAAU,MAAM;AACrB,UAAI,kBAAkB,SAAS,GAAG;AAChC,oBAAY,EAAE,UAAU,CAAC;AAAA,MAC3B;AAAA,IACF,CAAC;AAAA,EACH,GAAG,CAAC,SAAS,CAAC;AAEd,SAAO;AACT;AAEA,SAAS,kBAAkB,MAGf;AACV,QAAM,oBAAoB,KAAK;AAC/B,QAAM,YAAY,KAAK;AACvB,MAAI;AACF,UAAM,YAAY,kBAAkB;AACpC,WAAO,CAAC,OAAO,GAAG,WAAW,SAAS;AAAA,EAExC,SAAS,QAAQ;AACf,WAAO;AAAA,EACT;AACF;AAEO,SAAS,iCACd,WACA,aACA,UACA,SACW;AACX,QAAM,sBAAsB,OAA8B;AAE1D,QAAM,sBAAsB,MAAM;AAChC,UAAM,WAAW,YAAY;AAC7B,UAAM,WAAW,SAAS,QAAQ;AAElC,QACE,oBAAoB,YAAY,UAChC,CAAC,QAAQ,oBAAoB,SAAS,QAAQ,GAC9C;AACA,0BAAoB,UAAU;AAAA,IAChC;AAEA,WAAO,oBAAoB;AAAA,EAC7B;AAEA,SAAO,qBAAqB,WAAW,mBAAmB;AAC5D;","names":[]}
+{"version":3,"file":"utils.js","names":[],"sources":["../../src/utils.ts"],"sourcesContent":["import { useEffect, useLayoutEffect, useRef, useState } from 'preact/hooks'\n\n/**\n * This is taken from https://github.com/preactjs/preact/blob/main/compat/src/hooks.js#L8-L54\n * which is taken from https://github.com/facebook/react/blob/main/packages/use-sync-external-store/src/useSyncExternalStoreShimClient.js#L84\n * on a high level this cuts out the warnings, ... and attempts a smaller implementation.\n * This way we don't have to import preact/compat with side effects\n */\ntype InternalStore = {\n  _value: any\n  _getSnapshot: () => any\n}\ntype StoreRef = {\n  _instance: InternalStore\n}\nexport function useSyncExternalStore(\n  subscribe: (onStoreChange: () => void) => () => void,\n  getSnapshot: () => any,\n) {\n  const value = getSnapshot()\n\n  const [{ _instance }, forceUpdate] = useState<StoreRef>({\n    _instance: { _value: value, _getSnapshot: getSnapshot },\n  })\n\n  useLayoutEffect(() => {\n    _instance._value = value\n    _instance._getSnapshot = getSnapshot\n\n    if (didSnapshotChange(_instance)) {\n      forceUpdate({ _instance })\n    }\n  }, [subscribe, value, getSnapshot])\n\n  useEffect(() => {\n    if (didSnapshotChange(_instance)) {\n      forceUpdate({ _instance })\n    }\n\n    return subscribe(() => {\n      if (didSnapshotChange(_instance)) {\n        forceUpdate({ _instance })\n      }\n    })\n  }, [subscribe])\n\n  return value\n}\n\nfunction didSnapshotChange(inst: {\n  _getSnapshot: () => any\n  _value: any\n}): boolean {\n  const latestGetSnapshot = inst._getSnapshot\n  const prevValue = inst._value\n  try {\n    const nextValue = latestGetSnapshot()\n    return !Object.is(prevValue, nextValue)\n    // eslint-disable-next-line no-unused-vars\n  } catch (_error) {\n    return true\n  }\n}\n\nexport function useSyncExternalStoreWithSelector<TSnapshot, TSelected>(\n  subscribe: (onStoreChange: () => void) => () => void,\n  getSnapshot: () => TSnapshot,\n  selector: (snapshot: TSnapshot) => TSelected,\n  isEqual: (a: TSelected, b: TSelected) => boolean,\n): TSelected {\n  const selectedSnapshotRef = useRef<TSelected | undefined>()\n\n  const getSelectedSnapshot = () => {\n    const snapshot = getSnapshot()\n    const selected = selector(snapshot)\n\n    if (\n      selectedSnapshotRef.current === undefined ||\n      !isEqual(selectedSnapshotRef.current, selected)\n    ) {\n      selectedSnapshotRef.current = selected\n    }\n\n    return selectedSnapshotRef.current\n  }\n\n  return useSyncExternalStore(subscribe, getSelectedSnapshot)\n}\n"],"mappings":";;AAeA,SAAgB,qBACd,WACA,aACA;CACA,MAAM,QAAQ,YAAY;CAE1B,MAAM,CAAC,EAAE,aAAa,eAAe,SAAmB,EACtD,WAAW;EAAE,QAAQ;EAAO,cAAc;CAAY,EACxD,CAAC;CAED,sBAAsB;EACpB,UAAU,SAAS;EACnB,UAAU,eAAe;EAEzB,IAAI,kBAAkB,SAAS,GAC7B,YAAY,EAAE,UAAU,CAAC;CAE7B,GAAG;EAAC;EAAW;EAAO;CAAW,CAAC;CAElC,gBAAgB;EACd,IAAI,kBAAkB,SAAS,GAC7B,YAAY,EAAE,UAAU,CAAC;EAG3B,OAAO,gBAAgB;GACrB,IAAI,kBAAkB,SAAS,GAC7B,YAAY,EAAE,UAAU,CAAC;EAE7B,CAAC;CACH,GAAG,CAAC,SAAS,CAAC;CAEd,OAAO;AACT;AAEA,SAAS,kBAAkB,MAGf;CACV,MAAM,oBAAoB,KAAK;CAC/B,MAAM,YAAY,KAAK;CACvB,IAAI;EACF,MAAM,YAAY,kBAAkB;EACpC,OAAO,CAAC,OAAO,GAAG,WAAW,SAAS;CAExC,SAAS,QAAQ;EACf,OAAO;CACT;AACF;AAEA,SAAgB,iCACd,WACA,aACA,UACA,SACW;CACX,MAAM,sBAAsB,OAA8B;CAE1D,MAAM,4BAA4B;EAEhC,MAAM,WAAW,SADA,YACgB,CAAC;EAElC,IACE,oBAAoB,YAAY,KAAA,KAChC,CAAC,QAAQ,oBAAoB,SAAS,QAAQ,GAE9C,oBAAoB,UAAU;EAGhC,OAAO,oBAAoB;CAC7B;CAEA,OAAO,qBAAqB,WAAW,mBAAmB;AAC5D"}

package/build/query-codemods/root.eslint.config.js

@@ -32,7 +32,7 @@ export default [
               'tanstack', // Our package scope
               'todos', // Too general word to be caught as error
               'tsqd', // Our public interface (TanStack Query Devtools shorthand)
-              'tsup', // We use tsup as builder
+              'tsdown', // We use tsdown as builder
               'typecheck', // Field of vite.config.ts
               'vue-demi', // dependency of @tanstack/vue-query
               'ɵkind', // Angular specific

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/preact-query",
-  "version": "5.101.4",
+  "version": "5.102.0",
   "description": "Hooks for managing, caching and syncing asynchronous and remote data in preact",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -43,7 +43,7 @@
     "!build/codemods/**/__tests__"
   ],
   "dependencies": {
-    "@tanstack/query-core": "5.101.4"
+    "@tanstack/query-core": "5.102.0"
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.10.2",
@@ -53,9 +53,9 @@
     "npm-run-all2": "^5.0.0",
     "preact": "^10.28.0",
     "preact-render-to-string": "^6.6.4",
-    "typescript": "5.9.3",
+    "typescript": "6.0.3",
     "typescript-eslint": "^8.54.0",
-    "@tanstack/query-persist-client-core": "5.101.4",
+    "@tanstack/query-persist-client-core": "5.102.0",
     "@tanstack/query-test-utils": "0.0.0"
   },
   "peerDependencies": {
@@ -66,19 +66,17 @@
     "compile": "tsc --build",
     "test:eslint": "eslint --concurrency=auto ./src",
     "test:types": "npm-run-all --serial test:types:*",
-    "test:types:ts54": "node ../../node_modules/typescript54/lib/tsc.js --build tsconfig.legacy.json",
-    "test:types:ts55": "node ../../node_modules/typescript55/lib/tsc.js --build tsconfig.legacy.json",
     "test:types:ts56": "node ../../node_modules/typescript56/lib/tsc.js --build tsconfig.legacy.json",
     "test:types:ts57": "node ../../node_modules/typescript57/lib/tsc.js --build tsconfig.legacy.json",
     "test:types:ts58": "node ../../node_modules/typescript58/lib/tsc.js --build tsconfig.legacy.json",
     "test:types:ts59": "node ../../node_modules/typescript59/lib/tsc.js --build tsconfig.legacy.json",
     "test:types:tscurrent": "tsc --build",
-    "test:types:ts60": "node ../../node_modules/typescript60/lib/tsc.js --build",
+    "test:types:ts70": "node ../../node_modules/typescript70/lib/tsc.js --build",
     "test:lib": "vitest",
     "test:lib:dev": "pnpm run test:lib --watch",
     "test:build": "publint --strict && attw --pack",
-    "build": "pnpm build:tsup && pnpm build:codemods",
-    "build:tsup": "tsup --tsconfig tsconfig.prod.json",
+    "build": "pnpm build:tsdown && pnpm build:codemods",
+    "build:tsdown": "tsdown --tsconfig tsconfig.prod.json",
     "build:codemods": "cpy ../query-codemods/* ./build/codemods"
   }
 }

package/src/errorBoundaryUtils.ts

@@ -25,12 +25,14 @@ export const ensurePreventErrorBoundaryRetry = <
     TQueryKey
   >,
   errorResetBoundary: QueryErrorResetBoundaryValue,
+  query: Query<TQueryFnData, TError, TQueryData, TQueryKey> | undefined,
 ) => {
-  if (
-    options.suspense ||
-    options.throwOnError ||
-    options.experimental_prefetchInRender
-  ) {
+  const throwOnError =
+    query?.state.error && typeof options.throwOnError === 'function'
+      ? shouldThrowError(options.throwOnError, [query.state.error, query])
+      : options.throwOnError
+
+  if (options.suspense || throwOnError) {
     // Prevent retrying failed query if the error boundary has not been reset yet
     if (!errorResetBoundary.isReset()) {
       options.retryOnMount = false

package/src/infiniteQueryOptions.ts

@@ -1,11 +1,11 @@
 import type {
-  DataTag,
   DefaultError,
   InfiniteData,
   InitialDataFunction,
   NonUndefinedGuard,
   OmitKeyof,
   QueryKey,
+  QueryKeyWithDataTag,
   SkipToken,
 } from '@tanstack/query-core'
 
@@ -93,9 +93,8 @@ export function infiniteQueryOptions<
   TData,
   TQueryKey,
   TPageParam
-> & {
-  queryKey: DataTag<TQueryKey, InfiniteData<TQueryFnData>, TError>
-}
+> &
+  QueryKeyWithDataTag<TQueryKey, InfiniteData<TQueryFnData>, TError>
 
 export function infiniteQueryOptions<
   TQueryFnData,
@@ -117,9 +116,8 @@ export function infiniteQueryOptions<
   TData,
   TQueryKey,
   TPageParam
-> & {
-  queryKey: DataTag<TQueryKey, InfiniteData<TQueryFnData>, TError>
-}
+> &
+  QueryKeyWithDataTag<TQueryKey, InfiniteData<TQueryFnData>, TError>
 
 export function infiniteQueryOptions<
   TQueryFnData,
@@ -141,9 +139,8 @@ export function infiniteQueryOptions<
   TData,
   TQueryKey,
   TPageParam
-> & {
-  queryKey: DataTag<TQueryKey, InfiniteData<TQueryFnData>, TError>
-}
+> &
+  QueryKeyWithDataTag<TQueryKey, InfiniteData<TQueryFnData>, TError>
 
 export function infiniteQueryOptions(options: unknown) {
   return options

package/src/queryOptions.ts

@@ -1,11 +1,11 @@
 import type {
-  DataTag,
   DefaultError,
   InitialDataFunction,
   NonUndefinedGuard,
   OmitKeyof,
   QueryFunction,
   QueryKey,
+  QueryKeyWithDataTag,
   SkipToken,
 } from '@tanstack/query-core'
 
@@ -57,9 +57,8 @@ export function queryOptions<
   TQueryKey extends QueryKey = QueryKey,
 >(
   options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,
-): DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey> & {
-  queryKey: DataTag<TQueryKey, TQueryFnData, TError>
-}
+): DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey> &
+  QueryKeyWithDataTag<TQueryKey, TQueryFnData, TError>
 
 export function queryOptions<
   TQueryFnData = unknown,
@@ -68,9 +67,8 @@ export function queryOptions<
   TQueryKey extends QueryKey = QueryKey,
 >(
   options: UnusedSkipTokenOptions<TQueryFnData, TError, TData, TQueryKey>,
-): UnusedSkipTokenOptions<TQueryFnData, TError, TData, TQueryKey> & {
-  queryKey: DataTag<TQueryKey, TQueryFnData, TError>
-}
+): UnusedSkipTokenOptions<TQueryFnData, TError, TData, TQueryKey> &
+  QueryKeyWithDataTag<TQueryKey, TQueryFnData, TError>
 
 export function queryOptions<
   TQueryFnData = unknown,
@@ -79,9 +77,8 @@ export function queryOptions<
   TQueryKey extends QueryKey = QueryKey,
 >(
   options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,
-): UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey> & {
-  queryKey: DataTag<TQueryKey, TQueryFnData, TError>
-}
+): UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey> &
+  QueryKeyWithDataTag<TQueryKey, TQueryFnData, TError>
 
 export function queryOptions(options: unknown) {
   return options

package/src/suspense.ts

@@ -47,11 +47,6 @@ export const ensureSuspenseTimers = (
   }
 }
 
-export const willFetch = (
-  result: QueryObserverResult<any, any>,
-  isRestoring: boolean,
-) => result.isLoading && result.isFetching && !isRestoring
-
 export const shouldSuspend = (
   defaultedOptions:
     | DefaultedQueryObserverOptions<any, any, any, any, any>

package/src/types.ts

@@ -4,7 +4,8 @@ import type {
   DefinedInfiniteQueryObserverResult,
   DefinedQueryObserverResult,
   DistributiveOmit,
-  FetchQueryOptions,
+  InfiniteData,
+  InfiniteQueryExecuteOptions,
   InfiniteQueryObserverOptions,
   InfiniteQueryObserverResult,
   MutateFunction,
@@ -12,6 +13,7 @@ import type {
   MutationObserverResult,
   OmitKeyof,
   Override,
+  QueryExecuteOptions,
   QueryKey,
   QueryObserverOptions,
   QueryObserverResult,
@@ -45,17 +47,52 @@ export interface UseBaseQueryOptions<
   subscribed?: boolean
 }
 
-export interface UsePrefetchQueryOptions<
+export type UsePrefetchQueryOptions<
   TQueryFnData = unknown,
   TError = DefaultError,
   TData = TQueryFnData,
+  TQueryData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
-> extends OmitKeyof<
-  FetchQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
+> = DistributiveOmit<
+  QueryExecuteOptions<TQueryFnData, TError, TData, TQueryData, TQueryKey>,
   'queryFn'
-> {
+> & {
   queryFn?: Exclude<
-    FetchQueryOptions<TQueryFnData, TError, TData, TQueryKey>['queryFn'],
+    QueryExecuteOptions<
+      TQueryFnData,
+      TError,
+      TData,
+      TQueryFnData,
+      TQueryKey
+    >['queryFn'],
+    SkipToken
+  >
+}
+
+export type UsePrefetchInfiniteQueryOptions<
+  TQueryFnData = unknown,
+  TError = DefaultError,
+  TData = TQueryFnData,
+  TQueryKey extends QueryKey = QueryKey,
+  TPageParam = unknown,
+> = DistributiveOmit<
+  InfiniteQueryExecuteOptions<
+    TQueryFnData,
+    TError,
+    TData,
+    TQueryKey,
+    TPageParam
+  >,
+  'queryFn'
+> & {
+  queryFn?: Exclude<
+    InfiniteQueryExecuteOptions<
+      TQueryFnData,
+      TError,
+      TData,
+      TQueryKey,
+      TPageParam
+    >['queryFn'],
     SkipToken
   >
 }
@@ -102,7 +139,7 @@ export type AnyUseInfiniteQueryOptions = UseInfiniteQueryOptions<
 export interface UseInfiniteQueryOptions<
   TQueryFnData = unknown,
   TError = DefaultError,
-  TData = TQueryFnData,
+  TData = InfiniteData<TQueryFnData>,
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
 > extends OmitKeyof<
@@ -127,7 +164,7 @@ export type AnyUseSuspenseInfiniteQueryOptions =
 export interface UseSuspenseInfiniteQueryOptions<
   TQueryFnData = unknown,
   TError = DefaultError,
-  TData = TQueryFnData,
+  TData = InfiniteData<TQueryFnData>,
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
 > extends OmitKeyof<
@@ -161,7 +198,7 @@ export type UseSuspenseQueryResult<
   TError = DefaultError,
 > = DistributiveOmit<
   DefinedQueryObserverResult<TData, TError>,
-  'isPlaceholderData' | 'promise'
+  'isPlaceholderData'
 >
 
 export type DefinedUseQueryResult<
@@ -184,7 +221,7 @@ export type UseSuspenseInfiniteQueryResult<
   TError = DefaultError,
 > = OmitKeyof<
   DefinedInfiniteQueryObserverResult<TData, TError>,
-  'isPlaceholderData' | 'promise'
+  'isPlaceholderData'
 >
 
 export type AnyUseMutationOptions = UseMutationOptions<any, any, any, any>

package/src/useBaseQuery.ts

@@ -1,4 +1,4 @@
-import { environmentManager, noop, notifyManager } from '@tanstack/query-core'
+import { noop, notifyManager } from '@tanstack/query-core'
 import type {
   QueryClient,
   QueryKey,
@@ -19,7 +19,6 @@ import {
   ensureSuspenseTimers,
   fetchOptimistic,
   shouldSuspend,
-  willFetch,
 } from './suspense'
 import type { UseBaseQueryOptions } from './types'
 import { useSyncExternalStore } from './utils'
@@ -54,9 +53,14 @@ export function useBaseQuery<
   const client = useQueryClient(queryClient)
   const defaultedOptions = client.defaultQueryOptions(options)
 
-  ;(client.getDefaultOptions().queries as any)?._experimental_beforeQuery?.(
-    defaultedOptions,
-  )
+  const query = client
+    .getQueryCache()
+    .get<
+      TQueryFnData,
+      TError,
+      TQueryData,
+      TQueryKey
+    >(defaultedOptions.queryHash)
 
   if (process.env.NODE_ENV !== 'production') {
     if (!defaultedOptions.queryFn) {
@@ -72,15 +76,10 @@ export function useBaseQuery<
     : 'optimistic'
 
   ensureSuspenseTimers(defaultedOptions)
-  ensurePreventErrorBoundaryRetry(defaultedOptions, errorResetBoundary)
+  ensurePreventErrorBoundaryRetry(defaultedOptions, errorResetBoundary, query)
 
   useClearResetErrorBoundary(errorResetBoundary)
 
-  // this needs to be invoked before creating the Observer because that can create a cache entry
-  const isNewCacheEntry = !client
-    .getQueryCache()
-    .get(defaultedOptions.queryHash)
-
   const [observer] = useState(
     () =>
       new Observer<TQueryFnData, TError, TData, TQueryData, TQueryKey>(
@@ -126,42 +125,13 @@ export function useBaseQuery<
       result,
       errorResetBoundary,
       throwOnError: defaultedOptions.throwOnError,
-      query: client
-        .getQueryCache()
-        .get<
-          TQueryFnData,
-          TError,
-          TQueryData,
-          TQueryKey
-        >(defaultedOptions.queryHash),
+      query,
       suspense: defaultedOptions.suspense,
     })
   ) {
     throw result.error
   }
 
-  ;(client.getDefaultOptions().queries as any)?._experimental_afterQuery?.(
-    defaultedOptions,
-    result,
-  )
-
-  if (
-    defaultedOptions.experimental_prefetchInRender &&
-    !environmentManager.isServer() &&
-    willFetch(result, isRestoring)
-  ) {
-    const promise = isNewCacheEntry
-      ? // Fetch immediately on render in order to ensure `.promise` is resolved even if the component is unmounted
-        fetchOptimistic(defaultedOptions, observer, errorResetBoundary)
-      : // subscribe to the "cache promise" so that we can finalize the currentThenable once data comes in
-        client.getQueryCache().get(defaultedOptions.queryHash)?.promise
-
-    promise?.catch(noop).finally(() => {
-      // `.updateResult()` will trigger `.#currentThenable` to finalize
-      observer.updateResult()
-    })
-  }
-
   // Handle result property usage tracking
   return !defaultedOptions.notifyOnChangeProps
     ? observer.trackResult(result)

package/src/useMutation.ts

@@ -52,8 +52,12 @@ export function useMutation<
   const mutate = useCallback<
     UseMutateFunction<TData, TError, TVariables, TOnMutateResult>
   >(
-    (variables, mutateOptions) => {
-      observer.mutate(variables, mutateOptions).catch(noop)
+    (
+      ...args: Parameters<
+        UseMutateFunction<TData, TError, TVariables, TOnMutateResult>
+      >
+    ) => {
+      observer.mutate(args[0] as TVariables, args[1]).catch(noop)
     },
     [observer],
   )

package/src/useMutationState.ts

@@ -22,25 +22,50 @@ export function useIsMutating(
   ).length
 }
 
-type MutationStateOptions<TResult = MutationState> = {
+type MutationTypeFromResult<TResult> = [TResult] extends [
+  MutationState<
+    infer TData,
+    infer TError,
+    infer TVariables,
+    infer TOnMutateResult
+  >,
+]
+  ? Mutation<TData, TError, TVariables, TOnMutateResult>
+  : Mutation
+
+type MutationStateOptions<
+  TResult = MutationState,
+  TMutation extends Mutation<any, any, any, any> =
+    MutationTypeFromResult<TResult>,
+> = {
   filters?: MutationFilters
-  select?: (mutation: Mutation) => TResult
+  select?: (mutation: TMutation) => TResult
 }
 
-function getResult<TResult = MutationState>(
+function getResult<
+  TResult = MutationState,
+  TMutation extends Mutation<any, any, any, any> =
+    MutationTypeFromResult<TResult>,
+>(
   mutationCache: MutationCache,
-  options: MutationStateOptions<TResult>,
+  options: MutationStateOptions<TResult, TMutation>,
 ): Array<TResult> {
   return mutationCache
     .findAll(options.filters)
     .map(
       (mutation): TResult =>
-        (options.select ? options.select(mutation) : mutation.state) as TResult,
+        (options.select
+          ? options.select(mutation as TMutation)
+          : mutation.state) as TResult,
     )
 }
 
-export function useMutationState<TResult = MutationState>(
-  options: MutationStateOptions<TResult> = {},
+export function useMutationState<
+  TResult = MutationState,
+  TMutation extends Mutation<any, any, any, any> =
+    MutationTypeFromResult<TResult>,
+>(
+  options: MutationStateOptions<TResult, TMutation> = {},
   queryClient?: QueryClient,
 ): Array<TResult> {
   const mutationCache = useQueryClient(queryClient).getMutationCache()

package/src/usePrefetchInfiniteQuery.tsx

@@ -1,12 +1,9 @@
-import type {
-  DefaultError,
-  FetchInfiniteQueryOptions,
-  QueryClient,
-  QueryKey,
-} from '@tanstack/query-core'
-
+import { noop } from '@tanstack/query-core'
 import { useQueryClient } from './QueryClientProvider'
 
+import type { DefaultError, QueryClient, QueryKey } from '@tanstack/query-core'
+import type { UsePrefetchInfiniteQueryOptions } from './types'
+
 export function usePrefetchInfiniteQuery<
   TQueryFnData = unknown,
   TError = DefaultError,
@@ -14,7 +11,7 @@ export function usePrefetchInfiniteQuery<
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
 >(
-  options: FetchInfiniteQueryOptions<
+  options: UsePrefetchInfiniteQueryOptions<
     TQueryFnData,
     TError,
     TData,
@@ -26,6 +23,6 @@ export function usePrefetchInfiniteQuery<
   const client = useQueryClient(queryClient)
 
   if (!client.getQueryState(options.queryKey)) {
-    client.prefetchInfiniteQuery(options)
+    void client.infiniteQuery(options).catch(noop)
   }
 }

package/src/usePrefetchQuery.tsx

@@ -1,20 +1,28 @@
-import type { DefaultError, QueryClient, QueryKey } from '@tanstack/query-core'
-
+import { noop } from '@tanstack/query-core'
 import { useQueryClient } from './QueryClientProvider'
+
+import type { DefaultError, QueryClient, QueryKey } from '@tanstack/query-core'
 import type { UsePrefetchQueryOptions } from './types'
 
 export function usePrefetchQuery<
   TQueryFnData = unknown,
   TError = DefaultError,
   TData = TQueryFnData,
+  TQueryData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 >(
-  options: UsePrefetchQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
+  options: UsePrefetchQueryOptions<
+    TQueryFnData,
+    TError,
+    TData,
+    TQueryData,
+    TQueryKey
+  >,
   queryClient?: QueryClient,
 ) {
   const client = useQueryClient(queryClient)
 
   if (!client.getQueryState(options.queryKey)) {
-    client.prefetchQuery(options)
+    void client.fetchQuery(options).catch(noop)
   }
 }

package/src/useQueries.ts

@@ -241,9 +241,10 @@ export function useQueries<
     [queries, client, isRestoring],
   )
 
-  defaultedQueries.forEach((query) => {
-    ensureSuspenseTimers(query)
-    ensurePreventErrorBoundaryRetry(query, errorResetBoundary)
+  defaultedQueries.forEach((queryOptions) => {
+    ensureSuspenseTimers(queryOptions)
+    const query = client.getQueryCache().get(queryOptions.queryHash)
+    ensurePreventErrorBoundaryRetry(queryOptions, errorResetBoundary, query)
   })
 
   useClearResetErrorBoundary(errorResetBoundary)

package/src/useQuery.ts

@@ -20,7 +20,7 @@ export function useQuery<
 >(
   options: DefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,
   queryClient?: QueryClient,
-): DefinedUseQueryResult<NoInfer<TData>, TError>
+): DefinedUseQueryResult<TData, TError>
 
 export function useQuery<
   TQueryFnData = unknown,
@@ -30,7 +30,7 @@ export function useQuery<
 >(
   options: UndefinedInitialDataOptions<TQueryFnData, TError, TData, TQueryKey>,
   queryClient?: QueryClient,
-): UseQueryResult<NoInfer<TData>, TError>
+): UseQueryResult<TData, TError>
 
 export function useQuery<
   TQueryFnData = unknown,
@@ -40,7 +40,7 @@ export function useQuery<
 >(
   options: UseQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
   queryClient?: QueryClient,
-): UseQueryResult<NoInfer<TData>, TError>
+): UseQueryResult<TData, TError>
 
 export function useQuery(options: UseQueryOptions, queryClient?: QueryClient) {
   return useBaseQuery(options, QueryObserver, queryClient)

package/src/useSuspenseInfiniteQuery.ts

@@ -43,6 +43,7 @@ export function useSuspenseInfiniteQuery<
       enabled: true,
       suspense: true,
       throwOnError: defaultThrowOnError,
+      placeholderData: undefined,
     },
     InfiniteQueryObserver as typeof QueryObserver,
     queryClient,