@diagrammo/dgmo 0.44.0 → 0.45.0

package/src/embed/escape.ts

@@ -0,0 +1,15 @@
+const HTML_ENTITIES: Record<string, string> = {
+  '&': '&amp;',
+  '<': '&lt;',
+  '>': '&gt;',
+  '"': '&quot;',
+  "'": '&#39;',
+};
+
+export function escapeHtml(s: string): string {
+  return s.replace(/[&<>"']/g, (ch) => HTML_ENTITIES[ch] ?? ch);
+}
+
+export function escapeAttr(s: string): string {
+  return s.replace(/[&<>"']/g, (ch) => HTML_ENTITIES[ch] ?? ch);
+}

package/src/embed/index.ts

@@ -0,0 +1,280 @@
+/**
+ * Standard DGMO embed block (BL-114) — the ONE canonical
+ * "diagram + source chrome" HTML builder shared by every embed surface:
+ * remark-dgmo (and through it the astro/docusaurus/fumadocs/nextra/vitepress
+ * wrappers), the `/auto` script-tag drop-in, `<dgmo-diagram>`, dgmo-mcp HTML
+ * reports, the marketing site, and the Obsidian plugin.
+ *
+ * Chrome contract (user-approved 2026-07-05): the diagram is the star. A slim
+ * icon toolbar sits in a reserved row below the SVG, invisible until the
+ * block is hovered/focused or the source is open. Three wordless icon
+ * buttons — `</>` toggles the hidden source panel, copy, open-in-editor. No
+ * disclosure triangle, no text labels. The toolbar IS the <summary> of a
+ * native <details>, so show/hide works with zero JavaScript; copy needs a
+ * small delegated click handler (remark-dgmo's `bindDgmo` is the reference).
+ *
+ * Markup vocabulary: `figure.dgmo` (`--diagram`/`--showcase`/`--error`),
+ * `.dgmo-light`/`.dgmo-dark` (dual color-mode) or `.dgmo-svg` (single),
+ * `details.dgmo-source-wrap > summary.dgmo-toolbar`, `.dgmo-source-inner`,
+ * `pre.dgmo-pre > span.dgmo-code` with `.dgmo-tok-<role>` token spans. While
+ * the source is open the wrapper gets one shared frame (`:has()` rule) so
+ * diagram + code read as a single unit. No visible caption — `title` becomes
+ * the wrapper's aria-label. Styles ship as `BLOCK_CSS` / `dist/block.css`.
+ */
+
+import { render } from '../render';
+import { encodeDiagramUrl } from '../sharing';
+import { resolvePaletteOrFallback } from '../palettes';
+import { highlightDgmo } from '../editor/highlight-api';
+import { normalizeSvgForEmbed } from '../utils/svg-embed';
+import { escapeHtml, escapeAttr } from './escape';
+
+export { BLOCK_CSS } from './css';
+
+/** Default hosted editor used by "Open in editor" links. */
+export const EDITOR_BASE_URL = 'https://online.diagrammo.app';
+
+export type BlockMode = 'diagram' | 'showcase';
+
+/**
+ * Color-mode strategy for the emitted SVG(s).
+ * - `auto` — render twice (light + dark) and let CSS flip visibility.
+ * - `light` / `dark` / `transparent` — single render with that theme.
+ */
+export type BlockColorMode = 'auto' | 'light' | 'dark' | 'transparent';
+
+export interface DgmoBlockOptions {
+  /** `diagram` (default): SVG only. `showcase`: SVG + source chrome. */
+  mode?: BlockMode;
+  /** Palette name. Default `slate`; unknown names warn + fall back. */
+  palette?: string;
+  /** Default `auto` (dual light/dark render). */
+  colorMode?: BlockColorMode;
+  /** Default: true in showcase mode, false in diagram mode. */
+  showSource?: boolean;
+  /** Default: true in showcase mode, false in diagram mode. */
+  showCopy?: boolean;
+  /** Default: true in showcase mode, false in diagram mode. */
+  showOpenInEditor?: boolean;
+  /** Base URL for the open-in-editor link. Default: online.diagrammo.app. */
+  editorBaseUrl?: string;
+  /** Outer wrapper element. Default `figure`. */
+  wrapper?: 'figure' | 'div';
+  /** Base class for the wrapper (styling hook). Default `dgmo`. */
+  className?: string;
+  /** Extra classes appended to every emitted wrapper (compat shims). */
+  legacyClassNames?: string[];
+  /**
+   * Accessible name for the block (`aria-label` on the wrapper). NOT rendered
+   * visually — the chart's visible title belongs in the DGMO source itself.
+   */
+  title?: string;
+  /** Receives palette-fallback warnings. Default: console.warn. */
+  onWarn?: (message: string) => void;
+}
+
+type ResolvedBlockOptions = Required<
+  Omit<DgmoBlockOptions, 'title' | 'onWarn'>
+> & {
+  title: string | undefined;
+  onWarn: (message: string) => void;
+};
+
+export interface DgmoBlockResult {
+  html: string;
+  diagnostics: Array<{ message: string; line?: number; severity?: string }>;
+}
+
+function resolveBlockOptions(opts: DgmoBlockOptions): ResolvedBlockOptions {
+  const mode: BlockMode = opts.mode ?? 'diagram';
+  const showcase = mode === 'showcase';
+  return {
+    mode,
+    palette: opts.palette ?? 'slate',
+    colorMode: opts.colorMode ?? 'auto',
+    showSource: opts.showSource ?? showcase,
+    showCopy: opts.showCopy ?? showcase,
+    showOpenInEditor: opts.showOpenInEditor ?? showcase,
+    editorBaseUrl: opts.editorBaseUrl ?? EDITOR_BASE_URL,
+    wrapper: opts.wrapper ?? 'figure',
+    className: opts.className ?? 'dgmo',
+    legacyClassNames: opts.legacyClassNames ?? [],
+    title: opts.title,
+
+    onWarn: opts.onWarn ?? ((message) => console.warn(message)),
+  };
+}
+
+/**
+ * Render one ```dgmo source block to the standard embed HTML. Async because
+ * it runs the full dgmo render pipeline (once per color mode).
+ *
+ * Render errors are NOT caught here — callers decide between throwing,
+ * `errorBlockHtml()`, or their own fallback.
+ */
+export async function renderDgmoBlock(
+  source: string,
+  options: DgmoBlockOptions = {}
+): Promise<DgmoBlockResult> {
+  const opts = resolveBlockOptions(options);
+  const trimmed = source.trim();
+  // Resolve-with-fallback so unknown names warn here (render() itself falls
+  // back silently); render() takes the palette by NAME, so pass the id.
+  const paletteId = resolvePaletteOrFallback(opts.palette, opts.onWarn).id;
+  const diagnostics: DgmoBlockResult['diagnostics'] = [];
+
+  let svgsHtml: string;
+  if (opts.colorMode === 'auto') {
+    const [light, dark] = await Promise.all([
+      render(trimmed, { palette: paletteId, theme: 'light' }),
+      render(trimmed, { palette: paletteId, theme: 'dark' }),
+    ]);
+    diagnostics.push(...light.diagnostics, ...dark.diagnostics);
+    svgsHtml =
+      `<div class="${escapeAttr(innerClasses(opts, 'dgmo-light'))}">${normalizeSvgForEmbed(light.svg)}</div>` +
+      `<div class="${escapeAttr(innerClasses(opts, 'dgmo-dark'))}">${normalizeSvgForEmbed(dark.svg)}</div>`;
+  } else {
+    const result = await render(trimmed, {
+      palette: paletteId,
+      theme: opts.colorMode,
+    });
+    diagnostics.push(...result.diagnostics);
+    svgsHtml = `<div class="${escapeAttr(innerClasses(opts, 'dgmo-svg'))}">${normalizeSvgForEmbed(result.svg)}</div>`;
+  }
+
+  return { html: assembleBlock(trimmed, svgsHtml, opts), diagnostics };
+}
+
+/**
+ * Assemble the standard block around already-rendered SVG markup. Exposed for
+ * surfaces that render through their own pipeline (e.g. dgmo-mcp's
+ * renderPipeline) but must emit the canonical chrome. `svgsHtml` must be the
+ * `.dgmo-light`+`.dgmo-dark` (or `.dgmo-svg`) wrapper divs.
+ */
+export function buildDgmoBlockHtml(
+  source: string,
+  svgsHtml: string,
+  options: DgmoBlockOptions = {}
+): string {
+  return assembleBlock(source.trim(), svgsHtml, resolveBlockOptions(options));
+}
+
+/**
+ * Standard error card for a block that failed to parse/render. Same shape on
+ * every surface: `.dgmo--error` with `role="alert"`, message + offending
+ * source.
+ */
+export function errorBlockHtml(
+  err: unknown,
+  source: string,
+  options: Pick<DgmoBlockOptions, 'className' | 'legacyClassNames'> = {}
+): string {
+  const msg =
+    err instanceof Error ? err.message : 'Failed to render dgmo block.';
+  const base = options.className ?? 'dgmo';
+  const legacy = (options.legacyClassNames ?? []).join(' ');
+  const cls = legacy
+    ? `${base} ${legacy} ${base}--error`
+    : `${base} ${base}--error`;
+  return (
+    `<div class="${escapeAttr(cls)}" role="alert">` +
+    `<strong>dgmo render error:</strong> ${escapeHtml(msg)}` +
+    `<pre>${escapeHtml(source)}</pre></div>`
+  );
+}
+
+// ============================================================
+// Internals
+// ============================================================
+
+function wrapperClasses(
+  opts: ResolvedBlockOptions,
+  variant: 'diagram' | 'showcase'
+): string {
+  const base = `${opts.className} ${opts.className}--${variant}`;
+  const legacy = opts.legacyClassNames.join(' ');
+  return legacy ? `${base} ${legacy}` : base;
+}
+
+function innerClasses(opts: ResolvedBlockOptions, primary: string): string {
+  const legacy = opts.legacyClassNames.join(' ');
+  return legacy ? `${primary} ${legacy}` : primary;
+}
+
+function assembleBlock(
+  source: string,
+  svgsHtml: string,
+  opts: ResolvedBlockOptions
+): string {
+  const Wrapper = opts.wrapper;
+  const showcase = opts.mode === 'showcase';
+  const variant = showcase ? 'showcase' : 'diagram';
+
+  const ariaAttr = opts.title ? ` aria-label="${escapeAttr(opts.title)}"` : '';
+
+  const sourceHtml = showcase ? sourceDisclosure(source, opts) : '';
+
+  return (
+    `<${Wrapper} class="${escapeAttr(wrapperClasses(opts, variant))}"${ariaAttr}>` +
+    svgsHtml +
+    sourceHtml +
+    `</${Wrapper}>`
+  );
+}
+
+// ----- icon SVGs (static author-controlled markup) -----
+const CODE_ICON = `<svg width="16" height="16" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m10 4.5 4 3.5-4 3.5"/><path d="m6 4.5-4 3.5 4 3.5"/></svg>`;
+const COPY_ICON = `<svg width="16" height="16" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect x="5.5" y="5.5" width="8" height="8" rx="1.5"/><path d="M10.5 5.5V3a1.5 1.5 0 0 0-1.5-1.5H3A1.5 1.5 0 0 0 1.5 3v6A1.5 1.5 0 0 0 3 10.5h2.5"/></svg>`;
+const EXTERNAL_ICON = `<svg width="16" height="16" viewBox="0 0 16 16" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M9.5 2.5h4v4"/><path d="M13.5 2.5 7 9"/><path d="M12.5 9.5v3a1 1 0 0 1-1 1h-8a1 1 0 0 1-1-1v-8a1 1 0 0 1 1-1h3"/></svg>`;
+
+/**
+ * The hidden source panel plus its toolbar. The <summary> is the toolbar row;
+ * its default click behavior is the source toggle, so no JS is needed for
+ * show/hide. The `</>` span deliberately does NOT get the `.dgmo-toolbar-btn`
+ * class — client copy/open handlers preventDefault on `.dgmo-toolbar-btn`
+ * inside a <summary> (to not also toggle), and the toggle must keep the
+ * default.
+ */
+function sourceDisclosure(source: string, opts: ResolvedBlockOptions): string {
+  if (!opts.showSource) return '';
+
+  const toggle = `<span class="dgmo-toggle" title="View DGMO source">${CODE_ICON}</span>`;
+
+  const copyButton = opts.showCopy
+    ? `<button type="button" class="dgmo-toolbar-btn dgmo-copy" aria-label="Copy DGMO source" title="Copy source" data-dgmo-source="${escapeAttr(source)}">${COPY_ICON}</button>`
+    : '';
+
+  let openButton = '';
+  if (opts.showOpenInEditor) {
+    const encoded = encodeDiagramUrl(source, { baseUrl: opts.editorBaseUrl });
+    // `too-large` (or any encode failure) → omit the link; copy remains.
+    if (encoded.url) {
+      openButton = `<a href="${escapeAttr(encoded.url)}" target="_blank" rel="noopener noreferrer" class="dgmo-toolbar-btn dgmo-open" aria-label="Open in online editor" title="Open in online editor">${EXTERNAL_ICON}</a>`;
+    }
+  }
+
+  const sourceHtml = highlightedSource(source);
+
+  return (
+    `<details class="dgmo-source-wrap">` +
+    `<summary class="dgmo-toolbar" aria-label="View DGMO source">${toggle}${copyButton}${openButton}</summary>` +
+    `<div class="dgmo-source-inner">${sourceHtml}</div>` +
+    `</details>`
+  );
+}
+
+function highlightedSource(source: string): string {
+  const tokens = highlightDgmo(source);
+  const inner = tokens
+    .map((t) => {
+      const text = escapeHtml(t.text);
+      if (!t.role || t.role === 'default') return text;
+      return `<span class="dgmo-tok-${escapeAttr(t.role)}">${text}</span>`;
+    })
+    .join('');
+  // <pre><span> rather than <pre><code>: Astro's Shiki rehype plugin and
+  // Docusaurus's MDX pipeline post-process any <pre><code> pair (even ones
+  // emitted as raw HTML), clobbering pre-rendered highlight spans. A <span>
+  // inner element bypasses the matcher while keeping preformatted semantics.
+  return `<pre class="dgmo-pre"><span class="dgmo-code">${inner}</span></pre>`;
+}

package/src/event-line/renderer.ts

@@ -115,8 +115,8 @@ const DIM = 'dgmo-evt-dim';
 const ERA_HL = 'dgmo-evt-era-hl';
 // Clicking a legend entry collapses that tag value's cards (and their leaders)
 // to bare dots — the dot stays on the spine in its tag color and still reveals
-// its card on hover; the legend entry renders struck-through with a hollow
-// swatch so the muted state is self-documenting and reversible. Preview-only
+// its card on hover; the legend entry dims with a hollow swatch so the muted
+// state is self-documenting and reversible. Preview-only
 // (never in `exportMode`), so static SVG/PNG always carries the full set.
 const COLLAPSED = 'dgmo-evt-collapsed';
 const OFF = 'dgmo-evt-off';
@@ -136,7 +136,7 @@ const HOVER_CSS =
   // the extra class out-specifies both the collapse rule and DIM.
   `.dgmo-event-card.${COLLAPSED},.dgmo-event-leader.${COLLAPSED}{opacity:0;pointer-events:none}` +
   `.dgmo-event-card.${COLLAPSED}.${HL},.dgmo-event-leader.${COLLAPSED}.${HL}{opacity:1;pointer-events:auto}` +
-  `[data-legend-entry].${OFF} text{text-decoration:line-through;opacity:.5}`;
+  `[data-legend-entry].${OFF} text{opacity:.5}`;
 
 type Side = 'above' | 'below';
 
@@ -739,11 +739,10 @@ export function renderEventLine(
 
   if (!exportMode) svg.append('style').text(HOVER_CSS);
 
-  svg
-    .append('rect')
-    .attr('width', contentW)
-    .attr('height', totalH)
-    .attr('fill', palette.bg);
+  // No opaque full-canvas background rect: the SVG's CSS `background` style
+  // (and resvg's background option on PNG export) supplies the fill, so
+  // transparent-theme / Obsidian embeds blend with the host instead of
+  // showing a dark box — matching every other chart type.
 
   if (showTitle) {
     const t = svg

package/src/swimlane/renderer.ts

@@ -153,6 +153,7 @@ export function renderSwimlaneForExport(
     .attr('width', width)
     .attr('height', height)
     .attr('viewBox', `0 0 ${width} ${height}`)
+    .attr('preserveAspectRatio', 'xMidYMin meet')
     .style('font-family', FONT_FAMILY) as unknown as D3Svg;
 
   const defs = svg.append('defs');