@solidjs/router 2.0.0-next.37 → 2.0.0-next.38

package/dist/utils.d.ts

@@ -15,19 +15,20 @@ export declare const comparablePath: (path: string) => string;
  */
 export declare function isUnderBase(pathname: string, base: string): boolean;
 /**
- * The link-state rule shared by claimed anchors and `useLinkState`, given
- * the location and a link's already-resolved target (path, optional query
- * and hash):
+ * The link-state rule shared by claimed anchors and `useLinkState`, bound to
+ * a location so links matched against the same one share its parse. The
+ * returned matcher takes a link's already-resolved target (path, optional
+ * query and hash):
  *
  * - `current` — same pathname and same query (parameter order and hash aside)
  * - `active` — same pathname or one under it; the router's root (`base`, or
  *   `/` without one) only matches exactly, since it is a prefix of every
  *   page. `end` makes every link exact-only.
  */
-export declare function matchLink(location: {
+export declare function linkMatcher({ pathname, search }: {
     pathname: string;
     search: string;
-}, target: string | undefined, base: string, end?: boolean): {
+}, base: string, end?: boolean): (target: string | undefined) => {
     active: boolean;
     current: boolean;
 };

package/dist/utils.js

@@ -32,26 +32,30 @@ const comparableQuery = (search) => {
     return params.toString();
 };
 /**
- * The link-state rule shared by claimed anchors and `useLinkState`, given
- * the location and a link's already-resolved target (path, optional query
- * and hash):
+ * The link-state rule shared by claimed anchors and `useLinkState`, bound to
+ * a location so links matched against the same one share its parse. The
+ * returned matcher takes a link's already-resolved target (path, optional
+ * query and hash):
  *
  * - `current` — same pathname and same query (parameter order and hash aside)
  * - `active` — same pathname or one under it; the router's root (`base`, or
  *   `/` without one) only matches exactly, since it is a prefix of every
  *   page. `end` makes every link exact-only.
  */
-export function matchLink(location, target, base, end) {
-    if (target === undefined)
-        return { active: false, current: false };
-    const loc = comparablePath(location.pathname);
-    const path = comparablePath(target);
-    const exact = loc === path;
-    const hashless = target.split("#", 1)[0];
-    const q = hashless.indexOf("?");
-    return {
-        active: exact || (!end && path !== "" && path !== comparablePath(base) && loc.startsWith(path + "/")),
-        current: exact && comparableQuery(location.search) === comparableQuery(q < 0 ? "" : hashless.slice(q))
+export function linkMatcher({ pathname, search }, base, end) {
+    const loc = comparablePath(pathname);
+    const root = comparablePath(base);
+    return (target) => {
+        if (target === undefined)
+            return { active: false, current: false };
+        const path = comparablePath(target);
+        const exact = loc === path;
+        const hashless = target.split("#", 1)[0];
+        const q = hashless.indexOf("?");
+        return {
+            active: exact || (!end && path !== "" && path !== root && loc.startsWith(path + "/")),
+            current: exact && comparableQuery(search) === comparableQuery(q < 0 ? "" : hashless.slice(q))
+        };
     };
 }
 export function resolvePath(base, path, from) {

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "2.0.0-next.37",
+  "version": "2.0.0-next.38",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",