@tanstack/solid-query 5.0.0-alpha.1 → 5.0.0-alpha.15

package/src/createMutation.ts

@@ -1,4 +1,4 @@
-import type { QueryClient, RegisteredError } from '@tanstack/query-core'
+import type { QueryClient, DefaultError } from '@tanstack/query-core'
 import { MutationObserver } from '@tanstack/query-core'
 import { useQueryClient } from './QueryClientProvider'
 import type {
@@ -6,6 +6,7 @@ import type {
   CreateMutationOptions,
   CreateMutationResult,
 } from './types'
+import type { Accessor } from 'solid-js'
 import { createComputed, onCleanup, on } from 'solid-js'
 import { createStore } from 'solid-js/store'
 import { shouldThrowError } from './utils'
@@ -13,12 +14,12 @@ import { shouldThrowError } from './utils'
 // HOOK
 export function createMutation<
   TData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TVariables = void,
   TContext = unknown,
 >(
   options: CreateMutationOptions<TData, TError, TVariables, TContext>,
-  queryClient?: () => QueryClient,
+  queryClient?: Accessor<QueryClient>,
 ): CreateMutationResult<TData, TError, TVariables, TContext> {
   const client = useQueryClient(queryClient?.())
 

package/src/createQueries.ts

@@ -3,9 +3,10 @@ import type {
   QueryClient,
   QueryFunction,
   QueryKey,
-  RegisteredError,
+  DefaultError,
 } from '@tanstack/query-core'
 import { notifyManager, QueriesObserver } from '@tanstack/query-core'
+import type { Accessor } from 'solid-js'
 import { createComputed, onCleanup, onMount } from 'solid-js'
 import { createStore, unwrap } from 'solid-js/store'
 import { useQueryClient } from './QueryClientProvider'
@@ -15,7 +16,7 @@ import type { CreateQueryResult, SolidQueryOptions } from './types'
 // `placeholderData` function does not have a parameter
 type CreateQueryOptionsForCreateQueries<
   TQueryFnData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 > = Omit<
@@ -142,26 +143,26 @@ export type QueriesResults<
   ? // Dynamic-size (homogenous) UseQueryOptions array: map directly to array of results
     CreateQueryResult<
       unknown extends TData ? TQueryFnData : TData,
-      unknown extends TError ? RegisteredError : TError
+      unknown extends TError ? DefaultError : TError
     >[]
   : // Fallback
     CreateQueryResult[]
 
 export function createQueries<T extends any[]>(
-  queriesOptions: () => {
+  queriesOptions: Accessor<{
     queries: readonly [...QueriesOptions<T>]
-    queryClient?: QueryClient
-  },
+  }>,
+  queryClient?: Accessor<QueryClient>,
 ): QueriesResults<T> {
-  const queryClient = useQueryClient(queriesOptions().queryClient)
+  const client = useQueryClient(queryClient?.())
 
   const defaultedQueries = queriesOptions().queries.map((options) => {
-    const defaultedOptions = queryClient.defaultQueryOptions(options)
+    const defaultedOptions = client.defaultQueryOptions(options)
     defaultedOptions._optimisticResults = 'optimistic'
     return defaultedOptions
   })
 
-  const observer = new QueriesObserver(queryClient, defaultedQueries)
+  const observer = new QueriesObserver(client, defaultedQueries)
 
   const [state, setState] = createStore(
     observer.getOptimisticResult(defaultedQueries),
@@ -181,7 +182,7 @@ export function createQueries<T extends any[]>(
 
   createComputed(() => {
     const updatedQueries = queriesOptions().queries.map((options) => {
-      const defaultedOptions = queryClient.defaultQueryOptions(options)
+      const defaultedOptions = client.defaultQueryOptions(options)
       defaultedOptions._optimisticResults = 'optimistic'
       return defaultedOptions
     })

package/src/createQuery.ts

@@ -1,9 +1,6 @@
-import type {
-  QueryClient,
-  QueryKey,
-  RegisteredError,
-} from '@tanstack/query-core'
+import type { QueryClient, QueryKey, DefaultError } from '@tanstack/query-core'
 import { QueryObserver } from '@tanstack/query-core'
+import type { Accessor } from 'solid-js'
 import { createMemo } from 'solid-js'
 import { createBaseQuery } from './createBaseQuery'
 import type {
@@ -16,7 +13,7 @@ import type {
 
 type UndefinedInitialDataOptions<
   TQueryFnData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 > = FunctionedParams<
@@ -27,7 +24,7 @@ type UndefinedInitialDataOptions<
 
 type DefinedInitialDataOptions<
   TQueryFnData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 > = FunctionedParams<
@@ -38,7 +35,7 @@ type DefinedInitialDataOptions<
 
 export function createQuery<
   TQueryFnData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 >(
@@ -48,7 +45,7 @@ export function createQuery<
 
 export function createQuery<
   TQueryFnData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 >(
@@ -57,12 +54,12 @@ export function createQuery<
 ): DefinedCreateQueryResult<TData, TError>
 export function createQuery<
   TQueryFnData,
-  TError = RegisteredError,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 >(
   options: CreateQueryOptions<TQueryFnData, TError, TData, TQueryKey>,
-  queryClient?: () => QueryClient,
+  queryClient?: Accessor<QueryClient>,
 ) {
   return createBaseQuery(
     createMemo(() => options()),

package/src/types.ts

@@ -11,14 +11,14 @@ import type {
   InfiniteQueryObserverOptions,
   InfiniteQueryObserverResult,
   WithRequired,
-  RegisteredError,
+  DefaultError,
 } from '@tanstack/query-core'
 
 export type FunctionedParams<T> = () => T
 
 export interface CreateBaseQueryOptions<
   TQueryFnData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
@@ -31,7 +31,7 @@ export interface CreateBaseQueryOptions<
 
 export interface SolidQueryOptions<
   TQueryFnData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 > extends WithRequired<
@@ -47,7 +47,7 @@ export interface SolidQueryOptions<
 
 export type CreateQueryOptions<
   TQueryFnData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
 > = FunctionedParams<SolidQueryOptions<TQueryFnData, TError, TData, TQueryKey>>
@@ -56,28 +56,28 @@ export type CreateQueryOptions<
 
 export type CreateBaseQueryResult<
   TData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
 > = QueryObserverResult<TData, TError>
 
 export type CreateQueryResult<
   TData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
 > = CreateBaseQueryResult<TData, TError>
 
 export type DefinedCreateBaseQueryResult<
   TData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
 > = DefinedQueryObserverResult<TData, TError>
 
 export type DefinedCreateQueryResult<
   TData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
 > = DefinedCreateBaseQueryResult<TData, TError>
 
 /* --- Create Infinite Queries Types --- */
 export interface SolidInfiniteQueryOptions<
   TQueryFnData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
@@ -99,7 +99,7 @@ export interface SolidInfiniteQueryOptions<
 
 export type CreateInfiniteQueryOptions<
   TQueryFnData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TData = TQueryFnData,
   TQueryKey extends QueryKey = QueryKey,
   TPageParam = unknown,
@@ -116,13 +116,13 @@ export type CreateInfiniteQueryOptions<
 
 export type CreateInfiniteQueryResult<
   TData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
 > = InfiniteQueryObserverResult<TData, TError>
 
 /* --- Create Mutation Types --- */
 export interface SolidMutationOptions<
   TData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TVariables = void,
   TContext = unknown,
 > extends Omit<
@@ -132,14 +132,14 @@ export interface SolidMutationOptions<
 
 export type CreateMutationOptions<
   TData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TVariables = void,
   TContext = unknown,
 > = FunctionedParams<SolidMutationOptions<TData, TError, TVariables, TContext>>
 
 export type CreateMutateFunction<
   TData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TVariables = void,
   TContext = unknown,
 > = (
@@ -148,14 +148,14 @@ export type CreateMutateFunction<
 
 export type CreateMutateAsyncFunction<
   TData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TVariables = void,
   TContext = unknown,
 > = MutateFunction<TData, TError, TVariables, TContext>
 
 export type CreateBaseMutationResult<
   TData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TVariables = unknown,
   TContext = unknown,
 > = Override<
@@ -167,7 +167,7 @@ export type CreateBaseMutationResult<
 
 export type CreateMutationResult<
   TData = unknown,
-  TError = RegisteredError,
+  TError = DefaultError,
   TVariables = unknown,
   TContext = unknown,
 > = CreateBaseMutationResult<TData, TError, TVariables, TContext>

package/src/useIsFetching.ts

@@ -3,21 +3,17 @@ import type { Accessor } from 'solid-js'
 import { createMemo, createSignal, onCleanup } from 'solid-js'
 import { useQueryClient } from './QueryClientProvider'
 
-type Options = () => {
-  filters?: QueryFilters
-  queryClient?: QueryClient
-}
-
-export function useIsFetching(options: Options = () => ({})): Accessor<number> {
-  const queryClient = createMemo(() => useQueryClient(options().queryClient))
-  const queryCache = createMemo(() => queryClient().getQueryCache())
+export function useIsFetching(
+  filters?: Accessor<QueryFilters>,
+  queryClient?: Accessor<QueryClient>,
+): Accessor<number> {
+  const client = createMemo(() => useQueryClient(queryClient?.()))
+  const queryCache = createMemo(() => client().getQueryCache())
 
-  const [fetches, setFetches] = createSignal(
-    queryClient().isFetching(options().filters),
-  )
+  const [fetches, setFetches] = createSignal(client().isFetching(filters?.()))
 
   const unsubscribe = queryCache().subscribe(() => {
-    setFetches(queryClient().isFetching(options().filters))
+    setFetches(client().isFetching(filters?.()))
   })
 
   onCleanup(unsubscribe)

package/src/useIsMutating.ts

@@ -3,21 +3,19 @@ import { useQueryClient } from './QueryClientProvider'
 import type { Accessor } from 'solid-js'
 import { createSignal, onCleanup, createMemo } from 'solid-js'
 
-type Options = () => {
-  filters?: MutationFilters
-  queryClient?: QueryClient
-}
-
-export function useIsMutating(options: Options = () => ({})): Accessor<number> {
-  const queryClient = createMemo(() => useQueryClient(options().queryClient))
-  const mutationCache = createMemo(() => queryClient().getMutationCache())
+export function useIsMutating(
+  filters?: Accessor<MutationFilters>,
+  queryClient?: Accessor<QueryClient>,
+): Accessor<number> {
+  const client = createMemo(() => useQueryClient(queryClient?.()))
+  const mutationCache = createMemo(() => client().getMutationCache())
 
   const [mutations, setMutations] = createSignal(
-    queryClient().isMutating(options().filters),
+    client().isMutating(filters?.()),
   )
 
   const unsubscribe = mutationCache().subscribe((_result) => {
-    setMutations(queryClient().isMutating(options().filters))
+    setMutations(client().isMutating(filters?.()))
   })
 
   onCleanup(unsubscribe)