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

All tests but one going through

Browse Source
This commit is contained in:
Knut Sveidqvist
2025-04-29 15:02:34 +02:00
parent d24becb455
commit 516e03db1a
4 changed files with 90 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/parser/src/language/mindmap/mindmap.langium
View File

@@ -5,13 +5,15 @@
grammar Mindmap
entry MindmapDoc:
MINDMAP_KEYWORD (newline=NL)?
(PREDOC)? MINDMAP_KEYWORD
(MindmapRows+=MindmapRow)*;
MindmapRow:
// indent=(INDENTATION | '0') item=Item (terminator=NL)?;
(indent=INDENTATION)? item=Item (terminator=NL)?;
PREDOC:
pre=(ML_COMMENT | WS)+;
MindmapRow:
(indent=INDENTATION)|(indent=INDENTATION)? (item=Item);
Item:
Node | IconDecoration | ClassDecoration;
@@ -38,16 +40,6 @@ CloudNode:
HexagonNode:
(id=ID)? desc=(HEXAGON_STR|HEXAGON_QSTR);
// Handle other complex node variants
OtherComplex:
id=ID
(
('[' '[' desc=(ID | STRING) ']' ']') |
('{' '{' desc=(ID | STRING) '}' '}') |
('(-' desc=(ID | STRING) '-)') |
('(' desc=(ID | STRING) ')')
);
// Simple node as fallback
SimpleNode:
id=ID;
@@ -59,12 +51,10 @@ ClassDecoration:
content=(CLASS);
// This should be processed before whitespace is ignored
terminal INDENTATION: /[ \t]{2,}/; // Two or more spaces/tabs for indentation
terminal INDENTATION: /[ \t]{1,}/; // Two or more spaces/tabs for indentation
// Keywords with fixed text patterns
terminal MINDMAP_KEYWORD: 'mindmap\n';
// terminal ICON_KEYWORD: '::icon(';
// terminal CLASS_KEYWORD: ':::';
terminal MINDMAP_KEYWORD: 'mindmap';
// Basic token types
terminal CIRCLE_QSTR: "((\"" -> "\"))";
@@ -84,14 +74,14 @@ terminal ICON: "::icon(" -> ")";
terminal CLASS: /:::([^\n:])*/;
terminal ID: /[a-zA-Z0-9_\-\.\/]+/;
terminal STRING: /"[^"]*"|'[^']*'/;
// Modified indentation rule to have higher priority than WS
terminal NL: /\r?\n/;
hidden terminal ML_COMMENT: /\s*\%\%[^\n]*/;
hidden terminal NL: /\r?\n/;
// Hidden tokens
terminal WS: /[ \t]/; // Single space or tab for hidden whitespace
hidden terminal ML_COMMENT: /\%\%[^\n]*/;
// Type definition for node types
type NodeType = 'DEFAULT' | 'CIRCLE' | 'CLOUD' | 'BANG' | 'HEXAGON' | 'ROUND';

1
packages/parser/src/language/mindmap/valueConverter.ts
View File

@@ -42,6 +42,7 @@ export class MindmapValueConverter extends AbstractMermaidValueConverter {
} else if (rule.name === 'ICON') {
return input.replace('::icon(', '').replace(')', '').trim();
} else if (rule.name === 'INDENTATION') {
console.debug('INDENTATION', input.length);
return input.length;
}
return undefined;

68
packages/parser/tests/mindmap-poc.test.ts
View File

@@ -3,12 +3,9 @@ import { validatedMindmapParse as validatedParse, mindmapParse as parse } from '
import type { CircleNode, SimpleNode, OtherComplex } from '../src/language/generated/ast.js';
describe('Nodes (ported from mindmap.spec.ts)', () => {
it('MMP-21 should be possible to have comments in a mindmap', () => {
const result = parse(
'mindmap\nroot(Root)\n Child(Child)\n a(a)\n\n %% This is a comment\n b[New Stuff]'
);
it('MMP-20 should be possible to have meaningless empty rows in a mindmap', () => {
const result = parse('mindmap\nroot(Root)\n Child(Child)\n a(a)\n\n b[New Stuff]');
expect(result.lexerErrors).toHaveLength(0);
console.debug(result.parserErrors);
expect(result.parserErrors).toHaveLength(0);
const rootNode = result.value.MindmapRows[0].item as OtherComplex;
const childNode = result.value.MindmapRows[1].item as OtherComplex;
@@ -19,4 +16,65 @@ describe('Nodes (ported from mindmap.spec.ts)', () => {
expect(aNode.desc).toBe('a');
expect(bNode.desc).toBe('New Stuff');
});
it.only('MMP-24 Handle rows above the mindmap declarations', () => {
const result = parse('\n \nmindmap\nroot\n A\n \n\n B');
if (result.lexerErrors.length > 0) {
console.debug('lexerErrors', result.lexerErrors);
}
expect(result.lexerErrors).toHaveLength(0);
if (result.parserErrors.length > 0) {
console.debug('Error', result.parserErrors);
}
expect(result.parserErrors).toHaveLength(0);
for (const row of result.value.MindmapRows) {
console.debug('Row', row);
}
const rootNode = result.value.MindmapRows[0].item as SimpleNode;
const aNode = result.value.MindmapRows[1].item as SimpleNode;
const bNode = result.value.MindmapRows[3].item as SimpleNode;
expect(rootNode.id).toBe('root');
expect(aNode.id).toBe('A');
expect(bNode.id).toBe('B');
});
it('MMP-22 should be possible to have comments at the end of a line', () => {
const result = parse(
'mindmap\nroot(Root)\n Child(Child)\n a(a) %% This is a comment\n b[New Stuff]'
);
if (result.lexerErrors.length > 0) {
console.debug('lexerErrors', result.lexerErrors);
}
if (result.parserErrors.length > 0) {
console.debug('Error', result.parserErrors);
}
for (const row of result.value.MindmapRows) {
console.debug('Row', row);
}
expect(result.lexerErrors).toHaveLength(0);
expect(result.parserErrors).toHaveLength(0);
const rootNode = result.value.MindmapRows[0].item as OtherComplex;
const childNode = result.value.MindmapRows[1].item as OtherComplex;
const aNode = result.value.MindmapRows[2].item as OtherComplex;
const bNode = result.value.MindmapRows[3].item as OtherComplex;
expect(rootNode.desc).toBe('Root');
expect(childNode.desc).toBe('Child');
expect(aNode.desc).toBe('a');
expect(bNode.desc).toBe('New Stuff');
});
// it('MMP-21 should be possible to have comments in a mindmap', () => {
// const result = parse(
// 'mindmap\nroot(Root)\n Child(Child)\n a(a)\n\n %% This is a comment\n b[New Stuff]'
// );
// expect(result.lexerErrors).toHaveLength(0);
// console.debug(result.parserErrors);
// expect(result.parserErrors).toHaveLength(0);
// const rootNode = result.value.MindmapRows[0].item as OtherComplex;
// const childNode = result.value.MindmapRows[1].item as OtherComplex;
// const aNode = result.value.MindmapRows[2].item as OtherComplex;
// const bNode = result.value.MindmapRows[3].item as OtherComplex;
// expect(rootNode.desc).toBe('Root');
// expect(childNode.desc).toBe('Child');
// expect(aNode.desc).toBe('a');
// expect(bNode.desc).toBe('New Stuff');
// });
});

19
packages/parser/tests/mindmap.test.ts
View File

@@ -142,6 +142,7 @@ describe('Hierarchy (ported from mindmap.spec.ts)', () => {
);
const str2 = 'mindmap\nroot\n notAFakeRoot';
const result2 = await validatedParse(str2, { validation: true });
// console.debug('RESULT2:', result2.diagnostics);
expect(result2.diagnostics?.length).toBe(0);
});
@@ -353,17 +354,25 @@ describe('Miscellaneous (ported from mindmap.spec.ts)', () => {
});
it('MMP-21 should be possible to have comments in a mindmap', () => {
const result = parse(
// 'mindmap\nroot(Root)\n Child(Child)\n a(a)\n %% This is a comment\n b[New Stuff]'
'mindmap\nroot(Root)\n Child(Child)\n a(a)\n\n %% This is a comment\n b[New Stuff]'
);
if (result.lexerErrors.length > 0) {
console.debug('lexerErrors', result.lexerErrors);
}
expect(result.lexerErrors).toHaveLength(0);
if (result.parserErrors.length > 0) {
console.debug('Error', result.parserErrors);
}
expect(result.parserErrors).toHaveLength(0);
const rootNode = result.value.MindmapRows[0].item as OtherComplex;
const childNode = result.value.MindmapRows[1].item as OtherComplex;
const aNode = result.value.MindmapRows[2].item as OtherComplex;
const bNode = result.value.MindmapRows[3].item as OtherComplex;
expect(rootNode.desc).toBe('Root');
expect(childNode.desc).toBe('Child');
expect(aNode.desc).toBe('a');
const bNode = result.value.MindmapRows[4].item as OtherComplex;
expect(bNode.desc).toBe('New Stuff');
});
it('MMP-22 should be possible to have comments at the end of a line', () => {
@@ -375,7 +384,7 @@ describe('Miscellaneous (ported from mindmap.spec.ts)', () => {
const rootNode = result.value.MindmapRows[0].item as OtherComplex;
const childNode = result.value.MindmapRows[1].item as OtherComplex;
const aNode = result.value.MindmapRows[2].item as OtherComplex;
const bNode = result.value.MindmapRows[3].item as OtherComplex;
const bNode = result.value.MindmapRows[4].item as OtherComplex;
expect(rootNode.desc).toBe('Root');
expect(childNode.desc).toBe('Child');
expect(aNode.desc).toBe('a');
@@ -387,7 +396,7 @@ describe('Miscellaneous (ported from mindmap.spec.ts)', () => {
expect(result.parserErrors).toHaveLength(0);
const rootNode = result.value.MindmapRows[0].item as SimpleNode;
const aNode = result.value.MindmapRows[1].item as SimpleNode;
const bNode = result.value.MindmapRows[2].item as SimpleNode;
const bNode = result.value.MindmapRows[3].item as SimpleNode;
expect(rootNode.id).toBe('root');
expect(aNode.id).toBe('A');
expect(bNode.id).toBe('B');
@@ -398,7 +407,7 @@ describe('Miscellaneous (ported from mindmap.spec.ts)', () => {
expect(result.parserErrors).toHaveLength(0);
const rootNode = result.value.MindmapRows[0].item as SimpleNode;
const aNode = result.value.MindmapRows[1].item as SimpleNode;
const bNode = result.value.MindmapRows[2].item as SimpleNode;
const bNode = result.value.MindmapRows[3].item as SimpleNode;
expect(rootNode.id).toBe('root');
expect(aNode.id).toBe('A');
expect(bNode.id).toBe('B');
@@ -409,7 +418,7 @@ describe('Miscellaneous (ported from mindmap.spec.ts)', () => {
expect(result.parserErrors).toHaveLength(0);
const rootNode = result.value.MindmapRows[0].item as SimpleNode;
const aNode = result.value.MindmapRows[1].item as SimpleNode;
const bNode = result.value.MindmapRows[2].item as SimpleNode;
const bNode = result.value.MindmapRows[3].item as SimpleNode;
expect(rootNode.id).toBe('root');
expect(aNode.id).toBe('A');
expect(bNode.id).toBe('B');