@aws-amplify/datastore 3.10.1-unstable.7 → 3.10.1-unstable.8

package/dist/aws-amplify-datastore.js

@@ -83543,7 +83543,7 @@ _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Amplify"].register(instance);
 /*!**************************!*\
   !*** ./lib-esm/index.js ***!
   \**************************/
-/*! exports provided: DataStore, DataStoreClass, initSchema, Predicates, ModelPredicateCreator, ModelSortPredicateCreator, utils, isSchemaModel, isAssociatedWith, isTargetNameAssociation, isModelAttributeAuth, isModelAttributeKey, isModelAttributePrimaryKey, isModelAttributeCompositeKey, ModelAttributeAuthAllow, ModelAttributeAuthProvider, GraphQLScalarType, isGraphQLScalarType, isModelFieldType, isNonModelFieldType, isEnumFieldType, OpType, isPredicateObj, isPredicateGroup, QueryOne, SortDirection, AuthModeStrategyType, ModelOperation, syncExpression, DISCARD, LimitTimerRaceResolvedValues */
+/*! exports provided: DataStore, DataStoreClass, initSchema, Predicates, ModelPredicateCreator, ModelSortPredicateCreator, utils, isSchemaModel, isAssociatedWith, isTargetNameAssociation, isModelAttributeAuth, isModelAttributeKey, isModelAttributePrimaryKey, isModelAttributeCompositeKey, ModelAttributeAuthAllow, ModelAttributeAuthProvider, GraphQLScalarType, isGraphQLScalarType, isModelFieldType, isNonModelFieldType, isEnumFieldType, OpType, isPredicateObj, isPredicateGroup, QueryOne, SortDirection, AuthModeStrategyType, ModelOperation, syncExpression, ProcessName, DISCARD, LimitTimerRaceResolvedValues */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -83609,6 +83609,8 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "syncExpression", function() { return _types__WEBPACK_IMPORTED_MODULE_3__["syncExpression"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "ProcessName", function() { return _types__WEBPACK_IMPORTED_MODULE_3__["ProcessName"]; });
+
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "DISCARD", function() { return _types__WEBPACK_IMPORTED_MODULE_3__["DISCARD"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "LimitTimerRaceResolvedValues", function() { return _types__WEBPACK_IMPORTED_MODULE_3__["LimitTimerRaceResolvedValues"]; });
@@ -90228,9 +90230,9 @@ function () {
     var MutationEvent = this.modelClasses['MutationEvent'];
     this.outbox = new _outbox__WEBPACK_IMPORTED_MODULE_8__["MutationEventOutbox"](this.schema, MutationEvent, modelInstanceCreator, ownSymbol);
     this.modelMerger = new _merger__WEBPACK_IMPORTED_MODULE_7__["ModelMerger"](this.outbox, ownSymbol);
-    this.syncQueriesProcessor = new _processors_sync__WEBPACK_IMPORTED_MODULE_11__["SyncProcessor"](this.schema, this.syncPredicates, this.amplifyConfig, this.authModeStrategy);
-    this.subscriptionsProcessor = new _processors_subscription__WEBPACK_IMPORTED_MODULE_10__["SubscriptionProcessor"](this.schema, this.syncPredicates, this.amplifyConfig, this.authModeStrategy);
-    this.mutationsProcessor = new _processors_mutation__WEBPACK_IMPORTED_MODULE_9__["MutationProcessor"](this.schema, this.storage, this.userModelClasses, this.outbox, this.modelInstanceCreator, MutationEvent, this.amplifyConfig, this.authModeStrategy, conflictHandler, errorHandler);
+    this.syncQueriesProcessor = new _processors_sync__WEBPACK_IMPORTED_MODULE_11__["SyncProcessor"](this.schema, this.syncPredicates, this.amplifyConfig, this.authModeStrategy, errorHandler);
+    this.subscriptionsProcessor = new _processors_subscription__WEBPACK_IMPORTED_MODULE_10__["SubscriptionProcessor"](this.schema, this.syncPredicates, this.amplifyConfig, this.authModeStrategy, errorHandler);
+    this.mutationsProcessor = new _processors_mutation__WEBPACK_IMPORTED_MODULE_9__["MutationProcessor"](this.schema, this.storage, this.userModelClasses, this.outbox, this.modelInstanceCreator, MutationEvent, this.amplifyConfig, this.authModeStrategy, errorHandler, conflictHandler);
     this.datastoreConnectivity = new _datastoreConnectivity__WEBPACK_IMPORTED_MODULE_6__["default"]();
   }
 
@@ -92501,12 +92503,18 @@ var __values = undefined && undefined.__values || function (o) {
 
 
 var MAX_ATTEMPTS = 10;
-var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["ConsoleLogger"]('DataStore');
+var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["ConsoleLogger"]('DataStore'); // TODO: add additional error maps
+
+var errorMap = {
+  BadRecord: function BadRecord(error) {
+    return /^Cannot return \w+ for [\w-_]+ type/.test(error.message);
+  }
+};
 
 var MutationProcessor =
 /** @class */
 function () {
-  function MutationProcessor(schema, storage, userClasses, outbox, modelInstanceCreator, MutationEvent, amplifyConfig, authModeStrategy, conflictHandler, errorHandler) {
+  function MutationProcessor(schema, storage, userClasses, outbox, modelInstanceCreator, MutationEvent, amplifyConfig, authModeStrategy, errorHandler, conflictHandler) {
     if (amplifyConfig === void 0) {
       amplifyConfig = {};
     }
@@ -92519,8 +92527,8 @@ function () {
     this.MutationEvent = MutationEvent;
     this.amplifyConfig = amplifyConfig;
     this.authModeStrategy = authModeStrategy;
-    this.conflictHandler = conflictHandler;
     this.errorHandler = errorHandler;
+    this.conflictHandler = conflictHandler;
     this.typeQuery = new WeakMap();
     this.processing = false;
     this.generateQueries();
@@ -92971,11 +92979,14 @@ function () {
                       return [4
                       /*yield*/
                       , this.errorHandler({
-                        localModel: this.modelInstanceCreator(modelConstructor, variables.input),
+                        recoverySuggestion: 'Ensure app code is up to date, auth directives exist and are correct on each model, and that server-side data has not been invalidated by a schema change. If the problem persists, search for or create an issue: https://github.com/aws-amplify/amplify-js/issues',
+                        localModel: variables.input,
                         message: error.message,
                         operation: operation,
-                        errorType: error.errorType,
+                        errorType: Object(_utils__WEBPACK_IMPORTED_MODULE_5__["mapErrorToType"])(errorMap, error),
                         errorInfo: error.errorInfo,
+                        process: _types__WEBPACK_IMPORTED_MODULE_3__["ProcessName"].mutate,
+                        cause: error,
                         remoteModel: error.data ? this.modelInstanceCreator(modelConstructor, error.data) : null
                       })];
 
@@ -92988,7 +92999,7 @@ function () {
 
                     case 15:
                       err_3 = _h.sent();
-                      logger.warn('failed to execute errorHandler', err_3);
+                      logger.warn('Mutation error handler failed with:', err_3);
                       return [3
                       /*break*/
                       , 17];
@@ -93221,9 +93232,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @aws-amplify/pubsub */ "@aws-amplify/pubsub");
 /* harmony import */ var _aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__);
 /* harmony import */ var zen_observable_ts__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! zen-observable-ts */ "../../node_modules/zen-observable-ts/lib/bundle.esm.js");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../utils */ "./lib-esm/sync/utils.js");
-/* harmony import */ var _predicates__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../predicates */ "./lib-esm/predicates/index.js");
-/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../util */ "./lib-esm/util.js");
+/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../types */ "./lib-esm/types.js");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../utils */ "./lib-esm/sync/utils.js");
+/* harmony import */ var _predicates__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../predicates */ "./lib-esm/predicates/index.js");
+/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../util */ "./lib-esm/util.js");
 var __assign = undefined && undefined.__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -93427,7 +93439,23 @@ var __spread = undefined && undefined.__spread || function () {
 
 
 
-var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_3__["ConsoleLogger"]('DataStore');
+
+var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_3__["ConsoleLogger"]('DataStore'); // TODO: add additional error maps
+
+var errorMap = {
+  Unauthorized: function Unauthorized(givenError) {
+    var _a = givenError.error,
+        _b = __read((_a === void 0 ? {
+      errors: []
+    } : _a).errors, 1),
+        _c = _b[0],
+        _d = (_c === void 0 ? {} : _c).message,
+        message = _d === void 0 ? '' : _d;
+
+    var regex = /Connection failed.+Unauthorized/;
+    return regex.test(message);
+  }
+};
 var CONTROL_MSG;
 
 (function (CONTROL_MSG) {
@@ -93445,7 +93473,7 @@ var USER_CREDENTIALS;
 var SubscriptionProcessor =
 /** @class */
 function () {
-  function SubscriptionProcessor(schema, syncPredicates, amplifyConfig, authModeStrategy) {
+  function SubscriptionProcessor(schema, syncPredicates, amplifyConfig, authModeStrategy, errorHandler) {
     if (amplifyConfig === void 0) {
       amplifyConfig = {};
     }
@@ -93454,6 +93482,7 @@ function () {
     this.syncPredicates = syncPredicates;
     this.amplifyConfig = amplifyConfig;
     this.authModeStrategy = authModeStrategy;
+    this.errorHandler = errorHandler;
     this.typeQuery = new WeakMap();
     this.buffer = [];
   }
@@ -93466,7 +93495,7 @@ function () {
         ownerField = _a.ownerField,
         ownerValue = _a.ownerValue;
 
-    var _b = __read(Object(_utils__WEBPACK_IMPORTED_MODULE_6__["buildSubscriptionGraphQLOperation"])(namespace, model, transformerMutationType, isOwner, ownerField), 3),
+    var _b = __read(Object(_utils__WEBPACK_IMPORTED_MODULE_7__["buildSubscriptionGraphQLOperation"])(namespace, model, transformerMutationType, isOwner, ownerField), 3),
         opType = _b[0],
         opName = _b[1],
         query = _b[2];
@@ -93491,7 +93520,7 @@ function () {
       oidcTokenPayload = {};
     }
 
-    var rules = Object(_utils__WEBPACK_IMPORTED_MODULE_6__["getAuthorizationRules"])(model); // Return null if user doesn't have proper credentials for private API with IAM auth
+    var rules = Object(_utils__WEBPACK_IMPORTED_MODULE_7__["getAuthorizationRules"])(model); // Return null if user doesn't have proper credentials for private API with IAM auth
 
     var iamPrivateAuth = authMode === _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__["GRAPHQL_AUTH_MODE"].AWS_IAM && rules.find(function (rule) {
       return rule.authStrategy === 'private' && rule.provider === 'iam';
@@ -93510,8 +93539,8 @@ function () {
     });
     var validGroup = (authMode === _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__["GRAPHQL_AUTH_MODE"].AMAZON_COGNITO_USER_POOLS || authMode === _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__["GRAPHQL_AUTH_MODE"].OPENID_CONNECT) && groupAuthRules.find(function (groupAuthRule) {
       // validate token against groupClaim
-      var cognitoUserGroups = Object(_utils__WEBPACK_IMPORTED_MODULE_6__["getUserGroupsFromToken"])(cognitoTokenPayload, groupAuthRule);
-      var oidcUserGroups = Object(_utils__WEBPACK_IMPORTED_MODULE_6__["getUserGroupsFromToken"])(oidcTokenPayload, groupAuthRule);
+      var cognitoUserGroups = Object(_utils__WEBPACK_IMPORTED_MODULE_7__["getUserGroupsFromToken"])(cognitoTokenPayload, groupAuthRule);
+      var oidcUserGroups = Object(_utils__WEBPACK_IMPORTED_MODULE_7__["getUserGroupsFromToken"])(oidcTokenPayload, groupAuthRule);
       return __spread(cognitoUserGroups, oidcUserGroups).find(function (userGroup) {
         return groupAuthRule.groups.find(function (group) {
           return group === userGroup;
@@ -93720,7 +93749,7 @@ function () {
                           case 0:
                             return [4
                             /*yield*/
-                            , Object(_utils__WEBPACK_IMPORTED_MODULE_6__["getModelAuthModes"])({
+                            , Object(_utils__WEBPACK_IMPORTED_MODULE_7__["getModelAuthModes"])({
                               authModeStrategy: this.authModeStrategy,
                               defaultAuthMode: this.amplifyConfig.aws_appsync_authenticationType,
                               modelName: modelDefinition.name,
@@ -93730,9 +93759,9 @@ function () {
                           case 1:
                             modelAuthModes = _d.sent();
                             readAuthModes = modelAuthModes.READ;
-                            subscriptions = __assign(__assign({}, subscriptions), (_a = {}, _a[modelDefinition.name] = (_b = {}, _b[_utils__WEBPACK_IMPORTED_MODULE_6__["TransformerMutationType"].CREATE] = [], _b[_utils__WEBPACK_IMPORTED_MODULE_6__["TransformerMutationType"].UPDATE] = [], _b[_utils__WEBPACK_IMPORTED_MODULE_6__["TransformerMutationType"].DELETE] = [], _b), _a));
-                            operations = [_utils__WEBPACK_IMPORTED_MODULE_6__["TransformerMutationType"].CREATE, _utils__WEBPACK_IMPORTED_MODULE_6__["TransformerMutationType"].UPDATE, _utils__WEBPACK_IMPORTED_MODULE_6__["TransformerMutationType"].DELETE];
-                            operationAuthModeAttempts = (_c = {}, _c[_utils__WEBPACK_IMPORTED_MODULE_6__["TransformerMutationType"].CREATE] = 0, _c[_utils__WEBPACK_IMPORTED_MODULE_6__["TransformerMutationType"].UPDATE] = 0, _c[_utils__WEBPACK_IMPORTED_MODULE_6__["TransformerMutationType"].DELETE] = 0, _c);
+                            subscriptions = __assign(__assign({}, subscriptions), (_a = {}, _a[modelDefinition.name] = (_b = {}, _b[_utils__WEBPACK_IMPORTED_MODULE_7__["TransformerMutationType"].CREATE] = [], _b[_utils__WEBPACK_IMPORTED_MODULE_7__["TransformerMutationType"].UPDATE] = [], _b[_utils__WEBPACK_IMPORTED_MODULE_7__["TransformerMutationType"].DELETE] = [], _b), _a));
+                            operations = [_utils__WEBPACK_IMPORTED_MODULE_7__["TransformerMutationType"].CREATE, _utils__WEBPACK_IMPORTED_MODULE_7__["TransformerMutationType"].UPDATE, _utils__WEBPACK_IMPORTED_MODULE_7__["TransformerMutationType"].DELETE];
+                            operationAuthModeAttempts = (_c = {}, _c[_utils__WEBPACK_IMPORTED_MODULE_7__["TransformerMutationType"].CREATE] = 0, _c[_utils__WEBPACK_IMPORTED_MODULE_7__["TransformerMutationType"].UPDATE] = 0, _c[_utils__WEBPACK_IMPORTED_MODULE_7__["TransformerMutationType"].DELETE] = 0, _c);
 
                             _authModeRetry = function authModeRetry(operation) {
                               return __awaiter(_this, void 0, void 0, function () {
@@ -93746,7 +93775,7 @@ function () {
                                       _a = this.buildSubscription(namespace, modelDefinition, operation, userCredentials, cognitoTokenPayload, oidcTokenPayload, readAuthModes[operationAuthModeAttempts[operation]]), transformerMutationType = _a.opType, opName = _a.opName, query = _a.query, isOwner = _a.isOwner, ownerField = _a.ownerField, ownerValue = _a.ownerValue, authMode = _a.authMode;
                                       return [4
                                       /*yield*/
-                                      , Object(_utils__WEBPACK_IMPORTED_MODULE_6__["getTokenForCustomAuth"])(authMode, this.amplifyConfig)];
+                                      , Object(_utils__WEBPACK_IMPORTED_MODULE_7__["getTokenForCustomAuth"])(authMode, this.amplifyConfig)];
 
                                     case 1:
                                       authToken = _b.sent();
@@ -93792,7 +93821,7 @@ function () {
                                             return;
                                           }
 
-                                          var predicatesGroup = _predicates__WEBPACK_IMPORTED_MODULE_7__["ModelPredicateCreator"].getPredicates(_this.syncPredicates.get(modelDefinition), false);
+                                          var predicatesGroup = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].getPredicates(_this.syncPredicates.get(modelDefinition), false);
                                           var _b = data,
                                               _c = opName,
                                               record = _b[_c]; // checking incoming subscription against syncPredicate.
@@ -93807,46 +93836,93 @@ function () {
                                           _this.drainBuffer();
                                         },
                                         error: function error(subscriptionError) {
-                                          var _a = subscriptionError.error,
-                                              _b = __read((_a === void 0 ? {
-                                            errors: []
-                                          } : _a).errors, 1),
-                                              _c = _b[0],
-                                              _d = (_c === void 0 ? {} : _c).message,
-                                              message = _d === void 0 ? '' : _d;
-
-                                          if (message.includes(_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__["CONTROL_MSG"].REALTIME_SUBSCRIPTION_INIT_ERROR) || message.includes(_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__["CONTROL_MSG"].CONNECTION_FAILED)) {
-                                            // Unsubscribe and clear subscription array for model/operation
-                                            subscriptions[modelDefinition.name][transformerMutationType].forEach(function (subscription) {
-                                              return subscription.unsubscribe();
-                                            });
-                                            subscriptions[modelDefinition.name][transformerMutationType] = [];
-                                            operationAuthModeAttempts[operation]++;
-
-                                            if (operationAuthModeAttempts[operation] >= readAuthModes.length) {
-                                              logger.debug(operation + " subscription failed with authMode: " + readAuthModes[operationAuthModeAttempts[operation] - 1]);
-                                              logger.warn('subscriptionError', message);
-                                              return;
-                                            } else {
-                                              logger.debug(operation + " subscription failed with authMode: " + readAuthModes[operationAuthModeAttempts[operation] - 1] + ". Retrying with authMode: " + readAuthModes[operationAuthModeAttempts[operation]]);
-
-                                              _authModeRetry(operation);
-
-                                              return;
-                                            }
-                                          }
+                                          return __awaiter(_this, void 0, void 0, function () {
+                                            var _a, _b, _c, _d, message, e_1;
+
+                                            return __generator(this, function (_e) {
+                                              switch (_e.label) {
+                                                case 0:
+                                                  _a = subscriptionError.error, _b = __read((_a === void 0 ? {
+                                                    errors: []
+                                                  } : _a).errors, 1), _c = _b[0], _d = (_c === void 0 ? {} : _c).message, message = _d === void 0 ? '' : _d;
+                                                  _e.label = 1;
+
+                                                case 1:
+                                                  _e.trys.push([1, 3,, 4]);
+
+                                                  return [4
+                                                  /*yield*/
+                                                  , this.errorHandler({
+                                                    recoverySuggestion: 'Ensure app code is up to date, auth directives exist and are correct on each model, and that server-side data has not been invalidated by a schema change. If the problem persists, search for or create an issue: https://github.com/aws-amplify/amplify-js/issues',
+                                                    localModel: null,
+                                                    message: message,
+                                                    model: modelDefinition.name,
+                                                    operation: operation,
+                                                    errorType: Object(_utils__WEBPACK_IMPORTED_MODULE_7__["mapErrorToType"])(errorMap, subscriptionError),
+                                                    process: _types__WEBPACK_IMPORTED_MODULE_6__["ProcessName"].subscribe,
+                                                    remoteModel: null,
+                                                    cause: subscriptionError
+                                                  })];
+
+                                                case 2:
+                                                  _e.sent();
+
+                                                  return [3
+                                                  /*break*/
+                                                  , 4];
+
+                                                case 3:
+                                                  e_1 = _e.sent();
+                                                  logger.error('Sync error handler failed with:', e_1);
+                                                  return [3
+                                                  /*break*/
+                                                  , 4];
+
+                                                case 4:
+                                                  if (message.includes(_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__["CONTROL_MSG"].REALTIME_SUBSCRIPTION_INIT_ERROR) || message.includes(_aws_amplify_pubsub__WEBPACK_IMPORTED_MODULE_4__["CONTROL_MSG"].CONNECTION_FAILED)) {
+                                                    // Unsubscribe and clear subscription array for model/operation
+                                                    subscriptions[modelDefinition.name][transformerMutationType].forEach(function (subscription) {
+                                                      return subscription.unsubscribe();
+                                                    });
+                                                    subscriptions[modelDefinition.name][transformerMutationType] = [];
+                                                    operationAuthModeAttempts[operation]++;
+
+                                                    if (operationAuthModeAttempts[operation] >= readAuthModes.length) {
+                                                      logger.debug(operation + " subscription failed with authMode: " + readAuthModes[operationAuthModeAttempts[operation] - 1]);
+                                                      logger.warn('subscriptionError', message);
+                                                      return [2
+                                                      /*return*/
+                                                      ];
+                                                    } else {
+                                                      logger.debug(operation + " subscription failed with authMode: " + readAuthModes[operationAuthModeAttempts[operation] - 1] + ". Retrying with authMode: " + readAuthModes[operationAuthModeAttempts[operation]]);
+
+                                                      _authModeRetry(operation);
+
+                                                      return [2
+                                                      /*return*/
+                                                      ];
+                                                    }
+                                                  }
 
-                                          logger.warn('subscriptionError', message);
+                                                  logger.warn('subscriptionError', message);
 
-                                          if (typeof subscriptionReadyCallback === 'function') {
-                                            subscriptionReadyCallback();
-                                          }
+                                                  if (typeof subscriptionReadyCallback === 'function') {
+                                                    subscriptionReadyCallback();
+                                                  }
 
-                                          if (message.includes('"errorType":"Unauthorized"') || message.includes('"errorType":"OperationDisabled"')) {
-                                            return;
-                                          }
+                                                  if (message.includes('"errorType":"Unauthorized"') || message.includes('"errorType":"OperationDisabled"')) {
+                                                    return [2
+                                                    /*return*/
+                                                    ];
+                                                  }
 
-                                          observer.error(message);
+                                                  observer.error(message);
+                                                  return [2
+                                                  /*return*/
+                                                  ];
+                                              }
+                                            });
+                                          });
                                         }
                                       }));
                                       promises.push(function () {
@@ -93909,13 +93985,13 @@ function () {
 
       return function () {
         Object.keys(subscriptions).forEach(function (modelName) {
-          subscriptions[modelName][_utils__WEBPACK_IMPORTED_MODULE_6__["TransformerMutationType"].CREATE].forEach(function (subscription) {
+          subscriptions[modelName][_utils__WEBPACK_IMPORTED_MODULE_7__["TransformerMutationType"].CREATE].forEach(function (subscription) {
             return subscription.unsubscribe();
           });
-          subscriptions[modelName][_utils__WEBPACK_IMPORTED_MODULE_6__["TransformerMutationType"].UPDATE].forEach(function (subscription) {
+          subscriptions[modelName][_utils__WEBPACK_IMPORTED_MODULE_7__["TransformerMutationType"].UPDATE].forEach(function (subscription) {
             return subscription.unsubscribe();
           });
-          subscriptions[modelName][_utils__WEBPACK_IMPORTED_MODULE_6__["TransformerMutationType"].DELETE].forEach(function (subscription) {
+          subscriptions[modelName][_utils__WEBPACK_IMPORTED_MODULE_7__["TransformerMutationType"].DELETE].forEach(function (subscription) {
             return subscription.unsubscribe();
           });
         });
@@ -93940,7 +94016,7 @@ function () {
 
     var predicates = predicatesGroup.predicates,
         type = predicatesGroup.type;
-    return Object(_util__WEBPACK_IMPORTED_MODULE_8__["validatePredicate"])(record, type, predicates);
+    return Object(_util__WEBPACK_IMPORTED_MODULE_9__["validatePredicate"])(record, type, predicates);
   };
 
   SubscriptionProcessor.prototype.pushToBuffer = function (transformerMutationType, modelDefinition, data) {
@@ -93978,9 +94054,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SyncProcessor", function() { return SyncProcessor; });
 /* harmony import */ var _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @aws-amplify/api */ "../api/lib-esm/index.js");
 /* harmony import */ var zen_observable_ts__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! zen-observable-ts */ "../../node_modules/zen-observable-ts/lib/bundle.esm.js");
-/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../utils */ "./lib-esm/sync/utils.js");
-/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @aws-amplify/core */ "../core/lib-esm/index.js");
-/* harmony import */ var _predicates__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../predicates */ "./lib-esm/predicates/index.js");
+/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../types */ "./lib-esm/types.js");
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../utils */ "./lib-esm/sync/utils.js");
+/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! @aws-amplify/core */ "../core/lib-esm/index.js");
+/* harmony import */ var _predicates__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../../predicates */ "./lib-esm/predicates/index.js");
 var __assign = undefined && undefined.__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -94189,17 +94266,24 @@ var __values = undefined && undefined.__values || function (o) {
 
 
 
+
 var opResultDefaults = {
   items: [],
   nextToken: null,
   startedAt: null
 };
-var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_3__["ConsoleLogger"]('DataStore');
+var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_4__["ConsoleLogger"]('DataStore'); // TODO: add additional error maps
+
+var errorMap = {
+  BadRecord: function BadRecord(error) {
+    return /^Cannot return \w+ for [\w-_]+ type/.test(error.message);
+  }
+};
 
 var SyncProcessor =
 /** @class */
 function () {
-  function SyncProcessor(schema, syncPredicates, amplifyConfig, authModeStrategy) {
+  function SyncProcessor(schema, syncPredicates, amplifyConfig, authModeStrategy, errorHandler, modelInstanceCreator) {
     if (amplifyConfig === void 0) {
       amplifyConfig = {};
     }
@@ -94208,6 +94292,8 @@ function () {
     this.syncPredicates = syncPredicates;
     this.amplifyConfig = amplifyConfig;
     this.authModeStrategy = authModeStrategy;
+    this.errorHandler = errorHandler;
+    this.modelInstanceCreator = modelInstanceCreator;
     this.typeQuery = new WeakMap();
     this.generateQueries();
   }
@@ -94220,7 +94306,7 @@ function () {
         var syncable = _a.syncable;
         return syncable;
       }).forEach(function (model) {
-        var _a = __read(Object(_utils__WEBPACK_IMPORTED_MODULE_2__["buildGraphQLOperation"])(namespace, model, 'LIST'), 1),
+        var _a = __read(Object(_utils__WEBPACK_IMPORTED_MODULE_3__["buildGraphQLOperation"])(namespace, model, 'LIST'), 1),
             _b = __read(_a[0]),
             opNameQuery = _b.slice(1);
 
@@ -94234,13 +94320,13 @@ function () {
       return null;
     }
 
-    var predicatesGroup = _predicates__WEBPACK_IMPORTED_MODULE_4__["ModelPredicateCreator"].getPredicates(this.syncPredicates.get(model), false);
+    var predicatesGroup = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].getPredicates(this.syncPredicates.get(model), false);
 
     if (!predicatesGroup) {
       return null;
     }
 
-    return Object(_utils__WEBPACK_IMPORTED_MODULE_2__["predicateToGraphQLFilter"])(predicatesGroup);
+    return Object(_utils__WEBPACK_IMPORTED_MODULE_3__["predicateToGraphQLFilter"])(predicatesGroup);
   };
 
   SyncProcessor.prototype.retrievePage = function (modelDefinition, lastSync, nextToken, limit, filter) {
@@ -94265,7 +94351,7 @@ function () {
             };
             return [4
             /*yield*/
-            , Object(_utils__WEBPACK_IMPORTED_MODULE_2__["getModelAuthModes"])({
+            , Object(_utils__WEBPACK_IMPORTED_MODULE_3__["getModelAuthModes"])({
               authModeStrategy: this.authModeStrategy,
               defaultAuthMode: this.amplifyConfig.aws_appsync_authenticationType,
               modelName: modelDefinition.name,
@@ -94314,7 +94400,7 @@ function () {
                         authMode = readAuthModes[authModeAttempts - 1];
                         logger.debug("Sync failed with authMode: " + authMode, error_1);
 
-                        if (Object(_utils__WEBPACK_IMPORTED_MODULE_2__["getClientSideAuthError"])(error_1) || Object(_utils__WEBPACK_IMPORTED_MODULE_2__["getForbiddenError"])(error_1)) {
+                        if (Object(_utils__WEBPACK_IMPORTED_MODULE_3__["getClientSideAuthError"])(error_1) || Object(_utils__WEBPACK_IMPORTED_MODULE_3__["getForbiddenError"])(error_1)) {
                           // return empty list of data so DataStore will continue to sync other models
                           logger.warn("User is unauthorized to query " + opName + " with auth mode " + authMode + ". No data could be returned.");
                           return [2
@@ -94390,17 +94476,20 @@ function () {
           case 0:
             return [4
             /*yield*/
-            , Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_3__["jitteredExponentialRetry"])(function (query, variables) {
+            , Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_4__["jitteredExponentialRetry"])(function (query, variables) {
               return __awaiter(_this, void 0, void 0, function () {
                 var authToken, error_2, clientOrForbiddenErrorMessage, hasItems, result, unauthorized, result;
+
+                var _this = this;
+
                 return __generator(this, function (_a) {
                   switch (_a.label) {
                     case 0:
-                      _a.trys.push([0, 3,, 4]);
+                      _a.trys.push([0, 3,, 8]);
 
                       return [4
                       /*yield*/
-                      , Object(_utils__WEBPACK_IMPORTED_MODULE_2__["getTokenForCustomAuth"])(authMode, this.amplifyConfig)];
+                      , Object(_utils__WEBPACK_IMPORTED_MODULE_3__["getTokenForCustomAuth"])(authMode, this.amplifyConfig)];
 
                     case 1:
                       authToken = _a.sent();
@@ -94420,39 +94509,94 @@ function () {
 
                     case 3:
                       error_2 = _a.sent();
-                      clientOrForbiddenErrorMessage = Object(_utils__WEBPACK_IMPORTED_MODULE_2__["getClientSideAuthError"])(error_2) || Object(_utils__WEBPACK_IMPORTED_MODULE_2__["getForbiddenError"])(error_2);
+                      clientOrForbiddenErrorMessage = Object(_utils__WEBPACK_IMPORTED_MODULE_3__["getClientSideAuthError"])(error_2) || Object(_utils__WEBPACK_IMPORTED_MODULE_3__["getForbiddenError"])(error_2);
 
                       if (clientOrForbiddenErrorMessage) {
-                        throw new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_3__["NonRetryableError"](clientOrForbiddenErrorMessage);
+                        throw new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_4__["NonRetryableError"](clientOrForbiddenErrorMessage);
                       }
 
                       hasItems = Boolean(error_2 && error_2.data && error_2.data[opName] && error_2.data[opName].items);
+                      if (!this.partialDataFeatureFlagEnabled()) return [3
+                      /*break*/
+                      , 7];
+                      if (!hasItems) return [3
+                      /*break*/
+                      , 6];
+                      result = error_2;
+                      result.data[opName].items = result.data[opName].items.filter(function (item) {
+                        return item !== null;
+                      });
+                      if (!error_2.errors) return [3
+                      /*break*/
+                      , 5];
+                      return [4
+                      /*yield*/
+                      , Promise.all(error_2.errors.map(function (err) {
+                        return __awaiter(_this, void 0, void 0, function () {
+                          var e_1;
+                          return __generator(this, function (_a) {
+                            switch (_a.label) {
+                              case 0:
+                                _a.trys.push([0, 2,, 3]);
 
-                      if (this.partialDataFeatureFlagEnabled()) {
-                        if (hasItems) {
-                          result = error_2;
-                          result.data[opName].items = result.data[opName].items.filter(function (item) {
-                            return item !== null;
+                                return [4
+                                /*yield*/
+                                , this.errorHandler({
+                                  recoverySuggestion: 'Ensure app code is up to date, auth directives exist and are correct on each model, and that server-side data has not been invalidated by a schema change. If the problem persists, search for or create an issue: https://github.com/aws-amplify/amplify-js/issues',
+                                  localModel: null,
+                                  message: err.message,
+                                  model: modelDefinition.name,
+                                  operation: opName,
+                                  errorType: Object(_utils__WEBPACK_IMPORTED_MODULE_3__["mapErrorToType"])(errorMap, err),
+                                  process: _types__WEBPACK_IMPORTED_MODULE_2__["ProcessName"].sync,
+                                  remoteModel: null,
+                                  cause: err
+                                })];
+
+                              case 1:
+                                _a.sent();
+
+                                return [3
+                                /*break*/
+                                , 3];
+
+                              case 2:
+                                e_1 = _a.sent();
+                                logger.error('Sync error handler failed with:', e_1);
+                                return [3
+                                /*break*/
+                                , 3];
+
+                              case 3:
+                                return [2
+                                /*return*/
+                                ];
+                            }
                           });
+                        });
+                      }))];
 
-                          if (error_2.errors) {
-                            _aws_amplify_core__WEBPACK_IMPORTED_MODULE_3__["Hub"].dispatch('datastore', {
-                              event: 'syncQueriesPartialSyncError',
-                              data: {
-                                errors: error_2.errors,
-                                modelName: modelDefinition.name
-                              }
-                            });
-                          }
+                    case 4:
+                      _a.sent();
 
-                          return [2
-                          /*return*/
-                          , result];
-                        } else {
-                          throw error_2;
+                      _aws_amplify_core__WEBPACK_IMPORTED_MODULE_4__["Hub"].dispatch('datastore', {
+                        event: 'syncQueriesPartialSyncError',
+                        data: {
+                          errors: error_2.errors,
+                          modelName: modelDefinition.name
                         }
-                      }
+                      });
+                      _a.label = 5;
+
+                    case 5:
+                      return [2
+                      /*return*/
+                      , result];
 
+                    case 6:
+                      throw error_2;
+
+                    case 7:
                       unauthorized = error_2 && error_2.errors && error_2.errors.some(function (err) {
                         return err.errorType === 'Unauthorized';
                       });
@@ -94478,9 +94622,9 @@ function () {
 
                       return [3
                       /*break*/
-                      , 4];
+                      , 8];
 
-                    case 4:
+                    case 8:
                       return [2
                       /*return*/
                       ];
@@ -94508,7 +94652,7 @@ function () {
     var parentPromises = new Map();
     var observable = new zen_observable_ts__WEBPACK_IMPORTED_MODULE_1__["default"](function (observer) {
       var sortedTypesLastSyncs = Object.values(_this.schema.namespaces).reduce(function (map, namespace) {
-        var e_1, _a;
+        var e_2, _a;
 
         try {
           for (var _b = __values(Array.from(namespace.modelTopologicalOrdering.keys())), _c = _b.next(); !_c.done; _c = _b.next()) {
@@ -94516,15 +94660,15 @@ function () {
             var typeLastSync = typesLastSync.get(namespace.models[modelName]);
             map.set(namespace.models[modelName], typeLastSync);
           }
-        } catch (e_1_1) {
-          e_1 = {
-            error: e_1_1
+        } catch (e_2_1) {
+          e_2 = {
+            error: e_2_1
           };
         } finally {
           try {
             if (_c && !_c.done && (_a = _b["return"])) _a.call(_b);
           } finally {
-            if (e_1) throw e_1.error;
+            if (e_2) throw e_2.error;
           }
         }
 
@@ -94655,11 +94799,12 @@ function () {
 /*!*******************************!*\
   !*** ./lib-esm/sync/utils.js ***!
   \*******************************/
-/*! exports provided: TransformerMutationType, getMetadataFields, generateSelectionSet, getAuthorizationRules, buildSubscriptionGraphQLOperation, buildGraphQLOperation, createMutationInstanceFromModelOperation, predicateToGraphQLCondition, predicateToGraphQLFilter, getUserGroupsFromToken, getModelAuthModes, getForbiddenError, getClientSideAuthError, getTokenForCustomAuth */
+/*! exports provided: mapErrorToType, TransformerMutationType, getMetadataFields, generateSelectionSet, getAuthorizationRules, buildSubscriptionGraphQLOperation, buildGraphQLOperation, createMutationInstanceFromModelOperation, predicateToGraphQLCondition, predicateToGraphQLFilter, getUserGroupsFromToken, getModelAuthModes, getForbiddenError, getClientSideAuthError, getTokenForCustomAuth */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mapErrorToType", function() { return mapErrorToType; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "TransformerMutationType", function() { return TransformerMutationType; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getMetadataFields", function() { return getMetadataFields; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "generateSelectionSet", function() { return generateSelectionSet; });
@@ -94848,6 +94993,58 @@ var __generator = undefined && undefined.__generator || function (thisArg, body)
   }
 };
 
+var __read = undefined && undefined.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+      r,
+      ar = [],
+      e;
+
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
+      ar.push(r.value);
+    }
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+
+  return ar;
+};
+
+var __spread = undefined && undefined.__spread || function () {
+  for (var ar = [], i = 0; i < arguments.length; i++) {
+    ar = ar.concat(__read(arguments[i]));
+  }
+
+  return ar;
+};
+
+var __values = undefined && undefined.__values || function (o) {
+  var s = typeof Symbol === "function" && Symbol.iterator,
+      m = s && o[s],
+      i = 0;
+  if (m) return m.call(o);
+  if (o && typeof o.length === "number") return {
+    next: function next() {
+      if (o && i >= o.length) o = void 0;
+      return {
+        value: o && o[i++],
+        done: !o
+      };
+    }
+  };
+  throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
+
 
 
 
@@ -94863,7 +95060,42 @@ var GraphQLOperationType;
   GraphQLOperationType["DELETE"] = "mutation";
   GraphQLOperationType["GET"] = "query";
 })(GraphQLOperationType || (GraphQLOperationType = {}));
+/**
+ * Categorizes an error with a broad error type, intended to make
+ * customer error handling code simpler.
+ * @param errorMap Error names and a list of patterns that indicate them (each pattern as a regex or function)
+ * @param error The underying error to categorize.
+ */
+
+
+function mapErrorToType(errorMap, error) {
+  var e_1, _a;
 
+  var errorTypes = __spread(Object.keys(errorMap));
+
+  try {
+    for (var errorTypes_1 = __values(errorTypes), errorTypes_1_1 = errorTypes_1.next(); !errorTypes_1_1.done; errorTypes_1_1 = errorTypes_1.next()) {
+      var errorType = errorTypes_1_1.value;
+      var matcher = errorMap[errorType];
+
+      if (matcher(error)) {
+        return errorType;
+      }
+    }
+  } catch (e_1_1) {
+    e_1 = {
+      error: e_1_1
+    };
+  } finally {
+    try {
+      if (errorTypes_1_1 && !errorTypes_1_1.done && (_a = errorTypes_1["return"])) _a.call(errorTypes_1);
+    } finally {
+      if (e_1) throw e_1.error;
+    }
+  }
+
+  return 'Unknown';
+}
 var TransformerMutationType;
 
 (function (TransformerMutationType) {
@@ -95428,7 +95660,7 @@ function getTokenForCustomAuth(authMode, amplifyConfig) {
 /*!**************************!*\
   !*** ./lib-esm/types.js ***!
   \**************************/
-/*! exports provided: isSchemaModel, isAssociatedWith, isTargetNameAssociation, isModelAttributeAuth, isModelAttributeKey, isModelAttributePrimaryKey, isModelAttributeCompositeKey, ModelAttributeAuthAllow, ModelAttributeAuthProvider, GraphQLScalarType, isGraphQLScalarType, isModelFieldType, isNonModelFieldType, isEnumFieldType, OpType, isPredicateObj, isPredicateGroup, QueryOne, SortDirection, AuthModeStrategyType, ModelOperation, syncExpression, DISCARD, LimitTimerRaceResolvedValues */
+/*! exports provided: isSchemaModel, isAssociatedWith, isTargetNameAssociation, isModelAttributeAuth, isModelAttributeKey, isModelAttributePrimaryKey, isModelAttributeCompositeKey, ModelAttributeAuthAllow, ModelAttributeAuthProvider, GraphQLScalarType, isGraphQLScalarType, isModelFieldType, isNonModelFieldType, isEnumFieldType, OpType, isPredicateObj, isPredicateGroup, QueryOne, SortDirection, AuthModeStrategyType, ModelOperation, syncExpression, ProcessName, DISCARD, LimitTimerRaceResolvedValues */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -95455,6 +95687,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "AuthModeStrategyType", function() { return AuthModeStrategyType; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ModelOperation", function() { return ModelOperation; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "syncExpression", function() { return syncExpression; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "ProcessName", function() { return ProcessName; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DISCARD", function() { return DISCARD; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LimitTimerRaceResolvedValues", function() { return LimitTimerRaceResolvedValues; });
 /* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./util */ "./lib-esm/util.js");
@@ -95807,6 +96040,14 @@ function syncExpression(modelConstructor, conditionProducer) {
     });
   });
 }
+var ProcessName;
+
+(function (ProcessName) {
+  ProcessName["sync"] = "sync";
+  ProcessName["mutate"] = "mutate";
+  ProcessName["subscribe"] = "subscribe";
+})(ProcessName || (ProcessName = {}));
+
 var DISCARD = Symbol('DISCARD');
 var LimitTimerRaceResolvedValues;