marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-24 17:59:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Revert type change for renderer

Browse Source
This commit is contained in:
Sidharth Vinod
2023-12-07 00:17:53 +05:30
parent 8d90815862
commit 0d98e6ca53
4 changed files with 61 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mermaid/src/Diagram.ts
View File

@@ -58,7 +58,7 @@ export class Diagram {
} }
async render(id: string, version: string) { async render(id: string, version: string) {
await this.renderer.draw(this.text, id, version, this, null); await this.renderer.draw(this.text, id, version, this);
} }
getParser() { getParser() {

3
packages/mermaid/src/diagram-api/types.ts
View File

@@ -100,8 +100,7 @@ export type DrawDefinition = (
text: string, text: string,
id: string, id: string,
version: string, version: string,
diagramObject: Diagram, diagramObject: Diagram
error: Error | null,
) => void | Promise<void>; ) => void | Promise<void>;
export interface ParserDefinition { export interface ParserDefinition {

116
packages/mermaid/src/diagrams/error/errorRenderer.ts
View File

@@ -17,14 +17,12 @@ export const draw = (
id: string, id: string,
version: string, version: string,
_diagramObject: Diagram, _diagramObject: Diagram,
error: Error | null = null error?: Error
) => { ) => {
log.debug('renering svg for syntax error\n'); log.debug('renering svg for syntax error\n');
const svg: SVG = selectSvgElement(id); const svg: SVG = selectSvgElement(id);
const g: Group = svg.append('g'); const g: Group = svg.append('g');
if (error && error.message?.includes('KaTeX')) { if (error?.message?.includes('KaTeX')) {
const title = error.message.split(': ')[0]; const title = error.message.split(': ')[0];
const body = error.message.replace(/[A-z]*:/, '').replace('KaTeX parse ', ''); const body = error.message.replace(/[A-z]*:/, '').replace('KaTeX parse ', '');
g.append('foreignObject') g.append('foreignObject')
@@ -36,67 +34,69 @@ export const draw = (
.html(`<div style="font-size: 26px; margin-bottom: 8px">${title}</div><div>${body}</div>`); .html(`<div style="font-size: 26px; margin-bottom: 8px">${title}</div><div>${body}</div>`);
svg.attr('height', 100); svg.attr('height', 100);
svg.attr('width', 500); svg.attr('width', 500);
} else { svg.attr('viewBox', '0 0 500 100');
svg.attr('viewBox', '0 0 2412 512'); return;
configureSvgSize(svg, 100, 512, true); }
g.append('path') svg.attr('viewBox', '0 0 2412 512');
.attr('class', 'error-icon') configureSvgSize(svg, 100, 512, true);
.attr(
'd',
'm411.313,123.313c6.25-6.25 6.25-16.375 0-22.625s-16.375-6.25-22.625,0l-32,32-9.375,9.375-20.688-20.688c-12.484-12.5-32.766-12.5-45.25,0l-16,16c-1.261,1.261-2.304,2.648-3.31,4.051-21.739-8.561-45.324-13.426-70.065-13.426-105.867,0-192,86.133-192,192s86.133,192 192,192 192-86.133 192-192c0-24.741-4.864-48.327-13.426-70.065 1.402-1.007 2.79-2.049 4.051-3.31l16-16c12.5-12.492 12.5-32.758 0-45.25l-20.688-20.688 9.375-9.375 32.001-31.999zm-219.313,100.687c-52.938,0-96,43.063-96,96 0,8.836-7.164,16-16,16s-16-7.164-16-16c0-70.578 57.422-128 128-128 8.836,0 16,7.164 16,16s-7.164,16-16,16z'
);
g.append('path') g.append('path')
.attr('class', 'error-icon') .attr('class', 'error-icon')
.attr( .attr(
'd', 'd',
'm459.02,148.98c-6.25-6.25-16.375-6.25-22.625,0s-6.25,16.375 0,22.625l16,16c3.125,3.125 7.219,4.688 11.313,4.688 4.094,0 8.188-1.563 11.313-4.688 6.25-6.25 6.25-16.375 0-22.625l-16.001-16z' 'm411.313,123.313c6.25-6.25 6.25-16.375 0-22.625s-16.375-6.25-22.625,0l-32,32-9.375,9.375-20.688-20.688c-12.484-12.5-32.766-12.5-45.25,0l-16,16c-1.261,1.261-2.304,2.648-3.31,4.051-21.739-8.561-45.324-13.426-70.065-13.426-105.867,0-192,86.133-192,192s86.133,192 192,192 192-86.133 192-192c0-24.741-4.864-48.327-13.426-70.065 1.402-1.007 2.79-2.049 4.051-3.31l16-16c12.5-12.492 12.5-32.758 0-45.25l-20.688-20.688 9.375-9.375 32.001-31.999zm-219.313,100.687c-52.938,0-96,43.063-96,96 0,8.836-7.164,16-16,16s-16-7.164-16-16c0-70.578 57.422-128 128-128 8.836,0 16,7.164 16,16s-7.164,16-16,16z'
); );
g.append('path') g.append('path')
.attr('class', 'error-icon') .attr('class', 'error-icon')
.attr( .attr(
'd', 'd',
'm340.395,75.605c3.125,3.125 7.219,4.688 11.313,4.688 4.094,0 8.188-1.563 11.313-4.688 6.25-6.25 6.25-16.375 0-22.625l-16-16c-6.25-6.25-16.375-6.25-22.625,0s-6.25,16.375 0,22.625l15.999,16z' 'm459.02,148.98c-6.25-6.25-16.375-6.25-22.625,0s-6.25,16.375 0,22.625l16,16c3.125,3.125 7.219,4.688 11.313,4.688 4.094,0 8.188-1.563 11.313-4.688 6.25-6.25 6.25-16.375 0-22.625l-16.001-16z'
); );
g.append('path') g.append('path')
.attr('class', 'error-icon') .attr('class', 'error-icon')
.attr( .attr(
'd', 'd',
'm400,64c8.844,0 16-7.164 16-16v-32c0-8.836-7.156-16-16-16-8.844,0-16,7.164-16,16v32c0,8.836 7.156,16 16,16z' 'm340.395,75.605c3.125,3.125 7.219,4.688 11.313,4.688 4.094,0 8.188-1.563 11.313-4.688 6.25-6.25 6.25-16.375 0-22.625l-16-16c-6.25-6.25-16.375-6.25-22.625,0s-6.25,16.375 0,22.625l15.999,16z'
); );
g.append('path') g.append('path')
.attr('class', 'error-icon') .attr('class', 'error-icon')
.attr( .attr(
'd', 'd',
'm496,96.586h-32c-8.844,0-16,7.164-16,16 0,8.836 7.156,16 16,16h32c8.844,0 16-7.164 16-16 0-8.836-7.156-16-16-16z' 'm400,64c8.844,0 16-7.164 16-16v-32c0-8.836-7.156-16-16-16-8.844,0-16,7.164-16,16v32c0,8.836 7.156,16 16,16z'
); );
g.append('path') g.append('path')
.attr('class', 'error-icon') .attr('class', 'error-icon')
.attr( .attr(
'd', 'd',
'm436.98,75.605c3.125,3.125 7.219,4.688 11.313,4.688 4.094,0 8.188-1.563 11.313-4.688l32-32c6.25-6.25 6.25-16.375 0-22.625s-16.375-6.25-22.625,0l-32,32c-6.251,6.25-6.251,16.375-0.001,22.625z' 'm496,96.586h-32c-8.844,0-16,7.164-16,16 0,8.836 7.156,16 16,16h32c8.844,0 16-7.164 16-16 0-8.836-7.156-16-16-16z'
); );
g.append('text') // text label for the x axis g.append('path')
.attr('class', 'error-text') .attr('class', 'error-icon')
.attr('x', 1440) .attr(
.attr('y', 250) 'd',
.attr('font-size', '150px') 'm436.98,75.605c3.125,3.125 7.219,4.688 11.313,4.688 4.094,0 8.188-1.563 11.313-4.688l32-32c6.25-6.25 6.25-16.375 0-22.625s-16.375-6.25-22.625,0l-32,32c-6.251,6.25-6.251,16.375-0.001,22.625z'
.style('text-anchor', 'middle') );
.text('Syntax error in text');
g.append('text') // text label for the x axis g.append('text') // text label for the x axis
.attr('class', 'error-text') .attr('class', 'error-text')
.attr('x', 1250) .attr('x', 1440)
.attr('y', 400) .attr('y', 250)
.attr('font-size', '100px') .attr('font-size', '150px')
.style('text-anchor', 'middle') .style('text-anchor', 'middle')
.text(`mermaid version ${version}`); .text('Syntax error in text');
} g.append('text') // text label for the x axis
.attr('class', 'error-text')
.attr('x', 1250)
.attr('y', 400)
.attr('font-size', '100px')
.style('text-anchor', 'middle')
.text(`mermaid version ${version}`);
}; };
export const renderer = { draw }; export const renderer = { draw };

2
packages/mermaid/src/mermaidAPI.ts
View File

@@ -435,7 +435,7 @@ const render = async function (
// ------------------------------------------------------------------------------- // -------------------------------------------------------------------------------
// Draw the diagram with the renderer // Draw the diagram with the renderer
try { try {
await diag.renderer.draw(text, id, version, diag, null); await diag.renderer.draw(text, id, version, diag);
} catch (e: any) { } catch (e: any) {
errorRenderer.draw(text, id, version, diag, e); errorRenderer.draw(text, id, version, diag, e);
throw e; throw e;