fix

TanStack · Jul 25, 2024 · f0aa74c · f0aa74c
1 parent 63fd463
commit f0aa74c
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 16 deletions.
diff --git a/examples/svelte/svelte-melt/src/routes/+page.svelte b/examples/svelte/svelte-melt/src/routes/+page.svelte
@@ -13,7 +13,7 @@
   })
 </script>
 
-isReTORING:{isRes()}
+isRestoring:{isRes()}
 <!-- <h1>testing list query cache update</h1>
 <Simple />
 <h1>testing DerivedQuery cache update</h1> -->

diff --git a/examples/svelte/svelte-melt/src/routes/cacheUpdate.svelte b/examples/svelte/svelte-melt/src/routes/cacheUpdate.svelte
@@ -51,7 +51,7 @@
 <button
   onclick={() => {
     update.mutate()
-  }}>update cache</button
+  }}>update cache {update.status}</button
 >
 
 {data.fetchStatus}

diff --git a/packages/react-query/src/useQueries.ts b/packages/react-query/src/useQueries.ts
@@ -36,6 +36,7 @@ import type {
   QueryObserverOptions,
   ThrowOnError,
 } from '@tanstack/query-core'
+import { queryOptions } from './queryOptions'
 
 // This defines the `UseQueryOptions` that are accepted in `QueriesOptions` & `GetOptions`.
 // `placeholderData` function always gets undefined passed
@@ -344,3 +345,16 @@ export function useQueries<
 
   return getCombinedResult(trackResult())
 }
+
+const r = useQueries({
+  queries: [{ queryKey: ['1'], queryFn: (v) => 1 }],
+  combine: (v) => v.map((v) => v),
+})
+const options = queryOptions({
+  queryKey: ['key'],
+  queryFn: () => Promise.resolve(5),
+})
+
+const queries = useQueries({
+  queries: [options],
+})
diff --git a/packages/svelte-query-persist-client/src/PersistQueryClientProvider.svelte b/packages/svelte-query-persist-client/src/PersistQueryClientProvider.svelte
@@ -12,6 +12,7 @@
     OmitKeyof,
     QueryClientProviderProps,
   } from '@tanstack/svelte-query'
+
   type PersistQueryClientProviderProps = QueryClientProviderProps & {
     persistOptions: OmitKeyof<PersistQueryClientOptions, 'queryClient'>
     onSuccess?: () => void

diff --git a/packages/svelte-query/src/context.ts b/packages/svelte-query/src/context.ts
@@ -25,7 +25,9 @@ const _isRestoringContextKey = '$$_isRestoring'
 /** Retrieves a `isRestoring` from Svelte's context */
 export const getIsRestoringContext = (): (() => boolean) => {
   try {
-    const isRestoring = getContext<() => boolean>(_isRestoringContextKey)
+    const isRestoring = getContext<(() => boolean) | undefined>(
+      _isRestoringContextKey,
+    )
     return isRestoring ?? (() => false)
   } catch (error) {
     return () => false

diff --git a/packages/svelte-query/src/createQueries.svelte.ts b/packages/svelte-query/src/createQueries.svelte.ts
@@ -119,7 +119,7 @@ type GetCreateQueryResult<T> =
                     unknown extends TError ? DefaultError : TError
                   >
                 : // Fallback
-                  QueryObserverResult
+                  never
 
 /**
  * QueriesOptions reducer recursively unwraps function arguments to infer/enforce type param
@@ -221,13 +221,13 @@ export function createQueries<
   )
 
   const defaultedQueriesStore = $derived(() => {
-    return queriesStore().map((opts: QueryObserverOptions) => {
+    return queriesStore().map((opts) => {
       const defaultedOptions = client.defaultQueryOptions(opts)
       // Make sure the results are already in fetching state before subscribing or updating options
       defaultedOptions._optimisticResults = isRestoring()
         ? 'isRestoring'
         : 'optimistic'
-      return defaultedOptions
+      return defaultedOptions as QueryObserverOptions
     })
   })
   const observer = new QueriesObserver<TCombinedResult>(

diff --git a/packages/svelte-query/tests/createQueries/createQueries.test-d.ts b/packages/svelte-query/tests/createQueries/createQueries.test-d.ts
@@ -1,7 +1,7 @@
 import { describe, expectTypeOf, test } from 'vitest'
 import { skipToken } from '@tanstack/query-core'
 import { createQueries, queryOptions } from '../../src/index'
-import type { OmitKeyof, QueryObserverResult } from '@tanstack/query-core'
+import type { QueryObserverResult } from '@tanstack/query-core'
 import type { CreateQueryOptions } from '../../src/index'
 
 describe('createQueries', () => {
@@ -27,9 +27,7 @@ describe('createQueries', () => {
   test('Allow custom hooks using UseQueryOptions', () => {
     type Data = string
 
-    const useCustomQueries = (
-      options?: OmitKeyof<CreateQueryOptions<Data>, 'queryKey' | 'queryFn'>,
-    ) => {
+    const useCustomQueries = (options?: CreateQueryOptions<Data>) => {
       return createQueries({
         queries: [
           {

diff --git a/packages/svelte-query/tests/createQuery/createQuery.test-d.ts b/packages/svelte-query/tests/createQuery/createQuery.test-d.ts
@@ -1,6 +1,5 @@
 import { describe, expectTypeOf, test } from 'vitest'
 import { createQuery, queryOptions } from '../../src/index'
-import type { OmitKeyof } from '@tanstack/query-core'
 import type { CreateQueryOptions } from '../../src/index'
 
 describe('createQuery', () => {
@@ -47,9 +46,7 @@ describe('createQuery', () => {
   test('Allow custom hooks using CreateQueryOptions', () => {
     type Data = string
 
-    const useCustomQuery = (
-      options?: OmitKeyof<CreateQueryOptions<Data>, 'queryKey' | 'queryFn'>,
-    ) => {
+    const useCustomQuery = (options?: CreateQueryOptions<Data>) => {
       return createQuery({
         ...options,
         queryKey: ['todos-key'],

diff --git a/packages/svelte-query/tests/infiniteQueryOptions/infiniteQueryOptions.test-d.ts b/packages/svelte-query/tests/infiniteQueryOptions/infiniteQueryOptions.test-d.ts
@@ -45,12 +45,12 @@ describe('queryOptions', () => {
   })
 
   test('Should work when passed to fetchInfiniteQuery', async () => {
-    const options = infiniteQueryOptions({
+    const options = {
       queryKey: ['key'],
       queryFn: () => Promise.resolve('string'),
       getNextPageParam: () => 1,
       initialPageParam: 1,
-    })
+    }
 
     const data = await new QueryClient().fetchInfiniteQuery(options)