@aws-amplify/datastore 4.7.5 → 5.0.1-console-preview.4208d73.0

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

@@ -1,11 +1,62 @@
-import { __asyncValues, __awaiter, __generator, __values } from "tslib";
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-import { ConsoleLogger as Logger } from '@aws-amplify/core';
+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.");
+};
 import { ModelPredicateCreator } from '../../predicates';
 import { isPredicateObj, } from '../../types';
 import { getStorename, getIndexKeys, extractPrimaryKeyValues, traverseModel, validatePredicate, isModelConstructor, extractPrimaryKeyFieldNames, } from '../../util';
 import { ModelRelationship } from '../relationship';
+import { Logger } from '@aws-amplify/core/internals/utils';
 var logger = new Logger('DataStore');
 var DB_NAME = 'amplify-datastore';
 var StorageAdapterBase = /** @class */ (function () {
@@ -42,7 +93,7 @@ var StorageAdapterBase = /** @class */ (function () {
                         return [2 /*return*/];
                     case 4:
                         if (sessionId) {
-                            this.dbName = DB_NAME + "-" + sessionId;
+                            this.dbName = "".concat(DB_NAME, "-").concat(sessionId);
                         }
                         this.schema = theSchema;
                         this.namespaceResolver = namespaceResolver;
@@ -343,23 +394,28 @@ var StorageAdapterBase = /** @class */ (function () {
      * @param deleteQueue
      */
     StorageAdapterBase.prototype.deleteTraverse = function (models, modelConstructor, namespace, deleteQueue) {
-        var models_1, models_1_1;
-        var e_2, _a, e_3, _b;
+        var _a, models_1, models_1_1;
+        var _b, e_2, _c, _d, _e, e_3, _f, _g;
         return __awaiter(this, void 0, void 0, function () {
-            var cascadingRelationTypes, model, modelDefinition, modelMeta, relationships, relationships_1, relationships_1_1, r, queryObject, relatedRecords, e_3_1, e_2_1;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var cascadingRelationTypes, model, modelDefinition, modelMeta, relationships, _h, relationships_1, relationships_1_1, r, queryObject, relatedRecords, e_3_1, e_2_1;
+            return __generator(this, function (_j) {
+                switch (_j.label) {
                     case 0:
                         cascadingRelationTypes = ['HAS_ONE', 'HAS_MANY'];
-                        _c.label = 1;
+                        _j.label = 1;
                     case 1:
-                        _c.trys.push([1, 19, 20, 25]);
-                        models_1 = __asyncValues(models);
-                        _c.label = 2;
+                        _j.trys.push([1, 25, 26, 31]);
+                        _a = true, models_1 = __asyncValues(models);
+                        _j.label = 2;
                     case 2: return [4 /*yield*/, models_1.next()];
                     case 3:
-                        if (!(models_1_1 = _c.sent(), !models_1_1.done)) return [3 /*break*/, 18];
-                        model = models_1_1.value;
+                        if (!(models_1_1 = _j.sent(), _b = models_1_1.done, !_b)) return [3 /*break*/, 24];
+                        _d = models_1_1.value;
+                        _a = false;
+                        _j.label = 4;
+                    case 4:
+                        _j.trys.push([4, , 22, 23]);
+                        model = _d;
                         modelDefinition = this.schema.namespaces[namespace].models[modelConstructor.name];
                         modelMeta = {
                             builder: modelConstructor,
@@ -369,61 +425,74 @@ var StorageAdapterBase = /** @class */ (function () {
                         relationships = ModelRelationship.allFrom(modelMeta).filter(function (r) {
                             return cascadingRelationTypes.includes(r.type);
                         });
-                        _c.label = 4;
-                    case 4:
-                        _c.trys.push([4, 11, 12, 17]);
-                        relationships_1 = __asyncValues(relationships);
-                        _c.label = 5;
-                    case 5: return [4 /*yield*/, relationships_1.next()];
-                    case 6:
-                        if (!(relationships_1_1 = _c.sent(), !relationships_1_1.done)) return [3 /*break*/, 10];
-                        r = relationships_1_1.value;
+                        _j.label = 5;
+                    case 5:
+                        _j.trys.push([5, 15, 16, 21]);
+                        _h = true, relationships_1 = (e_3 = void 0, __asyncValues(relationships));
+                        _j.label = 6;
+                    case 6: return [4 /*yield*/, relationships_1.next()];
+                    case 7:
+                        if (!(relationships_1_1 = _j.sent(), _e = relationships_1_1.done, !_e)) return [3 /*break*/, 14];
+                        _g = relationships_1_1.value;
+                        _h = false;
+                        _j.label = 8;
+                    case 8:
+                        _j.trys.push([8, , 12, 13]);
+                        r = _g;
                         queryObject = r.createRemoteQueryObject(model);
-                        if (!(queryObject !== null)) return [3 /*break*/, 9];
+                        if (!(queryObject !== null)) return [3 /*break*/, 11];
                         return [4 /*yield*/, this.query(r.remoteModelConstructor, ModelPredicateCreator.createFromFlatEqualities(r.remoteDefinition, queryObject))];
-                    case 7:
-                        relatedRecords = _c.sent();
+                    case 9:
+                        relatedRecords = _j.sent();
                         return [4 /*yield*/, this.deleteTraverse(relatedRecords, r.remoteModelConstructor, namespace, deleteQueue)];
-                    case 8:
-                        _c.sent();
-                        _c.label = 9;
-                    case 9: return [3 /*break*/, 5];
-                    case 10: return [3 /*break*/, 17];
-                    case 11:
-                        e_3_1 = _c.sent();
-                        e_3 = { error: e_3_1 };
-                        return [3 /*break*/, 17];
+                    case 10:
+                        _j.sent();
+                        _j.label = 11;
+                    case 11: return [3 /*break*/, 13];
                     case 12:
-                        _c.trys.push([12, , 15, 16]);
-                        if (!(relationships_1_1 && !relationships_1_1.done && (_b = relationships_1.return))) return [3 /*break*/, 14];
-                        return [4 /*yield*/, _b.call(relationships_1)];
-                    case 13:
-                        _c.sent();
-                        _c.label = 14;
-                    case 14: return [3 /*break*/, 16];
+                        _h = true;
+                        return [7 /*endfinally*/];
+                    case 13: return [3 /*break*/, 6];
+                    case 14: return [3 /*break*/, 21];
                     case 15:
+                        e_3_1 = _j.sent();
+                        e_3 = { error: e_3_1 };
+                        return [3 /*break*/, 21];
+                    case 16:
+                        _j.trys.push([16, , 19, 20]);
+                        if (!(!_h && !_e && (_f = relationships_1.return))) return [3 /*break*/, 18];
+                        return [4 /*yield*/, _f.call(relationships_1)];
+                    case 17:
+                        _j.sent();
+                        _j.label = 18;
+                    case 18: return [3 /*break*/, 20];
+                    case 19:
                         if (e_3) throw e_3.error;
                         return [7 /*endfinally*/];
-                    case 16: return [7 /*endfinally*/];
-                    case 17: return [3 /*break*/, 2];
-                    case 18: return [3 /*break*/, 25];
-                    case 19:
-                        e_2_1 = _c.sent();
+                    case 20: return [7 /*endfinally*/];
+                    case 21: return [3 /*break*/, 23];
+                    case 22:
+                        _a = true;
+                        return [7 /*endfinally*/];
+                    case 23: return [3 /*break*/, 2];
+                    case 24: return [3 /*break*/, 31];
+                    case 25:
+                        e_2_1 = _j.sent();
                         e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 25];
-                    case 20:
-                        _c.trys.push([20, , 23, 24]);
-                        if (!(models_1_1 && !models_1_1.done && (_a = models_1.return))) return [3 /*break*/, 22];
-                        return [4 /*yield*/, _a.call(models_1)];
-                    case 21:
-                        _c.sent();
-                        _c.label = 22;
-                    case 22: return [3 /*break*/, 24];
-                    case 23:
+                        return [3 /*break*/, 31];
+                    case 26:
+                        _j.trys.push([26, , 29, 30]);
+                        if (!(!_a && !_b && (_c = models_1.return))) return [3 /*break*/, 28];
+                        return [4 /*yield*/, _c.call(models_1)];
+                    case 27:
+                        _j.sent();
+                        _j.label = 28;
+                    case 28: return [3 /*break*/, 30];
+                    case 29:
                         if (e_2) throw e_2.error;
                         return [7 /*endfinally*/];
-                    case 24: return [7 /*endfinally*/];
-                    case 25:
+                    case 30: return [7 /*endfinally*/];
+                    case 31:
                         deleteQueue.push({
                             storeName: getStorename(namespace, modelConstructor.name),
                             items: models,
@@ -436,4 +505,3 @@ var StorageAdapterBase = /** @class */ (function () {
     return StorageAdapterBase;
 }());
 export { StorageAdapterBase };
-//# sourceMappingURL=StorageAdapterBase.js.map

package/lib-esm/storage/adapter/getDefaultAdapter/index.js

@@ -1,14 +1,11 @@
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-import { browserOrNode, isWebWorker } from '@aws-amplify/core';
 import IndexedDBAdapter from '../IndexedDBAdapter';
 import AsyncStorageAdapter from '../AsyncStorageAdapter';
+import { isWebWorker } from '@aws-amplify/core/internals/utils';
 var getDefaultAdapter = function () {
-    var isBrowser = browserOrNode().isBrowser;
+    var isBrowser = true; // TODO(v6): Update this for SSR
     if ((isBrowser && window.indexedDB) || (isWebWorker() && self.indexedDB)) {
         return IndexedDBAdapter;
     }
     return AsyncStorageAdapter;
 };
 export default getDefaultAdapter;
-//# sourceMappingURL=index.js.map

package/lib-esm/storage/adapter/getDefaultAdapter/index.native.js

@@ -3,4 +3,3 @@ var getDefaultAdapter = function () {
     return AsyncStorageAdapter;
 };
 export default getDefaultAdapter;
-//# sourceMappingURL=index.native.js.map

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

@@ -1 +1 @@
-//# sourceMappingURL=index.js.map
+export {};

package/lib-esm/storage/relationship.js

@@ -1,4 +1,14 @@
-import { __values } from "tslib";
+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.");
+};
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { isFieldAssociation } from '../types';
@@ -17,7 +27,7 @@ var ModelRelationship = /** @class */ (function () {
      */
     function ModelRelationship(model, field) {
         if (!isFieldAssociation(model.schema, field)) {
-            throw new Error(model.schema.name + "." + field + " is not a relationship.");
+            throw new Error("".concat(model.schema.name, ".").concat(field, " is not a relationship."));
         }
         this.localModel = model;
         this._field = field;
@@ -65,7 +75,7 @@ var ModelRelationship = /** @class */ (function () {
         get: function () {
             return this.localModel.schema;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "field", {
@@ -76,7 +86,7 @@ var ModelRelationship = /** @class */ (function () {
         get: function () {
             return this._field;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "localConstructor", {
@@ -87,7 +97,7 @@ var ModelRelationship = /** @class */ (function () {
         get: function () {
             return this.localModel.builder;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "type", {
@@ -98,7 +108,7 @@ var ModelRelationship = /** @class */ (function () {
         get: function () {
             return this.localAssocation.connectionType;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "localAssocation", {
@@ -112,7 +122,7 @@ var ModelRelationship = /** @class */ (function () {
         get: function () {
             return this.localDefinition.fields[this.field].association;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "localJoinFields", {
@@ -143,7 +153,7 @@ var ModelRelationship = /** @class */ (function () {
                 return this.localPKFields;
             }
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "localPKFields", {
@@ -155,7 +165,7 @@ var ModelRelationship = /** @class */ (function () {
         get: function () {
             return this.localModel.pkField;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "remoteDefinition", {
@@ -163,14 +173,14 @@ var ModelRelationship = /** @class */ (function () {
             var _a;
             return (_a = this.remoteModelType.modelConstructor) === null || _a === void 0 ? void 0 : _a.schema;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "remoteModelType", {
         get: function () {
             return this.localDefinition.fields[this.field].type;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "remoteModelConstructor", {
@@ -181,7 +191,7 @@ var ModelRelationship = /** @class */ (function () {
         get: function () {
             return this.remoteModelType.modelConstructor.builder;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "remotePKFields", {
@@ -194,7 +204,7 @@ var ModelRelationship = /** @class */ (function () {
             var _a;
             return ((_a = this.remoteModelType.modelConstructor) === null || _a === void 0 ? void 0 : _a.pkField) || ['id'];
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "localAssociatedWith", {
@@ -217,7 +227,7 @@ var ModelRelationship = /** @class */ (function () {
                 return undefined;
             }
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "explicitRemoteAssociation", {
@@ -241,7 +251,7 @@ var ModelRelationship = /** @class */ (function () {
                 }
             }
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "remoteJoinFields", {
@@ -272,7 +282,7 @@ var ModelRelationship = /** @class */ (function () {
                 return this.remotePKFields;
             }
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     Object.defineProperty(ModelRelationship.prototype, "isComplete", {
@@ -283,7 +293,7 @@ var ModelRelationship = /** @class */ (function () {
         get: function () {
             return this.localJoinFields.length > 0 && this.remoteJoinFields.length > 0;
         },
-        enumerable: true,
+        enumerable: false,
         configurable: true
     });
     /**
@@ -341,4 +351,3 @@ var ModelRelationship = /** @class */ (function () {
     return ModelRelationship;
 }());
 export { ModelRelationship };
-//# sourceMappingURL=relationship.js.map

package/lib-esm/storage/storage.d.ts

@@ -4,11 +4,11 @@ import { ModelInstanceCreator } from '../datastore/datastore';
 import { InternalSchema, ModelInstanceMetadata, ModelPredicate, NamespaceResolver, OpType, PaginationInput, PersistentModel, PersistentModelConstructor, QueryOne, SchemaNamespace, InternalSubscriptionMessage, SubscriptionMessage } from '../types';
 import { NAMESPACES } from '../util';
 import { Adapter } from './adapter';
-export declare type StorageSubscriptionMessage<T extends PersistentModel> = InternalSubscriptionMessage<T> & {
+export type StorageSubscriptionMessage<T extends PersistentModel> = InternalSubscriptionMessage<T> & {
     mutator?: Symbol;
 };
-export declare type StorageFacade = Omit<Adapter, 'setUp'>;
-export declare type Storage = InstanceType<typeof StorageClass>;
+export type StorageFacade = Omit<Adapter, 'setUp'>;
+export type Storage = InstanceType<typeof StorageClass>;
 declare class StorageClass implements StorageFacade {
     private readonly schema;
     private readonly namespaceResolver;

package/lib-esm/storage/storage.js

@@ -1,13 +1,95 @@
-import { __assign, __awaiter, __generator, __read, __rest, __values } from "tslib";
-// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0
-import { Logger, Mutex } from '@aws-amplify/core';
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(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);
+};
+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 __rest = (this && this.__rest) || function (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;
+};
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __values = (this && this.__values) || function(o) {
+    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
+    if (m) return m.call(o);
+    if (o && typeof o.length === "number") return {
+        next: function () {
+            if (o && i >= o.length) o = void 0;
+            return { value: o && o[i++], done: !o };
+        }
+    };
+    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
+};
 import PushStream from 'zen-push';
 import { ModelPredicateCreator } from '../predicates';
 import { OpType, QueryOne, isTargetNameAssociation, } from '../types';
 import { isModelConstructor, STORAGE, validatePredicate, valuesEqual, } from '../util';
 import { getIdentifierValue } from '../sync/utils';
 import getDefaultAdapter from './adapter/getDefaultAdapter';
+import { Logger, Mutex } from '@aws-amplify/core/internals/utils';
 var logger = new Logger('DataStore');
 var StorageClass = /** @class */ (function () {
     function StorageClass(schema, namespaceResolver, getModelConstructorByModelName, modelInstanceCreator, adapter, sessionId) {
@@ -420,10 +502,7 @@ var StorageClass = /** @class */ (function () {
         var id = originalElement.id, _version = originalElement._version, _lastChangedAt = originalElement._lastChangedAt, _deleted = originalElement._deleted;
         // For update mutations we only want to send fields with changes
         // and the required internal fields
-        return __assign(__assign({}, updatedElement), { id: id,
-            _version: _version,
-            _lastChangedAt: _lastChangedAt,
-            _deleted: _deleted });
+        return __assign(__assign({}, updatedElement), { id: id, _version: _version, _lastChangedAt: _lastChangedAt, _deleted: _deleted });
     };
     return StorageClass;
 }());
@@ -510,4 +589,3 @@ var ExclusiveStorage = /** @class */ (function () {
     return ExclusiveStorage;
 }());
 export { ExclusiveStorage };
-//# sourceMappingURL=storage.js.map

package/lib-esm/sync/datastoreConnectivity.d.ts

@@ -1,5 +1,5 @@
 import Observable from 'zen-observable-ts';
-declare type ConnectionStatus = {
+type ConnectionStatus = {
     online: boolean;
 };
 export default class DataStoreConnectivity {

package/lib-esm/sync/datastoreConnectivity.js

@@ -1,9 +1,55 @@
-import { __assign, __awaiter, __generator } from "tslib";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(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);
+};
+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 };
+    }
+};
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import Observable from 'zen-observable-ts';
-import { ConsoleLogger as Logger } from '@aws-amplify/core';
 import { ReachabilityMonitor } from './datastoreReachability';
+import { Logger } from '@aws-amplify/core/internals/utils';
 var logger = new Logger('DataStore');
 var RECONNECTING_IN = 5000; // 5s this may be configurable in the future
 var DataStoreConnectivity = /** @class */ (function () {
@@ -60,4 +106,3 @@ var DataStoreConnectivity = /** @class */ (function () {
     return DataStoreConnectivity;
 }());
 export default DataStoreConnectivity;
-//# sourceMappingURL=datastoreConnectivity.js.map

package/lib-esm/sync/datastoreReachability/index.js

@@ -1,5 +1,4 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Reachability } from '@aws-amplify/core';
+import { Reachability } from '@aws-amplify/core/internals/utils';
 export var ReachabilityMonitor = new Reachability().networkMonitor();
-//# sourceMappingURL=index.js.map

package/lib-esm/sync/datastoreReachability/index.native.js

@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Reachability } from '@aws-amplify/core';
+import { Reachability } from '@aws-amplify/core/internals/utils';
 import { default as NetInfo } from '@react-native-community/netinfo';
 export var ReachabilityMonitor = new Reachability().networkMonitor(NetInfo);
-//# sourceMappingURL=index.native.js.map