Skip to content

test(preact-query): apply 'prefer-template', 'no-else-return', 'object-shorthand', 'radix', and 'require-await' eslint rules #10346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sukvvon merged 2 commits into from
Mar 28, 2026
+35 −38
Merged

test(preact-query): apply 'prefer-template', 'no-else-return', 'object-shorthand', 'radix', and 'require-await' eslint rules #10346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc62e1a
test(preact-query): apply 'prefer-template', 'no-else-return', 'objec…
sukvvon Mar 28, 2026
468d906
Merge branch 'main' into test/preact-query-fix-eslint-warnings
sukvvon Mar 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/preact-query/src/__tests__/useMutationState.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ describe('useMutationState', () => {
function Mutate() {
const { mutate, data } = useMutation({
mutationKey,
mutationFn: (input: number) => sleep(150).then(() => 'data' + input),
mutationFn: (input: number) => sleep(150).then(() => `data${input}`),
})

return (
Expand Down
2 changes: 1 addition & 1 deletion packages/preact-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const generateInfiniteQueryOptions = (
.mockImplementation(async () => {
const currentPageData = data[currentPage]
if (!currentPageData) {
throw new Error('No data defined for page ' + currentPage)
throw new Error(`No data defined for page ${currentPage}`)
}

await sleep(10)
Expand Down
24 changes: 12 additions & 12 deletions packages/preact-query/src/__tests__/useQueries.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ describe('useQueries', () => {
queryFn: () => 'string',
select: (a) => {
expectTypeOf(a).toEqualTypeOf<string>()
return parseInt(a)
return parseInt(a, 10)
},
},
],
Expand Down Expand Up @@ -219,7 +219,7 @@ describe('useQueries', () => {
queryFn: () => 'string',
select: (a) => {
expectTypeOf(a).toEqualTypeOf<string>()
return parseInt(a)
return parseInt(a, 10)
},
placeholderData: 'string',
// @ts-expect-error (initialData: string)
Expand Down Expand Up @@ -302,7 +302,7 @@ describe('useQueries', () => {
queryFn: () => 'string',
select: (a) => {
expectTypeOf(a).toEqualTypeOf<string>()
return parseInt(a)
return parseInt(a, 10)
},
},
],
Expand Down Expand Up @@ -362,7 +362,7 @@ describe('useQueries', () => {
queryFn: () => 'string',
select: (a) => {
expectTypeOf(a).toEqualTypeOf<string>()
return parseInt(a)
return parseInt(a, 10)
},
placeholderData: 'string',
// @ts-expect-error (initialData: string)
Expand Down Expand Up @@ -404,7 +404,7 @@ describe('useQueries', () => {
queryFn: () => 'string',
select: (a) => {
expectTypeOf(a).toEqualTypeOf<string>()
return parseInt(a)
return parseInt(a, 10)
},
}),
],
Expand Down Expand Up @@ -556,7 +556,7 @@ describe('useQueries', () => {
{
queryKey: key4,
queryFn: () => 'string',
select: (a: string) => parseInt(a),
select: (a: string) => parseInt(a, 10),
},
{
queryKey: key5,
Expand Down Expand Up @@ -596,12 +596,12 @@ describe('useQueries', () => {
{
queryKey: key4,
queryFn: () => 'string',
select: (a: string) => parseInt(a),
select: (a: string) => parseInt(a, 10),
},
{
queryKey: key5,
queryFn: () => 'string',
select: (a: string) => parseInt(a),
select: (a: string) => parseInt(a, 10),
throwOnError,
},
],
Expand Down Expand Up @@ -1138,14 +1138,14 @@ describe('useQueries', () => {
queryKey: key1,
queryFn: async () => {
await sleep(5)
return Promise.resolve('first result ' + count)
return Promise.resolve(`first result ${count}`)
},
},
{
queryKey: key2,
queryFn: async () => {
await sleep(50)
return Promise.resolve('second result ' + count)
return Promise.resolve(`second result ${count}`)
},
},
],
Expand Down Expand Up @@ -1330,14 +1330,14 @@ describe('useQueries', () => {
queryKey: key1,
queryFn: async () => {
await sleep(10)
return 'first result:' + value
return `first result:${value}`
},
},
{
queryKey: key2,
queryFn: async () => {
await sleep(20)
return 'second result:' + value
return `second result:${value}`
},
},
],
Expand Down
38 changes: 18 additions & 20 deletions packages/preact-query/src/__tests__/useQuery.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ describe('useQuery', () => {
queryKey: key,
queryFn: async () => {
await sleep(10)
return 'data: ' + value
return `data: ${value}`
},

gcTime: 0,
Expand Down Expand Up @@ -769,7 +769,7 @@ describe('useQuery', () => {
queryFn: async () => {
await sleep(10)
count++
return 'test' + count
return `test${count}`
},
})

Expand Down Expand Up @@ -3686,9 +3686,8 @@ describe('useQuery', () => {
if (counter < 2) {
counter++
return Promise.reject(new Error('error'))
} else {
return Promise.resolve('data')
}
return Promise.resolve('data')
},
retryDelay: 10,
})
Expand Down Expand Up @@ -5062,9 +5061,8 @@ describe('useQuery', () => {
await sleep(10)
if (id % 2 === 1) {
return Promise.reject(new Error('Error'))
} else {
return 'data'
}
return 'data'
},
retry: false,
retryOnMount: false,
Expand Down Expand Up @@ -5300,7 +5298,7 @@ describe('useQuery', () => {
queryFn: async () => {
count++
await sleep(10)
return 'data' + count
return `data${count}`
},
})

Expand Down Expand Up @@ -5363,7 +5361,7 @@ describe('useQuery', () => {
queryFn: async () => {
count++
await sleep(10)
return 'data' + count
return `data${count}`
},
})

Expand Down Expand Up @@ -5411,7 +5409,7 @@ describe('useQuery', () => {
queryFn: async () => {
count++
await sleep(10)
return 'data' + count
return `data${count}`
},
})

Expand Down Expand Up @@ -5457,7 +5455,7 @@ describe('useQuery', () => {
queryFn: async () => {
count++
await sleep(10)
return 'data' + count
return `data${count}`
},
initialData: 'initial',
})
Expand Down Expand Up @@ -5505,7 +5503,7 @@ describe('useQuery', () => {
queryFn: async () => {
count++
await sleep(10)
return 'data' + count
return `data${count}`
},
initialData: 'initial',
})
Expand Down Expand Up @@ -5565,7 +5563,7 @@ describe('useQuery', () => {
queryFn: async (): Promise<unknown> => {
count++
await sleep(10)
throw new Error('failed' + count)
throw new Error(`failed${count}`)
},
retry: 2,
retryDelay: 10,
Expand Down Expand Up @@ -5678,7 +5676,7 @@ describe('useQuery', () => {
queryFn: async () => {
count++
await sleep(10)
return 'data' + count
return `data${count}`
},
})

Expand Down Expand Up @@ -5735,7 +5733,7 @@ describe('useQuery', () => {
queryFn: async () => {
count++
await sleep(10)
return 'data' + count
return `data${count}`
},
refetchOnReconnect: false,
})
Expand Down Expand Up @@ -5787,7 +5785,7 @@ describe('useQuery', () => {
function Component() {
const state = useQuery({
queryKey: key,
queryFn: async () => {
queryFn: () => {
count++
return `data${count}`
},
Expand Down Expand Up @@ -5862,7 +5860,7 @@ describe('useQuery', () => {
queryFn: async () => {
count++
await sleep(10)
return 'data ' + count
return `data ${count}`
},
networkMode: 'always',
})
Expand Down Expand Up @@ -5898,7 +5896,7 @@ describe('useQuery', () => {
queryFn: async (): Promise<unknown> => {
count++
await sleep(10)
throw new Error('error ' + count)
throw new Error(`error ${count}`)
},
networkMode: 'always',
retry: 1,
Expand Down Expand Up @@ -5942,7 +5940,7 @@ describe('useQuery', () => {
queryFn: async (): Promise<unknown> => {
count++
await sleep(10)
throw new Error('failed' + count)
throw new Error(`failed${count}`)
},
retry: 2,
retryDelay: 1,
Expand Down Expand Up @@ -6067,7 +6065,7 @@ describe('useQuery', () => {
renders++
return (
<div>
<span>{data ? 'has data' + data : 'no data'}</span>
<span>{data ? `has data${data}` : 'no data'}</span>
<button
onClick={() => queryClient.setQueryData<string>(key, 'new data')}
>
Expand Down Expand Up @@ -6697,7 +6695,7 @@ describe('useQuery', () => {
expect(results[3]).toMatchObject({
status: 'error',
fetchStatus: 'idle',
error: error,
error,
errorUpdateCount: 2,
isLoading: false,
failureCount: 1,
Expand Down
6 changes: 3 additions & 3 deletions packages/preact-query/src/__tests__/useSuspenseQueries.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ describe('useSuspenseQueries 2', () => {
function Page({ count, isPending }: { count: number; isPending: boolean }) {
const { data } = useSuspenseQuery({
queryKey: [key, count],
queryFn: () => sleep(10).then(() => 'data' + count),
queryFn: () => sleep(10).then(() => `data${count}`),
})

return <div>{isPending ? 'pending' : data}</div>
Expand Down Expand Up @@ -560,7 +560,7 @@ describe('useSuspenseQueries 2', () => {
queryFn: () =>
sleep(10).then(() => {
queryFnCount++
return 'data' + count
return `data${count}`
}),
})

Expand Down Expand Up @@ -601,7 +601,7 @@ describe('useSuspenseQueries 2', () => {
function Page({ count, isPending }: { count: number; isPending: boolean }) {
const { data } = useSuspenseQuery({
queryKey: [key, count],
queryFn: () => sleep(10).then(() => 'data' + count),
queryFn: () => sleep(10).then(() => `data${count}`),
})

return (
Expand Down
1 change: 0 additions & 1 deletion packages/preact-query/src/__tests__/useSuspenseQuery.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,7 +918,6 @@ describe('useSuspenseQuery', () => {
useSuspenseQuery({
queryKey: key,
// @ts-expect-error
// eslint-disable-next-line
queryFn: Math.random() >= 0 ? skipToken : () => Promise.resolve(5),
})

Expand Down
Loading