Skip to content

Commit f06f1ba

Browse files
Merge branch 'develop' into ipsep-cola
2 parents e12036e + d93d9a5 commit f06f1ba

File tree

19 files changed

+456
-397
lines changed

19 files changed

+456
-397
lines changed

.changeset/rare-women-fly.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
fix: Add escaped class literal name on namespace

.changeset/silver-eyes-build.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
chore: migrate to class-based ArchitectureDB implementation

.changeset/vast-buses-see.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'mermaid': patch
3+
---
4+
5+
chore: Update packet diagram to use new class-based database structure

.github/workflows/e2e-timings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
echo "EOF" >> $GITHUB_OUTPUT
5959
6060
- name: Commit and create pull request
61-
uses: peter-evans/create-pull-request@2e50522bdf313efe32e5628afead9048374012ed
61+
uses: peter-evans/create-pull-request@07cbaebb4bfc9c5d7db426ea5a5f585df29dd0a0
6262
with:
6363
add-paths: |
6464
cypress/timings.json

cypress/integration/rendering/classDiagram.spec.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -512,4 +512,17 @@ describe('Class diagram', () => {
512512
);
513513
});
514514
});
515+
516+
it('should handle backticks for namespace and class names', () => {
517+
imgSnapshotTest(
518+
`
519+
classDiagram
520+
namespace \`A::B\` {
521+
class \`IPC::Sender\`
522+
}
523+
RenderProcessHost --|> \`IPC::Sender\`
524+
`,
525+
{}
526+
);
527+
});
515528
});

docs/ecosystem/integrations-community.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ Blogging frameworks and platforms
104104
- [Mermaid](https://nextra.site/docs/guide/mermaid)
105105
- [WordPress](https://wordpress.org)
106106
- [MerPRess](https://wordpress.org/plugins/merpress/)
107+
- [WP Documentation](https://wordpress.org/themes/wp-documentation/)
107108

108109
### CMS/ECM
109110

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
import { it, describe, expect } from 'vitest';
2-
import { db } from './architectureDb.js';
32
import { parser } from './architectureParser.js';
4-
5-
const {
6-
clear,
7-
getDiagramTitle,
8-
getAccTitle,
9-
getAccDescription,
10-
getServices,
11-
getGroups,
12-
getEdges,
13-
getJunctions,
14-
} = db;
15-
3+
import { ArchitectureDB } from './architectureDb.js';
164
describe('architecture diagrams', () => {
5+
let db: ArchitectureDB;
176
beforeEach(() => {
18-
clear();
7+
db = new ArchitectureDB();
8+
// @ts-expect-error since type is set to undefined we will have error
9+
parser.parser?.yy = db;
1910
});
2011

2112
describe('architecture diagram definitions', () => {
@@ -36,15 +27,15 @@ describe('architecture diagrams', () => {
3627
it('should handle title on the first line', async () => {
3728
const str = `architecture-beta title Simple Architecture Diagram`;
3829
await expect(parser.parse(str)).resolves.not.toThrow();
39-
expect(getDiagramTitle()).toBe('Simple Architecture Diagram');
30+
expect(db.getDiagramTitle()).toBe('Simple Architecture Diagram');
4031
});
4132

4233
it('should handle title on another line', async () => {
4334
const str = `architecture-beta
4435
title Simple Architecture Diagram
4536
`;
4637
await expect(parser.parse(str)).resolves.not.toThrow();
47-
expect(getDiagramTitle()).toBe('Simple Architecture Diagram');
38+
expect(db.getDiagramTitle()).toBe('Simple Architecture Diagram');
4839
});
4940

5041
it('should handle accessibility title and description', async () => {
@@ -53,8 +44,8 @@ describe('architecture diagrams', () => {
5344
accDescr: Accessibility Description
5445
`;
5546
await expect(parser.parse(str)).resolves.not.toThrow();
56-
expect(getAccTitle()).toBe('Accessibility Title');
57-
expect(getAccDescription()).toBe('Accessibility Description');
47+
expect(db.getAccTitle()).toBe('Accessibility Title');
48+
expect(db.getAccDescription()).toBe('Accessibility Description');
5849
});
5950

6051
it('should handle multiline accessibility description', async () => {
@@ -64,7 +55,7 @@ describe('architecture diagrams', () => {
6455
}
6556
`;
6657
await expect(parser.parse(str)).resolves.not.toThrow();
67-
expect(getAccDescription()).toBe('Accessibility Description');
58+
expect(db.getAccDescription()).toBe('Accessibility Description');
6859
});
6960
});
7061
});

0 commit comments

Comments
 (0)