@dogsbay/format-dogsbay-md 0.2.0-beta.138 → 0.2.0-beta.139

package/dist/diagnostics.js

@@ -8,9 +8,9 @@
  * 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 { BLOCK_LEAF_DIRECTIVES, GENERIC_CONTAINER } from "./plugin-containers.js";
+import { BLOCK_LEAF_DIRECTIVES, GENERIC_CONTAINER, LEAF_ONLY_DIRECTIVES } from "./plugin-containers.js";
 import { LABEL_PROP } from "./plugin-inline-directives.js";
-import { unknownProps } from "./directive-props.js";
+import { DIRECTIVE_PROPS, unknownProps } from "./directive-props.js";
 import * as yaml from "js-yaml";
 /**
  * Whether a source line closes a container opened with `colons` colons. The
@@ -74,6 +74,24 @@ function codeLineSet(tokens) {
 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(BLOCK_LEAF_DIRECTIVES);
+/** Whether the text at `at` is in a code span on its line or escaped, so no directive token starts there. */
+function notThisToken(text, at) {
+    if (at < 0)
+        return true;
+    if (text[at - 1] === "\\")
+        return true;
+    const lineStart = text.lastIndexOf("\n", at - 1) + 1;
+    return ((text.slice(lineStart, at).match(/`/g) ?? []).length % 2) === 1;
+}
+/** How to write a block directive that was given a `[label]`: its own name prop, and a closer when it has a body. */
+function blockForm(tag) {
+    if (LEAF_ONLY_DIRECTIVES.includes(tag))
+        return `Write ::${tag}{…} on a line of its own`;
+    const props = DIRECTIVE_PROPS[tag] ?? [];
+    const key = (tag === "tab" || tag === "accordion-item") && props.includes("label") ? "label" : props.includes("title") ? "title" : props.includes("label") ? "label" : undefined;
+    const form = `Write :::${tag}${key ? `{${key}="…"}` : "{…}"}, its content, then a ::: closer`;
+    return tag === "tab" ? `${form} (inside :::tabs), or a definition list: the term is the tab's name` : form;
+}
 /** 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" };
 /**
@@ -256,12 +274,31 @@ export function collectDiagnostics(tokens, lines, lineOf) {
                     if (child.type === "dogsbay_inline_directive_open" && child.meta?.labelless)
                         continue;
                     const form = child.type === "dogsbay_leaf_directive" ? `::${child.tag}` : `:${child.tag}[`;
-                    const at = text.indexOf(form, from);
+                    let at = text.indexOf(form, from);
+                    // `::tab[Helm]` starting a line of a paragraph (not a table cell): text because of its
+                    // `[label]`, which a block takes none of. A `::tab` the search met first in a code span
+                    // or escaped is not this token, so the line start wins over it.
+                    let labelled = false;
+                    if (child.type === "dogsbay_leaf_directive" && BLOCK_DIRECTIVES.has(child.tag) && tok.map) {
+                        const m = new RegExp(`(^|\\n)[ \\t]*::${child.tag}\\[`, "g");
+                        m.lastIndex = from;
+                        const hit = m.exec(text);
+                        const pos = hit ? hit.index + hit[0].indexOf("::") : -1;
+                        if (pos >= 0 && (pos === at || notThisToken(text, at))) {
+                            at = pos;
+                            labelled = true;
+                        }
+                    }
                     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}[…]`;
                     if (child.type === "dogsbay_leaf_directive" && BLOCK_DIRECTIVES.has(child.tag)) {
-                        add(base + 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`);
+                        if (labelled) {
+                            add(base + offset, "block-directive-inline", `${shown}[…] is shown as text: a block directive takes no [label]. ${blockForm(child.tag)}`);
+                        }
+                        else {
+                            add(base + 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(base + offset, "unknown-inline", `${shown} is not a known inline directive — it is shown as text`, child.tag);

package/dist/serialize.js

@@ -948,7 +948,7 @@ function termLabel(text) {
         .replace(/\{/g, "\\{");
 }
 function renderTabItem(node, ctx) {
-    const label = termLabel(String(node.props?.label ?? node.props?.title ?? "Tab"));
+    const label = termLabel(String(node.props?.label ?? node.props?.title ?? node.props?.value ?? "Tab"));
     const content = (node.children ?? []).map((c) => renderNode(c, ctx)).join("\n\n");
     // Definition list: term on one line, `:   body` with continuation indented
     const [first, ...rest] = content.split("\n");

package/package.json

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