@real-router/solid 0.3.0 → 0.4.0

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 { 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,43 +75,65 @@ 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();
   });
   return value;
 }
 
+const cache$2 = new WeakMap();
+function getOrCreateNodeSource(router, nodeName) {
+  let perRouter = cache$2.get(router);
+  if (!perRouter) {
+    perRouter = new Map();
+    cache$2.set(router, perRouter);
+  }
+  let source = perRouter.get(nodeName);
+  if (!source) {
+    source = createRouteNodeSource(router, nodeName);
+    perRouter.set(nodeName, source);
+  }
+  return source;
+}
+
 const RouterContext = createContext(null);
 const RouteContext = createContext(null);
 
@@ -117,27 +147,24 @@ const useRouter = () => {
 
 function useRouteNode(nodeName) {
   const router = useRouter();
-  const store = createRouteNodeSource(router, nodeName);
-  return createSignalFromSource(store);
+  return createSignalFromSource(getOrCreateNodeSource(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 +190,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 +228,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 +279,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 +304,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,25 +315,67 @@ 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");
   }
 }
 
 var _tmpl$ = /*#__PURE__*/template(`<a>`);
+// Slow-path source cache: shared per-router, keyed by routeName + params + flags.
+// Captured slow-path values are stable per Link (props captured at init), so the
+// cache key is guaranteed stable for the lifetime of any consumer.
+const activeSourceCache = new WeakMap();
+function getOrCreateActiveSource(router, routeName, routeParams, activeStrict, ignoreQueryParams) {
+  let perRouter = activeSourceCache.get(router);
+  if (!perRouter) {
+    perRouter = new Map();
+    activeSourceCache.set(router, perRouter);
+  }
+  const key = `${routeName}|${JSON.stringify(routeParams)}|${activeStrict}|${ignoreQueryParams}`;
+  let source = perRouter.get(key);
+  if (!source) {
+    source = createActiveRouteSource(router, routeName, routeParams, {
+      strict: activeStrict,
+      ignoreQueryParams
+    });
+    perRouter.set(key, source);
+  }
+  return source;
+}
 function Link(props) {
   const merged = mergeProps({
     routeParams: EMPTY_PARAMS,
@@ -287,13 +385,13 @@ 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;
-  const isActive = useFastPath ? () => ctx.routeSelector(local.routeName) : createSignalFromSource(createActiveRouteSource(router, local.routeName, local.routeParams, {
-    strict: local.activeStrict,
-    ignoreQueryParams: local.ignoreQueryParams
-  }));
+  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(getOrCreateActiveSource(router, local.routeName, local.routeParams, local.activeStrict, local.ignoreQueryParams));
   const href = createMemo(() => buildHref(router, local.routeName, local.routeParams));
   const handleClick = evt => {
     if (local.onClick) {
@@ -325,13 +423,13 @@ function Link(props) {
   })();
 }
 
-const cache = new WeakMap();
+const cache$1 = new WeakMap();
 function useRouterError() {
   const router = useRouter();
-  let source = cache.get(router);
+  let source = cache$1.get(router);
   if (!source) {
     source = createErrorSource(router);
-    cache.set(router, source);
+    cache$1.set(router, source);
   }
   return createSignalFromSource(source);
 }
@@ -350,9 +448,11 @@ function RouterErrorBoundary(props) {
     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 visibleError();
+    },
+    children: error => props.fallback(error(), resetError)
   })];
 }
 
@@ -422,7 +522,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,23 +533,24 @@ 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));
 }
 
 function useRouteNodeStore(nodeName) {
   const router = useRouter();
-  return createStoreFromSource(createRouteNodeSource(router, nodeName));
+  return createStoreFromSource(getOrCreateNodeSource(router, nodeName));
 }
 
+const cache = new WeakMap();
 function useRouterTransition() {
   const router = useRouter();
-  const store = createTransitionSource(router);
-  return createSignalFromSource(store);
+  let source = cache.get(router);
+  if (!source) {
+    source = createTransitionSource(router);
+    cache.set(router, source);
+  }
+  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,EAAU,MAAM,mBAAmB,CAAC;AAExD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAsCpC,wBAAgB,IAAI,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,EAC5C,KAAK,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAC5B,GAAG,CAAC,OAAO,CAuFb"}

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":"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,CA4Bb"}

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/sharedNodeSource.d.ts

@@ -0,0 +1,4 @@
+import type { Router } from "@real-router/core";
+import type { RouteNodeSnapshot, RouterSource } from "@real-router/sources";
+export declare function getOrCreateNodeSource(router: Router, nodeName: string): RouterSource<RouteNodeSnapshot>;
+//# sourceMappingURL=sharedNodeSource.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sharedNodeSource.d.ts","sourceRoot":"","sources":["../../../src/hooks/sharedNodeSource.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAO5E,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf,YAAY,CAAC,iBAAiB,CAAC,CAgBjC"}

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":"AAIA,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/useRouteNodeStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useRouteNodeStore.d.ts","sourceRoot":"","sources":["../../../src/hooks/useRouteNodeStore.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAI9D"}
+{"version":3,"file":"useRouteNodeStore.d.ts","sourceRoot":"","sources":["../../../src/hooks/useRouteNodeStore.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,CAI9D"}

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/dist/types/hooks/useRouterTransition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useRouterTransition.d.ts","sourceRoot":"","sources":["../../../src/hooks/useRouterTransition.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,wBAAgB,mBAAmB,IAAI,QAAQ,CAAC,wBAAwB,CAAC,CAKxE"}
+{"version":3,"file":"useRouterTransition.d.ts","sourceRoot":"","sources":["../../../src/hooks/useRouterTransition.tsx"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAEV,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAIzC,wBAAgB,mBAAmB,IAAI,QAAQ,CAAC,wBAAwB,CAAC,CAWxE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@real-router/solid",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "type": "commonjs",
   "description": "Solid.js integration for Real-Router",
   "main": "./dist/cjs/index.js",
@@ -51,9 +51,9 @@
   "license": "MIT",
   "sideEffects": false,
   "dependencies": {
-    "@real-router/core": "^0.47.0",
-    "@real-router/route-utils": "^0.2.0",
-    "@real-router/sources": "^0.5.0"
+    "@real-router/core": "^0.48.0",
+    "@real-router/route-utils": "^0.2.1",
+    "@real-router/sources": "^0.5.1"
   },
   "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.0"
+    "@real-router/browser-plugin": "^0.12.2"
   },
   "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 {