@labdigital/commercetools-mock 2.45.1 → 2.47.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@labdigital/commercetools-mock",
-  "version": "2.45.1",
+  "version": "2.47.0",
   "license": "MIT",
   "author": "Michael van Tellingen",
   "type": "module",
@@ -19,54 +19,46 @@
     "src"
   ],
   "dependencies": {
-    "basic-auth": "^2.0.1",
-    "body-parser": "^1.20.2",
+    "@biomejs/biome": "^1.9.4",
+    "basic-auth": "2.0.1",
+    "body-parser": "1.20.2",
     "decimal.js": "10.4.3",
-    "deep-equal": "^2.2.3",
-    "express": "^4.21.1",
-    "light-my-request": "^5.11.1",
-    "lodash.isequal": "^4.5.0",
-    "morgan": "^1.10.0",
-    "msw": "^2.5.0",
-    "uuid": "^9.0.1",
-    "zod": "^3.22.4",
-    "zod-validation-error": "^3.0.2"
+    "deep-equal": "2.2.3",
+    "express": "4.21.1",
+    "light-my-request": "5.11.1",
+    "lodash.isequal": "4.5.0",
+    "morgan": "1.10.0",
+    "msw": "2.5.0",
+    "uuid": "9.0.1",
+    "zod": "3.22.4",
+    "zod-validation-error": "3.0.2"
   },
   "devDependencies": {
-    "@changesets/changelog-github": "^0.5.0",
-    "@changesets/cli": "^2.27.1",
-    "@commercetools/platform-sdk": "7.17.0",
-    "@stylistic/eslint-plugin": "^1.6.2",
-    "@types/basic-auth": "^1.1.8",
-    "@types/body-parser": "^1.19.5",
-    "@types/deep-equal": "^1.0.4",
-    "@types/express": "^4.17.21",
-    "@types/express-serve-static-core": "^4.17.43",
-    "@types/lodash.isequal": "^4.5.8",
-    "@types/morgan": "^1.9.9",
-    "@types/node": "^20.16.14",
-    "@types/qs": "^6.9.11",
-    "@types/supertest": "^6.0.2",
-    "@types/uuid": "^9.0.8",
-    "@typescript-eslint/eslint-plugin": "^7.0.2",
-    "@typescript-eslint/parser": "^7.0.2",
+    "@changesets/changelog-github": "0.5.0",
+    "@changesets/cli": "2.27.1",
+    "@commercetools/platform-sdk": "8.8.0",
+    "@types/basic-auth": "1.1.8",
+    "@types/body-parser": "1.19.5",
+    "@types/deep-equal": "1.0.4",
+    "@types/express": "4.17.21",
+    "@types/express-serve-static-core": "4.17.43",
+    "@types/lodash.isequal": "4.5.8",
+    "@types/morgan": "1.9.9",
+    "@types/node": "20.16.14",
+    "@types/qs": "6.9.11",
+    "@types/supertest": "6.0.2",
+    "@types/uuid": "9.0.8",
     "@vitest/coverage-v8": "3.0.2",
-    "esbuild": "^0.20.1",
-    "eslint": "^8.57.1",
-    "eslint-plugin-sort-class-members": "^1.21.0",
-    "eslint-plugin-unused-imports": "^3.1.0",
-    "fishery": "^2.2.2",
-    "got": "^14.2.0",
-    "husky": "^9.0.11",
-    "prettier": "^3.2.5",
-    "prettier-plugin-organize-imports": "^3.2.4",
-    "prettier-plugin-packagejson": "^2.5.3",
-    "supertest": "^6.3.4",
-    "timekeeper": "^2.3.1",
-    "ts-node": "^10.9.2",
-    "tslib": "^2.8.0",
-    "tsup": "^8.0.2",
-    "typescript": "^5.6.3",
+    "esbuild": "0.20.1",
+    "fishery": "2.2.2",
+    "got": "14.2.0",
+    "husky": "9.0.11",
+    "supertest": "6.3.4",
+    "timekeeper": "2.3.1",
+    "ts-node": "10.9.2",
+    "tslib": "2.8.0",
+    "tsup": "8.0.2",
+    "typescript": "5.8.3",
     "vitest": "3.0.2"
   },
   "engines": {
@@ -79,10 +71,11 @@
   "scripts": {
     "build": "tsup",
     "build:server": "esbuild src/server.ts --bundle --outfile=dist/server.js --platform=node",
-    "check": "pnpm lint && tsc",
-    "format": "eslint src --fix ; prettier --write .",
-    "lint": "eslint src && prettier --check .",
+    "check": "biome check && tsc",
+    "format": "biome format --fix",
+    "lint": "biome check",
     "publish:ci": "pnpm build && pnpm changeset publish",
+    "publish:version": "pnpm changeset version && pnpm format",
     "start": "tsup src/server.ts --watch --onSuccess 'node dist/server'",
     "test": "vitest run",
     "test:ci": "vitest run --coverage"

package/src/ctMock.ts

@@ -182,12 +182,11 @@ export class CommercetoolsMock {
 					message: err.message,
 					errors: [err.info],
 				});
-			} else {
-				console.error(err);
-				return resp.status(500).send({
-					error: err.message,
-				});
 			}
+			console.error(err);
+			return resp.status(500).send({
+				error: err.message,
+			});
 		});
 
 		return app;
@@ -210,7 +209,7 @@ export class CommercetoolsMock {
 				const headers = copyHeaders(request.headers);
 
 				const res = await inject(app)
-					.post(url.pathname + "?" + url.searchParams.toString())
+					.post(`${url.pathname}?${url.searchParams.toString()}`)
 					.body(body)
 					.headers(headers)
 					.end();
@@ -225,7 +224,7 @@ export class CommercetoolsMock {
 				const headers = copyHeaders(request.headers);
 
 				const res = await inject(app)
-					.get(url.pathname + "?" + url.searchParams.toString())
+					.get(`${url.pathname}?${url.searchParams.toString()}`)
 					.body(body)
 					.headers(headers)
 					.end();
@@ -256,7 +255,7 @@ export class CommercetoolsMock {
 				const headers = copyHeaders(request.headers);
 
 				const res = await inject(app)
-					.get(url.pathname + "?" + url.searchParams.toString())
+					.get(`${url.pathname}?${url.searchParams.toString()}`)
 					.body(body)
 					.headers(headers)
 					.end();
@@ -271,7 +270,7 @@ export class CommercetoolsMock {
 				const headers = copyHeaders(request.headers);
 
 				const res = await inject(app)
-					.post(url.pathname + "?" + url.searchParams.toString())
+					.post(`${url.pathname}?${url.searchParams.toString()}`)
 					.body(body)
 					.headers(headers)
 					.end();
@@ -286,7 +285,7 @@ export class CommercetoolsMock {
 				const headers = copyHeaders(request.headers);
 
 				const res = await inject(app)
-					.delete(url.pathname + "?" + url.searchParams.toString())
+					.delete(`${url.pathname}?${url.searchParams.toString()}`)
 					.body(body)
 					.headers(headers)
 					.end();
@@ -307,10 +306,9 @@ export class CommercetoolsMock {
 		if (_globalListeners.length > 0) {
 			if (this._mswServer !== undefined) {
 				throw new Error("Server already started");
-			} else {
-				process.emitWarning("Server wasn't stopped properly, clearing");
-				_globalListeners.forEach((listener) => listener.close());
 			}
+			process.emitWarning("Server wasn't stopped properly, clearing");
+			_globalListeners.forEach((listener) => listener.close());
 		}
 
 		const server = setupServer();

package/src/index.test.ts

@@ -1,4 +1,4 @@
-import { type InvalidTokenError } from "@commercetools/platform-sdk";
+import type { InvalidTokenError } from "@commercetools/platform-sdk";
 import got from "got";
 import { setupServer } from "msw/node";
 import { afterEach, beforeAll, expect, test } from "vitest";
@@ -23,12 +23,12 @@ test("node:fetch client", async () => {
 	});
 	ctMock.registerHandlers(mswServer);
 
-	const authHeader = "Basic " + Buffer.from("foo:bar").toString("base64");
+	const authHeader = `Basic ${Buffer.from("foo:bar").toString("base64")}`;
 	let response = await fetch("https://localhost:8080/oauth/token", {
 		method: "POST",
 		headers: {
 			"Content-Type": "application/x-www-form-urlencoded",
-			"Authorization": authHeader,
+			Authorization: authHeader,
 		},
 		body: new URLSearchParams({
 			grant_type: "client_credentials",
@@ -109,7 +109,7 @@ test("Options.validateCredentials: true (error)", async () => {
 		"https://api.europe-west1.gcp.commercetools.com/my-project/orders",
 		{
 			headers: {
-				Authorization: `Bearer foobar`,
+				Authorization: "Bearer foobar",
 			},
 			responseType: "json",
 			throwHttpErrors: false,
@@ -130,7 +130,7 @@ test("Options.validateCredentials: false", async () => {
 		"https://api.europe-west1.gcp.commercetools.com/my-project/orders",
 		{
 			headers: {
-				Authorization: `Bearer foobar`,
+				Authorization: "Bearer foobar",
 			},
 			responseType: "json",
 		},

package/src/lib/predicateParser.test.ts

@@ -15,6 +15,10 @@ describe("Predicate filter", () => {
 			objectProperty: {
 				stringProperty: "foobar",
 				booleanProperty: true,
+				"45c652f2-76e8-48fd-ab64-d11ad99d6631": {
+					stringProperty: "foobar",
+					uuidProperty: "3a57cc78-db08-4cd3-b778-d59b3326c435",
+				},
 			},
 			array: [
 				{
@@ -91,60 +95,60 @@ describe("Predicate filter", () => {
 		expect(match(`stringProperty="foobar"`)).toBeTruthy();
 		expect(match(`stringProperty!="foobar"`)).toBeFalsy();
 
-		expect(match(`stringProperty=:val`, { val: "foobar" })).toBeTruthy();
+		expect(match("stringProperty=:val", { val: "foobar" })).toBeTruthy();
 	});
 
 	test("booleanProperty = true", async () => {
-		expect(match(`booleanProperty != true`)).toBeFalsy();
-		expect(match(`booleanProperty = true`)).toBeTruthy();
+		expect(match("booleanProperty != true")).toBeFalsy();
+		expect(match("booleanProperty = true")).toBeTruthy();
 
-		expect(match(`booleanProperty=:val`, { val: true })).toBeTruthy();
+		expect(match("booleanProperty=:val", { val: true })).toBeTruthy();
 	});
 
 	test('stringProperty matches ignore case "foobar"', async () => {
 		expect(match(`stringProperty="FOObar"`)).toBeFalsy();
 		expect(match(`stringProperty matches ignore case "FOObar"`)).toBeTruthy();
 		expect(
-			match(`stringProperty matches ignore case :val`, { val: "fooBar" }),
+			match("stringProperty matches ignore case :val", { val: "fooBar" }),
 		).toBeTruthy();
 	});
 
 	test("numberProperty = 1234", async () => {
-		expect(match(`numberProperty=1234`)).toBeTruthy();
-		expect(match(`numberProperty = 1234`)).toBeTruthy();
-		expect(match(`numberProperty=1230`)).toBeFalsy();
-		expect(match(`numberProperty = 1230`)).toBeFalsy();
+		expect(match("numberProperty=1234")).toBeTruthy();
+		expect(match("numberProperty = 1234")).toBeTruthy();
+		expect(match("numberProperty=1230")).toBeFalsy();
+		expect(match("numberProperty = 1230")).toBeFalsy();
 
-		expect(match(`numberProperty=:val`, { val: 1234 })).toBeTruthy();
+		expect(match("numberProperty=:val", { val: 1234 })).toBeTruthy();
 	});
 
 	test("numberProperty > ...", async () => {
-		expect(match(`numberProperty > 1233`)).toBeTruthy();
-		expect(match(`numberProperty > 1234`)).toBeFalsy();
+		expect(match("numberProperty > 1233")).toBeTruthy();
+		expect(match("numberProperty > 1234")).toBeFalsy();
 	});
 
 	test("numberProperty >= ...", async () => {
-		expect(match(`numberProperty >= 1234`)).toBeTruthy();
-		expect(match(`numberProperty >= 1235`)).toBeFalsy();
+		expect(match("numberProperty >= 1234")).toBeTruthy();
+		expect(match("numberProperty >= 1235")).toBeFalsy();
 	});
 
 	test("numberProperty < ...", async () => {
-		expect(match(`numberProperty < 1235`)).toBeTruthy();
-		expect(match(`numberProperty < 1234`)).toBeFalsy();
+		expect(match("numberProperty < 1235")).toBeTruthy();
+		expect(match("numberProperty < 1234")).toBeFalsy();
 	});
 
 	test("numberProperty <= ...", async () => {
-		expect(match(`numberProperty <= 1235`)).toBeTruthy();
-		expect(match(`numberProperty <= 1234`)).toBeTruthy();
-		expect(match(`numberProperty <= 1233`)).toBeFalsy();
+		expect(match("numberProperty <= 1235")).toBeTruthy();
+		expect(match("numberProperty <= 1234")).toBeTruthy();
+		expect(match("numberProperty <= 1233")).toBeFalsy();
 	});
 
 	test("numberPropery in (...)", async () => {
-		expect(match(`numberProperty in (1233, 1234, 1235)`)).toBeTruthy();
+		expect(match("numberProperty in (1233, 1234, 1235)")).toBeTruthy();
 	});
 
 	test("numberPropery in (...) single value", async () => {
-		expect(match(`numberProperty in (1234)`)).toBeTruthy();
+		expect(match("numberProperty in (1234)")).toBeTruthy();
 	});
 
 	test("arrayProperty contains all (...)", async () => {
@@ -155,17 +159,17 @@ describe("Predicate filter", () => {
 	});
 
 	test("arrayProperty is empty", async () => {
-		expect(match(`arrayProperty is empty`)).toBeFalsy();
-		expect(match(`arrayProperty is not empty`)).toBeTruthy();
-		expect(match(`emptyArrayProperty is empty`)).toBeTruthy();
+		expect(match("arrayProperty is empty")).toBeFalsy();
+		expect(match("arrayProperty is not empty")).toBeTruthy();
+		expect(match("emptyArrayProperty is empty")).toBeTruthy();
 	});
 
 	test("property is defined", async () => {
-		expect(match(`notDefined is defined`)).toBeFalsy();
-		expect(match(`notDefined is not defined`)).toBeTruthy();
+		expect(match("notDefined is defined")).toBeFalsy();
+		expect(match("notDefined is not defined")).toBeTruthy();
 
-		expect(match(`arrayProperty is defined`)).toBeTruthy();
-		expect(match(`arrayProperty is not defined`)).toBeFalsy();
+		expect(match("arrayProperty is defined")).toBeTruthy();
+		expect(match("arrayProperty is not defined")).toBeFalsy();
 	});
 
 	test("arrayProperty contains any (...)", async () => {
@@ -182,14 +186,14 @@ describe("Predicate filter", () => {
 		expect(match(`nested(array(stringProperty="foobar"))`)).toBeFalsy();
 
 		// Different comparison operators
-		expect(match(`nested(array(numberProperty>=2345))`)).toBeTruthy();
-		expect(match(`nested(array(numberProperty>=2346))`)).toBeFalsy();
-		expect(match(`nested(array(numberProperty>2344))`)).toBeTruthy();
-		expect(match(`nested(array(numberProperty>2345))`)).toBeFalsy();
-		expect(match(`nested(array(numberProperty<=1234))`)).toBeTruthy();
-		expect(match(`nested(array(numberProperty<=1233))`)).toBeFalsy();
-		expect(match(`nested(array(numberProperty<1235))`)).toBeTruthy();
-		expect(match(`nested(array(numberProperty<1234))`)).toBeFalsy();
+		expect(match("nested(array(numberProperty>=2345))")).toBeTruthy();
+		expect(match("nested(array(numberProperty>=2346))")).toBeFalsy();
+		expect(match("nested(array(numberProperty>2344))")).toBeTruthy();
+		expect(match("nested(array(numberProperty>2345))")).toBeFalsy();
+		expect(match("nested(array(numberProperty<=1234))")).toBeTruthy();
+		expect(match("nested(array(numberProperty<=1233))")).toBeFalsy();
+		expect(match("nested(array(numberProperty<1235))")).toBeTruthy();
+		expect(match("nested(array(numberProperty<1234))")).toBeFalsy();
 
 		// One level deeper
 		expect(
@@ -242,57 +246,57 @@ describe("Predicate filter", () => {
 	test("geolocation within circle (...)", async () => {
 		expect(
 			match(
-				`geoLocation within circle(5.121310867198959, 52.09068804569714, 2500)`,
+				"geoLocation within circle(5.121310867198959, 52.09068804569714, 2500)",
 			),
 		).toBeTruthy();
 		expect(
 			match(
-				`geoLocation within circle(5.121310867198959, 52.09068804569714, 2400)`,
+				"geoLocation within circle(5.121310867198959, 52.09068804569714, 2400)",
 			),
 		).toBeFalsy();
 	});
 
 	test("negate any other conditional expression", async () => {
-		expect(match(`numberProperty = 1234`)).toBeTruthy();
-		expect(match(`not (numberProperty = 1234)`)).toBeFalsy();
-		expect(match(`not (numberProperty = 1235)`)).toBeTruthy();
-		expect(match(`not (numberProperty = 1235)`)).toBeTruthy();
-
-		expect(match(`nested(numberProperty=1234))`)).toBeTruthy();
-		expect(match(`nested(not(numberProperty=1230)))`)).toBeTruthy();
-		expect(match(`nested(not(numberProperty=1234)))`)).toBeFalsy();
+		expect(match("numberProperty = 1234")).toBeTruthy();
+		expect(match("not (numberProperty = 1234)")).toBeFalsy();
+		expect(match("not (numberProperty = 1235)")).toBeTruthy();
+		expect(match("not (numberProperty = 1235)")).toBeTruthy();
+
+		expect(match("nested(numberProperty=1234))")).toBeTruthy();
+		expect(match("nested(not(numberProperty=1230)))")).toBeTruthy();
+		expect(match("nested(not(numberProperty=1234)))")).toBeFalsy();
 	});
 
 	test("and clause (implicit)", async () => {
 		expect(
-			match([`stringProperty="foobar"`, `numberProperty=1234`]),
+			match([`stringProperty="foobar"`, "numberProperty=1234"]),
 		).toBeTruthy();
 
 		expect(
-			match([`stringProperty="foobar"`, `numberProperty=1111`]),
+			match([`stringProperty="foobar"`, "numberProperty=1111"]),
 		).toBeFalsy();
 	});
 
 	test("and clause (explicit)", async () => {
-		expect(match(`numberProperty>1233 and numberProperty<1235`)).toBeTruthy();
-		expect(match(`numberProperty>1233 and numberProperty<1234`)).toBeFalsy();
+		expect(match("numberProperty>1233 and numberProperty<1235")).toBeTruthy();
+		expect(match("numberProperty>1233 and numberProperty<1234")).toBeFalsy();
 	});
 
 	test("or clause", async () => {
 		expect(
 			match(
-				`numberProperty=1231 or numberProperty>54312 or numberProperty=1234`,
+				"numberProperty=1231 or numberProperty>54312 or numberProperty=1234",
 			),
 		).toBeTruthy();
-		expect(match(`numberProperty=1231 or numberProperty=1234`)).toBeTruthy();
-		expect(match(`numberProperty=1231 or (numberProperty=1234)`)).toBeTruthy();
-		expect(match(`numberProperty=1233 or numberProperty=1235`)).toBeFalsy();
+		expect(match("numberProperty=1231 or numberProperty=1234")).toBeTruthy();
+		expect(match("numberProperty=1231 or (numberProperty=1234)")).toBeTruthy();
+		expect(match("numberProperty=1233 or numberProperty=1235")).toBeFalsy();
 	});
 
 	test("or / and clause mixed", async () => {
 		expect(
 			match(
-				`numberProperty=1234 and (numberProperty=1230 or (numberProperty=1234 or numberProperty=1235))`,
+				"numberProperty=1234 and (numberProperty=1230 or (numberProperty=1234 or numberProperty=1235))",
 			),
 		).toBeTruthy();
 	});
@@ -304,10 +308,10 @@ describe("Predicate filter", () => {
 
 	test("nested attribute access", async () => {
 		expect(
-			match(`nested(objectProperty(booleanProperty != true))`),
+			match("nested(objectProperty(booleanProperty != true))"),
 		).toBeFalsy();
 		expect(
-			match(`nested(objectProperty(booleanProperty != false))`),
+			match("nested(objectProperty(booleanProperty != false))"),
 		).toBeTruthy();
 	});
 
@@ -325,11 +329,38 @@ describe("Predicate filter", () => {
 	// })
 
 	test("invalid predicate", async () => {
-		expect(() => match(`stringProperty=nomatch`)).toThrow(PredicateError);
-		expect(() => match(`stringProperty=nomatch`)).toThrow(
+		expect(() => match("stringProperty=nomatch")).toThrow(PredicateError);
+		expect(() => match("stringProperty=nomatch")).toThrow(
 			"Invalid input 'n', expected input parameter or primitive value (line 1, column 16)",
 		);
-		expect(() => match(`stringProperty`)).toThrow(PredicateError);
+		expect(() => match("stringProperty")).toThrow(PredicateError);
+	});
+
+	test("uuid as field name", async () => {
+		expect(
+			match(
+				`nested(objectProperty(45c652f2-76e8-48fd-ab64-d11ad99d6631(stringProperty = "foobar")))`,
+			),
+		).toBeTruthy();
+
+		expect(
+			match(
+				`nested(objectProperty(3a57cc78-db08-4cd3-b778-d59b3326c435(stringProperty = "foobar")))`,
+			),
+		).toBeFalsy();
+	});
+
+	test("uuid as value", async () => {
+		expect(
+			match(
+				`nested(objectProperty(45c652f2-76e8-48fd-ab64-d11ad99d6631(uuidProperty = "3a57cc78-db08-4cd3-b778-d59b3326c435")))`,
+			),
+		).toBeTruthy();
+		expect(
+			match(
+				`nested(objectProperty(45c652f2-76e8-48fd-ab64-d11ad99d6631(uuidProperty = "45c652f2-76e8-48fd-ab64-d11ad99d6631")))`,
+			),
+		).toBeFalsy();
 	});
 });