@aws-amplify/datastore 4.7.5 → 5.0.1-console-preview.4432977.0

package/lib/datastore/datastore.js

@@ -1,15 +1,132 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+var __read = (this && this.__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 __values = (this && this.__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 () {
+            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.");
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
+exports.DataStore = exports.initSchema = exports.DataStoreClass = exports.AsyncCollection = exports.AsyncItem = exports.getAttachment = exports.attached = exports.syncClasses = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 var internals_1 = require("@aws-amplify/api/internals");
-var auth_1 = require("@aws-amplify/auth");
-var cache_1 = require("@aws-amplify/cache");
 var core_1 = require("@aws-amplify/core");
 var immer_1 = require("immer");
 var uuid_1 = require("uuid");
-var zen_observable_ts_1 = tslib_1.__importDefault(require("zen-observable-ts"));
+var zen_observable_ts_1 = __importDefault(require("zen-observable-ts"));
 var authModeStrategies_1 = require("../authModeStrategies");
 var predicates_1 = require("../predicates");
 var storage_1 = require("../storage/storage");
@@ -19,11 +136,11 @@ var types_1 = require("../types");
 var util_1 = require("../util");
 var next_1 = require("../predicates/next");
 var utils_1 = require("../sync/utils");
-immer_1.setAutoFreeze(true);
-immer_1.enablePatches();
-var logger = new core_1.ConsoleLogger('DataStore');
-var ulid = util_1.monotonicUlidFactory(Date.now());
-var isNode = core_1.browserOrNode().isNode;
+var utils_2 = require("@aws-amplify/core/internals/utils");
+(0, immer_1.setAutoFreeze)(true);
+(0, immer_1.enablePatches)();
+var logger = new utils_2.Logger('DataStore');
+var ulid = (0, util_1.monotonicUlidFactory)(Date.now());
 var SETTING_SCHEMA_VERSION = 'schemaVersion';
 var schema;
 var modelNamespaceMap = new WeakMap();
@@ -48,12 +165,12 @@ var getModelDefinition = function (modelConstructor) {
  * @param obj The object to test.
  */
 var isValidModelConstructor = function (obj) {
-    return util_1.isModelConstructor(obj) && modelNamespaceMap.has(obj);
+    return (0, util_1.isModelConstructor)(obj) && modelNamespaceMap.has(obj);
 };
 var namespaceResolver = function (modelConstructor) {
     var resolver = modelNamespaceMap.get(modelConstructor);
     if (!resolver) {
-        throw new Error("Namespace Resolver for '" + modelConstructor.name + "' not found! This is probably a bug in '@amplify-js/datastore'.");
+        throw new Error("Namespace Resolver for '".concat(modelConstructor.name, "' not found! This is probably a bug in '@amplify-js/datastore'."));
     }
     return resolver;
 };
@@ -82,10 +199,10 @@ var buildSeedPredicate = function (modelConstructor) {
     var modelSchema = getModelDefinition(modelConstructor);
     if (!modelSchema)
         throw new Error('Missing modelSchema');
-    var pks = util_1.extractPrimaryKeyFieldNames(modelSchema);
+    var pks = (0, util_1.extractPrimaryKeyFieldNames)(modelSchema);
     if (!pks)
         throw new Error('Could not determine PK');
-    return next_1.recursivePredicateFor({
+    return (0, next_1.recursivePredicateFor)({
         builder: modelConstructor,
         schema: modelSchema,
         pkField: pks,
@@ -154,11 +271,12 @@ exports.attached = attached;
  *
  * @param instance A model instance
  */
-exports.getAttachment = function (instance) {
+var getAttachment = function (instance) {
     return attachedModelInstances.has(instance)
         ? attachedModelInstances.get(instance)
         : ModelAttachment.Detached;
 };
+exports.getAttachment = getAttachment;
 var initSchema = function (userSchema) {
     var _a;
     if (schema !== undefined) {
@@ -167,7 +285,7 @@ var initSchema = function (userSchema) {
     }
     logger.log('validating schema', { schema: userSchema });
     checkSchemaCodegenVersion(userSchema.codegenVersion);
-    var internalUserNamespace = tslib_1.__assign({ name: util_1.USER }, userSchema);
+    var internalUserNamespace = __assign({ name: util_1.USER }, userSchema);
     logger.log('DataStore', 'Init models');
     userClasses = createTypeClasses(internalUserNamespace);
     logger.log('DataStore', 'Models initialized');
@@ -189,7 +307,7 @@ var initSchema = function (userSchema) {
     };
     Object.keys(schema.namespaces).forEach(function (namespace) {
         var e_1, _a;
-        var _b = tslib_1.__read(util_1.establishRelationAndKeys(schema.namespaces[namespace]), 2), relations = _b[0], keys = _b[1];
+        var _b = __read((0, util_1.establishRelationAndKeys)(schema.namespaces[namespace]), 2), relations = _b[0], keys = _b[1];
         schema.namespaces[namespace].relationships = relations;
         schema.namespaces[namespace].keys = keys;
         var modelAssociations = new Map();
@@ -211,16 +329,16 @@ var initSchema = function (userSchema) {
             // to go looking for it.
             Object.values(model.fields).forEach(function (field) {
                 var relatedModel = userClasses[field.type.model];
-                if (util_1.isModelConstructor(relatedModel)) {
+                if ((0, util_1.isModelConstructor)(relatedModel)) {
                     Object.defineProperty(field.type, 'modelConstructor', {
                         get: function () {
                             var relatedModelDefinition = getModelDefinition(relatedModel);
                             if (!relatedModelDefinition)
-                                throw new Error("Could not find model definition for " + relatedModel.name);
+                                throw new Error("Could not find model definition for ".concat(relatedModel.name));
                             return {
                                 builder: relatedModel,
                                 schema: relatedModelDefinition,
-                                pkField: util_1.extractPrimaryKeyFieldNames(relatedModelDefinition),
+                                pkField: (0, util_1.extractPrimaryKeyFieldNames)(relatedModelDefinition),
                             };
                         },
                     });
@@ -232,10 +350,10 @@ var initSchema = function (userSchema) {
             var indexes = schema.namespaces[namespace].relationships[model.name].indexes;
             var indexFields = new Set();
             try {
-                for (var indexes_1 = tslib_1.__values(indexes), indexes_1_1 = indexes_1.next(); !indexes_1_1.done; indexes_1_1 = indexes_1.next()) {
+                for (var indexes_1 = __values(indexes), indexes_1_1 = indexes_1.next(); !indexes_1_1.done; indexes_1_1 = indexes_1.next()) {
                     var index = indexes_1_1.value;
                     try {
-                        for (var _c = (e_3 = void 0, tslib_1.__values(index[1])), _d = _c.next(); !_d.done; _d = _c.next()) {
+                        for (var _c = (e_3 = void 0, __values(index[1])), _d = _c.next(); !_d.done; _d = _c.next()) {
                             var indexField = _d.value;
                             indexFields.add(indexField);
                         }
@@ -256,7 +374,7 @@ var initSchema = function (userSchema) {
                 }
                 finally { if (e_2) throw e_2.error; }
             }
-            model.allFields = tslib_1.__assign(tslib_1.__assign({}, Object.fromEntries(tslib_1.__spread(indexFields.values()).map(function (name) { return [
+            model.allFields = __assign(__assign({}, Object.fromEntries(__spreadArray([], __read(indexFields.values()), false).map(function (name) { return [
                 name,
                 {
                     name: name,
@@ -276,7 +394,7 @@ var initSchema = function (userSchema) {
                 throw new Error('Models are not topologically sortable. Please verify your schema.');
             }
             try {
-                for (var _c = (e_1 = void 0, tslib_1.__values(Array.from(modelAssociations.keys()))), _d = _c.next(); !_d.done; _d = _c.next()) {
+                for (var _c = (e_1 = void 0, __values(Array.from(modelAssociations.keys()))), _d = _c.next(); !_d.done; _d = _c.next()) {
                     var modelName = _d.value;
                     var parents = modelAssociations.get(modelName);
                     if (parents === null || parents === void 0 ? void 0 : parents.every(function (x) { return result.has(x); })) {
@@ -338,14 +456,14 @@ var checkSchemaCodegenVersion = function (codegenVersion) {
     var isValid = false;
     try {
         var versionParts = codegenVersion.split('.');
-        var _a = tslib_1.__read(versionParts, 4), major = _a[0], minor = _a[1], patch = _a[2], patchrevision = _a[3];
+        var _a = __read(versionParts, 4), major = _a[0], minor = _a[1], patch = _a[2], patchrevision = _a[3];
         isValid = Number(major) === majorVersion && Number(minor) >= minorVersion;
     }
     catch (err) {
-        console.log("Error parsing codegen version: " + codegenVersion + "\n" + err);
+        console.log("Error parsing codegen version: ".concat(codegenVersion, "\n").concat(err));
     }
     if (!isValid) {
-        var message = "Models were generated with an unsupported version of codegen. Codegen artifacts are from " + (codegenVersion || 'an unknown version') + ", whereas ^" + majorVersion + "." + minorVersion + ".0 is required. " +
+        var message = "Models were generated with an unsupported version of codegen. Codegen artifacts are from ".concat(codegenVersion || 'an unknown version', ", whereas ^").concat(majorVersion, ".").concat(minorVersion, ".0 is required. ") +
             "Update to the latest CLI and run 'amplify codegen models'.";
         logger.error(message);
         throw new Error(message);
@@ -354,13 +472,13 @@ var checkSchemaCodegenVersion = function (codegenVersion) {
 var createTypeClasses = function (namespace) {
     var classes = {};
     Object.entries(namespace.models).forEach(function (_a) {
-        var _b = tslib_1.__read(_a, 2), modelName = _b[0], modelDefinition = _b[1];
+        var _b = __read(_a, 2), modelName = _b[0], modelDefinition = _b[1];
         var clazz = createModelClass(modelDefinition);
         classes[modelName] = clazz;
         modelNamespaceMap.set(clazz, namespace.name);
     });
     Object.entries(namespace.nonModels || {}).forEach(function (_a) {
-        var _b = tslib_1.__read(_a, 2), typeName = _b[0], typeDefinition = _b[1];
+        var _b = __read(_a, 2), typeName = _b[0], typeDefinition = _b[1];
         var clazz = createNonModelClass(typeDefinition);
         classes[typeName] = clazz;
     });
@@ -380,24 +498,24 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
     var fieldDefinition = modelDefinition.fields[k];
     if (fieldDefinition !== undefined) {
         var type_1 = fieldDefinition.type, isRequired_1 = fieldDefinition.isRequired, isArrayNullable = fieldDefinition.isArrayNullable, name_1 = fieldDefinition.name, isArray = fieldDefinition.isArray;
-        var timestamps = types_1.isSchemaModelWithAttributes(modelDefinition)
-            ? util_1.getTimestampFields(modelDefinition)
+        var timestamps = (0, types_1.isSchemaModelWithAttributes)(modelDefinition)
+            ? (0, util_1.getTimestampFields)(modelDefinition)
             : {};
         var isTimestampField = !!timestamps[name_1];
         if (((!isArray && isRequired_1) || (isArray && !isArrayNullable)) &&
             !isTimestampField &&
             (v === null || v === undefined)) {
-            throw new Error("Field " + name_1 + " is required");
+            throw new Error("Field ".concat(name_1, " is required"));
         }
-        if (types_1.isSchemaModelWithAttributes(modelDefinition) &&
-            !util_1.isIdManaged(modelDefinition)) {
-            var keys = util_1.extractPrimaryKeyFieldNames(modelDefinition);
+        if ((0, types_1.isSchemaModelWithAttributes)(modelDefinition) &&
+            !(0, util_1.isIdManaged)(modelDefinition)) {
+            var keys = (0, util_1.extractPrimaryKeyFieldNames)(modelDefinition);
             if (keys.includes(k) && v === '') {
                 logger.error(util_1.errorMessages.idEmptyString, { k: k, value: v });
                 throw new Error(util_1.errorMessages.idEmptyString);
             }
         }
-        if (types_1.isGraphQLScalarType(type_1)) {
+        if ((0, types_1.isGraphQLScalarType)(type_1)) {
             var jsType_1 = types_1.GraphQLScalarType.getJSType(type_1);
             var validateScalar_1 = types_1.GraphQLScalarType.getValidationFunction(type_1);
             if (type_1 === 'AWSJSON') {
@@ -410,33 +528,33 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
                         return;
                     }
                     catch (error) {
-                        throw new Error("Field " + name_1 + " is an invalid JSON object. " + v);
+                        throw new Error("Field ".concat(name_1, " is an invalid JSON object. ").concat(v));
                     }
                 }
             }
             if (isArray) {
                 var errorTypeText = jsType_1;
                 if (!isRequired_1) {
-                    errorTypeText = jsType_1 + " | null | undefined";
+                    errorTypeText = "".concat(jsType_1, " | null | undefined");
                 }
                 if (!Array.isArray(v) && !isArrayNullable) {
-                    throw new Error("Field " + name_1 + " should be of type [" + errorTypeText + "], " + typeof v + " received. " + v);
+                    throw new Error("Field ".concat(name_1, " should be of type [").concat(errorTypeText, "], ").concat(typeof v, " received. ").concat(v));
                 }
-                if (!util_1.isNullOrUndefined(v) &&
+                if (!(0, util_1.isNullOrUndefined)(v) &&
                     v.some(function (e) {
-                        return util_1.isNullOrUndefined(e) ? isRequired_1 : typeof e !== jsType_1;
+                        return (0, util_1.isNullOrUndefined)(e) ? isRequired_1 : typeof e !== jsType_1;
                     })) {
                     var elemTypes = v
                         .map(function (e) { return (e === null ? 'null' : typeof e); })
                         .join(',');
-                    throw new Error("All elements in the " + name_1 + " array should be of type " + errorTypeText + ", [" + elemTypes + "] received. " + v);
+                    throw new Error("All elements in the ".concat(name_1, " array should be of type ").concat(errorTypeText, ", [").concat(elemTypes, "] received. ").concat(v));
                 }
-                if (validateScalar_1 && !util_1.isNullOrUndefined(v)) {
+                if (validateScalar_1 && !(0, util_1.isNullOrUndefined)(v)) {
                     var validationStatus = v.map(function (e) {
-                        if (!util_1.isNullOrUndefined(e)) {
+                        if (!(0, util_1.isNullOrUndefined)(e)) {
                             return validateScalar_1(e);
                         }
-                        else if (util_1.isNullOrUndefined(e) && !isRequired_1) {
+                        else if ((0, util_1.isNullOrUndefined)(e) && !isRequired_1) {
                             return true;
                         }
                         else {
@@ -444,7 +562,7 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
                         }
                     });
                     if (!validationStatus.every(function (s) { return s; })) {
-                        throw new Error("All elements in the " + name_1 + " array should be of type " + type_1 + ", validation failed for one or more elements. " + v);
+                        throw new Error("All elements in the ".concat(name_1, " array should be of type ").concat(type_1, ", validation failed for one or more elements. ").concat(v));
                     }
                 }
             }
@@ -452,34 +570,34 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
                 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);
+                throw new Error("Field ".concat(name_1, " should be of type ").concat(jsType_1, ", ").concat(typeof v, " received. ").concat(v));
             }
-            else if (!util_1.isNullOrUndefined(v) &&
+            else if (!(0, util_1.isNullOrUndefined)(v) &&
                 validateScalar_1 &&
                 !validateScalar_1(v) // TODO: why never, TS ... why ...
             ) {
-                throw new Error("Field " + name_1 + " should be of type " + type_1 + ", validation failed. " + v);
+                throw new Error("Field ".concat(name_1, " should be of type ").concat(type_1, ", validation failed. ").concat(v));
             }
         }
-        else if (types_1.isNonModelFieldType(type_1)) {
+        else if ((0, types_1.isNonModelFieldType)(type_1)) {
             // do not check non model fields if undefined or null
-            if (!util_1.isNullOrUndefined(v)) {
+            if (!(0, util_1.isNullOrUndefined)(v)) {
                 var subNonModelDefinition_1 = schema.namespaces.user.nonModels[type_1.nonModel];
                 var modelValidator_1 = validateModelFields(subNonModelDefinition_1);
                 if (isArray) {
                     var errorTypeText = type_1.nonModel;
                     if (!isRequired_1) {
-                        errorTypeText = type_1.nonModel + " | null | undefined";
+                        errorTypeText = "".concat(type_1.nonModel, " | null | undefined");
                     }
                     if (!Array.isArray(v)) {
-                        throw new Error("Field " + name_1 + " should be of type [" + errorTypeText + "], " + typeof v + " received. " + v);
+                        throw new Error("Field ".concat(name_1, " should be of type [").concat(errorTypeText, "], ").concat(typeof v, " received. ").concat(v));
                     }
                     v.forEach(function (item) {
-                        if ((util_1.isNullOrUndefined(item) && isRequired_1) ||
+                        if (((0, util_1.isNullOrUndefined)(item) && isRequired_1) ||
                             (typeof item !== 'object' && typeof item !== 'undefined')) {
-                            throw new Error("All elements in the " + name_1 + " array should be of type " + type_1.nonModel + ", [" + typeof item + "] received. " + item);
+                            throw new Error("All elements in the ".concat(name_1, " array should be of type ").concat(type_1.nonModel, ", [").concat(typeof item, "] received. ").concat(item));
                         }
-                        if (!util_1.isNullOrUndefined(item)) {
+                        if (!(0, util_1.isNullOrUndefined)(item)) {
                             Object.keys(subNonModelDefinition_1.fields).forEach(function (subKey) {
                                 modelValidator_1(subKey, item[subKey]);
                             });
@@ -488,7 +606,7 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
                 }
                 else {
                     if (typeof v !== 'object') {
-                        throw new Error("Field " + name_1 + " should be of type " + type_1.nonModel + ", " + typeof v + " recieved. " + v);
+                        throw new Error("Field ".concat(name_1, " should be of type ").concat(type_1.nonModel, ", ").concat(typeof v, " recieved. ").concat(v));
                     }
                     Object.keys(subNonModelDefinition_1.fields).forEach(function (subKey) {
                         modelValidator_1(subKey, v[subKey]);
@@ -504,8 +622,8 @@ var castInstanceType = function (modelDefinition, k, v) {
     if (typeof v === 'string' &&
         (isArray ||
             type === 'AWSJSON' ||
-            types_1.isNonModelFieldType(type) ||
-            types_1.isModelFieldType(type))) {
+            (0, types_1.isNonModelFieldType)(type) ||
+            (0, types_1.isModelFieldType)(type))) {
         try {
             return JSON.parse(v);
         }
@@ -536,7 +654,7 @@ var initPatches = new WeakMap();
 var initializeInstance = function (init, modelDefinition, draft) {
     var modelValidator = validateModelFields(modelDefinition);
     Object.entries(init).forEach(function (_a) {
-        var _b = tslib_1.__read(_a, 2), k = _b[0], v = _b[1];
+        var _b = __read(_a, 2), k = _b[0], v = _b[1];
         var parsedValue = castInstanceType(modelDefinition, k, v);
         modelValidator(k, parsedValue);
         draft[k] = parsedValue;
@@ -564,7 +682,7 @@ var initializeInstance = function (init, modelDefinition, draft) {
 var normalize = function (modelDefinition, draft) {
     var e_4, _a;
     try {
-        for (var _b = tslib_1.__values(Object.keys(modelDefinition.fields)), _c = _b.next(); !_c.done; _c = _b.next()) {
+        for (var _b = __values(Object.keys(modelDefinition.fields)), _c = _b.next(); !_c.done; _c = _b.next()) {
             var k = _c.value;
             if (draft[k] === undefined)
                 draft[k] = null;
@@ -586,7 +704,7 @@ var createModelClass = function (modelDefinition) {
             // set by customer code versus those set by normalization. only those fields
             // which are explicitly set by customers should be part of create mutations.
             var patches = [];
-            var baseInstance = immer_1.produce(this, function (draft) {
+            var baseInstance = (0, immer_1.produce)(this, function (draft) {
                 initializeInstance(init, modelDefinition, draft);
                 // model is initialized inside a DataStore component (e.g. by Sync Engine, Storage Engine, etc.)
                 var isInternallyInitialized = instancesMetadata.has(init);
@@ -594,18 +712,18 @@ var createModelClass = function (modelDefinition) {
                     ? init
                     : {};
                 var _id = modelInstanceMetadata.id;
-                if (util_1.isIdManaged(modelDefinition)) {
+                if ((0, util_1.isIdManaged)(modelDefinition)) {
                     var isInternalModel = _id !== null && _id !== undefined;
                     var id = isInternalModel
                         ? _id
                         : modelDefinition.syncable
-                            ? uuid_1.v4()
+                            ? (0, uuid_1.v4)()
                             : ulid();
                     draft.id = id;
                 }
-                else if (util_1.isIdOptionallyManaged(modelDefinition)) {
+                else if ((0, util_1.isIdOptionallyManaged)(modelDefinition)) {
                     // only auto-populate if the id was not provided
-                    draft.id = draft.id || uuid_1.v4();
+                    draft.id = draft.id || (0, uuid_1.v4)();
                 }
                 if (!isInternallyInitialized) {
                     checkReadOnlyPropertyOnCreate(draft, modelDefinition);
@@ -622,7 +740,7 @@ var createModelClass = function (modelDefinition) {
             // are only create to provide a consistent view of the data for fields pre/post sync
             // where possible. (not all fields can be normalized pre-sync, because they're generally
             // "cloud managed" fields, like createdAt and updatedAt.)
-            var normalized = immer_1.produce(baseInstance, function (draft) {
+            var normalized = (0, immer_1.produce)(baseInstance, function (draft) {
                 return normalize(modelDefinition, draft);
             });
             initPatches.set(normalized, patches);
@@ -636,19 +754,19 @@ var createModelClass = function (modelDefinition) {
                 throw new Error(msg);
             }
             var patches = [];
-            var model = immer_1.produce(source, function (draft) {
+            var model = (0, immer_1.produce)(source, function (draft) {
                 fn(draft);
-                var keyNames = util_1.extractPrimaryKeyFieldNames(modelDefinition);
+                var keyNames = (0, util_1.extractPrimaryKeyFieldNames)(modelDefinition);
                 // Keys are immutable
                 keyNames.forEach(function (key) {
                     if (draft[key] !== source[key]) {
-                        logger.warn("copyOf() does not update PK fields. The '" + key + "' update is being ignored.", { source: source });
+                        logger.warn("copyOf() does not update PK fields. The '".concat(key, "' update is being ignored."), { source: source });
                     }
                     draft[key] = source[key];
                 });
                 var modelValidator = validateModelFields(modelDefinition);
                 Object.entries(draft).forEach(function (_a) {
-                    var _b = tslib_1.__read(_a, 2), k = _b[0], v = _b[1];
+                    var _b = __read(_a, 2), k = _b[0], v = _b[1];
                     var parsedValue = castInstanceType(modelDefinition, k, v);
                     modelValidator(k, parsedValue);
                 });
@@ -657,8 +775,8 @@ var createModelClass = function (modelDefinition) {
             var hasExistingPatches = modelPatchesMap.has(source);
             if (patches.length || hasExistingPatches) {
                 if (hasExistingPatches) {
-                    var _a = tslib_1.__read(modelPatchesMap.get(source), 2), existingPatches = _a[0], existingSource = _a[1];
-                    var mergedPatches = util_1.mergePatches(existingSource, existingPatches, patches);
+                    var _a = __read(modelPatchesMap.get(source), 2), existingPatches = _a[0], existingSource = _a[1];
+                    var mergedPatches = (0, util_1.mergePatches)(existingSource, existingPatches, patches);
                     modelPatchesMap.set(model, [mergedPatches, existingSource]);
                     checkReadOnlyPropertyOnUpdate(mergedPatches, modelDefinition);
                 }
@@ -688,7 +806,7 @@ var createModelClass = function (modelDefinition) {
             var instance = modelInstanceCreator(clazz, json);
             var modelValidator = validateModelFields(modelDefinition);
             Object.entries(instance).forEach(function (_a) {
-                var _b = tslib_1.__read(_a, 2), k = _b[0], v = _b[1];
+                var _b = __read(_a, 2), k = _b[0], v = _b[1];
                 modelValidator(k, v);
             });
             return attached(instance, ModelAttachment.DataStore);
@@ -703,7 +821,7 @@ var createModelClass = function (modelDefinition) {
     var allModelRelationships = relationship_1.ModelRelationship.allFrom({
         builder: clazz,
         schema: modelDefinition,
-        pkField: util_1.extractPrimaryKeyFieldNames(modelDefinition),
+        pkField: (0, util_1.extractPrimaryKeyFieldNames)(modelDefinition),
     });
     var _loop_1 = function (relationship) {
         var field = relationship.field;
@@ -720,13 +838,13 @@ var createModelClass = function (modelDefinition) {
                         var modelConstructor = Object.getPrototypeOf(model || {})
                             .constructor;
                         if (!isValidModelConstructor(modelConstructor)) {
-                            var msg = "Value passed to " + modelDefinition.name + "." + field + " is not a valid instance of a model";
+                            var msg = "Value passed to ".concat(modelDefinition.name, ".").concat(field, " is not a valid instance of a model");
                             logger.error(msg, { model: model });
                             throw new Error(msg);
                         }
                         if (modelConstructor.name.toLowerCase() !==
                             relationship.remoteModelConstructor.name.toLowerCase()) {
-                            var msg = "Value passed to " + modelDefinition.name + "." + field + " is not an instance of " + relationship.remoteModelConstructor.name;
+                            var msg = "Value passed to ".concat(modelDefinition.name, ".").concat(field, " is not an instance of ").concat(relationship.remoteModelConstructor.name);
                             logger.error(msg, { model: model });
                             throw new Error(msg);
                         }
@@ -735,7 +853,8 @@ var createModelClass = function (modelDefinition) {
                 // if the relationship can be managed automagically, set the FK's
                 if (relationship.isComplete) {
                     for (var i = 0; i < relationship.localJoinFields.length; i++) {
-                        this[relationship.localJoinFields[i]] = model === null || model === void 0 ? void 0 : model[relationship.remoteJoinFields[i]];
+                        this[relationship.localJoinFields[i]] =
+                            model === null || model === void 0 ? void 0 : model[relationship.remoteJoinFields[i]];
                     }
                     var instanceMemos = modelInstanceAssociationsMap.has(this)
                         ? modelInstanceAssociationsMap.get(this)
@@ -757,7 +876,7 @@ var createModelClass = function (modelDefinition) {
                 if (!instanceMemos.hasOwnProperty(field)) {
                     // before we populate the memo, we need to know where to look for relatives.
                     // today, this only supports DataStore. Models aren't managed elsewhere in Amplify.
-                    if (exports.getAttachment(this) === ModelAttachment.DataStore) {
+                    if ((0, exports.getAttachment)(this) === ModelAttachment.DataStore) {
                         // when we fetch the results using a query constructed under the guidance
                         // of the relationship metadata, we DO NOT AWAIT resolution. we want to
                         // drop the promise into the memo's synchronously, eliminating the chance
@@ -783,7 +902,7 @@ var createModelClass = function (modelDefinition) {
                             instanceMemos[field] = resultPromise.then(function (rows) {
                                 if (rows.length > 1) {
                                     // should never happen for a HAS_ONE or BELONGS_TO.
-                                    var err = new Error("\n\t\t\t\t\t\t\t\t\tData integrity error.\n\t\t\t\t\t\t\t\t\tToo many records found for a HAS_ONE/BELONGS_TO field '" + modelDefinition.name + "." + field + "'\n\t\t\t\t\t\t\t\t");
+                                    var err = new Error("\n\t\t\t\t\t\t\t\t\tData integrity error.\n\t\t\t\t\t\t\t\t\tToo many records found for a HAS_ONE/BELONGS_TO field '".concat(modelDefinition.name, ".").concat(field, "'\n\t\t\t\t\t\t\t\t"));
                                     console.error(err);
                                     throw err;
                                 }
@@ -793,7 +912,7 @@ var createModelClass = function (modelDefinition) {
                             });
                         }
                     }
-                    else if (exports.getAttachment(this) === ModelAttachment.API) {
+                    else if ((0, exports.getAttachment)(this) === ModelAttachment.API) {
                         throw new Error('Lazy loading from API is not yet supported!');
                     }
                     else {
@@ -810,7 +929,7 @@ var createModelClass = function (modelDefinition) {
         });
     };
     try {
-        for (var allModelRelationships_1 = tslib_1.__values(allModelRelationships), allModelRelationships_1_1 = allModelRelationships_1.next(); !allModelRelationships_1_1.done; allModelRelationships_1_1 = allModelRelationships_1.next()) {
+        for (var allModelRelationships_1 = __values(allModelRelationships), allModelRelationships_1_1 = allModelRelationships_1.next(); !allModelRelationships_1_1.done; allModelRelationships_1_1 = allModelRelationships_1.next()) {
             var relationship = allModelRelationships_1_1.value;
             _loop_1(relationship);
         }
@@ -828,7 +947,7 @@ var createModelClass = function (modelDefinition) {
  * An eventually loaded related model instance.
  */
 var AsyncItem = /** @class */ (function (_super) {
-    tslib_1.__extends(AsyncItem, _super);
+    __extends(AsyncItem, _super);
     function AsyncItem() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
@@ -860,9 +979,9 @@ var AsyncCollection = /** @class */ (function () {
         var values;
         var index = 0;
         return {
-            next: function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            next: function () { return __awaiter(_this, void 0, void 0, function () {
                 var result;
-                return tslib_1.__generator(this, function (_a) {
+                return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             if (!!values) return [3 /*break*/, 2];
@@ -897,45 +1016,52 @@ var AsyncCollection = /** @class */ (function () {
      * ```
      */
     AsyncCollection.prototype.toArray = function (_a) {
-        var _b = (_a === void 0 ? {} : _a).max, max = _b === void 0 ? Number.MAX_SAFE_INTEGER : _b;
-        var e_6, _c;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var output, i, _d, _e, element, e_6_1;
-            return tslib_1.__generator(this, function (_f) {
-                switch (_f.label) {
+        var _b, e_6, _c, _d;
+        var _e = _a === void 0 ? {} : _a, _f = _e.max, max = _f === void 0 ? Number.MAX_SAFE_INTEGER : _f;
+        return __awaiter(this, void 0, void 0, function () {
+            var output, i, _g, _h, _j, element, e_6_1;
+            return __generator(this, function (_k) {
+                switch (_k.label) {
                     case 0:
                         output = [];
                         i = 0;
-                        _f.label = 1;
+                        _k.label = 1;
                     case 1:
-                        _f.trys.push([1, 6, 7, 12]);
-                        _d = tslib_1.__asyncValues(this);
-                        _f.label = 2;
-                    case 2: return [4 /*yield*/, _d.next()];
+                        _k.trys.push([1, 6, 7, 12]);
+                        _g = true, _h = __asyncValues(this);
+                        _k.label = 2;
+                    case 2: return [4 /*yield*/, _h.next()];
                     case 3:
-                        if (!(_e = _f.sent(), !_e.done)) return [3 /*break*/, 5];
-                        element = _e.value;
-                        if (i < max) {
-                            output.push(element);
-                            i++;
+                        if (!(_j = _k.sent(), _b = _j.done, !_b)) return [3 /*break*/, 5];
+                        _d = _j.value;
+                        _g = false;
+                        try {
+                            element = _d;
+                            if (i < max) {
+                                output.push(element);
+                                i++;
+                            }
+                            else {
+                                return [3 /*break*/, 5];
+                            }
                         }
-                        else {
-                            return [3 /*break*/, 5];
+                        finally {
+                            _g = true;
                         }
-                        _f.label = 4;
+                        _k.label = 4;
                     case 4: return [3 /*break*/, 2];
                     case 5: return [3 /*break*/, 12];
                     case 6:
-                        e_6_1 = _f.sent();
+                        e_6_1 = _k.sent();
                         e_6 = { error: e_6_1 };
                         return [3 /*break*/, 12];
                     case 7:
-                        _f.trys.push([7, , 10, 11]);
-                        if (!(_e && !_e.done && (_c = _d.return))) return [3 /*break*/, 9];
-                        return [4 /*yield*/, _c.call(_d)];
+                        _k.trys.push([7, , 10, 11]);
+                        if (!(!_g && !_b && (_c = _h.return))) return [3 /*break*/, 9];
+                        return [4 /*yield*/, _c.call(_h)];
                     case 8:
-                        _f.sent();
-                        _f.label = 9;
+                        _k.sent();
+                        _k.label = 9;
                     case 9: return [3 /*break*/, 11];
                     case 10:
                         if (e_6) throw e_6.error;
@@ -954,7 +1080,7 @@ var checkReadOnlyPropertyOnCreate = function (draft, modelDefinition) {
     var fields = modelDefinition.fields;
     modelKeys.forEach(function (key) {
         if (fields[key] && fields[key].isReadOnly) {
-            throw new Error(key + " is read-only.");
+            throw new Error("".concat(key, " is read-only."));
         }
     });
 };
@@ -962,18 +1088,18 @@ var checkReadOnlyPropertyOnUpdate = function (patches, modelDefinition) {
     var patchArray = patches.map(function (p) { return [p.path[0], p.value]; });
     var fields = modelDefinition.fields;
     patchArray.forEach(function (_a) {
-        var _b = tslib_1.__read(_a, 2), key = _b[0], val = _b[1];
+        var _b = __read(_a, 2), key = _b[0], val = _b[1];
         if (!val || !fields[key])
             return;
         if (fields[key].isReadOnly) {
-            throw new Error(key + " is read-only.");
+            throw new Error("".concat(key, " is read-only."));
         }
     });
 };
 var createNonModelClass = function (typeDefinition) {
     var clazz = /** @class */ (function () {
         function Model(init) {
-            var instance = immer_1.produce(this, function (draft) {
+            var instance = (0, immer_1.produce)(this, function (draft) {
                 initializeInstance(init, typeDefinition, draft);
             });
             return instance;
@@ -982,7 +1108,7 @@ var createNonModelClass = function (typeDefinition) {
     }());
     clazz[immer_1.immerable] = true;
     Object.defineProperty(clazz, 'name', { value: typeDefinition.name });
-    util_1.registerNonModelClass(clazz);
+    (0, util_1.registerNonModelClass)(clazz);
     return clazz;
 };
 function isQueryOne(obj) {
@@ -991,7 +1117,7 @@ function isQueryOne(obj) {
 function defaultConflictHandler(conflictData) {
     var localModel = conflictData.localModel, modelConstructor = conflictData.modelConstructor, remoteModel = conflictData.remoteModel;
     var _version = remoteModel._version;
-    return modelInstanceCreator(modelConstructor, tslib_1.__assign(tslib_1.__assign({}, localModel), { _version: _version }));
+    return modelInstanceCreator(modelConstructor, __assign(__assign({}, localModel), { _version: _version }));
 }
 function defaultErrorHandler(error) {
     logger.warn(error);
@@ -1012,13 +1138,13 @@ function getModelConstructorByModelName(namespaceName, modelName) {
             result = storageClasses[modelName];
             break;
         default:
-            throw new Error("Invalid namespace: " + namespaceName);
+            throw new Error("Invalid namespace: ".concat(namespaceName));
     }
     if (isValidModelConstructor(result)) {
         return result;
     }
     else {
-        var msg = "Model name is not valid for namespace. modelName: " + modelName + ", namespace: " + namespaceName;
+        var msg = "Model name is not valid for namespace. modelName: ".concat(modelName, ", namespace: ").concat(namespaceName);
         logger.error(msg);
         throw new Error(msg);
     }
@@ -1036,23 +1162,23 @@ function getModelConstructorByModelName(namespaceName, modelName) {
  * @param version The expected schema version.
  */
 function checkSchemaVersion(storage, version) {
-    return tslib_1.__awaiter(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function () {
         var Setting, modelDefinition;
         var _this = this;
-        return tslib_1.__generator(this, function (_a) {
+        return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     Setting = dataStoreClasses.Setting;
                     modelDefinition = schema.namespaces[util_1.DATASTORE].models.Setting;
-                    return [4 /*yield*/, storage.runExclusive(function (s) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    return [4 /*yield*/, storage.runExclusive(function (s) { return __awaiter(_this, void 0, void 0, function () {
                             var _a, schemaVersionSetting, storedValue;
-                            return tslib_1.__generator(this, function (_b) {
+                            return __generator(this, function (_b) {
                                 switch (_b.label) {
                                     case 0: return [4 /*yield*/, s.query(Setting, predicates_1.ModelPredicateCreator.createFromAST(modelDefinition, {
                                             and: { key: { eq: SETTING_SCHEMA_VERSION } },
                                         }), { page: 0, limit: 1 })];
                                     case 1:
-                                        _a = tslib_1.__read.apply(void 0, [_b.sent(), 1]), schemaVersionSetting = _a[0];
+                                        _a = __read.apply(void 0, [_b.sent(), 1]), schemaVersionSetting = _a[0];
                                         if (!(schemaVersionSetting !== undefined &&
                                             schemaVersionSetting.value !== undefined)) return [3 /*break*/, 4];
                                         storedValue = JSON.parse(schemaVersionSetting.value);
@@ -1131,9 +1257,8 @@ var DataStore = /** @class */ (function () {
     function DataStore() {
         var _this = this;
         // reference to configured category instances. Used for preserving SSR context
-        this.Auth = auth_1.Auth;
         this.InternalAPI = internals_1.InternalAPI;
-        this.Cache = cache_1.Cache;
+        this.Cache = core_1.Cache;
         // Non-null assertions (bang operator) have been added to most of these properties
         // to make TS happy. These properties are all expected to be set immediately after
         // construction.
@@ -1144,9 +1269,7 @@ var DataStore = /** @class */ (function () {
         this.syncPredicates = new WeakMap();
         // object that gets passed to descendent classes. Allows us to pass these down by reference
         this.amplifyContext = {
-            Auth: this.Auth,
             InternalAPI: this.InternalAPI,
-            Cache: this.Cache,
         };
         /**
          * **IMPORTANT!**
@@ -1179,7 +1302,7 @@ var DataStore = /** @class */ (function () {
          *
          * (Reasonable = *seconds*, not minutes.)
          */
-        this.runningProcesses = new core_1.BackgroundProcessManager();
+        this.runningProcesses = new utils_2.BackgroundProcessManager();
         /**
          * Indicates what state DataStore is in.
          *
@@ -1194,14 +1317,14 @@ var DataStore = /** @class */ (function () {
          * 3. If `this.amplifyConfig.aws_appsync_graphqlEndpoint` contains a URL,
          * attaches a sync engine, starts it, and subscribes.
          */
-        this.start = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        this.start = function () { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 return [2 /*return*/, this.runningProcesses
-                        .add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        .add(function () { return __awaiter(_this, void 0, void 0, function () {
                         var aws_appsync_graphqlEndpoint, _a, fullSyncIntervalInMilliseconds;
                         var _this = this;
-                        return tslib_1.__generator(this, function (_b) {
+                        return __generator(this, function (_b) {
                             switch (_b.label) {
                                 case 0:
                                     this.state = DataStoreState.Starting;
@@ -1239,11 +1362,8 @@ var DataStore = /** @class */ (function () {
                                         .subscribe({
                                         next: function (_a) {
                                             var type = _a.type, 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_1.ControlMessage.SYNC_ENGINE_SYNC_QUERIES_READY
-                                                : sync_1.ControlMessage.SYNC_ENGINE_STORAGE_SUBSCRIBED;
+                                            var readyType = sync_1.ControlMessage.SYNC_ENGINE_STORAGE_SUBSCRIBED;
                                             if (type === readyType) {
                                                 _this.initResolve();
                                             }
@@ -1275,15 +1395,15 @@ var DataStore = /** @class */ (function () {
                         .catch(this.handleAddProcError('DataStore.start()'))];
             });
         }); };
-        this.query = function (modelConstructor, identifierOrCriteria, paginationProducer) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        this.query = function (modelConstructor, identifierOrCriteria, paginationProducer) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 return [2 /*return*/, this.runningProcesses
-                        .add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        .add(function () { return __awaiter(_this, void 0, void 0, function () {
                         var result, msg, modelDefinition, pagination, keyFields, msg, predicate, predicate, seedPredicate, predicate, returnOne;
                         var _a;
                         var _b;
-                        return tslib_1.__generator(this, function (_c) {
+                        return __generator(this, function (_c) {
                             switch (_c.label) {
                                 case 0: return [4 /*yield*/, this.start()];
                                 case 1:
@@ -1307,7 +1427,7 @@ var DataStore = /** @class */ (function () {
                                         throw new Error('Invalid model definition provided!');
                                     }
                                     pagination = this.processPagination(modelDefinition, paginationProducer);
-                                    keyFields = util_1.extractPrimaryKeyFieldNames(modelDefinition);
+                                    keyFields = (0, util_1.extractPrimaryKeyFieldNames)(modelDefinition);
                                     if (!isQueryOne(identifierOrCriteria)) return [3 /*break*/, 3];
                                     if (keyFields.length > 1) {
                                         msg = util_1.errorMessages.queryByPkWithCompositeKeyPresent;
@@ -1320,7 +1440,7 @@ var DataStore = /** @class */ (function () {
                                     result = _c.sent();
                                     return [3 /*break*/, 9];
                                 case 3:
-                                    if (!types_1.isIdentifierObject(identifierOrCriteria, modelDefinition)) return [3 /*break*/, 5];
+                                    if (!(0, types_1.isIdentifierObject)(identifierOrCriteria, modelDefinition)) return [3 /*break*/, 5];
                                     predicate = predicates_1.ModelPredicateCreator.createForPk(modelDefinition, identifierOrCriteria);
                                     return [4 /*yield*/, this.storage.query(modelConstructor, predicate, pagination)];
                                 case 4:
@@ -1328,26 +1448,26 @@ var DataStore = /** @class */ (function () {
                                     return [3 /*break*/, 9];
                                 case 5:
                                     if (!(!identifierOrCriteria ||
-                                        predicates_1.isPredicatesAll(identifierOrCriteria))) return [3 /*break*/, 7];
+                                        (0, predicates_1.isPredicatesAll)(identifierOrCriteria))) return [3 /*break*/, 7];
                                     return [4 /*yield*/, ((_b = this.storage) === null || _b === void 0 ? void 0 : _b.query(modelConstructor, undefined, pagination))];
                                 case 6:
                                     result = _c.sent();
                                     return [3 /*break*/, 9];
                                 case 7:
-                                    seedPredicate = next_1.recursivePredicateFor({
+                                    seedPredicate = (0, next_1.recursivePredicateFor)({
                                         builder: modelConstructor,
                                         schema: modelDefinition,
-                                        pkField: util_1.extractPrimaryKeyFieldNames(modelDefinition),
+                                        pkField: (0, util_1.extractPrimaryKeyFieldNames)(modelDefinition),
                                     });
-                                    predicate = next_1.internals(identifierOrCriteria(seedPredicate));
+                                    predicate = (0, next_1.internals)(identifierOrCriteria(seedPredicate));
                                     return [4 /*yield*/, predicate.fetch(this.storage)];
                                 case 8:
                                     result = (_c.sent());
-                                    result = util_1.inMemoryPagination(result, pagination);
+                                    result = (0, util_1.inMemoryPagination)(result, pagination);
                                     _c.label = 9;
                                 case 9:
                                     returnOne = isQueryOne(identifierOrCriteria) ||
-                                        types_1.isIdentifierObject(identifierOrCriteria, modelDefinition);
+                                        (0, types_1.isIdentifierObject)(identifierOrCriteria, modelDefinition);
                                     return [2 /*return*/, attached(returnOne ? result[0] : result, ModelAttachment.DataStore)];
                             }
                         });
@@ -1355,14 +1475,14 @@ var DataStore = /** @class */ (function () {
                         .catch(this.handleAddProcError('DataStore.query()'))];
             });
         }); };
-        this.save = function (model, condition) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        this.save = function (model, condition) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 return [2 /*return*/, this.runningProcesses
-                        .add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        .add(function () { return __awaiter(_this, void 0, void 0, function () {
                         var updatedPatchesTuple, initPatchesTuple, patchesTuple, modelConstructor, msg, modelDefinition, modelMeta, producedCondition, _a, savedModel;
                         var _this = this;
-                        return tslib_1.__generator(this, function (_b) {
+                        return __generator(this, function (_b) {
                             switch (_b.label) {
                                 case 0: return [4 /*yield*/, this.start()];
                                 case 1:
@@ -1388,20 +1508,20 @@ var DataStore = /** @class */ (function () {
                                     modelMeta = {
                                         builder: modelConstructor,
                                         schema: modelDefinition,
-                                        pkField: util_1.extractPrimaryKeyFieldNames(modelDefinition),
+                                        pkField: (0, util_1.extractPrimaryKeyFieldNames)(modelDefinition),
                                     };
-                                    return [4 /*yield*/, this.storage.runExclusive(function (s) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                    return [4 /*yield*/, this.storage.runExclusive(function (s) { return __awaiter(_this, void 0, void 0, function () {
                                             var nonHasManyRelationships, nonHasManyRelationships_1, nonHasManyRelationships_1_1, relationship, queryObject, related, e_7_1;
                                             var e_7, _a;
                                             var _b;
-                                            return tslib_1.__generator(this, function (_c) {
+                                            return __generator(this, function (_c) {
                                                 switch (_c.label) {
                                                     case 0:
                                                         nonHasManyRelationships = relationship_1.ModelRelationship.allFrom(modelMeta).filter(function (r) { return r.type === 'BELONGS_TO'; });
                                                         _c.label = 1;
                                                     case 1:
                                                         _c.trys.push([1, 6, 7, 8]);
-                                                        nonHasManyRelationships_1 = tslib_1.__values(nonHasManyRelationships), nonHasManyRelationships_1_1 = nonHasManyRelationships_1.next();
+                                                        nonHasManyRelationships_1 = __values(nonHasManyRelationships), nonHasManyRelationships_1_1 = nonHasManyRelationships_1.next();
                                                         _c.label = 2;
                                                     case 2:
                                                         if (!!nonHasManyRelationships_1_1.done) return [3 /*break*/, 5];
@@ -1413,10 +1533,10 @@ var DataStore = /** @class */ (function () {
                                                         related = _c.sent();
                                                         if (related.length === 0) {
                                                             throw new Error([
-                                                                "Data integrity error. You tried to save a " + modelDefinition.name + " (" + JSON.stringify(model) + ")",
-                                                                "but the instance assigned to the \"" + relationship.field + "\" property",
+                                                                "Data integrity error. You tried to save a ".concat(modelDefinition.name, " (").concat(JSON.stringify(model), ")"),
+                                                                "but the instance assigned to the \"".concat(relationship.field, "\" property"),
                                                                 "does not exist in the local database. If you're trying to create the related",
-                                                                "\"" + ((_b = relationship.remoteDefinition) === null || _b === void 0 ? void 0 : _b.name) + "\", you must save it independently first.",
+                                                                "\"".concat((_b = relationship.remoteDefinition) === null || _b === void 0 ? void 0 : _b.name, "\", you must save it independently first."),
                                                             ].join(' '));
                                                         }
                                                         _c.label = 4;
@@ -1441,11 +1561,11 @@ var DataStore = /** @class */ (function () {
                                 case 2:
                                     _b.sent();
                                     producedCondition = condition
-                                        ? next_1.internals(condition(next_1.predicateFor(modelMeta))).toStoragePredicate()
+                                        ? (0, next_1.internals)(condition((0, next_1.predicateFor)(modelMeta))).toStoragePredicate()
                                         : undefined;
-                                    return [4 /*yield*/, this.storage.runExclusive(function (s) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                    return [4 /*yield*/, this.storage.runExclusive(function (s) { return __awaiter(_this, void 0, void 0, function () {
                                             var saved;
-                                            return tslib_1.__generator(this, function (_a) {
+                                            return __generator(this, function (_a) {
                                                 switch (_a.label) {
                                                     case 0: return [4 /*yield*/, s.save(model, producedCondition, undefined, patchesTuple)];
                                                     case 1:
@@ -1455,7 +1575,7 @@ var DataStore = /** @class */ (function () {
                                             });
                                         }); })];
                                 case 3:
-                                    _a = tslib_1.__read.apply(void 0, [_b.sent(), 1]), savedModel = _a[0];
+                                    _a = __read.apply(void 0, [_b.sent(), 1]), savedModel = _a[0];
                                     return [2 /*return*/, attached(savedModel, ModelAttachment.DataStore)];
                             }
                         });
@@ -1489,14 +1609,14 @@ var DataStore = /** @class */ (function () {
             }
             return _this.errorHandler || defaultErrorHandler;
         };
-        this.delete = function (modelOrConstructor, identifierOrCriteria) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+        this.delete = function (modelOrConstructor, identifierOrCriteria) { return __awaiter(_this, void 0, void 0, function () {
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 return [2 /*return*/, this.runningProcesses
-                        .add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        .add(function () { return __awaiter(_this, void 0, void 0, function () {
                         var condition, msg, modelConstructor, msg, modelDefinition, keyFields, msg, msg, _a, deleted, model, modelConstructor, msg, modelDefinition, pkPredicate, msg, _b, _c, deleted;
                         var _d;
-                        return tslib_1.__generator(this, function (_e) {
+                        return __generator(this, function (_e) {
                             switch (_e.label) {
                                 case 0: return [4 /*yield*/, this.start()];
                                 case 1:
@@ -1521,7 +1641,7 @@ var DataStore = /** @class */ (function () {
                                         throw new Error('Could not find model definition for modelConstructor.');
                                     }
                                     if (typeof identifierOrCriteria === 'string') {
-                                        keyFields = util_1.extractPrimaryKeyFieldNames(modelDefinition);
+                                        keyFields = (0, util_1.extractPrimaryKeyFieldNames)(modelDefinition);
                                         if (keyFields.length > 1) {
                                             msg = util_1.errorMessages.deleteByPkWithCompositeKeyPresent;
                                             logger.error(msg, { keyFields: keyFields });
@@ -1530,14 +1650,14 @@ var DataStore = /** @class */ (function () {
                                         condition = predicates_1.ModelPredicateCreator.createFromFlatEqualities(modelDefinition, (_d = {}, _d[keyFields[0]] = identifierOrCriteria, _d));
                                     }
                                     else {
-                                        if (types_1.isIdentifierObject(identifierOrCriteria, modelDefinition)) {
+                                        if ((0, types_1.isIdentifierObject)(identifierOrCriteria, modelDefinition)) {
                                             condition = predicates_1.ModelPredicateCreator.createForPk(modelDefinition, identifierOrCriteria);
                                         }
                                         else {
-                                            condition = next_1.internals(identifierOrCriteria(next_1.predicateFor({
+                                            condition = (0, next_1.internals)(identifierOrCriteria((0, next_1.predicateFor)({
                                                 builder: modelConstructor,
                                                 schema: modelDefinition,
-                                                pkField: util_1.extractPrimaryKeyFieldNames(modelDefinition),
+                                                pkField: (0, util_1.extractPrimaryKeyFieldNames)(modelDefinition),
                                             }))).toStoragePredicate();
                                         }
                                         if (!condition ||
@@ -1549,7 +1669,7 @@ var DataStore = /** @class */ (function () {
                                     }
                                     return [4 /*yield*/, this.storage.delete(modelConstructor, condition)];
                                 case 2:
-                                    _a = tslib_1.__read.apply(void 0, [_e.sent(), 1]), deleted = _a[0];
+                                    _a = __read.apply(void 0, [_e.sent(), 1]), deleted = _a[0];
                                     return [2 /*return*/, attached(deleted, ModelAttachment.DataStore)];
                                 case 3:
                                     model = modelOrConstructor;
@@ -1571,10 +1691,10 @@ var DataStore = /** @class */ (function () {
                                             logger.error(msg, { identifierOrCriteria: identifierOrCriteria });
                                             throw new Error(msg);
                                         }
-                                        condition = next_1.internals(identifierOrCriteria(next_1.predicateFor({
+                                        condition = (0, next_1.internals)(identifierOrCriteria((0, next_1.predicateFor)({
                                             builder: modelConstructor,
                                             schema: modelDefinition,
-                                            pkField: util_1.extractPrimaryKeyFieldNames(modelDefinition),
+                                            pkField: (0, util_1.extractPrimaryKeyFieldNames)(modelDefinition),
                                         }))).toStoragePredicate();
                                     }
                                     else {
@@ -1582,7 +1702,7 @@ var DataStore = /** @class */ (function () {
                                     }
                                     return [4 /*yield*/, this.storage.delete(model, condition)];
                                 case 4:
-                                    _b = tslib_1.__read.apply(void 0, [_e.sent(), 1]), _c = tslib_1.__read(_b[0], 1), deleted = _c[0];
+                                    _b = __read.apply(void 0, [_e.sent(), 1]), _c = __read(_b[0], 1), deleted = _c[0];
                                     return [2 /*return*/, attached(deleted, ModelAttachment.DataStore)];
                             }
                         });
@@ -1616,7 +1736,7 @@ var DataStore = /** @class */ (function () {
             // observe should not accept object literal syntax
             if (identifierOrCriteria &&
                 modelConstructor &&
-                types_1.isIdentifierObject(identifierOrCriteria, getModelDefinition(modelConstructor))) {
+                (0, types_1.isIdentifierObject)(identifierOrCriteria, getModelDefinition(modelConstructor))) {
                 var msg = util_1.errorMessages.observeWithObjectLiteral;
                 logger.error(msg, { objectLiteral: identifierOrCriteria });
                 throw new Error(msg);
@@ -1633,17 +1753,17 @@ var DataStore = /** @class */ (function () {
             }
             if (modelConstructor && typeof identifierOrCriteria === 'string') {
                 var buildIdPredicate = function (seed) { return seed.id.eq(identifierOrCriteria); };
-                executivePredicate = next_1.internals(buildIdPredicate(buildSeedPredicate(modelConstructor)));
+                executivePredicate = (0, next_1.internals)(buildIdPredicate(buildSeedPredicate(modelConstructor)));
             }
             else if (modelConstructor && typeof identifierOrCriteria === 'function') {
-                executivePredicate = next_1.internals(identifierOrCriteria(buildSeedPredicate(modelConstructor)));
+                executivePredicate = (0, next_1.internals)(identifierOrCriteria(buildSeedPredicate(modelConstructor)));
             }
             return new zen_observable_ts_1.default(function (observer) {
                 var source;
                 _this.runningProcesses
-                    .add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    .add(function () { return __awaiter(_this, void 0, void 0, function () {
                     var _this = this;
-                    return tslib_1.__generator(this, function (_a) {
+                    return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0: return [4 /*yield*/, this.start()];
                             case 1:
@@ -1658,20 +1778,20 @@ var DataStore = /** @class */ (function () {
                                     .subscribe({
                                     next: function (item) {
                                         return _this.runningProcesses.isOpen &&
-                                            _this.runningProcesses.add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                            _this.runningProcesses.add(function () { return __awaiter(_this, void 0, void 0, function () {
                                                 var message, modelDefinition, keyFields, primaryKeysAndValues, freshElement, _a;
-                                                return tslib_1.__generator(this, function (_b) {
+                                                return __generator(this, function (_b) {
                                                     switch (_b.label) {
                                                         case 0:
                                                             message = item;
                                                             if (!(item.opType !== 'DELETE')) return [3 /*break*/, 2];
                                                             modelDefinition = getModelDefinition(item.model);
-                                                            keyFields = util_1.extractPrimaryKeyFieldNames(modelDefinition);
-                                                            primaryKeysAndValues = util_1.extractPrimaryKeysAndValues(item.element, keyFields);
+                                                            keyFields = (0, util_1.extractPrimaryKeyFieldNames)(modelDefinition);
+                                                            primaryKeysAndValues = (0, util_1.extractPrimaryKeysAndValues)(item.element, keyFields);
                                                             return [4 /*yield*/, this.query(item.model, primaryKeysAndValues)];
                                                         case 1:
                                                             freshElement = _b.sent();
-                                                            message = tslib_1.__assign(tslib_1.__assign({}, message), { element: freshElement });
+                                                            message = __assign(__assign({}, message), { element: freshElement });
                                                             _b.label = 2;
                                                         case 2:
                                                             _a = !executivePredicate;
@@ -1703,8 +1823,8 @@ var DataStore = /** @class */ (function () {
                 // better than no cleaner, but if the subscriber is handling the
                 // complete() message async and not registering with the context,
                 // this will still be problematic.
-                return _this.runningProcesses.addCleaner(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                    return tslib_1.__generator(this, function (_a) {
+                return _this.runningProcesses.addCleaner(function () { return __awaiter(_this, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
                         if (source) {
                             source.unsubscribe();
                         }
@@ -1749,16 +1869,16 @@ var DataStore = /** @class */ (function () {
                     throw new Error('Could not find model definition.');
                 }
                 if (model && typeof criteria === 'function') {
-                    executivePredicate = next_1.internals(criteria(buildSeedPredicate(model)));
+                    executivePredicate = (0, next_1.internals)(criteria(buildSeedPredicate(model)));
                 }
-                else if (predicates_1.isPredicatesAll(criteria)) {
+                else if ((0, predicates_1.isPredicatesAll)(criteria)) {
                     executivePredicate = undefined;
                 }
                 _this.runningProcesses
-                    .add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    .add(function () { return __awaiter(_this, void 0, void 0, function () {
                     var err_1;
                     var _this = this;
-                    return tslib_1.__generator(this, function (_a) {
+                    return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
                                 _a.trys.push([0, 2, , 3]);
@@ -1767,7 +1887,7 @@ var DataStore = /** @class */ (function () {
                                 // first, query and return any locally-available records
                                 (_a.sent()).forEach(function (item) {
                                     var itemModelDefinition = getModelDefinition(model);
-                                    var idOrPk = utils_1.getIdentifierValue(itemModelDefinition, item);
+                                    var idOrPk = (0, utils_1.getIdentifierValue)(itemModelDefinition, item);
                                     items.set(idOrPk, item);
                                 });
                                 // Observe the model and send a stream of updates (debounced).
@@ -1777,14 +1897,14 @@ var DataStore = /** @class */ (function () {
                                 handle = this.observe(model).subscribe(function (_a) {
                                     var element = _a.element, model = _a.model, opType = _a.opType;
                                     return _this.runningProcesses.isOpen &&
-                                        _this.runningProcesses.add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                        _this.runningProcesses.add(function () { return __awaiter(_this, void 0, void 0, function () {
                                             var itemModelDefinition, idOrPk, _a, isSynced, limit;
                                             var _b, _c;
-                                            return tslib_1.__generator(this, function (_d) {
+                                            return __generator(this, function (_d) {
                                                 switch (_d.label) {
                                                     case 0:
                                                         itemModelDefinition = getModelDefinition(model);
-                                                        idOrPk = utils_1.getIdentifierValue(itemModelDefinition, element);
+                                                        idOrPk = (0, utils_1.getIdentifierValue)(itemModelDefinition, element);
                                                         _a = executivePredicate;
                                                         if (!_a) return [3 /*break*/, 2];
                                                         return [4 /*yield*/, executivePredicate.matches(element)];
@@ -1853,11 +1973,11 @@ var DataStore = /** @class */ (function () {
                 var generateSnapshot = function () {
                     var _a, _b;
                     var isSynced = (_b = (_a = _this.sync) === null || _a === void 0 ? void 0 : _a.getModelSyncedStatus(model)) !== null && _b !== void 0 ? _b : false;
-                    var itemsArray = tslib_1.__spread(Array.from(items.values()), Array.from(itemsChanged.values()));
+                    var itemsArray = __spreadArray(__spreadArray([], __read(Array.from(items.values())), false), __read(Array.from(itemsChanged.values())), false);
                     items.clear();
                     itemsArray.forEach(function (item) {
                         var itemModelDefinition = getModelDefinition(model);
-                        var idOrPk = utils_1.getIdentifierValue(itemModelDefinition, item);
+                        var idOrPk = (0, utils_1.getIdentifierValue)(itemModelDefinition, item);
                         items.set(idOrPk, item);
                     });
                     // remove deleted items from the final result set
@@ -1900,7 +2020,7 @@ var DataStore = /** @class */ (function () {
                     var pagination = _this.processPagination(modelDefinition, options);
                     var sortPredicates = predicates_1.ModelSortPredicateCreator.getPredicates(pagination.sort);
                     if (sortPredicates.length) {
-                        var compareFn = util_1.sortCompareFunction(sortPredicates);
+                        var compareFn = (0, util_1.sortCompareFunction)(sortPredicates);
                         itemsToSort.sort(compareFn);
                     }
                 };
@@ -1913,18 +2033,18 @@ var DataStore = /** @class */ (function () {
                  * @param payload The payload from the Hub event.
                  */
                 var hubCallback = function (_a) {
-                    var payload = _a.payload;
                     var _b;
+                    var payload = _a.payload;
                     var event = payload.event, data = payload.data;
                     if (event === sync_1.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();
-                        core_1.Hub.remove('datastore', hubCallback);
+                        hubRemove();
                     }
                 };
-                core_1.Hub.listen('datastore', hubCallback);
-                return _this.runningProcesses.addCleaner(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                    return tslib_1.__generator(this, function (_a) {
+                var hubRemove = core_1.Hub.listen('datastore', hubCallback);
+                return _this.runningProcesses.addCleaner(function () { return __awaiter(_this, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
                         if (handle) {
                             handle.unsubscribe();
                         }
@@ -1934,12 +2054,22 @@ var DataStore = /** @class */ (function () {
             });
         };
         this.configure = function (config) {
+            var _a;
             if (config === void 0) { config = {}; }
-            _this.amplifyContext.Auth = _this.Auth;
             _this.amplifyContext.InternalAPI = _this.InternalAPI;
-            _this.amplifyContext.Cache = _this.Cache;
-            var configDataStore = config.DataStore, configAuthModeStrategyType = config.authModeStrategyType, configConflictHandler = config.conflictHandler, configErrorHandler = config.errorHandler, configMaxRecordsToSync = config.maxRecordsToSync, configSyncPageSize = config.syncPageSize, configFullSyncInterval = config.fullSyncInterval, configSyncExpressions = config.syncExpressions, configAuthProviders = config.authProviders, configStorageAdapter = config.storageAdapter, configFromAmplify = tslib_1.__rest(config, ["DataStore", "authModeStrategyType", "conflictHandler", "errorHandler", "maxRecordsToSync", "syncPageSize", "fullSyncInterval", "syncExpressions", "authProviders", "storageAdapter"]);
-            _this.amplifyConfig = tslib_1.__assign(tslib_1.__assign({}, configFromAmplify), _this.amplifyConfig);
+            var configDataStore = config.DataStore, configAuthModeStrategyType = config.authModeStrategyType, configConflictHandler = config.conflictHandler, configErrorHandler = config.errorHandler, configMaxRecordsToSync = config.maxRecordsToSync, configSyncPageSize = config.syncPageSize, configFullSyncInterval = config.fullSyncInterval, configSyncExpressions = config.syncExpressions, configAuthProviders = config.authProviders, configStorageAdapter = config.storageAdapter, configFromAmplify = __rest(config, ["DataStore", "authModeStrategyType", "conflictHandler", "errorHandler", "maxRecordsToSync", "syncPageSize", "fullSyncInterval", "syncExpressions", "authProviders", "storageAdapter"]);
+            var apiKey = '';
+            var currentAppSyncConfig = (_a = core_1.Amplify.getConfig().API) === null || _a === void 0 ? void 0 : _a.AppSync;
+            if ((currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.defaultAuthMode.type) === 'apiKey') {
+                apiKey = currentAppSyncConfig.defaultAuthMode.apiKey;
+            }
+            var appSyncConfig = {
+                aws_appsync_graphqlEndpoint: currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.endpoint,
+                aws_appsync_authenticationType: currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.defaultAuthMode.type,
+                aws_appsync_region: currentAppSyncConfig === null || currentAppSyncConfig === void 0 ? void 0 : currentAppSyncConfig.region,
+                aws_appsync_apiKey: apiKey,
+            };
+            _this.amplifyConfig = __assign(__assign(__assign({}, _this.amplifyConfig), configFromAmplify), (currentAppSyncConfig && appSyncConfig));
             _this.conflictHandler = _this.setConflictHandler(config);
             _this.errorHandler = _this.setErrorHandler(config);
             var authModeStrategyType = (configDataStore && configDataStore.authModeStrategyType) ||
@@ -1947,7 +2077,7 @@ var DataStore = /** @class */ (function () {
                 types_1.AuthModeStrategyType.DEFAULT;
             switch (authModeStrategyType) {
                 case types_1.AuthModeStrategyType.MULTI_AUTH:
-                    _this.authModeStrategy = authModeStrategies_1.multiAuthStrategy(_this.amplifyContext);
+                    _this.authModeStrategy = (0, authModeStrategies_1.multiAuthStrategy)(_this.amplifyContext);
                     break;
                 case types_1.AuthModeStrategyType.DEFAULT:
                     _this.authModeStrategy = authModeStrategies_1.defaultAuthStrategy;
@@ -2011,7 +2141,7 @@ var DataStore = /** @class */ (function () {
         var handler = function (err) {
             if (err.message.startsWith('BackgroundManagerNotOpenError')) {
                 throw new Error([
-                    "DataStoreStateError: Tried to execute `" + operation + "` while DataStore was \"" + _this.state + "\".",
+                    "DataStoreStateError: Tried to execute `".concat(operation, "` while DataStore was \"").concat(_this.state, "\"."),
                     "This can only be done while DataStore is \"Started\" or \"Stopped\". To remedy:",
                     'Ensure all calls to `stop()` and `clear()` have completed first.',
                     'If this is not possible, retry the operation until it succeeds.',
@@ -2032,8 +2162,8 @@ var DataStore = /** @class */ (function () {
      * DataStore, such as `query()`, `save()`, or `delete()`.
      */
     DataStore.prototype.clear = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         checkSchemaInitialized();
@@ -2080,8 +2210,8 @@ var DataStore = /** @class */ (function () {
      * running queries and terminates subscriptions."
      */
     DataStore.prototype.stop = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.state = DataStoreState.Stopping;
@@ -2154,18 +2284,18 @@ var DataStore = /** @class */ (function () {
      * SchemaModel -> predicate to use during sync.
      */
     DataStore.prototype.processSyncExpressions = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var syncPredicates;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!this.syncExpressions || !this.syncExpressions.length) {
                             return [2 /*return*/, new WeakMap()];
                         }
-                        return [4 /*yield*/, Promise.all(this.syncExpressions.map(function (syncExpression) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, Promise.all(this.syncExpressions.map(function (syncExpression) { return __awaiter(_this, void 0, void 0, function () {
                                 var _a, modelConstructor, conditionProducer, modelDefinition, condition, predicate;
-                                return tslib_1.__generator(this, function (_b) {
+                                return __generator(this, function (_b) {
                                     switch (_b.label) {
                                         case 0: return [4 /*yield*/, syncExpression];
                                         case 1:
@@ -2174,13 +2304,13 @@ var DataStore = /** @class */ (function () {
                                             return [4 /*yield*/, this.unwrapPromise(conditionProducer)];
                                         case 2:
                                             condition = _b.sent();
-                                            if (predicates_1.isPredicatesAll(condition)) {
+                                            if ((0, predicates_1.isPredicatesAll)(condition)) {
                                                 return [2 /*return*/, [modelDefinition, null]];
                                             }
-                                            predicate = next_1.internals(condition(next_1.predicateFor({
+                                            predicate = (0, next_1.internals)(condition((0, next_1.predicateFor)({
                                                 builder: modelConstructor,
                                                 schema: modelDefinition,
-                                                pkField: util_1.extractPrimaryKeyFieldNames(modelDefinition),
+                                                pkField: (0, util_1.extractPrimaryKeyFieldNames)(modelDefinition),
                                             }))).toStoragePredicate();
                                             return [2 /*return*/, [modelDefinition, predicate]];
                                     }
@@ -2194,9 +2324,9 @@ var DataStore = /** @class */ (function () {
         });
     };
     DataStore.prototype.unwrapPromise = function (conditionProducer) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var condition, error_1;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
@@ -2217,10 +2347,10 @@ var DataStore = /** @class */ (function () {
     };
     DataStore.prototype.weakMapFromEntries = function (entries) {
         return entries.reduce(function (map, _a) {
-            var _b = tslib_1.__read(_a, 2), modelDefinition = _b[0], predicate = _b[1];
+            var _b = __read(_a, 2), modelDefinition = _b[0], predicate = _b[1];
             if (map.has(modelDefinition)) {
                 var name_2 = modelDefinition.name;
-                logger.warn("You can only utilize one Sync Expression per model.\n          Subsequent sync expressions for the " + name_2 + " model will be ignored.");
+                logger.warn("You can only utilize one Sync Expression per model.\n          Subsequent sync expressions for the ".concat(name_2, " model will be ignored."));
                 return map;
             }
             if (predicate) {
@@ -2239,8 +2369,8 @@ var DataStore = /** @class */ (function () {
             if (sessionId) {
                 var aws_appsync_graphqlEndpoint = this.amplifyConfig.aws_appsync_graphqlEndpoint;
                 var appSyncUrl = aws_appsync_graphqlEndpoint.split('/')[2];
-                var _a = tslib_1.__read(appSyncUrl.split('.'), 1), appSyncId = _a[0];
-                return sessionId + "-" + appSyncId;
+                var _a = __read(appSyncUrl.split('.'), 1), appSyncId = _a[0];
+                return "".concat(sessionId, "-").concat(appSyncId);
             }
         }
         catch (_b) { }
@@ -2251,5 +2381,9 @@ var DataStore = /** @class */ (function () {
 exports.DataStoreClass = DataStore;
 var instance = new DataStore();
 exports.DataStore = instance;
-core_1.Amplify.register(instance);
-//# sourceMappingURL=datastore.js.map
+instance.configure({});
+core_1.Hub.listen('core', function (capsule) {
+    if (capsule.payload.event === 'configure') {
+        instance.configure({});
+    }
+});