@vesk/runtime 0.2.50 → 0.2.52

package/dist/router-match.d.ts

@@ -23,6 +23,12 @@ export interface RouteNode {
 export interface RouteMatch {
     matchChain: RouteNode[];
     params: Record<string, string>;
+    /**
+     * The pathname this match was computed FOR — not the pattern that matched.
+     * `usePathname()` and `NavLink`'s active state read it, so leaving it unset
+     * made every route report `/` (via `pathname || ''`), which is what made
+     * NavLink highlighting permanently inert.
+     */
     pathname?: string;
 }
 interface CompiledRoute {

package/dist/router-match.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router-match.d.ts","sourceRoot":"","sources":["../src/router-match.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC1B,KAAK,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IACxB,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC3B,OAAO,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAC;IACnC,OAAO,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IAC1B,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,aAAa;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,CAiBnE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,SAAS,CAAA;CAAE,EAAE,CA6B/G;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAO5E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAc1F;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,MAAM,GAAE,SAAS,EAAO,GAAG,SAAS,EAAE,CAqChH;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAwBjF;AAED,wBAAgB,gBAAgB,CAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EAChC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,SAAS,EAAE,CA0Bb"}
+{"version":3,"file":"router-match.d.ts","sourceRoot":"","sources":["../src/router-match.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,SAAS;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IACvB,MAAM,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IACzB,OAAO,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC1B,KAAK,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IACxB,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAC;IAC3B,OAAO,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAC;IACnC,OAAO,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC;IAC1B,MAAM,CAAC,EAAE,QAAQ,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IAC1B,UAAU,EAAE,SAAS,EAAE,CAAC;IACxB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,aAAa;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,aAAa,CAiBnE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG;IAAE,MAAM,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,SAAS,CAAA;CAAE,EAAE,CA6B/G;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,OAAO,CAO5E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAc1F;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,MAAM,GAAE,SAAS,EAAO,GAAG,SAAS,EAAE,CAqFhH;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAwBjF;AAED,wBAAgB,gBAAgB,CAC/B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,EAChC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,SAAS,EAAE,CA0Bb"}

package/dist/router-match.js

@@ -82,7 +82,44 @@ export function flattenLayoutChain(tree, pathParts, result = []) {
     for (let i = 0; i < tree.length; i++) {
         const node = tree[i];
         if (node.isGroup) {
+            // A group contributes its LAYOUT to every route beneath it, so it has
+            // to be in the chain even when one of its children is the match.
+            // Dropping it meant `app/(public)/layout.vsk` never applied on the
+            // client — the framework's own hyd-dbg output showed
+            // `layoutNames:["Layout_Index"]` for `/about`, i.e. the root layout
+            // only, and the page rendered outside its shell. SSR kept the group
+            // (the server routes from the build manifest), which is why the page
+            // looked right until the client took over.
+            //
+            // A group consumes no path segment, so children are matched against
+            // the SAME parts.
+            const contributes = !!(node.layout || node.page);
+            const marker = result.length;
+            if (contributes)
+                result.push(node);
+            const before = result.length;
             flattenLayoutChain(node.children || [], pathParts, result);
+            if (result.length > before)
+                break;
+            // No child matched at this position; if the group is not itself the
+            // page here, it contributes nothing and must not stay in the chain.
+            // (If it IS the page, the push above is the match.)
+            if (contributes)
+                result.length = marker;
+            // A group can BE the page at this position: `app/(public)/page.vsk`
+            // serves `/`. Recursing into its children was the only thing this
+            // branch did, and at `/` none of them match (each carries a path
+            // segment), so the group was dropped and the chain collapsed onto the
+            // page-less root — a client-side 404 for the zero-segment path, with
+            // no hydration, while `/about` and every nested route matched fine.
+            //
+            // A group is transparent for prefix matching; it has to be
+            // transparent here too. Only at a terminal position: mid-path, the
+            // child that matched is the page, not the group.
+            if (node.page && (pathParts.length === 0 || pathParts.every((p) => p === ''))) {
+                result.push(node);
+                break;
+            }
             continue;
         }
         const part = pathParts[0];
@@ -108,6 +145,21 @@ export function flattenLayoutChain(tree, pathParts, result = []) {
                 result.length = 0;
             result.push(node);
             if (isLeaf) {
+                // A container node at a terminal position must still let a deeper
+                // page-owning node win. The root is exactly this case: it matches
+                // every URL, so without descending here the chain stopped on the
+                // page-less root and never reached `app/(public)/page.vsk` — a
+                // client 404 with no hydration for `/`, while `/about` matched
+                // fine.
+                //
+                // Only when THIS node has no page of its own; if it does, it is the
+                // page and descending would shadow it.
+                if (!node.page && (node.children || []).length > 0) {
+                    const before = result.length;
+                    flattenLayoutChain(node.children || [], remaining, result);
+                    if (result.length > before)
+                        break;
+                }
                 break;
             }
             else if ((node.children || []).length > 0) {
@@ -140,7 +192,7 @@ export function matchRoute(tree, pathname) {
         }
         partIdx += segCount;
     }
-    return { matchChain, params };
+    return { matchChain, params, pathname };
 }
 export function buildTreeFromMap(routes, _options) {
     const root = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/runtime",
-  "version": "0.2.50",
+  "version": "0.2.52",
   "type": "module",
   "description": "Vesk runtime — reactivity, blocks, DOM operations, hydration",
   "main": "./dist/index-client.js",
@@ -51,7 +51,7 @@
     }
   },
   "dependencies": {
-    "@vesk/compiler": "^0.2.50"
+    "@vesk/compiler": "^0.2.52"
   },
   "scripts": {
     "typecheck": "tsc --noEmit",