@owlmeans/router 0.1.18-rc.32 → 0.1.18-rc.33

package/README.md

@@ -11,7 +11,7 @@ Internal router service for the OwlMeans entrypoint system.
 ## Installation
 
 ```bash
-bun add @owlmeans/router@^0.1.18-rc.32
+bun add @owlmeans/router@^0.1.18-rc.33
 ```
 
 ## Related Packages
@@ -28,7 +28,7 @@ This package ships embedded agent skills under `agent-meta/`. After installing y
 your project's skill store (`.agents/skills/`):
 
 ```sh
-npx @owlmeans/agent-skills@^0.1.18-rc.48
+npx @owlmeans/agent-skills@^0.1.18-rc.49
 ```
 
 The embedded files are version-matched to this package release. Do not edit them

package/agent-meta/manifest.json

@@ -1,8 +1,8 @@
 {
   "schemaVersion": 2,
   "package": "@owlmeans/router",
-  "version": "0.1.18-rc.32",
-  "generatedAt": "2026-10-05T08:32:19.122Z",
+  "version": "0.1.18-rc.33",
+  "generatedAt": "2026-10-05T21:03:06.399Z",
   "canonicalRepo": "https://github.com/owlmeans/common",
   "entries": [
     {

package/agent-meta/skills/router/SKILL.md

@@ -8,7 +8,7 @@ user-invocable: false
 # @owlmeans/router
 
 **Layer:** Core (L1)
-**Install:** `"@owlmeans/router": "^0.1.18-rc.32"` in `dependencies`
+**Install:** `"@owlmeans/router": "^0.1.18-rc.33"` in `dependencies`
 
 `@owlmeans/router` is the **plugin host** for OwlMeans UI routing. It does not talk to any
 concrete router; it defines the contract, holds a registry of routing plugins, and selects the

package/build/index.d.ts

@@ -1,4 +1,5 @@
 export type * from './types.js';
+export type * from './matcher/types.js';
 export * from './consts.js';
 export * from './service.js';
 export * from './matcher.js';

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,mBAAmB,YAAY,CAAA;AAC/B,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,mBAAmB,YAAY,CAAA;AAC/B,mBAAmB,oBAAoB,CAAA;AACvC,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA"}

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAGA,cAAc,aAAa,CAAA;AAC3B,cAAc,cAAc,CAAA;AAC5B,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA"}

package/build/matcher/types.d.ts

@@ -0,0 +1,31 @@
+import type { PatternSegment, RouteBranch, RouteMatch, RouteObject } from '../types.js';
+/**
+ * Pure, DOM-free route matcher. Supports exactly the route-description subset used
+ * across the OwlMeans projects: static segments, `:param` dynamic segments, nested
+ * (parent/child) routes and index routes. Splat (`*`) and optional (`:x?`) segments
+ * are intentionally not implemented yet — a seam is reserved so they can be added
+ * without changing the public shape.
+ *
+ * Segment weights mirror react-router's ranking intuition (static beats dynamic,
+ * more specific / deeper beats shallower).
+ */
+export interface RouteMatcherHelper {
+    /** The non-empty `/`-separated parts of a path. */
+    splitPath: (path?: string) => string[];
+    /** The pattern segments of a route path: static, `:param` or splat. */
+    segmentsOf: (path?: string) => PatternSegment[];
+    /**
+     * Flatten a route tree into ranked-matchable branches. Every leaf and every node
+     * carrying an index child produces a branch.
+     */
+    flattenRoutes: (routes: RouteObject[], parentChain?: RouteObject[], parentSegments?: PatternSegment[]) => RouteBranch[];
+    /** Rank branches so the most specific match is tried first. Stable within equal score. */
+    rankRouteBranches: (branches: RouteBranch[]) => RouteBranch[];
+    /**
+     * Match a pathname against ranked branches. Returns the winning branch as a
+     * root→leaf chain of `RouteMatch` (params merged across the whole chain so every
+     * depth sees the full leaf param set, matching react-router's `useParams`).
+     */
+    matchRoutes: (branches: RouteBranch[], pathname: string) => RouteMatch[] | null;
+}
+//# sourceMappingURL=types.d.ts.map

package/build/matcher/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/matcher/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAEvF;;;;;;;;;GASG;AACH,MAAM,WAAW,kBAAkB;IACjC,mDAAmD;IACnD,SAAS,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,MAAM,EAAE,CAAA;IACtC,uEAAuE;IACvE,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE,MAAM,KAAK,cAAc,EAAE,CAAA;IAC/C;;;OAGG;IACH,aAAa,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,WAAW,CAAC,EAAE,WAAW,EAAE,EAAE,cAAc,CAAC,EAAE,cAAc,EAAE,KAAK,WAAW,EAAE,CAAA;IACvH,0FAA0F;IAC1F,iBAAiB,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,KAAK,WAAW,EAAE,CAAA;IAC7D;;;;OAIG;IACH,WAAW,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,EAAE,QAAQ,EAAE,MAAM,KAAK,UAAU,EAAE,GAAG,IAAI,CAAA;CAChF"}

package/build/matcher/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/build/matcher/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/matcher/types.ts"],"names":[],"mappings":""}

package/build/matcher.d.ts

@@ -1,27 +1,4 @@
-import type { RouteObject, PatternSegment, RouteBranch, RouteMatch } from './types.js';
-/**
- * Pure, DOM-free route matcher. Supports exactly the route-description subset used
- * across the OwlMeans projects: static segments, `:param` dynamic segments, nested
- * (parent/child) routes and index routes. Splat (`*`) and optional (`:x?`) segments
- * are intentionally not implemented yet — a seam is reserved so they can be added
- * without changing the public shape.
- *
- * Segment weights mirror react-router's ranking intuition (static beats dynamic,
- * more specific / deeper beats shallower).
- */
-export declare const splitPath: (path?: string) => string[];
-export declare const segmentsOf: (path?: string) => PatternSegment[];
-/**
- * Flatten a route tree into ranked-matchable branches. Every leaf and every node
- * carrying an index child produces a branch.
- */
-export declare const flattenRoutes: (routes: RouteObject[], parentChain?: RouteObject[], parentSegments?: PatternSegment[]) => RouteBranch[];
-/** Rank branches so the most specific match is tried first. Stable within equal score. */
-export declare const rankRouteBranches: (branches: RouteBranch[]) => RouteBranch[];
-/**
- * Match a pathname against ranked branches. Returns the winning branch as a
- * root→leaf chain of `RouteMatch` (params merged across the whole chain so every
- * depth sees the full leaf param set, matching react-router's `useParams`).
- */
-export declare const matchRoutes: (branches: RouteBranch[], pathname: string) => RouteMatch[] | null;
+import type { RouteMatcherHelper } from './matcher/types.js';
+export declare const createRouteMatcherHelper: () => RouteMatcherHelper;
+export declare const routeMatcherHelper: RouteMatcherHelper;
 //# sourceMappingURL=matcher.d.ts.map

package/build/matcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"matcher.d.ts","sourceRoot":"","sources":["../src/matcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAe,cAAc,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAGnG;;;;;;;;;GASG;AAIH,eAAO,MAAM,SAAS,UAAW,MAAM,KAAG,MAAM,EACS,CAAA;AAEzD,eAAO,MAAM,UAAU,UAAW,MAAM,KAAG,cAAc,EAKrD,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,aAAa,WAChB,WAAW,EAAE,gBACR,WAAW,EAAE,mBACV,cAAc,EAAE,KAC/B,WAAW,EAuBb,CAAA;AAaD,0FAA0F;AAC1F,eAAO,MAAM,iBAAiB,aAAc,WAAW,EAAE,KAAG,WAAW,EAKvC,CAAA;AAsBhC;;;;GAIG;AACH,eAAO,MAAM,WAAW,aAAc,WAAW,EAAE,YAAY,MAAM,KAAG,UAAU,EAAE,GAAG,IAgBtF,CAAA"}
+{"version":3,"file":"matcher.d.ts","sourceRoot":"","sources":["../src/matcher.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AAE5D,eAAO,MAAM,wBAAwB,QAAO,kBAiG3C,CAAA;AAED,eAAO,MAAM,kBAAkB,oBAA6B,CAAA"}

package/build/matcher.js

@@ -1,105 +1,89 @@
 import { EMPTY_WEIGHT, INDEX_WEIGHT, PARAM, PARAM_WEIGHT, SEP, SPLAT, STATIC_WEIGHT } from './consts.local.js';
-/**
- * Pure, DOM-free route matcher. Supports exactly the route-description subset used
- * across the OwlMeans projects: static segments, `:param` dynamic segments, nested
- * (parent/child) routes and index routes. Splat (`*`) and optional (`:x?`) segments
- * are intentionally not implemented yet — a seam is reserved so they can be added
- * without changing the public shape.
- *
- * Segment weights mirror react-router's ranking intuition (static beats dynamic,
- * more specific / deeper beats shallower).
- */
-export const splitPath = (path) => (path ?? '').split(SEP).filter(part => part.length > 0);
-export const segmentsOf = (path) => splitPath(path).map(part => {
-    if (part === SPLAT)
-        return { kind: 'splat', value: SPLAT };
-    if (part.startsWith(PARAM))
-        return { kind: 'param', value: part.slice(PARAM.length) };
-    return { kind: 'static', value: part };
-});
-/**
- * Flatten a route tree into ranked-matchable branches. Every leaf and every node
- * carrying an index child produces a branch.
- */
-export const flattenRoutes = (routes, parentChain = [], parentSegments = []) => {
-    const branches = [];
-    for (const route of routes) {
-        const chain = [...parentChain, route];
-        if (route.index === true) {
-            // An index route contributes an empty terminal at the parent's path.
-            branches.push({ chain, segments: parentSegments, index: true, score: 0 });
-            continue;
+export const createRouteMatcherHelper = () => {
+    const splitPath = (path) => (path ?? '').split(SEP).filter(part => part.length > 0);
+    const segmentsOf = (path) => splitPath(path).map(part => {
+        if (part === SPLAT)
+            return { kind: 'splat', value: SPLAT };
+        if (part.startsWith(PARAM))
+            return { kind: 'param', value: part.slice(PARAM.length) };
+        return { kind: 'static', value: part };
+    });
+    const flattenRoutes = (routes, parentChain = [], parentSegments = []) => {
+        const branches = [];
+        for (const route of routes) {
+            const chain = [...parentChain, route];
+            if (route.index === true) {
+                // An index route contributes an empty terminal at the parent's path.
+                branches.push({ chain, segments: parentSegments, index: true, score: 0 });
+                continue;
+            }
+            const segments = [...parentSegments, ...segmentsOf(route.path)];
+            const children = route.children ?? [];
+            if (children.length === 0) {
+                branches.push({ chain, segments, index: false, score: 0 });
+            }
+            else {
+                branches.push(...flattenRoutes(children, chain, segments));
+            }
         }
-        const segments = [...parentSegments, ...segmentsOf(route.path)];
-        const children = route.children ?? [];
-        if (children.length === 0) {
-            branches.push({ chain, segments, index: false, score: 0 });
+        return branches;
+    };
+    const scoreBranch = (branch) => {
+        let score = branch.segments.reduce((acc, seg) => {
+            if (seg.kind === 'static')
+                return acc + STATIC_WEIGHT;
+            if (seg.kind === 'param')
+                return acc + PARAM_WEIGHT;
+            return acc + EMPTY_WEIGHT;
+        }, 0);
+        if (branch.segments.length === 0)
+            score += EMPTY_WEIGHT;
+        if (branch.index)
+            score += INDEX_WEIGHT;
+        return score;
+    };
+    const rankRouteBranches = (branches) => branches
+        .map(branch => ({ ...branch, score: scoreBranch(branch) }))
+        .map((branch, index) => ({ branch, index }))
+        .sort((a, b) => (b.branch.score - a.branch.score) || (a.index - b.index))
+        .map(({ branch }) => branch);
+    const matchBranch = (branch, parts) => {
+        if (branch.segments.some(seg => seg.kind === 'splat')) {
+            throw new Error('router matcher: splat (*) segments are not implemented yet');
         }
-        else {
-            branches.push(...flattenRoutes(children, chain, segments));
+        // Exact-length match (no splats/optionals in the supported subset).
+        if (branch.segments.length !== parts.length)
+            return null;
+        const params = {};
+        for (let i = 0; i < branch.segments.length; i++) {
+            const seg = branch.segments[i];
+            const part = parts[i];
+            if (seg.kind === 'static') {
+                if (seg.value.toLowerCase() !== part.toLowerCase())
+                    return null;
+            }
+            else {
+                params[seg.value] = decodeURIComponent(part);
+            }
         }
-    }
-    return branches;
-};
-const scoreBranch = (branch) => {
-    let score = branch.segments.reduce((acc, seg) => {
-        if (seg.kind === 'static')
-            return acc + STATIC_WEIGHT;
-        if (seg.kind === 'param')
-            return acc + PARAM_WEIGHT;
-        return acc + EMPTY_WEIGHT;
-    }, 0);
-    if (branch.segments.length === 0)
-        score += EMPTY_WEIGHT;
-    if (branch.index)
-        score += INDEX_WEIGHT;
-    return score;
-};
-/** Rank branches so the most specific match is tried first. Stable within equal score. */
-export const rankRouteBranches = (branches) => branches
-    .map(branch => ({ ...branch, score: scoreBranch(branch) }))
-    .map((branch, index) => ({ branch, index }))
-    .sort((a, b) => (b.branch.score - a.branch.score) || (a.index - b.index))
-    .map(({ branch }) => branch);
-const matchBranch = (branch, parts) => {
-    if (branch.segments.some(seg => seg.kind === 'splat')) {
-        throw new Error('router matcher: splat (*) segments are not implemented yet');
-    }
-    // Exact-length match (no splats/optionals in the supported subset).
-    if (branch.segments.length !== parts.length)
-        return null;
-    const params = {};
-    for (let i = 0; i < branch.segments.length; i++) {
-        const seg = branch.segments[i];
-        const part = parts[i];
-        if (seg.kind === 'static') {
-            if (seg.value.toLowerCase() !== part.toLowerCase())
-                return null;
+        return params;
+    };
+    const matchRoutes = (branches, pathname) => {
+        const parts = splitPath(pathname);
+        const ranked = rankRouteBranches(branches);
+        for (const branch of ranked) {
+            const params = matchBranch(branch, parts);
+            if (params == null)
+                continue;
+            return branch.chain.map(route => ({
+                route,
+                params,
+                pathname: SEP + parts.join(SEP)
+            }));
         }
-        else {
-            params[seg.value] = decodeURIComponent(part);
-        }
-    }
-    return params;
-};
-/**
- * Match a pathname against ranked branches. Returns the winning branch as a
- * root→leaf chain of `RouteMatch` (params merged across the whole chain so every
- * depth sees the full leaf param set, matching react-router's `useParams`).
- */
-export const matchRoutes = (branches, pathname) => {
-    const parts = splitPath(pathname);
-    const ranked = rankRouteBranches(branches);
-    for (const branch of ranked) {
-        const params = matchBranch(branch, parts);
-        if (params == null)
-            continue;
-        return branch.chain.map(route => ({
-            route,
-            params,
-            pathname: SEP + parts.join(SEP)
-        }));
-    }
-    return null;
+        return null;
+    };
+    return { splitPath, segmentsOf, flattenRoutes, rankRouteBranches, matchRoutes };
 };
+export const routeMatcherHelper = createRouteMatcherHelper();
 //# sourceMappingURL=matcher.js.map

package/build/matcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"matcher.js","sourceRoot":"","sources":["../src/matcher.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAE9G;;;;;;;;;GASG;AAIH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAa,EAAY,EAAE,CACnD,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;AAEzD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAa,EAAoB,EAAE,CAC5D,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;IACzB,IAAI,IAAI,KAAK,KAAK;QAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IAC1D,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAA;IACrF,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;AACxC,CAAC,CAAC,CAAA;AAEJ;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,MAAqB,EACrB,WAAW,GAAkB,EAAE,EAC/B,cAAc,GAAqB,EAAE,EACtB,EAAE;IACjB,MAAM,QAAQ,GAAkB,EAAE,CAAA;IAElC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,CAAC,GAAG,WAAW,EAAE,KAAK,CAAC,CAAA;QAErC,IAAI,KAAK,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACzB,qEAAqE;YACrE,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;YACzE,SAAQ;QACV,CAAC;QAED,MAAM,QAAQ,GAAG,CAAC,GAAG,cAAc,EAAE,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;QAC/D,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAA;QAErC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAA;QAC5D,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;QAC5D,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,MAAmB,EAAU,EAAE;IAClD,IAAI,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QAC9C,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,GAAG,GAAG,aAAa,CAAA;QACrD,IAAI,GAAG,CAAC,IAAI,KAAK,OAAO;YAAE,OAAO,GAAG,GAAG,YAAY,CAAA;QACnD,OAAO,GAAG,GAAG,YAAY,CAAA;IAC3B,CAAC,EAAE,CAAC,CAAC,CAAA;IACL,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,KAAK,IAAI,YAAY,CAAA;IACvD,IAAI,MAAM,CAAC,KAAK;QAAE,KAAK,IAAI,YAAY,CAAA;IACvC,OAAO,KAAK,CAAA;AACd,CAAC,CAAA;AAED,0FAA0F;AAC1F,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,QAAuB,EAAiB,EAAE,CAC1E,QAAQ;KACL,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;KAC1D,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;KAC3C,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;KACxE,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,CAAA;AAEhC,MAAM,WAAW,GAAG,CAAC,MAAmB,EAAE,KAAe,EAAsB,EAAE;IAC/E,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,EAAE,CAAC;QACtD,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAA;IAC/E,CAAC;IACD,oEAAoE;IACpE,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM;QAAE,OAAO,IAAI,CAAA;IAExD,MAAM,MAAM,GAAgB,EAAE,CAAA;IAC9B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAChD,MAAM,GAAG,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;QAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;QACrB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC1B,IAAI,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE;gBAAE,OAAO,IAAI,CAAA;QACjE,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC,IAAI,CAAC,CAAA;QAC9C,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,QAAuB,EAAE,QAAgB,EAAuB,EAAE;IAC5F,MAAM,KAAK,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;IACjC,MAAM,MAAM,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IAE1C,KAAK,MAAM,MAAM,IAAI,MAAM,EAAE,CAAC;QAC5B,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;QACzC,IAAI,MAAM,IAAI,IAAI;YAAE,SAAQ;QAE5B,OAAO,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAChC,KAAK;YACL,MAAM;YACN,QAAQ,EAAE,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;SAChC,CAAC,CAAC,CAAA;IACL,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA"}
+{"version":3,"file":"matcher.js","sourceRoot":"","sources":["../src/matcher.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/router",
-  "version": "0.1.18-rc.32",
+  "version": "0.1.18-rc.33",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -21,7 +21,7 @@
     }
   },
   "dependencies": {
-    "@owlmeans/context": "^0.1.18-rc.33"
+    "@owlmeans/context": "^0.1.18-rc.34"
   },
   "peerDependencies": {
     "react": "*"

package/src/index.ts

@@ -1,5 +1,6 @@
 
 export type * from './types.js'
+export type * from './matcher/types.js'
 export * from './consts.js'
 export * from './service.js'
 export * from './matcher.js'

package/src/matcher/types.ts

@@ -0,0 +1,31 @@
+import type { PatternSegment, RouteBranch, RouteMatch, RouteObject } from '../types.js'
+
+/**
+ * Pure, DOM-free route matcher. Supports exactly the route-description subset used
+ * across the OwlMeans projects: static segments, `:param` dynamic segments, nested
+ * (parent/child) routes and index routes. Splat (`*`) and optional (`:x?`) segments
+ * are intentionally not implemented yet — a seam is reserved so they can be added
+ * without changing the public shape.
+ *
+ * Segment weights mirror react-router's ranking intuition (static beats dynamic,
+ * more specific / deeper beats shallower).
+ */
+export interface RouteMatcherHelper {
+  /** The non-empty `/`-separated parts of a path. */
+  splitPath: (path?: string) => string[]
+  /** The pattern segments of a route path: static, `:param` or splat. */
+  segmentsOf: (path?: string) => PatternSegment[]
+  /**
+   * Flatten a route tree into ranked-matchable branches. Every leaf and every node
+   * carrying an index child produces a branch.
+   */
+  flattenRoutes: (routes: RouteObject[], parentChain?: RouteObject[], parentSegments?: PatternSegment[]) => RouteBranch[]
+  /** Rank branches so the most specific match is tried first. Stable within equal score. */
+  rankRouteBranches: (branches: RouteBranch[]) => RouteBranch[]
+  /**
+   * Match a pathname against ranked branches. Returns the winning branch as a
+   * root→leaf chain of `RouteMatch` (params merged across the whole chain so every
+   * depth sees the full leaf param set, matching react-router's `useParams`).
+   */
+  matchRoutes: (branches: RouteBranch[], pathname: string) => RouteMatch[] | null
+}

package/src/matcher.ts

@@ -1,120 +1,104 @@
 import type { RouteObject, RouteParams, PatternSegment, RouteBranch, RouteMatch } from './types.js'
 import { EMPTY_WEIGHT, INDEX_WEIGHT, PARAM, PARAM_WEIGHT, SEP, SPLAT, STATIC_WEIGHT } from './consts.local.js'
-
-/**
- * Pure, DOM-free route matcher. Supports exactly the route-description subset used
- * across the OwlMeans projects: static segments, `:param` dynamic segments, nested
- * (parent/child) routes and index routes. Splat (`*`) and optional (`:x?`) segments
- * are intentionally not implemented yet — a seam is reserved so they can be added
- * without changing the public shape.
- *
- * Segment weights mirror react-router's ranking intuition (static beats dynamic,
- * more specific / deeper beats shallower).
- */
-
-
-
-export const splitPath = (path?: string): string[] =>
-  (path ?? '').split(SEP).filter(part => part.length > 0)
-
-export const segmentsOf = (path?: string): PatternSegment[] =>
-  splitPath(path).map(part => {
-    if (part === SPLAT) return { kind: 'splat', value: SPLAT }
-    if (part.startsWith(PARAM)) return { kind: 'param', value: part.slice(PARAM.length) }
-    return { kind: 'static', value: part }
-  })
-
-/**
- * Flatten a route tree into ranked-matchable branches. Every leaf and every node
- * carrying an index child produces a branch.
- */
-export const flattenRoutes = (
-  routes: RouteObject[],
-  parentChain: RouteObject[] = [],
-  parentSegments: PatternSegment[] = []
-): RouteBranch[] => {
-  const branches: RouteBranch[] = []
-
-  for (const route of routes) {
-    const chain = [...parentChain, route]
-
-    if (route.index === true) {
-      // An index route contributes an empty terminal at the parent's path.
-      branches.push({ chain, segments: parentSegments, index: true, score: 0 })
-      continue
+import type { RouteMatcherHelper } from './matcher/types.js'
+
+export const createRouteMatcherHelper = (): RouteMatcherHelper => {
+  const splitPath = (path?: string): string[] =>
+    (path ?? '').split(SEP).filter(part => part.length > 0)
+
+  const segmentsOf = (path?: string): PatternSegment[] =>
+    splitPath(path).map(part => {
+      if (part === SPLAT) return { kind: 'splat', value: SPLAT }
+      if (part.startsWith(PARAM)) return { kind: 'param', value: part.slice(PARAM.length) }
+      return { kind: 'static', value: part }
+    })
+
+  const flattenRoutes = (
+    routes: RouteObject[],
+    parentChain: RouteObject[] = [],
+    parentSegments: PatternSegment[] = []
+  ): RouteBranch[] => {
+    const branches: RouteBranch[] = []
+
+    for (const route of routes) {
+      const chain = [...parentChain, route]
+
+      if (route.index === true) {
+        // An index route contributes an empty terminal at the parent's path.
+        branches.push({ chain, segments: parentSegments, index: true, score: 0 })
+        continue
+      }
+
+      const segments = [...parentSegments, ...segmentsOf(route.path)]
+      const children = route.children ?? []
+
+      if (children.length === 0) {
+        branches.push({ chain, segments, index: false, score: 0 })
+      } else {
+        branches.push(...flattenRoutes(children, chain, segments))
+      }
     }
 
-    const segments = [...parentSegments, ...segmentsOf(route.path)]
-    const children = route.children ?? []
+    return branches
+  }
+
+  const scoreBranch = (branch: RouteBranch): number => {
+    let score = branch.segments.reduce((acc, seg) => {
+      if (seg.kind === 'static') return acc + STATIC_WEIGHT
+      if (seg.kind === 'param') return acc + PARAM_WEIGHT
+      return acc + EMPTY_WEIGHT
+    }, 0)
+    if (branch.segments.length === 0) score += EMPTY_WEIGHT
+    if (branch.index) score += INDEX_WEIGHT
+    return score
+  }
+
+  const rankRouteBranches = (branches: RouteBranch[]): RouteBranch[] =>
+    branches
+      .map(branch => ({ ...branch, score: scoreBranch(branch) }))
+      .map((branch, index) => ({ branch, index }))
+      .sort((a, b) => (b.branch.score - a.branch.score) || (a.index - b.index))
+      .map(({ branch }) => branch)
 
-    if (children.length === 0) {
-      branches.push({ chain, segments, index: false, score: 0 })
-    } else {
-      branches.push(...flattenRoutes(children, chain, segments))
+  const matchBranch = (branch: RouteBranch, parts: string[]): RouteParams | null => {
+    if (branch.segments.some(seg => seg.kind === 'splat')) {
+      throw new Error('router matcher: splat (*) segments are not implemented yet')
+    }
+    // Exact-length match (no splats/optionals in the supported subset).
+    if (branch.segments.length !== parts.length) return null
+
+    const params: RouteParams = {}
+    for (let i = 0; i < branch.segments.length; i++) {
+      const seg = branch.segments[i]
+      const part = parts[i]
+      if (seg.kind === 'static') {
+        if (seg.value.toLowerCase() !== part.toLowerCase()) return null
+      } else {
+        params[seg.value] = decodeURIComponent(part)
+      }
     }
+    return params
   }
 
-  return branches
-}
+  const matchRoutes = (branches: RouteBranch[], pathname: string): RouteMatch[] | null => {
+    const parts = splitPath(pathname)
+    const ranked = rankRouteBranches(branches)
 
-const scoreBranch = (branch: RouteBranch): number => {
-  let score = branch.segments.reduce((acc, seg) => {
-    if (seg.kind === 'static') return acc + STATIC_WEIGHT
-    if (seg.kind === 'param') return acc + PARAM_WEIGHT
-    return acc + EMPTY_WEIGHT
-  }, 0)
-  if (branch.segments.length === 0) score += EMPTY_WEIGHT
-  if (branch.index) score += INDEX_WEIGHT
-  return score
-}
+    for (const branch of ranked) {
+      const params = matchBranch(branch, parts)
+      if (params == null) continue
 
-/** Rank branches so the most specific match is tried first. Stable within equal score. */
-export const rankRouteBranches = (branches: RouteBranch[]): RouteBranch[] =>
-  branches
-    .map(branch => ({ ...branch, score: scoreBranch(branch) }))
-    .map((branch, index) => ({ branch, index }))
-    .sort((a, b) => (b.branch.score - a.branch.score) || (a.index - b.index))
-    .map(({ branch }) => branch)
-
-const matchBranch = (branch: RouteBranch, parts: string[]): RouteParams | null => {
-  if (branch.segments.some(seg => seg.kind === 'splat')) {
-    throw new Error('router matcher: splat (*) segments are not implemented yet')
-  }
-  // Exact-length match (no splats/optionals in the supported subset).
-  if (branch.segments.length !== parts.length) return null
-
-  const params: RouteParams = {}
-  for (let i = 0; i < branch.segments.length; i++) {
-    const seg = branch.segments[i]
-    const part = parts[i]
-    if (seg.kind === 'static') {
-      if (seg.value.toLowerCase() !== part.toLowerCase()) return null
-    } else {
-      params[seg.value] = decodeURIComponent(part)
+      return branch.chain.map(route => ({
+        route,
+        params,
+        pathname: SEP + parts.join(SEP)
+      }))
     }
-  }
-  return params
-}
 
-/**
- * Match a pathname against ranked branches. Returns the winning branch as a
- * root→leaf chain of `RouteMatch` (params merged across the whole chain so every
- * depth sees the full leaf param set, matching react-router's `useParams`).
- */
-export const matchRoutes = (branches: RouteBranch[], pathname: string): RouteMatch[] | null => {
-  const parts = splitPath(pathname)
-  const ranked = rankRouteBranches(branches)
-
-  for (const branch of ranked) {
-    const params = matchBranch(branch, parts)
-    if (params == null) continue
-
-    return branch.chain.map(route => ({
-      route,
-      params,
-      pathname: SEP + parts.join(SEP)
-    }))
+    return null
   }
 
-  return null
+  return { splitPath, segmentsOf, flattenRoutes, rankRouteBranches, matchRoutes }
 }
+
+export const routeMatcherHelper = createRouteMatcherHelper()