@jterrazz/test 6.4.1 → 6.5.0

package/dist/intercept2.js

@@ -23,55 +23,57 @@ async function ensureInterceptServer() {
 }
 /**
 * Register intercept entries as MSW handlers. Returns a cleanup function.
-* Handlers are consumed in queue order — each trigger match pops one response.
+*
+* Each incoming request is matched against all unconsumed entries in order.
+* The first entry whose URL and optional body filter match is consumed.
+* This supports multiple entries for the same URL with different body matchers.
 */
 async function registerIntercepts(entries) {
 	if (entries.length === 0) return () => {};
 	await ensureInterceptServer();
 	const { msw } = await loadMsw();
-	const queues = /* @__PURE__ */ new Map();
-	for (const entry of entries) {
-		const key = `${entry.trigger.method}:${entry.trigger.url}`;
-		const existing = queues.get(key) ?? [];
-		existing.push(entry);
-		queues.set(key, existing);
-	}
+	const consumed = Array.from({ length: entries.length }, () => false);
+	const urls = /* @__PURE__ */ new Set();
+	for (const entry of entries) urls.add(entry.trigger.url);
 	const handlers = [];
-	for (const [, queue] of queues) {
-		let index = 0;
-		const trigger = queue[0].trigger;
-		const handler = trigger.method === "*" ? msw.http.all(trigger.url instanceof RegExp ? trigger.url : trigger.url, createResolver(queue, () => index, () => {
-			index++;
-		})) : msw.http[trigger.method.toLowerCase()](trigger.url instanceof RegExp ? trigger.url : trigger.url, createResolver(queue, () => index, () => {
-			index++;
-		}));
-		handlers.push(handler);
+	for (const url of urls) {
+		const methods = /* @__PURE__ */ new Set();
+		for (const entry of entries) if (entry.trigger.url === url || String(entry.trigger.url) === String(url)) methods.add(entry.trigger.method);
+		for (const method of methods) {
+			const handlerFn = method === "*" ? msw.http.all : msw.http[method.toLowerCase()];
+			if (!handlerFn) continue;
+			const handler = handlerFn(url, async ({ request }) => {
+				let body = null;
+				let bodyParsed = false;
+				for (let i = 0; i < entries.length; i++) {
+					if (consumed[i]) continue;
+					const entry = entries[i];
+					if (entry.trigger.url !== url && String(entry.trigger.url) !== String(url)) continue;
+					if (entry.trigger.method !== method && entry.trigger.method !== "*") continue;
+					if (entry.trigger.match) {
+						if (!bodyParsed) {
+							try {
+								body = await request.clone().json();
+							} catch {}
+							bodyParsed = true;
+						}
+						if (!entry.trigger.match(body)) continue;
+					}
+					consumed[i] = true;
+					if (entry.response.delay) await new Promise((r) => setTimeout(r, entry.response.delay));
+					return msw.HttpResponse.json(entry.response.body, {
+						status: entry.response.status ?? 200,
+						headers: entry.response.headers
+					});
+				}
+			});
+			handlers.push(handler);
+		}
 	}
 	serverInstance.use(...handlers);
 	return () => {
 		serverInstance.resetHandlers();
 	};
-	function createResolver(queue, getIndex, advance) {
-		return async ({ request }) => {
-			const idx = getIndex();
-			if (idx >= queue.length) return;
-			const entry = queue[idx];
-			if (entry.trigger.match) {
-				let body = null;
-				try {
-					body = await request.clone().json();
-				} catch {}
-				if (!entry.trigger.match(body)) return;
-			}
-			advance();
-			if (entry.response.delay) await new Promise((r) => setTimeout(r, entry.response.delay));
-			const { HttpResponse } = await loadMsw().then((m) => m.msw);
-			return HttpResponse.json(entry.response.body, {
-				status: entry.response.status ?? 200,
-				headers: entry.response.headers
-			});
-		};
-	}
 }
 //#endregion
 export { registerIntercepts };

package/dist/intercept2.js.map

@@ -1 +1 @@
-{"version":3,"file":"intercept2.js","names":[],"sources":["../src/builder/common/intercept/intercept.ts"],"sourcesContent":["/**\n * MSW-based intercept server. Manages HTTP interception for spec.run().\n *\n * Intercepts are queued per trigger — the first matching handler is consumed,\n * then the next one in the queue is used for subsequent matching requests.\n */\nimport type { InterceptEntry } from './types.js';\n\nlet mswModule: any = null;\nlet mswHttp: any = null;\n\nasync function loadMsw() {\n    if (!mswModule) {\n        mswModule = await import('msw/node');\n        mswHttp = await import('msw');\n    }\n    return { node: mswModule, msw: mswHttp! };\n}\n\nlet serverInstance: any = null;\n\n/**\n * Start the MSW server (once per process).\n */\nexport async function ensureInterceptServer(): Promise<void> {\n    if (serverInstance) {\n        return;\n    }\n    const { node } = await loadMsw();\n    serverInstance = node.setupServer();\n    serverInstance.listen({ onUnhandledRequest: 'bypass' });\n}\n\n/**\n * Register intercept entries as MSW handlers. Returns a cleanup function.\n * Handlers are consumed in queue order — each trigger match pops one response.\n */\nexport async function registerIntercepts(entries: InterceptEntry[]): Promise<() => void> {\n    if (entries.length === 0) {\n        return () => {};\n    }\n\n    await ensureInterceptServer();\n    const { msw } = await loadMsw();\n\n    // Build a queue per unique trigger (same method+url+match combo)\n    const queues = new Map<string, InterceptEntry[]>();\n    for (const entry of entries) {\n        const key = `${entry.trigger.method}:${entry.trigger.url}`;\n        const existing = queues.get(key) ?? [];\n        existing.push(entry);\n        queues.set(key, existing);\n    }\n\n    const handlers: any[] = [];\n\n    for (const [, queue] of queues) {\n        let index = 0;\n        const trigger = queue[0].trigger;\n\n        const handler =\n            trigger.method === '*'\n                ? msw.http.all(\n                      trigger.url instanceof RegExp ? trigger.url : trigger.url,\n                      createResolver(\n                          queue,\n                          () => index,\n                          () => {\n                              index++;\n                          },\n                      ),\n                  )\n                : (msw.http as any)[trigger.method.toLowerCase()](\n                      trigger.url instanceof RegExp ? trigger.url : trigger.url,\n                      createResolver(\n                          queue,\n                          () => index,\n                          () => {\n                              index++;\n                          },\n                      ),\n                  );\n\n        handlers.push(handler);\n    }\n\n    serverInstance.use(...handlers);\n\n    return () => {\n        serverInstance.resetHandlers();\n    };\n\n    function createResolver(queue: InterceptEntry[], getIndex: () => number, advance: () => void) {\n        return async ({ request }: { request: Request }) => {\n            const idx = getIndex();\n            if (idx >= queue.length) {\n                // Queue exhausted — passthrough\n                return undefined;\n            }\n\n            const entry = queue[idx];\n\n            // Check body matcher if present\n            if (entry.trigger.match) {\n                let body: unknown = null;\n                try {\n                    body = await request.clone().json();\n                } catch {\n                    // Not JSON — skip match\n                }\n                if (!entry.trigger.match(body)) {\n                    return undefined;\n                }\n            }\n\n            advance();\n\n            // Apply delay if specified\n            if (entry.response.delay) {\n                await new Promise((r) => setTimeout(r, entry.response.delay));\n            }\n\n            const { HttpResponse } = await loadMsw().then((m) => m.msw);\n            return HttpResponse.json(entry.response.body, {\n                status: entry.response.status ?? 200,\n                headers: entry.response.headers,\n            });\n        };\n    }\n}\n\n/**\n * Stop the MSW server (call in afterAll).\n */\nexport async function stopInterceptServer(): Promise<void> {\n    if (serverInstance) {\n        serverInstance.close();\n        serverInstance = null;\n    }\n}\n"],"mappings":";AAQA,IAAI,YAAiB;AACrB,IAAI,UAAe;AAEnB,eAAe,UAAU;AACrB,KAAI,CAAC,WAAW;AACZ,cAAY,MAAM,OAAO;AACzB,YAAU,MAAM,OAAO;;AAE3B,QAAO;EAAE,MAAM;EAAW,KAAK;EAAU;;AAG7C,IAAI,iBAAsB;;;;AAK1B,eAAsB,wBAAuC;AACzD,KAAI,eACA;CAEJ,MAAM,EAAE,SAAS,MAAM,SAAS;AAChC,kBAAiB,KAAK,aAAa;AACnC,gBAAe,OAAO,EAAE,oBAAoB,UAAU,CAAC;;;;;;AAO3D,eAAsB,mBAAmB,SAAgD;AACrF,KAAI,QAAQ,WAAW,EACnB,cAAa;AAGjB,OAAM,uBAAuB;CAC7B,MAAM,EAAE,QAAQ,MAAM,SAAS;CAG/B,MAAM,yBAAS,IAAI,KAA+B;AAClD,MAAK,MAAM,SAAS,SAAS;EACzB,MAAM,MAAM,GAAG,MAAM,QAAQ,OAAO,GAAG,MAAM,QAAQ;EACrD,MAAM,WAAW,OAAO,IAAI,IAAI,IAAI,EAAE;AACtC,WAAS,KAAK,MAAM;AACpB,SAAO,IAAI,KAAK,SAAS;;CAG7B,MAAM,WAAkB,EAAE;AAE1B,MAAK,MAAM,GAAG,UAAU,QAAQ;EAC5B,IAAI,QAAQ;EACZ,MAAM,UAAU,MAAM,GAAG;EAEzB,MAAM,UACF,QAAQ,WAAW,MACb,IAAI,KAAK,IACL,QAAQ,eAAe,SAAS,QAAQ,MAAM,QAAQ,KACtD,eACI,aACM,aACA;AACF;IAEP,CACJ,GACA,IAAI,KAAa,QAAQ,OAAO,aAAa,EAC1C,QAAQ,eAAe,SAAS,QAAQ,MAAM,QAAQ,KACtD,eACI,aACM,aACA;AACF;IAEP,CACJ;AAEX,WAAS,KAAK,QAAQ;;AAG1B,gBAAe,IAAI,GAAG,SAAS;AAE/B,cAAa;AACT,iBAAe,eAAe;;CAGlC,SAAS,eAAe,OAAyB,UAAwB,SAAqB;AAC1F,SAAO,OAAO,EAAE,cAAoC;GAChD,MAAM,MAAM,UAAU;AACtB,OAAI,OAAO,MAAM,OAEb;GAGJ,MAAM,QAAQ,MAAM;AAGpB,OAAI,MAAM,QAAQ,OAAO;IACrB,IAAI,OAAgB;AACpB,QAAI;AACA,YAAO,MAAM,QAAQ,OAAO,CAAC,MAAM;YAC/B;AAGR,QAAI,CAAC,MAAM,QAAQ,MAAM,KAAK,CAC1B;;AAIR,YAAS;AAGT,OAAI,MAAM,SAAS,MACf,OAAM,IAAI,SAAS,MAAM,WAAW,GAAG,MAAM,SAAS,MAAM,CAAC;GAGjE,MAAM,EAAE,iBAAiB,MAAM,SAAS,CAAC,MAAM,MAAM,EAAE,IAAI;AAC3D,UAAO,aAAa,KAAK,MAAM,SAAS,MAAM;IAC1C,QAAQ,MAAM,SAAS,UAAU;IACjC,SAAS,MAAM,SAAS;IAC3B,CAAC"}
+{"version":3,"file":"intercept2.js","names":[],"sources":["../src/builder/common/intercept/intercept.ts"],"sourcesContent":["/**\n * MSW-based intercept server. Manages HTTP interception for spec.run().\n *\n * Intercepts are matched in order — for each incoming request, the first\n * unconsumed entry whose trigger matches (URL + optional body filter) is\n * used and consumed. This supports body-based routing to the same URL.\n */\nimport type { InterceptEntry } from './types.js';\n\nlet mswModule: any = null;\nlet mswHttp: any = null;\n\nasync function loadMsw() {\n    if (!mswModule) {\n        mswModule = await import('msw/node');\n        mswHttp = await import('msw');\n    }\n    return { node: mswModule, msw: mswHttp! };\n}\n\nlet serverInstance: any = null;\n\n/**\n * Start the MSW server (once per process).\n */\nexport async function ensureInterceptServer(): Promise<void> {\n    if (serverInstance) {\n        return;\n    }\n    const { node } = await loadMsw();\n    serverInstance = node.setupServer();\n    serverInstance.listen({ onUnhandledRequest: 'bypass' });\n}\n\n/**\n * Register intercept entries as MSW handlers. Returns a cleanup function.\n *\n * Each incoming request is matched against all unconsumed entries in order.\n * The first entry whose URL and optional body filter match is consumed.\n * This supports multiple entries for the same URL with different body matchers.\n */\nexport async function registerIntercepts(entries: InterceptEntry[]): Promise<() => void> {\n    if (entries.length === 0) {\n        return () => {};\n    }\n\n    await ensureInterceptServer();\n    const { msw } = await loadMsw();\n\n    // Track which entries have been consumed\n    const consumed = Array.from({ length: entries.length }, () => false);\n\n    // Collect unique URL patterns to register handlers for\n    const urls = new Set<RegExp | string>();\n    for (const entry of entries) {\n        urls.add(entry.trigger.url);\n    }\n\n    const handlers: any[] = [];\n\n    for (const url of urls) {\n        // Collect all methods for this URL\n        const methods = new Set<string>();\n        for (const entry of entries) {\n            if (entry.trigger.url === url || String(entry.trigger.url) === String(url)) {\n                methods.add(entry.trigger.method);\n            }\n        }\n\n        for (const method of methods) {\n            const handlerFn =\n                method === '*' ? msw.http.all : (msw.http as any)[method.toLowerCase()];\n            if (!handlerFn) {\n                continue;\n            }\n\n            const handler = handlerFn(url, async ({ request }: { request: Request }) => {\n                // Clone body once for all match checks\n                let body: unknown = null;\n                let bodyParsed = false;\n\n                for (let i = 0; i < entries.length; i++) {\n                    if (consumed[i]) {\n                        continue;\n                    }\n\n                    const entry = entries[i];\n\n                    // Check URL matches\n                    if (entry.trigger.url !== url && String(entry.trigger.url) !== String(url)) {\n                        continue;\n                    }\n\n                    // Check method matches\n                    if (entry.trigger.method !== method && entry.trigger.method !== '*') {\n                        continue;\n                    }\n\n                    // Check body matcher if present\n                    if (entry.trigger.match) {\n                        if (!bodyParsed) {\n                            try {\n                                body = await request.clone().json();\n                            } catch {\n                                // Not JSON\n                            }\n                            bodyParsed = true;\n                        }\n                        if (!entry.trigger.match(body)) {\n                            continue;\n                        }\n                    }\n\n                    // Match found — consume and respond\n                    consumed[i] = true;\n\n                    if (entry.response.delay) {\n                        await new Promise((r) => setTimeout(r, entry.response.delay));\n                    }\n\n                    return msw.HttpResponse.json(entry.response.body, {\n                        status: entry.response.status ?? 200,\n                        headers: entry.response.headers,\n                    });\n                }\n\n                // No match — passthrough\n                return undefined;\n            });\n\n            handlers.push(handler);\n        }\n    }\n\n    serverInstance.use(...handlers);\n\n    return () => {\n        serverInstance.resetHandlers();\n    };\n}\n\n/**\n * Stop the MSW server (call in afterAll).\n */\nexport async function stopInterceptServer(): Promise<void> {\n    if (serverInstance) {\n        serverInstance.close();\n        serverInstance = null;\n    }\n}\n"],"mappings":";AASA,IAAI,YAAiB;AACrB,IAAI,UAAe;AAEnB,eAAe,UAAU;AACrB,KAAI,CAAC,WAAW;AACZ,cAAY,MAAM,OAAO;AACzB,YAAU,MAAM,OAAO;;AAE3B,QAAO;EAAE,MAAM;EAAW,KAAK;EAAU;;AAG7C,IAAI,iBAAsB;;;;AAK1B,eAAsB,wBAAuC;AACzD,KAAI,eACA;CAEJ,MAAM,EAAE,SAAS,MAAM,SAAS;AAChC,kBAAiB,KAAK,aAAa;AACnC,gBAAe,OAAO,EAAE,oBAAoB,UAAU,CAAC;;;;;;;;;AAU3D,eAAsB,mBAAmB,SAAgD;AACrF,KAAI,QAAQ,WAAW,EACnB,cAAa;AAGjB,OAAM,uBAAuB;CAC7B,MAAM,EAAE,QAAQ,MAAM,SAAS;CAG/B,MAAM,WAAW,MAAM,KAAK,EAAE,QAAQ,QAAQ,QAAQ,QAAQ,MAAM;CAGpE,MAAM,uBAAO,IAAI,KAAsB;AACvC,MAAK,MAAM,SAAS,QAChB,MAAK,IAAI,MAAM,QAAQ,IAAI;CAG/B,MAAM,WAAkB,EAAE;AAE1B,MAAK,MAAM,OAAO,MAAM;EAEpB,MAAM,0BAAU,IAAI,KAAa;AACjC,OAAK,MAAM,SAAS,QAChB,KAAI,MAAM,QAAQ,QAAQ,OAAO,OAAO,MAAM,QAAQ,IAAI,KAAK,OAAO,IAAI,CACtE,SAAQ,IAAI,MAAM,QAAQ,OAAO;AAIzC,OAAK,MAAM,UAAU,SAAS;GAC1B,MAAM,YACF,WAAW,MAAM,IAAI,KAAK,MAAO,IAAI,KAAa,OAAO,aAAa;AAC1E,OAAI,CAAC,UACD;GAGJ,MAAM,UAAU,UAAU,KAAK,OAAO,EAAE,cAAoC;IAExE,IAAI,OAAgB;IACpB,IAAI,aAAa;AAEjB,SAAK,IAAI,IAAI,GAAG,IAAI,QAAQ,QAAQ,KAAK;AACrC,SAAI,SAAS,GACT;KAGJ,MAAM,QAAQ,QAAQ;AAGtB,SAAI,MAAM,QAAQ,QAAQ,OAAO,OAAO,MAAM,QAAQ,IAAI,KAAK,OAAO,IAAI,CACtE;AAIJ,SAAI,MAAM,QAAQ,WAAW,UAAU,MAAM,QAAQ,WAAW,IAC5D;AAIJ,SAAI,MAAM,QAAQ,OAAO;AACrB,UAAI,CAAC,YAAY;AACb,WAAI;AACA,eAAO,MAAM,QAAQ,OAAO,CAAC,MAAM;eAC/B;AAGR,oBAAa;;AAEjB,UAAI,CAAC,MAAM,QAAQ,MAAM,KAAK,CAC1B;;AAKR,cAAS,KAAK;AAEd,SAAI,MAAM,SAAS,MACf,OAAM,IAAI,SAAS,MAAM,WAAW,GAAG,MAAM,SAAS,MAAM,CAAC;AAGjE,YAAO,IAAI,aAAa,KAAK,MAAM,SAAS,MAAM;MAC9C,QAAQ,MAAM,SAAS,UAAU;MACjC,SAAS,MAAM,SAAS;MAC3B,CAAC;;KAKR;AAEF,YAAS,KAAK,QAAQ;;;AAI9B,gBAAe,IAAI,GAAG,SAAS;AAE/B,cAAa;AACT,iBAAe,eAAe"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jterrazz/test",
-    "version": "6.4.1",
+    "version": "6.5.0",
     "author": "Jean-Baptiste Terrazzoni <contact@jterrazz.com>",
     "repository": {
         "type": "git",