@aws-amplify/datastore 5.0.1-console-preview.67f944e.0 → 5.0.1-console-preview.0bbe168.0

package/lib-esm/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-esm/datastore/datastore.js

@@ -120,7 +120,7 @@ import { InternalAPI } from '@aws-amplify/api/internals';
 import { Amplify, Hub, Cache } from '@aws-amplify/core';
 import { immerable, produce, setAutoFreeze, enablePatches, } from 'immer';
 import { v4 as uuid4 } from 'uuid';
-import Observable from 'zen-observable-ts';
+import { Observable, filter } from 'rxjs';
 import { defaultAuthStrategy, multiAuthStrategy } from '../authModeStrategies';
 import { isPredicatesAll, ModelPredicateCreator, ModelSortPredicateCreator, } from '../predicates';
 import { ExclusiveStorage as Storage } from '../storage/storage';
@@ -1764,10 +1764,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(filter(function (_a) {
                                     var model = _a.model;
                                     return namespaceResolver(model) === USER;
-                                })
+                                }))
                                     .subscribe({
                                     next: function (item) {
                                         return _this.runningProcesses.isOpen &&

package/lib-esm/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-esm/storage/storage.js

@@ -83,7 +83,9 @@ var __values = (this && this.__values) || function(o) {
     };
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
-import PushStream from 'zen-push';
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+import { filter, map, Subject } from 'rxjs';
 import { ModelPredicateCreator } from '../predicates';
 import { OpType, QueryOne, isTargetNameAssociation, } from '../types';
 import { isModelConstructor, STORAGE, validatePredicate, valuesEqual, } from '../util';
@@ -100,7 +102,7 @@ var StorageClass = /** @class */ (function () {
         this.adapter = adapter;
         this.sessionId = sessionId;
         this.adapter = this.adapter || getDefaultAdapter();
-        this.pushStream = new PushStream();
+        this.pushStream = new Subject();
     }
     StorageClass.getNamespace = function () {
         var namespace = {
@@ -289,17 +291,17 @@ var StorageClass = /** @class */ (function () {
         var listenToAll = !modelConstructor;
         var _a = (predicate && ModelPredicateCreator.getPredicates(predicate, false)) ||
             {}, predicates = _a.predicates, type = _a.type;
-        var result = this.pushStream.observable
-            .filter(function (_a) {
+        var result = this.pushStream
+            .pipe(filter(function (_a) {
             var mutator = _a.mutator;
             return !skipOwn || mutator !== skipOwn;
-        })
-            .map(function (_a) {
+        }))
+            .pipe(map(function (_a) {
             var _mutator = _a.mutator, message = __rest(_a, ["mutator"]);
             return message;
-        });
+        }));
         if (!listenToAll) {
-            result = result.filter(function (_a) {
+            result = result.pipe(filter(function (_a) {
                 var model = _a.model, element = _a.element;
                 if (modelConstructor !== model) {
                     return false;
@@ -308,7 +310,7 @@ var StorageClass = /** @class */ (function () {
                     return validatePredicate(element, type, predicates);
                 }
                 return true;
-            });
+            }));
         }
         return result;
     };

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

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

package/lib-esm/sync/datastoreConnectivity.js

@@ -47,7 +47,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 import { ReachabilityMonitor } from './datastoreReachability';
 import { Logger } from '@aws-amplify/core/internals/utils';
 var logger = new Logger('DataStore');

package/lib-esm/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-esm/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-esm/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-esm/sync/index.js

@@ -74,7 +74,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 // SPDX-License-Identifier: Apache-2.0
 import { Logger, BackgroundProcessManager, } from '@aws-amplify/core/internals/utils';
 import { Hub } from '@aws-amplify/core';
-import Observable from 'zen-observable-ts';
+import { filter, Observable, of } from 'rxjs';
 import { ModelPredicateCreator } from '../predicates';
 import { OpType, } from '../types';
 import { getNow, SYNC, USER } from '../util';
@@ -333,11 +333,11 @@ var SyncEngine = /** @class */ (function () {
                             });
                             this.storage
                                 .observe(null, null, ownSymbol)
-                                .filter(function (_a) {
+                                .pipe(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;
@@ -438,7 +438,7 @@ var SyncEngine = /** @class */ (function () {
     SyncEngine.prototype.syncQueriesObservable = function () {
         var _this = this;
         if (!this.online) {
-            return Observable.of();
+            return of({}); // TODO(v6): fix this
         }
         return new Observable(function (observer) {
             var syncQueriesSubscription;

package/lib-esm/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-esm/sync/processors/mutation.js

@@ -85,7 +85,7 @@ var __values = (this && this.__values) || function(o) {
 };
 import { InternalAPI } from '@aws-amplify/api/internals';
 import { Category, Logger, DataStoreAction, jitteredBackoff, NonRetryableError, retry, BackgroundProcessManager, } from '@aws-amplify/core/internals/utils';
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 import { DISCARD, isModelFieldType, isTargetNameAssociation, OpType, ProcessName, } from '../../types';
 import { extractTargetNamesFromSrc, USER, ID } from '../../util';
 import { buildGraphQLOperation, createMutationInstanceFromModelOperation, getModelAuthModes, TransformerMutationType, getTokenForCustomAuth, } from '../utils';

package/lib-esm/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-esm/sync/processors/subscription.js

@@ -73,7 +73,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 import { InternalAPI } from '@aws-amplify/api/internals';
 import { Hub, fetchAuthSession } from '@aws-amplify/core';
 import { Category, Logger, DataStoreAction, BackgroundProcessManager, } from '@aws-amplify/core/internals/utils';
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 import { ProcessName, } from '../../types';
 import { buildSubscriptionGraphQLOperation, getAuthorizationRules, getModelAuthModes, getUserGroupsFromToken, TransformerMutationType, getTokenForCustomAuth, predicateToGraphQLFilter, RTFError, generateRTFRemediation, } from '../utils';
 import { ModelPredicateCreator } from '../../predicates';
@@ -301,7 +301,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;

package/lib-esm/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-esm/sync/processors/sync.js

@@ -62,7 +62,7 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 import { InternalAPI } from '@aws-amplify/api/internals';
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 import { ProcessName, } from '../../types';
 import { buildGraphQLOperation, getModelAuthModes, getClientSideAuthError, getForbiddenError, predicateToGraphQLFilter, getTokenForCustomAuth, } from '../utils';
 import { jitteredExponentialRetry, Category, ConsoleLogger as Logger, DataStoreAction, NonRetryableError, BackgroundProcessManager, } from '@aws-amplify/core/internals/utils';