@aws-amplify/api-graphql 4.0.1-console-preview.d745d43.0 → 4.0.1-ssr-api.df60e41.0

package/lib/utils/ReconnectionMonitor.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var constants_1 = require("../Providers/constants");
+const constants_1 = require("../Providers/constants");
 var ReconnectEvent;
 (function (ReconnectEvent) {
     ReconnectEvent["START_RECONNECT"] = "START_RECONNECT";
@@ -12,31 +12,30 @@ var ReconnectEvent;
  *   Attempting to reconnect only once creates unrecoverable states when the network state isn't
  *   supported by the browser, so this keeps retrying every minute until halted.
  */
-var ReconnectionMonitor = /** @class */ (function () {
-    function ReconnectionMonitor() {
+class ReconnectionMonitor {
+    constructor() {
         this.reconnectObservers = [];
     }
     /**
      * Add reconnect observer to the list of observers to alert on reconnect
      */
-    ReconnectionMonitor.prototype.addObserver = function (reconnectObserver) {
+    addObserver(reconnectObserver) {
         this.reconnectObservers.push(reconnectObserver);
-    };
+    }
     /**
      * Given a reconnect event, start the appropriate behavior
      */
-    ReconnectionMonitor.prototype.record = function (event) {
-        var _this = this;
+    record(event) {
         if (event === ReconnectEvent.START_RECONNECT) {
             // If the reconnection hasn't been started
             if (this.reconnectSetTimeoutId === undefined &&
                 this.reconnectIntervalId === undefined) {
-                this.reconnectSetTimeoutId = setTimeout(function () {
+                this.reconnectSetTimeoutId = setTimeout(() => {
                     // Reconnect now
-                    _this._triggerReconnect();
+                    this._triggerReconnect();
                     // Retry reconnect every periodically until it works
-                    _this.reconnectIntervalId = setInterval(function () {
-                        _this._triggerReconnect();
+                    this.reconnectIntervalId = setInterval(() => {
+                        this._triggerReconnect();
                     }, constants_1.RECONNECT_INTERVAL);
                 }, constants_1.RECONNECT_DELAY);
             }
@@ -51,22 +50,19 @@ var ReconnectionMonitor = /** @class */ (function () {
                 this.reconnectSetTimeoutId = undefined;
             }
         }
-    };
+    }
     /**
      * Complete all reconnect observers
      */
-    ReconnectionMonitor.prototype.close = function () {
-        this.reconnectObservers.forEach(function (reconnectObserver) {
-            var _a;
-            (_a = reconnectObserver.complete) === null || _a === void 0 ? void 0 : _a.call(reconnectObserver);
+    close() {
+        this.reconnectObservers.forEach(reconnectObserver => {
+            reconnectObserver.complete?.();
         });
-    };
-    ReconnectionMonitor.prototype._triggerReconnect = function () {
-        this.reconnectObservers.forEach(function (reconnectObserver) {
-            var _a;
-            (_a = reconnectObserver.next) === null || _a === void 0 ? void 0 : _a.call(reconnectObserver);
+    }
+    _triggerReconnect() {
+        this.reconnectObservers.forEach(reconnectObserver => {
+            reconnectObserver.next?.();
         });
-    };
-    return ReconnectionMonitor;
-}());
+    }
+}
 exports.ReconnectionMonitor = ReconnectionMonitor;

package/lib/utils/errors/APIError.js

@@ -2,21 +2,17 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var utils_1 = require("@aws-amplify/core/internals/utils");
+const utils_1 = require("@aws-amplify/core/internals/utils");
 /**
  * @internal
  */
-var APIError = /** @class */ (function (_super) {
-    tslib_1.__extends(APIError, _super);
-    function APIError(params) {
-        var _this = _super.call(this, params) || this;
+class APIError extends utils_1.AmplifyError {
+    constructor(params) {
+        super(params);
         // Hack for making the custom error class work when transpiled to es5
         // TODO: Delete the following 2 lines after we change the build target to >= es2015
-        _this.constructor = APIError;
-        Object.setPrototypeOf(_this, APIError.prototype);
-        return _this;
+        this.constructor = APIError;
+        Object.setPrototypeOf(this, APIError.prototype);
     }
-    return APIError;
-}(utils_1.AmplifyError));
+}
 exports.APIError = APIError;

package/lib/utils/errors/assertValidationError.js

@@ -2,15 +2,15 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-var APIError_1 = require("./APIError");
-var validation_1 = require("./validation");
+const APIError_1 = require("./APIError");
+const validation_1 = require("./validation");
 /**
  * @internal
  */
 function assertValidationError(assertion, name) {
-    var _a = validation_1.validationErrorMap[name], message = _a.message, recoverySuggestion = _a.recoverySuggestion;
+    const { message, recoverySuggestion } = validation_1.validationErrorMap[name];
     if (!assertion) {
-        throw new APIError_1.APIError({ name: name, message: message, recoverySuggestion: recoverySuggestion });
+        throw new APIError_1.APIError({ name, message, recoverySuggestion });
     }
 }
 exports.assertValidationError = assertValidationError;

package/lib/utils/errors/validation.js

@@ -1,7 +1,6 @@
 "use strict";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 var APIValidationErrorCode;
 (function (APIValidationErrorCode) {
@@ -9,18 +8,18 @@ var APIValidationErrorCode;
     APIValidationErrorCode["NoRegion"] = "NoRegion";
     APIValidationErrorCode["NoCustomEndpoint"] = "NoCustomEndpoint";
 })(APIValidationErrorCode = exports.APIValidationErrorCode || (exports.APIValidationErrorCode = {}));
-exports.validationErrorMap = (_a = {},
-    _a[APIValidationErrorCode.NoAuthSession] = {
+exports.validationErrorMap = {
+    [APIValidationErrorCode.NoAuthSession]: {
         message: 'Auth session should not be empty.',
     },
     // TODO: re-enable when working in all test environments:
     // [APIValidationErrorCode.NoEndpoint]: {
     // 	message: 'Missing endpoint',
     // },
-    _a[APIValidationErrorCode.NoRegion] = {
+    [APIValidationErrorCode.NoRegion]: {
         message: 'Missing region.',
     },
-    _a[APIValidationErrorCode.NoCustomEndpoint] = {
+    [APIValidationErrorCode.NoCustomEndpoint]: {
         message: 'Custom endpoint region is present without custom endpoint.',
     },
-    _a);
+};

package/lib/utils/resolveConfig.js

@@ -2,22 +2,21 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 Object.defineProperty(exports, "__esModule", { value: true });
-var errors_1 = require("./errors");
+const errors_1 = require("./errors");
 /**
  * @internal
  */
-exports.resolveConfig = function (amplify) {
-    var _a, _b;
-    var _c = (_b = (_a = amplify.getConfig().API) === null || _a === void 0 ? void 0 : _a.GraphQL) !== null && _b !== void 0 ? _b : {}, apiKey = _c.apiKey, customEndpoint = _c.customEndpoint, customEndpointRegion = _c.customEndpointRegion, defaultAuthMode = _c.defaultAuthMode, endpoint = _c.endpoint, region = _c.region;
+exports.resolveConfig = (amplify) => {
+    const { apiKey, customEndpoint, customEndpointRegion, defaultAuthMode, endpoint, region, } = amplify.getConfig().API?.GraphQL ?? {};
     // TODO: re-enable when working in all test environments:
     // assertValidationError(!!endpoint, APIValidationErrorCode.NoEndpoint);
     errors_1.assertValidationError(!(!customEndpoint && customEndpointRegion), errors_1.APIValidationErrorCode.NoCustomEndpoint);
     return {
-        apiKey: apiKey,
-        customEndpoint: customEndpoint,
-        customEndpointRegion: customEndpointRegion,
-        defaultAuthMode: defaultAuthMode,
-        endpoint: endpoint,
-        region: region,
+        apiKey,
+        customEndpoint,
+        customEndpointRegion,
+        defaultAuthMode,
+        endpoint,
+        region,
     };
 };

package/lib/utils/resolveLibraryOptions.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @internal
  */
-exports.resolveLibraryOptions = function (amplify) {
-    var _a, _b, _c, _d, _e, _f;
-    var headers = (_c = (_b = (_a = amplify.libraryOptions) === null || _a === void 0 ? void 0 : _a.API) === null || _b === void 0 ? void 0 : _b.GraphQL) === null || _c === void 0 ? void 0 : _c.headers;
-    var withCredentials = (_f = (_e = (_d = amplify.libraryOptions) === null || _d === void 0 ? void 0 : _d.API) === null || _e === void 0 ? void 0 : _e.GraphQL) === null || _f === void 0 ? void 0 : _f.withCredentials;
-    return { headers: headers, withCredentials: withCredentials };
+exports.resolveLibraryOptions = (amplify) => {
+    const headers = amplify.libraryOptions?.API?.GraphQL?.headers;
+    const withCredentials = amplify.libraryOptions?.API?.GraphQL?.withCredentials;
+    return { headers, withCredentials };
 };

package/lib-esm/GraphQLAPI.d.ts

@@ -19,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>(amplify: AmplifyClassV6, options: GraphQLOptions, additionalHeaders?: {
+    graphql<T = any>(amplify: AmplifyClassV6 | (() => Promise<AmplifyClassV6>), options: GraphQLOptions, additionalHeaders?: {
         [key: string]: string;
     }): Observable<GraphQLResult<T>> | Promise<GraphQLResult<T>>;
     /**

package/lib-esm/GraphQLAPI.js

@@ -1,25 +1,17 @@
-import { __extends } from "tslib";
 import { Category, ApiAction } from '@aws-amplify/core/internals/utils';
 import { InternalGraphQLAPIClass } from './internals';
-export var graphqlOperation = function (query, variables, authToken) {
-    if (variables === void 0) { variables = {}; }
-    return ({
-        query: query,
-        variables: variables,
-        authToken: authToken,
-    });
-};
+export const graphqlOperation = (query, variables = {}, authToken) => ({
+    query,
+    variables,
+    authToken,
+});
 /**
  * Export Cloud Logic APIs
  */
-var GraphQLAPIClass = /** @class */ (function (_super) {
-    __extends(GraphQLAPIClass, _super);
-    function GraphQLAPIClass() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    GraphQLAPIClass.prototype.getModuleName = function () {
+export class GraphQLAPIClass extends InternalGraphQLAPIClass {
+    getModuleName() {
         return 'GraphQLAPI';
-    };
+    }
     /**
      * Executes a GraphQL operation
      *
@@ -27,29 +19,29 @@ 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 (amplify, options, additionalHeaders) {
-        return _super.prototype.graphql.call(this, amplify, options, additionalHeaders, {
+    graphql(amplify, 
+    // amplify: AmplifyClassV6 | (() => Promise<AmplifyClassV6>),
+    options, additionalHeaders) {
+        return super.graphql(amplify, options, additionalHeaders, {
             category: Category.API,
-            action: ApiAction.GraphQl
+            action: ApiAction.GraphQl,
         });
-    };
+    }
     /**
      * Checks to see if an error thrown is from an api request cancellation
      * @param error - Any error
      * @returns A boolean indicating if the error was from an api request cancellation
      */
-    GraphQLAPIClass.prototype.isCancelError = function (error) {
-        return _super.prototype.isCancelError.call(this, error);
-    };
+    isCancelError(error) {
+        return super.isCancelError(error);
+    }
     /**
      * Cancels an inflight request. Only applicable for graphql queries and mutations
      * @param {any} request - request to cancel
      * @returns A boolean indicating if the request was cancelled
      */
-    GraphQLAPIClass.prototype.cancel = function (request, message) {
-        return _super.prototype.cancel.call(this, request, message);
-    };
-    return GraphQLAPIClass;
-}(InternalGraphQLAPIClass));
-export { GraphQLAPIClass };
-export var GraphQLAPI = new GraphQLAPIClass(null);
+    cancel(request, message) {
+        return super.cancel(request, message);
+    }
+}
+export const GraphQLAPI = new GraphQLAPIClass(null);