refactor(*): unify & use noop (#8294)

* refactor(*): unify & use noop * chore: update * fix(query-core): reflect tkdodo's review * chore: resolve type error
TanStack · Nov 15, 2024 · 6c2a055 · 6c2a055
1 parent 7838edc
commit 6c2a055
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 10 deletions.
diff --git a/packages/angular-query-experimental/src/util/index.ts b/packages/angular-query-experimental/src/util/index.ts
@@ -10,4 +10,4 @@ export function shouldThrowError<T extends (...args: Array<any>) => boolean>(
   return !!throwError
 }
 
-export function noop() {}
+export function noop(): void {}
diff --git a/packages/query-async-storage-persister/src/utils.ts b/packages/query-async-storage-persister/src/utils.ts
@@ -1 +1 @@
-export function noop() {}
+export function noop(): void {}
diff --git a/packages/query-sync-storage-persister/src/utils.ts b/packages/query-sync-storage-persister/src/utils.ts
@@ -1 +1 @@
-export function noop() {}
+export function noop(): void {}
diff --git a/packages/react-query/src/useBaseQuery.ts b/packages/react-query/src/useBaseQuery.ts
@@ -88,7 +88,7 @@ export function useBaseQuery<
     React.useCallback(
       (onStoreChange) => {
         const unsubscribe = isRestoring
-          ? () => undefined
+          ? noop
           : observer.subscribe(notifyManager.batchCalls(onStoreChange))
 
         // Update result to make sure we did not miss any query updates

diff --git a/packages/react-query/src/useQueries.ts b/packages/react-query/src/useQueries.ts
@@ -20,6 +20,7 @@ import {
   shouldSuspend,
   willFetch,
 } from './suspense'
+import { noop } from './utils'
 import type {
   DefinedUseQueryResult,
   UseQueryOptions,
@@ -280,7 +281,7 @@ export function useQueries<
     React.useCallback(
       (onStoreChange) =>
         isRestoring
-          ? () => undefined
+          ? noop
           : observer.subscribe(notifyManager.batchCalls(onStoreChange)),
       [observer, isRestoring],
     ),

diff --git a/packages/react-query/src/utils.ts b/packages/react-query/src/utils.ts
@@ -10,4 +10,4 @@ export function shouldThrowError<T extends (...args: Array<any>) => boolean>(
   return !!throwError
 }
 
-export function noop() {}
+export function noop(): void {}
diff --git a/packages/solid-query/src/createQueries.ts b/packages/solid-query/src/createQueries.ts
@@ -13,6 +13,7 @@ import {
 } from 'solid-js'
 import { useQueryClient } from './QueryClientProvider'
 import { useIsRestoring } from './isRestoring'
+import { noop } from './utils'
 import type { CreateQueryResult, SolidQueryOptions } from './types'
 import type { Accessor } from 'solid-js'
 import type { QueryClient } from './QueryClient'
@@ -305,10 +306,10 @@ export function createQueries<
       })
     })
 
-  let unsubscribe: () => void = () => undefined
+  let unsubscribe = noop
   createComputed<() => void>((cleanup) => {
     cleanup?.()
-    unsubscribe = isRestoring() ? () => undefined : subscribeToObserver()
+    unsubscribe = isRestoring() ? noop : subscribeToObserver()
     // cleanup needs to be scheduled after synchronous effects take place
     return () => queueMicrotask(unsubscribe)
   })

diff --git a/packages/solid-query/src/utils.ts b/packages/solid-query/src/utils.ts
@@ -10,4 +10,4 @@ export function shouldThrowError<T extends (...args: Array<any>) => boolean>(
   return !!throwError
 }
 
-export function noop() {}
+export function noop(): void {}
diff --git a/packages/svelte-query/src/utils.ts b/packages/svelte-query/src/utils.ts
@@ -7,4 +7,4 @@ export function isSvelteStore<T extends object>(
   return 'subscribe' in obj && typeof obj.subscribe === 'function'
 }
 
-export function noop() {}
+export function noop(): void {}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export function noop() {}
		export function noop(): void {}