From bdbbe5c1f50de288f50dbac7b593ff6aa8ed2f83 Mon Sep 17 00:00:00 2001 From: pmhxxhsj Date: Tue, 11 Jun 2024 23:51:43 +0900 Subject: [PATCH 1/3] refactor: Changed parameter names to match those in other sleep utility functions. --- packages/query-core/src/utils.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/query-core/src/utils.ts b/packages/query-core/src/utils.ts index 3cb9374e58..a4e840bca2 100644 --- a/packages/query-core/src/utils.ts +++ b/packages/query-core/src/utils.ts @@ -327,9 +327,9 @@ function hasObjectPrototype(o: any): boolean { return Object.prototype.toString.call(o) === '[object Object]' } -export function sleep(ms: number): Promise { +export function sleep(timeout: number): Promise { return new Promise((resolve) => { - setTimeout(resolve, ms) + setTimeout(resolve, timeout) }) } @@ -365,7 +365,7 @@ export function addToStart(items: Array, item: T, max = 0): Array { export const skipToken = Symbol() export type SkipToken = typeof skipToken -export const ensureQueryFn = < +export function ensureQueryFn< TQueryFnData = unknown, TQueryKey extends QueryKey = QueryKey, >( @@ -374,7 +374,7 @@ export const ensureQueryFn = < queryHash?: string }, fetchOptions?: FetchOptions, -): QueryFunction => { +): QueryFunction { if (process.env.NODE_ENV !== 'production') { if (options.queryFn === skipToken) { console.error( From b499ed1b24b1177f1585d250b1a438716c3c1c7f Mon Sep 17 00:00:00 2001 From: pmhxxhsj Date: Tue, 11 Jun 2024 23:53:15 +0900 Subject: [PATCH 2/3] refactor: Most utility functions are defined as regular functions, updated this one to match. --- packages/query-core/src/__tests__/utils.ts | 4 ++-- packages/query-persist-client-core/src/__tests__/utils.ts | 4 ++-- packages/react-query/src/__tests__/utils.tsx | 4 ++-- packages/solid-query/src/__tests__/utils.tsx | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/query-core/src/__tests__/utils.ts b/packages/query-core/src/__tests__/utils.ts index 84245d772b..86deb48fc4 100644 --- a/packages/query-core/src/__tests__/utils.ts +++ b/packages/query-core/src/__tests__/utils.ts @@ -32,11 +32,11 @@ export function sleep(timeout: number): Promise { }) } -export const executeMutation = ( +export function executeMutation( queryClient: QueryClient, options: MutationOptions, variables: TVariables, -) => { +) { return queryClient .getMutationCache() .build(queryClient, options) diff --git a/packages/query-persist-client-core/src/__tests__/utils.ts b/packages/query-persist-client-core/src/__tests__/utils.ts index 7f05c27545..d633cf7268 100644 --- a/packages/query-persist-client-core/src/__tests__/utils.ts +++ b/packages/query-persist-client-core/src/__tests__/utils.ts @@ -13,7 +13,7 @@ export function sleep(timeout: number): Promise { }) } -export const createMockPersister = (): Persister => { +export function createMockPersister(): Persister { let storedState: PersistedClient | undefined return { @@ -30,7 +30,7 @@ export const createMockPersister = (): Persister => { } } -export const createSpyPersister = (): Persister => { +export function createSpyPersister(): Persister { return { persistClient: vi.fn(), restoreClient: vi.fn(), diff --git a/packages/react-query/src/__tests__/utils.tsx b/packages/react-query/src/__tests__/utils.tsx index f640fd3d7b..3eb9472adc 100644 --- a/packages/react-query/src/__tests__/utils.tsx +++ b/packages/react-query/src/__tests__/utils.tsx @@ -22,13 +22,13 @@ export function renderWithClient( } as any } -export const Blink = ({ +export function Blink({ duration, children, }: { duration: number children: React.ReactNode -}) => { +}) { const [shouldShow, setShouldShow] = React.useState(true) React.useEffect(() => { diff --git a/packages/solid-query/src/__tests__/utils.tsx b/packages/solid-query/src/__tests__/utils.tsx index 603da491d4..f035191a6c 100644 --- a/packages/solid-query/src/__tests__/utils.tsx +++ b/packages/solid-query/src/__tests__/utils.tsx @@ -12,11 +12,11 @@ export function queryKey() { return [`query_${queryKeyCount}`] } -export const Blink = ( +export function Blink( props: { duration: number } & ParentProps, -) => { +){ const [shouldShow, setShouldShow] = createSignal(true) createEffect(() => { From 87306cb5ca1ab916e7650c5fde4de0ace30865a1 Mon Sep 17 00:00:00 2001 From: pmhxxhsj Date: Wed, 12 Jun 2024 00:16:18 +0900 Subject: [PATCH 3/3] fix: formatting --- packages/solid-query/src/__tests__/utils.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/solid-query/src/__tests__/utils.tsx b/packages/solid-query/src/__tests__/utils.tsx index f035191a6c..539d1e3544 100644 --- a/packages/solid-query/src/__tests__/utils.tsx +++ b/packages/solid-query/src/__tests__/utils.tsx @@ -16,7 +16,7 @@ export function Blink( props: { duration: number } & ParentProps, -){ +) { const [shouldShow, setShouldShow] = createSignal(true) createEffect(() => {