@labdigital/commercetools-mock 2.53.0 → 2.53.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@labdigital/commercetools-mock",
-  "version": "2.53.0",
+  "version": "2.53.2",
   "license": "MIT",
   "author": "Michael van Tellingen",
   "type": "module",

package/src/lib/predicateParser.test.ts

@@ -151,6 +151,45 @@ describe("Predicate filter", () => {
 		expect(match("numberProperty in (1234)")).toBeTruthy();
 	});
 
+	test("in operator with and clause", async () => {
+		expect(
+			match("numberProperty in (1234) and stringProperty=:val", {
+				val: "foobar",
+			}),
+		).toBeTruthy();
+		expect(
+			match("numberProperty in (1234) and stringProperty=:val", {
+				val: "other",
+			}),
+		).toBeFalsy();
+		expect(
+			match("numberProperty in (1235) and stringProperty=:val", {
+				val: "foobar",
+			}),
+		).toBeFalsy();
+	});
+
+	test("within operator with and clause", async () => {
+		expect(
+			match(
+				"geoLocation within circle(5.121310867198959, 52.09068804569714, 2500) and stringProperty=:val",
+				{ val: "foobar" },
+			),
+		).toBeTruthy();
+		expect(
+			match(
+				"geoLocation within circle(5.121310867198959, 52.09068804569714, 2500) and stringProperty=:val",
+				{ val: "other" },
+			),
+		).toBeFalsy();
+		expect(
+			match(
+				"geoLocation within circle(5.121310867198959, 52.09068804569714, 1000) and stringProperty=:val",
+				{ val: "foobar" },
+			),
+		).toBeFalsy();
+	});
+
 	test("arrayProperty contains all (...)", async () => {
 		expect(match(`arrayProperty contains all ("foo", "bar")`)).toBeTruthy();
 		expect(

package/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] });
@@ -373,6 +382,7 @@ const generateMatchFunc = (predicate: string): MatchFunc => {
 		})
 		.led("IN", 20, ({ left, bp }) => {
 			const expr = parser.parse({ terminals: [bp - 1] });
+			lexer.expect(")");
 			return (obj: any, vars: object) => {
 				let symbols = expr;
 				if (!Array.isArray(symbols)) {
@@ -417,6 +427,7 @@ const generateMatchFunc = (predicate: string): MatchFunc => {
 
 			lexer.expect("(");
 			const expr = parser.parse({ terminals: [")"] });
+			lexer.expect(")");
 
 			return (obj: any, vars: object) => {
 				const value = resolveValue(obj, left);

package/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)