Sidharth Vinod
c37ff47ee3
Add nested test
2022-08-24 12:33:32 +05:30
Sidharth Vinod
84148d4891
Remove failing test
2022-08-24 12:32:15 +05:30
Sidharth Vinod
60651fdfe0
Merge branch 'develop' into sidv/typescript
...
* develop: (22 commits)
Fix for build by revering jsdoc
Revert "chore(deps-dev): bump documentation from 13.2.0 to 14.0.0"
Review comments.
Add test for handling parameter names that are "default"
Add test for handling parameter names that are keywords
Add test for handling trailing whitespaces
Add first C4 parser test
chore(deps-dev): bump eslint-plugin-jest from 26.8.2 to 26.8.7
chore(deps-dev): bump documentation from 13.2.0 to 14.0.0
chore(deps-dev): bump terser-webpack-plugin from 5.3.4 to 5.3.5
chore(deps-dev): bump prettier-plugin-jsdoc from 0.3.38 to 0.4.1
test(e2e): add array and generic attributes erDiagram test
test(common): add generic parser test
test(parser): add tests for generics and arrays in erDiagram
feat: add array and generic symbols for erDiagram
Lint markdown
Fix prettier formatting in vscode
Prettier
Fix `securityLevel` docs
Update README.md
...
2022-08-24 11:38:23 +05:30
Sidharth Vinod
1efd5c7d58
Cleanup
2022-08-24 11:32:27 +05:30
Knut Sveidqvist
fd70b862ed
Merge pull request #3332 from lorint/docs/grammatical_touch_ups
...
Grammatical touch-ups to documentation
2022-08-23 20:18:03 +02:00
Knut Sveidqvist
11809e799b
Merge pull request #3334 from mermaid-js/sidv/fixDoc
...
Add `sandbox` to `securityLevel` docs
2022-08-23 20:10:06 +02:00
Knut Sveidqvist
c50745323a
Merge pull request #3335 from FlorianWoelki/feature/3171_erDiagram_more_symbols
...
Add generic and array symbols to `erDiagram`
2022-08-23 20:07:06 +02:00
Sidharth Vinod
248a7aff7a
Review comments.
2022-08-23 21:49:01 +05:30
Sidharth Vinod
a8042f622f
Merge branch 'sidv/typescript' of https://github.com/mermaid-js/mermaid into sidv/typescript
...
* 'sidv/typescript' of https://github.com/mermaid-js/mermaid :
Update src/config.ts
2022-08-23 21:35:43 +05:30
Sidharth Vinod
32ba2d5ffe
Remove console.logs
2022-08-23 21:35:33 +05:30
Daniel Bartholomae
8c56f68a06
Add test for handling parameter names that are "default"
2022-08-23 16:15:38 +02:00
Daniel Bartholomae
2cf9348f53
Add test for handling parameter names that are keywords
2022-08-23 16:12:16 +02:00
Daniel Bartholomae
d97ce7eab8
Add test for handling trailing whitespaces
2022-08-23 16:12:16 +02:00
Daniel Bartholomae
0c8f7163db
Add first C4 parser test
2022-08-23 16:12:16 +02:00
Knut Sveidqvist
0e0802a588
Update src/config.ts
...
Agree!
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2022-08-22 17:48:09 +02:00
Sidharth Vinod
9a0d5e31b7
fix: review comments
2022-08-22 17:12:05 +05:30
Sidharth Vinod
6291e4dcdd
fix detectType
2022-08-22 13:30:10 +05:30
Sidharth Vinod
9f49259bca
fix detectType
2022-08-22 13:29:55 +05:30
Sidharth Vinod
4885e7b7f1
fix detectType
2022-08-22 13:29:25 +05:30
Sidharth Vinod
1549eb20df
tsConversion: fix DiagramAPI
2022-08-22 13:18:50 +05:30
Sidharth Vinod
c245a2da07
tsConversion: rename DiagramAPI
2022-08-22 12:59:23 +05:30
Sidharth Vinod
d365dacbf7
tsConversion: mermaidAPI
2022-08-22 11:10:30 +05:30
Sidharth Vinod
39aaf2f813
tsConversion: fix paths, add d.ts to output
2022-08-21 22:27:13 +05:30
Sidharth Vinod
d97b3807b9
fix: startOnLoad
2022-08-21 19:32:21 +05:30
Sidharth Vinod
a51d8e844b
Merge branch 'develop' into sidv/typescript
...
* develop:
Fix #3009 Update main
#3243 Adding disabled testcase for diagram with leading \n
2022-08-21 19:24:15 +05:30
Sidharth Vinod
c68ec54fdd
tsConversion: mermaid main
2022-08-21 18:37:27 +05:30
Knut Sveidqvist
280c7e8da1
#3243 Adding disabled testcase for diagram with leading \n
2022-08-21 11:05:13 +02:00
Sidharth Vinod
cd4b1ea245
fix: codeScanning vuln
2022-08-21 11:45:20 +05:30
Sidharth Vinod
4710f67baf
fix: sanitization bug
2022-08-21 11:26:45 +05:30
Sidharth Vinod
f14f0d9857
tsConversion: config & common
2022-08-21 11:00:22 +05:30
Sidharth Vinod
238cbd14ca
tsConversion: styles
2022-08-21 08:54:27 +05:30
Sidharth Vinod
d9bace053b
Add `trace` logLevel
2022-08-21 08:45:17 +05:30
Sidharth Vinod
fab9688135
tsConversion: flowchartStyles
2022-08-21 01:21:47 +05:30
Sidharth Vinod
896154d89f
tsConversion: logger
2022-08-21 00:59:54 +05:30
Sidharth Vinod
c9cd56914f
tsConversion: errorRenderer
2022-08-21 00:59:27 +05:30
Sidharth Vinod
95dbbb350b
tsConversion: DetectType
2022-08-21 00:38:26 +05:30
Sidharth Vinod
88e17bf1b4
Typescript init
2022-08-20 23:40:52 +05:30
FlorianWoelki
e19581b540
test(common): add generic parser test
2022-08-20 14:08:53 +02:00
FlorianWoelki
ecf62e3b7a
test(parser): add tests for generics and arrays in erDiagram
2022-08-20 13:56:39 +02:00
FlorianWoelki
ea3573c989
feat: add array and generic symbols for erDiagram
2022-08-20 13:42:51 +02:00
Lorin Thwaits
e1977dd889
Remove duplicate spec
2022-08-19 21:27:22 +01:00
Lorin Thwaits
6635d4bc97
Grammatical touch-ups
2022-08-19 21:27:13 +01:00
Knut Sveidqvist
02fc68a3f6
Merge pull request #3330 from mermaid-js/3306_Fix_Gitgraph_Parsing_Issue
...
Fix for GitGraphs not working for Mermaid Live Editor
2022-08-18 19:43:17 +02:00
ashishj
a9e798c399
Making sure to addDiagrams before detectType call
2022-08-18 19:39:32 +02:00
Knut Sveidqvist
1befbe08ff
#3308 Allowing br tags in tooltips
2022-08-18 19:11:33 +02:00
ashishj
b21cb43639
Moved diagram registration out of initialize func
2022-08-18 17:54:42 +02:00
Ashish Jain
52fcb92f51
Merge pull request #3277 from alguerocode/clean-code-1
...
code syntax improvment (initialize func)
2022-08-18 17:01:02 +02:00
Knut Sveidqvist
cb4b60e8e4
Merge pull request #3310 from hrgui/fix/3305-subsequent-diagrams-issue
...
fix(Diagram): fix persisted data due to db not being cleared before parsing
2022-08-11 18:55:23 +02:00
Knut Sveidqvist
bf4272102d
#3313 Packaging the thrown error in reconised structure
2022-08-11 18:24:14 +02:00
may4everL
7257bba3f3
Added lollipop feature for updated codebase
2022-08-09 22:44:11 -07:00
Harman Goei
6e5eeb7215
fix(Diagram): C4C diagram does not have a db.clear method
2022-08-09 22:22:40 -07:00
Harman Goei
a5aef9e330
fix(Diagram): fix persisted data due to db not being cleared before parsing
2022-08-09 21:41:07 -07:00
Knut Sveidqvist
d32c8534cb
Bugfix for empty blank lines
2022-08-09 18:39:20 +02:00
Knut Sveidqvist
9b54feab84
Merge branch 'develop' into minmaps
2022-08-06 10:53:54 +02:00
Knut Sveidqvist
afe343e94f
Changes after merge
2022-08-06 10:49:32 +02:00
Knut Sveidqvist
44cb1acbb2
Fix for broken test
2022-08-04 13:16:48 +02:00
Knut Sveidqvist
b0074bf723
Merge pull request #3222 from leon19/bugfix/incorrect-label-padding
...
fix: remove right padding when a label contains HTML entities
2022-08-04 13:06:46 +02:00
Knut Sveidqvist
aa9149912d
Merge branch 'bug/3011_multiline_alignment' of github.com:hype09/mermaid into hype09-bug/3011_multiline_alignment
2022-08-04 13:05:17 +02:00
salah alhashmi
fb6bf87161
code syntax improvment (initialize func)
2022-08-03 14:16:02 +04:00
Muhammad Faisal Bin Arba'in
846531363e
PR comments
2022-08-01 19:41:53 +08:00
Muhammad Faisal Bin Arba'in
91e369a840
rename const name
2022-08-01 19:41:53 +08:00
Muhammad Faisal Bin Arba'in
81ff4416dc
rotate class id when branch more than 8
2022-08-01 19:41:53 +08:00
Knut Sveidqvist
ffe520db06
Curved edges
2022-07-29 15:06:21 +02:00
Knut Sveidqvist
00fe5d477d
Different hanlding of icons for circles
2022-07-28 20:38:25 +02:00
Knut Sveidqvist
ca3f4559ef
Fix
2022-07-27 19:10:06 +02:00
Knut Sveidqvist
1a205aeccc
Adding icon support
2022-07-27 18:40:44 +02:00
Knut Sveidqvist
82a480d924
Adding circle node type and class handling
2022-07-27 17:25:20 +02:00
Knut Sveidqvist
2d361964ce
Better padding handling in nodes
2022-07-27 10:24:27 +02:00
Knut Sveidqvist
03d71829c6
Adding default node form
2022-07-27 09:43:25 +02:00
Lorens León
c40368b0fa
fix: remove right padding when a label contains HTML entities
...
Decode the HTML entities from the label text before adding them to the
HTML this prevents a miss-calculation of the label text length
2022-07-26 21:50:36 +02:00
Knut Sveidqvist
0b2ca29ae8
Theme support for mindmaps
2022-07-25 17:03:18 +02:00
Knut Sveidqvist
f815bd08b7
Adjusting the width of the boxes based on the text in the boxes
2022-07-25 14:22:07 +02:00
Knut Sveidqvist
15f1cdf3aa
Draft of edge rendering
2022-07-24 17:45:54 +02:00
Knut Sveidqvist
8e5e212c49
Layout algorithm in place
2022-07-24 11:05:54 +02:00
Knut Sveidqvist
7de68f0bf2
Adding text wrap and logic for placing nodes in the svg
2022-07-23 10:16:54 +02:00
Knut Sveidqvist
6029c5371e
First take on grammar
2022-07-21 16:07:18 +02:00
Knut Sveidqvist
8681e78e50
Fixes for rendering tests
2022-07-20 14:39:01 +02:00
Knut Sveidqvist
4c30e03f1e
Using diagram api to add gitGraph
2022-07-18 16:00:03 +02:00
Knut Sveidqvist
0d4b09a0a0
Handle legacy state diagram and start using Generic diagram in mermaidAPI
2022-07-04 22:55:11 +02:00
Knut Sveidqvist
408c08d2a3
Fix for v2 class diagram
2022-07-04 22:41:09 +02:00
Knut Sveidqvist
10f56129c1
Fix for legacy class diagram
2022-07-04 19:37:56 +02:00
Knut Sveidqvist
bc6830cbdb
Handling of requirement diagrams using the generic diagram
2022-07-04 18:50:50 +02:00
Knut Sveidqvist
c5f78077ff
Fix for broken tests
2022-07-04 18:22:36 +02:00
Knut Sveidqvist
682a1404ca
Fixes for erDiagram, pie charts and journey diagram
2022-07-04 18:11:58 +02:00
Knut Sveidqvist
5318ec6dbf
Handling gantt and flowchart-v2
2022-07-04 15:33:39 +02:00
Knut Sveidqvist
490ddd9a15
Fix for tests
2022-07-04 14:25:25 +02:00
Knut Sveidqvist
1675174b2a
Fix for flowcharts
2022-07-04 12:37:50 +02:00
Knut Sveidqvist
48ad6e6042
Merge branch 'develop' into 3061_refactoring_and_modularisation
2022-07-04 11:38:52 +02:00
Knut Sveidqvist
bedc9399c5
Updating c4 and sequence
2022-07-04 11:29:38 +02:00
Paik Paustian
ed29fe1aa9
Fix #3011 : Support left- and right-alignment for multi-line messages and notes
...
Previously, messages and notes that had multiple lines (via `<br>`-tags) were only displayed correctly
when using the default `center` value for the `messageAlign` and `noteAlign` configuration options.
Using `left` or `right` for the alignment options caused the text to collapse and become illegible,
as outlined in issue #3011 .
This comes as a side-effect from how the internal `valign` text-rendering option was configured for
messages and notes:
```js
// Example from `sequenceRenderer.js: drawMessage()`
textObj.anchor = conf.messageAlign;
textObj.valign = conf.messageAlign;
```
Both the `anchor` option (which controls left-right alignment) and the `valign` option (which controls
vertical top-down placement) were set to the same value, the user-provided `messageAlign` config option.
While `left` and `right` are valid values for the `anchor` option, they were effectively no-ops for the
`valign` option, which only supports `top`, `start`, `middle`, `center`, `bottom`, and `end`.
To fix the issue, the `valign` property is now always set to `center` for notes and messages.
Similarly, the `dominantBaseline` option of texts is now always set to `middle`, rather than setting it to
either `text-{before,after}-edge`, which caused left-aligned multi-line text to always be "top-left" aligned
inside a note (or "bottom-right" when attempting to right-align).
Now, texts in messages and notes are always vertically centered and alignment options correctly apply for
both single and multi-line content.
2022-07-03 11:59:57 +02:00
Sidharth Vinod
5b15865d30
fix #3184 : Inject xlink in mermaidAPI. ( #3185 )
...
* fix #3184 : Inject xlink in mermaidAPI.
* fix static analysis
2022-07-03 10:37:27 +02:00
ashishj
1dfddfde54
Merge branch 'release/9.1.3' into 3061_refactoring_and_modularisation
2022-06-28 20:12:03 +02:00
Ashish Jain
1f4c1c3a6c
Merge pull request #3140 from mermaid-js/#3095-Gitgrph-Font-Size
...
#3095 Added support for commit & tag label font size
2022-06-28 19:11:16 +02:00
Ashish Jain
cc45f3ca01
Merge pull request #3151 from pinghe/develop
...
Add C4 Diagram. Compatible with C4-PlantUML syntax (2). #3038
2022-06-28 19:10:42 +02:00
Ashish Jain
259abb081a
Merge pull request #3176 from yutotnh/fix-typo
...
Fix typo
2022-06-28 19:01:35 +02:00
Knut Sveidqvist
0ae1bdb61a
Merge pull request from GHSA-x3vm-38hw-55wf
...
CSS Injection security issue
2022-06-28 18:55:12 +02:00
Knut Sveidqvist
5110e42786
Better balance check
2022-06-28 18:50:41 +02:00
yutotnh
0d6109c7a8
Merge branch 'develop' into fix-typo
2022-06-27 12:43:55 +09:00
yutotnh
4d4b77f39f
fix: typo for source
2022-06-27 12:34:28 +09:00
Knut Sveidqvist
8484d55a6a
Fix fir tests
2022-06-26 21:30:49 +02:00
Knut Sveidqvist
0a55cda0a9
Rendering statediagram v2 using the diagram passed from mermaidAPI
2022-06-26 21:05:30 +02:00
Knut Sveidqvist
2480a5eaa2
Merge remote-tracking branch 'origin/develop' into 3061_refactoring_and_modularisation
2022-06-26 14:28:11 +02:00
Sidharth Vinod
0e47c0ee6c
fix #3019 Add word boundary to FK&PK. ( #3168 )
2022-06-23 08:20:32 +02:00
Knut Sveidqvist
2792bb41de
Updated allowed characters to accomodate fonts and rgba colors
2022-06-22 08:16:55 +02:00
yutotnh
ca909edbed
fix: Typo for documents and comments
2022-06-22 12:39:10 +09:00
Knut Sveidqvist
610f154c74
Sanitizsation of incoming variables that are added to the userStyles
2022-06-21 21:46:37 +02:00
Knut Sveidqvist
ec2da8e85d
Only allowing a subset of characters in themeVariables
2022-06-21 21:17:53 +02:00
pinghe
546eb285c4
C4 diagram is fixed style, such as css color, so different css is not provided under different skins.
...
updateElementStyle and UpdateElementStyle are written in the diagram last part. updateElementStyle is inconsistent with the original definition and updates the style of the relationship, including the offset of the text label relative to the original position.
- [ ] Custom tags/stereotypes support and skinparam updates
- - [ ] AddElementTag(tagStereo, ?bgColor, ?fontColor, ?borderColor, ?shadowing, ?shape, ?sprite, ?techn, ?legendText, ?legendSprite): Introduces a new element tag. The styles of the tagged elements are updated and the tag is displayed in the calculated legend.
- - [ ] AddRelTag(tagStereo, ?textColor, ?lineColor, ?lineStyle, ?sprite, ?techn, ?legendText, ?legendSprite): Introduces a new Relationship tag. The styles of the tagged relationships are updated and the tag is displayed in the calculated legend.
- - [X] UpdateElementStyle(elementName, ?bgColor, ?fontColor, ?borderColor, ?shadowing, ?shape, ?sprite, ?techn, ?legendText, ?legendSprite): This call updates the default style of the elements (component, ...) and creates no additional legend entry.
- - [X] UpdateRelStyle(from, to, textColor, lineColor, ?offsetX, ?offsetY): This call updates the default relationship colors and creates no additional legend entry. Two new parameters, offsetX and offsetY, are added to set the offset of the original position of the text.
- - [ ] RoundedBoxShape(): This call returns the name of the rounded box shape and can be used as ?shape argument.
- - [ ] EightSidedShape(): This call returns the name of the eight sided shape and can be used as ?shape argument.
- - [ ] DashedLine(): This call returns the name of the dashed line and can be used as ?lineStyle argument.
- - [ ] DottedLine(): This call returns the name of the dotted line and can be used as ?lineStyle argument.
- - [ ] BoldLine(): This call returns the name of the bold line and can be used as ?lineStyle argument.
- - [X] UpdateLayoutConfig(?c4ShapeInRow, ?c4BoundaryInRow): New. This call updates the default c4ShapeInRow(4) and c4BoundaryInRow(2).
2022-06-18 22:43:07 +08:00
Knut Sveidqvist
f79d4f9a40
Merge branch 'develop' into 3061_refactoring_and_modularisation
2022-06-18 14:24:51 +02:00
Yash Singh
ddcc9a9d77
fix: use db for parser.yy
2022-06-16 11:37:28 -07:00
ashishj
e29c3d6125
#3095 Added support for commit & tag label font size
2022-06-14 20:36:26 +02:00
Knut Sveidqvist
69b7b0e029
Fix for padding issue and some cleanup
2022-06-14 20:09:55 +02:00
ashishj
113efd1150
Added placeholder docs fro C4C diagram
2022-06-14 18:27:15 +02:00
Knut Sveidqvist
2d5e49fa15
2022-06-14 17:49:05 +02:00
Ashish Jain
611880414b
Merge pull request #3114 from siddhant-tripathy1/3093_Removing_sass_files
...
Removed the Sass files
2022-06-14 17:10:45 +02:00
Knut Sveidqvist
5d30d46535
Merge pull request #3118 from mermaid-js/3116_paddings
...
Handle diagram paddings in a consistent way
2022-06-08 20:24:18 +02:00
Knut Sveidqvist
4dd3d3bc76
2022-06-08 20:17:31 +02:00
siddhant tripathy
61c1b0aebb
Removed the Sass files
2022-06-08 00:27:23 +05:30
ashishj
c147404d1c
#3080 Added support for cherry pick commits
2022-06-07 20:32:43 +02:00
ashishj
1851e81794
#3080 Adding rotated commit label functionality
2022-06-07 18:45:07 +02:00
Knut Sveidqvist
aeb6e860bb
Merge pull request #3094 from deining/contrib
...
Fixing various typos
2022-06-07 17:17:49 +02:00
Knut Sveidqvist
3300ad09f3
Merge pull request #3038 from pinghe/develop
...
Add C4 Diagram. Compatible with C4-PlantUML syntax.
2022-06-07 17:12:10 +02:00
Andreas Deininger
8e157423e0
Fixing various typos
...
Changing links from http to https
2022-06-01 12:06:53 +02:00
Knut Sveidqvist
bd459fadd3
2022-05-31 20:35:44 +02:00
Knut Sveidqvist
bb5baa65cb
Merge branch 'develop' of github.com:mermaid-js/mermaid into develop
2022-05-31 17:11:29 +02:00
Knut Sveidqvist
ee61a26faf
Merge pull request #3063 from financelurker/feature/3062_critical_region_and_break_in_sequence_diagrams
...
feat: adding "Critical Region"/"Option" and "Break" blocks to sequence diagram
2022-05-31 17:11:03 +02:00
Knut Sveidqvist
66f2f42294
Selecting the correct title for gantt charts
2022-05-24 20:10:04 +02:00
Knut Sveidqvist
b82b2d2b78
#3074 Using regular title as a fallback for the accessibility title when no dedicated accessibility title is present
2022-05-24 18:52:37 +02:00
Knut Sveidqvist
6eef26f107
#3074 Fix for tests
2022-05-24 18:33:13 +02:00
Knut Sveidqvist
2ab1e162ea
#3074 Cleanup and fixes for issues with accessibility for gantt and journey diagrams
2022-05-24 18:20:05 +02:00
Ronald Heggenberger
077e6621b9
Undo whitespace changes
2022-05-21 09:40:21 +02:00
Ronald Heggenberger
7372ca5e8e
Adding "Critical Region" and "Break" blocks
2022-05-21 09:31:06 +02:00
Michael Genereux
938b47bead
Removed unnecessary textLength attribute.
...
This attribute makes two digit numbers look bad.
2022-05-19 23:17:11 +00:00
Mindaugas Laganeckas
ce3ba4f772
Make initThrowsErrors available to clients
...
Missing piece for https://github.com/mermaid-js/mermaid/pull/2379
2022-05-18 08:51:19 +02:00
Knut Sveidqvist
a3878528c6
#3050 Renaming setTitle to setAccTitle
2022-05-17 20:23:45 +02:00
ashishj
91d5c7ed71
#3046 Fixed liniting issue
2022-05-17 19:28:23 +02:00
ashishj
85062ac570
#3046 Add support for cyclic themeVariable rotation for more than 8 branches
2022-05-17 19:15:50 +02:00
ashishj
ea58bb3359
Merge branch 'master' into develop
2022-05-17 17:06:38 +02:00
pinghe
28ca1420f9
Add C4Context diagram. Compatible with C4-PlantUML syntax.
...
For an example, see the source code demos/index.html
- System Context
- Container diagram
- Component diagram
- Dynamic diagram
- Deployment diagram
2022-05-17 19:57:03 +08:00
pinghe
015c112103
Add C4Context diagram. Compatible with C4-PlantUML syntax.
...
```
C4Context
title System Context diagram for Internet Banking System
Person(customerA, "Banking Customer A", "A customer of the bank, with personal bank accounts.")
Person(customerB, "Banking Customer B")
Person_Ext(customerC, "Banking Customer C")
System(SystemAA, "Internet Banking System", "Allows customers to view information about their bank accounts, and make payments.")
Person(customerD, "Banking Customer D", "A customer of the bank, <br/> with personal bank accounts.")
Enterprise_Boundary(b1, "BankBoundary") {
SystemDb_Ext(SystemE, "Mainframe Banking System", "Stores all of the core banking information about customers, accounts, transactions, etc.")
System_Boundary(b2, "BankBoundary2") {
System(SystemA, "Banking System A")
System(SystemB, "Banking System B", "A system of the bank, with personal bank accounts.")
}
System_Ext(SystemC, "E-mail system", "The internal Microsoft Exchange e-mail system.")
SystemDb(SystemD, "Banking System D Database", "A system of the bank, with personal bank accounts.")
Boundary(b3, "BankBoundary3", "boundary") {
SystemQueue(SystemF, "Banking System F Queue", "A system of the bank, with personal bank accounts.")
SystemQueue_Ext(SystemG, "Banking System G Queue", "A system of the bank, with personal bank accounts.")
}
}
BiRel(customerA, SystemAA, "Uses")
BiRel(SystemAA, SystemE, "Uses")
Rel(SystemAA, SystemC, "Sends e-mails", "SMTP")
Rel(SystemC, customerA, "Sends e-mails to")
```
2022-05-15 17:08:09 +08:00
ashishj
ee0b31b3d5
#3025 Fix from broken init call
2022-05-11 14:04:50 +02:00
Yash-Singh1
32a2e5fc47
fix: allow dot in entity name; fixes #1895
2022-05-10 18:39:11 -07:00
Yash-Singh1
bc58c8e03c
chore: reduce excessive logs in unit tests
2022-05-10 17:09:42 -07:00
ashishj
20c4a68aa8
Merging release 9.1.0 to develop
2022-05-10 18:51:21 +02:00
Knut Sveidqvist
6cea0fd835
#2951 Fix for styling issue on labes when using htmlLabels in legacy flowcharts
2022-05-10 17:45:12 +02:00
Knut Sveidqvist
734cef9017
Merge pull request #3004 from timmaffett/parse_parseError_fixes
...
fix mermaidAPI.parse() behavior to match documentation, add tests to ensure behavior matches docs
2022-05-10 17:00:22 +02:00
ashishj
3cb926727c
Fixing failing test cases
2022-05-06 20:14:36 +02:00
Knut Sveidqvist
6528a0cfb6
Merge pull request #3010 from mermaid-js/GitGraph_mainBranchOrdering
...
Added support to change the position of the main branch
2022-05-06 19:48:05 +02:00
Knut Sveidqvist
65143a0182
#2732 Regression fixes for accessibility
2022-05-06 19:42:40 +02:00
ashishj
3ef7d6fbc6
Added support to change the position of the main branch
2022-05-06 19:37:32 +02:00
Tim Maffett
c8e5525899
Merge branch 'develop' into parse_parseError_fixes
2022-05-06 09:24:49 -07:00
Knut Sveidqvist
3b94850084
Merge branch 'develop' into 2732_accesible_charts
2022-05-06 18:10:23 +02:00
Knut Sveidqvist
d8682cfb5f
#2732 rendering the title and descr fields for the gitGraph
2022-05-06 17:40:40 +02:00
Ashish Jain
1602755330
Merge pull request #3002 from husa/feature/2937-gitgraph-branch-ordering
...
GitGraph: add support for branch ordering
2022-05-06 17:38:06 +02:00
Knut Sveidqvist
572b29b35f
Merge branch 'develop' into 2732_accesible_charts
2022-05-06 17:17:59 +02:00
Tim Maffett
f7c28ff31e
Merge branch 'mermaid-js:develop' into parse_parseError_fixes
2022-05-05 11:52:23 -07:00
Tim Maffett
ca8080a371
add more test for mermaidAPI.parse() to ensure it matches documented behavior
2022-05-05 11:50:11 -07:00
Tim Maffett
67b6414693
fix parse() to match spec (return true if valid, false if invalid (and a parseError handler is defined))
2022-05-05 11:48:53 -07:00
Tim Maffett
8210e3c80a
add setParseErrorHandler,check for undefined mermaidAPI before using
2022-05-05 11:47:46 -07:00
dependabot[bot]
52fbc604b8
chore(deps-dev): bump jest from 27.5.1 to 28.0.3 ( #2995 )
...
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yash-Singh1 <saiansh2525@gmail.com>
2022-05-04 17:42:11 -07:00
Yuriy Husnay
d740fa5acf
add support for branch ordering
2022-05-04 18:04:41 +03:00
Knut Sveidqvist
ed56e4858a
Cleanup
2022-04-30 16:14:43 +02:00
Knut Sveidqvist
fdd7af9089
Adding acc to gitGrapg parser
2022-04-30 16:06:53 +02:00
Knut Sveidqvist
e917347b81
Removing logging, cleanup
2022-04-30 15:54:03 +02:00
Knut Sveidqvist
3baf31695e
Updated user state diagram parsing with the new syntax
2022-04-30 15:50:02 +02:00
Knut Sveidqvist
ae91f794d6
Updated user journey diagram parsing with the new syntax
2022-04-30 15:44:03 +02:00
Knut Sveidqvist
34ffe2790b
Updated sequence diagram parsing with the new syntax
2022-04-30 15:35:34 +02:00
Knut Sveidqvist
a642ae356c
Updated requirement diagram parsing with the new syntax
2022-04-30 15:22:51 +02:00
Knut Sveidqvist
a401e44180
Updated pie parsing with the new syntax + fix for flowDb
2022-04-30 15:13:28 +02:00
Knut Sveidqvist
8372d4952e
Updated gantt parsing with the new syntax
2022-04-30 15:07:13 +02:00
Knut Sveidqvist
5f4b7ae369
Updated er diagrams with the new syntax
2022-04-30 15:00:50 +02:00
Knut Sveidqvist
5e6b4d73e1
Updated classdiagrams with the new syntax
2022-04-30 14:54:24 +02:00
Knut Sveidqvist
85e157f0d3
Updated flowcharts with the new syntax
2022-04-30 11:36:00 +02:00
Tim Maffett
0127238645
protect config.js from attempting to use invalid theme name
2022-04-29 17:46:19 -07:00
Yash-Singh1
dc53699a96
chore: fix a few security vulnerabilities
2022-04-28 19:29:56 -07:00
ashishj
b30790cac4
Added default new line in the diagram text before parsing for special case where code is trimmed
2022-04-28 20:09:42 +02:00
Knut Sveidqvist
d914e23626
Fix for hideUnusedParticipants
2022-04-28 18:45:18 +02:00
ashishj
386f3c7ce9
Merge branch 'develop' into feature/hideUnusedParticipants_1210
2022-04-28 17:38:48 +02:00
Hans Petersen
3fcc43efdd
Sequence autonumbering and Git fix options parsing
2022-04-28 14:25:25 +02:00
ashishj
170ed89e9e
Merge branch 'master' into develop
2022-04-21 22:08:29 +02:00
ashishj
b472fb4f73
Retain attribute dominant-baseline in DOMpurify sanitization
2022-04-21 22:02:11 +02:00
ashishj
a6299d8334
Fix for broken gitGraph for Mermaid Live Editor
2022-04-21 21:33:49 +02:00
Knut Sveidqvist
c0bdf9d99b
Merge pull request #2958 from mermaid-js/decode_entities_update
...
Removal of vulnerability
2022-04-21 21:25:08 +02:00
Knut Sveidqvist
df87ab8818
Fix for vulnerability
2022-04-21 21:11:48 +02:00
Ashish Jain
a3e6d3cd76
Merge pull request #2954 from husa/feature/2936-gitgraph-pathed-branch-name
...
GitGraph: add support for "pathed" branches. fix #2936
2022-04-21 20:11:39 +02:00
Ashish Jain
1947af0693
Merge pull request #2955 from husa/feature/2934-gitgraph-support-merge-tags
...
GitGraph. Support tags for merge commits
2022-04-21 20:09:31 +02:00
ashishj
8966639e65
Fix for broken gitGraph for Mermaid Live Editor
2022-04-21 18:16:22 +02:00
Mindaugas Laganeckas
473aced449
Add initThrowsErrors() ( #2379 )
...
* Add initThrowsErrors()
* Update mermaid.js
* Update mermaid.js
2022-04-19 17:21:10 +02:00
Yuriy Husnay
3f812326a6
gitgraph #2934 support tags for merge commits
2022-04-19 18:02:41 +03:00
Yuriy Husnay
99a8c0d152
fix #2936 add support for "pathed" branches
...
allow "/" in branch names
2022-04-19 17:42:02 +03:00
Yash-Singh1
4c93870580
feat: add hideUnusedParticipants and some cleanup
2022-04-14 19:19:18 -07:00
Yash Singh
37f6a42de8
fix: clear state before error; closes #2931 ( #2932 )
2022-04-12 19:04:00 -07:00
Knut Sveidqvist
0935fb0790
Lint fix
2022-04-12 07:40:01 +02:00
Knut Sveidqvist
cda21c50ac
Merge branch 'develop' into kh-user-journey
2022-04-12 07:36:33 +02:00
Knut Sveidqvist
7aa037ee60
Merge pull request #2917 from therzka/accessible-state-diagrams
...
feat: add accDescription field to state diagrams
2022-04-12 07:31:55 +02:00
Knut Sveidqvist
491933f114
Link fix
2022-04-12 07:26:18 +02:00
Knut Sveidqvist
6052636a62
Merge branch 'develop' into cg-sanitize
2022-04-12 07:20:31 +02:00
Knut Sveidqvist
7d2e77a1b3
Merge pull request #2915 from gwincr11/cg-req-access
...
feat: Add accessibility fields to requirements diagram
2022-04-12 07:19:40 +02:00
Knut Sveidqvist
e48d60f4cf
Linting changes to fix build
2022-04-12 07:16:14 +02:00
Knut Sveidqvist
4f833db2d0
Merge pull request #2913 from lindseywild/feat/flowchart-accessibility
...
feat: adds title and description to flowchart
2022-04-12 07:09:10 +02:00
Knut Sveidqvist
266bce45f2
Merge pull request #2912 from el-mapache/feat/gantt-diagram-accessibility
...
Adds accDescription to Gantt, draws tags to svg
2022-04-12 07:06:41 +02:00
Kate Higa
a7527e6f88
fix test issue to ensure description is clearable
2022-04-08 13:35:48 -07:00
Kate Higa
6a57c99335
fix lint issues
2022-04-08 13:24:33 -07:00
Kate Higa
6b4eaa185e
add journey tests for accDescription
2022-04-08 13:07:52 -07:00
Kate Higa
81b982ac20
feat: add accDescription along with test page
2022-04-08 12:57:42 -07:00
Tali Herzka
897c4259ed
add title getters and setters, add spec for stateDiagram-v2
2022-04-08 18:44:22 +00:00
Tali Herzka
9eb18e78c3
add title to jison
2022-04-08 18:43:57 +00:00
Tali Herzka
c1a17d9fce
revert change to accessibility.js
2022-04-08 18:42:37 +00:00
Tali Herzka
df993f977c
add/remove semicolons
2022-04-08 18:03:31 +00:00
Cory Gwin
5452cedc51
always use the same setup
2022-04-08 13:38:57 +00:00
Tali Herzka
49409241bc
Add accDescription field to state diagrams
2022-04-07 21:35:13 +00:00
Adam B
e5345f209c
Sanitize user input for accessibility nodes
...
* Adds accDescription to demos/gantt.html
2022-04-07 15:34:53 -04:00
ashishj
0c5252594e
Merge branch 'master' into develop
2022-04-07 21:06:04 +02:00
Lindsey Wild
e2ec7fd653
feat: adds text sanitization, refactors function
2022-04-07 14:58:36 -04:00
Lindsey Wild
7a5149e39e
feat: adds title and description to flowchart
2022-04-07 14:42:13 -04:00
Cory Gwin
d36f45ec58
feat: add sanitization consistently
2022-04-07 18:36:30 +00:00
Knut Sveidqvist
380688c16a
Merge pull request #2879 from adam-hotait/develop
...
fix(sequencediagram): draw arrowheads on top of activation boxes
2022-04-07 20:33:17 +02:00
Cory Gwin
1d269f07e3
Update src/diagrams/requirement/requirementRenderer.js
...
Co-authored-by: Lindsey Wild <35239154+lindseywild@users.noreply.github.com>
2022-04-07 14:22:47 -04:00
ashishj
8b29fbe98e
Updating Gitgraph docs
2022-04-07 20:13:15 +02:00
Cory Gwin
3d7cb212c0
feat: Add accessibility fields to requirements diagram
2022-04-07 18:02:48 +00:00
Knut Sveidqvist
f2e77917d7
Merge pull request #2911 from gwincr11/cg-class-diagram-accessibility
...
Class diagram accessibility
2022-04-07 19:57:27 +02:00
Knut Sveidqvist
bed475b229
Merge pull request #2914 from mermaid-js/1252_gitgraph_reinvented
...
#1252 Adding configuration options and some cleanup, swich of graphType
2022-04-07 18:35:59 +02:00
Knut Sveidqvist
87b56bdd9a
#1252 Adding confuration options and some cleanup, swicth of graphType from git to gitGraph
2022-04-07 18:22:06 +02:00
Adam B
65b0b83625
Adds accDescription, draws tags to svg
2022-04-07 10:05:54 -04:00
Cory Gwin
bfca242958
feat(:accessibility): Add accessibility fields to class chart
2022-04-07 13:56:23 +00:00
Adam Hotait
d3ba48a1b7
fix(sequencediagram): draw arrowheads on top of activation boxes
2022-04-04 13:00:59 +02:00
Knut Sveidqvist
44877545e5
Merge pull request #2832 from gwincr11/cg-accessibility
...
ER and Sequence Chart Accessibility
2022-03-31 21:01:31 +02:00
ashishj
57ac111d05
Added commit types in renderer
2022-03-31 20:52:27 +02:00
ashishj
51e9a6b3aa
Added sanitization for gitGraph
2022-03-31 20:12:06 +02:00
Knut Sveidqvist
3ccf027f42
Removing random label for merge commits
2022-03-31 20:06:31 +02:00
ashishj
12c63ff007
Finalizing GitGraph with directives, theming & docs
2022-03-31 19:37:36 +02:00
Knut Sveidqvist
f6421734a2
Merge branch 'develop' into 1252_gitgraph_reinvented
2022-03-31 19:16:31 +02:00
Knut Sveidqvist
be92c70b1b
Autofix
2022-03-31 19:15:01 +02:00
Cory Gwin
50f522ae5c
feat: adding more accessibility tooling
2022-03-31 13:21:56 +00:00
Knut Sveidqvist
22aca7b3ee
#1252 Adding background on commit labels
2022-03-25 08:56:22 +01:00
Knut Sveidqvist
c0335cf5fb
#1252 Adding support for tags
2022-03-24 20:25:22 +01:00
ashishj
a29e2e6baa
Merge branch 'develop' into 1252_gitgraph_reinvented
2022-03-24 17:29:36 +01:00
dependabot[bot]
17857d3ea9
chore(deps-dev): bump prettier-plugin-jsdoc from 0.3.30 to 0.3.31 ( #2822 )
...
* chore(deps-dev): bump prettier-plugin-jsdoc from 0.3.30 to 0.3.31
Bumps [prettier-plugin-jsdoc](https://github.com/hosseinmd/prettier-plugin-jsdoc ) from 0.3.30 to 0.3.31.
- [Release notes](https://github.com/hosseinmd/prettier-plugin-jsdoc/releases )
- [Changelog](https://github.com/hosseinmd/prettier-plugin-jsdoc/blob/master/CHANGELOG.md )
- [Commits](https://github.com/hosseinmd/prettier-plugin-jsdoc/compare/v0.3.30...v0.3.31 )
---
updated-dependencies:
- dependency-name: prettier-plugin-jsdoc
dependency-type: direct:development
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
* Update config.js
* Update defaultConfig.js
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Matthieu MOREL <mmorel-35@users.noreply.github.com>
2022-03-21 21:45:45 +01:00
Ashish Jain
a9194d4eaa
Added test cases for error handling
2022-03-17 20:40:35 +01:00
Knut Sveidqvist
4023be1e84
Merge branch '1252_gitgraph_reinvented' of github.com:mermaid-js/mermaid into 1252_gitgraph_reinvented
2022-03-17 20:07:30 +01:00
Knut Sveidqvist
b78b371025
Added theming support for gitgraph
2022-03-17 20:07:27 +01:00
Ashish Jain
501e62894b
Added gitGraph jest test cases
2022-03-17 19:07:57 +01:00
Ashish Jain
c1dead1187
Added branch, merge and checkout error handling scenarios
2022-03-17 19:06:31 +01:00
Ashish Jain
01970d2bbd
fix broken rendering for math error
2022-03-17 19:05:19 +01:00
Ashish Jain
243f2b28cd
fix for gitGraph (:) and spaces (new line) issue
2022-03-17 19:04:37 +01:00
Knut Sveidqvist
9f7130a3e6
Merge branch 'develop' into 1252_gitgraph_reinvented
2022-03-17 18:03:40 +01:00
Knut Sveidqvist
b84cd155dd
Merge pull request #2831 from gwincr11/cg-custom-dompurify-config
...
Add dompurify config option
2022-03-17 18:01:19 +01:00
Knut Sveidqvist
0a8a0790cf
Renedring fix in an edge case
2022-03-17 17:35:45 +01:00
Cory Gwin
0181cbf743
feat(accessibility): add accessibility attributes to sequence diagrams
2022-03-17 16:18:10 +00:00
Cory Gwin
c6c9b88292
feat(config): add dompurify config option
2022-03-17 14:34:52 +00:00