@dogsbay/format-dogsbay-md 0.2.0-beta.129 → 0.2.0-beta.130

package/dist/diagnostics.d.ts

@@ -4,6 +4,12 @@ export interface ParseDiagnostic {
     /** Stable kind, for filtering. */
     code: "unclosed-container" | "stray-closer" | "unknown-container" | "unknown-inline" | "block-directive-inline" | "bad-attributes" | "closer-mismatch" | "dropped-attributes" | "missing-label" | "leaf-as-block" | "nesting-unchecked";
     message: string;
+    /**
+     * The directive's name, without colons, on `unknown-container` and `unknown-inline`: a host that
+     * also reports unknown names (render-html's `ctx.unknown`) can tell it is the same one, without
+     * reading it out of the message.
+     */
+    name?: string;
 }
 /**
  * Whether a source line closes a container opened with `colons` colons. The

package/dist/diagnostics.js

@@ -114,12 +114,17 @@ function youtubeAsBlock(map, closed, lines, around, lineOf) {
         return `takes the closer on line ${lineOf(map[1]) ?? "?"}, which leaves :::${parent.name} open`;
     return undefined;
 }
+/** A source line quoted in a message, trimmed and cut short: a closer may carry a comment of any length. */
+const clip = (line) => {
+    const t = (line ?? "").trim();
+    return t.length > 60 ? `${t.slice(0, 59)}…` : t;
+};
 export function collectDiagnostics(tokens, lines, lineOf) {
     const out = [];
-    const add = (line0, code, message) => {
+    const add = (line0, code, message, name) => {
         const line = line0 === undefined ? undefined : lineOf(line0);
         if (line !== undefined)
-            out.push({ line, code, message });
+            out.push({ line, code, message, ...(name === undefined ? {} : { name }) });
     };
     const code = codeLineSet(tokens);
     let row;
@@ -149,10 +154,10 @@ export function collectDiagnostics(tokens, lines, lineOf) {
                 }
                 else if (!closed && legacy !== undefined && !generic) {
                     // Before the nesting stack, the closer on that line ended this block and the ones inside it
-                    add(tok.map[0], "unclosed-container", `:::${name} is never closed — the ${lines[legacy]?.trim()} on line ${lineOf(legacy) ?? "?"} closes only the innermost open block; each block needs its own closer (one \`:::\` used to close several)`);
+                    add(tok.map[0], "unclosed-container", `:::${name} is never closed — the ${clip(lines[legacy])} on line ${lineOf(legacy) ?? "?"} closes only the innermost open block; each block needs its own closer (one \`:::\` used to close several)`);
                 }
                 else 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)`);
+                    add(tok.map[0], "unclosed-container", `:::${name} is never closed — the ${clip(lines[skipped])} 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
@@ -160,7 +165,7 @@ export function collectDiagnostics(tokens, lines, lineOf) {
                         : `:::${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)})`);
                 }
                 else if (generic) {
-                    add(tok.map[0], "unknown-container", `:::${name} is not a known directive — it is shown as a plain box`);
+                    add(tok.map[0], "unknown-container", `:::${name} is not a known directive — it is shown as a plain box`, name);
                 }
                 if (tok.meta?.unverified) {
                     add(tok.map[0], "nesting-unchecked", `the parser stopped re-checking the nested blocks on this page here, so where :::${name} ends may be wrong — check that each block inside it has its own closer, or split the page`);
@@ -186,7 +191,7 @@ export function collectDiagnostics(tokens, lines, lineOf) {
             if (tok.type === "inline" && tok.map) {
                 (tok.content ?? "").split("\n").forEach((l, k) => {
                     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: every block before it is already closed (each block takes one closer)`);
+                        add(tok.map[0] + k, "stray-closer", `stray \`${clip(l)}\` — it closes nothing and is shown as text: every block before it is already closed (each block takes one closer)`);
                     }
                 });
             }
@@ -207,7 +212,7 @@ export function collectDiagnostics(tokens, lines, lineOf) {
                         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`);
+                        add(tok.map[0] + offset, "unknown-inline", `${shown} is not a known inline directive — it is shown as text`, child.tag);
                     }
                 }
             }

package/dist/parse.js

@@ -27,6 +27,13 @@ import { treeToDogsbayMd } from "./serialize.js";
  * Parse Dogsbay Markdown into TreeNode[] plus extracted frontmatter.
  */
 export function dogsbayMdToTree(source, options) {
+    // Lone-CR line breaks: the pre-passes' line maps count `\n` only, so diagnostics read a copy with
+    // `\n` breaks — markdown-it breaks lines at a lone `\r` too, so every line keeps its number.
+    // The tree still comes from the source as given.
+    if (options?.diagnostics && /\r(?!\n)/.test(source)) {
+        const { diagnostics } = dogsbayMdToTree(source.replace(/\r(?!\n)/g, "\n"), { ...options, sourceLines: false });
+        return { ...dogsbayMdToTree(source, { ...options, diagnostics: false }), ...(diagnostics ? { diagnostics } : {}) };
+    }
     // Extract frontmatter first (js-yaml splitter — browser-safe, no node:fs).
     // Fall back to parsing source as-is if frontmatter is malformed.
     let content = source;
@@ -90,11 +97,8 @@ export function dogsbayMdToTree(source, options) {
     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, 
-        // markdown-it splits at \r too; a lone-CR file has no line map, so its lines are counted here
-        content.split(/\r\n|\r|\n/), lineOf ?? ((line0) => (source.slice(0, source.length - content.length).match(/\r\n|\r|\n/g) ?? []).length + line0 + 1))
-        : undefined;
+    // A lone-CR source never gets here with diagnostics (see the top), so `lineOf` is set
+    const diagnostics = options?.diagnostics ? collectDiagnostics(tokens, content.split(/\r\n|\n/), lineOf ?? (() => undefined)) : undefined;
     let tree = foldRelated(tokensToTree(tokens, options?.sourceLines ? lineOf : undefined));
     if (directiveTable) {
         // `preserve` restores every construct as a first-class node. `resolve-first`
@@ -1605,7 +1609,14 @@ function tokensToInline(tokens, inheritedFmt = []) {
                 break;
             }
             case "softbreak": {
-                // Treat as space in inline output
+                // Treat as space in inline output, but say where a bold run ended its line (stepLead)
+                // (markdown-it leaves an empty text token between the bold's close and the break)
+                let k = result.length - 1;
+                while (k > 0 && result[k].type === "text" && result[k].text === "")
+                    k--;
+                const last = result[k];
+                if (last && !fmtStack.includes("bold") && isBoldRun(last))
+                    last.lineEnd = true;
                 result.push(makeText(" ", fmtStack));
                 break;
             }
@@ -1806,7 +1817,7 @@ function mergeAdjacentText(nodes) {
             !!prev.strikethrough === !!node.strikethrough) {
             // Mutate-on-replace: build a fresh node so callers holding a
             // reference to the original `prev` don't see in-place edits.
-            out[out.length - 1] = { ...prev, text: prev.text + node.text };
+            out[out.length - 1] = { ...prev, text: prev.text + node.text, ...(node.lineEnd ? { lineEnd: true } : {}) };
         }
         else {
             out.push(node);
@@ -1814,6 +1825,15 @@ function mergeAdjacentText(nodes) {
     }
     return out;
 }
+/** Bold text, or a link whose text is all bold (`**Install the [CLI](…)**`). */
+function isBoldRun(node) {
+    if (node.type === "text")
+        return node.bold === true && node.text !== "";
+    if (node.type !== "link")
+        return false;
+    const texts = (node.children ?? []).filter((c) => c.type === "text");
+    return texts.length > 0 && texts.every((c) => c.type === "text" && c.bold === true);
+}
 function makeText(text, fmtStack) {
     const node = { type: "text", text };
     if (fmtStack.includes("bold"))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dogsbay/format-dogsbay-md",
-  "version": "0.2.0-beta.129",
+  "version": "0.2.0-beta.130",
   "description": "Dogsbay Markdown dialect — canonical format for TreeNode[] with directives, YAML bodies, and intelligent fallbacks",
   "type": "module",
   "main": "dist/index.js",
@@ -40,9 +40,9 @@
     "markdown-it-footnote": "^4.0.0",
     "markdown-it-front-matter": "^0.2.4",
     "pele": "1.6.0",
-    "@dogsbay/minja": "0.2.0-beta.129",
-    "@dogsbay/serialize-core": "0.2.0-beta.129",
-    "@dogsbay/types": "0.2.0-beta.129"
+    "@dogsbay/minja": "0.2.0-beta.130",
+    "@dogsbay/serialize-core": "0.2.0-beta.130",
+    "@dogsbay/types": "0.2.0-beta.130"
   },
   "license": "MIT",
   "repository": {