@aws-amplify/datastore 3.12.6-next.36 → 3.12.6-next.41

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

@@ -29,7 +29,6 @@ import {
 	AmplifyContext,
 } from '../../types';
 import {
-	exhaustiveCheck,
 	extractTargetNamesFromSrc,
 	USER,
 	USER_AGENT_SUFFIX_DATASTORE,
@@ -57,7 +56,7 @@ type MutationProcessorEvent = {
 };
 
 class MutationProcessor {
-	private observer: ZenObservable.Observer<MutationProcessorEvent>;
+	private observer!: ZenObservable.Observer<MutationProcessorEvent>;
 	private readonly typeQuery = new WeakMap<
 		SchemaModel,
 		[TransformerMutationType, string, string][]
@@ -118,6 +117,8 @@ class MutationProcessor {
 	}
 
 	public start(): Observable<MutationProcessorEvent> {
+		this.runningProcesses = new BackgroundProcessManager();
+
 		const observable = new Observable<MutationProcessorEvent>(observer => {
 			this.observer = observer;
 
@@ -166,9 +167,10 @@ class MutationProcessor {
 					const modelConstructor = this.userClasses[
 						model
 					] as PersistentModelConstructor<MutationEvent>;
-					let result: GraphQLResult<Record<string, PersistentModel>>;
-					let opName: string;
-					let modelDefinition: SchemaModel;
+					let result: GraphQLResult<Record<string, PersistentModel>> =
+						undefined!;
+					let opName: string = undefined!;
+					let modelDefinition: SchemaModel = undefined!;
 
 					try {
 						const modelAuthModes = await getModelAuthModes({
@@ -193,7 +195,7 @@ class MutationProcessor {
 									operation,
 									data,
 									condition,
-									modelConstructor,
+									modelConstructor as any,
 									this.MutationEvent,
 									head,
 									operationAuthModes[authModeAttempts],
@@ -244,7 +246,7 @@ class MutationProcessor {
 						continue;
 					}
 
-					const record = result.data[opName];
+					const record = result.data![opName!];
 					let hasMore = false;
 
 					await this.storage.runExclusive(async storage => {
@@ -254,7 +256,7 @@ class MutationProcessor {
 						hasMore = (await this.outbox.peek(storage)) !== undefined;
 					});
 
-					this.observer.next({
+					this.observer.next!({
 						operation,
 						modelDefinition,
 						model: record,
@@ -322,8 +324,8 @@ class MutationProcessor {
 							await this.amplifyContext.API.graphql(tryWith)
 						);
 
-						// `as any` because TypeScript doesn't seem to like passing tuples
-						// through generic params???
+						// Use `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) {
@@ -354,7 +356,7 @@ class MutationProcessor {
 									retryWith = DISCARD;
 								} else {
 									try {
-										retryWith = await this.conflictHandler({
+										retryWith = await this.conflictHandler!({
 											modelConstructor,
 											localModel: this.modelInstanceCreator(
 												modelConstructor,
@@ -407,7 +409,7 @@ class MutationProcessor {
 								// convert retry with to tryWith
 								const updatedMutation =
 									createMutationInstanceFromModelOperation(
-										namespace.relationships,
+										namespace.relationships!,
 										modelDefinition,
 										opType,
 										modelConstructor,
@@ -435,7 +437,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);
@@ -480,13 +482,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);
 
@@ -579,8 +581,11 @@ class MutationProcessor {
 			case TransformerMutationType.GET: // Intentionally blank
 				break;
 			default:
-				exhaustiveCheck(operation);
+				throw new Error(`Invalid operation ${operation}`);
 		}
+
+		// because it makes TS happy ...
+		return undefined!;
 	}
 
 	public pause() {

package/src/sync/processors/subscription.ts

@@ -59,7 +59,7 @@ class SubscriptionProcessor {
 	>();
 	private buffer: [TransformerMutationType, SchemaModel, PersistentModel][] =
 		[];
-	private dataObserver: ZenObservable.Observer<any>;
+	private dataObserver!: ZenObservable.Observer<any>;
 
 	private runningProcesses = new BackgroundProcessManager();
 
@@ -105,7 +105,7 @@ class SubscriptionProcessor {
 			model,
 			transformerMutationType,
 			isOwner,
-			ownerField
+			ownerField!
 		);
 		return { authMode, opType, opName, query, isOwner, ownerField, ownerValue };
 	}
@@ -128,7 +128,7 @@ class SubscriptionProcessor {
 			);
 
 		if (iamPrivateAuth && userCredentials === USER_CREDENTIALS.unauth) {
-			return null;
+			return null!;
 		}
 
 		// Group auth should take precedence over owner auth, so we are checking
@@ -192,8 +192,8 @@ class SubscriptionProcessor {
 			}
 		});
 
-		if (ownerAuthInfo) {
-			return ownerAuthInfo;
+		if (ownerAuthInfo!) {
+			return ownerAuthInfo!;
 		}
 
 		// Owner auth needs additional values to be returned in order to create the subscription with
@@ -219,8 +219,8 @@ class SubscriptionProcessor {
 			}
 		});
 
-		if (ownerAuthInfo) {
-			return ownerAuthInfo;
+		if (ownerAuthInfo!) {
+			return ownerAuthInfo!;
 		}
 
 		// Fallback: return authMode or default auth type
@@ -244,6 +244,9 @@ class SubscriptionProcessor {
 		Observable<CONTROL_MSG>,
 		Observable<[TransformerMutationType, SchemaModel, PersistentModel]>
 	] {
+		this.runningProcesses =
+			this.runningProcesses || new BackgroundProcessManager();
+
 		const ctlObservable = new Observable<CONTROL_MSG>(observer => {
 			const promises: Promise<void>[] = [];
 
@@ -388,7 +391,7 @@ class SubscriptionProcessor {
 												return;
 											}
 
-											variables[ownerField] = ownerValue;
+											variables[ownerField!] = ownerValue;
 										}
 
 										logger.debug(
@@ -443,10 +446,11 @@ class SubscriptionProcessor {
 
 														const predicatesGroup =
 															ModelPredicateCreator.getPredicates(
-																this.syncPredicates.get(modelDefinition),
+																this.syncPredicates.get(modelDefinition)!,
 																false
 															);
 
+														// @ts-ignore
 														const { [opName]: record } = data;
 
 														// checking incoming subscription against syncPredicate.
@@ -456,7 +460,7 @@ class SubscriptionProcessor {
 														if (
 															this.passesPredicateValidation(
 																record,
-																predicatesGroup
+																predicatesGroup!
 															)
 														) {
 															this.pushToBuffer(
@@ -529,14 +533,14 @@ class SubscriptionProcessor {
 															await this.errorHandler({
 																recoverySuggestion:
 																	'Ensure app code is up to date, auth directives exist and are correct on each model, and that server-side data has not been invalidated by a schema change. If the problem persists, search for or create an issue: https://github.com/aws-amplify/amplify-js/issues',
-																localModel: null,
+																localModel: null!,
 																message,
 																model: modelDefinition.name,
 																operation,
 																errorType:
 																	getSubscriptionErrorType(subscriptionError),
 																process: ProcessName.subscribe,
-																remoteModel: null,
+																remoteModel: null!,
 																cause: subscriptionError,
 															});
 														} catch (e) {
@@ -617,7 +621,7 @@ class SubscriptionProcessor {
 			this.drainBuffer();
 
 			return this.runningProcesses.addCleaner(async () => {
-				this.dataObserver = null;
+				this.dataObserver = null!;
 			});
 		});
 
@@ -652,7 +656,7 @@ class SubscriptionProcessor {
 
 	private drainBuffer() {
 		if (this.dataObserver) {
-			this.buffer.forEach(data => this.dataObserver.next(data));
+			this.buffer.forEach(data => this.dataObserver.next!(data));
 			this.buffer = [];
 		}
 	}

package/src/sync/processors/sync.ts

@@ -73,16 +73,16 @@ class SyncProcessor {
 
 	private graphqlFilterFromPredicate(model: SchemaModel): GraphQLFilter {
 		if (!this.syncPredicates) {
-			return null;
+			return null!;
 		}
 		const predicatesGroup: PredicatesGroup<any> =
 			ModelPredicateCreator.getPredicates(
-				this.syncPredicates.get(model),
+				this.syncPredicates.get(model)!,
 				false
-			);
+			)!;
 
 		if (!predicatesGroup) {
-			return null;
+			return null!;
 		}
 
 		return predicateToGraphQLFilter(predicatesGroup);
@@ -92,11 +92,11 @@ class SyncProcessor {
 		modelDefinition: SchemaModel,
 		lastSync: number,
 		nextToken: string,
-		limit: number = null,
+		limit: number = null!,
 		filter: GraphQLFilter,
 		onTerminate: Promise<void>
 	): Promise<{ nextToken: string; startedAt: number; items: T[] }> {
-		const [opName, query] = this.typeQuery.get(modelDefinition);
+		const [opName, query] = this.typeQuery.get(modelDefinition)!;
 
 		const variables = {
 			limit,
@@ -257,13 +257,13 @@ class SyncProcessor {
 									await this.errorHandler({
 										recoverySuggestion:
 											'Ensure app code is up to date, auth directives exist and are correct on each model, and that server-side data has not been invalidated by a schema change. If the problem persists, search for or create an issue: https://github.com/aws-amplify/amplify-js/issues',
-										localModel: null,
+										localModel: null!,
 										message: err.message,
 										model: modelDefinition.name,
 										operation: opName,
 										errorType: getSyncErrorType(err),
 										process: ProcessName.sync,
-										remoteModel: null,
+										remoteModel: null!,
 										cause: err,
 									});
 								} catch (e) {
@@ -318,10 +318,10 @@ class SyncProcessor {
 			const sortedTypesLastSyncs = Object.values(this.schema.namespaces).reduce(
 				(map, namespace) => {
 					for (const modelName of Array.from(
-						namespace.modelTopologicalOrdering.keys()
+						namespace.modelTopologicalOrdering!.keys()
 					)) {
 						const typeLastSync = typesLastSync.get(namespace.models[modelName]);
-						map.set(namespace.models[modelName], typeLastSync);
+						map.set(namespace.models[modelName], typeLastSync!);
 					}
 					return map;
 				},
@@ -335,17 +335,17 @@ class SyncProcessor {
 						this.runningProcesses.isOpen &&
 						this.runningProcesses.add(async onTerminate => {
 							let done = false;
-							let nextToken: string = null;
-							let startedAt: number = null;
-							let items: ModelInstanceMetadata[] = null;
+							let nextToken: string = null!;
+							let startedAt: number = null!;
+							let items: ModelInstanceMetadata[] = null!;
 
 							let recordsReceived = 0;
 							const filter = this.graphqlFilterFromPredicate(modelDefinition);
 
 							const parents = this.schema.namespaces[
 								namespace
-							].modelTopologicalOrdering.get(modelDefinition.name);
-							const promises = parents.map(parent =>
+							].modelTopologicalOrdering!.get(modelDefinition.name);
+							const promises = parents!.map(parent =>
 								parentPromises.get(`${namespace}_${parent}`)
 							);
 
@@ -398,7 +398,7 @@ class SyncProcessor {
 						}, `adding model ${modelDefinition.name}`)
 				);
 
-			Promise.all(allModelsReady).then(() => {
+			Promise.all(allModelsReady as Promise<any>[]).then(() => {
 				observer.complete();
 			});
 		});

package/src/sync/utils.ts

@@ -27,9 +27,9 @@ import {
 	ModelOperation,
 	InternalSchema,
 	AuthModeStrategy,
+	ModelAttributes,
 } from '../types';
 import {
-	exhaustiveCheck,
 	extractPrimaryKeyFieldNames,
 	establishRelationAndKeys,
 	IDENTIFIER_KEY_SEPARATOR,
@@ -54,9 +54,9 @@ export enum TransformerMutationType {
 }
 
 const dummyMetadata: ModelInstanceMetadata = {
-	_version: undefined,
-	_lastChangedAt: undefined,
-	_deleted: undefined,
+	_version: undefined!,
+	_lastChangedAt: undefined!,
+	_deleted: undefined!,
 };
 
 const metadataFields = <(keyof ModelInstanceMetadata)[]>(
@@ -110,7 +110,7 @@ function getOwnerFields(
 ): string[] {
 	const ownerFields: string[] = [];
 	if (isSchemaModelWithAttributes(modelDefinition)) {
-		modelDefinition.attributes.forEach(attr => {
+		modelDefinition.attributes!.forEach(attr => {
 			if (attr.properties && attr.properties.rules) {
 				const rule = attr.properties.rules.find(rule => rule.allow === 'owner');
 				if (rule && rule.ownerField) {
@@ -154,7 +154,7 @@ function getConnectionFields(
 	Object.values(modelDefinition.fields)
 		.filter(({ association }) => association && Object.keys(association).length)
 		.forEach(({ name, association }) => {
-			const { connectionType } = association;
+			const { connectionType } = association || {};
 
 			switch (connectionType) {
 				case 'HAS_ONE':
@@ -186,7 +186,7 @@ function getConnectionFields(
 					}
 					break;
 				default:
-					exhaustiveCheck(connectionType);
+					throw new Error(`Invalid connection type ${connectionType}`);
 			}
 		});
 
@@ -197,7 +197,7 @@ function getNonModelFields(
 	namespace: SchemaNamespace,
 	modelDefinition: SchemaModel | SchemaNonModel
 ): string[] {
-	const result = [];
+	const result: string[] = [];
 
 	Object.values(modelDefinition.fields).forEach(({ name, type }) => {
 		if (isNonModelFieldType(type)) {
@@ -206,13 +206,12 @@ function getNonModelFields(
 				({ name }) => name
 			);
 
-			const nested = [];
+			const nested: string[] = [];
 			Object.values(typeDefinition.fields).forEach(field => {
 				const { type, name } = field;
 
 				if (isNonModelFieldType(type)) {
 					const typeDefinition = namespace.nonModels![type.nonModel];
-
 					nested.push(
 						`${name} { ${generateSelectionSet(namespace, typeDefinition)} }`
 					);
@@ -230,8 +229,8 @@ export function getAuthorizationRules(
 	modelDefinition: SchemaModel
 ): AuthorizationRule[] {
 	// Searching for owner authorization on attributes
-	const authConfig = []
-		.concat(modelDefinition.attributes)
+	const authConfig = ([] as ModelAttributes)
+		.concat(modelDefinition.attributes || [])
 		.find(attr => attr && attr.type === 'auth');
 
 	const { properties: { rules = [] } = {} } = authConfig || {};
@@ -270,8 +269,8 @@ export function getAuthorizationRules(
 		if (isOwnerAuth) {
 			// look for the subscription level override
 			// only pay attention to the public level
-			const modelConfig = (<typeof modelDefinition.attributes>[])
-				.concat(modelDefinition.attributes)
+			const modelConfig = ([] as ModelAttributes)
+				.concat(modelDefinition.attributes || [])
 				.find(attr => attr && attr.type === 'model');
 
 			// find the subscriptions level. ON is default
@@ -337,8 +336,8 @@ export function buildGraphQLOperation(
 	const { name: typeName, pluralName: pluralTypeName } = modelDefinition;
 
 	let operation: string;
-	let documentArgs: string = ' ';
-	let operationArgs: string = ' ';
+	let documentArgs: string;
+	let operationArgs: string;
 	let transformerMutationType: TransformerMutationType;
 
 	switch (graphQLOpType) {
@@ -377,17 +376,16 @@ export function buildGraphQLOperation(
 			operationArgs = '(id: $id)';
 			transformerMutationType = TransformerMutationType.GET;
 			break;
-
 		default:
-			exhaustiveCheck(graphQLOpType);
+			throw new Error(`Invalid graphQlOpType ${graphQLOpType}`);
 	}
 
 	return [
 		[
-			transformerMutationType,
-			operation,
+			transformerMutationType!,
+			operation!,
 			`${GraphQLOperationType[graphQLOpType]} operation${documentArgs}{
-		${operation}${operationArgs}{
+		${operation!}${operationArgs}{
 			${selectionSet}
 		}
 	}`,
@@ -421,7 +419,7 @@ export function createMutationInstanceFromModelOperation<
 			operation = TransformerMutationType.DELETE;
 			break;
 		default:
-			exhaustiveCheck(opType);
+			throw new Error(`Invalid opType ${opType}`);
 	}
 
 	// stringify nested objects of type AWSJSON
@@ -449,7 +447,7 @@ export function createMutationInstanceFromModelOperation<
 		data: JSON.stringify(element, replacer),
 		modelId,
 		model: model.name,
-		operation,
+		operation: operation!,
 		condition: JSON.stringify(condition),
 	});
 
@@ -466,35 +464,22 @@ export function predicateToGraphQLCondition(
 		return result;
 	}
 
-	const keyFields = extractPrimaryKeyFieldNames(modelDefinition);
-
-	predicate.predicates.forEach(p => {
-		if (isPredicateObj(p)) {
-			const { field, operator, operand } = p;
-
-			// This is compatible with how the GQL Transform currently generates the Condition Input,
-			// i.e. any PK and SK fields are omitted and can't be used as conditions.
-			// However, I think this limits usability.
-			// What if we want to delete all records where SK > some value
-			// Or all records where PK = some value but SKs are different values
-
-			// TODO: if the Transform gets updated ^ we'll need to modify this logic to only omit
-			// key fields from the predicate/condition when ALL of the keyFields are present and using `eq` operators
-			if (keyFields.includes(field as string)) {
-				return;
-			}
+	// This is compatible with how the GQL Transform currently generates the Condition Input,
+	// i.e. any PK and SK fields are omitted and can't be used as conditions.
+	// However, I think this limits usability.
+	// What if we want to delete all records where SK > some value
+	// Or all records where PK = some value but SKs are different values
 
-			result[field] = { [operator]: operand };
-		} else {
-			result[p.type] = predicateToGraphQLCondition(p, modelDefinition);
-		}
-	});
+	// TODO: if the Transform gets updated we'll need to modify this logic to only omit
+	// key fields from the predicate/condition when ALL of the keyFields are present and using `eq` operators
 
-	return result;
+	const keyFields = extractPrimaryKeyFieldNames(modelDefinition);
+	return predicateToGraphQLFilter(predicate, keyFields) as GraphQLCondition;
 }
 
 export function predicateToGraphQLFilter(
-	predicatesGroup: PredicatesGroup<any>
+	predicatesGroup: PredicatesGroup<any>,
+	fieldsToOmit: string[] = []
 ): GraphQLFilter {
 	const result: GraphQLFilter = {};
 
@@ -514,6 +499,8 @@ export function predicateToGraphQLFilter(
 		if (isPredicateObj(predicate)) {
 			const { field, operator, operand } = predicate;
 
+			if (fieldsToOmit.includes(field as string)) return;
+
 			const gqlField: GraphQLField = {
 				[field]: { [operator]: operand },
 			};
@@ -522,9 +509,16 @@ export function predicateToGraphQLFilter(
 			return;
 		}
 
-		appendToFilter(predicateToGraphQLFilter(predicate));
+		const child = predicateToGraphQLFilter(predicate, fieldsToOmit);
+		Object.keys(child).length > 0 && appendToFilter(child);
 	});
 
+	if (isList) {
+		if (result[type].length === 0) return {};
+	} else {
+		if (Object.keys(result[type]).length === 0) return {};
+	}
+
 	return result;
 }