@dogsbay/format-dogsbay-md 0.2.0-beta.125 → 0.2.0-beta.126

package/dist/browser.d.ts

@@ -13,6 +13,7 @@
  */
 export { dogsbayMdToTree, parseInline, type ParseResult, type ParseOptions } from "./parse.js";
 export { KNOWN_INLINE_DIRECTIVES, type ParseDiagnostic } from "./diagnostics.js";
+export { KNOWN_BLOCK_DIRECTIVES } from "./plugin-containers.js";
 export { treeToDogsbayMd, nodeToDogsbayMd } from "./serialize.js";
 export type { SerializeOptions } from "./types.js";
 export { inlineToDogsbayMd } from "./inline.js";

package/dist/browser.js

@@ -13,6 +13,8 @@
  */
 export { dogsbayMdToTree, parseInline } from "./parse.js";
 export { KNOWN_INLINE_DIRECTIVES } from "./diagnostics.js";
+// The `:::name` blocks the parser knows (an editor completes names from it)
+export { KNOWN_BLOCK_DIRECTIVES } from "./plugin-containers.js";
 export { treeToDogsbayMd, nodeToDogsbayMd } from "./serialize.js";
 export { inlineToDogsbayMd } from "./inline.js";
 export { transformCodeRegions, transformProseLines, transformProseSegments, fenceOpenBefore, createFenceTracker, } from "./code-regions.js";

package/dist/container-rule.d.ts

@@ -0,0 +1,49 @@
+/**
+ * The `:::name` container block rule: markdown-it-container 4.0.0 (MIT,
+ * Vitaly Puzrin, Alex Kocharin), adapted. Two changes, both in how the
+ * closing line is found:
+ *
+ * 1. A closer may carry an HTML comment, `::: <!-- end note -->`, the way an
+ *    author labels an XML end tag. The comment changes nothing about which
+ *    container closes; it rides on the close token (`info`) so the parser can
+ *    keep it and diagnostics can check the name.
+ * 2. A `:::` line inside a code block does not close the container.
+ *    markdown-it-container scanned raw lines, so a code example showing a
+ *    directive closed the container around it and the rest of the page became
+ *    one code block, with no message. Which lines are code comes from one
+ *    block-level pass over the source with containers off (codeLines).
+ *
+ * Everything else (the colon rule, indentation, auto-close at the end of the
+ * parent) is markdown-it-container's.
+ *
+ * markdown-it-container's licence:
+ *
+ * Copyright (c) 2015 Vitaly Puzrin, Alex Kocharin.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+import type MarkdownIt from "markdown-it";
+export interface ContainerOptions {
+    validate: (params: string, markup: string) => boolean;
+    render?: (tokens: unknown[], idx: number) => string;
+}
+export declare function containerRule(md: MarkdownIt, name: string, options: ContainerOptions): void;

package/dist/container-rule.js

@@ -0,0 +1,139 @@
+/**
+ * What may follow a closer's colons: nothing, or spaces and one HTML comment, then spaces. The
+ * comment is not optional inside the group: `[ \t]*(…)?[ \t]*` backtracks quadratically on a long
+ * run of spaces followed by anything else.
+ */
+const CLOSER_TAIL = /^(?:[ \t]*|[ \t]*(<!--(?:(?!-->)[\s\S])*-->)[ \t]*)$/;
+/** state.env keys: the pre-pass that finds the code, and its result. */
+const NO_CONTAINERS = "__dogsbayNoContainers";
+const CODE_LINES = "__dogsbayCodeLines";
+/**
+ * The source lines inside a fenced code block, from one block-level pass over the whole source
+ * with containers switched off, made the first time a container needs it and kept in the parse's
+ * env. A `:::` line cannot change where a fence starts or ends (a fence ends only at its own
+ * closing fence or the end of its list item or quote), so the pass agrees with the real parse,
+ * and markdown-it reads fences in quotes, list items and definitions as a line scan does not.
+ * One pass per parse, so the cost is linear however many containers there are or how deep.
+ *
+ * Only a fence that CLOSES counts. With no container to end it, an unclosed fence in the pass runs
+ * to the end of the page, and every closer after it would be code: a ````` ```` ````` fence closed
+ * with three backticks would take the rest of the page into its container. Left out, it ends at
+ * the container's closer, as with markdown-it-container. (Still misread, and no worse than
+ * markdown-it-container: a `:::name` straight after a list item, lazily continuing it in the pass,
+ * so a fence indented four in the container is read in the item.)
+ */
+function codeLines(state) {
+    const env = state.env;
+    const cached = env?.[CODE_LINES];
+    if (cached && cached.src === state.src && cached.md === state.md)
+        return cached.lines;
+    const tokens = [];
+    state.md.block.parse(state.src, state.md, { [NO_CONTAINERS]: true }, tokens);
+    const source = state.src.split(/\r\n|\r|\n/);
+    const lines = new Set();
+    for (const t of tokens) {
+        if (t.type !== "fence" || !t.map || !closesFence(source[t.map[1] - 1], t.markup, t.map[1] - 1 > t.map[0]))
+            continue;
+        // A fence's opening line is not inside it; the lines after it, to its closing fence, are
+        for (let l = t.map[0] + 1; l < t.map[1]; l++)
+            lines.add(l);
+    }
+    if (env)
+        env[CODE_LINES] = { src: state.src, md: state.md, lines };
+    return lines;
+}
+/** Whether `line` (as written, with any `>` and indentation) is the closing fence of a fence opened with `markup`. */
+function closesFence(line, markup, after) {
+    if (!after || line === undefined)
+        return false;
+    const m = /^[ \t>]*(`{3,}|~{3,})[ \t]*$/.exec(line);
+    return m !== null && m[1][0] === markup[0] && m[1].length >= markup.length;
+}
+export function containerRule(md, name, options) {
+    const MARKER = ":".charCodeAt(0);
+    function container(state, startLine, endLine, silent) {
+        let start = state.bMarks[startLine] + state.tShift[startLine];
+        let max = state.eMarks[startLine];
+        if (state.src.charCodeAt(start) !== MARKER)
+            return false;
+        if (state.env?.[NO_CONTAINERS])
+            return false;
+        let pos = start + 1;
+        while (pos <= max && state.src.charCodeAt(pos) === MARKER)
+            pos++;
+        const markerCount = pos - start;
+        if (markerCount < 3)
+            return false;
+        const markup = state.src.slice(start, pos);
+        const params = state.src.slice(pos, max);
+        if (!options.validate(params, markup))
+            return false;
+        if (silent)
+            return true;
+        const oldParent = state.parentType;
+        const oldLineMax = state.lineMax;
+        state.parentType = "container";
+        let code;
+        let nextLine = startLine;
+        let autoClosed = false;
+        let closeMarkup = "";
+        let closeComment = "";
+        let skippedCloser;
+        for (;;) {
+            nextLine++;
+            // unclosed: closed by the end of the document or of the parent block
+            if (nextLine >= endLine)
+                break;
+            start = state.bMarks[nextLine] + state.tShift[nextLine];
+            max = state.eMarks[nextLine];
+            // a non-empty line indented less than the block ends it (a list item's container)
+            if (start < max && state.sCount[nextLine] < state.blkIndent)
+                break;
+            if (state.src.charCodeAt(start) !== MARKER)
+                continue;
+            // a closer is indented less than 4 spaces
+            if (state.sCount[nextLine] - state.blkIndent >= 4)
+                continue;
+            pos = start + 1;
+            while (pos < max && state.src.charCodeAt(pos) === MARKER)
+                pos++;
+            // a closer has at least as many colons as the opener
+            if (pos - start < markerCount)
+                continue;
+            const tail = CLOSER_TAIL.exec(state.src.slice(pos, max));
+            if (!tail)
+                continue;
+            // a `:::` in a code example is code
+            if ((code ??= codeLines(state)).has(nextLine)) {
+                skippedCloser ??= nextLine;
+                continue;
+            }
+            autoClosed = true;
+            closeMarkup = state.src.slice(start, pos);
+            closeComment = tail[1] ?? "";
+            break;
+        }
+        // lazy continuations never run past the closer
+        state.lineMax = nextLine;
+        const open = state.push(`container_${name}_open`, "div", 1);
+        open.markup = markup;
+        open.block = true;
+        open.info = params;
+        open.map = [startLine, nextLine];
+        if (skippedCloser !== undefined && !autoClosed)
+            open.meta = { ...(open.meta ?? {}), skippedCloser };
+        state.md.block.tokenize(state, startLine + 1, nextLine);
+        const close = state.push(`container_${name}_close`, "div", -1);
+        close.markup = closeMarkup;
+        close.block = true;
+        close.info = closeComment;
+        state.parentType = oldParent;
+        state.lineMax = oldLineMax;
+        state.line = nextLine + (autoClosed ? 1 : 0);
+        return true;
+    }
+    md.block.ruler.before("fence", `container_${name}`, container, { alt: ["paragraph", "reference", "blockquote", "list"] });
+    const render = options.render ?? (() => "");
+    md.renderer.rules[`container_${name}_open`] = render;
+    md.renderer.rules[`container_${name}_close`] = render;
+}

package/dist/diagnostics.d.ts

@@ -2,19 +2,26 @@ export interface ParseDiagnostic {
     /** 1-based line in the source (front matter counted). */
     line: number;
     /** Stable kind, for filtering. */
-    code: "unclosed-container" | "stray-closer" | "unknown-container" | "unknown-inline" | "bad-attributes";
+    code: "unclosed-container" | "stray-closer" | "unknown-container" | "unknown-inline" | "block-directive-inline" | "bad-attributes" | "closer-mismatch" | "dropped-attributes" | "missing-label";
     message: string;
 }
 /**
  * Whether a source line closes a container opened with `colons` colons. The
  * line may sit in a blockquote or a list item: its `>` markers and
- * indentation come first.
+ * indentation come first. A closer may carry one HTML comment, an end-tag
+ * label: `::: <!-- end note -->` (container-rule.ts).
  */
 export declare const closesContainer: (line: string | undefined, colons: number) => boolean;
+/**
+ * The container a closer's comment names, when it names one: `<!-- end note -->`,
+ * `<!-- /note -->` or `<!-- note -->`. Any other comment is the author's own words.
+ */
+export declare function closerLabel(comment: string): string | undefined;
 /** The inline directives the parser turns into nodes (parse.ts inlineDirectiveToNode); any other name stays literal text. */
 export declare const KNOWN_INLINE_DIRECTIVES: ReadonlySet<string>;
 type Token = {
     type: string;
+    attrs?: Array<[string, string]> | null;
     tag: string;
     info: string;
     markup: string;
@@ -23,6 +30,7 @@ type Token = {
     children: Token[] | null;
     meta: {
         unclosed?: boolean;
+        skippedCloser?: number;
     } | null;
 };
 /**

package/dist/diagnostics.js

@@ -8,15 +8,28 @@
  * here: the parser passes any leaf through as a node of that type, and only a
  * renderer knows whether it can draw it (render-html reports the ones it can't).
  */
-import { GENERIC_CONTAINER } from "./plugin-containers.js";
+import { GENERIC_CONTAINER, KNOWN_BLOCK_DIRECTIVES } from "./plugin-containers.js";
+import { PRECEDES_TEXT } from "./plugin-inline-directives.js";
 /**
  * Whether a source line closes a container opened with `colons` colons. The
  * line may sit in a blockquote or a list item: its `>` markers and
- * indentation come first.
+ * indentation come first. A closer may carry one HTML comment, an end-tag
+ * label: `::: <!-- end note -->` (container-rule.ts).
  */
-export const closesContainer = (line, colons) => line !== undefined && new RegExp(`^:{${colons},}\\s*$`).test(line.replace(/^[\s>]*/, ""));
+export const closesContainer = (line, colons) => line !== undefined && new RegExp(`^:{${colons},}[ \\t]*(?:<!--(?:(?!-->)[\\s\\S])*-->[ \\t]*)?$`).test(line.replace(/^[\s>]*/, ""));
+/**
+ * The container a closer's comment names, when it names one: `<!-- end note -->`,
+ * `<!-- /note -->` or `<!-- note -->`. Any other comment is the author's own words.
+ */
+export function closerLabel(comment) {
+    return /^<!--\s*(?:end\s+|\/)?:*([A-Za-z][\w-]*)\s*-->$/.exec(comment.trim())?.[1];
+}
 /** The inline directives the parser turns into nodes (parse.ts inlineDirectiveToNode); any other name stays literal text. */
 export const KNOWN_INLINE_DIRECTIVES = new Set(["kbd", "icon", "math", "mark", "highlight", "button", "badge"]);
+/** Directives that are blocks: `::name{…}` draws one only on a line of its own (parse.ts mapContainerToTreeNode). */
+const BLOCK_DIRECTIVES = new Set([...KNOWN_BLOCK_DIRECTIVES, "avatar", "child-links", "link-card", "openapi", "autodoc"]);
+/** Inline tokens markdown-it-attrs can give attributes to that the parser has no field for (links and images keep theirs). */
+const ATTRLESS_INLINE = { strong_open: "bold text", em_open: "italic text", s_open: "struck-through text", code_inline: "inline code" };
 /**
  * Why an attribute block `{…}` cannot be read, or undefined when it can.
  * parseAttrs never fails: it reads what it can and drops the rest, so a
@@ -59,7 +72,11 @@ export function collectDiagnostics(tokens, lines, lineOf) {
                 const name = generic ? (/^[A-Za-z][\w-]*/.exec(info)?.[0] ?? info) : open[1];
                 const colons = (tok.markup ?? ":::").length;
                 const closed = closesContainer(lines[tok.map[1]], colons);
-                if (!closed) {
+                const skipped = tok.meta?.skippedCloser;
+                if (!closed && skipped !== undefined) {
+                    add(tok.map[0], "unclosed-container", `:::${name} is never closed — the ${lines[skipped]?.trim()} on line ${lineOf(skipped) ?? "?"} is inside a code block, so it does not close it (add a closer after the code)`);
+                }
+                else if (!closed) {
                     add(tok.map[0], "unclosed-container", generic
                         ? `:::${name} is never closed — it is shown as text (close it with a line of ${":".repeat(colons)})`
                         : `:::${name} is never closed — it takes in everything after it, to the end of the page or of the block it sits in (close it with a line of ${":".repeat(colons)})`);
@@ -67,6 +84,14 @@ export function collectDiagnostics(tokens, lines, lineOf) {
                 else if (generic) {
                     add(tok.map[0], "unknown-container", `:::${name} is not a known directive — it is shown as a plain box`);
                 }
+                if (closed) {
+                    // The closer's end-tag label: it closes this container whatever it says, so a wrong
+                    // name means the author thinks it closes another one
+                    const label = closerLabel((lines[tok.map[1]] ?? "").replace(/^[\s>]*:+/, ""));
+                    if (label && label !== name) {
+                        add(tok.map[1], "closer-mismatch", `this closer is labelled ${label}, but it closes :::${name} (opened on line ${lineOf(tok.map[0]) ?? "?"}) — check which block you meant to end here`);
+                    }
+                }
                 const rest = info.slice(name.length).trim();
                 if (rest.startsWith("{")) {
                     const problem = attributeProblem(rest);
@@ -78,7 +103,7 @@ export function collectDiagnostics(tokens, lines, lineOf) {
             // meant to close ended earlier (an inner block of the same fence closed it), or there is none
             if (tok.type === "inline" && tok.map) {
                 (tok.content ?? "").split("\n").forEach((l, k) => {
-                    if (/^\s*:{3,}\s*$/.test(l)) {
+                    if (/^\s*:{3,}[ \t]*(?:<!--(?:(?!-->)[\s\S])*-->[ \t]*)?$/.test(l)) {
                         add(tok.map[0] + k, "stray-closer", `stray \`${l.trim()}\` — it closes nothing and is shown as text; to nest a directive, give the outer one more colons (::::steps around :::tabs)`);
                     }
                 });
@@ -96,7 +121,75 @@ export function collectDiagnostics(tokens, lines, lineOf) {
                     from = at >= 0 ? at + form.length : from;
                     const offset = at >= 0 ? (text.slice(0, at).match(/\n/g) ?? []).length : 0;
                     const shown = child.type === "dogsbay_leaf_directive" ? `::${child.tag}` : `:${child.tag}[…]`;
-                    add(tok.map[0] + offset, "unknown-inline", `${shown} is not a known inline directive — it is shown as text`);
+                    if (child.type === "dogsbay_leaf_directive" && BLOCK_DIRECTIVES.has(child.tag)) {
+                        add(tok.map[0] + offset, "block-directive-inline", `${shown} is a block directive — inside a line of text it is shown as text; put it on a line of its own`);
+                    }
+                    else {
+                        add(tok.map[0] + offset, "unknown-inline", `${shown} is not a known inline directive — it is shown as text`);
+                    }
+                }
+            }
+            // Attribute blocks markdown-it-attrs read and the tree has nowhere to keep
+            if (tok.type === "list_item_open" && tok.map && tok.attrs?.length) {
+                // parse.ts keepListItemBraces puts trailing braces back as text, or on a heading; what is left had nowhere to go
+                add(tok.map[0], "dropped-attributes", `the attribute block on this list item is dropped — list items take no attributes`);
+            }
+            // A table row that is only an attribute block, where the parser could not move it onto the
+            // table (not the last row, or text follows the table with no blank line): an empty row
+            if (tok.type === "tr_open" && tok.map) {
+                const cells = [];
+                for (let k = list.indexOf(tok) + 1; k < list.length && list[k].type !== "tr_close"; k++)
+                    cells.push(list[k]);
+                const inlines = cells.filter((c) => c.type === "inline");
+                if (cells[0]?.attrs?.length && /^\{[^{}]*\}$/.test((inlines[0]?.content ?? "").trim()) && inlines.slice(1).every((c) => c.content.trim() === "")) {
+                    add(tok.map[0], "dropped-attributes", `this attribute block is read as an empty table row — put it on the line directly under the table's last row, or after a blank line`);
+                }
+            }
+            // markdown-it-attrs gives a list a block on the line after it (or after its last item's text); the tree keeps no list attributes
+            // Only real attribute names: markdown-it-attrs also reads a leftover include (`{* src.py hl[4] *}`, FastAPI) as keys
+            const own = tok.attrs?.filter(([k]) => k !== "start") ?? [];
+            if ((tok.type === "bullet_list_open" || tok.type === "ordered_list_open") && tok.map && own.length > 0 && own.every(([k]) => /^[A-Za-z_][\w:.-]*$/.test(k))) {
+                add(tok.map[0], "dropped-attributes", `the attribute block on this list is dropped — lists take no attributes`);
+            }
+            // An attribute block alone on its line after a blank line: an empty paragraph that carries it
+            if (tok.type === "paragraph_open" && tok.map && tok.attrs?.length) {
+                const inline = list[list.indexOf(tok) + 1];
+                // Only what an author writes as attributes: `{#id}`, `{.class}`, `{key=…}`. markdown-it-attrs also eats a
+                // leftover MDX expression (`{/* prettier-ignore */}`), which is an importer's problem, not the author's
+                const looksLikeAttrs = /^\{\s*(?:[#.][^\s{}]|[\w-]+\s*=)/.test(inline?.content.trim() ?? "");
+                if (inline?.type === "inline" && looksLikeAttrs && (inline.children ?? []).every((c) => c.type === "text" && c.content.trim() === "")) {
+                    add(tok.map[0], "dropped-attributes", `this attribute block is on a line of its own and applies to nothing — put it at the end of the block's last line`);
+                }
+            }
+            if (tok.type === "inline" && tok.map && tok.children) {
+                for (const child of tok.children) {
+                    const what = ATTRLESS_INLINE[child.type];
+                    if (what && child.attrs?.length)
+                        add(tok.map[0], "dropped-attributes", `the attribute block on ${what} is dropped — only links, images and inline directives take attributes`);
+                }
+                // Inline directives that keep no attributes (only badge and button do)
+                for (const child of tok.children) {
+                    if (child.type !== "dogsbay_inline_directive_open" || child.tag === "badge" || child.tag === "button" || !KNOWN_INLINE_DIRECTIVES.has(child.tag))
+                        continue;
+                    let parsed = {};
+                    try {
+                        parsed = JSON.parse(child.info || "{}");
+                    }
+                    catch { /* not ours */ }
+                    if (parsed.id || parsed.classes?.length || Object.keys(parsed.props ?? {}).length) {
+                        add(tok.map[0], "dropped-attributes", `the attribute block on :${child.tag}[…] is dropped — of the inline directives only :badge and :button take attributes`);
+                    }
+                }
+                // `:kbd{…}` with no `[label]` is not a directive: the label is what it shows
+                for (const child of tok.children) {
+                    if (child.type !== "text")
+                        continue;
+                    for (const m of child.content.matchAll(/:([a-z]+)\{/g)) {
+                        if (m.index > 0 && PRECEDES_TEXT.test(child.content[m.index - 1]))
+                            continue;
+                        if (KNOWN_INLINE_DIRECTIVES.has(m[1]))
+                            add(tok.map[0], "missing-label", `:${m[1]}{…} has no [label] — it is shown as text; write :${m[1]}[…]{…}`);
+                    }
                 }
             }
             // A heading's attribute block that markdown-it-attrs could not read stays in its text

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export { transformCodeRegions, transformProseLines, transformProseSegments, fenc
 export { maskMinjaInCode, unmaskMinjaInCode, maskAllMinjaOpeners, isMinjaProcessedFence, stripInlineMinjaMarkers, stripFenceMinjaMarkers } from "./minja-mask.js";
 export type { ParseResult, ParseOptions } from "./parse.js";
 export { KNOWN_INLINE_DIRECTIVES, type ParseDiagnostic } from "./diagnostics.js";
+export { KNOWN_BLOCK_DIRECTIVES } from "./plugin-containers.js";
 export { buildNavFromDirectory } from "./nav.js";
 export type { BuildNavOptions } from "./nav.js";
 export { loadNavFile } from "./nav-file.js";

package/dist/index.js

@@ -10,6 +10,8 @@ export { extractHeadings, slugifyHeadingText } from "./headings.js";
 export { transformCodeRegions, transformProseLines, transformProseSegments, fenceOpenBefore, createFenceTracker } from "./code-regions.js";
 export { maskMinjaInCode, unmaskMinjaInCode, maskAllMinjaOpeners, isMinjaProcessedFence, stripInlineMinjaMarkers, stripFenceMinjaMarkers } from "./minja-mask.js";
 export { KNOWN_INLINE_DIRECTIVES } from "./diagnostics.js";
+// The `:::name` blocks the parser knows (an editor completes names from it)
+export { KNOWN_BLOCK_DIRECTIVES } from "./plugin-containers.js";
 export { buildNavFromDirectory } from "./nav.js";
 export { loadNavFile } from "./nav-file.js";
 export { renderDiagrams } from "./renderers/diagrams.js";

package/dist/parse.js

@@ -87,6 +87,8 @@ export function dogsbayMdToTree(source, options) {
     const md = sharedParser();
     const tokens = md.parse(content, {});
     markUnclosedGenericContainers(tokens, content);
+    keepListItemBraces(tokens, content);
+    attachTableAttrsRow(tokens, content);
     // Before tokensToTree: it changes nothing these read, but read the parse as markdown-it left it
     const diagnostics = options?.diagnostics
         ? collectDiagnostics(tokens, 
@@ -304,6 +306,88 @@ function createParser() {
     });
     return md;
 }
+/**
+ * `{.compact-table}` on the line straight under a table, with no blank line, is the table's
+ * attribute block, as Pandoc and kramdown write it. markdown-it reads the line as one more row, and
+ * markdown-it-attrs gives the attributes to that row's first cell, so the table got an empty last
+ * row and no class. Such a row is moved onto the table: the last row, written without a `|`
+ * (a row the author wrote as `| {x} |` is a row), its first cell only an attribute block. Once
+ * per table. After a blank line the block already reached the table.
+ */
+function attachTableAttrsRow(tokens, src) {
+    const lines = src.split(/\r\n|\r|\n/);
+    for (let i = 0; i < tokens.length; i++) {
+        if (tokens[i].type !== "table_close")
+            continue;
+        let open = i - 1;
+        while (open >= 0 && tokens[open].type !== "table_open")
+            open--;
+        // the last row: tr_close just before tbody_close
+        if (tokens[i - 1]?.type !== "tbody_close" || tokens[i - 2]?.type !== "tr_close")
+            continue;
+        let tr = i - 2;
+        while (tr > open && tokens[tr].type !== "tr_open")
+            tr--;
+        const map = tokens[tr].map;
+        if (!map || /^[\s>]*\|/.test(lines[map[0]] ?? ""))
+            continue;
+        const cells = tokens.slice(tr + 1, i - 2);
+        const inlines = cells.filter((t) => t.type === "inline");
+        const first = cells[0];
+        if (!first?.attrs?.length || !/^\{[^{}]*\}$/.test((inlines[0]?.content ?? "").trim()))
+            continue;
+        if (inlines.slice(1).some((t) => t.content.trim() !== ""))
+            continue;
+        // Classes join; any other key from the row wins, as the later block does in markdown-it-attrs
+        const attrs = new Map((tokens[open].attrs ?? []).map(([k, v]) => [k, v]));
+        for (const [k, v] of first.attrs)
+            attrs.set(k, k === "class" && attrs.has("class") ? `${attrs.get("class")} ${v}` : v);
+        tokens[open].attrs = [...attrs];
+        // The row, and its tbody when it was the only row (the serializer writes no empty tbody)
+        const onlyRow = tokens[tr - 1]?.type === "tbody_open";
+        const from = onlyRow ? tr - 1 : tr;
+        tokens.splice(from, (onlyRow ? i : i - 1) - from);
+        i = from;
+    }
+}
+/**
+ * markdown-it-attrs reads a trailing `{…}` on a list item's text as the item's attributes, and the
+ * tree has nowhere to keep them, so the braces were lost: `- e.g. { minutes: 3 }` and
+ * `- mcp__{server}__{tool}` lost their ends (both in real docs). Trailing braces on a list item are
+ * literal text, as the spec says: they are put back from the source line. An item that starts
+ * with a heading gives them to the heading.
+ */
+function keepListItemBraces(tokens, src) {
+    const lines = src.split(/\r\n|\r|\n/);
+    tokens.forEach((tok, i) => {
+        if (tok.type !== "list_item_open" || !tok.attrs?.length)
+            return;
+        // An item that starts with a heading: `1. ### Title {#id}` is the heading's id, and a step
+        // heading's anchor was lost with it
+        if (tokens[i + 1]?.type === "heading_open") {
+            const heading = tokens[i + 1];
+            heading.attrs = [...(heading.attrs ?? []), ...tok.attrs];
+            tok.attrs = null;
+            return;
+        }
+        // Otherwise only an item that starts with text (diagnostics report any other)
+        if (tokens[i + 1]?.type !== "paragraph_open")
+            return;
+        const inline = tokens.slice(i + 1).find((t) => t.type === "inline" || t.type === "list_item_open" || t.type === "list_item_close");
+        const map = inline?.map;
+        if (inline?.type !== "inline" || !map)
+            return;
+        const tail = /\s*\{[^{}]*\}[ \t]*$/.exec(lines[map[1] - 1] ?? "");
+        const last = [...(inline.children ?? [])].reverse().find((c) => c.type === "text");
+        if (!tail || !last)
+            return;
+        // The source's own spacing: markdown-it-attrs may or may not have trimmed the text before it
+        const braces = tail[0].trimEnd();
+        last.content = last.content.trimEnd() + braces;
+        inline.content = inline.content.trimEnd() + braces;
+        tok.attrs = null;
+    });
+}
 /**
  * markdown-it-container runs a block with no closing marker to the end of the document. For a
  * generic (unknown-name) container that would turn any prose line starting `:::word` into a block
@@ -956,9 +1040,12 @@ function consumeContainer(ctx) {
     ctx.i++;
     const children = [];
     const closeType = `container_${registered}_close`;
+    // The closer's end-tag label, `::: <!-- end note -->` (container-rule.ts): kept so it is written back
+    let closer = "";
     while (ctx.i < ctx.tokens.length) {
         const tok = ctx.tokens[ctx.i];
         if (tok.type === closeType) {
+            closer = tok.info ?? "";
             ctx.i++;
             break;
         }
@@ -988,10 +1075,11 @@ function consumeContainer(ctx) {
             type: "container",
             props: attrs ? attrsToProps(attrs) : {},
             children,
-            meta: { container: true, name, ...(title ? { title } : {}) },
+            meta: { container: true, name, ...(title ? { title } : {}), ...(closer ? { closer } : {}) },
         };
     }
-    return mapContainerToTreeNode(name, attrs, children);
+    const node = mapContainerToTreeNode(name, attrs, children);
+    return closer && !Array.isArray(node) ? { ...node, meta: { ...(node.meta ?? {}), closer } } : node;
 }
 /**
  * Convert a container + children into the appropriate TreeNode(s).
@@ -1629,6 +1717,9 @@ function tokensToInline(tokens, inheritedFmt = []) {
                 const name = tok.tag;
                 const attrs = tok.info ? JSON.parse(tok.info) : null;
                 const node = inlineDirectiveToNode(name, "", [], attrs);
+                // An unknown leaf stays as written (`::name{…}`), not in the text form `:name[]{…}`, which reads back as something else
+                if (node?.type === "html-inline" && node.html.startsWith(`:${name}[]`))
+                    node.html = `::${name}${node.html.slice(name.length + 3)}`;
                 if (node)
                     result.push(node);
                 break;

package/dist/plugin-containers.d.ts

@@ -1,7 +1,8 @@
 /**
- * Register markdown-it-container plugin for each known Dogsbay block directive.
+ * Register the container rule (container-rule.ts, adapted from markdown-it-container) for each
+ * known Dogsbay block directive.
  *
- * Uses the existing @markdown-it/container library. Each directive name is
+ * Each directive name is
  * registered separately; within same colon count, different-name directives can
  * nest. Same-name nesting requires more colons (::::).
  */

package/dist/plugin-containers.js

@@ -1,4 +1,4 @@
-import container from "markdown-it-container";
+import { containerRule } from "./container-rule.js";
 import { parseAttrs } from "./parse-attrs.js";
 export const KNOWN_BLOCK_DIRECTIVES = [
     "tabs",
@@ -72,7 +72,7 @@ export const KNOWN_BLOCK_DIRECTIVES = [
 export const GENERIC_CONTAINER = "dogsbay_generic";
 export function containersPlugin(md) {
     for (const name of KNOWN_BLOCK_DIRECTIVES) {
-        md.use(container, name, {
+        containerRule(md, name, {
             validate: (params) => {
                 const trimmed = params.trim();
                 if (!trimmed.startsWith(name))
@@ -103,7 +103,7 @@ export function containersPlugin(md) {
         });
     }
     const known = new Set(KNOWN_BLOCK_DIRECTIVES);
-    md.use(container, GENERIC_CONTAINER, {
+    containerRule(md, GENERIC_CONTAINER, {
         validate: (params) => {
             const m = /^([A-Za-z][\w-]*)(?=$|[\s{[])/.exec(params.trim());
             return m !== null && !known.has(m[1]);

package/dist/plugin-inline-directives.d.ts

@@ -14,4 +14,6 @@
  * The inline directive body contains nested inline tokens parsed recursively.
  */
 import type MarkdownIt from "markdown-it";
+/** A character a directive cannot follow directly (see inlineDirectiveRule). */
+export declare const PRECEDES_TEXT: RegExp;
 export declare function inlineDirectivesPlugin(md: MarkdownIt): void;

package/dist/plugin-inline-directives.js

@@ -1,4 +1,6 @@
 import { parseAttrs } from "./parse-attrs.js";
+/** A character a directive cannot follow directly (see inlineDirectiveRule). */
+export const PRECEDES_TEXT = /[\p{Script=Latin}\p{Script=Greek}\p{Script=Cyrillic}0-9:]/u;
 export function inlineDirectivesPlugin(md) {
     md.inline.ruler.before("emphasis", "dogsbay_inline_directive", inlineDirectiveRule);
 }
@@ -7,6 +9,11 @@ function inlineDirectiveRule(state, silent) {
     const src = state.src;
     if (src.charCodeAt(start) !== 0x3a /* : */)
         return false;
+    // Not straight after a word in a spaced script, a digit or a colon: `std::vector`, `x:Type[]`
+    // and a Tailwind `md:grid-cols-[…]` in an attribute block are text, not directives. CJK text
+    // has no spaces, so a directive may follow it directly (`按:kbd[Ctrl]键`)
+    if (start > 0 && PRECEDES_TEXT.test(src[start - 1]))
+        return false;
     // Determine leaf (::) vs text (:) directive
     const isLeaf = src.charCodeAt(start + 1) === 0x3a;
     const nameStart = isLeaf ? start + 2 : start + 1;

package/dist/serialize.js

@@ -29,6 +29,12 @@ export function nodeToDogsbayMd(node, options) {
     return renderNode(node, resolveOptions(options));
 }
 function renderNode(node, ctx) {
+    const out = renderNodeBody(node, ctx);
+    // A closer's end-tag label (`::: <!-- end note -->`), as the author wrote it
+    const closer = node.meta?.closer;
+    return typeof closer === "string" && /^<!--(?:(?!-->)[\s\S])*-->$/.test(closer) && /\n:{3,}$/.test(out) ? `${out} ${closer}` : out;
+}
+function renderNodeBody(node, ctx) {
     switch (node.type) {
         case "heading":
             return renderHeading(node);
@@ -423,7 +429,9 @@ function renderCallout(node, ctx) {
     // panel.
     const props = node.props ?? {};
     const hasOnlyTypeProp = Object.keys(props).every((k) => k === "type");
-    if (ctx.githubCallouts && hasOnlyTypeProp && GITHUB_CALLOUT_TYPES.has(type)) {
+    // Nor a closer's end-tag label: a `:::note` the author labelled stays a directive
+    const labelled = typeof node.meta?.closer === "string";
+    if (ctx.githubCallouts && hasOnlyTypeProp && !labelled && GITHUB_CALLOUT_TYPES.has(type)) {
         const tag = `[!${type.toUpperCase()}]`;
         return [tag, body]
             .join("\n")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dogsbay/format-dogsbay-md",
-  "version": "0.2.0-beta.125",
+  "version": "0.2.0-beta.126",
   "description": "Dogsbay Markdown dialect — canonical format for TreeNode[] with directives, YAML bodies, and intelligent fallbacks",
   "type": "module",
   "main": "dist/index.js",
@@ -36,13 +36,12 @@
     "js-yaml": "^5.2.1",
     "markdown-it": "^14.3.0",
     "markdown-it-attrs": "^5.0.0",
-    "markdown-it-container": "^4.0.0",
     "markdown-it-deflist": "^3.0.1",
     "markdown-it-footnote": "^4.0.0",
     "markdown-it-front-matter": "^0.2.4",
-    "@dogsbay/minja": "0.2.0-beta.125",
-    "@dogsbay/serialize-core": "0.2.0-beta.125",
-    "@dogsbay/types": "0.2.0-beta.125"
+    "@dogsbay/minja": "0.2.0-beta.126",
+    "@dogsbay/serialize-core": "0.2.0-beta.126",
+    "@dogsbay/types": "0.2.0-beta.126"
   },
   "license": "MIT",
   "repository": {