From dc2d1254104eea8d75a492be01ca6be7efcc87a3 Mon Sep 17 00:00:00 2001
From: "ben.durrant" <ben.durrant@actual-experience.com>
Date: Mon, 2 Oct 2023 15:18:33 +0100
Subject: [PATCH 1/2] Rewrite HooksWithUniqueNames type

---
 .../toolkit/src/query/react/namedHooks.ts     | 50 ++++++++++---------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/packages/toolkit/src/query/react/namedHooks.ts b/packages/toolkit/src/query/react/namedHooks.ts
index ae146cf4cf..e91b405036 100644
--- a/packages/toolkit/src/query/react/namedHooks.ts
+++ b/packages/toolkit/src/query/react/namedHooks.ts
@@ -6,26 +6,30 @@ import type {
   QueryDefinition,
 } from '@reduxjs/toolkit/query'
 
-export type HooksWithUniqueNames<Definitions extends EndpointDefinitions> =
-  keyof Definitions extends infer Keys
-    ? Keys extends string
-      ? Definitions[Keys] extends { type: DefinitionType.query }
-        ? {
-            [K in Keys as `use${Capitalize<K>}Query`]: UseQuery<
-              Extract<Definitions[K], QueryDefinition<any, any, any, any>>
-            >
-          } &
-            {
-              [K in Keys as `useLazy${Capitalize<K>}Query`]: UseLazyQuery<
-                Extract<Definitions[K], QueryDefinition<any, any, any, any>>
-              >
-            }
-        : Definitions[Keys] extends { type: DefinitionType.mutation }
-        ? {
-            [K in Keys as `use${Capitalize<K>}Mutation`]: UseMutation<
-              Extract<Definitions[K], MutationDefinition<any, any, any, any>>
-            >
-          }
-        : never
-      : never
-    : never
+export type HooksWithUniqueNames<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>>
+    >
+  }

From 3e370a3f6c9178f4526a157f6f4f6997d28c551c Mon Sep 17 00:00:00 2001
From: Ben Durrant <ben.j.durrant@gmail.com>
Date: Mon, 2 Oct 2023 22:53:59 +0100
Subject: [PATCH 2/2] copy over split type

---
 .../toolkit/src/query/react/namedHooks.ts     | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/packages/toolkit/src/query/react/namedHooks.ts b/packages/toolkit/src/query/react/namedHooks.ts
index e91b405036..7a21b993f4 100644
--- a/packages/toolkit/src/query/react/namedHooks.ts
+++ b/packages/toolkit/src/query/react/namedHooks.ts
@@ -6,7 +6,7 @@ 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
   }
@@ -14,22 +14,29 @@ export type HooksWithUniqueNames<Definitions extends EndpointDefinitions> = {
     : 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>