bun-plugin-stx 0.2.220 → 0.2.222

package/dist/{chunk-ebg5468e.js → chunk-qqcjq6v2.js}

@@ -2180,9 +2180,28 @@ else {
       var isActive=href!=='/'?cur.startsWith(href):cur==='/';
       if(isExact)eac.split(' ').forEach(function(cls){if(cls)link.classList.add(cls)});
       if(isActive)ac.split(' ').forEach(function(cls){if(cls)link.classList.add(cls)});
+      markCurrent(link,isExact);
     });
   }
 
+  // aria-current="page" names the page the user is ON, so it has to move when
+  // the page does. The server stamps it on the link for the page it rendered;
+  // after that, only a full load would ever correct it, and a fragment swap is
+  // not a full load. Left alone, a screen reader announces the entry the user
+  // arrived through as current for the rest of the session, however far they
+  // navigate \u2014 silently wrong, and only to the people relying on it.
+  //
+  // Only ever touched on links that already carry the attribute or are the
+  // current one, so a page using aria-current for something else \u2014 a step in a
+  // wizard, a sort direction \u2014 is not rewritten out from under itself.
+  function markCurrent(link,isExact){
+    if(isExact){
+      if(link.getAttribute('aria-current')!=='page')link.setAttribute('aria-current','page');
+      return;
+    }
+    if(link.getAttribute('aria-current')==='page')link.removeAttribute('aria-current');
+  }
+
   // \u2500\u2500 Progress bar DOM + style \u2500\u2500
   // Injects a fixed-position element at the top of the viewport plus the
   // minimal CSS for its transform/opacity transitions. Kept idempotent so

package/dist/serve.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 import {
-  deriveLayoutGroup
+  extractLayoutMetadata
 } from "./chunk-93ete56h.js";
 import {
   __require
@@ -9587,7 +9587,7 @@ function __stxOverlay(errs){
     pageMiddlewarePatterns.length = 0;
     await Promise.all(files.map((f) => detectPageMiddleware(f)));
     try {
-      const { Router } = await import("./chunk-ebg5468e.js");
+      const { Router } = await import("./chunk-qqcjq6v2.js");
       const pagesDirs = patterns.map((p) => p.replace(/\/$/, "")).filter(Boolean);
       const router = new Router(process19.cwd(), { pagesDirs, stateDir: stateDirName() });
       if (!options.quiet)
@@ -10510,10 +10510,9 @@ ${html}`;
                   const responseStatus = reqCtx.responseStatus ?? 200;
                   const isSpaNav = req.headers.get(SPA_NAV_HEADER) === "true";
                   if (isSpaNav) {
-                    const layoutMatch = content.match(/<!-- stx-layout: ([^ ]+) -->/);
-                    const pageLayout = layoutMatch ? layoutMatch[1] : "default";
-                    const groupMetaMatch = content.match(/<meta\b[^>]*name=["']stx-layout-group["'][^>]*content=["']([^"']+)["'][^>]*>/i);
-                    const pageLayoutGroup = i18nConfig && i18nLocale ? `i18n:${i18nLocale}` : groupMetaMatch?.[1] || deriveLayoutGroup(pageLayout);
+                    const layoutMetadata = extractLayoutMetadata(content);
+                    const pageLayout = layoutMetadata.layout;
+                    const pageLayoutGroup = i18nConfig && i18nLocale ? `i18n:${i18nLocale}` : layoutMetadata.group;
                     let fragment = content;
                     let containerAttrs = "";
                     let mainContentStart = -1;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-plugin-stx",
   "type": "module",
-  "version": "0.2.220",
+  "version": "0.2.222",
   "description": "A Bun plugin that allows for using Laravel Blade-like syntax.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",