split types

Author: ben.durrant

packages/toolkit/src/query/react/namedHooks.ts

@@ -6,30 +6,37 @@ import type {
   QueryDefinition,
 } from '@reduxjs/toolkit/query'
 
-export type HooksWithUniqueNames<Definitions extends EndpointDefinitions> = {
+type QueryHookNames<Definitions extends EndpointDefinitions> = {
   [K in keyof Definitions as Definitions[K] extends {
     type: DefinitionType.query
   }
     ? `use${Capitalize<K & string>}Query`
     : never]: UseQuery<
     Extract<Definitions[K], QueryDefinition<any, any, any, any>>
   >
-} &
-  {
-    [K in keyof Definitions as Definitions[K] extends {
-      type: DefinitionType.query
-    }
-      ? `useLazy${Capitalize<K & string>}Query`
-      : never]: UseLazyQuery<
-      Extract<Definitions[K], QueryDefinition<any, any, any, any>>
-    >
-  } &
-  {
-    [K in keyof Definitions as Definitions[K] extends {
-      type: DefinitionType.mutation
-    }
-      ? `use${Capitalize<K & string>}Mutation`
-      : never]: UseMutation<
-      Extract<Definitions[K], MutationDefinition<any, any, any, any>>
-    >
+}
+
+type LazyQueryHookNames<Definitions extends EndpointDefinitions> = {
+  [K in keyof Definitions as Definitions[K] extends {
+    type: DefinitionType.query
+  }
+    ? `useLazy${Capitalize<K & string>}Query`
+    : never]: UseLazyQuery<
+    Extract<Definitions[K], QueryDefinition<any, any, any, any>>
+  >
+}
+
+type MutationHookNames<Definitions extends EndpointDefinitions> = {
+  [K in keyof Definitions as Definitions[K] extends {
+    type: DefinitionType.mutation
   }
+    ? `use${Capitalize<K & string>}Mutation`
+    : never]: UseMutation<
+    Extract<Definitions[K], MutationDefinition<any, any, any, any>>
+  >
+}
+
+export type HooksWithUniqueNames<Definitions extends EndpointDefinitions> =
+  QueryHookNames<Definitions> &
+    LazyQueryHookNames<Definitions> &
+    MutationHookNames<Definitions>