@aws-amplify/datastore 3.11.1-unstable.1 → 3.11.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.
 
+## [3.11.1](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.11.0...@aws-amplify/datastore@3.11.1) (2022-05-12)
+
+
+### Bug Fixes
+
+* add error for when schema is not initialized ([#9874](https://github.com/aws-amplify/amplify-js/issues/9874)) ([a63f0ee](https://github.com/aws-amplify/amplify-js/commit/a63f0eec70b96dba2d220f3eeb0c799af8622b5c))
+
+
+
+
+
 # [3.11.0](https://github.com/aws-amplify/amplify-js/compare/@aws-amplify/datastore@3.10.0...@aws-amplify/datastore@3.11.0) (2022-05-03)
 
 

package/dist/aws-amplify-datastore.js

@@ -58572,6 +58572,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,
@@ -59176,6 +59186,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
@@ -59740,9 +59760,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
@@ -60241,7 +60272,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
@@ -60249,7 +60280,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
@@ -82060,6 +82097,20 @@ var initSchema = function initSchema(userSchema) {
   });
   return userClasses;
 };
+/* Checks if the schema has been initialized by initSchema().
+ *
+ * Call this function before accessing schema.
+ * Currently this only needs to be called in start() and clear() because all other functions will call start first.
+ */
+
+
+var checkSchemaInitialized = function checkSchemaInitialized() {
+  if (schema === undefined) {
+    var message = 'Schema is not initialized. DataStore will not function as expected. This could happen if you have multiple versions of DataStore installed. Please see https://docs.amplify.aws/lib/troubleshooting/upgrading/q/platform/js/#check-for-duplicate-versions';
+    logger.error(message);
+    throw new Error(message);
+  }
+};
 
 var createTypeClasses = function createTypeClasses(namespace) {
   var classes = {};
@@ -82585,6 +82636,7 @@ function () {
             case 4:
               _b.sent();
 
+              checkSchemaInitialized();
               return [4
               /*yield*/
               , checkSchemaVersion(this.storage, schema.version)];
@@ -83249,6 +83301,7 @@ function () {
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
+              checkSchemaInitialized();
               if (!(this.storage === undefined)) return [3
               /*break*/
               , 2]; // connect to storage so that it can be cleared without fully starting DataStore