@aws-amplify/datastore 3.12.6-next.20 → 3.12.6-next.32

package/lib-esm/storage/adapter/IndexedDBAdapter.js

@@ -3,13 +3,42 @@ import { ConsoleLogger as Logger } from '@aws-amplify/core';
 import * as idb from 'idb';
 import { ModelPredicateCreator, ModelSortPredicateCreator, } from '../../predicates';
 import { isPredicateObj, OpType, QueryOne, } from '../../types';
-import { exhaustiveCheck, getIndex, getIndexFromAssociation, isModelConstructor, isPrivateMode, traverseModel, validatePredicate, sortCompareFunction, } from '../../util';
+import { exhaustiveCheck, getIndex, getIndexFromAssociation, isModelConstructor, isPrivateMode, traverseModel, validatePredicate, sortCompareFunction, keysEqual, getStorename, getIndexKeys, extractPrimaryKeyValues, isSafariCompatabilityMode, } from '../../util';
 var logger = new Logger('DataStore');
 var DB_NAME = 'amplify-datastore';
 var IndexedDBAdapter = /** @class */ (function () {
     function IndexedDBAdapter() {
+        var _this = this;
         this.dbName = DB_NAME;
+        this.safariCompatabilityMode = false;
+        /**
+         * Checks the given path against the browser's IndexedDB implementation for
+         * necessary compatibility transformations, applying those transforms if needed.
+         *
+         * @param `keyArr` strings to compatibilize for browser-indexeddb index operations
+         * @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) {
+            if (_this.safariCompatabilityMode) {
+                return keyArr.length > 1 ? keyArr : keyArr[0];
+            }
+            return keyArr;
+        };
     }
+    IndexedDBAdapter.prototype.getStorenameForModel = function (modelConstructor) {
+        var namespace = this.namespaceResolver(modelConstructor);
+        var modelName = modelConstructor.name;
+        return 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 = getIndexKeys(this.schema.namespaces[namespaceName], modelConstructor.name);
+        return extractPrimaryKeyValues(model, keys);
+    };
     IndexedDBAdapter.prototype.checkPrivate = function () {
         return __awaiter(this, void 0, void 0, function () {
             var isPrivate;
@@ -32,14 +61,40 @@ var IndexedDBAdapter = /** @class */ (function () {
             });
         });
     };
-    IndexedDBAdapter.prototype.getStorenameForModel = function (modelConstructor) {
-        var namespace = this.namespaceResolver(modelConstructor);
-        var modelName = modelConstructor.name;
-        return this.getStorename(namespace, modelName);
+    /**
+     * 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 __awaiter(this, void 0, void 0, function () {
+            var _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = this;
+                        return [4 /*yield*/, 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.getStorename = function (namespace, modelName) {
-        var storeName = namespace + "_" + modelName;
-        return storeName;
+    IndexedDBAdapter.prototype.getNamespaceAndModelFromStorename = function (storeName) {
+        var _a = __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 () {
@@ -50,17 +105,20 @@ var IndexedDBAdapter = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
                         _b.sent();
-                        if (!!this.initPromise) return [3 /*break*/, 2];
+                        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*/, 4];
-                    case 2: return [4 /*yield*/, this.initPromise];
-                    case 3:
-                        _b.sent();
-                        _b.label = 4;
+                        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;
                         }
@@ -68,83 +126,80 @@ var IndexedDBAdapter = /** @class */ (function () {
                         this.namespaceResolver = namespaceResolver;
                         this.modelInstanceCreator = modelInstanceCreator;
                         this.getModelConstructorByModelName = getModelConstructorByModelName;
-                        _b.label = 5;
-                    case 5:
-                        _b.trys.push([5, 8, , 9]);
-                        if (!!this.db) return [3 /*break*/, 7];
-                        VERSION = 2;
+                        _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 __awaiter(_this, void 0, void 0, function () {
-                                    var _a, _b, storeName, origStore, tmpName, newStore, cursor, count, e_1_1, error_2;
-                                    var e_1, _c;
+                                    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 (_d) {
-                                        switch (_d.label) {
+                                    return __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 = _this.getStorename(namespaceName, modelName);
+                                                            var storeName = getStorename(namespaceName, modelName);
                                                             _this.createObjectStoreForModel(db, namespaceName, storeName, modelName);
                                                         });
                                                     });
                                                     return [2 /*return*/];
                                                 }
-                                                if (!(oldVersion === 1 && newVersion === 2)) return [3 /*break*/, 16];
-                                                _d.label = 1;
+                                                if (!((oldVersion === 1 || oldVersion === 2) && newVersion === 3)) return [3 /*break*/, 16];
+                                                _e.label = 1;
                                             case 1:
-                                                _d.trys.push([1, 14, , 15]);
-                                                _d.label = 2;
+                                                _e.trys.push([1, 14, , 15]);
+                                                _e.label = 2;
                                             case 2:
-                                                _d.trys.push([2, 11, 12, 13]);
+                                                _e.trys.push([2, 11, 12, 13]);
                                                 _a = __values(txn.objectStoreNames), _b = _a.next();
-                                                _d.label = 3;
+                                                _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;
-                                                newStore = db.createObjectStore(storeName, {
-                                                    keyPath: undefined,
-                                                    autoIncrement: true,
-                                                });
-                                                newStore.createIndex('byId', 'id', { unique: true });
+                                                _c = this.getNamespaceAndModelFromStorename(storeName), namespaceName = _c.namespaceName, modelName = _c.modelName;
+                                                newStore = this.createObjectStoreForModel(db, namespaceName, storeName, modelName);
                                                 return [4 /*yield*/, origStore.openCursor()];
                                             case 4:
-                                                cursor = _d.sent();
+                                                cursor = _e.sent();
                                                 count = 0;
-                                                _d.label = 5;
+                                                _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
-                                                _d.sent();
+                                                _e.sent();
                                                 return [4 /*yield*/, cursor.continue()];
                                             case 7:
-                                                cursor = _d.sent();
+                                                cursor = _e.sent();
                                                 count++;
                                                 return [3 /*break*/, 5];
                                             case 8:
                                                 // delete original
                                                 db.deleteObjectStore(tmpName);
                                                 logger.debug(count + " " + storeName + " records migrated");
-                                                _d.label = 9;
+                                                _e.label = 9;
                                             case 9:
                                                 _b = _a.next();
                                                 return [3 /*break*/, 3];
                                             case 10: return [3 /*break*/, 13];
                                             case 11:
-                                                e_1_1 = _d.sent();
+                                                e_1_1 = _e.sent();
                                                 e_1 = { error: e_1_1 };
                                                 return [3 /*break*/, 13];
                                             case 12:
                                                 try {
-                                                    if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
+                                                    if (_b && !_b.done && (_d = _a.return)) _d.call(_a);
                                                 }
                                                 finally { if (e_1) throw e_1.error; }
                                                 return [7 /*endfinally*/];
@@ -159,7 +214,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                                                         .map(function (modelName) {
                                                         return [
                                                             modelName,
-                                                            _this.getStorename(namespaceName, modelName),
+                                                            getStorename(namespaceName, modelName),
                                                         ];
                                                     })
                                                         .filter(function (_a) {
@@ -173,7 +228,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                                                 });
                                                 return [3 /*break*/, 15];
                                             case 14:
-                                                error_2 = _d.sent();
+                                                error_2 = _e.sent();
                                                 logger.error('Error migrating IndexedDB data', error_2);
                                                 txn.abort();
                                                 throw error_2;
@@ -183,21 +238,21 @@ var IndexedDBAdapter = /** @class */ (function () {
                                     });
                                 }); },
                             })];
-                    case 6:
+                    case 7:
                         _a.db = _b.sent();
                         this.resolve();
-                        _b.label = 7;
-                    case 7: return [3 /*break*/, 9];
-                    case 8:
+                        _b.label = 8;
+                    case 8: return [3 /*break*/, 10];
+                    case 9:
                         error_1 = _b.sent();
                         this.reject(error_1);
-                        return [3 /*break*/, 9];
-                    case 9: return [2 /*return*/];
+                        return [3 /*break*/, 10];
+                    case 10: return [2 /*return*/];
                 }
             });
         });
     };
-    IndexedDBAdapter.prototype._get = function (storeOrStoreName, id) {
+    IndexedDBAdapter.prototype._get = function (storeOrStoreName, keyArr) {
         return __awaiter(this, void 0, void 0, function () {
             var index, storeName, store, result;
             return __generator(this, function (_a) {
@@ -205,13 +260,13 @@ var IndexedDBAdapter = /** @class */ (function () {
                     case 0:
                         if (typeof storeOrStoreName === 'string') {
                             storeName = storeOrStoreName;
-                            index = this.db.transaction(storeName, 'readonly').store.index('byId');
+                            index = this.db.transaction(storeName, 'readonly').store.index('byPk');
                         }
                         else {
                             store = storeOrStoreName;
-                            index = store.index('byId');
+                            index = store.index('byPk');
                         }
-                        return [4 /*yield*/, index.get(id)];
+                        return [4 /*yield*/, index.get(this.canonicalKeyPath(keyArr))];
                     case 1:
                         result = _a.sent();
                         return [2 /*return*/, result];
@@ -222,7 +277,7 @@ 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, connectedModels, namespaceName, set, connectionStoreNames, tx, store, fromDB, predicates, predicateObjs, type, isValid, msg, result, connectionStoreNames_1, connectionStoreNames_1_1, resItem, storeName_1, item, instance, store_1, id, fromDB_1, opType, key, e_2_1;
+            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;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -232,18 +287,20 @@ var IndexedDBAdapter = /** @class */ (function () {
                         modelConstructor = Object.getPrototypeOf(model)
                             .constructor;
                         storeName = this.getStorenameForModel(modelConstructor);
-                        connectedModels = traverseModel(modelConstructor.name, model, this.schema.namespaces[this.namespaceResolver(modelConstructor)], this.modelInstanceCreator, this.getModelConstructorByModelName);
                         namespaceName = this.namespaceResolver(modelConstructor);
+                        connectedModels = 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 = _this.getStorename(namespaceName, modelName);
+                            var storeName = getStorename(namespaceName, modelName);
                             set.add(storeName);
-                            return { storeName: storeName, item: item, instance: instance };
+                            var keys = 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');
                         store = tx.objectStore(storeName);
-                        return [4 /*yield*/, this._get(store, model.id)];
+                        keyValues = this.getIndexKeyValuesFromModel(model);
+                        return [4 /*yield*/, this._get(store, keyValues)];
                     case 2:
                         fromDB = _b.sent();
                         if (condition && fromDB) {
@@ -266,15 +323,22 @@ var IndexedDBAdapter = /** @class */ (function () {
                     case 5:
                         if (!(connectionStoreNames_1_1 = _b.sent(), !connectionStoreNames_1_1.done)) return [3 /*break*/, 10];
                         resItem = connectionStoreNames_1_1.value;
-                        storeName_1 = resItem.storeName, item = resItem.item, instance = resItem.instance;
+                        storeName_1 = resItem.storeName, item = resItem.item, instance = resItem.instance, keys = resItem.keys;
                         store_1 = tx.objectStore(storeName_1);
-                        id = item.id;
-                        return [4 /*yield*/, this._get(store_1, id)];
+                        itemKeyValues = keys.map(function (key) {
+                            var value = item[key];
+                            return value;
+                        });
+                        return [4 /*yield*/, this._get(store_1, itemKeyValues)];
                     case 6:
                         fromDB_1 = _b.sent();
                         opType = fromDB_1 === undefined ? OpType.INSERT : OpType.UPDATE;
-                        if (!(id === model.id || opType === OpType.INSERT)) return [3 /*break*/, 9];
-                        return [4 /*yield*/, store_1.index('byId').getKey(item.id)];
+                        modelKeyValues = this.getIndexKeyValuesFromModel(model);
+                        if (!(keysEqual(itemKeyValues, modelKeyValues) ||
+                            opType === OpType.INSERT)) return [3 /*break*/, 9];
+                        return [4 /*yield*/, store_1
+                                .index('byPk')
+                                .getKey(this.canonicalKeyPath(itemKeyValues))];
                     case 7:
                         key = _b.sent();
                         return [4 /*yield*/, store_1.put(item, key)];
@@ -312,7 +376,7 @@ var IndexedDBAdapter = /** @class */ (function () {
         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, storeName, store, modelConstructor_1, _d, recordItem, getByfield, connectionRecord, e_4_1, recordItem, connectionRecord, e_5_1, e_3_1;
+            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;
             var _this = this;
             return __generator(this, function (_e) {
                 switch (_e.label) {
@@ -321,7 +385,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                         relations = namespace.relationships[srcModelName].relationTypes;
                         connectionStoreNames = relations.map(function (_a) {
                             var modelName = _a.modelName;
-                            return _this.getStorename(namespaceName, modelName);
+                            return getStorename(namespaceName, modelName);
                         });
                         modelConstructor = this.getModelConstructorByModelName(namespaceName, srcModelName);
                         if (connectionStoreNames.length === 0) {
@@ -332,122 +396,170 @@ var IndexedDBAdapter = /** @class */ (function () {
                         tx = this.db.transaction(__spread(connectionStoreNames), 'readonly');
                         _e.label = 1;
                     case 1:
-                        _e.trys.push([1, 34, 35, 40]);
+                        _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*/, 33];
+                        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;
-                        storeName = this.getStorename(namespaceName, modelName);
+                        fieldName = relation.fieldName, modelName = relation.modelName, targetName = relation.targetName, targetNames = relation.targetNames;
+                        storeName = 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*/, 17];
-                            case 'HAS_MANY': return [3 /*break*/, 30];
+                            case 'BELONGS_TO': return [3 /*break*/, 19];
+                            case 'HAS_MANY': return [3 /*break*/, 34];
                         }
-                        return [3 /*break*/, 31];
+                        return [3 /*break*/, 35];
                     case 4:
-                        _e.trys.push([4, 10, 11, 16]);
+                        _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*/, 9];
+                        if (!(records_1_1 = _e.sent(), !records_1_1.done)) return [3 /*break*/, 11];
                         recordItem = records_1_1.value;
-                        getByfield = recordItem[targetName] ? targetName : fieldName;
-                        if (!recordItem[getByfield])
-                            return [3 /*break*/, 9];
-                        return [4 /*yield*/, this._get(store, recordItem[getByfield])];
+                        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);
-                        _e.label = 8;
-                    case 8: return [3 /*break*/, 5];
-                    case 9: return [3 /*break*/, 16];
-                    case 10:
+                        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*/, 16];
-                    case 11:
-                        _e.trys.push([11, , 14, 15]);
-                        if (!(records_1_1 && !records_1_1.done && (_b = records_1.return))) return [3 /*break*/, 13];
+                        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 12:
-                        _e.sent();
-                        _e.label = 13;
-                    case 13: return [3 /*break*/, 15];
                     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 15: return [7 /*endfinally*/];
-                    case 16: return [3 /*break*/, 32];
-                    case 17:
-                        _e.trys.push([17, 23, 24, 29]);
-                        records_2 = __asyncValues(records);
-                        _e.label = 18;
-                    case 18: return [4 /*yield*/, records_2.next()];
+                    case 17: return [7 /*endfinally*/];
+                    case 18: return [3 /*break*/, 36];
                     case 19:
-                        if (!(records_2_1 = _e.sent(), !records_2_1.done)) return [3 /*break*/, 22];
+                        _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 (!recordItem[targetName]) return [3 /*break*/, 21];
-                        return [4 /*yield*/, this._get(store, recordItem[targetName])];
-                    case 20:
+                        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);
-                        delete recordItem[targetName];
-                        _e.label = 21;
-                    case 21: return [3 /*break*/, 18];
-                    case 22: return [3 /*break*/, 29];
+                        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*/, 29];
-                    case 24:
-                        _e.trys.push([24, , 27, 28]);
-                        if (!(records_2_1 && !records_2_1.done && (_c = records_2.return))) return [3 /*break*/, 26];
+                        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 25:
+                    case 29:
                         _e.sent();
-                        _e.label = 26;
-                    case 26: return [3 /*break*/, 28];
-                    case 27:
+                        _e.label = 30;
+                    case 30: return [3 /*break*/, 32];
+                    case 31:
                         if (e_5) throw e_5.error;
                         return [7 /*endfinally*/];
-                    case 28: return [7 /*endfinally*/];
-                    case 29: return [3 /*break*/, 32];
-                    case 30: 
+                    case 32: return [7 /*endfinally*/];
+                    case 33: return [3 /*break*/, 36];
+                    case 34: 
                     // TODO: Lazy loading
-                    return [3 /*break*/, 32];
-                    case 31:
+                    return [3 /*break*/, 36];
+                    case 35:
                         exhaustiveCheck(relation.relationType);
-                        return [3 /*break*/, 32];
-                    case 32: return [3 /*break*/, 2];
-                    case 33: return [3 /*break*/, 40];
-                    case 34:
+                        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*/, 40];
-                    case 35:
-                        _e.trys.push([35, , 38, 39]);
-                        if (!(relations_1_1 && !relations_1_1.done && (_a = relations_1.return))) return [3 /*break*/, 37];
+                        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 36:
+                    case 40:
                         _e.sent();
-                        _e.label = 37;
-                    case 37: return [3 /*break*/, 39];
-                    case 38:
+                        _e.label = 41;
+                    case 41: return [3 /*break*/, 43];
+                    case 42:
                         if (e_3) throw e_3.error;
                         return [7 /*endfinally*/];
-                    case 39: return [7 /*endfinally*/];
-                    case 40: return [2 /*return*/, records.map(function (record) {
+                    case 43: return [7 /*endfinally*/];
+                    case 44: return [2 /*return*/, records.map(function (record) {
                             return _this.modelInstanceCreator(modelConstructor, record);
                         })];
                 }
@@ -456,7 +568,7 @@ var IndexedDBAdapter = /** @class */ (function () {
     };
     IndexedDBAdapter.prototype.query = function (modelConstructor, predicate, pagination) {
         return __awaiter(this, void 0, void 0, function () {
-            var storeName, namespaceName, predicates, queryById, hasSort, hasPagination, records;
+            var storeName, namespaceName, predicates, keyPath, queryByKey, hasSort, hasPagination, records;
             var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -466,7 +578,8 @@ var IndexedDBAdapter = /** @class */ (function () {
                         storeName = this.getStorenameForModel(modelConstructor);
                         namespaceName = this.namespaceResolver(modelConstructor);
                         predicates = predicate && ModelPredicateCreator.getPredicates(predicate);
-                        queryById = predicates && this.idFromPredicate(predicates);
+                        keyPath = getIndexKeys(this.schema.namespaces[namespaceName], modelConstructor.name);
+                        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 () {
@@ -474,8 +587,8 @@ var IndexedDBAdapter = /** @class */ (function () {
                                 return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
-                                            if (!queryById) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, this.getById(storeName, queryById)];
+                                            if (!queryByKey) return [3 /*break*/, 2];
+                                            return [4 /*yield*/, this.getByKey(storeName, queryByKey)];
                                         case 1:
                                             record = _a.sent();
                                             return [2 /*return*/, record ? [record] : []];
@@ -507,12 +620,12 @@ var IndexedDBAdapter = /** @class */ (function () {
             });
         });
     };
-    IndexedDBAdapter.prototype.getById = function (storeName, id) {
+    IndexedDBAdapter.prototype.getByKey = function (storeName, keyValue) {
         return __awaiter(this, void 0, void 0, function () {
             var record;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this._get(storeName, id)];
+                    case 0: return [4 /*yield*/, this._get(storeName, keyValue)];
                     case 1:
                         record = _a.sent();
                         return [2 /*return*/, record];
@@ -530,11 +643,31 @@ var IndexedDBAdapter = /** @class */ (function () {
             });
         });
     };
-    IndexedDBAdapter.prototype.idFromPredicate = function (predicates) {
+    IndexedDBAdapter.prototype.keyValueFromPredicate = function (predicates, keyPath) {
+        var e_6, _a;
         var predicateObjs = predicates.predicates;
-        var idPredicate = predicateObjs.length === 1 &&
-            predicateObjs.find(function (p) { return isPredicateObj(p) && p.field === 'id' && p.operator === 'eq'; });
-        return idPredicate && idPredicate.operand;
+        if (predicateObjs.length !== keyPath.length) {
+            return;
+        }
+        var keyValues = [];
+        var _loop_1 = function (key) {
+            var predicateObj = predicateObjs.find(function (p) { return isPredicateObj(p) && p.field === key && p.operator === 'eq'; });
+            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()) {
+                var key = keyPath_1_1.value;
+                _loop_1(key);
+            }
+        }
+        catch (e_6_1) { e_6 = { error: e_6_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; }
+        }
+        return keyValues.length === keyPath.length ? keyValues : undefined;
     };
     IndexedDBAdapter.prototype.filterOnPredicate = function (storeName, predicates) {
         return __awaiter(this, void 0, void 0, function () {
@@ -640,7 +773,7 @@ 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, nameSpace, storeName, tx, store, fromDB, msg, predicates, predicateObjs, type, isValid, msg, relations, relations, deletedModels;
+            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) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
@@ -689,12 +822,13 @@ var IndexedDBAdapter = /** @class */ (function () {
                         model = modelOrModelConstructor;
                         modelConstructor = Object.getPrototypeOf(model)
                             .constructor;
-                        nameSpace = this.namespaceResolver(modelConstructor);
+                        namespaceName = this.namespaceResolver(modelConstructor);
                         storeName = this.getStorenameForModel(modelConstructor);
                         if (!condition) return [3 /*break*/, 13];
                         tx = this.db.transaction([storeName], 'readwrite');
                         store = tx.objectStore(storeName);
-                        return [4 /*yield*/, this._get(store, model.id)];
+                        keyValues = this.getIndexKeyValuesFromModel(model);
+                        return [4 /*yield*/, this._get(store, keyValues)];
                     case 10:
                         fromDB = _a.sent();
                         if (fromDB === undefined) {
@@ -713,16 +847,14 @@ var IndexedDBAdapter = /** @class */ (function () {
                         return [4 /*yield*/, tx.done];
                     case 11:
                         _a.sent();
-                        relations = this.schema.namespaces[nameSpace].relationships[modelConstructor.name]
-                            .relationTypes;
-                        return [4 /*yield*/, this.deleteTraverse(relations, [model], modelConstructor.name, nameSpace, deleteQueue)];
+                        relations = this.schema.namespaces[namespaceName].relationships[modelConstructor.name].relationTypes;
+                        return [4 /*yield*/, this.deleteTraverse(relations, [model], modelConstructor.name, namespaceName, deleteQueue)];
                     case 12:
                         _a.sent();
                         return [3 /*break*/, 15];
                     case 13:
-                        relations = this.schema.namespaces[nameSpace].relationships[modelConstructor.name]
-                            .relationTypes;
-                        return [4 /*yield*/, this.deleteTraverse(relations, [model], modelConstructor.name, nameSpace, deleteQueue)];
+                        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;
@@ -741,9 +873,9 @@ var IndexedDBAdapter = /** @class */ (function () {
     };
     IndexedDBAdapter.prototype.deleteItem = function (deleteQueue) {
         var deleteQueue_1, deleteQueue_1_1;
-        var e_6, _a, e_7, _b;
+        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, e_7_1, e_6_1;
+            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) {
                     case 0:
@@ -775,11 +907,16 @@ var IndexedDBAdapter = /** @class */ (function () {
                         if (!item) return [3 /*break*/, 12];
                         key = void 0;
                         if (!(typeof item === 'object')) return [3 /*break*/, 8];
-                        return [4 /*yield*/, store.index('byId').getKey(item['id'])];
+                        keyValues = this.getIndexKeyValuesFromModel(item);
+                        return [4 /*yield*/, store
+                                .index('byPk')
+                                .getKey(this.canonicalKeyPath(keyValues))];
                     case 7:
                         key = _c.sent();
                         return [3 /*break*/, 10];
-                    case 8: return [4 /*yield*/, store.index('byId').getKey(item.toString())];
+                    case 8:
+                        itemKey = item.toString();
+                        return [4 /*yield*/, store.index('byPk').getKey(itemKey)];
                     case 9:
                         key = _c.sent();
                         _c.label = 10;
@@ -792,8 +929,8 @@ var IndexedDBAdapter = /** @class */ (function () {
                     case 12: return [3 /*break*/, 5];
                     case 13: return [3 /*break*/, 20];
                     case 14:
-                        e_7_1 = _c.sent();
-                        e_7 = { error: e_7_1 };
+                        e_8_1 = _c.sent();
+                        e_8 = { error: e_8_1 };
                         return [3 /*break*/, 20];
                     case 15:
                         _c.trys.push([15, , 18, 19]);
@@ -804,14 +941,14 @@ var IndexedDBAdapter = /** @class */ (function () {
                         _c.label = 17;
                     case 17: return [3 /*break*/, 19];
                     case 18:
-                        if (e_7) throw e_7.error;
+                        if (e_8) throw e_8.error;
                         return [7 /*endfinally*/];
                     case 19: return [7 /*endfinally*/];
                     case 20: return [3 /*break*/, 2];
                     case 21: return [3 /*break*/, 28];
                     case 22:
-                        e_6_1 = _c.sent();
-                        e_6 = { error: e_6_1 };
+                        e_7_1 = _c.sent();
+                        e_7 = { error: e_7_1 };
                         return [3 /*break*/, 28];
                     case 23:
                         _c.trys.push([23, , 26, 27]);
@@ -822,7 +959,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                         _c.label = 25;
                     case 25: return [3 /*break*/, 27];
                     case 26:
-                        if (e_6) throw e_6.error;
+                        if (e_7) throw e_7.error;
                         return [7 /*endfinally*/];
                     case 27: return [7 /*endfinally*/];
                     case 28: return [2 /*return*/];
@@ -832,145 +969,178 @@ 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 e_8, _a, e_9, _b, e_10, _c;
+        var e_9, _a, e_10, _b, e_11, _c;
         return __awaiter(this, void 0, void 0, function () {
-            var rel, relationType, fieldName, modelName, targetName, storeName, index, _d, model, hasOneIndex, hasOneCustomField, value, recordToDelete, e_9_1, model, childrenArray, e_10_1, e_8_1;
+            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) {
                 switch (_e.label) {
                     case 0:
-                        _e.trys.push([0, 35, 36, 41]);
+                        _e.trys.push([0, 38, 39, 44]);
                         relations_2 = __asyncValues(relations);
                         _e.label = 1;
                     case 1: return [4 /*yield*/, relations_2.next()];
                     case 2:
-                        if (!(relations_2_1 = _e.sent(), !relations_2_1.done)) return [3 /*break*/, 34];
+                        if (!(relations_2_1 = _e.sent(), !relations_2_1.done)) return [3 /*break*/, 37];
                         rel = relations_2_1.value;
-                        relationType = rel.relationType, fieldName = rel.fieldName, modelName = rel.modelName, targetName = rel.targetName;
-                        storeName = this.getStorename(nameSpace, modelName);
-                        index = getIndex(this.schema.namespaces[nameSpace].relationships[modelName]
-                            .relationTypes, srcModel) ||
-                            // if we were unable to find an index via relationTypes
-                            // i.e. for keyName connections, attempt to find one by the
-                            // associatedWith property
-                            getIndexFromAssociation(this.schema.namespaces[nameSpace].relationships[modelName].indexes, rel.associatedWith);
+                        relationType = rel.relationType, modelName = rel.modelName, targetName = rel.targetName, targetNames = rel.targetNames, associatedWith = rel.associatedWith;
+                        storeName = getStorename(nameSpace, modelName);
                         _d = relationType;
                         switch (_d) {
                             case 'HAS_ONE': return [3 /*break*/, 3];
-                            case 'HAS_MANY': return [3 /*break*/, 17];
-                            case 'BELONGS_TO': return [3 /*break*/, 31];
+                            case 'HAS_MANY': return [3 /*break*/, 20];
+                            case 'BELONGS_TO': return [3 /*break*/, 34];
                         }
-                        return [3 /*break*/, 32];
+                        return [3 /*break*/, 35];
                     case 3:
-                        _e.trys.push([3, 10, 11, 16]);
+                        _e.trys.push([3, 13, 14, 19]);
                         models_1 = __asyncValues(models);
                         _e.label = 4;
                     case 4: return [4 /*yield*/, models_1.next()];
                     case 5:
-                        if (!(models_1_1 = _e.sent(), !models_1_1.done)) return [3 /*break*/, 9];
+                        if (!(models_1_1 = _e.sent(), !models_1_1.done)) return [3 /*break*/, 12];
                         model = models_1_1.value;
-                        hasOneIndex = index || 'byId';
-                        hasOneCustomField = targetName in model;
-                        value = hasOneCustomField ? model[targetName] : model.id;
-                        if (!value)
-                            return [3 /*break*/, 9];
+                        hasOneIndex = 'byPk';
+                        if (!(targetNames === null || targetNames === void 0 ? void 0 : targetNames.length)) return [3 /*break*/, 8];
+                        values = targetNames.map(function (targetName) { return model[targetName]; });
+                        if (values.length === 0)
+                            return [3 /*break*/, 12];
                         return [4 /*yield*/, this.db
                                 .transaction(storeName, 'readwrite')
                                 .objectStore(storeName)
                                 .index(hasOneIndex)
-                                .get(value)];
+                                .get(this.canonicalKeyPath(values))];
                     case 6:
                         recordToDelete = (_e.sent());
                         return [4 /*yield*/, this.deleteTraverse(this.schema.namespaces[nameSpace].relationships[modelName]
                                 .relationTypes, recordToDelete ? [recordToDelete] : [], modelName, nameSpace, deleteQueue)];
                     case 7:
                         _e.sent();
-                        _e.label = 8;
-                    case 8: return [3 /*break*/, 4];
-                    case 9: return [3 /*break*/, 16];
+                        return [3 /*break*/, 12];
+                    case 8:
+                        index = void 0;
+                        values = void 0;
+                        if (targetName && targetName in model) {
+                            index = hasOneIndex;
+                            value = model[targetName];
+                            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 = getIndex(this.schema.namespaces[nameSpace].relationships[modelName]
+                                .relationTypes, srcModel);
+                            values = this.getIndexKeyValuesFromModel(model);
+                        }
+                        if (!values || !index)
+                            return [3 /*break*/, 12];
+                        return [4 /*yield*/, this.db
+                                .transaction(storeName, 'readwrite')
+                                .objectStore(storeName)
+                                .index(index)
+                                .get(this.canonicalKeyPath(values))];
+                    case 9:
+                        recordToDelete = (_e.sent());
+                        return [4 /*yield*/, this.deleteTraverse(this.schema.namespaces[nameSpace].relationships[modelName]
+                                .relationTypes, recordToDelete ? [recordToDelete] : [], modelName, nameSpace, deleteQueue)];
                     case 10:
-                        e_9_1 = _e.sent();
-                        e_9 = { error: e_9_1 };
-                        return [3 /*break*/, 16];
-                    case 11:
-                        _e.trys.push([11, , 14, 15]);
-                        if (!(models_1_1 && !models_1_1.done && (_b = models_1.return))) return [3 /*break*/, 13];
-                        return [4 /*yield*/, _b.call(models_1)];
-                    case 12:
                         _e.sent();
-                        _e.label = 13;
-                    case 13: return [3 /*break*/, 15];
+                        _e.label = 11;
+                    case 11: return [3 /*break*/, 4];
+                    case 12: return [3 /*break*/, 19];
+                    case 13:
+                        e_10_1 = _e.sent();
+                        e_10 = { error: e_10_1 };
+                        return [3 /*break*/, 19];
                     case 14:
-                        if (e_9) throw e_9.error;
-                        return [7 /*endfinally*/];
-                    case 15: return [7 /*endfinally*/];
-                    case 16: return [3 /*break*/, 33];
+                        _e.trys.push([14, , 17, 18]);
+                        if (!(models_1_1 && !models_1_1.done && (_b = models_1.return))) return [3 /*break*/, 16];
+                        return [4 /*yield*/, _b.call(models_1)];
+                    case 15:
+                        _e.sent();
+                        _e.label = 16;
+                    case 16: return [3 /*break*/, 18];
                     case 17:
-                        _e.trys.push([17, 24, 25, 30]);
+                        if (e_10) throw e_10.error;
+                        return [7 /*endfinally*/];
+                    case 18: return [7 /*endfinally*/];
+                    case 19: return [3 /*break*/, 36];
+                    case 20:
+                        _e.trys.push([20, 27, 28, 33]);
                         models_2 = __asyncValues(models);
-                        _e.label = 18;
-                    case 18: return [4 /*yield*/, models_2.next()];
-                    case 19:
-                        if (!(models_2_1 = _e.sent(), !models_2_1.done)) return [3 /*break*/, 23];
+                        _e.label = 21;
+                    case 21: return [4 /*yield*/, models_2.next()];
+                    case 22:
+                        if (!(models_2_1 = _e.sent(), !models_2_1.done)) return [3 /*break*/, 26];
                         model = models_2_1.value;
+                        index = 
+                        // explicit bi-directional @hasMany and @manyToMany
+                        getIndex(this.schema.namespaces[nameSpace].relationships[modelName]
+                            .relationTypes, srcModel) ||
+                            // uni and/or implicit @hasMany
+                            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(model['id'])];
-                    case 20:
+                                .getAll(this.canonicalKeyPath(keyValues))];
+                    case 23:
                         childrenArray = _e.sent();
                         return [4 /*yield*/, this.deleteTraverse(this.schema.namespaces[nameSpace].relationships[modelName]
                                 .relationTypes, childrenArray, modelName, nameSpace, deleteQueue)];
-                    case 21:
-                        _e.sent();
-                        _e.label = 22;
-                    case 22: return [3 /*break*/, 18];
-                    case 23: return [3 /*break*/, 30];
                     case 24:
-                        e_10_1 = _e.sent();
-                        e_10 = { error: e_10_1 };
-                        return [3 /*break*/, 30];
-                    case 25:
-                        _e.trys.push([25, , 28, 29]);
-                        if (!(models_2_1 && !models_2_1.done && (_c = models_2.return))) return [3 /*break*/, 27];
-                        return [4 /*yield*/, _c.call(models_2)];
-                    case 26:
                         _e.sent();
-                        _e.label = 27;
-                    case 27: return [3 /*break*/, 29];
+                        _e.label = 25;
+                    case 25: return [3 /*break*/, 21];
+                    case 26: return [3 /*break*/, 33];
+                    case 27:
+                        e_11_1 = _e.sent();
+                        e_11 = { error: e_11_1 };
+                        return [3 /*break*/, 33];
                     case 28:
-                        if (e_10) throw e_10.error;
+                        _e.trys.push([28, , 31, 32]);
+                        if (!(models_2_1 && !models_2_1.done && (_c = models_2.return))) return [3 /*break*/, 30];
+                        return [4 /*yield*/, _c.call(models_2)];
+                    case 29:
+                        _e.sent();
+                        _e.label = 30;
+                    case 30: return [3 /*break*/, 32];
+                    case 31:
+                        if (e_11) throw e_11.error;
                         return [7 /*endfinally*/];
-                    case 29: return [7 /*endfinally*/];
-                    case 30: return [3 /*break*/, 33];
-                    case 31: 
+                    case 32: return [7 /*endfinally*/];
+                    case 33: return [3 /*break*/, 36];
+                    case 34: 
                     // Intentionally blank
-                    return [3 /*break*/, 33];
-                    case 32:
-                        exhaustiveCheck(relationType);
-                        return [3 /*break*/, 33];
-                    case 33: return [3 /*break*/, 1];
-                    case 34: return [3 /*break*/, 41];
+                    return [3 /*break*/, 36];
                     case 35:
-                        e_8_1 = _e.sent();
-                        e_8 = { error: e_8_1 };
-                        return [3 /*break*/, 41];
-                    case 36:
-                        _e.trys.push([36, , 39, 40]);
-                        if (!(relations_2_1 && !relations_2_1.done && (_a = relations_2.return))) return [3 /*break*/, 38];
+                        exhaustiveCheck(relationType);
+                        return [3 /*break*/, 36];
+                    case 36: return [3 /*break*/, 1];
+                    case 37: return [3 /*break*/, 44];
+                    case 38:
+                        e_9_1 = _e.sent();
+                        e_9 = { error: e_9_1 };
+                        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)];
-                    case 37:
+                    case 40:
                         _e.sent();
-                        _e.label = 38;
-                    case 38: return [3 /*break*/, 40];
-                    case 39:
-                        if (e_8) throw e_8.error;
+                        _e.label = 41;
+                    case 41: return [3 /*break*/, 43];
+                    case 42:
+                        if (e_9) throw e_9.error;
                         return [7 /*endfinally*/];
-                    case 40: return [7 /*endfinally*/];
-                    case 41:
+                    case 43: return [7 /*endfinally*/];
+                    case 44:
                         deleteQueue.push({
-                            storeName: this.getStorename(nameSpace, srcModel),
+                            storeName: getStorename(nameSpace, srcModel),
                             items: models.map(function (record) {
                                 return _this.modelInstanceCreator(_this.getModelConstructorByModelName(nameSpace, srcModel), record);
                             }),
@@ -1001,8 +1171,9 @@ var IndexedDBAdapter = /** @class */ (function () {
     };
     IndexedDBAdapter.prototype.batchSave = function (modelConstructor, items) {
         return __awaiter(this, void 0, void 0, function () {
-            var result, storeName, txn, store, _loop_1, this_1, items_2, items_2_1, item, e_11_1;
-            var e_11, _a;
+            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) {
                 switch (_b.label) {
                     case 0:
@@ -1016,21 +1187,26 @@ var IndexedDBAdapter = /** @class */ (function () {
                         storeName = this.getStorenameForModel(modelConstructor);
                         txn = this.db.transaction(storeName, 'readwrite');
                         store = txn.store;
-                        _loop_1 = function (item) {
-                            var connectedModels, id, _deleted, index, key, instance;
+                        _loop_2 = function (item) {
+                            var namespaceName, modelName, model, connectedModels, keyValues, _deleted, index, key, instance;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
-                                        connectedModels = traverseModel(modelConstructor.name, this_1.modelInstanceCreator(modelConstructor, item), this_1.schema.namespaces[this_1.namespaceResolver(modelConstructor)], this_1.modelInstanceCreator, this_1.getModelConstructorByModelName);
-                                        id = item.id, _deleted = item._deleted;
-                                        index = store.index('byId');
-                                        return [4 /*yield*/, index.getKey(id)];
+                                        namespaceName = this_1.namespaceResolver(modelConstructor);
+                                        modelName = modelConstructor.name;
+                                        model = this_1.modelInstanceCreator(modelConstructor, item);
+                                        connectedModels = 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;
-                                            return instance.id === id;
+                                            var instanceKeyValues = _this.getIndexKeyValuesFromModel(instance);
+                                            return keysEqual(instanceKeyValues, keyValues);
                                         }).instance;
                                         result.push([
                                             instance,
@@ -1060,7 +1236,7 @@ var IndexedDBAdapter = /** @class */ (function () {
                     case 3:
                         if (!!items_2_1.done) return [3 /*break*/, 6];
                         item = items_2_1.value;
-                        return [5 /*yield**/, _loop_1(item)];
+                        return [5 /*yield**/, _loop_2(item)];
                     case 4:
                         _b.sent();
                         _b.label = 5;
@@ -1069,14 +1245,14 @@ var IndexedDBAdapter = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 6: return [3 /*break*/, 9];
                     case 7:
-                        e_11_1 = _b.sent();
-                        e_11 = { error: e_11_1 };
+                        e_12_1 = _b.sent();
+                        e_12 = { error: e_12_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_11) throw e_11.error; }
+                        finally { if (e_12) throw e_12.error; }
                         return [7 /*endfinally*/];
                     case 9: return [4 /*yield*/, txn.done];
                     case 10:
@@ -1087,18 +1263,15 @@ var IndexedDBAdapter = /** @class */ (function () {
         });
     };
     IndexedDBAdapter.prototype.createObjectStoreForModel = function (db, namespaceName, storeName, modelName) {
-        return __awaiter(this, void 0, void 0, function () {
-            var store, indexes;
-            return __generator(this, function (_a) {
-                store = db.createObjectStore(storeName, {
-                    autoIncrement: true,
-                });
-                indexes = this.schema.namespaces[namespaceName].relationships[modelName].indexes;
-                indexes.forEach(function (index) { return store.createIndex(index, index); });
-                store.createIndex('byId', 'id', { unique: true });
-                return [2 /*return*/];
-            });
+        var store = db.createObjectStore(storeName, {
+            autoIncrement: true,
+        });
+        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];
+            store.createIndex(idxName, keyPath, options);
         });
+        return store;
     };
     return IndexedDBAdapter;
 }());