9279 Commits

Author SHA1 Message Date
Sidharth Vinod
30646d80f1
Merge pull request #5015 from mermaid-js/renovate/patch-all-patch
chore(deps): update all patch dependencies (patch)
2023-11-07 07:23:10 +00:00
renovate[bot]
6e74e91b5d
chore(deps): update all patch dependencies 2023-11-07 05:11:34 +00:00
Sidharth Vinod
eb4bd314b6
Merge pull request #5002 from ad1992/bug/4983-fix-getMessageAPI
fix: getMessageAPI so it considers entity codes
2023-11-07 05:04:53 +00:00
Alois Klink
7a3ce3e337
Merge pull request #5018 from mermaid-js/master
Sync `master` branch to `develop`
2023-11-06 14:48:55 +00:00
Alois Klink
d1045ed644 Merge remote-tracking branch 'origin/release/10.6.1' 2023-11-06 14:29:58 +00:00
Aakansha Doshi
396ea3cec2
Update demos/sequence.html 2023-11-06 19:55:53 +05:30
Aakansha Doshi
51d076a83b
Merge branch 'develop' into bug/4946-fix-svg-order-sequence-participant 2023-11-06 19:54:32 +05:30
Alois Klink
65daab2aaf chore: release v10.6.1
Fixes
=====

- Flowchart: Fix a freeze when using a `(` character in an ellipse node
v10.6.1
2023-11-06 13:57:01 +00:00
Aakansha Doshi
dff8b783b8 fix 2023-11-06 19:02:10 +05:30
Aakansha Doshi
78c1a3d980 fix 2023-11-06 18:57:47 +05:30
Aakansha Doshi
23cbf50413 fix: render the participants in same order as they are created 2023-11-06 18:47:38 +05:30
Knut Sveidqvist
7c7f3dd8be
Merge pull request #5016 from aloisklink/fix/4964-fix-invalid-ellipseText-regex
fix(flow): fix invalid ellipseText regex
2023-11-06 11:16:44 +00:00
Alois Klink
172d90e731 fix(flow): fix invalid ellipseText regex
This invalid regex was causing Mermaid to freeze.
2023-11-06 10:08:12 +00:00
Aakansha Doshi
dff13439f6 review fixes 2023-11-06 12:17:43 +05:30
Arda Aydın
b61ea4b8aa
Update XYChart's nav link in the docs template
The site gives 404 with xychart but navigates correctly with xyChart
2023-11-05 22:35:36 +03:00
Reda Al Sulais
cf22e30237 rename abstract rules in common parser files 2023-11-05 13:07:08 +03:00
Reda Al Sulais
f01971b67c switch to NEWLINE+ instead of EOF until next release of langium 2023-11-05 02:11:04 +03:00
Reda Al Sulais
c62be1bb45 export necessary functions and types from packages/parser 2023-11-05 02:08:36 +03:00
Reda Al Sulais
cf1880343b fix: make rearrangeRules update the array itself 2023-11-05 02:03:58 +03:00
Reda Al Sulais
0c57433567 Merge branch 'next' into add-pie-langium-parser 2023-11-03 23:17:57 +03:00
Reda Al Sulais
5ef0527ebc export all common ValueConverter and TokenBuilder and update imports 2023-11-03 23:12:24 +03:00
Reda Al Sulais
53ef5c51cc create CommonTokenBuilder 2023-11-03 23:09:58 +03:00
SteffenLm
b5fd8fb7c1
fix text-decoration for abstract attibutes 2023-11-03 20:55:42 +01:00
StefonSimmons
4ba3e2cff3
Update index.md
fix typo
2023-11-03 15:51:33 -04:00
Reda Al Sulais
58c7934dd8 export necessary objects and types from packages/parser 2023-11-03 22:45:23 +03:00
Reda Al Sulais
0a626917f8 remove unnecessary lines 2023-11-03 22:39:11 +03:00
Reda Al Sulais
922bb1452f test: update all parser test cases 2023-11-03 22:35:01 +03:00
Reda Al Sulais
1cda37659e chore(parser): rearrange rules to make imported rules at the beginning 2023-11-03 22:28:33 +03:00
Reda Al Sulais
fe2e46fe60 build(dev-deps): add chevrotain as a devDependencies 2023-11-03 22:26:05 +03:00
Reda Al Sulais
7765afa7da chore: allow comments to adjust keywords 2023-11-03 22:15:13 +03:00
Reda Al Sulais
55d7e9ec61 pref: remove CommonLexer and use EOF 2023-11-03 22:12:09 +03:00
Reda Al Sulais
6a4ad8af06 build(deps): update langium and langium-cli to v2.1.0 2023-11-03 22:09:36 +03:00
Reda Al Sulais
018440354f build(deps): remove langium-cli from packages/parser to use the one in root 2023-11-03 22:06:56 +03:00
Aakansha Doshi
a818f3e3ae add comment for ts ignore 2023-11-03 13:31:21 +05:30
Aakansha Doshi
58bad981be move decodeEntities to utils 2023-11-03 13:25:26 +05:30
Aakansha Doshi
6a5b7c40bd
Merge branch 'develop' into bug/4983-fix-getMessageAPI 2023-11-03 13:18:38 +05:30
Aakansha Doshi
6e6e92a1d1 review fixes 2023-11-03 13:16:30 +05:30
Steph
99244ffae5 Merge branch 'master' into update-latest-news 2023-11-02 05:05:04 -07:00
Laurent
379722d0fb
Fix case that generate broken link on docs 2023-11-02 12:51:52 +01:00
Sidharth Vinod
f5bd1e0809
Merge pull request #4997 from mermaid-js/renovate/all-minor
chore(deps): update all minor dependencies (minor)
2023-11-02 11:05:01 +00:00
renovate[bot]
0d4faef758
chore(deps): update all minor dependencies 2023-11-01 19:42:28 +00:00
Sidharth Vinod
0c5cf72235
chore: Point to correct changelog 2023-11-01 20:18:49 +05:30
Guy Pursey
57a9d7356c GitGraph: made reroute fn more readable
Pre-commit lint hook had made the use of ternaries harder to read
than I'd originally intended so I introduced an additional
variable which explains what is being checked and keeps ternaries
from becoming obscured.
2023-10-31 17:24:13 +00:00
Guy Pursey
a9c5d903c5 GitGraph: simplified branch check in arrow rerouting fn
Wanted to avoid repetition given that the originally nested
ternaries had the same structure
2023-10-31 17:24:13 +00:00
Guy Pursey
d80e1a2662 GitGraph: added commit IDs to e2e test to remove false positives
Should stop randomised commit IDs from showing arbitrary
differences between test runs.
2023-10-31 17:24:13 +00:00
Guy Pursey
bf52e76a39 GitGraph: Moved branch curve check to within reroute check fn
Based on review by @nirname. I had originally been trying
to minimise number of new arguments being passed to
rerouting check but as the branch curve check is not used
elsewhere and is part of the same rerouting check it makes
sense for them to be together.

Position information now passed to rerouting fn instead.
2023-10-31 17:24:13 +00:00
Guy Pursey
31a8e040fa GitGraph: corrected minor typo in comment. 2023-10-31 17:24:13 +00:00
Guy Pursey
f7d83e2cda GitGraph: added 2x e2e tests for branches not used immediately
My focus earlier on had been on relationship to `main` branch
so this is to ensure that we have some tests that cover
relationship between a pair of branches that doesn't
include `main`.
2023-10-31 17:24:13 +00:00
Guy Pursey
0555368e1c GitGraph: added branch checking to rerouting
Hypothesised that working out which branch needed checking for
overlapping commits might be missing, so added that as a
nested ternary and passed result as new argument to rerouting
check.

If commits are found on the branch which will be getting the
curve (whichever branch is lower or more to the right of main
than the other, for now), then the arrow will be rerouted.

I may refactor in a follow-up commit and I think there's scope
to simplify the logic but this is a test for now.
2023-10-31 17:24:13 +00:00
Guy Pursey
adfe1728ae GitGraph: Added e2e tests for deferred branch use.
In these tests, a new branch is created but then a commit is made
on the main branch before the new branch gets a commit. This
important to see what happens with rerouting of arrows.

Suggested by @nirname in PR review of #4927.
2023-10-31 17:24:13 +00:00