@aws-amplify/datastore 4.7.5 → 5.0.1-console-preview.4432977.0

package/lib/storage/adapter/IndexedDBAdapter.js

@@ -1,14 +1,130 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+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 (g && (g = 0, op[0] && (_ = 0)), _) 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.");
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var core_1 = require("@aws-amplify/core");
-var idb = tslib_1.__importStar(require("idb"));
+var idb = __importStar(require("idb"));
 var types_1 = require("../../types");
 var util_1 = require("../../util");
 var StorageAdapterBase_1 = require("./StorageAdapterBase");
-var logger = new core_1.ConsoleLogger('DataStore');
+var utils_1 = require("@aws-amplify/core/internals/utils");
+var logger = new utils_1.Logger('DataStore');
 /**
  * The point after which queries composed of multiple simple OR conditions
  * should scan-and-filter instead of individual queries for each condition.
@@ -34,7 +150,7 @@ var MULTI_OR_CONDITION_SCAN_BREAKPOINT = 7;
 //
 var DB_VERSION = 3;
 var IndexedDBAdapter = /** @class */ (function (_super) {
-    tslib_1.__extends(IndexedDBAdapter, _super);
+    __extends(IndexedDBAdapter, _super);
     function IndexedDBAdapter() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.safariCompatabilityMode = false;
@@ -57,8 +173,8 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
     }
     // checks are called by StorageAdapterBase class
     IndexedDBAdapter.prototype.preSetUpChecks = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
@@ -72,8 +188,8 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
         });
     };
     IndexedDBAdapter.prototype.preOpCheck = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
@@ -93,16 +209,16 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
      * @returns IDB Database instance
      */
     IndexedDBAdapter.prototype.initDb = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, idb.openDB(this.dbName, DB_VERSION, {
-                            upgrade: function (db, oldVersion, newVersion, txn) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            upgrade: function (db, oldVersion, newVersion, txn) { return __awaiter(_this, void 0, void 0, function () {
                                 var _a, _b, storeName, origStore, tmpName, _c, namespaceName, modelName, modelInCurrentSchema, newStore, cursor, count, e_1_1, error_1;
                                 var e_1, _d;
                                 var _this = this;
-                                return tslib_1.__generator(this, function (_e) {
+                                return __generator(this, function (_e) {
                                     switch (_e.label) {
                                         case 0:
                                             // create new database
@@ -110,7 +226,7 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
                                                 Object.keys(this.schema.namespaces).forEach(function (namespaceName) {
                                                     var namespace = _this.schema.namespaces[namespaceName];
                                                     Object.keys(namespace.models).forEach(function (modelName) {
-                                                        var storeName = util_1.getStorename(namespaceName, modelName);
+                                                        var storeName = (0, util_1.getStorename)(namespaceName, modelName);
                                                         _this.createObjectStoreForModel(db, namespaceName, storeName, modelName);
                                                     });
                                                 });
@@ -123,13 +239,13 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
                                             _e.label = 2;
                                         case 2:
                                             _e.trys.push([2, 11, 12, 13]);
-                                            _a = tslib_1.__values(txn.objectStoreNames), _b = _a.next();
+                                            _a = __values(txn.objectStoreNames), _b = _a.next();
                                             _e.label = 3;
                                         case 3:
                                             if (!!_b.done) return [3 /*break*/, 10];
                                             storeName = _b.value;
                                             origStore = txn.objectStore(storeName);
-                                            tmpName = "tmp_" + storeName;
+                                            tmpName = "tmp_".concat(storeName);
                                             origStore.name = tmpName;
                                             _c = this.getNamespaceAndModelFromStorename(storeName), namespaceName = _c.namespaceName, modelName = _c.modelName;
                                             modelInCurrentSchema = modelName in this.schema.namespaces[namespaceName].models;
@@ -159,7 +275,7 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
                                         case 8:
                                             // delete original
                                             db.deleteObjectStore(tmpName);
-                                            logger.debug(count + " " + storeName + " records migrated");
+                                            logger.debug("".concat(count, " ").concat(storeName, " records migrated"));
                                             _e.label = 9;
                                         case 9:
                                             _b = _a.next();
@@ -184,14 +300,14 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
                                                 var objectStoreNames = new Set(txn.objectStoreNames);
                                                 Object.keys(namespace.models)
                                                     .map(function (modelName) {
-                                                    return [modelName, util_1.getStorename(namespaceName, modelName)];
+                                                    return [modelName, (0, util_1.getStorename)(namespaceName, modelName)];
                                                 })
                                                     .filter(function (_a) {
-                                                    var _b = tslib_1.__read(_a, 2), storeName = _b[1];
+                                                    var _b = __read(_a, 2), storeName = _b[1];
                                                     return !objectStoreNames.has(storeName);
                                                 })
                                                     .forEach(function (_a) {
-                                                    var _b = tslib_1.__read(_a, 2), modelName = _b[0], storeName = _b[1];
+                                                    var _b = __read(_a, 2), modelName = _b[0], storeName = _b[1];
                                                     _this.createObjectStoreForModel(db, namespaceName, storeName, modelName);
                                                 });
                                             });
@@ -213,9 +329,9 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
         });
     };
     IndexedDBAdapter.prototype._get = function (storeOrStoreName, keyArr) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var index, storeName, store, result;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (typeof storeOrStoreName === 'string') {
@@ -236,8 +352,8 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
     };
     IndexedDBAdapter.prototype.clear = function () {
         var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_b) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
@@ -254,89 +370,112 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
         });
     };
     IndexedDBAdapter.prototype.save = function (model, condition) {
-        var e_2, _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _b, storeName, set, connectionStoreNames, modelKeyValues, tx, store, fromDB, result, connectionStoreNames_1, connectionStoreNames_1_1, resItem, storeName_1, item, instance, keys, store_1, itemKeyValues, fromDB_1, opType, key, e_2_1;
-            return tslib_1.__generator(this, function (_c) {
-                switch (_c.label) {
+        var _a, e_2, _b, _c;
+        return __awaiter(this, void 0, void 0, function () {
+            var _d, storeName, set, connectionStoreNames, modelKeyValues, tx, store, fromDB, result, _loop_1, this_1, _e, connectionStoreNames_1, connectionStoreNames_1_1, e_2_1;
+            return __generator(this, function (_f) {
+                switch (_f.label) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
-                        _c.sent();
-                        _b = this.saveMetadata(model), storeName = _b.storeName, set = _b.set, connectionStoreNames = _b.connectionStoreNames, modelKeyValues = _b.modelKeyValues;
-                        tx = this.db.transaction(tslib_1.__spread([storeName], Array.from(set.values())), 'readwrite');
+                        _f.sent();
+                        _d = this.saveMetadata(model), storeName = _d.storeName, set = _d.set, connectionStoreNames = _d.connectionStoreNames, modelKeyValues = _d.modelKeyValues;
+                        tx = this.db.transaction(__spreadArray([storeName], __read(Array.from(set.values())), false), 'readwrite');
                         store = tx.objectStore(storeName);
                         return [4 /*yield*/, this._get(store, modelKeyValues)];
                     case 2:
-                        fromDB = _c.sent();
+                        fromDB = _f.sent();
                         this.validateSaveCondition(condition, fromDB);
                         result = [];
-                        _c.label = 3;
+                        _f.label = 3;
                     case 3:
-                        _c.trys.push([3, 11, 12, 17]);
-                        connectionStoreNames_1 = tslib_1.__asyncValues(connectionStoreNames);
-                        _c.label = 4;
+                        _f.trys.push([3, 9, 10, 15]);
+                        _loop_1 = function () {
+                            var resItem, storeName_1, item, instance, keys, store_1, itemKeyValues, fromDB_1, opType, key;
+                            return __generator(this, function (_g) {
+                                switch (_g.label) {
+                                    case 0:
+                                        _c = connectionStoreNames_1_1.value;
+                                        _e = false;
+                                        _g.label = 1;
+                                    case 1:
+                                        _g.trys.push([1, , 6, 7]);
+                                        resItem = _c;
+                                        storeName_1 = resItem.storeName, item = resItem.item, instance = resItem.instance, keys = resItem.keys;
+                                        store_1 = tx.objectStore(storeName_1);
+                                        itemKeyValues = keys.map(function (key) { return item[key]; });
+                                        return [4 /*yield*/, this_1._get(store_1, itemKeyValues)];
+                                    case 2:
+                                        fromDB_1 = _g.sent();
+                                        opType = fromDB_1 ? types_1.OpType.UPDATE : types_1.OpType.INSERT;
+                                        if (!((0, util_1.keysEqual)(itemKeyValues, modelKeyValues) ||
+                                            opType === types_1.OpType.INSERT)) return [3 /*break*/, 5];
+                                        return [4 /*yield*/, store_1
+                                                .index('byPk')
+                                                .getKey(this_1.canonicalKeyPath(itemKeyValues))];
+                                    case 3:
+                                        key = _g.sent();
+                                        return [4 /*yield*/, store_1.put(item, key)];
+                                    case 4:
+                                        _g.sent();
+                                        result.push([instance, opType]);
+                                        _g.label = 5;
+                                    case 5: return [3 /*break*/, 7];
+                                    case 6:
+                                        _e = true;
+                                        return [7 /*endfinally*/];
+                                    case 7: return [2 /*return*/];
+                                }
+                            });
+                        };
+                        this_1 = this;
+                        _e = true, connectionStoreNames_1 = __asyncValues(connectionStoreNames);
+                        _f.label = 4;
                     case 4: return [4 /*yield*/, connectionStoreNames_1.next()];
                     case 5:
-                        if (!(connectionStoreNames_1_1 = _c.sent(), !connectionStoreNames_1_1.done)) return [3 /*break*/, 10];
-                        resItem = connectionStoreNames_1_1.value;
-                        storeName_1 = resItem.storeName, item = resItem.item, instance = resItem.instance, keys = resItem.keys;
-                        store_1 = tx.objectStore(storeName_1);
-                        itemKeyValues = keys.map(function (key) { return item[key]; });
-                        return [4 /*yield*/, this._get(store_1, itemKeyValues)];
+                        if (!(connectionStoreNames_1_1 = _f.sent(), _a = connectionStoreNames_1_1.done, !_a)) return [3 /*break*/, 8];
+                        return [5 /*yield**/, _loop_1()];
                     case 6:
-                        fromDB_1 = _c.sent();
-                        opType = fromDB_1 ? types_1.OpType.UPDATE : types_1.OpType.INSERT;
-                        if (!(util_1.keysEqual(itemKeyValues, modelKeyValues) ||
-                            opType === types_1.OpType.INSERT)) return [3 /*break*/, 9];
-                        return [4 /*yield*/, store_1
-                                .index('byPk')
-                                .getKey(this.canonicalKeyPath(itemKeyValues))];
-                    case 7:
-                        key = _c.sent();
-                        return [4 /*yield*/, store_1.put(item, key)];
-                    case 8:
-                        _c.sent();
-                        result.push([instance, opType]);
-                        _c.label = 9;
-                    case 9: return [3 /*break*/, 4];
-                    case 10: return [3 /*break*/, 17];
-                    case 11:
-                        e_2_1 = _c.sent();
+                        _f.sent();
+                        _f.label = 7;
+                    case 7: return [3 /*break*/, 4];
+                    case 8: return [3 /*break*/, 15];
+                    case 9:
+                        e_2_1 = _f.sent();
                         e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 17];
-                    case 12:
-                        _c.trys.push([12, , 15, 16]);
-                        if (!(connectionStoreNames_1_1 && !connectionStoreNames_1_1.done && (_a = connectionStoreNames_1.return))) return [3 /*break*/, 14];
-                        return [4 /*yield*/, _a.call(connectionStoreNames_1)];
+                        return [3 /*break*/, 15];
+                    case 10:
+                        _f.trys.push([10, , 13, 14]);
+                        if (!(!_e && !_a && (_b = connectionStoreNames_1.return))) return [3 /*break*/, 12];
+                        return [4 /*yield*/, _b.call(connectionStoreNames_1)];
+                    case 11:
+                        _f.sent();
+                        _f.label = 12;
+                    case 12: return [3 /*break*/, 14];
                     case 13:
-                        _c.sent();
-                        _c.label = 14;
-                    case 14: return [3 /*break*/, 16];
-                    case 15:
                         if (e_2) throw e_2.error;
                         return [7 /*endfinally*/];
-                    case 16: return [7 /*endfinally*/];
-                    case 17: return [4 /*yield*/, tx.done];
-                    case 18:
-                        _c.sent();
+                    case 14: return [7 /*endfinally*/];
+                    case 15: return [4 /*yield*/, tx.done];
+                    case 16:
+                        _f.sent();
                         return [2 /*return*/, result];
                 }
             });
         });
     };
     IndexedDBAdapter.prototype.query = function (modelConstructor, predicate, pagination) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var _a, storeName, namespaceName, queryByKey, predicates, hasSort, hasPagination, records;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
                         _b.sent();
                         _a = this.queryMetadata(modelConstructor, predicate, pagination), storeName = _a.storeName, namespaceName = _a.namespaceName, queryByKey = _a.queryByKey, predicates = _a.predicates, hasSort = _a.hasSort, hasPagination = _a.hasPagination;
-                        return [4 /*yield*/, (function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                        return [4 /*yield*/, (function () { return __awaiter(_this, void 0, void 0, function () {
                                 var record, filtered, all;
-                                return tslib_1.__generator(this, function (_a) {
+                                return __generator(this, function (_a) {
                                     switch (_a.label) {
                                         case 0:
                                             if (!queryByKey) return [3 /*break*/, 2];
@@ -374,9 +513,9 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
     };
     IndexedDBAdapter.prototype.queryOne = function (modelConstructor, firstOrLast) {
         if (firstOrLast === void 0) { firstOrLast = types_1.QueryOne.FIRST; }
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var storeName, cursor, result;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
@@ -395,11 +534,11 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
         });
     };
     IndexedDBAdapter.prototype.batchSave = function (modelConstructor, items) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var modelName, namespaceName, storeName, result, txn, store, _loop_1, this_1, items_1, items_1_1, item, e_3_1;
+        return __awaiter(this, void 0, void 0, function () {
+            var modelName, namespaceName, storeName, result, txn, store, _loop_2, this_2, items_1, items_1_1, item, e_3_1;
             var e_3, _a;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0: return [4 /*yield*/, this.checkPrivate()];
                     case 1:
@@ -413,24 +552,24 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
                         result = [];
                         txn = this.db.transaction(storeName, 'readwrite');
                         store = txn.store;
-                        _loop_1 = function (item) {
+                        _loop_2 = function (item) {
                             var model, connectedModels, keyValues, _deleted, index, key, instance;
-                            return tslib_1.__generator(this, function (_a) {
-                                switch (_a.label) {
+                            return __generator(this, function (_c) {
+                                switch (_c.label) {
                                     case 0:
-                                        model = this_1.modelInstanceCreator(modelConstructor, item);
-                                        connectedModels = util_1.traverseModel(modelName, model, this_1.schema.namespaces[namespaceName], this_1.modelInstanceCreator, this_1.getModelConstructorByModelName);
-                                        keyValues = this_1.getIndexKeyValuesFromModel(model);
+                                        model = this_2.modelInstanceCreator(modelConstructor, item);
+                                        connectedModels = (0, util_1.traverseModel)(modelName, model, this_2.schema.namespaces[namespaceName], this_2.modelInstanceCreator, this_2.getModelConstructorByModelName);
+                                        keyValues = this_2.getIndexKeyValuesFromModel(model);
                                         _deleted = item._deleted;
                                         index = store.index('byPk');
-                                        return [4 /*yield*/, index.getKey(this_1.canonicalKeyPath(keyValues))];
+                                        return [4 /*yield*/, index.getKey(this_2.canonicalKeyPath(keyValues))];
                                     case 1:
-                                        key = _a.sent();
+                                        key = _c.sent();
                                         if (!!_deleted) return [3 /*break*/, 3];
                                         instance = connectedModels.find(function (_a) {
                                             var instance = _a.instance;
                                             var instanceKeyValues = _this.getIndexKeyValuesFromModel(instance);
-                                            return util_1.keysEqual(instanceKeyValues, keyValues);
+                                            return (0, util_1.keysEqual)(instanceKeyValues, keyValues);
                                         }).instance;
                                         result.push([
                                             instance,
@@ -438,29 +577,29 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
                                         ]);
                                         return [4 /*yield*/, store.put(instance, key)];
                                     case 2:
-                                        _a.sent();
+                                        _c.sent();
                                         return [3 /*break*/, 5];
                                     case 3:
                                         result.push([item, types_1.OpType.DELETE]);
                                         if (!key) return [3 /*break*/, 5];
                                         return [4 /*yield*/, store.delete(key)];
                                     case 4:
-                                        _a.sent();
-                                        _a.label = 5;
+                                        _c.sent();
+                                        _c.label = 5;
                                     case 5: return [2 /*return*/];
                                 }
                             });
                         };
-                        this_1 = this;
+                        this_2 = this;
                         _b.label = 2;
                     case 2:
                         _b.trys.push([2, 7, 8, 9]);
-                        items_1 = tslib_1.__values(items), items_1_1 = items_1.next();
+                        items_1 = __values(items), items_1_1 = items_1.next();
                         _b.label = 3;
                     case 3:
                         if (!!items_1_1.done) return [3 /*break*/, 6];
                         item = items_1_1.value;
-                        return [5 /*yield**/, _loop_1(item)];
+                        return [5 /*yield**/, _loop_2(item)];
                     case 4:
                         _b.sent();
                         _b.label = 5;
@@ -487,107 +626,125 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
         });
     };
     IndexedDBAdapter.prototype.deleteItem = function (deleteQueue) {
-        var e_4, _a, e_5, _b;
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var connectionStoreNames, tx, _c, _d, deleteItem, storeName, items, store, items_2, items_2_1, item, key, keyValues, itemKey, e_5_1, e_4_1;
-            return tslib_1.__generator(this, function (_e) {
-                switch (_e.label) {
+        var _a, e_4, _b, _c, _d, e_5, _e, _f;
+        return __awaiter(this, void 0, void 0, function () {
+            var connectionStoreNames, tx, _g, _h, _j, deleteItem, storeName, items, store, _k, items_2, items_2_1, item, key, keyValues, itemKey, e_5_1, e_4_1;
+            return __generator(this, function (_l) {
+                switch (_l.label) {
                     case 0:
                         connectionStoreNames = deleteQueue.map(function (_a) {
                             var storeName = _a.storeName;
                             return storeName;
                         });
-                        tx = this.db.transaction(tslib_1.__spread(connectionStoreNames), 'readwrite');
-                        _e.label = 1;
+                        tx = this.db.transaction(__spreadArray([], __read(connectionStoreNames), false), 'readwrite');
+                        _l.label = 1;
                     case 1:
-                        _e.trys.push([1, 22, 23, 28]);
-                        _c = tslib_1.__asyncValues(deleteQueue);
-                        _e.label = 2;
-                    case 2: return [4 /*yield*/, _c.next()];
+                        _l.trys.push([1, 28, 29, 34]);
+                        _g = true, _h = __asyncValues(deleteQueue);
+                        _l.label = 2;
+                    case 2: return [4 /*yield*/, _h.next()];
                     case 3:
-                        if (!(_d = _e.sent(), !_d.done)) return [3 /*break*/, 21];
-                        deleteItem = _d.value;
+                        if (!(_j = _l.sent(), _a = _j.done, !_a)) return [3 /*break*/, 27];
+                        _c = _j.value;
+                        _g = false;
+                        _l.label = 4;
+                    case 4:
+                        _l.trys.push([4, , 25, 26]);
+                        deleteItem = _c;
                         storeName = deleteItem.storeName, items = deleteItem.items;
                         store = tx.objectStore(storeName);
-                        _e.label = 4;
-                    case 4:
-                        _e.trys.push([4, 14, 15, 20]);
-                        items_2 = tslib_1.__asyncValues(items);
-                        _e.label = 5;
-                    case 5: return [4 /*yield*/, items_2.next()];
-                    case 6:
-                        if (!(items_2_1 = _e.sent(), !items_2_1.done)) return [3 /*break*/, 13];
-                        item = items_2_1.value;
-                        if (!item) return [3 /*break*/, 12];
+                        _l.label = 5;
+                    case 5:
+                        _l.trys.push([5, 18, 19, 24]);
+                        _k = true, items_2 = (e_5 = void 0, __asyncValues(items));
+                        _l.label = 6;
+                    case 6: return [4 /*yield*/, items_2.next()];
+                    case 7:
+                        if (!(items_2_1 = _l.sent(), _d = items_2_1.done, !_d)) return [3 /*break*/, 17];
+                        _f = items_2_1.value;
+                        _k = false;
+                        _l.label = 8;
+                    case 8:
+                        _l.trys.push([8, , 15, 16]);
+                        item = _f;
+                        if (!item) return [3 /*break*/, 14];
                         key = void 0;
-                        if (!(typeof item === 'object')) return [3 /*break*/, 8];
+                        if (!(typeof item === 'object')) return [3 /*break*/, 10];
                         keyValues = this.getIndexKeyValuesFromModel(item);
                         return [4 /*yield*/, store
                                 .index('byPk')
                                 .getKey(this.canonicalKeyPath(keyValues))];
-                    case 7:
-                        key = _e.sent();
-                        return [3 /*break*/, 10];
-                    case 8:
-                        itemKey = item.toString();
-                        return [4 /*yield*/, store.index('byPk').getKey(itemKey)];
                     case 9:
-                        key = _e.sent();
-                        _e.label = 10;
+                        key = _l.sent();
+                        return [3 /*break*/, 12];
                     case 10:
-                        if (!(key !== undefined)) return [3 /*break*/, 12];
-                        return [4 /*yield*/, store.delete(key)];
+                        itemKey = item.toString();
+                        return [4 /*yield*/, store.index('byPk').getKey(itemKey)];
                     case 11:
-                        _e.sent();
-                        _e.label = 12;
-                    case 12: return [3 /*break*/, 5];
-                    case 13: return [3 /*break*/, 20];
-                    case 14:
-                        e_5_1 = _e.sent();
-                        e_5 = { error: e_5_1 };
-                        return [3 /*break*/, 20];
+                        key = _l.sent();
+                        _l.label = 12;
+                    case 12:
+                        if (!(key !== undefined)) return [3 /*break*/, 14];
+                        return [4 /*yield*/, store.delete(key)];
+                    case 13:
+                        _l.sent();
+                        _l.label = 14;
+                    case 14: return [3 /*break*/, 16];
                     case 15:
-                        _e.trys.push([15, , 18, 19]);
-                        if (!(items_2_1 && !items_2_1.done && (_b = items_2.return))) return [3 /*break*/, 17];
-                        return [4 /*yield*/, _b.call(items_2)];
-                    case 16:
-                        _e.sent();
-                        _e.label = 17;
-                    case 17: return [3 /*break*/, 19];
+                        _k = true;
+                        return [7 /*endfinally*/];
+                    case 16: return [3 /*break*/, 6];
+                    case 17: return [3 /*break*/, 24];
                     case 18:
+                        e_5_1 = _l.sent();
+                        e_5 = { error: e_5_1 };
+                        return [3 /*break*/, 24];
+                    case 19:
+                        _l.trys.push([19, , 22, 23]);
+                        if (!(!_k && !_d && (_e = items_2.return))) return [3 /*break*/, 21];
+                        return [4 /*yield*/, _e.call(items_2)];
+                    case 20:
+                        _l.sent();
+                        _l.label = 21;
+                    case 21: return [3 /*break*/, 23];
+                    case 22:
                         if (e_5) throw e_5.error;
                         return [7 /*endfinally*/];
-                    case 19: return [7 /*endfinally*/];
-                    case 20: return [3 /*break*/, 2];
-                    case 21: return [3 /*break*/, 28];
-                    case 22:
-                        e_4_1 = _e.sent();
+                    case 23: return [7 /*endfinally*/];
+                    case 24: return [3 /*break*/, 26];
+                    case 25:
+                        _g = true;
+                        return [7 /*endfinally*/];
+                    case 26: return [3 /*break*/, 2];
+                    case 27: return [3 /*break*/, 34];
+                    case 28:
+                        e_4_1 = _l.sent();
                         e_4 = { error: e_4_1 };
-                        return [3 /*break*/, 28];
-                    case 23:
-                        _e.trys.push([23, , 26, 27]);
-                        if (!(_d && !_d.done && (_a = _c.return))) return [3 /*break*/, 25];
-                        return [4 /*yield*/, _a.call(_c)];
-                    case 24:
-                        _e.sent();
-                        _e.label = 25;
-                    case 25: return [3 /*break*/, 27];
-                    case 26:
+                        return [3 /*break*/, 34];
+                    case 29:
+                        _l.trys.push([29, , 32, 33]);
+                        if (!(!_g && !_a && (_b = _h.return))) return [3 /*break*/, 31];
+                        return [4 /*yield*/, _b.call(_h)];
+                    case 30:
+                        _l.sent();
+                        _l.label = 31;
+                    case 31: return [3 /*break*/, 33];
+                    case 32:
                         if (e_4) throw e_4.error;
                         return [7 /*endfinally*/];
-                    case 27: return [7 /*endfinally*/];
-                    case 28: return [2 /*return*/];
+                    case 33: return [7 /*endfinally*/];
+                    case 34: return [2 /*return*/];
                 }
             });
         });
     };
     //#region platform-specific helper methods
     IndexedDBAdapter.prototype.checkPrivate = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var isPrivate;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, util_1.isPrivateMode().then(function (isPrivate) {
+                    case 0: return [4 /*yield*/, (0, util_1.isPrivateMode)().then(function (isPrivate) {
                             return isPrivate;
                         })];
                     case 1:
@@ -615,13 +772,13 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
      * https://github.com/aws-amplify/amplify-js/pull/10527
      */
     IndexedDBAdapter.prototype.setSafariCompatabilityMode = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var _a;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _a = this;
-                        return [4 /*yield*/, util_1.isSafariCompatabilityMode()];
+                        return [4 /*yield*/, (0, util_1.isSafariCompatabilityMode)()];
                     case 1:
                         _a.safariCompatabilityMode = _b.sent();
                         if (this.safariCompatabilityMode === true) {
@@ -633,7 +790,7 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
         });
     };
     IndexedDBAdapter.prototype.getNamespaceAndModelFromStorename = function (storeName) {
-        var _a = tslib_1.__read(storeName.split('_')), namespaceName = _a[0], modelNameArr = _a.slice(1);
+        var _a = __read(storeName.split('_')), namespaceName = _a[0], modelNameArr = _a.slice(1);
         return {
             namespaceName: namespaceName,
             modelName: modelNameArr.join('_'),
@@ -645,14 +802,14 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
         });
         var indexes = this.schema.namespaces[namespaceName].relationships[modelName].indexes;
         indexes.forEach(function (_a) {
-            var _b = tslib_1.__read(_a, 3), idxName = _b[0], keyPath = _b[1], options = _b[2];
+            var _b = __read(_a, 3), idxName = _b[0], keyPath = _b[1], options = _b[2];
             store.createIndex(idxName, keyPath, options);
         });
         return store;
     };
     IndexedDBAdapter.prototype.getByKey = function (storeName, keyValue) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this._get(storeName, keyValue)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -661,8 +818,8 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
         });
     };
     IndexedDBAdapter.prototype.getAll = function (storeName) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.db.getAll(storeName)];
                     case 1: return [2 /*return*/, _a.sent()];
@@ -686,7 +843,7 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
         var queries = [];
         var predicateIndex = new Map();
         try {
-            for (var predicates_1 = tslib_1.__values(predicates), predicates_1_1 = predicates_1.next(); !predicates_1_1.done; predicates_1_1 = predicates_1.next()) {
+            for (var predicates_1 = __values(predicates), predicates_1_1 = predicates_1.next(); !predicates_1_1.done; predicates_1_1 = predicates_1.next()) {
                 var predicate = predicates_1_1.value;
                 predicateIndex.set(String(predicate.field), predicate);
             }
@@ -699,13 +856,13 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
             finally { if (e_6) throw e_6.error; }
         }
         var store = transaction.objectStore(storeName);
-        var _loop_2 = function (name_1) {
-            var e_8, _a;
+        var _loop_3 = function (name_1) {
+            var e_8, _e;
             var idx = store.index(name_1);
             var keypath = Array.isArray(idx.keyPath) ? idx.keyPath : [idx.keyPath];
             var matchingPredicateValues = [];
             try {
-                for (var keypath_1 = (e_8 = void 0, tslib_1.__values(keypath)), keypath_1_1 = keypath_1.next(); !keypath_1_1.done; keypath_1_1 = keypath_1.next()) {
+                for (var keypath_1 = (e_8 = void 0, __values(keypath)), keypath_1_1 = keypath_1.next(); !keypath_1_1.done; keypath_1_1 = keypath_1.next()) {
                     var field = keypath_1_1.value;
                     var p = predicateIndex.get(field);
                     if (p && p.operand !== null && p.operand !== undefined) {
@@ -719,7 +876,7 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
             catch (e_8_1) { e_8 = { error: e_8_1 }; }
             finally {
                 try {
-                    if (keypath_1_1 && !keypath_1_1.done && (_a = keypath_1.return)) _a.call(keypath_1);
+                    if (keypath_1_1 && !keypath_1_1.done && (_e = keypath_1.return)) _e.call(keypath_1);
                 }
                 finally { if (e_8) throw e_8.error; }
             }
@@ -738,9 +895,9 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
             }
         };
         try {
-            for (var _c = tslib_1.__values(store.indexNames), _d = _c.next(); !_d.done; _d = _c.next()) {
+            for (var _c = __values(store.indexNames), _d = _c.next(); !_d.done; _d = _c.next()) {
                 var name_1 = _d.value;
-                _loop_2(name_1);
+                _loop_3(name_1);
             }
         }
         catch (e_7_1) { e_7 = { error: e_7_1 }; }
@@ -753,10 +910,10 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
         return queries;
     };
     IndexedDBAdapter.prototype.baseQueryIndex = function (storeName, predicates, transaction) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var predicateObjs, type, fieldPredicates, txn, result, groupQueries, objectQueries, indexedQueries;
             var _this = this;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         predicateObjs = predicates.predicates, type = predicates.type;
@@ -765,17 +922,17 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
                         // so, we unpack and/or groups until we find a group with more than 1
                         // child OR a child that is not a group (and is therefore a predicate "object").
                         while (predicateObjs.length === 1 &&
-                            types_1.isPredicateGroup(predicateObjs[0]) &&
+                            (0, types_1.isPredicateGroup)(predicateObjs[0]) &&
                             predicateObjs[0].type !== 'not') {
                             type = predicateObjs[0].type;
                             predicateObjs = predicateObjs[0].predicates;
                         }
-                        fieldPredicates = predicateObjs.filter(function (p) { return types_1.isPredicateObj(p) && p.operator === 'eq'; });
+                        fieldPredicates = predicateObjs.filter(function (p) { return (0, types_1.isPredicateObj)(p) && p.operator === 'eq'; });
                         txn = transaction || this.db.transaction(storeName);
                         result = {};
                         if (!(type === 'or')) return [3 /*break*/, 2];
                         return [4 /*yield*/, Promise.all(predicateObjs
-                                .filter(function (o) { return types_1.isPredicateGroup(o) && o.type === 'and'; })
+                                .filter(function (o) { return (0, types_1.isPredicateGroup)(o) && o.type === 'and'; })
                                 .map(function (o) {
                                 return _this.baseQueryIndex(storeName, o, txn);
                             })).then(function (queries) {
@@ -786,11 +943,11 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
                     case 1:
                         groupQueries = _a.sent();
                         objectQueries = predicateObjs
-                            .filter(function (o) { return types_1.isPredicateObj(o); })
+                            .filter(function (o) { return (0, types_1.isPredicateObj)(o); })
                             .map(function (o) {
                             return _this.matchingIndexQueries(storeName, [o], txn);
                         });
-                        indexedQueries = tslib_1.__spread(groupQueries, objectQueries).map(function (q) { return q[0]; })
+                        indexedQueries = __spreadArray(__spreadArray([], __read(groupQueries), false), __read(objectQueries), false).map(function (q) { return q[0]; })
                             .filter(function (i) { return i; });
                         // if, after hunting for base queries, we don't have exactly 1 base query
                         // for each child group + object, stop trying to optimize. we're not dealing
@@ -836,10 +993,10 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
         });
     };
     IndexedDBAdapter.prototype.filterOnPredicate = function (storeName, predicates) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var predicateObjs, type, _a, groupType, indexedQueries, candidateResults, distinctResults, indexedQueries_1, indexedQueries_1_1, query, resultGroup, resultGroup_1, resultGroup_1_1, item, distinctificationString, e_9_1, filtered;
             var e_9, _b, e_10, _c;
-            return tslib_1.__generator(this, function (_d) {
+            return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         predicateObjs = predicates.predicates, type = predicates.type;
@@ -861,7 +1018,7 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
                         _d.label = 4;
                     case 4:
                         _d.trys.push([4, 9, 10, 11]);
-                        indexedQueries_1 = tslib_1.__values(indexedQueries), indexedQueries_1_1 = indexedQueries_1.next();
+                        indexedQueries_1 = __values(indexedQueries), indexedQueries_1_1 = indexedQueries_1.next();
                         _d.label = 5;
                     case 5:
                         if (!!indexedQueries_1_1.done) return [3 /*break*/, 8];
@@ -870,7 +1027,7 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
                     case 6:
                         resultGroup = _d.sent();
                         try {
-                            for (resultGroup_1 = (e_10 = void 0, tslib_1.__values(resultGroup)), resultGroup_1_1 = resultGroup_1.next(); !resultGroup_1_1.done; resultGroup_1_1 = resultGroup_1.next()) {
+                            for (resultGroup_1 = (e_10 = void 0, __values(resultGroup)), resultGroup_1_1 = resultGroup_1.next(); !resultGroup_1_1.done; resultGroup_1_1 = resultGroup_1.next()) {
                                 item = resultGroup_1_1.value;
                                 distinctificationString = JSON.stringify(item);
                                 distinctResults.set(distinctificationString, item);
@@ -912,7 +1069,7 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
                         _d.label = 14;
                     case 14:
                         filtered = predicateObjs
-                            ? candidateResults.filter(function (m) { return util_1.validatePredicate(m, type, predicateObjs); })
+                            ? candidateResults.filter(function (m) { return (0, util_1.validatePredicate)(m, type, predicateObjs); })
                             : candidateResults;
                         return [2 /*return*/, filtered];
                 }
@@ -920,12 +1077,12 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
         });
     };
     IndexedDBAdapter.prototype.inMemoryPagination = function (records, pagination) {
-        return util_1.inMemoryPagination(records, pagination);
+        return (0, util_1.inMemoryPagination)(records, pagination);
     };
     IndexedDBAdapter.prototype.enginePagination = function (storeName, pagination) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var result, _a, page, _b, limit, initialRecord, cursor, pageResults, hasLimit;
-            return tslib_1.__generator(this, function (_c) {
+            return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         if (!pagination) return [3 /*break*/, 7];
@@ -971,4 +1128,3 @@ var IndexedDBAdapter = /** @class */ (function (_super) {
     return IndexedDBAdapter;
 }(StorageAdapterBase_1.StorageAdapterBase));
 exports.default = new IndexedDBAdapter();
-//# sourceMappingURL=IndexedDBAdapter.js.map