GitHub/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-01-28 07:03:17 +08:00
Code Issues Projects Releases Wiki Activity

Add special handling to avoid markdown to HTML issues

Browse Source
This commit is contained in:
yari-dewalt 2024-08-28 10:56:14 -07:00
parent 191e4217fc
commit 20a58d6dbb
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
packages/mermaid/src/diagrams/class/classTypes.ts
View File

@ -121,20 +121,45 @@ export class ClassMember {
}
this.classifier = potentialClassifier;
this.text = `${this.visibility}${this.id}${this.memberType === 'method' ? `(${this.parameters})${this.returnType ? ' : ' + this.returnType : ''}` : ''}`; //.replaceAll('~', '<');
this.text = `${this.visibility}${this.id}${this.memberType === 'method' ? `(${this.parameters})${this.returnType ? ' : ' + this.returnType : ''}` : ''}`;
const combinedText = `${this.visibility}${this.id}${this.memberType === 'method' ? `(${this.parameters})${this.returnType ? ' : ' + this.returnType : ''}` : ''}`;
if (combinedText.includes('~')) {
let count = (combinedText.match(/~/g) ?? []).length;
const numOfTildes = (combinedText.substring(1).match(/~/g) ?? []).length;
let count = numOfTildes;
if (count !== 1) {
const odd = count % 2 > 0;
// Replace all '~' with '>'
let replacedRaw = combinedText.replaceAll('~', '&gt;');
// Replace all '~' with '>'
let replacedRaw = combinedText.substring(1).replaceAll('~', '&gt;');
// Replace the first half of '>' with '<'
while (count > 0) {
replacedRaw = replacedRaw.replace('&gt;', '&lt;');
count -= 2; // Each iteration replaces one '>' with '<', so reduce count by 2
// Replace the first half of '>' with '<'
while (count > 0) {
replacedRaw = replacedRaw.replace('&gt;', '&lt;');
count -= 2; // Each iteration replaces one '>' with '<', so reduce count by 2
}
if (odd) {
if (this.memberType === 'method') {
replacedRaw = replacedRaw.replace('&lt;', '~');
} else {
// Replace the middle occurrence of '&lt;' with '~'
const ltOccurrences = replacedRaw.match(/&lt;/g) ?? [];
if (ltOccurrences.length > 1) {
let ltCount = 0;
replacedRaw = replacedRaw.replace(/&lt;/g, (match) => {
ltCount++;
return ltCount === ltOccurrences.length ? '~' : match;
});
}
}
}
this.text = this.text.charAt(0) + replacedRaw;
if (this.visibility === '~') {
this.text = this.text.replace('~', '\\~');
}
} else if (count === 1 && this.visibility === '~') {
this.text = this.text.replace('~', '\\~');
}
this.text = replacedRaw;
}
}