fix(toRouteMatcher): respect non strict trailing slash (#91)

Author: pi0

src/matcher.ts

@@ -19,13 +19,16 @@ export interface RouteMatcher {
 
 export function toRouteMatcher(router: RadixRouter): RouteMatcher {
   const table = _routerNodeToTable("", router.ctx.rootNode);
-  return _createMatcher(table);
+  return _createMatcher(table, router.ctx.options.strictTrailingSlash);
 }
 
-function _createMatcher(table: RouteTable): RouteMatcher {
+function _createMatcher(
+  table: RouteTable,
+  strictTrailingSlash?: boolean,
+): RouteMatcher {
   return {
     ctx: { table },
-    matchAll: (path) => _matchRoutes(path, table),
+    matchAll: (path: string) => _matchRoutes(path, table, strictTrailingSlash),
   } satisfies RouteMatcher;
 }
 
@@ -83,7 +86,16 @@ export function createMatcherFromExport(
   return _createMatcher(_createTableFromExport(matcherExport));
 }
 
-function _matchRoutes(path: string, table: RouteTable): RadixNodeData[] {
+function _matchRoutes(
+  path: string,
+  table: RouteTable,
+  strictTrailingSlash?: boolean,
+): RadixNodeData[] {
+  // By default trailing slashes are not strict
+  if (strictTrailingSlash !== true && path.endsWith("/")) {
+    path = path.slice(0, -1) || "/";
+  }
+
   // Order should be from less specific to most specific
   const matches = [];
 

tests/matcher.test.ts

@@ -51,6 +51,8 @@ describe("Route matcher", function () {
     "/foo/baz",
     "/foo/baz/**",
     "/foo/*/sub",
+    "/without-trailing",
+    "/with-trailing/",
   ]);
 
   const router = createRouter({ routes });
@@ -88,6 +90,12 @@ describe("Route matcher", function () {
           "/foo/baz" => {
             "pattern": "/foo/baz",
           },
+          "/without-trailing" => {
+            "pattern": "/without-trailing",
+          },
+          "/with-trailing" => {
+            "pattern": "/with-trailing/",
+          },
         },
         "wildcard": Map {
           "/foo" => {
@@ -142,6 +150,26 @@ describe("Route matcher", function () {
     `);
   });
 
+  it("trailing slash", () => {
+    // Defined with trailing slash
+    expect(_match("/with-trailing")).to.toMatchInlineSnapshot(`
+      [
+        "/with-trailing/",
+      ]
+    `);
+    expect(_match("/with-trailing")).toMatchObject(_match("/with-trailing/"));
+
+    // Defined without trailing slash
+    expect(_match("/without-trailing")).to.toMatchInlineSnapshot(`
+      [
+        "/without-trailing",
+      ]
+    `);
+    expect(_match("/without-trailing")).toMatchObject(
+      _match("/without-trailing/"),
+    );
+  });
+
   it("can be exported", () => {
     const jsonData = exportMatcher(matcher);
     expect(jsonData).toMatchInlineSnapshot(`
@@ -173,6 +201,12 @@ describe("Route matcher", function () {
           "/foo/baz": {
             "pattern": "/foo/baz",
           },
+          "/with-trailing": {
+            "pattern": "/with-trailing/",
+          },
+          "/without-trailing": {
+            "pattern": "/without-trailing",
+          },
         },
         "wildcard": {
           "/foo": {