@aws-amplify/datastore 4.1.0 → 4.1.1-unstable-v5.3

package/src/sync/outbox.ts

@@ -38,12 +38,14 @@ class MutationEventOutbox {
 
 			// `id` is the key for the record in the mutationEvent;
 			// `modelId` is the key for the actual record that was mutated
-			const predicate = ModelPredicateCreator.createFromExisting<MutationEvent>(
+			const predicate = ModelPredicateCreator.createFromAST<MutationEvent>(
 				mutationEventModelDefinition,
-				c =>
-					c
-						.modelId('eq', mutationEvent.modelId)
-						.id('ne', this.inProgressMutationEventId)
+				{
+					and: [
+						{ modelId: { eq: mutationEvent.modelId } },
+						{ id: { ne: this.inProgressMutationEventId } },
+					],
+				}
 			);
 
 			// Check if there are any other records with same id
@@ -138,10 +140,9 @@ class MutationEventOutbox {
 
 		const mutationEvents = await storage.query(
 			this.MutationEvent,
-			ModelPredicateCreator.createFromExisting(
-				mutationEventModelDefinition,
-				c => c.modelId('eq', modelId)
-			)
+			ModelPredicateCreator.createFromAST(mutationEventModelDefinition, {
+				and: { modelId: { eq: modelId } },
+			})
 		);
 
 		return mutationEvents;
@@ -201,9 +202,14 @@ class MutationEventOutbox {
 
 		const recordId = getIdentifierValue(userModelDefinition, record);
 
-		const predicate = ModelPredicateCreator.createFromExisting<MutationEvent>(
+		const predicate = ModelPredicateCreator.createFromAST<MutationEvent>(
 			mutationEventModelDefinition,
-			c => c.modelId('eq', recordId).id('ne', this.inProgressMutationEventId)
+			{
+				and: [
+					{ modelId: { eq: recordId } },
+					{ id: { ne: this.inProgressMutationEventId } },
+				],
+			}
 		);
 
 		const outdatedMutations = await storage.query(

package/src/sync/processors/mutation.ts

@@ -195,7 +195,7 @@ class MutationProcessor {
 									operation,
 									data,
 									condition,
-									modelConstructor as any,
+									modelConstructor,
 									this.MutationEvent,
 									head,
 									operationAuthModes[authModeAttempts],

package/src/sync/processors/subscription.ts

@@ -72,7 +72,10 @@ class SubscriptionProcessor {
 
 	constructor(
 		private readonly schema: InternalSchema,
-		private readonly syncPredicates: WeakMap<SchemaModel, ModelPredicate<any>>,
+		private readonly syncPredicates: WeakMap<
+			SchemaModel,
+			ModelPredicate<any> | null
+		>,
 		private readonly amplifyConfig: Record<string, any> = {},
 		private readonly authModeStrategy: AuthModeStrategy,
 		private readonly errorHandler: ErrorHandler,
@@ -749,6 +752,8 @@ class SubscriptionProcessor {
 			'Filters combination exceed maximum limit': RTFError.MaxCombinations,
 			'filter uses same fieldName multiple time': RTFError.RepeatedFieldname,
 			"The variables input contains a field name 'not'": RTFError.NotGroup,
+			'The variables input contains a field that is not defined for input object type':
+				RTFError.FieldNotInType,
 		};
 
 		const [_errorMsg, errorType] =

package/src/sync/processors/sync.ts

@@ -45,7 +45,10 @@ class SyncProcessor {
 
 	constructor(
 		private readonly schema: InternalSchema,
-		private readonly syncPredicates: WeakMap<SchemaModel, ModelPredicate<any>>,
+		private readonly syncPredicates: WeakMap<
+			SchemaModel,
+			ModelPredicate<any> | null
+		>,
 		private readonly amplifyConfig: Record<string, any> = {},
 		private readonly authModeStrategy: AuthModeStrategy,
 		private readonly errorHandler: ErrorHandler,

package/src/sync/utils.ts

@@ -732,6 +732,7 @@ export enum RTFError {
 	MaxCombinations,
 	RepeatedFieldname,
 	NotGroup,
+	FieldNotInType,
 }
 
 export function generateRTFRemediation(
@@ -785,6 +786,9 @@ export function generateRTFRemediation(
 				`Your selective sync expression for ${modelDefinition.name} uses a \`not\` group. If you'd like to filter subscriptions in the backend, ` +
 				`rewrite your expression using \`ne\` or \`notContains\` operators.`
 			);
+		case RTFError.FieldNotInType:
+			// no remediation instructions. We'll surface the message directly
+			return '';
 	}
 }