fix: Client type explicit default type arg (#12580)

aws-amplify · Nov 16, 2023 · 4953a58 · 4953a58
1 parent 3777b2a
commit 4953a58
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/packages/adapter-nextjs/src/api/index.ts b/packages/adapter-nextjs/src/api/index.ts
@@ -6,7 +6,18 @@ export {
 	generateServerClientUsingCookies,
 } from './generateServerClient';
 
-export {
-	V6ClientSSRCookies as ClientUsingSSRCookies,
-	V6ClientSSRRequest as ClientUsingSSRReq,
+import {
+	V6ClientSSRCookies,
+	V6ClientSSRRequest,
 } from '@aws-amplify/api-graphql';
+
+// explicitly defaulting to `never` here resolves
+// TS2589: Type instantiation is excessively deep and possibly infinite.
+// When this type is used without a generic type arg, i.e. `let client: Client`
+type ClientUsingSSRCookies<T extends Record<any, any> = never> =
+	V6ClientSSRCookies<T>;
+
+type ClientUsingSSRReq<T extends Record<any, any> = never> =
+	V6ClientSSRRequest<T>;
+
+export { ClientUsingSSRCookies, ClientUsingSSRReq };
diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts
@@ -12,7 +12,13 @@ export type {
 	CONNECTION_STATE_CHANGE,
 } from '@aws-amplify/api-graphql';
 
-export type { V6Client as Client } from '@aws-amplify/api-graphql';
+import type { V6Client } from '@aws-amplify/api-graphql';
+
+// explicitly defaulting to `never` here resolves
+// TS2589: Type instantiation is excessively deep and possibly infinite.
+// When this type is used without a generic type arg, i.e. `let client: Client`
+type Client<T extends Record<any, any> = never> = V6Client<T>;
+export { Client };
 
 export {
 	get,