Fix lint

Author: FrederikBolding

packages/base-data-service/src/createUIQueryClient.test.ts

@@ -1,6 +1,7 @@
 import { Messenger } from '@metamask/messenger';
 import { Json } from '@metamask/utils';
 import {
+  DehydratedState,
   InfiniteData,
   InfiniteQueryObserver,
   QueryClient,
@@ -15,6 +16,7 @@ import {
   ExampleDataServiceActions,
   ExampleMessenger,
   GetActivityResponse,
+  GetAssetsResponse,
 } from '../tests/ExampleDataService';
 import {
   mockAssets,
@@ -33,9 +35,11 @@ function createClient(serviceMessenger: ExampleMessenger): QueryClient {
 
   const messengerAdapter = {
     call: async (
-      method: ExampleDataServiceActions['type'],
+      method: string,
       ...params: Json[]
-    ) => {
+    ): Promise<
+      void | DehydratedState | GetActivityResponse | GetAssetsResponse
+    > => {
       if (method === 'ExampleDataService:subscribe') {
         return serviceMessenger.call(
           method,
@@ -49,7 +53,11 @@ function createClient(serviceMessenger: ExampleMessenger): QueryClient {
           subscription,
         );
       }
-      return serviceMessenger.call(method, ...params);
+      return serviceMessenger.call(
+        method as ExampleDataServiceActions['type'],
+        // @ts-expect-error TODO.
+        ...params,
+      );
     },
     subscribe: async (
       _method: string,

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

@@ -12,8 +12,9 @@ function getServiceFromQueryKey(queryKey: QueryKey): string {
   return queryKey[0].split(':')[0];
 }
 
+// When UI messengers are available this should simply be a proper messenger that allows access to DataServiceActions
 type MessengerAdapter = {
-  call: (method: string, ...params: Json[]) => Promise<Json>;
+  call: (method: string, ...params: Json[]) => Promise<Json | void>;
   subscribe: (method: string, callback: (data: Json) => void) => void;
 };
 
@@ -47,11 +48,11 @@ export function createUIQueryClient(
             'Queries must use data service actions.',
           );
 
-          return await messenger.call(
+          return (await messenger.call(
             action,
             ...(options.queryKey.slice(1) as Json[]),
             options.pageParam,
-          );
+          )) as Json;
         },
         // TODO: Decide on values for these.
         staleTime: Infinity,