@real-router/solid 0.3.1 → 0.4.1

package/README.md

@@ -90,6 +90,17 @@ function UserProfile() {
 
 Signal-based hooks (`useRoute`, `useRouteNode`) remain available for simpler use cases.
 
+### Primitives
+
+Two low-level bridges convert `@real-router/sources` `RouterSource<T>` instances into Solid reactive primitives. Use them when you build custom hooks on top of `@real-router/sources`:
+
+| Primitive                | Returns            | Description                                                   |
+| ------------------------ | ------------------ | ------------------------------------------------------------- |
+| `createSignalFromSource` | `Accessor<T>`      | Bridges a source to a Solid signal. Calls `onCleanup`.        |
+| `createStoreFromSource`  | `T` (Solid store)  | Bridges a source to a Solid store via `createStore + reconcile`. |
+
+Both must be called inside a reactive owner (component body or `createRoot`).
+
 ```tsx
 // useRouteNode — updates only when "users.*" changes
 function UsersLayout() {

package/dist/cjs/index.js

@@ -8,8 +8,10 @@ var routeUtils = require('@real-router/route-utils');
 var store = require('solid-js/store');
 var core = require('@real-router/core');
 
-const MATCH_MARKER = Symbol.for("RouteView.Match");
-const NOT_FOUND_MARKER = Symbol.for("RouteView.NotFound");
+// Local (non-global) Symbols — Symbol.for() would expose markers to spoofing
+// via the global Symbol registry. See Gotchas section "RouteView Marker Objects".
+const MATCH_MARKER = Symbol("RouteView.Match");
+const NOT_FOUND_MARKER = Symbol("RouteView.NotFound");
 function Match(props) {
   const result = {
     $$type: MATCH_MARKER,
@@ -20,6 +22,10 @@ function Match(props) {
       return props.children;
     }
   };
+
+  // Marker object is identified by $$type Symbol in RouteView/helpers.tsx,
+  // not rendered as JSX. Cast required because JSX.Element does not include
+  // arbitrary marker shapes.
   return result;
 }
 Match.displayName = "RouteView.Match";
@@ -30,6 +36,8 @@ function NotFound(props) {
       return props.children;
     }
   };
+
+  // See Match for the marker-pattern rationale.
   return result;
 }
 NotFound.displayName = "RouteView.NotFound";
@@ -69,37 +77,44 @@ function buildRenderList(elements, routeName, nodeName) {
       notFoundChildren = child.children;
       continue;
     }
+    if (activeMatchFound) {
+      continue;
+    }
     const {
       segment,
       exact,
       fallback
     } = child;
     const fullSegmentName = nodeName ? `${nodeName}.${segment}` : segment;
-    const isActive = !activeMatchFound && isSegmentMatch(routeName, fullSegmentName, exact);
-    if (isActive) {
-      activeMatchFound = true;
-      const matchContent = child.children;
-      const content = fallback === undefined ? matchContent : web.createComponent(solidJs.Suspense, {
-        fallback: fallback,
-        children: matchContent
-      });
-      rendered.push(content);
+    if (!isSegmentMatch(routeName, fullSegmentName, exact)) {
+      continue;
     }
+    activeMatchFound = true;
+    rendered.push(fallback === undefined ? child.children : web.createComponent(solidJs.Suspense, {
+      fallback: fallback,
+      get children() {
+        return child.children;
+      }
+    }));
   }
   if (!activeMatchFound && routeName === core.UNKNOWN_ROUTE && notFoundChildren !== null) {
     rendered.push(notFoundChildren);
   }
-  return {
-    rendered,
-    activeMatchFound
-  };
+  return rendered;
 }
 
 function createSignalFromSource(source) {
   const [value, setValue] = solidJs.createSignal(source.getSnapshot());
+  const sync = () => source.getSnapshot();
   const unsubscribe = source.subscribe(() => {
-    setValue(() => source.getSnapshot());
+    setValue(sync);
   });
+
+  // Re-read after subscribe: lazy sources reconcile their snapshot in
+  // onFirstSubscribe (when reused after disconnect via cache). Listener is not
+  // notified for that internal update, so we must sync the signal manually.
+  // No-op when snapshot is unchanged (signal equality check).
+  setValue(sync);
   solidJs.onCleanup(() => {
     unsubscribe();
   });
@@ -119,27 +134,24 @@ const useRouter = () => {
 
 function useRouteNode(nodeName) {
   const router = useRouter();
-  const store = sources.createRouteNodeSource(router, nodeName);
-  return createSignalFromSource(store);
+  return createSignalFromSource(sources.createRouteNodeSource(router, nodeName));
 }
 
 function RouteViewRoot(props) {
   const routeState = useRouteNode(props.nodeName);
   const resolved = solidJs.children(() => props.children);
+  const elements = solidJs.createMemo(() => {
+    const arr = [];
+    collectElements(resolved(), arr);
+    return arr;
+  });
   return web.memo(() => {
     const state = routeState();
     if (!state.route) {
       return null;
     }
-    const elements = [];
-    collectElements(resolved(), elements);
-    const {
-      rendered
-    } = buildRenderList(elements, state.route.name, props.nodeName);
-    if (rendered.length > 0) {
-      return rendered;
-    }
-    return null;
+    const rendered = buildRenderList(elements(), state.route.name, props.nodeName);
+    return rendered.length > 0 ? rendered : null;
   });
 }
 RouteViewRoot.displayName = "RouteView";
@@ -165,14 +177,36 @@ const INTERNAL_ROUTE_PREFIX = "@@";
 const VISUALLY_HIDDEN = "position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);clip-path:inset(50%);white-space:nowrap;border:0";
 function createRouteAnnouncer(router, options) {
   const prefix = "Navigated to ";
+  const getCustomText = options?.getAnnouncementText;
   let isInitialNavigation = true;
   let isReady = false;
   let isDestroyed = false;
   let lastAnnouncedText = "";
+  let pendingText = null;
   let clearTimeoutId;
   const announcer = getOrCreateAnnouncer();
+  const doAnnounce = (text, h1) => {
+    lastAnnouncedText = text;
+    clearTimeout(clearTimeoutId);
+    announcer.textContent = text;
+    clearTimeoutId = setTimeout(() => {
+      announcer.textContent = "";
+      lastAnnouncedText = "";
+    }, CLEAR_DELAY);
+    manageFocus(h1);
+  };
+
+  // Safari-ready delay: announcing before VoiceOver wires up the aria-live region
+  // causes the first announcement to be silently dropped. Wait SAFARI_READY_DELAY ms
+  // before marking the announcer "ready" — any navigation during that window is
+  // buffered in pendingText and flushed once the delay expires.
   const safariTimeoutId = setTimeout(() => {
     isReady = true;
+    if (pendingText !== null && !isDestroyed) {
+      const text = pendingText;
+      pendingText = null;
+      doAnnounce(text, document.querySelector("h1"));
+    }
   }, SAFARI_READY_DELAY);
   const unsubscribe = router.subscribe(({
     route
@@ -181,22 +215,28 @@ function createRouteAnnouncer(router, options) {
       isInitialNavigation = false;
       return;
     }
+
+    // Double rAF: waits for two paint frames so the incoming route's DOM
+    // (including the new <h1>) is fully rendered before resolveText reads it.
+    // Single rAF fires before the new route's template has been attached,
+    // which would cause resolveText to pick up the OLD h1 or fall back to
+    // document.title / route.name prematurely.
     requestAnimationFrame(() => {
       requestAnimationFrame(() => {
         if (isDestroyed) {
           return;
         }
-        const text = resolveText(route, prefix);
-        if (text && text !== lastAnnouncedText && isReady) {
-          lastAnnouncedText = text;
-          clearTimeout(clearTimeoutId);
-          announcer.textContent = text;
-          clearTimeoutId = setTimeout(() => {
-            announcer.textContent = "";
-            lastAnnouncedText = "";
-          }, CLEAR_DELAY);
-          manageFocus();
+        const h1 = document.querySelector("h1");
+        const text = resolveText(route, prefix, getCustomText, h1);
+        if (!text || text === lastAnnouncedText) {
+          return;
+        }
+        if (!isReady) {
+          // Defer announcement until Safari-ready window elapses (see safariTimeoutId).
+          pendingText = text;
+          return;
         }
+        doAnnounce(text, h1);
       });
     });
   });
@@ -226,15 +266,13 @@ function getOrCreateAnnouncer() {
 function removeAnnouncer() {
   document.querySelector(`[${ANNOUNCER_ATTR}]`)?.remove();
 }
-function resolveText(route, prefix, getCustomText) {
-  const h1 = document.querySelector("h1");
+function resolveText(route, prefix, getCustomText, h1) {
   const h1Text = h1?.textContent.trim() ?? "";
   const routeName = route.name.startsWith(INTERNAL_ROUTE_PREFIX) ? "" : route.name;
   const rawText = h1Text || document.title || routeName || globalThis.location.pathname;
   return `${prefix}${rawText}`;
 }
-function manageFocus() {
-  const h1 = document.querySelector("h1");
+function manageFocus(h1) {
   if (!h1) {
     return;
   }
@@ -253,7 +291,10 @@ function buildHref(router, routeName, routeParams) {
   try {
     const buildUrl = router.buildUrl;
     if (buildUrl) {
-      return buildUrl(routeName, routeParams);
+      const url = buildUrl(routeName, routeParams);
+      if (url !== undefined) {
+        return url;
+      }
     }
     return router.buildPath(routeName, routeParams);
   } catch {
@@ -261,20 +302,41 @@ function buildHref(router, routeName, routeParams) {
     return undefined;
   }
 }
+function parseTokens(value) {
+  return value ? value.match(/\S+/g) ?? [] : [];
+}
 function buildActiveClassName(isActive, activeClassName, baseClassName) {
   if (isActive && activeClassName) {
-    return baseClassName ? `${baseClassName} ${activeClassName}`.trim() : activeClassName;
+    const activeTokens = parseTokens(activeClassName);
+    if (activeTokens.length === 0) {
+      return baseClassName ?? undefined;
+    }
+    if (!baseClassName) {
+      return activeTokens.join(" ");
+    }
+    const baseTokens = parseTokens(baseClassName);
+    const seen = new Set(baseTokens);
+    for (const token of activeTokens) {
+      if (!seen.has(token)) {
+        seen.add(token);
+        baseTokens.push(token);
+      }
+    }
+    return baseTokens.join(" ");
   }
   return baseClassName ?? undefined;
 }
 function applyLinkA11y(element) {
+  if (!element) {
+    return;
+  }
   if (element instanceof HTMLAnchorElement || element instanceof HTMLButtonElement) {
     return;
   }
-  if (!element.getAttribute("role")) {
+  if (!element.hasAttribute("role")) {
     element.setAttribute("role", "link");
   }
-  if (!element.getAttribute("tabindex")) {
+  if (!element.hasAttribute("tabindex")) {
     element.setAttribute("tabindex", "0");
   }
 }
@@ -289,9 +351,12 @@ function Link(props) {
     ignoreQueryParams: true
   }, props);
   const [local, rest] = solidJs.splitProps(merged, ["routeName", "routeParams", "routeOptions", "activeClassName", "activeStrict", "ignoreQueryParams", "onClick", "target", "class", "children"]);
-  const router = useRouter();
   const ctx = solidJs.useContext(RouterContext);
-  const useFastPath = ctx?.routeSelector && !local.activeStrict && local.ignoreQueryParams && local.routeParams === EMPTY_PARAMS;
+  if (!ctx) {
+    throw new Error("Link must be used within a RouterProvider");
+  }
+  const router = ctx.router;
+  const useFastPath = !local.activeStrict && local.ignoreQueryParams && local.routeParams === EMPTY_PARAMS;
   const isActive = useFastPath ? () => ctx.routeSelector(local.routeName) : createSignalFromSource(sources.createActiveRouteSource(router, local.routeName, local.routeParams, {
     strict: local.activeStrict,
     ignoreQueryParams: local.ignoreQueryParams
@@ -327,34 +392,20 @@ function Link(props) {
   })();
 }
 
-const cache = new WeakMap();
-function useRouterError() {
-  const router = useRouter();
-  let source = cache.get(router);
-  if (!source) {
-    source = sources.createErrorSource(router);
-    cache.set(router, source);
-  }
-  return createSignalFromSource(source);
-}
-
 function RouterErrorBoundary(props) {
-  const snapshot = useRouterError();
-  const [dismissedVersion, setDismissedVersion] = solidJs.createSignal(-1);
+  const router = useRouter();
+  const snapshot = createSignalFromSource(sources.createDismissableError(router));
   solidJs.createEffect(() => {
     const snap = snapshot();
     if (snap.error) {
       props.onError?.(snap.error, snap.toRoute, snap.fromRoute);
     }
   });
-  const visibleError = solidJs.createMemo(() => {
-    const snap = snapshot();
-    return snap.version > dismissedVersion() ? snap.error : null;
-  });
-  const resetError = () => setDismissedVersion(snapshot().version);
-  return [web.memo(() => props.children), web.memo(() => {
-    const error = visibleError();
-    return error ? props.fallback(error, resetError) : null;
+  return [web.memo(() => props.children), web.createComponent(solidJs.Show, {
+    get when() {
+      return snapshot().error;
+    },
+    children: error => props.fallback(error(), snapshot().resetError)
   })];
 }
 
@@ -424,7 +475,9 @@ const useRoute = () => {
 };
 
 function createStoreFromSource(source) {
-  const [state, setState] = store.createStore(structuredClone(source.getSnapshot()));
+  const [state, setState] = store.createStore({
+    ...source.getSnapshot()
+  });
   const unsubscribe = source.subscribe(() => {
     setState(store.reconcile(source.getSnapshot()));
   });
@@ -433,10 +486,6 @@ function createStoreFromSource(source) {
 }
 
 function useRouteStore() {
-  const ctx = solidJs.useContext(RouteContext);
-  if (!ctx) {
-    throw new Error("useRouteStore must be used within a RouterProvider");
-  }
   const router = useRouter();
   return createStoreFromSource(sources.createRouteSource(router));
 }
@@ -448,8 +497,8 @@ function useRouteNodeStore(nodeName) {
 
 function useRouterTransition() {
   const router = useRouter();
-  const store = sources.createTransitionSource(router);
-  return createSignalFromSource(store);
+  const source = sources.getTransitionSource(router);
+  return createSignalFromSource(source);
 }
 
 function isRouteActive(linkRouteName, currentRouteName) {

package/dist/esm/index.mjs

@@ -1,13 +1,15 @@
 import { createComponent, memo, spread, mergeProps as mergeProps$1, insert, template } from 'solid-js/web';
-import { createRouteNodeSource, createActiveRouteSource, createErrorSource, createRouteSource, createTransitionSource } from '@real-router/sources';
-import { Suspense, createSignal, onCleanup, createContext, useContext, children, mergeProps, splitProps, createMemo, createEffect, onMount, createSelector } from 'solid-js';
+import { createRouteNodeSource, createActiveRouteSource, createDismissableError, createRouteSource, getTransitionSource } from '@real-router/sources';
+import { Suspense, createSignal, onCleanup, createContext, useContext, children, createMemo, mergeProps, splitProps, createEffect, Show, onMount, createSelector } from 'solid-js';
 import { getPluginApi } from '@real-router/core/api';
 import { startsWithSegment, getRouteUtils } from '@real-router/route-utils';
 import { createStore, reconcile } from 'solid-js/store';
 import { UNKNOWN_ROUTE, getNavigator } from '@real-router/core';
 
-const MATCH_MARKER = Symbol.for("RouteView.Match");
-const NOT_FOUND_MARKER = Symbol.for("RouteView.NotFound");
+// Local (non-global) Symbols — Symbol.for() would expose markers to spoofing
+// via the global Symbol registry. See Gotchas section "RouteView Marker Objects".
+const MATCH_MARKER = Symbol("RouteView.Match");
+const NOT_FOUND_MARKER = Symbol("RouteView.NotFound");
 function Match(props) {
   const result = {
     $$type: MATCH_MARKER,
@@ -18,6 +20,10 @@ function Match(props) {
       return props.children;
     }
   };
+
+  // Marker object is identified by $$type Symbol in RouteView/helpers.tsx,
+  // not rendered as JSX. Cast required because JSX.Element does not include
+  // arbitrary marker shapes.
   return result;
 }
 Match.displayName = "RouteView.Match";
@@ -28,6 +34,8 @@ function NotFound(props) {
       return props.children;
     }
   };
+
+  // See Match for the marker-pattern rationale.
   return result;
 }
 NotFound.displayName = "RouteView.NotFound";
@@ -67,37 +75,44 @@ function buildRenderList(elements, routeName, nodeName) {
       notFoundChildren = child.children;
       continue;
     }
+    if (activeMatchFound) {
+      continue;
+    }
     const {
       segment,
       exact,
       fallback
     } = child;
     const fullSegmentName = nodeName ? `${nodeName}.${segment}` : segment;
-    const isActive = !activeMatchFound && isSegmentMatch(routeName, fullSegmentName, exact);
-    if (isActive) {
-      activeMatchFound = true;
-      const matchContent = child.children;
-      const content = fallback === undefined ? matchContent : createComponent(Suspense, {
-        fallback: fallback,
-        children: matchContent
-      });
-      rendered.push(content);
+    if (!isSegmentMatch(routeName, fullSegmentName, exact)) {
+      continue;
     }
+    activeMatchFound = true;
+    rendered.push(fallback === undefined ? child.children : createComponent(Suspense, {
+      fallback: fallback,
+      get children() {
+        return child.children;
+      }
+    }));
   }
   if (!activeMatchFound && routeName === UNKNOWN_ROUTE && notFoundChildren !== null) {
     rendered.push(notFoundChildren);
   }
-  return {
-    rendered,
-    activeMatchFound
-  };
+  return rendered;
 }
 
 function createSignalFromSource(source) {
   const [value, setValue] = createSignal(source.getSnapshot());
+  const sync = () => source.getSnapshot();
   const unsubscribe = source.subscribe(() => {
-    setValue(() => source.getSnapshot());
+    setValue(sync);
   });
+
+  // Re-read after subscribe: lazy sources reconcile their snapshot in
+  // onFirstSubscribe (when reused after disconnect via cache). Listener is not
+  // notified for that internal update, so we must sync the signal manually.
+  // No-op when snapshot is unchanged (signal equality check).
+  setValue(sync);
   onCleanup(() => {
     unsubscribe();
   });
@@ -117,27 +132,24 @@ const useRouter = () => {
 
 function useRouteNode(nodeName) {
   const router = useRouter();
-  const store = createRouteNodeSource(router, nodeName);
-  return createSignalFromSource(store);
+  return createSignalFromSource(createRouteNodeSource(router, nodeName));
 }
 
 function RouteViewRoot(props) {
   const routeState = useRouteNode(props.nodeName);
   const resolved = children(() => props.children);
+  const elements = createMemo(() => {
+    const arr = [];
+    collectElements(resolved(), arr);
+    return arr;
+  });
   return memo(() => {
     const state = routeState();
     if (!state.route) {
       return null;
     }
-    const elements = [];
-    collectElements(resolved(), elements);
-    const {
-      rendered
-    } = buildRenderList(elements, state.route.name, props.nodeName);
-    if (rendered.length > 0) {
-      return rendered;
-    }
-    return null;
+    const rendered = buildRenderList(elements(), state.route.name, props.nodeName);
+    return rendered.length > 0 ? rendered : null;
   });
 }
 RouteViewRoot.displayName = "RouteView";
@@ -163,14 +175,36 @@ const INTERNAL_ROUTE_PREFIX = "@@";
 const VISUALLY_HIDDEN = "position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);clip-path:inset(50%);white-space:nowrap;border:0";
 function createRouteAnnouncer(router, options) {
   const prefix = "Navigated to ";
+  const getCustomText = options?.getAnnouncementText;
   let isInitialNavigation = true;
   let isReady = false;
   let isDestroyed = false;
   let lastAnnouncedText = "";
+  let pendingText = null;
   let clearTimeoutId;
   const announcer = getOrCreateAnnouncer();
+  const doAnnounce = (text, h1) => {
+    lastAnnouncedText = text;
+    clearTimeout(clearTimeoutId);
+    announcer.textContent = text;
+    clearTimeoutId = setTimeout(() => {
+      announcer.textContent = "";
+      lastAnnouncedText = "";
+    }, CLEAR_DELAY);
+    manageFocus(h1);
+  };
+
+  // Safari-ready delay: announcing before VoiceOver wires up the aria-live region
+  // causes the first announcement to be silently dropped. Wait SAFARI_READY_DELAY ms
+  // before marking the announcer "ready" — any navigation during that window is
+  // buffered in pendingText and flushed once the delay expires.
   const safariTimeoutId = setTimeout(() => {
     isReady = true;
+    if (pendingText !== null && !isDestroyed) {
+      const text = pendingText;
+      pendingText = null;
+      doAnnounce(text, document.querySelector("h1"));
+    }
   }, SAFARI_READY_DELAY);
   const unsubscribe = router.subscribe(({
     route
@@ -179,22 +213,28 @@ function createRouteAnnouncer(router, options) {
       isInitialNavigation = false;
       return;
     }
+
+    // Double rAF: waits for two paint frames so the incoming route's DOM
+    // (including the new <h1>) is fully rendered before resolveText reads it.
+    // Single rAF fires before the new route's template has been attached,
+    // which would cause resolveText to pick up the OLD h1 or fall back to
+    // document.title / route.name prematurely.
     requestAnimationFrame(() => {
       requestAnimationFrame(() => {
         if (isDestroyed) {
           return;
         }
-        const text = resolveText(route, prefix);
-        if (text && text !== lastAnnouncedText && isReady) {
-          lastAnnouncedText = text;
-          clearTimeout(clearTimeoutId);
-          announcer.textContent = text;
-          clearTimeoutId = setTimeout(() => {
-            announcer.textContent = "";
-            lastAnnouncedText = "";
-          }, CLEAR_DELAY);
-          manageFocus();
+        const h1 = document.querySelector("h1");
+        const text = resolveText(route, prefix, getCustomText, h1);
+        if (!text || text === lastAnnouncedText) {
+          return;
+        }
+        if (!isReady) {
+          // Defer announcement until Safari-ready window elapses (see safariTimeoutId).
+          pendingText = text;
+          return;
         }
+        doAnnounce(text, h1);
       });
     });
   });
@@ -224,15 +264,13 @@ function getOrCreateAnnouncer() {
 function removeAnnouncer() {
   document.querySelector(`[${ANNOUNCER_ATTR}]`)?.remove();
 }
-function resolveText(route, prefix, getCustomText) {
-  const h1 = document.querySelector("h1");
+function resolveText(route, prefix, getCustomText, h1) {
   const h1Text = h1?.textContent.trim() ?? "";
   const routeName = route.name.startsWith(INTERNAL_ROUTE_PREFIX) ? "" : route.name;
   const rawText = h1Text || document.title || routeName || globalThis.location.pathname;
   return `${prefix}${rawText}`;
 }
-function manageFocus() {
-  const h1 = document.querySelector("h1");
+function manageFocus(h1) {
   if (!h1) {
     return;
   }
@@ -251,7 +289,10 @@ function buildHref(router, routeName, routeParams) {
   try {
     const buildUrl = router.buildUrl;
     if (buildUrl) {
-      return buildUrl(routeName, routeParams);
+      const url = buildUrl(routeName, routeParams);
+      if (url !== undefined) {
+        return url;
+      }
     }
     return router.buildPath(routeName, routeParams);
   } catch {
@@ -259,20 +300,41 @@ function buildHref(router, routeName, routeParams) {
     return undefined;
   }
 }
+function parseTokens(value) {
+  return value ? value.match(/\S+/g) ?? [] : [];
+}
 function buildActiveClassName(isActive, activeClassName, baseClassName) {
   if (isActive && activeClassName) {
-    return baseClassName ? `${baseClassName} ${activeClassName}`.trim() : activeClassName;
+    const activeTokens = parseTokens(activeClassName);
+    if (activeTokens.length === 0) {
+      return baseClassName ?? undefined;
+    }
+    if (!baseClassName) {
+      return activeTokens.join(" ");
+    }
+    const baseTokens = parseTokens(baseClassName);
+    const seen = new Set(baseTokens);
+    for (const token of activeTokens) {
+      if (!seen.has(token)) {
+        seen.add(token);
+        baseTokens.push(token);
+      }
+    }
+    return baseTokens.join(" ");
   }
   return baseClassName ?? undefined;
 }
 function applyLinkA11y(element) {
+  if (!element) {
+    return;
+  }
   if (element instanceof HTMLAnchorElement || element instanceof HTMLButtonElement) {
     return;
   }
-  if (!element.getAttribute("role")) {
+  if (!element.hasAttribute("role")) {
     element.setAttribute("role", "link");
   }
-  if (!element.getAttribute("tabindex")) {
+  if (!element.hasAttribute("tabindex")) {
     element.setAttribute("tabindex", "0");
   }
 }
@@ -287,9 +349,12 @@ function Link(props) {
     ignoreQueryParams: true
   }, props);
   const [local, rest] = splitProps(merged, ["routeName", "routeParams", "routeOptions", "activeClassName", "activeStrict", "ignoreQueryParams", "onClick", "target", "class", "children"]);
-  const router = useRouter();
   const ctx = useContext(RouterContext);
-  const useFastPath = ctx?.routeSelector && !local.activeStrict && local.ignoreQueryParams && local.routeParams === EMPTY_PARAMS;
+  if (!ctx) {
+    throw new Error("Link must be used within a RouterProvider");
+  }
+  const router = ctx.router;
+  const useFastPath = !local.activeStrict && local.ignoreQueryParams && local.routeParams === EMPTY_PARAMS;
   const isActive = useFastPath ? () => ctx.routeSelector(local.routeName) : createSignalFromSource(createActiveRouteSource(router, local.routeName, local.routeParams, {
     strict: local.activeStrict,
     ignoreQueryParams: local.ignoreQueryParams
@@ -325,34 +390,20 @@ function Link(props) {
   })();
 }
 
-const cache = new WeakMap();
-function useRouterError() {
-  const router = useRouter();
-  let source = cache.get(router);
-  if (!source) {
-    source = createErrorSource(router);
-    cache.set(router, source);
-  }
-  return createSignalFromSource(source);
-}
-
 function RouterErrorBoundary(props) {
-  const snapshot = useRouterError();
-  const [dismissedVersion, setDismissedVersion] = createSignal(-1);
+  const router = useRouter();
+  const snapshot = createSignalFromSource(createDismissableError(router));
   createEffect(() => {
     const snap = snapshot();
     if (snap.error) {
       props.onError?.(snap.error, snap.toRoute, snap.fromRoute);
     }
   });
-  const visibleError = createMemo(() => {
-    const snap = snapshot();
-    return snap.version > dismissedVersion() ? snap.error : null;
-  });
-  const resetError = () => setDismissedVersion(snapshot().version);
-  return [memo(() => props.children), memo(() => {
-    const error = visibleError();
-    return error ? props.fallback(error, resetError) : null;
+  return [memo(() => props.children), createComponent(Show, {
+    get when() {
+      return snapshot().error;
+    },
+    children: error => props.fallback(error(), snapshot().resetError)
   })];
 }
 
@@ -422,7 +473,9 @@ const useRoute = () => {
 };
 
 function createStoreFromSource(source) {
-  const [state, setState] = createStore(structuredClone(source.getSnapshot()));
+  const [state, setState] = createStore({
+    ...source.getSnapshot()
+  });
   const unsubscribe = source.subscribe(() => {
     setState(reconcile(source.getSnapshot()));
   });
@@ -431,10 +484,6 @@ function createStoreFromSource(source) {
 }
 
 function useRouteStore() {
-  const ctx = useContext(RouteContext);
-  if (!ctx) {
-    throw new Error("useRouteStore must be used within a RouterProvider");
-  }
   const router = useRouter();
   return createStoreFromSource(createRouteSource(router));
 }
@@ -446,8 +495,8 @@ function useRouteNodeStore(nodeName) {
 
 function useRouterTransition() {
   const router = useRouter();
-  const store = createTransitionSource(router);
-  return createSignalFromSource(store);
+  const source = getTransitionSource(router);
+  return createSignalFromSource(source);
 }
 
 function isRouteActive(linkRouteName, currentRouteName) {

package/dist/types/RouterProvider.d.ts

@@ -4,5 +4,6 @@ export interface RouteProviderProps {
     router: Router;
     announceNavigation?: boolean;
 }
+export declare function isRouteActive(linkRouteName: string, currentRouteName: string): boolean;
 export declare function RouterProvider(props: ParentProps<RouteProviderProps>): JSX.Element;
 //# sourceMappingURL=RouterProvider.d.ts.map

package/dist/types/RouterProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouterProvider.d.ts","sourceRoot":"","sources":["../../src/RouterProvider.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEjD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAYD,wBAAgB,cAAc,CAC5B,KAAK,EAAE,WAAW,CAAC,kBAAkB,CAAC,GACrC,GAAG,CAAC,OAAO,CA+Bb"}
+{"version":3,"file":"RouterProvider.d.ts","sourceRoot":"","sources":["../../src/RouterProvider.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEjD,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAC;IACf,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,wBAAgB,aAAa,CAC3B,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAKT;AAED,wBAAgB,cAAc,CAC5B,KAAK,EAAE,WAAW,CAAC,kBAAkB,CAAC,GACrC,GAAG,CAAC,OAAO,CA+Bb"}

package/dist/types/components/Link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../../src/components/Link.tsx"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,wBAAgB,IAAI,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAC5C,KAAK,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAC5B,GAAG,CAAC,OAAO,CAgFb"}
+{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../../src/components/Link.tsx"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,wBAAgB,IAAI,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAC5C,KAAK,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAC5B,GAAG,CAAC,OAAO,CAoFb"}

package/dist/types/components/RouteView/components.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../../../src/components/RouteView/components.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,eAAO,MAAM,YAAY,eAAgC,CAAC;AAE1D,eAAO,MAAM,gBAAgB,eAAmC,CAAC;AAEjE,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,OAAO,YAAY,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;IACvB,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,OAAO,gBAAgB,CAAC;IAChC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;CACvB;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,GAAG,cAAc,CAAC;AAE3D,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,GAAG,CAAC,OAAO,CAYpD;yBAZe,KAAK;;;AAgBrB,wBAAgB,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,GAAG,CAAC,OAAO,CAS1D;yBATe,QAAQ"}
+{"version":3,"file":"components.d.ts","sourceRoot":"","sources":["../../../../src/components/RouteView/components.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACzD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAIpC,eAAO,MAAM,YAAY,eAA4B,CAAC;AAEtD,eAAO,MAAM,gBAAgB,eAA+B,CAAC;AAE7D,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,OAAO,YAAY,CAAC;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC;IACvB,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,OAAO,gBAAgB,CAAC;IAChC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;CACvB;AAED,MAAM,MAAM,eAAe,GAAG,WAAW,GAAG,cAAc,CAAC;AAE3D,wBAAgB,KAAK,CAAC,KAAK,EAAE,UAAU,GAAG,GAAG,CAAC,OAAO,CAepD;yBAfe,KAAK;;;AAmBrB,wBAAgB,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,GAAG,CAAC,OAAO,CAU1D;yBAVe,QAAQ"}

package/dist/types/components/RouteView/helpers.d.ts

@@ -1,8 +1,6 @@
 import type { RouteViewMarker } from "./components";
 import type { JSX } from "solid-js";
+export declare function isSegmentMatch(routeName: string, fullSegmentName: string, exact: boolean): boolean;
 export declare function collectElements(children: unknown, result: RouteViewMarker[]): void;
-export declare function buildRenderList(elements: RouteViewMarker[], routeName: string, nodeName: string): {
-    rendered: JSX.Element[];
-    activeMatchFound: boolean;
-};
+export declare function buildRenderList(elements: RouteViewMarker[], routeName: string, nodeName: string): JSX.Element[];
 //# sourceMappingURL=helpers.d.ts.map

package/dist/types/components/RouteView/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../src/components/RouteView/helpers.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAGV,eAAe,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAgCpC,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,eAAe,EAAE,GACxB,IAAI,CAgBN;AAED,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,eAAe,EAAE,EAC3B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf;IAAE,QAAQ,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC;IAAC,gBAAgB,EAAE,OAAO,CAAA;CAAE,CAuCxD"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../src/components/RouteView/helpers.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAGV,eAAe,EAChB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,wBAAgB,cAAc,CAC5B,SAAS,EAAE,MAAM,EACjB,eAAe,EAAE,MAAM,EACvB,KAAK,EAAE,OAAO,GACb,OAAO,CAMT;AAoBD,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,OAAO,EACjB,MAAM,EAAE,eAAe,EAAE,GACxB,IAAI,CAgBN;AAED,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,eAAe,EAAE,EAC3B,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,GACf,GAAG,CAAC,OAAO,EAAE,CAyCf"}

package/dist/types/components/RouterErrorBoundary.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RouterErrorBoundary.d.ts","sourceRoot":"","sources":["../../../src/components/RouterErrorBoundary.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,CACjB,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,MAAM,IAAI,KACnB,GAAG,CAAC,OAAO,CAAC;IACjB,QAAQ,CAAC,OAAO,CAAC,EAAE,CACjB,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,KAAK,GAAG,IAAI,EACrB,SAAS,EAAE,KAAK,GAAG,IAAI,KACpB,IAAI,CAAC;CACX;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,wBAAwB,GAC9B,GAAG,CAAC,OAAO,CA8Bb"}
+{"version":3,"file":"RouterErrorBoundary.d.ts","sourceRoot":"","sources":["../../../src/components/RouterErrorBoundary.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC;IAC/B,QAAQ,CAAC,QAAQ,EAAE,CACjB,KAAK,EAAE,WAAW,EAClB,UAAU,EAAE,MAAM,IAAI,KACnB,GAAG,CAAC,OAAO,CAAC;IACjB,QAAQ,CAAC,OAAO,CAAC,EAAE,CACjB,KAAK,EAAE,WAAW,EAClB,OAAO,EAAE,KAAK,GAAG,IAAI,EACrB,SAAS,EAAE,KAAK,GAAG,IAAI,KACpB,IAAI,CAAC;CACX;AAED,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,wBAAwB,GAC9B,GAAG,CAAC,OAAO,CAoBb"}

package/dist/types/createSignalFromSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createSignalFromSource.d.ts","sourceRoot":"","sources":["../../src/createSignalFromSource.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,wBAAgB,sBAAsB,CAAC,CAAC,EACtC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,GACtB,QAAQ,CAAC,CAAC,CAAC,CAYb"}
+{"version":3,"file":"createSignalFromSource.d.ts","sourceRoot":"","sources":["../../src/createSignalFromSource.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,wBAAgB,sBAAsB,CAAC,CAAC,EACtC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,GACtB,QAAQ,CAAC,CAAC,CAAC,CAoBb"}

package/dist/types/createStoreFromSource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createStoreFromSource.d.ts","sourceRoot":"","sources":["../../src/createStoreFromSource.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,MAAM,EACpD,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,GACtB,CAAC,CAYH"}
+{"version":3,"file":"createStoreFromSource.d.ts","sourceRoot":"","sources":["../../src/createStoreFromSource.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEzD,wBAAgB,qBAAqB,CAAC,CAAC,SAAS,MAAM,EACpD,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,GACtB,CAAC,CAUH"}

package/dist/types/dom-utils/index.d.ts

@@ -1,4 +1,4 @@
 export { createRouteAnnouncer } from "./route-announcer.js";
-export { shouldNavigate, buildHref, buildActiveClassName, applyLinkA11y, } from "./link-utils.js";
+export { shouldNavigate, buildHref, buildActiveClassName, shallowEqual, applyLinkA11y, } from "./link-utils.js";
 export type { RouteAnnouncerOptions } from "./route-announcer.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/types/dom-utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/dom-utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EACL,cAAc,EACd,SAAS,EACT,oBAAoB,EACpB,aAAa,GACd,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/dom-utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAE5D,OAAO,EACL,cAAc,EACd,SAAS,EACT,oBAAoB,EACpB,YAAY,EACZ,aAAa,GACd,MAAM,iBAAiB,CAAC;AAEzB,YAAY,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC"}

package/dist/types/dom-utils/link-utils.d.ts

@@ -2,5 +2,6 @@ import type { Router, Params } from "@real-router/core";
 export declare function shouldNavigate(evt: MouseEvent): boolean;
 export declare function buildHref(router: Router, routeName: string, routeParams: Params): string | undefined;
 export declare function buildActiveClassName(isActive: boolean, activeClassName: string | undefined, baseClassName: string | undefined): string | undefined;
-export declare function applyLinkA11y(element: HTMLElement): void;
+export declare function shallowEqual(prev: object | undefined, next: object | undefined): boolean;
+export declare function applyLinkA11y(element: HTMLElement | null | undefined): void;
 //# sourceMappingURL=link-utils.d.ts.map

package/dist/types/dom-utils/link-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"link-utils.d.ts","sourceRoot":"","sources":["../../../src/dom-utils/link-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAExD,wBAAgB,cAAc,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAQvD;AAID,wBAAgB,SAAS,CACvB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAgBpB;AAED,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,OAAO,EACjB,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,aAAa,EAAE,MAAM,GAAG,SAAS,GAChC,MAAM,GAAG,SAAS,CAQpB;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,CAaxD"}
+{"version":3,"file":"link-utils.d.ts","sourceRoot":"","sources":["../../../src/dom-utils/link-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAExD,wBAAgB,cAAc,CAAC,GAAG,EAAE,UAAU,GAAG,OAAO,CAQvD;AAID,wBAAgB,SAAS,CACvB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAoBpB;AAMD,wBAAgB,oBAAoB,CAClC,QAAQ,EAAE,OAAO,EACjB,eAAe,EAAE,MAAM,GAAG,SAAS,EACnC,aAAa,EAAE,MAAM,GAAG,SAAS,GAChC,MAAM,GAAG,SAAS,CAyBpB;AAED,wBAAgB,YAAY,CAC1B,IAAI,EAAE,MAAM,GAAG,SAAS,EACxB,IAAI,EAAE,MAAM,GAAG,SAAS,GACvB,OAAO,CAwBT;AAED,wBAAgB,aAAa,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,GAAG,SAAS,GAAG,IAAI,CAgB3E"}

package/dist/types/dom-utils/route-announcer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-announcer.d.ts","sourceRoot":"","sources":["../../../src/dom-utils/route-announcer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AASvD,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,CAAC;CAChD;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,qBAAqB,GAC9B;IAAE,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,CAuDzB"}
+{"version":3,"file":"route-announcer.d.ts","sourceRoot":"","sources":["../../../src/dom-utils/route-announcer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AASvD,MAAM,WAAW,qBAAqB;IACpC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,mBAAmB,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,CAAC;CAChD;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,OAAO,CAAC,EAAE,qBAAqB,GAC9B;IAAE,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,CAsFzB"}

package/dist/types/hooks/useRouteNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useRouteNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useRouteNode.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC,CAKnE"}
+{"version":3,"file":"useRouteNode.d.ts","sourceRoot":"","sources":["../../../src/hooks/useRouteNode.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC,CAInE"}

package/dist/types/hooks/useRouteStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useRouteStore.d.ts","sourceRoot":"","sources":["../../../src/hooks/useRouteStore.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,aAAa,IAAI,UAAU,CAU1C"}
+{"version":3,"file":"useRouteStore.d.ts","sourceRoot":"","sources":["../../../src/hooks/useRouteStore.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,aAAa,IAAI,UAAU,CAI1C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@real-router/solid",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "type": "commonjs",
   "description": "Solid.js integration for Real-Router",
   "main": "./dist/cjs/index.js",
@@ -53,7 +53,7 @@
   "dependencies": {
     "@real-router/core": "^0.48.0",
     "@real-router/route-utils": "^0.2.1",
-    "@real-router/sources": "^0.5.1"
+    "@real-router/sources": "^0.6.0"
   },
   "devDependencies": {
     "@babel/core": "7.29.0",
@@ -71,19 +71,19 @@
     "solid-js": "1.9.12",
     "vite-plugin-solid": "2.11.11",
     "vitest": "4.1.0",
-    "@real-router/browser-plugin": "^0.12.1"
+    "@real-router/browser-plugin": "^0.13.0"
   },
   "peerDependencies": {
     "solid-js": ">=1.7.0"
   },
   "scripts": {
-    "build": "rimraf dist && tsc -p tsconfig.build.json && rollup -c rollup.config.mjs",
     "test": "vitest",
     "test:properties": "vitest run --config vitest.config.properties.mts",
     "test:stress": "vitest run --config vitest.config.stress.mts",
     "type-check": "tsc --noEmit",
     "lint": "eslint --cache --ext .ts,.tsx src/ tests/ --fix --max-warnings 0",
     "lint:package": "publint",
-    "lint:types": "attw --pack ."
+    "lint:types": "attw --pack .",
+    "bundle": "rimraf dist && tsc -p tsconfig.build.json && rollup -c rollup.config.mjs"
   }
 }

package/src/RouterProvider.tsx

@@ -14,7 +14,7 @@ export interface RouteProviderProps {
   announceNavigation?: boolean;
 }
 
-function isRouteActive(
+export function isRouteActive(
   linkRouteName: string,
   currentRouteName: string,
 ): boolean {

package/src/components/Link.tsx

@@ -9,7 +9,6 @@ import {
   buildHref,
   buildActiveClassName,
 } from "../dom-utils/index.js";
-import { useRouter } from "../hooks/useRouter";
 
 import type { LinkProps } from "../types";
 import type { Params } from "@real-router/core";
@@ -42,11 +41,15 @@ export function Link<P extends Params = Params>(
     "children",
   ]);
 
-  const router = useRouter();
   const ctx = useContext(RouterContext);
 
+  if (!ctx) {
+    throw new Error("Link must be used within a RouterProvider");
+  }
+
+  const router = ctx.router;
+
   const useFastPath =
-    ctx?.routeSelector &&
     !local.activeStrict &&
     local.ignoreQueryParams &&
     local.routeParams === EMPTY_PARAMS;

package/src/components/RouteView/RouteView.tsx

@@ -1,4 +1,4 @@
-import { children as resolveChildren } from "solid-js";
+import { children as resolveChildren, createMemo } from "solid-js";
 
 import { Match, NotFound } from "./components";
 import { buildRenderList, collectElements } from "./helpers";
@@ -13,6 +13,14 @@ function RouteViewRoot(props: Readonly<RouteViewProps>): JSX.Element {
 
   const resolved = resolveChildren(() => props.children);
 
+  const elements = createMemo(() => {
+    const arr: RouteViewMarker[] = [];
+
+    collectElements(resolved(), arr);
+
+    return arr;
+  });
+
   return (
     <>
       {(() => {
@@ -22,24 +30,16 @@ function RouteViewRoot(props: Readonly<RouteViewProps>): JSX.Element {
           return null;
         }
 
-        const elements: RouteViewMarker[] = [];
-
-        collectElements(resolved(), elements);
-
-        const { rendered } = buildRenderList(
-          elements,
+        const rendered = buildRenderList(
+          elements(),
           state.route.name,
           props.nodeName,
         );
 
-        if (rendered.length > 0) {
-          return rendered;
-        }
-
-        return null;
+        return rendered.length > 0 ? rendered : null;
       })()}
     </>
-  ) as unknown as JSX.Element;
+  );
 }
 
 RouteViewRoot.displayName = "RouteView";

package/src/components/RouteView/components.tsx

@@ -1,9 +1,11 @@
 import type { MatchProps, NotFoundProps } from "./types";
 import type { JSX } from "solid-js";
 
-export const MATCH_MARKER = Symbol.for("RouteView.Match");
+// Local (non-global) Symbols — Symbol.for() would expose markers to spoofing
+// via the global Symbol registry. See Gotchas section "RouteView Marker Objects".
+export const MATCH_MARKER = Symbol("RouteView.Match");
 
-export const NOT_FOUND_MARKER = Symbol.for("RouteView.NotFound");
+export const NOT_FOUND_MARKER = Symbol("RouteView.NotFound");
 
 export interface MatchMarker {
   $$type: typeof MATCH_MARKER;
@@ -21,7 +23,7 @@ export interface NotFoundMarker {
 export type RouteViewMarker = MatchMarker | NotFoundMarker;
 
 export function Match(props: MatchProps): JSX.Element {
-  const result = {
+  const result: MatchMarker = {
     $$type: MATCH_MARKER,
     segment: props.segment,
     exact: props.exact ?? false,
@@ -29,21 +31,25 @@ export function Match(props: MatchProps): JSX.Element {
     get children(): JSX.Element {
       return props.children;
     },
-  } as MatchMarker;
+  };
 
+  // Marker object is identified by $$type Symbol in RouteView/helpers.tsx,
+  // not rendered as JSX. Cast required because JSX.Element does not include
+  // arbitrary marker shapes.
   return result as unknown as JSX.Element;
 }
 
 Match.displayName = "RouteView.Match";
 
 export function NotFound(props: NotFoundProps): JSX.Element {
-  const result = {
+  const result: NotFoundMarker = {
     $$type: NOT_FOUND_MARKER,
     get children(): JSX.Element {
       return props.children;
     },
-  } as NotFoundMarker;
+  };
 
+  // See Match for the marker-pattern rationale.
   return result as unknown as JSX.Element;
 }
 

package/src/components/RouteView/helpers.tsx

@@ -11,7 +11,7 @@ import type {
 } from "./components";
 import type { JSX } from "solid-js";
 
-function isSegmentMatch(
+export function isSegmentMatch(
   routeName: string,
   fullSegmentName: string,
   exact: boolean,
@@ -66,7 +66,7 @@ export function buildRenderList(
   elements: RouteViewMarker[],
   routeName: string,
   nodeName: string,
-): { rendered: JSX.Element[]; activeMatchFound: boolean } {
+): JSX.Element[] {
   let notFoundChildren: JSX.Element | null = null;
   let activeMatchFound = false;
   const rendered: JSX.Element[] = [];
@@ -77,23 +77,25 @@ export function buildRenderList(
       continue;
     }
 
+    if (activeMatchFound) {
+      continue;
+    }
+
     const { segment, exact, fallback } = child;
     const fullSegmentName = nodeName ? `${nodeName}.${segment}` : segment;
-    const isActive =
-      !activeMatchFound && isSegmentMatch(routeName, fullSegmentName, exact);
-
-    if (isActive) {
-      activeMatchFound = true;
-      const matchContent = child.children;
-      const content =
-        fallback === undefined ? (
-          matchContent
-        ) : (
-          <Suspense fallback={fallback}>{matchContent}</Suspense>
-        );
-
-      rendered.push(content);
+
+    if (!isSegmentMatch(routeName, fullSegmentName, exact)) {
+      continue;
     }
+
+    activeMatchFound = true;
+    rendered.push(
+      fallback === undefined ? (
+        child.children
+      ) : (
+        <Suspense fallback={fallback}>{child.children}</Suspense>
+      ),
+    );
   }
 
   if (
@@ -104,5 +106,5 @@ export function buildRenderList(
     rendered.push(notFoundChildren);
   }
 
-  return { rendered, activeMatchFound };
+  return rendered;
 }

package/src/components/RouterErrorBoundary.tsx

@@ -1,6 +1,8 @@
-import { createEffect, createMemo, createSignal } from "solid-js";
+import { createDismissableError } from "@real-router/sources";
+import { createEffect, Show } from "solid-js";
 
-import { useRouterError } from "../hooks/useRouterError";
+import { createSignalFromSource } from "../createSignalFromSource";
+import { useRouter } from "../hooks/useRouter";
 
 import type { RouterError, State } from "@real-router/core";
 import type { JSX } from "solid-js";
@@ -21,8 +23,8 @@ export interface RouterErrorBoundaryProps {
 export function RouterErrorBoundary(
   props: RouterErrorBoundaryProps,
 ): JSX.Element {
-  const snapshot = useRouterError();
-  const [dismissedVersion, setDismissedVersion] = createSignal(-1);
+  const router = useRouter();
+  const snapshot = createSignalFromSource(createDismissableError(router));
 
   createEffect(() => {
     const snap = snapshot();
@@ -32,22 +34,12 @@ export function RouterErrorBoundary(
     }
   });
 
-  const visibleError = createMemo(() => {
-    const snap = snapshot();
-
-    return snap.version > dismissedVersion() ? snap.error : null;
-  });
-
-  const resetError = () => setDismissedVersion(snapshot().version);
-
   return (
     <>
       {props.children}
-      {(() => {
-        const error = visibleError();
-
-        return error ? props.fallback(error, resetError) : null;
-      })()}
+      <Show when={snapshot().error}>
+        {(error) => props.fallback(error(), snapshot().resetError)}
+      </Show>
     </>
   );
 }

package/src/createSignalFromSource.ts

@@ -8,10 +8,18 @@ export function createSignalFromSource<T>(
 ): Accessor<T> {
   const [value, setValue] = createSignal<T>(source.getSnapshot());
 
+  const sync = (): T => source.getSnapshot();
+
   const unsubscribe = source.subscribe(() => {
-    setValue(() => source.getSnapshot());
+    setValue(sync);
   });
 
+  // Re-read after subscribe: lazy sources reconcile their snapshot in
+  // onFirstSubscribe (when reused after disconnect via cache). Listener is not
+  // notified for that internal update, so we must sync the signal manually.
+  // No-op when snapshot is unchanged (signal equality check).
+  setValue(sync);
+
   onCleanup(() => {
     unsubscribe();
   });

package/src/createStoreFromSource.ts

@@ -6,9 +6,7 @@ import type { RouterSource } from "@real-router/sources";
 export function createStoreFromSource<T extends object>(
   source: RouterSource<T>,
 ): T {
-  const [state, setState] = createStore<T>(
-    structuredClone(source.getSnapshot()),
-  );
+  const [state, setState] = createStore<T>({ ...source.getSnapshot() });
 
   const unsubscribe = source.subscribe(() => {
     setState(reconcile(source.getSnapshot()));

package/src/hooks/useRouteNode.tsx

@@ -8,7 +8,6 @@ import type { Accessor } from "solid-js";
 
 export function useRouteNode(nodeName: string): Accessor<RouteState> {
   const router = useRouter();
-  const store = createRouteNodeSource(router, nodeName);
 
-  return createSignalFromSource(store);
+  return createSignalFromSource(createRouteNodeSource(router, nodeName));
 }

package/src/hooks/useRouteStore.tsx

@@ -1,19 +1,11 @@
 import { createRouteSource } from "@real-router/sources";
-import { useContext } from "solid-js";
 
-import { RouteContext } from "../context";
 import { createStoreFromSource } from "../createStoreFromSource";
 import { useRouter } from "./useRouter";
 
 import type { RouteState } from "../types";
 
 export function useRouteStore(): RouteState {
-  const ctx = useContext(RouteContext);
-
-  if (!ctx) {
-    throw new Error("useRouteStore must be used within a RouterProvider");
-  }
-
   const router = useRouter();
 
   return createStoreFromSource(createRouteSource(router));

package/src/hooks/useRouterTransition.tsx

@@ -1,4 +1,4 @@
-import { createTransitionSource } from "@real-router/sources";
+import { getTransitionSource } from "@real-router/sources";
 
 import { createSignalFromSource } from "../createSignalFromSource";
 import { useRouter } from "./useRouter";
@@ -8,7 +8,7 @@ import type { Accessor } from "solid-js";
 
 export function useRouterTransition(): Accessor<RouterTransitionSnapshot> {
   const router = useRouter();
-  const store = createTransitionSource(router);
+  const source = getTransitionSource(router);
 
-  return createSignalFromSource(store);
+  return createSignalFromSource(source);
 }

package/dist/types/hooks/useRouterError.d.ts

@@ -1,4 +0,0 @@
-import type { RouterErrorSnapshot } from "@real-router/sources";
-import type { Accessor } from "solid-js";
-export declare function useRouterError(): Accessor<RouterErrorSnapshot>;
-//# sourceMappingURL=useRouterError.d.ts.map

package/dist/types/hooks/useRouterError.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useRouterError.d.ts","sourceRoot":"","sources":["../../../src/hooks/useRouterError.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,mBAAmB,EAAgB,MAAM,sBAAsB,CAAC;AAC9E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAIzC,wBAAgB,cAAc,IAAI,QAAQ,CAAC,mBAAmB,CAAC,CAW9D"}

package/src/hooks/useRouterError.tsx

@@ -1,23 +0,0 @@
-import { createErrorSource } from "@real-router/sources";
-
-import { createSignalFromSource } from "../createSignalFromSource";
-import { useRouter } from "./useRouter";
-
-import type { Router } from "@real-router/core";
-import type { RouterErrorSnapshot, RouterSource } from "@real-router/sources";
-import type { Accessor } from "solid-js";
-
-const cache = new WeakMap<Router, RouterSource<RouterErrorSnapshot>>();
-
-export function useRouterError(): Accessor<RouterErrorSnapshot> {
-  const router = useRouter();
-
-  let source = cache.get(router);
-
-  if (!source) {
-    source = createErrorSource(router);
-    cache.set(router, source);
-  }
-
-  return createSignalFromSource(source);
-}