@aws-amplify/datastore 3.12.3-unstable.2 → 3.12.3-unstable.6

package/dist/aws-amplify-datastore.js

@@ -58130,7 +58130,7 @@ var __read = undefined && undefined.__read || function (o, n) {
 
 var USER_AGENT_HEADER = 'x-amz-user-agent';
 var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["ConsoleLogger"]('GraphQLAPI');
-var graphqlOperation = function graphqlOperation(query, variables, authToken) {
+var graphqlOperation = function graphqlOperation(query, variables, authToken, userAgentSuffix) {
   if (variables === void 0) {
     variables = {};
   }
@@ -58138,7 +58138,8 @@ var graphqlOperation = function graphqlOperation(query, variables, authToken) {
   return {
     query: query,
     variables: variables,
-    authToken: authToken
+    authToken: authToken,
+    userAgentSuffix: userAgentSuffix
   };
 };
 /**
@@ -58429,7 +58430,8 @@ function () {
         _b = _a.variables,
         variables = _b === void 0 ? {} : _b,
         authMode = _a.authMode,
-        authToken = _a.authToken;
+        authToken = _a.authToken,
+        userAgentSuffix = _a.userAgentSuffix;
     var query = typeof paramQuery === 'string' ? Object(graphql__WEBPACK_IMPORTED_MODULE_0__["parse"])(paramQuery) : Object(graphql__WEBPACK_IMPORTED_MODULE_0__["parse"])(Object(graphql__WEBPACK_IMPORTED_MODULE_0__["print"])(paramQuery));
 
     var _c = __read(query.definitions.filter(function (def) {
@@ -58457,7 +58459,8 @@ function () {
         var responsePromise = this._graphql({
           query: query,
           variables: variables,
-          authMode: authMode
+          authMode: authMode,
+          userAgentSuffix: userAgentSuffix
         }, headers, initParams);
 
         this._api.updateRequestToBeCancellable(responsePromise, cancellableToken);
@@ -58479,7 +58482,8 @@ function () {
   GraphQLAPIClass.prototype._graphql = function (_a, additionalHeaders, initParams) {
     var query = _a.query,
         variables = _a.variables,
-        authMode = _a.authMode;
+        authMode = _a.authMode,
+        userAgentSuffix = _a.userAgentSuffix;
 
     if (additionalHeaders === void 0) {
       additionalHeaders = {};
@@ -58565,7 +58569,7 @@ function () {
             })];
 
           case 9:
-            headers = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _j.concat([_l.sent()])), additionalHeaders]), !customGraphqlEndpoint && (_k = {}, _k[USER_AGENT_HEADER] = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["Constants"].userAgent, _k)]);
+            headers = __assign.apply(void 0, [__assign.apply(void 0, [__assign.apply(void 0, _j.concat([_l.sent()])), additionalHeaders]), !customGraphqlEndpoint && (_k = {}, _k[USER_AGENT_HEADER] = Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["getAmplifyUserAgent"])(userAgentSuffix), _k)]);
             body = {
               query: Object(graphql__WEBPACK_IMPORTED_MODULE_0__["print"])(query),
               variables: variables
@@ -71223,8 +71227,8 @@ if (typeof navigator !== 'undefined' && navigator.product) {
   }
 }
 
-var getAmplifyUserAgent = function getAmplifyUserAgent() {
-  return Platform.userAgent;
+var getAmplifyUserAgent = function getAmplifyUserAgent(content) {
+  return "" + Platform.userAgent + (content ? content : '');
 };
 /**
  * @deprecated use named import
@@ -81730,57 +81734,66 @@ function getAuthRules(_a) {
   return Array.from(authModes);
 }
 
-var multiAuthStrategy = function multiAuthStrategy(_a) {
-  var schema = _a.schema,
-      modelName = _a.modelName;
-  return __awaiter(void 0, void 0, void 0, function () {
-    var currentUser, e_1, attributes, authAttribute, sortedRules;
-    return __generator(this, function (_b) {
-      switch (_b.label) {
-        case 0:
-          _b.trys.push([0, 2,, 3]);
+var multiAuthStrategy = function multiAuthStrategy(amplifyContext) {
+  return function (_a) {
+    var schema = _a.schema,
+        modelName = _a.modelName;
+    return __awaiter(void 0, void 0, void 0, function () {
+      var currentUser, e_1, attributes, authAttribute, sortedRules;
 
-          return [4
-          /*yield*/
-          , _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_0__["default"].currentAuthenticatedUser()];
+      var _b;
 
-        case 1:
-          currentUser = _b.sent();
-          return [3
-          /*break*/
-          , 3];
+      return __generator(this, function (_c) {
+        switch (_c.label) {
+          case 0:
+            amplifyContext.Auth = amplifyContext.Auth || _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_0__["default"];
+            _c.label = 1;
 
-        case 2:
-          e_1 = _b.sent();
-          return [3
-          /*break*/
-          , 3];
+          case 1:
+            _c.trys.push([1, 3,, 4]);
 
-        case 3:
-          attributes = schema.namespaces.user.models[modelName].attributes;
+            return [4
+            /*yield*/
+            , amplifyContext.Auth.currentAuthenticatedUser()];
 
-          if (attributes) {
-            authAttribute = attributes.find(function (attr) {
-              return attr.type === 'auth';
-            });
+          case 2:
+            currentUser = _c.sent();
+            return [3
+            /*break*/
+            , 4];
 
-            if (authAttribute.properties && authAttribute.properties.rules) {
-              sortedRules = sortAuthRulesWithPriority(authAttribute.properties.rules);
-              return [2
-              /*return*/
-              , getAuthRules({
-                currentUser: currentUser,
-                rules: sortedRules
-              })];
+          case 3:
+            e_1 = _c.sent();
+            return [3
+            /*break*/
+            , 4];
+
+          case 4:
+            attributes = schema.namespaces.user.models[modelName].attributes;
+
+            if (attributes) {
+              authAttribute = attributes.find(function (attr) {
+                return attr.type === 'auth';
+              });
+
+              if ((_b = authAttribute === null || authAttribute === void 0 ? void 0 : authAttribute.properties) === null || _b === void 0 ? void 0 : _b.rules) {
+                sortedRules = sortAuthRulesWithPriority(authAttribute.properties.rules);
+                return [2
+                /*return*/
+                , getAuthRules({
+                  currentUser: currentUser,
+                  rules: sortedRules
+                })];
+              }
             }
-          }
 
-          return [2
-          /*return*/
-          , []];
-      }
+            return [2
+            /*return*/
+            , []];
+        }
+      });
     });
-  });
+  };
 };
 
 /***/ }),
@@ -81798,17 +81811,20 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DataStoreClass", function() { return DataStore; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "initSchema", function() { return initSchema; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DataStore", function() { return instance; });
-/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @aws-amplify/core */ "../core/lib-esm/index.js");
-/* harmony import */ var immer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! immer */ "./node_modules/immer/dist/immer.esm.js");
-/* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/index.js");
-/* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(uuid__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var zen_observable_ts__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! zen-observable-ts */ "../../node_modules/zen-observable-ts/lib/bundle.esm.js");
-/* harmony import */ var _authModeStrategies__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../authModeStrategies */ "./lib-esm/authModeStrategies/index.js");
-/* harmony import */ var _predicates__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../predicates */ "./lib-esm/predicates/index.js");
-/* harmony import */ var _storage_storage__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../storage/storage */ "./lib-esm/storage/storage.js");
-/* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../sync */ "./lib-esm/sync/index.js");
-/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../types */ "./lib-esm/types.js");
-/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../util */ "./lib-esm/util.js");
+/* harmony import */ var _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @aws-amplify/api */ "../api/lib-esm/index.js");
+/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @aws-amplify/core */ "../core/lib-esm/index.js");
+/* harmony import */ var _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @aws-amplify/auth */ "../auth/lib-esm/index.js");
+/* harmony import */ var _aws_amplify_cache__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @aws-amplify/cache */ "../cache/lib-esm/index.js");
+/* harmony import */ var immer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! immer */ "./node_modules/immer/dist/immer.esm.js");
+/* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! uuid */ "./node_modules/uuid/index.js");
+/* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(uuid__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var zen_observable_ts__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! zen-observable-ts */ "../../node_modules/zen-observable-ts/lib/bundle.esm.js");
+/* harmony import */ var _authModeStrategies__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../authModeStrategies */ "./lib-esm/authModeStrategies/index.js");
+/* harmony import */ var _predicates__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../predicates */ "./lib-esm/predicates/index.js");
+/* harmony import */ var _storage_storage__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../storage/storage */ "./lib-esm/storage/storage.js");
+/* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../sync */ "./lib-esm/sync/index.js");
+/* harmony import */ var _types__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../types */ "./lib-esm/types.js");
+/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ../util */ "./lib-esm/util.js");
 function _typeof(obj) {
   "@babel/helpers - typeof";
 
@@ -82053,11 +82069,14 @@ var __spread = undefined && undefined.__spread || function () {
 
 
 
-Object(immer__WEBPACK_IMPORTED_MODULE_1__["setAutoFreeze"])(true);
-Object(immer__WEBPACK_IMPORTED_MODULE_1__["enablePatches"])();
-var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["ConsoleLogger"]('DataStore');
-var ulid = Object(_util__WEBPACK_IMPORTED_MODULE_9__["monotonicUlidFactory"])(Date.now());
-var isNode = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["JS"].browserOrNode().isNode;
+
+
+
+Object(immer__WEBPACK_IMPORTED_MODULE_4__["setAutoFreeze"])(true);
+Object(immer__WEBPACK_IMPORTED_MODULE_4__["enablePatches"])();
+var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["ConsoleLogger"]('DataStore');
+var ulid = Object(_util__WEBPACK_IMPORTED_MODULE_12__["monotonicUlidFactory"])(Date.now());
+var isNode = _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["JS"].browserOrNode().isNode;
 var SETTING_SCHEMA_VERSION = 'schemaVersion';
 var schema;
 var modelNamespaceMap = new WeakMap(); // stores data for crafting the correct update mutation input for a model
@@ -82072,7 +82091,7 @@ var getModelDefinition = function getModelDefinition(modelConstructor) {
 };
 
 var isValidModelConstructor = function isValidModelConstructor(obj) {
-  return Object(_util__WEBPACK_IMPORTED_MODULE_9__["isModelConstructor"])(obj) && modelNamespaceMap.has(obj);
+  return Object(_util__WEBPACK_IMPORTED_MODULE_12__["isModelConstructor"])(obj) && modelNamespaceMap.has(obj);
 };
 
 var namespaceResolver = function namespaceResolver(modelConstructor) {
@@ -82098,15 +82117,15 @@ var initSchema = function initSchema(userSchema) {
   });
 
   var internalUserNamespace = __assign({
-    name: _util__WEBPACK_IMPORTED_MODULE_9__["USER"]
+    name: _util__WEBPACK_IMPORTED_MODULE_12__["USER"]
   }, userSchema);
 
   logger.log('DataStore', 'Init models');
   userClasses = createTypeClasses(internalUserNamespace);
   logger.log('DataStore', 'Models initialized');
   var dataStoreNamespace = getNamespace();
-  var storageNamespace = _storage_storage__WEBPACK_IMPORTED_MODULE_6__["ExclusiveStorage"].getNamespace();
-  var syncNamespace = _sync__WEBPACK_IMPORTED_MODULE_7__["SyncEngine"].getNamespace();
+  var storageNamespace = _storage_storage__WEBPACK_IMPORTED_MODULE_9__["ExclusiveStorage"].getNamespace();
+  var syncNamespace = _sync__WEBPACK_IMPORTED_MODULE_10__["SyncEngine"].getNamespace();
   dataStoreClasses = createTypeClasses(dataStoreNamespace);
   storageClasses = createTypeClasses(storageNamespace);
   syncClasses = createTypeClasses(syncNamespace);
@@ -82117,7 +82136,7 @@ var initSchema = function initSchema(userSchema) {
   Object.keys(schema.namespaces).forEach(function (namespace) {
     var e_1, _a;
 
-    var _b = __read(Object(_util__WEBPACK_IMPORTED_MODULE_9__["establishRelationAndKeys"])(schema.namespaces[namespace]), 2),
+    var _b = __read(Object(_util__WEBPACK_IMPORTED_MODULE_12__["establishRelationAndKeys"])(schema.namespaces[namespace]), 2),
         relations = _b[0],
         keys = _b[1];
 
@@ -82238,9 +82257,9 @@ var validateModelFields = function validateModelFields(modelDefinition) {
         throw new Error("Field " + name_1 + " is required");
       }
 
-      if (Object(_types__WEBPACK_IMPORTED_MODULE_8__["isGraphQLScalarType"])(type)) {
-        var jsType_1 = _types__WEBPACK_IMPORTED_MODULE_8__["GraphQLScalarType"].getJSType(type);
-        var validateScalar_1 = _types__WEBPACK_IMPORTED_MODULE_8__["GraphQLScalarType"].getValidationFunction(type);
+      if (Object(_types__WEBPACK_IMPORTED_MODULE_11__["isGraphQLScalarType"])(type)) {
+        var jsType_1 = _types__WEBPACK_IMPORTED_MODULE_11__["GraphQLScalarType"].getJSType(type);
+        var validateScalar_1 = _types__WEBPACK_IMPORTED_MODULE_11__["GraphQLScalarType"].getValidationFunction(type);
 
         if (type === 'AWSJSON') {
           if (_typeof(v) === jsType_1) {
@@ -82268,8 +82287,8 @@ var validateModelFields = function validateModelFields(modelDefinition) {
             throw new Error("Field " + name_1 + " should be of type [" + errorTypeText + "], " + _typeof(v) + " received. " + v);
           }
 
-          if (!Object(_util__WEBPACK_IMPORTED_MODULE_9__["isNullOrUndefined"])(v) && v.some(function (e) {
-            return Object(_util__WEBPACK_IMPORTED_MODULE_9__["isNullOrUndefined"])(e) ? isRequired_1 : _typeof(e) !== jsType_1;
+          if (!Object(_util__WEBPACK_IMPORTED_MODULE_12__["isNullOrUndefined"])(v) && v.some(function (e) {
+            return Object(_util__WEBPACK_IMPORTED_MODULE_12__["isNullOrUndefined"])(e) ? isRequired_1 : _typeof(e) !== jsType_1;
           })) {
             var elemTypes = v.map(function (e) {
               return e === null ? 'null' : _typeof(e);
@@ -82277,11 +82296,11 @@ var validateModelFields = function validateModelFields(modelDefinition) {
             throw new Error("All elements in the " + name_1 + " array should be of type " + errorTypeText + ", [" + elemTypes + "] received. " + v);
           }
 
-          if (validateScalar_1 && !Object(_util__WEBPACK_IMPORTED_MODULE_9__["isNullOrUndefined"])(v)) {
+          if (validateScalar_1 && !Object(_util__WEBPACK_IMPORTED_MODULE_12__["isNullOrUndefined"])(v)) {
             var validationStatus = v.map(function (e) {
-              if (!Object(_util__WEBPACK_IMPORTED_MODULE_9__["isNullOrUndefined"])(e)) {
+              if (!Object(_util__WEBPACK_IMPORTED_MODULE_12__["isNullOrUndefined"])(e)) {
                 return validateScalar_1(e);
-              } else if (Object(_util__WEBPACK_IMPORTED_MODULE_9__["isNullOrUndefined"])(e) && !isRequired_1) {
+              } else if (Object(_util__WEBPACK_IMPORTED_MODULE_12__["isNullOrUndefined"])(e) && !isRequired_1) {
                 return true;
               } else {
                 return false;
@@ -82298,7 +82317,7 @@ var validateModelFields = function validateModelFields(modelDefinition) {
           return;
         } else if (_typeof(v) !== jsType_1 && v !== null) {
           throw new Error("Field " + name_1 + " should be of type " + jsType_1 + ", " + _typeof(v) + " received. " + v);
-        } else if (!Object(_util__WEBPACK_IMPORTED_MODULE_9__["isNullOrUndefined"])(v) && validateScalar_1 && !validateScalar_1(v)) {
+        } else if (!Object(_util__WEBPACK_IMPORTED_MODULE_12__["isNullOrUndefined"])(v) && validateScalar_1 && !validateScalar_1(v)) {
           throw new Error("Field " + name_1 + " should be of type " + type + ", validation failed. " + v);
         }
       }
@@ -82312,7 +82331,7 @@ var castInstanceType = function castInstanceType(modelDefinition, k, v) {
       type = _a.type; // attempt to parse stringified JSON
 
 
-  if (typeof v === 'string' && (isArray || type === 'AWSJSON' || Object(_types__WEBPACK_IMPORTED_MODULE_8__["isNonModelFieldType"])(type) || Object(_types__WEBPACK_IMPORTED_MODULE_8__["isModelFieldType"])(type))) {
+  if (typeof v === 'string' && (isArray || type === 'AWSJSON' || Object(_types__WEBPACK_IMPORTED_MODULE_11__["isNonModelFieldType"])(type) || Object(_types__WEBPACK_IMPORTED_MODULE_11__["isModelFieldType"])(type))) {
     try {
       return JSON.parse(v);
     } catch (_b) {// if JSON is invalid, don't throw and let modelValidator handle it
@@ -82345,7 +82364,7 @@ var createModelClass = function createModelClass(modelDefinition) {
   /** @class */
   function () {
     function Model(init) {
-      var instance = Object(immer__WEBPACK_IMPORTED_MODULE_1__["produce"])(this, function (draft) {
+      var instance = Object(immer__WEBPACK_IMPORTED_MODULE_4__["produce"])(this, function (draft) {
         initializeInstance(init, modelDefinition, draft);
         var modelInstanceMetadata = instancesMetadata.has(init) ? init : {};
         var _id = modelInstanceMetadata.id,
@@ -82354,7 +82373,7 @@ var createModelClass = function createModelClass(modelDefinition) {
             _deleted = modelInstanceMetadata._deleted; // instancesIds are set by modelInstanceCreator, it is accessible only internally
 
         var isInternal = _id !== null && _id !== undefined;
-        var id = isInternal ? _id : modelDefinition.syncable ? Object(uuid__WEBPACK_IMPORTED_MODULE_2__["v4"])() : ulid();
+        var id = isInternal ? _id : modelDefinition.syncable ? Object(uuid__WEBPACK_IMPORTED_MODULE_5__["v4"])() : ulid();
 
         if (!isInternal) {
           checkReadOnlyPropertyOnCreate(draft, modelDefinition);
@@ -82383,7 +82402,7 @@ var createModelClass = function createModelClass(modelDefinition) {
       }
 
       var patches;
-      var model = Object(immer__WEBPACK_IMPORTED_MODULE_1__["produce"])(source, function (draft) {
+      var model = Object(immer__WEBPACK_IMPORTED_MODULE_4__["produce"])(source, function (draft) {
         fn(draft);
         draft.id = source.id;
         var modelValidator = validateModelFields(modelDefinition);
@@ -82406,7 +82425,7 @@ var createModelClass = function createModelClass(modelDefinition) {
               existingPatches = _a[0],
               existingSource = _a[1];
 
-          var mergedPatches = Object(_util__WEBPACK_IMPORTED_MODULE_9__["mergePatches"])(existingSource, existingPatches, patches);
+          var mergedPatches = Object(_util__WEBPACK_IMPORTED_MODULE_12__["mergePatches"])(existingSource, existingPatches, patches);
           modelPatchesMap.set(model, [mergedPatches, existingSource]);
           checkReadOnlyPropertyOnUpdate(mergedPatches, modelDefinition);
         } else {
@@ -82444,7 +82463,7 @@ var createModelClass = function createModelClass(modelDefinition) {
     return Model;
   }();
 
-  clazz[immer__WEBPACK_IMPORTED_MODULE_1__["immerable"]] = true;
+  clazz[immer__WEBPACK_IMPORTED_MODULE_4__["immerable"]] = true;
   Object.defineProperty(clazz, 'name', {
     value: modelDefinition.name
   });
@@ -82484,7 +82503,7 @@ var createNonModelClass = function createNonModelClass(typeDefinition) {
   /** @class */
   function () {
     function Model(init) {
-      var instance = Object(immer__WEBPACK_IMPORTED_MODULE_1__["produce"])(this, function (draft) {
+      var instance = Object(immer__WEBPACK_IMPORTED_MODULE_4__["produce"])(this, function (draft) {
         initializeInstance(init, typeDefinition, draft);
       });
       return instance;
@@ -82493,11 +82512,11 @@ var createNonModelClass = function createNonModelClass(typeDefinition) {
     return Model;
   }();
 
-  clazz[immer__WEBPACK_IMPORTED_MODULE_1__["immerable"]] = true;
+  clazz[immer__WEBPACK_IMPORTED_MODULE_4__["immerable"]] = true;
   Object.defineProperty(clazz, 'name', {
     value: typeDefinition.name
   });
-  Object(_util__WEBPACK_IMPORTED_MODULE_9__["registerNonModelClass"])(clazz);
+  Object(_util__WEBPACK_IMPORTED_MODULE_12__["registerNonModelClass"])(clazz);
   return clazz;
 };
 
@@ -82523,24 +82542,24 @@ function getModelConstructorByModelName(namespaceName, modelName) {
   var result;
 
   switch (namespaceName) {
-    case _util__WEBPACK_IMPORTED_MODULE_9__["DATASTORE"]:
+    case _util__WEBPACK_IMPORTED_MODULE_12__["DATASTORE"]:
       result = dataStoreClasses[modelName];
       break;
 
-    case _util__WEBPACK_IMPORTED_MODULE_9__["USER"]:
+    case _util__WEBPACK_IMPORTED_MODULE_12__["USER"]:
       result = userClasses[modelName];
       break;
 
-    case _util__WEBPACK_IMPORTED_MODULE_9__["SYNC"]:
+    case _util__WEBPACK_IMPORTED_MODULE_12__["SYNC"]:
       result = syncClasses[modelName];
       break;
 
-    case _util__WEBPACK_IMPORTED_MODULE_9__["STORAGE"]:
+    case _util__WEBPACK_IMPORTED_MODULE_12__["STORAGE"]:
       result = storageClasses[modelName];
       break;
 
     default:
-      Object(_util__WEBPACK_IMPORTED_MODULE_9__["exhaustiveCheck"])(namespaceName);
+      Object(_util__WEBPACK_IMPORTED_MODULE_12__["exhaustiveCheck"])(namespaceName);
       break;
   }
 
@@ -82563,7 +82582,7 @@ function checkSchemaVersion(storage, version) {
       switch (_a.label) {
         case 0:
           Setting = dataStoreClasses.Setting;
-          modelDefinition = schema.namespaces[_util__WEBPACK_IMPORTED_MODULE_9__["DATASTORE"]].models.Setting;
+          modelDefinition = schema.namespaces[_util__WEBPACK_IMPORTED_MODULE_12__["DATASTORE"]].models.Setting;
           return [4
           /*yield*/
           , storage.runExclusive(function (s) {
@@ -82575,7 +82594,7 @@ function checkSchemaVersion(storage, version) {
                   case 0:
                     return [4
                     /*yield*/
-                    , s.query(Setting, _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].createFromExisting(modelDefinition, function (c) {
+                    , s.query(Setting, _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createFromExisting(modelDefinition, function (c) {
                       // @ts-ignore Argument of type '"eq"' is not assignable to parameter of type 'never'.
                       return c.key('eq', SETTING_SCHEMA_VERSION);
                     }), {
@@ -82643,7 +82662,7 @@ var syncSubscription;
 
 function getNamespace() {
   var namespace = {
-    name: _util__WEBPACK_IMPORTED_MODULE_9__["DATASTORE"],
+    name: _util__WEBPACK_IMPORTED_MODULE_12__["DATASTORE"],
     relationships: {},
     enums: {},
     nonModels: {},
@@ -82682,10 +82701,20 @@ var DataStore =
 /** @class */
 function () {
   function DataStore() {
-    var _this = this;
+    var _this = this; // reference to configured category instances. Used for preserving SSR context
+
 
+    this.Auth = _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_2__["Auth"];
+    this.API = _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__["default"];
+    this.Cache = _aws_amplify_cache__WEBPACK_IMPORTED_MODULE_3__["default"];
     this.amplifyConfig = {};
-    this.syncPredicates = new WeakMap();
+    this.syncPredicates = new WeakMap(); // object that gets passed to descendent classes. Allows us to pass these down by reference
+
+    this.amplifyContext = {
+      Auth: this.Auth,
+      API: this.API,
+      Cache: this.Cache
+    };
 
     this.start = function () {
       return __awaiter(_this, void 0, void 0, function () {
@@ -82721,7 +82750,7 @@ function () {
               ];
 
             case 3:
-              this.storage = new _storage_storage__WEBPACK_IMPORTED_MODULE_6__["ExclusiveStorage"](schema, namespaceResolver, getModelConstructorByModelName, modelInstanceCreator, this.storageAdapter, this.sessionId);
+              this.storage = new _storage_storage__WEBPACK_IMPORTED_MODULE_9__["ExclusiveStorage"](schema, namespaceResolver, getModelConstructorByModelName, modelInstanceCreator, this.storageAdapter, this.sessionId);
               return [4
               /*yield*/
               , this.storage.init()];
@@ -82749,7 +82778,7 @@ function () {
 
             case 6:
               _a.syncPredicates = _b.sent();
-              this.sync = new _sync__WEBPACK_IMPORTED_MODULE_7__["SyncEngine"](schema, namespaceResolver, syncClasses, userClasses, this.storage, modelInstanceCreator, this.conflictHandler, this.errorHandler, this.syncPredicates, this.amplifyConfig, this.authModeStrategy);
+              this.sync = new _sync__WEBPACK_IMPORTED_MODULE_10__["SyncEngine"](schema, namespaceResolver, syncClasses, userClasses, this.storage, modelInstanceCreator, this.conflictHandler, this.errorHandler, this.syncPredicates, this.amplifyConfig, this.authModeStrategy, this.amplifyContext);
               fullSyncIntervalInMilliseconds = this.fullSyncInterval * 1000 * 60;
               syncSubscription = this.sync.start({
                 fullSyncInterval: fullSyncIntervalInMilliseconds
@@ -82759,13 +82788,13 @@ function () {
                       data = _a.data; // In Node, we need to wait for queries to be synced to prevent returning empty arrays.
                   // In the Browser, we can begin returning data once subscriptions are in place.
 
-                  var readyType = isNode ? _sync__WEBPACK_IMPORTED_MODULE_7__["ControlMessage"].SYNC_ENGINE_SYNC_QUERIES_READY : _sync__WEBPACK_IMPORTED_MODULE_7__["ControlMessage"].SYNC_ENGINE_STORAGE_SUBSCRIBED;
+                  var readyType = isNode ? _sync__WEBPACK_IMPORTED_MODULE_10__["ControlMessage"].SYNC_ENGINE_SYNC_QUERIES_READY : _sync__WEBPACK_IMPORTED_MODULE_10__["ControlMessage"].SYNC_ENGINE_STORAGE_SUBSCRIBED;
 
                   if (type === readyType) {
                     _this.initResolve();
                   }
 
-                  _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Hub"].dispatch('datastore', {
+                  _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["Hub"].dispatch('datastore', {
                     event: type,
                     data: data
                   });
@@ -82834,13 +82863,13 @@ function () {
               modelDefinition = getModelDefinition(modelConstructor);
 
               if (isQueryOne(idOrCriteria)) {
-                predicate = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].createForId(modelDefinition, idOrCriteria);
+                predicate = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createForId(modelDefinition, idOrCriteria);
               } else {
-                if (Object(_predicates__WEBPACK_IMPORTED_MODULE_5__["isPredicatesAll"])(idOrCriteria)) {
+                if (Object(_predicates__WEBPACK_IMPORTED_MODULE_8__["isPredicatesAll"])(idOrCriteria)) {
                   // Predicates.ALL means "all records", so no predicate (undefined)
                   predicate = undefined;
                 } else {
-                  predicate = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].createFromExisting(modelDefinition, idOrCriteria);
+                  predicate = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createFromExisting(modelDefinition, idOrCriteria);
                 }
               }
 
@@ -82848,9 +82877,9 @@ function () {
 
               logger.debug('params ready', {
                 modelConstructor: modelConstructor,
-                predicate: _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].getPredicates(predicate, false),
+                predicate: _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].getPredicates(predicate, false),
                 pagination: __assign(__assign({}, pagination), {
-                  sort: _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelSortPredicateCreator"].getPredicates(pagination && pagination.sort, false)
+                  sort: _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelSortPredicateCreator"].getPredicates(pagination && pagination.sort, false)
                 })
               });
               return [4
@@ -82895,7 +82924,7 @@ function () {
               }
 
               modelDefinition = getModelDefinition(modelConstructor);
-              producedCondition = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].createFromExisting(modelDefinition, condition);
+              producedCondition = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createFromExisting(modelDefinition, condition);
               return [4
               /*yield*/
               , this.storage.runExclusive(function (s) {
@@ -82912,7 +82941,7 @@ function () {
 
                         return [2
                         /*return*/
-                        , s.query(modelConstructor, _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].createForId(modelDefinition, model.id))];
+                        , s.query(modelConstructor, _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createForId(modelDefinition, model.id))];
                     }
                   });
                 });
@@ -83000,16 +83029,16 @@ function () {
               }
 
               if (typeof idOrCriteria === 'string') {
-                condition = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].createForId(getModelDefinition(modelConstructor), idOrCriteria);
+                condition = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createForId(getModelDefinition(modelConstructor), idOrCriteria);
               } else {
-                condition = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].createFromExisting(getModelDefinition(modelConstructor),
+                condition = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createFromExisting(getModelDefinition(modelConstructor),
                 /**
                  * idOrCriteria is always a ProducerModelPredicate<T>, never a symbol.
                  * The symbol is used only for typing purposes. e.g. see Predicates.ALL
                  */
                 idOrCriteria);
 
-                if (!condition || !_predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].isValidPredicate(condition)) {
+                if (!condition || !_predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].isValidPredicate(condition)) {
                   msg = 'Criteria required. Do you want to delete all? Pass Predicates.ALL';
                   logger.error(msg, {
                     condition: condition
@@ -83041,7 +83070,7 @@ function () {
               }
 
               modelDefinition = getModelDefinition(modelConstructor);
-              idPredicate = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].createForId(modelDefinition, model.id);
+              idPredicate = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createForId(modelDefinition, model.id);
 
               if (idOrCriteria) {
                 if (typeof idOrCriteria !== 'function') {
@@ -83112,12 +83141,12 @@ function () {
       }
 
       if (typeof idOrCriteria === 'string') {
-        predicate = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].createForId(getModelDefinition(modelConstructor), idOrCriteria);
+        predicate = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createForId(getModelDefinition(modelConstructor), idOrCriteria);
       } else {
-        predicate = modelConstructor && _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].createFromExisting(getModelDefinition(modelConstructor), idOrCriteria);
+        predicate = modelConstructor && _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createFromExisting(getModelDefinition(modelConstructor), idOrCriteria);
       }
 
-      return new zen_observable_ts__WEBPACK_IMPORTED_MODULE_3__["default"](function (observer) {
+      return new zen_observable_ts__WEBPACK_IMPORTED_MODULE_6__["default"](function (observer) {
         var handle;
 
         (function () {
@@ -83138,7 +83167,7 @@ function () {
 
                   handle = this.storage.observe(modelConstructor, predicate).filter(function (_a) {
                     var model = _a.model;
-                    return namespaceResolver(model) === _util__WEBPACK_IMPORTED_MODULE_9__["USER"];
+                    return namespaceResolver(model) === _util__WEBPACK_IMPORTED_MODULE_12__["USER"];
                   }).subscribe({
                     next: function next(item) {
                       return __awaiter(_this, void 0, void 0, function () {
@@ -83194,7 +83223,7 @@ function () {
     };
 
     this.observeQuery = function (model, criteria, options) {
-      return new zen_observable_ts__WEBPACK_IMPORTED_MODULE_3__["default"](function (observer) {
+      return new zen_observable_ts__WEBPACK_IMPORTED_MODULE_6__["default"](function (observer) {
         var items = new Map();
         var itemsChanged = new Map();
         var deletedItemIds = [];
@@ -83218,7 +83247,7 @@ function () {
         // "limit" (itemsChanged >= this.syncPageSize) has been reached, whichever comes first
 
 
-        var limitTimerRace = new _util__WEBPACK_IMPORTED_MODULE_9__["DeferredCallbackResolver"]({
+        var limitTimerRace = new _util__WEBPACK_IMPORTED_MODULE_12__["DeferredCallbackResolver"]({
           callback: generateAndEmitSnapshot,
           errorHandler: observer.error,
           maxInterval: 2000
@@ -83230,17 +83259,17 @@ function () {
         var modelDefinition = getModelDefinition(model);
 
         if (isQueryOne(criteria)) {
-          predicate = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].createForId(modelDefinition, criteria);
+          predicate = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createForId(modelDefinition, criteria);
         } else {
-          if (Object(_predicates__WEBPACK_IMPORTED_MODULE_5__["isPredicatesAll"])(criteria)) {
+          if (Object(_predicates__WEBPACK_IMPORTED_MODULE_8__["isPredicatesAll"])(criteria)) {
             // Predicates.ALL means "all records", so no predicate (undefined)
             predicate = undefined;
           } else {
-            predicate = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].createFromExisting(modelDefinition, criteria);
+            predicate = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createFromExisting(modelDefinition, criteria);
           }
         }
 
-        var _a = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].getPredicates(predicate, false) || {},
+        var _a = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].getPredicates(predicate, false) || {},
             predicates = _a.predicates,
             predicateGroupType = _a.type;
 
@@ -83278,7 +83307,7 @@ function () {
 
                     var _b, _c;
 
-                    if (hasPredicate && !Object(_util__WEBPACK_IMPORTED_MODULE_9__["validatePredicate"])(element, predicateGroupType, predicates)) {
+                    if (hasPredicate && !Object(_util__WEBPACK_IMPORTED_MODULE_12__["validatePredicate"])(element, predicateGroupType, predicates)) {
                       if (opType === 'UPDATE' && (items.has(element.id) || itemsChanged.has(element.id))) {
                         // tracking as a "deleted item" will include the item in
                         // page limit calculations and ensure it is removed from the
@@ -83394,10 +83423,10 @@ function () {
 
           var pagination = _this.processPagination(modelDefinition, options);
 
-          var sortPredicates = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelSortPredicateCreator"].getPredicates(pagination.sort);
+          var sortPredicates = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelSortPredicateCreator"].getPredicates(pagination.sort);
 
           if (sortPredicates.length) {
-            var compareFn = Object(_util__WEBPACK_IMPORTED_MODULE_9__["sortCompareFunction"])(sortPredicates);
+            var compareFn = Object(_util__WEBPACK_IMPORTED_MODULE_12__["sortCompareFunction"])(sortPredicates);
             itemsToSort.sort(compareFn);
           }
         };
@@ -83419,13 +83448,13 @@ function () {
           var event = payload.event,
               data = payload.data;
 
-          if (event === _sync__WEBPACK_IMPORTED_MODULE_7__["ControlMessage"].SYNC_ENGINE_MODEL_SYNCED && ((_b = data === null || data === void 0 ? void 0 : data.model) === null || _b === void 0 ? void 0 : _b.name) === model.name) {
+          if (event === _sync__WEBPACK_IMPORTED_MODULE_10__["ControlMessage"].SYNC_ENGINE_MODEL_SYNCED && ((_b = data === null || data === void 0 ? void 0 : data.model) === null || _b === void 0 ? void 0 : _b.name) === model.name) {
             generateAndEmitSnapshot();
-            _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Hub"].remove('api', hubCallback);
+            _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["Hub"].remove('api', hubCallback);
           }
         };
 
-        _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Hub"].listen('datastore', hubCallback);
+        _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["Hub"].listen('datastore', hubCallback);
         return function () {
           if (handle) {
             handle.unsubscribe();
@@ -83439,6 +83468,10 @@ function () {
         config = {};
       }
 
+      _this.amplifyContext.Auth = _this.Auth;
+      _this.amplifyContext.API = _this.API;
+      _this.amplifyContext.Cache = _this.Cache;
+
       var configDataStore = config.DataStore,
           configAuthModeStrategyType = config.authModeStrategyType,
           configConflictHandler = config.conflictHandler,
@@ -83454,19 +83487,19 @@ function () {
       _this.amplifyConfig = __assign(__assign({}, configFromAmplify), _this.amplifyConfig);
       _this.conflictHandler = _this.setConflictHandler(config);
       _this.errorHandler = _this.setErrorHandler(config);
-      var authModeStrategyType = configDataStore && configDataStore.authModeStrategyType || configAuthModeStrategyType || _types__WEBPACK_IMPORTED_MODULE_8__["AuthModeStrategyType"].DEFAULT;
+      var authModeStrategyType = configDataStore && configDataStore.authModeStrategyType || configAuthModeStrategyType || _types__WEBPACK_IMPORTED_MODULE_11__["AuthModeStrategyType"].DEFAULT;
 
       switch (authModeStrategyType) {
-        case _types__WEBPACK_IMPORTED_MODULE_8__["AuthModeStrategyType"].MULTI_AUTH:
-          _this.authModeStrategy = _authModeStrategies__WEBPACK_IMPORTED_MODULE_4__["multiAuthStrategy"];
+        case _types__WEBPACK_IMPORTED_MODULE_11__["AuthModeStrategyType"].MULTI_AUTH:
+          _this.authModeStrategy = Object(_authModeStrategies__WEBPACK_IMPORTED_MODULE_7__["multiAuthStrategy"])(_this.amplifyContext);
           break;
 
-        case _types__WEBPACK_IMPORTED_MODULE_8__["AuthModeStrategyType"].DEFAULT:
-          _this.authModeStrategy = _authModeStrategies__WEBPACK_IMPORTED_MODULE_4__["defaultAuthStrategy"];
+        case _types__WEBPACK_IMPORTED_MODULE_11__["AuthModeStrategyType"].DEFAULT:
+          _this.authModeStrategy = _authModeStrategies__WEBPACK_IMPORTED_MODULE_7__["defaultAuthStrategy"];
           break;
 
         default:
-          _this.authModeStrategy = _authModeStrategies__WEBPACK_IMPORTED_MODULE_4__["defaultAuthStrategy"];
+          _this.authModeStrategy = _authModeStrategies__WEBPACK_IMPORTED_MODULE_7__["defaultAuthStrategy"];
           break;
       } // store on config object, so that Sync, Subscription, and Mutation processors can have access
 
@@ -83495,7 +83528,7 @@ function () {
               /*break*/
               , 2]; // connect to storage so that it can be cleared without fully starting DataStore
 
-              this.storage = new _storage_storage__WEBPACK_IMPORTED_MODULE_6__["ExclusiveStorage"](schema, namespaceResolver, getModelConstructorByModelName, modelInstanceCreator, this.storageAdapter, this.sessionId);
+              this.storage = new _storage_storage__WEBPACK_IMPORTED_MODULE_9__["ExclusiveStorage"](schema, namespaceResolver, getModelConstructorByModelName, modelInstanceCreator, this.storageAdapter, this.sessionId);
               return [4
               /*yield*/
               , this.storage.init()];
@@ -83613,7 +83646,7 @@ function () {
     }
 
     if (sort) {
-      sortPredicate = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelSortPredicateCreator"].createFromExisting(modelDefinition, paginationProducer.sort);
+      sortPredicate = _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelSortPredicateCreator"].createFromExisting(modelDefinition, paginationProducer.sort);
     }
 
     return {
@@ -83661,7 +83694,7 @@ function () {
                     case 2:
                       condition = _b.sent();
 
-                      if (Object(_predicates__WEBPACK_IMPORTED_MODULE_5__["isPredicatesAll"])(condition)) {
+                      if (Object(_predicates__WEBPACK_IMPORTED_MODULE_8__["isPredicatesAll"])(condition)) {
                         return [2
                         /*return*/
                         , [modelDefinition, null]];
@@ -83688,7 +83721,7 @@ function () {
 
   DataStore.prototype.createFromCondition = function (modelDefinition, condition) {
     try {
-      return _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].createFromExisting(modelDefinition, condition);
+      return _predicates__WEBPACK_IMPORTED_MODULE_8__["ModelPredicateCreator"].createFromExisting(modelDefinition, condition);
     } catch (error) {
       logger.error('Error creating Sync Predicate');
       throw error;
@@ -83776,7 +83809,7 @@ function () {
 }();
 
 var instance = new DataStore();
-_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["Amplify"].register(instance);
+_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["Amplify"].register(instance);
 
 
 /***/ }),
@@ -90453,7 +90486,7 @@ var ControlMessage;
 var SyncEngine =
 /** @class */
 function () {
-  function SyncEngine(schema, namespaceResolver, modelClasses, userModelClasses, storage, modelInstanceCreator, conflictHandler, errorHandler, syncPredicates, amplifyConfig, authModeStrategy) {
+  function SyncEngine(schema, namespaceResolver, modelClasses, userModelClasses, storage, modelInstanceCreator, conflictHandler, errorHandler, syncPredicates, amplifyConfig, authModeStrategy, amplifyContext) {
     if (amplifyConfig === void 0) {
       amplifyConfig = {};
     }
@@ -90467,14 +90500,15 @@ function () {
     this.syncPredicates = syncPredicates;
     this.amplifyConfig = amplifyConfig;
     this.authModeStrategy = authModeStrategy;
+    this.amplifyContext = amplifyContext;
     this.online = false;
     this.modelSyncedStatus = new WeakMap();
     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, 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.syncQueriesProcessor = new _processors_sync__WEBPACK_IMPORTED_MODULE_11__["SyncProcessor"](this.schema, this.syncPredicates, this.amplifyConfig, this.authModeStrategy, errorHandler, this.amplifyContext);
+    this.subscriptionsProcessor = new _processors_subscription__WEBPACK_IMPORTED_MODULE_10__["SubscriptionProcessor"](this.schema, this.syncPredicates, this.amplifyConfig, this.authModeStrategy, errorHandler, this.amplifyContext);
+    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.amplifyContext);
     this.datastoreConnectivity = new _datastoreConnectivity__WEBPACK_IMPORTED_MODULE_6__["default"]();
   }
 
@@ -92946,7 +92980,7 @@ var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["ConsoleLogger"]
 var MutationProcessor =
 /** @class */
 function () {
-  function MutationProcessor(schema, storage, userClasses, outbox, modelInstanceCreator, MutationEvent, amplifyConfig, authModeStrategy, errorHandler, conflictHandler) {
+  function MutationProcessor(schema, storage, userClasses, outbox, modelInstanceCreator, MutationEvent, amplifyConfig, authModeStrategy, errorHandler, conflictHandler, amplifyContext) {
     if (amplifyConfig === void 0) {
       amplifyConfig = {};
     }
@@ -92961,8 +92995,10 @@ function () {
     this.authModeStrategy = authModeStrategy;
     this.errorHandler = errorHandler;
     this.conflictHandler = conflictHandler;
+    this.amplifyContext = amplifyContext;
     this.typeQuery = new WeakMap();
     this.processing = false;
+    this.amplifyContext.API = this.amplifyContext.API || _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__["default"];
     this.generateQueries();
   }
 
@@ -93284,7 +93320,8 @@ function () {
                         query: query,
                         variables: variables,
                         authMode: authMode,
-                        authToken: authToken
+                        authToken: authToken,
+                        userAgentSuffix: _util__WEBPACK_IMPORTED_MODULE_4__["USER_AGENT_SUFFIX_DATASTORE"]
                       };
                       attempt = 0;
                       opType = this.opTypeFromTransformerOperation(operation);
@@ -93295,7 +93332,7 @@ function () {
 
                       return [4
                       /*yield*/
-                      , _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__["default"].graphql(tryWith)];
+                      , this.amplifyContext.API.graphql(tryWith)];
 
                     case 3:
                       result = _h.sent();
@@ -93378,13 +93415,14 @@ function () {
                       authToken_1 = _h.sent();
                       return [4
                       /*yield*/
-                      , _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__["default"].graphql({
+                      , this.amplifyContext.API.graphql({
                         query: query_1,
                         variables: {
                           id: variables.input.id
                         },
                         authMode: authMode,
-                        authToken: authToken_1
+                        authToken: authToken_1,
+                        userAgentSuffix: _util__WEBPACK_IMPORTED_MODULE_4__["USER_AGENT_SUFFIX_DATASTORE"]
                       })];
 
                     case 10:
@@ -93892,16 +93930,25 @@ var USER_CREDENTIALS;
 var SubscriptionProcessor =
 /** @class */
 function () {
-  function SubscriptionProcessor(schema, syncPredicates, amplifyConfig, authModeStrategy, errorHandler) {
+  function SubscriptionProcessor(schema, syncPredicates, amplifyConfig, authModeStrategy, errorHandler, amplifyContext) {
     if (amplifyConfig === void 0) {
       amplifyConfig = {};
     }
 
+    if (amplifyContext === void 0) {
+      amplifyContext = {
+        Auth: _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_1__["Auth"],
+        API: _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__["default"],
+        Cache: _aws_amplify_cache__WEBPACK_IMPORTED_MODULE_2__["default"]
+      };
+    }
+
     this.schema = schema;
     this.syncPredicates = syncPredicates;
     this.amplifyConfig = amplifyConfig;
     this.authModeStrategy = authModeStrategy;
     this.errorHandler = errorHandler;
+    this.amplifyContext = amplifyContext;
     this.typeQuery = new WeakMap();
     this.buffer = [];
   }
@@ -94060,7 +94107,7 @@ function () {
 
                 return [4
                 /*yield*/
-                , _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_1__["default"].currentCredentials()];
+                , this.amplifyContext.Auth.currentCredentials()];
 
               case 1:
                 credentials = _b.sent();
@@ -94080,7 +94127,7 @@ function () {
 
                 return [4
                 /*yield*/
-                , _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_1__["default"].currentSession()];
+                , this.amplifyContext.Auth.currentSession()];
 
               case 4:
                 session = _b.sent();
@@ -94107,7 +94154,7 @@ function () {
                 token = void 0;
                 return [4
                 /*yield*/
-                , _aws_amplify_cache__WEBPACK_IMPORTED_MODULE_2__["default"].getItem('federatedInfo')];
+                , this.amplifyContext.Cache.getItem('federatedInfo')];
 
               case 7:
                 federatedInfo = _b.sent();
@@ -94122,7 +94169,7 @@ function () {
               case 8:
                 return [4
                 /*yield*/
-                , _aws_amplify_auth__WEBPACK_IMPORTED_MODULE_1__["default"].currentAuthenticatedUser()];
+                , this.amplifyContext.Auth.currentAuthenticatedUser()];
 
               case 9:
                 currentUser = _b.sent();
@@ -94184,7 +94231,7 @@ function () {
 
                             _authModeRetry = function authModeRetry(operation) {
                               return __awaiter(_this, void 0, void 0, function () {
-                                var _a, transformerMutationType, opName, query, isOwner, ownerField, ownerValue, authMode, authToken, variables, queryObservable, subscriptionReadyCallback;
+                                var _a, transformerMutationType, opName, query, isOwner, ownerField, ownerValue, authMode, authToken, variables, userAgentSuffix, queryObservable, subscriptionReadyCallback;
 
                                 var _this = this;
 
@@ -94212,13 +94259,15 @@ function () {
                                       }
 
                                       logger.debug("Attempting " + operation + " subscription with authMode: " + readAuthModes[operationAuthModeAttempts[operation]]);
-                                      queryObservable = _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__["default"].graphql(__assign(__assign({
+                                      userAgentSuffix = _util__WEBPACK_IMPORTED_MODULE_9__["USER_AGENT_SUFFIX_DATASTORE"];
+                                      queryObservable = this.amplifyContext.API.graphql(__assign(__assign({
                                         query: query,
                                         variables: variables
                                       }, {
                                         authMode: authMode
                                       }), {
-                                        authToken: authToken
+                                        authToken: authToken,
+                                        userAgentSuffix: userAgentSuffix
                                       }));
                                       subscriptions[modelDefinition.name][transformerMutationType].push(queryObservable.map(function (_a) {
                                         var value = _a.value;
@@ -94474,9 +94523,10 @@ __webpack_require__.r(__webpack_exports__);
 /* 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 _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");
-/* harmony import */ var _errorMaps__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./errorMaps */ "./lib-esm/sync/processors/errorMaps.js");
+/* harmony import */ var _util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../util */ "./lib-esm/util.js");
+/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @aws-amplify/core */ "../core/lib-esm/index.js");
+/* harmony import */ var _predicates__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../../predicates */ "./lib-esm/predicates/index.js");
+/* harmony import */ var _errorMaps__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./errorMaps */ "./lib-esm/sync/processors/errorMaps.js");
 var __assign = undefined && undefined.__assign || function () {
   __assign = Object.assign || function (t) {
     for (var s, i = 1, n = arguments.length; i < n; i++) {
@@ -94687,17 +94737,18 @@ var __values = undefined && undefined.__values || function (o) {
 
 
 
+
 var opResultDefaults = {
   items: [],
   nextToken: null,
   startedAt: null
 };
-var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_4__["ConsoleLogger"]('DataStore');
+var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["ConsoleLogger"]('DataStore');
 
 var SyncProcessor =
 /** @class */
 function () {
-  function SyncProcessor(schema, syncPredicates, amplifyConfig, authModeStrategy, errorHandler, modelInstanceCreator) {
+  function SyncProcessor(schema, syncPredicates, amplifyConfig, authModeStrategy, errorHandler, amplifyContext) {
     if (amplifyConfig === void 0) {
       amplifyConfig = {};
     }
@@ -94707,8 +94758,9 @@ function () {
     this.amplifyConfig = amplifyConfig;
     this.authModeStrategy = authModeStrategy;
     this.errorHandler = errorHandler;
-    this.modelInstanceCreator = modelInstanceCreator;
+    this.amplifyContext = amplifyContext;
     this.typeQuery = new WeakMap();
+    amplifyContext.API = amplifyContext.API || _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__["default"];
     this.generateQueries();
   }
 
@@ -94734,7 +94786,7 @@ function () {
       return null;
     }
 
-    var predicatesGroup = _predicates__WEBPACK_IMPORTED_MODULE_5__["ModelPredicateCreator"].getPredicates(this.syncPredicates.get(model), false);
+    var predicatesGroup = _predicates__WEBPACK_IMPORTED_MODULE_6__["ModelPredicateCreator"].getPredicates(this.syncPredicates.get(model), false);
 
     if (!predicatesGroup) {
       return null;
@@ -94890,7 +94942,7 @@ function () {
           case 0:
             return [4
             /*yield*/
-            , Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_4__["jitteredExponentialRetry"])(function (query, variables) {
+            , Object(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["jitteredExponentialRetry"])(function (query, variables) {
               return __awaiter(_this, void 0, void 0, function () {
                 var authToken, error_2, clientOrForbiddenErrorMessage, hasItems, result, unauthorized, result;
 
@@ -94909,11 +94961,12 @@ function () {
                       authToken = _a.sent();
                       return [4
                       /*yield*/
-                      , _aws_amplify_api__WEBPACK_IMPORTED_MODULE_0__["default"].graphql({
+                      , this.amplifyContext.API.graphql({
                         query: query,
                         variables: variables,
                         authMode: authMode,
-                        authToken: authToken
+                        authToken: authToken,
+                        userAgentSuffix: _util__WEBPACK_IMPORTED_MODULE_4__["USER_AGENT_SUFFIX_DATASTORE"]
                       })];
 
                     case 2:
@@ -94926,7 +94979,7 @@ function () {
                       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_4__["NonRetryableError"](clientOrForbiddenErrorMessage);
+                        throw new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["NonRetryableError"](clientOrForbiddenErrorMessage);
                       }
 
                       hasItems = Boolean(error_2 && error_2.data && error_2.data[opName] && error_2.data[opName].items);
@@ -94961,7 +95014,7 @@ function () {
                                   message: err.message,
                                   model: modelDefinition.name,
                                   operation: opName,
-                                  errorType: Object(_errorMaps__WEBPACK_IMPORTED_MODULE_6__["getSyncErrorType"])(err),
+                                  errorType: Object(_errorMaps__WEBPACK_IMPORTED_MODULE_7__["getSyncErrorType"])(err),
                                   process: _types__WEBPACK_IMPORTED_MODULE_2__["ProcessName"].sync,
                                   remoteModel: null,
                                   cause: err
@@ -94993,7 +95046,7 @@ function () {
                     case 4:
                       _a.sent();
 
-                      _aws_amplify_core__WEBPACK_IMPORTED_MODULE_4__["Hub"].dispatch('datastore', {
+                      _aws_amplify_core__WEBPACK_IMPORTED_MODULE_5__["Hub"].dispatch('datastore', {
                         event: 'syncQueriesPartialSyncError',
                         data: {
                           errors: error_2.errors,
@@ -96380,7 +96433,7 @@ var LimitTimerRaceResolvedValues;
 (function (LimitTimerRaceResolvedValues) {
   LimitTimerRaceResolvedValues["LIMIT"] = "LIMIT";
   LimitTimerRaceResolvedValues["TIMER"] = "TIMER";
-})(LimitTimerRaceResolvedValues || (LimitTimerRaceResolvedValues = {})); //#endregion
+})(LimitTimerRaceResolvedValues || (LimitTimerRaceResolvedValues = {}));
 
 /***/ }),
 
@@ -96388,11 +96441,17 @@ var LimitTimerRaceResolvedValues;
 /*!*************************!*\
   !*** ./lib-esm/util.js ***!
   \*************************/
-/*! exports provided: exhaustiveCheck, isNullOrUndefined, validatePredicate, validatePredicateField, isModelConstructor, registerNonModelClass, isNonModelConstructor, processCompositeKeys, establishRelationAndKeys, traverseModel, getIndex, getIndexFromAssociation, NAMESPACES, USER, SYNC, STORAGE, DATASTORE, isPrivateMode, monotonicUlidFactory, getNow, sortCompareFunction, valuesEqual, isAWSDate, isAWSTime, isAWSDateTime, isAWSTimestamp, isAWSEmail, isAWSJSON, isAWSURL, isAWSPhone, isAWSIPAddress, DeferredPromise, DeferredCallbackResolver, mergePatches */
+/*! exports provided: NAMESPACES, USER, SYNC, STORAGE, DATASTORE, USER_AGENT_SUFFIX_DATASTORE, exhaustiveCheck, isNullOrUndefined, validatePredicate, validatePredicateField, isModelConstructor, registerNonModelClass, isNonModelConstructor, processCompositeKeys, establishRelationAndKeys, traverseModel, getIndex, getIndexFromAssociation, isPrivateMode, monotonicUlidFactory, getNow, sortCompareFunction, valuesEqual, isAWSDate, isAWSTime, isAWSDateTime, isAWSTimestamp, isAWSEmail, isAWSJSON, isAWSURL, isAWSPhone, isAWSIPAddress, DeferredPromise, DeferredCallbackResolver, mergePatches */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NAMESPACES", function() { return NAMESPACES; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "USER", function() { return USER; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SYNC", function() { return SYNC; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "STORAGE", function() { return STORAGE; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DATASTORE", function() { return DATASTORE; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "USER_AGENT_SUFFIX_DATASTORE", function() { return USER_AGENT_SUFFIX_DATASTORE; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "exhaustiveCheck", function() { return exhaustiveCheck; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isNullOrUndefined", function() { return isNullOrUndefined; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "validatePredicate", function() { return validatePredicate; });
@@ -96405,11 +96464,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "traverseModel", function() { return traverseModel; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getIndex", function() { return getIndex; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getIndexFromAssociation", function() { return getIndexFromAssociation; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "NAMESPACES", function() { return NAMESPACES; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "USER", function() { return USER; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "SYNC", function() { return SYNC; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "STORAGE", function() { return STORAGE; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DATASTORE", function() { return DATASTORE; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isPrivateMode", function() { return isPrivateMode; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "monotonicUlidFactory", function() { return monotonicUlidFactory; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getNow", function() { return getNow; });
@@ -96646,6 +96700,21 @@ var __values = undefined && undefined.__values || function (o) {
 
 
 
+var NAMESPACES;
+
+(function (NAMESPACES) {
+  NAMESPACES["DATASTORE"] = "datastore";
+  NAMESPACES["USER"] = "user";
+  NAMESPACES["SYNC"] = "sync";
+  NAMESPACES["STORAGE"] = "storage";
+})(NAMESPACES || (NAMESPACES = {}));
+
+var DATASTORE = NAMESPACES.DATASTORE;
+var USER = NAMESPACES.USER;
+var SYNC = NAMESPACES.SYNC;
+var STORAGE = NAMESPACES.STORAGE;
+
+var USER_AGENT_SUFFIX_DATASTORE = '/DataStore';
 var exhaustiveCheck = function exhaustiveCheck(obj, throwOnError) {
   if (throwOnError === void 0) {
     throwOnError = true;
@@ -97031,20 +97100,6 @@ var getIndexFromAssociation = function getIndexFromAssociation(indexes, src) {
   });
   return index;
 };
-var NAMESPACES;
-
-(function (NAMESPACES) {
-  NAMESPACES["DATASTORE"] = "datastore";
-  NAMESPACES["USER"] = "user";
-  NAMESPACES["SYNC"] = "sync";
-  NAMESPACES["STORAGE"] = "storage";
-})(NAMESPACES || (NAMESPACES = {}));
-
-var DATASTORE = NAMESPACES.DATASTORE;
-var USER = NAMESPACES.USER;
-var SYNC = NAMESPACES.SYNC;
-var STORAGE = NAMESPACES.STORAGE;
-
 var privateModeCheckResult;
 var isPrivateMode = function isPrivateMode() {
   return new Promise(function (resolve) {