@aws-amplify/datastore 4.7.5 → 5.0.1-console-preview.4208d73.0

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 } from '@aws-amplify/core';
+
 import {
 	Draft,
 	immerable,
@@ -110,6 +103,10 @@ import {
 } from '../predicates/next';
 import { getIdentifierValue } from '../sync/utils';
 import DataStoreConnectivity from '../sync/datastoreConnectivity';
+import {
+	BackgroundProcessManager,
+	Logger,
+} from '@aws-amplify/core/internals/utils';
 
 setAutoFreeze(true);
 enablePatches();
@@ -117,7 +114,6 @@ enablePatches();
 const logger = new Logger('DataStore');
 
 const ulid = monotonicUlidFactory(Date.now());
-const { isNode } = browserOrNode();
 
 type SettingMetaData = {
 	identifier: ManagedIdentifier<Setting, 'id'>;
@@ -492,7 +488,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;
@@ -1383,7 +1378,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 +1408,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 +1523,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 +1533,6 @@ class DataStore {
 					);
 
 					this.syncPredicates = await this.processSyncExpressions();
-
 					this.sync = new SyncEngine(
 						schema,
 						namespaceResolver,
@@ -1563,11 +1555,8 @@ 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 = ControlMessage.SYNC_ENGINE_STORAGE_SUBSCRIBED;
 
 								if (type === readyType) {
 									this.initResolve();
@@ -2426,10 +2415,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 +2429,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 +2445,24 @@ class DataStore {
 			...configFromAmplify
 		} = config;
 
+		let apiKey = '';
+		const currentAppSyncConfig = Amplify.getConfig().API?.AppSync;
+		if (currentAppSyncConfig?.defaultAuthMode.type === 'apiKey') {
+			apiKey = currentAppSyncConfig.defaultAuthMode.apiKey;
+		}
+
+		const appSyncConfig = {
+			aws_appsync_graphqlEndpoint: currentAppSyncConfig?.endpoint,
+			aws_appsync_authenticationType:
+				currentAppSyncConfig?.defaultAuthMode.type,
+			aws_appsync_region: currentAppSyncConfig?.region,
+			aws_appsync_apiKey: apiKey,
+		};
+
 		this.amplifyConfig = {
-			...configFromAmplify,
 			...this.amplifyConfig,
+			...configFromAmplify,
+			...(currentAppSyncConfig && appSyncConfig),
 		};
 
 		this.conflictHandler = this.setConflictHandler(config);
@@ -2752,6 +2754,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,6 +24,7 @@ import {
 	isSafariCompatabilityMode,
 } from '../../util';
 import { StorageAdapterBase } from './StorageAdapterBase';
+import { Logger } from '@aws-amplify/core/internals/utils';
 
 const logger = new Logger('DataStore');
 

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,6 +30,7 @@ import {
 import type { IDBPDatabase, IDBPObjectStore } from 'idb';
 import type AsyncStorageDatabase from './AsyncStorageDatabase';
 import { ModelRelationship } from '../relationship';
+import { Logger } from '@aws-amplify/core/internals/utils';
 
 const logger = new Logger('DataStore');
 const DB_NAME = 'amplify-datastore';

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

@@ -1,12 +1,11 @@
 // 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 } from '@aws-amplify/core/internals/utils';
 const getDefaultAdapter: () => Adapter = () => {
-	const { isBrowser } = browserOrNode();
+	const isBrowser = true; // TODO(v6): Update this for SSR
 
 	if ((isBrowser && window.indexedDB) || (isWebWorker() && self.indexedDB)) {
 		return IndexedDBAdapter as Adapter;

package/src/storage/storage.ts

@@ -1,6 +1,5 @@
 // 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 { Patch } from 'immer';
@@ -32,6 +31,7 @@ import {
 import { getIdentifierValue } from '../sync/utils';
 import { Adapter } from './adapter';
 import getDefaultAdapter from './adapter/getDefaultAdapter';
+import { Logger, Mutex } from '@aws-amplify/core/internals/utils';
 
 export type StorageSubscriptionMessage<T extends PersistentModel> =
 	InternalSubscriptionMessage<T> & {

package/src/sync/datastoreConnectivity.ts

@@ -1,8 +1,8 @@
 // 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 { ReachabilityMonitor } from './datastoreReachability';
+import { Logger } from '@aws-amplify/core/internals/utils';
 
 const logger = new Logger('DataStore');
 
@@ -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,6 @@
 // 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';
 import { default as NetInfo } from '@react-native-community/netinfo';
 
 export const ReachabilityMonitor = new Reachability().networkMonitor(NetInfo);

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();

package/src/sync/index.ts

@@ -1,16 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import {
-	browserOrNode,
-	ConsoleLogger as Logger,
+	Logger,
 	BackgroundProcessManager,
-	Hub,
-} from '@aws-amplify/core';
-import {
-	CONTROL_MSG as PUBSUB_CONTROL_MSG,
-	CONNECTION_STATE_CHANGE as PUBSUB_CONNECTION_STATE_CHANGE,
-	ConnectionState,
-} from '@aws-amplify/pubsub';
+} from '@aws-amplify/core/internals/utils';
+import { Hub } from '@aws-amplify/core';
+
 import Observable, { ZenObservable } from 'zen-observable-ts';
 import { ModelInstanceCreator } from '../datastore/datastore';
 import { ModelPredicateCreator } from '../predicates';
@@ -53,7 +48,12 @@ import {
 	TransformerMutationType,
 } from './utils';
 
-const { isNode } = browserOrNode();
+import {
+	CONTROL_MSG as PUBSUB_CONTROL_MSG,
+	ConnectionState,
+	CONNECTION_STATE_CHANGE as PUBSUB_CONNECTION_STATE_CHANGE,
+} from '@aws-amplify/api-graphql';
+
 const logger = new Logger('DataStore');
 
 const ownSymbol = Symbol('sync');
@@ -249,53 +249,47 @@ export class SyncEngine {
 											[TransformerMutationType, SchemaModel, PersistentModel]
 										>;
 
-										// NOTE: need a way to override this conditional for testing.
-										if (isNode) {
-											logger.warn(
-												'Realtime disabled when in a server-side environment'
-											);
-										} else {
-											this.stopDisruptionListener =
-												this.startDisruptionListener();
-											//#region GraphQL Subscriptions
-											[ctlSubsObservable, dataSubsObservable] =
-												this.subscriptionsProcessor.start();
-
-											try {
-												await new Promise<void>((resolve, reject) => {
-													onTerminate.then(reject);
-													const ctlSubsSubscription =
-														ctlSubsObservable.subscribe({
-															next: msg => {
-																if (msg === CONTROL_MSG.CONNECTED) {
-																	resolve();
-																}
-															},
-															error: err => {
-																reject(err);
-																const handleDisconnect =
-																	this.disconnectionHandler();
-																handleDisconnect(err);
-															},
-														});
-
-													subscriptions.push(ctlSubsSubscription);
-												});
-											} catch (err) {
-												observer.error(err);
-												failedStarting();
-												return;
-											}
+										this.stopDisruptionListener =
+											this.startDisruptionListener();
+										//#region GraphQL Subscriptions
+										[ctlSubsObservable, dataSubsObservable] =
+											this.subscriptionsProcessor.start();
 
-											logger.log('Realtime ready');
+										try {
+											await new Promise<void>((resolve, reject) => {
+												onTerminate.then(reject);
+												const ctlSubsSubscription = ctlSubsObservable.subscribe(
+													{
+														next: msg => {
+															if (msg === CONTROL_MSG.CONNECTED) {
+																resolve();
+															}
+														},
+														error: err => {
+															reject(err);
+															const handleDisconnect =
+																this.disconnectionHandler();
+															handleDisconnect(err);
+														},
+													}
+												);
 
-											observer.next({
-												type: ControlMessage.SYNC_ENGINE_SUBSCRIPTIONS_ESTABLISHED,
+												subscriptions.push(ctlSubsSubscription);
 											});
-
-											//#endregion
+										} catch (err) {
+											observer.error(err);
+											failedStarting();
+											return;
 										}
 
+										logger.log('Realtime ready');
+
+										observer.next({
+											type: ControlMessage.SYNC_ENGINE_SUBSCRIPTIONS_ESTABLISHED,
+										});
+
+										//#endregion
+
 										//#region Base & Sync queries
 										try {
 											await new Promise<void>((resolve, reject) => {
@@ -376,32 +370,29 @@ export class SyncEngine {
 										//#endregion
 
 										//#region Merge subscriptions buffer
-										// TODO: extract to function
-										if (!isNode) {
-											subscriptions.push(
-												dataSubsObservable!.subscribe(
-													([_transformerMutationType, modelDefinition, item]) =>
-														this.runningProcesses.add(async () => {
-															const modelConstructor = this.userModelClasses[
-																modelDefinition.name
-															] as PersistentModelConstructor<any>;
-
-															const model = this.modelInstanceCreator(
-																modelConstructor,
-																item
-															);
-
-															await this.storage.runExclusive(storage =>
-																this.modelMerger.merge(
-																	storage,
-																	model,
-																	modelDefinition
-																)
-															);
-														}, 'subscription dataSubsObservable event')
-												)
-											);
-										}
+										subscriptions.push(
+											dataSubsObservable!.subscribe(
+												([_transformerMutationType, modelDefinition, item]) =>
+													this.runningProcesses.add(async () => {
+														const modelConstructor = this.userModelClasses[
+															modelDefinition.name
+														] as PersistentModelConstructor<any>;
+
+														const model = this.modelInstanceCreator(
+															modelConstructor,
+															item
+														);
+
+														await this.storage.runExclusive(storage =>
+															this.modelMerger.merge(
+																storage,
+																model,
+																modelDefinition
+															)
+														);
+													}, 'subscription dataSubsObservable event')
+											)
+										);
 										//#endregion
 									} else if (!online) {
 										this.online = online;

package/src/sync/processors/mutation.ts

@@ -1,17 +1,20 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-import { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
+import { GraphQLResult } from '@aws-amplify/api';
 import { InternalAPI } from '@aws-amplify/api/internals';
 import {
 	Category,
-	ConsoleLogger as Logger,
+	Logger,
 	CustomUserAgentDetails,
 	DataStoreAction,
 	jitteredBackoff,
 	NonRetryableError,
 	retry,
 	BackgroundProcessManager,
-} from '@aws-amplify/core';
+	GraphQLAuthModeKeys,
+	AmplifyError,
+} from '@aws-amplify/core/internals/utils';
+
 import Observable, { ZenObservable } from 'zen-observable-ts';
 import { MutationEvent } from '../';
 import { ModelInstanceCreator } from '../../datastore/datastore';
@@ -161,8 +164,8 @@ class MutationProcessor {
 	}
 
 	public async resume(): Promise<void> {
-		await (this.runningProcesses.isOpen &&
-			this.runningProcesses.add(async onTerminate => {
+		if (this.runningProcesses.isOpen) {
+			await this.runningProcesses.add(async onTerminate => {
 				if (
 					this.processing ||
 					!this.isReady() ||
@@ -170,7 +173,6 @@ class MutationProcessor {
 				) {
 					return;
 				}
-
 				this.processing = true;
 				let head: MutationEvent;
 				const namespaceName = USER;
@@ -300,7 +302,8 @@ class MutationProcessor {
 
 				// pauses itself
 				this.pause();
-			}, 'mutation resume loop'));
+			}, 'mutation resume loop');
+		}
 	}
 
 	private async jitteredRetry(
@@ -312,7 +315,7 @@ class MutationProcessor {
 		modelConstructor: PersistentModelConstructor<PersistentModel>,
 		MutationEvent: PersistentModelConstructor<MutationEvent>,
 		mutationEvent: MutationEvent,
-		authMode: GRAPHQL_AUTH_MODE,
+		authMode: GraphQLAuthModeKeys,
 		onTerminate: Promise<void>
 	): Promise<
 		[GraphQLResult<Record<string, PersistentModel>>, string, SchemaModel]
@@ -544,7 +547,7 @@ class MutationProcessor {
 
 		// include all the fields that comprise a custom PK if one is specified
 		const deleteInput = {};
-		if (primaryKey?.length) {
+		if (primaryKey && primaryKey.length) {
 			for (const pkField of primaryKey) {
 				deleteInput[pkField] = parsedData[pkField];
 			}
@@ -679,7 +682,10 @@ export const safeJitteredBackoff: typeof originalJitteredBackoff = (
 	const attemptResult = originalJitteredBackoff(attempt);
 
 	// If this is the last attempt and it is a network error, we retry indefinitively every 5 minutes
-	if (attemptResult === false && error?.message === 'Network Error') {
+	if (
+		attemptResult === false &&
+		((error || {}) as any).message === 'Network Error'
+	) {
 		return MAX_RETRY_DELAY_MS;
 	}