dogsbay 0.2.0-beta.119 → 0.2.0-beta.120

package/dist/import-content.d.ts

@@ -1,4 +1,5 @@
 import type { FormatPlugin, ExportPage, NavItem } from "@dogsbay/types";
+import { isNamespaceAxisActive, rewriteContentRefs } from "@dogsbay/site-files";
 import type { DogsbayConfig, SourceConfig } from "./config/index.js";
 /**
  * Effective version label for a source. Resolution chain:
@@ -16,17 +17,7 @@ import type { DogsbayConfig, SourceConfig } from "./config/index.js";
  * URLs in another.
  */
 export declare function effectiveVersion(s: SourceConfig, defaultVersion?: string): string | undefined;
-/**
- * Whether the namespace axis is "active" — i.e. ≥2 distinct
- * effective namespaces appear across the configured sources.
- * `undefined` (an unnamed source) counts as a distinct bucket,
- * so an unnamed + named pair activates the axis: the unnamed
- * source emits flat URLs, the named one gets `/<name>/<slug>`.
- *
- * See plans/multi-source-content.md → "Detecting which axes are
- * active".
- */
-export declare function isNamespaceAxisActive(sources: SourceConfig[]): boolean;
+export { isNamespaceAxisActive };
 /**
  * Whether the version axis is "active" — i.e. ≥2 distinct
  * effective versions appear across the configured sources.
@@ -214,24 +205,7 @@ export declare function importContent(resolvedSources: string[], config: Dogsbay
  * naming the page and the version.
  */
 export declare function checkRootVersionCollisions(pages: ExportPage[], rootVersion: string, versionIds: (string | undefined)[]): void;
-/**
- * Prefix INTERNAL-ABSOLUTE refs in a page tree with the source's URL
- * segments, matching the slug rewrite — so a versioned/localised page's
- * links and images resolve under the same `/<segs>/...` prefix as the
- * pages themselves. Covers page links (`href`) and asset refs (`src`),
- * in both markdown nodes (`src`/`href` fields) and raw-HTML nodes
- * (`href="..."`/`src="..."` inside an `html` string).
- *
- * Refs at this pipeline stage are ROOT-RELATIVE and carry NO basePath
- * (importers resolve to `/foo`; basePath is composed downstream), so the
- * match anchor is `/`, not `<basePath>/`. A ref is prefixed iff it is an
- * internal absolute path (starts with `/`), and NOT: external
- * (`scheme:`, `//host`), an anchor (`#`), the site home (`/`), under a
- * GLOBAL prefix (taxonomy index paths — one `/tags/` for the whole site,
- * never version-bucketed), or ALREADY carrying this source's full
- * `/<segs>/` prefix (idempotent). Relative refs are left untouched.
- */
-export declare function rewriteContentRefs(tree: unknown, prefixSegs: string[], globalPrefixes: Set<string>): void;
+export { rewriteContentRefs };
 /**
  * Build the options bag passed to the format plugin's import method.
  * The shape is intentionally loose (`Record<string, unknown>`) because

package/dist/import-content.js

@@ -11,20 +11,13 @@
  */
 import { isAbsolute, join, resolve } from "node:path";
 import { normalizeBasePath, resolvePrefixes } from "@dogsbay/format-astro";
+import { isNamespaceAxisActive, namespaceNavGroup, prefixNavHrefs, prefixSlug, rewriteContentRefs, sourceNamespace, } from "@dogsbay/site-files";
 // THE registry — shared with `dogsbay convert` (commands/convert.ts). This
 // module used to keep its own copy in a different order, so `site build` and
 // `convert` disagreed about the same directory. See formats.ts.
 import { FORMATS, DOCUSAURUS_ADAPTERS, loadAdapter, MDX_ADAPTERS, detectFormat, importerNames, } from "./formats.js";
-/**
- * Effective namespace key for a source. Returns `undefined` when
- * the source has no explicit `name:` — the source's URLs stay
- * flat (no namespace segment) even when paired with named
- * siblings. Avoids surprising "I added one namespace and now
- * everything else got a /docs/ prefix" rewrites.
- */
-function effectiveNamespace(s) {
-    return s.name;
-}
+/** A source's namespace (its `name:`); the rule lives in @dogsbay/site-files. */
+const effectiveNamespace = sourceNamespace;
 /**
  * Effective version label for a source. Resolution chain:
  *   1. `source.version`
@@ -43,24 +36,9 @@ function effectiveNamespace(s) {
 export function effectiveVersion(s, defaultVersion) {
     return s.version ?? defaultVersion;
 }
-/**
- * Whether the namespace axis is "active" — i.e. ≥2 distinct
- * effective namespaces appear across the configured sources.
- * `undefined` (an unnamed source) counts as a distinct bucket,
- * so an unnamed + named pair activates the axis: the unnamed
- * source emits flat URLs, the named one gets `/<name>/<slug>`.
- *
- * See plans/multi-source-content.md → "Detecting which axes are
- * active".
- */
-export function isNamespaceAxisActive(sources) {
-    if (sources.length < 2)
-        return false;
-    const seen = new Set();
-    for (const s of sources)
-        seen.add(effectiveNamespace(s));
-    return seen.size >= 2;
-}
+// Whether the namespace axis is active: shared with dogsbay-ssg, so both
+// pipelines put a named source under the same /<name>/ URLs.
+export { isNamespaceAxisActive };
 /**
  * Whether the version axis is "active" — i.e. ≥2 distinct
  * effective versions appear across the configured sources.
@@ -242,6 +220,17 @@ export async function importContent(resolvedSources, config, options = {}) {
         if (!firstImporter)
             firstImporter = importer;
         const opts = await buildImportOptions(config, sourceCfg, options);
+        // First URL segments a site-root link must not start with by accident:
+        // `/api/list-things` on a source published under `/api/` reads as
+        // already prefixed (rewriteContentRefs), and under base path `/api` as
+        // already based (format-astro). Importers that invent slugs (OpenAPI
+        // tags) avoid them.
+        const combinedPrefix = resolvePrefixes(config.site.url, config.site.basePath).combined;
+        opts.reservedSlugs = [
+            ...getPrefixSegments(sourceCfg, axes, defaults).slice(0, 1),
+            ...combinedPrefix.split("/").filter(Boolean).slice(0, 1),
+            ...globalPrefixes,
+        ];
         const result = await importer.import(resolved, opts);
         const { pages, nav } = result;
         const ownRoots = [...new Set([result.contentRoot, resolved].filter((r) => !!r))];
@@ -310,7 +299,7 @@ export async function importContent(resolvedSources, config, options = {}) {
             // emitter (page output paths, sitemap, llms.txt, agent-
             // readiness mirrors) reads slug.
             for (const page of pages) {
-                page.slug = prefixSlugWithSegments(prefixSegs, page.slug);
+                page.slug = prefixSlug(prefixSegs, page.slug);
             }
             // Prefix in-content refs with the source's URL segments, matching
             // the slug rewrite: internal page links AND asset refs (`/foo` →
@@ -332,11 +321,9 @@ export async function importContent(resolvedSources, config, options = {}) {
             //     unnamed in a namespace-active site → "default
             //     section")
             const ns = axes.namespace ? effectiveNamespace(sourceCfg) : undefined;
-            if (ns !== undefined) {
-                allNav.push({
-                    label: prettyNamespaceLabel(ns),
-                    children: prefixedNav,
-                });
+            const group = namespaceNavGroup(ns, prefixedNav);
+            if (group) {
+                allNav.push(group);
             }
             else {
                 allNav.push(...prefixedNav);
@@ -391,133 +378,9 @@ export function checkRootVersionCollisions(pages, rootVersion, versionIds) {
         }
     }
 }
-/**
- * Prefix INTERNAL-ABSOLUTE refs in a page tree with the source's URL
- * segments, matching the slug rewrite — so a versioned/localised page's
- * links and images resolve under the same `/<segs>/...` prefix as the
- * pages themselves. Covers page links (`href`) and asset refs (`src`),
- * in both markdown nodes (`src`/`href` fields) and raw-HTML nodes
- * (`href="..."`/`src="..."` inside an `html` string).
- *
- * Refs at this pipeline stage are ROOT-RELATIVE and carry NO basePath
- * (importers resolve to `/foo`; basePath is composed downstream), so the
- * match anchor is `/`, not `<basePath>/`. A ref is prefixed iff it is an
- * internal absolute path (starts with `/`), and NOT: external
- * (`scheme:`, `//host`), an anchor (`#`), the site home (`/`), under a
- * GLOBAL prefix (taxonomy index paths — one `/tags/` for the whole site,
- * never version-bucketed), or ALREADY carrying this source's full
- * `/<segs>/` prefix (idempotent). Relative refs are left untouched.
- */
-export function rewriteContentRefs(tree, prefixSegs, globalPrefixes) {
-    if (prefixSegs.length === 0)
-        return;
-    const seg = prefixSegs.join("/");
-    const fullPrefix = `/${seg}/`;
-    const prefix = (u) => {
-        if (!u)
-            return u;
-        if (/^[a-z][a-z0-9+.-]*:/i.test(u))
-            return u; // scheme (http:, mailto:)
-        if (u.startsWith("//") || u.startsWith("#"))
-            return u; // protocol-rel / anchor
-        if (!u.startsWith("/"))
-            return u; // relative
-        if (u === "/" || u === "")
-            return u; // site home — global
-        if (u.startsWith(fullPrefix) || u === `/${seg}`)
-            return u; // already prefixed
-        // Global (taxonomy) prefixes live in one un-bucketed namespace.
-        const firstSeg = u.slice(1).split(/[/#?]/)[0];
-        if (globalPrefixes.has(firstSeg))
-            return u;
-        return `/${seg}${u}`;
-    };
-    // Raw HTML: rewrite the VALUE of each href="..."/src="..." attribute.
-    const rewriteHtml = (html) => html.replace(/\b(href|src)=("|')(.*?)\2/gi, (_m, attr, q, val) => `${attr}=${q}${prefix(val)}${q}`);
-    const walk = (node) => {
-        if (Array.isArray(node)) {
-            for (const item of node)
-                walk(item);
-            return;
-        }
-        if (!node || typeof node !== "object")
-            return;
-        const obj = node;
-        if (typeof obj.src === "string")
-            obj.src = prefix(obj.src);
-        if (typeof obj.href === "string")
-            obj.href = prefix(obj.href);
-        if (typeof obj.html === "string")
-            obj.html = rewriteHtml(obj.html);
-        // `::child-links{folder=…}` is a site path too: on a versioned or
-        // localized site it names a folder in THIS source's namespace.
-        if (obj.type === "child-links" && obj.props && typeof obj.props.folder === "string") {
-            const props = obj.props;
-            props.folder = prefix(`/${String(props.folder).replace(/^\/+/, "")}`);
-        }
-        // `scope=section` has no folder to prefix: record the source namespace,
-        // or the section resolves to the version segment (`/v2/`).
-        if (obj.type === "child-links" && obj.props && obj.props.scope === "section") {
-            obj.props.scopeBase = `/${seg}`;
-        }
-        for (const key of Object.keys(obj)) {
-            const val = obj[key];
-            if (val && typeof val === "object")
-                walk(val);
-        }
-    };
-    walk(tree);
-}
-function prefixSlugWithSegments(prefix, slug) {
-    if (prefix.length === 0)
-        return slug;
-    if (!slug)
-        return prefix.join("/");
-    return `${prefix.join("/")}/${slug}`;
-}
-/**
- * Inject prefix segments into nav hrefs that match the
- * configured basePath prefix. Skips external URLs and hrefs that
- * don't start with basePath (the latter is unusual but worth
- * tolerating — never silently rewrite something we don't
- * recognise).
- */
-function prefixNavHrefs(items, prefix, basePath) {
-    // basePath is normalised: "" or "/<seg>". For matching purposes
-    // we always work with a string ending in "/".
-    const matchPrefix = basePath ? `${basePath}/` : "/";
-    return items.map((item) => {
-        const next = { ...item };
-        if (item.href !== undefined) {
-            next.href = injectPrefixIntoHref(item.href, prefix, matchPrefix);
-        }
-        if (item.children && item.children.length > 0) {
-            next.children = prefixNavHrefs(item.children, prefix, basePath);
-        }
-        return next;
-    });
-}
-function injectPrefixIntoHref(href, prefix, matchPrefix) {
-    // External URLs pass through untouched.
-    if (/^[a-z][a-z0-9+.-]*:\/\//i.test(href) || href.startsWith("mailto:")) {
-        return href;
-    }
-    if (!href.startsWith(matchPrefix)) {
-        // Defensive: nav items not matching basePath stay as-is. In
-        // practice all importer-produced hrefs include basePath since
-        // we thread `hrefPrefix` through buildImportOptions.
-        return href;
-    }
-    const rest = href.slice(matchPrefix.length);
-    return `${matchPrefix}${prefix.join("/")}/${rest}`;
-}
-/** Title-case a namespace key for sidebar display. */
-function prettyNamespaceLabel(ns) {
-    return ns
-        .split("-")
-        .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
-        .join(" ");
-}
+// rewriteContentRefs (a prefixed source's site-root links get its segments)
+// lives in @dogsbay/site-files, shared with dogsbay-ssg.
+export { rewriteContentRefs };
 function resolveImporter(source, fromName) {
     if (fromName && fromName !== "auto") {
         const explicit = FORMATS.find((f) => f.name === fromName && f.canImport);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dogsbay",
-  "version": "0.2.0-beta.119",
+  "version": "0.2.0-beta.120",
   "description": "CLI for Dogsbay — scaffold, build, and serve documentation sites with markdown / MkDocs / Obsidian / OpenAPI sources",
   "type": "module",
   "bin": {
@@ -43,34 +43,35 @@
     "typescript": "^5.9.3",
     "valibot": "1.1.0",
     "yaml": "^2.9.0",
-    "@dogsbay/adoc2md-modular": "0.2.0-beta.119",
-    "@dogsbay/commands": "0.2.0-beta.119",
-    "@dogsbay/format-asciidoc": "0.2.0-beta.119",
-    "@dogsbay/autodoc-python": "0.2.0-beta.119",
-    "@dogsbay/format-astro": "0.2.0-beta.119",
-    "@dogsbay/format-dita": "0.2.0-beta.119",
-    "@dogsbay/format-docusaurus": "0.2.0-beta.119",
-    "@dogsbay/format-dogsbay-md": "0.2.0-beta.119",
-    "@dogsbay/format-fluidtopics-markdown": "0.2.0-beta.119",
-    "@dogsbay/format-fluidtopics-rest": "0.2.0-beta.119",
-    "@dogsbay/format-gatsby": "0.2.0-beta.119",
-    "@dogsbay/format-gitbook": "0.2.0-beta.119",
-    "@dogsbay/format-hugo": "0.2.0-beta.119",
-    "@dogsbay/format-mdx": "0.2.0-beta.119",
-    "@dogsbay/format-mkdocs": "0.2.0-beta.119",
-    "@dogsbay/format-myst": "0.2.0-beta.119",
-    "@dogsbay/format-obsidian": "0.2.0-beta.119",
-    "@dogsbay/format-openapi": "0.2.0-beta.119",
-    "@dogsbay/format-openknowledge": "0.2.0-beta.119",
-    "@dogsbay/format-rst": "0.2.0-beta.119",
-    "@dogsbay/format-starlight": "0.2.0-beta.119",
-    "@dogsbay/format-topicmap": "0.2.0-beta.119",
-    "@dogsbay/format-vitepress": "0.2.0-beta.119",
-    "@dogsbay/minja": "0.2.0-beta.119",
-    "@dogsbay/render": "0.2.0-beta.119",
-    "@dogsbay/serialize-core": "0.2.0-beta.119",
-    "@dogsbay/site-check": "0.2.0-beta.119",
-    "@dogsbay/types": "0.2.0-beta.119"
+    "@dogsbay/adoc2md-modular": "0.2.0-beta.120",
+    "@dogsbay/format-asciidoc": "0.2.0-beta.120",
+    "@dogsbay/commands": "0.2.0-beta.120",
+    "@dogsbay/autodoc-python": "0.2.0-beta.120",
+    "@dogsbay/format-astro": "0.2.0-beta.120",
+    "@dogsbay/format-dita": "0.2.0-beta.120",
+    "@dogsbay/format-docusaurus": "0.2.0-beta.120",
+    "@dogsbay/format-dogsbay-md": "0.2.0-beta.120",
+    "@dogsbay/format-fluidtopics-markdown": "0.2.0-beta.120",
+    "@dogsbay/format-fluidtopics-rest": "0.2.0-beta.120",
+    "@dogsbay/format-gatsby": "0.2.0-beta.120",
+    "@dogsbay/format-gitbook": "0.2.0-beta.120",
+    "@dogsbay/format-hugo": "0.2.0-beta.120",
+    "@dogsbay/format-mdx": "0.2.0-beta.120",
+    "@dogsbay/format-mkdocs": "0.2.0-beta.120",
+    "@dogsbay/format-myst": "0.2.0-beta.120",
+    "@dogsbay/format-openapi": "0.2.0-beta.120",
+    "@dogsbay/format-obsidian": "0.2.0-beta.120",
+    "@dogsbay/format-openknowledge": "0.2.0-beta.120",
+    "@dogsbay/format-rst": "0.2.0-beta.120",
+    "@dogsbay/format-topicmap": "0.2.0-beta.120",
+    "@dogsbay/format-starlight": "0.2.0-beta.120",
+    "@dogsbay/format-vitepress": "0.2.0-beta.120",
+    "@dogsbay/minja": "0.2.0-beta.120",
+    "@dogsbay/render": "0.2.0-beta.120",
+    "@dogsbay/serialize-core": "0.2.0-beta.120",
+    "@dogsbay/site-check": "0.2.0-beta.120",
+    "@dogsbay/site-files": "0.2.0-beta.120",
+    "@dogsbay/types": "0.2.0-beta.120"
   },
   "devDependencies": {
     "@mdx-js/mdx": "^3.1.1",