marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-03 15:46:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

WIP 5

Browse Source
This commit is contained in:
Knut Sveidqvist
2025-08-09 18:31:53 +02:00
parent bdfc15caf3
commit f8d66e2faa
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
packages/mermaid/src/diagrams/flowchart/parser/flowParser.ts
View File

@@ -4211,7 +4211,7 @@ class LezerFlowParser {
length: number; length: number;
nextIndex: number; nextIndex: number;
} | null { } | null {
console.log(`UIO DEBUG: parseComplexArrowPattern called at index ${startIndex}`); log.debug(`UIO parseComplexArrowPattern called at index ${startIndex}`);
let i = startIndex; let i = startIndex;
// Collect all tokens until we find the target identifier // Collect all tokens until we find the target identifier
@@ -4222,8 +4222,8 @@ class LezerFlowParser {
while (i < tokens.length) { while (i < tokens.length) {
const token = tokens[i]; const token = tokens[i];
console.log( log.debug(
`UIO DEBUG: parseComplexArrowPattern: processing token ${i}: ${token.type}:${token.value}` `UIO parseComplexArrowPattern: processing token ${i}: ${token.type}:${token.value}`
); );
// Handle double-ended arrow heads tokenized as identifiers (e.g., 'x' or 'o') // Handle double-ended arrow heads tokenized as identifiers (e.g., 'x' or 'o')
@@ -4232,9 +4232,7 @@ class LezerFlowParser {
(token.value === 'x' || token.value === 'o') && (token.value === 'x' || token.value === 'o') &&
arrowParts.length === 0 arrowParts.length === 0
) { ) {
console.log( log.debug(`UIO parseComplexArrowPattern: treating '${token.value}' as arrow head prefix`);
`UIO DEBUG: parseComplexArrowPattern: treating '${token.value}' as arrow head prefix`
);
arrowParts.push(token.value); arrowParts.push(token.value);
i++; i++;
continue; continue;
@@ -4247,8 +4245,8 @@ class LezerFlowParser {
) { ) {
const m = /^(x|o)(--|==|-\.+)$/.exec(token.value); const m = /^(x|o)(--|==|-\.+)$/.exec(token.value);
if (m) { if (m) {
console.log( log.debug(
`UIO DEBUG: parseComplexArrowPattern: splitting combined head+open '${token.value}' into '${m[1]}' and '${m[2]}'` `UIO parseComplexArrowPattern: splitting combined head+open '${token.value}' into '${m[1]}' and '${m[2]}'`
); );
arrowParts.push(m[1]); arrowParts.push(m[1]);
arrowParts.push(m[2]); arrowParts.push(m[2]);
@@ -4258,12 +4256,12 @@ class LezerFlowParser {
} }
if (token.type === 'Arrow' || token.type === 'LINK') { if (token.type === 'Arrow' || token.type === 'LINK') {
console.log(`UIO DEBUG: parseComplexArrowPattern: found Arrow/LINK token: ${token.value}`); log.debug(`UIO parseComplexArrowPattern: found Arrow/LINK token: ${token.value}`);
// If we already have text, check if this LINK token should be treated as text or arrow part // If we already have text, check if this LINK token should be treated as text or arrow part
if (foundText && !this.isArrowContinuation(token.value)) { if (foundText && !this.isArrowContinuation(token.value)) {
// This LINK token is part of the text, not the arrow // This LINK token is part of the text, not the arrow
console.log(`UIO DEBUG: parseComplexArrowPattern: treating LINK as text: ${token.value}`); log.debug(`UIO parseComplexArrowPattern: treating LINK as text: ${token.value}`);
text += ' ' + token.value; text += ' ' + token.value;
} else { } else {
// This is part of the arrow pattern // This is part of the arrow pattern
@@ -4283,10 +4281,10 @@ class LezerFlowParser {
arrowParts.push(token.value); arrowParts.push(token.value);
} else if (token.type === 'STR') { } else if (token.type === 'STR') {
// Handle quoted strings for edge text; preserve quotes so processNodeText can derive labelType // Handle quoted strings for edge text; preserve quotes so processNodeText can derive labelType
console.log(`UIO DEBUG: parseComplexArrowPattern: found STR token: ${token.value}`); log.debug(`UIO parseComplexArrowPattern: found STR token: ${token.value}`);
if (!foundText) { if (!foundText) {
console.log( log.debug(
`UIO DEBUG: parseComplexArrowPattern: setting text = ${token.value} (from STR, preserving quotes)` `UIO parseComplexArrowPattern: setting text = ${token.value} (from STR, preserving quotes)`
); );
text = token.value; // Keep surrounding quotes; downstream will classify as 'string' or 'markdown' text = token.value; // Keep surrounding quotes; downstream will classify as 'string' or 'markdown'
foundText = true; foundText = true;
@@ -4294,9 +4292,7 @@ class LezerFlowParser {
} else if ( } else if (
token.type === 'Identifier' || token.type === 'Identifier' ||
token.type === 'NODE_STRING' || token.type === 'NODE_STRING' ||
token.type === '⚠' || this.isTextToken(token.type)
token.type === 'DIR' ||
token.type === 'GRAPH'
) { ) {
// This could be text or the target node // This could be text or the target node
// For single-ended arrows like A e1@----x B, B should be the target directly // For single-ended arrows like A e1@----x B, B should be the target directly
@@ -4329,28 +4325,28 @@ class LezerFlowParser {
if (isSingleEndedArrow) { if (isSingleEndedArrow) {
// For single-ended arrows, this identifier is the target // For single-ended arrows, this identifier is the target
console.log( log.debug(
`UIO DEBUG: parseComplexArrowPattern: setting targetId = ${token.value} (single-ended arrow)` `UIO parseComplexArrowPattern: setting targetId = ${token.value} (single-ended arrow)`
); );
targetId = token.value; targetId = token.value;
i++; i++;
break; break;
} else if (arrowParts.length > 0 && !foundText) { } else if (arrowParts.length > 0 && !foundText) {
// This is text in the middle of a double-ended arrow // This is text in the middle of a double-ended arrow
console.log( log.debug(
`UIO DEBUG: parseComplexArrowPattern: setting text = ${token.value} (double-ended arrow)` `UIO parseComplexArrowPattern: setting text = ${token.value} (double-ended arrow)`
); );
text = token.value; text = token.value;
foundText = true; foundText = true;
} else if (foundText && arrowParts.length <= 1) { } else if (foundText && arrowParts.length <= 1) {
// Continue collecting multi-word text until the second arrow begins // Continue collecting multi-word text until the second arrow begins
console.log(`UIO DEBUG: parseComplexArrowPattern: appending to text: ${token.value}`); log.debug(`UIO parseComplexArrowPattern: appending to text: ${token.value}`);
text += ' ' + token.value; text += ' ' + token.value;
} else if (foundText && arrowParts.length >= 2) { } else if (foundText && arrowParts.length >= 2) {
// We have text collected and have encountered the second arrow. // We have text collected and have encountered the second arrow.
// The current token is the identifier immediately after the second arrow. // The current token is the identifier immediately after the second arrow.
console.log( log.debug(
`UIO DEBUG: parseComplexArrowPattern: setting targetId = ${token.value} (double-ended arrow with text)` `UIO parseComplexArrowPattern: setting targetId = ${token.value} (double-ended arrow with text)`
); );
targetId = token.value; targetId = token.value;
i++; i++;
@@ -4359,7 +4355,7 @@ class LezerFlowParser {
// NOTE: fixed stray closing brace // NOTE: fixed stray closing brace
// No arrow parts yet, this might be the start of a pattern // No arrow parts yet, this might be the start of a pattern
// But be conservative - don't assume single chars are arrow parts // But be conservative - don't assume single chars are arrow parts
console.log(`UIO DEBUG: parseComplexArrowPattern: no arrow parts yet, breaking`); log.debug(`UIO parseComplexArrowPattern: no arrow parts yet, breaking`);
break; break;
} }
} else { } else {