@@ -9,34 +9,25 @@ import {
99 createSignal ,
1010 on ,
1111} from 'solid-js'
12- import {
13- QueryCache ,
14- QueryClientProvider ,
15- createInfiniteQuery ,
16- createQuery ,
17- } from '..'
12+ import { QueryCache , QueryClientProvider , useInfiniteQuery , useQuery } from '..'
1813import { createQueryClient , queryKey , sleep } from './utils'
19- import type {
20- CreateInfiniteQueryResult ,
21- CreateQueryResult ,
22- InfiniteData ,
23- } from '..'
14+ import type { InfiniteData , UseInfiniteQueryResult , UseQueryResult } from '..'
2415
2516describe ( "useQuery's in Suspense mode" , ( ) => {
2617 const queryCache = new QueryCache ( )
2718 const queryClient = createQueryClient ( { queryCache } )
2819
2920 it ( 'should render the correct amount of times in Suspense mode' , async ( ) => {
3021 const key = queryKey ( )
31- const states : Array < CreateQueryResult < number > > = [ ]
22+ const states : Array < UseQueryResult < number > > = [ ]
3223
3324 let count = 0
3425 let renders = 0
3526
3627 function Page ( ) {
3728 const [ stateKey , setStateKey ] = createSignal ( key )
3829
39- const state = createQuery ( ( ) => ( {
30+ const state = useQuery ( ( ) => ( {
4031 queryKey : stateKey ( ) ,
4132 queryFn : async ( ) => {
4233 count ++
@@ -84,11 +75,11 @@ describe("useQuery's in Suspense mode", () => {
8475
8576 it ( 'should return the correct states for a successful infinite query' , async ( ) => {
8677 const key = queryKey ( )
87- const states : Array < CreateInfiniteQueryResult < InfiniteData < number > > > = [ ]
78+ const states : Array < UseInfiniteQueryResult < InfiniteData < number > > > = [ ]
8879
8980 function Page ( ) {
9081 const [ multiplier , setMultiplier ] = createSignal ( 1 )
91- const state = createInfiniteQuery ( ( ) => ( {
82+ const state = useInfiniteQuery ( ( ) => ( {
9283 queryKey : [ `${ key } _${ multiplier ( ) } ` ] ,
9384 queryFn : async ( { pageParam } ) => {
9485 await sleep ( 10 )
@@ -152,7 +143,7 @@ describe("useQuery's in Suspense mode", () => {
152143 } )
153144
154145 function Page ( ) {
155- createQuery ( ( ) => ( { queryKey : [ key ] , queryFn, suspense : true } ) )
146+ useQuery ( ( ) => ( { queryKey : [ key ] , queryFn, suspense : true } ) )
156147
157148 return < > rendered</ >
158149 }
@@ -174,7 +165,7 @@ describe("useQuery's in Suspense mode", () => {
174165 const key = queryKey ( )
175166
176167 function Page ( ) {
177- createQuery ( ( ) => ( {
168+ useQuery ( ( ) => ( {
178169 queryKey : key ,
179170 queryFn : ( ) => {
180171 sleep ( 10 )
@@ -226,7 +217,7 @@ describe("useQuery's in Suspense mode", () => {
226217 let succeed = false
227218
228219 function Page ( ) {
229- const state = createQuery ( ( ) => ( {
220+ const state = useQuery ( ( ) => ( {
230221 queryKey : key ,
231222 queryFn : async ( ) => {
232223 await sleep ( 10 )
@@ -289,7 +280,7 @@ describe("useQuery's in Suspense mode", () => {
289280 let succeed = false
290281
291282 function Page ( ) {
292- const state = createQuery ( ( ) => ( {
283+ const state = useQuery ( ( ) => ( {
293284 queryKey : key ,
294285 queryFn : async ( ) => {
295286 await sleep ( 10 )
@@ -350,7 +341,7 @@ describe("useQuery's in Suspense mode", () => {
350341 let count = 0
351342
352343 function Component ( ) {
353- const result = createQuery ( ( ) => ( {
344+ const result = useQuery ( ( ) => ( {
354345 queryKey : key ,
355346 queryFn : async ( ) => {
356347 await sleep ( 100 )
@@ -409,7 +400,7 @@ describe("useQuery's in Suspense mode", () => {
409400 const key2 = queryKey ( )
410401
411402 function Component ( props : { queryKey : Array < string > } ) {
412- const result = createQuery ( ( ) => ( {
403+ const result = useQuery ( ( ) => ( {
413404 queryKey : props . queryKey ,
414405 queryFn : async ( ) => {
415406 await sleep ( 100 )
@@ -460,7 +451,7 @@ describe("useQuery's in Suspense mode", () => {
460451 . mockImplementation ( ( ) => undefined )
461452
462453 function Page ( ) {
463- const state = createQuery ( ( ) => ( {
454+ const state = useQuery ( ( ) => ( {
464455 queryKey : key ,
465456 queryFn : async ( ) : Promise < unknown > => {
466457 await sleep ( 10 )
@@ -510,7 +501,7 @@ describe("useQuery's in Suspense mode", () => {
510501 const key = queryKey ( )
511502
512503 function Page ( ) {
513- const state = createQuery ( ( ) => ( {
504+ const state = useQuery ( ( ) => ( {
514505 queryKey : key ,
515506 queryFn : async ( ) : Promise < unknown > => {
516507 await sleep ( 10 )
@@ -562,7 +553,7 @@ describe("useQuery's in Suspense mode", () => {
562553 . mockImplementation ( ( ) => undefined )
563554
564555 function Page ( ) {
565- const state = createQuery ( ( ) => ( {
556+ const state = useQuery ( ( ) => ( {
566557 queryKey : key ,
567558 queryFn : async ( ) : Promise < unknown > => {
568559 await sleep ( 10 )
@@ -612,7 +603,7 @@ describe("useQuery's in Suspense mode", () => {
612603 const key = queryKey ( )
613604
614605 function Page ( ) {
615- const state = createQuery ( ( ) => ( {
606+ const state = useQuery ( ( ) => ( {
616607 queryKey : key ,
617608 queryFn : async ( ) : Promise < unknown > => {
618609 await sleep ( 10 )
@@ -669,7 +660,7 @@ describe("useQuery's in Suspense mode", () => {
669660
670661 function Page ( ) {
671662 const [ enabled , setEnabled ] = createSignal ( false )
672- const result = createQuery ( ( ) => ( {
663+ const result = useQuery ( ( ) => ( {
673664 queryKey : [ key ] ,
674665 queryFn,
675666 suspense : true ,
@@ -715,7 +706,7 @@ describe("useQuery's in Suspense mode", () => {
715706 function Page ( ) {
716707 const [ nonce ] = createSignal ( 0 )
717708 const queryKeys = [ `${ key } -${ succeed } ` ]
718- const result = createQuery ( ( ) => ( {
709+ const result = useQuery ( ( ) => ( {
719710 queryKey : queryKeys ,
720711 queryFn : async ( ) => {
721712 await sleep ( 10 )
@@ -784,7 +775,7 @@ describe("useQuery's in Suspense mode", () => {
784775 function Page ( ) {
785776 const [ key , setKey ] = createSignal ( 0 )
786777
787- const result = createQuery ( ( ) => ( {
778+ const result = useQuery ( ( ) => ( {
788779 queryKey : [ `${ key ( ) } -${ succeed } ` ] ,
789780 queryFn : async ( ) => {
790781 await sleep ( 10 )
@@ -847,7 +838,7 @@ describe("useQuery's in Suspense mode", () => {
847838 const queryKeys = '1'
848839 const [ enabled , setEnabled ] = createSignal ( false )
849840
850- const result = createQuery < string > ( ( ) => ( {
841+ const result = useQuery < string > ( ( ) => ( {
851842 queryKey : [ queryKeys ] ,
852843 queryFn : async ( ) => {
853844 await sleep ( 10 )
@@ -906,13 +897,13 @@ describe("useQuery's in Suspense mode", () => {
906897
907898 it ( 'should render the correct amount of times in Suspense mode when gcTime is set to 0' , async ( ) => {
908899 const key = queryKey ( )
909- let state : CreateQueryResult < number > | null = null
900+ let state : UseQueryResult < number > | null = null
910901
911902 let count = 0
912903 let renders = 0
913904
914905 function Page ( ) {
915- state = createQuery ( ( ) => ( {
906+ state = useQuery ( ( ) => ( {
916907 queryKey : key ,
917908 queryFn : async ( ) => {
918909 count ++
0 commit comments