@ai-matrx/rich-content 0.2.78 → 0.2.79

package/CHANGELOG.md

@@ -1,11 +1,37 @@
 # Changelog
 
+## 0.2.79
+### Unreleased
+
+- **A mermaid `<artifact type="mermaid">` prints as a drawn diagram.** `printMessage` drew mermaid
+  FENCES only, so an artifact-wrapped diagram printed as source. It now draws both through the same
+  path (`drawMermaidForPrint(markdown, extraBodies)`; `mermaidSourceOf` strips a fence around the
+  body). No consumer action.
+
 ## 0.2.78
 
 Automatic changed-only republish (docs/metadata drift since the last tag — see
 `git diff npm/rich-content/v0.2.77..npm/rich-content/v0.2.78 -- apps/shared/rich-content`).
 No source changes intended and no consumer action required.
 
+## 0.2.77
+
+Automatic changed-only republish (docs/metadata drift since the last tag — see
+`git diff npm/rich-content/v0.2.76..npm/rich-content/v0.2.77 -- apps/shared/rich-content`).
+No source changes intended and no consumer action required.
+
+## 0.2.76
+
+Automatic changed-only republish (docs/metadata drift since the last tag — see
+`git diff npm/rich-content/v0.2.75..npm/rich-content/v0.2.76 -- apps/shared/rich-content`).
+No source changes intended and no consumer action required.
+
+## 0.2.75
+
+Automatic changed-only republish (docs/metadata drift since the last tag — see
+`git diff npm/rich-content/v0.2.74..npm/rich-content/v0.2.75 -- apps/shared/rich-content`).
+No source changes intended and no consumer action required.
+
 ## 0.2.74
 
 Automatic changed-only republish (docs/metadata drift since the last tag — see

package/dist/copy/print-message.js

@@ -23,14 +23,18 @@ async function printMessage(markdown, options = {}) {
     return printer?.toPrintHtml ? printer : null;
   };
   const blocks = listPrintBlocks(markdown, skin);
-  const hasMermaid = blocks.some((block) => block.source === "fence" && block.type === "mermaid");
-  const adapted = blocks.filter((block) => adapterFor(block) !== null);
+  const mermaidBlocks = blocks.filter((block) => block.type === "mermaid");
+  const hasMermaid = mermaidBlocks.length > 0;
+  const adapted = blocks.filter((block) => block.type !== "mermaid" && adapterFor(block) !== null);
   if (!hasMermaid && adapted.length === 0) return printMarkdown(markdown, { skin, title });
   let drawing = null;
   const drawAll = () => drawing ??= (async () => {
     try {
       const { drawMermaidForPrint } = await import("../mermaid/print-render.js");
-      const { pictures, failed } = await drawMermaidForPrint(markdown);
+      const { pictures, failed } = await drawMermaidForPrint(
+        markdown,
+        mermaidBlocks.filter((block) => block.source !== "fence").map((block) => block.body)
+      );
       if (failed > 0) {
         notice("warning", `${failed} diagram${failed === 1 ? "" : "s"} could not be drawn and print${failed === 1 ? "s" : ""} as source.`);
       }
@@ -45,7 +49,7 @@ async function printMessage(markdown, options = {}) {
     skin,
     title,
     renderBlock: async (block) => {
-      if (block.source === "fence" && block.type === "mermaid") {
+      if (block.type === "mermaid") {
         const svg = (await drawAll())?.get(block.body);
         return svg ? { svg, alt: "Diagram" } : null;
       }

package/dist/mermaid/print-render.d.ts

@@ -6,4 +6,6 @@ export interface PrintedDiagrams {
     /** Fences that could not be drawn (they print as source). */
     failed: number;
 }
-export declare function drawMermaidForPrint(markdown: string): Promise<PrintedDiagrams>;
+/** A mermaid `<artifact>` body may wrap its source in a fence; draw the diagram source itself. */
+export declare function mermaidSourceOf(body: string): string;
+export declare function drawMermaidForPrint(markdown: string, extraBodies?: readonly string[]): Promise<PrintedDiagrams>;

package/dist/mermaid/print-render.js

@@ -20,12 +20,17 @@ function mermaidFenceSources(markdown) {
   }
   return out;
 }
-async function drawMermaidForPrint(markdown) {
+function mermaidSourceOf(body) {
+  const fenced = /^\s*(`{3,}|~{3,})[^\n]*\n([\s\S]*?)\n?\s*\1\s*$/.exec(body);
+  return (fenced ? fenced[2] : body).trim();
+}
+async function drawMermaidForPrint(markdown, extraBodies = []) {
   const pictures = /* @__PURE__ */ new Map();
   let failed = 0;
-  for (const source of new Set(mermaidFenceSources(markdown))) {
+  const sources = /* @__PURE__ */ new Set([...mermaidFenceSources(markdown), ...extraBodies]);
+  for (const source of sources) {
     try {
-      const { svg } = await renderMermaid(source, PRINT_OPTIONS);
+      const { svg } = await renderMermaid(mermaidSourceOf(source), PRINT_OPTIONS);
       pictures.set(source, svg);
     } catch {
       failed++;
@@ -35,5 +40,6 @@ async function drawMermaidForPrint(markdown) {
 }
 export {
   drawMermaidForPrint,
-  mermaidFenceSources
+  mermaidFenceSources,
+  mermaidSourceOf
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-matrx/rich-content",
-  "version": "0.2.78",
+  "version": "0.2.79",
   "description": "The AI Matrx formatted-text engine: the one markdown renderer, streaming markdown, the block splitter and renderer, the generic blocks, <RichContent> levels, the rich-document action registry and menus, copy, and the selection toolbar — as portable React.",
   "type": "module",
   "license": "MIT",
@@ -130,20 +130,20 @@
     "unist-util-visit": "^5.1.0",
     "unist-util-visit-parents": "^6.0.2",
     "yaml": "^2.9.1",
-    "@ai-matrx/agents": "latest",
+    "@ai-matrx/alchemy": "latest",
     "@ai-matrx/canvas": "latest",
     "@ai-matrx/content-ir": "latest",
-    "@ai-matrx/alchemy": "latest",
+    "@ai-matrx/content-ir-react": "latest",
     "@ai-matrx/data": "latest",
-    "@ai-matrx/diff": "latest",
+    "@ai-matrx/agents": "latest",
     "@ai-matrx/design-system": "latest",
+    "@ai-matrx/diff": "latest",
     "@ai-matrx/icons": "latest",
     "@ai-matrx/kit": "latest",
     "@ai-matrx/media": "latest",
-    "@ai-matrx/print": "latest",
     "@ai-matrx/records": "latest",
     "@ai-matrx/records-ui": "latest",
-    "@ai-matrx/content-ir-react": "latest"
+    "@ai-matrx/print": "latest"
   },
   "peerDependencies": {
     "react": ">=19.0.0",
@@ -204,5 +204,5 @@
     "verify:modules-tarball": "node ./scripts/verify-modules-tarball.mjs",
     "verify:tarball": "node ./scripts/verify-tarball.mjs"
   },
-  "gitHead": "425e47eba7aeb2977899442435c1d669db809c6c"
+  "gitHead": "beef2ffa0187b314e351134e7f905eb2d6a8ec33"
 }