@aws-amplify/api 4.0.40-unstable.2 → 4.0.41-unstable.1

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.0.40](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api@4.0.39...@aws-amplify/api@4.0.40) (2022-05-12)
+
+
+### Bug Fixes
+
+* **@aws-amplify/api:** graphql API.cancel fix ([#9578](https://github.com/aws-amplify/amplify-js/issues/9578)) ([a9ae27f](https://github.com/aws-amplify/amplify-js/commit/a9ae27f65e1a782321c0be87556f92d2ee432352))
+
+
+
+
+
 ## [4.0.39](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/api@4.0.38...@aws-amplify/api@4.0.39) (2022-05-03)
 
 **Note:** Version bump only for package @aws-amplify/api

package/dist/aws-amplify-api.js

@@ -10125,6 +10125,16 @@ function () {
   GraphQLAPIClass.prototype.cancel = function (request, message) {
     return this._api.cancel(request, message);
   };
+  /**
+   * Check if the request has a corresponding cancel token in the WeakMap.
+   * @params request - The request promise
+   * @return if the request has a corresponding cancel token.
+   */
+
+
+  GraphQLAPIClass.prototype.hasCancelToken = function (request) {
+    return this._api.hasCancelToken(request);
+  };
 
   GraphQLAPIClass.prototype._graphqlSubscribe = function (_a, additionalHeaders) {
     var query = _a.query,
@@ -10731,6 +10741,16 @@ function () {
   RestAPIClass.prototype.cancel = function (request, message) {
     return this._api.cancel(request, message);
   };
+  /**
+   * Check if the request has a corresponding cancel token in the WeakMap.
+   * @params request - The request promise
+   * @return if the request has a corresponding cancel token.
+   */
+
+
+  RestAPIClass.prototype.hasCancelToken = function (request) {
+    return this._api.hasCancelToken(request);
+  };
   /**
    * Getting endpoint for API
    * @param {string} apiName - The name of the api
@@ -11296,9 +11316,20 @@ function () {
 
     if (source) {
       source.cancel(message);
+      return true;
     }
 
-    return true;
+    return false;
+  };
+  /**
+   * Check if the request has a corresponding cancel token in the WeakMap.
+   * @params request - The request promise
+   * @return if the request has a corresponding cancel token.
+   */
+
+
+  RestClient.prototype.hasCancelToken = function (request) {
+    return this._cancelTokenMap.has(request);
   };
   /**
    * Checks to see if an error thrown is from an api request cancellation
@@ -15340,7 +15371,7 @@ function () {
     return this._restApi.isCancel(error);
   };
   /**
-   * Cancels an inflight request
+   * Cancels an inflight request for either a GraphQL request or a Rest API request.
    * @param request - request to cancel
    * @param [message] - custom error message
    * @return If the request was cancelled
@@ -15348,7 +15379,13 @@ function () {
 
 
   APIClass.prototype.cancel = function (request, message) {
-    return this._restApi.cancel(request, message);
+    if (this._restApi.hasCancelToken(request)) {
+      return this._restApi.cancel(request, message);
+    } else if (this._graphqlApi.hasCancelToken(request)) {
+      return this._graphqlApi.cancel(request, message);
+    }
+
+    return false;
   };
   /**
    * Getting endpoint for API