@aws-amplify/api-graphql 4.0.16 → 4.0.17-unstable.1fdbb12.0

package/dist/esm/internals/utils/isConfigureEventWithResourceConfig.mjs

@@ -0,0 +1,8 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+function isConfigureEventWithResourceConfig(payload) {
+    return payload.event === 'configure';
+}
+
+export { isConfigureEventWithResourceConfig };
+//# sourceMappingURL=isConfigureEventWithResourceConfig.mjs.map

package/dist/esm/internals/utils/isConfigureEventWithResourceConfig.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"isConfigureEventWithResourceConfig.mjs","sources":["../../../../src/internals/utils/isConfigureEventWithResourceConfig.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nexport function isConfigureEventWithResourceConfig(payload) {\n    return payload.event === 'configure';\n}\n"],"names":[],"mappings":"AAAA;AACA;AACO,SAAS,kCAAkC,CAAC,OAAO,EAAE;AAC5D,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,WAAW,CAAC;AACzC;;;;"}

package/dist/esm/internals/v6.mjs

@@ -88,7 +88,7 @@ import { __authMode, __authToken, __amplify } from '../types/index.mjs';
  * @param additionalHeaders
  */
 function graphql(options, additionalHeaders) {
-    // inject client-level auth 
+    // inject client-level auth
     options.authMode = options.authMode || this[__authMode];
     options.authToken = options.authToken || this[__authToken];
     /**

package/dist/esm/internals/v6.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"v6.mjs","sources":["../../../src/internals/v6.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { GraphQLAPI } from '../GraphQLAPI';\nimport { __amplify, __authMode, __authToken, } from '../types';\n/**\n * Invokes graphql operations against a graphql service, providing correct input and\n * output types if Amplify-generated graphql from a recent version of the CLI/codegen\n * are used *or* correct typing is provided via the type argument.\n *\n * Amplify-generated \"branded\" graphql queries will look similar to this:\n *\n * ```ts\n *                               //\n *                               // |-- branding\n *                               // v\n * export const getModel = `...` as GeneratedQuery<\n * \tGetModelQueryVariables,\n * \tGetModelQuery\n * >;\n * ```\n *\n * If this branding is not in your generated graphql, update to a newer version of\n * CLI/codegen and regenerate your graphql using `amplify codegen`.\n *\n * ## Using Amplify-generated graphql\n *\n * ```ts\n * import * as queries from './graphql/queries';\n *\n * //\n * //    |-- correctly typed graphql response containing a Widget\n * //    v\n * const queryResult = await graphql({\n * \tquery: queries.getWidget,\n * \tvariables: {\n * \t\tid: \"abc\", // <-- type hinted/enforced\n * \t},\n * });\n *\n * //\n * //    |-- a correctly typed Widget\n * //    v\n * const fetchedWidget = queryResult.data?.getWidget!;\n * ```\n *\n * ## Custom input + result types\n *\n * To provide input types (`variables`) and result types:\n *\n * ```ts\n * type GetById_NameOnly = {\n * \tvariables: {\n * \t\tid: string\n * \t},\n * \tresult: Promise<{\n * \t\tdata: { getWidget: { name: string } }\n * \t}>\n * }\n *\n * //\n * //    |-- type is GetById_NameOnly[\"result\"]\n * //    v\n * const result = graphql<GetById_NameOnly>({\n * \tquery: \"...\",\n * \tvariables: { id: \"abc\" }  // <-- type of GetById_NameOnly[\"variables\"]\n * });\n * ```\n *\n * ## Custom result type only\n *\n * To specify result types only, use a type that is *not* in the `{variables, result}` shape:\n *\n * ```ts\n * type MyResultType = Promise<{\n * \tdata: {\n * \t\tgetWidget: { name: string }\n * \t}\n * }>\n *\n * //\n * //    |-- type is MyResultType\n * //    v\n * const result = graphql<MyResultType>({query: \"...\"});\n * ```\n *\n * @param options\n * @param additionalHeaders\n */\nexport function graphql(options, additionalHeaders) {\n    // inject client-level auth \n    options.authMode = options.authMode || this[__authMode];\n    options.authToken = options.authToken || this[__authToken];\n    /**\n     * The correctness of these typings depends on correct string branding or overrides.\n     * Neither of these can actually be validated at runtime. Hence, we don't perform\n     * any validation or type-guarding here.\n     */\n    const result = GraphQLAPI.graphql(this[__amplify], options, additionalHeaders);\n    return result;\n}\n/**\n * Cancels an inflight request. Only applicable for graphql queries and mutations\n * @param {any} request - request to cancel\n * @returns - A boolean indicating if the request was cancelled\n */\nexport function cancel(promise, message) {\n    return GraphQLAPI.cancel(promise, message);\n}\n/**\n * Checks to see if an error thrown is from an api request cancellation\n * @param {any} error - Any error\n * @returns - A boolean indicating if the error was from an api request cancellation\n */\nexport function isCancelError(error) {\n    return GraphQLAPI.isCancelError(error);\n}\n"],"names":[],"mappings":";;;AAAA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,OAAO,CAAC,OAAO,EAAE,iBAAiB,EAAE;AACpD;AACA,IAAI,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;AAC5D,IAAI,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC;AAC/D;AACA;AACA;AACA;AACA;AACA,IAAI,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;AACnF,IAAI,OAAO,MAAM,CAAC;AAClB,CAAC;AACD;AACA;AACA;AACA;AACA;AACO,SAAS,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE;AACzC,IAAI,OAAO,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC/C,CAAC;AACD;AACA;AACA;AACA;AACA;AACO,SAAS,aAAa,CAAC,KAAK,EAAE;AACrC,IAAI,OAAO,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC3C;;;;"}
+{"version":3,"file":"v6.mjs","sources":["../../../src/internals/v6.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { GraphQLAPI } from '../GraphQLAPI';\nimport { __amplify, __authMode, __authToken, } from '../types';\n/**\n * Invokes graphql operations against a graphql service, providing correct input and\n * output types if Amplify-generated graphql from a recent version of the CLI/codegen\n * are used *or* correct typing is provided via the type argument.\n *\n * Amplify-generated \"branded\" graphql queries will look similar to this:\n *\n * ```ts\n *                               //\n *                               // |-- branding\n *                               // v\n * export const getModel = `...` as GeneratedQuery<\n * \tGetModelQueryVariables,\n * \tGetModelQuery\n * >;\n * ```\n *\n * If this branding is not in your generated graphql, update to a newer version of\n * CLI/codegen and regenerate your graphql using `amplify codegen`.\n *\n * ## Using Amplify-generated graphql\n *\n * ```ts\n * import * as queries from './graphql/queries';\n *\n * //\n * //    |-- correctly typed graphql response containing a Widget\n * //    v\n * const queryResult = await graphql({\n * \tquery: queries.getWidget,\n * \tvariables: {\n * \t\tid: \"abc\", // <-- type hinted/enforced\n * \t},\n * });\n *\n * //\n * //    |-- a correctly typed Widget\n * //    v\n * const fetchedWidget = queryResult.data?.getWidget!;\n * ```\n *\n * ## Custom input + result types\n *\n * To provide input types (`variables`) and result types:\n *\n * ```ts\n * type GetById_NameOnly = {\n * \tvariables: {\n * \t\tid: string\n * \t},\n * \tresult: Promise<{\n * \t\tdata: { getWidget: { name: string } }\n * \t}>\n * }\n *\n * //\n * //    |-- type is GetById_NameOnly[\"result\"]\n * //    v\n * const result = graphql<GetById_NameOnly>({\n * \tquery: \"...\",\n * \tvariables: { id: \"abc\" }  // <-- type of GetById_NameOnly[\"variables\"]\n * });\n * ```\n *\n * ## Custom result type only\n *\n * To specify result types only, use a type that is *not* in the `{variables, result}` shape:\n *\n * ```ts\n * type MyResultType = Promise<{\n * \tdata: {\n * \t\tgetWidget: { name: string }\n * \t}\n * }>\n *\n * //\n * //    |-- type is MyResultType\n * //    v\n * const result = graphql<MyResultType>({query: \"...\"});\n * ```\n *\n * @param options\n * @param additionalHeaders\n */\nexport function graphql(options, additionalHeaders) {\n    // inject client-level auth\n    options.authMode = options.authMode || this[__authMode];\n    options.authToken = options.authToken || this[__authToken];\n    /**\n     * The correctness of these typings depends on correct string branding or overrides.\n     * Neither of these can actually be validated at runtime. Hence, we don't perform\n     * any validation or type-guarding here.\n     */\n    const result = GraphQLAPI.graphql(this[__amplify], options, additionalHeaders);\n    return result;\n}\n/**\n * Cancels an inflight request. Only applicable for graphql queries and mutations\n * @param {any} request - request to cancel\n * @returns - A boolean indicating if the request was cancelled\n */\nexport function cancel(promise, message) {\n    return GraphQLAPI.cancel(promise, message);\n}\n/**\n * Checks to see if an error thrown is from an api request cancellation\n * @param {any} error - Any error\n * @returns - A boolean indicating if the error was from an api request cancellation\n */\nexport function isCancelError(error) {\n    return GraphQLAPI.isCancelError(error);\n}\n"],"names":[],"mappings":";;;AAAA;AACA;AAGA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,SAAS,OAAO,CAAC,OAAO,EAAE,iBAAiB,EAAE;AACpD;AACA,IAAI,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;AAC5D,IAAI,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,WAAW,CAAC,CAAC;AAC/D;AACA;AACA;AACA;AACA;AACA,IAAI,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,iBAAiB,CAAC,CAAC;AACnF,IAAI,OAAO,MAAM,CAAC;AAClB,CAAC;AACD;AACA;AACA;AACA;AACA;AACO,SAAS,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE;AACzC,IAAI,OAAO,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC/C,CAAC;AACD;AACA;AACA;AACA;AACA;AACO,SAAS,aAAa,CAAC,KAAK,EAAE;AACrC,IAAI,OAAO,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;AAC3C;;;;"}

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

@@ -1,5 +1,5 @@
 import { AmplifyClassV6, ResourcesConfig } from '@aws-amplify/core';
-import { ModelTypes, CustomHeaders } from '@aws-amplify/data-schema-types';
+import { ModelTypes, CustomHeaders, EnumTypes } from '@aws-amplify/data-schema-types';
 import { Source, DocumentNode, GraphQLError } from 'graphql';
 export { OperationTypeNode } from 'graphql';
 import { Observable } from 'rxjs';
@@ -294,6 +294,7 @@ export type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
     cancel: (promise: Promise<any>, message?: string) => boolean;
     isCancelError: (error: any) => boolean;
     models: ModelTypes<T>;
+    enums: EnumTypes<T>;
 }>;
 export type V6ClientSSRRequest<T extends Record<any, any> = never> = ExcludeNeverFields<{
     [__amplify]: AmplifyClassV6;

package/dist/esm/utils/resolveLibraryOptions.d.ts

@@ -4,8 +4,11 @@ import { AmplifyClassV6 } from '@aws-amplify/core';
  */
 export declare const resolveLibraryOptions: (amplify: AmplifyClassV6) => {
     headers: ((options?: {
+        /**
+         * @internal
+         */
         query?: string | undefined;
         variables?: Record<string, import("@aws-amplify/core/internals/utils").DocumentType> | undefined;
-    } | undefined) => Promise<{} | import("@aws-amplify/core/internals/aws-client-utils").Headers>) | undefined;
+    } | undefined) => Promise<Record<string, unknown> | import("@aws-amplify/core/internals/aws-client-utils").Headers>) | undefined;
     withCredentials: boolean | undefined;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.16",
+	"version": "4.0.17-unstable.1fdbb12.0+1fdbb12",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./dist/cjs/index.js",
 	"module": "./dist/esm/index.mjs",
@@ -84,9 +84,9 @@
 		"server"
 	],
 	"dependencies": {
-		"@aws-amplify/api-rest": "4.0.16",
-		"@aws-amplify/core": "6.0.16",
-		"@aws-amplify/data-schema-types": "^0.7.1",
+		"@aws-amplify/api-rest": "4.0.17-unstable.1fdbb12.0+1fdbb12",
+		"@aws-amplify/core": "6.0.17-unstable.1fdbb12.0+1fdbb12",
+		"@aws-amplify/data-schema-types": "^0.7.2",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
@@ -101,5 +101,5 @@
 			"limit": "91.7 kB"
 		}
 	],
-	"gitHead": "0e919f6e759cb94d03e119162b530b32d48f1357"
+	"gitHead": "1fdbb12f85d1a363258c4ebeb5aa7c98ee619e16"
 }

package/src/GraphQLAPI.ts

@@ -10,7 +10,7 @@ import { Observable } from 'rxjs';
 export const graphqlOperation = (
 	query: any,
 	variables = {},
-	authToken?: string
+	authToken?: string,
 ) => ({
 	query,
 	variables,
@@ -35,7 +35,7 @@ export class GraphQLAPIClass extends InternalGraphQLAPIClass {
 	graphql<T = any>(
 		amplify: AmplifyClassV6 | (() => Promise<AmplifyClassV6>),
 		options: GraphQLOptions,
-		additionalHeaders?: CustomHeaders
+		additionalHeaders?: CustomHeaders,
 	): Observable<GraphQLResult<T>> | Promise<GraphQLResult<T>> {
 		return super.graphql(amplify, options, additionalHeaders, {
 			category: Category.API,

package/src/Providers/AWSAppSyncRealTimeProvider/index.ts

@@ -158,7 +158,7 @@ export class AWSAppSyncRealTimeProvider {
 					) {
 						this.reconnectionMonitor.record(ReconnectEvent.HALT_RECONNECT);
 					}
-				}
+				},
 			);
 	}
 
@@ -191,7 +191,7 @@ export class AWSAppSyncRealTimeProvider {
 
 	subscribe(
 		options?: AWSAppSyncRealTimeProviderOptions,
-		customUserAgentDetails?: CustomUserAgentDetails
+		customUserAgentDetails?: CustomUserAgentDetails,
 	): Observable<Record<string, unknown>> {
 		const {
 			appSyncGraphqlEndpoint,
@@ -211,7 +211,7 @@ export class AWSAppSyncRealTimeProvider {
 					errors: [
 						{
 							...new GraphQLError(
-								`Subscribe only available for AWS AppSync endpoint`
+								`Subscribe only available for AWS AppSync endpoint`,
 							),
 						},
 					],
@@ -242,7 +242,7 @@ export class AWSAppSyncRealTimeProvider {
 								customUserAgentDetails,
 							}).catch<any>(err => {
 								logger.debug(
-									`${CONTROL_MSG.REALTIME_SUBSCRIPTION_INIT_ERROR}: ${err}`
+									`${CONTROL_MSG.REALTIME_SUBSCRIPTION_INIT_ERROR}: ${err}`,
 								);
 
 								this.connectionStateMonitor.record(CONNECTION_CHANGE.CLOSED);
@@ -428,13 +428,13 @@ export class AWSAppSyncRealTimeProvider {
 	private _logStartSubscriptionError(
 		subscriptionId: string,
 		observer: PubSubContentObserver,
-		err: { message?: string }
+		err: { message?: string },
 	) {
 		logger.debug({ err });
 		const message = String(err.message ?? '');
 		// Resolving to give the state observer time to propogate the update
 		Promise.resolve(
-			this.connectionStateMonitor.record(CONNECTION_CHANGE.CLOSED)
+			this.connectionStateMonitor.record(CONNECTION_CHANGE.CLOSED),
 		);
 
 		// Capture the error only when the network didn't cause disruption
@@ -447,7 +447,7 @@ export class AWSAppSyncRealTimeProvider {
 					errors: [
 						{
 							...new GraphQLError(
-								`${CONTROL_MSG.CONNECTION_FAILED}: ${message}`
+								`${CONTROL_MSG.CONNECTION_FAILED}: ${message}`,
 							),
 						},
 					],
@@ -558,7 +558,7 @@ export class AWSAppSyncRealTimeProvider {
 			return;
 		}
 		logger.debug(
-			`subscription message from AWS AppSync RealTime: ${message.data}`
+			`subscription message from AWS AppSync RealTime: ${message.data}`,
 		);
 		const {
 			id = '',
@@ -587,7 +587,7 @@ export class AWSAppSyncRealTimeProvider {
 
 		if (type === MESSAGE_TYPES.GQL_START_ACK) {
 			logger.debug(
-				`subscription ready for ${JSON.stringify({ query, variables })}`
+				`subscription ready for ${JSON.stringify({ query, variables })}`,
 			);
 			if (typeof subscriptionReadyCallback === 'function') {
 				subscriptionReadyCallback();
@@ -611,7 +611,7 @@ export class AWSAppSyncRealTimeProvider {
 				});
 			}
 			this.connectionStateMonitor.record(
-				CONNECTION_CHANGE.CONNECTION_ESTABLISHED
+				CONNECTION_CHANGE.CONNECTION_ESTABLISHED,
 			);
 
 			return;
@@ -623,7 +623,7 @@ export class AWSAppSyncRealTimeProvider {
 				clearTimeout(this.keepAliveAlertTimeoutId);
 			this.keepAliveTimeoutId = setTimeout(
 				() => this._errorDisconnect(CONTROL_MSG.TIMEOUT_DISCONNECT),
-				this.keepAliveTimeout
+				this.keepAliveTimeout,
 			);
 			this.keepAliveAlertTimeoutId = setTimeout(() => {
 				this.connectionStateMonitor.record(CONNECTION_CHANGE.KEEP_ALIVE_MISSED);
@@ -646,14 +646,14 @@ export class AWSAppSyncRealTimeProvider {
 				});
 
 				logger.debug(
-					`${CONTROL_MSG.CONNECTION_FAILED}: ${JSON.stringify(payload)}`
+					`${CONTROL_MSG.CONNECTION_FAILED}: ${JSON.stringify(payload)}`,
 				);
 
 				observer.error({
 					errors: [
 						{
 							...new GraphQLError(
-								`${CONTROL_MSG.CONNECTION_FAILED}: ${JSON.stringify(payload)}`
+								`${CONTROL_MSG.CONNECTION_FAILED}: ${JSON.stringify(payload)}`,
 							),
 						},
 					],
@@ -697,7 +697,7 @@ export class AWSAppSyncRealTimeProvider {
 			this.connectionStateMonitor.record(CONNECTION_CHANGE.CLOSED);
 			logger.debug(
 				'timeoutStartSubscription',
-				JSON.stringify({ query, variables })
+				JSON.stringify({ query, variables }),
 			);
 		}
 	}
@@ -785,7 +785,7 @@ export class AWSAppSyncRealTimeProvider {
 		await jitteredExponentialRetry(
 			this._initializeHandshake.bind(this),
 			[awsRealTimeUrl],
-			MAX_DELAY_MS
+			MAX_DELAY_MS,
 		);
 	}
 
@@ -827,7 +827,7 @@ export class AWSAppSyncRealTimeProvider {
 								return;
 							}
 							logger.debug(
-								`subscription message from AWS AppSyncRealTime: ${message.data} `
+								`subscription message from AWS AppSyncRealTime: ${message.data} `,
 							);
 							const data = JSON.parse(message.data) as ParsedMessagePayload;
 							const {
@@ -874,12 +874,12 @@ export class AWSAppSyncRealTimeProvider {
 						const checkAckOk = (ackOk: boolean) => {
 							if (!ackOk) {
 								this.connectionStateMonitor.record(
-									CONNECTION_CHANGE.CONNECTION_FAILED
+									CONNECTION_CHANGE.CONNECTION_FAILED,
 								);
 								rej(
 									new Error(
-										`Connection timeout: ack from AWSAppSyncRealTime was not received after ${CONNECTION_INIT_TIMEOUT} ms`
-									)
+										`Connection timeout: ack from AWSAppSyncRealTime was not received after ${CONNECTION_INIT_TIMEOUT} ms`,
+									),
 								);
 							}
 						};
@@ -1010,7 +1010,7 @@ export class AWSAppSyncRealTimeProvider {
 				credentials: creds!,
 				signingRegion: endpointInfo.region!,
 				signingService: endpointInfo.service,
-			}
+			},
 		);
 		return signed_params.headers;
 	}

package/src/internals/APIClient.ts

@@ -579,8 +579,6 @@ export function generateGraphQLDocument(
 		);
 	}
 
-	console.log('indexQueryArgs', indexQueryArgs!);
-
 	let graphQLOperationType: 'mutation' | 'query' | 'subscription' | undefined;
 	let graphQLSelectionSet: string | undefined;
 	let graphQLArguments: Record<string, any> | undefined;
@@ -613,10 +611,10 @@ export function generateGraphQLDocument(
 								return acc;
 							},
 							{},
-					  )
+						)
 					: {
 							[primaryKeyFieldName]: `${fields[primaryKeyFieldName].type}!`,
-					  });
+						});
 			graphQLSelectionSet ?? (graphQLSelectionSet = selectionSetFields);
 		case 'LIST':
 			graphQLArguments ??
@@ -660,13 +658,13 @@ export function generateGraphQLDocument(
 		graphQLArguments
 			? `(${Object.entries(graphQLArguments).map(
 					([fieldName, type]) => `\$${fieldName}: ${type}`,
-			  )})`
+				)})`
 			: ''
 	} { ${graphQLFieldName}${
 		graphQLArguments
 			? `(${Object.keys(graphQLArguments).map(
 					fieldName => `${fieldName}: \$${fieldName}`,
-			  )})`
+				)})`
 			: ''
 	} { ${graphQLSelectionSet} } }`;
 
@@ -716,7 +714,7 @@ export function buildGraphQLVariables(
 
 								return !isReadOnly;
 							}),
-					  )
+						)
 					: {},
 			};
 			break;
@@ -732,7 +730,7 @@ export function buildGraphQLVariables(
 								return acc;
 							},
 							{},
-					  )
+						)
 					: { [primaryKeyFieldName]: arg[primaryKeyFieldName] };
 			}
 

package/src/internals/InternalGraphQLAPI.ts

@@ -40,7 +40,7 @@ const logger = new ConsoleLogger('GraphQLAPI');
 const isAmplifyInstance = (
 	amplify:
 		| AmplifyClassV6
-		| ((fn: (amplify: any) => Promise<any>) => Promise<AmplifyClassV6>)
+		| ((fn: (amplify: any) => Promise<any>) => Promise<AmplifyClassV6>),
 ): amplify is AmplifyClassV6 => {
 	return typeof amplify !== 'function';
 };
@@ -68,7 +68,7 @@ export class InternalGraphQLAPIClass {
 	private async _headerBasedAuth(
 		amplify: AmplifyClassV6,
 		authMode: GraphQLAuthMode,
-		additionalHeaders: Record<string, string> = {}
+		additionalHeaders: Record<string, string> = {},
 	) {
 		const {
 			region: region,
@@ -159,7 +159,7 @@ export class InternalGraphQLAPIClass {
 			| ((fn: (amplify: any) => Promise<any>) => Promise<AmplifyClassV6>),
 		{ query: paramQuery, variables = {}, authMode, authToken }: GraphQLOptions,
 		additionalHeaders?: CustomHeaders,
-		customUserAgentDetails?: CustomUserAgentDetails
+		customUserAgentDetails?: CustomUserAgentDetails,
 	): Observable<GraphQLResult<T>> | Promise<GraphQLResult<T>> {
 		const query =
 			typeof paramQuery === 'string'
@@ -167,7 +167,7 @@ export class InternalGraphQLAPIClass {
 				: parse(print(paramQuery));
 
 		const [operationDef = {}] = query.definitions.filter(
-			def => def.kind === 'OperationDefinition'
+			def => def.kind === 'OperationDefinition',
 		);
 		const { operation: operationType } =
 			operationDef as OperationDefinitionNode;
@@ -188,19 +188,24 @@ export class InternalGraphQLAPIClass {
 						headers,
 						abortController,
 						customUserAgentDetails,
-						authToken
+						authToken,
 					);
 				} else {
-					const wrapper = (amplifyInstance: AmplifyClassV6) =>
-						this._graphql<T>(
+					// NOTE: this wrapper function must be await-able so the Amplify server context manager can
+					// destroy the context only after it completes
+					const wrapper = async (amplifyInstance: AmplifyClassV6) => {
+						const result = await this._graphql<T>(
 							amplifyInstance,
 							{ query, variables, authMode },
 							headers,
 							abortController,
 							customUserAgentDetails,
-							authToken
+							authToken,
 						);
 
+						return result;
+					};
+
 					responsePromise = amplify(wrapper) as unknown as Promise<
 						GraphQLResult<T>
 					>;
@@ -208,7 +213,7 @@ export class InternalGraphQLAPIClass {
 
 				this._api.updateRequestToBeCancellable(
 					responsePromise,
-					abortController
+					abortController,
 				);
 				return responsePromise;
 			case 'subscription':
@@ -217,7 +222,7 @@ export class InternalGraphQLAPIClass {
 					{ query, variables, authMode },
 					headers,
 					customUserAgentDetails,
-					authToken
+					authToken,
 				);
 			default:
 				throw new Error(`invalid operation type: ${operationType}`);
@@ -230,7 +235,7 @@ export class InternalGraphQLAPIClass {
 		additionalHeaders: CustomHeaders = {},
 		abortController: AbortController,
 		customUserAgentDetails?: CustomUserAgentDetails,
-		authToken?: string
+		authToken?: string,
 	): Promise<GraphQLResult<T>> {
 		const {
 			region: region,
@@ -263,7 +268,7 @@ export class InternalGraphQLAPIClass {
 			const requestOptions: RequestOptions = {
 				method: 'POST',
 				url: new AmplifyUrl(
-					customEndpoint || appSyncGraphqlEndpoint || ''
+					customEndpoint || appSyncGraphqlEndpoint || '',
 				).toString(),
 				queryString: print(query as DocumentNode),
 			};
@@ -287,7 +292,7 @@ export class InternalGraphQLAPIClass {
 				(await this._headerBasedAuth(
 					amplify,
 					authMode!,
-					additionalCustomHeaders
+					additionalCustomHeaders,
 				))),
 			/**
 			 * Custom endpoint headers.
@@ -300,8 +305,8 @@ export class InternalGraphQLAPIClass {
 					? await this._headerBasedAuth(
 							amplify,
 							authMode!,
-							additionalCustomHeaders
-					  )
+							additionalCustomHeaders,
+						)
 					: {})) ||
 				{}),
 			// Custom headers included in Amplify configuration options:
@@ -361,7 +366,7 @@ export class InternalGraphQLAPIClass {
 		let response: any;
 
 		try {
-			const { body: responseBody } = await this._api.post({
+			const { body: responseBody } = await this._api.post(amplify, {
 				url: new AmplifyUrl(endpoint),
 				options: {
 					headers,
@@ -392,7 +397,7 @@ export class InternalGraphQLAPIClass {
 						null,
 						null,
 						null,
-						err as any
+						err as any,
 					),
 				],
 			};
@@ -430,7 +435,7 @@ export class InternalGraphQLAPIClass {
 		{ query, variables, authMode }: GraphQLOptions,
 		additionalHeaders: CustomHeaders = {},
 		customUserAgentDetails?: CustomUserAgentDetails,
-		authToken?: string
+		authToken?: string,
 	): Observable<any> {
 		const config = resolveConfig(amplify);
 
@@ -457,7 +462,7 @@ export class InternalGraphQLAPIClass {
 					authToken,
 					libraryConfigHeaders,
 				},
-				customUserAgentDetails
+				customUserAgentDetails,
 			)
 			.pipe(
 				catchError(e => {
@@ -465,7 +470,7 @@ export class InternalGraphQLAPIClass {
 						throw repackageUnauthError(e);
 					}
 					throw e;
-				})
+				}),
 			);
 	}
 }

package/src/internals/generateClient.ts

@@ -1,7 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import { Hub } from '@aws-amplify/core';
+import { EnumTypes, ModelTypes } from '@aws-amplify/data-schema-types';
 import { graphql, cancel, isCancelError } from './v6';
-import { generateModelsProperty } from './generateModelsProperty';
+import { generateEnumsProperty } from './utils/generateEnumsProperty';
+import { generateModelsProperty } from './utils/generateModelsProperty';
+import { isApiGraphQLConfig } from './utils/isApiGraphQLProviderConfig';
 import {
 	V6Client,
 	__amplify,
@@ -10,8 +14,7 @@ import {
 	__headers,
 } from '../types';
 import { ClientGenerationParams } from './types';
-import { ModelTypes } from '@aws-amplify/data-schema-types';
-import { Hub, HubCapsule, ResourcesConfig } from '@aws-amplify/core';
+import { isConfigureEventWithResourceConfig } from './utils/isConfigureEventWithResourceConfig';
 
 /**
  * @private
@@ -23,7 +26,7 @@ import { Hub, HubCapsule, ResourcesConfig } from '@aws-amplify/core';
  * @returns
  */
 export function generateClient<T extends Record<any, any> = never>(
-	params: ClientGenerationParams
+	params: ClientGenerationParams,
 ): V6Client<T> {
 	const client = {
 		[__amplify]: params.amplify,
@@ -33,12 +36,16 @@ export function generateClient<T extends Record<any, any> = never>(
 		graphql,
 		cancel,
 		isCancelError,
-		models: {},
+		models: emptyProperty as ModelTypes<never>,
+		enums: emptyProperty as EnumTypes<never>,
 	} as any;
 
-	const config = params.amplify.getConfig();
+	const apiGraphqlConfig = params.amplify.getConfig().API?.GraphQL;
 
-	if (!config.API?.GraphQL) {
+	if (isApiGraphQLConfig(apiGraphqlConfig)) {
+		client.models = generateModelsProperty<T>(client, apiGraphqlConfig);
+		client.enums = generateEnumsProperty<T>(apiGraphqlConfig);
+	} else {
 		// This happens when the `Amplify.configure()` call gets evaluated after the `generateClient()` call.
 		//
 		// Cause: when the `generateClient()` and the `Amplify.configure()` calls are located in
@@ -51,52 +58,33 @@ export function generateClient<T extends Record<any, any> = never>(
 		//
 		// TODO: revisit, and reverify this approach when enabling multiple clients for multi-endpoints
 		// configuration.
-		client.models = emptyModels as ModelTypes<never>;
-		generateModelsPropertyOnAmplifyConfigure<T>(client);
-	} else {
-		client.models = generateModelsProperty<T>(
-			client,
-			config.API?.GraphQL,
-		);
+		generateModelsPropertyOnAmplifyConfigure(client);
 	}
 
 	return client as V6Client<T>;
 }
 
-const generateModelsPropertyOnAmplifyConfigure = <
-	T extends Record<any, any> = never,
->(clientRef: any) => {
+const generateModelsPropertyOnAmplifyConfigure = (clientRef: any) => {
 	Hub.listen('core', coreEvent => {
-		if (!isConfigureEvent(coreEvent.payload)) {
+		if (!isConfigureEventWithResourceConfig(coreEvent.payload)) {
 			return;
 		}
 
-		const { data: resourceConfig } = coreEvent.payload;
+		const apiGraphQLConfig = coreEvent.payload.data.API?.GraphQL;
 
-		if (resourceConfig.API?.GraphQL) {
-			clientRef.models = generateModelsProperty<T>(
-				clientRef,
-				resourceConfig.API?.GraphQL,
-			);
+		if (isApiGraphQLConfig(apiGraphQLConfig)) {
+			clientRef.models = generateModelsProperty(clientRef, apiGraphQLConfig);
+			clientRef.enums = generateEnumsProperty(apiGraphQLConfig);
 		}
 	});
 };
 
-function isConfigureEvent(
-	payload: HubCapsule<'core', { event: string; data?: unknown }>['payload'],
-): payload is {
-	event: 'configure';
-	data: ResourcesConfig;
-} {
-	return payload.event === 'configure';
-}
-
-const emptyModels = new Proxy(
+const emptyProperty = new Proxy(
 	{},
 	{
 		get() {
 			throw new Error(
-				'Could not generate client. This is likely due to Amplify.configure() not being called prior to generateClient().',
+				'Client could not be generated. This is likely due to `Amplify.configure()` not being called prior to `generateClient()` or because the configuration passed to `Amplify.configure()` is missing GraphQL provider configuration.',
 			);
 		},
 	},