refactor: replace Accessor<T> wth FunctionedParams<T> (TanStack#8535)

Author: braden-w

packages/solid-query/src/infiniteQueryOptions.ts

@@ -4,15 +4,16 @@ import type {
   InfiniteData,
   QueryKey,
 } from '@tanstack/query-core'
-import type { FunctionedParams, SolidInfiniteQueryOptions } from './types'
+import type { SolidInfiniteQueryOptions } from './types'
+import type { Accessor } from 'solid-js'
 
 export type UndefinedInitialDataInfiniteOptions<
   TQueryFnData,
   TError = DefaultError,
   TData = InfiniteData<TQueryFnData>,
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
-> = FunctionedParams<
+> = Accessor<
   SolidInfiniteQueryOptions<
     TQueryFnData,
     TError,
@@ -34,7 +35,7 @@ export type DefinedInitialDataInfiniteOptions<
   TData = InfiniteData<TQueryFnData>,
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
-> = FunctionedParams<
+> = Accessor<
   SolidInfiniteQueryOptions<
     TQueryFnData,
     TError,

packages/solid-query/src/queryOptions.ts

@@ -1,12 +1,13 @@
 import type { DataTag, DefaultError, QueryKey } from '@tanstack/query-core'
-import type { FunctionedParams, SolidQueryOptions } from './types'
+import type { SolidQueryOptions } from './types'
+import type { Accessor } from 'solid-js'
 
 export type UndefinedInitialDataOptions<
   TQueryFnData = unknown,
   TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
-> = FunctionedParams<
+> = Accessor<
   SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
     initialData?: undefined
   }
@@ -17,7 +18,7 @@ export type DefinedInitialDataOptions<
   TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
-> = FunctionedParams<
+> = Accessor<
   SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey> & {
     initialData: TQueryFnData | (() => TQueryFnData)
   }

packages/solid-query/src/types.ts

@@ -17,8 +17,7 @@ import type {
   InfiniteQueryObserverOptions,
   QueryObserverOptions,
 } from './QueryClient'
-
-export type FunctionedParams<T> = () => T
+import type { Accessor } from 'solid-js'
 
 export interface CreateBaseQueryOptions<
   TQueryFnData = unknown,
@@ -63,7 +62,7 @@ export type CreateQueryOptions<
   TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
-> = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>
+> = Accessor<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>
 
 /* --- Create Query and Create Base Query  Types --- */
 
@@ -128,7 +127,7 @@ export type CreateInfiniteQueryOptions<
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
-> = FunctionedParams<
+> = Accessor<
   SolidInfiniteQueryOptions<
     TQueryFnData,
     TError,
@@ -165,7 +164,7 @@ export type CreateMutationOptions<
   TError = DefaultError,
   TVariables = void,
   TContext = unknown,
-> = FunctionedParams<SolidMutationOptions<TData, TError, TVariables, TContext>>
+> = Accessor<SolidMutationOptions<TData, TError, TVariables, TContext>>
 
 export type CreateMutateFunction<
   TData = unknown,