refactor: rename resolveValueOrFunction to resolveOption for consistency

Author: braden-w

packages/query-core/src/query.ts

@@ -2,7 +2,7 @@ import {
   ensureQueryFn,
   noop,
   replaceData,
-  resolveValueOrFunction,
+  resolveOption,
   skipToken,
   timeUntilStale,
 } from './utils'
@@ -255,7 +255,7 @@ export class Query<
   isActive(): boolean {
     return this.observers.some(
       (observer) =>
-        resolveValueOrFunction(observer.options.enabled, this) !== false,
+        resolveOption(observer.options.enabled, this) !== false,
     )
   }
 
@@ -274,7 +274,7 @@ export class Query<
     if (this.getObserversCount() > 0) {
       return this.observers.some(
         (observer) =>
-          resolveValueOrFunction(observer.options.staleTime, this) === 'static',
+          resolveOption(observer.options.staleTime, this) === 'static',
       )
     }
 
@@ -690,12 +690,12 @@ function getDefaultState<
 >(
   options: QueryOptions<TQueryFnData, TError, TData, TQueryKey>,
 ): QueryState<TData, TError> {
-  const data = resolveValueOrFunction(options.initialData)
+  const data = resolveOption(options.initialData)
 
   const hasData = data !== undefined
 
   const initialDataUpdatedAt = hasData
-    ? resolveValueOrFunction(options.initialDataUpdatedAt)
+    ? resolveOption(options.initialDataUpdatedAt)
     : 0
 
   return {

packages/query-core/src/queryClient.ts

@@ -4,7 +4,7 @@ import {
   hashQueryKeyByOptions,
   noop,
   partialMatchKey,
-  resolveValueOrFunction,
+  resolveOption,
   skipToken,
 } from './utils'
 import { QueryCache } from './queryCache'
@@ -156,7 +156,7 @@ export class QueryClient {
     if (
       options.revalidateIfStale &&
       query.isStaleByTime(
-        resolveValueOrFunction(defaultedOptions.staleTime, query),
+        resolveOption(defaultedOptions.staleTime, query),
       )
     ) {
       void this.prefetchQuery(defaultedOptions)

packages/query-core/src/queryObserver.ts

@@ -8,7 +8,7 @@ import {
   isValidTimeout,
   noop,
   replaceData,
-  resolveValueOrFunction,
+  resolveOption,
   shallowEqualObjects,
   timeUntilStale,
 } from './utils'
@@ -155,7 +155,7 @@ export class QueryObserver<
       this.options.enabled !== undefined &&
       typeof this.options.enabled !== 'boolean' &&
       typeof this.options.enabled !== 'function' &&
-      typeof resolveValueOrFunction(
+      typeof resolveOption(
         this.options.enabled,
         this.#currentQuery,
       ) !== 'boolean'
@@ -201,10 +201,10 @@ export class QueryObserver<
     if (
       mounted &&
       (this.#currentQuery !== prevQuery ||
-        resolveValueOrFunction(this.options.enabled, this.#currentQuery) !==
-          resolveValueOrFunction(prevOptions.enabled, this.#currentQuery) ||
-        resolveValueOrFunction(this.options.staleTime, this.#currentQuery) !==
-          resolveValueOrFunction(prevOptions.staleTime, this.#currentQuery))
+        resolveOption(this.options.enabled, this.#currentQuery) !==
+          resolveOption(prevOptions.enabled, this.#currentQuery) ||
+        resolveOption(this.options.staleTime, this.#currentQuery) !==
+          resolveOption(prevOptions.staleTime, this.#currentQuery))
     ) {
       this.#updateStaleTimeout()
     }
@@ -215,8 +215,8 @@ export class QueryObserver<
     if (
       mounted &&
       (this.#currentQuery !== prevQuery ||
-        resolveValueOrFunction(this.options.enabled, this.#currentQuery) !==
-          resolveValueOrFunction(prevOptions.enabled, this.#currentQuery) ||
+        resolveOption(this.options.enabled, this.#currentQuery) !==
+          resolveOption(prevOptions.enabled, this.#currentQuery) ||
         nextRefetchInterval !== this.#currentRefetchInterval)
     ) {
       this.#updateRefetchInterval(nextRefetchInterval)
@@ -344,7 +344,7 @@ export class QueryObserver<
 
   #updateStaleTimeout(): void {
     this.#clearStaleTimeout()
-    const staleTime = resolveValueOrFunction(
+    const staleTime = resolveOption(
       this.options.staleTime,
       this.#currentQuery,
     )
@@ -368,7 +368,7 @@ export class QueryObserver<
 
   #computeRefetchInterval() {
     return (
-      resolveValueOrFunction(
+      resolveOption(
         this.options.refetchInterval,
         this.#currentQuery,
       ) ?? false
@@ -382,7 +382,7 @@ export class QueryObserver<
 
     if (
       isServer ||
-      resolveValueOrFunction(this.options.enabled, this.#currentQuery) ===
+      resolveOption(this.options.enabled, this.#currentQuery) ===
         false ||
       !isValidTimeout(this.#currentRefetchInterval) ||
       this.#currentRefetchInterval === 0
@@ -491,7 +491,7 @@ export class QueryObserver<
         skipSelect = true
       } else {
         // compute placeholderData
-        placeholderData = resolveValueOrFunction(
+        placeholderData = resolveOption(
           options.placeholderData,
           this.#lastQueryWithDefinedData?.state.data,
           this.#lastQueryWithDefinedData as any,
@@ -659,7 +659,7 @@ export class QueryObserver<
 
       const { notifyOnChangeProps } = this.options
       const notifyOnChangePropsValue =
-        resolveValueOrFunction(notifyOnChangeProps)
+        resolveOption(notifyOnChangeProps)
 
       if (
         notifyOnChangePropsValue === 'all' ||
@@ -737,7 +737,7 @@ function shouldLoadOnMount(
   options: QueryObserverOptions<any, any, any, any>,
 ): boolean {
   return (
-    resolveValueOrFunction(options.enabled, query) !== false &&
+    resolveOption(options.enabled, query) !== false &&
     query.state.data === undefined &&
     !(query.state.status === 'error' && options.retryOnMount === false)
   )
@@ -762,10 +762,10 @@ function shouldFetchOn(
     (typeof options)['refetchOnReconnect'],
 ) {
   if (
-    resolveValueOrFunction(options.enabled, query) !== false &&
-    resolveValueOrFunction(options.staleTime, query) !== 'static'
+    resolveOption(options.enabled, query) !== false &&
+    resolveOption(options.staleTime, query) !== 'static'
   ) {
-    const value = resolveValueOrFunction(field, query)
+    const value = resolveOption(field, query)
 
     return value === 'always' || (value !== false && isStale(query, options))
   }
@@ -780,7 +780,7 @@ function shouldFetchOptionally(
 ): boolean {
   return (
     (query !== prevQuery ||
-      resolveValueOrFunction(prevOptions.enabled, query) === false) &&
+      resolveOption(prevOptions.enabled, query) === false) &&
     (!options.suspense || query.state.status !== 'error') &&
     isStale(query, options)
   )
@@ -791,8 +791,8 @@ function isStale(
   options: QueryObserverOptions<any, any, any, any, any>,
 ): boolean {
   return (
-    resolveValueOrFunction(options.enabled, query) !== false &&
-    query.isStaleByTime(resolveValueOrFunction(options.staleTime, query))
+    resolveOption(options.enabled, query) !== false &&
+    query.isStaleByTime(resolveOption(options.staleTime, query))
   )
 }
 

packages/query-core/src/retryer.ts

@@ -1,7 +1,7 @@
 import { focusManager } from './focusManager'
 import { onlineManager } from './onlineManager'
 import { pendingThenable } from './thenable'
-import { isServer, resolveValueOrFunction, sleep } from './utils'
+import { isServer, resolveOption, sleep } from './utils'
 import type { CancelOptions, DefaultError, NetworkMode } from './types'
 
 // TYPES
@@ -166,7 +166,7 @@ export function createRetryer<TData = unknown, TError = DefaultError>(
         // Do we need to retry the request?
         const retry = config.retry ?? (isServer ? 0 : 3)
         const retryDelay = config.retryDelay ?? defaultRetryDelay
-        const delay = resolveValueOrFunction(retryDelay, failureCount, error)
+        const delay = resolveOption(retryDelay, failureCount, error)
         const shouldRetry =
           retry === true ||
           (typeof retry === 'number' && failureCount < retry) ||

packages/query-core/src/utils.ts

@@ -131,20 +131,20 @@ function isFunctionVariant<T, TArgs extends Array<any> = []>(
  * ```ts
  * // Zero-argument function resolution (like initialData)
  * const initialData: string | (() => string) = 'hello'
- * const resolved = resolveValueOrFunction(initialData) // 'hello'
+ * const resolved = resolveOption(initialData) // 'hello'
  *
  * const initialDataFn: string | (() => string) = () => 'world'
- * const resolved2 = resolveValueOrFunction(initialDataFn) // 'world'
+ * const resolved2 = resolveOption(initialDataFn) // 'world'
  * ```
  *
  * @example
  * ```ts
  * // Function with arguments (like staleTime, retryDelay)
  * const staleTime: number | ((query: Query) => number) = (query) => query.state.dataUpdatedAt + 5000
- * const resolved = resolveValueOrFunction(staleTime, query) // number
+ * const resolved = resolveOption(staleTime, query) // number
  *
  * const retryDelay: number | ((failureCount: number, error: Error) => number) = 1000
- * const resolved2 = resolveValueOrFunction(retryDelay, 3, new Error()) // 1000
+ * const resolved2 = resolveOption(retryDelay, 3, new Error()) // 1000
  * ```
  *
  * @example
@@ -155,10 +155,10 @@ function isFunctionVariant<T, TArgs extends Array<any> = []>(
  * //   : retryDelay
  *
  * // With:
- * const delay = resolveValueOrFunction(retryDelay, failureCount, error)
+ * const delay = resolveOption(retryDelay, failureCount, error)
  * ```
  */
-export function resolveValueOrFunction<T, TArgs extends Array<any>>(
+export function resolveOption<T, TArgs extends Array<any>>(
   value: T | ((...args: TArgs) => T),
   ...args: TArgs
 ): T {