@aws-amplify/datastore 5.0.1-api-v6-models.c1977f8.0 → 5.0.1-api-v6-models.891fe0d.0

package/lib-esm/sync/index.js

@@ -1,75 +1,3 @@
-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));
-};
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { BackgroundProcessManager } from '@aws-amplify/core/internals/utils';
@@ -86,8 +14,8 @@ import { CONTROL_MSG, SubscriptionProcessor } from './processors/subscription';
 import { SyncProcessor } from './processors/sync';
 import { createMutationInstanceFromModelOperation, getIdentifierValue, predicateToGraphQLCondition, } from './utils';
 import { CONTROL_MSG as PUBSUB_CONTROL_MSG, ConnectionState, CONNECTION_STATE_CHANGE as PUBSUB_CONNECTION_STATE_CHANGE, } from '@aws-amplify/api-graphql';
-var logger = new ConsoleLogger('DataStore');
-var ownSymbol = Symbol('sync');
+const logger = new ConsoleLogger('DataStore');
+const ownSymbol = Symbol('sync');
 export var ControlMessage;
 (function (ControlMessage) {
     ControlMessage["SYNC_ENGINE_STORAGE_SUBSCRIBED"] = "storageSubscribed";
@@ -101,10 +29,11 @@ export var ControlMessage;
     ControlMessage["SYNC_ENGINE_NETWORK_STATUS"] = "networkStatus";
     ControlMessage["SYNC_ENGINE_READY"] = "ready";
 })(ControlMessage || (ControlMessage = {}));
-var SyncEngine = /** @class */ (function () {
-    function SyncEngine(schema, namespaceResolver, modelClasses, userModelClasses, storage, modelInstanceCreator, conflictHandler, errorHandler, syncPredicates, amplifyConfig, authModeStrategy, amplifyContext, connectivityMonitor) {
-        if (amplifyConfig === void 0) { amplifyConfig = {}; }
-        var _this = this;
+export class SyncEngine {
+    getModelSyncedStatus(modelConstructor) {
+        return this.modelSyncedStatus.get(modelConstructor);
+    }
+    constructor(schema, namespaceResolver, modelClasses, userModelClasses, storage, modelInstanceCreator, conflictHandler, errorHandler, syncPredicates, amplifyConfig = {}, authModeStrategy, amplifyContext, connectivityMonitor) {
         this.schema = schema;
         this.namespaceResolver = namespaceResolver;
         this.modelClasses = modelClasses;
@@ -120,10 +49,10 @@ var SyncEngine = /** @class */ (function () {
         this.modelSyncedStatus = new WeakMap();
         this.connectionDisrupted = false;
         this.runningProcesses = new BackgroundProcessManager();
-        this.waitForSleepState = new Promise(function (resolve) {
-            _this.syncQueriesObservableStartSleeping = resolve;
+        this.waitForSleepState = new Promise(resolve => {
+            this.syncQueriesObservableStartSleeping = resolve;
         });
-        var MutationEvent = this.modelClasses['MutationEvent'];
+        const MutationEvent = this.modelClasses['MutationEvent'];
         this.outbox = new MutationEventOutbox(this.schema, MutationEvent, modelInstanceCreator, ownSymbol);
         this.modelMerger = new ModelMerger(this.outbox, ownSymbol);
         this.syncQueriesProcessor = new SyncProcessor(this.schema, this.syncPredicates, this.amplifyConfig, this.authModeStrategy, errorHandler, this.amplifyContext);
@@ -132,807 +61,510 @@ var SyncEngine = /** @class */ (function () {
         this.datastoreConnectivity =
             this.connectivityMonitor || new DataStoreConnectivity();
     }
-    SyncEngine.prototype.getModelSyncedStatus = function (modelConstructor) {
-        return this.modelSyncedStatus.get(modelConstructor);
-    };
-    SyncEngine.prototype.start = function (params) {
-        var _this = this;
-        return new Observable(function (observer) {
+    start(params) {
+        return new Observable(observer => {
             logger.log('starting sync engine...');
-            var subscriptions = [];
-            _this.runningProcesses.add(function () { return __awaiter(_this, void 0, void 0, function () {
-                var err_1, startPromise, hasMutationsInOutbox;
-                var _this = this;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            _a.trys.push([0, 2, , 3]);
-                            return [4 /*yield*/, this.setupModels(params)];
-                        case 1:
-                            _a.sent();
-                            return [3 /*break*/, 3];
-                        case 2:
-                            err_1 = _a.sent();
-                            observer.error(err_1);
-                            return [2 /*return*/];
-                        case 3:
-                            startPromise = new Promise(function (doneStarting, failedStarting) {
-                                _this.datastoreConnectivity.status().subscribe(function (_a) {
-                                    var online = _a.online;
-                                    return __awaiter(_this, void 0, void 0, function () {
-                                        var _this = this;
-                                        return __generator(this, function (_b) {
-                                            return [2 /*return*/, this.runningProcesses.isOpen &&
-                                                    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 __generator(this, function (_b) {
-                                                            switch (_b.label) {
-                                                                case 0:
-                                                                    if (!(online && !this.online)) return [3 /*break*/, 9];
-                                                                    this.online = online;
-                                                                    observer.next({
-                                                                        type: ControlMessage.SYNC_ENGINE_NETWORK_STATUS,
-                                                                        data: {
-                                                                            active: this.online,
-                                                                        },
-                                                                    });
-                                                                    dataSubsObservable = void 0;
-                                                                    this.stopDisruptionListener =
-                                                                        this.startDisruptionListener();
-                                                                    //#region GraphQL Subscriptions
-                                                                    _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({
-                                                                                next: function (msg) {
-                                                                                    if (msg === CONTROL_MSG.CONNECTED) {
-                                                                                        resolve();
-                                                                                    }
-                                                                                },
-                                                                                error: function (err) {
-                                                                                    reject(err);
-                                                                                    var handleDisconnect = _this.disconnectionHandler();
-                                                                                    handleDisconnect(err);
-                                                                                },
-                                                                            });
-                                                                            subscriptions.push(ctlSubsSubscription);
-                                                                        })];
-                                                                case 2:
-                                                                    _b.sent();
-                                                                    return [3 /*break*/, 4];
-                                                                case 3:
-                                                                    err_2 = _b.sent();
-                                                                    observer.error(err_2);
-                                                                    failedStarting();
-                                                                    return [2 /*return*/];
-                                                                case 4:
-                                                                    logger.log('Realtime ready');
-                                                                    observer.next({
-                                                                        type: ControlMessage.SYNC_ENGINE_SUBSCRIPTIONS_ESTABLISHED,
-                                                                    });
-                                                                    _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) {
-                                                                                    var type = message.type;
-                                                                                    if (type ===
-                                                                                        ControlMessage.SYNC_ENGINE_SYNC_QUERIES_READY) {
-                                                                                        resolve();
-                                                                                    }
-                                                                                    observer.next(message);
-                                                                                },
-                                                                                complete: function () {
-                                                                                    resolve();
-                                                                                },
-                                                                                error: function (error) {
-                                                                                    reject(error);
-                                                                                },
-                                                                            });
-                                                                            if (syncQuerySubscription) {
-                                                                                subscriptions.push(syncQuerySubscription);
-                                                                            }
-                                                                        })];
-                                                                case 6:
-                                                                    _b.sent();
-                                                                    return [3 /*break*/, 8];
-                                                                case 7:
-                                                                    error_1 = _b.sent();
-                                                                    observer.error(error_1);
-                                                                    failedStarting();
-                                                                    return [2 /*return*/];
-                                                                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 __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();
-                                                                                        observer.next({
-                                                                                            type: ControlMessage.SYNC_ENGINE_OUTBOX_MUTATION_PROCESSED,
-                                                                                            data: {
-                                                                                                model: modelConstructor,
-                                                                                                element: model,
-                                                                                            },
-                                                                                        });
-                                                                                        observer.next({
-                                                                                            type: ControlMessage.SYNC_ENGINE_OUTBOX_STATUS,
-                                                                                            data: {
-                                                                                                isEmpty: !hasMore,
-                                                                                            },
-                                                                                        });
-                                                                                        return [2 /*return*/];
-                                                                                }
-                                                                            });
-                                                                        }); }, 'mutation processor event');
-                                                                    }));
-                                                                    //#endregion
-                                                                    //#region Merge subscriptions buffer
-                                                                    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({
-                                                                            type: ControlMessage.SYNC_ENGINE_NETWORK_STATUS,
-                                                                            data: {
-                                                                                active: this.online,
-                                                                            },
-                                                                        });
-                                                                        subscriptions.forEach(function (sub) { return sub.unsubscribe(); });
-                                                                        subscriptions = [];
-                                                                    }
-                                                                    _b.label = 10;
-                                                                case 10:
-                                                                    doneStarting();
-                                                                    return [2 /*return*/];
-                                                            }
-                                                        });
-                                                    }); }, 'datastore connectivity event')];
+            let subscriptions = [];
+            this.runningProcesses.add(async () => {
+                try {
+                    await this.setupModels(params);
+                }
+                catch (err) {
+                    observer.error(err);
+                    return;
+                }
+                // this is awaited at the bottom. so, we don't need to register
+                // this explicitly with the context. it's already contained.
+                const startPromise = new Promise((doneStarting, failedStarting) => {
+                    this.datastoreConnectivity.status().subscribe(async ({ online }) => this.runningProcesses.isOpen &&
+                        this.runningProcesses.add(async (onTerminate) => {
+                            // From offline to online
+                            if (online && !this.online) {
+                                this.online = online;
+                                observer.next({
+                                    type: ControlMessage.SYNC_ENGINE_NETWORK_STATUS,
+                                    data: {
+                                        active: this.online,
+                                    },
+                                });
+                                let ctlSubsObservable;
+                                let dataSubsObservable;
+                                this.stopDisruptionListener =
+                                    this.startDisruptionListener();
+                                //#region GraphQL Subscriptions
+                                [ctlSubsObservable, dataSubsObservable] =
+                                    this.subscriptionsProcessor.start();
+                                try {
+                                    await new Promise((resolve, reject) => {
+                                        onTerminate.then(reject);
+                                        const ctlSubsSubscription = ctlSubsObservable.subscribe({
+                                            next: msg => {
+                                                if (msg === CONTROL_MSG.CONNECTED) {
+                                                    resolve();
+                                                }
+                                            },
+                                            error: err => {
+                                                reject(err);
+                                                const handleDisconnect = this.disconnectionHandler();
+                                                handleDisconnect(err);
+                                            },
                                         });
+                                        subscriptions.push(ctlSubsSubscription);
                                     });
+                                }
+                                catch (err) {
+                                    observer.error(err);
+                                    failedStarting();
+                                    return;
+                                }
+                                logger.log('Realtime ready');
+                                observer.next({
+                                    type: ControlMessage.SYNC_ENGINE_SUBSCRIPTIONS_ESTABLISHED,
                                 });
-                            });
-                            this.storage
-                                .observe(null, null, ownSymbol)
-                                .pipe(filter(function (_a) {
-                                var model = _a.model;
-                                var modelDefinition = _this.getModelDefinition(model);
-                                return modelDefinition.syncable === true;
-                            }))
+                                //#endregion
+                                //#region Base & Sync queries
+                                try {
+                                    await new Promise((resolve, reject) => {
+                                        const syncQuerySubscription = this.syncQueriesObservable().subscribe({
+                                            next: message => {
+                                                const { type } = message;
+                                                if (type ===
+                                                    ControlMessage.SYNC_ENGINE_SYNC_QUERIES_READY) {
+                                                    resolve();
+                                                }
+                                                observer.next(message);
+                                            },
+                                            complete: () => {
+                                                resolve();
+                                            },
+                                            error: error => {
+                                                reject(error);
+                                            },
+                                        });
+                                        if (syncQuerySubscription) {
+                                            subscriptions.push(syncQuerySubscription);
+                                        }
+                                    });
+                                }
+                                catch (error) {
+                                    observer.error(error);
+                                    failedStarting();
+                                    return;
+                                }
+                                //#endregion
+                                //#region process mutations (outbox)
+                                subscriptions.push(this.mutationsProcessor
+                                    .start()
+                                    .subscribe(({ modelDefinition, model: item, hasMore }) => this.runningProcesses.add(async () => {
+                                    const modelConstructor = this.userModelClasses[modelDefinition.name];
+                                    const model = this.modelInstanceCreator(modelConstructor, item);
+                                    await this.storage.runExclusive(storage => this.modelMerger.merge(storage, model, modelDefinition));
+                                    observer.next({
+                                        type: ControlMessage.SYNC_ENGINE_OUTBOX_MUTATION_PROCESSED,
+                                        data: {
+                                            model: modelConstructor,
+                                            element: model,
+                                        },
+                                    });
+                                    observer.next({
+                                        type: ControlMessage.SYNC_ENGINE_OUTBOX_STATUS,
+                                        data: {
+                                            isEmpty: !hasMore,
+                                        },
+                                    });
+                                }, 'mutation processor event')));
+                                //#endregion
+                                //#region Merge subscriptions buffer
+                                subscriptions.push(dataSubsObservable.subscribe(([_transformerMutationType, modelDefinition, item]) => this.runningProcesses.add(async () => {
+                                    const modelConstructor = this.userModelClasses[modelDefinition.name];
+                                    const model = this.modelInstanceCreator(modelConstructor, item);
+                                    await this.storage.runExclusive(storage => this.modelMerger.merge(storage, model, modelDefinition));
+                                }, 'subscription dataSubsObservable event')));
+                                //#endregion
+                            }
+                            else if (!online) {
+                                this.online = online;
+                                observer.next({
+                                    type: ControlMessage.SYNC_ENGINE_NETWORK_STATUS,
+                                    data: {
+                                        active: this.online,
+                                    },
+                                });
+                                subscriptions.forEach(sub => sub.unsubscribe());
+                                subscriptions = [];
+                            }
+                            doneStarting();
+                        }, 'datastore connectivity event'));
+                });
+                this.storage
+                    .observe(null, null, ownSymbol)
+                    .pipe(filter(({ model }) => {
+                    const modelDefinition = this.getModelDefinition(model);
+                    return modelDefinition.syncable === true;
+                }))
+                    .subscribe({
+                    next: async ({ opType, model, element, condition }) => this.runningProcesses.add(async () => {
+                        const namespace = this.schema.namespaces[this.namespaceResolver(model)];
+                        const MutationEventConstructor = this.modelClasses['MutationEvent'];
+                        const modelDefinition = this.getModelDefinition(model);
+                        const graphQLCondition = predicateToGraphQLCondition(condition, modelDefinition);
+                        const mutationEvent = createMutationInstanceFromModelOperation(namespace.relationships, this.getModelDefinition(model), opType, model, element, graphQLCondition, MutationEventConstructor, this.modelInstanceCreator);
+                        await this.outbox.enqueue(this.storage, mutationEvent);
+                        observer.next({
+                            type: ControlMessage.SYNC_ENGINE_OUTBOX_MUTATION_ENQUEUED,
+                            data: {
+                                model,
+                                element,
+                            },
+                        });
+                        observer.next({
+                            type: ControlMessage.SYNC_ENGINE_OUTBOX_STATUS,
+                            data: {
+                                isEmpty: false,
+                            },
+                        });
+                        await startPromise;
+                        // Set by the this.datastoreConnectivity.status().subscribe() loop
+                        if (this.online) {
+                            this.mutationsProcessor.resume();
+                        }
+                    }, 'storage event'),
+                });
+                observer.next({
+                    type: ControlMessage.SYNC_ENGINE_STORAGE_SUBSCRIBED,
+                });
+                const hasMutationsInOutbox = (await this.outbox.peek(this.storage)) === undefined;
+                observer.next({
+                    type: ControlMessage.SYNC_ENGINE_OUTBOX_STATUS,
+                    data: {
+                        isEmpty: hasMutationsInOutbox,
+                    },
+                });
+                await startPromise;
+                observer.next({
+                    type: ControlMessage.SYNC_ENGINE_READY,
+                });
+            }, 'sync start');
+        });
+    }
+    async getModelsMetadataWithNextFullSync(currentTimeStamp) {
+        const modelLastSync = new Map((await this.runningProcesses.add(() => this.getModelsMetadata(), 'sync/index getModelsMetadataWithNextFullSync')).map(({ namespace, model, lastSync, lastFullSync, fullSyncInterval, lastSyncPredicate, }) => {
+            const nextFullSync = lastFullSync + fullSyncInterval;
+            const syncFrom = !lastFullSync || nextFullSync < currentTimeStamp
+                ? 0 // perform full sync if expired
+                : lastSync; // perform delta sync
+            return [
+                this.schema.namespaces[namespace].models[model],
+                [namespace, syncFrom],
+            ];
+        }));
+        return modelLastSync;
+    }
+    syncQueriesObservable() {
+        if (!this.online) {
+            return of({}); // TODO(v6): fix this
+        }
+        return new Observable(observer => {
+            let syncQueriesSubscription;
+            this.runningProcesses.isOpen &&
+                this.runningProcesses.add(async (onTerminate) => {
+                    let terminated = false;
+                    while (!observer.closed && !terminated) {
+                        const count = new WeakMap();
+                        const modelLastSync = await this.getModelsMetadataWithNextFullSync(Date.now());
+                        const paginatingModels = new Set(modelLastSync.keys());
+                        let lastFullSyncStartedAt;
+                        let syncInterval;
+                        let start;
+                        let syncDuration;
+                        let lastStartedAt;
+                        await new Promise((resolve, reject) => {
+                            if (!this.runningProcesses.isOpen)
+                                resolve();
+                            onTerminate.then(() => resolve());
+                            syncQueriesSubscription = this.syncQueriesProcessor
+                                .start(modelLastSync)
                                 .subscribe({
-                                next: function (_a) {
-                                    var opType = _a.opType, model = _a.model, element = _a.element, condition = _a.condition;
-                                    return __awaiter(_this, void 0, void 0, function () {
-                                        var _this = this;
-                                        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 __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 = predicateToGraphQLCondition(condition, modelDefinition);
-                                                                mutationEvent = 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();
-                                                                observer.next({
-                                                                    type: ControlMessage.SYNC_ENGINE_OUTBOX_MUTATION_ENQUEUED,
-                                                                    data: {
-                                                                        model: model,
-                                                                        element: element,
-                                                                    },
-                                                                });
-                                                                observer.next({
-                                                                    type: ControlMessage.SYNC_ENGINE_OUTBOX_STATUS,
-                                                                    data: {
-                                                                        isEmpty: false,
-                                                                    },
-                                                                });
-                                                                return [4 /*yield*/, startPromise];
-                                                            case 2:
-                                                                _a.sent();
-                                                                // Set by the this.datastoreConnectivity.status().subscribe() loop
-                                                                if (this.online) {
-                                                                    this.mutationsProcessor.resume();
-                                                                }
-                                                                return [2 /*return*/];
-                                                        }
-                                                    });
-                                                }); }, 'storage event')];
+                                next: async ({ namespace, modelDefinition, items, done, startedAt, isFullSync, }) => {
+                                    const modelConstructor = this.userModelClasses[modelDefinition.name];
+                                    if (!count.has(modelConstructor)) {
+                                        count.set(modelConstructor, {
+                                            new: 0,
+                                            updated: 0,
+                                            deleted: 0,
+                                        });
+                                        start = getNow();
+                                        lastStartedAt =
+                                            lastStartedAt === undefined
+                                                ? startedAt
+                                                : Math.max(lastStartedAt, startedAt);
+                                    }
+                                    /**
+                                     * If there are mutations in the outbox for a given id, those need to be
+                                     * merged individually. Otherwise, we can merge them in batches.
+                                     */
+                                    await this.storage.runExclusive(async (storage) => {
+                                        const idsInOutbox = await this.outbox.getModelIds(storage);
+                                        const oneByOne = [];
+                                        const page = items.filter(item => {
+                                            const itemId = getIdentifierValue(modelDefinition, item);
+                                            if (!idsInOutbox.has(itemId)) {
+                                                return true;
+                                            }
+                                            oneByOne.push(item);
+                                            return false;
+                                        });
+                                        const opTypeCount = [];
+                                        for (const item of oneByOne) {
+                                            const opType = await this.modelMerger.merge(storage, item, modelDefinition);
+                                            if (opType !== undefined) {
+                                                opTypeCount.push([item, opType]);
+                                            }
+                                        }
+                                        opTypeCount.push(...(await this.modelMerger.mergePage(storage, modelConstructor, page, modelDefinition)));
+                                        const counts = count.get(modelConstructor);
+                                        opTypeCount.forEach(([, opType]) => {
+                                            switch (opType) {
+                                                case OpType.INSERT:
+                                                    counts.new++;
+                                                    break;
+                                                case OpType.UPDATE:
+                                                    counts.updated++;
+                                                    break;
+                                                case OpType.DELETE:
+                                                    counts.deleted++;
+                                                    break;
+                                                default:
+                                                    throw new Error(`Invalid opType ${opType}`);
+                                            }
                                         });
                                     });
+                                    if (done) {
+                                        const { name: modelName } = modelDefinition;
+                                        //#region update last sync for type
+                                        let modelMetadata = await this.getModelMetadata(namespace, modelName);
+                                        const { lastFullSync, fullSyncInterval } = modelMetadata;
+                                        syncInterval = fullSyncInterval;
+                                        lastFullSyncStartedAt =
+                                            lastFullSyncStartedAt === undefined
+                                                ? lastFullSync
+                                                : Math.max(lastFullSyncStartedAt, isFullSync ? startedAt : lastFullSync);
+                                        modelMetadata = this.modelClasses
+                                            .ModelMetadata.copyOf(modelMetadata, draft => {
+                                            draft.lastSync = startedAt;
+                                            draft.lastFullSync = isFullSync
+                                                ? startedAt
+                                                : modelMetadata.lastFullSync;
+                                        });
+                                        await this.storage.save(modelMetadata, undefined, ownSymbol);
+                                        //#endregion
+                                        const counts = count.get(modelConstructor);
+                                        this.modelSyncedStatus.set(modelConstructor, true);
+                                        observer.next({
+                                            type: ControlMessage.SYNC_ENGINE_MODEL_SYNCED,
+                                            data: {
+                                                model: modelConstructor,
+                                                isFullSync,
+                                                isDeltaSync: !isFullSync,
+                                                counts,
+                                            },
+                                        });
+                                        paginatingModels.delete(modelDefinition);
+                                        if (paginatingModels.size === 0) {
+                                            syncDuration = getNow() - start;
+                                            resolve();
+                                            observer.next({
+                                                type: ControlMessage.SYNC_ENGINE_SYNC_QUERIES_READY,
+                                            });
+                                            syncQueriesSubscription.unsubscribe();
+                                        }
+                                    }
+                                },
+                                error: error => {
+                                    observer.error(error);
                                 },
                             });
                             observer.next({
-                                type: ControlMessage.SYNC_ENGINE_STORAGE_SUBSCRIBED,
-                            });
-                            return [4 /*yield*/, this.outbox.peek(this.storage)];
-                        case 4:
-                            hasMutationsInOutbox = (_a.sent()) === undefined;
-                            observer.next({
-                                type: ControlMessage.SYNC_ENGINE_OUTBOX_STATUS,
+                                type: ControlMessage.SYNC_ENGINE_SYNC_QUERIES_STARTED,
                                 data: {
-                                    isEmpty: hasMutationsInOutbox,
+                                    models: Array.from(paginatingModels).map(({ name }) => name),
                                 },
                             });
-                            return [4 /*yield*/, startPromise];
-                        case 5:
-                            _a.sent();
-                            observer.next({
-                                type: ControlMessage.SYNC_ENGINE_READY,
+                        });
+                        // null is cast to 0 resulting in unexpected behavior.
+                        // undefined in arithmetic operations results in NaN also resulting in unexpected behavior.
+                        // If lastFullSyncStartedAt is null this is the first sync.
+                        // Assume lastStartedAt is is also newest full sync.
+                        let msNextFullSync;
+                        if (!lastFullSyncStartedAt) {
+                            msNextFullSync = syncInterval - syncDuration;
+                        }
+                        else {
+                            msNextFullSync =
+                                lastFullSyncStartedAt +
+                                    syncInterval -
+                                    (lastStartedAt + syncDuration);
+                        }
+                        logger.debug(`Next fullSync in ${msNextFullSync / 1000} seconds. (${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:
+                        //
+                        //  1. non-cancelable
+                        //  2. cancelable, unsleep on exit()
+                        //  3. cancelable, throw Error on exit()
+                        //  4. cancelable, callback first on exit()?
+                        //  5. ... etc. ? ...
+                        //
+                        // 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.
+                        await this.runningProcesses.add(async (onTerminate) => {
+                            let sleepTimer;
+                            let unsleep;
+                            const sleep = new Promise(_unsleep => {
+                                unsleep = _unsleep;
+                                sleepTimer = setTimeout(unsleep, msNextFullSync);
+                            });
+                            onTerminate.then(() => {
+                                terminated = true;
+                                this.syncQueriesObservableStartSleeping();
+                                unsleep();
                             });
-                            return [2 /*return*/];
+                            this.unsleepSyncQueriesObservable = unsleep;
+                            this.syncQueriesObservableStartSleeping();
+                            return sleep;
+                        }, 'syncQueriesObservable sleep');
+                        this.unsleepSyncQueriesObservable = null;
+                        this.waitForSleepState = new Promise(resolve => {
+                            this.syncQueriesObservableStartSleeping = resolve;
+                        });
                     }
-                });
-            }); }, 'sync start');
-        });
-    };
-    SyncEngine.prototype.getModelsMetadataWithNextFullSync = function (currentTimeStamp) {
-        return __awaiter(this, void 0, void 0, function () {
-            var modelLastSync, _a;
-            var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = Map.bind;
-                        return [4 /*yield*/, this.runningProcesses.add(function () { return _this.getModelsMetadata(); }, 'sync/index getModelsMetadataWithNextFullSync')];
-                    case 1:
-                        modelLastSync = new (_a.apply(Map, [void 0, (_b.sent()).map(function (_a) {
-                                var namespace = _a.namespace, model = _a.model, lastSync = _a.lastSync, lastFullSync = _a.lastFullSync, fullSyncInterval = _a.fullSyncInterval, lastSyncPredicate = _a.lastSyncPredicate;
-                                var nextFullSync = lastFullSync + fullSyncInterval;
-                                var syncFrom = !lastFullSync || nextFullSync < currentTimeStamp
-                                    ? 0 // perform full sync if expired
-                                    : lastSync; // perform delta sync
-                                return [
-                                    _this.schema.namespaces[namespace].models[model],
-                                    [namespace, syncFrom],
-                                ];
-                            })]))();
-                        return [2 /*return*/, modelLastSync];
-                }
-            });
-        });
-    };
-    SyncEngine.prototype.syncQueriesObservable = function () {
-        var _this = this;
-        if (!this.online) {
-            return of({}); // TODO(v6): fix this
-        }
-        return new Observable(function (observer) {
-            var syncQueriesSubscription;
-            _this.runningProcesses.isOpen &&
-                _this.runningProcesses.add(function (onTerminate) { return __awaiter(_this, void 0, void 0, function () {
-                    var terminated, _loop_1, this_1;
-                    var _this = this;
-                    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 __generator(this, function (_b) {
-                                        switch (_b.label) {
-                                            case 0:
-                                                count = new WeakMap();
-                                                return [4 /*yield*/, this_1.getModelsMetadataWithNextFullSync(Date.now())];
-                                            case 1:
-                                                modelLastSync = _b.sent();
-                                                paginatingModels = new Set(modelLastSync.keys());
-                                                return [4 /*yield*/, new Promise(function (resolve, reject) {
-                                                        if (!_this.runningProcesses.isOpen)
-                                                            resolve();
-                                                        onTerminate.then(function () { return resolve(); });
-                                                        syncQueriesSubscription = _this.syncQueriesProcessor
-                                                            .start(modelLastSync)
-                                                            .subscribe({
-                                                            next: function (_a) {
-                                                                var namespace = _a.namespace, modelDefinition = _a.modelDefinition, items = _a.items, done = _a.done, startedAt = _a.startedAt, isFullSync = _a.isFullSync;
-                                                                return __awaiter(_this, void 0, void 0, function () {
-                                                                    var modelConstructor, modelName, modelMetadata_1, lastFullSync, fullSyncInterval, counts;
-                                                                    var _this = this;
-                                                                    return __generator(this, function (_b) {
-                                                                        switch (_b.label) {
-                                                                            case 0:
-                                                                                modelConstructor = this.userModelClasses[modelDefinition.name];
-                                                                                if (!count.has(modelConstructor)) {
-                                                                                    count.set(modelConstructor, {
-                                                                                        new: 0,
-                                                                                        updated: 0,
-                                                                                        deleted: 0,
-                                                                                    });
-                                                                                    start = getNow();
-                                                                                    lastStartedAt =
-                                                                                        lastStartedAt === undefined
-                                                                                            ? startedAt
-                                                                                            : Math.max(lastStartedAt, startedAt);
-                                                                                }
-                                                                                /**
-                                                                                 * 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 __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 = _f.sent();
-                                                                                                    oneByOne = [];
-                                                                                                    page = items.filter(function (item) {
-                                                                                                        var itemId = getIdentifierValue(modelDefinition, item);
-                                                                                                        if (!idsInOutbox.has(itemId)) {
-                                                                                                            return true;
-                                                                                                        }
-                                                                                                        oneByOne.push(item);
-                                                                                                        return false;
-                                                                                                    });
-                                                                                                    opTypeCount = [];
-                                                                                                    _f.label = 2;
-                                                                                                case 2:
-                                                                                                    _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 = _f.sent();
-                                                                                                    if (opType !== undefined) {
-                                                                                                        opTypeCount.push([item, opType]);
-                                                                                                    }
-                                                                                                    _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 = _f.sent();
-                                                                                                    e_1 = { error: e_1_1 };
-                                                                                                    return [3 /*break*/, 9];
-                                                                                                case 8:
-                                                                                                    try {
-                                                                                                        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([__spreadArray.apply(void 0, _d.concat([__read.apply(void 0, [(_f.sent())]), false]))]));
-                                                                                                    counts = count.get(modelConstructor);
-                                                                                                    opTypeCount.forEach(function (_a) {
-                                                                                                        var _b = __read(_a, 2), opType = _b[1];
-                                                                                                        switch (opType) {
-                                                                                                            case OpType.INSERT:
-                                                                                                                counts.new++;
-                                                                                                                break;
-                                                                                                            case OpType.UPDATE:
-                                                                                                                counts.updated++;
-                                                                                                                break;
-                                                                                                            case OpType.DELETE:
-                                                                                                                counts.deleted++;
-                                                                                                                break;
-                                                                                                            default:
-                                                                                                                throw new Error("Invalid opType ".concat(opType));
-                                                                                                        }
-                                                                                                    });
-                                                                                                    return [2 /*return*/];
-                                                                                            }
-                                                                                        });
-                                                                                    }); })];
-                                                                            case 1:
-                                                                                /**
-                                                                                 * If there are mutations in the outbox for a given id, those need to be
-                                                                                 * merged individually. Otherwise, we can merge them in batches.
-                                                                                 */
-                                                                                _b.sent();
-                                                                                if (!done) return [3 /*break*/, 4];
-                                                                                modelName = modelDefinition.name;
-                                                                                return [4 /*yield*/, this.getModelMetadata(namespace, modelName)];
-                                                                            case 2:
-                                                                                modelMetadata_1 = _b.sent();
-                                                                                lastFullSync = modelMetadata_1.lastFullSync, fullSyncInterval = modelMetadata_1.fullSyncInterval;
-                                                                                syncInterval = fullSyncInterval;
-                                                                                lastFullSyncStartedAt =
-                                                                                    lastFullSyncStartedAt === undefined
-                                                                                        ? lastFullSync
-                                                                                        : Math.max(lastFullSyncStartedAt, isFullSync ? startedAt : lastFullSync);
-                                                                                modelMetadata_1 = this.modelClasses
-                                                                                    .ModelMetadata.copyOf(modelMetadata_1, function (draft) {
-                                                                                    draft.lastSync = startedAt;
-                                                                                    draft.lastFullSync = isFullSync
-                                                                                        ? startedAt
-                                                                                        : modelMetadata_1.lastFullSync;
-                                                                                });
-                                                                                return [4 /*yield*/, this.storage.save(modelMetadata_1, undefined, ownSymbol)];
-                                                                            case 3:
-                                                                                _b.sent();
-                                                                                counts = count.get(modelConstructor);
-                                                                                this.modelSyncedStatus.set(modelConstructor, true);
-                                                                                observer.next({
-                                                                                    type: ControlMessage.SYNC_ENGINE_MODEL_SYNCED,
-                                                                                    data: {
-                                                                                        model: modelConstructor,
-                                                                                        isFullSync: isFullSync,
-                                                                                        isDeltaSync: !isFullSync,
-                                                                                        counts: counts,
-                                                                                    },
-                                                                                });
-                                                                                paginatingModels.delete(modelDefinition);
-                                                                                if (paginatingModels.size === 0) {
-                                                                                    syncDuration = getNow() - start;
-                                                                                    resolve();
-                                                                                    observer.next({
-                                                                                        type: ControlMessage.SYNC_ENGINE_SYNC_QUERIES_READY,
-                                                                                    });
-                                                                                    syncQueriesSubscription.unsubscribe();
-                                                                                }
-                                                                                _b.label = 4;
-                                                                            case 4: return [2 /*return*/];
-                                                                        }
-                                                                    });
-                                                                });
-                                                            },
-                                                            error: function (error) {
-                                                                observer.error(error);
-                                                            },
-                                                        });
-                                                        observer.next({
-                                                            type: ControlMessage.SYNC_ENGINE_SYNC_QUERIES_STARTED,
-                                                            data: {
-                                                                models: Array.from(paginatingModels).map(function (_a) {
-                                                                    var name = _a.name;
-                                                                    return name;
-                                                                }),
-                                                            },
-                                                        });
-                                                    })];
-                                            case 2:
-                                                _b.sent();
-                                                if (!lastFullSyncStartedAt) {
-                                                    msNextFullSync = syncInterval - syncDuration;
-                                                }
-                                                else {
-                                                    msNextFullSync =
-                                                        lastFullSyncStartedAt +
-                                                            syncInterval -
-                                                            (lastStartedAt + syncDuration);
-                                                }
-                                                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:
-                                                //
-                                                //  1. non-cancelable
-                                                //  2. cancelable, unsleep on exit()
-                                                //  3. cancelable, throw Error on exit()
-                                                //  4. cancelable, callback first on exit()?
-                                                //  5. ... etc. ? ...
-                                                //
-                                                // 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 __awaiter(_this, void 0, void 0, function () {
-                                                        var sleepTimer, unsleep, sleep;
-                                                        var _this = this;
-                                                        return __generator(this, function (_a) {
-                                                            sleep = new Promise(function (_unsleep) {
-                                                                unsleep = _unsleep;
-                                                                sleepTimer = setTimeout(unsleep, msNextFullSync);
-                                                            });
-                                                            onTerminate.then(function () {
-                                                                terminated = true;
-                                                                _this.syncQueriesObservableStartSleeping();
-                                                                unsleep();
-                                                            });
-                                                            this.unsleepSyncQueriesObservable = unsleep;
-                                                            this.syncQueriesObservableStartSleeping();
-                                                            return [2 /*return*/, sleep];
-                                                        });
-                                                    }); }, 'syncQueriesObservable sleep')];
-                                            case 3:
-                                                // TODO: create `BackgroundProcessManager.sleep()` ... but, need to put
-                                                // a lot of thought into what that contract looks like to
-                                                //  support possible use-cases:
-                                                //
-                                                //  1. non-cancelable
-                                                //  2. cancelable, unsleep on exit()
-                                                //  3. cancelable, throw Error on exit()
-                                                //  4. cancelable, callback first on exit()?
-                                                //  5. ... etc. ? ...
-                                                //
-                                                // 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.
-                                                _b.sent();
-                                                this_1.unsleepSyncQueriesObservable = null;
-                                                this_1.waitForSleepState = new Promise(function (resolve) {
-                                                    _this.syncQueriesObservableStartSleeping = resolve;
-                                                });
-                                                return [2 /*return*/];
-                                        }
-                                    });
-                                };
-                                this_1 = this;
-                                _a.label = 1;
-                            case 1:
-                                if (!(!observer.closed && !terminated)) return [3 /*break*/, 3];
-                                return [5 /*yield**/, _loop_1()];
-                            case 2:
-                                _a.sent();
-                                return [3 /*break*/, 1];
-                            case 3: return [2 /*return*/];
-                        }
-                    });
-                }); }, 'syncQueriesObservable main');
+                }, 'syncQueriesObservable main');
         });
-    };
-    SyncEngine.prototype.disconnectionHandler = function () {
-        var _this = this;
-        return function (msg) {
+    }
+    disconnectionHandler() {
+        return (msg) => {
             // This implementation is tied to AWSAppSyncRealTimeProvider 'Connection closed', 'Timeout disconnect' msg
             if (PUBSUB_CONTROL_MSG.CONNECTION_CLOSED === msg ||
                 PUBSUB_CONTROL_MSG.TIMEOUT_DISCONNECT === msg) {
-                _this.datastoreConnectivity.socketDisconnected();
+                this.datastoreConnectivity.socketDisconnected();
             }
         };
-    };
-    SyncEngine.prototype.unsubscribeConnectivity = function () {
+    }
+    unsubscribeConnectivity() {
         this.datastoreConnectivity.unsubscribe();
-    };
+    }
     /**
      * Stops all subscription activities and resolves when all activies report
      * that they're disconnected, done retrying, etc..
      */
-    SyncEngine.prototype.stop = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        logger.debug('stopping sync engine');
-                        /**
-                         * Gracefully disconnecting subscribers first just prevents *more* work
-                         * from entering the pipelines.
-                         */
-                        this.unsubscribeConnectivity();
-                        /**
-                         * Stop listening for websocket connection disruption
-                         */
-                        this.stopDisruptionListener && this.stopDisruptionListener();
-                        /**
-                         * aggressively shut down any lingering background processes.
-                         * some of this might be semi-redundant with unsubscribing. however,
-                         * unsubscribing doesn't allow us to wait for settling.
-                         * (Whereas `stop()` does.)
-                         */
-                        return [4 /*yield*/, this.mutationsProcessor.stop()];
-                    case 1:
-                        /**
-                         * aggressively shut down any lingering background processes.
-                         * some of this might be semi-redundant with unsubscribing. however,
-                         * unsubscribing doesn't allow us to wait for settling.
-                         * (Whereas `stop()` does.)
-                         */
-                        _a.sent();
-                        return [4 /*yield*/, this.subscriptionsProcessor.stop()];
-                    case 2:
-                        _a.sent();
-                        return [4 /*yield*/, this.datastoreConnectivity.stop()];
-                    case 3:
-                        _a.sent();
-                        return [4 /*yield*/, this.syncQueriesProcessor.stop()];
-                    case 4:
-                        _a.sent();
-                        return [4 /*yield*/, this.runningProcesses.close()];
-                    case 5:
-                        _a.sent();
-                        return [4 /*yield*/, this.runningProcesses.open()];
-                    case 6:
-                        _a.sent();
-                        logger.debug('sync engine stopped and ready to restart');
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    SyncEngine.prototype.setupModels = function (params) {
-        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 __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        fullSyncInterval = params.fullSyncInterval;
-                        ModelMetadataConstructor = this.modelClasses
-                            .ModelMetadata;
-                        models = [];
-                        Object.values(this.schema.namespaces).forEach(function (namespace) {
-                            Object.values(namespace.models)
-                                .filter(function (_a) {
-                                var syncable = _a.syncable;
-                                return syncable;
-                            })
-                                .forEach(function (model) {
-                                models.push([namespace.name, model]);
-                                if (namespace.name === USER) {
-                                    var modelConstructor = _this.userModelClasses[model.name];
-                                    _this.modelSyncedStatus.set(modelConstructor, false);
-                                }
-                            });
-                        });
-                        promises = models.map(function (_a) {
-                            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 __generator(this, function (_g) {
-                                    switch (_g.label) {
-                                        case 0: return [4 /*yield*/, this.getModelMetadata(namespace, model.name)];
-                                        case 1:
-                                            modelMetadata = _g.sent();
-                                            syncPredicate = ModelPredicateCreator.getPredicates(this.syncPredicates.get(model), false);
-                                            lastSyncPredicate = syncPredicate
-                                                ? JSON.stringify(syncPredicate)
-                                                : null;
-                                            if (!(modelMetadata === undefined)) return [3 /*break*/, 3];
-                                            return [4 /*yield*/, this.storage.save(this.modelInstanceCreator(ModelMetadataConstructor, {
-                                                    model: model.name,
-                                                    namespace: namespace,
-                                                    lastSync: null,
-                                                    fullSyncInterval: fullSyncInterval,
-                                                    lastFullSync: null,
-                                                    lastSyncPredicate: lastSyncPredicate,
-                                                }), undefined, ownSymbol)];
-                                        case 2:
-                                            _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
-                                                ? modelMetadata.lastSyncPredicate
-                                                : null;
-                                            syncPredicateUpdated_1 = prevSyncPredicate !== lastSyncPredicate;
-                                            return [4 /*yield*/, this.storage.save(ModelMetadataConstructor.copyOf(modelMetadata, function (draft) {
-                                                    draft.fullSyncInterval = fullSyncInterval;
-                                                    // perform a base sync if the syncPredicate changed in between calls to DataStore.start
-                                                    // ensures that the local store contains all the data specified by the syncExpression
-                                                    if (syncPredicateUpdated_1) {
-                                                        draft.lastSync = null;
-                                                        draft.lastFullSync = null;
-                                                        draft.lastSyncPredicate = lastSyncPredicate;
-                                                    }
-                                                }))];
-                                        case 4:
-                                            _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];
-                                    }
-                                });
-                            });
-                        });
-                        result = {};
-                        _d.label = 1;
-                    case 1:
-                        _d.trys.push([1, 6, 7, 8]);
-                        return [4 /*yield*/, Promise.all(promises)];
-                    case 2:
-                        _a = __values.apply(void 0, [_d.sent()]), _b = _a.next();
-                        _d.label = 3;
-                    case 3:
-                        if (!!_b.done) return [3 /*break*/, 5];
-                        modelMetadata = _b.value;
-                        modelName = modelMetadata.model;
-                        result[modelName] = modelMetadata;
-                        _d.label = 4;
-                    case 4:
-                        _b = _a.next();
-                        return [3 /*break*/, 3];
-                    case 5: return [3 /*break*/, 8];
-                    case 6:
-                        e_2_1 = _d.sent();
-                        e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 8];
-                    case 7:
-                        try {
-                            if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
-                        }
-                        finally { if (e_2) throw e_2.error; }
-                        return [7 /*endfinally*/];
-                    case 8: return [2 /*return*/, result];
+    async stop() {
+        logger.debug('stopping sync engine');
+        /**
+         * Gracefully disconnecting subscribers first just prevents *more* work
+         * from entering the pipelines.
+         */
+        this.unsubscribeConnectivity();
+        /**
+         * Stop listening for websocket connection disruption
+         */
+        this.stopDisruptionListener && this.stopDisruptionListener();
+        /**
+         * aggressively shut down any lingering background processes.
+         * some of this might be semi-redundant with unsubscribing. however,
+         * unsubscribing doesn't allow us to wait for settling.
+         * (Whereas `stop()` does.)
+         */
+        await this.mutationsProcessor.stop();
+        await this.subscriptionsProcessor.stop();
+        await this.datastoreConnectivity.stop();
+        await this.syncQueriesProcessor.stop();
+        await this.runningProcesses.close();
+        await this.runningProcesses.open();
+        logger.debug('sync engine stopped and ready to restart');
+    }
+    async setupModels(params) {
+        const { fullSyncInterval } = params;
+        const ModelMetadataConstructor = this.modelClasses
+            .ModelMetadata;
+        const models = [];
+        let savedModel;
+        Object.values(this.schema.namespaces).forEach(namespace => {
+            Object.values(namespace.models)
+                .filter(({ syncable }) => syncable)
+                .forEach(model => {
+                models.push([namespace.name, model]);
+                if (namespace.name === USER) {
+                    const modelConstructor = this.userModelClasses[model.name];
+                    this.modelSyncedStatus.set(modelConstructor, false);
                 }
             });
         });
-    };
-    SyncEngine.prototype.getModelsMetadata = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            var ModelMetadata, modelsMetadata;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        ModelMetadata = this.modelClasses
-                            .ModelMetadata;
-                        return [4 /*yield*/, this.storage.query(ModelMetadata)];
-                    case 1:
-                        modelsMetadata = _a.sent();
-                        return [2 /*return*/, modelsMetadata];
-                }
-            });
+        const promises = models.map(async ([namespace, model]) => {
+            const modelMetadata = await this.getModelMetadata(namespace, model.name);
+            const syncPredicate = ModelPredicateCreator.getPredicates(this.syncPredicates.get(model), false);
+            const lastSyncPredicate = syncPredicate
+                ? JSON.stringify(syncPredicate)
+                : null;
+            if (modelMetadata === undefined) {
+                [[savedModel]] = await this.storage.save(this.modelInstanceCreator(ModelMetadataConstructor, {
+                    model: model.name,
+                    namespace,
+                    lastSync: null,
+                    fullSyncInterval,
+                    lastFullSync: null,
+                    lastSyncPredicate,
+                }), undefined, ownSymbol);
+            }
+            else {
+                const prevSyncPredicate = modelMetadata.lastSyncPredicate
+                    ? modelMetadata.lastSyncPredicate
+                    : null;
+                const syncPredicateUpdated = prevSyncPredicate !== lastSyncPredicate;
+                [[savedModel]] = await this.storage.save(ModelMetadataConstructor.copyOf(modelMetadata, draft => {
+                    draft.fullSyncInterval = fullSyncInterval;
+                    // perform a base sync if the syncPredicate changed in between calls to DataStore.start
+                    // ensures that the local store contains all the data specified by the syncExpression
+                    if (syncPredicateUpdated) {
+                        draft.lastSync = null;
+                        draft.lastFullSync = null;
+                        draft.lastSyncPredicate = lastSyncPredicate;
+                    }
+                }));
+            }
+            return savedModel;
         });
-    };
-    SyncEngine.prototype.getModelMetadata = function (namespace, model) {
-        return __awaiter(this, void 0, void 0, function () {
-            var ModelMetadata, predicate, _a, modelMetadata;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        ModelMetadata = this.modelClasses
-                            .ModelMetadata;
-                        predicate = ModelPredicateCreator.createFromAST(this.schema.namespaces[SYNC].models[ModelMetadata.name], { and: [{ namespace: { eq: namespace } }, { model: { eq: model } }] });
-                        return [4 /*yield*/, this.storage.query(ModelMetadata, predicate, {
-                                page: 0,
-                                limit: 1,
-                            })];
-                    case 1:
-                        _a = __read.apply(void 0, [_b.sent(), 1]), modelMetadata = _a[0];
-                        return [2 /*return*/, modelMetadata];
-                }
-            });
+        const result = {};
+        for (const modelMetadata of await Promise.all(promises)) {
+            const { model: modelName } = modelMetadata;
+            result[modelName] = modelMetadata;
+        }
+        return result;
+    }
+    async getModelsMetadata() {
+        const ModelMetadata = this.modelClasses
+            .ModelMetadata;
+        const modelsMetadata = await this.storage.query(ModelMetadata);
+        return modelsMetadata;
+    }
+    async getModelMetadata(namespace, model) {
+        const ModelMetadata = this.modelClasses
+            .ModelMetadata;
+        const predicate = ModelPredicateCreator.createFromAST(this.schema.namespaces[SYNC].models[ModelMetadata.name], { and: [{ namespace: { eq: namespace } }, { model: { eq: model } }] });
+        const [modelMetadata] = await this.storage.query(ModelMetadata, predicate, {
+            page: 0,
+            limit: 1,
         });
-    };
-    SyncEngine.prototype.getModelDefinition = function (modelConstructor) {
-        var namespaceName = this.namespaceResolver(modelConstructor);
-        var modelDefinition = this.schema.namespaces[namespaceName].models[modelConstructor.name];
+        return modelMetadata;
+    }
+    getModelDefinition(modelConstructor) {
+        const namespaceName = this.namespaceResolver(modelConstructor);
+        const modelDefinition = this.schema.namespaces[namespaceName].models[modelConstructor.name];
         return modelDefinition;
-    };
-    SyncEngine.getNamespace = function () {
-        var namespace = {
+    }
+    static getNamespace() {
+        const namespace = {
             name: SYNC,
             relationships: {},
             enums: {
@@ -1040,7 +672,7 @@ var SyncEngine = /** @class */ (function () {
             },
         };
         return namespace;
-    };
+    }
     /**
      * listen for websocket connection disruption
      *
@@ -1048,43 +680,37 @@ var SyncEngine = /** @class */ (function () {
      * from AppSync were missed. A sync needs to be triggered to
      * retrieve the missed data.
      */
-    SyncEngine.prototype.startDisruptionListener = function () {
-        var _this = this;
-        return Hub.listen('api', function (data) {
+    startDisruptionListener() {
+        return Hub.listen('api', (data) => {
             if (data.source === 'PubSub' &&
                 data.payload.event === PUBSUB_CONNECTION_STATE_CHANGE) {
-                var connectionState = data.payload.data
+                const connectionState = data.payload.data
                     .connectionState;
                 switch (connectionState) {
                     // Do not need to listen for ConnectionDisruptedPendingNetwork
                     // Normal network reconnection logic will handle the sync
                     case ConnectionState.ConnectionDisrupted:
-                        _this.connectionDisrupted = true;
+                        this.connectionDisrupted = true;
                         break;
                     case ConnectionState.Connected:
-                        if (_this.connectionDisrupted) {
-                            _this.scheduleSync();
+                        if (this.connectionDisrupted) {
+                            this.scheduleSync();
                         }
-                        _this.connectionDisrupted = false;
+                        this.connectionDisrupted = false;
                         break;
                 }
             }
         });
-    };
+    }
     /*
      * Schedule a sync to start when syncQueriesObservable enters sleep state
      * Start sync immediately if syncQueriesObservable is already in sleep state
      */
-    SyncEngine.prototype.scheduleSync = function () {
-        var _this = this;
+    scheduleSync() {
         return (this.runningProcesses.isOpen &&
-            this.runningProcesses.add(function () {
-                return _this.waitForSleepState.then(function () {
-                    // unsleepSyncQueriesObservable will be set if waitForSleepState has resolved
-                    _this.unsleepSyncQueriesObservable();
-                });
-            }));
-    };
-    return SyncEngine;
-}());
-export { SyncEngine };
+            this.runningProcesses.add(() => this.waitForSleepState.then(() => {
+                // unsleepSyncQueriesObservable will be set if waitForSleepState has resolved
+                this.unsleepSyncQueriesObservable();
+            })));
+    }
+}