GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-02-04 07:13:25 +08:00
Code Issues Projects Releases Wiki Activity

Make flowchart edge Ids consistent across getEdges and getData

Browse Source
This commit is contained in:
Ashish Jain 2025-01-22 01:09:49 +01:00
parent ab5b7694c6
commit 54a0dd0af6
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/mermaid/src/diagrams/flowchart/flowDb.ts
View File

@ -212,6 +212,7 @@ export const addSingleLink = function (_start: string, _end: string, type: any,
text: '', text: '',
labelType: 'text', labelType: 'text',
classes: [], classes: [],
isUserDefinedId: false,
}; };
log.info('abc78 Got edge...', edge); log.info('abc78 Got edge...', edge);
const linkTextObj = type.text; const linkTextObj = type.text;
@ -233,12 +234,15 @@ export const addSingleLink = function (_start: string, _end: string, type: any,
} }
if (id) { if (id) {
edge.id = id; edge.id = id;
edge.isUserDefinedId = true;
} else { } else {
const existingLinks = edges.filter((e) => e.start === edge.start && e.end === edge.end); const existingLinks = edges.filter((e) => e.start === edge.start && e.end === edge.end);
if (existingLinks.length === 0) { if (existingLinks.length === 0) {
edge.id = `${edge.start}-${edge.end}-${edge.length}`; edge.id = getEdgeId(edge.start, edge.end, { counter: 0, prefix: 'L' });
//edge.id = `${edge.start}-${edge.end}-${edge.length}`;
} else { } else {
edge.id = `${edge.start}-${edge.end}-${existingLinks.length + 1}`; edge.id = getEdgeId(edge.start, edge.end, { counter: existingLinks.length + 1, prefix: 'L' });
//edge.id = `${edge.start}-${edge.end}-${existingLinks.length + 1}`;
} }
} }
@ -274,11 +278,13 @@ export const addLink = function (_start: string[], _end: string[], linkData: unk
log.info('addLink', _start, _end, id); log.info('addLink', _start, _end, id);
let idIsUsed = false; // for a group syntax like A e1@--> B & C, only the first edge should have an the userDefined id
// the rest of the edges should have auto generated ids
let isEdgeConsumed = false;
for (const start of _start) { for (const start of _start) {
for (const end of _end) { for (const end of _end) {
addSingleLink(start, end, linkData, !idIsUsed ? id : undefined); addSingleLink(start, end, linkData, !isEdgeConsumed ? id : undefined);
idIsUsed = true; isEdgeConsumed = true;
} }
} }
}; };
@ -1054,6 +1060,7 @@ export const getData = () => {
} }
const edge: Edge = { const edge: Edge = {
id: getEdgeId(rawEdge.start, rawEdge.end, { counter: index, prefix: 'L' }, rawEdge.id), id: getEdgeId(rawEdge.start, rawEdge.end, { counter: index, prefix: 'L' }, rawEdge.id),
isUserDefinedId: rawEdge.isUserDefinedId,
start: rawEdge.start, start: rawEdge.start,
end: rawEdge.end, end: rawEdge.end,
type: rawEdge.type ?? 'normal', type: rawEdge.type ?? 'normal',

1
packages/mermaid/src/diagrams/flowchart/types.ts
View File

@ -53,6 +53,7 @@ export interface FlowText {
} }
export interface FlowEdge { export interface FlowEdge {
isUserDefinedId: boolean;
start: string; start: string;
end: string; end: string;
interpolate?: string; interpolate?: string;

1
packages/mermaid/src/rendering-util/types.ts
View File

@ -125,6 +125,7 @@ export interface Edge {
pattern?: string; pattern?: string;
thickness?: 'normal' | 'thick' | 'invisible' | 'dotted'; thickness?: 'normal' | 'thick' | 'invisible' | 'dotted';
look?: string; look?: string;
isUserDefinedId?: boolean;
} }
export interface RectOptions { export interface RectOptions {