@aws-amplify/datastore 3.12.6-next.13 → 3.12.6-next.32

package/src/storage/adapter/index.ts

@@ -29,7 +29,7 @@ export interface Adapter extends SystemComponent {
 		firstOrLast: QueryOne
 	): Promise<T | undefined>;
 	batchSave<T extends PersistentModel>(
-		modelConstructor: PersistentModelConstructor<any>,
+		modelConstructor: PersistentModelConstructor<T>,
 		items: ModelInstanceMetadata[]
 	): Promise<[T, OpType][]>;
 }

package/src/storage/storage.ts

@@ -26,6 +26,7 @@ import {
 	validatePredicate,
 	valuesEqual,
 } from '../util';
+import { getIdentifierValue } from '../sync/utils';
 import { Adapter } from './adapter';
 import getDefaultAdapter from './adapter/getDefaultAdapter';
 
@@ -188,7 +189,21 @@ class StorageClass implements StorageFacade {
 			condition
 		);
 
-		const modelIds = new Set(models.map(({ id }) => id));
+		const modelConstructor = isModelConstructor(modelOrModelConstructor)
+			? modelOrModelConstructor
+			: (Object.getPrototypeOf(modelOrModelConstructor || {})
+					.constructor as PersistentModelConstructor<T>);
+		const namespaceName = this.namespaceResolver(modelConstructor);
+
+		const modelDefinition =
+			this.schema.namespaces[namespaceName].models[modelConstructor.name];
+
+		const modelIds = new Set(
+			models.map(model => {
+				const modelId = getIdentifierValue(modelDefinition, model);
+				return modelId;
+			})
+		);
 
 		if (
 			!isModelConstructor(modelOrModelConstructor) &&
@@ -204,7 +219,8 @@ class StorageClass implements StorageFacade {
 			let theCondition: PredicatesGroup<any>;
 
 			if (!isModelConstructor(modelOrModelConstructor)) {
-				theCondition = modelIds.has(model.id)
+				const modelId = getIdentifierValue(modelDefinition, model);
+				theCondition = modelIds.has(modelId)
 					? ModelPredicateCreator.getPredicates(condition, false)
 					: undefined;
 			}
@@ -337,30 +353,65 @@ class StorageClass implements StorageFacade {
 
 		// set original values for these fields
 		updatedFields.forEach((field: string) => {
-			const targetName: any = isTargetNameAssociation(
+			const targetNames: any = isTargetNameAssociation(
 				fields[field]?.association
 			);
 
-			// if field refers to a belongsTo relation, use the target field instead
-			const key = targetName || field;
+			if (Array.isArray(targetNames)) {
+				// if field refers to a belongsTo relation, use the target field instead
+
+				for (const targetName of targetNames) {
+					// check field values by value. Ignore unchanged fields
+					if (!valuesEqual(source[targetName], originalElement[targetName])) {
+						// if the field was updated to 'undefined', replace with 'null' for compatibility with JSON and GraphQL
+
+						updatedElement[targetName] =
+							originalElement[targetName] === undefined
+								? null
+								: originalElement[targetName];
+
+						for (const fieldSet of compositeKeys) {
+							// include all of the fields that comprise the composite key
+							if (fieldSet.has(targetName)) {
+								for (const compositeField of fieldSet) {
+									updatedElement[compositeField] =
+										originalElement[compositeField];
+								}
+							}
+						}
+					}
+				}
+			} else {
+				// Backwards compatibility pre-CPK
+
+				// if field refers to a belongsTo relation, use the target field instead
+				const key = targetNames || field;
+
+				// check field values by value. Ignore unchanged fields
+				if (!valuesEqual(source[key], originalElement[key])) {
+					// if the field was updated to 'undefined', replace with 'null' for compatibility with JSON and GraphQL
 
-			// check field values by value. Ignore unchanged fields
-			if (!valuesEqual(source[key], originalElement[key])) {
-				// if the field was updated to 'undefined', replace with 'null' for compatibility with JSON and GraphQL
-				updatedElement[key] =
-					originalElement[key] === undefined ? null : originalElement[key];
+					updatedElement[key] =
+						originalElement[key] === undefined ? null : originalElement[key];
 
-				for (const fieldSet of compositeKeys) {
-					// include all of the fields that comprise the composite key
-					if (fieldSet.has(key)) {
-						for (const compositeField of fieldSet) {
-							updatedElement[compositeField] = originalElement[compositeField];
+					for (const fieldSet of compositeKeys) {
+						// include all of the fields that comprise the composite key
+						if (fieldSet.has(key)) {
+							for (const compositeField of fieldSet) {
+								updatedElement[compositeField] =
+									originalElement[compositeField];
+							}
 						}
 					}
 				}
 			}
 		});
 
+		// Exit early when there are no changes introduced in the update mutation
+		if (Object.keys(updatedElement).length === 0) {
+			return null;
+		}
+
 		// include field(s) from custom PK if one is specified for the model
 		if (primaryKey && primaryKey.length) {
 			for (const pkField of primaryKey) {
@@ -368,10 +419,6 @@ class StorageClass implements StorageFacade {
 			}
 		}
 
-		if (Object.keys(updatedElement).length === 0) {
-			return null;
-		}
-
 		const { id, _version, _lastChangedAt, _deleted } = originalElement;
 
 		// For update mutations we only want to send fields with changes
@@ -421,7 +468,7 @@ class ExclusiveStorage implements StorageFacade {
 		patchesTuple?: [Patch[], PersistentModel]
 	): Promise<[T, OpType.INSERT | OpType.UPDATE][]> {
 		return this.runExclusive<[T, OpType.INSERT | OpType.UPDATE][]>(storage =>
-			storage.save<T>(model, condition, mutator, patchesTuple)
+			storage.save(model, condition, mutator, patchesTuple)
 		);
 	}
 
@@ -485,11 +532,11 @@ class ExclusiveStorage implements StorageFacade {
 	}
 
 	async clear() {
-		await this.storage.clear();
+		await this.runExclusive(storage => storage.clear());
 	}
 
 	batchSave<T extends PersistentModel>(
-		modelConstructor: PersistentModelConstructor<any>,
+		modelConstructor: PersistentModelConstructor<T>,
 		items: ModelInstanceMetadata[]
 	): Promise<[T, OpType][]> {
 		return this.storage.batchSave(modelConstructor, items);

package/src/sync/datastoreConnectivity.ts

@@ -52,6 +52,12 @@ export default class DataStoreConnectivity {
 		}
 	}
 
+	// for consistency with other background processors.
+	async stop() {
+		this.unsubscribe();
+		return;
+	}
+
 	socketDisconnected() {
 		if (this.observer && typeof this.observer.next === 'function') {
 			this.observer.next({ online: false }); // Notify network issue from the socket