@schmock/core 1.0.2 → 1.0.3

package/dist/builder.d.ts

@@ -42,8 +42,8 @@ export declare class CallableMockInstance {
     private runPluginPipeline;
     /**
      * Find a route that matches the given method and path
-     * Uses two-pass matching: exact routes first, then parameterized routes
-     * Searches in reverse order to prefer most recently defined routes
+     * Uses two-pass matching: static routes first, then parameterized routes
+     * Matches routes in registration order (first registered wins)
      * @param method - HTTP method to match
      * @param path - Request path to match
      * @returns Matched compiled route or undefined if no match

package/dist/builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,SAAS,EAET,YAAY,EACZ,UAAU,EACV,MAAM,EAGN,cAAc,EACd,QAAQ,EACR,WAAW,EACX,QAAQ,EACT,MAAM,YAAY,CAAC;AA4CpB;;;;GAIG;AACH,qBAAa,oBAAoB;IAKnB,OAAO,CAAC,YAAY;IAJhC,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,MAAM,CAAc;gBAER,YAAY,GAAE,YAAiB;IAanD,WAAW,CACT,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,WAAW,GAClB,IAAI;IA4DP,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAepB,MAAM,CACV,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,QAAQ,CAAC;IAiLpB;;;;OAIG;YACW,UAAU;IAcxB;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa;IA0DrB;;;;;;;;;;OAUG;YACW,iBAAiB;IAmF/B;;;;;;;;OAQG;IACH,OAAO,CAAC,SAAS;IA+BjB;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa;CActB"}
+{"version":3,"file":"builder.d.ts","sourceRoot":"","sources":["../src/builder.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,SAAS,EAET,YAAY,EACZ,UAAU,EACV,MAAM,EAGN,cAAc,EACd,QAAQ,EACR,WAAW,EACX,QAAQ,EACT,MAAM,YAAY,CAAC;AA4CpB;;;;GAIG;AACH,qBAAa,oBAAoB;IAKnB,OAAO,CAAC,YAAY;IAJhC,OAAO,CAAC,MAAM,CAA+B;IAC7C,OAAO,CAAC,OAAO,CAAgB;IAC/B,OAAO,CAAC,MAAM,CAAc;gBAER,YAAY,GAAE,YAAiB;IAanD,WAAW,CACT,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,WAAW,GAClB,IAAI;IA4DP,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAepB,MAAM,CACV,MAAM,EAAE,UAAU,EAClB,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,QAAQ,CAAC;IAiLpB;;;;OAIG;YACW,UAAU;IAcxB;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa;IA0DrB;;;;;;;;;;OAUG;YACW,iBAAiB;IAmF/B;;;;;;;;OAQG;IACH,OAAO,CAAC,SAAS;IA6BjB;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa;CActB"}

package/dist/builder.js

@@ -383,17 +383,16 @@ export class CallableMockInstance {
     }
     /**
      * Find a route that matches the given method and path
-     * Uses two-pass matching: exact routes first, then parameterized routes
-     * Searches in reverse order to prefer most recently defined routes
+     * Uses two-pass matching: static routes first, then parameterized routes
+     * Matches routes in registration order (first registered wins)
      * @param method - HTTP method to match
      * @param path - Request path to match
      * @returns Matched compiled route or undefined if no match
      * @private
      */
     findRoute(method, path) {
-        // First pass: Look for exact matches (routes without parameters)
-        for (let i = this.routes.length - 1; i >= 0; i--) {
-            const route = this.routes[i];
+        // First pass: Look for static routes (routes without parameters)
+        for (const route of this.routes) {
             if (route.method === method &&
                 route.params.length === 0 &&
                 route.pattern.test(path)) {
@@ -401,8 +400,7 @@ export class CallableMockInstance {
             }
         }
         // Second pass: Look for parameterized routes
-        for (let i = this.routes.length - 1; i >= 0; i--) {
-            const route = this.routes[i];
+        for (const route of this.routes) {
             if (route.method === method &&
                 route.params.length > 0 &&
                 route.pattern.test(path)) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@schmock/core",
   "description": "Core functionality for Schmock",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -32,7 +32,7 @@
   "license": "MIT",
   "devDependencies": {
     "@amiceli/vitest-cucumber": "^6.1.0",
-    "@types/node": "^24.9.1",
+    "@types/node": "^25.0.0",
     "@vitest/ui": "^4.0.15",
     "vitest": "^4.0.15"
   }

package/src/builder.ts

@@ -525,8 +525,8 @@ export class CallableMockInstance {
 
   /**
    * Find a route that matches the given method and path
-   * Uses two-pass matching: exact routes first, then parameterized routes
-   * Searches in reverse order to prefer most recently defined routes
+   * Uses two-pass matching: static routes first, then parameterized routes
+   * Matches routes in registration order (first registered wins)
    * @param method - HTTP method to match
    * @param path - Request path to match
    * @returns Matched compiled route or undefined if no match
@@ -536,9 +536,8 @@ export class CallableMockInstance {
     method: HttpMethod,
     path: string,
   ): CompiledCallableRoute | undefined {
-    // First pass: Look for exact matches (routes without parameters)
-    for (let i = this.routes.length - 1; i >= 0; i--) {
-      const route = this.routes[i];
+    // First pass: Look for static routes (routes without parameters)
+    for (const route of this.routes) {
       if (
         route.method === method &&
         route.params.length === 0 &&
@@ -549,8 +548,7 @@ export class CallableMockInstance {
     }
 
     // Second pass: Look for parameterized routes
-    for (let i = this.routes.length - 1; i >= 0; i--) {
-      const route = this.routes[i];
+    for (const route of this.routes) {
       if (
         route.method === method &&
         route.params.length > 0 &&

package/src/route-matching.test.ts

@@ -128,7 +128,7 @@ describe("route matching", () => {
   });
 
   describe("route precedence and conflicts", () => {
-    it("matches most recently defined route when patterns overlap", async () => {
+    it("prioritizes static routes over parameterized routes", async () => {
       const mock = schmock();
       mock("GET /users/:id", "parameterized");
       mock("GET /users/special", "static");
@@ -136,7 +136,7 @@ describe("route matching", () => {
       const paramResponse = await mock.handle("GET", "/users/123");
       const staticResponse = await mock.handle("GET", "/users/special");
 
-      // The static route should be matched since it was defined later
+      // Static routes should always be checked before parameterized routes
       expect(paramResponse.body).toBe("parameterized");
       expect(staticResponse.body).toBe("static");
     });
@@ -153,18 +153,61 @@ describe("route matching", () => {
       expect(v1Response.body).toBe("v1-specific");
     });
 
-    it("matches first matching route in definition order", async () => {
+    it("matches routes in registration order (first registered wins)", async () => {
       const mock = schmock();
       mock("GET /:type/items", "first");
       mock("GET /shop/:category", "second");
 
       const response = await mock.handle("GET", "/shop/items");
 
-      // Both routes match, but with reverse order search, the second route should win
-      // /:type/items matches with type="shop"
-      // /shop/:category matches with category="items"
-      // Since we search in reverse, /shop/:category (more specific) should match
-      expect(response.body).toBe("second");
+      // Both routes match, but the first registered route should win
+      // This matches the behavior of Express, Hono, Fastify, etc.
+      expect(response.body).toBe("first");
+    });
+
+    it("matches specific routes before wildcard when registered in natural order", async () => {
+      // Bug report reproduction: natural order (specific before wildcard)
+      const mock = schmock();
+      mock("GET /api/items/special", () => ({ type: "special" }));
+      mock("GET /api/items/:id", () => ({ type: "generic" }));
+
+      const specialResult = await mock.handle("GET", "/api/items/special");
+      const genericResult = await mock.handle("GET", "/api/items/123");
+
+      // Static route should match for /api/items/special
+      expect(specialResult.body).toEqual({ type: "special" });
+      // Parameterized route should match for /api/items/123
+      expect(genericResult.body).toEqual({ type: "generic" });
+    });
+
+    it("matches multiple specific routes before wildcard", async () => {
+      // Bug report scenario with multiple specific routes
+      const mock = schmock();
+      mock("GET /api/vulns/aggregated", "aggregated");
+      mock("GET /api/vulns/count", "count");
+      mock("GET /api/vulns/familyList", "familyList");
+      mock("GET /api/vulns/:vulnId", "byId");
+
+      const aggregatedRes = await mock.handle("GET", "/api/vulns/aggregated");
+      const countRes = await mock.handle("GET", "/api/vulns/count");
+      const familyListRes = await mock.handle("GET", "/api/vulns/familyList");
+      const byIdRes = await mock.handle("GET", "/api/vulns/CVE-2024-1234");
+
+      expect(aggregatedRes.body).toBe("aggregated");
+      expect(countRes.body).toBe("count");
+      expect(familyListRes.body).toBe("familyList");
+      expect(byIdRes.body).toBe("byId");
+    });
+
+    it("matches overlapping parameterized routes in registration order", async () => {
+      const mock = schmock();
+      mock("GET /api/:org/users/:id", "first-pattern");
+      mock("GET /api/:version/users/:userId", "second-pattern");
+
+      const response = await mock.handle("GET", "/api/acme/users/123");
+
+      // When both routes are parameterized and match, first registered wins
+      expect(response.body).toBe("first-pattern");
     });
   });