@aws-amplify/datastore 4.7.6-api-v6-models.b3abc9b.0 → 5.0.0

package/lib/storage/storage.js

@@ -1,29 +1,33 @@
 "use strict";
+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.ExclusiveStorage = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var core_1 = require("@aws-amplify/core");
-var zen_push_1 = tslib_1.__importDefault(require("zen-push"));
-var predicates_1 = require("../predicates");
-var types_1 = require("../types");
-var util_1 = require("../util");
-var utils_1 = require("../sync/utils");
-var getDefaultAdapter_1 = tslib_1.__importDefault(require("./adapter/getDefaultAdapter"));
-var logger = new core_1.Logger('DataStore');
-var StorageClass = /** @class */ (function () {
-    function StorageClass(schema, namespaceResolver, getModelConstructorByModelName, modelInstanceCreator, adapter, sessionId) {
+const rxjs_1 = require("rxjs");
+const predicates_1 = require("../predicates");
+const types_1 = require("../types");
+const util_1 = require("../util");
+const utils_1 = require("../sync/utils");
+const getDefaultAdapter_1 = __importDefault(require("./adapter/getDefaultAdapter"));
+const utils_2 = require("@aws-amplify/core/internals/utils");
+const core_1 = require("@aws-amplify/core");
+const logger = new core_1.ConsoleLogger('DataStore');
+class StorageClass {
+    constructor(schema, namespaceResolver, getModelConstructorByModelName, modelInstanceCreator, adapter, sessionId) {
         this.schema = schema;
         this.namespaceResolver = namespaceResolver;
         this.getModelConstructorByModelName = getModelConstructorByModelName;
         this.modelInstanceCreator = modelInstanceCreator;
         this.adapter = adapter;
         this.sessionId = sessionId;
-        this.adapter = this.adapter || getDefaultAdapter_1.default();
-        this.pushStream = new zen_push_1.default();
+        this.adapter = this.adapter || (0, getDefaultAdapter_1.default)();
+        this.pushStream = new rxjs_1.Subject();
     }
-    StorageClass.getNamespace = function () {
-        var namespace = {
+    static getNamespace() {
+        const namespace = {
             name: util_1.STORAGE,
             relationships: {},
             enums: {},
@@ -31,371 +35,235 @@ var StorageClass = /** @class */ (function () {
             nonModels: {},
         };
         return namespace;
-    };
-    StorageClass.prototype.init = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var resolve, reject;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        if (!(this.initialized !== undefined)) return [3 /*break*/, 2];
-                        return [4 /*yield*/, this.initialized];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                    case 2:
-                        logger.debug('Starting Storage');
-                        this.initialized = new Promise(function (res, rej) {
-                            resolve = res;
-                            reject = rej;
-                        });
-                        this.adapter.setUp(this.schema, this.namespaceResolver, this.modelInstanceCreator, this.getModelConstructorByModelName, this.sessionId).then(resolve, reject);
-                        return [4 /*yield*/, this.initialized];
-                    case 3:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    StorageClass.prototype.save = function (model, condition, mutator, patchesTuple) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var result;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.init()];
-                    case 1:
-                        _a.sent();
-                        if (!this.adapter) {
-                            throw new Error('Storage adapter is missing');
-                        }
-                        return [4 /*yield*/, this.adapter.save(model, condition)];
-                    case 2:
-                        result = _a.sent();
-                        result.forEach(function (r) {
-                            var _a = tslib_1.__read(r, 2), savedElement = _a[0], opType = _a[1];
-                            // truthy when save is called by the Merger
-                            var syncResponse = !!mutator;
-                            var updateMutationInput;
-                            // don't attempt to calc mutation input when storage.save
-                            // is called by Merger, i.e., when processing an AppSync response
-                            if ((opType === types_1.OpType.UPDATE || opType === types_1.OpType.INSERT) &&
-                                !syncResponse) {
-                                //
-                                // TODO: LOOK!!!
-                                // the `model` used here is in effect regardless of what model
-                                // comes back from adapter.save().
-                                // Prior to fix, SQLite adapter had been returning two models
-                                // of different types, resulting in invalid outbox entries.
-                                //
-                                // the bug is essentially fixed in SQLite adapter.
-                                // leaving as-is, because it's currently unclear whether anything
-                                // depends on this remaining as-is.
-                                //
-                                updateMutationInput = _this.getChangedFieldsInput(model, savedElement, patchesTuple);
-                                // // an update without changed user fields
-                                // => don't create mutationEvent
-                                if (updateMutationInput === null) {
-                                    return result;
-                                }
-                            }
-                            var element = updateMutationInput || savedElement;
-                            var modelConstructor = Object.getPrototypeOf(savedElement)
-                                .constructor;
-                            _this.pushStream.next({
-                                model: modelConstructor,
-                                opType: opType,
-                                element: element,
-                                mutator: mutator,
-                                condition: (condition &&
-                                    predicates_1.ModelPredicateCreator.getPredicates(condition, false)) ||
-                                    null,
-                                savedElement: savedElement,
-                            });
-                        });
-                        return [2 /*return*/, result];
-                }
-            });
-        });
-    };
-    StorageClass.prototype.delete = function (modelOrModelConstructor, condition, mutator) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var models, deleted, modelConstructor, namespaceName, modelDefinition, modelIds;
-            var _a;
-            var _this = this;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.init()];
-                    case 1:
-                        _b.sent();
-                        if (!this.adapter) {
-                            throw new Error('Storage adapter is missing');
-                        }
-                        return [4 /*yield*/, this.adapter.delete(modelOrModelConstructor, condition)];
-                    case 2:
-                        _a = tslib_1.__read.apply(void 0, [_b.sent(), 2]), models = _a[0], deleted = _a[1];
-                        modelConstructor = util_1.isModelConstructor(modelOrModelConstructor)
-                            ? modelOrModelConstructor
-                            : Object.getPrototypeOf(modelOrModelConstructor || {})
-                                .constructor;
-                        namespaceName = this.namespaceResolver(modelConstructor);
-                        modelDefinition = this.schema.namespaces[namespaceName].models[modelConstructor.name];
-                        modelIds = new Set(models.map(function (model) {
-                            var modelId = utils_1.getIdentifierValue(modelDefinition, model);
-                            return modelId;
-                        }));
-                        if (!util_1.isModelConstructor(modelOrModelConstructor) &&
-                            !Array.isArray(deleted)) {
-                            deleted = [deleted];
-                        }
-                        deleted.forEach(function (model) {
-                            var modelConstructor = Object.getPrototypeOf(model)
-                                .constructor;
-                            var theCondition;
-                            if (!util_1.isModelConstructor(modelOrModelConstructor)) {
-                                var modelId = utils_1.getIdentifierValue(modelDefinition, model);
-                                theCondition = modelIds.has(modelId)
-                                    ? predicates_1.ModelPredicateCreator.getPredicates(condition, false)
-                                    : undefined;
-                            }
-                            _this.pushStream.next({
-                                model: modelConstructor,
-                                opType: types_1.OpType.DELETE,
-                                element: model,
-                                mutator: mutator,
-                                condition: theCondition || null,
-                            });
-                        });
-                        return [2 /*return*/, [models, deleted]];
-                }
-            });
+    }
+    async init() {
+        if (this.initialized !== undefined) {
+            await this.initialized;
+            return;
+        }
+        logger.debug('Starting Storage');
+        let resolve;
+        let reject;
+        this.initialized = new Promise((res, rej) => {
+            resolve = res;
+            reject = rej;
         });
-    };
-    StorageClass.prototype.query = function (modelConstructor, predicate, pagination) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.init()];
-                    case 1:
-                        _a.sent();
-                        if (!this.adapter) {
-                            throw new Error('Storage adapter is missing');
-                        }
-                        return [4 /*yield*/, this.adapter.query(modelConstructor, predicate, pagination)];
-                    case 2: return [2 /*return*/, _a.sent()];
+        this.adapter.setUp(this.schema, this.namespaceResolver, this.modelInstanceCreator, this.getModelConstructorByModelName, this.sessionId).then(resolve, reject);
+        await this.initialized;
+    }
+    async save(model, condition, mutator, patchesTuple) {
+        await this.init();
+        if (!this.adapter) {
+            throw new Error('Storage adapter is missing');
+        }
+        const result = await this.adapter.save(model, condition);
+        result.forEach(r => {
+            const [savedElement, opType] = r;
+            // truthy when save is called by the Merger
+            const syncResponse = !!mutator;
+            let updateMutationInput;
+            // don't attempt to calc mutation input when storage.save
+            // is called by Merger, i.e., when processing an AppSync response
+            if ((opType === types_1.OpType.UPDATE || opType === types_1.OpType.INSERT) &&
+                !syncResponse) {
+                //
+                // TODO: LOOK!!!
+                // the `model` used here is in effect regardless of what model
+                // comes back from adapter.save().
+                // Prior to fix, SQLite adapter had been returning two models
+                // of different types, resulting in invalid outbox entries.
+                //
+                // the bug is essentially fixed in SQLite adapter.
+                // leaving as-is, because it's currently unclear whether anything
+                // depends on this remaining as-is.
+                //
+                updateMutationInput = this.getChangedFieldsInput(model, savedElement, patchesTuple);
+                // // an update without changed user fields
+                // => don't create mutationEvent
+                if (updateMutationInput === null) {
+                    return result;
                 }
+            }
+            const element = updateMutationInput || savedElement;
+            const modelConstructor = Object.getPrototypeOf(savedElement)
+                .constructor;
+            this.pushStream.next({
+                model: modelConstructor,
+                opType,
+                element,
+                mutator,
+                condition: (condition &&
+                    predicates_1.ModelPredicateCreator.getPredicates(condition, false)) ||
+                    null,
+                savedElement,
             });
         });
-    };
-    StorageClass.prototype.queryOne = function (modelConstructor, firstOrLast) {
-        if (firstOrLast === void 0) { firstOrLast = types_1.QueryOne.FIRST; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.init()];
-                    case 1:
-                        _a.sent();
-                        if (!this.adapter) {
-                            throw new Error('Storage adapter is missing');
-                        }
-                        return [4 /*yield*/, this.adapter.queryOne(modelConstructor, firstOrLast)];
-                    case 2: return [2 /*return*/, _a.sent()];
-                }
+        return result;
+    }
+    async delete(modelOrModelConstructor, condition, mutator) {
+        await this.init();
+        if (!this.adapter) {
+            throw new Error('Storage adapter is missing');
+        }
+        let models;
+        let deleted;
+        [models, deleted] = await this.adapter.delete(modelOrModelConstructor, condition);
+        const modelConstructor = (0, util_1.isModelConstructor)(modelOrModelConstructor)
+            ? modelOrModelConstructor
+            : Object.getPrototypeOf(modelOrModelConstructor || {})
+                .constructor;
+        const namespaceName = this.namespaceResolver(modelConstructor);
+        const modelDefinition = this.schema.namespaces[namespaceName].models[modelConstructor.name];
+        const modelIds = new Set(models.map(model => {
+            const modelId = (0, utils_1.getIdentifierValue)(modelDefinition, model);
+            return modelId;
+        }));
+        if (!(0, util_1.isModelConstructor)(modelOrModelConstructor) &&
+            !Array.isArray(deleted)) {
+            deleted = [deleted];
+        }
+        deleted.forEach(model => {
+            const modelConstructor = Object.getPrototypeOf(model)
+                .constructor;
+            let theCondition;
+            if (!(0, util_1.isModelConstructor)(modelOrModelConstructor)) {
+                const modelId = (0, utils_1.getIdentifierValue)(modelDefinition, model);
+                theCondition = modelIds.has(modelId)
+                    ? predicates_1.ModelPredicateCreator.getPredicates(condition, false)
+                    : undefined;
+            }
+            this.pushStream.next({
+                model: modelConstructor,
+                opType: types_1.OpType.DELETE,
+                element: model,
+                mutator,
+                condition: theCondition || null,
             });
         });
-    };
-    StorageClass.prototype.observe = function (modelConstructor, predicate, skipOwn) {
-        var listenToAll = !modelConstructor;
-        var _a = (predicate && predicates_1.ModelPredicateCreator.getPredicates(predicate, false)) ||
-            {}, predicates = _a.predicates, type = _a.type;
-        var result = this.pushStream.observable
-            .filter(function (_a) {
-            var mutator = _a.mutator;
+        return [models, deleted];
+    }
+    async query(modelConstructor, predicate, pagination) {
+        await this.init();
+        if (!this.adapter) {
+            throw new Error('Storage adapter is missing');
+        }
+        return await this.adapter.query(modelConstructor, predicate, pagination);
+    }
+    async queryOne(modelConstructor, firstOrLast = types_1.QueryOne.FIRST) {
+        await this.init();
+        if (!this.adapter) {
+            throw new Error('Storage adapter is missing');
+        }
+        return await this.adapter.queryOne(modelConstructor, firstOrLast);
+    }
+    observe(modelConstructor, predicate, skipOwn) {
+        const listenToAll = !modelConstructor;
+        const { predicates, type } = (predicate && predicates_1.ModelPredicateCreator.getPredicates(predicate, false)) ||
+            {};
+        let result = this.pushStream
+            .pipe((0, rxjs_1.filter)(({ mutator }) => {
             return !skipOwn || mutator !== skipOwn;
-        })
-            .map(function (_a) {
-            var _mutator = _a.mutator, message = tslib_1.__rest(_a, ["mutator"]);
-            return message;
-        });
+        }))
+            .pipe((0, rxjs_1.map)(({ mutator: _mutator, ...message }) => message));
         if (!listenToAll) {
-            result = result.filter(function (_a) {
-                var model = _a.model, element = _a.element;
+            result = result.pipe((0, rxjs_1.filter)(({ model, element }) => {
                 if (modelConstructor !== model) {
                     return false;
                 }
                 if (!!predicates && !!type) {
-                    return util_1.validatePredicate(element, type, predicates);
+                    return (0, util_1.validatePredicate)(element, type, predicates);
                 }
                 return true;
-            });
+            }));
         }
         return result;
-    };
-    StorageClass.prototype.clear = function (completeObservable) {
-        if (completeObservable === void 0) { completeObservable = true; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        this.initialized = undefined;
-                        if (!this.adapter) {
-                            throw new Error('Storage adapter is missing');
-                        }
-                        return [4 /*yield*/, this.adapter.clear()];
-                    case 1:
-                        _a.sent();
-                        if (completeObservable) {
-                            this.pushStream.complete();
-                        }
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    StorageClass.prototype.batchSave = function (modelConstructor, items, mutator) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var result;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.init()];
-                    case 1:
-                        _a.sent();
-                        if (!this.adapter) {
-                            throw new Error('Storage adapter is missing');
-                        }
-                        return [4 /*yield*/, this.adapter.batchSave(modelConstructor, items)];
-                    case 2:
-                        result = _a.sent();
-                        result.forEach(function (_a) {
-                            var _b = tslib_1.__read(_a, 2), element = _b[0], opType = _b[1];
-                            _this.pushStream.next({
-                                model: modelConstructor,
-                                opType: opType,
-                                element: element,
-                                mutator: mutator,
-                                condition: null,
-                            });
-                        });
-                        return [2 /*return*/, result];
-                }
+    }
+    async clear(completeObservable = true) {
+        this.initialized = undefined;
+        if (!this.adapter) {
+            throw new Error('Storage adapter is missing');
+        }
+        await this.adapter.clear();
+        if (completeObservable) {
+            this.pushStream.complete();
+        }
+    }
+    async batchSave(modelConstructor, items, mutator) {
+        await this.init();
+        if (!this.adapter) {
+            throw new Error('Storage adapter is missing');
+        }
+        const result = await this.adapter.batchSave(modelConstructor, items);
+        result.forEach(([element, opType]) => {
+            this.pushStream.next({
+                model: modelConstructor,
+                opType,
+                element,
+                mutator,
+                condition: null,
             });
         });
-    };
+        return result;
+    }
     // returns null if no user fields were changed (determined by value comparison)
-    StorageClass.prototype.getChangedFieldsInput = function (model, originalElement, patchesTuple) {
-        var e_1, _a;
-        var _b;
-        var containsPatches = patchesTuple && patchesTuple.length;
+    getChangedFieldsInput(model, originalElement, patchesTuple) {
+        const containsPatches = patchesTuple && patchesTuple.length;
         if (!containsPatches) {
             return null;
         }
-        var _c = tslib_1.__read(patchesTuple, 2), patches = _c[0], source = _c[1];
-        var updatedElement = {};
+        const [patches, source] = patchesTuple;
+        const updatedElement = {};
         // extract array of updated fields from patches
-        var updatedFields = (patches.map(function (patch) { return patch.path && patch.path[0]; }));
+        const updatedFields = (patches.map(patch => patch.path && patch.path[0]));
         // check model def for association and replace with targetName if exists
-        var modelConstructor = Object.getPrototypeOf(model)
+        const modelConstructor = Object.getPrototypeOf(model)
             .constructor;
-        var namespace = this.namespaceResolver(modelConstructor);
-        var fields = this.schema.namespaces[namespace].models[modelConstructor.name].fields;
-        var _d = ((_b = this.schema.namespaces[namespace].keys) === null || _b === void 0 ? void 0 : _b[modelConstructor.name]) || {}, primaryKey = _d.primaryKey, _e = _d.compositeKeys, compositeKeys = _e === void 0 ? [] : _e;
+        const namespace = this.namespaceResolver(modelConstructor);
+        const { fields } = this.schema.namespaces[namespace].models[modelConstructor.name];
+        const { primaryKey, compositeKeys = [] } = this.schema.namespaces[namespace].keys?.[modelConstructor.name] || {};
         // set original values for these fields
-        updatedFields.forEach(function (field) {
-            var e_2, _a, e_3, _b, e_4, _c, e_5, _d, e_6, _e;
-            var _f;
-            var targetNames = types_1.isTargetNameAssociation((_f = fields[field]) === null || _f === void 0 ? void 0 : _f.association);
+        updatedFields.forEach((field) => {
+            const targetNames = (0, types_1.isTargetNameAssociation)(fields[field]?.association);
             if (Array.isArray(targetNames)) {
-                try {
-                    // if field refers to a belongsTo relation, use the target field instead
-                    for (var targetNames_1 = tslib_1.__values(targetNames), targetNames_1_1 = targetNames_1.next(); !targetNames_1_1.done; targetNames_1_1 = targetNames_1.next()) {
-                        var targetName = targetNames_1_1.value;
-                        // check field values by value. Ignore unchanged fields
-                        if (!util_1.valuesEqual(source[targetName], originalElement[targetName])) {
-                            // if the field was updated to 'undefined', replace with 'null' for compatibility with JSON and GraphQL
-                            updatedElement[targetName] =
-                                originalElement[targetName] === undefined
-                                    ? null
-                                    : originalElement[targetName];
-                            try {
-                                for (var compositeKeys_1 = (e_3 = void 0, tslib_1.__values(compositeKeys)), compositeKeys_1_1 = compositeKeys_1.next(); !compositeKeys_1_1.done; compositeKeys_1_1 = compositeKeys_1.next()) {
-                                    var fieldSet = compositeKeys_1_1.value;
-                                    // include all of the fields that comprise the composite key
-                                    if (fieldSet.has(targetName)) {
-                                        try {
-                                            for (var fieldSet_1 = (e_4 = void 0, tslib_1.__values(fieldSet)), fieldSet_1_1 = fieldSet_1.next(); !fieldSet_1_1.done; fieldSet_1_1 = fieldSet_1.next()) {
-                                                var compositeField = fieldSet_1_1.value;
-                                                updatedElement[compositeField] =
-                                                    originalElement[compositeField];
-                                            }
-                                        }
-                                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
-                                        finally {
-                                            try {
-                                                if (fieldSet_1_1 && !fieldSet_1_1.done && (_c = fieldSet_1.return)) _c.call(fieldSet_1);
-                                            }
-                                            finally { if (e_4) throw e_4.error; }
-                                        }
-                                    }
-                                }
-                            }
-                            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                            finally {
-                                try {
-                                    if (compositeKeys_1_1 && !compositeKeys_1_1.done && (_b = compositeKeys_1.return)) _b.call(compositeKeys_1);
+                // if field refers to a belongsTo relation, use the target field instead
+                for (const targetName of targetNames) {
+                    // check field values by value. Ignore unchanged fields
+                    if (!(0, util_1.valuesEqual)(source[targetName], originalElement[targetName])) {
+                        // if the field was updated to 'undefined', replace with 'null' for compatibility with JSON and GraphQL
+                        updatedElement[targetName] =
+                            originalElement[targetName] === undefined
+                                ? null
+                                : originalElement[targetName];
+                        for (const fieldSet of compositeKeys) {
+                            // include all of the fields that comprise the composite key
+                            if (fieldSet.has(targetName)) {
+                                for (const compositeField of fieldSet) {
+                                    updatedElement[compositeField] =
+                                        originalElement[compositeField];
                                 }
-                                finally { if (e_3) throw e_3.error; }
                             }
                         }
                     }
                 }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                finally {
-                    try {
-                        if (targetNames_1_1 && !targetNames_1_1.done && (_a = targetNames_1.return)) _a.call(targetNames_1);
-                    }
-                    finally { if (e_2) throw e_2.error; }
-                }
             }
             else {
                 // Backwards compatibility pre-CPK
                 // if field refers to a belongsTo relation, use the target field instead
-                var key = targetNames || field;
+                const key = targetNames || field;
                 // check field values by value. Ignore unchanged fields
-                if (!util_1.valuesEqual(source[key], originalElement[key])) {
+                if (!(0, util_1.valuesEqual)(source[key], originalElement[key])) {
                     // if the field was updated to 'undefined', replace with 'null' for compatibility with JSON and GraphQL
                     updatedElement[key] =
                         originalElement[key] === undefined ? null : originalElement[key];
-                    try {
-                        for (var compositeKeys_2 = tslib_1.__values(compositeKeys), compositeKeys_2_1 = compositeKeys_2.next(); !compositeKeys_2_1.done; compositeKeys_2_1 = compositeKeys_2.next()) {
-                            var fieldSet = compositeKeys_2_1.value;
-                            // include all of the fields that comprise the composite key
-                            if (fieldSet.has(key)) {
-                                try {
-                                    for (var fieldSet_2 = (e_6 = void 0, tslib_1.__values(fieldSet)), fieldSet_2_1 = fieldSet_2.next(); !fieldSet_2_1.done; fieldSet_2_1 = fieldSet_2.next()) {
-                                        var compositeField = fieldSet_2_1.value;
-                                        updatedElement[compositeField] =
-                                            originalElement[compositeField];
-                                    }
-                                }
-                                catch (e_6_1) { e_6 = { error: e_6_1 }; }
-                                finally {
-                                    try {
-                                        if (fieldSet_2_1 && !fieldSet_2_1.done && (_e = fieldSet_2.return)) _e.call(fieldSet_2);
-                                    }
-                                    finally { if (e_6) throw e_6.error; }
-                                }
+                    for (const fieldSet of compositeKeys) {
+                        // include all of the fields that comprise the composite key
+                        if (fieldSet.has(key)) {
+                            for (const compositeField of fieldSet) {
+                                updatedElement[compositeField] =
+                                    originalElement[compositeField];
                             }
                         }
                     }
-                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
-                    finally {
-                        try {
-                            if (compositeKeys_2_1 && !compositeKeys_2_1.done && (_d = compositeKeys_2.return)) _d.call(compositeKeys_2);
-                        }
-                        finally { if (e_5) throw e_5.error; }
-                    }
                 }
             }
         });
@@ -405,111 +273,65 @@ var StorageClass = /** @class */ (function () {
         }
         // include field(s) from custom PK if one is specified for the model
         if (primaryKey && primaryKey.length) {
-            try {
-                for (var primaryKey_1 = tslib_1.__values(primaryKey), primaryKey_1_1 = primaryKey_1.next(); !primaryKey_1_1.done; primaryKey_1_1 = primaryKey_1.next()) {
-                    var pkField = primaryKey_1_1.value;
-                    updatedElement[pkField] = originalElement[pkField];
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (primaryKey_1_1 && !primaryKey_1_1.done && (_a = primaryKey_1.return)) _a.call(primaryKey_1);
-                }
-                finally { if (e_1) throw e_1.error; }
+            for (const pkField of primaryKey) {
+                updatedElement[pkField] = originalElement[pkField];
             }
         }
-        var id = originalElement.id, _version = originalElement._version, _lastChangedAt = originalElement._lastChangedAt, _deleted = originalElement._deleted;
+        const { id, _version, _lastChangedAt, _deleted } = originalElement;
         // For update mutations we only want to send fields with changes
         // and the required internal fields
-        return tslib_1.__assign(tslib_1.__assign({}, updatedElement), { id: id,
-            _version: _version,
-            _lastChangedAt: _lastChangedAt,
-            _deleted: _deleted });
-    };
-    return StorageClass;
-}());
-var ExclusiveStorage = /** @class */ (function () {
-    function ExclusiveStorage(schema, namespaceResolver, getModelConstructorByModelName, modelInstanceCreator, adapter, sessionId) {
-        this.mutex = new core_1.Mutex();
+        return {
+            ...updatedElement,
+            id,
+            _version,
+            _lastChangedAt,
+            _deleted,
+        };
+    }
+}
+class ExclusiveStorage {
+    constructor(schema, namespaceResolver, getModelConstructorByModelName, modelInstanceCreator, adapter, sessionId) {
+        this.mutex = new utils_2.Mutex();
         this.storage = new StorageClass(schema, namespaceResolver, getModelConstructorByModelName, modelInstanceCreator, adapter, sessionId);
     }
-    ExclusiveStorage.prototype.runExclusive = function (fn) {
+    runExclusive(fn) {
         return this.mutex.runExclusive(fn.bind(this, this.storage));
-    };
-    ExclusiveStorage.prototype.save = function (model, condition, mutator, patchesTuple) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.runExclusive(function (storage) {
-                        return storage.save(model, condition, mutator, patchesTuple);
-                    })];
-            });
-        });
-    };
-    ExclusiveStorage.prototype.delete = function (modelOrModelConstructor, condition, mutator) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.runExclusive(function (storage) {
-                        if (util_1.isModelConstructor(modelOrModelConstructor)) {
-                            var modelConstructor = modelOrModelConstructor;
-                            return storage.delete(modelConstructor, condition, mutator);
-                        }
-                        else {
-                            var model = modelOrModelConstructor;
-                            return storage.delete(model, condition, mutator);
-                        }
-                    })];
-            });
-        });
-    };
-    ExclusiveStorage.prototype.query = function (modelConstructor, predicate, pagination) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.runExclusive(function (storage) {
-                        return storage.query(modelConstructor, predicate, pagination);
-                    })];
-            });
-        });
-    };
-    ExclusiveStorage.prototype.queryOne = function (modelConstructor, firstOrLast) {
-        if (firstOrLast === void 0) { firstOrLast = types_1.QueryOne.FIRST; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.runExclusive(function (storage) {
-                        return storage.queryOne(modelConstructor, firstOrLast);
-                    })];
-            });
+    }
+    async save(model, condition, mutator, patchesTuple) {
+        return this.runExclusive(storage => storage.save(model, condition, mutator, patchesTuple));
+    }
+    async delete(modelOrModelConstructor, condition, mutator) {
+        return this.runExclusive(storage => {
+            if ((0, util_1.isModelConstructor)(modelOrModelConstructor)) {
+                const modelConstructor = modelOrModelConstructor;
+                return storage.delete(modelConstructor, condition, mutator);
+            }
+            else {
+                const model = modelOrModelConstructor;
+                return storage.delete(model, condition, mutator);
+            }
         });
-    };
-    ExclusiveStorage.getNamespace = function () {
+    }
+    async query(modelConstructor, predicate, pagination) {
+        return this.runExclusive(storage => storage.query(modelConstructor, predicate, pagination));
+    }
+    async queryOne(modelConstructor, firstOrLast = types_1.QueryOne.FIRST) {
+        return this.runExclusive(storage => storage.queryOne(modelConstructor, firstOrLast));
+    }
+    static getNamespace() {
         return StorageClass.getNamespace();
-    };
-    ExclusiveStorage.prototype.observe = function (modelConstructor, predicate, skipOwn) {
+    }
+    observe(modelConstructor, predicate, skipOwn) {
         return this.storage.observe(modelConstructor, predicate, skipOwn);
-    };
-    ExclusiveStorage.prototype.clear = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.runExclusive(function (storage) { return storage.clear(); })];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    ExclusiveStorage.prototype.batchSave = function (modelConstructor, items) {
+    }
+    async clear() {
+        await this.runExclusive(storage => storage.clear());
+    }
+    batchSave(modelConstructor, items) {
         return this.storage.batchSave(modelConstructor, items);
-    };
-    ExclusiveStorage.prototype.init = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
-                return [2 /*return*/, this.storage.init()];
-            });
-        });
-    };
-    return ExclusiveStorage;
-}());
+    }
+    async init() {
+        return this.storage.init();
+    }
+}
 exports.ExclusiveStorage = ExclusiveStorage;
-//# sourceMappingURL=storage.js.map