reroute-js 1.0.0-alpha.6 → 1.0.0-alpha.8

package/README.md

@@ -670,7 +670,9 @@ src/client/routes/blog/content/
 - Flat files under `content/` are the default locale; nest under `content/{locale}/` for translations
 - Collections without locale folders behave as before
 - Default-locale prefix (`/blog/en-US/...`) 302s to the unprefixed URL
-- Optional negotiate: `Accept-Language` / cookie can 302 default content URLs to a localized path (`i18n.redirectContentOnNegotiate`, default `true`)
+- A locale segment in the URL always wins over cookie / `Accept-Language`
+- `setLocale()` writes `?lang=` and the server 302s to the canonical content URL (and sets the cookie). That is the only way to leave a URL that already has a locale in the path
+- Optional negotiate: `Accept-Language` / cookie can 302 **unprefixed** content URLs to a localized path (`i18n.redirectContentOnNegotiate`, default `true`)
 
 ### UI Strings
 
@@ -1165,8 +1167,8 @@ export default defineConfig({
 Your site now supports:
 - `.txt` and `.md` extensions on any route (e.g., `/blog/post.txt`, `/about.md`)
 - Accept header content negotiation (`Accept: text/plain`, `Accept: text/markdown`)
-- `/llms.txt` - Index of all content organized by section
-- `/llms-full.txt` - Complete site content in one file
+- `/llms.txt` - Index of all content: title, description, and link per page
+- `/llms-full.txt` - Complete site content in one file (optional; large)
 
 #### How It Works
 

package/cli/bin.d.ts

@@ -1,5 +1,5 @@
 /**
- * reroute-js v1.0.0-alpha.6
+ * reroute-js v1.0.0-alpha.8
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>

package/cli/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 // @bun
 /**
- * reroute-js v1.0.0-alpha.6
+ * reroute-js v1.0.0-alpha.8
  *
  * @license MIT
  * @copyright 2026 stewones <hi@stewan.io>
@@ -68,7 +68,7 @@ async function getVersionString() {
 }
 async function getVersion() {
   if (true) {
-    return "1.0.0-alpha.6";
+    return "1.0.0-alpha.8";
   }
   const possiblePaths = [
     path.join(import.meta.dir, "../../../../package.json"),
@@ -86,7 +86,7 @@ async function getVersion() {
 }
 async function getCommit() {
   if (true) {
-    return "1f58c52";
+    return "2c48a1e";
   }
   return "dev";
 }
@@ -818,9 +818,30 @@ function hreflangTags(baseUrl, collection, name, locales, defaultLocale) {
 var init_pathname = () => {};
 
 // packages/core/src/i18n/resolve.ts
+function canonicalLocale(value, availableLocales) {
+  return availableLocales.find((l) => l.toLowerCase() === value.toLowerCase()) || value;
+}
+function parseLangParam(search, isAvailable, availableLocales) {
+  if (!search)
+    return;
+  const params = new URLSearchParams(search.startsWith("?") ? search.slice(1) : search);
+  const raw = params.get("lang") ?? undefined;
+  if (!isAvailable(raw))
+    return;
+  return canonicalLocale(raw, availableLocales);
+}
+function stripLangParam(search) {
+  if (!search)
+    return "";
+  const params = new URLSearchParams(search.startsWith("?") ? search.slice(1) : search);
+  params.delete("lang");
+  const rest = params.toString();
+  return rest ? `?${rest}` : "";
+}
 function resolveLocale(input) {
   const {
     pathname,
+    search,
     cookieHeader,
     acceptLanguage,
     availableLocales,
@@ -831,14 +852,32 @@ function resolveLocale(input) {
   const parsed = parseContentPath(pathname, availableLocales, collections);
   const availableLower = new Set(availableLocales.map((l) => l.toLowerCase()));
   const isAvailable = (locale) => !!locale && availableLower.has(locale.toLowerCase());
+  const routingPathname = parsed?.routingPathname ?? pathname.split("?")[0];
+  const restSearch = stripLangParam(search);
+  const queryLocale = parseLangParam(search, isAvailable, availableLocales);
+  if (queryLocale) {
+    const target = parsed ? localizeContentHref(parsed.collection, parsed.name, queryLocale, defaultLocale) : routingPathname;
+    return {
+      locale: queryLocale,
+      routingPathname,
+      fromPath: false,
+      fromQuery: true,
+      redirectTo: `${target}${restSearch}`,
+      parsed: parsed ? {
+        ...parsed,
+        locale: queryLocale === defaultLocale ? undefined : queryLocale
+      } : undefined
+    };
+  }
   if (parsed?.locale && isAvailable(parsed.locale)) {
-    const locale = availableLocales.find((l) => l.toLowerCase() === parsed.locale?.toLowerCase()) || parsed.locale;
+    const locale = canonicalLocale(parsed.locale, availableLocales);
     if (locale === defaultLocale && parsed.pathname !== parsed.routingPathname) {
       return {
         locale,
         routingPathname: parsed.routingPathname,
         fromPath: true,
-        redirectTo: parsed.routingPathname,
+        fromQuery: false,
+        redirectTo: `${parsed.routingPathname}${restSearch}`,
         parsed: { ...parsed, locale }
       };
     }
@@ -846,17 +885,18 @@ function resolveLocale(input) {
       locale,
       routingPathname: parsed.routingPathname,
       fromPath: true,
+      fromQuery: false,
       parsed: { ...parsed, locale }
     };
   }
-  const routingPathname = parsed?.routingPathname ?? pathname.split("?")[0];
   const cookieLocale = parseCookieValue(cookieHeader, cookieName);
   if (isAvailable(cookieLocale)) {
-    const locale = availableLocales.find((l) => l.toLowerCase() === cookieLocale.toLowerCase()) || cookieLocale;
+    const locale = canonicalLocale(cookieLocale, availableLocales);
     return {
       locale,
       routingPathname,
       fromPath: false,
+      fromQuery: false,
       parsed: parsed ? { ...parsed, locale: undefined } : undefined
     };
   }
@@ -865,13 +905,14 @@ function resolveLocale(input) {
     locale: negotiated,
     routingPathname,
     fromPath: false,
+    fromQuery: false,
     parsed: parsed ? { ...parsed, locale: undefined } : undefined
   };
 }
 function contentNegotiateRedirect(resolution, defaultLocale, enabled) {
   if (!enabled)
     return;
-  if (resolution.fromPath)
+  if (resolution.fromPath || resolution.fromQuery)
     return;
   if (resolution.locale === defaultLocale)
     return;
@@ -1447,6 +1488,21 @@ function setGlobalCollections(byCollectionForSSR) {
     globalThis.__REROUTE_COLLECTIONS__ = byCollectionForSSR;
   } catch {}
 }
+function resetSSRContentResults() {
+  try {
+    globalThis.__REROUTE_SSR_RESULTS__ = {};
+  } catch {}
+}
+function takeSSRContentResults() {
+  try {
+    const g = globalThis;
+    const results = g.__REROUTE_SSR_RESULTS__;
+    g.__REROUTE_SSR_RESULTS__ = {};
+    return results;
+  } catch {
+    return;
+  }
+}
 var init_collections = __esm(() => {
   init_imports();
 });
@@ -3567,23 +3623,34 @@ function parseAccessTracking(accessedCollections) {
   }
   return usage;
 }
-function processCollections(accessedCollections, byCollectionForSSR) {
+function processCapturedResults(capturedResults, byCollectionForSSR) {
   const subset = {};
   const partial = {};
   try {
     const g = globalThis;
-    const ssrResults = g.__REROUTE_SSR_RESULTS__;
-    if (ssrResults && typeof ssrResults === "object") {
-      for (const [collection, items] of Object.entries(ssrResults)) {
-        if (Array.isArray(items) && items.length > 0) {
-          subset[collection] = items;
-          const full = byCollectionForSSR?.[collection] || [];
-          partial[collection] = items.length < full.length;
-        }
+    const ssrResults = capturedResults ?? g.__REROUTE_SSR_RESULTS__;
+    if (!ssrResults || typeof ssrResults !== "object")
+      return;
+    for (const [collection, items] of Object.entries(ssrResults)) {
+      if (Array.isArray(items) && items.length > 0) {
+        subset[collection] = items;
+        const full = byCollectionForSSR?.[collection] || [];
+        partial[collection] = items.length < full.length;
       }
-      return { subset, partial };
     }
-  } catch {}
+  } catch {
+    return;
+  }
+  if (Object.keys(subset).length === 0)
+    return;
+  return { subset, partial };
+}
+function processCollections(accessedCollections, byCollectionForSSR, capturedResults) {
+  const captured = processCapturedResults(capturedResults, byCollectionForSSR);
+  if (captured)
+    return captured;
+  const subset = {};
+  const partial = {};
   const sortByDate = (order) => (a, b) => {
     const da = a?.meta?.date ? Date.parse(String(a.meta.date)) : 0;
     const db = b?.meta?.date ? Date.parse(String(b.meta.date)) : 0;
@@ -3872,6 +3939,7 @@ async function performSSRSetupInternal(options, streaming, timeoutState) {
   });
   assertNotTimedOut();
   resetSSRAccessTracking();
+  resetSSRContentResults();
   const bundlePreload = createBundlePreload(bundleUrl);
   const preloadResult = await withSpan("ssr.preload", async (span) => {
     span.setAttribute("pathname", pathname);
@@ -3947,12 +4015,12 @@ async function performSSRSetupInternal(options, streaming, timeoutState) {
     pending: computeResult.pending
   };
 }
-function generateCollectionScripts(byCollectionForSSR) {
+function generateCollectionScripts(byCollectionForSSR, capturedResults) {
   try {
     const g = globalThis;
     const acc = g.__REROUTE_SSR_ACCESSED__;
     if (acc) {
-      const { subset, partial } = processCollections(acc, byCollectionForSSR);
+      const { subset, partial } = processCollections(acc, byCollectionForSSR, capturedResults);
       if (Object.keys(subset).length > 0) {
         return createCollectionScript(subset, partial);
       }
@@ -4104,13 +4172,16 @@ async function renderSSRDocument(options) {
   }, false);
   const duplicatedData = duplicateQueryParamData(setup2.ssrData);
   setGlobalSSRData(duplicatedData);
+  let capturedResults;
   const appHtml = await withSpan("ssr.render.react", async (span) => {
     const componentWithPathname = cloneElement(rootComponent, {
       pathname,
       searchParams
     });
     span.setAttribute("reroute.pathname", pathname);
+    resetSSRContentResults();
     const html3 = renderToString(componentWithPathname);
+    capturedResults = takeSSRContentResults();
     span.setAttribute("reroute.html.final.size", html3.length);
     return html3;
   });
@@ -4119,7 +4190,7 @@ async function renderSSRDocument(options) {
     span.setAttribute("reroute.template.size", template2.length);
     return template2;
   });
-  const collectionScripts = generateCollectionScripts(setup2.byCollectionForSSR);
+  const collectionScripts = generateCollectionScripts(setup2.byCollectionForSSR, capturedResults);
   const config = await loadConfig(cwd);
   const browserTelemetryConfigRaw = config.telemetry?.browser;
   const { serializeBrowserTelemetryConfig: serializeBrowserTelemetryConfig2 } = await Promise.resolve().then(() => exports_serialize);
@@ -4502,6 +4573,25 @@ __export(exports_index_generator, {
   generateLLMsIndex: () => generateLLMsIndex
 });
 import { pathToFileURL as pathToFileURL6 } from "node:url";
+function oneLine(value) {
+  return value.replace(/\s+/g, " ").trim();
+}
+function stringField(record, key) {
+  const value = record?.[key];
+  if (typeof value !== "string")
+    return;
+  const trimmed = oneLine(value);
+  return trimmed.length > 0 ? trimmed : undefined;
+}
+function metaFromUnknown(meta) {
+  if (!meta || typeof meta !== "object")
+    return {};
+  const record = meta;
+  return {
+    title: stringField(record, "title") ?? stringField(record, "name"),
+    description: stringField(record, "description") ?? stringField(record, "excerpt")
+  };
+}
 async function discoverStaticRoutes(cwd, isWatchMode) {
   const routes = [];
   try {
@@ -4518,8 +4608,11 @@ async function discoverStaticRoutes(cwd, isWatchMode) {
         if (pattern.includes("[404]") || pattern.includes("[layout]") || pattern.includes("[skeleton]") || pattern.includes(":")) {
           continue;
         }
+        const { title, description } = metaFromUnknown(route?.meta);
         routes.push({
-          path: pattern
+          path: pattern,
+          title,
+          description
         });
       }
     }
@@ -4542,11 +4635,13 @@ function createRouteEntriesFromItems(items, collection) {
   for (const item of items) {
     const href = String(item.href || "");
     if (href) {
-      const title = item.meta?.title || item.meta?.name || item.name;
+      const fromMeta = metaFromUnknown(item.meta);
+      const title = fromMeta.title || (typeof item.name === "string" ? item.name : undefined);
       routes.push({
         path: href,
         section: collection,
-        title
+        title,
+        description: fromMeta.description
       });
     }
   }
@@ -4612,9 +4707,13 @@ function createEntriesFromArray(array, routePath) {
       continue;
     const identifier = extractIdentifier(item);
     if (identifier) {
+      const fromItem = metaFromUnknown(item);
+      const fromMeta = metaFromUnknown(item.meta);
       entries.push({
         path: `${routePath}/${identifier}`,
-        section: routePath.split("/").filter(Boolean)[0]
+        section: routePath.split("/").filter(Boolean)[0],
+        title: fromItem.title ?? fromMeta.title,
+        description: fromItem.description ?? fromMeta.description
       });
     }
   }
@@ -4720,13 +4819,21 @@ function formatRouteUrl(routePath, baseUrl) {
 function getRouteTitle(route) {
   return route.title || (route.path === "/" ? "Home" : route.path.split("/").pop() || "Page");
 }
-function addRootRoutes(parts, rootRoutes, baseUrl, isScoped) {
+function formatIndexLine(route, url, summaries) {
+  const link = `- [${getRouteTitle(route)}](${url})`;
+  if (!(summaries && route.description))
+    return link;
+  return `${link}: ${route.description}`;
+}
+function summariesEnabled(llmsConfig) {
+  return llmsConfig?.indexSummaries !== false;
+}
+function addRootRoutes(parts, rootRoutes, baseUrl, isScoped, llmsConfig) {
   if (isScoped || rootRoutes.length === 0)
     return;
+  const summaries = summariesEnabled(llmsConfig);
   for (const route of rootRoutes) {
-    const title = getRouteTitle(route);
-    const url = formatRouteUrl(route.path, baseUrl);
-    parts.push(`- [${title}](${url})`);
+    parts.push(formatIndexLine(route, formatRouteUrl(route.path, baseUrl), summaries));
   }
   parts.push("");
 }
@@ -4737,10 +4844,9 @@ function addCollectionSection(parts, collection, routes, baseUrl, llmsConfig) {
   const sectionName = collection.charAt(0).toUpperCase() + collection.slice(1);
   parts.push(`## ${sectionName}`);
   parts.push("");
+  const summaries = summariesEnabled(llmsConfig);
   for (const route of filteredRoutes) {
-    const title = route.title || route.path.split("/").pop() || "Untitled";
-    const url = `${baseUrl}${route.path}.txt`;
-    parts.push(`- [${title}](${url})`);
+    parts.push(formatIndexLine(route, `${baseUrl}${route.path}.txt`, summaries));
   }
   parts.push("");
 }
@@ -4758,10 +4864,9 @@ function addSSRDataSection(parts, routePattern, routes, baseUrl, isScoped, targe
   const sectionName = routeSection?.charAt(0).toUpperCase() + routeSection?.slice(1) || "Content";
   parts.push(`## ${sectionName}`);
   parts.push("");
+  const summaries = summariesEnabled(llmsConfig);
   for (const route of filteredRoutes) {
-    const title = route.title || route.path.split("/").pop() || "Untitled";
-    const url = `${baseUrl}${route.path}.txt`;
-    parts.push(`- [${title}](${url})`);
+    parts.push(formatIndexLine(route, `${baseUrl}${route.path}.txt`, summaries));
   }
   parts.push("");
 }
@@ -4775,10 +4880,9 @@ function addStaticSection(parts, section, routes, baseUrl, isScoped, targetColle
   const sectionName = section.charAt(0).toUpperCase() + section.slice(1);
   parts.push(`## ${sectionName}`);
   parts.push("");
+  const summaries = summariesEnabled(llmsConfig);
   for (const route of filteredRoutes) {
-    const title = route.title || route.path.split("/").pop() || "Untitled";
-    const url = `${baseUrl}${route.path}.txt`;
-    parts.push(`- [${title}](${url})`);
+    parts.push(formatIndexLine(route, `${baseUrl}${route.path}.txt`, summaries));
   }
   parts.push("");
 }
@@ -4792,7 +4896,7 @@ async function generateLLMsIndex(options) {
   const collectionsMap = await discoverCollectionRoutes(cwd, collections2, isWatchMode, llmsConfig);
   const ssrDataRoutes = await discoverSSRDataRoutes(cwd, staticRoutes, isWatchMode);
   const { sections, rootRoutes } = groupStaticRoutes(staticRoutes, llmsConfig);
-  addRootRoutes(parts, rootRoutes, baseUrl, isScoped);
+  addRootRoutes(parts, rootRoutes, baseUrl, isScoped, llmsConfig);
   for (const [collection, routes] of collectionsMap.entries()) {
     if (routes.length > 0) {
       addCollectionSection(parts, collection, routes, baseUrl, llmsConfig);
@@ -4811,9 +4915,6 @@ async function generateLLMsIndex(options) {
   parts.push("---");
   parts.push("");
   parts.push("Formats: .txt | .md | Accept: text/plain | Accept: text/markdown");
-  if (!isScoped && baseUrl) {
-    parts.push(`Full dump: ${baseUrl}/llms-full.txt`);
-  }
   return parts.join(`
 `);
 }
@@ -6696,6 +6797,7 @@ __export(exports_core, {
   renderSSRDocument: () => renderSSRDocument,
   renderSSRDocumentStream: () => renderSSRDocumentStream,
   resetSSRAccessTracking: () => resetSSRAccessTracking,
+  resetSSRContentResults: () => resetSSRContentResults,
   resolveLocale: () => resolveLocale,
   seedSSRModuleForPath: () => seedSSRModuleForPath,
   setGlobalCollections: () => setGlobalCollections,
@@ -6707,6 +6809,7 @@ __export(exports_core, {
   stripEnd: () => stripEnd,
   stripHtmlTags: () => stripHtmlTags,
   stripStart: () => stripStart,
+  takeSSRContentResults: () => takeSSRContentResults,
   toBytes: () => toBytes,
   toOgLocale: () => toOgLocale,
   toPromise: () => toPromise
@@ -107085,7 +107188,7 @@ async function getVersionString2() {
 }
 async function getVersion2() {
   if (true) {
-    return "1.0.0-alpha.6";
+    return "1.0.0-alpha.8";
   }
   const possiblePaths = [
     path3.join(import.meta.dir, "../../../package.json"),
@@ -107102,10 +107205,10 @@ async function getVersion2() {
 }
 async function getCommit2() {
   if (true) {
-    return "1f58c52";
+    return "2c48a1e";
   }
   return "dev";
 }
 main();
 
-//# debugId=AFC08EDF211039B364756E2164756E21
+//# debugId=2ADD943B3E15E9F264756E2164756E21