@heroiclands/package-build 22.2.0 → 22.3.0

package/engine/site-build.mjs

@@ -33,13 +33,12 @@
  * a function.
  *
  * **Every gate reports; none exits.** The integrity checks a site build needs —
- * a wikilink authored in frontmatter, a name that yields no slug, two pages
- * claiming one URL, an unusable or unaddressable foreign manifest, an address
- * two packages both claim, a table directive that cannot be honoured, a dead
- * wikilink — were inline `process.exit` calls in both scripts, with no test
- * between them. Here each returns its findings and the command decides. That is
- * the rule `engine/site-index.mjs` already follows, and it is the only reason
- * these cases can be tested at all.
+ * a wikilink authored in frontmatter, a name that yields no slug, an unusable
+ * or unaddressable foreign manifest, a table directive that cannot be
+ * honoured, a dead wikilink — were inline `process.exit` calls in both
+ * scripts, with no test between them. Here each returns its findings and the
+ * command decides. That is the rule `engine/site-index.mjs` already follows,
+ * and it is the only reason these cases can be tested at all.
  *
  * @module
  */
@@ -49,7 +48,6 @@ import path from "node:path";
 import { createRequire } from "node:module";
 import matter from "gray-matter";
 
-import { slugify } from "./content-slug.mjs";
 import { addressSlug } from "./content-address.mjs";
 import { protectCode } from "./code-fences.mjs";
 import { expandContentTables } from "./content-tables.mjs";
@@ -81,37 +79,6 @@ import { HUGO_CONTENT } from "./site-config.mjs";
 
 const require = createRequire(import.meta.url);
 
-/**
- * Every `.md` file under `dir`, depth-first in directory order.
- *
- * Deliberately *not* {@link walkMarkdownTree}, whose stack-based walk yields a
- * tree in reverse. Order was load-bearing here when the address index carried
- * first-writer-wins fallbacks for a page's name, filename and slug — reversing
- * the walk silently changed which page an ambiguous name resolved to. Those
- * fallbacks are gone with the bare `[[Name]]` form, so this is now
- * ordinary reading order rather than a dependency; it is kept because a site's
- * emitted pages should not reorder for no reason.
- *
- * @param {string} dir - Directory to walk.
- * @param {readonly string[]} skip - Directory names to ignore at any depth.
- * @returns {string[]} Absolute paths.
- */
-export function walkSiteTree(dir, skip = []) {
-    const out = [];
-    if (!fs.existsSync(dir)) return out;
-    const skipped = new Set(skip);
-    for (const e of fs.readdirSync(dir, { withFileTypes: true })) {
-        const full = path.join(dir, e.name);
-        if (e.isDirectory()) {
-            if (skipped.has(e.name)) continue;
-            out.push(...walkSiteTree(full, skip));
-        } else if (e.isFile() && e.name.endsWith(".md")) {
-            out.push(full);
-        }
-    }
-    return out;
-}
-
 /**
  * The content-tree files this build publishes from, in the order it emits them.
  *
@@ -135,10 +102,6 @@ export function walkSiteTree(dir, skip = []) {
  * is a fact about the filesystem, not about the content, so it can differ
  * between two checkouts of one tree; this order cannot.
  *
- * `collectTreePages` is deliberately **not** converted: it walks an auxiliary
- * tree (`site.trees`, the developer docs), which is not the content tree and
- * appears in no record.
- *
  * @param {string} contentBase - Root of the content tree.
  * @param {object} ctx - The build context. `ctx.records` is the corpus when the
  *   caller already derived it — the site build derives one and hands it to both
@@ -267,73 +230,6 @@ export function collectContentPages(contentBase, ctx) {
     return { pages, addressFindings, fmLinkFindings };
 }
 
-/**
- * An extra tree's pages — a documentation tree published alongside the content.
- *
- * These preserve their **source layout** below the section rather than being
- * addressed by type and slug: they are a book with chapters, and a reader
- * follows their paths. A `README` is its directory's landing.
- *
- * **The section is the tree's, never the note's.** `tree.section` is the
- * mount point a `trees` entry configures — fixed, physical, and the same
- * value `site-index.mjs` indexes a tree page's address under. A note's own
- * `subType` is a genre and reaches no address, the same contract
- * `packageAddress()` holds for a content page: reading it here would move a
- * page's URL, its file destination (`pageDestination`) and the address a
- * wikilink cites it by, every time an author classified it.
- *
- * @param {object} tree - `{ from, rel, section, route }`.
- * @param {object} ctx - `{ mount }`.
- * @returns {{pages: object[], fmLinkFindings: object[]}}
- */
-export function collectTreePages(tree, ctx) {
-    const pages = [];
-    const fmLinkFindings = [];
-
-    for (const file of walkSiteTree(tree.from)) {
-        const note = readNote(file);
-        if (!note) continue;
-        const { fm, body } = note;
-
-        for (const hit of frontmatterWikilinks(fm)) {
-            fmLinkFindings.push({ file, ...hit });
-        }
-
-        const rel = path.relative(tree.from, file).replace(/\\/g, "/");
-        const base = path.basename(rel);
-        const isReadme = base.toLowerCase() === "readme.md";
-        const sec = tree.section;
-        const h1 = /^#\s+(.+?)\s*$/m.exec(body);
-        const h1Title = h1 ? h1[1].replace(/\{@link\s+[^}]*\}/g, "").trim() : null;
-        const name = fm.name?.full ?? fm.title ?? h1Title ?? path.basename(base, ".md");
-        const slug = fm.slug ?? slugify(path.basename(base, ".md"));
-        const relNoExt = rel.slice(0, -3).toLowerCase();
-        const dir = path.posix.dirname(relNoExt);
-        pages.push({
-            kind: "tree",
-            tree,
-            fm,
-            // As above: the source file, for a located link diagnostic.
-            file,
-            // The H1 is stripped: the page title renders it.
-            body: body.replace(/^\s*#\s+.*$\r?\n?/m, ""),
-            name,
-            slug,
-            base,
-            rel,
-            sec,
-            url:
-                isReadme ?
-                    dir === "." ?
-                        `${ctx.mount}${sec}/`
-                    :   `${ctx.mount}${sec}/${dir}/`
-                :   `${ctx.mount}${sec}/${relNoExt}/`,
-            isReadme,
-        });
-    }
-    return { pages, fmLinkFindings };
-}
-
 /**
  * The package's homepage notes — the authored page at `/<contentPackage>/`.
  *
@@ -454,7 +350,6 @@ export function siteGates(pages, findings, { config }) {
         addressErrors: findings.addressFindings ?? [],
         staleManifests: [],
         unaddressable: [],
-        conflicts: [],
         index: null,
         foreign: null,
         manifests: null,
@@ -477,14 +372,10 @@ export function siteGates(pages, findings, { config }) {
     out.unaddressable = unaddressableForeignPackages(foreign.index);
     if (out.unaddressable.length) return out;
 
-    const index = buildSiteIndex(pages, {
+    out.index = buildSiteIndex(pages, {
         foreignIndex: foreign.index,
         noIndexPackages: noContentIndexPackages(config),
     });
-    out.conflicts = index.conflicts;
-    if (out.conflicts.length) return out;
-
-    out.index = index;
     return out;
 }
 
@@ -505,7 +396,6 @@ export function emptyGates() {
         addressErrors: [],
         staleManifests: [],
         unaddressable: [],
-        conflicts: [],
         index: null,
         foreign: null,
         manifests: null,
@@ -519,8 +409,7 @@ export function gatesFailed(gates) {
         gates.frontmatterLinks.length ||
         gates.addressErrors.length ||
         gates.staleManifests.length ||
-        gates.unaddressable.length ||
-        gates.conflicts.length,
+        gates.unaddressable.length,
     );
 }
 
@@ -622,15 +511,8 @@ export function sectionFrontmatter(meta) {
  * self-describing and makes sweeping the field out of a content tree
  * output-preserving for a site as it already is for the packs.
  *
- * A **tree** page is the one that still reads `readmeSections`: a `trees` entry
- * keeps its source layout below a named section, so its own `README` is that
- * section's landing and takes the title and hero the section declares.
- *
  * @param {object} page - The page.
  * @param {object} options
- * @param {Record<string, object>} [options.readmeSections] - The sections a
- *   published tree declares, which a tree page's own `README` is the landing
- *   for.
  * @param {(data: object, page: object) => void} [options.decorate] - Called
  *   with each page's frontmatter, for whatever a consumer's own pass adds.
  * @param {(value: unknown, type: string) => string|null} [options.artSrc] -
@@ -642,37 +524,25 @@ export function sectionFrontmatter(meta) {
  *   same way.
  * @returns {object} The frontmatter to write.
  */
-export function pageFrontmatter(page, { readmeSections = {}, decorate, webSrc, artSrc }) {
-    const { fm, name, slug, sec, isReadme } = page;
-    let data;
-    if (page.kind === "content") {
-        data = {
-            ...fm,
-            // Spread after the note's own frontmatter. Guarded because
-            // `package: undefined` is not a value YAML can carry.
-            ...(page.pkg ? { package: page.pkg } : {}),
-            // The address, stated — site-root relative, because Hugo prefixes
-            // the site's own base to it. `slug` is written beside it
-            // because it is the last segment of that address and Hugo's own key
-            // for one; it decides nothing while `url` is present, but a page
-            // that carried only `url` would report a slug Hugo had inferred
-            // from the filename.
-            slug,
-            url: `/${slug}/`,
-            title: fm.title ?? name,
-            kbfolder: page.folder,
-        };
-        if (decorate) decorate(data, page);
-    } else {
-        // A tree's own landing describes the *mount*, and nothing beneath it. A
-        // nested README is a sub-section's landing, and reading the section's
-        // entry for it would title every one of them alike and hang the section
-        // hero on each. Its title comes from its H1, like any other page's.
-        const isSectionRoot = path.posix.dirname(page.rel) === ".";
-        const meta = isReadme && isSectionRoot ? readmeSections[sec] : null;
-        data = { ...fm, title: meta?.title ?? fm.title ?? name };
-        if (meta) Object.assign(data, sectionFrontmatter(meta));
-    }
+export function pageFrontmatter(page, { decorate, webSrc, artSrc }) {
+    const { fm, name, slug } = page;
+    const data = {
+        ...fm,
+        // Spread after the note's own frontmatter. Guarded because
+        // `package: undefined` is not a value YAML can carry.
+        ...(page.pkg ? { package: page.pkg } : {}),
+        // The address, stated — site-root relative, because Hugo prefixes
+        // the site's own base to it. `slug` is written beside it
+        // because it is the last segment of that address and Hugo's own key
+        // for one; it decides nothing while `url` is present, but a page
+        // that carried only `url` would report a slug Hugo had inferred
+        // from the filename.
+        slug,
+        url: `/${slug}/`,
+        title: fm.title ?? name,
+        kbfolder: page.folder,
+    };
+    if (decorate) decorate(data, page);
     delete data.aliases;
     if (webSrc && artSrc) resolveArtFields(data, webSrc, artSrc);
     return data;
@@ -733,16 +603,11 @@ function isPlainObject(value) {
  * the same as another note's `type`, and `doc-gear.md` and `weapongear-gear.md`
  * are distinct whatever the sections.
  *
- * **A `trees` entry is the exception, and always was.** Those pages preserve
- * their source layout below a named section — they are a book with chapters,
- * addressed by their path — so a `README` there is still its directory's
- * `_index.md`.
+ * @param {object} page - The page.
+ * @returns {string} The file, relative to the mount.
  */
 export function pageDestination(page) {
-    if (page.kind === "content") return `${page.slug}.md`;
-    const rel =
-        page.isReadme ? path.posix.join(path.posix.dirname(page.rel), "_index.md") : page.rel;
-    return path.join(page.sec, rel);
+    return `${page.slug}.md`;
 }
 
 /**
@@ -755,10 +620,10 @@ export function pageDestination(page) {
  *    authored as a fenced `dataview` block, which `protectCode` would otherwise
  *    stash away before the expander saw it. Expanding first leaves an ordinary
  *    markdown table to walk, with every other fence still protected.
- * 2. **Then, inside protection**: the consumer's `beforeLinks` pass, wikilink
- *    resolution, and the consumer's `afterLinks` pass. A `{@link}` tag may sit
- *    in prose a wikilink also touches, so the repository's own rewrites bracket
- *    the shared one rather than replacing it.
+ * 2. **Then, inside protection**: the consumer's `beforeLinks` pass, then
+ *    wikilink resolution. A `{@link}` tag may sit in prose a wikilink also
+ *    touches, so the repository's own rewrite runs before the shared one
+ *    rather than replacing it.
  *
  * @param {object[]} pages - Every page.
  * @param {object} options - Everything the render needs.
@@ -772,7 +637,6 @@ export function renderPages(pages, options) {
         foreign,
         universe,
         pass = {},
-        readmeSections,
         decorate,
         linkable = (d) => Boolean(d.fm.shortcode),
         sqlTables,
@@ -834,11 +698,10 @@ export function renderPages(pages, options) {
     };
 
     for (const page of pages) {
-        // The page's path in the tree an author edits: below the content root
-        // for a content note, below the tree's own root for a `trees` page. It
-        // is not composed as `<section>/<basename>` for a content note,
-        // which named a directory that was never the note's.
-        const src = page.relPath ?? page.rel ?? page.base;
+        // The page's path in the tree an author edits, below the content
+        // root. It is not composed as `<section>/<basename>`, which named a
+        // directory that was never the note's.
+        const src = page.relPath ?? page.base;
         const ctx = wikiContext(index, {
             src,
             file: page.file,
@@ -854,7 +717,6 @@ export function renderPages(pages, options) {
             let t = text;
             if (pass.beforeLinks) t = pass.beforeLinks(t, page);
             t = resolveWebWikilinks(t, ctx);
-            if (pass.afterLinks) t = pass.afterLinks(t, page);
             // Last, so a consumer's own rewrites see the image as the note
             // wrote it rather than as a figure. Hugo is handed markdown, not a
             // rendered page, so a `{…}` directive left in the body would reach
@@ -862,26 +724,22 @@ export function renderPages(pages, options) {
             return renderImageFigures(t, webSrc);
         };
 
-        let body = page.body;
-        if (page.kind === "content") {
-            const { markdown, errors } = expandContentTables(body, {
-                docs: universe.get(page.pkg) ?? [],
-                linkable,
-                source: src,
-                // Prepared before this render began — DuckDB is async and this
-                // is not. Keyed by the note's own file, absolute here as in
-                // every other pass, so the three cannot disagree about a note.
-                sqlTables: sqlTables?.get(page.file),
-                self: {
-                    fm: searchableFrontmatter(page.fm, page.pkg),
-                    path: page.relPath,
-                },
-            });
-            tableErrors.push(...errors);
-            body = markdown;
-        }
+        const { markdown: body, errors } = expandContentTables(page.body, {
+            docs: universe.get(page.pkg) ?? [],
+            linkable,
+            source: src,
+            // Prepared before this render began — DuckDB is async and this
+            // is not. Keyed by the note's own file, absolute here as in
+            // every other pass, so the three cannot disagree about a note.
+            sqlTables: sqlTables?.get(page.file),
+            self: {
+                fm: searchableFrontmatter(page.fm, page.pkg),
+                path: page.relPath,
+            },
+        });
+        tableErrors.push(...errors);
 
-        const data = pageFrontmatter(page, { readmeSections, decorate, webSrc, artSrc });
+        const data = pageFrontmatter(page, { decorate, webSrc, artSrc });
         const dest = path.join(outRoot, pageDestination(page));
         fs.mkdirSync(path.dirname(dest), { recursive: true });
         fs.writeFileSync(dest, matter.stringify(protectCode(body, resolve), data));
@@ -915,9 +773,9 @@ export function renderPages(pages, options) {
  *   or its own address publishes nothing. Hugo generates a section page
  *   automatically only for a *top-level* content directory; below that, a
  *   directory without an `_index.md` is not a section, so its URL 404s while its
- *   children publish normally. With content pages flat, what that reaches is a
- *   `trees` entry's directory — the one thing left below the mount that a note
- *   creates.
+ *   children publish normally. With content pages flat, no note creates a
+ *   directory below the mount, so this reaches only what something else
+ *   placed there.
  *
  * **A section listing is not a page listing any more.** A layout that reads
  * `.Pages` off a section it declares here will find nothing, because no file is
@@ -1016,7 +874,7 @@ const SITE_PASSES = Object.freeze({
  *
  * @param {string|undefined} name - The configured name.
  * @param {object} options - The configured options, plus `repoRoot`.
- * @returns {{beforeLinks?: Function, afterLinks?: Function}} The bundle.
+ * @returns {{beforeLinks?: Function}} The bundle.
  */
 export function resolveSitePass(name, options) {
     if (!name) return {};
@@ -1177,8 +1035,7 @@ export function buildSite({ config, sqlTables } = {}) {
     }
 
     const content = collectContentPages(resolved.paths.content, ctx);
-    const pages = [...content.pages];
-    const fmLinkFindings = [...content.fmLinkFindings];
+    const { pages } = content;
 
     // The homepage is **indexed but not rendered**. Now that it has an
     // address, `[[homepage-root|Text]]` is an ordinary wikilink and has to
@@ -1197,22 +1054,7 @@ export function buildSite({ config, sqlTables } = {}) {
         url: `${base}${addressSlug(page.fm)}/`,
     }));
 
-    const trees = site.trees.map((t) => ({
-        ...t,
-        from: path.resolve(resolved.rootDir, t.from),
-        route: `${mount}${t.section}/`,
-    }));
-    for (const tree of trees) {
-        const got = collectTreePages(tree, ctx);
-        pages.push(...got.pages);
-        fmLinkFindings.push(...got.fmLinkFindings);
-    }
-
-    const gates = siteGates(
-        [...pages, ...homepageEntries],
-        { ...content, fmLinkFindings },
-        { config: resolved },
-    );
+    const gates = siteGates([...pages, ...homepageEntries], content, { config: resolved });
     if (gatesFailed(gates)) {
         return {
             gates,
@@ -1238,7 +1080,6 @@ export function buildSite({ config, sqlTables } = {}) {
         foreign: gates.foreign,
         universe: tableUniverse(pages),
         pass,
-        readmeSections: site.readmeSections,
         // What counts as a being is the toolchain's to say, not a consumer's.
         // Asking in a consumer's script is how one came to still be checking
         // `character` and `creature` months after they were retired, and to

package/engine/site-index.mjs

@@ -65,20 +65,14 @@ import { isDraftNote } from "./note-vocabulary.mjs";
  *
  * @typedef {object} SiteEntry
  * @property {string} kind   `"content"` for a note compiled from the content
- *                           tree, anything else for a page that carries no
- *                           `type`/`shortcode` (a developer doc, say). Only
- *                           content entries take part in type-scoped indexing.
+ *                           tree. Only content entries take part in
+ *                           type-scoped indexing; anything else is carried
+ *                           through unindexed.
  * @property {object} fm     The note's frontmatter.
  * @property {string} name   Display name.
  * @property {string} slug   URL segment.
- * @property {string} [sec]  The Hugo section a **tree** page is filed under, and
- *                           the first segment of the `<sec>/<slug>` address it
- *                           is reachable by. A content page has none: it is
- *                           addressed by `(type, shortcode)` and emitted flat.
  * @property {string} base   Source file's basename, e.g. `Climbing.md`.
  * @property {string} url    The page's published address.
- * @property {boolean} [isReadme]  Whether a tree page is its directory's
- *                           landing.
  */
 
 /**
@@ -94,23 +88,18 @@ import { isDraftNote } from "./note-vocabulary.mjs";
  *                                       from `index`.
  * @property {Set<string>} contentTypes  Every type the resolver should read as
  *                                       an address qualifier, local and foreign.
- * @property {Set<string>} sections      Section names, lowercased.
  * @property {Map<string, {name: string, url: string, subType?: string}>} refIndex
  *                                       `type:shortcode` → page, for callers
  *                                       resolving embedded references (a
  *                                       being's items, say).
- * @property {{key: string, package: string}[]} conflicts  Addresses claimed by
- *                                       more than one package. Non-empty is a
- *                                       build failure; the caller reports it.
  */
 
 /**
  * Merge the packages this build does not publish into the local index.
  *
  * Every canonical key is globally unique, so a foreign manifest merges straight
- * in — one map, one lookup, no precedence rule. A key already present is a
- * genuine conflict: two packages claiming one address, which is the case the
- * canonical form exists to make detectable.
+ * in — one map, one lookup, no precedence rule. It runs before the local pass
+ * writes a single key, so a local page always ends up owning its own address.
  *
  * The short `type/shortcode` form is merged too, because a bare `[[doc-xyz]]`
  * carries no package and must still find a foreign note when exactly one
@@ -122,22 +111,15 @@ import { isDraftNote } from "./note-vocabulary.mjs";
  *
  * @param {Map<string, object>} index - The local index, mutated.
  * @param {Map<string, {package: string, type?: string}>} foreignIndex - Merged in.
- * @returns {{conflicts: {key: string, package: string}[],
- *   ambiguous: Set<string>}} The addresses two packages both claim outright,
- *   and the short `type/shortcode` forms two foreign packages claim — those are
- *   left out of the index, so a resolver can say *ambiguous* rather than
- *   *nothing answers*.
+ * @returns {{ambiguous: Set<string>}} The short `type/shortcode` forms two
+ *   foreign packages claim — those are left out of the index, so a resolver
+ *   can say *ambiguous* rather than *nothing answers*.
  */
 function mergeForeign(index, foreignIndex) {
-    const conflicts = [];
     const short = new Map();
     const ambiguous = new Set();
 
     for (const [key, value] of foreignIndex) {
-        if (index.has(key)) {
-            conflicts.push({ key, package: value.package });
-            continue;
-        }
         index.set(key, value);
 
         const parts = readCanonicalKey(key);
@@ -154,7 +136,7 @@ function mergeForeign(index, foreignIndex) {
     for (const [key, value] of short) {
         if (!index.has(key)) index.set(key, value);
     }
-    return { conflicts, ambiguous };
+    return { ambiguous };
 }
 
 /**
@@ -178,7 +160,6 @@ export function buildSiteIndex(
 ) {
     const index = new Map();
     const contentTypes = new Set();
-    const sections = new Set();
     const refIndex = new Map();
     // Every package an address may name: this build's own, plus every one a
     // vendored manifest speaks for. Without it `readQualifier` cannot see the
@@ -187,30 +168,12 @@ export function buildSiteIndex(
     const ownPackage = contentPackage();
     const packages = new Set(ownPackage ? [ownPackage] : []);
 
-    // `section/slug` is unique by construction, and is now a **tree** page's
-    // address: a `trees` entry keeps its source layout below a named section,
-    // so `dev-docs/testing` is how one is cited. A content page carries no
-    // section at all and is addressed by `(type, shortcode)` below —
-    // indexing it here as well would have written `weapongear/weapongear-dagger`,
-    // a key no author could reasonably write.
-    //
-    // A page's name, filename and bare slug were indexed here too, as
-    // collision-aware fallbacks the bare `[[Name]]` form looked up; that form is
-    // retired and nothing consults them, so they are gone and with them the rule
-    // that two pages of a type may not share a name.
-    for (const e of entries) {
-        if (typeof e.sec !== "string" || !e.sec) continue;
-        sections.add(e.sec.toLowerCase());
-        // `draft` rides on every key a page is addressable by, because a link
-        // into a draft note renders marked whichever of them the author wrote.
-        // It decides nothing about resolution: the page is indexed and
-        // published as any other.
-        index.set(`${e.sec}/${e.slug}`.toLowerCase(), {
-            url: e.url,
-            name: e.name,
-            draft: isDraftNote(e.fm),
-        });
-    }
+    // A page is addressed by `(type, shortcode)` and nothing else. Its name,
+    // filename and bare slug are not keys: the bare `[[Name]]` form that
+    // looked them up is retired, and with it the rule that two pages of a
+    // type may not share a name. A page carries no section either — a
+    // section is a listing the configuration declares, not part of any
+    // address.
 
     // A foreign package may use a type this build has never seen. Seeding those
     // is what lets the resolver recognise `polity-xyz` as an address at all —
@@ -226,15 +189,11 @@ export function buildSiteIndex(
     // the local packages, so a manifest should never carry one — this is what
     // makes that a belt-and-braces rather than the only thing standing between
     // a stale vendored manifest and a shadowed local page.
-    //
-    // The corollary is that a conflict can only be reported against the keys
-    // that exist at this point — the addressing ones, `section/slug` and the
-    // bare fallbacks — which is precisely the overlap worth refusing.
-    const { conflicts, ambiguous } = mergeForeign(index, foreignIndex);
+    const { ambiguous } = mergeForeign(index, foreignIndex);
 
     for (const e of entries) {
-        // A page with no type or shortcode — a developer doc — is addressable
-        // by section and name, and takes no part in type-scoped indexing.
+        // Only a content note is addressable; anything else is carried
+        // through and takes no part in type-scoped indexing.
         if (e.kind !== "content") continue;
         const type = String(e.fm.type).toLowerCase();
         contentTypes.add(type);
@@ -303,11 +262,9 @@ export function buildSiteIndex(
         index,
         ambiguous,
         contentTypes,
-        sections,
         packages,
         noIndexPackages,
         refIndex,
-        conflicts,
     };
 }
 
@@ -352,7 +309,6 @@ export function wikiContext(
         // a URL and a name, an asset's carries the path to a file.
         assets,
         collide: built.ambiguous,
-        sections: built.sections,
         contentTypes: built.contentTypes,
         packages: built.packages,
         noIndexPackages: built.noIndexPackages,

package/engine/web-wikilinks.mjs

@@ -312,7 +312,7 @@ function isPlainMap(value) {
  * for the website, and what the book reads its staging list out of.
  *
  * @param {string} body - The markdown body.
- * @param {object} ctx - `{ index, assets, collide, sections, contentTypes,
+ * @param {object} ctx - `{ index, assets, collide, contentTypes,
  *   packages, noIndexPackages, foreign, type, errors, src, file }`.
  *   `packages` is every package an address may name, without which the leading
  *   package segment of a canonical address reads as an unknown type;
@@ -415,10 +415,6 @@ export function resolveWebWikilinks(body, ctx) {
         const rawKey = target.toLowerCase();
         const hit =
             lookupRead(ctx.index, read, ctx.contentPackage) ??
-            // `section/slug` is the site's own address for a page, and it is in
-            // the same map. Admitted only when the target carries a slash, so
-            // a page's bare slug cannot answer for an address.
-            (rawKey.includes("/") ? ctx.index.get(rawKey) : undefined) ??
             // A manifest entry carries the same `{ url, name }` shape as a
             // local one, so a cross-package hit needs no special case
             // below. Local wins: a live build is authoritative and a vendored
@@ -449,16 +445,6 @@ export function resolveWebWikilinks(body, ctx) {
             return hit.draft ? draftLink(link) : link;
         }
 
-        const slash = target.indexOf("/");
-        const prefix = slash === -1 ? null : target.slice(0, slash).toLowerCase();
-        // A slash-qualified target whose prefix is a real KB **section** is an
-        // address in the site's own `section/slug` space, which the lookup
-        // above already consulted. It parses as no `type/shortcode`, but it did
-        // address something and nothing answered — so it is unresolved, not
-        // unaddressable. (A prefix that is a content *type* never reaches here:
-        // it parses as an address.)
-        const siteAddress = prefix !== null && ctx.sections.has(prefix);
-
         // **An address resolving nowhere is a failure, unconditionally**.
         //
         // It was gated on a manifest-completeness check — while any linkable package was
@@ -485,7 +471,7 @@ export function resolveWebWikilinks(body, ctx) {
             ctx.collide?.has(collideKey) ? "ambiguous"
                 // "It parsed as an address" is a property of the parse, not of
                 // a key: a partial address has no single key to be non-null.
-            : (read && !read.reason) || siteAddress ? "unresolved"
+            : read && !read.reason ? "unresolved"
             : read?.reason === "unknown-type" ? "unknown-type"
             : read?.reason === "no-content-index" ? "no-content-index"
                 // Every link is an address, and this is not one. Distinct from