@heroiclands/package-build 22.12.2 → 22.13.0

package/engine/note-addresses.mjs

@@ -24,7 +24,13 @@ export { AddressEntries, encodeAddresses, cloneAddressState } from "./address-va
 
 /** Structured positions whose Address is nested inside a declared container. */
 export const STRUCTURED_ADDRESSES = Object.freeze([
-    { path: ["packFolder"], shape: "scalar-or-map", type: "folder", accepts: ["folder"] },
+    {
+        path: ["packFolder"],
+        shape: "scalar-or-map",
+        type: "folder",
+        accepts: ["folder"],
+        system: "none",
+    },
     {
         noteType: "affiliation",
         path: ["data", "governance", "ranks", "*", "lore"],
@@ -67,6 +73,9 @@ export function addressPositions(fm, context = {}) {
                 shape,
                 type: field.ref,
                 accepts: field.accepts,
+                ...(ASSET_TYPE_NAMES.has(field.ref) || field.ref === "folder" ?
+                    { system: "none" }
+                :   {}),
             });
     }
     out.push(...STRUCTURED_ADDRESSES.filter((p) => !p.noteType || p.noteType === fm.type));
@@ -79,7 +88,7 @@ export function addressPositions(fm, context = {}) {
             shape: "scalar-or-map",
             type: "folder",
             accepts: ["folder"],
-            system,
+            system: "none",
         });
         out.push({
             path: [system, "items", "*", "model"],
@@ -93,7 +102,7 @@ export function addressPositions(fm, context = {}) {
                 shape: "value",
                 type: slot.type,
                 accepts: slot.accepts,
-                system,
+                system: "none",
             });
         const spec = context.systemBlocks?.[system];
         for (const [index, entry] of (Array.isArray(fm[system]?.items) ?
@@ -121,7 +130,13 @@ export function addressPositions(fm, context = {}) {
                         field.address.holds === "items" ? "list" : (field.address.holds ?? "value"),
                     type: field.address.type,
                     accepts: field.address.accepts,
-                    system,
+                    system:
+                        (
+                            ASSET_TYPE_NAMES.has(field.address.type) ||
+                            field.address.type === "folder"
+                        ) ?
+                            "none"
+                        :   system,
                 });
             }
         }
@@ -135,7 +150,10 @@ export function addressPositions(fm, context = {}) {
                 shape: field.address.holds === "items" ? "list" : (field.address.holds ?? "value"),
                 type: field.address.type,
                 accepts: field.address.accepts,
-                system,
+                system:
+                    ASSET_TYPE_NAMES.has(field.address.type) || field.address.type === "folder" ?
+                        "none"
+                    :   system,
             };
             out.push({ ...position, path: [system, "system", ...field.to.split(".")] });
             out.push({
@@ -143,7 +161,7 @@ export function addressPositions(fm, context = {}) {
                 path: [system, ...(field.legacyKey ?? field.name).split(".")],
             });
             if (field.name?.startsWith("data.") && field.topLevelMeans === undefined)
-                out.push({ ...position, system: "none", path: field.name.slice(5).split(".") });
+                out.push({ ...position, path: field.name.slice(5).split(".") });
         }
     }
     for (const position of [...out]) {
@@ -171,7 +189,7 @@ export function decodeNoteAddresses(fm, context) {
         const defaults = {
             ...context,
             types,
-            system: position.system ?? context.system ?? "none",
+            system: position.system ?? context.system ?? "note",
             type: position.type,
         };
         const fail = (value, path, description) => {
@@ -277,7 +295,7 @@ export function noteAddressContext(config) {
     }
     return {
         package: config.contentPackage,
-        system: "none",
+        system: "note",
         systemBlocks,
     };
 }
@@ -313,7 +331,7 @@ export function decodeIndexAddresses(record, context) {
             written,
             {
                 ...context,
-                system: "none",
+                system: "note",
                 types: new Set([...Object.keys(NOTE_VOCABULARY), ...ASSET_TYPE_NAMES]),
             },
             { declared: true },

package/engine/note-ids.mjs

@@ -44,6 +44,9 @@ import { documentId } from "./content-address.mjs";
 import { systemOf } from "./document-subtypes.mjs";
 import { contentPackage } from "./content-package.mjs";
 import { KNOWN_DOCUMENT_SUBTYPE_MAPS } from "./subtype-registry.mjs";
+import { JOURNAL_TYPES } from "./ids.mjs";
+import { NOTE_SYSTEM } from "./systems.mjs";
+import { HOMEPAGE_TYPE } from "./homepage.mjs";
 // The folder id's derivation, taken from the pass that owns it rather than
 // restated here — see the `folder` branch below. `folder-notes.mjs` reaches
 // only `content-address`, `address-charset`, `ids` and `retired-fields`, none
@@ -112,7 +115,9 @@ export function noteDocId(fm, { pkg, maps = KNOWN_DOCUMENT_SUBTYPE_MAPS } = {})
     // the two must answer alike about the same note or the divergence this
     // branch closes reopens under a capitalised `type: Folder`.
     if (type.toLowerCase() === FOLDER_TYPE) return folderDocId(owner, shortcode);
-    return documentId(owner, systemOf(type, maps), type, shortcode);
+    const system =
+        JOURNAL_TYPES.has(type) || type === HOMEPAGE_TYPE ? NOTE_SYSTEM : systemOf(type, maps);
+    return documentId(owner, system, type, shortcode);
 }
 
 /**

package/engine/place-relations.mjs

@@ -67,7 +67,7 @@ import { encodeAddresses } from "./address-values.mjs";
 
 import { positionOfFrontmatterPath } from "./diagnostics.mjs";
 import { acceptsType, parseAddress, renderAddress } from "./address.mjs";
-import { NO_SYSTEM } from "./document-subtypes.mjs";
+import { NOTE_SYSTEM } from "./systems.mjs";
 
 /* --------------------------------------------------------------------- */
 /*  The closed sets                                                       */
@@ -232,7 +232,7 @@ function addressDefaults(index) {
         packages: index?.packages,
         noIndexPackages: index?.noIndexPackages,
         package: index?.contentPackage,
-        system: NO_SYSTEM,
+        system: NOTE_SYSTEM,
         type: RELATION_TYPE,
     };
 }
@@ -356,7 +356,7 @@ function checkRelation(note, { field, index }) {
         here.package && self ?
             renderAddress({
                 package: here.package,
-                system: NO_SYSTEM,
+                system: NOTE_SYSTEM,
                 type: RELATION_TYPE,
                 shortcode: self,
             })
@@ -425,7 +425,7 @@ function checkRelation(note, { field, index }) {
                 "to",
                 `${label(i, "to")} must name a place — the other place's \`shortcode\`, or ` +
                     `its address as \`${RELATION_TYPE}-<shortcode>\` or ` +
-                    `\`<package>-${NO_SYSTEM}-${RELATION_TYPE}-<shortcode>\` for a place in ` +
+                    `\`<package>-${NOTE_SYSTEM}-${RELATION_TYPE}-<shortcode>\` for a place in ` +
                     `another package — but reads ${JSON.stringify(encodeAddresses(to))}`,
             );
         } else if (!acceptsType(read, [RELATION_TYPE])) {

package/engine/reference-targets.mjs

@@ -4,9 +4,10 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { completeAddress, renderAddress } from "./address.mjs";
-import { systemOf } from "./document-subtypes.mjs";
-import { KNOWN_DOCUMENT_SUBTYPE_MAPS } from "./subtype-registry.mjs";
+import { completeAddress, ownDocumentSystem, renderAddress } from "./address.mjs";
+import { NOTE_SYSTEM } from "./systems.mjs";
+import { JOURNAL_TYPES } from "./ids.mjs";
+import { hasDocEntry } from "./item-docs.mjs";
 
 /**
  * Names and published destinations for reference presentation.
@@ -21,10 +22,9 @@ export function buildReferenceTargets(records, published = new Map()) {
     for (const record of records) {
         if (!record.package || !record.type || !record.shortcode) continue;
         const value = { name: record.name?.full ?? record.name, subType: record.subType };
-        for (const system of new Set([
-            systemOf(record.type, KNOWN_DOCUMENT_SUBTYPE_MAPS),
-            "none",
-        ])) {
+        const systems = new Set([ownDocumentSystem(record.type)]);
+        if (JOURNAL_TYPES.has(record.type) || hasDocEntry(record.type)) systems.add(NOTE_SYSTEM);
+        for (const system of systems) {
             const address = completeAddress({
                 package: record.package,
                 system,

package/engine/shortcode-references.mjs

@@ -52,7 +52,7 @@ export function resolveShortcodeReference(indexes, code, hint) {
     const { address: native, value } = matches.values().next().value;
     const address = completeAddress({
         package: native.package,
-        system: "none",
+        system: "note",
         type: native.type,
         shortcode: native.shortcode,
     });

package/engine/site-index.mjs

@@ -61,12 +61,9 @@ import {
     parseAddress,
     renderAddress,
     isAddressTuple,
-    completeAddress,
+    ownDocumentSystem,
 } from "./address.mjs";
-import { NO_SYSTEM } from "./systems.mjs";
-import { systemOf } from "./document-subtypes.mjs";
-import { KNOWN_DOCUMENT_SUBTYPE_MAPS } from "./note-claims.mjs";
-import { hasDocEntry } from "./item-docs.mjs";
+import { NOTE_SYSTEM } from "./systems.mjs";
 import { contentPackage } from "./content-package.mjs";
 // The declared tag vocabulary, which is where `draft` is stated.
 import { isDraftNote } from "./note-vocabulary.mjs";
@@ -241,42 +238,14 @@ export function buildSiteIndex(
             // resolves it and records it as `pkg`. Never read out of
             // frontmatter: `package:` is retired.
             index.set(
-                canonicalKey(
-                    e.pkg ?? ownPackage,
-                    systemOf(type, KNOWN_DOCUMENT_SUBTYPE_MAPS),
-                    type,
-                    shortcode,
-                ),
+                canonicalKey(e.pkg ?? ownPackage, ownDocumentSystem(type), type, shortcode),
                 value,
             );
             if (e.pkg) packages.add(e.pkg);
-            // In Foundry an item and its documentation are two documents, so
-            // `skill/wpnc` and `docskill/wpnc` are two UUIDs. Here the
-            // item note renders as one page which *is* its documentation, so
-            // the two qualifiers alias one URL and an anchor on either is an
-            // ordinary in-page anchor. One authored link, correct in both
-            // builds — restricted to the types that actually have an item doc,
-            // so a qualifier the packs would reject is reported broken here too.
-            const proseAddress = completeAddress({
-                package: e.pkg ?? ownPackage,
-                system: NO_SYSTEM,
-                type,
-                shortcode,
-            });
-            if (proseAddress.type !== type || hasDocEntry(type)) {
-                contentTypes.add(`doc${type}`);
-                index.set(`doc${type}/${shortcode}`.toLowerCase(), value);
-                // The canonical documentation address too, so the page answers
-                // to the address a bare prose link expands to: body
-                // prose is under no system block, so it defaults to `none`, and
-                // a system-bearing type's `none` address is its `doc<type>`
-                // one. In Foundry that names a second document; here it names
-                // this same page, which is what makes one authored link correct
-                // in both builds.
-                index.set(
-                    canonicalKey(e.pkg ?? ownPackage, NO_SYSTEM, `doc${type}`, shortcode),
-                    value,
-                );
+            // A web page is the readable `note` target for every type.
+            if (ownDocumentSystem(type) !== NOTE_SYSTEM) {
+                // The same page answers to its readable Address.
+                index.set(canonicalKey(e.pkg ?? ownPackage, NOTE_SYSTEM, type, shortcode), value);
             }
         }
     }
@@ -375,7 +344,7 @@ export function resolveInfoboxRef(siteIndex, ref, hint) {
     }
     const context = {
         package: siteIndex.contentPackage ?? contentPackage(),
-        system: "none",
+        system: "note",
         types: siteIndex.contentTypes,
         packages: siteIndex.packages,
     };

package/engine/sql-tables.mjs

@@ -253,7 +253,7 @@ export async function openNotesDatabase(records, { dir, dependencies = [], addre
         addressContext: addressContext ?? {
             package: records.find((record) => record.package)?.package,
             types: new Set(Object.keys(NOTE_VOCABULARY)),
-            system: "none",
+            system: "note",
         },
         stubsExcluded,
         async query(sql) {

package/engine/systems.mjs

@@ -62,6 +62,9 @@ import { ADDRESS_SEGMENT_PATTERN, isAddressSegment } from "./address-charset.mjs
  */
 export const NO_SYSTEM = "none";
 
+/** The Address segment for a note's readable content. */
+export const NOTE_SYSTEM = "note";
+
 /**
  * Every game system this toolchain compiles for.
  *
@@ -86,7 +89,7 @@ export const SYSTEM_IDS = Object.freeze(new Set(["sohl", "hm3"]));
  *
  * @type {ReadonlySet<string>}
  */
-export const SYSTEM_SEGMENTS = Object.freeze(new Set([...SYSTEM_IDS, NO_SYSTEM]));
+export const SYSTEM_SEGMENTS = Object.freeze(new Set([...SYSTEM_IDS, NO_SYSTEM, NOTE_SYSTEM]));
 
 /**
  * Whether a value names a game system this toolchain knows.

package/engine/web-wikilinks.mjs

@@ -48,7 +48,7 @@ import { replaceOutsideCode } from "./code-fences.mjs";
 // address is matched the way a vendored manifest publishes it — by the
 // segments the target supplies, with the system wildcarded unless stated.
 import { canonicalKey, expandAddress, readCanonicalKey } from "./content-address.mjs";
-import { NO_SYSTEM } from "./systems.mjs";
+import { NOTE_SYSTEM } from "./systems.mjs";
 // The one rule about a link's shape both builds share: it carries a label, and
 // {@link unlabelledLinkMessage} is the one place that says so.
 import { unlabelledLinkMessage } from "./wikilink-syntax.mjs";
@@ -102,7 +102,7 @@ function lookupRead(index, read, contentPackage) {
     // It replaced a system-blind short key for the unqualified form, which
     // could be silently overwritten by a second note of the same
     // `(type, shortcode)` under another system.
-    const key = expandAddress(read, { package: contentPackage, system: NO_SYSTEM });
+    const key = expandAddress(read, { package: contentPackage, system: NOTE_SYSTEM });
     const found = index.get(key);
     if (found || read.package) return found;
 
@@ -393,7 +393,7 @@ export function resolveWebWikilinks(body, ctx) {
     return replaceOutsideCode(embedded.markdown, WIKILINK, (all, rawInner) => {
         const parsed = readWikilink(rawInner, {
             package: ctx.contentPackage,
-            system: "none",
+            system: "note",
             types: ctx.contentTypes ?? new Set(),
             packages: ctx.packages,
             noIndexPackages: ctx.noIndexPackages,

package/engine/wikilinks.mjs

@@ -12,74 +12,17 @@
  */
 
 /**
- * Wikilink resolution for the pack compilers.
+ * Resolve body wikilinks for Foundry packs.
  *
- * Content notes link to one another with wikilinks rather than file paths:
+ * `[[type-shortcode|Text]]` defaults to the readable `note` Address. A stated
+ * game system names an Actor or Item; `none` names a systemless document.
+ * Journal links can carry a heading anchor. Actor, Item and Macro links open
+ * their sheets, so their anchors do not select a page.
  *
- *   `[[type-shortcode|Text]]`   a document of that type
- *   `[[type-shortcode|]]`       the same, showing the target's current name
- *   `[[type-shortcode#slug|T]]` a section (see below)
- *   `[[#slug|Text]]`            a section of the source note itself
- *   `[[doctype-shortcode|T]]`   an item's *documentation* (see below)
+ * `doc<type>` is accepted as an input alias for the readable note Address.
+ * A link with an empty label displays the target's current name.
  *
- * **Every link is an address, and every address carries a label**. A
- * link written without one addresses nothing and is reported — see
- * {@link unlabelledLinkMessage}, which states the rule for both builds. The
- * bare `[[Alias]]` form and the index it was looked up in are retired.
- *
- * The qualifier is the note's **type**, which with its shortcode is the system's
- * logical identity: `(type, shortcode)` is unique by rule (see the Shortcode
- * Integrity doc). It is deliberately not the note's directory — shortcodes are
- * unique per type, not per directory, so a directory qualifier would add nothing
- * to the address while breaking every inbound link the moment a note is refiled.
- *
- * Nothing narrower than `(type, shortcode)` is consulted — a note's directory
- * and its `category` play no part in resolution — and nothing wider: a note's
- * *name* is not an address, so two notes of a type may share a display name
- * ("Gear" as a rules page and as a user guide page) with nothing to disambiguate.
- *
- * At compile time each becomes a Foundry UUID enricher, routed to the pack that
- * the target's type compiles into (see {@link packForType}):
- *
- *   `@UUID[Compendium.sohl.items.Item.<id>]{Text}`
- *   `@UUID[Compendium.sohl.journals.JournalEntry.<id>.JournalEntryPage.<anchorId>]{Text}`
- *
- * **Every address is computed once, when the target is indexed** — see
- * {@link buildWikilinkIndex} — and a link is resolved by looking that value up.
- * Nothing here concatenates a prefix at the point of use.
- *
- * Section links address a **JournalEntryPage**, because Foundry UUIDs cannot
- * target a position inside a page. A heading carrying `{#slug}` therefore starts
- * its own page, whose id is {@link anchorPageId} — derived from the note id and
- * the slug so that the link and the page agree without any shared state.
- *
- * **An anchor on an Item, an Actor or a Macro is a no-op** and is dropped. What
- * such a link does is open that document's **sheet** — not its documentation —
- * and a sheet has no sections to address. Only a JournalEntry link opens a
- * journal, at its first page or at the page an anchor names. An item's pages are
- * reached through its `doc<type>` counterpart, below.
- *
- * **A document and its documentation are two documents.** An item note
- * compiles into an item — and, separately, its prose compiles into a
- * JournalEntry in the journals pack (see
- * {@link sohl.utils.packs.itemDocEntryId}); a macro note works the same way.
- * `skill/wpnc` addresses the skill; the **virtual qualifier**
- * `docskill/wpnc` addresses that skill's documentation, and
- * `docskill/wpnc#crafting` a page within it. `docmacro/autoattack#script`
- * reaches a macro's source. Every doc-carrying type has a `doc<type>`
- * counterpart, formed by prefix and never enumerated; see
- * {@link resolveItemDocType}. Without it a section link to an item note
- * produced a UUID against the *items* pack, which cannot hold a
- * JournalEntryPage, and dead-ended.
- *
- * **The two builds read the qualifier differently, by design.** In Foundry the
- * item and its documentation are separate documents in separate packs, so the
- * two qualifiers resolve to two different UUIDs. On the knowledgebase the item
- * note renders as a single page which *is* its documentation, so `doc<type>` and
- * `<type>` are aliases for the same URL and an anchor on either is an ordinary
- * in-page anchor. One authored link, correct in both.
- *
- * Plain ESM with no Foundry and no filesystem access, so it is unit-testable.
+ * @module
  */
 
 import { resolveShortcodeReference } from "./shortcode-references.mjs";
@@ -100,12 +43,13 @@ import {
     renderAddress,
     isAddressTuple,
     completeAddress,
+    ownDocumentSystem,
 } from "./address.mjs";
 import { ASSET_TYPE_NAMES } from "./asset-types.mjs";
-import { NO_SYSTEM } from "./systems.mjs";
+import { NOTE_SYSTEM } from "./systems.mjs";
 import { systemOf } from "./document-subtypes.mjs";
 import { KNOWN_DOCUMENT_SUBTYPE_MAPS } from "./subtype-registry.mjs";
-import { itemDocEntryId } from "./item-docs.mjs";
+import { hasDocEntry, itemDocEntryId } from "./item-docs.mjs";
 import { replaceOutsideCode } from "./code-fences.mjs";
 // The syntax lives in `./wikilink-syntax.mjs`, so the web resolver and this
 // one cannot disagree about what counts as a link.
@@ -228,10 +172,8 @@ export function buildWikilinkIndex(
                     // type and a UUID carries the pack name, so the address
                     // cannot be derived from the type alone.
                     uuid: compendiumUuid(packageId, d.type, d.id, d.pack),
-                    // An item's prose compiles into a separate JournalEntry,
-                    // addressed by the virtual `doc<type>` qualifier. Its id
-                    // is derived from the item's, so its address is knowable
-                    // here too.
+                    // The readable note has a separate JournalEntry whose id
+                    // is derived from the item's id.
                     docUuid: compendiumUuid(packageId, "doc", itemDocEntryId(d.id), d.docPack),
                 },
         );
@@ -249,19 +191,8 @@ export function buildWikilinkIndex(
     for (const v of foreignByKey.values()) {
         if (v.type) foreignTypes.push(norm(v.type));
     }
-    // A manifest publishes `doc<type>` addresses, but `doc<type>` is a
-    // *virtual* qualifier formed by prefix — never a real type. Admitting it
-    // here would make it one, and a real type owns its own name, so the
-    // virtual reading would stop firing and every `[[docskill-wpnc]]` would
-    // resolve nowhere. The virtual form still reaches a foreign documentation
-    // entry: it reads as `skill` + `itemDoc`, which the manifest lookup then
-    // asks for as `docskill`.
-    //
-    // Real types are admitted **first**, in a pass of their own, so the test
-    // below sees the complete set. Done in one pass it would depend on
-    // manifest iteration order wherever the base type is published only by a
-    // foreign package — `docmacro` admitted or not according to whether
-    // `macro` happened to come first.
+    // A legacy index may contain `doc<type>` records. Keep the authored type
+    // vocabulary separate so the input alias can resolve to its base type.
     for (const t of foreignTypes) {
         if (!t.startsWith(ITEM_DOC_PREFIX)) types.add(t);
     }
@@ -334,7 +265,8 @@ function findForeign(index, read) {
  */
 function foreignHits(index, read) {
     if (!read || read.reason || !index.foreign?.size) return [];
-    const wanted = norm(read.itemDoc ? `doc${read.type}` : read.type);
+    const tuple = completeAddress(read, { package: index.contentPackage, system: NOTE_SYSTEM });
+    const wanted = norm(tuple.type);
     const shortcode = norm(read.shortcode);
 
     // **An omitted package means this package**, so a short form
@@ -348,7 +280,7 @@ function foreignHits(index, read) {
     // than a filter. That is what makes a cross-package `ambiguous` impossible:
     // one key, one entry.
     if (!read.package) return [];
-    const wantedSystem = norm(read.system ?? NO_SYSTEM);
+    const wantedSystem = norm(tuple.system);
     const hits = [];
     for (const [key, entry] of index.foreign) {
         const parts = readCanonicalKey(key);
@@ -460,7 +392,7 @@ export function convertWikilinks(markdown, { type, id, pack, docPack, index }) {
     const out = replaceOutsideCode(markdown, WIKILINK, (all, rawInner, offset) => {
         const parsed = readWikilink(rawInner, {
             package: index.contentPackage,
-            system: "none",
+            system: "note",
             types: index.types,
             packages: index.packages,
             noIndexPackages: index.noIndexPackages,
@@ -516,20 +448,13 @@ export function convertWikilinks(markdown, { type, id, pack, docPack, index }) {
                 });
                 return unresolvedLink(text || target, target);
             }
-            // An omitted system defaults from where the link is written,
-            // and a body is under no system block, so it is `none`. Under
-            // `none` a system-bearing type addresses its *documentation* — a
-            // note's `none` address IS its `doc<type>` entry — which is what a
-            // prose link almost always means. Stating the system is how prose
-            // reaches the Item instead.
-            //
-            // Only a type whose *own* document carries a system is redirected.
-            // A `macro` and the map types have documentation journals too, but
-            // their own documents are core ones already at `none`, so
-            // `macro-autoattack` names the Macro and `docmacro-autoattack` its
-            // journal — two live addresses the redirect would collapse.
+            // Ordinary wikilinks default to readable note content.
             const baseType = resolveItemDocType(qualified.type, index.types);
-            itemDoc = Boolean(baseType);
+            const address = completeAddress(qualified, {
+                package: index.contentPackage,
+                system: NOTE_SYSTEM,
+            });
+            itemDoc = address.system === NOTE_SYSTEM && hasDocEntry(baseType ?? qualified.type);
             if (qualified.package === index.contentPackage)
                 doc = index.byShortcode.get(`${baseType ?? qualified.type}/${qualified.shortcode}`);
         }
@@ -615,7 +540,7 @@ export function convertWikilinks(markdown, { type, id, pack, docPack, index }) {
         // *sheet*, which has no sections, so the anchor has nothing to address
         // and is dropped. Forging a JournalEntryPage id onto a document that
         // can never hold one is what made such links dead-end; an
-        // item's pages are addressed through its `doc<type>` counterpart.
+        // an item's pages are addressed through its `note` Address.
         // A `#section` the target declares no heading for. Checked here, and
         // not only by `content-build links`, because this is the build that
         // *emits* the link: `anchorPageId` will hash any slug into a page id,
@@ -672,7 +597,7 @@ export function resolveReference(index, ref, hint) {
         );
     const tuple = parseAddress(ref, {
         package: index.contentPackage,
-        system: "none",
+        system: "note",
         types: index.types,
         packages: index.packages,
         noIndexPackages: index.noIndexPackages,
@@ -699,15 +624,15 @@ export function resolveReference(index, ref, hint) {
             if (foreign) return { ...foreign, address: tuple };
             return undefined;
         }
-        const base = resolveItemDocType(tuple.type, index.types);
-        const type = base ?? tuple.type;
-        if (tuple.system !== (base ? NO_SYSTEM : systemOf(type, KNOWN_DOCUMENT_SUBTYPE_MAPS)))
+        const type = tuple.type;
+        const documentation = tuple.system === NOTE_SYSTEM && hasDocEntry(type);
+        if (tuple.system !== (documentation ? NOTE_SYSTEM : ownDocumentSystem(type)))
             return undefined;
         const local = index.byShortcode?.get(`${type}/${tuple.shortcode}`);
         if (!local) return undefined;
         const addresses = index.uuidByDoc?.get(local);
         const uuid =
-            base ?
+            documentation ?
                 Object.hasOwn(local, "documentationUuid") ?
                     local.documentationUuid
                 :   addresses?.docUuid

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@heroiclands/package-build",
-    "version": "22.12.2",
+    "version": "22.13.0",
     "description": "Shared toolchain for building and shipping a HeroicLands Foundry VTT package — content compilation, manifest, localization, staging, bundle, release and deployment.",
     "license": "GPL-3.0-or-later",
     "type": "module",

package/sohl/infobox.mjs

@@ -270,7 +270,7 @@ function itemPresentation(item, resolve, block) {
     if (!item.shortcode) return undefined;
     if (!item.address)
         return resolve?.(item.shortcode, { kind: "shortcode", type: item.type, system: block });
-    const documentation = completeAddress({ ...item.address, system: "none" });
+    const documentation = completeAddress({ ...item.address, system: "note" });
     const found = resolve?.(documentation, { type: documentation.type });
     const native =
         !found?.name || !found?.subType ? resolve?.(item.address, { type: item.type }) : undefined;
@@ -556,7 +556,7 @@ export function affiliationSections(fm, ctx) {
     const entries = value.map((skill) => {
         const native = ctx.resolve?.(skill, { type: "skill", system: "sohl" });
         const docAddress =
-            isAddressTuple(skill) ? completeAddress({ ...skill, system: "none" }) : undefined;
+            isAddressTuple(skill) ? completeAddress({ ...skill, system: "note" }) : undefined;
         const doc = docAddress ? ctx.resolve?.(docAddress, { type: docAddress.type }) : undefined;
         return {
             text: doc?.name || native?.name || humanizeValue(skill),