@heroiclands/package-build 23.1.0 → 23.2.0

package/engine/readability-lint.mjs

@@ -1,4 +1,13 @@
 /*
+ * This file is part of the Song of Heroic Lands (SoHL) system for Foundry VTT.
+ * Copyright (c) 2024-2026 Tom Rodriguez ("Toasty") — <toasty@heroiclands.org>
+ *
+ * This work is licensed under the GNU General Public License v3.0 (GPLv3).
+ * You may copy, modify, and distribute it under the terms of that license.
+ *
+ * For full terms, see the LICENSE.md file in the project root or visit:
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ *
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 

package/engine/reckoning-markers.mjs

@@ -1,4 +1,15 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * This file is part of the Song of Heroic Lands (SoHL) system for Foundry VTT.
+ * Copyright (c) 2024-2026 Tom Rodriguez ("Toasty") — <toasty@heroiclands.org>
+ *
+ * This work is licensed under the GNU General Public License v3.0 (GPLv3).
+ * You may copy, modify, and distribute it under the terms of that license.
+ *
+ * For full terms, see the LICENSE.md file in the project root or visit:
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 import { positionOfFrontmatterPath } from "./diagnostics.mjs";
 import {

package/engine/reference-targets.mjs

@@ -1,6 +1,13 @@
 /*
  * This file is part of the Song of Heroic Lands (SoHL) system for Foundry VTT.
  * Copyright (c) 2024-2026 Tom Rodriguez ("Toasty") — <toasty@heroiclands.org>
+ *
+ * This work is licensed under the GNU General Public License v3.0 (GPLv3).
+ * You may copy, modify, and distribute it under the terms of that license.
+ *
+ * For full terms, see the LICENSE.md file in the project root or visit:
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ *
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 

package/engine/runtime-only-fields.mjs

@@ -15,12 +15,9 @@
  * Schema fields a note may **never** author, because the document writes them
  * in play.
  *
- * `retired-fields.mjs` refuses a field a note may no longer declare; this
- * refuses one it never could. The two read alike deliberately — a note says one
- * thing, the build does another, and nothing says so — but they are different
- * facts, and only one of them is ever swept: a retired field goes away, while
+ * A note says one thing and the build does another, and nothing says so:
  * `onsetDate` is a permanent part of `affliction`'s schema that simply is not
- * content.
+ * content, so it is refused by name.
  *
  * ## What was going wrong
  *
@@ -65,7 +62,7 @@
 
 import { runtimeOnlyFields } from "./field-spec.mjs";
 import { getFrontmatter } from "./frontmatter.mjs";
-import { locateFrontmatterKey } from "./retired-fields.mjs";
+import { locateFrontmatterKey } from "./diagnostics.mjs";
 import { SYSTEM_DATA_KEY, systemData } from "./system-block.mjs";
 
 /**
@@ -107,7 +104,7 @@ export function runtimeOnlyMessage(key, field, file) {
 /**
  * The runtime-only fields a note actually writes, in declaration order.
  *
- * **Presence is the whole test**, as it is for every retired field: an authored
+ * **Presence is the whole test**: an authored
  * `onsetDate: null` is as much a claim about play state as a number is, and it
  * is exactly the belief the message exists to correct. So the question is
  * whether the path resolves to anything at all, never whether the value is a
@@ -115,7 +112,7 @@ export function runtimeOnlyMessage(key, field, file) {
  *
  * Only `<block>.system.<to>` is searched, because it is the only position a
  * runtime-only field is reachable at. Such a declaration carries no `name`, so
- * it has neither a legacy in-block key nor a shared top-level source — and a
+ * it has neither an in-block key nor a shared top-level source — and a
  * bare `<block>.onsetDate` is an unrecognized block key, which
  * {@link module:engine/system-block.unknownBlockKeys} already reports as an
  * error naming the note and the line.

package/engine/scene-levels.mjs

@@ -26,7 +26,7 @@
  *
  * and yields an empty collection. The very next world launch migrates that
  * scene, **persists `levels: []`**, and leaves `initialLevel` pointing at an id
- * that no longer exists — measured on both 14.359 and 14.367. The map image is
+ * that does not exist — measured on both 14.359 and 14.367. The map image is
  * gone for good, and the only symptom a human sees is a blank battlemap.
  *
  * Foundry is behaving correctly there: a scene with no Level records genuinely
@@ -34,7 +34,7 @@
  * permanent. So the pack build asserts the invariant on the artefact it just
  * wrote — the compiled LevelDB, not the JSON it was compiled from — because the
  * gap this closes is the write path (the emitter is already unit-tested, and
- * the compendium CLI has previously mishandled Scene Levels).
+ * the compendium CLI can mishandle Scene Levels).
  *
  * An {@link https://foundryvtt.com/api/classes/foundry.documents.BaseAdventure.html Adventure}
  * carries its scenes *inline*, levels and all, so the same invariant has a

package/engine/scenes.mjs

@@ -17,7 +17,7 @@
  *
  * A map note carries its Scene as exported from Foundry, at `data.scene`. The
  * build never constructs a Scene: {@link module:engine/exported-scene} passes
- * the export through, applying `data.fixup` and binding pins marked `#anchor`
+ * the export through, applying its fixups and binding pins marked `#anchor`
  * to the note's own journal pages.
  *
  * **Two outputs, for two different jobs.**

package/engine/shortcode-references.mjs

@@ -1,6 +1,13 @@
 /*
  * This file is part of the Song of Heroic Lands (SoHL) system for Foundry VTT.
  * Copyright (c) 2024-2026 Tom Rodriguez ("Toasty") — <toasty@heroiclands.org>
+ *
+ * This work is licensed under the GNU General Public License v3.0 (GPLv3).
+ * You may copy, modify, and distribute it under the terms of that license.
+ *
+ * For full terms, see the LICENSE.md file in the project root or visit:
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ *
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 

package/engine/site-build.mjs

@@ -71,6 +71,7 @@ import { renderFigureBlocks, scanFigures } from "./content-figures.mjs";
 import { footnoteFindings } from "./content-footnotes.mjs";
 import { collectAnchors, eventAnchors, markupAnchorFindings } from "./anchors.mjs";
 import { checkImages, renderImageFigures } from "./content-images.mjs";
+import { isAddressTuple } from "./address.mjs";
 import { assetPathnameKey, pathnameProblem, resolvePathname } from "./pathnames.mjs";
 import {
     buildSiteIndex,
@@ -229,7 +230,7 @@ export function collectContentPages(contentBase, ctx) {
         if (!note) continue;
         applyComputedBeingAge(note.fm, present, dates);
         const { fm, body, bodyLine } = note;
-        // The configuration's, never a note's: `package:` is retired, so every
+        // The configuration's, never a note's: a note declares no `package:`, so every
         // note in the tree belongs to the package this repository compiles.
         const pkg = ctx.contentPackage;
         if (!ctx.packages.has(pkg) || !fm.type) continue;
@@ -377,15 +378,26 @@ export function collectHomepages(contentBase, ctx) {
  * @param {import("./related-pages.mjs").Related} [options.related] - The
  *   homepage's backlinks and mentions. Absent where nothing connects to it,
  *   and when the tree contains only a homepage, where no content link resolves.
+ * @param {readonly object[]} [options.records] - The corpus, so a `data.banner`
+ *   address resolves against the images this package ships.
+ * @param {object} [options.foreign] - The dependencies' vendored indexes, so a
+ *   `data.banner` may name an image a dependency ships.
  * @returns {number} How many pages were written.
  */
-export function writeHomepages(outRoot, pages, config, { related } = {}) {
+export function writeHomepages(outRoot, pages, config, { related, records, foreign } = {}) {
+    const artIndex = assetAddressIndex(records ?? [], { config, foreign });
+    // A pathname no asset host serves resolves to `null`, which the theme reads
+    // as an unset banner rather than as a URL to nowhere.
+    const webSrc = (src) => resolvePathname(src, config)?.web ?? null;
+    const artSrc = (value, type, accepts) => artPathname(artIndex, value, type, accepts).pathname;
     for (const page of pages) {
         const data = homepageFrontmatter(page.fm, {
             contentPackage: config.contentPackage,
             title: homepageTitle(page.fm, config),
             related,
         });
+        if (isPlainObject(data.data)) data.data = { ...data.data };
+        resolveArtFields(data, webSrc, artSrc);
         const dest = path.join(outRoot, HOMEPAGE_DESTINATION);
         fs.mkdirSync(path.dirname(dest), { recursive: true });
         fs.writeFileSync(dest, matter.stringify(page.body, encodeAddresses(data)));
@@ -532,9 +544,7 @@ export function tableUniverse(pages) {
 /**
  * The frontmatter a page publishes with.
  *
- * An authored `aliases` is retired and refused before a build reaches
- * here, which makes this a guard rather than a working path. It is a list of
- * names a reader might call the note. Hugo reads
+ * An authored `aliases` is a list of names a reader might call the note. Hugo reads
  * `aliases` as **URL redirects**, so passing them through would publish a
  * redirect stub at each name. They are dropped, and this build emits no
  * redirects of its own.
@@ -556,7 +566,7 @@ export function tableUniverse(pages) {
  * `<base><slug>/`.
  *
  * A content page carries the package the build **derived**. No note
- * declares one — `package:` is retired — so the note's frontmatter alone
+ * declares one, so the note's frontmatter alone
  * would publish a page that does not say which package it belongs to. The
  * emitted page is what a theme reads: `breadcrumbs.html` reads
  * `.Params.package`. Writing the derived value keeps a page
@@ -629,7 +639,8 @@ function pageTitle(page) {
  * added to the vocabulary reaches the page without anyone remembering this
  * function exists. Only an authored **string** is touched: `null` is a note
  * naming no art and `""` is one naming none on purpose, and neither is an
- * address to resolve.
+ * address to resolve. A slot's declining word (`banner: none`) is emitted as
+ * a blank, the value a theme reads as "draw no image".
  *
  * **An address nothing answers is dropped**, not emitted as written. The theme
  * renders nothing where a value is absent — its silent-disappear convention —
@@ -643,11 +654,15 @@ function pageTitle(page) {
  * @returns {void}
  */
 function resolveArtFields(data, webSrc, artSrc) {
-    for (const { key, type, accepts } of ART_SLOTS) {
+    for (const { key, type, accepts, declines } of ART_SLOTS) {
         const holder = isPlainObject(data.data) ? data.data : null;
         if (!holder) continue;
         const value = holder[key];
-        if (typeof value !== "string" || value === "") continue;
+        if (declines !== undefined && value === declines) {
+            holder[key] = "";
+            continue;
+        }
+        if ((typeof value !== "string" && !isAddressTuple(value)) || value === "") continue;
         const pathname = artSrc(value, type, accepts);
         if (pathname === null) delete holder[key];
         else holder[key] = webSrc(pathname);
@@ -1229,8 +1244,8 @@ export function buildSite({ config, sqlTables } = {}) {
 
     const ctx = {
         packages,
-        // The package every note in the tree belongs to. `package:` is
-        // retired, so this is the only source of it.
+        // The package every note in the tree belongs to. a note declares no
+        // `package:`, so this is the only source of it.
         contentPackage: resolved.contentPackage,
         skipDirectories: resolved.skipDirectories,
         config: resolved,
@@ -1292,7 +1307,7 @@ export function buildSite({ config, sqlTables } = {}) {
     }
 
     // The whole tree is a build artifact, regenerated every run: a page whose
-    // note was deleted or renamed would otherwise linger and keep publishing.
+    // note was deleted or moved would otherwise linger and keep publishing.
     fs.rmSync(outBase, { recursive: true, force: true });
 
     // Homepage-only stops here, and stopping is the point: nothing below reads
@@ -1313,7 +1328,7 @@ export function buildSite({ config, sqlTables } = {}) {
             embedErrors: [],
             mapFindings: [],
             stats: {
-                homepages: writeHomepages(homeRoot, homepages, resolved),
+                homepages: writeHomepages(homeRoot, homepages, resolved, { records: ctx.records }),
                 out: homeRoot,
             },
         };
@@ -1397,9 +1412,6 @@ export function buildSite({ config, sqlTables } = {}) {
         maps: drawn.maps,
         pass,
         // 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
-        // publish 95 pages with empty sidebars for months without noticing.
         decorate: sitePageDecorator(resolved, gates.index),
     });
 
@@ -1408,6 +1420,8 @@ export function buildSite({ config, sqlTables } = {}) {
     // graph keys its block.
     const homepagesWritten = writeHomepages(homeRoot, homepages, resolved, {
         related: rendered.related.get(base),
+        records: ctx.records,
+        foreign: gates.foreign,
     });
 
     return {

package/engine/site-index.mjs

@@ -36,11 +36,8 @@
  * matched by the segments it supplies rather than fetched by an exact key —
  * one hit resolves, and anything else is a finding.
  *
- * **A page's *name* is not a key**. It was, as one of a set of
- * collision-aware fallbacks a bare `[[Name]]` was looked up in — which is what
- * made two pages of one type forbidden from sharing a display name. The
- * bare form is retired, so the fallbacks answer nothing and the constraint they
- * imposed is gone with them.
+ * **A page's *name* is not a key**, so two pages of one type may share a
+ * display name.
  *
  * **It reports rather than exits.** A build script owns its diagnostics and its
  * exit code; this returns what it found. That is the same rule the rest of the
@@ -200,11 +197,9 @@ export function buildSiteIndex(
     const packages = new Set(ownPackage ? [ownPackage] : []);
 
     // 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.
+    // filename and bare slug are not keys, so two pages of a type may 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 —
@@ -265,7 +260,7 @@ export function buildSiteIndex(
             // canonical form is what cross-package links use.
             // The page's package is the configured one — the site collection
             // resolves it and records it as `pkg`. Never read out of
-            // frontmatter: `package:` is retired.
+            // frontmatter: a note declares no `package:`.
             index.set(
                 canonicalKey(e.pkg ?? ownPackage, ownDocumentSystem(type), type, shortcode),
                 value,
@@ -387,11 +382,10 @@ export function resolveCrossNoteFigures(
  *   the one pass that resolves them.
  * @returns {object} The resolver context.
  *
- * There is deliberately **no `manifestsComplete`**. It used to let a resolver
- * soften an unresolved cross-package address while any package's manifest was
- * missing; the softening is retired, since the pack compilers and the link
- * checker never had it and one authored link must not get two verdicts. A
- * caller still passing it is ignored rather than obeyed.
+ * There is deliberately **no `manifestsComplete`**: an unresolved cross-package
+ * address is never softened while a manifest is missing, since the pack
+ * compilers and the link checker do not soften it and one authored link must
+ * not get two verdicts.
  */
 export function wikiContext(
     built,

package/engine/site-preview.mjs

@@ -2,6 +2,12 @@
  * This file is part of the Song of Heroic Lands (SoHL) system for Foundry VTT.
  * Copyright (c) 2024-2026 Tom Rodriguez ("Toasty") — <toasty@heroiclands.org>
  *
+ * This work is licensed under the GNU General Public License v3.0 (GPLv3).
+ * You may copy, modify, and distribute it under the terms of that license.
+ *
+ * For full terms, see the LICENSE.md file in the project root or visit:
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ *
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 

package/engine/site-root.mjs

@@ -1,5 +1,12 @@
 /*
  * This file is part of the Song of Heroic Lands (SoHL) system for Foundry VTT.
+ * Copyright (c) 2024-2026 Tom Rodriguez ("Toasty") — <toasty@heroiclands.org>
+ *
+ * This work is licensed under the GNU General Public License v3.0 (GPLv3).
+ * You may copy, modify, and distribute it under the terms of that license.
+ *
+ * For full terms, see the LICENSE.md file in the project root or visit:
+ * https://www.gnu.org/licenses/gpl-3.0.html
  *
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
@@ -216,7 +223,7 @@ export async function indexSite({ site, output }) {
  * sits there. Left in place it would redirect the prefix root — the homepage —
  * to an address nothing publishes. The same holds for a `pagefind/` left by an
  * earlier build when `search` is off: deployed, it is a working search over
- * pages that may no longer exist, so it goes too.
+ * pages that may not exist, so it goes too.
  *
  * `_headers` is written before the index is built, so a failed index leaves
  * the root files as they would be — the failure is the indexer's, reported as

package/engine/social-tie-terms.mjs

@@ -1,4 +1,15 @@
-/* SPDX-License-Identifier: GPL-3.0-or-later */
+/*
+ * This file is part of the Song of Heroic Lands (SoHL) system for Foundry VTT.
+ * Copyright (c) 2024-2026 Tom Rodriguez ("Toasty") — <toasty@heroiclands.org>
+ *
+ * This work is licensed under the GNU General Public License v3.0 (GPLv3).
+ * You may copy, modify, and distribute it under the terms of that license.
+ *
+ * For full terms, see the LICENSE.md file in the project root or visit:
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
 
 /** Relationships a being states from its own point of view. */
 export const SOCIAL_TIES = Object.freeze([

package/engine/social-ties.mjs

@@ -5,6 +5,9 @@
  * This work is licensed under the GNU General Public License v3.0 (GPLv3).
  * You may copy, modify, and distribute it under the terms of that license.
  *
+ * For full terms, see the LICENSE.md file in the project root or visit:
+ * https://www.gnu.org/licenses/gpl-3.0.html
+ *
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 

package/engine/sql-tables.mjs

@@ -569,7 +569,7 @@ function cellText(value, column) {
  * ships a link that does not resolve. A `_section` alias splits the result into
  * a headed table per distinct value, in the order the rows arrive — so the
  * authored `ORDER BY` decides the section order too, and one query replaces the
- * forty near-identical blocks the language used to require.
+ * forty near-identical blocks it would otherwise take.
  *
  * **A result selecting nothing still renders its header and rule.** The finding
  * is the point, not withholding the output: an authored heading with an empty
@@ -677,6 +677,17 @@ export function renderSqlTable(
 export async function prepareSqlTables(db, sources, { linkable, records } = {}) {
     const prepared = new Map();
     if (records) prepared.pageLists = preparePageLists(records, sources);
+    // The corpus does not change while a preparation runs, so a query written
+    // twice has one answer. Each use gets its own copy, because a caller
+    // rewrites the rows it is handed.
+    const answers = new Map();
+    const reader = {
+        ...db,
+        async query(sql) {
+            if (!answers.has(sql)) answers.set(sql, await db.query(sql));
+            return structuredClone(answers.get(sql));
+        },
+    };
     for (const { source, markdown } of sources) {
         const blocks = findSqlBlocks(markdown);
         if (!blocks.length) continue;
@@ -685,7 +696,7 @@ export async function prepareSqlTables(db, sources, { linkable, records } = {})
         for (const block of blocks) {
             try {
                 if (block.problems.length) throw new Error(block.problems.join("; "));
-                const result = await runSqlQuery(db, block.query);
+                const result = await runSqlQuery(reader, block.query);
                 forNote.push({
                     markdown: renderSqlTable(result, {
                         linkable,
@@ -810,9 +821,11 @@ export async function generatedSectionsFor(
  *   From {@link generatedSectionsFor}.
  * @param {Array<{source: string, markdown: string, frontmatter?: object}>} sources -
  *   The bodies to answer, extended in place.
+ * @param {Map<string, {body: string, frontmatter: object|null}>} [parsed] -
+ *   Notes already parsed, keyed by file; a note absent from it is read.
  * @returns {void}
  */
-export function joinGeneratedSections(generated, sources) {
+export function joinGeneratedSections(generated, sources, parsed) {
     for (const [absPath, text] of generated.sections) {
         const source = sources.find((one) => one.source === absPath);
         if (source) {
@@ -820,7 +833,7 @@ export function joinGeneratedSections(generated, sources) {
             continue;
         }
         if (!generated.views.has(absPath)) continue;
-        const { body, frontmatter } = parseMarkdownFile(absPath);
+        const { body, frontmatter } = parsed?.get(absPath) ?? parseMarkdownFile(absPath);
         sources.push({
             source: absPath,
             markdown: appendGeneratedSections(body, text),
@@ -847,6 +860,23 @@ export function attachGeneratedSections(prepared, generated) {
     }
 }
 
+/**
+ * Each declared dependency's cached index, as {@link openNotesDatabase} attaches
+ * them. Empty where none has been fetched.
+ *
+ * @param {object} [config] - Resolved configuration, defaulting to ambient.
+ * @returns {Promise<Array<{id: string, file: string}>>} The dependencies.
+ */
+export async function cachedDependencies(config) {
+    try {
+        const { cachedMetadataIndexes } = await import("./metadata-index.mjs");
+        const { loadPackConfig } = await import("./pack-config.mjs");
+        return cachedMetadataIndexes(config ?? loadPackConfig());
+    } catch {
+        return [];
+    }
+}
+
 /**
  * Answer every `sql` directive in a content tree.
  *
@@ -871,6 +901,14 @@ export function attachGeneratedSections(prepared, generated) {
  * @param {object[]} [opts.records] - Index records the caller already derived.
  *   A command that also builds a link index holds them already, and deriving
  *   them twice is the duplicated-corpus failure this closes.
+ * @param {Map<string, {body: string, frontmatter: object|null}>} [opts.parsed] -
+ *   The notes {@link module:engine/content-index.indexRecordsFor} parsed for
+ *   `records`, keyed by file, so no note is parsed twice. A note absent from it
+ *   is read.
+ * @param {object} [opts.database] - An open notes database over `records`, from
+ *   {@link openNotesDatabase} with this call's `audience` and the declared
+ *   dependencies from {@link cachedDependencies}. It is queried and left open;
+ *   absent, one is opened and closed here.
  * @param {"all"|"public"} [opts.audience] - Whether to exclude GM notes.
  * @param {Map<string, object>} [opts.foreignIndex] - The fetched indexes the
  *   generated sections take in, where the caller holds them already; absent,
@@ -881,21 +919,22 @@ export function attachGeneratedSections(prepared, generated) {
  */
 export async function prepareTreeSqlTables(
     contentBase,
-    { config, skipDirectories, records, audience = "all", foreignIndex } = {},
+    { config, skipDirectories, records, parsed, database, audience = "all", foreignIndex } = {},
 ) {
     // Imported here rather than at module scope: the index reaches the pack
     // compilers through `manifest-emit` → `journals`, so a static import from a
     // module they load would close a cycle and leave `BasePackCompiler`
     // uninitialised for whichever module the runtime happened to load first.
     const { indexRecordsFor } = await import("./content-index.mjs");
+    const notes = parsed ?? new Map();
     const indexRecords = (
-        records ?? indexRecordsFor({ contentBase, config, skipDirectories })
+        records ?? indexRecordsFor({ contentBase, config, skipDirectories, parsed: notes })
     ).filter((record) => audience !== "public" || !isGmNote(record));
 
     // Which notes carry a directive, discovered over the same corpus every
     // other pass reads rather than over a walk of this one's own. The
     // body has to be read to find a fence — the index carries no note text —
-    // but *which files* to read is no longer a second answer.
+    // but *which files* to read is not a second answer.
     //
     // `parseMarkdownFile` yields the body `walkMarkdownTree` yielded, trimmed
     // the same way, which matters: results are keyed by note and looked up by
@@ -905,7 +944,7 @@ export async function prepareTreeSqlTables(
     for (const record of indexRecords) {
         if (!isNoteRecord(record)) continue;
         const absPath = noteFile(contentBase, record);
-        const { body, frontmatter } = parseMarkdownFile(absPath);
+        const { body, frontmatter } = notes.get(absPath) ?? parseMarkdownFile(absPath);
         if (
             body &&
             (findSqlBlocks(body).length ||
@@ -953,7 +992,7 @@ export async function prepareTreeSqlTables(
         );
     if (!needsDatabase) {
         const pageOnly = new Map();
-        joinGeneratedSections(derivedOnly, sources);
+        joinGeneratedSections(derivedOnly, sources, notes);
         pageOnly.inline = new Map();
         pageOnly.pageLists = preparePageLists(indexRecords, sources);
         attachGeneratedSections(pageOnly, derivedOnly);
@@ -978,20 +1017,17 @@ export async function prepareTreeSqlTables(
     // same cycle reason the index is, and tolerated when absent: a tree with no
     // `sql` directive never reaches this line, and one whose dependency has not
     // been fetched already fails earlier with a message naming the fetch.
-    let dependencies = [];
-    try {
-        const { cachedMetadataIndexes } = await import("./metadata-index.mjs");
-        const { loadPackConfig } = await import("./pack-config.mjs");
-        dependencies = cachedMetadataIndexes(config ?? loadPackConfig());
-    } catch {
-        dependencies = [];
-    }
-    const db = await openNotesDatabase(indexRecords, { dependencies, audience });
+    const db =
+        database ??
+        (await openNotesDatabase(indexRecords, {
+            dependencies: await cachedDependencies(config),
+            audience,
+        }));
     try {
         const generated = await generatedSectionsFor(db, indexRecords, contentBase, {
             derived: derivedOnly.derived,
         });
-        joinGeneratedSections(generated, sources);
+        joinGeneratedSections(generated, sources, notes);
         const prepared = await prepareSqlTables(db, sources, {
             linkable: (ref) => addresses.has(renderAddress(ref)),
             records: indexRecords,
@@ -1000,6 +1036,6 @@ export async function prepareTreeSqlTables(
         attachGeneratedSections(prepared, generated);
         return prepared;
     } finally {
-        await db.close();
+        if (!database) await db.close();
     }
 }

package/engine/standing-terms.mjs

@@ -36,7 +36,8 @@ export const STANDING_BODY_TYPES = Object.freeze(["affiliation"]);
  *
  * `rank` is the level on the body's own `governance.ranks` ladder, and every
  * membership states one. `office` is a key of its `governance.offices` map, and
- * is stated only where the being holds a post.
+ * is stated only where the being holds a post. `societies` names the societies
+ * the membership is held in, as a list because a membership can span several.
  *
  * @type {readonly import("./data-keys.mjs").InnerKeySpec[]}
  */
@@ -56,6 +57,15 @@ export const STANDING_FIELDS = Object.freeze([
         shape: "a post from that body's `governance.offices`",
         describe: "A post the body names in its `governance.offices`, where one is held.",
     }),
+    Object.freeze({
+        name: "societies",
+        kind: "list",
+        shape: "a list of society names",
+        entries: Object.freeze({ kind: "string", shape: "a string" }),
+        describe:
+            "The societies the membership is held in, by name. SoHL carries one, " +
+            "the first, as the affiliation item's `system.society`.",
+    }),
 ]);
 
 /** The keys of {@link STANDING_FIELDS}, in declared order. */