@buzola/router 0.0.16 → 0.0.18

package/dist/engine/utils.js

@@ -34,4 +34,17 @@ export function isSamePath(a, b) {
     const urlB = typeof b === 'string' ? new URL(b) : b;
     return urlA.origin === urlB.origin && urlA.pathname === urlB.pathname;
 }
+/**
+ * Whether going from `from` to `to` is a fragment navigation: the URLs differ at most in the hash and `to`
+ * has one. Browsers always perform those within the current document, whether intercepted or not.
+ */
+export function isFragmentNavigation(from, to) {
+    if (to.hash === '')
+        return false;
+    const fromWithoutHash = new URL(from);
+    fromWithoutHash.hash = '';
+    const toWithoutHash = new URL(to);
+    toWithoutHash.hash = '';
+    return fromWithoutHash.href === toWithoutHash.href;
+}
 //# sourceMappingURL=utils.js.map

package/dist/engine/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/engine/utils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAChD,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IACxC,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACjE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;AAC5B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAChD,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1C,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAA;QAC5C,CAAC;IACF,CAAC;IACD,OAAO,KAAK,CAAA;AACb,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CAAC,CAAe,EAAE,CAAe;IAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACnD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACnD,OAAO,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,CAAA;AACtE,CAAC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/engine/utils.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAChD,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IACxC,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACjE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,CAAA;AAC5B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAChD,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1C,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAA;QAC5C,CAAC;IACF,CAAC;IACD,OAAO,KAAK,CAAA;AACb,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,UAAU,CAAC,CAAe,EAAE,CAAe;IAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACnD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACnD,OAAO,IAAI,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,CAAA;AACtE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,IAAS,EAAE,EAAO;IACtD,IAAI,EAAE,CAAC,IAAI,KAAK,EAAE;QAAE,OAAO,KAAK,CAAA;IAChC,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,CAAA;IACrC,eAAe,CAAC,IAAI,GAAG,EAAE,CAAA;IACzB,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC,CAAA;IACjC,aAAa,CAAC,IAAI,GAAG,EAAE,CAAA;IACvB,OAAO,eAAe,CAAC,IAAI,KAAK,aAAa,CAAC,IAAI,CAAA;AACnD,CAAC"}

package/dist/index.d.ts

@@ -6,7 +6,7 @@ export type { CreateRouteNodeOptions } from './engine/route-tree.js';
 export { matchRoutes } from './engine/matcher.js';
 export { createBrowserNavigationAdapter, createMemoryNavigationAdapter } from './engine/navigation-adapter.js';
 export type { MemoryNavigationAdapter, MemoryNavigationAdapterOptions } from './engine/navigation-adapter.js';
-export type { BlockerFn, BuzolaNavigateEvent, BuzolaPageMap, BuzolaPersistentParams, EffectivePageParams, NavigateOptions, NavigationAdapter, PageParams, RegisteredPage, RouteComponent, RouteConfig, RouteMatch, RouteNode, RouterState, RouteTree, StandardSchema, } from './engine/types.js';
+export type { BlockerFn, BuzolaNavigateEvent, BuzolaPageMap, BuzolaPersistentParams, EffectivePageParams, InterceptInfo, NavigateOptions, NavigationAdapter, PageParams, RegisteredPage, RouteComponent, RouteConfig, RouteMatch, RouteNode, RouterState, RouteTree, ShouldInterceptFn, StandardSchema, } from './engine/types.js';
 export { s } from './engine/schema.js';
 export { BuzolaRedirect, createPage, redirect } from './define/create-page.js';
 export type { CatchContext, PageDefinition, PageProps, RedirectFn } from './define/create-page.js';

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AACnE,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAEzE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxE,YAAY,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEjD,OAAO,EAAE,8BAA8B,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAA;AAC9G,YAAY,EAAE,uBAAuB,EAAE,8BAA8B,EAAE,MAAM,gCAAgC,CAAA;AAG7G,YAAY,EACX,SAAS,EACT,mBAAmB,EACnB,aAAa,EACb,sBAAsB,EACtB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,cAAc,EACd,WAAW,EACX,UAAU,EACV,SAAS,EACT,WAAW,EACX,SAAS,EACT,cAAc,GACd,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAAE,CAAC,EAAE,MAAM,oBAAoB,CAAA;AAGtC,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAC9E,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAGlG,OAAO,EACN,cAAc,EACd,aAAa,EACb,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,EACb,WAAW,EACX,kBAAkB,EAClB,SAAS,EACT,QAAQ,EACR,SAAS,EACT,cAAc,EACd,eAAe,GACf,MAAM,kBAAkB,CAAA;AACzB,YAAY,EAAE,YAAY,EAAE,mBAAmB,EAAE,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AACnE,YAAY,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAEzE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxE,YAAY,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAA;AAEpE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEjD,OAAO,EAAE,8BAA8B,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAA;AAC9G,YAAY,EAAE,uBAAuB,EAAE,8BAA8B,EAAE,MAAM,gCAAgC,CAAA;AAG7G,YAAY,EACX,SAAS,EACT,mBAAmB,EACnB,aAAa,EACb,sBAAsB,EACtB,mBAAmB,EACnB,aAAa,EACb,eAAe,EACf,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,cAAc,EACd,WAAW,EACX,UAAU,EACV,SAAS,EACT,WAAW,EACX,SAAS,EACT,iBAAiB,EACjB,cAAc,GACd,MAAM,mBAAmB,CAAA;AAG1B,OAAO,EAAE,CAAC,EAAE,MAAM,oBAAoB,CAAA;AAGtC,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAC9E,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAA;AAGlG,OAAO,EACN,cAAc,EACd,aAAa,EACb,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,EACb,WAAW,EACX,kBAAkB,EAClB,SAAS,EACT,QAAQ,EACR,SAAS,EACT,cAAc,EACd,eAAe,GACf,MAAM,kBAAkB,CAAA;AACzB,YAAY,EAAE,YAAY,EAAE,mBAAmB,EAAE,SAAS,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA"}

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAGnE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAGxE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEjD,OAAO,EAAE,8BAA8B,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAA;AAuB9G,gFAAgF;AAChF,OAAO,EAAE,CAAC,EAAE,MAAM,oBAAoB,CAAA;AAEtC,+EAA+E;AAC/E,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAG9E,+EAA+E;AAC/E,OAAO,EACN,cAAc,EACd,aAAa,EACb,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,EACb,WAAW,EACX,kBAAkB,EAClB,SAAS,EACT,QAAQ,EACR,SAAS,EACT,cAAc,EACd,eAAe,GACf,MAAM,kBAAkB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,+EAA+E;AAC/E,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAGnE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAGxE,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAEjD,OAAO,EAAE,8BAA8B,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAA;AAyB9G,gFAAgF;AAChF,OAAO,EAAE,CAAC,EAAE,MAAM,oBAAoB,CAAA;AAEtC,+EAA+E;AAC/E,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAG9E,+EAA+E;AAC/E,OAAO,EACN,cAAc,EACd,aAAa,EACb,IAAI,EACJ,MAAM,EACN,YAAY,EACZ,aAAa,EACb,UAAU,EACV,aAAa,EACb,WAAW,EACX,kBAAkB,EAClB,SAAS,EACT,QAAQ,EACR,SAAS,EACT,cAAc,EACd,eAAe,GACf,MAAM,kBAAkB,CAAA"}

package/dist/react/provider.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Router } from '../engine/router.js';
-import type { RouteMatch, RouteTree } from '../engine/types.js';
+import type { RouteMatch, RouteTree, ShouldInterceptFn } from '../engine/types.js';
 /** Props passed to the middleware component. */
 export interface MiddlewareProps {
     /** Merged params from all matched routes. */
@@ -21,11 +21,14 @@ export type BuzolaProviderProps = {
     routes?: never;
     persistentParams?: never;
     pageRegistry?: never;
+    shouldIntercept?: never;
 } | {
     router?: never;
     routes: RouteTree;
     persistentParams?: () => Record<string, string>;
     pageRegistry?: Record<string, string>;
+    /** Decides per navigation whether the router handles it; see `RouterOptions.shouldIntercept`. */
+    shouldIntercept?: ShouldInterceptFn;
 });
 /**
  * Root provider for Buzola router.

package/dist/react/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/react/provider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8E,MAAM,OAAO,CAAA;AAElG,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAI/D,gDAAgD;AAChD,MAAM,WAAW,eAAe;IAC/B,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9B,2CAA2C;IAC3C,OAAO,EAAE,UAAU,EAAE,CAAA;IACrB,uCAAuC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CACzB;AAED,gEAAgE;AAChE,MAAM,MAAM,mBAAmB,GAAG,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAA;AAEtE,MAAM,MAAM,mBAAmB,GAC5B;IACD,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,8FAA8F;IAC9F,UAAU,CAAC,EAAE,mBAAmB,CAAA;CAChC,GACC,CACC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,CAAC;IAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAAC,YAAY,CAAC,EAAE,KAAK,CAAA;CAAE,GAClF;IACD,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,MAAM,EAAE,SAAS,CAAA;IACjB,gBAAgB,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/C,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACrC,CACD,CAAA;AAEF;;;GAGG;AACH,wBAAgB,cAAc,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,KAAK,EAAE,EAAE,mBAAmB,GAAG,KAAK,CAAC,YAAY,CA+C9H"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/react/provider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8E,MAAM,OAAO,CAAA;AAElG,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAIlF,gDAAgD;AAChD,MAAM,WAAW,eAAe;IAC/B,6CAA6C;IAC7C,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC9B,2CAA2C;IAC3C,OAAO,EAAE,UAAU,EAAE,CAAA;IACrB,uCAAuC;IACvC,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;CACzB;AAED,gEAAgE;AAChE,MAAM,MAAM,mBAAmB,GAAG,KAAK,CAAC,aAAa,CAAC,eAAe,CAAC,CAAA;AAEtE,MAAM,MAAM,mBAAmB,GAC5B;IACD,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,8FAA8F;IAC9F,UAAU,CAAC,EAAE,mBAAmB,CAAA;CAChC,GACC,CACC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,KAAK,CAAC;IAAC,gBAAgB,CAAC,EAAE,KAAK,CAAC;IAAC,YAAY,CAAC,EAAE,KAAK,CAAC;IAAC,eAAe,CAAC,EAAE,KAAK,CAAA;CAAE,GAC3G;IACD,MAAM,CAAC,EAAE,KAAK,CAAA;IACd,MAAM,EAAE,SAAS,CAAA;IACjB,gBAAgB,CAAC,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC/C,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACrC,iGAAiG;IACjG,eAAe,CAAC,EAAE,iBAAiB,CAAA;CACnC,CACD,CAAA;AAEF;;;GAGG;AACH,wBAAgB,cAAc,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,KAAK,EAAE,EAAE,mBAAmB,GAAG,KAAK,CAAC,YAAY,CAqD9H"}

package/dist/react/provider.js

@@ -9,6 +9,11 @@ import { Outlet } from './outlet.js';
  * Subscribes to router state and provides context to the React tree.
  */
 export function BuzolaProvider({ routes, children, middleware: Middleware, ...props }) {
+    // The router is created once, so it reads the latest prop through a ref rather than the first render's closure.
+    const shouldInterceptRef = useRef(props.shouldIntercept);
+    useLayoutEffect(() => {
+        shouldInterceptRef.current = props.shouldIntercept;
+    });
     const routerRef = useRef(props.router);
     if (!routerRef.current) {
         routerRef.current = new Router({
@@ -16,6 +21,7 @@ export function BuzolaProvider({ routes, children, middleware: Middleware, ...pr
             adapter: createBrowserNavigationAdapter(),
             persistentParams: props.persistentParams,
             pageRegistry: props.pageRegistry,
+            shouldIntercept: info => shouldInterceptRef.current?.(info) ?? true,
         });
     }
     const router = routerRef.current;

package/dist/react/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/react/provider.tsx"],"names":[],"mappings":";AAAA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAA;AAClG,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAA;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAE5C,OAAO,EAAE,YAAY,EAA0B,aAAa,EAAE,MAAM,cAAc,CAAA;AAClF,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AA+BpC;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,KAAK,EAAuB;IACzG,MAAM,SAAS,GAAG,MAAM,CAAqB,KAAK,CAAC,MAAM,CAAC,CAAA;IAC1D,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QACxB,SAAS,CAAC,OAAO,GAAG,IAAI,MAAM,CAAC;YAC9B,MAAM,EAAE,MAAO;YACf,OAAO,EAAE,8BAA8B,EAAE;YACzC,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;YACxC,YAAY,EAAE,KAAK,CAAC,YAAY;SAChC,CAAC,CAAA;IACH,CAAC;IACD,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAA;IAChC,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,EAAc,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;IACjF,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;IAClE,MAAM,KAAK,GAAG,oBAAoB,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;IAEvE,gCAAgC;IAChC,eAAe,CAAC,GAAG,EAAE;QACpB,OAAO,MAAM,CAAC,KAAK,EAAE,CAAA;IACtB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAA;IAEZ,MAAM,iBAAiB,GAAG,OAAO,CAAoB,GAAG,EAAE,CAAC,CAAC;QAC3D,KAAK;QACL,KAAK,EAAE,CAAC;QACR,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM,EAAE,EAAE;KACV,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAA;IAEZ,+CAA+C;IAC/C,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE;QAC9B,IAAI,MAAM,GAA2B,EAAE,CAAA;QACvC,KAAK,MAAM,KAAK,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YACnC,MAAM,GAAG,EAAE,GAAG,MAAM,EAAE,GAAG,KAAK,CAAC,MAAM,EAAE,CAAA;QACxC,CAAC;QACD,OAAO,MAAM,CAAA;IACd,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;IAEnB,MAAM,OAAO,GAAG,QAAQ,IAAI,KAAC,MAAM,KAAG,CAAA;IAEtC,OAAO,CACN,KAAC,aAAa,IAAC,KAAK,EAAE,MAAM,YAC3B,KAAC,YAAY,IAAC,KAAK,EAAE,iBAAiB,YACpC,UAAU;gBACV,CAAC,CAAC,KAAC,UAAU,IAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,YAAG,OAAO,GAAc;gBAC/E,CAAC,CAAC,OAAO,GACI,GACA,CAChB,CAAA;AACF,CAAC"}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/react/provider.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@buzola/router",
-	"version": "0.0.16",
+	"version": "0.0.18",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",

package/src/__tests__/matcher.test.ts

@@ -367,3 +367,36 @@ describe('matchRoutes', () => {
 		expect(matches).toBeNull()
 	})
 })
+
+describe('matchRoutes with differently named params at the same position', () => {
+	const tree = createTestTree([
+		{ path: '/app/programs/:programId/sessions/create', component: dummyComponent },
+		{ path: '/app/programs/:id/sessions', component: dummyComponent },
+		{ path: '/app/programs/:slug/files/:path+', component: dummyComponent },
+	])
+
+	it('names the value by the route that matched, not the one registered first', () => {
+		const matches = matchRoutes(tree, new URL('http://localhost/app/programs/42/sessions'))
+		expect(matches!.at(-1)!.node.fullPath).toBe('/app/programs/:id/sessions')
+		expect(matches!.at(-1)!.params).toEqual({ id: '42' })
+	})
+
+	it('still gives the first route its own name', () => {
+		const matches = matchRoutes(tree, new URL('http://localhost/app/programs/42/sessions/create'))
+		expect(matches!.at(-1)!.params).toEqual({ programId: '42' })
+	})
+
+	it('names values before a catch-all by the matched route too', () => {
+		const matches = matchRoutes(tree, new URL('http://localhost/app/programs/42/files/a/b'))
+		expect(matches!.at(-1)!.params).toEqual({ slug: '42', path: 'a/b' })
+	})
+
+	it('does not leak a value from a branch that failed to match', () => {
+		const tree = createTestTree([
+			{ path: '/a/:x/b', component: dummyComponent },
+			{ path: '/a/:y/:z/c', component: dummyComponent },
+		])
+		const matches = matchRoutes(tree, new URL('http://localhost/a/1/b/c'))
+		expect(matches!.at(-1)!.params).toEqual({ y: '1', z: 'b' })
+	})
+})

package/src/__tests__/react.test.tsx

@@ -1134,3 +1134,69 @@ describe('ErrorBoundary', () => {
 		spy.mockRestore()
 	})
 })
+
+// ─── BuzolaProvider shouldIntercept ──────────────────────────────────────────
+
+describe('BuzolaProvider shouldIntercept', () => {
+	/* The provider builds its router on the browser adapter, so stand in for the slice of the
+	   Navigation API it uses and raise navigate events by hand. */
+	interface FakeNavigateEvent {
+		destination: { url: string }
+		canIntercept: boolean
+		navigationType: 'push'
+		userInitiated: boolean
+		intercept: () => void
+	}
+
+	function withNavigation() {
+		const listeners = new Set<(event: FakeNavigateEvent) => void>()
+		Object.defineProperty(window, 'navigation', {
+			value: {
+				currentEntry: { url: 'http://localhost/', getState: () => undefined },
+				addEventListener: (type: string, listener: (event: FakeNavigateEvent) => void) => listeners.add(listener),
+				removeEventListener: (type: string, listener: (event: FakeNavigateEvent) => void) => listeners.delete(listener),
+			},
+			writable: true,
+			configurable: true,
+		})
+		return function push(url: string) {
+			const intercept = mock(() => {})
+			for (const listener of listeners) {
+				listener({ destination: { url }, canIntercept: true, navigationType: 'push', userInitiated: true, intercept })
+			}
+			return intercept
+		}
+	}
+
+	afterEach(() => {
+		Reflect.deleteProperty(window, 'navigation')
+	})
+
+	const routes = buildRouteTree([
+		{ path: '/', component: Home, isIndex: true },
+		{ path: '/about', component: About },
+	])
+
+	it('lets the browser take a navigation the prop declines', () => {
+		const push = withNavigation()
+		render(<BuzolaProvider routes={routes} shouldIntercept={() => false} />)
+
+		expect(push('http://localhost/about')).not.toHaveBeenCalled()
+	})
+
+	it('consults the prop from the latest render', () => {
+		const push = withNavigation()
+		const { rerender } = render(<BuzolaProvider routes={routes} shouldIntercept={() => true} />)
+
+		rerender(<BuzolaProvider routes={routes} shouldIntercept={() => false} />)
+
+		expect(push('http://localhost/about')).not.toHaveBeenCalled()
+	})
+
+	it('intercepts as before without the prop', () => {
+		const push = withNavigation()
+		render(<BuzolaProvider routes={routes} />)
+
+		expect(push('http://localhost/about')).toHaveBeenCalledTimes(1)
+	})
+})

package/src/__tests__/router.test.ts

@@ -3,7 +3,7 @@ import { matchRoutes } from '../engine/matcher.js'
 import { createMemoryNavigationAdapter } from '../engine/navigation-adapter.js'
 import { buildRouteTree } from '../engine/route-tree.js'
 import { Router } from '../engine/router.js'
-import type { BuzolaNavigateEvent, NavigationAdapter, RouteConfig } from '../engine/types.js'
+import type { BuzolaNavigateEvent, InterceptInfo, NavigationAdapter, RouteConfig, ShouldInterceptFn } from '../engine/types.js'
 
 function dummyComponent() {
 	return null
@@ -12,7 +12,7 @@ function dummyComponent() {
 function createRouter(
 	configs: RouteConfig[],
 	initialURL = 'http://localhost/',
-	options?: { persistentParams?: () => Record<string, string> },
+	options?: { persistentParams?: () => Record<string, string>; shouldIntercept?: ShouldInterceptFn },
 ) {
 	const routes = buildRouteTree(configs)
 	const adapter = createMemoryNavigationAdapter({ initialURL })
@@ -474,3 +474,266 @@ describe('Router.leaveApp', () => {
 		expect(router.getState().location.pathname).toBe('/')
 	})
 })
+
+describe('Router reload', () => {
+	const flush = () => new Promise(resolve => setTimeout(resolve, 0))
+
+	it('lets a reload through to the browser so it loads a fresh document', () => {
+		const { adapter } = createRouter([{ path: '/list', component: dummyComponent }], 'http://localhost/list')
+
+		adapter.reload()
+
+		expect(adapter.reloadCount()).toBe(1)
+	})
+
+	it('asks the blockers first and reloads once they allow it', async () => {
+		const { router, adapter } = createRouter([{ path: '/list', component: dummyComponent }], 'http://localhost/list')
+		const blocker = mock(async () => true)
+		router.addBlocker(blocker)
+
+		adapter.reload()
+		await flush()
+
+		expect(blocker).toHaveBeenCalledTimes(1)
+		expect(adapter.reloadCount()).toBe(1)
+	})
+
+	it('does not reload when a blocker refuses', async () => {
+		const { router, adapter } = createRouter([{ path: '/list', component: dummyComponent }], 'http://localhost/list')
+		router.addBlocker(async () => false)
+
+		adapter.reload()
+		await flush()
+
+		expect(adapter.reloadCount()).toBe(0)
+	})
+
+	it('still intercepts a push to the current URL', () => {
+		const { router, adapter } = createRouter([{ path: '/list', component: dummyComponent }], 'http://localhost/list')
+		const before = router.getState().location
+
+		router.navigate('/list')
+
+		expect(adapter.reloadCount()).toBe(0)
+		expect(router.getState().location).not.toBe(before)
+	})
+})
+
+describe('Router shouldIntercept', () => {
+	const flush = () => new Promise(resolve => setTimeout(resolve, 0))
+	const configs: RouteConfig[] = [
+		{ path: '/list', component: dummyComponent },
+		{ path: '/about', component: dummyComponent },
+	]
+
+	it('intercepts every navigation when the option is not set', () => {
+		const { router, adapter } = createRouter(configs, 'http://localhost/list')
+
+		router.navigate('/about')
+		router.back()
+
+		expect(router.getState().location.pathname).toBe('/list')
+		expect(adapter.reloadCount()).toBe(0)
+	})
+
+	it('intercepts a navigation it allows', () => {
+		const { router } = createRouter(configs, 'http://localhost/list', { shouldIntercept: () => true })
+
+		router.navigate('/about')
+
+		expect(router.getState().location.pathname).toBe('/about')
+	})
+
+	it('describes the navigation it is asked about', () => {
+		const shouldIntercept = mock((info: InterceptInfo) => true)
+		const { router } = createRouter(configs, 'http://localhost/list', { shouldIntercept })
+
+		router.navigate('/about?tab=team', { replace: true })
+
+		const info = shouldIntercept.mock.calls[0][0]
+		expect(info.destination.href).toBe('http://localhost/about?tab=team')
+		expect(info.from.href).toBe('http://localhost/list')
+		expect(info.navigationType).toBe('replace')
+		expect(info.userInitiated).toBe(false)
+	})
+
+	it('lets a declined push through to the browser as a document navigation', () => {
+		const { router, adapter } = createRouter(configs, 'http://localhost/list', { shouldIntercept: () => false })
+
+		router.navigate('/about')
+
+		expect(adapter.getCurrentURL().pathname).toBe('/about')
+		// The browser took it: the router neither rendered the destination nor turned it into a reload.
+		expect(router.getState().location.pathname).toBe('/list')
+		expect(adapter.reloadCount()).toBe(0)
+	})
+
+	it('lets a declined replace through to the browser as a document navigation', () => {
+		const { router, adapter } = createRouter(configs, 'http://localhost/list', { shouldIntercept: () => false })
+
+		router.navigate('/about', { replace: true })
+
+		expect(adapter.getCurrentURL().pathname).toBe('/about')
+		expect(router.getState().location.pathname).toBe('/list')
+		expect(adapter.reloadCount()).toBe(0)
+	})
+
+	it('reloads at the destination of a declined traversal', () => {
+		let intercept = true
+		const { router, adapter } = createRouter(configs, 'http://localhost/list', { shouldIntercept: () => intercept })
+		router.navigate('/about')
+
+		intercept = false
+		router.back()
+
+		expect(adapter.getCurrentURL().pathname).toBe('/list')
+		expect(adapter.reloadCount()).toBe(1)
+		expect(router.getState().location.pathname).toBe('/about')
+	})
+
+	it('intercepts a traversal it allows', () => {
+		const shouldIntercept = mock((info: InterceptInfo) => true)
+		const { router, adapter } = createRouter(configs, 'http://localhost/list', { shouldIntercept })
+		router.navigate('/about')
+
+		router.back()
+
+		expect(shouldIntercept.mock.calls.at(-1)?.[0].navigationType).toBe('traverse')
+		expect(router.getState().location.pathname).toBe('/list')
+		expect(adapter.reloadCount()).toBe(0)
+	})
+
+	it('is not asked about a reload, which always goes to the browser', () => {
+		const shouldIntercept = mock(() => true)
+		const { adapter } = createRouter(configs, 'http://localhost/list', { shouldIntercept })
+
+		adapter.reload()
+
+		expect(shouldIntercept).not.toHaveBeenCalled()
+		expect(adapter.reloadCount()).toBe(1)
+	})
+
+	it('is not asked about a fragment navigation, which the browser keeps in the document anyway', () => {
+		const shouldIntercept = mock(() => false)
+		const { router } = createRouter(configs, 'http://localhost/list', { shouldIntercept })
+
+		router.navigate('/list#details')
+
+		expect(shouldIntercept).not.toHaveBeenCalled()
+		expect(router.getState().location.hash).toBe('#details')
+	})
+
+	it('is asked when the path changes along with the hash', () => {
+		const shouldIntercept = mock(() => false)
+		const { router } = createRouter(configs, 'http://localhost/list#details', { shouldIntercept })
+
+		router.navigate('/about#team')
+
+		expect(shouldIntercept).toHaveBeenCalledTimes(1)
+		expect(router.getState().location.pathname).toBe('/list')
+	})
+
+	it('is asked when the hash is dropped, since that loads a document', () => {
+		const shouldIntercept = mock(() => false)
+		const { router } = createRouter(configs, 'http://localhost/list#details', { shouldIntercept })
+
+		router.navigate('/list')
+
+		expect(shouldIntercept).toHaveBeenCalledTimes(1)
+	})
+
+	it('is not asked about a URL handed to the browser with leaveApp', () => {
+		const shouldIntercept = mock(() => true)
+		const { router } = createRouter(configs, 'http://localhost/list', { shouldIntercept })
+
+		router.leaveApp('/about')
+
+		expect(shouldIntercept).not.toHaveBeenCalled()
+	})
+
+	it('asks the blockers before a declined push and then loads the destination', async () => {
+		const { router, adapter } = createRouter(configs, 'http://localhost/list', { shouldIntercept: () => false })
+		const blocker = mock(async () => true)
+		router.addBlocker(blocker)
+
+		router.navigate('/about')
+		await flush()
+
+		expect(blocker).toHaveBeenCalledTimes(1)
+		expect(adapter.getCurrentURL().pathname).toBe('/about')
+		expect(adapter.reloadCount()).toBe(1)
+		expect(router.getState().location.pathname).toBe('/list')
+	})
+
+	it('does not load the destination of a declined navigation when a blocker refuses', async () => {
+		const { router, adapter } = createRouter(configs, 'http://localhost/list', { shouldIntercept: () => false })
+		router.addBlocker(async () => false)
+
+		router.navigate('/about')
+		await flush()
+
+		expect(adapter.reloadCount()).toBe(0)
+		expect(adapter.getCurrentURL().pathname).toBe('/about')
+		expect(router.getState().location.pathname).toBe('/list')
+	})
+
+	it('asks the blockers before a declined traversal and then loads the destination', async () => {
+		let intercept = true
+		const { router, adapter } = createRouter(configs, 'http://localhost/list', { shouldIntercept: () => intercept })
+		router.navigate('/about')
+		await flush()
+		const blocker = mock(async () => true)
+		router.addBlocker(blocker)
+
+		intercept = false
+		router.back()
+		await flush()
+
+		expect(blocker).toHaveBeenCalledTimes(1)
+		expect(adapter.getCurrentURL().pathname).toBe('/list')
+		expect(adapter.reloadCount()).toBe(1)
+		expect(router.getState().location.pathname).toBe('/about')
+	})
+
+	it('does not load the destination of a declined traversal when a blocker refuses', async () => {
+		let intercept = true
+		const { router, adapter } = createRouter(configs, 'http://localhost/list', { shouldIntercept: () => intercept })
+		router.navigate('/about')
+		await flush()
+		router.addBlocker(async () => false)
+
+		intercept = false
+		router.back()
+		await flush()
+
+		expect(adapter.reloadCount()).toBe(0)
+		expect(adapter.getCurrentURL().pathname).toBe('/list')
+		expect(router.getState().location.pathname).toBe('/about')
+	})
+
+	it('treats a fragment of the committed entry as a fragment navigation while a navigation is pending', async () => {
+		let intercept = true
+		const shouldIntercept = mock(() => intercept)
+		const { router, adapter } = createRouter(configs, 'http://localhost/list', { shouldIntercept })
+		let blockerCalls = 0
+		router.addBlocker(async () => {
+			blockerCalls++
+			// The first navigation stays pending, like one held by an open unsaved-changes dialog.
+			if (blockerCalls === 1) return new Promise<boolean>(() => {})
+			return true
+		})
+		router.navigate('/about')
+		await flush()
+		expect(adapter.getCurrentURL().pathname).toBe('/about')
+		expect(router.getState().location.pathname).toBe('/list')
+
+		intercept = false
+		router.navigate('/about#team')
+		await flush()
+
+		// The browser keeps `/about#team` in the document, so declining it would load nothing.
+		expect(shouldIntercept).toHaveBeenCalledTimes(1)
+		expect(adapter.reloadCount()).toBe(0)
+		expect(router.getState().location.href).toBe('http://localhost/about#team')
+	})
+})

package/src/engine/matcher.ts

@@ -1,4 +1,4 @@
-import type { RouteMatch, RouteTree, TrieNode } from './types.js'
+import type { RouteMatch, RouteTree, TrieNode, TrieRoute } from './types.js'
 
 /**
  * Match a URL against the route trie.
@@ -10,20 +10,20 @@ import type { RouteMatch, RouteTree, TrieNode } from './types.js'
 export function matchRoutes(tree: RouteTree, url: URL): RouteMatch[] | null {
 	const pathname = url.pathname
 	const segments = pathname.split('/').filter(Boolean)
-	return matchTrie(tree.root, segments, 0, {}, pathname)
+	return matchTrie(tree.root, segments, 0, [], pathname)
 }
 
 function matchTrie(
 	node: TrieNode,
 	segments: string[],
 	index: number,
-	params: Record<string, string>,
+	values: string[],
 	pathname: string,
 ): RouteMatch[] | null {
 	// All segments consumed — check if this trie node has a terminal route
 	if (index === segments.length) {
 		if (node.route) {
-			return buildMatchChain(node.route.chain, params, pathname)
+			return buildMatchChain(node.route, values, pathname)
 		}
 		return null
 	}
@@ -33,35 +33,34 @@ function matchTrie(
 	// 1. Try static child first — O(1) Map lookup, always most specific
 	const staticChild = node.staticChildren.get(segment)
 	if (staticChild) {
-		const result = matchTrie(staticChild, segments, index + 1, params, pathname)
+		const result = matchTrie(staticChild, segments, index + 1, values, pathname)
 		if (result) return result
 	}
 
 	// 2. Try dynamic child — matches any single segment
 	if (node.dynamicChild) {
-		const newParams = { ...params, [node.dynamicChild.paramName]: decodeURIComponent(segment) }
-		const result = matchTrie(node.dynamicChild.node, segments, index + 1, newParams, pathname)
+		const result = matchTrie(node.dynamicChild, segments, index + 1, [...values, decodeURIComponent(segment)], pathname)
 		if (result) return result
 	}
 
 	// 3. Try catch-all child — consumes all remaining segments
 	if (node.catchAllChild) {
 		const remaining = segments.slice(index).map(s => decodeURIComponent(s)).join('/')
-		const newParams = { ...params, [node.catchAllChild.paramName]: remaining }
-		return buildMatchChain(node.catchAllChild.chain, newParams, pathname)
+		return buildMatchChain(node.catchAllChild, [...values, remaining], pathname)
 	}
 
 	return null
 }
 
 /**
- * Build a RouteMatch[] array from a chain of RouteNodes and collected params.
- * Each match in the chain gets all collected params (they're merged by the React layer anyway).
+ * Build a RouteMatch[] array for a matched route. Values are collected by position and named here,
+ * by the matched route's own pattern, since routes sharing a trie position may name it differently.
+ * Each match in the chain gets all params (they're merged by the React layer anyway).
  */
-function buildMatchChain(
-	chain: import('./types.js').RouteNode[],
-	params: Record<string, string>,
-	pathname: string,
-): RouteMatch[] {
-	return chain.map(node => ({ node, params, pathname }))
+function buildMatchChain(route: TrieRoute, values: string[], pathname: string): RouteMatch[] {
+	const params: Record<string, string> = {}
+	route.paramNames.forEach((name, i) => {
+		params[name] = values[i]
+	})
+	return route.chain.map(node => ({ node, params, pathname }))
 }