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

package/dist/routing.js

@@ -2,10 +2,11 @@ import { runWithOwner } from "solid-js";
 // standalone import: `DEV` is undefined in solid's production build, so app
 // bundlers fold `DEV &&` diagnostics out of shipped bundles
 import { DEV } from "solid-js";
-import { createComponent, createContext, createMemo, createSignal, getOwner, isPending, latest, NotReadyError, untrack, useContext } from "solid-js";
+import { createComponent, createContext, createMemo, createSignal, getOwner, NotReadyError, untrack, useContext } from "solid-js";
 import { clearFlashCookie, getRequestEvent, hasFlashCookie, isServer } from "@solidjs/web";
 import { mockBase, createMemoObject, extractSearchParams, invariant, matchLink, resolvePath, createMatcher, joinPaths, scoreRoute, mergeSearchString, expandOptionals, validateSearch } from "./utils.js";
 import { HREF } from "./paths.js";
+import { linkPending, routingState } from "./pending.js";
 import { serverRouteOf, serverRouteArgs, serverRouteArgsEqual } from "./serverRouteShared.js";
 const MAX_REDIRECTS = 100;
 /**
@@ -81,6 +82,8 @@ export const useLocation = () => useRouter().location;
 /**
  * Retrieves a signal that indicates whether the router is currently processing a navigation.
  * Useful for showing pending navigation state while the next route and its data settle.
+ * This is the way to read routing state: `RouterContext` doesn't carry `isRouting`.
+ * For the in-flight destination, read the location with Solid's `isPending`/`latest`.
  *
  * @example
  * ```js
@@ -93,7 +96,7 @@ export const useLocation = () => useRouter().location;
  * );
  * ```
  */
-export const useIsRouting = () => useRouter().isRouting;
+export const useIsRouting = () => routingState(useRouter());
 /**
  * `useMatch` takes an accessor that returns the path and creates a `Memo` that returns match information if the current path matches the provided path.
  * Useful for determining if a given path matches the current route.
@@ -237,10 +240,7 @@ export const useLinkState = (href, options = {}) => {
         // observe the committed location during a transition
         pending: createMemo(() => {
             state(); // location dependency: mid-flight target swaps recompute
-            return (router.isRouting() &&
-                !!router.pendingTarget &&
-                matchLink({ pathname: router.pendingTarget.value, search: "" }, to(), base, options.end)
-                    .active);
+            return linkPending(router, to(), base, options.end);
         })
     };
 };
@@ -577,7 +577,11 @@ export function createRouterContext(integration, branches, getContext, options =
             _navigation: isServer ? undefined : 1
         });
     }
-    const location = createLocation(() => source().value, () => source().state, utils.queryWrapper);
+    // The flushed world — what `latest(source)` answers — as the location's own
+    // memo sees it: it recomputes under the transition that carries a write,
+    // never for a write of this same tick (A28).
+    let flushed = initialSource;
+    const location = createLocation(() => (flushed = source()).value, () => source().state, utils.queryWrapper);
     // The flash cookie is consumed eagerly: its one-shot clear (Set-Cookie)
     // must be appended before streaming flushes the response headers, and an
     // unread outcome must not haunt a later request's render. Only detection
@@ -643,7 +647,9 @@ export function createRouterContext(integration, branches, getContext, options =
     // NotReadyError's source must be a reactive async node, not the raw
     // Promise. Keep one reader per boundary for this router owner so rejection
     // is delivered through the graph's error channel and resolution wakes the
-    // parked matches computation.
+    // parked matches computation. `transparent`: the reader exists on the
+    // client only (the server parks `matches` on the promise directly), so it
+    // must not take a hydration id the server never allocated.
     const routerOwner = getOwner();
     const lazyReaders = new WeakMap();
     const readLazySubtree = (record) => {
@@ -652,7 +658,7 @@ export function createRouterContext(integration, branches, getContext, options =
             read = runWithOwner(routerOwner, () => createMemo(() => {
                 const result = resolveLazySubtree(record);
                 return result instanceof Promise ? result.then(() => undefined) : undefined;
-            }, DEV && { name: "lazyRoutes" }));
+            }, { transparent: true, ...(DEV && { name: "lazyRoutes" }) }));
             lazyReaders.set(record, read);
         }
         return read();
@@ -688,30 +694,16 @@ export function createRouterContext(integration, branches, getContext, options =
         }
         return m;
     }, DEV && { name: "matches" });
-    const routingPending = createMemo(() => isPending(() => {
-        try {
-            matches();
-        }
-        catch (e) {
-            if (e instanceof NotReadyError)
-                throw e;
-        }
-        location.search;
-        location.hash;
-    }), DEV && { name: "routingPending" });
-    const isRouting = () => routingPending() || isPending(source);
+    const headedLocation = () => (isServer ? untrack(source) : flushed);
+    // A flushed navigation write whose settle has not run is still in flight.
+    const unsettled = (change) => change._navigation !== undefined && !!integration.settled && !integration.settled(change);
     const transitionIntent = () => {
-        if (!isPending(source))
+        const head = headedLocation();
+        if (!unsettled(head))
             return;
-        const navigation = latest(source)._navigation;
+        const navigation = head._navigation;
         return navigation === -1 ? "native" : navigation && navigation > 0 ? "navigate" : undefined;
     };
-    const pendingNavigation = () => {
-        if (!isRouting())
-            return;
-        const target = latest(source);
-        return target._navigation && target._navigation > 0 ? target : undefined;
-    };
     const buildParams = () => mergeParams(matches());
     const wrapParams = utils.paramsWrapper
         ? (getParams) => utils.paramsWrapper(getParams, branches)
@@ -731,11 +723,9 @@ export function createRouterContext(integration, branches, getContext, options =
         location,
         params,
         wrapParams,
-        isRouting,
         intent: transitionIntent,
-        get pendingTarget() {
-            return pendingNavigation();
-        },
+        _source: source,
+        _owner: routerOwner,
         renderPath,
         parsePath,
         navigatorFactory,
@@ -795,10 +785,10 @@ export function createRouterContext(integration, branches, getContext, options =
             // the destination the leave guard is told all read it. A write of this
             // same tick is not in it (A28) — see `compose` below.
             //
-            // A redirect hop: the previous navigation is still pending, or has landed
-            // but not yet reached history (a guard redirecting in the landing flush
-            // — its destination was never shown either way).
-            const headed = latest(source);
+            // A redirect hop: the previous navigation's write has not settled — it
+            // is still held, or a guard is redirecting in its landing flush — so its
+            // destination was never shown.
+            const headed = headedLocation();
             // A composed target (`setSearchParams`) is a function of where the
             // router is heading, an unflushed write of this tick included. Only
             // the integration's functional updater serves that value, so the
@@ -834,7 +824,7 @@ export function createRouterContext(integration, branches, getContext, options =
             const navigationDepth = !isServer &&
                 headed._navigation !== undefined &&
                 headed._navigation > 0 &&
-                (isPending(source) || integration.inflight?.() === headed)
+                unsettled(headed)
                 ? headed._navigation
                 : 0;
             if (navigationDepth >= MAX_REDIRECTS) {

package/dist/serverRouteComponent.js

@@ -8,7 +8,7 @@
 //   // before: a client component exists only to make the call
 //   const getStory = query(storyView, "story");
 //   component: props => {
-//     const View = dynamic(() => getStory(props.params.id));
+//     const View = dynamicComponent(() => getStory(props.params.id));
 //     return <View>{props.children}</View>;
 //   }
 //   // after
@@ -36,7 +36,7 @@
 // A server component that takes other client positions — handlers, refs,
 // named slots — has a client half, and that half is a client component; the
 // helper does not pretend otherwise. Write the wrapper for that route.
-import { dynamic } from "@solidjs/web";
+import { dynamicComponent } from "@solidjs/web";
 import { createComponent, DEV } from "solid-js";
 import { SERVER_ROUTE } from "./serverRouteShared.js";
 /**
@@ -77,8 +77,9 @@ source) {
     };
     function render(args, routeProps) {
         // The source may answer a component, a promise of one, or (a live query)
-        // successive components; `dynamic`'s memo lands each the same way.
-        const View = dynamic(() => call(args()));
+        // successive components; `dynamicComponent`'s memo lands each the same
+        // way. Never a tag, so the element runtime `dynamic` retains stays out.
+        const View = dynamicComponent(() => call(args()));
         return createComponent(View, {
             get children() {
                 return routeProps.children;

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,11 +330,12 @@ 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;
     matches: () => RouteMatch[];
     renderPath(path: string): string;
     parsePath(str: string): string;
@@ -343,6 +344,22 @@ export interface RouterContext {
     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;
+};
 export interface BeforeLeaveEventArgs {
     from: Location;
     to: string | number;

package/package.json

@@ -6,7 +6,7 @@
     "Ryan Turnquist"
   ],
   "license": "MIT",
-  "version": "2.0.0-next.35",
+  "version": "2.0.0-next.37",
   "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": {