@kirchdev/duxt 0.1.1-dev.16-c752db1 → 0.1.1-dev.18-c374611

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://www.schemastore.org/package.json",
   "name": "@kirchdev/duxt",
-  "version": "0.1.1-dev.16-c752db1",
+  "version": "0.1.1-dev.18-c374611",
   "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/sources-git.ts

@@ -1,6 +1,11 @@
 import { execFileSync } from 'node:child_process';
 import type { DuxtSource } from './sources-resolve';
-import { isLatestRef, newestTag, repoUrl } from './sources-resolve';
+import {
+  expandSources,
+  isLatestRef,
+  newestTag,
+  repoUrl
+} from './sources-resolve';
 
 /**
  * Resolve the `latest` shorthand into the tag it means.
@@ -81,6 +86,8 @@ function tagsOf(repo: string | undefined): string[] {
  * resolver itself stays pure and testable — it never learns that git exists.
  */
 export function resolveLatestRefs(sources: DuxtSource[]): DuxtSource[] {
+  // Reject local refs before a missing tag can hide the configuration error.
+  expandSources(sources);
   return sources.map((source) => {
     if (!source.refs?.some(isLatestRef)) return source;
 

package/sources-resolve.ts

@@ -12,10 +12,10 @@ import type {
 export interface DuxtSource {
   /** Folder holding the Markdown, relative to the repository root. */
   path?: string;
-  /** `owner/name` or a full git URL. Omitted means this repository. */
+  /** `owner/name` or a full git URL. Omitted reads the local checkout. */
   repo?: string;
   /**
-   * Refs to publish as versions. Omitted means the current checkout.
+   * Refs to publish as versions. Requires an explicit source or locale repo.
    *
    * A bare string is a branch. A tag has to say so — git keeps the two in
    * separate namespaces, and asking for a tag under refs/heads fails the
@@ -166,7 +166,7 @@ export type DuxtSourceLocale =
       path?: string;
       /** A repository of its own — `owner/name` or a git URL. */
       repo?: string;
-      /** A ref of its own, when the translation is versioned separately. */
+      /** A ref of its own; requires an explicit source or locale repo. */
       ref?: DuxtRef;
     };
 
@@ -488,12 +488,16 @@ export function expandSources(
 
   return sources.flatMap((source) =>
     (source.refs?.length ? source.refs : [undefined]).flatMap((ref) =>
-      localesOf(source, ref).map((locale) => ({
-        source,
-        ref,
-        locale,
-        effective: localeEntry(source, locale, defaultLocale)
-      }))
+      localesOf(source, ref).map((locale) => {
+        const effective = localeEntry(source, locale, defaultLocale);
+        if (!effective.repo && (effective.ref ?? ref)) {
+          throw new Error(
+            `duxt: source "${source.path ?? 'docs'}" reads the local checkout and cannot select a ref. ` +
+              'Set an explicit repo to publish Git refs, or use version folders without refs.'
+          );
+        }
+        return { source, ref, locale, effective };
+      })
     )
   );
 }