@aws-amplify/datastore 4.7.24 → 4.7.27

package/lib/datastore/datastore.js

@@ -1,5 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DataStore = exports.initSchema = exports.DataStoreClass = exports.AsyncCollection = exports.AsyncItem = exports.getAttachment = exports.syncClasses = void 0;
+exports.attached = attached;
 var tslib_1 = require("tslib");
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
@@ -23,12 +25,12 @@ var loadGetRandomValues_1 = require("./loadGetRandomValues");
 // `uuid` v4 (used below to mint model ids) requires `crypto.getRandomValues`,
 // which is not available in React Native. On RN this loads the
 // `react-native-get-random-values` polyfill; on web/Node it is a no-op.
-loadGetRandomValues_1.loadGetRandomValues();
-immer_1.setAutoFreeze(true);
-immer_1.enablePatches();
+(0, loadGetRandomValues_1.loadGetRandomValues)();
+(0, immer_1.setAutoFreeze)(true);
+(0, immer_1.enablePatches)();
 var logger = new core_1.ConsoleLogger('DataStore');
-var ulid = util_1.monotonicUlidFactory(Date.now());
-var isNode = core_1.browserOrNode().isNode;
+var ulid = (0, util_1.monotonicUlidFactory)(Date.now());
+var isNode = (0, core_1.browserOrNode)().isNode;
 var SETTING_SCHEMA_VERSION = 'schemaVersion';
 var schema;
 var modelNamespaceMap = new WeakMap();
@@ -53,12 +55,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;
 };
@@ -87,10 +89,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,
@@ -151,7 +153,6 @@ function attached(result, attachment) {
     }
     return result;
 }
-exports.attached = attached;
 /**
  * Determines what source a model instance should lazy load from.
  *
@@ -159,11 +160,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) {
@@ -194,7 +196,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 = tslib_1.__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();
@@ -216,16 +218,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),
                             };
                         },
                     });
@@ -261,7 +263,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 = tslib_1.__assign(tslib_1.__assign({}, Object.fromEntries(tslib_1.__spreadArray([], tslib_1.__read(indexFields.values()), false).map(function (name) { return [
                 name,
                 {
                     name: name,
@@ -347,10 +349,10 @@ var checkSchemaCodegenVersion = function (codegenVersion) {
         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);
@@ -385,24 +387,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') {
@@ -415,33 +417,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 {
@@ -449,7 +451,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));
                     }
                 }
             }
@@ -457,34 +459,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]);
                             });
@@ -493,7 +495,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]);
@@ -509,8 +511,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);
         }
@@ -591,7 +593,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);
@@ -599,18 +601,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);
@@ -627,7 +629,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);
@@ -641,13 +643,13 @@ 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];
                 });
@@ -663,7 +665,7 @@ var createModelClass = function (modelDefinition) {
             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 mergedPatches = (0, util_1.mergePatches)(existingSource, existingPatches, patches);
                     modelPatchesMap.set(model, [mergedPatches, existingSource]);
                     checkReadOnlyPropertyOnUpdate(mergedPatches, modelDefinition);
                 }
@@ -708,7 +710,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;
@@ -725,13 +727,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);
                         }
@@ -740,7 +742,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)
@@ -762,7 +765,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
@@ -788,7 +791,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;
                                 }
@@ -798,7 +801,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 {
@@ -901,25 +904,27 @@ var AsyncCollection = /** @class */ (function () {
      * const first100 = await collection.toArray({max: 100});
      * ```
      */
-    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) {
+    AsyncCollection.prototype.toArray = function () {
+        return tslib_1.__awaiter(this, arguments, void 0, function (_a) {
+            var output, i, _b, _c, _d, element, e_6_1;
+            var _e, e_6, _f, _g;
+            var _h = _a === void 0 ? {} : _a, _j = _h.max, max = _j === void 0 ? Number.MAX_SAFE_INTEGER : _j;
+            return tslib_1.__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]);
+                        _b = true, _c = tslib_1.__asyncValues(this);
+                        _k.label = 2;
+                    case 2: return [4 /*yield*/, _c.next()];
                     case 3:
-                        if (!(_e = _f.sent(), !_e.done)) return [3 /*break*/, 5];
-                        element = _e.value;
+                        if (!(_d = _k.sent(), _e = _d.done, !_e)) return [3 /*break*/, 5];
+                        _g = _d.value;
+                        _b = false;
+                        element = _g;
                         if (i < max) {
                             output.push(element);
                             i++;
@@ -927,20 +932,22 @@ var AsyncCollection = /** @class */ (function () {
                         else {
                             return [3 /*break*/, 5];
                         }
-                        _f.label = 4;
-                    case 4: return [3 /*break*/, 2];
+                        _k.label = 4;
+                    case 4:
+                        _b = true;
+                        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 (!(!_b && !_e && (_f = _c.return))) return [3 /*break*/, 9];
+                        return [4 /*yield*/, _f.call(_c)];
                     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;
@@ -959,7 +966,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."));
         }
     });
 };
@@ -971,14 +978,14 @@ var checkReadOnlyPropertyOnUpdate = function (patches, modelDefinition) {
         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;
@@ -987,7 +994,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) {
@@ -1017,13 +1024,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);
     }
@@ -1312,7 +1319,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;
@@ -1325,7 +1332,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:
@@ -1333,26 +1340,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)];
                             }
                         });
@@ -1393,7 +1400,7 @@ 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 () {
                                             var nonHasManyRelationships, nonHasManyRelationships_1, nonHasManyRelationships_1_1, relationship, queryObject, related, e_7_1;
@@ -1418,10 +1425,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;
@@ -1446,7 +1453,7 @@ 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 () {
                                             var saved;
@@ -1526,7 +1533,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 });
@@ -1535,14 +1542,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 ||
@@ -1576,10 +1583,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 {
@@ -1621,7 +1628,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);
@@ -1638,10 +1645,10 @@ 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;
@@ -1671,8 +1678,8 @@ var DataStore = /** @class */ (function () {
                                                             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();
@@ -1754,9 +1761,9 @@ 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
@@ -1772,7 +1779,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).
@@ -1789,7 +1796,7 @@ var DataStore = /** @class */ (function () {
                                                 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)];
@@ -1858,11 +1865,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 = tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(Array.from(items.values())), false), tslib_1.__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
@@ -1905,7 +1912,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);
                     }
                 };
@@ -1918,8 +1925,8 @@ 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) {
@@ -1952,7 +1959,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;
@@ -2016,7 +2023,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.',
@@ -2179,13 +2186,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]];
                                     }
@@ -2225,7 +2232,7 @@ var DataStore = /** @class */ (function () {
             var _b = tslib_1.__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) {
@@ -2245,7 +2252,7 @@ var DataStore = /** @class */ (function () {
                 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;
+                return "".concat(sessionId, "-").concat(appSyncId);
             }
         }
         catch (_b) { }