@schmock/core 2.0.0 → 2.0.1

package/dist/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"AAwDA;;;;GAIG;AACH,qBAAa,oBAAoB;IAanB,OAAO,CAAC,YAAY;IAZhC,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,YAAY,CAA4C;IAChE,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,WAAW,CAA2C;IAC9D,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,UAAU,CAAiC;IACnD,OAAO,CAAC,eAAe,CAAwC;IAE/D,OAAO,CAAC,SAAS,CAAoC;gBAEjC,YAAY,GAAE,OAAO,CAAC,YAAiB;IAa3D,WAAW,CACT,KAAK,EAAE,OAAO,CAAC,QAAQ,EACvB,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,MAAM,EAAE,OAAO,CAAC,WAAW,GAC1B,IAAI;IAiFP,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,oBAAoB,GAAG,IAAI;IAIvD,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI;IAoBlC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE;IAS5E,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO;IAS3D,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM;IAS7D,WAAW,CACT,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,EAC3B,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,aAAa,GAAG,SAAS;IAYpC,SAAS,IAAI,OAAO,CAAC,SAAS,EAAE;IAQhC,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAMnC,EAAE,CAAC,CAAC,SAAS,OAAO,CAAC,YAAY,EAC/B,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,IAAI,GACnD,IAAI;IAUP,GAAG,CAAC,CAAC,SAAS,OAAO,CAAC,YAAY,EAChC,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,IAAI,GACnD,IAAI;IAKP,OAAO,CAAC,IAAI;IAWZ,KAAK,IAAI,IAAI;IAeb,YAAY,IAAI,IAAI;IAKpB,UAAU,IAAI,IAAI;IAWlB,MAAM,CAAC,IAAI,SAAI,EAAE,QAAQ,SAAc,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;IAqDrE,KAAK,IAAI,IAAI;IAYb,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC,eAAe;IAgBhE,MAAM,CACV,MAAM,EAAE,OAAO,CAAC,UAAU,EAC1B,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,GAC/B,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;IAoO5B;;;;OAIG;YACW,UAAU;CAezB"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"AAwDA;;;;GAIG;AACH,qBAAa,oBAAoB;IAanB,OAAO,CAAC,YAAY;IAZhC,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,YAAY,CAA4C;IAChE,OAAO,CAAC,OAAO,CAAwB;IACvC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,WAAW,CAA2C;IAC9D,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,UAAU,CAAiC;IACnD,OAAO,CAAC,eAAe,CAAwC;IAE/D,OAAO,CAAC,SAAS,CAAoC;gBAEjC,YAAY,GAAE,OAAO,CAAC,YAAiB;IAa3D,WAAW,CACT,KAAK,EAAE,OAAO,CAAC,QAAQ,EACvB,SAAS,EAAE,OAAO,CAAC,SAAS,EAC5B,MAAM,EAAE,OAAO,CAAC,WAAW,GAC1B,IAAI;IAiFP,cAAc,CAAC,GAAG,EAAE,OAAO,CAAC,oBAAoB,GAAG,IAAI;IAIvD,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,GAAG,IAAI;IAoBlC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE;IAS5E,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO;IAS3D,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM;IAS7D,WAAW,CACT,MAAM,CAAC,EAAE,OAAO,CAAC,UAAU,EAC3B,IAAI,CAAC,EAAE,MAAM,GACZ,OAAO,CAAC,aAAa,GAAG,SAAS;IAYpC,SAAS,IAAI,OAAO,CAAC,SAAS,EAAE;IAQhC,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAMnC,EAAE,CAAC,CAAC,SAAS,OAAO,CAAC,YAAY,EAC/B,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,IAAI,GACnD,IAAI;IAUP,GAAG,CAAC,CAAC,SAAS,OAAO,CAAC,YAAY,EAChC,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,KAAK,IAAI,GACnD,IAAI;IAKP,OAAO,CAAC,IAAI;IAWZ,KAAK,IAAI,IAAI;IAiBb,YAAY,IAAI,IAAI;IAKpB,UAAU,IAAI,IAAI;IAWlB,MAAM,CAAC,IAAI,SAAI,EAAE,QAAQ,SAAc,GAAG,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;IAqDrE,KAAK,IAAI,IAAI;IAab,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC,eAAe;IAgBhE,MAAM,CACV,MAAM,EAAE,OAAO,CAAC,UAAU,EAC1B,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,OAAO,CAAC,cAAc,GAC/B,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC;IAoO5B;;;;OAIG;YACW,UAAU;CAezB"}

package/dist/builder.js

@@ -210,6 +210,8 @@ export class CallableMockInstance {
     }
     // ===== Reset / Lifecycle =====
     reset() {
+        this.interceptHandle?.restore();
+        this.interceptHandle = null;
         this.close();
         this.routes = [];
         this.staticRoutes.clear();
@@ -281,6 +283,7 @@ export class CallableMockInstance {
         if (!this.server) {
             return;
         }
+        this.server.closeAllConnections();
         this.server.close();
         this.server = undefined;
         this.serverInfo = undefined;

package/dist/interceptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interceptor.d.ts","sourceRoot":"","sources":["../src/interceptor.ts"],"names":[],"mappings":"AAwGA;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,CACN,MAAM,EAAE,OAAO,CAAC,UAAU,EAC1B,IAAI,EAAE,MAAM,EACZ,cAAc,CAAC,EAAE,OAAO,CAAC,cAAc,KACpC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAC9B,OAAO,GAAE,OAAO,CAAC,gBAAqB,GACrC,OAAO,CAAC,eAAe,CAyIzB"}
+{"version":3,"file":"interceptor.d.ts","sourceRoot":"","sources":["../src/interceptor.ts"],"names":[],"mappings":"AAoHA;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,CACN,MAAM,EAAE,OAAO,CAAC,UAAU,EAC1B,IAAI,EAAE,MAAM,EACZ,cAAc,CAAC,EAAE,OAAO,CAAC,cAAc,KACpC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,EAC9B,OAAO,GAAE,OAAO,CAAC,gBAAqB,GACrC,OAAO,CAAC,eAAe,CAiJzB"}

package/dist/interceptor.js

@@ -38,7 +38,7 @@ function extractQuery(url) {
  */
 function extractHeaders(input, init) {
     const headers = {};
-    const raw = input instanceof Request ? input.headers : init?.headers;
+    const raw = init?.headers ?? (input instanceof Request ? input.headers : undefined);
     if (!raw)
         return headers;
     if (raw instanceof Headers) {
@@ -48,11 +48,13 @@ function extractHeaders(input, init) {
     }
     else if (Array.isArray(raw)) {
         for (const [key, value] of raw) {
-            headers[key] = value;
+            headers[key.toLowerCase()] = value;
         }
     }
     else {
-        Object.assign(headers, raw);
+        for (const key of Object.keys(raw)) {
+            headers[key.toLowerCase()] = raw[key];
+        }
     }
     return headers;
 }
@@ -60,11 +62,11 @@ function extractHeaders(input, init) {
  * Extract body from fetch init, parsing JSON when possible.
  */
 async function extractBody(input, init) {
-    const rawBody = input instanceof Request ? input.body : init?.body;
-    if (rawBody === null || rawBody === undefined)
+    // Per Fetch spec, init.body overrides Request.body when both are present
+    const bodyInit = init?.body ?? (input instanceof Request ? input.body : null);
+    if (bodyInit === null || bodyInit === undefined)
         return undefined;
     // String body — try to parse as JSON
-    const bodyInit = init?.body;
     if (typeof bodyInit === "string") {
         try {
             return JSON.parse(bodyInit);
@@ -73,8 +75,16 @@ async function extractBody(input, init) {
             return bodyInit;
         }
     }
+    // URLSearchParams — convert to key/value object
+    if (bodyInit instanceof URLSearchParams) {
+        const result = {};
+        bodyInit.forEach((value, key) => {
+            result[key] = value;
+        });
+        return result;
+    }
     // Request with body — clone and read
-    if (input instanceof Request && input.body) {
+    if (input instanceof Request && !init?.body && input.body) {
         try {
             return await input.clone().json();
         }
@@ -105,8 +115,15 @@ export function createFetchInterceptor(handle, options = {}) {
                 : input;
         const path = extractPathname(urlString);
         // BaseUrl filter — non-matching requests go straight to real fetch
-        if (baseUrl && !path.startsWith(baseUrl)) {
-            return originalFetch(input, init);
+        // Enforce segment boundary: /api must not match /apiv2
+        if (baseUrl) {
+            const normalizedBase = baseUrl.endsWith("/")
+                ? baseUrl.slice(0, -1)
+                : baseUrl;
+            const isMatch = path === normalizedBase || path.startsWith(`${normalizedBase}/`);
+            if (!isMatch) {
+                return originalFetch(input, init);
+            }
         }
         // Build adapter request
         const method = input instanceof Request ? input.method : (init?.method ?? "GET");

package/dist/types.d.ts

@@ -30,4 +30,5 @@ export type AdapterRequest = Schmock.AdapterRequest;
 export type AdapterResponse = Schmock.AdapterResponse;
 export type InterceptOptions = Schmock.InterceptOptions;
 export type InterceptHandle = Schmock.InterceptHandle;
+export type AdapterRequestOverride = Schmock.AdapterRequestOverride;
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;AAC5C,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;AACxC,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;AAChD,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;AACpD,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;AACpD,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;AACxC,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;AACpD,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;AAChD,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;AAC9C,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;AAC1C,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;AAC1D,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC;AAChE,MAAM,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;AACpC,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAClD,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;AAChD,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;AAC5C,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAClD,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;AAC5C,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;AAC1C,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,CAAC;AACtE,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AAC5D,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;AAClE,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;AAClE,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;AACpD,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;AAC5C,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;AAC5C,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;AAC5C,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;AAC1C,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;AACpD,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;AACtD,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;AACxD,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;AAC5C,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;AACxC,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;AAChD,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;AACpD,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;AACpD,MAAM,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;AACxC,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;AACpD,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;AAChD,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;AAC9C,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;AAC1C,MAAM,MAAM,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,CAAC;AAC1D,MAAM,MAAM,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC;AAChE,MAAM,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;AACpC,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAClD,MAAM,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;AAChD,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;AAC5C,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAClD,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;AAC5C,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;AAC1C,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAC,uBAAuB,CAAC;AACtE,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AAC5D,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;AAClE,MAAM,MAAM,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;AAClE,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;AACpD,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;AAC5C,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;AAC5C,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;AAC5C,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;AAC1C,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;AACpD,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;AACtD,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,CAAC;AACxD,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;AACtD,MAAM,MAAM,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@schmock/core",
   "description": "Core functionality for Schmock",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/src/builder.ts

@@ -283,6 +283,8 @@ export class CallableMockInstance {
   // ===== Reset / Lifecycle =====
 
   reset(): void {
+    this.interceptHandle?.restore();
+    this.interceptHandle = null;
     this.close();
     this.routes = [];
     this.staticRoutes.clear();
@@ -370,6 +372,7 @@ export class CallableMockInstance {
     if (!this.server) {
       return;
     }
+    this.server.closeAllConnections();
     this.server.close();
     this.server = undefined;
     this.serverInfo = undefined;

package/src/helpers.test.ts

@@ -103,4 +103,45 @@ describe("paginate", () => {
     expect(result.data).toEqual([]);
     expect(result.total).toBe(5);
   });
+
+  it("page=0 falls back to page 1 (falsy default)", () => {
+    const result = paginate(items, { page: 0, pageSize: 2 });
+    // page=0 is falsy, so options.page || 1 => 1
+    expect(result.page).toBe(1);
+    expect(result.data).toEqual([{ id: 1 }, { id: 2 }]);
+  });
+
+  it("pageSize=0 falls back to default 10 (falsy default)", () => {
+    const result = paginate(items, { pageSize: 0 });
+    // pageSize=0 is falsy, so options.pageSize || 10 => 10
+    expect(result.pageSize).toBe(10);
+    expect(result.data).toEqual(items);
+  });
+
+  it("handles empty array", () => {
+    const result = paginate([], { page: 1, pageSize: 5 });
+    expect(result).toEqual({
+      data: [],
+      page: 1,
+      pageSize: 5,
+      total: 0,
+      totalPages: 0,
+    });
+  });
+
+  it("negative page produces empty data (start index < 0)", () => {
+    const result = paginate(items, { page: -1, pageSize: 2 });
+    // (page - 1) * pageSize = (-1 - 1) * 2 = -4
+    // items.slice(-4, -2) => items from index 1 to 3
+    expect(result.page).toBe(-1);
+    expect(result.pageSize).toBe(2);
+    expect(result.total).toBe(5);
+  });
+
+  it("negative pageSize returns empty data", () => {
+    const result = paginate(items, { page: 1, pageSize: -5 });
+    // start = 0, end = 0 + (-5) = -5 => items.slice(0, -5) => []
+    expect(result.data).toEqual([]);
+    expect(result.pageSize).toBe(-5);
+  });
 });

package/src/interceptor.test.ts

@@ -143,6 +143,29 @@ describe("mock.intercept()", () => {
     handle.restore();
   });
 
+  it("normalizes header keys to lowercase", async () => {
+    mock("POST /api/data", ({ headers }) => [
+      200,
+      { auth: headers.authorization, ct: headers["content-type"] },
+    ]);
+    const handle = mock.intercept();
+
+    const res = await fetch("http://localhost/api/data", {
+      method: "POST",
+      headers: {
+        Authorization: "Bearer tok",
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({}),
+    });
+    expect(await res.json()).toEqual({
+      auth: "Bearer tok",
+      ct: "application/json",
+    });
+
+    handle.restore();
+  });
+
   it("parses JSON body from fetch init", async () => {
     mock("POST /api/users", ({ body }) => [201, body]);
     const handle = mock.intercept();
@@ -157,4 +180,112 @@ describe("mock.intercept()", () => {
 
     handle.restore();
   });
+
+  it("intercepts fetch called with a Request object", async () => {
+    mock("GET /api/users", [{ id: 1, name: "Alice" }]);
+    const handle = mock.intercept();
+
+    const req = new Request("http://localhost/api/users");
+    const res = await fetch(req);
+    expect(res.status).toBe(200);
+    expect(await res.json()).toEqual([{ id: 1, name: "Alice" }]);
+
+    handle.restore();
+  });
+
+  it("prefers init.headers over Request.headers", async () => {
+    mock("GET /api/data", ({ headers }) => [200, { val: headers["x-custom"] }]);
+    const handle = mock.intercept();
+
+    const req = new Request("http://localhost/api/data", {
+      headers: { "X-Custom": "from-request" },
+    });
+    const res = await fetch(req, {
+      headers: { "X-Custom": "from-init" },
+    });
+    expect(await res.json()).toEqual({ val: "from-init" });
+
+    handle.restore();
+  });
+
+  it("parses URLSearchParams body", async () => {
+    mock("POST /api/form", ({ body }) => [200, body]);
+    const handle = mock.intercept();
+
+    const params = new URLSearchParams();
+    params.set("name", "Alice");
+    params.set("role", "admin");
+
+    const res = await fetch("http://localhost/api/form", {
+      method: "POST",
+      body: params,
+    });
+    expect(await res.json()).toEqual({ name: "Alice", role: "admin" });
+
+    handle.restore();
+  });
+
+  it("baseUrl /api should NOT match /apiv2 (segment boundary)", async () => {
+    mock("GET /apiv2/data", [{ v2: true }]);
+    const savedFetch = globalThis.fetch;
+    const handle = mock.intercept({ baseUrl: "/api" });
+
+    // /apiv2/data does not start with "/api/" — it should passthrough
+    await fetch("http://localhost/apiv2/data");
+    expect(savedFetch).toHaveBeenCalled();
+
+    handle.restore();
+  });
+
+  it("baseUrl with trailing slash matches the same routes as without", async () => {
+    mock("GET /api/items", [{ id: 1 }]);
+
+    // Without trailing slash
+    const handle1 = mock.intercept({ baseUrl: "/api" });
+    const res1 = await fetch("http://localhost/api/items");
+    expect(res1.status).toBe(200);
+    expect(await res1.json()).toEqual([{ id: 1 }]);
+    handle1.restore();
+
+    // With trailing slash — should still match /api/items
+    const handle2 = mock.intercept({ baseUrl: "/api/" });
+    const res2 = await fetch("http://localhost/api/items");
+    expect(res2.status).toBe(200);
+    expect(await res2.json()).toEqual([{ id: 1 }]);
+    handle2.restore();
+  });
+
+  it("extractBody: init.body wins over Request.body per Fetch spec", async () => {
+    mock("POST /api/data", ({ body }) => [200, body]);
+    const handle = mock.intercept();
+
+    const req = new Request("http://localhost/api/data", {
+      method: "POST",
+      headers: { "content-type": "application/json" },
+      body: JSON.stringify({ source: "request" }),
+    });
+
+    const res = await fetch(req, {
+      body: JSON.stringify({ source: "init" }),
+    });
+    expect(await res.json()).toEqual({ source: "init" });
+
+    handle.restore();
+  });
+
+  it("extractBody: failed JSON parse falls back to text", async () => {
+    mock("POST /api/text", ({ body }) => [200, { received: body }]);
+    const handle = mock.intercept();
+
+    const res = await fetch("http://localhost/api/text", {
+      method: "POST",
+      headers: { "content-type": "text/plain" },
+      body: "not-json-{broken",
+    });
+
+    const json = await res.json();
+    expect(json.received).toBe("not-json-{broken");
+
+    handle.restore();
+  });
 });

package/src/interceptor.ts

@@ -48,7 +48,8 @@ function extractHeaders(
 ): Record<string, string> {
   const headers: Record<string, string> = {};
 
-  const raw = input instanceof Request ? input.headers : init?.headers;
+  const raw =
+    init?.headers ?? (input instanceof Request ? input.headers : undefined);
   if (!raw) return headers;
 
   if (raw instanceof Headers) {
@@ -57,10 +58,12 @@ function extractHeaders(
     });
   } else if (Array.isArray(raw)) {
     for (const [key, value] of raw) {
-      headers[key] = value;
+      headers[key.toLowerCase()] = value;
     }
   } else {
-    Object.assign(headers, raw);
+    for (const key of Object.keys(raw)) {
+      headers[key.toLowerCase()] = (raw as Record<string, string>)[key];
+    }
   }
 
   return headers;
@@ -73,11 +76,11 @@ async function extractBody(
   input: RequestInfo | URL,
   init?: RequestInit,
 ): Promise<unknown> {
-  const rawBody = input instanceof Request ? input.body : init?.body;
-  if (rawBody === null || rawBody === undefined) return undefined;
+  // Per Fetch spec, init.body overrides Request.body when both are present
+  const bodyInit = init?.body ?? (input instanceof Request ? input.body : null);
+  if (bodyInit === null || bodyInit === undefined) return undefined;
 
   // String body — try to parse as JSON
-  const bodyInit = init?.body;
   if (typeof bodyInit === "string") {
     try {
       return JSON.parse(bodyInit);
@@ -86,8 +89,17 @@ async function extractBody(
     }
   }
 
+  // URLSearchParams — convert to key/value object
+  if (bodyInit instanceof URLSearchParams) {
+    const result: Record<string, string> = {};
+    bodyInit.forEach((value, key) => {
+      result[key] = value;
+    });
+    return result;
+  }
+
   // Request with body — clone and read
-  if (input instanceof Request && input.body) {
+  if (input instanceof Request && !init?.body && input.body) {
     try {
       return await input.clone().json();
     } catch {
@@ -139,8 +151,16 @@ export function createFetchInterceptor(
     const path = extractPathname(urlString);
 
     // BaseUrl filter — non-matching requests go straight to real fetch
-    if (baseUrl && !path.startsWith(baseUrl)) {
-      return originalFetch(input, init);
+    // Enforce segment boundary: /api must not match /apiv2
+    if (baseUrl) {
+      const normalizedBase = baseUrl.endsWith("/")
+        ? baseUrl.slice(0, -1)
+        : baseUrl;
+      const isMatch =
+        path === normalizedBase || path.startsWith(`${normalizedBase}/`);
+      if (!isMatch) {
+        return originalFetch(input, init);
+      }
     }
 
     // Build adapter request

package/src/parser.property.test.ts

@@ -491,3 +491,104 @@ describe("handle() — fuzz", () => {
     );
   });
 });
+
+// ============================================================
+// Route matching round-trip properties
+// ============================================================
+
+describe("route matching round-trip — property", () => {
+  it("parameterized route: arbitrary param values are extracted correctly", () => {
+    fc.assert(
+      fc.asyncProperty(
+        safeSeg,
+        safeSeg,
+        safeSeg,
+        async (resource, paramA, paramB) => {
+          const mock = schmock();
+          let capturedParams: Record<string, string> = {};
+          mock(`GET /${resource}/:a/:b` as any, (ctx) => {
+            capturedParams = ctx.params;
+            return { ok: true };
+          });
+
+          const response = await mock.handle(
+            "GET",
+            `/${resource}/${paramA}/${paramB}`,
+          );
+          expect(response.status).toBe(200);
+          expect(capturedParams.a).toBe(paramA);
+          expect(capturedParams.b).toBe(paramB);
+        },
+      ),
+      { numRuns: 300 },
+    );
+  });
+
+  it("any valid response format produces a valid Response with status/body/headers", () => {
+    const responseGen = fc.oneof(
+      // Object body
+      fc.record({ key: safeSeg }),
+      // Tuple [status, body]
+      fc.tuple(fc.integer({ min: 100, max: 599 }), fc.record({ v: safeSeg })),
+      // Tuple [status, body, headers]
+      fc.tuple(
+        fc.integer({ min: 100, max: 599 }),
+        fc.record({ v: safeSeg }),
+        fc.constant({}),
+      ),
+      // null/undefined
+      fc.constant(null),
+      fc.constant(undefined),
+    );
+
+    fc.assert(
+      fc.asyncProperty(responseGen, async (genValue) => {
+        const mock = schmock();
+        mock("GET /test", () => genValue);
+
+        const response = await mock.handle("GET", "/test");
+        expect(typeof response.status).toBe("number");
+        expect(response.status).toBeGreaterThanOrEqual(100);
+        expect(response.status).toBeLessThanOrEqual(599);
+        expect(response).toHaveProperty("headers");
+        expect(typeof response.headers).toBe("object");
+      }),
+      { numRuns: 300 },
+    );
+  });
+
+  it("header keys are always lowercased after extractHeaders in interceptor", () => {
+    const headerKey = fc
+      .stringMatching(/^[A-Za-z][A-Za-z0-9-]{0,20}$/)
+      .filter((k) => k.length > 0);
+    const headerVal = safeSeg;
+
+    fc.assert(
+      fc.asyncProperty(headerKey, headerVal, async (key, val) => {
+        const mock = schmock();
+        let capturedHeaders: Record<string, string> = {};
+        mock("GET /hdr", (ctx) => {
+          capturedHeaders = ctx.headers;
+          return { ok: true };
+        });
+        const handle = mock.intercept();
+
+        try {
+          await fetch("http://localhost/hdr", {
+            headers: { [key]: val },
+          });
+
+          // All header keys should be lowercase
+          for (const hdrKey of Object.keys(capturedHeaders)) {
+            expect(hdrKey).toBe(hdrKey.toLowerCase());
+          }
+          // The value should be preserved
+          expect(capturedHeaders[key.toLowerCase()]).toBe(val);
+        } finally {
+          handle.restore();
+        }
+      }),
+      { numRuns: 200 },
+    );
+  });
+});

package/src/response-parsing.test.ts

@@ -225,6 +225,80 @@ describe("response parsing", () => {
     });
   });
 
+  describe("status code boundaries", () => {
+    it("status code 100 (lower boundary) is accepted as tuple", async () => {
+      const mock = schmock();
+      mock("GET /continue", () => [100, "Continue"]);
+
+      const response = await mock.handle("GET", "/continue");
+      expect(response.status).toBe(100);
+      expect(response.body).toBe("Continue");
+    });
+
+    it("status code 599 (upper boundary) is accepted as tuple", async () => {
+      const mock = schmock();
+      mock("GET /custom", () => [599, { message: "custom status" }]);
+
+      const response = await mock.handle("GET", "/custom");
+      expect(response.status).toBe(599);
+      expect(response.body).toEqual({ message: "custom status" });
+    });
+
+    it("float status like 200.5 is accepted as tuple (number check)", async () => {
+      const mock = schmock();
+      mock("GET /float", () => [200.5, { ok: true }]);
+
+      const response = await mock.handle("GET", "/float");
+      // isStatusTuple checks typeof === 'number' and 100 <= n <= 599
+      // 200.5 passes both checks, so it's treated as a tuple
+      expect(response.status).toBe(200.5);
+      expect(response.body).toEqual({ ok: true });
+    });
+
+    it("array [201, null, undefined] — tuple with undefined headers defaults to empty", async () => {
+      const mock = schmock();
+      mock("GET /null-headers", () => [201, null, undefined] as any);
+
+      const response = await mock.handle("GET", "/null-headers");
+      // isStatusTuple: length 3, first element 201 (number, 100-599) -> true
+      // destructure: [status=201, body=null, headers=undefined]
+      // headers defaults to {} via `headers = {}`
+      expect(response.status).toBe(201);
+      expect(response.body).toBeUndefined(); // null body becomes undefined
+      expect(response.headers).toEqual({});
+    });
+
+    it("non-tuple array [1, 2, 3, 4] with length > 3 treated as body", async () => {
+      const mock = schmock();
+      mock("GET /long-array", () => [1, 2, 3, 4] as any);
+
+      const response = await mock.handle("GET", "/long-array");
+      // isStatusTuple requires length 2 or 3, so length 4 => not a tuple => body
+      expect(response.status).toBe(200);
+      expect(response.body).toEqual([1, 2, 3, 4]);
+    });
+
+    it("status 99 (below 100) is NOT treated as a tuple", async () => {
+      const mock = schmock();
+      mock("GET /below-range", () => [99, { data: true }]);
+
+      const response = await mock.handle("GET", "/below-range");
+      // isStatusTuple requires value[0] >= 100, so 99 fails => treated as body
+      expect(response.status).toBe(200);
+      expect(response.body).toEqual([99, { data: true }]);
+    });
+
+    it("status 600 (above 599) is NOT treated as a tuple", async () => {
+      const mock = schmock();
+      mock("GET /above-range", () => [600, { data: true }]);
+
+      const response = await mock.handle("GET", "/above-range");
+      // isStatusTuple requires value[0] <= 599, so 600 fails => treated as body
+      expect(response.status).toBe(200);
+      expect(response.body).toEqual([600, { data: true }]);
+    });
+  });
+
   describe("edge cases", () => {
     it("handles response with circular references gracefully", async () => {
       const mock = schmock();

package/src/server.test.ts

@@ -113,4 +113,53 @@ describe("Standalone Server", () => {
     mock.close();
     expect(() => mock.close()).not.toThrow();
   });
+
+  it("generator that throws synchronously returns 500", async () => {
+    mock = schmock();
+    mock("GET /boom", () => {
+      throw new Error("sync kaboom");
+    });
+    const info = await mock.listen(0);
+
+    const res = await fetch(`http://127.0.0.1:${info.port}/boom`);
+    expect(res.status).toBe(500);
+    const body = await res.json();
+    expect(body.error).toBe("sync kaboom");
+  });
+
+  it("generator that returns rejected Promise returns 500", async () => {
+    mock = schmock();
+    mock("GET /reject", async () => {
+      throw new Error("async rejection");
+    });
+    const info = await mock.listen(0);
+
+    const res = await fetch(`http://127.0.0.1:${info.port}/reject`);
+    expect(res.status).toBe(500);
+    const body = await res.json();
+    expect(body.error).toBe("async rejection");
+  });
+
+  it("close terminates keep-alive connections immediately", async () => {
+    mock = schmock();
+    mock("GET /test", { ok: true });
+    const info = await mock.listen(0);
+
+    // Make a keep-alive request to establish a persistent connection
+    const res = await fetch(`http://127.0.0.1:${info.port}/test`, {
+      headers: { connection: "keep-alive" },
+    });
+    expect(res.status).toBe(200);
+
+    // Close the server — should terminate all connections
+    mock.close();
+
+    // Subsequent request should fail immediately (not hang on keep-alive)
+    try {
+      await fetch(`http://127.0.0.1:${info.port}/test`);
+      expect.unreachable("Should have thrown");
+    } catch {
+      // Expected: connection refused
+    }
+  });
 });