Move QueryKey type

Author: FrederikBolding

packages/base-data-service/src/BaseDataService.ts

@@ -20,12 +20,14 @@ import {
   InvalidateQueryFilters,
   QueryClient,
   QueryClientConfig,
-  QueryKey,
   WithRequired,
   dehydrate,
 } from '@tanstack/query-core';
 import deepEqual from 'fast-deep-equal';
 
+// Data service queries use the following format: ['ServiceActionName', ...params]
+export type QueryKey = [string, ...Json[]];
+
 export type GranularCacheUpdatedPayload =
   | { type: 'added' | 'updated'; state: DehydratedState }
   | {

packages/base-data-service/src/hooks.ts

@@ -1,4 +1,3 @@
-import { Json } from '@metamask/utils';
 import {
   useQuery as useQueryTanStack,
   useInfiniteQuery as useInfiniteQueryTanStack,
@@ -11,12 +10,11 @@ import {
   UseInfiniteQueryResult,
 } from '@tanstack/react-query';
 
+import { QueryKey } from './BaseDataService';
+
 // We provide re-exports of the underlying TanStack Query hooks with narrower types,
 // removing `staleTime` and `queryFn` which aren't useful when using data services.
 
-// Data service queries use the following format: ['ServiceActionName', ...params]
-export type QueryKey = [string, ...Json[]];
-
 /**
  * Consume a query from a data service.
  *

packages/base-data-service/src/index.ts

@@ -6,6 +6,7 @@ export type {
   DataServiceEvents,
   DataServiceCacheUpdatedEvent,
   DataServiceGranularCacheUpdatedEvent,
+  QueryKey,
 } from './BaseDataService';
 export { BaseDataService } from './BaseDataService';
 export { createUIQueryClient } from './createUIQueryClient';