@aws-amplify/api-graphql 4.6.7-graphql-multi-client.93b5136.0 → 4.6.7-graphql-multi-client.ba4c61d.0

package/dist/esm/internals/generateClient.d.ts

@@ -1,5 +1,5 @@
 import { V6Client } from '../types';
-import { ClientGenerationParams, CommonPublicClientOptions } from './types';
+import { ClientGenerationParams } from './types';
 /**
  * @private
  *
@@ -9,4 +9,4 @@ import { ClientGenerationParams, CommonPublicClientOptions } from './types';
  * @param params
  * @returns
  */
-export declare function generateClient<T extends Record<any, any> = never, Options extends CommonPublicClientOptions = object>(params: ClientGenerationParams): V6Client<T, Options>;
+export declare function generateClient<T extends Record<any, any> = never, Options extends ClientGenerationParams = ClientGenerationParams>(params: Options): V6Client<T, Options>;

package/dist/esm/internals/index.d.ts

@@ -1,4 +1,4 @@
 export { InternalGraphQLAPI, InternalGraphQLAPIClass, } from './InternalGraphQLAPI';
 export { graphql, cancel, isCancelError } from './v6';
 export { generateClient } from './generateClient';
-export { CommonPublicClientOptions } from './types';
+export { CommonPublicClientOptions, DefaultCommonClientOptions } from './types';

package/dist/esm/internals/types.d.ts

@@ -9,16 +9,17 @@ import { CustomHeaders } from '@aws-amplify/data-schema/runtime';
 export type ClientGenerationParams = {
     amplify: AmplifyClassV6;
 } & CommonPublicClientOptions;
-/**
- * Common options that can be used on public `generateClient()` interfaces.
- */
-export type CommonPublicClientOptions = {
+export interface DefaultCommonClientOptions {
     endpoint?: never;
     authMode?: GraphQLAuthMode;
-    authToken?: string;
     apiKey?: string;
+    authToken?: string;
     headers?: CustomHeaders;
-} | {
+}
+/**
+ * Common options that can be used on public `generateClient()` interfaces.
+ */
+export type CommonPublicClientOptions = DefaultCommonClientOptions | {
     endpoint: string;
     authMode: 'apiKey';
     apiKey: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.6.7-graphql-multi-client.93b5136.0+93b5136",
+	"version": "4.6.7-graphql-multi-client.ba4c61d.0+ba4c61d",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./dist/cjs/index.js",
 	"module": "./dist/esm/index.mjs",
@@ -84,8 +84,8 @@
 		"server"
 	],
 	"dependencies": {
-		"@aws-amplify/api-rest": "4.0.64-graphql-multi-client.93b5136.0+93b5136",
-		"@aws-amplify/core": "6.7.4-graphql-multi-client.93b5136.0+93b5136",
+		"@aws-amplify/api-rest": "4.0.64-graphql-multi-client.ba4c61d.0+ba4c61d",
+		"@aws-amplify/core": "6.7.4-graphql-multi-client.ba4c61d.0+ba4c61d",
 		"@aws-amplify/data-schema": "^1.7.0",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
@@ -101,5 +101,5 @@
 			"limit": "91.7 kB"
 		}
 	],
-	"gitHead": "93b51360e57e283a7d4ed64c6b701d85ec71e94b"
+	"gitHead": "ba4c61dd1dd3014c8f3dfc1ebfc66bcf8170eaa9"
 }

package/src/internals/generateClient.ts

@@ -24,7 +24,7 @@ import {
 import { isApiGraphQLConfig } from './utils/runtimeTypeGuards/isApiGraphQLProviderConfig';
 import { isConfigureEventWithResourceConfig } from './utils/runtimeTypeGuards/isConfigureEventWithResourceConfig';
 import { cancel, graphql, isCancelError } from './v6';
-import { ClientGenerationParams, CommonPublicClientOptions } from './types';
+import { ClientGenerationParams } from './types';
 
 /**
  * @private
@@ -37,8 +37,8 @@ import { ClientGenerationParams, CommonPublicClientOptions } from './types';
  */
 export function generateClient<
 	T extends Record<any, any> = never,
-	Options extends CommonPublicClientOptions = object,
->(params: ClientGenerationParams): V6Client<T, Options> {
+	Options extends ClientGenerationParams = ClientGenerationParams,
+>(params: Options): V6Client<T, Options> {
 	const client = {
 		[__amplify]: params.amplify,
 		[__authMode]: params.authMode,

package/src/internals/index.ts

@@ -7,4 +7,4 @@ export {
 
 export { graphql, cancel, isCancelError } from './v6';
 export { generateClient } from './generateClient';
-export { CommonPublicClientOptions } from './types';
+export { CommonPublicClientOptions, DefaultCommonClientOptions } from './types';

package/src/internals/types.ts

@@ -13,17 +13,19 @@ export type ClientGenerationParams = {
 	amplify: AmplifyClassV6;
 } & CommonPublicClientOptions;
 
+export interface DefaultCommonClientOptions {
+	endpoint?: never;
+	authMode?: GraphQLAuthMode;
+	apiKey?: string;
+	authToken?: string;
+	headers?: CustomHeaders;
+}
+
 /**
  * Common options that can be used on public `generateClient()` interfaces.
  */
 export type CommonPublicClientOptions =
-	| {
-			endpoint?: never;
-			authMode?: GraphQLAuthMode;
-			authToken?: string;
-			apiKey?: string;
-			headers?: CustomHeaders;
-	  }
+	| DefaultCommonClientOptions
 	| {
 			endpoint: string;
 			authMode: 'apiKey';