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

package/dist/types.d.ts

@@ -1,4 +1,4 @@
-import type { Component, Signal } from "solid-js";
+import type { Component, Owner, Signal } from "solid-js";
 import type { JSX, ResponseEnvelope } from "@solidjs/web";
 declare module "@solidjs/web" {
     interface RequestEvent {
@@ -118,13 +118,13 @@ export interface LocationWrite<S = unknown> extends Omit<LocationChange<S>, "val
 export interface RouterIntegration {
     signal: [get: () => LocationChange, set: (next: LocationWrite) => void];
     /**
-     * The navigation written but not yet committed to history — the window
-     * between its location write and the settle that pushes it. A destination
-     * in that window was never shown, so a `navigate()` issued inside it (a
-     * guard redirecting as the held route lands) is a hop of that navigation
-     * rather than a new one, exactly as one issued while it is still pending.
+     * Whether a navigation write's settle has run: Solid's `onSettled`,
+     * registered beside the write, fired for the transition that carried it.
+     * Until then the write is in flight: its destination was never shown, so a
+     * `navigate()` issued meanwhile (a guard redirecting as the held route
+     * lands) is a hop of that navigation rather than a new one.
      */
-    inflight?: () => LocationChange | undefined;
+    settled?: (write: LocationChange) => boolean;
     utils?: Partial<RouterUtils>;
 }
 export type Intent = "initial" | "native" | "navigate" | "preload";
@@ -330,19 +330,54 @@ export interface RouterContext {
     params: Params;
     wrapParams: (getParams: () => Params) => Params;
     navigatorFactory: NavigatorFactory;
-    isRouting: () => boolean;
     /** @internal Intent of the in-flight canonical location transition. */
     intent?: () => Intent | undefined;
-    /** The target of the in-flight navigation transition, if any. Not reactive. */
-    readonly pendingTarget?: LocationChange;
+    /** @internal The integration's location signal: the last flushed write. */
+    _source: () => LocationChange;
+    /** @internal The owner the router's own computations live under. */
+    _owner: Owner | null;
+    /** @internal The owner route components and their `preload` functions run under. */
+    _routeOwner: () => Owner;
+    /** @internal Route matches for a pathname, after `transformUrl`. */
+    _match: (pathname: string) => RouteMatch[];
     matches: () => RouteMatch[];
     renderPath(path: string): string;
     parsePath(str: string): string;
     beforeLeave: BeforeLeaveSlot;
-    preloadRoute: (url: URL, preloadData?: boolean) => void;
     singleFlight: boolean;
     submissions: Signal<Submission<any, any>[]>;
 }
+/**
+ * A plugin for the router's `links` option that extends the state it writes
+ * onto claimed anchors. Built once per router with its base path. The router
+ * ships `pendingLinks`, which adds `data-pending`.
+ *
+ * @example
+ * ```ts
+ * const Router = createRouter({ routes, links: pendingLinks });
+ * ```
+ */
+export type LinksPlugin = (router: RouterContext, base: string) => {
+    /** The reactive read the claims sweep re-runs on. */
+    track(): unknown;
+    /** Whether an anchor resolving to `target` is the in-flight destination; read when `track()` is truthy. */
+    pending(target: string | undefined): boolean;
+};
+/** @internal What the router hands a link preload strategy. */
+export interface LinkPreloadContext {
+    /** The router-managed anchor on an event's composed path, with its URL. */
+    anchor(evt: Event): readonly [HTMLAnchorElement | SVGAElement, URL] | undefined;
+    /** An anchor's URL, resolved now, when the router manages it. */
+    url(a: HTMLAnchorElement | SVGAElement): URL | undefined;
+    /** Warm `url`: route code always, `preload` functions too when `data` is true. */
+    preload(url: URL, data: boolean): void;
+}
+/**
+ * A link preload strategy for the router's `preloadLinks` option, such as
+ * `intentPreload()`. Client-only: runs once under the router's owner and
+ * cleans up with it.
+ */
+export type LinkPreload = (ctx: LinkPreloadContext) => void;
 export interface BeforeLeaveEventArgs {
     from: Location;
     to: string | number;

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.36",
+  "version": "2.0.0-next.38",
   "homepage": "https://github.com/solidjs/solid-router#readme",
   "repository": {
     "type": "git",
@@ -37,23 +37,23 @@
     "@rollup/plugin-babel": "6.0.4",
     "@rollup/plugin-node-resolve": "15.3.0",
     "@rollup/plugin-terser": "0.4.4",
-    "@solidjs/vite-plugin": "3.0.0-next.35",
-    "@solidjs/web": "^2.0.0-rc.13",
+    "@solidjs/vite-plugin": "3.0.0-next.47",
+    "@solidjs/web": "^2.0.0-rc.14",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.10.0",
     "babel-preset-solid": "^2.0.0-rc.2",
     "jsdom": "^25.0.1",
     "prettier": "^3.4.1",
     "rollup": "^4.27.4",
-    "solid-js": "^2.0.0-rc.13",
+    "solid-js": "^2.0.0-rc.14",
     "typescript": "^5.7.2",
     "vite": "^8.2.2",
     "vitest": "^4.1.11"
   },
   "peerDependencies": {
-    "@solidjs/web": "^2.0.0-rc.13",
+    "@solidjs/web": "^2.0.0-rc.14",
     "filesystem-routing": ">=0.4.0",
-    "solid-js": "^2.0.0-rc.13"
+    "solid-js": "^2.0.0-rc.14"
   },
   "peerDependenciesMeta": {
     "filesystem-routing": {