@labdigital/commercetools-mock 2.1.0 → 2.3.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@labdigital/commercetools-mock",
   "author": "Michael van Tellingen",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "license": "MIT",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
@@ -37,10 +37,10 @@
     "body-parser": "^1.20.2",
     "deep-equal": "^2.2.2",
     "express": "^4.18.2",
+    "light-my-request": "^5.11.0",
     "lodash.isequal": "^4.5.0",
     "morgan": "^1.10.0",
     "msw": "^2.0.0",
-    "supertest": "^6.3.3",
     "uuid": "^9.0.0"
   },
   "devDependencies": {
@@ -67,6 +67,7 @@
     "got": "^11.8.3",
     "husky": "^8.0.3",
     "prettier": "^3.0.0",
+    "supertest": "^6.3.3",
     "timekeeper": "^2.3.1",
     "ts-node": "^10.9.1",
     "tslib": "^2.6.1",

package/src/ctMock.ts

@@ -1,6 +1,6 @@
 import express, { NextFunction, Request, Response } from 'express'
-import supertest from 'supertest'
 import morgan from 'morgan'
+import inject from 'light-my-request'
 import { setupServer, SetupServer } from 'msw/node'
 import { http, HttpResponse } from 'msw'
 import { AbstractStorage, InMemoryStorage } from './storage/index.js'
@@ -16,6 +16,7 @@ import { ProjectService } from './services/project.js'
 import { createRepositories, RepositoryMap } from './repositories/index.js'
 import { createServices } from './services/index.js'
 import { ProjectRepository } from './repositories/project.js'
+import { mapHeaderType } from './helpers.js'
 
 export type CommercetoolsMockOptions = {
 	validateCredentials: boolean
@@ -175,56 +176,66 @@ export class CommercetoolsMock {
 			}
 		}
 
-		const app = this.app
+		const server = this.app
 		this._mswServer = setupServer(
 			http.post(`${this.options.authHost}/oauth/*`, async ({ request }) => {
-				const text = await request.text()
+				const body = await request.text()
 				const url = new URL(request.url)
-				const res = await supertest(app)
-					.post(url.pathname + '?' + url.searchParams.toString())
-					.set(copyHeaders(request.headers))
-					.send(text)
+				const headers = copyHeaders(request.headers)
 
-				return new HttpResponse(res.text, {
-					status: res.status,
-					headers: res.headers,
+				const res = await inject(server)
+					.post(url.pathname + '?' + url.searchParams.toString())
+					.body(body)
+					.headers(headers)
+					.end()
+				return new HttpResponse(res.body, {
+					status: res.statusCode,
+					headers: mapHeaderType(res.headers),
 				})
 			}),
 			http.get(`${this.options.apiHost}/*`, async ({ request }) => {
 				const body = await request.text()
 				const url = new URL(request.url)
-				const res = await supertest(app)
+				const headers = copyHeaders(request.headers)
+
+				const res = await inject(server)
 					.get(url.pathname + '?' + url.searchParams.toString())
-					.set(copyHeaders(request.headers))
-					.send(body)
-				return new HttpResponse(res.text, {
-					status: res.status,
-					headers: res.headers,
+					.body(body)
+					.headers(headers)
+					.end()
+				return new HttpResponse(res.body, {
+					status: res.statusCode,
+					headers: mapHeaderType(res.headers),
 				})
 			}),
 			http.post(`${this.options.apiHost}/*`, async ({ request }) => {
 				const body = await request.text()
 				const url = new URL(request.url)
-				const res = await supertest(app)
+				const headers = copyHeaders(request.headers)
+
+				const res = await inject(server)
 					.post(url.pathname + '?' + url.searchParams.toString())
-					.set(copyHeaders(request.headers))
-					.send(body)
-				return new HttpResponse(res.text, {
-					status: res.status,
-					headers: res.headers,
+					.body(body)
+					.headers(headers)
+					.end()
+				return new HttpResponse(res.body, {
+					status: res.statusCode,
+					headers: mapHeaderType(res.headers),
 				})
 			}),
 			http.delete(`${this.options.apiHost}/*`, async ({ request }) => {
 				const body = await request.text()
 				const url = new URL(request.url)
-				const res = await supertest(app)
-					.delete(url.pathname + '?' + url.searchParams.toString())
-					.set(copyHeaders(request.headers))
-					.send(body)
+				const headers = copyHeaders(request.headers)
 
-				return new HttpResponse(res.text, {
-					status: res.status,
-					headers: res.headers,
+				const res = await inject(server)
+					.delete(url.pathname + '?' + url.searchParams.toString())
+					.body(body)
+					.headers(headers)
+					.end()
+				return new HttpResponse(res.body, {
+					status: res.statusCode,
+					headers: mapHeaderType(res.headers),
 				})
 			})
 		)

package/src/helpers.ts

@@ -1,3 +1,4 @@
+import { OutgoingHttpHeaders } from 'node:http'
 import { ParsedQs } from 'qs'
 import { v4 as uuidv4 } from 'uuid'
 
@@ -59,3 +60,20 @@ export const queryParamsValue = (
 }
 
 export const cloneObject = <T>(o: T): T => JSON.parse(JSON.stringify(o))
+
+export const mapHeaderType = (
+	outgoingHttpHeaders: OutgoingHttpHeaders
+): HeadersInit => {
+	const headersInit: HeadersInit = {}
+	for (const key in outgoingHttpHeaders) {
+		const value = outgoingHttpHeaders[key]
+		if (Array.isArray(value)) {
+			// Join multiple values for the same header with a comma
+			headersInit[key] = value.join(', ')
+		} else if (value !== undefined) {
+			// Single value or undefined
+			headersInit[key] = value.toString()
+		}
+	}
+	return headersInit
+}