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

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

@@ -1,62 +1,9 @@
-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 __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.");
-};
+import { __asyncValues, __awaiter, __generator, __values } from "tslib";
 import { ConsoleLogger as Logger } from '@aws-amplify/core';
 import AsyncStorageDatabase from './AsyncStorageDatabase';
-import { ModelPredicateCreator, ModelSortPredicateCreator, } from '../../predicates';
+import { ModelPredicateCreator } from '../../predicates';
 import { isPredicateObj, OpType, QueryOne, } from '../../types';
-import { DEFAULT_PRIMARY_KEY_VALUE_SEPARATOR, exhaustiveCheck, getIndex, getIndexFromAssociation, isModelConstructor, traverseModel, validatePredicate, sortCompareFunction, keysEqual, getStorename, getIndexKeys, extractPrimaryKeyValues, IDENTIFIER_KEY_SEPARATOR, } from '../../util';
+import { DEFAULT_PRIMARY_KEY_VALUE_SEPARATOR, getIndex, getIndexFromAssociation, isModelConstructor, traverseModel, validatePredicate, inMemoryPagination, keysEqual, getStorename, getIndexKeys, extractPrimaryKeyValues, IDENTIFIER_KEY_SEPARATOR, } from '../../util';
 var logger = new Logger('DataStore');
 var AsyncStorageAdapter = /** @class */ (function () {
     function AsyncStorageAdapter() {
@@ -123,10 +70,10 @@ var AsyncStorageAdapter = /** @class */ (function () {
     AsyncStorageAdapter.prototype.save = function (model, condition) {
         var e_1, _a;
         return __awaiter(this, void 0, void 0, function () {
-            var modelConstructor, storeName, namespaceName, connectedModels, set, connectionStoreNames, keyValuesPath, fromDB, predicates, predicateObjs, type, isValid, msg, result, connectionStoreNames_1, connectionStoreNames_1_1, resItem, storeName_1, item, instance, keys, itemKeyValues, itemKeyValuesPath, fromDB_1, opType, modelKeyValues, e_1_1;
+            var modelConstructor, storeName, namespaceName, connectedModels, set, connectionStoreNames, keyValuesPath, fromDB, predicates, _b, predicateObjs, type, isValid, msg, result, connectionStoreNames_1, connectionStoreNames_1_1, resItem, storeName_1, item, instance, keys, itemKeyValues, itemKeyValuesPath, fromDB_1, opType, modelKeyValues, e_1_1;
             var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         modelConstructor = Object.getPrototypeOf(model)
                             .constructor;
@@ -144,10 +91,10 @@ var AsyncStorageAdapter = /** @class */ (function () {
                         keyValuesPath = this.getIndexKeyValuesPath(model);
                         return [4 /*yield*/, this.db.get(keyValuesPath, storeName)];
                     case 1:
-                        fromDB = _b.sent();
+                        fromDB = _c.sent();
                         if (condition && fromDB) {
                             predicates = ModelPredicateCreator.getPredicates(condition);
-                            predicateObjs = predicates.predicates, type = predicates.type;
+                            _b = predicates, predicateObjs = _b.predicates, type = _b.type;
                             isValid = validatePredicate(fromDB, type, predicateObjs);
                             if (!isValid) {
                                 msg = 'Conditional update failed';
@@ -156,43 +103,43 @@ var AsyncStorageAdapter = /** @class */ (function () {
                             }
                         }
                         result = [];
-                        _b.label = 2;
+                        _c.label = 2;
                     case 2:
-                        _b.trys.push([2, 9, 10, 15]);
+                        _c.trys.push([2, 9, 10, 15]);
                         connectionStoreNames_1 = __asyncValues(connectionStoreNames);
-                        _b.label = 3;
+                        _c.label = 3;
                     case 3: return [4 /*yield*/, connectionStoreNames_1.next()];
                     case 4:
-                        if (!(connectionStoreNames_1_1 = _b.sent(), !connectionStoreNames_1_1.done)) return [3 /*break*/, 8];
+                        if (!(connectionStoreNames_1_1 = _c.sent(), !connectionStoreNames_1_1.done)) return [3 /*break*/, 8];
                         resItem = connectionStoreNames_1_1.value;
                         storeName_1 = resItem.storeName, item = resItem.item, instance = resItem.instance, keys = resItem.keys;
                         itemKeyValues = keys.map(function (key) { return item[key]; });
                         itemKeyValuesPath = itemKeyValues.join(DEFAULT_PRIMARY_KEY_VALUE_SEPARATOR);
                         return [4 /*yield*/, this.db.get(itemKeyValuesPath, storeName_1)];
                     case 5:
-                        fromDB_1 = _b.sent();
+                        fromDB_1 = _c.sent();
                         opType = fromDB_1 ? OpType.UPDATE : OpType.INSERT;
                         modelKeyValues = this.getIndexKeyValuesFromModel(model);
                         if (!(keysEqual(itemKeyValues, modelKeyValues) ||
                             opType === OpType.INSERT)) return [3 /*break*/, 7];
                         return [4 /*yield*/, this.db.save(item, storeName_1, keys, itemKeyValuesPath)];
                     case 6:
-                        _b.sent();
+                        _c.sent();
                         result.push([instance, opType]);
-                        _b.label = 7;
+                        _c.label = 7;
                     case 7: return [3 /*break*/, 3];
                     case 8: return [3 /*break*/, 15];
                     case 9:
-                        e_1_1 = _b.sent();
+                        e_1_1 = _c.sent();
                         e_1 = { error: e_1_1 };
                         return [3 /*break*/, 15];
                     case 10:
-                        _b.trys.push([10, , 13, 14]);
+                        _c.trys.push([10, , 13, 14]);
                         if (!(connectionStoreNames_1_1 && !connectionStoreNames_1_1.done && (_a = connectionStoreNames_1.return))) return [3 /*break*/, 12];
                         return [4 /*yield*/, _a.call(connectionStoreNames_1)];
                     case 11:
-                        _b.sent();
-                        _b.label = 12;
+                        _c.sent();
+                        _c.label = 12;
                     case 12: return [3 /*break*/, 14];
                     case 13:
                         if (e_1) throw e_1.error;
@@ -204,196 +151,25 @@ var AsyncStorageAdapter = /** @class */ (function () {
         });
     };
     AsyncStorageAdapter.prototype.load = function (namespaceName, srcModelName, records) {
-        var records_1, records_1_1, records_2, records_2_1;
-        var e_2, _a, e_3, _b, e_4, _c;
         return __awaiter(this, void 0, void 0, function () {
-            var namespace, relations, connectionStoreNames, modelConstructor, relations_1, relations_1_1, relation, fieldName, modelName, targetName, targetNames, relationType, storeName, modelConstructor_1, _d, recordItem, getByFields, allPresent, keys, connectionRecord, getByfield, key, connectionRecord, e_3_1, recordItem, allPresent, keys, connectionRecord, key, connectionRecord, e_4_1, e_2_1;
+            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 getStorename(namespaceName, modelName);
-                        });
-                        modelConstructor = this.getModelConstructorByModelName(namespaceName, srcModelName);
-                        if (connectionStoreNames.length === 0) {
-                            return [2 /*return*/, records.map(function (record) {
-                                    return _this.modelInstanceCreator(modelConstructor, record);
-                                })];
-                        }
-                        _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, relationType = relation.relationType;
-                        storeName = getStorename(namespaceName, modelName);
-                        modelConstructor_1 = this.getModelConstructorByModelName(namespaceName, modelName);
-                        _d = 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]; })
-                            .join(DEFAULT_PRIMARY_KEY_VALUE_SEPARATOR);
-                        return [4 /*yield*/, this.db.get(keys, storeName)];
-                    case 7:
-                        connectionRecord = _e.sent();
-                        recordItem[fieldName] =
-                            connectionRecord &&
-                                this.modelInstanceCreator(modelConstructor_1, connectionRecord);
-                        return [3 /*break*/, 10];
-                    case 8:
-                        getByfield = recordItem[targetName]
-                            ? targetName
-                            : fieldName;
-                        if (!recordItem[getByfield])
-                            return [3 /*break*/, 11];
-                        key = recordItem[getByfield];
-                        return [4 /*yield*/, this.db.get(key, storeName)];
-                    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_3_1 = _e.sent();
-                        e_3 = { error: e_3_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_3) throw e_3.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]; })
-                            .join(DEFAULT_PRIMARY_KEY_VALUE_SEPARATOR);
-                        return [4 /*yield*/, this.db.get(keys, storeName)];
-                    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.db.get(key, storeName)];
-                    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_4_1 = _e.sent();
-                        e_4 = { error: e_4_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_4) throw e_4.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:
-                        exhaustiveCheck(relationType);
-                        return [3 /*break*/, 36];
-                    case 36: return [3 /*break*/, 2];
-                    case 37: return [3 /*break*/, 44];
-                    case 38:
-                        e_2_1 = _e.sent();
-                        e_2 = { error: e_2_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_2) throw e_2.error;
-                        return [7 /*endfinally*/];
-                    case 43: return [7 /*endfinally*/];
-                    case 44: return [2 /*return*/, records.map(function (record) {
+            return __generator(this, function (_a) {
+                namespace = this.schema.namespaces[namespaceName];
+                relations = namespace.relationships[srcModelName].relationTypes;
+                connectionStoreNames = relations.map(function (_a) {
+                    var modelName = _a.modelName;
+                    return 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);
+                    })];
             });
         });
     };
@@ -438,7 +214,7 @@ var AsyncStorageAdapter = /** @class */ (function () {
                                 });
                             }); })()];
                     case 1:
-                        records = _a.sent();
+                        records = (_a.sent());
                         return [4 /*yield*/, this.load(namespaceName, modelConstructor.name, records)];
                     case 2: return [2 /*return*/, _a.sent()];
                 }
@@ -469,7 +245,7 @@ var AsyncStorageAdapter = /** @class */ (function () {
         });
     };
     AsyncStorageAdapter.prototype.keyValueFromPredicate = function (predicates, keys) {
-        var e_5, _a;
+        var e_2, _a;
         var predicateObjs = predicates.predicates;
         if (predicateObjs.length !== keys.length) {
             return;
@@ -485,12 +261,12 @@ var AsyncStorageAdapter = /** @class */ (function () {
                 _loop_1(key);
             }
         }
-        catch (e_5_1) { e_5 = { error: e_5_1 }; }
+        catch (e_2_1) { e_2 = { error: e_2_1 }; }
         finally {
             try {
                 if (keys_1_1 && !keys_1_1.done && (_a = keys_1.return)) _a.call(keys_1);
             }
-            finally { if (e_5) throw e_5.error; }
+            finally { if (e_2) throw e_2.error; }
         }
         return keyValues.length === keys.length
             ? keyValues.join(DEFAULT_PRIMARY_KEY_VALUE_SEPARATOR)
@@ -515,20 +291,7 @@ var AsyncStorageAdapter = /** @class */ (function () {
         });
     };
     AsyncStorageAdapter.prototype.inMemoryPagination = function (records, pagination) {
-        if (pagination && records.length > 1) {
-            if (pagination.sort) {
-                var sortPredicates = ModelSortPredicateCreator.getPredicates(pagination.sort);
-                if (sortPredicates.length) {
-                    var compareFn = 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 inMemoryPagination(records, pagination);
     };
     AsyncStorageAdapter.prototype.queryOne = function (modelConstructor, firstOrLast) {
         if (firstOrLast === void 0) { firstOrLast = QueryOne.FIRST; }
@@ -548,9 +311,9 @@ var AsyncStorageAdapter = /** @class */ (function () {
     };
     AsyncStorageAdapter.prototype.delete = function (modelOrModelConstructor, condition) {
         return __awaiter(this, void 0, void 0, function () {
-            var deleteQueue, modelConstructor, nameSpace, models, relations, deletedModels, deletedModels, model, modelConstructor, namespaceName, storeName, keyValuePath, fromDB, msg, predicates, predicateObjs, type, isValid, msg, relations, relations, deletedModels;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var deleteQueue, modelConstructor, nameSpace, models, relations, deletedModels, deletedModels, model, modelConstructor, nameSpace, storeName, keyValuePath, fromDB, msg, predicates, _a, predicateObjs, type, isValid, msg, relations, relations, deletedModels;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
                         deleteQueue = [];
                         if (!isModelConstructor(modelOrModelConstructor)) return [3 /*break*/, 8];
@@ -558,16 +321,16 @@ var AsyncStorageAdapter = /** @class */ (function () {
                         nameSpace = this.namespaceResolver(modelConstructor);
                         return [4 /*yield*/, this.query(modelConstructor, condition)];
                     case 1:
-                        models = _a.sent();
+                        models = _b.sent();
                         relations = this.schema.namespaces[nameSpace].relationships[modelConstructor.name]
                             .relationTypes;
                         if (!(condition !== undefined)) return [3 /*break*/, 4];
                         return [4 /*yield*/, this.deleteTraverse(relations, models, modelConstructor.name, nameSpace, deleteQueue)];
                     case 2:
-                        _a.sent();
+                        _b.sent();
                         return [4 /*yield*/, this.deleteItem(deleteQueue)];
                     case 3:
-                        _a.sent();
+                        _b.sent();
                         deletedModels = deleteQueue.reduce(function (acc, _a) {
                             var items = _a.items;
                             return acc.concat(items);
@@ -575,10 +338,10 @@ var AsyncStorageAdapter = /** @class */ (function () {
                         return [2 /*return*/, [models, deletedModels]];
                     case 4: return [4 /*yield*/, this.deleteTraverse(relations, models, modelConstructor.name, nameSpace, deleteQueue)];
                     case 5:
-                        _a.sent();
+                        _b.sent();
                         return [4 /*yield*/, this.deleteItem(deleteQueue)];
                     case 6:
-                        _a.sent();
+                        _b.sent();
                         deletedModels = deleteQueue.reduce(function (acc, _a) {
                             var items = _a.items;
                             return acc.concat(items);
@@ -589,40 +352,40 @@ var AsyncStorageAdapter = /** @class */ (function () {
                         model = modelOrModelConstructor;
                         modelConstructor = Object.getPrototypeOf(model)
                             .constructor;
-                        namespaceName = this.namespaceResolver(modelConstructor);
+                        nameSpace = this.namespaceResolver(modelConstructor);
                         storeName = this.getStorenameForModel(modelConstructor);
                         if (!condition) return [3 /*break*/, 11];
                         keyValuePath = this.getIndexKeyValuesPath(model);
                         return [4 /*yield*/, this.db.get(keyValuePath, storeName)];
                     case 9:
-                        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 = ModelPredicateCreator.getPredicates(condition);
-                        predicateObjs = predicates.predicates, type = predicates.type;
+                        _a = predicates, predicateObjs = _a.predicates, type = _a.type;
                         isValid = validatePredicate(fromDB, type, predicateObjs);
                         if (!isValid) {
                             msg = 'Conditional update failed';
                             logger.error(msg, { model: fromDB, condition: predicateObjs });
                             throw new Error(msg);
                         }
-                        relations = this.schema.namespaces[namespaceName].relationships[modelConstructor.name].relationTypes;
-                        return [4 /*yield*/, this.deleteTraverse(relations, [model], modelConstructor.name, namespaceName, deleteQueue)];
+                        relations = this.schema.namespaces[nameSpace].relationships[modelConstructor.name].relationTypes;
+                        return [4 /*yield*/, this.deleteTraverse(relations, [model], modelConstructor.name, nameSpace, deleteQueue)];
                     case 10:
-                        _a.sent();
+                        _b.sent();
                         return [3 /*break*/, 13];
                     case 11:
-                        relations = this.schema.namespaces[namespaceName].relationships[modelConstructor.name].relationTypes;
-                        return [4 /*yield*/, this.deleteTraverse(relations, [model], modelConstructor.name, namespaceName, deleteQueue)];
+                        relations = this.schema.namespaces[nameSpace].relationships[modelConstructor.name].relationTypes;
+                        return [4 /*yield*/, this.deleteTraverse(relations, [model], modelConstructor.name, nameSpace, deleteQueue)];
                     case 12:
-                        _a.sent();
-                        _a.label = 13;
+                        _b.sent();
+                        _b.label = 13;
                     case 13: return [4 /*yield*/, this.deleteItem(deleteQueue)];
                     case 14:
-                        _a.sent();
+                        _b.sent();
                         deletedModels = deleteQueue.reduce(function (acc, _a) {
                             var items = _a.items;
                             return acc.concat(items);
@@ -634,71 +397,70 @@ var AsyncStorageAdapter = /** @class */ (function () {
         });
     };
     AsyncStorageAdapter.prototype.deleteItem = function (deleteQueue) {
-        var deleteQueue_1, deleteQueue_1_1;
-        var e_6, _a, e_7, _b;
+        var e_3, _a, e_4, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var deleteItem, storeName, items, items_1, items_1_1, item, keyValuesPath, e_7_1, e_6_1;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var _c, _d, deleteItem, storeName, items, items_1, items_1_1, item, keyValuesPath, e_4_1, e_3_1;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
-                        _c.trys.push([0, 17, 18, 23]);
-                        deleteQueue_1 = __asyncValues(deleteQueue);
-                        _c.label = 1;
-                    case 1: return [4 /*yield*/, deleteQueue_1.next()];
+                        _e.trys.push([0, 17, 18, 23]);
+                        _c = __asyncValues(deleteQueue);
+                        _e.label = 1;
+                    case 1: return [4 /*yield*/, _c.next()];
                     case 2:
-                        if (!(deleteQueue_1_1 = _c.sent(), !deleteQueue_1_1.done)) return [3 /*break*/, 16];
-                        deleteItem = deleteQueue_1_1.value;
+                        if (!(_d = _e.sent(), !_d.done)) return [3 /*break*/, 16];
+                        deleteItem = _d.value;
                         storeName = deleteItem.storeName, items = deleteItem.items;
-                        _c.label = 3;
+                        _e.label = 3;
                     case 3:
-                        _c.trys.push([3, 9, 10, 15]);
+                        _e.trys.push([3, 9, 10, 15]);
                         items_1 = __asyncValues(items);
-                        _c.label = 4;
+                        _e.label = 4;
                     case 4: return [4 /*yield*/, items_1.next()];
                     case 5:
-                        if (!(items_1_1 = _c.sent(), !items_1_1.done)) return [3 /*break*/, 8];
+                        if (!(items_1_1 = _e.sent(), !items_1_1.done)) return [3 /*break*/, 8];
                         item = items_1_1.value;
                         if (!item) return [3 /*break*/, 7];
                         if (!(typeof item === 'object')) return [3 /*break*/, 7];
                         keyValuesPath = this.getIndexKeyValuesPath(item);
                         return [4 /*yield*/, this.db.delete(keyValuesPath, storeName)];
                     case 6:
-                        _c.sent();
-                        _c.label = 7;
+                        _e.sent();
+                        _e.label = 7;
                     case 7: return [3 /*break*/, 4];
                     case 8: return [3 /*break*/, 15];
                     case 9:
-                        e_7_1 = _c.sent();
-                        e_7 = { error: e_7_1 };
+                        e_4_1 = _e.sent();
+                        e_4 = { error: e_4_1 };
                         return [3 /*break*/, 15];
                     case 10:
-                        _c.trys.push([10, , 13, 14]);
+                        _e.trys.push([10, , 13, 14]);
                         if (!(items_1_1 && !items_1_1.done && (_b = items_1.return))) return [3 /*break*/, 12];
                         return [4 /*yield*/, _b.call(items_1)];
                     case 11:
-                        _c.sent();
-                        _c.label = 12;
+                        _e.sent();
+                        _e.label = 12;
                     case 12: return [3 /*break*/, 14];
                     case 13:
-                        if (e_7) throw e_7.error;
+                        if (e_4) throw e_4.error;
                         return [7 /*endfinally*/];
                     case 14: return [7 /*endfinally*/];
                     case 15: return [3 /*break*/, 1];
                     case 16: return [3 /*break*/, 23];
                     case 17:
-                        e_6_1 = _c.sent();
-                        e_6 = { error: e_6_1 };
+                        e_3_1 = _e.sent();
+                        e_3 = { error: e_3_1 };
                         return [3 /*break*/, 23];
                     case 18:
-                        _c.trys.push([18, , 21, 22]);
-                        if (!(deleteQueue_1_1 && !deleteQueue_1_1.done && (_a = deleteQueue_1.return))) return [3 /*break*/, 20];
-                        return [4 /*yield*/, _a.call(deleteQueue_1)];
+                        _e.trys.push([18, , 21, 22]);
+                        if (!(_d && !_d.done && (_a = _c.return))) return [3 /*break*/, 20];
+                        return [4 /*yield*/, _a.call(_c)];
                     case 19:
-                        _c.sent();
-                        _c.label = 20;
+                        _e.sent();
+                        _e.label = 20;
                     case 20: return [3 /*break*/, 22];
                     case 21:
-                        if (e_6) throw e_6.error;
+                        if (e_3) throw e_3.error;
                         return [7 /*endfinally*/];
                     case 22: return [7 /*endfinally*/];
                     case 23: return [2 /*return*/];
@@ -715,21 +477,21 @@ var AsyncStorageAdapter = /** @class */ (function () {
      * @param deleteQueue
      */
     AsyncStorageAdapter.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 relations_1, relations_1_1, models_1, models_1_1, models_2, models_2_1;
+        var e_5, _a, e_6, _b, e_7, _c;
         return __awaiter(this, void 0, void 0, function () {
-            var rel, relationType, modelName, targetName, targetNames, associatedWith, storeName, index, _d, model, hasOneIndex_1, hasConnectedModelFields, keyValuesPath, values_1, isUnidirectionalConnection, allRecords, recordToDelete, hasOneIndex_2, hasOneCustomField, keyValuesPath, value_1, allRecords, recordToDelete, e_9_1, model, keyValues, allRecords, indices, childrenArray, e_10_1, e_8_1;
+            var rel, relationType, modelName, targetName, targetNames, associatedWith, storeName, index, _d, model, hasOneIndex_1, hasConnectedModelFields, keyValuesPath, values_1, isUnidirectionalConnection, allRecords, recordToDelete, hasOneIndex_2, hasOneCustomField, keyValuesPath, value_1, allRecords, recordToDelete, e_6_1, model, keyValues, allRecords, indices, childrenArray, e_7_1, e_5_1;
             var _this = this;
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
                         _e.trys.push([0, 38, 39, 44]);
-                        relations_2 = __asyncValues(relations);
+                        relations_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 = getStorename(nameSpace, modelName);
                         index = getIndex(this.schema.namespaces[nameSpace].relationships[modelName]
@@ -772,7 +534,9 @@ var AsyncStorageAdapter = /** @class */ (function () {
                         isUnidirectionalConnection = hasOneIndex_1 === associatedWith;
                         if (hasConnectedModelFields && isUnidirectionalConnection) {
                             // Values will be that of the child model
-                            values_1 = targetNames.map(function (targetName) { return model[targetName]; });
+                            values_1 = targetNames
+                                .filter(function (targetName) { var _a; return (_a = model[targetName]) !== null && _a !== void 0 ? _a : false; })
+                                .map(function (targetName) { return model[targetName]; });
                         }
                         else {
                             // values will be that of the parent model
@@ -828,8 +592,8 @@ var AsyncStorageAdapter = /** @class */ (function () {
                     case 11: return [3 /*break*/, 4];
                     case 12: return [3 /*break*/, 19];
                     case 13:
-                        e_9_1 = _e.sent();
-                        e_9 = { error: e_9_1 };
+                        e_6_1 = _e.sent();
+                        e_6 = { error: e_6_1 };
                         return [3 /*break*/, 19];
                     case 14:
                         _e.trys.push([14, , 17, 18]);
@@ -840,7 +604,7 @@ var AsyncStorageAdapter = /** @class */ (function () {
                         _e.label = 16;
                     case 16: return [3 /*break*/, 18];
                     case 17:
-                        if (e_9) throw e_9.error;
+                        if (e_6) throw e_6.error;
                         return [7 /*endfinally*/];
                     case 18: return [7 /*endfinally*/];
                     case 19: return [3 /*break*/, 36];
@@ -868,8 +632,8 @@ var AsyncStorageAdapter = /** @class */ (function () {
                     case 25: return [3 /*break*/, 21];
                     case 26: return [3 /*break*/, 33];
                     case 27:
-                        e_10_1 = _e.sent();
-                        e_10 = { error: e_10_1 };
+                        e_7_1 = _e.sent();
+                        e_7 = { error: e_7_1 };
                         return [3 /*break*/, 33];
                     case 28:
                         _e.trys.push([28, , 31, 32]);
@@ -880,32 +644,30 @@ var AsyncStorageAdapter = /** @class */ (function () {
                         _e.label = 30;
                     case 30: return [3 /*break*/, 32];
                     case 31:
-                        if (e_10) throw e_10.error;
+                        if (e_7) throw e_7.error;
                         return [7 /*endfinally*/];
                     case 32: return [7 /*endfinally*/];
                     case 33: return [3 /*break*/, 36];
                     case 34: 
                     // Intentionally blank
                     return [3 /*break*/, 36];
-                    case 35:
-                        exhaustiveCheck(relationType);
-                        return [3 /*break*/, 36];
+                    case 35: throw new Error("Invalid relationType " + relationType);
                     case 36: return [3 /*break*/, 1];
                     case 37: return [3 /*break*/, 44];
                     case 38:
-                        e_8_1 = _e.sent();
-                        e_8 = { error: e_8_1 };
+                        e_5_1 = _e.sent();
+                        e_5 = { error: e_5_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)];
+                        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_8) throw e_8.error;
+                        if (e_5) throw e_5.error;
                         return [7 /*endfinally*/];
                     case 43: return [7 /*endfinally*/];
                     case 44:
@@ -937,7 +699,7 @@ var AsyncStorageAdapter = /** @class */ (function () {
     AsyncStorageAdapter.prototype.batchSave = function (modelConstructor, items) {
         return __awaiter(this, void 0, void 0, function () {
             var modelName, namespaceName, storeName, keys, batch, _loop_2, this_1, items_2, items_2_1, item;
-            var e_11, _a;
+            var e_8, _a;
             var _this = this;
             return __generator(this, function (_b) {
                 switch (_b.label) {
@@ -965,12 +727,12 @@ var AsyncStorageAdapter = /** @class */ (function () {
                                 _loop_2(item);
                             }
                         }
-                        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
                         finally {
                             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_8) throw e_8.error; }
                         }
                         return [4 /*yield*/, this.db.batchSave(storeName, batch, keys)];
                     case 1: return [2 /*return*/, _b.sent()];