Skip to content

Commit 8bde747

Browse files
sukvvonsukvvon
committed
test({solid,svelte,angular}-query): add missing 'initialData' describe nesting and wrap with top-level describe
1 parent fc35bbf commit 8bde747

3 files changed

Lines changed: 128 additions & 122 deletions

File tree

‎packages/angular-query-experimental/src/__tests__/inject-query.test-d.ts‎

Lines changed: 60 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ import { sleep } from '@tanstack/query-test-utils'
33
import { injectQuery, queryOptions } from '..'
44
import type { Signal } from '@angular/core'
55

6-
describe('initialData', () => {
7-
describe('Config object overload', () => {
6+
describe('injectQuery', () => {
7+
describe('initialData', () => {
8+
describe('Config object overload', () => {
89
it('TData should always be defined when initialData is provided as an object', () => {
910
const { data } = injectQuery(() => ({
1011
queryKey: ['key'],
@@ -107,73 +108,74 @@ describe('initialData', () => {
107108
})
108109
})
109110

110-
describe('structuralSharing', () => {
111-
it('should be able to use structuralSharing with unknown types', () => {
112-
// https://github.com/TanStack/query/issues/6525#issuecomment-1938411343
113-
injectQuery(() => ({
114-
queryKey: ['key'],
115-
queryFn: () => 5,
116-
structuralSharing: (oldData, newData) => {
117-
expectTypeOf(oldData).toBeUnknown()
118-
expectTypeOf(newData).toBeUnknown()
119-
return newData
120-
},
121-
}))
111+
describe('structuralSharing', () => {
112+
it('should be able to use structuralSharing with unknown types', () => {
113+
// https://github.com/TanStack/query/issues/6525#issuecomment-1938411343
114+
injectQuery(() => ({
115+
queryKey: ['key'],
116+
queryFn: () => 5,
117+
structuralSharing: (oldData, newData) => {
118+
expectTypeOf(oldData).toBeUnknown()
119+
expectTypeOf(newData).toBeUnknown()
120+
return newData
121+
},
122+
}))
123+
})
122124
})
123125
})
124-
})
125126

126-
describe('Discriminated union return type', () => {
127-
test('data should be possibly undefined by default', () => {
128-
const query = injectQuery(() => ({
129-
queryKey: ['key'],
130-
queryFn: () => sleep(0).then(() => 'Some data'),
131-
}))
127+
describe('Discriminated union return type', () => {
128+
test('data should be possibly undefined by default', () => {
129+
const query = injectQuery(() => ({
130+
queryKey: ['key'],
131+
queryFn: () => sleep(0).then(() => 'Some data'),
132+
}))
132133

133-
expectTypeOf(query.data).toEqualTypeOf<Signal<string | undefined>>()
134-
})
134+
expectTypeOf(query.data).toEqualTypeOf<Signal<string | undefined>>()
135+
})
135136

136-
test('data should be defined when query is success', () => {
137-
const query = injectQuery(() => ({
138-
queryKey: ['key'],
139-
queryFn: () => sleep(0).then(() => 'Some data'),
140-
}))
137+
test('data should be defined when query is success', () => {
138+
const query = injectQuery(() => ({
139+
queryKey: ['key'],
140+
queryFn: () => sleep(0).then(() => 'Some data'),
141+
}))
141142

142-
if (query.isSuccess()) {
143-
expectTypeOf(query.data).toEqualTypeOf<Signal<string>>()
144-
}
145-
})
143+
if (query.isSuccess()) {
144+
expectTypeOf(query.data).toEqualTypeOf<Signal<string>>()
145+
}
146+
})
146147

147-
test('error should be null when query is success', () => {
148-
const query = injectQuery(() => ({
149-
queryKey: ['key'],
150-
queryFn: () => sleep(0).then(() => 'Some data'),
151-
}))
148+
test('error should be null when query is success', () => {
149+
const query = injectQuery(() => ({
150+
queryKey: ['key'],
151+
queryFn: () => sleep(0).then(() => 'Some data'),
152+
}))
152153

153-
if (query.isSuccess()) {
154-
expectTypeOf(query.error).toEqualTypeOf<Signal<null>>()
155-
}
156-
})
154+
if (query.isSuccess()) {
155+
expectTypeOf(query.error).toEqualTypeOf<Signal<null>>()
156+
}
157+
})
157158

158-
test('data should be undefined when query is pending', () => {
159-
const query = injectQuery(() => ({
160-
queryKey: ['key'],
161-
queryFn: () => sleep(0).then(() => 'Some data'),
162-
}))
159+
test('data should be undefined when query is pending', () => {
160+
const query = injectQuery(() => ({
161+
queryKey: ['key'],
162+
queryFn: () => sleep(0).then(() => 'Some data'),
163+
}))
163164

164-
if (query.isPending()) {
165-
expectTypeOf(query.data).toEqualTypeOf<Signal<undefined>>()
166-
}
167-
})
165+
if (query.isPending()) {
166+
expectTypeOf(query.data).toEqualTypeOf<Signal<undefined>>()
167+
}
168+
})
168169

169-
test('error should be defined when query is error', () => {
170-
const query = injectQuery(() => ({
171-
queryKey: ['key'],
172-
queryFn: () => sleep(0).then(() => 'Some data'),
173-
}))
170+
test('error should be defined when query is error', () => {
171+
const query = injectQuery(() => ({
172+
queryKey: ['key'],
173+
queryFn: () => sleep(0).then(() => 'Some data'),
174+
}))
174175

175-
if (query.isError()) {
176-
expectTypeOf(query.error).toEqualTypeOf<Signal<Error>>()
177-
}
176+
if (query.isError()) {
177+
expectTypeOf(query.error).toEqualTypeOf<Signal<Error>>()
178+
}
179+
})
178180
})
179181
})

‎packages/solid-query/src/__tests__/useQuery.test-d.tsx‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { describe, expectTypeOf, it } from 'vitest'
22
import { queryOptions, useQuery } from '../index'
33

44
describe('useQuery', () => {
5-
describe('Config object overload', () => {
5+
describe('initialData', () => {
6+
describe('Config object overload', () => {
67
it('TData should always be defined when initialData is provided as an object', () => {
78
const { data } = useQuery(() => ({
89
queryKey: ['key'],
@@ -54,45 +55,46 @@ describe('useQuery', () => {
5455
})
5556
})
5657

57-
describe('Query key overload', () => {
58-
it('TData should always be defined when initialData is provided', () => {
59-
const { data } = useQuery(() => ({
60-
queryKey: ['key'],
61-
queryFn: () => ({ wow: true }),
62-
initialData: { wow: true },
63-
}))
58+
describe('Query key overload', () => {
59+
it('TData should always be defined when initialData is provided', () => {
60+
const { data } = useQuery(() => ({
61+
queryKey: ['key'],
62+
queryFn: () => ({ wow: true }),
63+
initialData: { wow: true },
64+
}))
6465

65-
expectTypeOf(data).toEqualTypeOf<{ wow: boolean }>()
66-
})
66+
expectTypeOf(data).toEqualTypeOf<{ wow: boolean }>()
67+
})
6768

68-
it('TData should have undefined in the union when initialData is NOT provided', () => {
69-
const { data } = useQuery(() => ({
70-
queryKey: ['key'],
71-
queryFn: () => ({ wow: true }),
72-
}))
69+
it('TData should have undefined in the union when initialData is NOT provided', () => {
70+
const { data } = useQuery(() => ({
71+
queryKey: ['key'],
72+
queryFn: () => ({ wow: true }),
73+
}))
7374

74-
expectTypeOf(data).toEqualTypeOf<{ wow: boolean } | undefined>()
75+
expectTypeOf(data).toEqualTypeOf<{ wow: boolean } | undefined>()
76+
})
7577
})
76-
})
7778

78-
describe('Query key and func', () => {
79-
it('TData should always be defined when initialData is provided', () => {
80-
const { data } = useQuery(() => ({
81-
queryKey: ['key'],
82-
queryFn: () => ({ wow: true }),
83-
initialData: { wow: true },
84-
}))
79+
describe('Query key and func', () => {
80+
it('TData should always be defined when initialData is provided', () => {
81+
const { data } = useQuery(() => ({
82+
queryKey: ['key'],
83+
queryFn: () => ({ wow: true }),
84+
initialData: { wow: true },
85+
}))
8586

86-
expectTypeOf(data).toEqualTypeOf<{ wow: boolean }>()
87-
})
87+
expectTypeOf(data).toEqualTypeOf<{ wow: boolean }>()
88+
})
8889

89-
it('TData should have undefined in the union when initialData is NOT provided', () => {
90-
const { data } = useQuery(() => ({
91-
queryKey: ['key'],
92-
queryFn: () => ({ wow: true }),
93-
}))
90+
it('TData should have undefined in the union when initialData is NOT provided', () => {
91+
const { data } = useQuery(() => ({
92+
queryKey: ['key'],
93+
queryFn: () => ({ wow: true }),
94+
}))
9495

95-
expectTypeOf(data).toEqualTypeOf<{ wow: boolean } | undefined>()
96+
expectTypeOf(data).toEqualTypeOf<{ wow: boolean } | undefined>()
97+
})
9698
})
9799
})
98100
})

‎packages/svelte-query/tests/createQuery.test-d.ts‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { describe, expectTypeOf, it } from 'vitest'
22
import { createQuery, queryOptions } from '../src/index.js'
33

44
describe('createQuery', () => {
5-
describe('Config object overload', () => {
5+
describe('initialData', () => {
6+
describe('Config object overload', () => {
67
it('TData should always be defined when initialData is provided as an object', () => {
78
const { data } = createQuery(() => ({
89
queryKey: ['key'],
@@ -44,45 +45,46 @@ describe('createQuery', () => {
4445
})
4546
})
4647

47-
describe('Query key overload', () => {
48-
it('TData should always be defined when initialData is provided', () => {
49-
const { data } = createQuery(() => ({
50-
queryKey: ['key'],
51-
queryFn: () => ({ wow: true }),
52-
initialData: { wow: true },
53-
}))
48+
describe('Query key overload', () => {
49+
it('TData should always be defined when initialData is provided', () => {
50+
const { data } = createQuery(() => ({
51+
queryKey: ['key'],
52+
queryFn: () => ({ wow: true }),
53+
initialData: { wow: true },
54+
}))
5455

55-
expectTypeOf(data).toEqualTypeOf<{ wow: boolean }>()
56-
})
56+
expectTypeOf(data).toEqualTypeOf<{ wow: boolean }>()
57+
})
5758

58-
it('TData should have undefined in the union when initialData is NOT provided', () => {
59-
const { data } = createQuery(() => ({
60-
queryKey: ['key'],
61-
queryFn: () => ({ wow: true }),
62-
}))
59+
it('TData should have undefined in the union when initialData is NOT provided', () => {
60+
const { data } = createQuery(() => ({
61+
queryKey: ['key'],
62+
queryFn: () => ({ wow: true }),
63+
}))
6364

64-
expectTypeOf(data).toEqualTypeOf<{ wow: boolean } | undefined>()
65+
expectTypeOf(data).toEqualTypeOf<{ wow: boolean } | undefined>()
66+
})
6567
})
66-
})
6768

68-
describe('Query key and func', () => {
69-
it('TData should always be defined when initialData is provided', () => {
70-
const { data } = createQuery(() => ({
71-
queryKey: ['key'],
72-
queryFn: () => ({ wow: true }),
73-
initialData: { wow: true },
74-
}))
69+
describe('Query key and func', () => {
70+
it('TData should always be defined when initialData is provided', () => {
71+
const { data } = createQuery(() => ({
72+
queryKey: ['key'],
73+
queryFn: () => ({ wow: true }),
74+
initialData: { wow: true },
75+
}))
7576

76-
expectTypeOf(data).toEqualTypeOf<{ wow: boolean }>()
77-
})
77+
expectTypeOf(data).toEqualTypeOf<{ wow: boolean }>()
78+
})
7879

79-
it('TData should have undefined in the union when initialData is NOT provided', () => {
80-
const { data } = createQuery(() => ({
81-
queryKey: ['key'],
82-
queryFn: () => ({ wow: true }),
83-
}))
80+
it('TData should have undefined in the union when initialData is NOT provided', () => {
81+
const { data } = createQuery(() => ({
82+
queryKey: ['key'],
83+
queryFn: () => ({ wow: true }),
84+
}))
8485

85-
expectTypeOf(data).toEqualTypeOf<{ wow: boolean } | undefined>()
86+
expectTypeOf(data).toEqualTypeOf<{ wow: boolean } | undefined>()
87+
})
8688
})
8789
})
8890
})

0 commit comments

Comments
 (0)