@tanstack/solid-query 4.29.22 → 4.29.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tanstack/solid-query",
-  "version": "4.29.22",
+  "version": "4.29.25",
   "description": "Primitives for managing, caching and syncing asynchronous and remote data in Solid",
   "author": "tannerlinsley",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "solid-jest": "^0.2.0"
   },
   "dependencies": {
-    "@tanstack/query-core": "4.29.22"
+    "@tanstack/query-core": "4.29.25"
   },
   "peerDependencies": {
     "solid-js": "^1.5.7"

package/src/QueryClientProvider.tsx

@@ -1,12 +1,12 @@
-import type { QueryClient } from '@tanstack/query-core'
-import type { Context, JSX } from 'solid-js'
 import {
   createContext,
-  useContext,
-  onMount,
-  onCleanup,
   mergeProps,
+  onCleanup,
+  onMount,
+  useContext,
 } from 'solid-js'
+import type { QueryClient } from '@tanstack/query-core'
+import type { Context, JSX } from 'solid-js'
 import type { ContextOptions } from './types'
 
 declare global {

package/src/__tests__/QueryClientProvider.test.tsx

@@ -1,12 +1,12 @@
 import { render, screen, waitFor } from 'solid-testing-library'
-import { queryKey } from './utils'
 
 import { QueryCache, QueryClient } from '@tanstack/query-core'
-import type { Context } from 'solid-js'
 import { createContext, useContext } from 'solid-js'
 import { renderToString } from 'solid-js/web'
-import { createQuery, QueryClientProvider, useQueryClient } from '..'
+import { QueryClientProvider, createQuery, useQueryClient } from '..'
+import { queryKey } from './utils'
 import { createQueryClient, sleep } from './utils'
+import type { Context } from 'solid-js'
 
 describe('QueryClientProvider', () => {
   it('sets a specific cache for all queries to use', async () => {

package/src/__tests__/createInfiniteQuery.test.tsx

@@ -1,23 +1,22 @@
 import { fireEvent, render, screen, waitFor } from 'solid-testing-library'
 
-import { createQueryClient, sleep } from './utils'
-
 import {
-  createEffect,
-  createRenderEffect,
-  createSignal,
   For,
   Index,
   Match,
   Switch,
+  createEffect,
+  createRenderEffect,
+  createSignal,
 } from 'solid-js'
+import { QueryCache, QueryClientProvider, createInfiniteQuery } from '..'
+import { createQueryClient, sleep } from './utils'
+import { Blink, queryKey, setActTimeout } from './utils'
 import type {
   CreateInfiniteQueryResult,
   InfiniteData,
   QueryFunctionContext,
 } from '..'
-import { createInfiniteQuery, QueryCache, QueryClientProvider } from '..'
-import { Blink, queryKey, setActTimeout } from './utils'
 
 interface Result {
   items: number[]

package/src/__tests__/createMutation.test.tsx

@@ -1,20 +1,18 @@
 import '@testing-library/jest-dom'
 import {
+  ErrorBoundary,
   createContext,
   createEffect,
   createRenderEffect,
   createSignal,
-  ErrorBoundary,
 } from 'solid-js'
 import { fireEvent, render, screen, waitFor } from 'solid-testing-library'
-import type { QueryClient } from '..'
 import {
-  createMutation,
   MutationCache,
   QueryCache,
   QueryClientProvider,
+  createMutation,
 } from '..'
-import type { CreateMutationResult } from '../types'
 import {
   createQueryClient,
   mockNavigatorOnLine,
@@ -22,6 +20,8 @@ import {
   setActTimeout,
   sleep,
 } from './utils'
+import type { QueryClient } from '..'
+import type { CreateMutationResult } from '../types'
 
 describe('useMutation', () => {
   const queryCache = new QueryCache()

package/src/__tests__/createQueries.test.tsx

@@ -1,28 +1,19 @@
 import { fireEvent, render, screen, waitFor } from 'solid-testing-library'
 
-import * as QueriesObserverModule from '../../../query-core/src/queriesObserver'
-
-import type { QueryFunctionContext } from '@tanstack/query-core'
 import {
+  ErrorBoundary,
   createContext,
   createMemo,
   createRenderEffect,
   createSignal,
-  ErrorBoundary,
 } from 'solid-js'
-import type {
-  CreateQueryOptions,
-  CreateQueryResult,
-  QueryClient,
-  QueryFunction,
-  QueryObserverResult,
-  SolidQueryKey,
-} from '..'
+import * as QueriesObserverModule from '../../../query-core/src/queriesObserver'
+
 import {
-  createQueries,
   QueriesObserver,
   QueryCache,
   QueryClientProvider,
+  createQueries,
 } from '..'
 import {
   createQueryClient,
@@ -31,6 +22,15 @@ import {
   queryKey,
   sleep,
 } from './utils'
+import type { QueryFunctionContext } from '@tanstack/query-core'
+import type {
+  CreateQueryOptions,
+  CreateQueryResult,
+  QueryClient,
+  QueryFunction,
+  QueryObserverResult,
+  SolidQueryKey,
+} from '..'
 
 describe('useQueries', () => {
   const queryCache = new QueryCache()

package/src/__tests__/createQuery.test.tsx

@@ -1,23 +1,16 @@
 import '@testing-library/jest-dom'
-import type { JSX } from 'solid-js'
 import {
+  ErrorBoundary,
+  Match,
+  Switch,
   createEffect,
   createMemo,
   createRenderEffect,
   createSignal,
-  ErrorBoundary,
-  Match,
   on,
-  Switch,
 } from 'solid-js'
 import { fireEvent, render, screen, waitFor } from 'solid-testing-library'
-import type {
-  CreateQueryOptions,
-  CreateQueryResult,
-  DefinedCreateQueryResult,
-  QueryFunction,
-} from '..'
-import { createQuery, QueryCache, QueryClientProvider } from '..'
+import { QueryCache, QueryClientProvider, createQuery } from '..'
 import {
   Blink,
   createQueryClient,
@@ -29,6 +22,13 @@ import {
   setActTimeout,
   sleep,
 } from './utils'
+import type {
+  CreateQueryOptions,
+  CreateQueryResult,
+  DefinedCreateQueryResult,
+  QueryFunction,
+} from '..'
+import type { JSX } from 'solid-js'
 
 describe('createQuery', () => {
   const queryCache = new QueryCache()

package/src/__tests__/suspense.test.tsx

@@ -1,21 +1,21 @@
 import { fireEvent, render, screen, waitFor } from 'solid-testing-library'
 
 import {
-  createRenderEffect,
-  createSignal,
   ErrorBoundary,
-  on,
   Show,
   Suspense,
+  createRenderEffect,
+  createSignal,
+  on,
 } from 'solid-js'
-import type { CreateInfiniteQueryResult, CreateQueryResult } from '..'
 import {
-  createInfiniteQuery,
-  createQuery,
   QueryCache,
   QueryClientProvider,
+  createInfiniteQuery,
+  createQuery,
 } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
+import type { CreateInfiniteQueryResult, CreateQueryResult } from '..'
 
 describe("useQuery's in Suspense mode", () => {
   const queryCache = new QueryCache()

package/src/__tests__/transition.test.tsx

@@ -1,7 +1,7 @@
 import { fireEvent, render, screen, waitFor } from 'solid-testing-library'
 
-import { createSignal, Show, startTransition, Suspense } from 'solid-js'
-import { createQuery, QueryCache, QueryClientProvider } from '..'
+import { Show, Suspense, createSignal, startTransition } from 'solid-js'
+import { QueryCache, QueryClientProvider, createQuery } from '..'
 import { createQueryClient, queryKey, sleep } from './utils'
 
 describe("useQuery's in Suspense mode with transitions", () => {

package/src/__tests__/useIsFetching.test.tsx

@@ -1,16 +1,16 @@
 import { fireEvent, render, screen, waitFor } from 'solid-testing-library'
 
 import {
+  ErrorBoundary,
+  Show,
   createContext,
   createEffect,
   createRenderEffect,
   createSignal,
-  ErrorBoundary,
-  Show,
 } from 'solid-js'
-import type { QueryClient } from '..'
-import { createQuery, QueryCache, QueryClientProvider, useIsFetching } from '..'
+import { QueryCache, QueryClientProvider, createQuery, useIsFetching } from '..'
 import { createQueryClient, queryKey, setActTimeout, sleep } from './utils'
+import type { QueryClient } from '..'
 
 describe('useIsFetching', () => {
   // See https://github.com/tannerlinsley/react-query/issues/105

package/src/__tests__/useIsMutating.test.tsx

@@ -1,22 +1,22 @@
 import { fireEvent, screen, waitFor } from 'solid-testing-library'
-import {
-  createMutation,
-  QueryClient,
-  QueryClientProvider,
-  useIsMutating,
-} from '..'
-import { createQueryClient, sleep } from './utils'
 
 import {
+  ErrorBoundary,
+  Show,
   createContext,
   createEffect,
   createRenderEffect,
   createSignal,
-  ErrorBoundary,
-  Show,
 } from 'solid-js'
 import { render } from 'solid-testing-library'
+import {
+  QueryClient,
+  QueryClientProvider,
+  createMutation,
+  useIsMutating,
+} from '..'
 import * as MutationCacheModule from '../../../query-core/src/mutationCache'
+import { createQueryClient, sleep } from './utils'
 import { setActTimeout } from './utils'
 
 describe('useIsMutating', () => {

package/src/__tests__/utils.tsx

@@ -1,7 +1,7 @@
-import type { QueryClientConfig } from '@tanstack/query-core'
 import { QueryClient } from '@tanstack/query-core'
+import { Show, createEffect, createSignal, onCleanup } from 'solid-js'
+import type { QueryClientConfig } from '@tanstack/query-core'
 import type { ParentProps } from 'solid-js'
-import { createEffect, createSignal, onCleanup, Show } from 'solid-js'
 
 let queryKeyCount = 0
 export function queryKey(): () => Array<string> {

package/src/createBaseQuery.ts

@@ -1,17 +1,17 @@
-import type { QueryObserver } from '@tanstack/query-core'
-import type { QueryKey, QueryObserverResult } from '@tanstack/query-core'
-import type { CreateBaseQueryOptions } from './types'
-import { useQueryClient } from './QueryClientProvider'
 import {
-  onMount,
-  onCleanup,
+  batch,
   createComputed,
   createResource,
   on,
-  batch,
+  onCleanup,
+  onMount,
 } from 'solid-js'
 import { createStore, unwrap } from 'solid-js/store'
+import { useQueryClient } from './QueryClientProvider'
 import { shouldThrowError } from './utils'
+import type { QueryObserver } from '@tanstack/query-core'
+import type { QueryKey, QueryObserverResult } from '@tanstack/query-core'
+import type { CreateBaseQueryOptions } from './types'
 
 // Base Query Function that is used to create the query.
 export function createBaseQuery<

package/src/createInfiniteQuery.ts

@@ -1,18 +1,18 @@
-import type {
-  QueryObserver,
-  QueryFunction,
-  QueryOptions,
-} from '@tanstack/query-core'
 import { InfiniteQueryObserver } from '@tanstack/query-core'
+import { createComputed } from 'solid-js'
+import { createStore } from 'solid-js/store'
+import { createBaseQuery } from './createBaseQuery'
+import { parseQueryArgs } from './utils'
 import type {
   CreateInfiniteQueryOptions,
   CreateInfiniteQueryResult,
   SolidQueryKey,
 } from './types'
-import { createBaseQuery } from './createBaseQuery'
-import { createComputed } from 'solid-js'
-import { createStore } from 'solid-js/store'
-import { parseQueryArgs } from './utils'
+import type {
+  QueryFunction,
+  QueryObserver,
+  QueryOptions,
+} from '@tanstack/query-core'
 
 export function createInfiniteQuery<
   TQueryFnData = unknown,

package/src/createMutation.ts

@@ -1,14 +1,14 @@
-import type { MutationFunction, MutationKey } from '@tanstack/query-core'
-import { parseMutationArgs, MutationObserver } from '@tanstack/query-core'
+import { MutationObserver, parseMutationArgs } from '@tanstack/query-core'
+import { createComputed, on, onCleanup } from 'solid-js'
+import { createStore } from 'solid-js/store'
 import { useQueryClient } from './QueryClientProvider'
+import { shouldThrowError } from './utils'
 import type {
   CreateMutateFunction,
   CreateMutationOptions,
   CreateMutationResult,
 } from './types'
-import { createComputed, onCleanup, on } from 'solid-js'
-import { createStore } from 'solid-js/store'
-import { shouldThrowError } from './utils'
+import type { MutationFunction, MutationKey } from '@tanstack/query-core'
 
 // HOOK
 export function createMutation<

package/src/createQueries.ts

@@ -1,14 +1,14 @@
 import { createComputed, onCleanup, onMount } from 'solid-js'
-import type { QueryFunction } from '@tanstack/query-core'
 import { QueriesObserver } from '@tanstack/query-core'
+import { createStore, unwrap } from 'solid-js/store'
 import { useQueryClient } from './QueryClientProvider'
+import { scheduleMicrotask } from './utils'
 import type {
   CreateQueryOptions,
   CreateQueryResult,
   SolidQueryKey,
 } from './types'
-import { createStore, unwrap } from 'solid-js/store'
-import { scheduleMicrotask } from './utils'
+import type { QueryFunction } from '@tanstack/query-core'
 
 // This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.
 // - `context` is omitted as it is passed as a root-level option to `useQueries` instead.

package/src/createQuery.ts

@@ -1,15 +1,15 @@
-import type { QueryFunction, QueryOptions } from '@tanstack/query-core'
 import { QueryObserver } from '@tanstack/query-core'
+import { createComputed } from 'solid-js'
+import { createStore } from 'solid-js/store'
+import { parseQueryArgs } from './utils'
+import { createBaseQuery } from './createBaseQuery'
 import type {
   CreateQueryOptions,
   CreateQueryResult,
   DefinedCreateQueryResult,
   SolidQueryKey,
 } from './types'
-import { createComputed } from 'solid-js'
-import { createStore } from 'solid-js/store'
-import { parseQueryArgs } from './utils'
-import { createBaseQuery } from './createBaseQuery'
+import type { QueryFunction, QueryOptions } from '@tanstack/query-core'
 
 // There are several ways to create a query.
 // 1. createQuery(options: CreateQueryOptions)

package/src/types.ts

@@ -2,17 +2,17 @@
 
 import type { Context } from 'solid-js'
 import type {
-  QueryClient,
-  QueryKey,
-  QueryObserverOptions,
-  QueryObserverResult,
-  MutateFunction,
-  MutationObserverOptions,
-  MutationObserverResult,
   DefinedQueryObserverResult,
   InfiniteQueryObserverOptions,
   InfiniteQueryObserverResult,
+  MutateFunction,
+  MutationObserverOptions,
+  MutationObserverResult,
+  QueryClient,
   QueryFilters,
+  QueryKey,
+  QueryObserverOptions,
+  QueryObserverResult,
   QueryOptions,
 } from '@tanstack/query-core'
 

package/src/useIsFetching.ts

@@ -1,10 +1,10 @@
+import { createComputed, createMemo, createSignal, onCleanup } from 'solid-js'
+import { useQueryClient } from './QueryClientProvider'
+import { parseFilterArgs } from './utils'
 import type { QueryFilters } from '@tanstack/query-core'
 
-import type { ContextOptions, SolidQueryKey, SolidQueryFilters } from './types'
-import { useQueryClient } from './QueryClientProvider'
+import type { ContextOptions, SolidQueryFilters, SolidQueryKey } from './types'
 import type { Accessor } from 'solid-js'
-import { createSignal, onCleanup, createComputed, createMemo } from 'solid-js'
-import { parseFilterArgs } from './utils'
 
 interface Options extends ContextOptions {}
 

package/src/useIsMutating.ts

@@ -1,9 +1,9 @@
-import type { MutationKey, MutationFilters } from '@tanstack/query-core'
 import { parseMutationFilterArgs } from '@tanstack/query-core'
-import type { ContextOptions } from './types'
+import { createSignal, onCleanup } from 'solid-js'
 import { useQueryClient } from './QueryClientProvider'
+import type { MutationFilters, MutationKey } from '@tanstack/query-core'
+import type { ContextOptions } from './types'
 import type { Accessor } from 'solid-js'
-import { createSignal, onCleanup } from 'solid-js'
 
 interface Options extends ContextOptions {}
 

package/src/utils.ts

@@ -1,8 +1,8 @@
 import type {
-  SolidQueryKey,
-  SolidQueryFilters,
   ParseFilterArgs,
   ParseQueryArgs,
+  SolidQueryFilters,
+  SolidQueryKey,
 } from './types'
 import type { QueryFunction, QueryOptions } from '@tanstack/query-core'