feat(solid-query): type useQuery/useInfiniteQuery data as non-nullable

packages/solid-query-persist-client/src/__tests__/PersistQueryClientProvider.test.tsx

@@ -364,7 +364,7 @@ describe('PersistQueryClientProvider', () => {
 
       return (
         <div>
-          <h1>data: {state.data ?? 'null'}</h1>
+          <h1>data: {state.data}</h1>
           <h2>fetchStatus: {state.fetchStatus}</h2>
         </div>
       )
@@ -381,7 +381,7 @@ describe('PersistQueryClientProvider', () => {
       </Loading>
     ))
 
-    expect(screen.getByText('data: null')).toBeInTheDocument()
+    expect(screen.getByText('data:')).toBeInTheDocument()
     await vi.advanceTimersByTimeAsync(10)
     expect(screen.getByText('data: hydrated')).toBeInTheDocument()
     await vi.advanceTimersByTimeAsync(10)

packages/solid-query/src/__tests__/infiniteQueryOptions.test-d.tsx

@@ -52,7 +52,7 @@ describe('infiniteQueryOptions', () => {
     })
 
     expectTypeOf(() => useInfiniteQuery(() => options).data).toEqualTypeOf<
-      () => InfiniteData<{ wow: boolean }, unknown> | undefined
+      () => InfiniteData<{ wow: boolean }, unknown>
     >()
 
     expectTypeOf(options).toExtend<

packages/solid-query/src/__tests__/queryOptions.test-d.tsx

@@ -37,7 +37,7 @@ describe('queryOptions', () => {
     })
 
     const { data } = useQuery(() => options)
-    expectTypeOf(data).toEqualTypeOf<number | undefined>()
+    expectTypeOf(data).toEqualTypeOf<number>()
   })
   it('should work when passed to fetchQuery', async () => {
     const options = queryOptions({

packages/solid-query/src/__tests__/suspense.test.tsx

@@ -1,6 +1,12 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { fireEvent } from '@solidjs/testing-library'
-import { Errored, Loading, createRenderEffect, createSignal } from 'solid-js'
+import {
+  Errored,
+  Loading,
+  createRenderEffect,
+  createSignal,
+  deep,
+} from 'solid-js'
 import { queryKey, sleep } from '@tanstack/query-test-utils'
 import { QueryCache, QueryClient, useInfiniteQuery, useQuery } from '..'
 import { renderWithClient } from './utils'
@@ -37,14 +43,14 @@ describe("useQuery's in Loading mode", () => {
       }))
 
       createRenderEffect(
-        () => state,
+        () => deep(state),
         (s) => {
-          states.push({ ...s })
+          states.push(s)
         },
       )
 
       createRenderEffect(
-        () => [{ ...state }, () => key],
+        () => [deep(state), () => key],
         () => {
           renders++
         },
@@ -92,16 +98,16 @@ describe("useQuery's in Loading mode", () => {
       }))
 
       createRenderEffect(
-        () => state,
+        () => deep(state),
         (s) => {
-          states.push({ ...s })
+          states.push(s)
         },
       )
 
       return (
         <div>
           <button onClick={() => setMultiplier(2)}>next</button>
-          data: {state.data?.pages.join(',')}
+          data: {state.data.pages.join(',')}
         </div>
       )
     }

packages/solid-query/src/__tests__/useInfiniteQuery.test-d.tsx

@@ -76,9 +76,7 @@ describe('useInfiniteQuery', () => {
         getNextPageParam: () => undefined,
       }))
 
-      expectTypeOf(data).toEqualTypeOf<
-        InfiniteData<number, unknown> | undefined
-      >()
+      expectTypeOf(data).toEqualTypeOf<InfiniteData<number, unknown>>()
     })
   })
 
@@ -95,7 +93,7 @@ describe('useInfiniteQuery', () => {
 
       // TODO: Order of generics prevents pageParams to be typed correctly. Using `unknown` for now
       expectTypeOf(infiniteQuery.data).toEqualTypeOf<
-        InfiniteData<number, unknown> | undefined
+        InfiniteData<number, unknown>
       >()
     })
 
@@ -113,7 +111,7 @@ describe('useInfiniteQuery', () => {
         },
       }))
 
-      expectTypeOf(infiniteQuery.data).toEqualTypeOf<'selected' | undefined>()
+      expectTypeOf(infiniteQuery.data).toEqualTypeOf<'selected'>()
     })
   })
 
@@ -153,7 +151,7 @@ describe('useInfiniteQuery', () => {
 
       // TODO: Order of generics prevents pageParams to be typed correctly. Using `unknown` for now
       expectTypeOf(infiniteQuery.data).toEqualTypeOf<
-        InfiniteData<string, unknown> | undefined
+        InfiniteData<string, unknown>
       >()
     })
   })
@@ -199,7 +197,7 @@ describe('useInfiniteQuery', () => {
 
       // TODO: Order of generics prevents pageParams to be typed correctly. Using `unknown` for now
       expectTypeOf(infiniteQuery.data).toEqualTypeOf<
-        InfiniteData<number, unknown> | undefined
+        InfiniteData<number, unknown>
       >()
     })
   })