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

package/lib/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/types/index.js

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

package/lib-esm/GraphQLAPI.d.ts

@@ -1,3 +1,4 @@
+import { AmplifyClassV6 } from '@aws-amplify/core';
 import { GraphQLOptions, GraphQLResult } from './types';
 import { InternalGraphQLAPIClass } from './internals';
 import { Observable } from 'rxjs';
@@ -18,7 +19,7 @@ export declare class GraphQLAPIClass extends InternalGraphQLAPIClass {
      * @param [additionalHeaders] - headers to merge in after any `graphql_headers` set in the config
      * @returns An Observable if the query is a subscription query, else a promise of the graphql result.
      */
-    graphql<T = any>(options: GraphQLOptions, additionalHeaders?: {
+    graphql<T = any>(amplify: AmplifyClassV6, options: GraphQLOptions, additionalHeaders?: {
         [key: string]: string;
     }): Observable<GraphQLResult<T>> | Promise<GraphQLResult<T>>;
     /**

package/lib-esm/GraphQLAPI.js

@@ -26,8 +26,8 @@ var GraphQLAPIClass = /** @class */ (function (_super) {
      * @param [additionalHeaders] - headers to merge in after any `graphql_headers` set in the config
      * @returns An Observable if the query is a subscription query, else a promise of the graphql result.
      */
-    GraphQLAPIClass.prototype.graphql = function (options, additionalHeaders) {
-        return _super.prototype.graphql.call(this, options, additionalHeaders);
+    GraphQLAPIClass.prototype.graphql = function (amplify, options, additionalHeaders) {
+        return _super.prototype.graphql.call(this, amplify, options, additionalHeaders);
     };
     /**
      * Checks to see if an error thrown is from an api request cancellation

package/lib-esm/internals/InternalGraphQLAPI.d.ts

@@ -1,5 +1,6 @@
 import { OperationTypeNode } from 'graphql';
 import { Observable } from 'rxjs';
+import { AmplifyClassV6 } from '@aws-amplify/core';
 import { CustomUserAgentDetails } from '@aws-amplify/core/internals/utils';
 import { GraphQLResult, GraphQLOperation, GraphQLOptions } from '../types';
 export declare const graphqlOperation: (query: any, variables?: {}, authToken?: string | undefined) => {
@@ -16,7 +17,6 @@ export declare class InternalGraphQLAPIClass {
      */
     private _options;
     private appSyncRealTime;
-    Cache: import("@aws-amplify/core/lib-esm/Cache/types").ICache;
     private _api;
     /**
      * Initialize GraphQL API with AWS configuration
@@ -37,7 +37,7 @@ export declare class InternalGraphQLAPIClass {
      * @param [additionalHeaders] - headers to merge in after any `graphql_headers` set in the config
      * @returns An Observable if the query is a subscription query, else a promise of the graphql result.
      */
-    graphql<T = any>({ query: paramQuery, variables, authMode, authToken }: GraphQLOptions, additionalHeaders?: {
+    graphql<T = any>(amplify: AmplifyClassV6, { query: paramQuery, variables, authMode, authToken }: GraphQLOptions, additionalHeaders?: {
         [key: string]: string;
     }, customUserAgentDetails?: CustomUserAgentDetails): Observable<GraphQLResult<T>> | Promise<GraphQLResult<T>>;
     private _graphql;

package/lib-esm/internals/InternalGraphQLAPI.js

@@ -2,7 +2,6 @@ import { __assign, __awaiter, __generator, __read } from "tslib";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { print, parse, GraphQLError, } from 'graphql';
-import { Amplify, Cache, fetchAuthSession } from '@aws-amplify/core';
 import { ConsoleLogger as Logger, getAmplifyUserAgent, } from '@aws-amplify/core/internals/utils';
 import { GraphQLAuthError, } from '../types';
 import { isCancelError as isCancelErrorREST } from '@aws-amplify/api-rest';
@@ -27,7 +26,6 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
      * @param {Object} options - Configuration object for API
      */
     function InternalGraphQLAPIClass(options) {
-        this.Cache = Cache;
         this._api = { post: post, updateRequestToBeCancellable: updateRequestToBeCancellable };
         this._options = options;
         logger.debug('API Options', this._options);
@@ -35,7 +33,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
     InternalGraphQLAPIClass.prototype.getModuleName = function () {
         return 'InternalGraphQLAPI';
     };
-    InternalGraphQLAPIClass.prototype._headerBasedAuth = function (authMode, additionalHeaders) {
+    InternalGraphQLAPIClass.prototype._headerBasedAuth = function (amplify, authMode, additionalHeaders) {
         if (additionalHeaders === void 0) { additionalHeaders = {}; }
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
@@ -43,7 +41,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
-                        config = Amplify.getConfig();
+                        config = amplify.getConfig();
                         _c = ((_a = config.API) === null || _a === void 0 ? void 0 : _a.GraphQL) || {}, region = _c.region, appSyncGraphqlEndpoint = _c.endpoint, apiKey = _c.apiKey, defaultAuthMode = _c.defaultAuthMode;
                         authenticationType = authMode || defaultAuthMode || 'iam';
                         headers = {};
@@ -65,7 +63,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                             'X-Api-Key': apiKey,
                         };
                         return [3 /*break*/, 11];
-                    case 2: return [4 /*yield*/, fetchAuthSession()];
+                    case 2: return [4 /*yield*/, amplify.Auth.fetchAuthSession()];
                     case 3:
                         session = _e.sent();
                         if (session.credentials === undefined) {
@@ -75,7 +73,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                     case 4:
                         _e.trys.push([4, 6, , 7]);
                         token = void 0;
-                        return [4 /*yield*/, fetchAuthSession()];
+                        return [4 /*yield*/, amplify.Auth.fetchAuthSession()];
                     case 5:
                         token = (_b = (_e.sent()).tokens) === null || _b === void 0 ? void 0 : _b.accessToken.toString();
                         if (!token) {
@@ -125,7 +123,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
      * @param [additionalHeaders] - headers to merge in after any `graphql_headers` set in the config
      * @returns An Observable if the query is a subscription query, else a promise of the graphql result.
      */
-    InternalGraphQLAPIClass.prototype.graphql = function (_a, additionalHeaders, customUserAgentDetails) {
+    InternalGraphQLAPIClass.prototype.graphql = function (amplify, _a, additionalHeaders, customUserAgentDetails) {
         var paramQuery = _a.query, _b = _a.variables, variables = _b === void 0 ? {} : _b, authMode = _a.authMode, authToken = _a.authToken;
         var query = typeof paramQuery === 'string'
             ? parse(paramQuery)
@@ -141,16 +139,16 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
             case 'query':
             case 'mutation':
                 var abortController = new AbortController();
-                var responsePromise = this._graphql({ query: query, variables: variables, authMode: authMode }, headers, abortController, customUserAgentDetails);
+                var responsePromise = this._graphql(amplify, { query: query, variables: variables, authMode: authMode }, headers, abortController, customUserAgentDetails);
                 this._api.updateRequestToBeCancellable(responsePromise, abortController);
                 return responsePromise;
             case 'subscription':
-                return this._graphqlSubscribe({ query: query, variables: variables, authMode: authMode }, headers, customUserAgentDetails);
+                return this._graphqlSubscribe(amplify, { query: query, variables: variables, authMode: authMode }, headers, customUserAgentDetails);
             default:
                 throw new Error("invalid operation type: " + operationType);
         }
     };
-    InternalGraphQLAPIClass.prototype._graphql = function (_a, additionalHeaders, abortController, customUserAgentDetails) {
+    InternalGraphQLAPIClass.prototype._graphql = function (amplify, _a, additionalHeaders, abortController, customUserAgentDetails) {
         var query = _a.query, variables = _a.variables, authMode = _a.authMode;
         if (additionalHeaders === void 0) { additionalHeaders = {}; }
         var _b;
@@ -160,14 +158,14 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
             return __generator(this, function (_k) {
                 switch (_k.label) {
                     case 0:
-                        config = Amplify.getConfig();
+                        config = amplify.getConfig();
                         _c = ((_b = config.API) === null || _b === void 0 ? void 0 : _b.GraphQL) || {}, region = _c.region, appSyncGraphqlEndpoint = _c.endpoint;
                         customGraphqlEndpoint = null;
                         customEndpointRegion = null;
                         _d = [{}];
                         _e = !customGraphqlEndpoint;
                         if (!_e) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
+                        return [4 /*yield*/, this._headerBasedAuth(amplify, authMode, additionalHeaders)];
                     case 1:
                         _e = (_k.sent());
                         _k.label = 2;
@@ -176,7 +174,7 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
                         _g = customGraphqlEndpoint;
                         if (!_g) return [3 /*break*/, 6];
                         if (!customEndpointRegion) return [3 /*break*/, 4];
-                        return [4 /*yield*/, this._headerBasedAuth(authMode, additionalHeaders)];
+                        return [4 /*yield*/, this._headerBasedAuth(amplify, authMode, additionalHeaders)];
                     case 3:
                         _h = _k.sent();
                         return [3 /*break*/, 5];
@@ -264,11 +262,11 @@ var InternalGraphQLAPIClass = /** @class */ (function () {
     InternalGraphQLAPIClass.prototype.cancel = function (request, message) {
         return cancelREST(request, message);
     };
-    InternalGraphQLAPIClass.prototype._graphqlSubscribe = function (_a, additionalHeaders, customUserAgentDetails) {
+    InternalGraphQLAPIClass.prototype._graphqlSubscribe = function (amplify, _a, additionalHeaders, customUserAgentDetails) {
         var query = _a.query, variables = _a.variables, authMode = _a.authMode;
         if (additionalHeaders === void 0) { additionalHeaders = {}; }
         var _b;
-        var GraphQL = ((_b = Amplify.getConfig().API) !== null && _b !== void 0 ? _b : {}).GraphQL;
+        var GraphQL = ((_b = amplify.getConfig().API) !== null && _b !== void 0 ? _b : {}).GraphQL;
         if (!this.appSyncRealTime) {
             this.appSyncRealTime = new AWSAppSyncRealTimeProvider();
         }

package/lib-esm/internals/v6.d.ts

@@ -1,4 +1,4 @@
-import { GraphQLOptionsV6, GraphQLResponseV6 } from '../types';
+import { V6Client, GraphQLOptionsV6, GraphQLResponseV6 } from '../types';
 /**
  * Invokes graphql operations against a graphql service, providing correct input and
  * output types if Amplify-generated graphql from a recent version of the CLI/codegen
@@ -83,7 +83,7 @@ import { GraphQLOptionsV6, GraphQLResponseV6 } from '../types';
  * @param options
  * @param additionalHeaders
  */
-export declare function graphql<FALLBACK_TYPES = unknown, TYPED_GQL_STRING extends string = string>(options: GraphQLOptionsV6<FALLBACK_TYPES, TYPED_GQL_STRING>, additionalHeaders?: {
+export declare 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>;
 /**
@@ -91,11 +91,11 @@ export declare function graphql<FALLBACK_TYPES = unknown, TYPED_GQL_STRING exten
  * @param {any} request - request to cancel
  * @returns - A boolean indicating if the request was cancelled
  */
-export declare function cancel(promise: Promise<any>, message?: string): boolean;
+export declare function cancel(this: V6Client, promise: Promise<any>, message?: string): boolean;
 /**
  * Checks to see if an error thrown is from an api request cancellation
  * @param {any} error - Any error
  * @returns - A boolean indicating if the error was from an api request cancellation
  */
-export declare function isCancelError(error: any): boolean;
+export declare function isCancelError(this: V6Client, error: any): boolean;
 export { GraphQLOptionsV6, GraphQLResponseV6 };

package/lib-esm/internals/v6.js

@@ -1,6 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { GraphQLAPI } from '../GraphQLAPI';
+import { __amplify, } from '../types';
 /**
  * Invokes graphql operations against a graphql service, providing correct input and
  * output types if Amplify-generated graphql from a recent version of the CLI/codegen
@@ -91,7 +92,7 @@ export function graphql(options, additionalHeaders) {
      * Neither of these can actually be validated at runtime. Hence, we don't perform
      * any validation or type-guarding here.
      */
-    var result = GraphQLAPI.graphql(options, additionalHeaders);
+    var result = GraphQLAPI.graphql(this[__amplify], options, additionalHeaders);
     return result;
 }
 /**