@aws-amplify/datastore 3.14.4 → 3.14.5-unstable.2

package/lib/storage/adapter/IndexedDBAdapter.js

@@ -1,88 +1,8 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __asyncValues = (this && this.__asyncValues) || function (o) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var m = o[Symbol.asyncIterator], i;
-    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
-    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
-    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-var __spread = (this && this.__spread) || function () {
-    for (var ar = [], i = 0; i < arguments.length; i++) ar = ar.concat(__read(arguments[i]));
-    return ar;
-};
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
 var core_1 = require("@aws-amplify/core");
-var idb = __importStar(require("idb"));
+var idb = tslib_1.__importStar(require("idb"));
 var predicates_1 = require("../../predicates");
 var types_1 = require("../../types");
 var util_1 = require("../../util");
@@ -122,9 +42,9 @@ var IndexedDBAdapter = /** @class */ (function () {
         return util_1.extractPrimaryKeyValues(model, keys);
     };
     IndexedDBAdapter.prototype.checkPrivate = function () {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var isPrivate;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, util_1.isPrivateMode().then(function (isPrivate) {
                             return isPrivate;
@@ -154,9 +74,9 @@ var IndexedDBAdapter = /** @class */ (function () {
      * https://github.com/aws-amplify/amplify-js/pull/10527
      */
     IndexedDBAdapter.prototype.setSafariCompatabilityMode = function () {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var _a;
-            return __generator(this, function (_b) {
+            return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _a = this;
@@ -172,17 +92,17 @@ var IndexedDBAdapter = /** @class */ (function () {
         });
     };
     IndexedDBAdapter.prototype.getNamespaceAndModelFromStorename = function (storeName) {
-        var _a = __read(storeName.split('_')), namespaceName = _a[0], modelNameArr = _a.slice(1);
+        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) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var VERSION, _a, error_1;
             var _this = this;
-            return __generator(this, function (_b) {
+            return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
@@ -215,11 +135,11 @@ var IndexedDBAdapter = /** @class */ (function () {
                         VERSION = 3;
                         _a = this;
                         return [4 /*yield*/, idb.openDB(this.dbName, VERSION, {
-                                upgrade: function (db, oldVersion, newVersion, txn) { return __awaiter(_this, void 0, void 0, function () {
+                                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, newStore, cursor, count, e_1_1, error_2;
                                     var e_1, _d;
                                     var _this = this;
-                                    return __generator(this, function (_e) {
+                                    return tslib_1.__generator(this, function (_e) {
                                         switch (_e.label) {
                                             case 0:
                                                 if (oldVersion === 0) {
@@ -239,7 +159,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                                                 _e.label = 2;
                                             case 2:
                                                 _e.trys.push([2, 11, 12, 13]);
-                                                _a = __values(txn.objectStoreNames), _b = _a.next();
+                                                _a = tslib_1.__values(txn.objectStoreNames), _b = _a.next();
                                                 _e.label = 3;
                                             case 3:
                                                 if (!!_b.done) return [3 /*break*/, 10];
@@ -300,11 +220,11 @@ var IndexedDBAdapter = /** @class */ (function () {
                                                         ];
                                                     })
                                                         .filter(function (_a) {
-                                                        var _b = __read(_a, 2), storeName = _b[1];
+                                                        var _b = tslib_1.__read(_a, 2), storeName = _b[1];
                                                         return !objectStoreNames.has(storeName);
                                                     })
                                                         .forEach(function (_a) {
-                                                        var _b = __read(_a, 2), modelName = _b[0], storeName = _b[1];
+                                                        var _b = tslib_1.__read(_a, 2), modelName = _b[0], storeName = _b[1];
                                                         _this.createObjectStoreForModel(db, namespaceName, storeName, modelName);
                                                     });
                                                 });
@@ -335,9 +255,9 @@ var IndexedDBAdapter = /** @class */ (function () {
         });
     };
     IndexedDBAdapter.prototype._get = function (storeOrStoreName, keyArr) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var index, storeName, store, result;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (typeof storeOrStoreName === 'string') {
@@ -358,14 +278,14 @@ var IndexedDBAdapter = /** @class */ (function () {
     };
     IndexedDBAdapter.prototype.save = function (model, condition) {
         var e_2, _a;
-        return __awaiter(this, void 0, void 0, function () {
-            var modelConstructor, storeName, namespaceName, connectedModels, set, connectionStoreNames, tx, store, keyValues, fromDB, predicates, 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;
+        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;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
-                        _b.sent();
+                        _c.sent();
                         modelConstructor = Object.getPrototypeOf(model)
                             .constructor;
                         storeName = this.getStorenameForModel(modelConstructor);
@@ -379,15 +299,15 @@ var IndexedDBAdapter = /** @class */ (function () {
                             var keys = util_1.getIndexKeys(_this.schema.namespaces[namespaceName], modelName);
                             return { storeName: storeName, item: item, instance: instance, keys: keys };
                         });
-                        tx = this.db.transaction(__spread([storeName], Array.from(set.values())), 'readwrite');
+                        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)];
                     case 2:
-                        fromDB = _b.sent();
+                        fromDB = _c.sent();
                         if (condition && fromDB) {
                             predicates = predicates_1.ModelPredicateCreator.getPredicates(condition);
-                            predicateObjs = predicates.predicates, type = predicates.type;
+                            _b = predicates || {}, predicateObjs = _b.predicates, type = _b.type;
                             isValid = util_1.validatePredicate(fromDB, type, predicateObjs);
                             if (!isValid) {
                                 msg = 'Conditional update failed';
@@ -396,14 +316,14 @@ var IndexedDBAdapter = /** @class */ (function () {
                             }
                         }
                         result = [];
-                        _b.label = 3;
+                        _c.label = 3;
                     case 3:
-                        _b.trys.push([3, 11, 12, 17]);
-                        connectionStoreNames_1 = __asyncValues(connectionStoreNames);
-                        _b.label = 4;
+                        _c.trys.push([3, 11, 12, 17]);
+                        connectionStoreNames_1 = tslib_1.__asyncValues(connectionStoreNames);
+                        _c.label = 4;
                     case 4: return [4 /*yield*/, connectionStoreNames_1.next()];
                     case 5:
-                        if (!(connectionStoreNames_1_1 = _b.sent(), !connectionStoreNames_1_1.done)) return [3 /*break*/, 10];
+                        if (!(connectionStoreNames_1_1 = _c.sent(), !connectionStoreNames_1_1.done)) return [3 /*break*/, 10];
                         resItem = connectionStoreNames_1_1.value;
                         storeName_1 = resItem.storeName, item = resItem.item, instance = resItem.instance, keys = resItem.keys;
                         store_1 = tx.objectStore(storeName_1);
@@ -413,7 +333,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                         });
                         return [4 /*yield*/, this._get(store_1, itemKeyValues)];
                     case 6:
-                        fromDB_1 = _b.sent();
+                        fromDB_1 = _c.sent();
                         opType = fromDB_1 === undefined ? types_1.OpType.INSERT : types_1.OpType.UPDATE;
                         modelKeyValues = this.getIndexKeyValuesFromModel(model);
                         if (!(util_1.keysEqual(itemKeyValues, modelKeyValues) ||
@@ -422,25 +342,25 @@ var IndexedDBAdapter = /** @class */ (function () {
                                 .index('byPk')
                                 .getKey(this.canonicalKeyPath(itemKeyValues))];
                     case 7:
-                        key = _b.sent();
+                        key = _c.sent();
                         return [4 /*yield*/, store_1.put(item, key)];
                     case 8:
-                        _b.sent();
+                        _c.sent();
                         result.push([instance, opType]);
-                        _b.label = 9;
+                        _c.label = 9;
                     case 9: return [3 /*break*/, 4];
                     case 10: return [3 /*break*/, 17];
                     case 11:
-                        e_2_1 = _b.sent();
+                        e_2_1 = _c.sent();
                         e_2 = { error: e_2_1 };
                         return [3 /*break*/, 17];
                     case 12:
-                        _b.trys.push([12, , 15, 16]);
+                        _c.trys.push([12, , 15, 16]);
                         if (!(connectionStoreNames_1_1 && !connectionStoreNames_1_1.done && (_a = connectionStoreNames_1.return))) return [3 /*break*/, 14];
                         return [4 /*yield*/, _a.call(connectionStoreNames_1)];
                     case 13:
-                        _b.sent();
-                        _b.label = 14;
+                        _c.sent();
+                        _c.label = 14;
                     case 14: return [3 /*break*/, 16];
                     case 15:
                         if (e_2) throw e_2.error;
@@ -448,211 +368,40 @@ var IndexedDBAdapter = /** @class */ (function () {
                     case 16: return [7 /*endfinally*/];
                     case 17: return [4 /*yield*/, tx.done];
                     case 18:
-                        _b.sent();
+                        _c.sent();
                         return [2 /*return*/, result];
                 }
             });
         });
     };
     IndexedDBAdapter.prototype.load = function (namespaceName, srcModelName, records) {
-        var records_1, records_1_1, records_2, records_2_1;
-        var e_3, _a, e_4, _b, e_5, _c;
-        return __awaiter(this, void 0, void 0, function () {
-            var namespace, relations, connectionStoreNames, modelConstructor, tx, relations_1, relations_1_1, relation, fieldName, modelName, targetName, targetNames, storeName, store, modelConstructor_1, _d, recordItem, getByFields, allPresent, keys, connectionRecord, getByfield, key, connectionRecord, e_4_1, recordItem, allPresent, keys, connectionRecord, key, connectionRecord, e_5_1, e_3_1;
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var namespace, relations, connectionStoreNames, modelConstructor;
             var _this = this;
-            return __generator(this, function (_e) {
-                switch (_e.label) {
-                    case 0:
-                        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);
-                                })];
-                        }
-                        tx = this.db.transaction(__spread(connectionStoreNames), 'readonly');
-                        _e.label = 1;
-                    case 1:
-                        _e.trys.push([1, 38, 39, 44]);
-                        relations_1 = __asyncValues(relations);
-                        _e.label = 2;
-                    case 2: return [4 /*yield*/, relations_1.next()];
-                    case 3:
-                        if (!(relations_1_1 = _e.sent(), !relations_1_1.done)) return [3 /*break*/, 37];
-                        relation = relations_1_1.value;
-                        fieldName = relation.fieldName, modelName = relation.modelName, targetName = relation.targetName, targetNames = relation.targetNames;
-                        storeName = util_1.getStorename(namespaceName, modelName);
-                        store = tx.objectStore(storeName);
-                        modelConstructor_1 = this.getModelConstructorByModelName(namespaceName, modelName);
-                        _d = relation.relationType;
-                        switch (_d) {
-                            case 'HAS_ONE': return [3 /*break*/, 4];
-                            case 'BELONGS_TO': return [3 /*break*/, 19];
-                            case 'HAS_MANY': return [3 /*break*/, 34];
-                        }
-                        return [3 /*break*/, 35];
-                    case 4:
-                        _e.trys.push([4, 12, 13, 18]);
-                        records_1 = __asyncValues(records);
-                        _e.label = 5;
-                    case 5: return [4 /*yield*/, records_1.next()];
-                    case 6:
-                        if (!(records_1_1 = _e.sent(), !records_1_1.done)) return [3 /*break*/, 11];
-                        recordItem = records_1_1.value;
-                        if (!(targetNames === null || targetNames === void 0 ? void 0 : targetNames.length)) return [3 /*break*/, 8];
-                        getByFields = [];
-                        allPresent = void 0;
-                        // iterate through all targetnames to make sure they are all present in the recordItem
-                        allPresent = targetNames.every(function (targetName) {
-                            return recordItem[targetName] != null;
-                        });
-                        if (!allPresent) {
-                            return [3 /*break*/, 11];
-                        }
-                        getByFields = targetNames;
-                        keys = getByFields.map(function (getByField) { return recordItem[getByField]; });
-                        return [4 /*yield*/, this._get(store, keys)];
-                    case 7:
-                        connectionRecord = _e.sent();
-                        recordItem[fieldName] =
-                            connectionRecord &&
-                                this.modelInstanceCreator(modelConstructor_1, connectionRecord);
-                        return [3 /*break*/, 10];
-                    case 8:
-                        getByfield = recordItem[targetName]
-                            ? targetName
-                            : fieldName;
-                        // We break here, because the recordItem does not have 'team', the `getByField`
-                        // extract the keys on the related model.
-                        if (!recordItem[getByfield])
-                            return [3 /*break*/, 11];
-                        key = [recordItem[getByfield]];
-                        return [4 /*yield*/, this._get(store, key)];
-                    case 9:
-                        connectionRecord = _e.sent();
-                        recordItem[fieldName] =
-                            connectionRecord &&
-                                this.modelInstanceCreator(modelConstructor_1, connectionRecord);
-                        _e.label = 10;
-                    case 10: return [3 /*break*/, 5];
-                    case 11: return [3 /*break*/, 18];
-                    case 12:
-                        e_4_1 = _e.sent();
-                        e_4 = { error: e_4_1 };
-                        return [3 /*break*/, 18];
-                    case 13:
-                        _e.trys.push([13, , 16, 17]);
-                        if (!(records_1_1 && !records_1_1.done && (_b = records_1.return))) return [3 /*break*/, 15];
-                        return [4 /*yield*/, _b.call(records_1)];
-                    case 14:
-                        _e.sent();
-                        _e.label = 15;
-                    case 15: return [3 /*break*/, 17];
-                    case 16:
-                        if (e_4) throw e_4.error;
-                        return [7 /*endfinally*/];
-                    case 17: return [7 /*endfinally*/];
-                    case 18: return [3 /*break*/, 36];
-                    case 19:
-                        _e.trys.push([19, 27, 28, 33]);
-                        records_2 = __asyncValues(records);
-                        _e.label = 20;
-                    case 20: return [4 /*yield*/, records_2.next()];
-                    case 21:
-                        if (!(records_2_1 = _e.sent(), !records_2_1.done)) return [3 /*break*/, 26];
-                        recordItem = records_2_1.value;
-                        if (!(targetNames === null || targetNames === void 0 ? void 0 : targetNames.length)) return [3 /*break*/, 23];
-                        allPresent = void 0;
-                        // iterate through all targetnames to make sure they are all present in the recordItem
-                        allPresent = targetNames.every(function (targetName) {
-                            return recordItem[targetName] != null;
-                        });
-                        // If not present, there is not yet a connected record
-                        if (!allPresent) {
-                            return [3 /*break*/, 26];
-                        }
-                        keys = targetNames.map(function (targetName) { return recordItem[targetName]; });
-                        return [4 /*yield*/, this._get(store, keys)];
-                    case 22:
-                        connectionRecord = _e.sent();
-                        recordItem[fieldName] =
-                            connectionRecord &&
-                                this.modelInstanceCreator(modelConstructor_1, connectionRecord);
-                        targetNames === null || targetNames === void 0 ? void 0 : targetNames.map(function (targetName) {
-                            delete recordItem[targetName];
-                        });
-                        return [3 /*break*/, 25];
-                    case 23:
-                        if (!recordItem[targetName]) return [3 /*break*/, 25];
-                        key = [recordItem[targetName]];
-                        return [4 /*yield*/, this._get(store, key)];
-                    case 24:
-                        connectionRecord = _e.sent();
-                        recordItem[fieldName] =
-                            connectionRecord &&
-                                this.modelInstanceCreator(modelConstructor_1, connectionRecord);
-                        delete recordItem[targetName];
-                        _e.label = 25;
-                    case 25: return [3 /*break*/, 20];
-                    case 26: return [3 /*break*/, 33];
-                    case 27:
-                        e_5_1 = _e.sent();
-                        e_5 = { error: e_5_1 };
-                        return [3 /*break*/, 33];
-                    case 28:
-                        _e.trys.push([28, , 31, 32]);
-                        if (!(records_2_1 && !records_2_1.done && (_c = records_2.return))) return [3 /*break*/, 30];
-                        return [4 /*yield*/, _c.call(records_2)];
-                    case 29:
-                        _e.sent();
-                        _e.label = 30;
-                    case 30: return [3 /*break*/, 32];
-                    case 31:
-                        if (e_5) throw e_5.error;
-                        return [7 /*endfinally*/];
-                    case 32: return [7 /*endfinally*/];
-                    case 33: return [3 /*break*/, 36];
-                    case 34: 
-                    // TODO: Lazy loading
-                    return [3 /*break*/, 36];
-                    case 35:
-                        util_1.exhaustiveCheck(relation.relationType);
-                        return [3 /*break*/, 36];
-                    case 36: return [3 /*break*/, 2];
-                    case 37: return [3 /*break*/, 44];
-                    case 38:
-                        e_3_1 = _e.sent();
-                        e_3 = { error: e_3_1 };
-                        return [3 /*break*/, 44];
-                    case 39:
-                        _e.trys.push([39, , 42, 43]);
-                        if (!(relations_1_1 && !relations_1_1.done && (_a = relations_1.return))) return [3 /*break*/, 41];
-                        return [4 /*yield*/, _a.call(relations_1)];
-                    case 40:
-                        _e.sent();
-                        _e.label = 41;
-                    case 41: return [3 /*break*/, 43];
-                    case 42:
-                        if (e_3) throw e_3.error;
-                        return [7 /*endfinally*/];
-                    case 43: return [7 /*endfinally*/];
-                    case 44: return [2 /*return*/, records.map(function (record) {
+            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 __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var storeName, namespaceName, predicates, keyPath, queryByKey, hasSort, hasPagination, records;
             var _this = this;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
@@ -664,9 +413,9 @@ var IndexedDBAdapter = /** @class */ (function () {
                         queryByKey = predicates && this.keyValueFromPredicate(predicates, keyPath);
                         hasSort = pagination && pagination.sort;
                         hasPagination = pagination && pagination.limit;
-                        return [4 /*yield*/, (function () { return __awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, (function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                                 var record, filtered, all;
-                                return __generator(this, function (_a) {
+                                return tslib_1.__generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
                                             if (!queryByKey) return [3 /*break*/, 2];
@@ -695,7 +444,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                                 });
                             }); })()];
                     case 2:
-                        records = _a.sent();
+                        records = (_a.sent());
                         return [4 /*yield*/, this.load(namespaceName, modelConstructor.name, records)];
                     case 3: return [2 /*return*/, _a.sent()];
                 }
@@ -703,21 +452,18 @@ var IndexedDBAdapter = /** @class */ (function () {
         });
     };
     IndexedDBAdapter.prototype.getByKey = function (storeName, keyValue) {
-        return __awaiter(this, void 0, void 0, function () {
-            var record;
-            return __generator(this, function (_a) {
+        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:
-                        record = _a.sent();
-                        return [2 /*return*/, record];
+                    case 1: return [2 /*return*/, _a.sent()];
                 }
             });
         });
     };
     IndexedDBAdapter.prototype.getAll = function (storeName) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
+        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()];
@@ -726,7 +472,7 @@ var IndexedDBAdapter = /** @class */ (function () {
         });
     };
     IndexedDBAdapter.prototype.keyValueFromPredicate = function (predicates, keyPath) {
-        var e_6, _a;
+        var e_3, _a;
         var predicateObjs = predicates.predicates;
         if (predicateObjs.length !== keyPath.length) {
             return;
@@ -737,58 +483,169 @@ var IndexedDBAdapter = /** @class */ (function () {
             predicateObj && keyValues.push(predicateObj.operand);
         };
         try {
-            for (var keyPath_1 = __values(keyPath), keyPath_1_1 = keyPath_1.next(); !keyPath_1_1.done; keyPath_1_1 = keyPath_1.next()) {
+            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_6_1) { e_6 = { error: e_6_1 }; }
+        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_6) throw e_6.error; }
+            finally { if (e_3) throw e_3.error; }
         }
         return keyValues.length === keyPath.length ? keyValues : undefined;
     };
+    IndexedDBAdapter.prototype.matchingIndex = function (storeName, fieldName, transaction) {
+        var e_4, _a;
+        var store = transaction.objectStore(storeName);
+        try {
+            for (var _b = tslib_1.__values(store.indexNames), _c = _b.next(); !_c.done; _c = _b.next()) {
+                var name_1 = _c.value;
+                var idx = store.index(name_1);
+                if (idx.keyPath === fieldName) {
+                    return idx;
+                }
+            }
+        }
+        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        finally {
+            try {
+                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+            }
+            finally { if (e_4) throw e_4.error; }
+        }
+    };
     IndexedDBAdapter.prototype.filterOnPredicate = function (storeName, predicates) {
-        return __awaiter(this, void 0, void 0, function () {
-            var predicateObjs, type, all, filtered;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var predicateObjs, type, candidateResults, fieldPredicates, txn, predicateIndexes, actualPredicateIndexes, predicateIndex, distinctResults, predicateIndexes_1, predicateIndexes_1_1, predicateIndex, resultGroup, resultGroup_1, resultGroup_1_1, item, e_5_1, filtered;
+            var e_5, _a, e_6, _b;
+            var _this = this;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         predicateObjs = predicates.predicates, type = predicates.type;
-                        return [4 /*yield*/, this.getAll(storeName)];
+                        // the predicate objects we care about tend to be nested at least
+                        // one level down: `{and: {or: {and: { <the predicates we want> }}}}`
+                        // so, we unpack and/or groups until we find a group with more than 1
+                        // child OR a child that is not a group (and is therefore a predicate "object").
+                        while (predicateObjs.length === 1 && types_1.isPredicateGroup(predicateObjs[0])) {
+                            type = predicateObjs[0].type;
+                            predicateObjs = predicateObjs[0].predicates;
+                        }
+                        fieldPredicates = predicateObjs.filter(function (p) {
+                            return types_1.isPredicateObj(p);
+                        });
+                        txn = this.db.transaction(storeName);
+                        predicateIndexes = fieldPredicates.map(function (p) {
+                            return {
+                                predicate: p,
+                                index: _this.matchingIndex(storeName, String(p.field), txn),
+                            };
+                        });
+                        // Explicitly wait for txns from index queries to complete before proceding.
+                        // This helps ensure IndexedDB is in a stable, ready state. Else, subseqeuent
+                        // qeuries can sometimes appear to deadlock (at least in FakeIndexedDB).
+                        return [4 /*yield*/, txn.done];
                     case 1:
-                        all = _a.sent();
+                        // Explicitly wait for txns from index queries to complete before proceding.
+                        // This helps ensure IndexedDB is in a stable, ready state. Else, subseqeuent
+                        // qeuries can sometimes appear to deadlock (at least in FakeIndexedDB).
+                        _c.sent();
+                        if (!(type === 'and')) return [3 /*break*/, 6];
+                        actualPredicateIndexes = predicateIndexes.filter(function (i) { return i.index && i.predicate.operator === 'eq'; });
+                        if (!(actualPredicateIndexes.length > 0)) return [3 /*break*/, 3];
+                        predicateIndex = actualPredicateIndexes[0];
+                        return [4 /*yield*/, predicateIndex.index.getAll(predicateIndex.predicate.operand)];
+                    case 2:
+                        candidateResults = (_c.sent());
+                        return [3 /*break*/, 5];
+                    case 3: return [4 /*yield*/, this.getAll(storeName)];
+                    case 4:
+                        // no usable indexes
+                        candidateResults = (_c.sent());
+                        _c.label = 5;
+                    case 5: return [3 /*break*/, 20];
+                    case 6:
+                        if (!(type === 'or')) return [3 /*break*/, 18];
+                        if (!(predicateIndexes.length > 0 &&
+                            predicateIndexes.every(function (i) { return i.index && i.predicate.operator === 'eq'; }))) return [3 /*break*/, 15];
+                        distinctResults = new Map();
+                        _c.label = 7;
+                    case 7:
+                        _c.trys.push([7, 12, 13, 14]);
+                        predicateIndexes_1 = tslib_1.__values(predicateIndexes), predicateIndexes_1_1 = predicateIndexes_1.next();
+                        _c.label = 8;
+                    case 8:
+                        if (!!predicateIndexes_1_1.done) return [3 /*break*/, 11];
+                        predicateIndex = predicateIndexes_1_1.value;
+                        return [4 /*yield*/, predicateIndex.index.getAll(predicateIndex.predicate.operand)];
+                    case 9:
+                        resultGroup = (_c.sent());
+                        try {
+                            for (resultGroup_1 = (e_6 = 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;
+                                // TODO: custom PK
+                                distinctResults.set(item.id, item);
+                            }
+                        }
+                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                        finally {
+                            try {
+                                if (resultGroup_1_1 && !resultGroup_1_1.done && (_b = resultGroup_1.return)) _b.call(resultGroup_1);
+                            }
+                            finally { if (e_6) throw e_6.error; }
+                        }
+                        _c.label = 10;
+                    case 10:
+                        predicateIndexes_1_1 = predicateIndexes_1.next();
+                        return [3 /*break*/, 8];
+                    case 11: return [3 /*break*/, 14];
+                    case 12:
+                        e_5_1 = _c.sent();
+                        e_5 = { error: e_5_1 };
+                        return [3 /*break*/, 14];
+                    case 13:
+                        try {
+                            if (predicateIndexes_1_1 && !predicateIndexes_1_1.done && (_a = predicateIndexes_1.return)) _a.call(predicateIndexes_1);
+                        }
+                        finally { if (e_5) throw e_5.error; }
+                        return [7 /*endfinally*/];
+                    case 14:
+                        // we could conceivably check for special conditions and return early here.
+                        // but, this is simpler and has not yet had a measurable performance impact.
+                        candidateResults = Array.from(distinctResults.values());
+                        return [3 /*break*/, 17];
+                    case 15: return [4 /*yield*/, this.getAll(storeName)];
+                    case 16:
+                        // either no usable indexes or not all conditions can use one.
+                        candidateResults = (_c.sent());
+                        _c.label = 17;
+                    case 17: return [3 /*break*/, 20];
+                    case 18: return [4 /*yield*/, this.getAll(storeName)];
+                    case 19:
+                        // nothing intelligent we can do with `not` groups unless or until we start
+                        // smashing comparison operators against indexes -- at which point we could
+                        // perform some reversal here.
+                        candidateResults = (_c.sent());
+                        _c.label = 20;
+                    case 20:
                         filtered = predicateObjs
-                            ? all.filter(function (m) { return util_1.validatePredicate(m, type, predicateObjs); })
-                            : all;
+                            ? candidateResults.filter(function (m) { return util_1.validatePredicate(m, type, predicateObjs); })
+                            : candidateResults;
                         return [2 /*return*/, filtered];
                 }
             });
         });
     };
     IndexedDBAdapter.prototype.inMemoryPagination = function (records, pagination) {
-        if (pagination && records.length > 1) {
-            if (pagination.sort) {
-                var sortPredicates = predicates_1.ModelSortPredicateCreator.getPredicates(pagination.sort);
-                if (sortPredicates.length) {
-                    var compareFn = util_1.sortCompareFunction(sortPredicates);
-                    records.sort(compareFn);
-                }
-            }
-            var _a = pagination.page, page = _a === void 0 ? 0 : _a, _b = pagination.limit, limit = _b === void 0 ? 0 : _b;
-            var start = Math.max(0, page * limit) || 0;
-            var end = limit > 0 ? start + limit : records.length;
-            return records.slice(start, end);
-        }
-        return records;
+        return util_1.inMemoryPagination(records, pagination);
     };
     IndexedDBAdapter.prototype.enginePagination = function (storeName, pagination) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var result, _a, page, _b, limit, initialRecord, cursor, pageResults, hasLimit;
-            return __generator(this, function (_c) {
+            return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         if (!pagination) return [3 /*break*/, 7];
@@ -833,9 +690,9 @@ var IndexedDBAdapter = /** @class */ (function () {
     };
     IndexedDBAdapter.prototype.queryOne = function (modelConstructor, firstOrLast) {
         if (firstOrLast === void 0) { firstOrLast = types_1.QueryOne.FIRST; }
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var storeName, cursor, result;
-            return __generator(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
@@ -854,13 +711,13 @@ var IndexedDBAdapter = /** @class */ (function () {
         });
     };
     IndexedDBAdapter.prototype.delete = function (modelOrModelConstructor, condition) {
-        return __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, predicateObjs, type, isValid, msg, relations, relations, deletedModels;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+        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:
-                        _a.sent();
+                        _b.sent();
                         deleteQueue = [];
                         if (!util_1.isModelConstructor(modelOrModelConstructor)) return [3 /*break*/, 9];
                         modelConstructor = modelOrModelConstructor;
@@ -868,16 +725,16 @@ var IndexedDBAdapter = /** @class */ (function () {
                         storeName = this.getStorenameForModel(modelConstructor);
                         return [4 /*yield*/, this.query(modelConstructor, condition)];
                     case 2:
-                        models = _a.sent();
+                        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:
-                        _a.sent();
+                        _b.sent();
                         return [4 /*yield*/, this.deleteItem(deleteQueue)];
                     case 4:
-                        _a.sent();
+                        _b.sent();
                         deletedModels = deleteQueue.reduce(function (acc, _a) {
                             var items = _a.items;
                             return acc.concat(items);
@@ -885,7 +742,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                         return [2 /*return*/, [models, deletedModels]];
                     case 5: return [4 /*yield*/, this.deleteTraverse(relations, models, modelConstructor.name, nameSpace, deleteQueue)];
                     case 6:
-                        _a.sent();
+                        _b.sent();
                         // Delete all
                         return [4 /*yield*/, this.db
                                 .transaction([storeName], 'readwrite')
@@ -893,7 +750,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                                 .clear()];
                     case 7:
                         // Delete all
-                        _a.sent();
+                        _b.sent();
                         deletedModels = deleteQueue.reduce(function (acc, _a) {
                             var items = _a.items;
                             return acc.concat(items);
@@ -912,14 +769,14 @@ var IndexedDBAdapter = /** @class */ (function () {
                         keyValues = this.getIndexKeyValuesFromModel(model);
                         return [4 /*yield*/, this._get(store, keyValues)];
                     case 10:
-                        fromDB = _a.sent();
+                        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);
-                        predicateObjs = predicates.predicates, type = predicates.type;
+                        _a = predicates, predicateObjs = _a.predicates, type = _a.type;
                         isValid = util_1.validatePredicate(fromDB, type, predicateObjs);
                         if (!isValid) {
                             msg = 'Conditional update failed';
@@ -928,21 +785,21 @@ var IndexedDBAdapter = /** @class */ (function () {
                         }
                         return [4 /*yield*/, tx.done];
                     case 11:
-                        _a.sent();
+                        _b.sent();
                         relations = this.schema.namespaces[namespaceName].relationships[modelConstructor.name].relationTypes;
                         return [4 /*yield*/, this.deleteTraverse(relations, [model], modelConstructor.name, namespaceName, deleteQueue)];
                     case 12:
-                        _a.sent();
+                        _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:
-                        _a.sent();
-                        _a.label = 15;
+                        _b.sent();
+                        _b.label = 15;
                     case 15: return [4 /*yield*/, this.deleteItem(deleteQueue)];
                     case 16:
-                        _a.sent();
+                        _b.sent();
                         deletedModels = deleteQueue.reduce(function (acc, _a) {
                             var items = _a.items;
                             return acc.concat(items);
@@ -954,37 +811,36 @@ var IndexedDBAdapter = /** @class */ (function () {
         });
     };
     IndexedDBAdapter.prototype.deleteItem = function (deleteQueue) {
-        var deleteQueue_1, deleteQueue_1_1;
         var e_7, _a, e_8, _b;
-        return __awaiter(this, void 0, void 0, function () {
-            var connectionStoreNames, tx, deleteItem, storeName, items, store, items_1, items_1_1, item, key, keyValues, itemKey, e_8_1, e_7_1;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+        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_8_1, e_7_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(__spread(connectionStoreNames), 'readwrite');
-                        _c.label = 1;
+                        tx = this.db.transaction(tslib_1.__spread(connectionStoreNames), 'readwrite');
+                        _e.label = 1;
                     case 1:
-                        _c.trys.push([1, 22, 23, 28]);
-                        deleteQueue_1 = __asyncValues(deleteQueue);
-                        _c.label = 2;
-                    case 2: return [4 /*yield*/, deleteQueue_1.next()];
+                        _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 (!(deleteQueue_1_1 = _c.sent(), !deleteQueue_1_1.done)) return [3 /*break*/, 21];
-                        deleteItem = deleteQueue_1_1.value;
+                        if (!(_d = _e.sent(), !_d.done)) return [3 /*break*/, 21];
+                        deleteItem = _d.value;
                         storeName = deleteItem.storeName, items = deleteItem.items;
                         store = tx.objectStore(storeName);
-                        _c.label = 4;
+                        _e.label = 4;
                     case 4:
-                        _c.trys.push([4, 14, 15, 20]);
-                        items_1 = __asyncValues(items);
-                        _c.label = 5;
+                        _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 = _c.sent(), !items_1_1.done)) return [3 /*break*/, 13];
+                        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;
@@ -994,33 +850,33 @@ var IndexedDBAdapter = /** @class */ (function () {
                                 .index('byPk')
                                 .getKey(this.canonicalKeyPath(keyValues))];
                     case 7:
-                        key = _c.sent();
+                        key = _e.sent();
                         return [3 /*break*/, 10];
                     case 8:
                         itemKey = item.toString();
                         return [4 /*yield*/, store.index('byPk').getKey(itemKey)];
                     case 9:
-                        key = _c.sent();
-                        _c.label = 10;
+                        key = _e.sent();
+                        _e.label = 10;
                     case 10:
                         if (!(key !== undefined)) return [3 /*break*/, 12];
                         return [4 /*yield*/, store.delete(key)];
                     case 11:
-                        _c.sent();
-                        _c.label = 12;
+                        _e.sent();
+                        _e.label = 12;
                     case 12: return [3 /*break*/, 5];
                     case 13: return [3 /*break*/, 20];
                     case 14:
-                        e_8_1 = _c.sent();
+                        e_8_1 = _e.sent();
                         e_8 = { error: e_8_1 };
                         return [3 /*break*/, 20];
                     case 15:
-                        _c.trys.push([15, , 18, 19]);
+                        _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:
-                        _c.sent();
-                        _c.label = 17;
+                        _e.sent();
+                        _e.label = 17;
                     case 17: return [3 /*break*/, 19];
                     case 18:
                         if (e_8) throw e_8.error;
@@ -1029,16 +885,16 @@ var IndexedDBAdapter = /** @class */ (function () {
                     case 20: return [3 /*break*/, 2];
                     case 21: return [3 /*break*/, 28];
                     case 22:
-                        e_7_1 = _c.sent();
+                        e_7_1 = _e.sent();
                         e_7 = { error: e_7_1 };
                         return [3 /*break*/, 28];
                     case 23:
-                        _c.trys.push([23, , 26, 27]);
-                        if (!(deleteQueue_1_1 && !deleteQueue_1_1.done && (_a = deleteQueue_1.return))) return [3 /*break*/, 25];
-                        return [4 /*yield*/, _a.call(deleteQueue_1)];
+                        _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:
-                        _c.sent();
-                        _c.label = 25;
+                        _e.sent();
+                        _e.label = 25;
                     case 25: return [3 /*break*/, 27];
                     case 26:
                         if (e_7) throw e_7.error;
@@ -1050,21 +906,21 @@ var IndexedDBAdapter = /** @class */ (function () {
         });
     };
     IndexedDBAdapter.prototype.deleteTraverse = function (relations, models, srcModel, nameSpace, deleteQueue) {
-        var relations_2, relations_2_1, models_1, models_1_1, models_2, models_2_1;
+        var relations_1, relations_1_1, models_1, models_1_1, models_2, models_2_1;
         var e_9, _a, e_10, _b, e_11, _c;
-        return __awaiter(this, void 0, void 0, function () {
+        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, e_10_1, model, index, keyValues, childrenArray, e_11_1, e_9_1;
             var _this = this;
-            return __generator(this, function (_e) {
+            return tslib_1.__generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
                         _e.trys.push([0, 38, 39, 44]);
-                        relations_2 = __asyncValues(relations);
+                        relations_1 = tslib_1.__asyncValues(relations);
                         _e.label = 1;
-                    case 1: return [4 /*yield*/, relations_2.next()];
+                    case 1: return [4 /*yield*/, relations_1.next()];
                     case 2:
-                        if (!(relations_2_1 = _e.sent(), !relations_2_1.done)) return [3 /*break*/, 37];
-                        rel = relations_2_1.value;
+                        if (!(relations_1_1 = _e.sent(), !relations_1_1.done)) return [3 /*break*/, 37];
+                        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;
@@ -1076,7 +932,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                         return [3 /*break*/, 35];
                     case 3:
                         _e.trys.push([3, 13, 14, 19]);
-                        models_1 = __asyncValues(models);
+                        models_1 = tslib_1.__asyncValues(models);
                         _e.label = 4;
                     case 4: return [4 /*yield*/, models_1.next()];
                     case 5:
@@ -1084,7 +940,9 @@ var IndexedDBAdapter = /** @class */ (function () {
                         model = models_1_1.value;
                         hasOneIndex = 'byPk';
                         if (!(targetNames === null || targetNames === void 0 ? void 0 : targetNames.length)) return [3 /*break*/, 8];
-                        values = targetNames.map(function (targetName) { return model[targetName]; });
+                        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*/, 12];
                         return [4 /*yield*/, this.db
@@ -1151,7 +1009,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                     case 19: return [3 /*break*/, 36];
                     case 20:
                         _e.trys.push([20, 27, 28, 33]);
-                        models_2 = __asyncValues(models);
+                        models_2 = tslib_1.__asyncValues(models);
                         _e.label = 21;
                     case 21: return [4 /*yield*/, models_2.next()];
                     case 22:
@@ -1199,9 +1057,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                     case 34: 
                     // Intentionally blank
                     return [3 /*break*/, 36];
-                    case 35:
-                        util_1.exhaustiveCheck(relationType);
-                        return [3 /*break*/, 36];
+                    case 35: throw new Error("Invalid relation type " + relationType);
                     case 36: return [3 /*break*/, 1];
                     case 37: return [3 /*break*/, 44];
                     case 38:
@@ -1210,8 +1066,8 @@ var IndexedDBAdapter = /** @class */ (function () {
                         return [3 /*break*/, 44];
                     case 39:
                         _e.trys.push([39, , 42, 43]);
-                        if (!(relations_2_1 && !relations_2_1.done && (_a = relations_2.return))) return [3 /*break*/, 41];
-                        return [4 /*yield*/, _a.call(relations_2)];
+                        if (!(relations_1_1 && !relations_1_1.done && (_a = relations_1.return))) return [3 /*break*/, 41];
+                        return [4 /*yield*/, _a.call(relations_1)];
                     case 40:
                         _e.sent();
                         _e.label = 41;
@@ -1234,8 +1090,8 @@ var IndexedDBAdapter = /** @class */ (function () {
     };
     IndexedDBAdapter.prototype.clear = function () {
         var _a;
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_b) {
+        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:
@@ -1252,11 +1108,11 @@ var IndexedDBAdapter = /** @class */ (function () {
         });
     };
     IndexedDBAdapter.prototype.batchSave = function (modelConstructor, items) {
-        return __awaiter(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var result, storeName, txn, store, _loop_2, this_1, items_2, items_2_1, item, e_12_1;
             var e_12, _a;
             var _this = this;
-            return __generator(this, function (_b) {
+            return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (items.length === 0) {
@@ -1271,7 +1127,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                         store = txn.store;
                         _loop_2 = function (item) {
                             var namespaceName, modelName, model, connectedModels, keyValues, _deleted, index, key, instance;
-                            return __generator(this, function (_a) {
+                            return tslib_1.__generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
                                         namespaceName = this_1.namespaceResolver(modelConstructor);
@@ -1313,7 +1169,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                         _b.label = 2;
                     case 2:
                         _b.trys.push([2, 7, 8, 9]);
-                        items_2 = __values(items), items_2_1 = items_2.next();
+                        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];
@@ -1350,7 +1206,7 @@ var IndexedDBAdapter = /** @class */ (function () {
         });
         var indexes = this.schema.namespaces[namespaceName].relationships[modelName].indexes;
         indexes.forEach(function (_a) {
-            var _b = __read(_a, 3), idxName = _b[0], keyPath = _b[1], options = _b[2];
+            var _b = tslib_1.__read(_a, 3), idxName = _b[0], keyPath = _b[1], options = _b[2];
             store.createIndex(idxName, keyPath, options);
         });
         return store;