@aws-amplify/datastore-storage-adapter 1.4.6-unstable.2 → 1.4.6

package/dist/aws-amplify-datastore-storage-adapter.js

@@ -96,260 +96,6 @@ return /******/ (function(modules) { // webpackBootstrap
 /************************************************************************/
 /******/ ({
 
-/***/ "../../node_modules/tslib/tslib.es6.js":
-/*!********************************************************!*\
-  !*** /root/amplify-js/node_modules/tslib/tslib.es6.js ***!
-  \********************************************************/
-/*! exports provided: __extends, __assign, __rest, __decorate, __param, __metadata, __awaiter, __generator, __createBinding, __exportStar, __values, __read, __spread, __spreadArrays, __await, __asyncGenerator, __asyncDelegator, __asyncValues, __makeTemplateObject, __importStar, __importDefault, __classPrivateFieldGet, __classPrivateFieldSet */
-/***/ (function(module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__extends", function() { return __extends; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__assign", function() { return __assign; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__rest", function() { return __rest; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__decorate", function() { return __decorate; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__param", function() { return __param; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__metadata", function() { return __metadata; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__awaiter", function() { return __awaiter; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__generator", function() { return __generator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__createBinding", function() { return __createBinding; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__exportStar", function() { return __exportStar; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__values", function() { return __values; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__read", function() { return __read; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spread", function() { return __spread; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__spreadArrays", function() { return __spreadArrays; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__await", function() { return __await; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncGenerator", function() { return __asyncGenerator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncDelegator", function() { return __asyncDelegator; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__asyncValues", function() { return __asyncValues; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__makeTemplateObject", function() { return __makeTemplateObject; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__importStar", function() { return __importStar; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__importDefault", function() { return __importDefault; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__classPrivateFieldGet", function() { return __classPrivateFieldGet; });
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "__classPrivateFieldSet", function() { return __classPrivateFieldSet; });
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation.
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-***************************************************************************** */
-/* global Reflect, Promise */
-
-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 (b.hasOwnProperty(p)) d[p] = b[p]; };
-    return extendStatics(d, b);
-};
-
-function __extends(d, b) {
-    extendStatics(d, b);
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-}
-
-var __assign = function() {
-    __assign = Object.assign || function __assign(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-        }
-        return t;
-    }
-    return __assign.apply(this, arguments);
-}
-
-function __rest(s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-}
-
-function __decorate(decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-}
-
-function __param(paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-}
-
-function __metadata(metadataKey, metadataValue) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(metadataKey, metadataValue);
-}
-
-function __awaiter(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());
-    });
-}
-
-function __generator(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 };
-    }
-}
-
-function __createBinding(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}
-
-function __exportStar(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) exports[p] = m[p];
-}
-
-function __values(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.");
-}
-
-function __read(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;
-}
-
-function __spread() {
-    for (var ar = [], i = 0; i < arguments.length; i++)
-        ar = ar.concat(__read(arguments[i]));
-    return ar;
-}
-
-function __spreadArrays() {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
-};
-
-function __await(v) {
-    return this instanceof __await ? (this.v = v, this) : new __await(v);
-}
-
-function __asyncGenerator(thisArg, _arguments, generator) {
-    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
-    var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i;
-    function verb(n) { if (g[n]) i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; }
-    function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
-    function step(r) { r.value instanceof __await ? Promise.resolve(r.value.v).then(fulfill, reject) : settle(q[0][2], r); }
-    function fulfill(value) { resume("next", value); }
-    function reject(value) { resume("throw", value); }
-    function settle(f, v) { if (f(v), q.shift(), q.length) resume(q[0][0], q[0][1]); }
-}
-
-function __asyncDelegator(o) {
-    var i, p;
-    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
-    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: n === "return" } : f ? f(v) : v; } : f; }
-}
-
-function __asyncValues(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); }
-}
-
-function __makeTemplateObject(cooked, raw) {
-    if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
-    return cooked;
-};
-
-function __importStar(mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result.default = mod;
-    return result;
-}
-
-function __importDefault(mod) {
-    return (mod && mod.__esModule) ? mod : { default: mod };
-}
-
-function __classPrivateFieldGet(receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
-    }
-    return privateMap.get(receiver);
-}
-
-function __classPrivateFieldSet(receiver, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to set private field on non-instance");
-    }
-    privateMap.set(receiver, value);
-    return value;
-}
-
-
-/***/ }),
-
 /***/ "./lib-esm/SQLiteAdapter/SQLiteAdapter.js":
 /*!************************************************!*\
   !*** ./lib-esm/SQLiteAdapter/SQLiteAdapter.js ***!
@@ -377,20 +123,175 @@ var SQLiteAdapter = new _common_CommonSQLiteAdapter__WEBPACK_IMPORTED_MODULE_0__
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
-/* harmony import */ var react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react-native-sqlite-storage */ "react-native-sqlite-storage");
-/* harmony import */ var react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @aws-amplify/core */ "@aws-amplify/core");
-/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var _common_constants__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../common/constants */ "./lib-esm/common/constants.js");
-
+/* harmony import */ var react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react-native-sqlite-storage */ "react-native-sqlite-storage");
+/* harmony import */ var react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @aws-amplify/core */ "@aws-amplify/core");
+/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _common_constants__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../common/constants */ "./lib-esm/common/constants.js");
+var __awaiter = undefined && undefined.__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 = undefined && undefined.__generator || function (thisArg, body) {
+  var _ = {
+      label: 0,
+      sent: function sent() {
+        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 __read = undefined && undefined.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
+      ar.push(r.value);
+    }
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __values = undefined && undefined.__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 next() {
+      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 logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_2__["ConsoleLogger"]('SQLiteDatabase');
-react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_1___default.a.enablePromise(true);
-if (_aws_amplify_core__WEBPACK_IMPORTED_MODULE_2__["ConsoleLogger"].LOG_LEVEL === 'DEBUG') {
-  react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_1___default.a.DEBUG(true);
+var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["ConsoleLogger"]('SQLiteDatabase');
+react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_0___default.a.enablePromise(true);
+if (_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["ConsoleLogger"].LOG_LEVEL === 'DEBUG') {
+  react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_0___default.a.DEBUG(true);
 }
 /*
 
@@ -407,15 +308,15 @@ get the result of an `executeSql` command inside of a transaction
 var SQLiteDatabase = /** @class */function () {
   function SQLiteDatabase() {}
   SQLiteDatabase.prototype.init = function () {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function () {
       var _a;
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_b) {
+      return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
             if (!!this.db) return [3 /*break*/, 2];
             _a = this;
-            return [4 /*yield*/, react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_1___default.a.openDatabase({
-              name: _common_constants__WEBPACK_IMPORTED_MODULE_3__["DB_NAME"],
+            return [4 /*yield*/, react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_0___default.a.openDatabase({
+              name: _common_constants__WEBPACK_IMPORTED_MODULE_2__["DB_NAME"],
               location: 'default'
             })];
           case 1:
@@ -429,8 +330,8 @@ var SQLiteDatabase = /** @class */function () {
   };
 
   SQLiteDatabase.prototype.createSchema = function (statements) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__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.executeStatements(statements)];
@@ -441,16 +342,16 @@ var SQLiteDatabase = /** @class */function () {
     });
   };
   SQLiteDatabase.prototype.clear = function () {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__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.closeDB()];
           case 1:
             _a.sent();
             logger.debug('Deleting database');
-            return [4 /*yield*/, react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_1___default.a.deleteDatabase({
-              name: _common_constants__WEBPACK_IMPORTED_MODULE_3__["DB_NAME"],
+            return [4 /*yield*/, react_native_sqlite_storage__WEBPACK_IMPORTED_MODULE_0___default.a.deleteDatabase({
+              name: _common_constants__WEBPACK_IMPORTED_MODULE_2__["DB_NAME"],
               location: 'default'
             })];
           case 2:
@@ -463,9 +364,9 @@ var SQLiteDatabase = /** @class */function () {
   };
 
   SQLiteDatabase.prototype.get = function (statement, params) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function () {
       var results;
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_a) {
+      return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             return [4 /*yield*/, this.getAll(statement, params)];
@@ -477,14 +378,14 @@ var SQLiteDatabase = /** @class */function () {
     });
   };
   SQLiteDatabase.prototype.getAll = function (statement, params) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function () {
       var _a, resultSet, result;
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_b) {
+      return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
             return [4 /*yield*/, this.db.executeSql(statement, params)];
           case 1:
-            _a = tslib__WEBPACK_IMPORTED_MODULE_0__["__read"].apply(void 0, [_b.sent(), 1]), resultSet = _a[0];
+            _a = __read.apply(void 0, [_b.sent(), 1]), resultSet = _a[0];
             result = resultSet && resultSet.rows && resultSet.rows.length && resultSet.rows.raw && resultSet.rows.raw();
             return [2 /*return*/, result || []];
         }
@@ -492,8 +393,8 @@ var SQLiteDatabase = /** @class */function () {
     });
   };
   SQLiteDatabase.prototype.save = function (statement, params) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__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.executeSql(statement, params)];
@@ -506,17 +407,17 @@ var SQLiteDatabase = /** @class */function () {
   };
 
   SQLiteDatabase.prototype.batchQuery = function (queryParameterizedStatements) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function () {
       var results;
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_a) {
+      return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             results = [];
             return [4 /*yield*/, this.db.readTransaction(function (tx) {
               var e_1, _a;
               try {
-                for (var queryParameterizedStatements_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(queryParameterizedStatements), queryParameterizedStatements_1_1 = queryParameterizedStatements_1.next(); !queryParameterizedStatements_1_1.done; queryParameterizedStatements_1_1 = queryParameterizedStatements_1.next()) {
-                  var _b = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(queryParameterizedStatements_1_1.value, 2),
+                for (var queryParameterizedStatements_1 = __values(queryParameterizedStatements), queryParameterizedStatements_1_1 = queryParameterizedStatements_1.next(); !queryParameterizedStatements_1_1.done; queryParameterizedStatements_1_1 = queryParameterizedStatements_1.next()) {
+                  var _b = __read(queryParameterizedStatements_1_1.value, 2),
                     statement = _b[0],
                     params = _b[1];
                   tx.executeSql(statement, params, function (_, res) {
@@ -543,15 +444,15 @@ var SQLiteDatabase = /** @class */function () {
     });
   };
   SQLiteDatabase.prototype.batchSave = function (saveParameterizedStatements, deleteParameterizedStatements) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__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.transaction(function (tx) {
               var e_2, _a;
               try {
-                for (var saveParameterizedStatements_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(saveParameterizedStatements), saveParameterizedStatements_1_1 = saveParameterizedStatements_1.next(); !saveParameterizedStatements_1_1.done; saveParameterizedStatements_1_1 = saveParameterizedStatements_1.next()) {
-                  var _b = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(saveParameterizedStatements_1_1.value, 2),
+                for (var saveParameterizedStatements_1 = __values(saveParameterizedStatements), saveParameterizedStatements_1_1 = saveParameterizedStatements_1.next(); !saveParameterizedStatements_1_1.done; saveParameterizedStatements_1_1 = saveParameterizedStatements_1.next()) {
+                  var _b = __read(saveParameterizedStatements_1_1.value, 2),
                     statement = _b[0],
                     params = _b[1];
                   tx.executeSql(statement, params);
@@ -574,8 +475,8 @@ var SQLiteDatabase = /** @class */function () {
             return [4 /*yield*/, this.db.transaction(function (tx) {
               var e_3, _a;
               try {
-                for (var deleteParameterizedStatements_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(deleteParameterizedStatements), deleteParameterizedStatements_1_1 = deleteParameterizedStatements_1.next(); !deleteParameterizedStatements_1_1.done; deleteParameterizedStatements_1_1 = deleteParameterizedStatements_1.next()) {
-                  var _b = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(deleteParameterizedStatements_1_1.value, 2),
+                for (var deleteParameterizedStatements_1 = __values(deleteParameterizedStatements), deleteParameterizedStatements_1_1 = deleteParameterizedStatements_1.next(); !deleteParameterizedStatements_1_1.done; deleteParameterizedStatements_1_1 = deleteParameterizedStatements_1.next()) {
+                  var _b = __read(deleteParameterizedStatements_1_1.value, 2),
                     statement = _b[0],
                     params = _b[1];
                   tx.executeSql(statement, params);
@@ -603,14 +504,14 @@ var SQLiteDatabase = /** @class */function () {
   };
 
   SQLiteDatabase.prototype.selectAndDelete = function (queryParameterizedStatement, deleteParameterizedStatement) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function () {
       var results, _a, queryStatement, queryParams, _b, deleteStatement, deleteParams;
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_c) {
+      return __generator(this, function (_c) {
         switch (_c.label) {
           case 0:
             results = [];
-            _a = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(queryParameterizedStatement, 2), queryStatement = _a[0], queryParams = _a[1];
-            _b = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(deleteParameterizedStatement, 2), deleteStatement = _b[0], deleteParams = _b[1];
+            _a = __read(queryParameterizedStatement, 2), queryStatement = _a[0], queryParams = _a[1];
+            _b = __read(deleteParameterizedStatement, 2), deleteStatement = _b[0], deleteParams = _b[1];
             return [4 /*yield*/, this.db.transaction(function (tx) {
               tx.executeSql(queryStatement, queryParams, function (_, res) {
                 results = res.rows.raw();
@@ -625,14 +526,14 @@ var SQLiteDatabase = /** @class */function () {
     });
   };
   SQLiteDatabase.prototype.executeStatements = function (statements) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__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.transaction(function (tx) {
               var e_4, _a;
               try {
-                for (var statements_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(statements), statements_1_1 = statements_1.next(); !statements_1_1.done; statements_1_1 = statements_1.next()) {
+                for (var statements_1 = __values(statements), statements_1_1 = statements_1.next(); !statements_1_1.done; statements_1_1 = statements_1.next()) {
                   var statement = statements_1_1.value;
                   tx.executeSql(statement);
                 }
@@ -657,8 +558,8 @@ var SQLiteDatabase = /** @class */function () {
   };
 
   SQLiteDatabase.prototype.closeDB = function () {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_a) {
+    return __awaiter(this, void 0, void 0, function () {
+      return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             if (!this.db) return [3 /*break*/, 2];
@@ -692,29 +593,207 @@ var SQLiteDatabase = /** @class */function () {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "CommonSQLiteAdapter", function() { return CommonSQLiteAdapter; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
-/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @aws-amplify/core */ "@aws-amplify/core");
-/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../common/SQLiteUtils */ "./lib-esm/common/SQLiteUtils.js");
-/* harmony import */ var _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! @aws-amplify/datastore */ "@aws-amplify/datastore");
-/* harmony import */ var _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__);
-
+/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @aws-amplify/core */ "@aws-amplify/core");
+/* harmony import */ var _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var _common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../common/SQLiteUtils */ "./lib-esm/common/SQLiteUtils.js");
+/* harmony import */ var _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @aws-amplify/datastore */ "@aws-amplify/datastore");
+/* harmony import */ var _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__);
+var __awaiter = undefined && undefined.__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 = undefined && undefined.__generator || function (thisArg, body) {
+  var _ = {
+      label: 0,
+      sent: function sent() {
+        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 = undefined && undefined.__asyncValues || function (o) {
+  if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+  var m = o[Symbol.asyncIterator],
+    i;
+  return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () {
+    return this;
+  }, i);
+  function verb(n) {
+    i[n] = o[n] && function (v) {
+      return new Promise(function (resolve, reject) {
+        v = o[n](v), settle(resolve, reject, v.done, v.value);
+      });
+    };
+  }
+  function settle(resolve, reject, d, v) {
+    Promise.resolve(v).then(function (v) {
+      resolve({
+        value: v,
+        done: d
+      });
+    }, reject);
+  }
+};
+var __read = undefined && undefined.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
+      ar.push(r.value);
+    }
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __values = undefined && undefined.__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 next() {
+      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 traverseModel = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["utils"].traverseModel,
-  validatePredicate = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["utils"].validatePredicate,
-  isModelConstructor = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["utils"].isModelConstructor;
-var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_1__["ConsoleLogger"]('DataStore');
+var traverseModel = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["utils"].traverseModel,
+  validatePredicate = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["utils"].validatePredicate,
+  isModelConstructor = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["utils"].isModelConstructor;
+var logger = new _aws_amplify_core__WEBPACK_IMPORTED_MODULE_0__["ConsoleLogger"]('DataStore');
 var CommonSQLiteAdapter = /** @class */function () {
   function CommonSQLiteAdapter(db) {
     this.db = db;
   }
   CommonSQLiteAdapter.prototype.setUp = function (theSchema, namespaceResolver, modelInstanceCreator, getModelConstructorByModelName) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function () {
       var statements, error_1;
       var _this = this;
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_a) {
+      return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             if (!!this.initPromise) return [3 /*break*/, 1];
@@ -739,7 +818,7 @@ var CommonSQLiteAdapter = /** @class */function () {
             return [4 /*yield*/, this.db.init()];
           case 5:
             _a.sent();
-            statements = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["generateSchemaStatements"])(this.schema);
+            statements = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["generateSchemaStatements"])(this.schema);
             return [4 /*yield*/, this.db.createSchema(statements)];
           case 6:
             _a.sent();
@@ -757,8 +836,8 @@ var CommonSQLiteAdapter = /** @class */function () {
   };
 
   CommonSQLiteAdapter.prototype.clear = function () {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__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.clear()];
@@ -773,9 +852,9 @@ var CommonSQLiteAdapter = /** @class */function () {
 
   CommonSQLiteAdapter.prototype.save = function (model, condition) {
     var e_1, _a;
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function () {
       var modelConstructor, tableName, connectedModels, connectionStoreNames, _b, queryStatement, params, fromDB, predicates, predicateObjs, type, isValid, msg, result, saveStatements, connectionStoreNames_1, connectionStoreNames_1_1, resItem, modelName, item, instance, id, _c, queryStatement_1, params_1, fromDB_1, opType, saveStatement, e_1_1;
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_d) {
+      return __generator(this, function (_d) {
         switch (_d.label) {
           case 0:
             modelConstructor = Object.getPrototypeOf(model).constructor;
@@ -791,12 +870,12 @@ var CommonSQLiteAdapter = /** @class */function () {
                 instance: instance
               };
             });
-            _b = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["queryByIdStatement"])(model.id, tableName), 2), queryStatement = _b[0], params = _b[1];
+            _b = __read(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["queryByIdStatement"])(model.id, tableName), 2), queryStatement = _b[0], params = _b[1];
             return [4 /*yield*/, this.db.get(queryStatement, params)];
           case 1:
             fromDB = _d.sent();
             if (condition && fromDB) {
-              predicates = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["ModelPredicateCreator"].getPredicates(condition);
+              predicates = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["ModelPredicateCreator"].getPredicates(condition);
               predicateObjs = predicates.predicates, type = predicates.type;
               isValid = validatePredicate(fromDB, type, predicateObjs);
               if (!isValid) {
@@ -813,7 +892,7 @@ var CommonSQLiteAdapter = /** @class */function () {
             _d.label = 2;
           case 2:
             _d.trys.push([2, 8, 9, 14]);
-            connectionStoreNames_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__asyncValues"])(connectionStoreNames);
+            connectionStoreNames_1 = __asyncValues(connectionStoreNames);
             _d.label = 3;
           case 3:
             return [4 /*yield*/, connectionStoreNames_1.next()];
@@ -822,13 +901,13 @@ var CommonSQLiteAdapter = /** @class */function () {
             resItem = connectionStoreNames_1_1.value;
             modelName = resItem.modelName, item = resItem.item, instance = resItem.instance;
             id = item.id;
-            _c = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["queryByIdStatement"])(id, modelName), 2), queryStatement_1 = _c[0], params_1 = _c[1];
+            _c = __read(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["queryByIdStatement"])(id, modelName), 2), queryStatement_1 = _c[0], params_1 = _c[1];
             return [4 /*yield*/, this.db.get(queryStatement_1, params_1)];
           case 5:
             fromDB_1 = _d.sent();
-            opType = fromDB_1 === undefined ? _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["OpType"].INSERT : _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["OpType"].UPDATE;
-            saveStatement = fromDB_1 ? Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["modelUpdateStatement"])(instance, modelName) : Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["modelInsertStatement"])(instance, modelName);
-            if (id === model.id || opType === _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["OpType"].INSERT) {
+            opType = fromDB_1 === undefined ? _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["OpType"].INSERT : _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["OpType"].UPDATE;
+            saveStatement = fromDB_1 ? Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["modelUpdateStatement"])(instance, modelName) : Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["modelInsertStatement"])(instance, modelName);
+            if (id === model.id || opType === _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["OpType"].INSERT) {
               saveStatements.add(saveStatement);
               result.push([instance, opType]);
             }
@@ -867,46 +946,190 @@ var CommonSQLiteAdapter = /** @class */function () {
     });
   };
   CommonSQLiteAdapter.prototype.load = function (namespaceName, srcModelName, records) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
-      var namespace, relations, connectionTableNames, modelConstructor;
+    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, connectionTableNames, modelConstructor, relations_1, relations_1_1, relation, fieldName, tableName, targetName, relationType, modelConstructor_1, _d, recordItem, getByfield, _e, queryStatement, params, connectionRecord, e_3_1, recordItem, _f, queryStatement, params, connectionRecord, e_4_1, _, e_2_1;
       var _this = this;
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_a) {
-        namespace = this.schema.namespaces[namespaceName];
-        relations = namespace.relationships[srcModelName].relationTypes;
-        connectionTableNames = relations.map(function (_a) {
-          var modelName = _a.modelName;
-          return modelName;
-        });
-        modelConstructor = this.getModelConstructorByModelName(namespaceName, srcModelName);
-        if (connectionTableNames.length === 0) {
-          return [2 /*return*/, records.map(function (record) {
-            return _this.modelInstanceCreator(modelConstructor, record);
-          })];
+      return __generator(this, function (_g) {
+        switch (_g.label) {
+          case 0:
+            namespace = this.schema.namespaces[namespaceName];
+            relations = namespace.relationships[srcModelName].relationTypes;
+            connectionTableNames = relations.map(function (_a) {
+              var modelName = _a.modelName;
+              return modelName;
+            });
+            modelConstructor = this.getModelConstructorByModelName(namespaceName, srcModelName);
+            if (connectionTableNames.length === 0) {
+              return [2 /*return*/, records.map(function (record) {
+                return _this.modelInstanceCreator(modelConstructor, record);
+              })];
+            }
+            _g.label = 1;
+          case 1:
+            _g.trys.push([1, 34, 35, 40]);
+            relations_1 = __asyncValues(relations);
+            _g.label = 2;
+          case 2:
+            return [4 /*yield*/, relations_1.next()];
+          case 3:
+            if (!(relations_1_1 = _g.sent(), !relations_1_1.done)) return [3 /*break*/, 33];
+            relation = relations_1_1.value;
+            fieldName = relation.fieldName, tableName = relation.modelName, targetName = relation.targetName, relationType = relation.relationType;
+            modelConstructor_1 = this.getModelConstructorByModelName(namespaceName, tableName);
+            _d = relationType;
+            switch (_d) {
+              case 'HAS_ONE':
+                return [3 /*break*/, 4];
+              case 'BELONGS_TO':
+                return [3 /*break*/, 17];
+              case 'HAS_MANY':
+                return [3 /*break*/, 30];
+            }
+            return [3 /*break*/, 31];
+          case 4:
+            _g.trys.push([4, 10, 11, 16]);
+            records_1 = __asyncValues(records);
+            _g.label = 5;
+          case 5:
+            return [4 /*yield*/, records_1.next()];
+          case 6:
+            if (!(records_1_1 = _g.sent(), !records_1_1.done)) return [3 /*break*/, 9];
+            recordItem = records_1_1.value;
+            getByfield = recordItem[targetName] ? targetName : fieldName;
+            if (!recordItem[getByfield]) return [3 /*break*/, 9];
+            _e = __read(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["queryByIdStatement"])(recordItem[getByfield], tableName), 2), queryStatement = _e[0], params = _e[1];
+            return [4 /*yield*/, this.db.get(queryStatement, params)];
+          case 7:
+            connectionRecord = _g.sent();
+            recordItem[fieldName] = connectionRecord && this.modelInstanceCreator(modelConstructor_1, connectionRecord);
+            _g.label = 8;
+          case 8:
+            return [3 /*break*/, 5];
+          case 9:
+            return [3 /*break*/, 16];
+          case 10:
+            e_3_1 = _g.sent();
+            e_3 = {
+              error: e_3_1
+            };
+            return [3 /*break*/, 16];
+          case 11:
+            _g.trys.push([11,, 14, 15]);
+            if (!(records_1_1 && !records_1_1.done && (_b = records_1["return"]))) return [3 /*break*/, 13];
+            return [4 /*yield*/, _b.call(records_1)];
+          case 12:
+            _g.sent();
+            _g.label = 13;
+          case 13:
+            return [3 /*break*/, 15];
+          case 14:
+            if (e_3) throw e_3.error;
+            return [7 /*endfinally*/];
+          case 15:
+            return [7 /*endfinally*/];
+          case 16:
+            return [3 /*break*/, 32];
+          case 17:
+            _g.trys.push([17, 23, 24, 29]);
+            records_2 = __asyncValues(records);
+            _g.label = 18;
+          case 18:
+            return [4 /*yield*/, records_2.next()];
+          case 19:
+            if (!(records_2_1 = _g.sent(), !records_2_1.done)) return [3 /*break*/, 22];
+            recordItem = records_2_1.value;
+            if (!recordItem[targetName]) return [3 /*break*/, 21];
+            _f = __read(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["queryByIdStatement"])(recordItem[targetName], tableName), 2), queryStatement = _f[0], params = _f[1];
+            return [4 /*yield*/, this.db.get(queryStatement, params)];
+          case 20:
+            connectionRecord = _g.sent();
+            recordItem[fieldName] = connectionRecord && this.modelInstanceCreator(modelConstructor_1, connectionRecord);
+            delete recordItem[targetName];
+            _g.label = 21;
+          case 21:
+            return [3 /*break*/, 18];
+          case 22:
+            return [3 /*break*/, 29];
+          case 23:
+            e_4_1 = _g.sent();
+            e_4 = {
+              error: e_4_1
+            };
+            return [3 /*break*/, 29];
+          case 24:
+            _g.trys.push([24,, 27, 28]);
+            if (!(records_2_1 && !records_2_1.done && (_c = records_2["return"]))) return [3 /*break*/, 26];
+            return [4 /*yield*/, _c.call(records_2)];
+          case 25:
+            _g.sent();
+            _g.label = 26;
+          case 26:
+            return [3 /*break*/, 28];
+          case 27:
+            if (e_4) throw e_4.error;
+            return [7 /*endfinally*/];
+          case 28:
+            return [7 /*endfinally*/];
+          case 29:
+            return [3 /*break*/, 32];
+          case 30:
+            // TODO: Lazy loading
+            return [3 /*break*/, 32];
+          case 31:
+            _ = relationType;
+            throw new Error("invalid relation type " + relationType);
+          case 32:
+            return [3 /*break*/, 2];
+          case 33:
+            return [3 /*break*/, 40];
+          case 34:
+            e_2_1 = _g.sent();
+            e_2 = {
+              error: e_2_1
+            };
+            return [3 /*break*/, 40];
+          case 35:
+            _g.trys.push([35,, 38, 39]);
+            if (!(relations_1_1 && !relations_1_1.done && (_a = relations_1["return"]))) return [3 /*break*/, 37];
+            return [4 /*yield*/, _a.call(relations_1)];
+          case 36:
+            _g.sent();
+            _g.label = 37;
+          case 37:
+            return [3 /*break*/, 39];
+          case 38:
+            if (e_2) throw e_2.error;
+            return [7 /*endfinally*/];
+          case 39:
+            return [7 /*endfinally*/];
+          case 40:
+            return [2 /*return*/, records.map(function (record) {
+              return _this.modelInstanceCreator(modelConstructor, record);
+            })];
         }
-        return [2 /*return*/, records.map(function (record) {
-          return _this.modelInstanceCreator(modelConstructor, record);
-        })];
       });
     });
   };
   CommonSQLiteAdapter.prototype.query = function (modelConstructor, predicate, pagination) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function () {
       var tableName, namespaceName, predicates, sortPredicates, limit, page, queryById, records;
       var _this = this;
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_a) {
+      return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             tableName = modelConstructor.name;
             namespaceName = this.namespaceResolver(modelConstructor);
-            predicates = predicate && _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["ModelPredicateCreator"].getPredicates(predicate);
-            sortPredicates = pagination && pagination.sort && _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["ModelSortPredicateCreator"].getPredicates(pagination.sort);
+            predicates = predicate && _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["ModelPredicateCreator"].getPredicates(predicate);
+            sortPredicates = pagination && pagination.sort && _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["ModelSortPredicateCreator"].getPredicates(pagination.sort);
             limit = pagination && pagination.limit;
             page = limit && pagination.page;
             queryById = predicates && this.idFromPredicate(predicates);
             return [4 /*yield*/, function () {
-              return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(_this, void 0, void 0, function () {
+              return __awaiter(_this, void 0, void 0, function () {
                 var record, _a, queryStatement, params;
-                return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_b) {
+                return __generator(this, function (_b) {
                   switch (_b.label) {
                     case 0:
                       if (!queryById) return [3 /*break*/, 2];
@@ -915,7 +1138,7 @@ var CommonSQLiteAdapter = /** @class */function () {
                       record = _b.sent();
                       return [2 /*return*/, record ? [record] : []];
                     case 2:
-                      _a = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["queryAllStatement"])(tableName, predicates, sortPredicates, limit, page), 2), queryStatement = _a[0], params = _a[1];
+                      _a = __read(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["queryAllStatement"])(tableName, predicates, sortPredicates, limit, page), 2), queryStatement = _a[0], params = _a[1];
                       return [4 /*yield*/, this.db.getAll(queryStatement, params)];
                     case 3:
                       return [2 /*return*/, _b.sent()];
@@ -933,12 +1156,12 @@ var CommonSQLiteAdapter = /** @class */function () {
     });
   };
   CommonSQLiteAdapter.prototype.getById = function (tableName, id) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function () {
       var _a, queryStatement, params, record;
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_b) {
+      return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
-            _a = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["queryByIdStatement"])(id, tableName), 2), queryStatement = _a[0], params = _a[1];
+            _a = __read(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["queryByIdStatement"])(id, tableName), 2), queryStatement = _a[0], params = _a[1];
             return [4 /*yield*/, this.db.get(queryStatement, params)];
           case 1:
             record = _b.sent();
@@ -950,21 +1173,21 @@ var CommonSQLiteAdapter = /** @class */function () {
   CommonSQLiteAdapter.prototype.idFromPredicate = function (predicates) {
     var predicateObjs = predicates.predicates;
     var idPredicate = predicateObjs.length === 1 && predicateObjs.find(function (p) {
-      return Object(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["isPredicateObj"])(p) && p.field === 'id' && p.operator === 'eq';
+      return Object(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["isPredicateObj"])(p) && p.field === 'id' && p.operator === 'eq';
     });
     return idPredicate && idPredicate.operand;
   };
   CommonSQLiteAdapter.prototype.queryOne = function (modelConstructor, firstOrLast) {
     if (firstOrLast === void 0) {
-      firstOrLast = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["QueryOne"].FIRST;
+      firstOrLast = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["QueryOne"].FIRST;
     }
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function () {
       var tableName, _a, queryStatement, params, result, modelInstance;
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_b) {
+      return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
             tableName = modelConstructor.name;
-            _a = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["queryOneStatement"])(firstOrLast, tableName), 2), queryStatement = _a[0], params = _a[1];
+            _a = __read(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["queryOneStatement"])(firstOrLast, tableName), 2), queryStatement = _a[0], params = _a[1];
             return [4 /*yield*/, this.db.get(queryStatement, params)];
           case 1:
             result = _b.sent();
@@ -978,18 +1201,18 @@ var CommonSQLiteAdapter = /** @class */function () {
   // TODO: use FKs in relations and have `ON DELETE CASCADE` set
   // For Has Many and Has One relations to have SQL handle cascades automatically
   CommonSQLiteAdapter.prototype["delete"] = function (modelOrModelConstructor, condition) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function () {
       var modelConstructor, namespaceName, tableName, predicates, queryStatement, deleteStatement, models, modelInstances, model, modelConstructor, tableName, _a, queryStatement, params, fromDB, msg, predicates, predicateObjs, type, isValid, msg, _b, deleteStatement, deleteParams, _c, deleteStatement, params;
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_d) {
+      return __generator(this, function (_d) {
         switch (_d.label) {
           case 0:
             if (!isModelConstructor(modelOrModelConstructor)) return [3 /*break*/, 3];
             modelConstructor = modelOrModelConstructor;
             namespaceName = this.namespaceResolver(modelConstructor);
             tableName = modelConstructor.name;
-            predicates = condition && _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["ModelPredicateCreator"].getPredicates(condition);
-            queryStatement = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["queryAllStatement"])(tableName, predicates);
-            deleteStatement = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["deleteByPredicateStatement"])(tableName, predicates);
+            predicates = condition && _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["ModelPredicateCreator"].getPredicates(condition);
+            queryStatement = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["queryAllStatement"])(tableName, predicates);
+            deleteStatement = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["deleteByPredicateStatement"])(tableName, predicates);
             return [4 /*yield*/, this.db.selectAndDelete(queryStatement, deleteStatement)];
           case 1:
             models = _d.sent();
@@ -1002,7 +1225,7 @@ var CommonSQLiteAdapter = /** @class */function () {
             modelConstructor = Object.getPrototypeOf(model).constructor;
             tableName = modelConstructor.name;
             if (!condition) return [3 /*break*/, 6];
-            _a = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["queryByIdStatement"])(model.id, tableName), 2), queryStatement = _a[0], params = _a[1];
+            _a = __read(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["queryByIdStatement"])(model.id, tableName), 2), queryStatement = _a[0], params = _a[1];
             return [4 /*yield*/, this.db.get(queryStatement, params)];
           case 4:
             fromDB = _d.sent();
@@ -1013,7 +1236,7 @@ var CommonSQLiteAdapter = /** @class */function () {
               });
               return [2 /*return*/, [[model], []]];
             }
-            predicates = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["ModelPredicateCreator"].getPredicates(condition);
+            predicates = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["ModelPredicateCreator"].getPredicates(condition);
             predicateObjs = predicates.predicates, type = predicates.type;
             isValid = validatePredicate(fromDB, type, predicateObjs);
             if (!isValid) {
@@ -1024,13 +1247,13 @@ var CommonSQLiteAdapter = /** @class */function () {
               });
               throw new Error(msg);
             }
-            _b = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["deleteByIdStatement"])(model.id, tableName), 2), deleteStatement = _b[0], deleteParams = _b[1];
+            _b = __read(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["deleteByIdStatement"])(model.id, tableName), 2), deleteStatement = _b[0], deleteParams = _b[1];
             return [4 /*yield*/, this.db.save(deleteStatement, deleteParams)];
           case 5:
             _d.sent();
             return [2 /*return*/, [[model], [model]]];
           case 6:
-            _c = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["deleteByIdStatement"])(model.id, tableName), 2), deleteStatement = _c[0], params = _c[1];
+            _c = __read(Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["deleteByIdStatement"])(model.id, tableName), 2), deleteStatement = _c[0], params = _c[1];
             return [4 /*yield*/, this.db.save(deleteStatement, params)];
           case 7:
             _d.sent();
@@ -1040,10 +1263,10 @@ var CommonSQLiteAdapter = /** @class */function () {
     });
   };
   CommonSQLiteAdapter.prototype.batchSave = function (modelConstructor, items) {
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__awaiter"])(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function () {
       var tableName, result, itemsToSave, queryStatements, deleteStatements, saveStatements, _loop_1, this_1, items_1, items_1_1, item, queryResponses;
-      var e_2, _a;
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__generator"])(this, function (_b) {
+      var e_5, _a;
+      return __generator(this, function (_b) {
         switch (_b.label) {
           case 0:
             tableName = modelConstructor.name;
@@ -1062,12 +1285,12 @@ var CommonSQLiteAdapter = /** @class */function () {
               }).instance;
               if (_deleted) {
                 // create the delete statements right away
-                var deleteStatement = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["deleteByIdStatement"])(instance.id, tableName);
+                var deleteStatement = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["deleteByIdStatement"])(instance.id, tableName);
                 deleteStatements.add(deleteStatement);
-                result.push([item, _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["OpType"].DELETE]);
+                result.push([item, _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["OpType"].DELETE]);
               } else {
                 // query statements for the saves at first
-                var queryStatement = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["queryByIdStatement"])(id, tableName);
+                var queryStatement = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["queryByIdStatement"])(id, tableName);
                 queryStatements.add(queryStatement);
                 // combination of insert and update items
                 itemsToSave.push(instance);
@@ -1075,19 +1298,19 @@ var CommonSQLiteAdapter = /** @class */function () {
             };
             this_1 = this;
             try {
-              for (items_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(items), items_1_1 = items_1.next(); !items_1_1.done; items_1_1 = items_1.next()) {
+              for (items_1 = __values(items), items_1_1 = items_1.next(); !items_1_1.done; items_1_1 = items_1.next()) {
                 item = items_1_1.value;
                 _loop_1(item);
               }
-            } catch (e_2_1) {
-              e_2 = {
-                error: e_2_1
+            } catch (e_5_1) {
+              e_5 = {
+                error: e_5_1
               };
             } finally {
               try {
                 if (items_1_1 && !items_1_1.done && (_a = items_1["return"])) _a.call(items_1);
               } finally {
-                if (e_2) throw e_2.error;
+                if (e_5) throw e_5.error;
               }
             }
             return [4 /*yield*/, this.db.batchQuery(queryStatements)];
@@ -1095,13 +1318,13 @@ var CommonSQLiteAdapter = /** @class */function () {
             queryResponses = _b.sent();
             queryResponses.forEach(function (response, idx) {
               if (response === undefined) {
-                var insertStatement = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["modelInsertStatement"])(itemsToSave[idx], tableName);
+                var insertStatement = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["modelInsertStatement"])(itemsToSave[idx], tableName);
                 saveStatements.add(insertStatement);
-                result.push([itemsToSave[idx], _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["OpType"].INSERT]);
+                result.push([itemsToSave[idx], _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["OpType"].INSERT]);
               } else {
-                var updateStatement = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_2__["modelUpdateStatement"])(itemsToSave[idx], tableName);
+                var updateStatement = Object(_common_SQLiteUtils__WEBPACK_IMPORTED_MODULE_1__["modelUpdateStatement"])(itemsToSave[idx], tableName);
                 saveStatements.add(updateStatement);
-                result.push([itemsToSave[idx], _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_3__["OpType"].UPDATE]);
+                result.push([itemsToSave[idx], _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_2__["OpType"].UPDATE]);
               }
             });
             // perform all of the insert/update/delete operations in a single transaction
@@ -1143,9 +1366,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "queryOneStatement", function() { return queryOneStatement; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "deleteByIdStatement", function() { return deleteByIdStatement; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "deleteByPredicateStatement", function() { return deleteByPredicateStatement; });
-/* harmony import */ var tslib__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! tslib */ "../../node_modules/tslib/tslib.es6.js");
-/* harmony import */ var _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @aws-amplify/datastore */ "@aws-amplify/datastore");
-/* harmony import */ var _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @aws-amplify/datastore */ "@aws-amplify/datastore");
+/* harmony import */ var _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__);
 function _typeof(obj) {
   "@babel/helpers - typeof";
 
@@ -1155,11 +1377,56 @@ function _typeof(obj) {
     return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
   }, _typeof(obj);
 }
+var __read = undefined && undefined.__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 __spread = undefined && undefined.__spread || function () {
+  for (var ar = [], i = 0; i < arguments.length; i++) {
+    ar = ar.concat(__read(arguments[i]));
+  }
+  return ar;
+};
+var __values = undefined && undefined.__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 next() {
+      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 USER = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_1__["utils"].USER,
-  isNonModelConstructor = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_1__["utils"].isNonModelConstructor,
-  isModelConstructor = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_1__["utils"].isModelConstructor;
+var USER = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__["utils"].USER,
+  isNonModelConstructor = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__["utils"].isNonModelConstructor,
+  isModelConstructor = _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__["utils"].isModelConstructor;
 var keysFromModel = function keysFromModel(model) {
   return Object.keys(model).map(function (k) {
     return "\"" + k + "\"";
@@ -1175,11 +1442,11 @@ var valuesFromModel = function valuesFromModel(model) {
 var updateSet = function updateSet(model) {
   var values = [];
   var paramaterized = Object.entries(model).filter(function (_a) {
-    var _b = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(_a, 1),
+    var _b = __read(_a, 1),
       k = _b[0];
     return k !== 'id';
   }).map(function (_a) {
-    var _b = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(_a, 2),
+    var _b = __read(_a, 2),
       k = _b[0],
       v = _b[1];
     values.push(prepareValueForDML(v));
@@ -1236,7 +1503,7 @@ var implicitAuthFieldsForModel = function implicitAuthFieldsForModel(model) {
   if (!model.attributes || !model.attributes.length) {
     return [];
   }
-  var authRules = model.attributes.find(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_1__["isModelAttributeAuth"]);
+  var authRules = model.attributes.find(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__["isModelAttributeAuth"]);
   if (!authRules) {
     return [];
   }
@@ -1259,20 +1526,20 @@ function modelCreateTableStatement(model, userModel) {
   // implicitly defined auth fields, e.g., `owner`, `groupsField`, etc.
   var implicitAuthFields = implicitAuthFieldsForModel(model);
   var fields = Object.values(model.fields).reduce(function (acc, field) {
-    if (Object(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_1__["isGraphQLScalarType"])(field.type)) {
+    if (Object(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__["isGraphQLScalarType"])(field.type)) {
       if (field.name === 'id') {
-        return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spread"])(acc, ['"id" PRIMARY KEY NOT NULL']);
+        return __spread(acc, ['"id" PRIMARY KEY NOT NULL']);
       }
       var columnParam_1 = "\"" + field.name + "\" " + getSQLiteType(field.type);
       if (field.isRequired) {
         columnParam_1 += ' NOT NULL';
       }
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spread"])(acc, ["" + columnParam_1]);
+      return __spread(acc, ["" + columnParam_1]);
     }
-    if (Object(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_1__["isModelFieldType"])(field.type)) {
+    if (Object(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__["isModelFieldType"])(field.type)) {
       var columnParam_2 = "\"" + field.name + "\" TEXT";
       // add targetName as well as field name for BELONGS_TO relations
-      if (Object(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_1__["isTargetNameAssociation"])(field.association)) {
+      if (Object(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__["isTargetNameAssociation"])(field.association)) {
         // check if this field has been explicitly defined in the model
         var fkDefinedInModel = Object.values(model.fields).find(function (f) {
           var _a;
@@ -1286,38 +1553,38 @@ function modelCreateTableStatement(model, userModel) {
       }
       // ignore isRequired param for model fields, since they will not contain
       // the related data locally
-      return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spread"])(acc, ["" + columnParam_2]);
+      return __spread(acc, ["" + columnParam_2]);
     }
     // default to TEXT
     var columnParam = "\"" + field.name + "\" TEXT";
     if (field.isRequired) {
       columnParam += ' NOT NULL';
     }
-    return Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spread"])(acc, ["" + columnParam]);
+    return __spread(acc, ["" + columnParam]);
   }, []);
   implicitAuthFields.forEach(function (authField) {
     fields.push(authField + " TEXT");
   });
   if (userModel) {
-    fields = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spread"])(fields, ["\"_version\" INTEGER", "\"_lastChangedAt\" INTEGER", "\"_deleted\" INTEGER"]);
+    fields = __spread(fields, ["\"_version\" INTEGER", "\"_lastChangedAt\" INTEGER", "\"_deleted\" INTEGER"]);
   }
   var createTableStatement = "CREATE TABLE IF NOT EXISTS \"" + model.name + "\" (" + fields.join(', ') + ");";
   return createTableStatement;
 }
 function modelInsertStatement(model, tableName) {
   var keys = keysFromModel(model);
-  var _a = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(valuesFromModel(model), 2),
+  var _a = __read(valuesFromModel(model), 2),
     paramaterized = _a[0],
     values = _a[1];
   var insertStatement = "INSERT INTO \"" + tableName + "\" (" + keys + ") VALUES (" + paramaterized + ")";
   return [insertStatement, values];
 }
 function modelUpdateStatement(model, tableName) {
-  var _a = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(updateSet(model), 2),
+  var _a = __read(updateSet(model), 2),
     paramaterized = _a[0],
     values = _a[1];
   var updateStatement = "UPDATE \"" + tableName + "\" SET " + paramaterized + " WHERE id=?";
-  return [updateStatement, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spread"])(values, [model.id])];
+  return [updateStatement, __spread(values, [model.id])];
 }
 function queryByIdStatement(id, tableName) {
   return ["SELECT * FROM \"" + tableName + "\" WHERE \"id\" = ?", [id]];
@@ -1416,7 +1683,7 @@ function whereClauseFromPredicate(predicate) {
     if (params === void 0) {
       params = [];
     }
-    if (Object(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_1__["isPredicateGroup"])(predicate)) {
+    if (Object(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__["isPredicateGroup"])(predicate)) {
       var groupType = predicate.type,
         groupPredicates = predicate.predicates;
       var filterType = '';
@@ -1437,7 +1704,7 @@ function whereClauseFromPredicate(predicate) {
       }
       var groupResult = [];
       try {
-        for (var groupPredicates_1 = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__values"])(groupPredicates), groupPredicates_1_1 = groupPredicates_1.next(); !groupPredicates_1_1.done; groupPredicates_1_1 = groupPredicates_1.next()) {
+        for (var groupPredicates_1 = __values(groupPredicates), groupPredicates_1_1 = groupPredicates_1.next(); !groupPredicates_1_1.done; groupPredicates_1_1 = groupPredicates_1.next()) {
           var p = groupPredicates_1_1.value;
           recurse(p, groupResult, params);
         }
@@ -1453,12 +1720,12 @@ function whereClauseFromPredicate(predicate) {
         }
       }
       result.push((isNegation ? 'NOT' : '') + "(" + groupResult.join(" " + filterType + " ") + ")");
-    } else if (Object(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_1__["isPredicateObj"])(predicate)) {
-      var _b = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(whereConditionFromPredicateObject(predicate), 2),
+    } else if (Object(_aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__["isPredicateObj"])(predicate)) {
+      var _b = __read(whereConditionFromPredicateObject(predicate), 2),
         condition = _b[0],
         conditionParams = _b[1];
       result.push(condition);
-      params.push.apply(params, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spread"])(conditionParams));
+      params.push.apply(params, __spread(conditionParams));
     }
   }
 }
@@ -1496,25 +1763,25 @@ function queryAllStatement(tableName, predicate, sort, limit, page) {
   var statement = "SELECT * FROM \"" + tableName + "\"";
   var params = [];
   if (predicate && predicate.predicates.length) {
-    var _a = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(whereClauseFromPredicate(predicate), 2),
+    var _a = __read(whereClauseFromPredicate(predicate), 2),
       whereClause = _a[0],
       whereParams = _a[1];
     statement += " " + whereClause;
-    params.push.apply(params, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spread"])(whereParams));
+    params.push.apply(params, __spread(whereParams));
   }
   var orderByClause = orderByClauseFromSort(sort);
   statement += " " + orderByClause;
   if (limit) {
-    var _b = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(limitClauseFromPagination(limit, page), 2),
+    var _b = __read(limitClauseFromPagination(limit, page), 2),
       limitClause = _b[0],
       limitParams = _b[1];
     statement += " " + limitClause;
-    params.push.apply(params, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spread"])(limitParams));
+    params.push.apply(params, __spread(limitParams));
   }
   return [statement, params];
 }
 function queryOneStatement(firstOrLast, tableName) {
-  if (firstOrLast === _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_1__["QueryOne"].FIRST) {
+  if (firstOrLast === _aws_amplify_datastore__WEBPACK_IMPORTED_MODULE_0__["QueryOne"].FIRST) {
     // ORDER BY rowid will no longer work as expected if a customer has
     // a field by that name in their schema. We may want to enforce it
     // as a reserved keyword in Codegen
@@ -1531,11 +1798,11 @@ function deleteByPredicateStatement(tableName, predicate) {
   var statement = "DELETE FROM \"" + tableName + "\"";
   var params = [];
   if (predicate && predicate.predicates.length) {
-    var _a = Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__read"])(whereClauseFromPredicate(predicate), 2),
+    var _a = __read(whereClauseFromPredicate(predicate), 2),
       whereClause = _a[0],
       whereParams = _a[1];
     statement += " " + whereClause;
-    params.push.apply(params, Object(tslib__WEBPACK_IMPORTED_MODULE_0__["__spread"])(whereParams));
+    params.push.apply(params, __spread(whereParams));
   }
   return [statement, params];
 }