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

package/lib/sync/index.js

@@ -1,23 +1,98 @@
 "use strict";
+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 __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.");
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
+exports.SyncEngine = exports.ControlMessage = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
+var utils_1 = require("@aws-amplify/core/internals/utils");
 var core_1 = require("@aws-amplify/core");
-var pubsub_1 = require("@aws-amplify/pubsub");
-var zen_observable_ts_1 = tslib_1.__importDefault(require("zen-observable-ts"));
+var zen_observable_ts_1 = __importDefault(require("zen-observable-ts"));
 var predicates_1 = require("../predicates");
 var types_1 = require("../types");
 var util_1 = require("../util");
-var datastoreConnectivity_1 = tslib_1.__importDefault(require("./datastoreConnectivity"));
+var datastoreConnectivity_1 = __importDefault(require("./datastoreConnectivity"));
 var merger_1 = require("./merger");
 var outbox_1 = require("./outbox");
 var mutation_1 = require("./processors/mutation");
 var subscription_1 = require("./processors/subscription");
 var sync_1 = require("./processors/sync");
-var utils_1 = require("./utils");
-var isNode = core_1.browserOrNode().isNode;
-var logger = new core_1.ConsoleLogger('DataStore');
+var utils_2 = require("./utils");
+var api_graphql_1 = require("@aws-amplify/api-graphql");
+var logger = new utils_1.Logger('DataStore');
 var ownSymbol = Symbol('sync');
 var ControlMessage;
 (function (ControlMessage) {
@@ -34,8 +109,8 @@ var ControlMessage;
 })(ControlMessage = exports.ControlMessage || (exports.ControlMessage = {}));
 var SyncEngine = /** @class */ (function () {
     function SyncEngine(schema, namespaceResolver, modelClasses, userModelClasses, storage, modelInstanceCreator, conflictHandler, errorHandler, syncPredicates, amplifyConfig, authModeStrategy, amplifyContext, connectivityMonitor) {
-        var _this = this;
         if (amplifyConfig === void 0) { amplifyConfig = {}; }
+        var _this = this;
         this.schema = schema;
         this.namespaceResolver = namespaceResolver;
         this.modelClasses = modelClasses;
@@ -50,7 +125,7 @@ var SyncEngine = /** @class */ (function () {
         this.online = false;
         this.modelSyncedStatus = new WeakMap();
         this.connectionDisrupted = false;
-        this.runningProcesses = new core_1.BackgroundProcessManager();
+        this.runningProcesses = new utils_1.BackgroundProcessManager();
         this.waitForSleepState = new Promise(function (resolve) {
             _this.syncQueriesObservableStartSleeping = resolve;
         });
@@ -71,10 +146,10 @@ var SyncEngine = /** @class */ (function () {
         return new zen_observable_ts_1.default(function (observer) {
             logger.log('starting sync engine...');
             var subscriptions = [];
-            _this.runningProcesses.add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            _this.runningProcesses.add(function () { return __awaiter(_this, void 0, void 0, function () {
                 var err_1, startPromise, hasMutationsInOutbox;
                 var _this = this;
-                return tslib_1.__generator(this, function (_a) {
+                return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             _a.trys.push([0, 2, , 3]);
@@ -90,18 +165,18 @@ var SyncEngine = /** @class */ (function () {
                             startPromise = new Promise(function (doneStarting, failedStarting) {
                                 _this.datastoreConnectivity.status().subscribe(function (_a) {
                                     var online = _a.online;
-                                    return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                    return __awaiter(_this, void 0, void 0, function () {
                                         var _this = this;
-                                        return tslib_1.__generator(this, function (_b) {
+                                        return __generator(this, function (_b) {
                                             return [2 /*return*/, this.runningProcesses.isOpen &&
-                                                    this.runningProcesses.add(function (onTerminate) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                                    this.runningProcesses.add(function (onTerminate) { return __awaiter(_this, void 0, void 0, function () {
                                                         var ctlSubsObservable_1, dataSubsObservable, err_2, error_1;
                                                         var _a;
                                                         var _this = this;
-                                                        return tslib_1.__generator(this, function (_b) {
+                                                        return __generator(this, function (_b) {
                                                             switch (_b.label) {
                                                                 case 0:
-                                                                    if (!(online && !this.online)) return [3 /*break*/, 10];
+                                                                    if (!(online && !this.online)) return [3 /*break*/, 9];
                                                                     this.online = online;
                                                                     observer.next({
                                                                         type: ControlMessage.SYNC_ENGINE_NETWORK_STATUS,
@@ -110,17 +185,13 @@ var SyncEngine = /** @class */ (function () {
                                                                         },
                                                                     });
                                                                     dataSubsObservable = void 0;
-                                                                    if (!isNode) return [3 /*break*/, 1];
-                                                                    logger.warn('Realtime disabled when in a server-side environment');
-                                                                    return [3 /*break*/, 6];
-                                                                case 1:
                                                                     this.stopDisruptionListener =
                                                                         this.startDisruptionListener();
                                                                     //#region GraphQL Subscriptions
-                                                                    _a = tslib_1.__read(this.subscriptionsProcessor.start(), 2), ctlSubsObservable_1 = _a[0], dataSubsObservable = _a[1];
-                                                                    _b.label = 2;
-                                                                case 2:
-                                                                    _b.trys.push([2, 4, , 5]);
+                                                                    _a = __read(this.subscriptionsProcessor.start(), 2), ctlSubsObservable_1 = _a[0], dataSubsObservable = _a[1];
+                                                                    _b.label = 1;
+                                                                case 1:
+                                                                    _b.trys.push([1, 3, , 4]);
                                                                     return [4 /*yield*/, new Promise(function (resolve, reject) {
                                                                             onTerminate.then(reject);
                                                                             var ctlSubsSubscription = ctlSubsObservable_1.subscribe({
@@ -137,22 +208,22 @@ var SyncEngine = /** @class */ (function () {
                                                                             });
                                                                             subscriptions.push(ctlSubsSubscription);
                                                                         })];
-                                                                case 3:
+                                                                case 2:
                                                                     _b.sent();
-                                                                    return [3 /*break*/, 5];
-                                                                case 4:
+                                                                    return [3 /*break*/, 4];
+                                                                case 3:
                                                                     err_2 = _b.sent();
                                                                     observer.error(err_2);
                                                                     failedStarting();
                                                                     return [2 /*return*/];
-                                                                case 5:
+                                                                case 4:
                                                                     logger.log('Realtime ready');
                                                                     observer.next({
                                                                         type: ControlMessage.SYNC_ENGINE_SUBSCRIPTIONS_ESTABLISHED,
                                                                     });
-                                                                    _b.label = 6;
-                                                                case 6:
-                                                                    _b.trys.push([6, 8, , 9]);
+                                                                    _b.label = 5;
+                                                                case 5:
+                                                                    _b.trys.push([5, 7, , 8]);
                                                                     return [4 /*yield*/, new Promise(function (resolve, reject) {
                                                                             var syncQuerySubscription = _this.syncQueriesObservable().subscribe({
                                                                                 next: function (message) {
@@ -174,25 +245,25 @@ var SyncEngine = /** @class */ (function () {
                                                                                 subscriptions.push(syncQuerySubscription);
                                                                             }
                                                                         })];
-                                                                case 7:
+                                                                case 6:
                                                                     _b.sent();
-                                                                    return [3 /*break*/, 9];
-                                                                case 8:
+                                                                    return [3 /*break*/, 8];
+                                                                case 7:
                                                                     error_1 = _b.sent();
                                                                     observer.error(error_1);
                                                                     failedStarting();
                                                                     return [2 /*return*/];
-                                                                case 9:
+                                                                case 8:
                                                                     //#endregion
                                                                     //#region process mutations (outbox)
                                                                     subscriptions.push(this.mutationsProcessor
                                                                         .start()
                                                                         .subscribe(function (_a) {
                                                                         var modelDefinition = _a.modelDefinition, item = _a.model, hasMore = _a.hasMore;
-                                                                        return _this.runningProcesses.add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                                                        return _this.runningProcesses.add(function () { return __awaiter(_this, void 0, void 0, function () {
                                                                             var modelConstructor, model;
                                                                             var _this = this;
-                                                                            return tslib_1.__generator(this, function (_a) {
+                                                                            return __generator(this, function (_a) {
                                                                                 switch (_a.label) {
                                                                                     case 0:
                                                                                         modelConstructor = this.userModelClasses[modelDefinition.name];
@@ -222,31 +293,28 @@ var SyncEngine = /** @class */ (function () {
                                                                     }));
                                                                     //#endregion
                                                                     //#region Merge subscriptions buffer
-                                                                    // TODO: extract to function
-                                                                    if (!isNode) {
-                                                                        subscriptions.push(dataSubsObservable.subscribe(function (_a) {
-                                                                            var _b = tslib_1.__read(_a, 3), _transformerMutationType = _b[0], modelDefinition = _b[1], item = _b[2];
-                                                                            return _this.runningProcesses.add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                                                                var modelConstructor, model;
-                                                                                var _this = this;
-                                                                                return tslib_1.__generator(this, function (_a) {
-                                                                                    switch (_a.label) {
-                                                                                        case 0:
-                                                                                            modelConstructor = this.userModelClasses[modelDefinition.name];
-                                                                                            model = this.modelInstanceCreator(modelConstructor, item);
-                                                                                            return [4 /*yield*/, this.storage.runExclusive(function (storage) {
-                                                                                                    return _this.modelMerger.merge(storage, model, modelDefinition);
-                                                                                                })];
-                                                                                        case 1:
-                                                                                            _a.sent();
-                                                                                            return [2 /*return*/];
-                                                                                    }
-                                                                                });
-                                                                            }); }, 'subscription dataSubsObservable event');
-                                                                        }));
-                                                                    }
-                                                                    return [3 /*break*/, 11];
-                                                                case 10:
+                                                                    subscriptions.push(dataSubsObservable.subscribe(function (_a) {
+                                                                        var _b = __read(_a, 3), _transformerMutationType = _b[0], modelDefinition = _b[1], item = _b[2];
+                                                                        return _this.runningProcesses.add(function () { return __awaiter(_this, void 0, void 0, function () {
+                                                                            var modelConstructor, model;
+                                                                            var _this = this;
+                                                                            return __generator(this, function (_a) {
+                                                                                switch (_a.label) {
+                                                                                    case 0:
+                                                                                        modelConstructor = this.userModelClasses[modelDefinition.name];
+                                                                                        model = this.modelInstanceCreator(modelConstructor, item);
+                                                                                        return [4 /*yield*/, this.storage.runExclusive(function (storage) {
+                                                                                                return _this.modelMerger.merge(storage, model, modelDefinition);
+                                                                                            })];
+                                                                                    case 1:
+                                                                                        _a.sent();
+                                                                                        return [2 /*return*/];
+                                                                                }
+                                                                            });
+                                                                        }); }, 'subscription dataSubsObservable event');
+                                                                    }));
+                                                                    return [3 /*break*/, 10];
+                                                                case 9:
                                                                     if (!online) {
                                                                         this.online = online;
                                                                         observer.next({
@@ -258,8 +326,8 @@ var SyncEngine = /** @class */ (function () {
                                                                         subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
                                                                         subscriptions = [];
                                                                     }
-                                                                    _b.label = 11;
-                                                                case 11:
+                                                                    _b.label = 10;
+                                                                case 10:
                                                                     doneStarting();
                                                                     return [2 /*return*/];
                                                             }
@@ -279,19 +347,19 @@ var SyncEngine = /** @class */ (function () {
                                 .subscribe({
                                 next: function (_a) {
                                     var opType = _a.opType, model = _a.model, element = _a.element, condition = _a.condition;
-                                    return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                    return __awaiter(_this, void 0, void 0, function () {
                                         var _this = this;
-                                        return tslib_1.__generator(this, function (_b) {
-                                            return [2 /*return*/, this.runningProcesses.add(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                        return __generator(this, function (_b) {
+                                            return [2 /*return*/, this.runningProcesses.add(function () { return __awaiter(_this, void 0, void 0, function () {
                                                     var namespace, MutationEventConstructor, modelDefinition, graphQLCondition, mutationEvent;
-                                                    return tslib_1.__generator(this, function (_a) {
+                                                    return __generator(this, function (_a) {
                                                         switch (_a.label) {
                                                             case 0:
                                                                 namespace = this.schema.namespaces[this.namespaceResolver(model)];
                                                                 MutationEventConstructor = this.modelClasses['MutationEvent'];
                                                                 modelDefinition = this.getModelDefinition(model);
-                                                                graphQLCondition = utils_1.predicateToGraphQLCondition(condition, modelDefinition);
-                                                                mutationEvent = utils_1.createMutationInstanceFromModelOperation(namespace.relationships, this.getModelDefinition(model), opType, model, element, graphQLCondition, MutationEventConstructor, this.modelInstanceCreator);
+                                                                graphQLCondition = (0, utils_2.predicateToGraphQLCondition)(condition, modelDefinition);
+                                                                mutationEvent = (0, utils_2.createMutationInstanceFromModelOperation)(namespace.relationships, this.getModelDefinition(model), opType, model, element, graphQLCondition, MutationEventConstructor, this.modelInstanceCreator);
                                                                 return [4 /*yield*/, this.outbox.enqueue(this.storage, mutationEvent)];
                                                             case 1:
                                                                 _a.sent();
@@ -348,10 +416,10 @@ var SyncEngine = /** @class */ (function () {
         });
     };
     SyncEngine.prototype.getModelsMetadataWithNextFullSync = function (currentTimeStamp) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var modelLastSync, _a;
             var _this = this;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _a = Map.bind;
@@ -381,22 +449,22 @@ var SyncEngine = /** @class */ (function () {
         return new zen_observable_ts_1.default(function (observer) {
             var syncQueriesSubscription;
             _this.runningProcesses.isOpen &&
-                _this.runningProcesses.add(function (onTerminate) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                _this.runningProcesses.add(function (onTerminate) { return __awaiter(_this, void 0, void 0, function () {
                     var terminated, _loop_1, this_1;
                     var _this = this;
-                    return tslib_1.__generator(this, function (_a) {
+                    return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
                                 terminated = false;
                                 _loop_1 = function () {
                                     var count, modelLastSync, paginatingModels, lastFullSyncStartedAt, syncInterval, start, syncDuration, lastStartedAt, msNextFullSync;
-                                    return tslib_1.__generator(this, function (_a) {
-                                        switch (_a.label) {
+                                    return __generator(this, function (_b) {
+                                        switch (_b.label) {
                                             case 0:
                                                 count = new WeakMap();
                                                 return [4 /*yield*/, this_1.getModelsMetadataWithNextFullSync(Date.now())];
                                             case 1:
-                                                modelLastSync = _a.sent();
+                                                modelLastSync = _b.sent();
                                                 paginatingModels = new Set(modelLastSync.keys());
                                                 return [4 /*yield*/, new Promise(function (resolve, reject) {
                                                         if (!_this.runningProcesses.isOpen)
@@ -407,10 +475,10 @@ var SyncEngine = /** @class */ (function () {
                                                             .subscribe({
                                                             next: function (_a) {
                                                                 var namespace = _a.namespace, modelDefinition = _a.modelDefinition, items = _a.items, done = _a.done, startedAt = _a.startedAt, isFullSync = _a.isFullSync;
-                                                                return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                                                return __awaiter(_this, void 0, void 0, function () {
                                                                     var modelConstructor, modelName, modelMetadata_1, lastFullSync, fullSyncInterval, counts;
                                                                     var _this = this;
-                                                                    return tslib_1.__generator(this, function (_b) {
+                                                                    return __generator(this, function (_b) {
                                                                         switch (_b.label) {
                                                                             case 0:
                                                                                 modelConstructor = this.userModelClasses[modelDefinition.name];
@@ -420,7 +488,7 @@ var SyncEngine = /** @class */ (function () {
                                                                                         updated: 0,
                                                                                         deleted: 0,
                                                                                     });
-                                                                                    start = util_1.getNow();
+                                                                                    start = (0, util_1.getNow)();
                                                                                     lastStartedAt =
                                                                                         lastStartedAt === undefined
                                                                                             ? startedAt
@@ -430,17 +498,17 @@ var SyncEngine = /** @class */ (function () {
                                                                                  * If there are mutations in the outbox for a given id, those need to be
                                                                                  * merged individually. Otherwise, we can merge them in batches.
                                                                                  */
-                                                                                return [4 /*yield*/, this.storage.runExclusive(function (storage) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                                                                                        var idsInOutbox, oneByOne, page, opTypeCount, oneByOne_1, oneByOne_1_1, item, opType, e_1_1, _a, _b, _c, counts;
-                                                                                        var e_1, _d;
-                                                                                        return tslib_1.__generator(this, function (_e) {
-                                                                                            switch (_e.label) {
+                                                                                return [4 /*yield*/, this.storage.runExclusive(function (storage) { return __awaiter(_this, void 0, void 0, function () {
+                                                                                        var idsInOutbox, oneByOne, page, opTypeCount, oneByOne_1, oneByOne_1_1, item, opType, e_1_1, _a, _b, _c, _d, counts;
+                                                                                        var e_1, _e;
+                                                                                        return __generator(this, function (_f) {
+                                                                                            switch (_f.label) {
                                                                                                 case 0: return [4 /*yield*/, this.outbox.getModelIds(storage)];
                                                                                                 case 1:
-                                                                                                    idsInOutbox = _e.sent();
+                                                                                                    idsInOutbox = _f.sent();
                                                                                                     oneByOne = [];
                                                                                                     page = items.filter(function (item) {
-                                                                                                        var itemId = utils_1.getIdentifierValue(modelDefinition, item);
+                                                                                                        var itemId = (0, utils_2.getIdentifierValue)(modelDefinition, item);
                                                                                                         if (!idsInOutbox.has(itemId)) {
                                                                                                             return true;
                                                                                                         }
@@ -448,44 +516,45 @@ var SyncEngine = /** @class */ (function () {
                                                                                                         return false;
                                                                                                     });
                                                                                                     opTypeCount = [];
-                                                                                                    _e.label = 2;
+                                                                                                    _f.label = 2;
                                                                                                 case 2:
-                                                                                                    _e.trys.push([2, 7, 8, 9]);
-                                                                                                    oneByOne_1 = tslib_1.__values(oneByOne), oneByOne_1_1 = oneByOne_1.next();
-                                                                                                    _e.label = 3;
+                                                                                                    _f.trys.push([2, 7, 8, 9]);
+                                                                                                    oneByOne_1 = __values(oneByOne), oneByOne_1_1 = oneByOne_1.next();
+                                                                                                    _f.label = 3;
                                                                                                 case 3:
                                                                                                     if (!!oneByOne_1_1.done) return [3 /*break*/, 6];
                                                                                                     item = oneByOne_1_1.value;
                                                                                                     return [4 /*yield*/, this.modelMerger.merge(storage, item, modelDefinition)];
                                                                                                 case 4:
-                                                                                                    opType = _e.sent();
+                                                                                                    opType = _f.sent();
                                                                                                     if (opType !== undefined) {
                                                                                                         opTypeCount.push([item, opType]);
                                                                                                     }
-                                                                                                    _e.label = 5;
+                                                                                                    _f.label = 5;
                                                                                                 case 5:
                                                                                                     oneByOne_1_1 = oneByOne_1.next();
                                                                                                     return [3 /*break*/, 3];
                                                                                                 case 6: return [3 /*break*/, 9];
                                                                                                 case 7:
-                                                                                                    e_1_1 = _e.sent();
+                                                                                                    e_1_1 = _f.sent();
                                                                                                     e_1 = { error: e_1_1 };
                                                                                                     return [3 /*break*/, 9];
                                                                                                 case 8:
                                                                                                     try {
-                                                                                                        if (oneByOne_1_1 && !oneByOne_1_1.done && (_d = oneByOne_1.return)) _d.call(oneByOne_1);
+                                                                                                        if (oneByOne_1_1 && !oneByOne_1_1.done && (_e = oneByOne_1.return)) _e.call(oneByOne_1);
                                                                                                     }
                                                                                                     finally { if (e_1) throw e_1.error; }
                                                                                                     return [7 /*endfinally*/];
                                                                                                 case 9:
                                                                                                     _b = (_a = opTypeCount.push).apply;
                                                                                                     _c = [opTypeCount];
+                                                                                                    _d = [[]];
                                                                                                     return [4 /*yield*/, this.modelMerger.mergePage(storage, modelConstructor, page, modelDefinition)];
                                                                                                 case 10:
-                                                                                                    _b.apply(_a, _c.concat([tslib_1.__spread.apply(void 0, [(_e.sent())])]));
+                                                                                                    _b.apply(_a, _c.concat([__spreadArray.apply(void 0, _d.concat([__read.apply(void 0, [(_f.sent())]), false]))]));
                                                                                                     counts = count.get(modelConstructor);
                                                                                                     opTypeCount.forEach(function (_a) {
-                                                                                                        var _b = tslib_1.__read(_a, 2), opType = _b[1];
+                                                                                                        var _b = __read(_a, 2), opType = _b[1];
                                                                                                         switch (opType) {
                                                                                                             case types_1.OpType.INSERT:
                                                                                                                 counts.new++;
@@ -497,7 +566,7 @@ var SyncEngine = /** @class */ (function () {
                                                                                                                 counts.deleted++;
                                                                                                                 break;
                                                                                                             default:
-                                                                                                                throw new Error("Invalid opType " + opType);
+                                                                                                                throw new Error("Invalid opType ".concat(opType));
                                                                                                         }
                                                                                                     });
                                                                                                     return [2 /*return*/];
@@ -544,7 +613,7 @@ var SyncEngine = /** @class */ (function () {
                                                                                 });
                                                                                 paginatingModels.delete(modelDefinition);
                                                                                 if (paginatingModels.size === 0) {
-                                                                                    syncDuration = util_1.getNow() - start;
+                                                                                    syncDuration = (0, util_1.getNow)() - start;
                                                                                     resolve();
                                                                                     observer.next({
                                                                                         type: ControlMessage.SYNC_ENGINE_SYNC_QUERIES_READY,
@@ -572,7 +641,7 @@ var SyncEngine = /** @class */ (function () {
                                                         });
                                                     })];
                                             case 2:
-                                                _a.sent();
+                                                _b.sent();
                                                 if (!lastFullSyncStartedAt) {
                                                     msNextFullSync = syncInterval - syncDuration;
                                                 }
@@ -582,7 +651,7 @@ var SyncEngine = /** @class */ (function () {
                                                             syncInterval -
                                                             (lastStartedAt + syncDuration);
                                                 }
-                                                logger.debug("Next fullSync in " + msNextFullSync / 1000 + " seconds. (" + new Date(Date.now() + msNextFullSync) + ")");
+                                                logger.debug("Next fullSync in ".concat(msNextFullSync / 1000, " seconds. (").concat(new Date(Date.now() + msNextFullSync), ")"));
                                                 // TODO: create `BackgroundProcessManager.sleep()` ... but, need to put
                                                 // a lot of thought into what that contract looks like to
                                                 //  support possible use-cases:
@@ -596,10 +665,10 @@ var SyncEngine = /** @class */ (function () {
                                                 // TLDR; this is a lot of complexity here for a sleep(),
                                                 // but, it's not clear to me yet how to support an
                                                 // extensible, centralized cancelable `sleep()` elegantly.
-                                                return [4 /*yield*/, this_1.runningProcesses.add(function (onTerminate) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                                                return [4 /*yield*/, this_1.runningProcesses.add(function (onTerminate) { return __awaiter(_this, void 0, void 0, function () {
                                                         var sleepTimer, unsleep, sleep;
                                                         var _this = this;
-                                                        return tslib_1.__generator(this, function (_a) {
+                                                        return __generator(this, function (_a) {
                                                             sleep = new Promise(function (_unsleep) {
                                                                 unsleep = _unsleep;
                                                                 sleepTimer = setTimeout(unsleep, msNextFullSync);
@@ -628,7 +697,7 @@ var SyncEngine = /** @class */ (function () {
                                                 // TLDR; this is a lot of complexity here for a sleep(),
                                                 // but, it's not clear to me yet how to support an
                                                 // extensible, centralized cancelable `sleep()` elegantly.
-                                                _a.sent();
+                                                _b.sent();
                                                 this_1.unsleepSyncQueriesObservable = null;
                                                 this_1.waitForSleepState = new Promise(function (resolve) {
                                                     _this.syncQueriesObservableStartSleeping = resolve;
@@ -655,8 +724,8 @@ var SyncEngine = /** @class */ (function () {
         var _this = this;
         return function (msg) {
             // This implementation is tied to AWSAppSyncRealTimeProvider 'Connection closed', 'Timeout disconnect' msg
-            if (pubsub_1.CONTROL_MSG.CONNECTION_CLOSED === msg ||
-                pubsub_1.CONTROL_MSG.TIMEOUT_DISCONNECT === msg) {
+            if (api_graphql_1.CONTROL_MSG.CONNECTION_CLOSED === msg ||
+                api_graphql_1.CONTROL_MSG.TIMEOUT_DISCONNECT === msg) {
                 _this.datastoreConnectivity.socketDisconnected();
             }
         };
@@ -669,8 +738,8 @@ var SyncEngine = /** @class */ (function () {
      * that they're disconnected, done retrying, etc..
      */
     SyncEngine.prototype.stop = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
-            return tslib_1.__generator(this, function (_a) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         logger.debug('stopping sync engine');
@@ -720,11 +789,11 @@ var SyncEngine = /** @class */ (function () {
         });
     };
     SyncEngine.prototype.setupModels = function (params) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var fullSyncInterval, ModelMetadataConstructor, models, savedModel, promises, result, _a, _b, modelMetadata, modelName, e_2_1;
             var e_2, _c;
             var _this = this;
-            return tslib_1.__generator(this, function (_d) {
+            return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
                         fullSyncInterval = params.fullSyncInterval;
@@ -746,11 +815,11 @@ var SyncEngine = /** @class */ (function () {
                             });
                         });
                         promises = models.map(function (_a) {
-                            var _b = tslib_1.__read(_a, 2), namespace = _b[0], model = _b[1];
-                            return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                            var _b = __read(_a, 2), namespace = _b[0], model = _b[1];
+                            return __awaiter(_this, void 0, void 0, function () {
                                 var modelMetadata, syncPredicate, lastSyncPredicate, prevSyncPredicate, syncPredicateUpdated_1;
                                 var _c, _d, _e, _f;
-                                return tslib_1.__generator(this, function (_g) {
+                                return __generator(this, function (_g) {
                                     switch (_g.label) {
                                         case 0: return [4 /*yield*/, this.getModelMetadata(namespace, model.name)];
                                         case 1:
@@ -769,7 +838,7 @@ var SyncEngine = /** @class */ (function () {
                                                     lastSyncPredicate: lastSyncPredicate,
                                                 }), undefined, ownSymbol)];
                                         case 2:
-                                            _c = tslib_1.__read.apply(void 0, [_g.sent(), 1]), _d = tslib_1.__read(_c[0], 1), savedModel = _d[0];
+                                            _c = __read.apply(void 0, [_g.sent(), 1]), _d = __read(_c[0], 1), savedModel = _d[0];
                                             return [3 /*break*/, 5];
                                         case 3:
                                             prevSyncPredicate = modelMetadata.lastSyncPredicate
@@ -787,7 +856,7 @@ var SyncEngine = /** @class */ (function () {
                                                     }
                                                 }))];
                                         case 4:
-                                            _e = tslib_1.__read.apply(void 0, [_g.sent(), 1]), _f = tslib_1.__read(_e[0], 1), savedModel = _f[0];
+                                            _e = __read.apply(void 0, [_g.sent(), 1]), _f = __read(_e[0], 1), savedModel = _f[0];
                                             _g.label = 5;
                                         case 5: return [2 /*return*/, savedModel];
                                     }
@@ -800,7 +869,7 @@ var SyncEngine = /** @class */ (function () {
                         _d.trys.push([1, 6, 7, 8]);
                         return [4 /*yield*/, Promise.all(promises)];
                     case 2:
-                        _a = tslib_1.__values.apply(void 0, [_d.sent()]), _b = _a.next();
+                        _a = __values.apply(void 0, [_d.sent()]), _b = _a.next();
                         _d.label = 3;
                     case 3:
                         if (!!_b.done) return [3 /*break*/, 5];
@@ -828,9 +897,9 @@ var SyncEngine = /** @class */ (function () {
         });
     };
     SyncEngine.prototype.getModelsMetadata = function () {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var ModelMetadata, modelsMetadata;
-            return tslib_1.__generator(this, function (_a) {
+            return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         ModelMetadata = this.modelClasses
@@ -844,9 +913,9 @@ var SyncEngine = /** @class */ (function () {
         });
     };
     SyncEngine.prototype.getModelMetadata = function (namespace, model) {
-        return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return __awaiter(this, void 0, void 0, function () {
             var ModelMetadata, predicate, _a, modelMetadata;
-            return tslib_1.__generator(this, function (_b) {
+            return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         ModelMetadata = this.modelClasses
@@ -857,7 +926,7 @@ var SyncEngine = /** @class */ (function () {
                                 limit: 1,
                             })];
                     case 1:
-                        _a = tslib_1.__read.apply(void 0, [_b.sent(), 1]), modelMetadata = _a[0];
+                        _a = __read.apply(void 0, [_b.sent(), 1]), modelMetadata = _a[0];
                         return [2 /*return*/, modelMetadata];
                 }
             });
@@ -989,16 +1058,16 @@ var SyncEngine = /** @class */ (function () {
         var _this = this;
         return core_1.Hub.listen('api', function (data) {
             if (data.source === 'PubSub' &&
-                data.payload.event === pubsub_1.CONNECTION_STATE_CHANGE) {
+                data.payload.event === api_graphql_1.CONNECTION_STATE_CHANGE) {
                 var connectionState = data.payload.data
                     .connectionState;
                 switch (connectionState) {
                     // Do not need to listen for ConnectionDisruptedPendingNetwork
                     // Normal network reconnection logic will handle the sync
-                    case pubsub_1.ConnectionState.ConnectionDisrupted:
+                    case api_graphql_1.ConnectionState.ConnectionDisrupted:
                         _this.connectionDisrupted = true;
                         break;
-                    case pubsub_1.ConnectionState.Connected:
+                    case api_graphql_1.ConnectionState.Connected:
                         if (_this.connectionDisrupted) {
                             _this.scheduleSync();
                         }
@@ -1025,4 +1094,3 @@ var SyncEngine = /** @class */ (function () {
     return SyncEngine;
 }());
 exports.SyncEngine = SyncEngine;
-//# sourceMappingURL=index.js.map