@naeil/ui 0.11.0 → 0.13.0

package/dist/naeil-locale/chrome.js

@@ -1230,16 +1230,16 @@ import { cva as cva2 } from "class-variance-authority";
 import { Slot as Slot2 } from "radix-ui";
 import { jsx as jsx4 } from "react/jsx-runtime";
 var buttonVariants = cva2(
-  "inline-flex items-center justify-center gap-2 whitespace-nowrap ui-control ui-focus rounded-md text-base font-medium transition-colors duration-(--ui-motion-fast) cursor-pointer  disabled:pointer-events-none disabled:opacity-50 disabled:cursor-not-allowed [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0  ui-focus aria-invalid:border-error",
+  "inline-flex items-center justify-center gap-2 whitespace-nowrap ui-control ui-focus rounded-md text-base font-medium transition-colors duration-(--ui-motion-fast) cursor-pointer  disabled:pointer-events-none disabled:opacity-50 disabled:cursor-not-allowed [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0  ui-focus aria-invalid:border-error aria-pressed:inset-ring-2",
   {
     variants: {
       variant: {
-        default: "bg-primary text-primary-foreground hover:bg-primary-hover",
-        destructive: "bg-destructive text-destructive-foreground hover:bg-destructive/90 ",
-        outline: "border border-border-strong bg-background hover:bg-surface-subtle",
-        secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80",
-        ghost: "hover:bg-surface-subtle",
-        link: "text-primary underline-offset-4 hover:underline"
+        default: "bg-primary text-primary-foreground hover:bg-primary-hover aria-pressed:bg-primary-hover aria-pressed:inset-ring-4 aria-pressed:inset-ring-primary-foreground aria-pressed:inset-shadow-[0_0_0_2px_var(--primary-hover)]",
+        destructive: "bg-destructive text-destructive-foreground hover:bg-destructive/90 aria-pressed:inset-ring-4 aria-pressed:inset-ring-destructive-foreground aria-pressed:inset-shadow-[0_0_0_2px_var(--destructive)]",
+        outline: "border border-border-strong bg-background hover:bg-surface-subtle aria-pressed:bg-surface-selected aria-pressed:text-foreground aria-pressed:inset-ring-foreground",
+        secondary: "bg-secondary text-secondary-foreground hover:bg-secondary/80 aria-pressed:bg-surface-selected aria-pressed:text-foreground aria-pressed:inset-ring-foreground",
+        ghost: "hover:bg-surface-subtle aria-pressed:bg-surface-selected aria-pressed:text-foreground aria-pressed:inset-ring-foreground",
+        link: "text-primary underline-offset-4 hover:underline aria-pressed:bg-surface-selected aria-pressed:text-foreground aria-pressed:inset-ring-foreground"
       },
       size: {
         default: "px-4 has-[>svg]:px-3",
@@ -1615,6 +1615,7 @@ function Navigation(_a) {
     toolbar,
     mobileToolbar,
     mobileFooter,
+    omitEmptyNavigation = false,
     mobileOpen: controlledOpen,
     onMobileOpenChange,
     containerClassName,
@@ -1629,6 +1630,7 @@ function Navigation(_a) {
     "toolbar",
     "mobileToolbar",
     "mobileFooter",
+    "omitEmptyNavigation",
     "mobileOpen",
     "onMobileOpenChange",
     "containerClassName",
@@ -1699,7 +1701,8 @@ function Navigation(_a) {
     setOpenGroup(null);
   }, [currentHref, setMobileOpen]);
   React.useEffect(() => {
-    const element = desktop.current;
+    var _a2, _b2;
+    const element = omitEmptyNavigation && !items.length ? (_b2 = (_a2 = desktop.current) == null ? void 0 : _a2.parentElement) == null ? void 0 : _b2.querySelector(".ui-navigation-toolbar") : desktop.current;
     if (!element || typeof ResizeObserver === "undefined") return;
     const observer = new ResizeObserver(() => {
       if (element.getBoundingClientRect().width > 0) setMobileOpen(false);
@@ -1707,7 +1710,8 @@ function Navigation(_a) {
     });
     observer.observe(element);
     return () => observer.disconnect();
-  }, [setMobileOpen]);
+  }, [setMobileOpen, omitEmptyNavigation, items.length]);
+  const DesktopElement = omitEmptyNavigation && !items.length ? "div" : "nav";
   const active = (item) => {
     var _a2;
     return (_a2 = item.active) != null ? _a2 : !item.external && item.href === currentHref;
@@ -1756,10 +1760,12 @@ function Navigation(_a) {
       children: /* @__PURE__ */ jsx6("div", { className: cn("ui-navigation-frame", containerClassName), children: /* @__PURE__ */ jsxs4("div", { className: "ui-navigation-row", children: [
         /* @__PURE__ */ jsx6("div", { className: "ui-navigation-brand", children: brand }),
         /* @__PURE__ */ jsx6(
-          "nav",
+          DesktopElement,
           {
-            ref: desktop,
-            "aria-label": labels.navigation,
+            ref: (element) => {
+              desktop.current = element;
+            },
+            "aria-label": omitEmptyNavigation && !items.length ? void 0 : labels.navigation,
             className: "ui-navigation-desktop",
             children: items.map(
               (item) => "items" in item ? /* @__PURE__ */ jsx6(
@@ -1811,7 +1817,7 @@ function Navigation(_a) {
                 className: "ui-navigation-sheet ui-popup",
                 "aria-describedby": void 0,
                 onCloseAutoFocus: (event) => {
-                  var _a2, _b2;
+                  var _a2, _b2, _c, _d;
                   if (controlledOpen !== void 0 && (!mounted.current || state.current.open)) {
                     event.preventDefault();
                     return;
@@ -1825,7 +1831,10 @@ function Navigation(_a) {
                   }
                   if (trigger.current && trigger.current.getBoundingClientRect().width === 0) {
                     event.preventDefault();
-                    (_b2 = (_a2 = desktop.current) == null ? void 0 : _a2.querySelector("button, a")) == null ? void 0 : _b2.focus();
+                    const target = (_a2 = desktop.current) == null ? void 0 : _a2.querySelector("button, a");
+                    const toolbar2 = omitEmptyNavigation && !items.length ? (_c = (_b2 = desktop.current) == null ? void 0 : _b2.parentElement) == null ? void 0 : _c.querySelector(".ui-navigation-toolbar") : void 0;
+                    const toolbarTarget = !target && toolbar2 ? Array.from(toolbar2.querySelectorAll("button, a[href], input, select, textarea, [tabindex]")).find((element) => element.tabIndex >= 0 && !element.matches(":disabled") && element.getBoundingClientRect().width > 0 && element.getBoundingClientRect().height > 0) : void 0;
+                    (_d = target != null ? target : toolbarTarget) == null ? void 0 : _d.focus();
                   }
                 },
                 children: [
@@ -1840,7 +1849,7 @@ function Navigation(_a) {
                       }
                     )
                   ] }),
-                  /* @__PURE__ */ jsx6(
+                  (!omitEmptyNavigation || items.length > 0) && /* @__PURE__ */ jsx6(
                     "nav",
                     {
                       "aria-label": labels.navigation,
@@ -1886,7 +1895,7 @@ function Navigation(_a) {
 }
 
 // src/lib/ui-release.ts
-var uiRelease = { version: "0.11.0", contractVersion: "1" };
+var uiRelease = { version: "0.13.0", contractVersion: "1" };
 
 // src/components/naeil-header-data.ts
 var headerLocales = ["en", "ko", "ja"];
@@ -2078,6 +2087,58 @@ function NaeilHeaderAccountControl({ locale, account, Link = NativeLink3 }) {
 
 // src/components/naeil-header-core.tsx
 import { Fragment as Fragment3, jsx as jsx9, jsxs as jsxs7 } from "react/jsx-runtime";
+var naeilServices = Object.freeze(["abstorm", "home", "estimate", "jev"]);
+var serviceCompatibilityProps = [
+  "brandSuffix",
+  "statusSlot",
+  "brandSlot",
+  "toolbarSlot",
+  "subNav",
+  "brandLinkComponent",
+  "projects",
+  "projectsExternal",
+  "showProjects",
+  "showBlog",
+  "translations",
+  "className",
+  "containerClassName",
+  "style",
+  "brandLinkProps",
+  "mobileFooter",
+  "omitEmptyNavigation"
+];
+var warnedServiceProps = /* @__PURE__ */ new Set();
+function isDevelopment() {
+  try {
+    return process.env.NODE_ENV === "development";
+  } catch (e) {
+    return false;
+  }
+}
+function warnServiceProp(name, message) {
+  if (!isDevelopment() || warnedServiceProps.has(name)) return;
+  warnedServiceProps.add(name);
+  console.warn(message);
+}
+function isNaeilService(value) {
+  return naeilServices.includes(value);
+}
+function NaeilHeader(input) {
+  if (input.service === void 0) return /* @__PURE__ */ jsx9(HeaderComposition, __spreadValues({}, input));
+  if (!isNaeilService(input.service)) {
+    warnServiceProp("service", "NaeilHeader: invalid service; rendering the legacy profile.");
+    const legacy = __spreadProps(__spreadValues({}, input), { service: void 0 });
+    delete legacy.service;
+    return /* @__PURE__ */ jsx9(HeaderComposition, __spreadValues({}, legacy));
+  }
+  const props = __spreadValues({}, input);
+  for (const name of Object.keys(props)) {
+    if (!serviceCompatibilityProps.includes(name) && name !== "data-slot" && name !== "data-global-header" && !name.startsWith("data-naeil-")) continue;
+    delete props[name];
+    warnServiceProp(name, `NaeilHeader: service profile ignores ${name}; use the shared service composition.`);
+  }
+  return /* @__PURE__ */ jsx9(HeaderComposition, __spreadProps(__spreadValues({}, props), { service: input.service }));
+}
 var subscribe = () => () => {
 };
 function NaeilHeaderThemeControl({ locale }) {
@@ -2114,8 +2175,9 @@ function NaeilHeaderLocaleControl({ locale, onLocaleChange }) {
   ] });
 }
 var NativeLink4 = (props) => /* @__PURE__ */ jsx9("a", __spreadValues({}, props));
-function NaeilHeader(_a) {
+function HeaderComposition(_a) {
   var _b = _a, {
+    service,
     locale,
     resolveHref = (path) => `https://naeil.dev/${locale}${path === "/" ? "" : path}`,
     brandHref,
@@ -2143,6 +2205,7 @@ function NaeilHeader(_a) {
     className,
     containerClassName
   } = _b, props = __objRest(_b, [
+    "service",
     "locale",
     "resolveHref",
     "brandHref",
@@ -2171,6 +2234,11 @@ function NaeilHeader(_a) {
     "containerClassName"
   ]);
   var _b2, _c;
+  if (service) {
+    brandSuffix = service;
+    showProjects = false;
+    showBlog = false;
+  }
   const content = useNaeilMessages(locale).header;
   const projectLinks = !showProjects ? [] : projects != null ? projects : headerProjects.map((project) => {
     var _a3, _b3, _c2;
@@ -2189,7 +2257,7 @@ function NaeilHeader(_a) {
       badge: project.status === "coming" ? /* @__PURE__ */ jsx9(Badge, { variant: "outline", children: (_c2 = translations == null ? void 0 : translations.project("status.coming")) != null ? _c2 : content.projects.status.coming }) : void 0
     };
   });
-  const brandDestination = brandHref != null ? brandHref : resolveHref("/");
+  const brandDestination = brandHref != null ? brandHref : service ? "/" : resolveHref("/");
   const BrandLink = brandLinkComponent != null ? brandLinkComponent : Link;
   const _a2 = brandLinkProps != null ? brandLinkProps : {}, { onClick: onBrandClick } = _a2, brandProps = __objRest(_a2, ["onClick"]);
   const toolbar = /* @__PURE__ */ jsx9(
@@ -2215,11 +2283,11 @@ function NaeilHeader(_a) {
     __spreadProps(__spreadValues({
       href: brandDestination,
       "data-app-brand": true,
-      "aria-label": brandSlot == null ? ".naeil" : void 0
+      "aria-label": service ? `.naeil ${service}` : brandSlot == null ? ".naeil" : void 0
     }, brandProps), {
       onClick: (event) => {
         onBrandClick == null ? void 0 : onBrandClick(event);
-        onNavigate == null ? void 0 : onNavigate(event, { id: "brand", href: brandDestination, label: ".naeil" });
+        onNavigate == null ? void 0 : onNavigate(event, { id: "brand", href: brandDestination, label: service ? `.naeil ${service}` : ".naeil" });
       },
       children: brandSlot != null ? brandSlot : brandSuffix ? /* @__PURE__ */ jsxs7(Fragment3, { children: [
         logo,
@@ -2229,7 +2297,7 @@ function NaeilHeader(_a) {
   );
   return /* @__PURE__ */ jsx9(
     Navigation,
-    __spreadProps(__spreadValues({}, props), {
+    __spreadProps(__spreadValues(__spreadValues({}, props), service ? { "data-slot": "navigation", omitEmptyNavigation: true } : {}), {
       "data-global-header": true,
       "data-naeil-header": true,
       "data-naeil-chrome": "",
@@ -2381,5 +2449,6 @@ export {
   NaeilHeader,
   NaeilHeaderAccountControl,
   NaeilHeaderLocaleControl,
-  NaeilHeaderThemeControl
+  NaeilHeaderThemeControl,
+  naeilServices
 };

package/dist/naeil-locale/{chunk-4U64K4J3.js → chunk-24IL53QO.js}

@@ -1,6 +1,6 @@
 import {
   assertLocale
-} from "./chunk-U65OQHZY.js";
+} from "./chunk-WT6QXR7O.js";
 import {
   __spreadValues
 } from "./chunk-N3ETBM74.js";

package/dist/naeil-locale/{chunk-U65OQHZY.js → chunk-WT6QXR7O.js}

@@ -6,6 +6,10 @@ import {
 // src/naeil-locale/routing.ts
 var naeilLocales = ["en", "ko", "ja"];
 var defaultLocale = "en";
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+var localePrefix = new RegExp(`^/(?:${naeilLocales.map(escapeRegExp).join("|")})(?:/|$)`);
 var naeilRouting = {
   locales: naeilLocales,
   defaultLocale,
@@ -28,7 +32,7 @@ var origins = {
   estimate: "https://abestimate.naeil.dev"
 };
 var protocolPrefixes = ["/api", "/auth", "/_next", "/_vercel", "/.well-known", "/health", "/invite", "/return", "/webhook", "/images", "/fonts"];
-var protocolFiles = ["/favicon.ico", "/icon.svg", "/apple-icon.png", "/robots.txt", "/sitemap.xml"];
+var protocolFiles = ["/favicon.ico", "/favicon.svg", "/icon.svg", "/apple-icon.png", "/robots.txt", "/sitemap.xml"];
 function defineLocaleService(service) {
   var _a, _b, _c, _d;
   if (origins[service.id] !== service.origin) throw new Error("Service origin must match the exact owned origin");
@@ -36,7 +40,7 @@ function defineLocaleService(service) {
   if (!paths.length || new Set(paths).size !== paths.length) throw new Error("Route inventory is empty or duplicated");
   for (const path of paths) {
     if (!/^\/(?:[A-Za-z0-9._~-]+|\[[A-Za-z][A-Za-z0-9_]*\])(?:\/(?:[A-Za-z0-9._~-]+|\[[A-Za-z][A-Za-z0-9_]*\]))*$/.test(path) && path !== "/") throw new Error(`Invalid registered route: ${path}`);
-    if (/^\/(?:en|ko|ja)(?:\/|$)/.test(path) || isProtocolPath(path, service) && !((_a = service.uiProtocolExceptions) == null ? void 0 : _a.includes(path)) || path.split("/").some((segment) => segment === "." || segment === "..")) throw new Error(`Locale/protocol path cannot be a UI route: ${path}`);
+    if (localePrefix.test(path) || isProtocolPath(path, service) && !((_a = service.uiProtocolExceptions) == null ? void 0 : _a.includes(path)) || path.split("/").some((segment) => segment === "." || segment === "..")) throw new Error(`Locale/protocol path cannot be a UI route: ${path}`);
   }
   for (const exception of (_b = service.uiProtocolExceptions) != null ? _b : []) if (exception.includes("[") || !paths.includes(exception)) throw new Error("Protocol UI exceptions must be exact registered routes");
   return Object.freeze(__spreadProps(__spreadValues({}, service), { routes: Object.freeze(service.routes.map((route) => typeof route === "string" ? route : Object.freeze(__spreadValues({}, route)))), protocolPrefixes: Object.freeze([...(_c = service.protocolPrefixes) != null ? _c : []]), uiProtocolExceptions: Object.freeze([...(_d = service.uiProtocolExceptions) != null ? _d : []]) }));
@@ -72,7 +76,7 @@ function invalid(reason, status = 404, locale) {
   return __spreadValues({ kind: "invalid", status, reason }, locale ? { locale } : {});
 }
 function splitInput(input, origin) {
-  if (!input || /[\u0000-\u0020\u007f\\]/.test(input)) return;
+  if (!input || /[\u0000-\u0020\u007f]/.test(input)) return;
   let path = input;
   if (!path.startsWith("/")) {
     if (!path.startsWith(origin + "/") && path !== origin) return;
@@ -85,12 +89,14 @@ function splitInput(input, origin) {
   const queryAt = withoutHash.indexOf("?");
   return { pathname: queryAt < 0 ? withoutHash : withoutHash.slice(0, queryAt), search: queryAt < 0 ? "" : withoutHash.slice(queryAt), hash };
 }
-function safePath(path) {
+function safePath(path, service) {
+  var _a;
   if (!path.startsWith("/") || path.includes("//")) return false;
+  const reserved = /* @__PURE__ */ new Set([...naeilLocales, ...[...protocolPrefixes, ...(_a = service.protocolPrefixes) != null ? _a : []].flatMap((prefix) => prefix.split("/").filter(Boolean))]);
   return path.split("/").every((segment) => {
     try {
       const decoded = decodeURIComponent(segment);
-      return !/[\u0000-\u001f\u007f/\\%?#]/.test(decoded) && decoded !== "." && decoded !== ".." && (!/^(?:en|ko|ja|api|auth|_next|invite|return|webhook)$/.test(decoded) || decoded === segment);
+      return !/[\u0000-\u001f\u007f/\\%?#]/.test(decoded) && decoded !== "." && decoded !== ".." && (!reserved.has(decoded) || decoded === segment);
     } catch (e) {
       return false;
     }
@@ -113,7 +119,7 @@ function resolveLocaleUrl(inputService, input) {
   var _a, _b;
   const service = getLocaleService(inputService);
   const parts = splitInput(input, service.origin);
-  if (!parts || !safePath(parts.pathname)) return invalid("Malformed or encoded path");
+  if (!parts || !safePath(parts.pathname, service)) return invalid("Malformed or encoded path");
   const rawPathname = parts.pathname;
   const pathname = rawPathname !== "/" && rawPathname.endsWith("/") ? rawPathname.slice(0, -1) : rawPathname;
   if (isProtocolPath(pathname, service) && !((_a = service.uiProtocolExceptions) == null ? void 0 : _a.includes(pathname))) return { kind: "protocol", pathname };
@@ -121,7 +127,7 @@ function resolveLocaleUrl(inputService, input) {
   const explicit = isNaeilLocale(segments[1]);
   const pathLocale = explicit ? segments[1] : void 0;
   const logicalPath = explicit ? "/" + segments.slice(2).join("/") : pathname;
-  if (/^\/(?:en|ko|ja)(?:\/|$)/.test(logicalPath) || isProtocolPath(logicalPath, service) && !((_b = service.uiProtocolExceptions) == null ? void 0 : _b.includes(logicalPath))) return invalid("Nested locale or localized protocol path", 404, pathLocale);
+  if (localePrefix.test(logicalPath) || isProtocolPath(logicalPath, service) && !((_b = service.uiProtocolExceptions) == null ? void 0 : _b.includes(logicalPath))) return invalid("Nested locale or localized protocol path", 404, pathLocale);
   const route = matchRoute(service, logicalPath);
   if (!route) return invalid("Unregistered UI route", 404, pathLocale);
   const legacy = service.id !== "main";
@@ -137,7 +143,7 @@ function localePath(inputService, unlocalizedRoute, locale) {
   assertLocale(locale);
   const service = getLocaleService(inputService);
   const parts = splitInput(unlocalizedRoute, service.origin);
-  if (!parts || /^\/(?:en|ko|ja)(?:\/|$)/.test(parts.pathname)) throw new Error("localePath requires an unlocalized route");
+  if (!parts || localePrefix.test(parts.pathname)) throw new Error("localePath requires an unlocalized route");
   const result = resolveLocaleUrl(service, parts.pathname);
   if (result.kind !== "ui") throw new Error("Unregistered UI destination");
   return prefixPath(result.logicalPath, locale) + (service.id === "main" ? parts.search : stripLegacyLang(parts.search)) + parts.hash;

package/dist/naeil-locale/client.js

@@ -13,6 +13,10 @@ import { NextIntlClientProvider } from "next-intl";
 
 // src/naeil-locale/routing.ts
 var naeilLocales = ["en", "ko", "ja"];
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+var localePrefix = new RegExp(`^/(?:${naeilLocales.map(escapeRegExp).join("|")})(?:/|$)`);
 function isNaeilLocale(value) {
   return typeof value === "string" && naeilLocales.includes(value);
 }
@@ -27,7 +31,7 @@ var origins = {
   estimate: "https://abestimate.naeil.dev"
 };
 var protocolPrefixes = ["/api", "/auth", "/_next", "/_vercel", "/.well-known", "/health", "/invite", "/return", "/webhook", "/images", "/fonts"];
-var protocolFiles = ["/favicon.ico", "/icon.svg", "/apple-icon.png", "/robots.txt", "/sitemap.xml"];
+var protocolFiles = ["/favicon.ico", "/favicon.svg", "/icon.svg", "/apple-icon.png", "/robots.txt", "/sitemap.xml"];
 function defineLocaleService(service) {
   var _a, _b, _c, _d;
   if (origins[service.id] !== service.origin) throw new Error("Service origin must match the exact owned origin");
@@ -35,7 +39,7 @@ function defineLocaleService(service) {
   if (!paths.length || new Set(paths).size !== paths.length) throw new Error("Route inventory is empty or duplicated");
   for (const path of paths) {
     if (!/^\/(?:[A-Za-z0-9._~-]+|\[[A-Za-z][A-Za-z0-9_]*\])(?:\/(?:[A-Za-z0-9._~-]+|\[[A-Za-z][A-Za-z0-9_]*\]))*$/.test(path) && path !== "/") throw new Error(`Invalid registered route: ${path}`);
-    if (/^\/(?:en|ko|ja)(?:\/|$)/.test(path) || isProtocolPath(path, service) && !((_a = service.uiProtocolExceptions) == null ? void 0 : _a.includes(path)) || path.split("/").some((segment) => segment === "." || segment === "..")) throw new Error(`Locale/protocol path cannot be a UI route: ${path}`);
+    if (localePrefix.test(path) || isProtocolPath(path, service) && !((_a = service.uiProtocolExceptions) == null ? void 0 : _a.includes(path)) || path.split("/").some((segment) => segment === "." || segment === "..")) throw new Error(`Locale/protocol path cannot be a UI route: ${path}`);
   }
   for (const exception of (_b = service.uiProtocolExceptions) != null ? _b : []) if (exception.includes("[") || !paths.includes(exception)) throw new Error("Protocol UI exceptions must be exact registered routes");
   return Object.freeze(__spreadProps(__spreadValues({}, service), { routes: Object.freeze(service.routes.map((route) => typeof route === "string" ? route : Object.freeze(__spreadValues({}, route)))), protocolPrefixes: Object.freeze([...(_c = service.protocolPrefixes) != null ? _c : []]), uiProtocolExceptions: Object.freeze([...(_d = service.uiProtocolExceptions) != null ? _d : []]) }));
@@ -71,7 +75,7 @@ function invalid(reason, status = 404, locale) {
   return __spreadValues({ kind: "invalid", status, reason }, locale ? { locale } : {});
 }
 function splitInput(input, origin) {
-  if (!input || /[\u0000-\u0020\u007f\\]/.test(input)) return;
+  if (!input || /[\u0000-\u0020\u007f]/.test(input)) return;
   let path = input;
   if (!path.startsWith("/")) {
     if (!path.startsWith(origin + "/") && path !== origin) return;
@@ -84,12 +88,14 @@ function splitInput(input, origin) {
   const queryAt = withoutHash.indexOf("?");
   return { pathname: queryAt < 0 ? withoutHash : withoutHash.slice(0, queryAt), search: queryAt < 0 ? "" : withoutHash.slice(queryAt), hash };
 }
-function safePath(path) {
+function safePath(path, service) {
+  var _a;
   if (!path.startsWith("/") || path.includes("//")) return false;
+  const reserved = /* @__PURE__ */ new Set([...naeilLocales, ...[...protocolPrefixes, ...(_a = service.protocolPrefixes) != null ? _a : []].flatMap((prefix) => prefix.split("/").filter(Boolean))]);
   return path.split("/").every((segment) => {
     try {
       const decoded = decodeURIComponent(segment);
-      return !/[\u0000-\u001f\u007f/\\%?#]/.test(decoded) && decoded !== "." && decoded !== ".." && (!/^(?:en|ko|ja|api|auth|_next|invite|return|webhook)$/.test(decoded) || decoded === segment);
+      return !/[\u0000-\u001f\u007f/\\%?#]/.test(decoded) && decoded !== "." && decoded !== ".." && (!reserved.has(decoded) || decoded === segment);
     } catch (e) {
       return false;
     }
@@ -112,7 +118,7 @@ function resolveLocaleUrl(inputService, input) {
   var _a, _b;
   const service = getLocaleService(inputService);
   const parts = splitInput(input, service.origin);
-  if (!parts || !safePath(parts.pathname)) return invalid("Malformed or encoded path");
+  if (!parts || !safePath(parts.pathname, service)) return invalid("Malformed or encoded path");
   const rawPathname = parts.pathname;
   const pathname = rawPathname !== "/" && rawPathname.endsWith("/") ? rawPathname.slice(0, -1) : rawPathname;
   if (isProtocolPath(pathname, service) && !((_a = service.uiProtocolExceptions) == null ? void 0 : _a.includes(pathname))) return { kind: "protocol", pathname };
@@ -120,7 +126,7 @@ function resolveLocaleUrl(inputService, input) {
   const explicit = isNaeilLocale(segments[1]);
   const pathLocale = explicit ? segments[1] : void 0;
   const logicalPath = explicit ? "/" + segments.slice(2).join("/") : pathname;
-  if (/^\/(?:en|ko|ja)(?:\/|$)/.test(logicalPath) || isProtocolPath(logicalPath, service) && !((_b = service.uiProtocolExceptions) == null ? void 0 : _b.includes(logicalPath))) return invalid("Nested locale or localized protocol path", 404, pathLocale);
+  if (localePrefix.test(logicalPath) || isProtocolPath(logicalPath, service) && !((_b = service.uiProtocolExceptions) == null ? void 0 : _b.includes(logicalPath))) return invalid("Nested locale or localized protocol path", 404, pathLocale);
   const route = matchRoute(service, logicalPath);
   if (!route) return invalid("Unregistered UI route", 404, pathLocale);
   const legacy = service.id !== "main";
@@ -136,7 +142,7 @@ function localePath(inputService, unlocalizedRoute, locale) {
   assertLocale(locale);
   const service = getLocaleService(inputService);
   const parts = splitInput(unlocalizedRoute, service.origin);
-  if (!parts || /^\/(?:en|ko|ja)(?:\/|$)/.test(parts.pathname)) throw new Error("localePath requires an unlocalized route");
+  if (!parts || localePrefix.test(parts.pathname)) throw new Error("localePath requires an unlocalized route");
   const result = resolveLocaleUrl(service, parts.pathname);
   if (result.kind !== "ui") throw new Error("Unregistered UI destination");
   return prefixPath(result.logicalPath, locale) + (service.id === "main" ? parts.search : stripLegacyLang(parts.search)) + parts.hash;
@@ -236,6 +242,7 @@ function NaeilLocaleController({ service, children, preferenceWritesEnabled = fa
   const [intent, setIntent] = useState();
   const [error, setError] = useState();
   const lastRequest = useRef(void 0);
+  const timedOutIntent = useRef(void 0);
   const focus = useRef(void 0);
   const timer = useRef(void 0);
   const guards = useRef(/* @__PURE__ */ new Set());
@@ -245,6 +252,7 @@ function NaeilLocaleController({ service, children, preferenceWritesEnabled = fa
   }, []);
   const cancel = useCallback(() => {
     gate.cancel();
+    timedOutIntent.current = void 0;
     clearTimer();
     setIntent(void 0);
     setError(void 0);
@@ -253,6 +261,8 @@ function NaeilLocaleController({ service, children, preferenceWritesEnabled = fa
   const fail = useCallback((token, reason) => {
     var _a;
     if (((_a = gate.current()) == null ? void 0 : _a.token) !== token) return;
+    timedOutIntent.current = reason === "timeout" ? gate.current() : void 0;
+    focus.current = void 0;
     gate.cancel(token);
     clearTimer();
     setIntent(void 0);
@@ -262,12 +272,17 @@ function NaeilLocaleController({ service, children, preferenceWritesEnabled = fa
     var _a;
     const locale = assertLocale(language);
     if (gate.current()) return false;
+    lastRequest.current = { locale, options: options ? __spreadValues({}, options) : void 0 };
+    timedOutIntent.current = void 0;
     const current = resolveLocaleUrl(service, browserHref());
     if (current.kind !== "ui") {
       setError("unsupported-route");
       return false;
     }
-    if (current.locale === locale && !(options == null ? void 0 : options.route) && !(options == null ? void 0 : options.href)) return false;
+    if (current.locale === locale && !(options == null ? void 0 : options.route) && !(options == null ? void 0 : options.href)) {
+      setError(void 0);
+      return false;
+    }
     const suffix = current.canonicalPath.slice(localePath(service, current.logicalPath, current.locale).length);
     let href;
     try {
@@ -283,7 +298,6 @@ function NaeilLocaleController({ service, children, preferenceWritesEnabled = fa
     }
     const request = gate.begin(href, locale);
     if (!request) return false;
-    lastRequest.current = { locale, options };
     focus.current = captureFocus();
     setIntent(request);
     setError(void 0);
@@ -296,11 +310,26 @@ function NaeilLocaleController({ service, children, preferenceWritesEnabled = fa
       return false;
     }
   }, [service, gate, router, fail, transitionTimeoutMs]);
-  const retry = useCallback(() => lastRequest.current ? changeLocale(lastRequest.current.locale, lastRequest.current.options) : false, [changeLocale]);
+  const retry = useCallback(() => {
+    const request = lastRequest.current;
+    if (!request || gate.current()) return false;
+    const current = resolveLocaleUrl(service, browserHref());
+    if (current.kind === "ui" && current.locale === request.locale) {
+      setError(void 0);
+      return false;
+    }
+    return changeLocale(request.locale, request.options);
+  }, [service, gate, changeLocale]);
   const arrive = useCallback((token, locale, committedPathname) => {
-    if (token === void 0 || committedPathname !== window.location.pathname) return;
-    const committed = gate.arrive(token, browserHref(), locale);
+    if (committedPathname !== window.location.pathname) return;
+    let committed = token === void 0 ? void 0 : gate.arrive(token, browserHref(), locale);
+    const late = timedOutIntent.current;
+    if (!committed && !gate.current() && late && (token === void 0 || token === late.token)) {
+      const current = resolveLocaleUrl(service, browserHref());
+      if (late.locale === locale && current.kind === "ui" && !current.alias && current.locale === locale && current.canonicalPath === late.href) committed = late;
+    }
     if (!committed) return;
+    timedOutIntent.current = void 0;
     clearTimer();
     setIntent(void 0);
     setError(void 0);
@@ -310,7 +339,7 @@ function NaeilLocaleController({ service, children, preferenceWritesEnabled = fa
     const savedFocus = focus.current;
     focus.current = void 0;
     requestAnimationFrame(() => restoreFocus(savedFocus));
-  }, [gate, clearTimer, preferenceWritesEnabled]);
+  }, [service, gate, clearTimer, preferenceWritesEnabled]);
   const registerDepartureGuard = useCallback((guard) => {
     guards.current.add(guard);
     return () => {
@@ -341,7 +370,8 @@ function NaeilLocaleController({ service, children, preferenceWritesEnabled = fa
     };
   }, [cancel, gate, clearTimer]);
   useEffect(() => {
-    const pending = gate.current();
+    var _a;
+    const pending = (_a = gate.current()) != null ? _a : timedOutIntent.current;
     if (!pending) return;
     const target = pending.href.split(/[?#]/, 1)[0];
     const current = resolveLocaleUrl(service, pathname != null ? pathname : "/");

package/dist/naeil-locale/index.js

@@ -11,7 +11,7 @@ import {
   naeilServices,
   resolveLocaleUrl,
   sameLogicalRoute
-} from "./chunk-U65OQHZY.js";
+} from "./chunk-WT6QXR7O.js";
 import "./chunk-N3ETBM74.js";
 
 // src/naeil-locale/preference.ts

package/dist/naeil-locale/messages.js

@@ -3,8 +3,8 @@ import {
   loadSharedMessages,
   mergeLocaleMessages,
   recoverMissingMessages
-} from "./chunk-4U64K4J3.js";
-import "./chunk-U65OQHZY.js";
+} from "./chunk-24IL53QO.js";
+import "./chunk-WT6QXR7O.js";
 import "./chunk-N3ETBM74.js";
 export {
   createLocaleMessageLoader,

package/dist/naeil-locale/server.js

@@ -2,7 +2,7 @@ import {
   createLocaleMessageLoader,
   loadSharedMessages,
   recoverMissingMessages
-} from "./chunk-4U64K4J3.js";
+} from "./chunk-24IL53QO.js";
 import {
   assertLocale,
   getLocaleService,
@@ -11,7 +11,7 @@ import {
   naeilLocales,
   naeilRouting,
   resolveLocaleUrl
-} from "./chunk-U65OQHZY.js";
+} from "./chunk-WT6QXR7O.js";
 import "./chunk-N3ETBM74.js";
 
 // src/naeil-locale/server.ts
@@ -62,10 +62,10 @@ function stripMarkers(headers) {
   return sanitized;
 }
 function sanitizeProtocolPassThrough(response, requestHeaders) {
-  var _a;
   if (response.headers.get("x-middleware-next") !== "1" && !response.headers.has("x-middleware-rewrite")) return response;
-  const forwarded = new Headers(requestHeaders);
-  for (const key of ((_a = response.headers.get("x-middleware-override-headers")) != null ? _a : "").split(",")) {
+  const overrides = response.headers.get("x-middleware-override-headers");
+  const forwarded = new Headers(overrides === null ? requestHeaders : void 0);
+  for (const key of (overrides != null ? overrides : "").split(",").map((name) => name.trim())) {
     if (!key) continue;
     const value = response.headers.get(`x-middleware-request-${key}`);
     if (value !== null) forwarded.set(key, value);
@@ -79,7 +79,7 @@ function sanitizeProtocolPassThrough(response, requestHeaders) {
     names.push(key);
     response.headers.set(`x-middleware-request-${key}`, value);
   }
-  response.headers.set("x-middleware-override-headers", names.join(","));
+  response.headers.set("x-middleware-override-headers", [...names, ...privateHeaders].join(","));
   return response;
 }
 function markPrivate(response) {

package/dist/{navigation-D8N1tMTu.d.ts → navigation-CXZapKac.d.ts}

@@ -25,6 +25,8 @@ interface NavigationGroup {
 }
 type NavigationItem = NavigationLink | NavigationGroup;
 interface NavigationProps extends Omit<React.ComponentPropsWithoutRef<"header">, "children" | "onSelect"> {
+    /** Omit empty landmarks and dismiss toolbar-only sheets on desktop crossing. */
+    omitEmptyNavigation?: boolean;
     brand: React.ReactNode;
     items: NavigationItem[];
     /** Translated landmark/dialog/close labels are supplied by the application. */
@@ -45,6 +47,6 @@ interface NavigationProps extends Omit<React.ComponentPropsWithoutRef<"header">,
     /** Preserve modified clicks; applications may preventDefault for client routing/guards. */
     onNavigate?: (event: React.MouseEvent<HTMLAnchorElement>, item: NavigationLink) => void;
 }
-declare function Navigation({ brand, items, labels, Link, currentHref, toolbar, mobileToolbar, mobileFooter, mobileOpen: controlledOpen, onMobileOpenChange, containerClassName, onNavigate, className, ...props }: NavigationProps): react_jsx_runtime.JSX.Element;
+declare function Navigation({ brand, items, labels, Link, currentHref, toolbar, mobileToolbar, mobileFooter, omitEmptyNavigation, mobileOpen: controlledOpen, onMobileOpenChange, containerClassName, onNavigate, className, ...props }: NavigationProps): react_jsx_runtime.JSX.Element;
 
 export { type NavigationLink as N, type NavigationProps as a, type NavigationLinkComponent as b, type NavigationItem as c, type NavigationLinkProps as d, Navigation as e, type NavigationGroup as f };

package/dist/{site-footer-s113FZgC.d.ts → site-footer-C4jgkGDU.d.ts}

@@ -1,6 +1,6 @@
 import * as react_jsx_runtime from 'react/jsx-runtime';
 import * as React from 'react';
-import { N as NavigationLink, b as NavigationLinkComponent, a as NavigationProps } from './navigation-D8N1tMTu.js';
+import { N as NavigationLink, b as NavigationLinkComponent, a as NavigationProps } from './navigation-CXZapKac.js';
 
 interface SiteFooterProps extends React.ComponentPropsWithoutRef<"footer"> {
     brand?: React.ReactNode;