@aws-amplify/api-graphql 4.0.1-console-preview.67f944e.0 → 4.0.1-console-preview.0bbe168.0

package/lib-esm/types/PubSub.d.ts

@@ -1,4 +1,4 @@
-import { ZenObservable } from 'zen-observable-ts';
+import { Observer } from 'rxjs';
 export interface SubscriptionObserver<T> {
     closed: boolean;
     next(value: T): void;
@@ -24,4 +24,4 @@ export declare enum ConnectionState {
     ConnectedPendingKeepAlive = "ConnectedPendingKeepAlive"
 }
 export declare type PubSubContent = Record<string, unknown> | string;
-export declare type PubSubContentObserver = ZenObservable.SubscriptionObserver<PubSubContent>;
+export declare type PubSubContentObserver = Observer<PubSubContent>;

package/lib-esm/utils/ConnectionStateMonitor.d.ts

@@ -1,4 +1,4 @@
-import Observable from 'zen-observable-ts';
+import { Observable } from 'rxjs';
 import { ConnectionState } from '../types/PubSub';
 declare type LinkedConnectionState = 'connected' | 'disconnected';
 declare type LinkedHealthState = 'healthy' | 'unhealthy';

package/lib-esm/utils/ConnectionStateMonitor.js

@@ -1,7 +1,7 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { __assign } from "tslib";
-import Observable from 'zen-observable-ts';
+import { Observable, map, filter } from 'rxjs';
 import { ConnectionState } from '../types/PubSub';
 import { ReachabilityMonitor } from './ReachabilityMonitor';
 export var CONNECTION_CHANGE = {
@@ -82,14 +82,14 @@ var ConnectionStateMonitor = /** @class */ (function () {
             // states without changing the overall connection state.
             // After translating from linked states to ConnectionState, then remove any duplicates
             return this._linkedConnectionStateObservable
-                .map(function (value) {
+                .pipe(map(function (value) {
                 return _this.connectionStatesTranslator(value);
-            })
-                .filter(function (current) {
+            }))
+                .pipe(filter(function (current) {
                 var toInclude = current !== previous;
                 previous = current;
                 return toInclude;
-            });
+            }));
         },
         enumerable: true,
         configurable: true
@@ -98,6 +98,7 @@ var ConnectionStateMonitor = /** @class */ (function () {
      * Updates local connection state and emits the full state to the observer.
      */
     ConnectionStateMonitor.prototype.record = function (statusUpdates) {
+        var _a;
         // Maintain the network monitor
         if (statusUpdates.intendedConnectionState === 'connected') {
             this.enableNetworkMonitoring();
@@ -108,7 +109,7 @@ var ConnectionStateMonitor = /** @class */ (function () {
         // Maintain the socket state
         var newSocketStatus = __assign(__assign({}, this._linkedConnectionState), statusUpdates);
         this._linkedConnectionState = __assign({}, newSocketStatus);
-        this._linkedConnectionStateObserver.next(this._linkedConnectionState);
+        (_a = this._linkedConnectionStateObserver) === null || _a === void 0 ? void 0 : _a.next(this._linkedConnectionState);
     };
     /*
      * Translate the ConnectionState structure into a specific ConnectionState string literal union

package/lib-esm/utils/ReachabilityMonitor/index.d.ts

@@ -1,3 +1 @@
-export declare const ReachabilityMonitor: () => import("zen-observable-ts").default<{
-    online: boolean;
-}>;
+export declare const ReachabilityMonitor: () => any;

package/lib-esm/utils/ReachabilityMonitor/index.native.d.ts

@@ -1,3 +1 @@
-export declare const ReachabilityMonitor: () => import("zen-observable-ts").default<{
-    online: boolean;
-}>;
+export declare const ReachabilityMonitor: () => any;

package/lib-esm/utils/ReconnectionMonitor.d.ts

@@ -1,4 +1,4 @@
-import { Observer } from 'zen-observable-ts';
+import { Observer } from 'rxjs';
 export declare enum ReconnectEvent {
     START_RECONNECT = "START_RECONNECT",
     HALT_RECONNECT = "HALT_RECONNECT"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/api-graphql",
-	"version": "4.0.1-console-preview.67f944e.0+67f944e",
+	"version": "4.0.1-console-preview.0bbe168.0+0bbe168",
 	"description": "Api-graphql category of aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -40,9 +40,6 @@
 		"url": "https://github.com/aws/aws-amplify/issues"
 	},
 	"homepage": "https://aws-amplify.github.io/",
-	"devDependencies": {
-		"@types/zen-observable": "^0.8.0"
-	},
 	"files": [
 		"lib",
 		"lib-esm",
@@ -50,15 +47,14 @@
 		"internals"
 	],
 	"dependencies": {
-		"@aws-amplify/api-rest": "4.0.1-console-preview.67f944e.0+67f944e",
-		"@aws-amplify/auth": "6.0.1-console-preview.67f944e.0+67f944e",
-		"@aws-amplify/core": "6.0.1-console-preview.67f944e.0+67f944e",
+		"@aws-amplify/api-rest": "4.0.1-console-preview.0bbe168.0+0bbe168",
+		"@aws-amplify/auth": "6.0.1-console-preview.0bbe168.0+0bbe168",
+		"@aws-amplify/core": "6.0.1-console-preview.0bbe168.0+0bbe168",
 		"@aws-sdk/types": "3.387.0",
 		"graphql": "15.8.0",
 		"rxjs": "^7.8.1",
 		"tslib": "^1.8.0",
-		"uuid": "^3.2.1",
-		"zen-observable-ts": "0.8.19"
+		"uuid": "^3.2.1"
 	},
 	"size-limit": [
 		{
@@ -113,5 +109,5 @@
 			"lib-esm"
 		]
 	},
-	"gitHead": "67f944e08acb70d5edf6743f5d23a048db1a57ae"
+	"gitHead": "0bbe168c66929877174b331c71f7666bb16529d6"
 }

package/src/Providers/AWSAppSyncRealTimeProvider/index.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, SubscriptionLike } from 'rxjs';
 import { GraphQLError } from 'graphql';
 import * as url from 'url';
 import { v4 as uuid } from 'uuid';
@@ -119,7 +119,7 @@ export class AWSAppSyncRealTimeProvider {
 	private connectionState: ConnectionState;
 	private readonly connectionStateMonitor = new ConnectionStateMonitor();
 	private readonly reconnectionMonitor = new ReconnectionMonitor();
-	private connectionStateMonitorSubscription: ZenObservable.Subscription;
+	private connectionStateMonitorSubscription: SubscriptionLike;
 
 	constructor(options: AWSAppSyncRealTimeProviderOptions = {}) {
 		// Monitor the connection state and pass changes along to Hub
@@ -242,7 +242,7 @@ export class AWSAppSyncRealTimeProvider {
 					}
 				};
 
-				let reconnectSubscription: ZenObservable.Subscription;
+				let reconnectSubscription: SubscriptionLike;
 
 				// Add an observable to the reconnection list to manage reconnection for this subscription
 				reconnectSubscription = new Observable(observer => {

package/src/types/PubSub.ts

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { ZenObservable } from 'zen-observable-ts';
-
+import { Observer } from 'rxjs';
 export interface SubscriptionObserver<T> {
 	closed: boolean;
 	next(value: T): void;
@@ -54,5 +53,4 @@ export enum ConnectionState {
 }
 
 export type PubSubContent = Record<string, unknown> | string;
-export type PubSubContentObserver =
-	ZenObservable.SubscriptionObserver<PubSubContent>;
+export type PubSubContentObserver = Observer<PubSubContent>;

package/src/utils/ConnectionStateMonitor.ts

@@ -1,7 +1,7 @@
 // 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, map, filter } from 'rxjs';
 import { ConnectionState } from '../types/PubSub';
 import { ReachabilityMonitor } from './ReachabilityMonitor';
 
@@ -50,9 +50,9 @@ export class ConnectionStateMonitor {
 	 */
 	private _linkedConnectionState: LinkedConnectionStates;
 	private _linkedConnectionStateObservable: Observable<LinkedConnectionStates>;
-	private _linkedConnectionStateObserver: ZenObservable.SubscriptionObserver<LinkedConnectionStates>;
-	private _networkMonitoringSubscription?: ZenObservable.Subscription;
-	private _initialNetworkStateSubscription?: ZenObservable.Subscription;
+	private _linkedConnectionStateObserver: Observer<LinkedConnectionStates>;
+	private _networkMonitoringSubscription?: SubscriptionLike;
+	private _initialNetworkStateSubscription?: SubscriptionLike;
 
 	constructor() {
 		this._networkMonitoringSubscription = undefined;
@@ -121,14 +121,18 @@ export class ConnectionStateMonitor {
 
 		// After translating from linked states to ConnectionState, then remove any duplicates
 		return this._linkedConnectionStateObservable
-			.map(value => {
-				return this.connectionStatesTranslator(value);
-			})
-			.filter(current => {
-				const toInclude = current !== previous;
-				previous = current;
-				return toInclude;
-			});
+			.pipe(
+				map(value => {
+					return this.connectionStatesTranslator(value);
+				})
+			)
+			.pipe(
+				filter(current => {
+					const toInclude = current !== previous;
+					previous = current;
+					return toInclude;
+				})
+			);
 	}
 
 	/*
@@ -150,7 +154,7 @@ export class ConnectionStateMonitor {
 
 		this._linkedConnectionState = { ...newSocketStatus };
 
-		this._linkedConnectionStateObserver.next(this._linkedConnectionState);
+		this._linkedConnectionStateObserver?.next(this._linkedConnectionState);
 	}
 
 	/*

package/src/utils/ReconnectionMonitor.ts

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Observer } from 'zen-observable-ts';
+import { Observer } from 'rxjs';
 import { RECONNECT_DELAY, RECONNECT_INTERVAL } from '../Providers/constants';
 
 export enum ReconnectEvent {