@labdigital/commercetools-mock 2.53.1 → 2.53.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@labdigital/commercetools-mock",
-  "version": "2.53.1",
+  "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

@@ -382,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)) {
@@ -426,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);