@schmock/core 2.0.2 → 2.1.0

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;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"}
+{"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;IA+EP,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;IA+O5B;;;;OAIG;YACW,UAAU;CAezB"}

package/dist/builder.js

@@ -103,10 +103,11 @@ export class CallableMockInstance {
         }
         // Parse the route key to create pattern and extract parameters
         const parsed = parseRouteKey(route);
-        // Check for duplicate routes
+        // Check for duplicate routes — first registration wins, subsequent ones are dropped
         const existing = this.routes.find((r) => r.method === parsed.method && r.path === parsed.path);
         if (existing) {
             this.logger.log("warning", `Duplicate route: ${route} — first registration wins`);
+            return this;
         }
         // Compile the route
         const compiledRoute = {
@@ -119,12 +120,9 @@ export class CallableMockInstance {
         };
         this.routes.push(compiledRoute);
         // Store static routes (no params) in Map for O(1) lookup
-        // Only store the first registration — "first registration wins" semantics
         if (parsed.params.length === 0) {
             const key = `${parsed.method} ${normalizePath(parsed.path)}`;
-            if (!this.staticRoutes.has(key)) {
-                this.staticRoutes.set(key, compiledRoute);
-            }
+            this.staticRoutes.set(key, compiledRoute);
         }
         this.logger.log("route", `Route defined: ${route}`, {
             contentType: config.contentType,
@@ -419,7 +417,7 @@ export class CallableMockInstance {
             const response = parseResponse(result, matchedRoute.config);
             // Apply delay (route-level overrides global)
             await this.applyDelay(matchedRoute.config.delay);
-            // Record request in history
+            // Record request in history (FIFO-bounded when maxHistorySize is set)
             this.requestHistory.push({
                 method,
                 path: requestPath,
@@ -430,6 +428,12 @@ export class CallableMockInstance {
                 timestamp: Date.now(),
                 response: { status: response.status, body: response.body },
             });
+            const maxHistorySize = this.globalConfig.maxHistorySize;
+            if (typeof maxHistorySize === "number" &&
+                maxHistorySize >= 0 &&
+                this.requestHistory.length > maxHistorySize) {
+                this.requestHistory.splice(0, this.requestHistory.length - maxHistorySize);
+            }
             this.emit("request:end", {
                 method,
                 path: requestPath,

package/dist/constants.d.ts

@@ -16,6 +16,11 @@ export declare function isRouteNotFound(response: {
 /**
  * Check if a value is a status tuple: [status, body] or [status, body, headers]
  * Guards against misinterpreting numeric arrays like [1, 2, 3] as tuples.
+ *
+ * Known ambiguity: a length-2 numeric array whose first element happens to
+ * be in the HTTP-status range (e.g. [200, 300] as legitimate data) is
+ * indistinguishable from a status tuple by shape alone. Prefer the explicit
+ * status() helper or return an object response when the data could collide.
  */
 export declare function isStatusTuple(value: unknown): value is [number, unknown] | [number, unknown, Record<string, string>];
 //# sourceMappingURL=constants.d.ts.map

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,eAAO,MAAM,oBAAoB,EAAG,iBAA0B,CAAC;AAE/D,eAAO,MAAM,YAAY,EAAE,SAAS,UAAU,EAQpC,CAAC;AAEX,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,UAAU,CAEjE;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAMvD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAG7E;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;CACf,GAAG,OAAO,CASV;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAQxE"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,eAAO,MAAM,oBAAoB,EAAG,iBAA0B,CAAC;AAE/D,eAAO,MAAM,YAAY,EAAE,SAAS,UAAU,EAQpC,CAAC;AAEX,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,IAAI,UAAU,CAEjE;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAMvD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAG7E;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE;IACxC,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;CACf,GAAG,OAAO,CASV;AAED;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAQxE"}

package/dist/constants.js

@@ -40,6 +40,11 @@ export function isRouteNotFound(response) {
 /**
  * Check if a value is a status tuple: [status, body] or [status, body, headers]
  * Guards against misinterpreting numeric arrays like [1, 2, 3] as tuples.
+ *
+ * Known ambiguity: a length-2 numeric array whose first element happens to
+ * be in the HTTP-status range (e.g. [200, 300] as legitimate data) is
+ * indistinguishable from a status tuple by shape alone. Prefer the explicit
+ * status() helper or return an object response when the data could collide.
  */
 export function isStatusTuple(value) {
     return (Array.isArray(value) &&

package/dist/interceptor.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"version":3,"file":"interceptor.d.ts","sourceRoot":"","sources":["../src/interceptor.ts"],"names":[],"mappings":"AA2JA;;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,CA0JzB"}

package/dist/interceptor.js

@@ -19,6 +19,43 @@ function extractPathname(url) {
     }
     return urlWithoutQuery;
 }
+/**
+ * Extract origin (scheme + host + port) from a URL string, or null for
+ * relative URLs that don't carry one.
+ */
+function extractOrigin(url) {
+    if (!url.includes("://"))
+        return null;
+    try {
+        return new URL(url).origin;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Parse the user-supplied baseUrl option into its origin and path parts.
+ * - "/api"                  → { origin: null, path: "/api" }
+ * - "https://x.com/api/v1"  → { origin: "https://x.com", path: "/api/v1" }
+ * - "https://x.com"         → { origin: "https://x.com", path: "" }
+ *
+ * Trailing slash is stripped from the path so the segment-boundary check
+ * works the same way for "/api" and "/api/".
+ */
+function parseBaseUrl(baseUrl) {
+    if (baseUrl.includes("://")) {
+        try {
+            const parsed = new URL(baseUrl);
+            const rawPath = parsed.pathname;
+            const path = rawPath === "/" ? "" : rawPath.replace(/\/$/, "");
+            return { origin: parsed.origin, path };
+        }
+        catch {
+            // Fall through to path-only handling
+        }
+    }
+    return { origin: null, path: baseUrl.replace(/\/$/, "") };
+}
 /**
  * Extract query parameters from a URL string.
  */
@@ -114,15 +151,25 @@ export function createFetchInterceptor(handle, options = {}) {
                 ? input.href
                 : input;
         const path = extractPathname(urlString);
-        // BaseUrl filter — non-matching requests go straight to real fetch
-        // Enforce segment boundary: /api must not match /apiv2
+        // BaseUrl filter — non-matching requests go straight to real fetch.
+        // Two modes:
+        //   - origin form ("https://api.example.com/v1"): require matching
+        //     origin AND matching path prefix.
+        //   - path form ("/api"): match pathname prefix only.
+        // Both enforce a segment boundary so "/api" doesn't 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);
+            const { origin: baseOrigin, path: basePath } = parseBaseUrl(baseUrl);
+            if (baseOrigin) {
+                const reqOrigin = extractOrigin(urlString);
+                if (reqOrigin !== baseOrigin) {
+                    return originalFetch(input, init);
+                }
+            }
+            if (basePath) {
+                const isMatch = path === basePath || path.startsWith(`${basePath}/`);
+                if (!isMatch) {
+                    return originalFetch(input, init);
+                }
             }
         }
         // Build adapter request

package/dist/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAuC3D"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../src/parser.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAE7C,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,UAAU,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,WAAW,CAyC3D"}

package/dist/parser.js

@@ -17,20 +17,23 @@ export function parseRouteKey(routeKey) {
         throw new RouteParseError(routeKey, 'Expected format: "METHOD /path" (e.g., "GET /users")');
     }
     const [, method, path] = match;
-    // Extract parameter names
+    // Parameter names are restricted to [A-Za-z0-9_-] so that surrounding
+    // literals (".json", brackets, parens, etc.) terminate the name and can
+    // be escaped without bleeding into the parameter regex. Build the
+    // pattern by splitting the path on the param marker, escaping each
+    // literal segment, then substituting the capture group for each :name.
     const params = [];
-    const paramPattern = /:([^/]+)/g;
-    let paramMatch;
-    paramMatch = paramPattern.exec(path);
-    while (paramMatch !== null) {
-        params.push(paramMatch[1]);
-        paramMatch = paramPattern.exec(path);
-    }
-    // Build regex pattern for matching
-    // Replace :param with capture groups
     const regexPath = path
-        .replace(/[.*+?^${}()|[\]\\]/g, "\\$&") // Escape special regex chars except :
-        .replace(/:([^/]+)/g, "([^/]+)"); // Replace :param with capture group
+        .split(/(:[a-zA-Z0-9_-]+)/g)
+        .map((segment) => {
+        const paramMatch = segment.match(/^:([a-zA-Z0-9_-]+)$/);
+        if (paramMatch) {
+            params.push(paramMatch[1]);
+            return "([^/]+)";
+        }
+        return segment.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    })
+        .join("");
     const pattern = new RegExp(`^${regexPath}$`);
     return {
         method: toHttpMethod(method),

package/package.json

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

package/src/builder.ts

@@ -129,7 +129,7 @@ export class CallableMockInstance {
     // Parse the route key to create pattern and extract parameters
     const parsed = parseRouteKey(route);
 
-    // Check for duplicate routes
+    // Check for duplicate routes — first registration wins, subsequent ones are dropped
     const existing = this.routes.find(
       (r) => r.method === parsed.method && r.path === parsed.path,
     );
@@ -138,6 +138,7 @@ export class CallableMockInstance {
         "warning",
         `Duplicate route: ${route} — first registration wins`,
       );
+      return this;
     }
 
     // Compile the route
@@ -153,12 +154,9 @@ export class CallableMockInstance {
     this.routes.push(compiledRoute);
 
     // Store static routes (no params) in Map for O(1) lookup
-    // Only store the first registration — "first registration wins" semantics
     if (parsed.params.length === 0) {
       const key = `${parsed.method} ${normalizePath(parsed.path)}`;
-      if (!this.staticRoutes.has(key)) {
-        this.staticRoutes.set(key, compiledRoute);
-      }
+      this.staticRoutes.set(key, compiledRoute);
     }
 
     this.logger.log("route", `Route defined: ${route}`, {
@@ -564,7 +562,7 @@ export class CallableMockInstance {
       // Apply delay (route-level overrides global)
       await this.applyDelay(matchedRoute.config.delay);
 
-      // Record request in history
+      // Record request in history (FIFO-bounded when maxHistorySize is set)
       this.requestHistory.push({
         method,
         path: requestPath,
@@ -575,6 +573,17 @@ export class CallableMockInstance {
         timestamp: Date.now(),
         response: { status: response.status, body: response.body },
       });
+      const maxHistorySize = this.globalConfig.maxHistorySize;
+      if (
+        typeof maxHistorySize === "number" &&
+        maxHistorySize >= 0 &&
+        this.requestHistory.length > maxHistorySize
+      ) {
+        this.requestHistory.splice(
+          0,
+          this.requestHistory.length - maxHistorySize,
+        );
+      }
 
       this.emit("request:end", {
         method,

package/src/constants.ts

@@ -54,6 +54,11 @@ export function isRouteNotFound(response: {
 /**
  * Check if a value is a status tuple: [status, body] or [status, body, headers]
  * Guards against misinterpreting numeric arrays like [1, 2, 3] as tuples.
+ *
+ * Known ambiguity: a length-2 numeric array whose first element happens to
+ * be in the HTTP-status range (e.g. [200, 300] as legitimate data) is
+ * indistinguishable from a status tuple by shape alone. Prefer the explicit
+ * status() helper or return an object response when the data could collide.
  */
 export function isStatusTuple(
   value: unknown,

package/src/interceptor.ts

@@ -24,6 +24,45 @@ function extractPathname(url: string): string {
   return urlWithoutQuery;
 }
 
+/**
+ * Extract origin (scheme + host + port) from a URL string, or null for
+ * relative URLs that don't carry one.
+ */
+function extractOrigin(url: string): string | null {
+  if (!url.includes("://")) return null;
+  try {
+    return new URL(url).origin;
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * Parse the user-supplied baseUrl option into its origin and path parts.
+ * - "/api"                  → { origin: null, path: "/api" }
+ * - "https://x.com/api/v1"  → { origin: "https://x.com", path: "/api/v1" }
+ * - "https://x.com"         → { origin: "https://x.com", path: "" }
+ *
+ * Trailing slash is stripped from the path so the segment-boundary check
+ * works the same way for "/api" and "/api/".
+ */
+function parseBaseUrl(baseUrl: string): {
+  origin: string | null;
+  path: string;
+} {
+  if (baseUrl.includes("://")) {
+    try {
+      const parsed = new URL(baseUrl);
+      const rawPath = parsed.pathname;
+      const path = rawPath === "/" ? "" : rawPath.replace(/\/$/, "");
+      return { origin: parsed.origin, path };
+    } catch {
+      // Fall through to path-only handling
+    }
+  }
+  return { origin: null, path: baseUrl.replace(/\/$/, "") };
+}
+
 /**
  * Extract query parameters from a URL string.
  */
@@ -150,16 +189,25 @@ export function createFetchInterceptor(
 
     const path = extractPathname(urlString);
 
-    // BaseUrl filter — non-matching requests go straight to real fetch
-    // Enforce segment boundary: /api must not match /apiv2
+    // BaseUrl filter — non-matching requests go straight to real fetch.
+    // Two modes:
+    //   - origin form ("https://api.example.com/v1"): require matching
+    //     origin AND matching path prefix.
+    //   - path form ("/api"): match pathname prefix only.
+    // Both enforce a segment boundary so "/api" doesn't 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);
+      const { origin: baseOrigin, path: basePath } = parseBaseUrl(baseUrl);
+      if (baseOrigin) {
+        const reqOrigin = extractOrigin(urlString);
+        if (reqOrigin !== baseOrigin) {
+          return originalFetch(input, init);
+        }
+      }
+      if (basePath) {
+        const isMatch = path === basePath || path.startsWith(`${basePath}/`);
+        if (!isMatch) {
+          return originalFetch(input, init);
+        }
       }
     }
 

package/src/parser.test.ts

@@ -127,5 +127,22 @@ describe("parseRouteKey", () => {
       expect(match).toBeTruthy();
       expect(match?.[1]).toBe("report-2023.pdf");
     });
+
+    it("stops the param name at a literal '.' suffix and escapes the dot", () => {
+      const route = parseRouteKey("GET /files/:name.json");
+
+      expect(route.params).toEqual(["name"]);
+      expect("/files/report.json".match(route.pattern)?.[1]).toBe("report");
+      expect("/files/report.json2".match(route.pattern)).toBeNull();
+      expect("/files/reportXjson".match(route.pattern)).toBeNull();
+    });
+
+    it("treats parens around params as literal characters", () => {
+      const route = parseRouteKey("GET /items/(:id)");
+
+      expect(route.params).toEqual(["id"]);
+      expect("/items/(42)".match(route.pattern)?.[1]).toBe("42");
+      expect("/items/42".match(route.pattern)).toBeNull();
+    });
   });
 });

package/src/parser.ts

@@ -34,22 +34,24 @@ export function parseRouteKey(routeKey: string): ParsedRoute {
 
   const [, method, path] = match;
 
-  // Extract parameter names
+  // Parameter names are restricted to [A-Za-z0-9_-] so that surrounding
+  // literals (".json", brackets, parens, etc.) terminate the name and can
+  // be escaped without bleeding into the parameter regex. Build the
+  // pattern by splitting the path on the param marker, escaping each
+  // literal segment, then substituting the capture group for each :name.
   const params: string[] = [];
-  const paramPattern = /:([^/]+)/g;
-  let paramMatch: RegExpExecArray | null;
 
-  paramMatch = paramPattern.exec(path);
-  while (paramMatch !== null) {
-    params.push(paramMatch[1]);
-    paramMatch = paramPattern.exec(path);
-  }
-
-  // Build regex pattern for matching
-  // Replace :param with capture groups
   const regexPath = path
-    .replace(/[.*+?^${}()|[\]\\]/g, "\\$&") // Escape special regex chars except :
-    .replace(/:([^/]+)/g, "([^/]+)"); // Replace :param with capture group
+    .split(/(:[a-zA-Z0-9_-]+)/g)
+    .map((segment) => {
+      const paramMatch = segment.match(/^:([a-zA-Z0-9_-]+)$/);
+      if (paramMatch) {
+        params.push(paramMatch[1]);
+        return "([^/]+)";
+      }
+      return segment.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    })
+    .join("");
 
   const pattern = new RegExp(`^${regexPath}$`);
 

package/src/steps/developer-experience.steps.ts

@@ -183,4 +183,22 @@ describeFeature(feature, ({ Scenario }) => {
     });
   });
 
+  Scenario("Duplicate routes are not duplicated in getRoutes()", ({ Given, When, Then }) => {
+    let routesList: ReturnType<typeof mock.getRoutes>;
+
+    Given("I create a mock with two routes on {string} with different data", (_, route: string) => {
+      mock = schmock();
+      mock(route as Schmock.RouteKey, [{ id: 1 }]);
+      mock(route as Schmock.RouteKey, [{ id: 2 }]);
+    });
+
+    When("I call getRoutes", () => {
+      routesList = mock.getRoutes();
+    });
+
+    Then("only one route entry is returned", () => {
+      expect(routesList).toHaveLength(1);
+    });
+  });
+
 });

package/src/steps/interceptor.steps.ts

@@ -130,6 +130,60 @@ describeFeature(feature, ({ Scenario, AfterEachScenario }) => {
     });
   });
 
+  Scenario("Origin-form baseUrl intercepts matching origin only", ({ Given, When, Then, And }) => {
+    Given("a Schmock instance with route \"GET /api/users\" returning users", () => {
+      setup();
+      mock("GET /api/users", [{ id: 1 }]);
+    });
+
+    And("fetch is intercepted with baseUrl \"https://api.example.com\"", () => {
+      handle = mock.intercept({ baseUrl: "https://api.example.com" });
+    });
+
+    When("I fetch \"https://api.example.com/api/users\"", async () => {
+      fetchResponse = await fetch("https://api.example.com/api/users");
+    });
+
+    Then("the response status should be {int}", (_, status: number) => {
+      expect(fetchResponse?.status).toBe(status);
+    });
+
+    When("I fetch \"https://other.example.com/api/users\"", async () => {
+      await fetch("https://other.example.com/api/users");
+    });
+
+    Then("the original fetch should have been called", () => {
+      expect(savedFetch).toHaveBeenCalled();
+    });
+  });
+
+  Scenario("Origin-form baseUrl with a path prefix requires both to match", ({ Given, When, Then, And }) => {
+    Given("a Schmock instance with route \"GET /v1/users\" returning users", () => {
+      setup();
+      mock("GET /v1/users", [{ id: 1 }]);
+    });
+
+    And("fetch is intercepted with baseUrl \"https://api.example.com/v1\"", () => {
+      handle = mock.intercept({ baseUrl: "https://api.example.com/v1" });
+    });
+
+    When("I fetch \"https://api.example.com/v1/users\"", async () => {
+      fetchResponse = await fetch("https://api.example.com/v1/users");
+    });
+
+    Then("the response status should be {int}", (_, status: number) => {
+      expect(fetchResponse?.status).toBe(status);
+    });
+
+    When("I fetch \"https://api.example.com/users\"", async () => {
+      await fetch("https://api.example.com/users");
+    });
+
+    Then("the original fetch should have been called", () => {
+      expect(savedFetch).toHaveBeenCalled();
+    });
+  });
+
   Scenario("beforeRequest hook modifies the request", ({ Given, When, Then, And }) => {
     Given("a Schmock instance with route \"GET /api/users\" that reads headers", () => {
       setup();

package/src/steps/request-history.steps.ts

@@ -255,4 +255,22 @@ describeFeature(feature, ({ Scenario }) => {
       expect(mock.callCount()).toBe(0);
     });
   });
+
+  Scenario("maxHistorySize bounds the history with FIFO eviction", ({ Given, When, Then }) => {
+    Given("I create a mock with maxHistorySize {int} and a users route", (_, maxHistorySize: number) => {
+      mock = schmock({ maxHistorySize });
+      mock("GET /users", []);
+    });
+
+    When("I issue {int} requests to {string}", async (_, count: number, request: string) => {
+      const [method, path] = request.split(" ");
+      for (let i = 0; i < count; i++) {
+        await mock.handle(method as any, path);
+      }
+    });
+
+    Then("the call count should be {int}", (_, expected: number) => {
+      expect(mock.callCount()).toBe(expected);
+    });
+  });
 });