@aws-amplify/datastore 5.0.1-console-preview.431c340.0 → 5.0.1-console-preview.4b7d177.0

package/lib/datastore/datastore.d.ts

@@ -1,4 +1,4 @@
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 import { PredicateAll } from '../predicates';
 import { ConflictHandler, DataStoreConfig, ProducerPaginationInput, PersistentModel, PersistentModelConstructor, Schema, SubscriptionMessage, DataStoreSnapshot, TypeConstructorMap, ErrorHandler, ObserveQueryOptions, PersistentModelMetaData, IdentifierFieldOrIdentifierObject, RecursiveModelPredicateExtender, ModelPredicateExtender } from '../types';
 export declare let syncClasses: TypeConstructorMap;

package/lib/datastore/datastore.js

@@ -115,9 +115,6 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataStore = exports.initSchema = exports.DataStoreClass = exports.AsyncCollection = exports.AsyncItem = exports.getAttachment = exports.attached = exports.syncClasses = void 0;
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
@@ -126,7 +123,7 @@ var internals_1 = require("@aws-amplify/api/internals");
 var core_1 = require("@aws-amplify/core");
 var immer_1 = require("immer");
 var uuid_1 = require("uuid");
-var zen_observable_ts_1 = __importDefault(require("zen-observable-ts"));
+var rxjs_1 = require("rxjs");
 var authModeStrategies_1 = require("../authModeStrategies");
 var predicates_1 = require("../predicates");
 var storage_1 = require("../storage/storage");
@@ -1758,7 +1755,7 @@ var DataStore = /** @class */ (function () {
             else if (modelConstructor && typeof identifierOrCriteria === 'function') {
                 executivePredicate = (0, next_1.internals)(identifierOrCriteria(buildSeedPredicate(modelConstructor)));
             }
-            return new zen_observable_ts_1.default(function (observer) {
+            return new rxjs_1.Observable(function (observer) {
                 var source;
                 _this.runningProcesses
                     .add(function () { return __awaiter(_this, void 0, void 0, function () {
@@ -1771,10 +1768,10 @@ var DataStore = /** @class */ (function () {
                                 // Filter the events returned by Storage according to namespace,
                                 // append original element data, and subscribe to the observable
                                 source = this.storage.observe(modelConstructor)
-                                    .filter(function (_a) {
+                                    .pipe((0, rxjs_1.filter)(function (_a) {
                                     var model = _a.model;
                                     return namespaceResolver(model) === util_1.USER;
-                                })
+                                }))
                                     .subscribe({
                                     next: function (item) {
                                         return _this.runningProcesses.isOpen &&
@@ -1834,7 +1831,7 @@ var DataStore = /** @class */ (function () {
             });
         };
         this.observeQuery = function (model, criteria, options) {
-            return new zen_observable_ts_1.default(function (observer) {
+            return new rxjs_1.Observable(function (observer) {
                 var items = new Map();
                 var itemsChanged = new Map();
                 var deletedItemIds = [];

package/lib/storage/storage.d.ts

@@ -1,4 +1,4 @@
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 import { Patch } from 'immer';
 import { ModelInstanceCreator } from '../datastore/datastore';
 import { InternalSchema, ModelInstanceMetadata, ModelPredicate, NamespaceResolver, OpType, PaginationInput, PersistentModel, PersistentModelConstructor, QueryOne, SchemaNamespace, InternalSubscriptionMessage, SubscriptionMessage } from '../types';

package/lib/storage/storage.js

@@ -89,7 +89,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExclusiveStorage = void 0;
-var zen_push_1 = __importDefault(require("zen-push"));
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+var rxjs_1 = require("rxjs");
 var predicates_1 = require("../predicates");
 var types_1 = require("../types");
 var util_1 = require("../util");
@@ -106,7 +108,7 @@ var StorageClass = /** @class */ (function () {
         this.adapter = adapter;
         this.sessionId = sessionId;
         this.adapter = this.adapter || (0, getDefaultAdapter_1.default)();
-        this.pushStream = new zen_push_1.default();
+        this.pushStream = new rxjs_1.Subject();
     }
     StorageClass.getNamespace = function () {
         var namespace = {
@@ -295,17 +297,17 @@ var StorageClass = /** @class */ (function () {
         var listenToAll = !modelConstructor;
         var _a = (predicate && predicates_1.ModelPredicateCreator.getPredicates(predicate, false)) ||
             {}, predicates = _a.predicates, type = _a.type;
-        var result = this.pushStream.observable
-            .filter(function (_a) {
+        var result = this.pushStream
+            .pipe((0, rxjs_1.filter)(function (_a) {
             var mutator = _a.mutator;
             return !skipOwn || mutator !== skipOwn;
-        })
-            .map(function (_a) {
+        }))
+            .pipe((0, rxjs_1.map)(function (_a) {
             var _mutator = _a.mutator, message = __rest(_a, ["mutator"]);
             return message;
-        });
+        }));
         if (!listenToAll) {
-            result = result.filter(function (_a) {
+            result = result.pipe((0, rxjs_1.filter)(function (_a) {
                 var model = _a.model, element = _a.element;
                 if (modelConstructor !== model) {
                     return false;
@@ -314,7 +316,7 @@ var StorageClass = /** @class */ (function () {
                     return (0, util_1.validatePredicate)(element, type, predicates);
                 }
                 return true;
-            });
+            }));
         }
         return result;
     };

package/lib/sync/datastoreConnectivity.d.ts

@@ -1,4 +1,4 @@
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 type ConnectionStatus = {
     online: boolean;
 };

package/lib/sync/datastoreConnectivity.js

@@ -46,13 +46,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-var zen_observable_ts_1 = __importDefault(require("zen-observable-ts"));
+var rxjs_1 = require("rxjs");
 var datastoreReachability_1 = require("./datastoreReachability");
 var utils_1 = require("@aws-amplify/core/internals/utils");
 var logger = new utils_1.Logger('DataStore');
@@ -68,7 +65,7 @@ var DataStoreConnectivity = /** @class */ (function () {
         if (this.observer) {
             throw new Error('Subscriber already exists');
         }
-        return new zen_observable_ts_1.default(function (observer) {
+        return new rxjs_1.Observable(function (observer) {
             _this.observer = observer;
             // Will be used to forward socket connection changes, enhancing Reachability
             _this.subscription = datastoreReachability_1.ReachabilityMonitor.subscribe(function (_a) {

package/lib/sync/datastoreReachability/index.d.ts

@@ -1,3 +1 @@
-export declare const ReachabilityMonitor: import("zen-observable-ts").default<{
-    online: boolean;
-}>;
+export declare const ReachabilityMonitor: import("rxjs").Observable<import("@aws-amplify/core/lib-esm/Reachability/types").NetworkStatus>;

package/lib/sync/datastoreReachability/index.native.d.ts

@@ -1,3 +1 @@
-export declare const ReachabilityMonitor: import("zen-observable-ts").default<{
-    online: boolean;
-}>;
+export declare const ReachabilityMonitor: import("rxjs").Observable<import("@aws-amplify/core/lib-esm/Reachability/types").NetworkStatus>;

package/lib/sync/index.d.ts

@@ -1,4 +1,4 @@
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 import { ModelInstanceCreator } from '../datastore/datastore';
 import { ExclusiveStorage as Storage } from '../storage/storage';
 import { ConflictHandler, ControlMessageType, ErrorHandler, InternalSchema, ModelInit, MutableModel, NamespaceResolver, PersistentModelConstructor, SchemaModel, SchemaNamespace, TypeConstructorMap, ModelPredicate, AuthModeStrategy, ManagedIdentifier, OptionallyManagedIdentifier, AmplifyContext } from '../types';

package/lib/sync/index.js

@@ -80,7 +80,7 @@ exports.SyncEngine = exports.ControlMessage = void 0;
 // SPDX-License-Identifier: Apache-2.0
 var utils_1 = require("@aws-amplify/core/internals/utils");
 var core_1 = require("@aws-amplify/core");
-var zen_observable_ts_1 = __importDefault(require("zen-observable-ts"));
+var rxjs_1 = require("rxjs");
 var predicates_1 = require("../predicates");
 var types_1 = require("../types");
 var util_1 = require("../util");
@@ -143,7 +143,7 @@ var SyncEngine = /** @class */ (function () {
     };
     SyncEngine.prototype.start = function (params) {
         var _this = this;
-        return new zen_observable_ts_1.default(function (observer) {
+        return new rxjs_1.Observable(function (observer) {
             logger.log('starting sync engine...');
             var subscriptions = [];
             _this.runningProcesses.add(function () { return __awaiter(_this, void 0, void 0, function () {
@@ -339,11 +339,11 @@ var SyncEngine = /** @class */ (function () {
                             });
                             this.storage
                                 .observe(null, null, ownSymbol)
-                                .filter(function (_a) {
+                                .pipe((0, rxjs_1.filter)(function (_a) {
                                 var model = _a.model;
                                 var modelDefinition = _this.getModelDefinition(model);
                                 return modelDefinition.syncable === true;
-                            })
+                            }))
                                 .subscribe({
                                 next: function (_a) {
                                     var opType = _a.opType, model = _a.model, element = _a.element, condition = _a.condition;
@@ -444,9 +444,9 @@ var SyncEngine = /** @class */ (function () {
     SyncEngine.prototype.syncQueriesObservable = function () {
         var _this = this;
         if (!this.online) {
-            return zen_observable_ts_1.default.of();
+            return (0, rxjs_1.of)({}); // TODO(v6): fix this
         }
-        return new zen_observable_ts_1.default(function (observer) {
+        return new rxjs_1.Observable(function (observer) {
             var syncQueriesSubscription;
             _this.runningProcesses.isOpen &&
                 _this.runningProcesses.add(function (onTerminate) { return __awaiter(_this, void 0, void 0, function () {

package/lib/sync/processors/mutation.d.ts

@@ -1,4 +1,4 @@
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 import { MutationEvent } from '../';
 import { ModelInstanceCreator } from '../../datastore/datastore';
 import { ExclusiveStorage as Storage } from '../../storage/storage';

package/lib/sync/processors/mutation.js

@@ -84,14 +84,11 @@ var __values = (this && this.__values) || function(o) {
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MutationProcessor = exports.safeJitteredBackoff = void 0;
 var internals_1 = require("@aws-amplify/api/internals");
 var utils_1 = require("@aws-amplify/core/internals/utils");
-var zen_observable_ts_1 = __importDefault(require("zen-observable-ts"));
+var rxjs_1 = require("rxjs");
 var types_1 = require("../../types");
 var util_1 = require("../../util");
 var utils_2 = require("../utils");
@@ -145,7 +142,7 @@ var MutationProcessor = /** @class */ (function () {
     MutationProcessor.prototype.start = function () {
         var _this = this;
         this.runningProcesses = new utils_1.BackgroundProcessManager();
-        var observable = new zen_observable_ts_1.default(function (observer) {
+        var observable = new rxjs_1.Observable(function (observer) {
             _this.observer = observer;
             try {
                 _this.resume();

package/lib/sync/processors/subscription.d.ts

@@ -1,4 +1,4 @@
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 import { InternalSchema, PersistentModel, SchemaModel, ModelPredicate, AuthModeStrategy, ErrorHandler, AmplifyContext } from '../../types';
 import { TransformerMutationType } from '../utils';
 export declare enum CONTROL_MSG {

package/lib/sync/processors/subscription.js

@@ -71,15 +71,12 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SubscriptionProcessor = exports.USER_CREDENTIALS = exports.CONTROL_MSG = void 0;
 var internals_1 = require("@aws-amplify/api/internals");
 var core_1 = require("@aws-amplify/core");
 var utils_1 = require("@aws-amplify/core/internals/utils");
-var zen_observable_ts_1 = __importDefault(require("zen-observable-ts"));
+var rxjs_1 = require("rxjs");
 var types_1 = require("../../types");
 var utils_2 = require("../utils");
 var predicates_1 = require("../../predicates");
@@ -198,7 +195,7 @@ var SubscriptionProcessor = /** @class */ (function () {
         var _this = this;
         this.runningProcesses =
             this.runningProcesses || new utils_1.BackgroundProcessManager();
-        var ctlObservable = new zen_observable_ts_1.default(function (observer) {
+        var ctlObservable = new rxjs_1.Observable(function (observer) {
             var promises = [];
             // Creating subs for each model/operation combo so they can be unsubscribed
             // independently, since the auth retry behavior is asynchronous.
@@ -307,7 +304,6 @@ var SubscriptionProcessor = /** @class */ (function () {
                                                                             queryObservable = this.amplifyContext.InternalAPI.graphql(__assign(__assign({ query: query, variables: variables }, { authMode: authMode }), { authToken: authToken }), undefined, customUserAgentDetails);
                                                                             // TODO: consider onTerminate.then(() => API.cancel(...))
                                                                             subscriptions[modelDefinition.name][transformerMutationType].push(queryObservable
-                                                                                .filter(function () { return true; }) // to make change more readable
                                                                                 .subscribe({
                                                                                 next: function (result) {
                                                                                     var data = result.data, errors = result.errors;
@@ -462,7 +458,7 @@ var SubscriptionProcessor = /** @class */ (function () {
                 });
             }); });
         });
-        var dataObservable = new zen_observable_ts_1.default(function (observer) {
+        var dataObservable = new rxjs_1.Observable(function (observer) {
             _this.dataObserver = observer;
             _this.drainBuffer();
             return _this.runningProcesses.addCleaner(function () { return __awaiter(_this, void 0, void 0, function () {

package/lib/sync/processors/sync.d.ts

@@ -1,4 +1,4 @@
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 import { InternalSchema, ModelInstanceMetadata, SchemaModel, ModelPredicate, AuthModeStrategy, ErrorHandler, AmplifyContext } from '../../types';
 declare class SyncProcessor {
     private readonly schema;

package/lib/sync/processors/sync.js

@@ -62,13 +62,10 @@ var __values = (this && this.__values) || function(o) {
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SyncProcessor = void 0;
 var internals_1 = require("@aws-amplify/api/internals");
-var zen_observable_ts_1 = __importDefault(require("zen-observable-ts"));
+var rxjs_1 = require("rxjs");
 var types_1 = require("../../types");
 var utils_1 = require("../utils");
 var utils_2 = require("@aws-amplify/core/internals/utils");
@@ -346,7 +343,7 @@ var SyncProcessor = /** @class */ (function () {
         var _this = this;
         var _a = this.amplifyConfig, maxRecordsToSync = _a.maxRecordsToSync, syncPageSize = _a.syncPageSize;
         var parentPromises = new Map();
-        var observable = new zen_observable_ts_1.default(function (observer) {
+        var observable = new rxjs_1.Observable(function (observer) {
             var sortedTypesLastSyncs = Object.values(_this.schema.namespaces).reduce(function (map, namespace) {
                 var e_2, _a;
                 try {