@aws-amplify/datastore 4.7.24 → 4.7.26

package/lib-esm/authModeStrategies/multiAuthStrategy.js

@@ -1,4 +1,4 @@
-import { __awaiter, __generator, __read, __spread } from "tslib";
+import { __awaiter, __generator, __read, __spreadArray } from "tslib";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { Auth } from '@aws-amplify/auth';
@@ -30,7 +30,7 @@ function sortAuthRulesWithPriority(rules) {
         ModelAttributeAuthProvider.IAM,
         ModelAttributeAuthProvider.API_KEY,
     ];
-    return __spread(rules).sort(function (a, b) {
+    return __spreadArray([], __read(rules), false).sort(function (a, b) {
         if (a.allow === b.allow) {
             return (providerSortPriority.indexOf(getProviderFromRule(a)) -
                 providerSortPriority.indexOf(getProviderFromRule(b)));
@@ -107,38 +107,36 @@ function getAuthRules(_a) {
  * @returns A sorted array of auth modes to attempt.
  */
 export var multiAuthStrategy = function (amplifyContext) {
-    return function (_a) {
-        var schema = _a.schema, modelName = _a.modelName;
-        return __awaiter(void 0, void 0, void 0, function () {
-            var currentUser, e_1, attributes, authAttribute, sortedRules;
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
-                    case 0:
-                        amplifyContext.Auth = amplifyContext.Auth || Auth;
-                        _c.label = 1;
-                    case 1:
-                        _c.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, amplifyContext.Auth.currentAuthenticatedUser()];
-                    case 2:
-                        currentUser = _c.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        e_1 = _c.sent();
-                        return [3 /*break*/, 4];
-                    case 4:
-                        attributes = schema.namespaces.user.models[modelName].attributes;
-                        if (attributes) {
-                            authAttribute = attributes.find(function (attr) { return attr.type === 'auth'; });
-                            if ((_b = authAttribute === null || authAttribute === void 0 ? void 0 : authAttribute.properties) === null || _b === void 0 ? void 0 : _b.rules) {
-                                sortedRules = sortAuthRulesWithPriority(authAttribute.properties.rules);
-                                return [2 /*return*/, getAuthRules({ currentUser: currentUser, rules: sortedRules })];
-                            }
+    return function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
+        var currentUser, e_1, attributes, authAttribute, sortedRules;
+        var _c;
+        var schema = _b.schema, modelName = _b.modelName;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    amplifyContext.Auth = amplifyContext.Auth || Auth;
+                    _d.label = 1;
+                case 1:
+                    _d.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, amplifyContext.Auth.currentAuthenticatedUser()];
+                case 2:
+                    currentUser = _d.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    e_1 = _d.sent();
+                    return [3 /*break*/, 4];
+                case 4:
+                    attributes = schema.namespaces.user.models[modelName].attributes;
+                    if (attributes) {
+                        authAttribute = attributes.find(function (attr) { return attr.type === 'auth'; });
+                        if ((_c = authAttribute === null || authAttribute === void 0 ? void 0 : authAttribute.properties) === null || _c === void 0 ? void 0 : _c.rules) {
+                            sortedRules = sortAuthRulesWithPriority(authAttribute.properties.rules);
+                            return [2 /*return*/, getAuthRules({ currentUser: currentUser, rules: sortedRules })];
                         }
-                        return [2 /*return*/, []];
-                }
-            });
+                    }
+                    return [2 /*return*/, []];
+            }
         });
-    };
+    }); };
 };
 //# sourceMappingURL=multiAuthStrategy.js.map

package/lib-esm/authModeStrategies/multiAuthStrategy.js.map

@@ -1 +1 @@
-{"version":3,"file":"multiAuthStrategy.js","sourceRoot":"","sources":["../../src/authModeStrategies/multiAuthStrategy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"multiAuthStrategy.js","sourceRoot":"","sources":["../../src/authModeStrategies/multiAuthStrategy.ts"],"names":[],"mappings":"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"}

package/lib-esm/datastore/datastore.d.ts

@@ -1,6 +1,6 @@
 import Observable from 'zen-observable-ts';
 import { PredicateAll } from '../predicates';
-import { ConflictHandler, DataStoreConfig, NonModelTypeConstructor, ProducerPaginationInput, PersistentModel, PersistentModelConstructor, Schema, SubscriptionMessage, DataStoreSnapshot, TypeConstructorMap, ErrorHandler, ObserveQueryOptions, PersistentModelMetaData, IdentifierFieldOrIdentifierObject, RecursiveModelPredicateExtender, ModelPredicateExtender } from '../types';
+import { ConflictHandler, DataStoreConfig, ProducerPaginationInput, PersistentModel, PersistentModelConstructor, Schema, SubscriptionMessage, DataStoreSnapshot, TypeConstructorMap, ErrorHandler, ObserveQueryOptions, PersistentModelMetaData, IdentifierFieldOrIdentifierObject, RecursiveModelPredicateExtender, ModelPredicateExtender } from '../types';
 export declare let syncClasses: TypeConstructorMap;
 /**
  * Describes whether and to what a model is attached for lazy loading purposes.
@@ -41,8 +41,8 @@ export declare function attached<T extends PersistentModel | PersistentModel[]>(
  *
  * @param instance A model instance
  */
-export declare const getAttachment: (instance: Readonly<Record<string, any>>) => ModelAttachment.Detached | ModelAttachment;
-declare const initSchema: (userSchema: Schema) => Record<string, PersistentModelConstructor<any> | NonModelTypeConstructor<unknown>>;
+export declare const getAttachment: (instance: PersistentModel) => ModelAttachment;
+declare const initSchema: (userSchema: Schema) => TypeConstructorMap;
 /**
  * Constructs a model and records it with its metadata in a weakset. Allows for
  * the separate storage of core model fields and Amplify/DataStore metadata
@@ -173,7 +173,7 @@ declare class DataStore {
         <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, identifier: IdentifierFieldOrIdentifierObject<T, PersistentModelMetaData<T>>): Promise<T | undefined>;
         <T extends PersistentModel>(modelConstructor: PersistentModelConstructor<T>, criteria?: RecursiveModelPredicateExtender<T> | typeof PredicateAll | null, paginationProducer?: ProducerPaginationInput<T>): Promise<T[]>;
     };
-    save: <T extends Readonly<Record<string, any>>>(model: T, condition?: ModelPredicateExtender<T>) => Promise<T>;
+    save: <T extends PersistentModel>(model: T, condition?: ModelPredicateExtender<T>) => Promise<T>;
     setConflictHandler: (config: DataStoreConfig) => ConflictHandler;
     setErrorHandler: (config: DataStoreConfig) => ErrorHandler;
     delete: {

package/lib-esm/datastore/datastore.js

@@ -1,4 +1,4 @@
-import { __assign, __asyncValues, __awaiter, __extends, __generator, __read, __rest, __spread, __values } from "tslib";
+import { __assign, __asyncValues, __awaiter, __extends, __generator, __read, __rest, __spreadArray, __values } from "tslib";
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { InternalAPI } from '@aws-amplify/api/internals';
@@ -56,7 +56,7 @@ var isValidModelConstructor = function (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;
 };
@@ -220,7 +220,7 @@ var initSchema = function (userSchema) {
                         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,
@@ -260,7 +260,7 @@ var initSchema = function (userSchema) {
                 }
                 finally { if (e_2) throw e_2.error; }
             }
-            model.allFields = __assign(__assign({}, Object.fromEntries(__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,
@@ -345,10 +345,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);
@@ -390,7 +390,7 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
         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 (isSchemaModelWithAttributes(modelDefinition) &&
             !isIdManaged(modelDefinition)) {
@@ -413,17 +413,17 @@ 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 (!isNullOrUndefined(v) &&
                     v.some(function (e) {
@@ -432,7 +432,7 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
                     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 && !isNullOrUndefined(v)) {
                     var validationStatus = v.map(function (e) {
@@ -447,7 +447,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));
                     }
                 }
             }
@@ -455,13 +455,13 @@ 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 (!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 (isNonModelFieldType(type_1)) {
@@ -472,15 +472,15 @@ var validateModelFields = function (modelDefinition) { return function (k, v) {
                 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 ((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 (!isNullOrUndefined(item)) {
                             Object.keys(subNonModelDefinition_1.fields).forEach(function (subKey) {
@@ -491,7 +491,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]);
@@ -645,7 +645,7 @@ var createModelClass = function (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];
                 });
@@ -723,13 +723,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);
                         }
@@ -738,7 +738,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)
@@ -786,7 +787,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;
                                 }
@@ -899,25 +900,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 __awaiter(this, void 0, void 0, function () {
-            var output, i, _d, _e, element, e_6_1;
-            return __generator(this, function (_f) {
-                switch (_f.label) {
+    AsyncCollection.prototype.toArray = function () {
+        return __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 __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 = __asyncValues(this);
-                        _f.label = 2;
-                    case 2: return [4 /*yield*/, _d.next()];
+                        _k.trys.push([1, 6, 7, 12]);
+                        _b = true, _c = __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++;
@@ -925,20 +928,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;
@@ -957,7 +962,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."));
         }
     });
 };
@@ -969,7 +974,7 @@ 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."));
         }
     });
 };
@@ -1015,13 +1020,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);
     }
@@ -1416,10 +1421,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;
@@ -1856,7 +1861,7 @@ 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 = __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);
@@ -1916,8 +1921,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 === 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) {
@@ -2014,7 +2019,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.',
@@ -2223,7 +2228,7 @@ var DataStore = /** @class */ (function () {
             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) {
@@ -2243,7 +2248,7 @@ var DataStore = /** @class */ (function () {
                 var aws_appsync_graphqlEndpoint = this.amplifyConfig.aws_appsync_graphqlEndpoint;
                 var appSyncUrl = aws_appsync_graphqlEndpoint.split('/')[2];
                 var _a = __read(appSyncUrl.split('.'), 1), appSyncId = _a[0];
-                return sessionId + "-" + appSyncId;
+                return "".concat(sessionId, "-").concat(appSyncId);
             }
         }
         catch (_b) { }