fix: master variant predicates and AND predicates (#316)

- vars are now passed to both sides of AND predicate
- masterVariants are now included in variants in predicate

Author: BramKaashoek

.changeset/green-queens-rule.md

@@ -0,0 +1,5 @@
+---
+"@labdigital/commercetools-mock": patch
+---
+
+Fixes a bug where main variants were not included in where predicates. Fixes a bug where vars were not read in predicates with AND statements

src/lib/predicateParser.ts

@@ -88,6 +88,15 @@ const resolveValue = (obj: any, val: TypeSymbol): any => {
 		throw new PredicateError("Internal error");
 	}
 
+	// variants() includes both masterVariant and variants for predicates
+	if (
+		val.value === "variants" &&
+		obj.masterVariant &&
+		obj.variants !== undefined
+	) {
+		return [obj.masterVariant, ...(obj.variants ?? [])];
+	}
+
 	if (!(val.value in obj)) {
 		if (Array.isArray(obj)) {
 			return Object.values(obj)
@@ -230,7 +239,7 @@ const generateMatchFunc = (predicate: string): MatchFunc => {
 
 		.led("AND", 5, ({ left, bp }) => {
 			const expr = parser.parse({ terminals: [bp - 1] });
-			return (obj: any) => left(obj) && expr(obj);
+			return (obj: any, vars: object) => left(obj, vars) && expr(obj, vars);
 		})
 		.led("OR", 5, ({ left, token, bp }) => {
 			const expr = parser.parse({ terminals: [bp - 1] });

src/services/product-projection.test.ts

@@ -97,6 +97,10 @@ beforeEach(async () => {
 						name: "number",
 						value: 4 as any,
 					},
+					{
+						name: "store",
+						value: ["test-store"],
+					},
 				],
 			},
 			variants: [
@@ -252,6 +256,30 @@ describe("Product Projection Query - Generic", () => {
 		}
 	});
 
+	test("Filter on complex query", async () => {
+		{
+			const response = await supertest(ctMock.app)
+				.get("/dummy/product-projections")
+				.query({
+					limit: 50,
+					where: [
+						'slug(nl-NL=:slug) and variants(attributes(name="store" and value="test-store"))',
+					],
+					"var.slug": "test-product",
+					"var.store": "test-store",
+				});
+
+			const result: ProductProjectionPagedSearchResponse = response.body;
+			expect(result).toEqual({
+				count: 1,
+				limit: 50,
+				offset: 0,
+				total: 1,
+				results: [productProjection],
+			});
+		}
+	});
+
 	test("Filter on invalid slug", async () => {
 		{
 			const response = await supertest(ctMock.app)