@dogsbay/format-astro 0.2.0-beta.137 → 0.2.0-beta.139

package/dist/serialize.js

@@ -1069,7 +1069,11 @@ function genericContainerToAstro(node, ctx) {
     const title = typeof node.meta?.title === "string" ? `<p class="font-semibold">${escapeTemplate(node.meta.title)}</p>\n` : "";
     const classAttr = mergeClassAttr("", node.props?.class);
     const passthrough = renderPassthroughAttrs(node.props, ["class"]);
-    return `<div data-directive="${escapeAttr(name)}"${classAttr}${passthrough}>\n${title}${childrenToAstro(node, ctx)}\n</div>`;
+    // Nested props (a `---` block on an unknown directive) reach the page as one JSON attribute,
+    // so a site's own component or script can read them; scalar props pass through as before.
+    const nested = Object.fromEntries(Object.entries(node.props ?? {}).filter(([, v]) => v !== null && typeof v === "object"));
+    const dataProps = Object.keys(nested).length ? ` data-props="${escapeAttr(JSON.stringify(nested))}"` : "";
+    return `<div data-directive="${escapeAttr(name)}"${classAttr}${passthrough}${dataProps}>\n${title}${childrenToAstro(node, ctx)}\n</div>`;
 }
 function detailsToAstro(node, ctx) {
     ctx.imports.add("details");
@@ -1109,7 +1113,8 @@ function tabsToAstro(node, ctx) {
     if (tabs.length === 0)
         return "";
     const tabItems = tabs.map((tab, i) => {
-        const title = tab.props?.title || tab.props?.label || tab.props?.value || `Tab ${i + 1}`;
+        // The same order as render-html: `label` is ours, `title` what a Comark import wrote
+        const title = tab.props?.label || tab.props?.title || tab.props?.value || `Tab ${i + 1}`;
         const value = tab.props?.value || title;
         const label = title;
         return { value, label, node: tab };
@@ -1191,12 +1196,42 @@ const TITLE_TAG = /^<\/?(?:code|kbd|b|strong|i|em|s|del|mark|sub|sup|br)\s*\/?>$
  * and a title with `<img onerror=…>` ran a script in the summary. render-html reads titles the same way.
  */
 function titleInline(title) {
-    return captionInline(title).map((n) => (n.type === "html-inline" && !TITLE_TAG.test(n.html.trim()) ? { type: "text", text: n.html } : n));
+    const nodes = captionInline(title);
+    const kept = balancedTitleTags(nodes);
+    return nodes.map((n, i) => (n.type === "html-inline" && !kept.has(i) ? { type: "text", text: n.html } : n));
+}
+/**
+ * The indexes of the formatting tags a title keeps: a bare `TITLE_TAG` that is one half of a
+ * matched pair (or `<br>`). An unclosed `<em>` was kept, and the browser carried it past the
+ * title's element into the rest of the page (render-html has the same rule).
+ */
+function balancedTitleTags(nodes) {
+    const kept = new Set();
+    const open = [];
+    nodes.forEach((n, i) => {
+        if (n.type !== "html-inline")
+            return;
+        const html = n.html.trim();
+        if (!TITLE_TAG.test(html))
+            return;
+        const name = /^<\/?\s*(\w+)/.exec(html)[1].toLowerCase();
+        if (name === "br")
+            kept.add(i);
+        else if (!html.startsWith("</"))
+            open.push({ name, at: i });
+        else if (open.length && open[open.length - 1].name === name) {
+            kept.add(open.pop().at);
+            kept.add(i);
+        }
+    });
+    return kept;
 }
 /** A plain caption's text (escapes undone by the parse). */
 const captionText = (nodes) => nodes.map((n) => (n.type === "text" ? n.text : "")).join("");
 function captionToAstro(caption, ctx) {
-    const nodes = captionInline(caption);
+    // Raw HTML other than balanced formatting tags is text, as in a title (an imported repo's caption
+    // is someone else's; render-html draws captions the same way).
+    const nodes = titleInline(caption);
     return isPlainCaption(nodes)
         ? escapeTemplate(captionText(nodes))
         : renderInline(nodes, ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dogsbay/format-astro",
-  "version": "0.2.0-beta.137",
+  "version": "0.2.0-beta.139",
   "description": "Astro format plugin for Dogsbay — export TreeNode[] to Astro component markup",
   "type": "module",
   "main": "dist/index.js",
@@ -32,12 +32,12 @@
   "license": "MIT",
   "dependencies": {
     "markdown-it": "^14.3.0",
-    "@dogsbay/render-html": "0.2.0-beta.137",
-    "@dogsbay/format-dogsbay-md": "0.2.0-beta.137",
-    "@dogsbay/site-files": "0.2.0-beta.137",
-    "@dogsbay/serialize-core": "0.2.0-beta.137",
-    "@dogsbay/types": "0.2.0-beta.137",
-    "@dogsbay/ui": "0.2.0-beta.137"
+    "@dogsbay/format-dogsbay-md": "0.2.0-beta.139",
+    "@dogsbay/render-html": "0.2.0-beta.139",
+    "@dogsbay/serialize-core": "0.2.0-beta.139",
+    "@dogsbay/site-files": "0.2.0-beta.139",
+    "@dogsbay/types": "0.2.0-beta.139",
+    "@dogsbay/ui": "0.2.0-beta.139"
   },
   "repository": {
     "type": "git",