@aws-amplify/datastore 3.14.5-unstable.4 → 3.14.5

package/src/storage/storage.ts

@@ -25,7 +25,6 @@ import {
 	STORAGE,
 	validatePredicate,
 	valuesEqual,
-	NAMESPACES,
 } from '../util';
 import { getIdentifierValue } from '../sync/utils';
 import { Adapter } from './adapter';
@@ -41,7 +40,7 @@ export type Storage = InstanceType<typeof StorageClass>;
 
 const logger = new Logger('DataStore');
 class StorageClass implements StorageFacade {
-	private initialized: Promise<void> | undefined;
+	private initialized: Promise<void>;
 	private readonly pushStream: {
 		observable: Observable<StorageSubscriptionMessage<PersistentModel>>;
 	} & Required<
@@ -52,7 +51,7 @@ class StorageClass implements StorageFacade {
 		private readonly schema: InternalSchema,
 		private readonly namespaceResolver: NamespaceResolver,
 		private readonly getModelConstructorByModelName: (
-			namsespaceName: NAMESPACES,
+			namsespaceName: string,
 			modelName: string
 		) => PersistentModelConstructor<any>,
 		private readonly modelInstanceCreator: ModelInstanceCreator,
@@ -60,7 +59,7 @@ class StorageClass implements StorageFacade {
 		private readonly sessionId?: string
 	) {
 		this.adapter = this.adapter || getDefaultAdapter();
-		this.pushStream = new PushStream() as any;
+		this.pushStream = new PushStream();
 	}
 
 	static getNamespace() {
@@ -90,13 +89,15 @@ class StorageClass implements StorageFacade {
 			reject = rej;
 		});
 
-		this.adapter!.setUp(
-			this.schema,
-			this.namespaceResolver,
-			this.modelInstanceCreator,
-			this.getModelConstructorByModelName,
-			this.sessionId
-		).then(resolve!, reject!);
+		this.adapter
+			.setUp(
+				this.schema,
+				this.namespaceResolver,
+				this.modelInstanceCreator,
+				this.getModelConstructorByModelName,
+				this.sessionId
+			)
+			.then(resolve, reject);
 
 		await this.initialized;
 	}
@@ -108,9 +109,6 @@ class StorageClass implements StorageFacade {
 		patchesTuple?: [Patch[], PersistentModel]
 	): Promise<[T, OpType.INSERT | OpType.UPDATE][]> {
 		await this.init();
-		if (!this.adapter) {
-			throw new Error('Storage adapter is missing');
-		}
 
 		const result = await this.adapter.save(model, condition);
 
@@ -154,14 +152,11 @@ class StorageClass implements StorageFacade {
 				.constructor as PersistentModelConstructor<T>;
 
 			this.pushStream.next({
-				model: modelConstructor as any,
+				model: modelConstructor,
 				opType,
 				element,
 				mutator,
-				condition:
-					(condition &&
-						ModelPredicateCreator.getPredicates(condition, false)) ||
-					null,
+				condition: ModelPredicateCreator.getPredicates(condition, false),
 				savedElement,
 			});
 		});
@@ -185,12 +180,9 @@ class StorageClass implements StorageFacade {
 		mutator?: Symbol
 	): Promise<[T[], T[]]> {
 		await this.init();
-		if (!this.adapter) {
-			throw new Error('Storage adapter is missing');
-		}
 
+		let deleted: T[];
 		let models: T[];
-		let deleted: T[] | undefined;
 
 		[models, deleted] = await this.adapter.delete(
 			modelOrModelConstructor,
@@ -224,21 +216,21 @@ class StorageClass implements StorageFacade {
 			const modelConstructor = (Object.getPrototypeOf(model) as Object)
 				.constructor as PersistentModelConstructor<T>;
 
-			let theCondition: PredicatesGroup<any> | undefined;
+			let theCondition: PredicatesGroup<any>;
 
 			if (!isModelConstructor(modelOrModelConstructor)) {
 				const modelId = getIdentifierValue(modelDefinition, model);
 				theCondition = modelIds.has(modelId)
-					? ModelPredicateCreator.getPredicates(condition!, false)
+					? ModelPredicateCreator.getPredicates(condition, false)
 					: undefined;
 			}
 
 			this.pushStream.next({
-				model: modelConstructor as any,
+				model: modelConstructor,
 				opType: OpType.DELETE,
 				element: model,
 				mutator,
-				condition: theCondition || null,
+				condition: theCondition,
 			});
 		});
 
@@ -251,9 +243,6 @@ class StorageClass implements StorageFacade {
 		pagination?: PaginationInput<T>
 	): Promise<T[]> {
 		await this.init();
-		if (!this.adapter) {
-			throw new Error('Storage adapter is missing');
-		}
 
 		return await this.adapter.query(modelConstructor, predicate, pagination);
 	}
@@ -261,24 +250,22 @@ class StorageClass implements StorageFacade {
 	async queryOne<T extends PersistentModel>(
 		modelConstructor: PersistentModelConstructor<T>,
 		firstOrLast: QueryOne = QueryOne.FIRST
-	): Promise<T | undefined> {
+	): Promise<T> {
 		await this.init();
-		if (!this.adapter) {
-			throw new Error('Storage adapter is missing');
-		}
 
-		return await this.adapter.queryOne(modelConstructor, firstOrLast);
+		const record = await this.adapter.queryOne(modelConstructor, firstOrLast);
+		return record;
 	}
 
 	observe<T extends PersistentModel>(
-		modelConstructor?: PersistentModelConstructor<T> | null,
-		predicate?: ModelPredicate<T> | null,
+		modelConstructor?: PersistentModelConstructor<T>,
+		predicate?: ModelPredicate<T>,
 		skipOwn?: Symbol
 	): Observable<SubscriptionMessage<T>> {
 		const listenToAll = !modelConstructor;
 		const { predicates, type } =
-			(predicate && ModelPredicateCreator.getPredicates(predicate, false)) ||
-			{};
+			ModelPredicateCreator.getPredicates(predicate, false) || {};
+		const hasPredicate = !!predicates;
 
 		let result = this.pushStream.observable
 			.filter(({ mutator }) => {
@@ -294,7 +281,7 @@ class StorageClass implements StorageFacade {
 					return false;
 				}
 
-				if (!!predicates && !!type) {
+				if (hasPredicate) {
 					return validatePredicate(element, type, predicates);
 				}
 
@@ -307,9 +294,6 @@ class StorageClass implements StorageFacade {
 
 	async clear(completeObservable = true) {
 		this.initialized = undefined;
-		if (!this.adapter) {
-			throw new Error('Storage adapter is missing');
-		}
 
 		await this.adapter.clear();
 
@@ -324,9 +308,6 @@ class StorageClass implements StorageFacade {
 		mutator?: Symbol
 	): Promise<[T, OpType][]> {
 		await this.init();
-		if (!this.adapter) {
-			throw new Error('Storage adapter is missing');
-		}
 
 		const result = await this.adapter.batchSave(modelConstructor, items);
 
@@ -336,7 +317,7 @@ class StorageClass implements StorageFacade {
 				opType,
 				element,
 				mutator,
-				condition: null,
+				condition: undefined,
 			});
 		});
 
@@ -354,7 +335,7 @@ class StorageClass implements StorageFacade {
 			return null;
 		}
 
-		const [patches, source] = patchesTuple!;
+		const [patches, source] = patchesTuple;
 		const updatedElement = {};
 		// extract array of updated fields from patches
 		const updatedFields = <string[]>(
@@ -368,7 +349,7 @@ class StorageClass implements StorageFacade {
 		const { fields } =
 			this.schema.namespaces[namespace].models[modelConstructor.name];
 		const { primaryKey, compositeKeys = [] } =
-			this.schema.namespaces[namespace].keys?.[modelConstructor.name] || {};
+			this.schema.namespaces[namespace].keys[modelConstructor.name];
 
 		// set original values for these fields
 		updatedFields.forEach((field: string) => {
@@ -459,7 +440,7 @@ class ExclusiveStorage implements StorageFacade {
 		schema: InternalSchema,
 		namespaceResolver: NamespaceResolver,
 		getModelConstructorByModelName: (
-			namsespaceName: NAMESPACES,
+			namsespaceName: string,
 			modelName: string
 		) => PersistentModelConstructor<any>,
 		modelInstanceCreator: ModelInstanceCreator,
@@ -510,11 +491,11 @@ class ExclusiveStorage implements StorageFacade {
 			if (isModelConstructor(modelOrModelConstructor)) {
 				const modelConstructor = modelOrModelConstructor;
 
-				return storage.delete(modelConstructor as any, condition, mutator);
+				return storage.delete(modelConstructor, condition, mutator);
 			} else {
 				const model = modelOrModelConstructor;
 
-				return storage.delete(model as any, condition, mutator);
+				return storage.delete(model, condition, mutator);
 			}
 		});
 	}
@@ -532,8 +513,8 @@ class ExclusiveStorage implements StorageFacade {
 	async queryOne<T extends PersistentModel>(
 		modelConstructor: PersistentModelConstructor<T>,
 		firstOrLast: QueryOne = QueryOne.FIRST
-	): Promise<T | undefined> {
-		return this.runExclusive<T | undefined>(storage =>
+	): Promise<T> {
+		return this.runExclusive<T>(storage =>
 			storage.queryOne<T>(modelConstructor, firstOrLast)
 		);
 	}
@@ -543,8 +524,8 @@ class ExclusiveStorage implements StorageFacade {
 	}
 
 	observe<T extends PersistentModel>(
-		modelConstructor?: PersistentModelConstructor<T> | null,
-		predicate?: ModelPredicate<T> | null,
+		modelConstructor?: PersistentModelConstructor<T>,
+		predicate?: ModelPredicate<T>,
 		skipOwn?: Symbol
 	): Observable<SubscriptionMessage<T>> {
 		return this.storage.observe(modelConstructor, predicate, skipOwn);

package/src/sync/datastoreConnectivity.ts

@@ -13,9 +13,9 @@ type ConnectionStatus = {
 
 export default class DataStoreConnectivity {
 	private connectionStatus: ConnectionStatus;
-	private observer!: ZenObservable.SubscriptionObserver<ConnectionStatus>;
-	private subscription!: ZenObservable.Subscription;
-	private timeout!: ReturnType<typeof setTimeout>;
+	private observer: ZenObservable.SubscriptionObserver<ConnectionStatus>;
+	private subscription: ZenObservable.Subscription;
+	private timeout: ReturnType<typeof setTimeout>;
 	constructor() {
 		this.connectionStatus = {
 			online: false,
@@ -26,7 +26,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/index.ts

@@ -32,7 +32,7 @@ import {
 // tslint:disable:no-duplicate-imports
 import type { __modelMeta__ } from '../types';
 
-import { getNow, SYNC, USER } from '../util';
+import { exhaustiveCheck, getNow, SYNC, USER } from '../util';
 import DataStoreConnectivity from './datastoreConnectivity';
 import { ModelMerger } from './merger';
 import { MutationEventOutbox } from './outbox';
@@ -122,7 +122,7 @@ export class SyncEngine {
 	public getModelSyncedStatus(
 		modelConstructor: PersistentModelConstructor<any>
 	): boolean {
-		return this.modelSyncedStatus.get(modelConstructor)!;
+		return this.modelSyncedStatus.get(modelConstructor);
 	}
 
 	constructor(
@@ -235,8 +235,14 @@ export class SyncEngine {
 										);
 									} else {
 										//#region GraphQL Subscriptions
-										[ctlSubsObservable, dataSubsObservable] =
-											this.subscriptionsProcessor.start();
+										[
+											// const ctlObservable: Observable<CONTROL_MSG>
+											ctlSubsObservable,
+											// const dataObservable: Observable<[TransformerMutationType, SchemaModel, Readonly<{
+											// id: string;
+											// } & Record<string, any>>]>
+											dataSubsObservable,
+										] = this.subscriptionsProcessor.start();
 
 										try {
 											await new Promise((resolve, reject) => {
@@ -356,7 +362,7 @@ export class SyncEngine {
 									// TODO: extract to function
 									if (!isNode) {
 										subscriptions.push(
-											dataSubsObservable!.subscribe(
+											dataSubsObservable.subscribe(
 												([_transformerMutationType, modelDefinition, item]) =>
 													this.runningProcesses.add(async () => {
 														const modelConstructor = this.userModelClasses[
@@ -415,11 +421,11 @@ export class SyncEngine {
 								] as PersistentModelConstructor<MutationEvent>;
 								const modelDefinition = this.getModelDefinition(model);
 								const graphQLCondition = predicateToGraphQLCondition(
-									condition!,
+									condition,
 									modelDefinition
 								);
 								const mutationEvent = createMutationInstanceFromModelOperation(
-									namespace.relationships!,
+									namespace.relationships,
 									this.getModelDefinition(model),
 									opType,
 									model,
@@ -494,7 +500,7 @@ export class SyncEngine {
 					fullSyncInterval,
 					lastSyncPredicate,
 				}) => {
-					const nextFullSync = lastFullSync! + fullSyncInterval;
+					const nextFullSync = lastFullSync + fullSyncInterval;
 					const syncFrom =
 						!lastFullSync || nextFullSync < currentTimeStamp
 							? 0 // perform full sync if expired
@@ -502,7 +508,7 @@ export class SyncEngine {
 
 					return [
 						this.schema.namespaces[namespace].models[model],
-						[namespace, syncFrom!],
+						[namespace, syncFrom],
 					];
 				}
 			)
@@ -625,7 +631,7 @@ export class SyncEngine {
 												))
 											);
 
-											const counts = count.get(modelConstructor)!;
+											const counts = count.get(modelConstructor);
 
 											opTypeCount.forEach(([, opType]) => {
 												switch (opType) {
@@ -639,7 +645,7 @@ export class SyncEngine {
 														counts.deleted++;
 														break;
 													default:
-														throw new Error(`Invalid opType ${opType}`);
+														exhaustiveCheck(opType);
 												}
 											});
 										});
@@ -659,10 +665,10 @@ export class SyncEngine {
 
 											newestFullSyncStartedAt =
 												newestFullSyncStartedAt === undefined
-													? lastFullSync!
+													? lastFullSync
 													: Math.max(
 															newestFullSyncStartedAt,
-															isFullSync ? startedAt : lastFullSync!
+															isFullSync ? startedAt : lastFullSync
 													  );
 
 											modelMetadata = (
@@ -722,9 +728,9 @@ export class SyncEngine {
 						});
 
 						const msNextFullSync =
-							newestFullSyncStartedAt! +
-							theInterval! -
-							(newestStartedAt! + duration!);
+							newestFullSyncStartedAt +
+							theInterval -
+							(newestStartedAt + duration);
 
 						logger.debug(
 							`Next fullSync in ${msNextFullSync / 1000} seconds. (${new Date(
@@ -837,7 +843,7 @@ export class SyncEngine {
 		const promises = models.map(async ([namespace, model]) => {
 			const modelMetadata = await this.getModelMetadata(namespace, model.name);
 			const syncPredicate = ModelPredicateCreator.getPredicates(
-				this.syncPredicates.get(model)!,
+				this.syncPredicates.get(model),
 				false
 			);
 			const lastSyncPredicate = syncPredicate
@@ -849,9 +855,9 @@ export class SyncEngine {
 					this.modelInstanceCreator(ModelMetadataConstructor, {
 						model: model.name,
 						namespace,
-						lastSync: null!,
+						lastSync: null,
 						fullSyncInterval,
-						lastFullSync: null!,
+						lastFullSync: null,
 						lastSyncPredicate,
 					}),
 					undefined,
@@ -869,9 +875,9 @@ export class SyncEngine {
 						// perform a base sync if the syncPredicate changed in between calls to DataStore.start
 						// ensures that the local store contains all the data specified by the syncExpression
 						if (syncPredicateUpdated) {
-							draft.lastSync = null!;
-							draft.lastFullSync = null!;
-							(draft.lastSyncPredicate as any) = lastSyncPredicate;
+							draft.lastSync = null;
+							draft.lastFullSync = null;
+							draft.lastSyncPredicate = lastSyncPredicate;
 						}
 					})
 				);

package/src/sync/merger.ts

@@ -44,7 +44,7 @@ class ModelMerger {
 			}
 		}
 
-		return result!;
+		return result;
 	}
 
 	public async mergePage(

package/src/sync/outbox.ts

@@ -19,7 +19,7 @@ import { getIdentifierValue, TransformerMutationType } from './utils';
 // TODO: Persist deleted ids
 // https://github.com/aws-amplify/amplify-js/blob/datastore-docs/packages/datastore/docs/sync-engine.md#outbox
 class MutationEventOutbox {
-	private inProgressMutationEventId!: string;
+	private inProgressMutationEventId: string;
 
 	constructor(
 		private readonly schema: InternalSchema,
@@ -88,7 +88,7 @@ class MutationEventOutbox {
 					await s.delete(this.MutationEvent, predicate);
 				}
 
-				merged = merged! || mutationEvent;
+				merged = merged || mutationEvent;
 
 				// Enqueue new one
 				await s.save(merged, undefined, this.ownSymbol);
@@ -104,11 +104,11 @@ class MutationEventOutbox {
 		const head = await this.peek(storage);
 
 		if (record) {
-			await this.syncOutboxVersionsOnDequeue(storage, record, head, recordOp!);
+			await this.syncOutboxVersionsOnDequeue(storage, record, head, recordOp);
 		}
 
 		await storage.delete(head);
-		this.inProgressMutationEventId = undefined!;
+		this.inProgressMutationEventId = undefined;
 
 		return head;
 	}
@@ -121,9 +121,9 @@ class MutationEventOutbox {
 	public async peek(storage: StorageFacade): Promise<MutationEvent> {
 		const head = await storage.queryOne(this.MutationEvent, QueryOne.FIRST);
 
-		this.inProgressMutationEventId = head ? head.id : undefined!;
+		this.inProgressMutationEventId = head ? head.id : undefined;
 
-		return head!;
+		return head;
 	}
 
 	public async getForModel<T extends PersistentModel>(

package/src/sync/processors/errorMaps.ts

@@ -85,7 +85,7 @@ export function mapErrorToType(errorMap: ErrorMap, error: Error): ErrorType {
 	const errorTypes = [...Object.keys(errorMap)] as ErrorType[];
 	for (const errorType of errorTypes) {
 		const matcher = errorMap[errorType];
-		if (matcher?.(error)) {
+		if (matcher(error)) {
 			return errorType;
 		}
 	}

package/src/sync/processors/mutation.ts

@@ -1,4 +1,4 @@
-import { API, GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
+import API, { GraphQLResult, GRAPHQL_AUTH_MODE } from '@aws-amplify/api';
 import {
 	ConsoleLogger as Logger,
 	jitteredBackoff,
@@ -29,6 +29,7 @@ import {
 	AmplifyContext,
 } from '../../types';
 import {
+	exhaustiveCheck,
 	extractTargetNamesFromSrc,
 	USER,
 	USER_AGENT_SUFFIX_DATASTORE,
@@ -56,7 +57,7 @@ type MutationProcessorEvent = {
 };
 
 class MutationProcessor {
-	private observer!: ZenObservable.Observer<MutationProcessorEvent>;
+	private observer: ZenObservable.Observer<MutationProcessorEvent>;
 	private readonly typeQuery = new WeakMap<
 		SchemaModel,
 		[TransformerMutationType, string, string][]
@@ -117,8 +118,6 @@ class MutationProcessor {
 	}
 
 	public start(): Observable<MutationProcessorEvent> {
-		this.runningProcesses = new BackgroundProcessManager();
-
 		const observable = new Observable<MutationProcessorEvent>(observer => {
 			this.observer = observer;
 
@@ -167,10 +166,9 @@ class MutationProcessor {
 					const modelConstructor = this.userClasses[
 						model
 					] as PersistentModelConstructor<MutationEvent>;
-					let result: GraphQLResult<Record<string, PersistentModel>> =
-						undefined!;
-					let opName: string = undefined!;
-					let modelDefinition: SchemaModel = undefined!;
+					let result: GraphQLResult<Record<string, PersistentModel>>;
+					let opName: string;
+					let modelDefinition: SchemaModel;
 
 					try {
 						const modelAuthModes = await getModelAuthModes({
@@ -195,7 +193,7 @@ class MutationProcessor {
 									operation,
 									data,
 									condition,
-									modelConstructor as any,
+									modelConstructor,
 									this.MutationEvent,
 									head,
 									operationAuthModes[authModeAttempts],
@@ -246,7 +244,7 @@ class MutationProcessor {
 						continue;
 					}
 
-					const record = result.data![opName!];
+					const record = result.data[opName];
 					let hasMore = false;
 
 					await this.storage.runExclusive(async storage => {
@@ -256,7 +254,7 @@ class MutationProcessor {
 						hasMore = (await this.outbox.peek(storage)) !== undefined;
 					});
 
-					this.observer.next!({
+					this.observer.next({
 						operation,
 						modelDefinition,
 						model: record,
@@ -324,8 +322,9 @@ class MutationProcessor {
 							await this.amplifyContext.API.graphql(tryWith)
 						);
 
-						// Use `as any` because TypeScript doesn't seem to like passing tuples
-						// through generic params.
+
+						// `as any` because TypeScript doesn't seem to like passing tuples
+						// through generic params???
 						return [result, opName, modelDefinition] as any;
 					} catch (err) {
 						if (err.errors && err.errors.length > 0) {
@@ -356,7 +355,7 @@ class MutationProcessor {
 									retryWith = DISCARD;
 								} else {
 									try {
-										retryWith = await this.conflictHandler!({
+										retryWith = await this.conflictHandler({
 											modelConstructor,
 											localModel: this.modelInstanceCreator(
 												modelConstructor,
@@ -409,7 +408,7 @@ class MutationProcessor {
 								// convert retry with to tryWith
 								const updatedMutation =
 									createMutationInstanceFromModelOperation(
-										namespace.relationships!,
+										namespace.relationships,
 										modelDefinition,
 										opType,
 										modelConstructor,
@@ -437,7 +436,7 @@ class MutationProcessor {
 										cause: error,
 										remoteModel: error.data
 											? this.modelInstanceCreator(modelConstructor, error.data)
-											: null!,
+											: null,
 									});
 								} catch (err) {
 									logger.warn('Mutation error handler failed with:', err);
@@ -482,13 +481,13 @@ class MutationProcessor {
 		condition: string
 	): [string, Record<string, any>, GraphQLCondition, string, SchemaModel] {
 		const modelDefinition = this.schema.namespaces[namespaceName].models[model];
-		const { primaryKey } = this.schema.namespaces[namespaceName].keys![model];
+		const { primaryKey } = this.schema.namespaces[namespaceName].keys[model];
 
 		const queriesTuples = this.typeQuery.get(modelDefinition);
 
-		const [, opName, query] = queriesTuples!.find(
+		const [, opName, query] = queriesTuples.find(
 			([transformerMutationType]) => transformerMutationType === operation
-		)!;
+		);
 
 		const { _version, ...parsedData } = <ModelInstanceMetadata>JSON.parse(data);
 
@@ -581,11 +580,8 @@ class MutationProcessor {
 			case TransformerMutationType.GET: // Intentionally blank
 				break;
 			default:
-				throw new Error(`Invalid operation ${operation}`);
+				exhaustiveCheck(operation);
 		}
-
-		// because it makes TS happy ...
-		return undefined!;
 	}
 
 	public pause() {