@kirchdev/duxt 0.1.1-dev.17-509021b → 0.1.1-dev.19-efe898e

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://www.schemastore.org/package.json",
   "name": "@kirchdev/duxt",
-  "version": "0.1.1-dev.17-509021b",
+  "version": "0.1.1-dev.19-efe898e",
   "description": "Nuxt documentation layer on Content v3 — multi-repo, versioned docs from one compact source list.",
   "keywords": [
     "content-v3",

package/server/middleware/raw-markdown.ts

@@ -1,4 +1,6 @@
 import { queryCollection } from '@nuxt/content/nitro';
+import { splitLocalePath } from '../../app/utils/locale-path';
+import { sourcesForRoute } from '../../sources-resolve';
 import { duxtDefaults, mergeDuxtConfig } from '../../app/utils/duxt-config';
 import { stripFrontmatter } from '../utils/duxt-server-text';
 
@@ -21,31 +23,42 @@ export default defineEventHandler(async (event) => {
   const appConfig = useAppConfig() as { duxt?: Partial<DuxtConfig> };
   const duxt = mergeDuxtConfig(appConfig.duxt, duxtDefaults);
 
-  const wanted = stripLocale(path.slice(0, -'.md'.length));
-
-  // Longest prefix first, exactly as the app resolves a route: `/app/v2` beats
-  // `/app` on `/app/v2/guide`.
-  const sources = [...(duxt.resolvedSources ?? [])].sort(
-    (a, b) => b.prefix.length - a.prefix.length
+  const i18n = (
+    useRuntimeConfig(event).public as {
+      i18n?: {
+        locales?: ({ code: string } | string)[];
+        defaultLocale?: string;
+      };
+    }
+  ).i18n;
+  const { path: wanted, locale } = splitLocalePath(
+    path.slice(0, -'.md'.length),
+    (i18n?.locales ?? []).map((entry) =>
+      typeof entry === 'string' ? entry : entry.code
+    )
+  );
+  // Nuxt i18n loads the consumer's merged Vue I18n config in its request hook.
+  // Browser-language detection's fallback is a different policy.
+  const fallbackLocale = event.context.nuxtI18n?.vueI18nOptions
+    ?.fallbackLocale as string | string[] | undefined;
+  const sources = sourcesForRoute(
+    wanted,
+    locale ?? i18n?.defaultLocale,
+    duxt.resolvedSources ?? [],
+    fallbackLocale
   );
 
-  const source =
-    sources.find(
-      (entry) =>
-        !entry.prefix ||
-        wanted === entry.prefix ||
-        wanted.startsWith(`${entry.prefix}/`)
-    ) ?? sources[0];
-
-  if (!source) return;
-
-  const page = await queryCollection(
-    event,
-    source.collection as Parameters<typeof queryCollection>[1]
-  )
-    .path(wanted)
-    .select('title', 'rawbody')
-    .first();
+  let page;
+  for (const source of sources) {
+    page = await queryCollection(
+      event,
+      source.collection as Parameters<typeof queryCollection>[1]
+    )
+      .path(wanted)
+      .select('title', 'rawbody')
+      .first();
+    if (page) break;
+  }
 
   // No page is not this middleware's error to raise: falling through lets the
   // app answer with its own 404, which knows how to suggest a near miss.
@@ -57,30 +70,3 @@ export default defineEventHandler(async (event) => {
   setHeader(event, 'content-type', 'text/markdown; charset=utf-8');
   return stripFrontmatter(body).trim();
 });
-
-/**
- * The locale segment, off.
- *
- * The browser is on `/de-DE/guide/deploying`; the page is `/guide/deploying`.
- * Same distinction `stripLocalePrefix` makes in the app, made again here
- * because Nitro has no i18n composable to ask.
- */
-function stripLocale(path: string): string {
-  const first = path.split('/')[1];
-  if (!first) return path;
-
-  const locales = (
-    useRuntimeConfig().public as {
-      i18n?: { locales?: ({ code: string } | string)[] };
-    }
-  ).i18n?.locales;
-
-  const codes = (locales ?? []).map((locale) =>
-    typeof locale === 'string' ? locale : locale.code
-  );
-
-  if (!codes.includes(first)) return path;
-
-  const rest = path.slice(first.length + 1);
-  return rest.startsWith('/') ? rest : rest || '/';
-}

package/server/routes/llms-full.txt.get.ts

@@ -1,4 +1,4 @@
-import { queryCollection } from '@nuxt/content/nitro';
+import { llmsPages } from '../utils/llms-pages';
 // Imported by path, not auto-import: app/ belongs to the Vue app, and Nitro
 // does not see its utils. The defaults have to come from the same file the
 // pages use, or the two descriptions drift apart.
@@ -27,19 +27,7 @@ export default defineEventHandler(async (event) => {
     mergeDuxtConfig(appConfig.duxt, duxtDefaults)
   );
 
-  const collections = duxt.resolvedSources?.length
-    ? duxt.resolvedSources.map((source) => source.collection)
-    : ['docs'];
-
-  const pages = (
-    await Promise.all(
-      collections.map((name) =>
-        queryCollection(event, name as Parameters<typeof queryCollection>[1])
-          .select('path', 'title', 'description', 'rawbody')
-          .all()
-      )
-    )
-  ).flat();
+  const pages = await llmsPages(event, duxt.resolvedSources);
 
   const origin = getRequestURL(event).origin;
 

package/server/routes/llms.txt.get.ts

@@ -1,4 +1,4 @@
-import { queryCollection } from '@nuxt/content/nitro';
+import { llmsPages } from '../utils/llms-pages';
 // Imported by path, not auto-import: app/ belongs to the Vue app, and Nitro
 // does not see its utils. The defaults have to come from the same file the
 // pages use, or the two descriptions drift apart.
@@ -22,21 +22,7 @@ export default defineEventHandler(async (event) => {
 
   // Every collection the manifest names, not just `docs`: a versioned site
   // has none by that name, and llms.txt is the whole site's index.
-  const collections = duxt.resolvedSources?.length
-    ? duxt.resolvedSources.map((source) => source.collection)
-    : ['docs'];
-
-  const pages = (
-    await Promise.all(
-      collections.map((name) =>
-        // Cast from Content's own signature: the collection name is data
-        // from the manifest, and the key union is generated per site.
-        queryCollection(event, name as Parameters<typeof queryCollection>[1])
-          .select('path', 'title', 'description')
-          .all()
-      )
-    )
-  ).flat();
+  const pages = await llmsPages(event, duxt.resolvedSources);
 
   const origin = getRequestURL(event).origin;
 

package/server/utils/llms-pages.ts

@@ -0,0 +1,87 @@
+import { queryCollection } from '@nuxt/content/nitro';
+import type { H3Event } from 'h3';
+import {
+  sourcesForRoute,
+  type DuxtResolvedSource
+} from '../../sources-resolve';
+
+/** Enumerate public pages, selecting the same collection chain as HTML. */
+export async function llmsPages(
+  event: H3Event,
+  sources: DuxtResolvedSource[] = []
+) {
+  const i18n = (
+    useRuntimeConfig(event).public as unknown as {
+      i18n?: {
+        locales?: (string | { code: string })[];
+        defaultLocale?: string;
+        strategy?: string;
+      };
+    }
+  ).i18n;
+  const fallbackLocale = event.context.nuxtI18n?.vueI18nOptions
+    ?.fallbackLocale as string | string[] | undefined;
+  const codes = (i18n?.locales ?? []).map((locale) =>
+    typeof locale === 'string' ? locale : locale.code
+  );
+  const defaultLocale = i18n?.defaultLocale ?? codes[0];
+  const strategy = i18n?.strategy ?? 'prefix_except_default';
+  const locales =
+    strategy === 'no_prefix' || !codes.length ? [defaultLocale] : codes;
+  const collections = sources.length
+    ? [...new Set(sources.map((source) => source.collection))]
+    : ['docs'];
+  const entries = await Promise.all(
+    collections.map(
+      async (name) =>
+        [
+          name,
+          await queryCollection(
+            event,
+            name as Parameters<typeof queryCollection>[1]
+          )
+            .select('path', 'title', 'description', 'rawbody')
+            .all()
+        ] as const
+    )
+  );
+  const pagesByCollection = new Map(
+    entries.map(([name, pages]) => [
+      name,
+      new Map(
+        pages.filter((page) => page.path).map((page) => [page.path, page])
+      )
+    ])
+  );
+  const paths = new Set(
+    entries.flatMap(([, pages]) =>
+      pages.map((page) => page.path).filter(Boolean)
+    )
+  );
+  const result = new Map<string, (typeof entries)[number][1][number]>();
+
+  for (const locale of locales) {
+    for (const path of paths) {
+      const chain = sources.length
+        ? sourcesForRoute(path, locale, sources, fallbackLocale).map(
+            (source) => source.collection
+          )
+        : ['docs'];
+      const page = chain
+        .map((name) => pagesByCollection.get(name)?.get(path))
+        .find(Boolean);
+      if (!page) continue;
+      const prefixed =
+        locale &&
+        strategy !== 'no_prefix' &&
+        (strategy !== 'prefix_except_default' || locale !== defaultLocale);
+      const publicPath = prefixed
+        ? `/${locale}${path === '/' ? '' : path}`
+        : path;
+      result.set(publicPath, { ...page, path: publicPath });
+      if (strategy === 'prefix_and_default' && locale === defaultLocale)
+        result.set(path, { ...page, path });
+    }
+  }
+  return [...result.values()].sort((a, b) => a.path.localeCompare(b.path));
+}