Fixing a bug when a regexp is used as a path #270

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 8.8.1
+
+Fixing a bug when a regexp is used as a path. #270
+
 ## 8.8.0
 
 Adding a `hashString` to the `Match` object. #269

lib/es/index.js

@@ -299,9 +299,13 @@ export default function Navigo(appRoute, resolveOptions) {
       currentLocationPath: currentLocation
     };
     setLocationPath(context, function () {});
-    path = clean(path);
+
+    if (typeof path === "string") {
+      path = clean(path);
+    }
+
     var match = matchRoute(context, {
-      name: path,
+      name: String(path),
       path: path,
       handler: function handler() {},
       hooks: {}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "navigo",
-  "version": "8.8.0",
+  "version": "8.8.1",
   "description": "A simple vanilla JavaScript router",
   "main": "lib/navigo.js",
   "browser": "lib/navigo.min.js",

src/__tests__/issues.spec.ts

@@ -316,4 +316,39 @@ describe("Given the Navigo library", () => {
       expect(location.pathname).toBe("/item/abc-1234");
     });
   });
+  describe("and the problem described in #270", () => {
+    it("should not throw an error", () => {
+      const h1 = jest.fn();
+      const h2 = jest.fn();
+      const r: NavigoRouter = new Navigo("/");
+
+      r.on(/xyz\/[0-9a-z]{4,8}$/, h1, {
+        leave: (done, match) => {
+          done();
+        },
+      });
+
+      r.on(/xyz\/[0-9a-z]{4,8}\/sub$/, h2, {
+        leave: (done, match) => {
+          done();
+        },
+      });
+
+      r.navigate("/xyz/asdf");
+      r.navigate("/xyz/asdf/sub");
+
+      expect(h1).toBeCalledTimes(1);
+      expect(h1).toBeCalledWith(
+        expect.objectContaining({
+          url: "xyz/asdf",
+        })
+      );
+      expect(h2).toBeCalledTimes(1);
+      expect(h2).toBeCalledWith(
+        expect.objectContaining({
+          url: "xyz/asdf/sub",
+        })
+      );
+    });
+  });
 });

src/index.ts

@@ -322,7 +322,7 @@ export default function Navigo(
     return context.matches ? context.matches : false;
   }
   function directMatchWithLocation(
-    path: string,
+    path: string | RegExp,
     currentLocation?: string
   ): false | Match {
     const context: QContext = {
@@ -331,9 +331,11 @@ export default function Navigo(
       currentLocationPath: currentLocation,
     };
     setLocationPath(context, () => {});
-    path = clean(path);
+    if (typeof path === "string") {
+      path = clean(path);
+    }
     const match = matchRoute(context, {
-      name: path,
+      name: String(path),
       path,
       handler: () => {},
       hooks: {},

src/middlewares/checkForLeaveHook.ts

@@ -18,7 +18,7 @@ export default function checkForLeaveHook(context: QContext, done) {
         }
         let runHook = false;
         const newLocationVSOldMatch = context.instance.matchLocation(
-          oldMatch.route.path as string,
+          oldMatch.route.path,
           context.currentLocationPath
         );
         if (oldMatch.route.path !== "*") {