@aws-amplify/datastore 4.7.6-api-v6-models.b3abc9b.0 → 5.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@aws-amplify/datastore",
-	"version": "4.7.6-api-v6-models.b3abc9b.0+b3abc9b",
+	"version": "5.0.0",
 	"description": "AppSyncLocal support for aws-amplify",
 	"main": "./lib/index.js",
 	"module": "./lib-esm/index.js",
@@ -19,10 +19,10 @@
 		"test": "npm run lint && jest -w 1 --coverage",
 		"test:size": "size-limit",
 		"build-with-test": "npm test && npm run build",
-		"build:cjs": "node ./build es5 && webpack && webpack --config ./webpack.config.dev.js",
-		"build:esm": "node ./build es6",
-		"build:cjs:watch": "node ./build es5 --watch",
-		"build:esm:watch": "rimraf lib-esm && node ./build es6 --watch",
+		"build:cjs": "rimraf lib && tsc -m commonjs --outDir lib && webpack && webpack --config ./webpack.config.dev.js",
+		"build:esm": "rimraf lib-esm && tsc -m esnext --outDir lib-esm",
+		"build:cjs:watch": "rimraf lib && tsc -m commonjs --outDir lib --watch",
+		"build:esm:watch": "rimraf lib-esm && tsc -m esnext --outDir lib-esm --watch",
 		"build": "yarn clean && yarn build:esm && npm run build:cjs",
 		"clean": "npm run clean:size && rimraf lib-esm lib dist",
 		"clean:size": "rimraf dual-publish-tmp tmp*",
@@ -40,14 +40,6 @@
 		"url": "https://github.com/aws/aws-amplify/issues"
 	},
 	"homepage": "https://aws-amplify.github.io/",
-	"devDependencies": {
-		"@react-native-community/netinfo": "4.7.0",
-		"@types/uuid": "3.4.6",
-		"@types/uuid-validate": "^0.0.1",
-		"dexie": "3.2.2",
-		"dexie-export-import": "1.0.3",
-		"fake-indexeddb": "3.0.0"
-	},
 	"files": [
 		"lib",
 		"lib-esm",
@@ -55,25 +47,33 @@
 		"ssr"
 	],
 	"dependencies": {
-		"@aws-amplify/api": "5.4.6-api-v6-models.b3abc9b.0+b3abc9b",
-		"@aws-amplify/auth": "5.6.6-api-v6-models.b3abc9b.0+b3abc9b",
-		"@aws-amplify/core": "5.8.6-api-v6-models.b3abc9b.0+b3abc9b",
-		"@aws-amplify/pubsub": "5.5.6-api-v6-models.b3abc9b.0+b3abc9b",
-		"amazon-cognito-identity-js": "6.3.7-api-v6-models.b3abc9b.0+b3abc9b",
+		"@aws-amplify/api": "6.0.0",
+		"@aws-amplify/auth": "6.0.0",
 		"buffer": "4.9.2",
 		"idb": "5.0.6",
 		"immer": "9.0.6",
-		"ulid": "2.3.0",
-		"uuid": "3.4.0",
-		"zen-observable-ts": "0.8.19",
-		"zen-push": "0.2.1"
+		"rxjs": "^7.8.1",
+		"ulid": "^2.3.0"
+	},
+	"peerDependencies": {
+		"@aws-amplify/core": "^6.0.0"
+	},
+	"devDependencies": {
+		"@aws-amplify/core": "6.0.0",
+		"@aws-amplify/react-native": "^1.0.0",
+		"@types/uuid-validate": "^0.0.1",
+		"dexie": "3.2.2",
+		"dexie-export-import": "1.0.3",
+		"fake-indexeddb": "3.0.0",
+		"graphql": "15.8.0",
+		"typescript": "5.0.2"
 	},
 	"size-limit": [
 		{
 			"name": "DataStore (top-level class)",
 			"path": "./lib-esm/index.js",
 			"import": "{ Amplify, DataStore }",
-			"limit": "139.94 kB"
+			"limit": "65.25 kB"
 		}
 	],
 	"jest": {
@@ -91,8 +91,10 @@
 					"target": "es5",
 					"allowJs": true,
 					"esModuleInterop": true,
-					"downlevelIteration": true,
-					"strictNullChecks": true
+					"strictNullChecks": false,
+					"types": [
+						"@types/jest"
+					]
 				}
 			}
 		},
@@ -128,7 +130,10 @@
 			"dist",
 			"lib",
 			"lib-esm"
+		],
+		"setupFilesAfterEnv": [
+			"<rootDir>/jest.setup.js"
 		]
 	},
-	"gitHead": "b3abc9b75f6f1353f4c2fbc10cd3369be498e9fc"
+	"gitHead": "d505105326d7f6214f6bd1e06eb20be3a3651377"
 }

package/src/authModeStrategies/multiAuthStrategy.ts

@@ -1,7 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Auth } from '@aws-amplify/auth';
-import { GRAPHQL_AUTH_MODE } from '@aws-amplify/api-graphql';
+import { fetchAuthSession } from '@aws-amplify/core';
 import {
 	AuthModeStrategy,
 	ModelAttributeAuthProperty,
@@ -9,6 +8,7 @@ import {
 	ModelAttributeAuthAllow,
 	AmplifyContext,
 } from '../types';
+import { GraphQLAuthMode } from '@aws-amplify/core/internals/utils';
 
 function getProviderFromRule(
 	rule: ModelAttributeAuthProperty
@@ -63,7 +63,7 @@ function getAuthRules({
 	currentUser: unknown;
 }) {
 	// Using Set to ensure uniqueness
-	const authModes = new Set<GRAPHQL_AUTH_MODE>();
+	const authModes = new Set<GraphQLAuthMode>();
 
 	rules.forEach(rule => {
 		switch (rule.allow) {
@@ -73,7 +73,7 @@ function getAuthRules({
 					!rule.provider ||
 					rule.provider === ModelAttributeAuthProvider.FUNCTION
 				) {
-					authModes.add(GRAPHQL_AUTH_MODE.AWS_LAMBDA);
+					authModes.add('lambda');
 				}
 				break;
 			case ModelAttributeAuthAllow.GROUPS:
@@ -81,9 +81,9 @@ function getAuthRules({
 				// We shouldn't attempt User Pool or OIDC if there isn't an authenticated user
 				if (currentUser) {
 					if (rule.provider === ModelAttributeAuthProvider.USER_POOLS) {
-						authModes.add(GRAPHQL_AUTH_MODE.AMAZON_COGNITO_USER_POOLS);
+						authModes.add('userPool');
 					} else if (rule.provider === ModelAttributeAuthProvider.OIDC) {
-						authModes.add(GRAPHQL_AUTH_MODE.OPENID_CONNECT);
+						authModes.add('oidc');
 					}
 				}
 				break;
@@ -96,9 +96,9 @@ function getAuthRules({
 						!rule.provider ||
 						rule.provider === ModelAttributeAuthProvider.USER_POOLS
 					) {
-						authModes.add(GRAPHQL_AUTH_MODE.AMAZON_COGNITO_USER_POOLS);
+						authModes.add('userPool');
 					} else if (rule.provider === ModelAttributeAuthProvider.IAM) {
-						authModes.add(GRAPHQL_AUTH_MODE.AWS_IAM);
+						authModes.add('iam');
 					}
 				}
 
@@ -106,13 +106,13 @@ function getAuthRules({
 			}
 			case ModelAttributeAuthAllow.PUBLIC: {
 				if (rule.provider === ModelAttributeAuthProvider.IAM) {
-					authModes.add(GRAPHQL_AUTH_MODE.AWS_IAM);
+					authModes.add('iam');
 				} else if (
 					!rule.provider ||
 					rule.provider === ModelAttributeAuthProvider.API_KEY
 				) {
 					// public with no provider means apiKey
-					authModes.add(GRAPHQL_AUTH_MODE.API_KEY);
+					authModes.add('apiKey');
 				}
 				break;
 			}
@@ -140,10 +140,13 @@ export const multiAuthStrategy: (
 ) => AuthModeStrategy =
 	(amplifyContext: AmplifyContext) =>
 	async ({ schema, modelName }) => {
-		amplifyContext.Auth = amplifyContext.Auth || Auth;
 		let currentUser;
 		try {
-			currentUser = await amplifyContext.Auth.currentAuthenticatedUser();
+			const authSession = await fetchAuthSession();
+			if (authSession.tokens.accessToken) {
+				// the user is authenticated
+				currentUser = authSession;
+			}
 		} catch (e) {
 			// No current user
 		}

package/src/datastore/datastore.ts

@@ -1,15 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import { InternalAPI } from '@aws-amplify/api/internals';
-import { Auth } from '@aws-amplify/auth';
-import { Cache } from '@aws-amplify/cache';
-import {
-	Amplify,
-	ConsoleLogger as Logger,
-	Hub,
-	browserOrNode,
-	BackgroundProcessManager,
-} from '@aws-amplify/core';
+import { Amplify, Hub, Cache, ConsoleLogger } from '@aws-amplify/core';
+
 import {
 	Draft,
 	immerable,
@@ -18,8 +11,8 @@ import {
 	enablePatches,
 	Patch,
 } from 'immer';
-import { v4 as uuid4 } from 'uuid';
-import Observable, { ZenObservable } from 'zen-observable-ts';
+import { amplifyUuid, isBrowser } from '@aws-amplify/core/internals/utils';
+import { Observable, SubscriptionLike, filter } from 'rxjs';
 import { defaultAuthStrategy, multiAuthStrategy } from '../authModeStrategies';
 import {
 	isPredicatesAll,
@@ -110,14 +103,14 @@ import {
 } from '../predicates/next';
 import { getIdentifierValue } from '../sync/utils';
 import DataStoreConnectivity from '../sync/datastoreConnectivity';
+import { BackgroundProcessManager } from '@aws-amplify/core/internals/utils';
 
 setAutoFreeze(true);
 enablePatches();
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 
 const ulid = monotonicUlidFactory(Date.now());
-const { isNode } = browserOrNode();
 
 type SettingMetaData = {
 	identifier: ManagedIdentifier<Setting, 'id'>;
@@ -492,7 +485,6 @@ const checkSchemaCodegenVersion = (codegenVersion: string) => {
 	const majorVersion = 3;
 	const minorVersion = 2;
 	let isValid = false;
-
 	try {
 		const versionParts = codegenVersion.split('.');
 		const [major, minor, patch, patchrevision] = versionParts;
@@ -843,13 +835,14 @@ const createModelClass = <T extends PersistentModel>(
 						const id = isInternalModel
 							? _id
 							: modelDefinition.syncable
-							? uuid4()
+							? amplifyUuid()
 							: ulid();
 
 						(<ModelWithIDIdentifier>(<unknown>draft)).id = id;
 					} else if (isIdOptionallyManaged(modelDefinition)) {
 						// only auto-populate if the id was not provided
-						(<ModelWithIDIdentifier>(<unknown>draft)).id = draft.id || uuid4();
+						(<ModelWithIDIdentifier>(<unknown>draft)).id =
+							draft.id || amplifyUuid();
 					}
 
 					if (!isInternallyInitialized) {
@@ -1331,7 +1324,7 @@ async function checkSchemaVersion(
 	});
 }
 
-let syncSubscription: ZenObservable.Subscription;
+let syncSubscription: SubscriptionLike;
 
 function getNamespace(): SchemaNamespace {
 	const namespace: SchemaNamespace = {
@@ -1383,7 +1376,6 @@ enum DataStoreState {
 // https://github.com/aws-amplify/amplify-js/pull/10477/files#r1007363485
 class DataStore {
 	// reference to configured category instances. Used for preserving SSR context
-	private Auth = Auth;
 	private InternalAPI = InternalAPI;
 	private Cache = Cache;
 
@@ -1414,9 +1406,7 @@ class DataStore {
 	private storageAdapter!: Adapter;
 	// object that gets passed to descendent classes. Allows us to pass these down by reference
 	private amplifyContext: AmplifyContext = {
-		Auth: this.Auth,
 		InternalAPI: this.InternalAPI,
-		Cache: this.Cache,
 	};
 	private connectivityMonitor?: DataStoreConnectivity;
 
@@ -1531,6 +1521,7 @@ class DataStore {
 				await this.storage.init();
 				checkSchemaInitialized();
 				await checkSchemaVersion(this.storage, schema.version);
+
 				const { aws_appsync_graphqlEndpoint } = this.amplifyConfig;
 
 				if (aws_appsync_graphqlEndpoint) {
@@ -1540,7 +1531,6 @@ class DataStore {
 					);
 
 					this.syncPredicates = await this.processSyncExpressions();
-
 					this.sync = new SyncEngine(
 						schema,
 						namespaceResolver,
@@ -1563,11 +1553,10 @@ class DataStore {
 						.start({ fullSyncInterval: fullSyncIntervalInMilliseconds })
 						.subscribe({
 							next: ({ type, data }) => {
-								// In Node, we need to wait for queries to be synced to prevent returning empty arrays.
 								// In the Browser, we can begin returning data once subscriptions are in place.
-								const readyType = isNode
-									? ControlMessage.SYNC_ENGINE_SYNC_QUERIES_READY
-									: ControlMessage.SYNC_ENGINE_STORAGE_SUBSCRIBED;
+								const readyType = isBrowser()
+									? ControlMessage.SYNC_ENGINE_STORAGE_SUBSCRIBED
+									: ControlMessage.SYNC_ENGINE_SYNC_QUERIES_READY;
 
 								if (type === readyType) {
 									this.initResolve();
@@ -1737,7 +1726,6 @@ class DataStore {
 		return this.runningProcesses
 			.add(async () => {
 				await this.start();
-
 				if (!this.storage) {
 					throw new Error('No storage to save to');
 				}
@@ -2128,7 +2116,7 @@ class DataStore {
 		}
 
 		return new Observable<SubscriptionMessage<T>>(observer => {
-			let source: ZenObservable.Subscription;
+			let source: SubscriptionLike;
 
 			this.runningProcesses
 				.add(async () => {
@@ -2137,7 +2125,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 &&
@@ -2211,7 +2199,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;
 
@@ -2426,10 +2414,10 @@ class DataStore {
 					data?.model?.name === model.name
 				) {
 					generateAndEmitSnapshot();
-					Hub.remove('datastore', hubCallback);
+					hubRemove();
 				}
 			};
-			Hub.listen('datastore', hubCallback);
+			const hubRemove = Hub.listen('datastore', hubCallback);
 
 			return this.runningProcesses.addCleaner(async () => {
 				if (handle) {
@@ -2440,9 +2428,7 @@ class DataStore {
 	};
 
 	configure = (config: DataStoreConfig = {}) => {
-		this.amplifyContext.Auth = this.Auth;
 		this.amplifyContext.InternalAPI = this.InternalAPI;
-		this.amplifyContext.Cache = this.Cache;
 
 		const {
 			DataStore: configDataStore,
@@ -2458,9 +2444,19 @@ class DataStore {
 			...configFromAmplify
 		} = config;
 
+		const currentAppSyncConfig = Amplify.getConfig().API?.GraphQL;
+
+		const appSyncConfig = {
+			aws_appsync_graphqlEndpoint: currentAppSyncConfig?.endpoint,
+			aws_appsync_authenticationType: currentAppSyncConfig?.defaultAuthMode,
+			aws_appsync_region: currentAppSyncConfig?.region,
+			aws_appsync_apiKey: currentAppSyncConfig?.apiKey,
+		};
+
 		this.amplifyConfig = {
-			...configFromAmplify,
 			...this.amplifyConfig,
+			...configFromAmplify,
+			...(currentAppSyncConfig && appSyncConfig),
 		};
 
 		this.conflictHandler = this.setConflictHandler(config);
@@ -2752,6 +2748,11 @@ class DataStore {
 }
 
 const instance = new DataStore();
-Amplify.register(instance);
+instance.configure({});
+Hub.listen('core', capsule => {
+	if (capsule.payload.event === 'configure') {
+		instance.configure({});
+	}
+});
 
 export { DataStore as DataStoreClass, initSchema, instance as DataStore };

package/src/predicates/sort.ts

@@ -30,7 +30,9 @@ export class ModelSortPredicateCreator {
 
 					if (!fieldNames.has(field)) {
 						throw new Error(
-							`Invalid field for model. field: ${field}, model: ${modelName}`
+							`Invalid field for model. field: ${String(
+								field
+							)}, model: ${modelName}`
 						);
 					}
 

package/src/storage/adapter/InMemoryStore.ts

@@ -15,7 +15,7 @@ export class InMemoryStore {
 	};
 
 	multiRemove = async (keys: string[], callback?) => {
-		keys.forEach((k) => this.db.delete(k));
+		keys.forEach(k => this.db.delete(k));
 
 		typeof callback === 'function' && callback();
 	};

package/src/storage/adapter/IndexedDBAdapter.ts

@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { ConsoleLogger as Logger } from '@aws-amplify/core';
 import * as idb from 'idb';
 import {
 	isPredicateObj,
@@ -25,8 +24,9 @@ import {
 	isSafariCompatabilityMode,
 } from '../../util';
 import { StorageAdapterBase } from './StorageAdapterBase';
+import { ConsoleLogger } from '@aws-amplify/core';
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 
 /**
  * The point after which queries composed of multiple simple OR conditions

package/src/storage/adapter/StorageAdapterBase.ts

@@ -1,6 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { ConsoleLogger as Logger } from '@aws-amplify/core';
 import { Adapter } from './index';
 import { ModelInstanceCreator } from '../../datastore/datastore';
 import { ModelPredicateCreator } from '../../predicates';
@@ -31,8 +30,9 @@ import {
 import type { IDBPDatabase, IDBPObjectStore } from 'idb';
 import type AsyncStorageDatabase from './AsyncStorageDatabase';
 import { ModelRelationship } from '../relationship';
+import { ConsoleLogger } from '@aws-amplify/core';
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 const DB_NAME = 'amplify-datastore';
 
 export abstract class StorageAdapterBase implements Adapter {

package/src/storage/adapter/getDefaultAdapter/index.ts

@@ -1,13 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { browserOrNode, isWebWorker } from '@aws-amplify/core';
 import { Adapter } from '..';
 import IndexedDBAdapter from '../IndexedDBAdapter';
 import AsyncStorageAdapter from '../AsyncStorageAdapter';
-
+import { isWebWorker, isBrowser } from '@aws-amplify/core/internals/utils';
 const getDefaultAdapter: () => Adapter = () => {
-	const { isBrowser } = browserOrNode();
-
 	if ((isBrowser && window.indexedDB) || (isWebWorker() && self.indexedDB)) {
 		return IndexedDBAdapter as Adapter;
 	}

package/src/storage/storage.ts

@@ -1,8 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Logger, Mutex } from '@aws-amplify/core';
-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';
@@ -32,6 +30,8 @@ import {
 import { getIdentifierValue } from '../sync/utils';
 import { Adapter } from './adapter';
 import getDefaultAdapter from './adapter/getDefaultAdapter';
+import { Mutex } from '@aws-amplify/core/internals/utils';
+import { ConsoleLogger } from '@aws-amplify/core';
 
 export type StorageSubscriptionMessage<T extends PersistentModel> =
 	InternalSubscriptionMessage<T> & {
@@ -41,13 +41,11 @@ export type StorageSubscriptionMessage<T extends PersistentModel> =
 export type StorageFacade = Omit<Adapter, 'setUp'>;
 export type Storage = InstanceType<typeof StorageClass>;
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('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 +60,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 +283,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,10 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import Observable, { ZenObservable } from 'zen-observable-ts';
-import { ConsoleLogger as Logger } from '@aws-amplify/core';
+import { Observable, Observer, SubscriptionLike } from 'rxjs';
 import { ReachabilityMonitor } from './datastoreReachability';
+import { ConsoleLogger } from '@aws-amplify/core';
 
-const logger = new Logger('DataStore');
+const logger = new ConsoleLogger('DataStore');
 
 const RECONNECTING_IN = 5000; // 5s this may be configurable in the future
 
@@ -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 = {
@@ -28,7 +28,7 @@ export default class DataStoreConnectivity {
 		if (this.observer) {
 			throw new Error('Subscriber already exists');
 		}
-		return new Observable((observer) => {
+		return new Observable(observer => {
 			this.observer = observer;
 			// Will be used to forward socket connection changes, enhancing Reachability
 

package/src/sync/datastoreReachability/index.native.ts

@@ -1,6 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Reachability } from '@aws-amplify/core';
-import { default as NetInfo } from '@react-native-community/netinfo';
+import { Reachability } from '@aws-amplify/core/internals/utils';
+import { loadNetInfo } from '@aws-amplify/react-native';
 
-export const ReachabilityMonitor = new Reachability().networkMonitor(NetInfo);
+export const ReachabilityMonitor = new Reachability().networkMonitor(
+	loadNetInfo()
+);

package/src/sync/datastoreReachability/index.ts

@@ -1,5 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { Reachability } from '@aws-amplify/core';
+import { Reachability } from '@aws-amplify/core/internals/utils';
 
 export const ReachabilityMonitor = new Reachability().networkMonitor();