@heroiclands/package-build 25.2.0 → 25.2.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @heroiclands/package-build
 
+## 25.2.1
+
+**Rendering and sites**
+
+- Preview tables display linked names cleanly and keep their following columns aligned.
+- Foundry journal page names show the readable text of headings containing names, links or emphasis.
+
 ## 25.2.0
 
 **Content and notes**

package/docs/content-format.md

@@ -25,7 +25,7 @@ Start with [your first note](authoring/first-note.md). It explains the smallest
 
 ## The shared note
 
-A nonempty note body creates one system-agnostic Foundry JournalEntry. Content before the first H1 becomes an introduction page; every H1 starts another JournalEntryPage. A lower-level heading with an explicit `{#anchor}` starts a page too, so a link can address it. The same prose becomes a web page and can be selected for a book. The content index records the note and its frontmatter for queries and navigation.
+A nonempty note body creates one system-agnostic Foundry JournalEntry. Content before the first H1 becomes an introduction page; every H1 starts another JournalEntryPage. A lower-level heading with an explicit `{#anchor}` starts a page too, so a link can address it. Each page name is its heading's visible text: spans, links and emphasis contribute their text without their markup. The same prose becomes a web page and can be selected for a book. The content index records the note and its frontmatter for queries and navigation.
 
 Leading `:` captions describe the next supported block; `:@` captions also number it. The optional type accepts `figure`, `table`, `verse`, `code`, `prose`, and `example`. Captions support identifiers, classes and named attributes; unsupported following blocks are errors. See [captions and numbered references](authoring/links-and-markup.md#captions-and-numbered-references).
 

package/docs/source-preview.md

@@ -37,7 +37,8 @@ source. A host that holds the package's content index builds an index with
 wikilink is a link, a link to a concealed note is concealed, an embed draws its
 picture, marked text is mapped and set in its face, an icon is drawn, and a
 caption is numbered with its asset's role, so a map is a **Map**. A query, which
-a buffer cannot run, stays highlighted source in both views.
+a buffer cannot run, stays highlighted source in both views. Table cells keep
+wikilinks and their labels together, including links inside marked spans.
 
 With an index, a marked-text run that cannot be set produces an error finding
 and sets the result's `ok` to `false`. The preview still returns recoverable

package/engine/journals.mjs

@@ -116,9 +116,9 @@ function namedBlockLines(markdown, syntax) {
  * code blocks are respected so `# foo` inside ``` or ~~~ blocks doesn't
  * trigger a split. Content before the first H1 (if non-empty) becomes a
  * leading page. Each H1 yields a page whose name is the heading
- * text (with any `{#anchor-id}` suffix stripped out and surfaced as
- * `anchorSlug`). The classes the heading declares come along as `classes`, so
- * a surface that honours one has it without reading the suffix again.
+ * text without inline markup (with any `{#anchor-id}` suffix stripped out and
+ * surfaced as `anchorSlug`). The classes the heading declares come along as
+ * `classes`, so a surface that honours one has it without reading the suffix again.
  *
  * `leadName` names that leading page. A journal note's is "Introduction",
  * because it introduces the pages that follow. An item doc's is the item — a
@@ -220,7 +220,7 @@ export function splitPages(body, leadName = "Introduction", resolveRole, syntax)
                 anchorSlug: null,
                 level: section.level,
                 classes: section.classes,
-                continues: item.slug || item.label || captionPageName(item.caption),
+                continues: item.slug || item.label || pageNameText(item.caption),
                 lines: [],
             };
         }
@@ -231,7 +231,7 @@ export function splitPages(body, leadName = "Introduction", resolveRole, syntax)
         if (figure) {
             closeCurrent();
             current = {
-                name: figure.label || captionPageName(figure.caption),
+                name: figure.label || pageNameText(figure.caption),
                 anchorSlug: figure.id || null,
                 level: 1,
                 classes: section.classes.includes(WITHHELD_CLASS) ? [WITHHELD_CLASS] : [],
@@ -243,7 +243,7 @@ export function splitPages(body, leadName = "Introduction", resolveRole, syntax)
         if (opening) {
             closeCurrent();
             current = {
-                name: opening.text,
+                name: pageNameText(opening.text),
                 anchorSlug: opening.id || null,
                 level: opening.level,
                 classes: opening.classes,
@@ -384,20 +384,20 @@ export function journalPageId(entryId, page) {
 }
 
 /**
- * The name of the page a caption begins: the caption's visible text.
+ * The name of a page a heading or caption begins: its visible text.
  *
- * Foundry shows a page name as plain text, so a caption's markup — emphasis, a
+ * Foundry shows a page name as plain text, so inline markup — emphasis, a
  * code span, a Markdown link, or the `@UUID[...]{label}` a resolved wikilink
  * has already become, inside its wrapping `<span>` — reduces to the text a
  * reader sees, the same text a reference to the caption displays. The markup
  * itself stays in the page's content, where it renders.
  *
- * @param {string} caption - The figure's caption, as the journal pass sees it.
+ * @param {string} markdown - A heading or caption, as the journal pass sees it.
  * @returns {string} Its visible text, whitespace collapsed.
  */
-function captionPageName(caption) {
-    if (!caption) return "";
-    const [inline] = md.parseInline(caption, {});
+function pageNameText(markdown) {
+    if (!markdown) return "";
+    const [inline] = md.parseInline(markdown, {});
     const text = (inline?.children ?? [])
         .map((token) =>
             token.type === "text" || token.type === "code_inline" ? token.content
@@ -501,7 +501,7 @@ function buildFigurePageFields(figure, page, pageId, footnoteNumbers, resolveRol
             // image's own render takes when no configuration resolves it.
         }
         return {
-            name: figure.label || captionPageName(figure.caption),
+            name: figure.label || pageNameText(figure.caption),
             type: "image",
             src,
             image: figure.hasCaption ? { caption: figure.caption } : {},
@@ -520,7 +520,7 @@ function buildFigurePageFields(figure, page, pageId, footnoteNumbers, resolveRol
         runs,
     );
     return {
-        name: figure.label || captionPageName(figure.caption),
+        name: figure.label || pageNameText(figure.caption),
         type: "text",
         text: {
             format: 1,

package/engine/preview-source.mjs

@@ -67,7 +67,8 @@ export const PREVIEW_HELPERS = Object.freeze({
  */
 export const INERT_BRACKET = "\uE000";
 
-const escapeHtml = new MarkdownIt().utils.escapeHtml;
+const syntax = new MarkdownIt();
+const escapeHtml = syntax.utils.escapeHtml;
 // An authored `<` stands as a private-use character until the HTML is written;
 // source is shown as it was authored.
 const escape = (value) => escapeHtml(String(value ?? "").replaceAll(INERT_BRACKET, "<"));
@@ -185,16 +186,16 @@ function withTrailingAttributes(rest, raw) {
 }
 
 /**
- * The cells of one table row, keeping a pipe inside a wikilink, a code span or
- * an extension's braces in its cell.
+ * The cells of one table row, keeping pipes inside balanced brackets, code
+ * spans and extension braces in their cell.
  *
  * @param {string} line - One table line.
  * @returns {string[]} The trimmed cells, without the empty edges.
  */
 function tableCells(line) {
     const result = [];
+    const state = new syntax.inline.State(line, syntax, {}, []);
     let cell = "",
-        wiki = false,
         code = "",
         quote = false,
         braces = 0;
@@ -204,7 +205,15 @@ function tableCells(line) {
             cell += char + line[++at];
             continue;
         }
-        if (char === "`" && !wiki) {
+        if (char === "[" && !code && !braces) {
+            const end = syntax.helpers.parseLinkLabel(state, at, false);
+            if (end >= 0) {
+                cell += line.slice(at, end + 1);
+                at = end;
+                continue;
+            }
+        }
+        if (char === "`") {
             const marks = /^`+/.exec(line.slice(at))[0];
             if (!code) code = marks;
             else if (code === marks) code = "";
@@ -213,13 +222,11 @@ function tableCells(line) {
             continue;
         }
         if (!code) {
-            if (line.slice(at, at + 2) === "[[") wiki = true;
-            if (line.slice(at - 1, at + 1) === "]]") wiki = false;
             if (char === '"' && braces) quote = !quote;
             if (!quote && char === "{") braces++;
             if (!quote && char === "}" && braces) braces--;
         }
-        if (char === "|" && !wiki && !code && !braces) {
+        if (char === "|" && !code && !braces) {
             result.push(cell.trim());
             cell = "";
         } else cell += char;

package/package.json

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

package/types/engine/journals.d.mts

@@ -3,9 +3,9 @@
  * code blocks are respected so `# foo` inside ``` or ~~~ blocks doesn't
  * trigger a split. Content before the first H1 (if non-empty) becomes a
  * leading page. Each H1 yields a page whose name is the heading
- * text (with any `{#anchor-id}` suffix stripped out and surfaced as
- * `anchorSlug`). The classes the heading declares come along as `classes`, so
- * a surface that honours one has it without reading the suffix again.
+ * text without inline markup (with any `{#anchor-id}` suffix stripped out and
+ * surfaced as `anchorSlug`). The classes the heading declares come along as
+ * `classes`, so a surface that honours one has it without reading the suffix again.
  *
  * `leadName` names that leading page. A journal note's is "Introduction",
  * because it introduces the pages that follow. An item doc's is the item — a