@vobs/router 0.1.0 → 0.3.0

package/dist/history.d.ts

@@ -21,5 +21,5 @@ export interface ScrollRestoration {
     settle(action: 'none' | 'push' | 'replace', historyEntryKey: string | undefined): void;
     destroy(): void;
 }
-export declare function createScrollRestoration(window: RouterWindow | undefined): ScrollRestoration;
+export declare function createScrollRestoration(window: RouterWindow | undefined, maxEntries?: number): ScrollRestoration;
 export {};

package/dist/history.js

@@ -85,12 +85,16 @@ export function resolveHistoryWindow(options) {
         ? (options.window ?? defaultRouterWindow())
         : defaultRouterWindow();
 }
-export function createScrollRestoration(window) {
+export function createScrollRestoration(window, maxEntries = 100) {
     const positions = new Map();
+    const positionLimit = Number.isFinite(maxEntries) ? Math.max(0, Math.trunc(maxEntries)) : 100;
     let currentKey;
-    if (window?.history?.scrollRestoration !== undefined) {
+    const previousScrollRestoration = window?.history?.scrollRestoration;
+    let changedScrollRestoration = false;
+    if (previousScrollRestoration !== undefined && window !== undefined) {
         try {
             window.history.scrollRestoration = 'manual';
+            changedScrollRestoration = true;
         }
         catch {
             // ignore read-only scrollRestoration (e.g. sandboxed iframes)
@@ -107,7 +111,16 @@ export function createScrollRestoration(window) {
         saveCurrent() {
             if (window === undefined || currentKey === undefined)
                 return;
+            if (positionLimit === 0)
+                return;
+            positions.delete(currentKey);
             positions.set(currentKey, readPosition());
+            while (positions.size > positionLimit) {
+                const oldestKey = positions.keys().next().value;
+                if (oldestKey === undefined)
+                    break;
+                positions.delete(oldestKey);
+            }
         },
         settle(action, historyEntryKey) {
             if (window === undefined)
@@ -121,6 +134,14 @@ export function createScrollRestoration(window) {
         destroy() {
             positions.clear();
             currentKey = undefined;
+            if (changedScrollRestoration && window !== undefined) {
+                try {
+                    window.history.scrollRestoration = previousScrollRestoration;
+                }
+                catch {
+                    // ignore read-only scrollRestoration (e.g. sandboxed iframes)
+                }
+            }
         },
     };
 }

package/dist/resolve.js

@@ -8,6 +8,7 @@ import { resolveRouteMatch } from './match.js';
 import { createRouteLocation } from './location.js';
 export const defaultRedirectLimit = 8;
 const routeComponentCache = new WeakMap();
+const pendingLoaderSignals = new WeakMap();
 export function resolveRoute(options) {
     const match = resolveRouteMatch(options.routes, options.path, options.redirectLimit ?? defaultRedirectLimit, 0);
     const component = match?.component ?? options.notFound;
@@ -44,7 +45,16 @@ export function resolveRouteInitialState(route, options = {}) {
     const context = createRouteLoaderContext(route.route, options);
     const cacheKey = readLoaderCacheKey(route.loaderCache, route.route, options);
     if (cacheKey !== undefined && options.loaderCache?.has(cacheKey) === true) {
-        return options.loaderCache.get(cacheKey);
+        const cached = options.loaderCache.get(cacheKey);
+        if (!isPromiseLike(cached))
+            return cached;
+        // A pending loader may belong to a superseded navigation. Keep prefetch deduplication,
+        // but do not hand a cancelled navigation's request to a new consumer.
+        if (pendingLoaderSignals.get(cached) === undefined ||
+            !pendingLoaderSignals.get(cached)?.aborted) {
+            return cached;
+        }
+        options.loaderCache.delete(cacheKey);
     }
     const loaded = runWithInjectionScope(context.injections, () => route.loader(context));
     return cacheLoaderResult(loaded, cacheKey, context.signal, options.loaderCache);
@@ -184,6 +194,7 @@ function cacheLoaderResult(loaded, cacheKey, signal, loaderCache) {
             }
             throw error;
         });
+        pendingLoaderSignals.set(pending, signal);
         writeLoaderCache(cacheKey, pending, signal, loaderCache);
         return pending;
     }

package/dist/router.d.ts

@@ -2,5 +2,7 @@
  * Copyright (c) 2026 vobsjs
  * @vobs/router
  */
-import { type Router, type RouterOptions } from './types.js';
-export declare function createRouter(options: RouterOptions): Router;
+import { type RouteRecord, type ValidatedRouteRecords, type Router, type RouterOptions } from './types.js';
+export declare function createRouter<const Routes extends readonly RouteRecord[]>(options: RouterOptions<Routes> & {
+    readonly routes: Routes & ValidatedRouteRecords<Routes>;
+}): Router;

package/dist/router.js

@@ -44,7 +44,7 @@ export function createRouter(options) {
         historyBinding = createHistoryBinding(options.history);
         scrollRestoration =
             options.scrollRestoration === true
-                ? createScrollRestoration(resolveHistoryWindow(options.history) ?? defaultRouterWindow())
+                ? createScrollRestoration(resolveHistoryWindow(options.history) ?? defaultRouterWindow(), options.scrollRestorationMaxEntries)
                 : undefined;
         try {
             await commitNavigation(options.initialPath ?? historyBinding?.readPath() ?? '/', historyBinding === undefined ? 'none' : 'replace', 0, options.hydrate === true ? 'hydrate' : 'mount', undefined);
@@ -339,18 +339,47 @@ export function createRouter(options) {
         mounted = false;
         container = undefined;
         environment = undefined;
-        historyBinding?.destroy();
+        const errors = [];
+        try {
+            historyBinding?.destroy();
+        }
+        catch (error) {
+            errors.push(error);
+        }
         historyBinding = undefined;
         const page = currentPage;
         currentPage = undefined;
         current.value = null;
         pending.value = null;
-        page?.destroy();
-        keepAliveCache.destroyAll();
-        scrollRestoration?.destroy();
+        try {
+            page?.destroy();
+        }
+        catch (error) {
+            errors.push(error);
+        }
+        try {
+            keepAliveCache.destroyAll();
+        }
+        catch (error) {
+            errors.push(error);
+        }
+        try {
+            scrollRestoration?.destroy();
+        }
+        catch (error) {
+            errors.push(error);
+        }
         scrollRestoration = undefined;
-        routerInjectionScope?.dispose();
+        try {
+            routerInjectionScope?.dispose();
+        }
+        catch (error) {
+            errors.push(error);
+        }
         routerInjectionScope = undefined;
+        if (errors.length > 0) {
+            throw new AggregateError(errors, 'Router destroy failed');
+        }
     }
     return {
         current,

package/dist/types.d.ts

@@ -59,6 +59,18 @@ export interface RouteLoaderCache {
     clear(): void;
 }
 export type RouteRecord<Component extends RouteComponent = RouteComponent> = PageRouteRecord<Component> | NestedRouteRecord<Component> | RedirectRouteRecord;
+type RouteRecordForValue<Route> = Route extends RouteRecord ? Route extends {
+    readonly children: infer Children extends readonly RouteRecord[];
+} ? Omit<Route, 'children'> & {
+    readonly children: {
+        readonly [Key in keyof Children]: RouteRecordForValue<Children[Key]>;
+    };
+} : Route extends {
+    readonly component: infer Component extends RouteComponent;
+} ? Route & PageRouteRecord<Component> : Route : never;
+export type ValidatedRouteRecords<Routes extends readonly RouteRecord[]> = {
+    readonly [Key in keyof Routes]: RouteRecordForValue<Routes[Key]>;
+};
 export type PageRouteRecord<Component extends RouteComponent = RouteComponent> = PageRouteRecordWithoutInitialState<Component> | PageRouteRecordWithInitialState<Component> | PageRouteRecordWithLoader<Component>;
 export interface PageRouteRecordWithoutInitialState<Component extends RouteComponent = RouteComponent> {
     readonly path: string;
@@ -102,7 +114,7 @@ export interface PageRouteRecordWithLoader<Component extends RouteComponent = Ro
 export interface NestedRouteRecord<Component extends RouteComponent = RouteComponent> {
     readonly path: string;
     readonly component?: Component;
-    readonly children: readonly RouteRecord[];
+    readonly children: readonly RouteRecord<Component>[];
     readonly layouts?: readonly RouteComponent[];
     readonly error?: RouteComponent;
     readonly meta?: RouteMeta;
@@ -159,8 +171,8 @@ export interface RouteNavigationScope {
     readonly description: ReadonlySignal<string>;
     readonly status: ReadonlySignal<string>;
 }
-export interface RouterOptions {
-    readonly routes: readonly RouteRecord[];
+export interface RouterOptions<Routes extends readonly RouteRecord[] = readonly RouteRecord[]> {
+    readonly routes: Routes;
     readonly notFound?: RouteComponent | undefined;
     readonly error?: RouteComponent | undefined;
     readonly initialPath?: string;
@@ -168,6 +180,8 @@ export interface RouterOptions {
     readonly hydrate?: boolean;
     readonly navigation?: RouterNavigationOptions;
     readonly scrollRestoration?: boolean;
+    /** Maximum number of saved history-entry scroll positions. Defaults to 100. */
+    readonly scrollRestorationMaxEntries?: number;
     readonly keepAliveMax?: number;
 }
 export interface RouterNavigationOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vobs/router",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Client and server route resolution for vobs pages.",
   "type": "module",
   "publishConfig": {
@@ -18,8 +18,8 @@
   },
   "homepage": "https://github.com/vobsjs/vobs#readme",
   "dependencies": {
-    "@vobs/reactivity": "0.1.0",
-    "@vobs/runtime-core": "0.1.0"
+    "@vobs/reactivity": "0.3.0",
+    "@vobs/runtime-core": "0.3.0"
   },
   "files": [
     "dist"
@@ -36,9 +36,9 @@
   "main": "./dist/index.js",
   "sideEffects": false,
   "devDependencies": {
-    "@vobs/resource": "0.1.0"
+    "@vobs/resource": "0.3.0"
   },
   "engines": {
-    "node": ">=20.19.0"
+    "node": ">=22.12.0"
   }
 }