Fixing a bug with matchLocation

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 8.8.10
+
+Fixing a bug with `matchLocation`.
+
 ## 8.8.9
 
 Proper `url` of the Match object in case of custom `root`.

lib/es/index.js

@@ -316,6 +316,10 @@ export default function Navigo(appRoute, resolveOptions) {
   }
 
   function directMatchWithLocation(path, currentLocation, annotatePathWithRoot) {
+    if (currentLocation && typeof annotatePathWithRoot === "undefined" || annotatePathWithRoot) {
+      currentLocation = composePathWithRoot(currentLocation);
+    }
+
     var context = {
       instance: self,
       to: currentLocation,

package.json

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

src/__tests__/basic.spec.ts

@@ -452,4 +452,17 @@ describe("Given the Navigo library", () => {
       });
     });
   });
+  describe("when using matchLocation and we have a custom root", () => {
+    it("should properly match the path", () => {
+      const r: NavigoRouter = new Navigo("/app");
+
+      expect(r.matchLocation("posts/edit/:id", "posts/edit/xxx")).toStrictEqual(
+        expect.objectContaining({
+          data: {
+            id: "xxx",
+          },
+        })
+      );
+    });
+  });
 });

src/index.ts

@@ -344,6 +344,12 @@ export default function Navigo(
     currentLocation?: string,
     annotatePathWithRoot?: boolean
   ): false | Match {
+    if (
+      (currentLocation && typeof annotatePathWithRoot === "undefined") ||
+      annotatePathWithRoot
+    ) {
+      currentLocation = composePathWithRoot(currentLocation);
+    }
     const context: QContext = {
       instance: self,
       to: currentLocation,