@schmock/core 2.0.3 → 2.1.0

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/package.json

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

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/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();