@kirchdev/duxt 0.8.1 → 0.8.2-dev-main.59-9244f91

package/app/components/DuxtPageInfo.vue

@@ -56,7 +56,8 @@ const file = computed(() => {
     ? sourceFilePath(
         page.value.stem,
         source.value?.prefix ?? '',
-        source.value?.path ?? 'docs'
+        // The folder on the forge, where the one on disk is a copy of it.
+        source.value?.originPath ?? source.value?.path ?? 'docs'
       )
     : undefined;
 });

package/app/types/duxt.d.ts

@@ -292,7 +292,7 @@ declare global {
      * The repository a source read off disk lives in, for links back to it.
      * Not `repo`, which is what makes Content download a source.
      */
-    origin?: { repo: string; ref?: string };
+    origin?: { repo: string; ref?: string; path?: string };
     /**
      * Read this source's git history for "Last updated" and the contributors.
      * Off by default for a remote source: Content clones with `--depth 1`, and
@@ -480,6 +480,8 @@ declare global {
     repositoryUrl?: string;
     ref?: string;
     refKind?: 'branch' | 'tag';
+    /** Folder inside `repository`, where it is not `path` — see `origin.path`. */
+    originPath?: string;
     path: string;
     /** The locale this collection serves; absent on a site with no translations. */
     locale?: string;

package/build/sources/sources-resolve.ts

@@ -141,8 +141,14 @@ export interface DuxtSource {
    * Writing `repo` instead would be the obvious move and the wrong one: `repo`
    * is what makes Content DOWNLOAD a source, so naming this repository there
    * would have the build clone the checkout it is already standing in.
+   *
+   * `path` is the folder in THAT repository which this source's own `path`
+   * stands for. Only needed where the two differ — content copied into a
+   * build context, or a sibling checkout read through `../` — because the
+   * folder on disk is then not the folder on the forge, and "Edit this page"
+   * would open a file that does not exist there.
    */
-  origin?: { repo: string; ref?: string };
+  origin?: { repo: string; ref?: string; path?: string };
   /**
    * Read this source's git history for "Last updated" and the contributors.
    *
@@ -348,6 +354,11 @@ export interface DuxtResolvedSource {
   repositoryUrl?: string;
   /** The ref the pages were read at, by name. */
   ref?: string;
+  /**
+   * Folder inside `repository` holding this collection's Markdown, where it is
+   * not `path` — see `origin.path`. Links back read this first.
+   */
+  originPath?: string;
   /** Which namespace that ref lives in. */
   refKind?: 'branch' | 'tag';
   /** Folder inside the repository holding the Markdown. */
@@ -603,6 +614,45 @@ export function expandSources(
   );
 }
 
+/**
+ * Where a folder read off disk sits in the repository `origin` names.
+ *
+ * A locale's folder is mapped through the source's own: `wiki-content/docs/en`
+ * under `wiki-content/docs`, with `origin.path` `docs`, is `docs/en`. A folder
+ * outside the source's cannot be mapped, and is rejected rather than guessed —
+ * a link to the wrong file is worse than no link.
+ */
+export function originFolder(
+  originPath: string | undefined,
+  sourcePath: string | undefined,
+  folder: string
+): string | undefined {
+  if (originPath === undefined) return undefined;
+
+  // A loop rather than `/\/+$/`: the paths are consumer input, and an anchored
+  // repetition is a polynomial backtrack on a long run of slashes.
+  const trim = (value: string) => {
+    let end = value.length;
+    while (end > 0 && value[end - 1] === '/') end--;
+    const kept = value.slice(0, end);
+    return kept.startsWith('./') ? kept.slice(2) : kept;
+  };
+  const base = trim(sourcePath ?? '');
+  const target = trim(originPath);
+  const own = trim(folder);
+
+  if (own === base) return target;
+  if (base === '' || own.startsWith(`${base}/`)) {
+    const rest = base === '' ? own : own.slice(base.length + 1);
+    return [target, rest].filter(Boolean).join('/');
+  }
+
+  throw new Error(
+    `duxt: origin.path cannot map "${folder}", which is outside the source ` +
+      `path "${sourcePath ?? ''}". Keep its locale folders under the source.`
+  );
+}
+
 export function resolveSources(
   sources: DuxtSource[],
   options: DuxtSourcesOptions = {}
@@ -732,6 +782,9 @@ export function resolveSources(
           ? repoUrl(source.origin.repo)
           : undefined,
       ref: name ?? source.origin?.ref,
+      originPath: entry.repo
+        ? undefined
+        : originFolder(source.origin?.path, source.path, entry.path),
       refKind: effectiveRef
         ? refIsTag(effectiveRef)
           ? 'tag'

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://www.schemastore.org/package.json",
   "name": "@kirchdev/duxt",
-  "version": "0.8.1",
+  "version": "0.8.2-dev-main.59-9244f91",
   "description": "duxt is a Nuxt layer: extend it and your docs/ folder becomes a site, with theme, search, API reference and llms.txt included. Point it at other repositories, or at tags of the same one, and each becomes a version.",
   "keywords": [
     "content-v3",