@aws-amplify/datastore 4.0.12 → 4.0.13-push-notification-dryrun.43

package/lib/storage/adapter/IndexedDBAdapter.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var core_1 = require("@aws-amplify/core");
 var idb = tslib_1.__importStar(require("idb"));
-var predicates_1 = require("../../predicates");
 var types_1 = require("../../types");
 var util_1 = require("../../util");
+var StorageAdapterBase_1 = require("./StorageAdapterBase");
 var logger = new core_1.ConsoleLogger('DataStore');
 /**
  * The point after which queries composed of multiple simple OR conditions
@@ -29,12 +29,13 @@ var logger = new core_1.ConsoleLogger('DataStore');
  *
  */
 var MULTI_OR_CONDITION_SCAN_BREAKPOINT = 7;
-var DB_NAME = 'amplify-datastore';
-var IndexedDBAdapter = /** @class */ (function () {
+//
+var DB_VERSION = 3;
+var IndexedDBAdapter = /** @class */ (function (_super) {
+    tslib_1.__extends(IndexedDBAdapter, _super);
     function IndexedDBAdapter() {
-        var _this = this;
-        this.dbName = DB_NAME;
-        this.safariCompatabilityMode = false;
+        var _this = _super !== null && _super.apply(this, arguments) || this;
+        _this.safariCompatabilityMode = false;
         /**
          * Checks the given path against the browser's IndexedDB implementation for
          * necessary compatibility transformations, applying those transforms if needed.
@@ -43,241 +44,168 @@ var IndexedDBAdapter = /** @class */ (function () {
          * @returns An array or string, depending on and given key,
          * that is ensured to be compatible with the IndexedDB implementation's nuances.
          */
-        this.canonicalKeyPath = function (keyArr) {
+        _this.canonicalKeyPath = function (keyArr) {
             if (_this.safariCompatabilityMode) {
                 return keyArr.length > 1 ? keyArr : keyArr[0];
             }
             return keyArr;
         };
+        return _this;
+        //#endregion
     }
-    IndexedDBAdapter.prototype.getStorenameForModel = function (modelConstructor) {
-        var namespace = this.namespaceResolver(modelConstructor);
-        var modelName = modelConstructor.name;
-        return util_1.getStorename(namespace, modelName);
-    };
-    // Retrieves primary key values from a model
-    IndexedDBAdapter.prototype.getIndexKeyValuesFromModel = function (model) {
-        var modelConstructor = Object.getPrototypeOf(model)
-            .constructor;
-        var namespaceName = this.namespaceResolver(modelConstructor);
-        var keys = util_1.getIndexKeys(this.schema.namespaces[namespaceName], modelConstructor.name);
-        return util_1.extractPrimaryKeyValues(model, keys);
-    };
-    IndexedDBAdapter.prototype.checkPrivate = function () {
+    // checks are called by StorageAdapterBase class
+    IndexedDBAdapter.prototype.preSetUpChecks = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var isPrivate;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, util_1.isPrivateMode().then(function (isPrivate) {
-                            return isPrivate;
-                        })];
+                    case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
-                        isPrivate = _a.sent();
-                        if (isPrivate) {
-                            logger.error("IndexedDB not supported in this browser's private mode");
-                            return [2 /*return*/, Promise.reject("IndexedDB not supported in this browser's private mode")];
-                        }
-                        else {
-                            return [2 /*return*/, Promise.resolve()];
-                        }
+                        _a.sent();
+                        return [4 /*yield*/, this.setSafariCompatabilityMode()];
+                    case 2:
+                        _a.sent();
                         return [2 /*return*/];
                 }
             });
         });
     };
-    /**
-     * Whether the browser's implementation of IndexedDB is coercing single-field
-     * indexes to a scalar key.
-     *
-     * If this returns `true`, we need to treat indexes containing a single field
-     * as scalars.
-     *
-     * See PR description for reference:
-     * https://github.com/aws-amplify/amplify-js/pull/10527
-     */
-    IndexedDBAdapter.prototype.setSafariCompatabilityMode = function () {
+    IndexedDBAdapter.prototype.preOpCheck = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = this;
-                        return [4 /*yield*/, util_1.isSafariCompatabilityMode()];
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
-                        _a.safariCompatabilityMode = _b.sent();
-                        if (this.safariCompatabilityMode === true) {
-                            logger.debug('IndexedDB Adapter is running in Safari Compatability Mode');
-                        }
+                        _a.sent();
                         return [2 /*return*/];
                 }
             });
         });
     };
-    IndexedDBAdapter.prototype.getNamespaceAndModelFromStorename = function (storeName) {
-        var _a = tslib_1.__read(storeName.split('_')), namespaceName = _a[0], modelNameArr = _a.slice(1);
-        return {
-            namespaceName: namespaceName,
-            modelName: modelNameArr.join('_'),
-        };
-    };
-    IndexedDBAdapter.prototype.setUp = function (theSchema, namespaceResolver, modelInstanceCreator, getModelConstructorByModelName, sessionId) {
+    /**
+     * Initialize IndexedDB database
+     * Create new DB if one doesn't exist
+     * Upgrade outdated DB
+     *
+     * Called by `StorageAdapterBase.setUp()`
+     *
+     * @returns IDB Database instance
+     */
+    IndexedDBAdapter.prototype.initDb = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var VERSION, _a, error_1;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.checkPrivate()];
-                    case 1:
-                        _b.sent();
-                        return [4 /*yield*/, this.setSafariCompatabilityMode()];
-                    case 2:
-                        _b.sent();
-                        if (!!this.initPromise) return [3 /*break*/, 3];
-                        this.initPromise = new Promise(function (res, rej) {
-                            _this.resolve = res;
-                            _this.reject = rej;
-                        });
-                        return [3 /*break*/, 5];
-                    case 3: return [4 /*yield*/, this.initPromise];
-                    case 4:
-                        _b.sent();
-                        _b.label = 5;
-                    case 5:
-                        if (sessionId) {
-                            this.dbName = DB_NAME + "-" + sessionId;
-                        }
-                        this.schema = theSchema;
-                        this.namespaceResolver = namespaceResolver;
-                        this.modelInstanceCreator = modelInstanceCreator;
-                        this.getModelConstructorByModelName = getModelConstructorByModelName;
-                        _b.label = 6;
-                    case 6:
-                        _b.trys.push([6, 9, , 10]);
-                        if (!!this.db) return [3 /*break*/, 8];
-                        VERSION = 3;
-                        _a = this;
-                        return [4 /*yield*/, idb.openDB(this.dbName, VERSION, {
-                                upgrade: function (db, oldVersion, newVersion, txn) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                    var _a, _b, storeName, origStore, tmpName, _c, namespaceName, modelName, modelInCurrentSchema, newStore, cursor, count, e_1_1, error_2;
-                                    var e_1, _d;
-                                    var _this = this;
-                                    return tslib_1.__generator(this, function (_e) {
-                                        switch (_e.label) {
-                                            case 0:
-                                                if (oldVersion === 0) {
-                                                    Object.keys(theSchema.namespaces).forEach(function (namespaceName) {
-                                                        var namespace = theSchema.namespaces[namespaceName];
-                                                        Object.keys(namespace.models).forEach(function (modelName) {
-                                                            var storeName = util_1.getStorename(namespaceName, modelName);
-                                                            _this.createObjectStoreForModel(db, namespaceName, storeName, modelName);
-                                                        });
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, idb.openDB(this.dbName, DB_VERSION, {
+                            upgrade: function (db, oldVersion, newVersion, txn) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                var _a, _b, storeName, origStore, tmpName, _c, namespaceName, modelName, modelInCurrentSchema, newStore, cursor, count, e_1_1, error_1;
+                                var e_1, _d;
+                                var _this = this;
+                                return tslib_1.__generator(this, function (_e) {
+                                    switch (_e.label) {
+                                        case 0:
+                                            // create new database
+                                            if (oldVersion === 0) {
+                                                Object.keys(this.schema.namespaces).forEach(function (namespaceName) {
+                                                    var namespace = _this.schema.namespaces[namespaceName];
+                                                    Object.keys(namespace.models).forEach(function (modelName) {
+                                                        var storeName = util_1.getStorename(namespaceName, modelName);
+                                                        _this.createObjectStoreForModel(db, namespaceName, storeName, modelName);
                                                     });
-                                                    return [2 /*return*/];
-                                                }
-                                                if (!((oldVersion === 1 || oldVersion === 2) && newVersion === 3)) return [3 /*break*/, 16];
-                                                _e.label = 1;
-                                            case 1:
-                                                _e.trys.push([1, 14, , 15]);
-                                                _e.label = 2;
-                                            case 2:
-                                                _e.trys.push([2, 11, 12, 13]);
-                                                _a = tslib_1.__values(txn.objectStoreNames), _b = _a.next();
-                                                _e.label = 3;
-                                            case 3:
-                                                if (!!_b.done) return [3 /*break*/, 10];
-                                                storeName = _b.value;
-                                                origStore = txn.objectStore(storeName);
-                                                tmpName = "tmp_" + storeName;
-                                                origStore.name = tmpName;
-                                                _c = this.getNamespaceAndModelFromStorename(storeName), namespaceName = _c.namespaceName, modelName = _c.modelName;
-                                                modelInCurrentSchema = modelName in this.schema.namespaces[namespaceName].models;
-                                                if (!modelInCurrentSchema) {
-                                                    // delete original
-                                                    db.deleteObjectStore(tmpName);
-                                                    return [3 /*break*/, 9];
-                                                }
-                                                newStore = this.createObjectStoreForModel(db, namespaceName, storeName, modelName);
-                                                return [4 /*yield*/, origStore.openCursor()];
-                                            case 4:
-                                                cursor = _e.sent();
-                                                count = 0;
-                                                _e.label = 5;
-                                            case 5:
-                                                if (!(cursor && cursor.value)) return [3 /*break*/, 8];
-                                                // we don't pass key, since they are all new entries in the new store
-                                                return [4 /*yield*/, newStore.put(cursor.value)];
-                                            case 6:
-                                                // we don't pass key, since they are all new entries in the new store
-                                                _e.sent();
-                                                return [4 /*yield*/, cursor.continue()];
-                                            case 7:
-                                                cursor = _e.sent();
-                                                count++;
-                                                return [3 /*break*/, 5];
-                                            case 8:
+                                                });
+                                                return [2 /*return*/];
+                                            }
+                                            if (!((oldVersion === 1 || oldVersion === 2) && newVersion === 3)) return [3 /*break*/, 16];
+                                            _e.label = 1;
+                                        case 1:
+                                            _e.trys.push([1, 14, , 15]);
+                                            _e.label = 2;
+                                        case 2:
+                                            _e.trys.push([2, 11, 12, 13]);
+                                            _a = tslib_1.__values(txn.objectStoreNames), _b = _a.next();
+                                            _e.label = 3;
+                                        case 3:
+                                            if (!!_b.done) return [3 /*break*/, 10];
+                                            storeName = _b.value;
+                                            origStore = txn.objectStore(storeName);
+                                            tmpName = "tmp_" + storeName;
+                                            origStore.name = tmpName;
+                                            _c = this.getNamespaceAndModelFromStorename(storeName), namespaceName = _c.namespaceName, modelName = _c.modelName;
+                                            modelInCurrentSchema = modelName in this.schema.namespaces[namespaceName].models;
+                                            if (!modelInCurrentSchema) {
                                                 // delete original
                                                 db.deleteObjectStore(tmpName);
-                                                logger.debug(count + " " + storeName + " records migrated");
-                                                _e.label = 9;
-                                            case 9:
-                                                _b = _a.next();
-                                                return [3 /*break*/, 3];
-                                            case 10: return [3 /*break*/, 13];
-                                            case 11:
-                                                e_1_1 = _e.sent();
-                                                e_1 = { error: e_1_1 };
-                                                return [3 /*break*/, 13];
-                                            case 12:
-                                                try {
-                                                    if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
-                                                }
-                                                finally { if (e_1) throw e_1.error; }
-                                                return [7 /*endfinally*/];
-                                            case 13:
-                                                // add new models created after IndexedDB, but before migration
-                                                // this case may happen when a user has not opened an app for
-                                                // some time and a new model is added during that time
-                                                Object.keys(theSchema.namespaces).forEach(function (namespaceName) {
-                                                    var namespace = theSchema.namespaces[namespaceName];
-                                                    var objectStoreNames = new Set(txn.objectStoreNames);
-                                                    Object.keys(namespace.models)
-                                                        .map(function (modelName) {
-                                                        return [
-                                                            modelName,
-                                                            util_1.getStorename(namespaceName, modelName),
-                                                        ];
-                                                    })
-                                                        .filter(function (_a) {
-                                                        var _b = tslib_1.__read(_a, 2), storeName = _b[1];
-                                                        return !objectStoreNames.has(storeName);
-                                                    })
-                                                        .forEach(function (_a) {
-                                                        var _b = tslib_1.__read(_a, 2), modelName = _b[0], storeName = _b[1];
-                                                        _this.createObjectStoreForModel(db, namespaceName, storeName, modelName);
-                                                    });
+                                                return [3 /*break*/, 9];
+                                            }
+                                            newStore = this.createObjectStoreForModel(db, namespaceName, storeName, modelName);
+                                            return [4 /*yield*/, origStore.openCursor()];
+                                        case 4:
+                                            cursor = _e.sent();
+                                            count = 0;
+                                            _e.label = 5;
+                                        case 5:
+                                            if (!(cursor && cursor.value)) return [3 /*break*/, 8];
+                                            // we don't pass key, since they are all new entries in the new store
+                                            return [4 /*yield*/, newStore.put(cursor.value)];
+                                        case 6:
+                                            // we don't pass key, since they are all new entries in the new store
+                                            _e.sent();
+                                            return [4 /*yield*/, cursor.continue()];
+                                        case 7:
+                                            cursor = _e.sent();
+                                            count++;
+                                            return [3 /*break*/, 5];
+                                        case 8:
+                                            // delete original
+                                            db.deleteObjectStore(tmpName);
+                                            logger.debug(count + " " + storeName + " records migrated");
+                                            _e.label = 9;
+                                        case 9:
+                                            _b = _a.next();
+                                            return [3 /*break*/, 3];
+                                        case 10: return [3 /*break*/, 13];
+                                        case 11:
+                                            e_1_1 = _e.sent();
+                                            e_1 = { error: e_1_1 };
+                                            return [3 /*break*/, 13];
+                                        case 12:
+                                            try {
+                                                if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
+                                            }
+                                            finally { if (e_1) throw e_1.error; }
+                                            return [7 /*endfinally*/];
+                                        case 13:
+                                            // add new models created after IndexedDB, but before migration
+                                            // this case may happen when a user has not opened an app for
+                                            // some time and a new model is added during that time
+                                            Object.keys(this.schema.namespaces).forEach(function (namespaceName) {
+                                                var namespace = _this.schema.namespaces[namespaceName];
+                                                var objectStoreNames = new Set(txn.objectStoreNames);
+                                                Object.keys(namespace.models)
+                                                    .map(function (modelName) {
+                                                    return [modelName, util_1.getStorename(namespaceName, modelName)];
+                                                })
+                                                    .filter(function (_a) {
+                                                    var _b = tslib_1.__read(_a, 2), storeName = _b[1];
+                                                    return !objectStoreNames.has(storeName);
+                                                })
+                                                    .forEach(function (_a) {
+                                                    var _b = tslib_1.__read(_a, 2), modelName = _b[0], storeName = _b[1];
+                                                    _this.createObjectStoreForModel(db, namespaceName, storeName, modelName);
                                                 });
-                                                return [3 /*break*/, 15];
-                                            case 14:
-                                                error_2 = _e.sent();
-                                                logger.error('Error migrating IndexedDB data', error_2);
-                                                txn.abort();
-                                                throw error_2;
-                                            case 15: return [2 /*return*/];
-                                            case 16: return [2 /*return*/];
-                                        }
-                                    });
-                                }); },
-                            })];
-                    case 7:
-                        _a.db = _b.sent();
-                        this.resolve();
-                        _b.label = 8;
-                    case 8: return [3 /*break*/, 10];
-                    case 9:
-                        error_1 = _b.sent();
-                        this.reject(error_1);
-                        return [3 /*break*/, 10];
-                    case 10: return [2 /*return*/];
+                                            });
+                                            return [3 /*break*/, 15];
+                                        case 14:
+                                            error_1 = _e.sent();
+                                            logger.error('Error migrating IndexedDB data', error_1);
+                                            txn.abort();
+                                            throw error_1;
+                                        case 15: return [2 /*return*/];
+                                        case 16: return [2 /*return*/];
+                                    }
+                                });
+                            }); },
+                        })];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
@@ -304,45 +232,41 @@ var IndexedDBAdapter = /** @class */ (function () {
             });
         });
     };
+    IndexedDBAdapter.prototype.clear = function () {
+        var _a;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, this.checkPrivate()];
+                    case 1:
+                        _b.sent();
+                        (_a = this.db) === null || _a === void 0 ? void 0 : _a.close();
+                        return [4 /*yield*/, idb.deleteDB(this.dbName)];
+                    case 2:
+                        _b.sent();
+                        this.db = undefined;
+                        this.initPromise = undefined;
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     IndexedDBAdapter.prototype.save = function (model, condition) {
         var e_2, _a;
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var modelConstructor, storeName, namespaceName, connectedModels, set, connectionStoreNames, tx, store, keyValues, fromDB, predicates, _b, predicateObjs, type, isValid, msg, result, connectionStoreNames_1, connectionStoreNames_1_1, resItem, storeName_1, item, instance, keys, store_1, itemKeyValues, fromDB_1, opType, modelKeyValues, key, e_2_1;
-            var _this = this;
+            var _b, storeName, set, connectionStoreNames, modelKeyValues, tx, store, fromDB, result, connectionStoreNames_1, connectionStoreNames_1_1, resItem, storeName_1, item, instance, keys, store_1, itemKeyValues, fromDB_1, opType, key, e_2_1;
             return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
                         _c.sent();
-                        modelConstructor = Object.getPrototypeOf(model)
-                            .constructor;
-                        storeName = this.getStorenameForModel(modelConstructor);
-                        namespaceName = this.namespaceResolver(modelConstructor);
-                        connectedModels = util_1.traverseModel(modelConstructor.name, model, this.schema.namespaces[namespaceName], this.modelInstanceCreator, this.getModelConstructorByModelName);
-                        set = new Set();
-                        connectionStoreNames = Object.values(connectedModels).map(function (_a) {
-                            var modelName = _a.modelName, item = _a.item, instance = _a.instance;
-                            var storeName = util_1.getStorename(namespaceName, modelName);
-                            set.add(storeName);
-                            var keys = util_1.getIndexKeys(_this.schema.namespaces[namespaceName], modelName);
-                            return { storeName: storeName, item: item, instance: instance, keys: keys };
-                        });
+                        _b = this.saveMetadata(model), storeName = _b.storeName, set = _b.set, connectionStoreNames = _b.connectionStoreNames, modelKeyValues = _b.modelKeyValues;
                         tx = this.db.transaction(tslib_1.__spread([storeName], Array.from(set.values())), 'readwrite');
                         store = tx.objectStore(storeName);
-                        keyValues = this.getIndexKeyValuesFromModel(model);
-                        return [4 /*yield*/, this._get(store, keyValues)];
+                        return [4 /*yield*/, this._get(store, modelKeyValues)];
                     case 2:
                         fromDB = _c.sent();
-                        if (condition && fromDB) {
-                            predicates = predicates_1.ModelPredicateCreator.getPredicates(condition);
-                            _b = predicates || {}, predicateObjs = _b.predicates, type = _b.type;
-                            isValid = util_1.validatePredicate(fromDB, type, predicateObjs);
-                            if (!isValid) {
-                                msg = 'Conditional update failed';
-                                logger.error(msg, { model: fromDB, condition: predicateObjs });
-                                throw new Error(msg);
-                            }
-                        }
+                        this.validateSaveCondition(condition, fromDB);
                         result = [];
                         _c.label = 3;
                     case 3:
@@ -355,15 +279,11 @@ var IndexedDBAdapter = /** @class */ (function () {
                         resItem = connectionStoreNames_1_1.value;
                         storeName_1 = resItem.storeName, item = resItem.item, instance = resItem.instance, keys = resItem.keys;
                         store_1 = tx.objectStore(storeName_1);
-                        itemKeyValues = keys.map(function (key) {
-                            var value = item[key];
-                            return value;
-                        });
+                        itemKeyValues = keys.map(function (key) { return item[key]; });
                         return [4 /*yield*/, this._get(store_1, itemKeyValues)];
                     case 6:
                         fromDB_1 = _c.sent();
-                        opType = fromDB_1 === undefined ? types_1.OpType.INSERT : types_1.OpType.UPDATE;
-                        modelKeyValues = this.getIndexKeyValuesFromModel(model);
+                        opType = fromDB_1 ? types_1.OpType.UPDATE : types_1.OpType.INSERT;
                         if (!(util_1.keysEqual(itemKeyValues, modelKeyValues) ||
                             opType === types_1.OpType.INSERT)) return [3 /*break*/, 9];
                         return [4 /*yield*/, store_1
@@ -402,45 +322,16 @@ var IndexedDBAdapter = /** @class */ (function () {
             });
         });
     };
-    IndexedDBAdapter.prototype.load = function (namespaceName, srcModelName, records) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var namespace, relations, connectionStoreNames, modelConstructor;
-            var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                namespace = this.schema.namespaces[namespaceName];
-                relations = namespace.relationships[srcModelName].relationTypes;
-                connectionStoreNames = relations.map(function (_a) {
-                    var modelName = _a.modelName;
-                    return util_1.getStorename(namespaceName, modelName);
-                });
-                modelConstructor = this.getModelConstructorByModelName(namespaceName, srcModelName);
-                if (connectionStoreNames.length === 0) {
-                    return [2 /*return*/, records.map(function (record) {
-                            return _this.modelInstanceCreator(modelConstructor, record);
-                        })];
-                }
-                return [2 /*return*/, records.map(function (record) {
-                        return _this.modelInstanceCreator(modelConstructor, record);
-                    })];
-            });
-        });
-    };
     IndexedDBAdapter.prototype.query = function (modelConstructor, predicate, pagination) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var storeName, namespaceName, predicates, keyPath, queryByKey, hasSort, hasPagination, records;
+            var _a, storeName, namespaceName, queryByKey, predicates, hasSort, hasPagination, records;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
-                        _a.sent();
-                        storeName = this.getStorenameForModel(modelConstructor);
-                        namespaceName = this.namespaceResolver(modelConstructor);
-                        predicates = predicate && predicates_1.ModelPredicateCreator.getPredicates(predicate);
-                        keyPath = util_1.getIndexKeys(this.schema.namespaces[namespaceName], modelConstructor.name);
-                        queryByKey = predicates && this.keyValueFromPredicate(predicates, keyPath);
-                        hasSort = pagination && pagination.sort;
-                        hasPagination = pagination && pagination.limit;
+                        _b.sent();
+                        _a = this.queryMetadata(modelConstructor, predicate, pagination), storeName = _a.storeName, namespaceName = _a.namespaceName, queryByKey = _a.queryByKey, predicates = _a.predicates, hasSort = _a.hasSort, hasPagination = _a.hasPagination;
                         return [4 /*yield*/, (function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                                 var record, filtered, all;
                                 return tslib_1.__generator(this, function (_a) {
@@ -472,111 +363,363 @@ var IndexedDBAdapter = /** @class */ (function () {
                                 });
                             }); })()];
                     case 2:
-                        records = (_a.sent());
+                        records = (_b.sent());
                         return [4 /*yield*/, this.load(namespaceName, modelConstructor.name, records)];
-                    case 3: return [2 /*return*/, _a.sent()];
+                    case 3: return [2 /*return*/, _b.sent()];
                 }
             });
         });
     };
-    IndexedDBAdapter.prototype.getByKey = function (storeName, keyValue) {
+    IndexedDBAdapter.prototype.queryOne = function (modelConstructor, firstOrLast) {
+        if (firstOrLast === void 0) { firstOrLast = types_1.QueryOne.FIRST; }
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var storeName, cursor, result;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._get(storeName, keyValue)];
-                    case 1: return [2 /*return*/, _a.sent()];
+                    case 0: return [4 /*yield*/, this.checkPrivate()];
+                    case 1:
+                        _a.sent();
+                        storeName = this.getStorenameForModel(modelConstructor);
+                        return [4 /*yield*/, this.db
+                                .transaction([storeName], 'readonly')
+                                .objectStore(storeName)
+                                .openCursor(undefined, firstOrLast === types_1.QueryOne.FIRST ? 'next' : 'prev')];
+                    case 2:
+                        cursor = _a.sent();
+                        result = cursor ? cursor.value : undefined;
+                        return [2 /*return*/, result && this.modelInstanceCreator(modelConstructor, result)];
                 }
             });
         });
     };
-    IndexedDBAdapter.prototype.getAll = function (storeName) {
+    IndexedDBAdapter.prototype.batchSave = function (modelConstructor, items) {
         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.db.getAll(storeName)];
-                    case 1: return [2 /*return*/, _a.sent()];
+            var modelName, namespaceName, storeName, result, txn, store, _loop_1, this_1, items_1, items_1_1, item, e_3_1;
+            var e_3, _a;
+            var _this = this;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, this.checkPrivate()];
+                    case 1:
+                        _b.sent();
+                        if (items.length === 0) {
+                            return [2 /*return*/, []];
+                        }
+                        modelName = modelConstructor.name;
+                        namespaceName = this.namespaceResolver(modelConstructor);
+                        storeName = this.getStorenameForModel(modelConstructor);
+                        result = [];
+                        txn = this.db.transaction(storeName, 'readwrite');
+                        store = txn.store;
+                        _loop_1 = function (item) {
+                            var model, connectedModels, keyValues, _deleted, index, key, instance;
+                            return tslib_1.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0:
+                                        model = this_1.modelInstanceCreator(modelConstructor, item);
+                                        connectedModels = util_1.traverseModel(modelName, model, this_1.schema.namespaces[namespaceName], this_1.modelInstanceCreator, this_1.getModelConstructorByModelName);
+                                        keyValues = this_1.getIndexKeyValuesFromModel(model);
+                                        _deleted = item._deleted;
+                                        index = store.index('byPk');
+                                        return [4 /*yield*/, index.getKey(this_1.canonicalKeyPath(keyValues))];
+                                    case 1:
+                                        key = _a.sent();
+                                        if (!!_deleted) return [3 /*break*/, 3];
+                                        instance = connectedModels.find(function (_a) {
+                                            var instance = _a.instance;
+                                            var instanceKeyValues = _this.getIndexKeyValuesFromModel(instance);
+                                            return util_1.keysEqual(instanceKeyValues, keyValues);
+                                        }).instance;
+                                        result.push([
+                                            instance,
+                                            key ? types_1.OpType.UPDATE : types_1.OpType.INSERT,
+                                        ]);
+                                        return [4 /*yield*/, store.put(instance, key)];
+                                    case 2:
+                                        _a.sent();
+                                        return [3 /*break*/, 5];
+                                    case 3:
+                                        result.push([item, types_1.OpType.DELETE]);
+                                        if (!key) return [3 /*break*/, 5];
+                                        return [4 /*yield*/, store.delete(key)];
+                                    case 4:
+                                        _a.sent();
+                                        _a.label = 5;
+                                    case 5: return [2 /*return*/];
+                                }
+                            });
+                        };
+                        this_1 = this;
+                        _b.label = 2;
+                    case 2:
+                        _b.trys.push([2, 7, 8, 9]);
+                        items_1 = tslib_1.__values(items), items_1_1 = items_1.next();
+                        _b.label = 3;
+                    case 3:
+                        if (!!items_1_1.done) return [3 /*break*/, 6];
+                        item = items_1_1.value;
+                        return [5 /*yield**/, _loop_1(item)];
+                    case 4:
+                        _b.sent();
+                        _b.label = 5;
+                    case 5:
+                        items_1_1 = items_1.next();
+                        return [3 /*break*/, 3];
+                    case 6: return [3 /*break*/, 9];
+                    case 7:
+                        e_3_1 = _b.sent();
+                        e_3 = { error: e_3_1 };
+                        return [3 /*break*/, 9];
+                    case 8:
+                        try {
+                            if (items_1_1 && !items_1_1.done && (_a = items_1.return)) _a.call(items_1);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                        return [7 /*endfinally*/];
+                    case 9: return [4 /*yield*/, txn.done];
+                    case 10:
+                        _b.sent();
+                        return [2 /*return*/, result];
                 }
             });
         });
     };
-    IndexedDBAdapter.prototype.keyValueFromPredicate = function (predicates, keyPath) {
-        var e_3, _a;
-        var predicateObjs = predicates.predicates;
-        if (predicateObjs.length !== keyPath.length) {
-            return;
-        }
-        var keyValues = [];
-        var _loop_1 = function (key) {
-            var predicateObj = predicateObjs.find(function (p) { return types_1.isPredicateObj(p) && p.field === key && p.operator === 'eq'; });
-            predicateObj && keyValues.push(predicateObj.operand);
-        };
-        try {
-            for (var keyPath_1 = tslib_1.__values(keyPath), keyPath_1_1 = keyPath_1.next(); !keyPath_1_1.done; keyPath_1_1 = keyPath_1.next()) {
-                var key = keyPath_1_1.value;
-                _loop_1(key);
-            }
-        }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
-        finally {
-            try {
-                if (keyPath_1_1 && !keyPath_1_1.done && (_a = keyPath_1.return)) _a.call(keyPath_1);
-            }
-            finally { if (e_3) throw e_3.error; }
-        }
-        return keyValues.length === keyPath.length ? keyValues : undefined;
-    };
-    /**
-     * Tries to generate an index fetcher for the given predicates. Assumes
-     * that the given predicate conditions are contained by an AND group and
-     * should therefore all match a single record.
-     *
-     * @param storeName The table to query.
-     * @param predicates The predicates to try to AND together.
-     * @param transaction
+    IndexedDBAdapter.prototype.deleteItem = function (deleteQueue) {
+        var e_4, _a, e_5, _b;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var connectionStoreNames, tx, _c, _d, deleteItem, storeName, items, store, items_2, items_2_1, item, key, keyValues, itemKey, e_5_1, e_4_1;
+            return tslib_1.__generator(this, function (_e) {
+                switch (_e.label) {
+                    case 0:
+                        connectionStoreNames = deleteQueue.map(function (_a) {
+                            var storeName = _a.storeName;
+                            return storeName;
+                        });
+                        tx = this.db.transaction(tslib_1.__spread(connectionStoreNames), 'readwrite');
+                        _e.label = 1;
+                    case 1:
+                        _e.trys.push([1, 22, 23, 28]);
+                        _c = tslib_1.__asyncValues(deleteQueue);
+                        _e.label = 2;
+                    case 2: return [4 /*yield*/, _c.next()];
+                    case 3:
+                        if (!(_d = _e.sent(), !_d.done)) return [3 /*break*/, 21];
+                        deleteItem = _d.value;
+                        storeName = deleteItem.storeName, items = deleteItem.items;
+                        store = tx.objectStore(storeName);
+                        _e.label = 4;
+                    case 4:
+                        _e.trys.push([4, 14, 15, 20]);
+                        items_2 = tslib_1.__asyncValues(items);
+                        _e.label = 5;
+                    case 5: return [4 /*yield*/, items_2.next()];
+                    case 6:
+                        if (!(items_2_1 = _e.sent(), !items_2_1.done)) return [3 /*break*/, 13];
+                        item = items_2_1.value;
+                        if (!item) return [3 /*break*/, 12];
+                        key = void 0;
+                        if (!(typeof item === 'object')) return [3 /*break*/, 8];
+                        keyValues = this.getIndexKeyValuesFromModel(item);
+                        return [4 /*yield*/, store
+                                .index('byPk')
+                                .getKey(this.canonicalKeyPath(keyValues))];
+                    case 7:
+                        key = _e.sent();
+                        return [3 /*break*/, 10];
+                    case 8:
+                        itemKey = item.toString();
+                        return [4 /*yield*/, store.index('byPk').getKey(itemKey)];
+                    case 9:
+                        key = _e.sent();
+                        _e.label = 10;
+                    case 10:
+                        if (!(key !== undefined)) return [3 /*break*/, 12];
+                        return [4 /*yield*/, store.delete(key)];
+                    case 11:
+                        _e.sent();
+                        _e.label = 12;
+                    case 12: return [3 /*break*/, 5];
+                    case 13: return [3 /*break*/, 20];
+                    case 14:
+                        e_5_1 = _e.sent();
+                        e_5 = { error: e_5_1 };
+                        return [3 /*break*/, 20];
+                    case 15:
+                        _e.trys.push([15, , 18, 19]);
+                        if (!(items_2_1 && !items_2_1.done && (_b = items_2.return))) return [3 /*break*/, 17];
+                        return [4 /*yield*/, _b.call(items_2)];
+                    case 16:
+                        _e.sent();
+                        _e.label = 17;
+                    case 17: return [3 /*break*/, 19];
+                    case 18:
+                        if (e_5) throw e_5.error;
+                        return [7 /*endfinally*/];
+                    case 19: return [7 /*endfinally*/];
+                    case 20: return [3 /*break*/, 2];
+                    case 21: return [3 /*break*/, 28];
+                    case 22:
+                        e_4_1 = _e.sent();
+                        e_4 = { error: e_4_1 };
+                        return [3 /*break*/, 28];
+                    case 23:
+                        _e.trys.push([23, , 26, 27]);
+                        if (!(_d && !_d.done && (_a = _c.return))) return [3 /*break*/, 25];
+                        return [4 /*yield*/, _a.call(_c)];
+                    case 24:
+                        _e.sent();
+                        _e.label = 25;
+                    case 25: return [3 /*break*/, 27];
+                    case 26:
+                        if (e_4) throw e_4.error;
+                        return [7 /*endfinally*/];
+                    case 27: return [7 /*endfinally*/];
+                    case 28: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    //#region platform-specific helper methods
+    IndexedDBAdapter.prototype.checkPrivate = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var isPrivate;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, util_1.isPrivateMode().then(function (isPrivate) {
+                            return isPrivate;
+                        })];
+                    case 1:
+                        isPrivate = _a.sent();
+                        if (isPrivate) {
+                            logger.error("IndexedDB not supported in this browser's private mode");
+                            return [2 /*return*/, Promise.reject("IndexedDB not supported in this browser's private mode")];
+                        }
+                        else {
+                            return [2 /*return*/, Promise.resolve()];
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    /**
+     * Whether the browser's implementation of IndexedDB is coercing single-field
+     * indexes to a scalar key.
+     *
+     * If this returns `true`, we need to treat indexes containing a single field
+     * as scalars.
+     *
+     * See PR description for reference:
+     * https://github.com/aws-amplify/amplify-js/pull/10527
+     */
+    IndexedDBAdapter.prototype.setSafariCompatabilityMode = function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var _a;
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this;
+                        return [4 /*yield*/, util_1.isSafariCompatabilityMode()];
+                    case 1:
+                        _a.safariCompatabilityMode = _b.sent();
+                        if (this.safariCompatabilityMode === true) {
+                            logger.debug('IndexedDB Adapter is running in Safari Compatability Mode');
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    IndexedDBAdapter.prototype.getNamespaceAndModelFromStorename = function (storeName) {
+        var _a = tslib_1.__read(storeName.split('_')), namespaceName = _a[0], modelNameArr = _a.slice(1);
+        return {
+            namespaceName: namespaceName,
+            modelName: modelNameArr.join('_'),
+        };
+    };
+    IndexedDBAdapter.prototype.createObjectStoreForModel = function (db, namespaceName, storeName, modelName) {
+        var store = db.createObjectStore(storeName, {
+            autoIncrement: true,
+        });
+        var indexes = this.schema.namespaces[namespaceName].relationships[modelName].indexes;
+        indexes.forEach(function (_a) {
+            var _b = tslib_1.__read(_a, 3), idxName = _b[0], keyPath = _b[1], options = _b[2];
+            store.createIndex(idxName, keyPath, options);
+        });
+        return store;
+    };
+    IndexedDBAdapter.prototype.getByKey = function (storeName, keyValue) {
+        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._get(storeName, keyValue)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    IndexedDBAdapter.prototype.getAll = function (storeName) {
+        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.db.getAll(storeName)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
+    /**
+     * Tries to generate an index fetcher for the given predicates. Assumes
+     * that the given predicate conditions are contained by an AND group and
+     * should therefore all match a single record.
+     *
+     * @param storeName The table to query.
+     * @param predicates The predicates to try to AND together.
+     * @param transaction
      */
     IndexedDBAdapter.prototype.matchingIndexQueries = function (storeName, predicates, transaction) {
-        var e_4, _a, e_5, _b;
+        var e_6, _a, e_7, _b;
         var _this = this;
         // could be expanded later to include `exec()` and a `cardinality` estimate?
         var queries = [];
         var predicateIndex = new Map();
         try {
-            for (var predicates_2 = tslib_1.__values(predicates), predicates_2_1 = predicates_2.next(); !predicates_2_1.done; predicates_2_1 = predicates_2.next()) {
-                var predicate = predicates_2_1.value;
+            for (var predicates_1 = tslib_1.__values(predicates), predicates_1_1 = predicates_1.next(); !predicates_1_1.done; predicates_1_1 = predicates_1.next()) {
+                var predicate = predicates_1_1.value;
                 predicateIndex.set(String(predicate.field), predicate);
             }
         }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
         finally {
             try {
-                if (predicates_2_1 && !predicates_2_1.done && (_a = predicates_2.return)) _a.call(predicates_2);
+                if (predicates_1_1 && !predicates_1_1.done && (_a = predicates_1.return)) _a.call(predicates_1);
             }
-            finally { if (e_4) throw e_4.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         var store = transaction.objectStore(storeName);
         var _loop_2 = function (name_1) {
-            var e_6, _a;
+            var e_8, _a;
             var idx = store.index(name_1);
             var keypath = Array.isArray(idx.keyPath) ? idx.keyPath : [idx.keyPath];
             var matchingPredicateValues = [];
             try {
-                for (var keypath_1 = (e_6 = void 0, tslib_1.__values(keypath)), keypath_1_1 = keypath_1.next(); !keypath_1_1.done; keypath_1_1 = keypath_1.next()) {
+                for (var keypath_1 = (e_8 = void 0, tslib_1.__values(keypath)), keypath_1_1 = keypath_1.next(); !keypath_1_1.done; keypath_1_1 = keypath_1.next()) {
                     var field = keypath_1_1.value;
                     var p = predicateIndex.get(field);
-                    if (p) {
-                        matchingPredicateValues.push(String(p.operand));
+                    if (p && p.operand !== null && p.operand !== undefined) {
+                        matchingPredicateValues.push(p.operand);
                     }
                     else {
                         break;
                     }
                 }
             }
-            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+            catch (e_8_1) { e_8 = { error: e_8_1 }; }
             finally {
                 try {
                     if (keypath_1_1 && !keypath_1_1.done && (_a = keypath_1.return)) _a.call(keypath_1);
                 }
-                finally { if (e_6) throw e_6.error; }
+                finally { if (e_8) throw e_8.error; }
             }
             // if we have a matching predicate field for each component of this index,
             // we can build a query for it. otherwise, we can't.
@@ -598,12 +741,12 @@ var IndexedDBAdapter = /** @class */ (function () {
                 _loop_2(name_1);
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_7) throw e_7.error; }
         }
         return queries;
     };
@@ -692,8 +835,8 @@ var IndexedDBAdapter = /** @class */ (function () {
     };
     IndexedDBAdapter.prototype.filterOnPredicate = function (storeName, predicates) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var predicateObjs, type, _a, groupType, indexedQueries, candidateResults, distinctResults, indexedQueries_1, indexedQueries_1_1, query, resultGroup, resultGroup_1, resultGroup_1_1, item, distinctificationString, e_7_1, filtered;
-            var e_7, _b, e_8, _c;
+            var predicateObjs, type, _a, groupType, indexedQueries, candidateResults, distinctResults, indexedQueries_1, indexedQueries_1_1, query, resultGroup, resultGroup_1, resultGroup_1_1, item, distinctificationString, e_9_1, filtered;
+            var e_9, _b, e_10, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -725,18 +868,18 @@ var IndexedDBAdapter = /** @class */ (function () {
                     case 6:
                         resultGroup = _d.sent();
                         try {
-                            for (resultGroup_1 = (e_8 = void 0, tslib_1.__values(resultGroup)), resultGroup_1_1 = resultGroup_1.next(); !resultGroup_1_1.done; resultGroup_1_1 = resultGroup_1.next()) {
+                            for (resultGroup_1 = (e_10 = void 0, tslib_1.__values(resultGroup)), resultGroup_1_1 = resultGroup_1.next(); !resultGroup_1_1.done; resultGroup_1_1 = resultGroup_1.next()) {
                                 item = resultGroup_1_1.value;
                                 distinctificationString = JSON.stringify(item);
                                 distinctResults.set(distinctificationString, item);
                             }
                         }
-                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+                        catch (e_10_1) { e_10 = { error: e_10_1 }; }
                         finally {
                             try {
                                 if (resultGroup_1_1 && !resultGroup_1_1.done && (_c = resultGroup_1.return)) _c.call(resultGroup_1);
                             }
-                            finally { if (e_8) throw e_8.error; }
+                            finally { if (e_10) throw e_10.error; }
                         }
                         _d.label = 7;
                     case 7:
@@ -744,14 +887,14 @@ var IndexedDBAdapter = /** @class */ (function () {
                         return [3 /*break*/, 5];
                     case 8: return [3 /*break*/, 11];
                     case 9:
-                        e_7_1 = _d.sent();
-                        e_7 = { error: e_7_1 };
+                        e_9_1 = _d.sent();
+                        e_9 = { error: e_9_1 };
                         return [3 /*break*/, 11];
                     case 10:
                         try {
                             if (indexedQueries_1_1 && !indexedQueries_1_1.done && (_b = indexedQueries_1.return)) _b.call(indexedQueries_1);
                         }
-                        finally { if (e_7) throw e_7.error; }
+                        finally { if (e_9) throw e_9.error; }
                         return [7 /*endfinally*/];
                     case 11:
                         // we could conceivably check for special conditions and return early here.
@@ -823,545 +966,7 @@ var IndexedDBAdapter = /** @class */ (function () {
             });
         });
     };
-    IndexedDBAdapter.prototype.queryOne = function (modelConstructor, firstOrLast) {
-        if (firstOrLast === void 0) { firstOrLast = types_1.QueryOne.FIRST; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var storeName, cursor, result;
-            return tslib_1.__generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.checkPrivate()];
-                    case 1:
-                        _a.sent();
-                        storeName = this.getStorenameForModel(modelConstructor);
-                        return [4 /*yield*/, this.db
-                                .transaction([storeName], 'readonly')
-                                .objectStore(storeName)
-                                .openCursor(undefined, firstOrLast === types_1.QueryOne.FIRST ? 'next' : 'prev')];
-                    case 2:
-                        cursor = _a.sent();
-                        result = cursor ? cursor.value : undefined;
-                        return [2 /*return*/, result && this.modelInstanceCreator(modelConstructor, result)];
-                }
-            });
-        });
-    };
-    IndexedDBAdapter.prototype.delete = function (modelOrModelConstructor, condition) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var deleteQueue, modelConstructor, nameSpace, storeName, models, relations, deletedModels, deletedModels, model, modelConstructor, namespaceName, storeName, tx, store, keyValues, fromDB, msg, predicates, _a, predicateObjs, type, isValid, msg, relations, relations, deletedModels;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.checkPrivate()];
-                    case 1:
-                        _b.sent();
-                        deleteQueue = [];
-                        if (!util_1.isModelConstructor(modelOrModelConstructor)) return [3 /*break*/, 9];
-                        modelConstructor = modelOrModelConstructor;
-                        nameSpace = this.namespaceResolver(modelConstructor);
-                        storeName = this.getStorenameForModel(modelConstructor);
-                        return [4 /*yield*/, this.query(modelConstructor, condition)];
-                    case 2:
-                        models = _b.sent();
-                        relations = this.schema.namespaces[nameSpace].relationships[modelConstructor.name]
-                            .relationTypes;
-                        if (!(condition !== undefined)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.deleteTraverse(relations, models, modelConstructor.name, nameSpace, deleteQueue)];
-                    case 3:
-                        _b.sent();
-                        return [4 /*yield*/, this.deleteItem(deleteQueue)];
-                    case 4:
-                        _b.sent();
-                        deletedModels = deleteQueue.reduce(function (acc, _a) {
-                            var items = _a.items;
-                            return acc.concat(items);
-                        }, []);
-                        return [2 /*return*/, [models, deletedModels]];
-                    case 5: return [4 /*yield*/, this.deleteTraverse(relations, models, modelConstructor.name, nameSpace, deleteQueue)];
-                    case 6:
-                        _b.sent();
-                        // Delete all
-                        return [4 /*yield*/, this.db
-                                .transaction([storeName], 'readwrite')
-                                .objectStore(storeName)
-                                .clear()];
-                    case 7:
-                        // Delete all
-                        _b.sent();
-                        deletedModels = deleteQueue.reduce(function (acc, _a) {
-                            var items = _a.items;
-                            return acc.concat(items);
-                        }, []);
-                        return [2 /*return*/, [models, deletedModels]];
-                    case 8: return [3 /*break*/, 17];
-                    case 9:
-                        model = modelOrModelConstructor;
-                        modelConstructor = Object.getPrototypeOf(model)
-                            .constructor;
-                        namespaceName = this.namespaceResolver(modelConstructor);
-                        storeName = this.getStorenameForModel(modelConstructor);
-                        if (!condition) return [3 /*break*/, 13];
-                        tx = this.db.transaction([storeName], 'readwrite');
-                        store = tx.objectStore(storeName);
-                        keyValues = this.getIndexKeyValuesFromModel(model);
-                        return [4 /*yield*/, this._get(store, keyValues)];
-                    case 10:
-                        fromDB = _b.sent();
-                        if (fromDB === undefined) {
-                            msg = 'Model instance not found in storage';
-                            logger.warn(msg, { model: model });
-                            return [2 /*return*/, [[model], []]];
-                        }
-                        predicates = predicates_1.ModelPredicateCreator.getPredicates(condition);
-                        _a = predicates, predicateObjs = _a.predicates, type = _a.type;
-                        isValid = util_1.validatePredicate(fromDB, type, predicateObjs);
-                        if (!isValid) {
-                            msg = 'Conditional update failed';
-                            logger.error(msg, { model: fromDB, condition: predicateObjs });
-                            throw new Error(msg);
-                        }
-                        return [4 /*yield*/, tx.done];
-                    case 11:
-                        _b.sent();
-                        relations = this.schema.namespaces[namespaceName].relationships[modelConstructor.name].relationTypes;
-                        return [4 /*yield*/, this.deleteTraverse(relations, [model], modelConstructor.name, namespaceName, deleteQueue)];
-                    case 12:
-                        _b.sent();
-                        return [3 /*break*/, 15];
-                    case 13:
-                        relations = this.schema.namespaces[namespaceName].relationships[modelConstructor.name].relationTypes;
-                        return [4 /*yield*/, this.deleteTraverse(relations, [model], modelConstructor.name, namespaceName, deleteQueue)];
-                    case 14:
-                        _b.sent();
-                        _b.label = 15;
-                    case 15: return [4 /*yield*/, this.deleteItem(deleteQueue)];
-                    case 16:
-                        _b.sent();
-                        deletedModels = deleteQueue.reduce(function (acc, _a) {
-                            var items = _a.items;
-                            return acc.concat(items);
-                        }, []);
-                        return [2 /*return*/, [[model], deletedModels]];
-                    case 17: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    IndexedDBAdapter.prototype.deleteItem = function (deleteQueue) {
-        var e_9, _a, e_10, _b;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var connectionStoreNames, tx, _c, _d, deleteItem, storeName, items, store, items_1, items_1_1, item, key, keyValues, itemKey, e_10_1, e_9_1;
-            return tslib_1.__generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        connectionStoreNames = deleteQueue.map(function (_a) {
-                            var storeName = _a.storeName;
-                            return storeName;
-                        });
-                        tx = this.db.transaction(tslib_1.__spread(connectionStoreNames), 'readwrite');
-                        _e.label = 1;
-                    case 1:
-                        _e.trys.push([1, 22, 23, 28]);
-                        _c = tslib_1.__asyncValues(deleteQueue);
-                        _e.label = 2;
-                    case 2: return [4 /*yield*/, _c.next()];
-                    case 3:
-                        if (!(_d = _e.sent(), !_d.done)) return [3 /*break*/, 21];
-                        deleteItem = _d.value;
-                        storeName = deleteItem.storeName, items = deleteItem.items;
-                        store = tx.objectStore(storeName);
-                        _e.label = 4;
-                    case 4:
-                        _e.trys.push([4, 14, 15, 20]);
-                        items_1 = tslib_1.__asyncValues(items);
-                        _e.label = 5;
-                    case 5: return [4 /*yield*/, items_1.next()];
-                    case 6:
-                        if (!(items_1_1 = _e.sent(), !items_1_1.done)) return [3 /*break*/, 13];
-                        item = items_1_1.value;
-                        if (!item) return [3 /*break*/, 12];
-                        key = void 0;
-                        if (!(typeof item === 'object')) return [3 /*break*/, 8];
-                        keyValues = this.getIndexKeyValuesFromModel(item);
-                        return [4 /*yield*/, store
-                                .index('byPk')
-                                .getKey(this.canonicalKeyPath(keyValues))];
-                    case 7:
-                        key = _e.sent();
-                        return [3 /*break*/, 10];
-                    case 8:
-                        itemKey = item.toString();
-                        return [4 /*yield*/, store.index('byPk').getKey(itemKey)];
-                    case 9:
-                        key = _e.sent();
-                        _e.label = 10;
-                    case 10:
-                        if (!(key !== undefined)) return [3 /*break*/, 12];
-                        return [4 /*yield*/, store.delete(key)];
-                    case 11:
-                        _e.sent();
-                        _e.label = 12;
-                    case 12: return [3 /*break*/, 5];
-                    case 13: return [3 /*break*/, 20];
-                    case 14:
-                        e_10_1 = _e.sent();
-                        e_10 = { error: e_10_1 };
-                        return [3 /*break*/, 20];
-                    case 15:
-                        _e.trys.push([15, , 18, 19]);
-                        if (!(items_1_1 && !items_1_1.done && (_b = items_1.return))) return [3 /*break*/, 17];
-                        return [4 /*yield*/, _b.call(items_1)];
-                    case 16:
-                        _e.sent();
-                        _e.label = 17;
-                    case 17: return [3 /*break*/, 19];
-                    case 18:
-                        if (e_10) throw e_10.error;
-                        return [7 /*endfinally*/];
-                    case 19: return [7 /*endfinally*/];
-                    case 20: return [3 /*break*/, 2];
-                    case 21: return [3 /*break*/, 28];
-                    case 22:
-                        e_9_1 = _e.sent();
-                        e_9 = { error: e_9_1 };
-                        return [3 /*break*/, 28];
-                    case 23:
-                        _e.trys.push([23, , 26, 27]);
-                        if (!(_d && !_d.done && (_a = _c.return))) return [3 /*break*/, 25];
-                        return [4 /*yield*/, _a.call(_c)];
-                    case 24:
-                        _e.sent();
-                        _e.label = 25;
-                    case 25: return [3 /*break*/, 27];
-                    case 26:
-                        if (e_9) throw e_9.error;
-                        return [7 /*endfinally*/];
-                    case 27: return [7 /*endfinally*/];
-                    case 28: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    IndexedDBAdapter.prototype.deleteTraverse = function (relations, models, srcModel, nameSpace, deleteQueue) {
-        var relations_1, relations_1_1, models_1, models_1_1, models_2, models_2_1;
-        var e_11, _a, e_12, _b, e_13, _c;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var rel, relationType, modelName, targetName, targetNames, associatedWith, storeName, _d, model, hasOneIndex, values, recordToDelete, index, values, value, recordToDelete, modelsToDelete, _e, e_12_1, model, index, keyValues, childRecords, childModels, e_13_1, e_11_1;
-            var _this = this;
-            return tslib_1.__generator(this, function (_f) {
-                switch (_f.label) {
-                    case 0:
-                        _f.trys.push([0, 42, 43, 48]);
-                        relations_1 = tslib_1.__asyncValues(relations);
-                        _f.label = 1;
-                    case 1: return [4 /*yield*/, relations_1.next()];
-                    case 2:
-                        if (!(relations_1_1 = _f.sent(), !relations_1_1.done)) return [3 /*break*/, 41];
-                        rel = relations_1_1.value;
-                        relationType = rel.relationType, modelName = rel.modelName, targetName = rel.targetName, targetNames = rel.targetNames, associatedWith = rel.associatedWith;
-                        storeName = util_1.getStorename(nameSpace, modelName);
-                        _d = relationType;
-                        switch (_d) {
-                            case 'HAS_ONE': return [3 /*break*/, 3];
-                            case 'HAS_MANY': return [3 /*break*/, 23];
-                            case 'BELONGS_TO': return [3 /*break*/, 38];
-                        }
-                        return [3 /*break*/, 39];
-                    case 3:
-                        _f.trys.push([3, 16, 17, 22]);
-                        models_1 = tslib_1.__asyncValues(models);
-                        _f.label = 4;
-                    case 4: return [4 /*yield*/, models_1.next()];
-                    case 5:
-                        if (!(models_1_1 = _f.sent(), !models_1_1.done)) return [3 /*break*/, 15];
-                        model = models_1_1.value;
-                        hasOneIndex = 'byPk';
-                        if (!(targetNames === null || targetNames === void 0 ? void 0 : targetNames.length)) return [3 /*break*/, 8];
-                        values = targetNames
-                            .filter(function (targetName) { var _a; return (_a = model[targetName]) !== null && _a !== void 0 ? _a : false; })
-                            .map(function (targetName) { return model[targetName]; });
-                        if (values.length === 0)
-                            return [3 /*break*/, 15];
-                        return [4 /*yield*/, this.db
-                                .transaction(storeName, 'readwrite')
-                                .objectStore(storeName)
-                                .index(hasOneIndex)
-                                .get(this.canonicalKeyPath(values))];
-                    case 6:
-                        recordToDelete = (_f.sent());
-                        return [4 /*yield*/, this.deleteTraverse(this.schema.namespaces[nameSpace].relationships[modelName]
-                                .relationTypes, recordToDelete ? [recordToDelete] : [], modelName, nameSpace, deleteQueue)];
-                    case 7:
-                        _f.sent();
-                        return [3 /*break*/, 15];
-                    case 8:
-                        index = void 0;
-                        values = void 0;
-                        if (targetName && targetName in model) {
-                            index = hasOneIndex;
-                            value = model[targetName];
-                            if (value === null)
-                                return [3 /*break*/, 15];
-                            values = [value];
-                        }
-                        else {
-                            // backwards compatability for older versions of codegen that did not emit targetName for HAS_ONE relations
-                            // TODO: can we deprecate this? it's been ~2 years since codegen started including targetName for HAS_ONE
-                            // If we deprecate, we'll need to re-gen the MIPR in __tests__/schema.ts > newSchema
-                            // otherwise some unit tests will fail
-                            index = util_1.getIndex(this.schema.namespaces[nameSpace].relationships[modelName]
-                                .relationTypes, srcModel);
-                            values = this.getIndexKeyValuesFromModel(model);
-                        }
-                        if (!values || !index)
-                            return [3 /*break*/, 15];
-                        return [4 /*yield*/, this.db
-                                .transaction(storeName, 'readwrite')
-                                .objectStore(storeName)
-                                .index(index)
-                                .get(this.canonicalKeyPath(values))];
-                    case 9:
-                        recordToDelete = (_f.sent());
-                        if (!recordToDelete) return [3 /*break*/, 11];
-                        return [4 /*yield*/, this.load(nameSpace, modelName, [recordToDelete])];
-                    case 10:
-                        _e = _f.sent();
-                        return [3 /*break*/, 12];
-                    case 11:
-                        _e = [];
-                        _f.label = 12;
-                    case 12:
-                        modelsToDelete = _e;
-                        return [4 /*yield*/, this.deleteTraverse(this.schema.namespaces[nameSpace].relationships[modelName]
-                                .relationTypes, modelsToDelete, modelName, nameSpace, deleteQueue)];
-                    case 13:
-                        _f.sent();
-                        _f.label = 14;
-                    case 14: return [3 /*break*/, 4];
-                    case 15: return [3 /*break*/, 22];
-                    case 16:
-                        e_12_1 = _f.sent();
-                        e_12 = { error: e_12_1 };
-                        return [3 /*break*/, 22];
-                    case 17:
-                        _f.trys.push([17, , 20, 21]);
-                        if (!(models_1_1 && !models_1_1.done && (_b = models_1.return))) return [3 /*break*/, 19];
-                        return [4 /*yield*/, _b.call(models_1)];
-                    case 18:
-                        _f.sent();
-                        _f.label = 19;
-                    case 19: return [3 /*break*/, 21];
-                    case 20:
-                        if (e_12) throw e_12.error;
-                        return [7 /*endfinally*/];
-                    case 21: return [7 /*endfinally*/];
-                    case 22: return [3 /*break*/, 40];
-                    case 23:
-                        _f.trys.push([23, 31, 32, 37]);
-                        models_2 = tslib_1.__asyncValues(models);
-                        _f.label = 24;
-                    case 24: return [4 /*yield*/, models_2.next()];
-                    case 25:
-                        if (!(models_2_1 = _f.sent(), !models_2_1.done)) return [3 /*break*/, 30];
-                        model = models_2_1.value;
-                        index = 
-                        // explicit bi-directional @hasMany and @manyToMany
-                        util_1.getIndex(this.schema.namespaces[nameSpace].relationships[modelName]
-                            .relationTypes, srcModel) ||
-                            // uni and/or implicit @hasMany
-                            util_1.getIndexFromAssociation(this.schema.namespaces[nameSpace].relationships[modelName]
-                                .indexes, associatedWith);
-                        keyValues = this.getIndexKeyValuesFromModel(model);
-                        return [4 /*yield*/, this.db
-                                .transaction(storeName, 'readwrite')
-                                .objectStore(storeName)
-                                .index(index)
-                                .getAll(this.canonicalKeyPath(keyValues))];
-                    case 26:
-                        childRecords = _f.sent();
-                        return [4 /*yield*/, this.load(nameSpace, modelName, childRecords)];
-                    case 27:
-                        childModels = _f.sent();
-                        return [4 /*yield*/, this.deleteTraverse(this.schema.namespaces[nameSpace].relationships[modelName]
-                                .relationTypes, childModels, modelName, nameSpace, deleteQueue)];
-                    case 28:
-                        _f.sent();
-                        _f.label = 29;
-                    case 29: return [3 /*break*/, 24];
-                    case 30: return [3 /*break*/, 37];
-                    case 31:
-                        e_13_1 = _f.sent();
-                        e_13 = { error: e_13_1 };
-                        return [3 /*break*/, 37];
-                    case 32:
-                        _f.trys.push([32, , 35, 36]);
-                        if (!(models_2_1 && !models_2_1.done && (_c = models_2.return))) return [3 /*break*/, 34];
-                        return [4 /*yield*/, _c.call(models_2)];
-                    case 33:
-                        _f.sent();
-                        _f.label = 34;
-                    case 34: return [3 /*break*/, 36];
-                    case 35:
-                        if (e_13) throw e_13.error;
-                        return [7 /*endfinally*/];
-                    case 36: return [7 /*endfinally*/];
-                    case 37: return [3 /*break*/, 40];
-                    case 38: 
-                    // Intentionally blank
-                    return [3 /*break*/, 40];
-                    case 39: throw new Error("Invalid relation type " + relationType);
-                    case 40: return [3 /*break*/, 1];
-                    case 41: return [3 /*break*/, 48];
-                    case 42:
-                        e_11_1 = _f.sent();
-                        e_11 = { error: e_11_1 };
-                        return [3 /*break*/, 48];
-                    case 43:
-                        _f.trys.push([43, , 46, 47]);
-                        if (!(relations_1_1 && !relations_1_1.done && (_a = relations_1.return))) return [3 /*break*/, 45];
-                        return [4 /*yield*/, _a.call(relations_1)];
-                    case 44:
-                        _f.sent();
-                        _f.label = 45;
-                    case 45: return [3 /*break*/, 47];
-                    case 46:
-                        if (e_11) throw e_11.error;
-                        return [7 /*endfinally*/];
-                    case 47: return [7 /*endfinally*/];
-                    case 48:
-                        deleteQueue.push({
-                            storeName: util_1.getStorename(nameSpace, srcModel),
-                            items: models.map(function (record) {
-                                return _this.modelInstanceCreator(_this.getModelConstructorByModelName(nameSpace, srcModel), record);
-                            }),
-                        });
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    IndexedDBAdapter.prototype.clear = function () {
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0: return [4 /*yield*/, this.checkPrivate()];
-                    case 1:
-                        _b.sent();
-                        (_a = this.db) === null || _a === void 0 ? void 0 : _a.close();
-                        return [4 /*yield*/, idb.deleteDB(this.dbName)];
-                    case 2:
-                        _b.sent();
-                        this.db = undefined;
-                        this.initPromise = undefined;
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    IndexedDBAdapter.prototype.batchSave = function (modelConstructor, items) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var result, storeName, txn, store, _loop_3, this_1, items_2, items_2_1, item, e_14_1;
-            var e_14, _a;
-            var _this = this;
-            return tslib_1.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        if (items.length === 0) {
-                            return [2 /*return*/, []];
-                        }
-                        return [4 /*yield*/, this.checkPrivate()];
-                    case 1:
-                        _b.sent();
-                        result = [];
-                        storeName = this.getStorenameForModel(modelConstructor);
-                        txn = this.db.transaction(storeName, 'readwrite');
-                        store = txn.store;
-                        _loop_3 = function (item) {
-                            var namespaceName, modelName, model, connectedModels, keyValues, _deleted, index, key, instance;
-                            return tslib_1.__generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        namespaceName = this_1.namespaceResolver(modelConstructor);
-                                        modelName = modelConstructor.name;
-                                        model = this_1.modelInstanceCreator(modelConstructor, item);
-                                        connectedModels = util_1.traverseModel(modelName, model, this_1.schema.namespaces[namespaceName], this_1.modelInstanceCreator, this_1.getModelConstructorByModelName);
-                                        keyValues = this_1.getIndexKeyValuesFromModel(model);
-                                        _deleted = item._deleted;
-                                        index = store.index('byPk');
-                                        return [4 /*yield*/, index.getKey(this_1.canonicalKeyPath(keyValues))];
-                                    case 1:
-                                        key = _a.sent();
-                                        if (!!_deleted) return [3 /*break*/, 3];
-                                        instance = connectedModels.find(function (_a) {
-                                            var instance = _a.instance;
-                                            var instanceKeyValues = _this.getIndexKeyValuesFromModel(instance);
-                                            return util_1.keysEqual(instanceKeyValues, keyValues);
-                                        }).instance;
-                                        result.push([
-                                            instance,
-                                            key ? types_1.OpType.UPDATE : types_1.OpType.INSERT,
-                                        ]);
-                                        return [4 /*yield*/, store.put(instance, key)];
-                                    case 2:
-                                        _a.sent();
-                                        return [3 /*break*/, 5];
-                                    case 3:
-                                        result.push([item, types_1.OpType.DELETE]);
-                                        if (!key) return [3 /*break*/, 5];
-                                        return [4 /*yield*/, store.delete(key)];
-                                    case 4:
-                                        _a.sent();
-                                        _a.label = 5;
-                                    case 5: return [2 /*return*/];
-                                }
-                            });
-                        };
-                        this_1 = this;
-                        _b.label = 2;
-                    case 2:
-                        _b.trys.push([2, 7, 8, 9]);
-                        items_2 = tslib_1.__values(items), items_2_1 = items_2.next();
-                        _b.label = 3;
-                    case 3:
-                        if (!!items_2_1.done) return [3 /*break*/, 6];
-                        item = items_2_1.value;
-                        return [5 /*yield**/, _loop_3(item)];
-                    case 4:
-                        _b.sent();
-                        _b.label = 5;
-                    case 5:
-                        items_2_1 = items_2.next();
-                        return [3 /*break*/, 3];
-                    case 6: return [3 /*break*/, 9];
-                    case 7:
-                        e_14_1 = _b.sent();
-                        e_14 = { error: e_14_1 };
-                        return [3 /*break*/, 9];
-                    case 8:
-                        try {
-                            if (items_2_1 && !items_2_1.done && (_a = items_2.return)) _a.call(items_2);
-                        }
-                        finally { if (e_14) throw e_14.error; }
-                        return [7 /*endfinally*/];
-                    case 9: return [4 /*yield*/, txn.done];
-                    case 10:
-                        _b.sent();
-                        return [2 /*return*/, result];
-                }
-            });
-        });
-    };
-    IndexedDBAdapter.prototype.createObjectStoreForModel = function (db, namespaceName, storeName, modelName) {
-        var store = db.createObjectStore(storeName, {
-            autoIncrement: true,
-        });
-        var indexes = this.schema.namespaces[namespaceName].relationships[modelName].indexes;
-        indexes.forEach(function (_a) {
-            var _b = tslib_1.__read(_a, 3), idxName = _b[0], keyPath = _b[1], options = _b[2];
-            store.createIndex(idxName, keyPath, options);
-        });
-        return store;
-    };
     return IndexedDBAdapter;
-}());
+}(StorageAdapterBase_1.StorageAdapterBase));
 exports.default = new IndexedDBAdapter();
 //# sourceMappingURL=IndexedDBAdapter.js.map