692fdddcc9
* fix(web): make mermaid sanitizer quote-aware and detect parens in bracket labels
Two diagrams failed to render because sanitizeMermaidCode injected nested
quotes into already-quoted labels and missed parens-as-stadium-opener inside
bracket labels. Skip ranges already inside `"..."` (recomputed between
passes) and add `(`/`)` to the bracket-pass trigger set.
* refactor(web): drop dead text.startsWith('"') guards in mermaid sanitizer
The regex character classes [^\]"], [^|"], [^)"] already exclude `"`,
so the guards were unreachable.
* fix(web): stop unterminated quote bleeding across lines in mermaid sanitizer
findQuotedRanges now stops scanning at newline; an unterminated `"` is
discarded rather than paired with a `"` on a later line where it would
silently suppress sanitization of unrelated content. Add tests for the
cross-line guard and for a bracket-with-parens adjacent to a real
stadium node on the same line.
122 lines
4.2 KiB
TypeScript
122 lines
4.2 KiB
TypeScript
/** Shared constants and helpers for mermaid diagram rendering. */
|
|
|
|
export const DEFAULT_SCALE = 0.75;
|
|
export const SCALE_STEP = 0.1;
|
|
export const MIN_SCALE = 0.1;
|
|
export const MAX_SCALE = 1.5;
|
|
|
|
export const MERMAID_ERROR_EVENT = "mermaid:render-error";
|
|
|
|
export function cleanupMermaidOrphans(id: string): void {
|
|
document.getElementById(id)?.remove();
|
|
document.getElementById(`d${id}`)?.remove();
|
|
}
|
|
|
|
export function emitMermaidRenderError(message: string): void {
|
|
document.dispatchEvent(new CustomEvent(MERMAID_ERROR_EVENT, { detail: { message } }));
|
|
}
|
|
|
|
/** Read intrinsic width/height from an SVG element's viewBox or attributes. */
|
|
export function getSvgDimensions(container: HTMLElement): { w: number; h: number } | null {
|
|
const svg = container.querySelector("svg");
|
|
if (!svg) return null;
|
|
const vb = svg.getAttribute("viewBox");
|
|
if (vb) {
|
|
const parts = vb.split(/[\s,]+/).map(Number);
|
|
if (parts.length === 4 && parts[2] > 0 && parts[3] > 0) {
|
|
return { w: parts[2], h: parts[3] };
|
|
}
|
|
}
|
|
const w = parseFloat(svg.getAttribute("width") ?? "");
|
|
const h = parseFloat(svg.getAttribute("height") ?? "");
|
|
if (w > 0 && h > 0) return { w, h };
|
|
return null;
|
|
}
|
|
|
|
/**
|
|
* Characters that require quoting in mermaid node/edge labels.
|
|
* Includes: $, #, &, /, and other special chars that cause lexical errors.
|
|
*/
|
|
const SPECIAL_CHARS_RE = /[$#&/\\<>{}]/;
|
|
|
|
/**
|
|
* Bracket-pass trigger: parens are mermaid grammar metachars (stadium-shape
|
|
* opener) and break parsing when they appear inside `[...]` labels, so they
|
|
* force quoting in bracket labels even though they're legal in standalone
|
|
* `(...)` stadium nodes.
|
|
*/
|
|
const BRACKET_TRIGGER_RE = /[$#&/\\<>{}()]/;
|
|
|
|
/**
|
|
* Index ranges of every top-level `"..."` span (start = opening `"`, end = closing `"`).
|
|
* Scan stops at newline so an unterminated `"` on one line cannot pair with a
|
|
* `"` on a later line and silently suppress sanitization of unrelated content.
|
|
*/
|
|
function findQuotedRanges(s: string): Array<[number, number]> {
|
|
const out: Array<[number, number]> = [];
|
|
let i = 0;
|
|
while (i < s.length) {
|
|
if (s[i] === '"' && s[i - 1] !== "\\") {
|
|
const start = i;
|
|
i++;
|
|
while (i < s.length && s[i] !== "\n" && !(s[i] === '"' && s[i - 1] !== "\\")) i++;
|
|
if (i < s.length && s[i] === '"') out.push([start, i]);
|
|
}
|
|
i++;
|
|
}
|
|
return out;
|
|
}
|
|
|
|
const inAnyRange = (offset: number, ranges: Array<[number, number]>): boolean =>
|
|
ranges.some(([a, b]) => offset >= a && offset <= b);
|
|
|
|
/**
|
|
* Preprocesses mermaid code to quote text containing special characters.
|
|
* Mermaid requires quotes around text with special chars like $, /, etc.
|
|
*
|
|
* Handles:
|
|
* - Node labels: A[text] -> A["text"] if text contains special chars or parens
|
|
* - Edge labels: -->|text| -> -->|"text"| if text contains special chars
|
|
* - Stadium nodes: (text) -> ("text") if text contains special chars
|
|
*
|
|
* Skips any region already inside a user-supplied `"..."` label so we never
|
|
* inject nested quotes into pre-quoted content.
|
|
*/
|
|
export function sanitizeMermaidCode(code: string): string {
|
|
// Quote node labels: [text] or [[text]] etc. Match brackets that aren't already quoted.
|
|
let quoted = findQuotedRanges(code);
|
|
let result = code.replace(/(\[+)([^\]"]+?)(\]+)/g, (match, open, text, close, offset) => {
|
|
if (inAnyRange(offset, quoted)) return match;
|
|
if (BRACKET_TRIGGER_RE.test(text)) {
|
|
return `${open}"${text}"${close}`;
|
|
}
|
|
return match;
|
|
});
|
|
|
|
// Quote edge labels: |text|
|
|
quoted = findQuotedRanges(result);
|
|
result = result.replace(/\|([^|"]+?)\|/g, (match, text, offset) => {
|
|
if (inAnyRange(offset, quoted)) return match;
|
|
if (SPECIAL_CHARS_RE.test(text)) {
|
|
return `|"${text}"|`;
|
|
}
|
|
return match;
|
|
});
|
|
|
|
// Quote parentheses labels: (text) for stadium/circle nodes
|
|
quoted = findQuotedRanges(result);
|
|
result = result.replace(/(\(+)([^)"]+?)(\)+)/g, (match, open, text, close, offset) => {
|
|
if (inAnyRange(offset, quoted)) return match;
|
|
// Skip if it looks like a subgraph or keyword
|
|
if (/^(subgraph|end|graph|flowchart|sequenceDiagram)\b/.test(text.trim())) {
|
|
return match;
|
|
}
|
|
if (SPECIAL_CHARS_RE.test(text)) {
|
|
return `${open}"${text}"${close}`;
|
|
}
|
|
return match;
|
|
});
|
|
|
|
return result;
|
|
}
|