Proper of the Match object in case of custom

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 8.8.9
+
+Proper `url` of the Match object in case of custom `root`.
+
 ## 8.8.8
 
 Fixing a bug with `directMatchWithLocation`. It wasn't aware for the `root`.

lib/es/utils.js

@@ -97,7 +97,7 @@ export function matchRoute(context, route) {
   if (match) {
     var data = isString(route.path) ? regExpResultToParams(match, paramNames) : match.groups ? match.groups : match.slice(1);
     return {
-      url: current,
+      url: clean(current.replace(new RegExp("^" + context.instance.root), "")),
       queryString: GETParams,
       hashString: extractHashFromURL(context.to),
       route: route,

package.json

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

src/__tests__/basic.spec.ts

@@ -428,4 +428,28 @@ describe("Given the Navigo library", () => {
       expect(r.current).toHaveLength(1);
     });
   });
+  describe("when we have a custom root and we have a match", () => {
+    it("should not include the root into the Match's url prop", () => {
+      const r: NavigoRouter = new Navigo("/app");
+      const h = jest.fn();
+
+      r.on("/login", h);
+      r.navigate("login");
+
+      expect(h).toBeCalledTimes(1);
+      expect(h).toBeCalledWith({
+        url: "login",
+        data: null,
+        params: null,
+        queryString: "",
+        hashString: "",
+        route: {
+          handler: expect.any(Function),
+          hooks: {},
+          name: "app/login",
+          path: "app/login",
+        },
+      });
+    });
+  });
 });

src/__tests__/navigate.spec.ts

@@ -231,7 +231,7 @@ describe("Given the Navigo library", () => {
         expect(location.pathname).toBe("/app/login");
         expect(r.current).toStrictEqual([
           expect.objectContaining({
-            url: "app/login",
+            url: "login",
           }),
         ]);
       });

src/utils.ts

@@ -113,7 +113,7 @@ export function matchRoute(context: QContext, route: Route): false | Match {
       ? match.groups
       : match.slice(1);
     return {
-      url: current,
+      url: clean(current.replace(new RegExp(`^${context.instance.root}`), "")),
       queryString: GETParams,
       hashString: extractHashFromURL(context.to),
       route: route,