@aws-amplify/api-graphql 4.0.1-console-preview.d807e55.0 → 4.0.1-console-preview.5f040a2.0

package/lib-esm/types/index.d.ts

@@ -1,3 +1,4 @@
+import { AmplifyClassV6 } from '@aws-amplify/core';
 import { Source, DocumentNode, GraphQLError } from 'graphql';
 export { OperationTypeNode } from 'graphql';
 import { Observable } from 'rxjs';
@@ -271,3 +272,18 @@ export declare type GeneratedSubscription<InputType, OutputType> = string & {
     __generatedSubscriptionInput: InputType;
     __generatedSubscriptionOutput: OutputType;
 };
+declare type FilteredKeys<T> = {
+    [P in keyof T]: T[P] extends never ? never : P;
+}[keyof T];
+declare type ExcludeNeverFields<O> = {
+    [K in FilteredKeys<O>]: O[K];
+};
+export declare const __amplify: unique symbol;
+export declare type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
+    [__amplify]: AmplifyClassV6;
+    graphql: <FALLBACK_TYPES = unknown, TYPED_GQL_STRING extends string = string>(options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>, additionalHeaders?: {
+        [key: string]: string;
+    } | undefined) => GraphQLResponseV6<FALLBACK_TYPES, TYPED_GQL_STRING>;
+    cancel: (promise: Promise<any>, message?: string) => boolean;
+    isCancelError: (error: any) => boolean;
+}>;

package/lib-esm/types/index.js

@@ -7,3 +7,4 @@ export var GraphQLAuthError;
     GraphQLAuthError["NO_FEDERATED_JWT"] = "No federated jwt";
     GraphQLAuthError["NO_AUTH_TOKEN"] = "No auth token specified";
 })(GraphQLAuthError || (GraphQLAuthError = {}));
+export var __amplify = Symbol('amplify');

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.1-console-preview.d807e55.0+d807e55",
+	"version": "4.0.1-console-preview.5f040a2.0+5f040a2",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -47,9 +47,9 @@
 		"internals"
 	],
 	"dependencies": {
-		"@aws-amplify/api-rest": "4.0.1-console-preview.d807e55.0+d807e55",
-		"@aws-amplify/auth": "6.0.1-console-preview.d807e55.0+d807e55",
-		"@aws-amplify/core": "6.0.1-console-preview.d807e55.0+d807e55",
+		"@aws-amplify/api-rest": "4.0.1-console-preview.5f040a2.0+5f040a2",
+		"@aws-amplify/auth": "6.0.1-console-preview.5f040a2.0+5f040a2",
+		"@aws-amplify/core": "6.0.1-console-preview.5f040a2.0+5f040a2",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
@@ -122,5 +122,5 @@
 			"<rootDir>/__tests__"
 		]
 	},
-	"gitHead": "d807e554bd4c36e287ab3b4a229260fc9b851d40"
+	"gitHead": "5f040a29ecebf29374ae9b58abc661f45143ac4f"
 }

package/src/GraphQLAPI.ts

@@ -1,5 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import { AmplifyClassV6 } from '@aws-amplify/core';
 import { GraphQLOptions, GraphQLResult } from './types';
 import { InternalGraphQLAPIClass } from './internals';
 import { Observable } from 'rxjs';
@@ -30,10 +31,11 @@ export class GraphQLAPIClass extends InternalGraphQLAPIClass {
 	 * @returns An Observable if the query is a subscription query, else a promise of the graphql result.
 	 */
 	graphql<T = any>(
+		amplify: AmplifyClassV6,
 		options: GraphQLOptions,
 		additionalHeaders?: { [key: string]: string }
 	): Observable<GraphQLResult<T>> | Promise<GraphQLResult<T>> {
-		return super.graphql(options, additionalHeaders);
+		return super.graphql(amplify, options, additionalHeaders);
 	}
 
 	/**

package/src/internals/InternalGraphQLAPI.ts

@@ -9,7 +9,7 @@ import {
 	OperationTypeNode,
 } from 'graphql';
 import { Observable } from 'rxjs';
-import { Amplify, Cache, fetchAuthSession } from '@aws-amplify/core';
+import { AmplifyClassV6 } from '@aws-amplify/core';
 import {
 	APIAuthMode,
 	CustomUserAgentDetails,
@@ -54,7 +54,6 @@ export class InternalGraphQLAPIClass {
 	private _options;
 	private appSyncRealTime: AWSAppSyncRealTimeProvider | null;
 
-	Cache = Cache;
 	private _api = { post, updateRequestToBeCancellable };
 
 	/**
@@ -71,10 +70,11 @@ export class InternalGraphQLAPIClass {
 	}
 
 	private async _headerBasedAuth(
+		amplify: AmplifyClassV6,
 		authMode: APIAuthMode,
 		additionalHeaders: { [key: string]: string } = {}
 	) {
-		const config = Amplify.getConfig();
+		const config = amplify.getConfig();
 		const {
 			region: region,
 			endpoint: appSyncGraphqlEndpoint,
@@ -95,7 +95,7 @@ export class InternalGraphQLAPIClass {
 				};
 				break;
 			case 'iam':
-				const session = await fetchAuthSession();
+				const session = await amplify.Auth.fetchAuthSession();
 				if (session.credentials === undefined) {
 					throw new Error(GraphQLAuthError.NO_CREDENTIALS);
 				}
@@ -105,7 +105,9 @@ export class InternalGraphQLAPIClass {
 				try {
 					let token;
 
-					token = (await fetchAuthSession()).tokens?.accessToken.toString();
+					token = (
+						await amplify.Auth.fetchAuthSession()
+					).tokens?.accessToken.toString();
 
 					if (!token) {
 						throw new Error(GraphQLAuthError.NO_FEDERATED_JWT);
@@ -158,6 +160,7 @@ export class InternalGraphQLAPIClass {
 	 * @returns An Observable if the query is a subscription query, else a promise of the graphql result.
 	 */
 	graphql<T = any>(
+		amplify: AmplifyClassV6,
 		{ query: paramQuery, variables = {}, authMode, authToken }: GraphQLOptions,
 		additionalHeaders?: { [key: string]: string },
 		customUserAgentDetails?: CustomUserAgentDetails
@@ -185,6 +188,7 @@ export class InternalGraphQLAPIClass {
 			case 'mutation':
 				const abortController = new AbortController();
 				const responsePromise = this._graphql<T>(
+					amplify,
 					{ query, variables, authMode },
 					headers,
 					abortController,
@@ -197,6 +201,7 @@ export class InternalGraphQLAPIClass {
 				return responsePromise;
 			case 'subscription':
 				return this._graphqlSubscribe(
+					amplify,
 					{ query, variables, authMode },
 					headers,
 					customUserAgentDetails
@@ -207,12 +212,13 @@ export class InternalGraphQLAPIClass {
 	}
 
 	private async _graphql<T = any>(
+		amplify: AmplifyClassV6,
 		{ query, variables, authMode }: GraphQLOptions,
 		additionalHeaders = {},
 		abortController: AbortController,
 		customUserAgentDetails?: CustomUserAgentDetails
 	): Promise<GraphQLResult<T>> {
-		const config = Amplify.getConfig();
+		const config = amplify.getConfig();
 
 		const { region: region, endpoint: appSyncGraphqlEndpoint } =
 			config.API?.GraphQL || {};
@@ -223,10 +229,10 @@ export class InternalGraphQLAPIClass {
 		// TODO: Figure what we need to do to remove `!`'s.
 		const headers = {
 			...(!customGraphqlEndpoint &&
-				(await this._headerBasedAuth(authMode!, additionalHeaders))),
+				(await this._headerBasedAuth(amplify, authMode!, additionalHeaders))),
 			...((customGraphqlEndpoint &&
 				(customEndpointRegion
-					? await this._headerBasedAuth(authMode!, additionalHeaders)
+					? await this._headerBasedAuth(amplify, authMode!, additionalHeaders)
 					: { Authorization: null })) ||
 				{}),
 			...additionalHeaders,
@@ -311,11 +317,12 @@ export class InternalGraphQLAPIClass {
 	}
 
 	private _graphqlSubscribe(
+		amplify: AmplifyClassV6,
 		{ query, variables, authMode }: GraphQLOptions,
 		additionalHeaders = {},
 		customUserAgentDetails?: CustomUserAgentDetails
 	): Observable<any> {
-		const { GraphQL } = Amplify.getConfig().API ?? {};
+		const { GraphQL } = amplify.getConfig().API ?? {};
 		if (!this.appSyncRealTime) {
 			this.appSyncRealTime = new AWSAppSyncRealTimeProvider();
 		}

package/src/internals/v6.ts

@@ -1,7 +1,12 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { GraphQLAPI } from '../GraphQLAPI';
-import { GraphQLOptionsV6, GraphQLResponseV6 } from '../types';
+import {
+	__amplify,
+	V6Client,
+	GraphQLOptionsV6,
+	GraphQLResponseV6,
+} from '../types';
 
 /**
  * Invokes graphql operations against a graphql service, providing correct input and
@@ -91,6 +96,7 @@ export function graphql<
 	FALLBACK_TYPES = unknown,
 	TYPED_GQL_STRING extends string = string
 >(
+	this: V6Client,
 	options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>,
 	additionalHeaders?: { [key: string]: string }
 ): GraphQLResponseV6<FALLBACK_TYPES, TYPED_GQL_STRING> {
@@ -99,7 +105,11 @@ export function graphql<
 	 * Neither of these can actually be validated at runtime. Hence, we don't perform
 	 * any validation or type-guarding here.
 	 */
-	const result = GraphQLAPI.graphql(options, additionalHeaders);
+	const result = GraphQLAPI.graphql(
+		this[__amplify],
+		options,
+		additionalHeaders
+	);
 	return result as any;
 }
 
@@ -108,7 +118,11 @@ export function graphql<
  * @param {any} request - request to cancel
  * @returns - A boolean indicating if the request was cancelled
  */
-export function cancel(promise: Promise<any>, message?: string): boolean {
+export function cancel(
+	this: V6Client,
+	promise: Promise<any>,
+	message?: string
+): boolean {
 	return GraphQLAPI.cancel(promise, message);
 }
 
@@ -117,7 +131,7 @@ export function cancel(promise: Promise<any>, message?: string): boolean {
  * @param {any} error - Any error
  * @returns - A boolean indicating if the error was from an api request cancellation
  */
-export function isCancelError(error: any): boolean {
+export function isCancelError(this: V6Client, error: any): boolean {
 	return GraphQLAPI.isCancelError(error);
 }
 

package/src/types/index.ts

@@ -1,5 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+import { AmplifyClassV6 } from '@aws-amplify/core';
 import { Source, DocumentNode, GraphQLError } from 'graphql';
 export { OperationTypeNode } from 'graphql';
 import { Observable } from 'rxjs';
@@ -339,3 +340,26 @@ export type GeneratedSubscription<InputType, OutputType> = string & {
 	__generatedSubscriptionInput: InputType;
 	__generatedSubscriptionOutput: OutputType;
 };
+
+type FilteredKeys<T> = {
+	[P in keyof T]: T[P] extends never ? never : P;
+}[keyof T];
+type ExcludeNeverFields<O> = {
+	[K in FilteredKeys<O>]: O[K];
+};
+
+export const __amplify = Symbol('amplify');
+
+export type V6Client<T extends Record<any, any> = never> = ExcludeNeverFields<{
+	[__amplify]: AmplifyClassV6;
+	graphql: <FALLBACK_TYPES = unknown, TYPED_GQL_STRING extends string = string>(
+		options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>,
+		additionalHeaders?:
+			| {
+					[key: string]: string;
+			  }
+			| undefined
+	) => GraphQLResponseV6<FALLBACK_TYPES, TYPED_GQL_STRING>;
+	cancel: (promise: Promise<any>, message?: string) => boolean;
+	isCancelError: (error: any) => boolean;
+}>;