mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-11-09 23:34:08 +01:00
Merge pull request #5076 from ad1992/aakansha/bug/5075-fix-getDiagramFromText-api
fix: clean comments in text in getDiagramFromText API so flowchart works well
This commit is contained in:
@@ -96,7 +96,7 @@ mermaid.initialize(config);
|
|||||||
|
|
||||||
#### Defined in
|
#### Defined in
|
||||||
|
|
||||||
[mermaidAPI.ts:603](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L603)
|
[mermaidAPI.ts:608](https://github.com/mermaid-js/mermaid/blob/master/packages/mermaid/src/mermaidAPI.ts#L608)
|
||||||
|
|
||||||
## Functions
|
## Functions
|
||||||
|
|
||||||
|
|||||||
@@ -67,6 +67,7 @@ vi.mock('stylis', () => {
|
|||||||
});
|
});
|
||||||
import { compile, serialize } from 'stylis';
|
import { compile, serialize } from 'stylis';
|
||||||
import { decodeEntities, encodeEntities } from './utils.js';
|
import { decodeEntities, encodeEntities } from './utils.js';
|
||||||
|
import { Diagram } from './Diagram.js';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @see https://vitest.dev/guide/mocking.html Mock part of a module
|
* @see https://vitest.dev/guide/mocking.html Mock part of a module
|
||||||
@@ -744,4 +745,16 @@ describe('mermaidAPI', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('getDiagramFromText', () => {
|
||||||
|
it('should clean up comments when present in diagram definition', async () => {
|
||||||
|
const diagram = await mermaidAPI.getDiagramFromText(
|
||||||
|
`flowchart LR
|
||||||
|
%% This is a comment A -- text --> B{node}
|
||||||
|
A -- text --> B -- text2 --> C`
|
||||||
|
);
|
||||||
|
expect(diagram).toBeInstanceOf(Diagram);
|
||||||
|
expect(diagram.type).toBe('flowchart-v2');
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import { compile, serialize, stringify } from 'stylis';
|
|||||||
import { version } from '../package.json';
|
import { version } from '../package.json';
|
||||||
import * as configApi from './config.js';
|
import * as configApi from './config.js';
|
||||||
import { addDiagrams } from './diagram-api/diagram-orchestration.js';
|
import { addDiagrams } from './diagram-api/diagram-orchestration.js';
|
||||||
import { Diagram, getDiagramFromText } from './Diagram.js';
|
import { Diagram, getDiagramFromText as getDiagramFromTextInternal } from './Diagram.js';
|
||||||
import errorRenderer from './diagrams/error/errorRenderer.js';
|
import errorRenderer from './diagrams/error/errorRenderer.js';
|
||||||
import { attachFunctions } from './interactionDb.js';
|
import { attachFunctions } from './interactionDb.js';
|
||||||
import { log, setLogLevel } from './logger.js';
|
import { log, setLogLevel } from './logger.js';
|
||||||
@@ -28,7 +28,7 @@ import type { MermaidConfig } from './config.type.js';
|
|||||||
import { evaluate } from './diagrams/common/common.js';
|
import { evaluate } from './diagrams/common/common.js';
|
||||||
import isEmpty from 'lodash-es/isEmpty.js';
|
import isEmpty from 'lodash-es/isEmpty.js';
|
||||||
import { setA11yDiagramInfo, addSVGa11yTitleDescription } from './accessibility.js';
|
import { setA11yDiagramInfo, addSVGa11yTitleDescription } from './accessibility.js';
|
||||||
import type { DiagramStyleClassDef } from './diagram-api/types.js';
|
import type { DiagramMetadata, DiagramStyleClassDef } from './diagram-api/types.js';
|
||||||
import { preprocessDiagram } from './preprocess.js';
|
import { preprocessDiagram } from './preprocess.js';
|
||||||
import { decodeEntities } from './utils.js';
|
import { decodeEntities } from './utils.js';
|
||||||
|
|
||||||
@@ -519,6 +519,11 @@ function initialize(options: MermaidConfig = {}) {
|
|||||||
addDiagrams();
|
addDiagrams();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const getDiagramFromText = (text: string, metadata: Pick<DiagramMetadata, 'title'> = {}) => {
|
||||||
|
const { code } = preprocessDiagram(text);
|
||||||
|
return getDiagramFromTextInternal(code, metadata);
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add accessibility (a11y) information to the diagram.
|
* Add accessibility (a11y) information to the diagram.
|
||||||
*
|
*
|
||||||
|
|||||||
Reference in New Issue
Block a user