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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/datastore",
-  "version": "5.0.1-console-preview.67f944e.0+67f944e",
+  "version": "5.0.1-console-preview.0bbe168.0+0bbe168",
   "description": "AppSyncLocal support for aws-amplify",
   "main": "./lib/index.js",
   "module": "./lib-esm/index.js",
@@ -47,21 +47,20 @@
     "ssr"
   ],
   "dependencies": {
-    "@aws-amplify/api": "6.0.1-console-preview.67f944e.0+67f944e",
-    "@aws-amplify/auth": "6.0.1-console-preview.67f944e.0+67f944e",
+    "@aws-amplify/api": "6.0.1-console-preview.0bbe168.0+0bbe168",
+    "@aws-amplify/auth": "6.0.1-console-preview.0bbe168.0+0bbe168",
     "buffer": "4.9.2",
     "idb": "5.0.6",
     "immer": "9.0.6",
+    "rxjs": "^7.8.1",
     "ulid": "^2.3.0",
-    "uuid": "^9.0.0",
-    "zen-observable-ts": "0.8.19",
-    "zen-push": "0.2.1"
+    "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@aws-amplify/core": "6.0.1-console-preview.67f944e.0+67f944e"
+    "@aws-amplify/core": "6.0.1-console-preview.0bbe168.0+0bbe168"
   },
   "devDependencies": {
-    "@aws-amplify/core": "6.0.1-console-preview.67f944e.0+67f944e",
+    "@aws-amplify/core": "6.0.1-console-preview.0bbe168.0+0bbe168",
     "@react-native-community/netinfo": "4.7.0",
     "@types/uuid": "^9.0.0",
     "@types/uuid-validate": "^0.0.1",
@@ -137,5 +136,5 @@
       "lib-esm"
     ]
   },
-  "gitHead": "67f944e08acb70d5edf6743f5d23a048db1a57ae"
+  "gitHead": "0bbe168c66929877174b331c71f7666bb16529d6"
 }

package/src/datastore/datastore.ts

@@ -12,7 +12,7 @@ import {
 	Patch,
 } from 'immer';
 import { v4 as uuid4 } from 'uuid';
-import Observable, { ZenObservable } from 'zen-observable-ts';
+import { Observable, SubscriptionLike, filter } from 'rxjs';
 import { defaultAuthStrategy, multiAuthStrategy } from '../authModeStrategies';
 import {
 	isPredicatesAll,
@@ -1326,7 +1326,7 @@ async function checkSchemaVersion(
 	});
 }
 
-let syncSubscription: ZenObservable.Subscription;
+let syncSubscription: SubscriptionLike;
 
 function getNamespace(): SchemaNamespace {
 	const namespace: SchemaNamespace = {
@@ -2117,7 +2117,7 @@ class DataStore {
 		}
 
 		return new Observable<SubscriptionMessage<T>>(observer => {
-			let source: ZenObservable.Subscription;
+			let source: SubscriptionLike;
 
 			this.runningProcesses
 				.add(async () => {
@@ -2126,7 +2126,7 @@ class DataStore {
 					// Filter the events returned by Storage according to namespace,
 					// append original element data, and subscribe to the observable
 					source = this.storage!.observe(modelConstructor)
-						.filter(({ model }) => namespaceResolver(model) === USER)
+						.pipe(filter(({ model }) => namespaceResolver(model) === USER))
 						.subscribe({
 							next: item =>
 								this.runningProcesses.isOpen &&
@@ -2200,7 +2200,7 @@ class DataStore {
 			const items = new Map<string, T>();
 			const itemsChanged = new Map<string, T>();
 			let deletedItemIds: string[] = [];
-			let handle: ZenObservable.Subscription;
+			let handle: SubscriptionLike;
 			// let predicate: ModelPredicate<T> | undefined;
 			let executivePredicate: GroupCondition | undefined;
 

package/src/storage/storage.ts

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import Observable, { ZenObservable } from 'zen-observable-ts';
-import PushStream from 'zen-push';
+import { Observable, filter, map, Subject } from 'rxjs';
 import { Patch } from 'immer';
 import { ModelInstanceCreator } from '../datastore/datastore';
 import { ModelPredicateCreator } from '../predicates';
@@ -44,10 +43,8 @@ export type Storage = InstanceType<typeof StorageClass>;
 const logger = new Logger('DataStore');
 class StorageClass implements StorageFacade {
 	private initialized: Promise<void> | undefined;
-	private readonly pushStream: {
-		observable: Observable<StorageSubscriptionMessage<PersistentModel>>;
-	} & Required<
-		ZenObservable.Observer<StorageSubscriptionMessage<PersistentModel>>
+	private readonly pushStream: Subject<
+		StorageSubscriptionMessage<PersistentModel>
 	>;
 
 	constructor(
@@ -62,7 +59,7 @@ class StorageClass implements StorageFacade {
 		private readonly sessionId?: string
 	) {
 		this.adapter = this.adapter || getDefaultAdapter();
-		this.pushStream = new PushStream();
+		this.pushStream = new Subject();
 	}
 
 	static getNamespace() {
@@ -285,26 +282,33 @@ class StorageClass implements StorageFacade {
 			(predicate && ModelPredicateCreator.getPredicates(predicate, false)) ||
 			{};
 
-		let result = this.pushStream.observable
-			.filter(({ mutator }) => {
-				return !skipOwn || mutator !== skipOwn;
-			})
-			.map(
-				({ mutator: _mutator, ...message }) => message as SubscriptionMessage<T>
+		let result = this.pushStream
+			.pipe(
+				filter(({ mutator }) => {
+					return !skipOwn || mutator !== skipOwn;
+				})
+			)
+			.pipe(
+				map(
+					({ mutator: _mutator, ...message }) =>
+						message as SubscriptionMessage<T>
+				)
 			);
 
 		if (!listenToAll) {
-			result = result.filter(({ model, element }) => {
-				if (modelConstructor !== model) {
-					return false;
-				}
+			result = result.pipe(
+				filter(({ model, element }) => {
+					if (modelConstructor !== model) {
+						return false;
+					}
 
-				if (!!predicates && !!type) {
-					return validatePredicate(element, type, predicates);
-				}
+					if (!!predicates && !!type) {
+						return validatePredicate(element, type, predicates);
+					}
 
-				return true;
-			});
+					return true;
+				})
+			);
 		}
 
 		return result;

package/src/sync/datastoreConnectivity.ts

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import Observable, { ZenObservable } from 'zen-observable-ts';
+import { Observable, Observer, SubscriptionLike } from 'rxjs';
 import { ReachabilityMonitor } from './datastoreReachability';
 import { Logger } from '@aws-amplify/core/internals/utils';
 
@@ -15,8 +15,8 @@ type ConnectionStatus = {
 
 export default class DataStoreConnectivity {
 	private connectionStatus: ConnectionStatus;
-	private observer!: ZenObservable.SubscriptionObserver<ConnectionStatus>;
-	private subscription!: ZenObservable.Subscription;
+	private observer!: Observer<ConnectionStatus>;
+	private subscription!: SubscriptionLike;
 	private timeout!: ReturnType<typeof setTimeout>;
 	constructor() {
 		this.connectionStatus = {

package/src/sync/index.ts

@@ -6,7 +6,7 @@ import {
 } from '@aws-amplify/core/internals/utils';
 import { Hub } from '@aws-amplify/core';
 
-import Observable, { ZenObservable } from 'zen-observable-ts';
+import { filter, Observable, Observer, of, SubscriptionLike } from 'rxjs';
 import { ModelInstanceCreator } from '../datastore/datastore';
 import { ModelPredicateCreator } from '../predicates';
 import { ExclusiveStorage as Storage } from '../storage/storage';
@@ -215,7 +215,7 @@ export class SyncEngine {
 		return new Observable<ControlMessageType<ControlMessage>>(observer => {
 			logger.log('starting sync engine...');
 
-			let subscriptions: ZenObservable.Subscription[] = [];
+			let subscriptions: SubscriptionLike[] = [];
 
 			this.runningProcesses.add(async () => {
 				try {
@@ -416,10 +416,12 @@ export class SyncEngine {
 
 				this.storage
 					.observe(null, null, ownSymbol)
-					.filter(({ model }) => {
-						const modelDefinition = this.getModelDefinition(model);
-						return modelDefinition.syncable === true;
-					})
+					.pipe(
+						filter(({ model }) => {
+							const modelDefinition = this.getModelDefinition(model);
+							return modelDefinition.syncable === true;
+						})
+					)
 					.subscribe({
 						next: async ({ opType, model, element, condition }) =>
 							this.runningProcesses.add(async () => {
@@ -531,11 +533,11 @@ export class SyncEngine {
 		ControlMessageType<ControlMessage>
 	> {
 		if (!this.online) {
-			return Observable.of<ControlMessageType<ControlMessage>>();
+			return of<ControlMessageType<ControlMessage>>({} as any); // TODO(v6): fix this
 		}
 
 		return new Observable<ControlMessageType<ControlMessage>>(observer => {
-			let syncQueriesSubscription: ZenObservable.Subscription;
+			let syncQueriesSubscription: SubscriptionLike;
 
 			this.runningProcesses.isOpen &&
 				this.runningProcesses.add(async onTerminate => {

package/src/sync/processors/mutation.ts

@@ -15,7 +15,7 @@ import {
 	AmplifyError,
 } from '@aws-amplify/core/internals/utils';
 
-import Observable, { ZenObservable } from 'zen-observable-ts';
+import { Observable, Observer } from 'rxjs';
 import { MutationEvent } from '../';
 import { ModelInstanceCreator } from '../../datastore/datastore';
 import { ExclusiveStorage as Storage } from '../../storage/storage';
@@ -68,7 +68,7 @@ class MutationProcessor {
 	 * yet started. In this case, `isReady()` will be `false` and `resume()` will exit
 	 * early.
 	 */
-	private observer?: ZenObservable.Observer<MutationProcessorEvent>;
+	private observer?: Observer<MutationProcessorEvent>;
 	private readonly typeQuery = new WeakMap<
 		SchemaModel,
 		[TransformerMutationType, string, string][]

package/src/sync/processors/subscription.ts

@@ -14,7 +14,7 @@ import {
 	JwtPayload,
 } from '@aws-amplify/core/internals/utils';
 
-import Observable, { ZenObservable } from 'zen-observable-ts';
+import { Observable, Observer, SubscriptionLike } from 'rxjs';
 import {
 	InternalSchema,
 	PersistentModel,
@@ -73,7 +73,7 @@ class SubscriptionProcessor {
 	>();
 	private buffer: [TransformerMutationType, SchemaModel, PersistentModel][] =
 		[];
-	private dataObserver!: ZenObservable.Observer<any>;
+	private dataObserver!: Observer<any>;
 
 	private runningProcesses = new BackgroundProcessManager();
 
@@ -255,9 +255,9 @@ class SubscriptionProcessor {
 			// independently, since the auth retry behavior is asynchronous.
 			let subscriptions: {
 				[modelName: string]: {
-					[TransformerMutationType.CREATE]: ZenObservable.Subscription[];
-					[TransformerMutationType.UPDATE]: ZenObservable.Subscription[];
-					[TransformerMutationType.DELETE]: ZenObservable.Subscription[];
+					[TransformerMutationType.CREATE]: SubscriptionLike[];
+					[TransformerMutationType.UPDATE]: SubscriptionLike[];
+					[TransformerMutationType.DELETE]: SubscriptionLike[];
 				};
 			} = {};
 			let oidcTokenPayload: JwtPayload | undefined;
@@ -407,7 +407,6 @@ class SubscriptionProcessor {
 											transformerMutationType
 										].push(
 											queryObservable
-												.filter(() => true) // to make change more readable
 												.subscribe({
 													next: result => {
 														const { data, errors } = result;

package/src/sync/processors/sync.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 import { GraphQLResult } from '@aws-amplify/api';
 import { InternalAPI } from '@aws-amplify/api/internals';
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 import {
 	InternalSchema,
 	ModelInstanceMetadata,