Commit Graph

2822 Commits

Author SHA1 Message Date
Reda Al Sulais 54a09ead95 pref: remove `rearrangeRules` from `AbstractMermaidTokenBuilder` 2023-12-31 15:31:15 +03:00
Reda Al Sulais c2ea23f01f Merge branch next into add-pie-langium-parser 2023-12-31 15:21:47 +03:00
Steph 5cec92ceb3 update verbiage 2023-12-28 11:53:04 -08:00
Steph 44dcac7501 update verbiage 2023-12-28 11:34:46 -08:00
Matheus B c50a82a60e Build config types 2023-12-22 21:52:19 -03:00
Matheus Braga f5ef0b600e
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges 2023-12-22 21:49:21 -03:00
Matheus B 41f3f9fb32 Fix linter issues 2023-12-22 21:48:19 -03:00
Matheus B 46583cf4eb Merge branch 'develop' into feature/5114_add_parallel_commit_config 2023-12-22 21:32:20 -03:00
Matheus B 222c46e7f0 Implement support for parallel commits config 2023-12-22 21:08:15 -03:00
Matheus B 00ac6ccb37 Add parallelCommits config option for gitGraphs 2023-12-22 20:42:24 -03:00
Vitor Soares Silva e6bd1ae9dc
fix sequence diagram popup 2023-12-22 11:30:24 -03:00
Steph 749db745d0 add jetbrains blog post 2023-12-20 16:47:43 -08:00
Nikolay Rozhkov dfa0ad5b7a Refined contribution guide again 2023-12-21 03:41:21 +03:00
Ronid1 8002d9e2eb Merge branch 'develop' of https://github.com/mermaid-js/mermaid into docs/4974_reorder_integration_links 2023-12-19 18:17:58 -08:00
Steph f02114eaab
Merge pull request #5112 from mermaid-js/update-getting-started
Docs: update Getting Started page
2023-12-19 12:56:03 -08:00
Steph 2469419070 additional updates 2023-12-19 12:16:01 -08:00
Nikolay Rozhkov d2b9240a22 Simplify things 2023-12-19 04:33:38 +03:00
Nikolay Rozhkov 2705c0de03 Different fixes 2023-12-19 03:56:16 +03:00
Nikolay Rozhkov 3bc39409e5 Formatting 2023-12-19 02:55:20 +03:00
Nikolay Rozhkov 2f3f76fa24 Contribution guidelines rework 2023-12-19 02:48:22 +03:00
Nikolay Rozhkov 7b6764da20
Merge branch 'develop' into docs/2910_update-contributing-guidelines 2023-12-19 00:55:46 +03:00
Nikolay Rozhkov f66f4f438f Use deep outline for the whole documentation website 2023-12-19 00:54:33 +03:00
Matheus Braga ddd6e9ac73
Merge branch 'develop' into bug/5059_fix_external_connection_after_updating_edges 2023-12-18 17:12:44 -03:00
Justin Greywolf 2b4940d67d Merge branch '2408-support-style-for-class' of https://github.com/mermaid-js/mermaid into 2408-support-style-for-class 2023-12-18 06:27:30 -08:00
Justin Greywolf c5220bd92d Fixed parser/tests 2023-12-18 06:27:10 -08:00
Nikolay Rozhkov 0506ba872a Fixed linters 2023-12-17 13:35:49 +03:00
Steph 35224e5fe2 update latest news pages 2023-12-14 10:14:46 -08:00
Justin Greywolf 1babceb63c
Update classDiagram.md 2023-12-14 06:48:13 -08:00
Justin Greywolf 237518ba3b
Update classDiagram.md 2023-12-14 06:47:37 -08:00
Scott Blomquist 5e1f0c620a
Fix typos in timeline syntax samples 2023-12-12 12:48:07 -08:00
Steph aaea8cf45e fix addl broken link 2023-12-11 13:02:02 -08:00
Steph 97e07f8473 fix link 2023-12-11 12:31:22 -08:00
Alois Klink 3a816e7298 Merge branch 'chore/use-tsx-instead-of-ts-node-esm' into verbiage-updates 2023-12-11 16:55:24 +00:00
Alois Klink 41a9ac953a build: use `tsx` instead of `ts-node-esm`
`ts-node-esm` v10.9.1 is not compatible with Node.JS v18.19.0.

(cherry picked from commit 4a7e4a3bcb)
2023-12-11 16:55:06 +00:00
Justin Greywolf a71bdbd2bb
Merge branch 'develop' into 2408-support-style-for-class 2023-12-11 04:56:11 -08:00
Justin Greywolf 668bf327d5
Update packages/mermaid/src/diagrams/class/classDb.ts
Co-authored-by: Alois Klink <alois@mermaidchart.com>
2023-12-11 04:45:48 -08:00
Justin Greywolf 3dce04e0a9
Update packages/mermaid/src/docs/syntax/classDiagram.md
Co-authored-by: Alois Klink <alois@mermaidchart.com>
2023-12-11 04:45:16 -08:00
Justin Greywolf 24957f44df
Update packages/mermaid/src/diagrams/class/classDb.ts
Co-authored-by: Alois Klink <alois@mermaidchart.com>
2023-12-11 04:44:53 -08:00
Nikolay Rozhkov 01908b1278 Development Into planning 2023-12-11 05:22:58 +03:00
Nikolay Rozhkov 57f0a3aa8e Contribution documentation improvements 2023-12-11 05:08:42 +03:00
Justin Greywolf 5a26edf6c0 Update generics docs 2023-12-10 17:01:36 -08:00
Justin Greywolf b51ca4fb15 Address potential undefined 2023-12-10 13:25:16 -08:00
Justin Greywolf 3bb005b973 Merge branch 'develop' into 2408-support-style-for-class 2023-12-10 13:18:58 -08:00
Sidharth Vinod ff6188bd80
Merge pull request #5118 from mermaid-js/sidv/diagramType
feat: Add diagramType to RenderResult and ParseResult
2023-12-10 22:05:40 +05:30
Matheus Braga 7e1cc27c76
Merge branch 'mermaid-js:develop' into bug/5059_fix_external_connection_after_updating_edges 2023-12-08 13:15:09 -03:00
Matheus B 8bff32adab Modify algorithm to re-check for external connections after defining anchor nodes 2023-12-08 13:08:13 -03:00
Diego Sogari d732a146c2
Merge branch 'next' into chore/5125-fix-duplicate-config-types 2023-12-08 09:35:43 -03:00
Sidharth Vinod b9bc518a0a
chore: Add docs 2023-12-08 10:06:36 +05:30
Sidharth Vinod edf32911be
Merge branch 'sidv/diagramType' of https://github.com/mermaid-js/mermaid into sidv/diagramType
* 'sidv/diagramType' of https://github.com/mermaid-js/mermaid:
  Update docs
  Update packages/mermaid/src/docs/config/usage.md
2023-12-08 09:57:33 +05:30
Sidharth Vinod b8470a471b
chore: Add docs 2023-12-08 09:57:08 +05:30
Sidharth Vinod 6f3c9205cd
Update packages/mermaid/src/docs/config/usage.md
Co-authored-by: Alois Klink <alois@mermaidchart.com>
2023-12-08 09:45:49 +05:30
Sidharth Vinod 96c90b24d1
Merge branch 'next' into sidv/diagramType
* next:
  chore: Fix import.meta.vitest warnings
  Update docs
  Update NiceGuy.io links in integrations-community.md
2023-12-08 09:39:14 +05:30
Sidharth Vinod aa4bfa0727
chore: Fix import.meta.vitest warnings 2023-12-08 09:38:54 +05:30
Sidharth Vinod 8873ffca12
chore: Overload parse type to be more specific.
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-12-08 09:37:46 +05:30
Diego Sogari 0bda748ad9
Remove default properties before generating the config types 2023-12-07 17:30:56 -03:00
Steph f363af482e verbiage updates 2023-12-07 10:14:33 -08:00
Faris Nabiev b60fc1b056 fix: replace functional approaches with oop 2023-12-07 11:32:49 +03:00
Sidharth Vinod 867686fe34
refactor: Address review comments 2023-12-07 11:27:48 +05:30
Sidharth Vinod 7c3bd9abd2
Merge branch 'develop' into release/10.6.2
* develop:
  Update docs
  Update NiceGuy.io links in integrations-community.md
  build(deps-dev): bump vite from 4.4.9 to 4.4.12
  Changes to .prettierignore 1. Added 'demos/dev/**' to be ignored by Prettier. 2. Added '!/demos/dev/example.html' so that Prettier ensures no one changes the example.html in a way that doesn't obey the Prettier code formatting rules.
  build: use `tsx` instead of `ts-node-esm`
  fix: #5100 Add viewbox to sankey
  fix: Check if parentCommit is provided
  Condition of Parent Id Without Merge Commit Added
  Error Hash Removed
  Linting Issue Fixed
  Updated gitgraph.md
  Linting Issue Fixed
  Documentation Modified New Ex Added
  e2e test case added
  Merge Conflict Resolved
  Suggested Changes FOR PR DONE
  documentation added, Tests Fixed
  All Unit Tests Passing
  Unit Test Cases Added
  Parser and Logic For Parent Commit Added
2023-12-07 11:02:52 +05:30
Sidharth Vinod 60f92dcdbc
Merge branch 'develop' into next
* develop:
  Update docs
  Update NiceGuy.io links in integrations-community.md
2023-12-07 11:02:27 +05:30
Sidharth Vinod d3257cef80
Merge branch 'develop' into sidv/5042_maxEdges 2023-12-07 11:01:19 +05:30
Sidharth Vinod 69f31097e7
refactor: Move maxEdges out of flowchart config. 2023-12-07 10:55:12 +05:30
Sidharth Vinod 9b34adf2c9
refactor: Move maxEdges out of flowchart config. 2023-12-07 10:49:20 +05:30
Sidharth Vinod 3b7cabee4b
chore: Add maxEdges to secure list 2023-12-07 10:39:10 +05:30
Sidharth Vinod 22f83f1614
fix: Sequence actor rendering 2023-12-07 09:57:02 +05:30
Arda Aydın 1d08155fb1
Update NiceGuy.io links in integrations-community.md 2023-12-07 02:30:21 +03:00
Sidharth Vinod a9818b40b6
chore: Remove special case error handling 2023-12-07 01:27:54 +05:30
Sidharth Vinod 85774b7e46
chore: Fix configAPI 2023-12-07 01:04:12 +05:30
Sidharth Vinod 886eda92a9
chore: await drawActors 2023-12-07 00:40:45 +05:30
Sidharth Vinod 1d86cf01ad
refactor: Cleanup error renderer 2023-12-07 00:37:25 +05:30
Sidharth Vinod 70b948fd17
refactor: Optimize renderKatex 2023-12-07 00:36:21 +05:30
Sidharth Vinod 0d98e6ca53
refactor: Revert type change for renderer 2023-12-07 00:17:53 +05:30
Sidharth Vinod 8d90815862
Merge branch 'develop' into pr/NicolasNewman/2885
* develop: (192 commits)
  build(deps-dev): bump vite from 4.4.9 to 4.4.12
  Changes to .prettierignore 1. Added 'demos/dev/**' to be ignored by Prettier. 2. Added '!/demos/dev/example.html' so that Prettier ensures no one changes the example.html in a way that doesn't obey the Prettier code formatting rules.
  build: use `tsx` instead of `ts-node-esm`
  chore: Downgrade node to 18.18.2
  fix: #5100 Add viewbox to sankey
  chore(deps): update all minor dependencies
  chore: Rename test
  test: Add unit test for generic classname and namespace
  fix: Check if parentCommit is provided
  Split type from generic class name
  Condition of Parent Id Without Merge Commit Added
  Referenced the PmWiki's Cookbook recipe enabling MermaidJs schematics in wiki pages
  test(e2e): fix pie chart E2E tests for PR #4288
  Add dummy commit to trigger GH checks
  chore: Revert unnecessary export
  refactor: Remove unnecessary calculations
  chore: Fix computeWidth function
  chore: Cleanup setupGraphViewbox
  Update docs
  update mermaidAPI to cleanup the text before passing to getDiagramFromText
  ...
2023-12-07 00:01:01 +05:30
Sidharth Vinod 6871ad09e6
test: Update tests 2023-12-06 22:27:00 +05:30
Sidharth Vinod 479188bc40
refactor: Change return type to retain partial backwards compatibility. 2023-12-06 22:23:37 +05:30
Sidharth Vinod c3c7ccd78a
feat: Add diagramType to RenderResult and ParseResult #5117 2023-12-06 21:11:07 +05:30
Sidharth Vinod 000b432bb2
Merge branch 'develop' into next
* develop: (70 commits)
  build(deps-dev): bump vite from 4.4.9 to 4.4.12
  Changes to .prettierignore 1. Added 'demos/dev/**' to be ignored by Prettier. 2. Added '!/demos/dev/example.html' so that Prettier ensures no one changes the example.html in a way that doesn't obey the Prettier code formatting rules.
  build: use `tsx` instead of `ts-node-esm`
  chore: Downgrade node to 18.18.2
  fix: #5100 Add viewbox to sankey
  chore(deps): update all minor dependencies
  chore: Rename test
  test: Add unit test for generic classname and namespace
  fix: Check if parentCommit is provided
  Split type from generic class name
  Condition of Parent Id Without Merge Commit Added
  Referenced the PmWiki's Cookbook recipe enabling MermaidJs schematics in wiki pages
  test(e2e): fix pie chart E2E tests for PR #4288
  Add dummy commit to trigger GH checks
  chore: Revert unnecessary export
  refactor: Remove unnecessary calculations
  chore: Fix computeWidth function
  chore: Cleanup setupGraphViewbox
  Update docs
  update mermaidAPI to cleanup the text before passing to getDiagramFromText
  ...
2023-12-06 20:50:04 +05:30
Sidharth Vinod 770fc412ca
feat: Track outbound links in plausible
Unlike mermaid.live, there is no user provided links in mermaid.js.org.
So we can track the outbound link clicks without leaking any user data.
2023-12-06 11:47:15 +05:30
futzmonitor 03b5c00f03 Merge branch 'develop' into issue1981 2023-12-05 21:56:08 -05:00
dependabot[bot] faf282b45b
build(deps-dev): bump vite from 4.4.9 to 4.4.12
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.4.9 to 4.4.12.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/v4.4.12/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.4.12/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-12-05 23:52:12 +00:00
Justin Greywolf 02b2d71eb3
Update packages/mermaid/src/diagrams/class/classDb.ts
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-12-05 07:57:39 -08:00
Justin Greywolf e25515a960 Merge branch 'develop' into 2408-support-style-for-class 2023-12-05 07:11:08 -08:00
Justin Greywolf ca386ab597 Update docs 2023-12-05 07:10:45 -08:00
Nikolay Rozhkov fe07e9da46
Merge pull request #5102 from mermaid-js/5100_SankeyViewbox
fix: #5100 Add viewbox to sankey
2023-12-05 10:14:55 +00:00
Steph 276b5c748a update getting started page 2023-12-04 13:47:20 -08:00
Justin Greywolf 1ecae7dc93 Merge branch 'develop' into 2408-support-style-for-class 2023-12-04 13:29:00 -08:00
Justin Greywolf 239fad94ee Grammar/rendering for setting style on class node 2023-12-04 13:28:31 -08:00
futzmonitor aa3a19b63c Merge branch 'develop' into issue1981 2023-12-04 15:25:09 -05:00
Steph 78c44bf793 add blog post 2023-12-04 11:07:55 -08:00
Alois Klink 4a7e4a3bcb build: use `tsx` instead of `ts-node-esm`
`ts-node-esm` v10.9.1 is not compatible with Node.JS v18.19.0.
2023-12-04 11:25:58 +00:00
Alois Klink 6a31ae6b4f
Merge pull request #4944 from RounakJoshi09/bug/#4497_unable-to-cherrypick-merge-commit
Bug/#4497 Unable to Cherry Pick Merge Commit Solved
2023-12-04 09:15:03 +00:00
Sidharth Vinod 80fa3e9597
update docs 2023-12-04 12:28:05 +05:30
Sidharth Vinod 60ea9a2972
v10.6.2-rc.2 2023-12-04 12:20:40 +05:30
Sidharth Vinod 1165fb163d
Merge branch 'develop' into release/10.6.2
* develop: (47 commits)
  chore(deps): update all minor dependencies
  chore: Rename test
  test: Add unit test for generic classname and namespace
  Split type from generic class name
  Referenced the PmWiki's Cookbook recipe enabling MermaidJs schematics in wiki pages
  test(e2e): fix pie chart E2E tests for PR #4288
  Add dummy commit to trigger GH checks
  chore: Revert unnecessary export
  refactor: Remove unnecessary calculations
  chore: Fix computeWidth function
  chore: Cleanup setupGraphViewbox
  Update docs
  update mermaidAPI to cleanup the text before passing to getDiagramFromText
  Add test for subgraphs with title margins and edge labels
  Modify margin logic to avoid creating unnecessary space in subgraph
  review fixes
  add test
  remove unused variable
  fix: clean comments in text in getDiagramFromText API so flowchart works well
  chore(deps): update all minor dependencies
  ...
2023-12-04 12:20:17 +05:30
Sidharth Vinod 160c7d399a
fix: #5100 Add viewbox to sankey 2023-12-04 11:36:07 +05:30
renovate[bot] e87243c135
chore(deps): update all minor dependencies 2023-12-04 06:04:52 +00:00
Sidharth Vinod 761fa27eea
chore: Rename test 2023-12-04 11:22:09 +05:30
Sidharth Vinod 93a920cdfe
test: Add unit test for generic classname and namespace 2023-12-04 11:21:27 +05:30
Sidharth Vinod d22ee8d1d5
fix: Check if parentCommit is provided 2023-12-04 11:13:52 +05:30
Sidharth Vinod f806de3a1d
Merge branch 'develop' into sidv/5042_maxEdges 2023-12-04 09:57:26 +05:30
Justin Greywolf 8de1bde8f4 Split type from generic class name 2023-12-03 18:01:00 -08:00
RounakJoshi09 31a1de1566
Condition of Parent Id Without Merge Commit Added 2023-12-04 00:28:01 +05:30
RounakJoshi09 c6bf9083c8
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-12-04 00:19:28 +05:30
futzmonitor 8e95cdb883 Changes to gantt.jison
1. Consistent spacing on line 30
2023-12-02 12:56:58 -05:00
futzmonitor 68ff352f2d Changes to gantt.jison
1. Removed typo
2023-12-02 10:26:46 -05:00
futzmonitor f02dfe60af Changes to gnatt.jison
1. Removed the hash and semicolon symbols from the title regex to allow for their use.
2. Removed the hash and semicolon symbols from the section regex to allow for their use.
3. Removed the hash and semicolon symbols for the taskTxt regex to allow for their use. I did not remove the colon because the parser fails to recognize when the actual taskData begins if that distinctions isn't kept.
4. Removed the regex \#[^\n]* which skipped comments to fix some bugs with hash symbols in the taskTxt. I tested this changed by putting it back and using the comment  to see if it was recognized as a comment, but I would receive a syntax error and the diagram would not be rendered. So, I think we can safely remove that line, BUT it would be best practice if someone else tested this change to ensure that this will not break anyone's Gantt diagrams.
2023-12-02 10:23:44 -05:00
Sidharth Vinod 9be9601927
chore: Update promo link 2023-12-01 12:04:30 +05:30
Sidharth Vinod fdf9988af1
feat #5042: Add `flowchart.maxEdges` config. 2023-11-28 19:07:10 +05:30
d-faure ae7003aa39 Merge remote-tracking branch 'origin/develop' into PmWiki-integration 2023-11-28 14:01:30 +01:00
d-faure f35fb3955d Referenced the PmWiki's Cookbook recipe enabling MermaidJs schematics in wiki pages 2023-11-28 13:50:31 +01:00
Sidharth Vinod 4499926453
Merge pull request #5076 from ad1992/aakansha/bug/5075-fix-getDiagramFromText-api
fix: clean comments in text in getDiagramFromText API so flowchart works well
2023-11-28 12:02:57 +00:00
Sidharth Vinod 252a8a73b1
Merge pull request #5041 from mathbraga/feature/4935_subgraph-title-margin-config-option
Feature/4935 subgraph title margin config option
2023-11-28 12:02:03 +00:00
Sidharth Vinod a1563c9f7d
docs: Holiday promo v2 2023-11-28 13:39:46 +05:30
Aakansha Doshi 4ed7b2be02
Add dummy commit to trigger GH checks 2023-11-28 12:05:52 +05:30
Sidharth Vinod af9566df75
Update packages/mermaid/src/docs/.vitepress/components/TopBar.vue 2023-11-28 11:42:04 +05:30
Sidharth Vinod 89b392327a
chore: Revert unnecessary export 2023-11-28 11:34:58 +05:30
Sidharth Vinod 9c2dae92f8
refactor: Remove unnecessary calculations 2023-11-28 11:30:41 +05:30
Sidharth Vinod 403ac4b76b
chore: Fix computeWidth function 2023-11-28 10:39:34 +05:30
Sidharth Vinod 0620c6daf2
chore: Cleanup setupGraphViewbox 2023-11-28 10:34:58 +05:30
Sidharth Vinod 1f4e335f8d
Merge branch 'develop' into pr/iwestlin/4288
* develop: (596 commits)
  chore(deps): update all minor dependencies
  chore(deps): update all patch dependencies
  fix: flowchart image without text
  fix Types
  chore: Update pnpm-lock
  chore: Add tests for calculateDeltaAndAngle
  fix: #5064 Handle case when line has only one point
  reset the testTimeout to 5 seconds and change it directly in the test
  update testTimeout from 5 seconds to 10 seconds
  Update all patch dependencies
  fix broken link
  add latest blog post
  Update all minor dependencies
  Update all patch dependencies
  Fix docs
  Update packages/mermaid/src/docs/community/questions-and-suggestions.md
  Update packages/mermaid/src/diagrams/class/classRenderer-v2.ts
  update edge ids
  draw top actors with lines  first followed by messages
  Bump GitHub workflow actions to latest versions
  ...
2023-11-28 10:34:18 +05:30
Aakansha Doshi fe4485c55f update mermaidAPI to cleanup the text before passing to getDiagramFromText 2023-11-28 09:05:00 +05:30
Matheus Braga 5718be50ee
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option 2023-11-27 22:17:32 -03:00
Matheus B 8e794e3af9 Merge branch 'feature/4935_subgraph-title-margin-config-option' of https://github.com/mathbraga/mermaid into feature/4935_subgraph-title-margin-config-option 2023-11-27 22:13:00 -03:00
Matheus B a807a58a29 Modify margin logic to avoid creating unnecessary space in subgraph 2023-11-27 22:10:05 -03:00
Steph 8d53fa17da update announcements page 2023-11-27 11:44:47 -08:00
Steph c0b80df1cb update announcement bar verbiage 2023-11-27 11:36:56 -08:00
Sidharth Vinod 65a08efa00
chore: Cleanup types 2023-11-28 00:31:05 +05:30
Sidharth Vinod 60266289e0
chore: Remove unused file 2023-11-28 00:17:16 +05:30
Sidharth Vinod 3145758411
Convert flowDb.spec.js 2023-11-28 00:15:22 +05:30
Sidharth Vinod d7948a845d
fix: Flatten Nodelist 2023-11-28 00:12:22 +05:30
Sidharth Vinod aff69e583e
chore: Fix bindFunctions type 2023-11-27 23:10:36 +05:30
Aakansha Doshi d3d4948b3a
Merge branch 'develop' into aakansha/bug/5075-fix-getDiagramFromText-api 2023-11-27 19:51:33 +09:00
Aakansha Doshi 4dbfa2f0d3 review fixes 2023-11-27 16:11:25 +05:30
Alois Klink 25e9bb354e
Merge pull request #4837 from mermaid-js/refactor/unifyEdgeMarkers
refactor: Unify the edgeMarker adding logic
2023-11-27 10:07:42 +00:00
Sidharth Vinod e7f7b6ad68
chore: Separate types 2023-11-27 14:44:03 +05:30
Sidharth Vinod 7ca76b02e1
Merge pull request #5063 from bonyuta0204/bug/4736_zero_size_image_flowchart
fix: flowchart image without text
2023-11-27 08:28:48 +00:00
Aakansha Doshi 282da45d0e
Merge branch 'develop' into aakansha/bug/5075-fix-getDiagramFromText-api 2023-11-27 17:04:39 +09:00
Aakansha Doshi 7e119381e8 add test 2023-11-27 13:33:01 +05:30
Aakansha Doshi 4a4d715270 remove unused variable 2023-11-27 13:25:13 +05:30
Aakansha Doshi 1d5378a4f2 fix: clean comments in text in getDiagramFromText API so flowchart works well 2023-11-27 13:19:31 +05:30
Sidharth Vinod b5e58f4076
refactor: Convert flowDB to TS 2023-11-27 10:57:04 +05:30
renovate[bot] 2cc4f23856
chore(deps): update all patch dependencies 2023-11-27 01:36:48 +00:00
Matheus B ce875c9a33 Move getConfig() call out of recursiveRender to its parent caller 2023-11-26 18:18:31 -03:00
Sidharth Vinod fd0f51926e
Move mermaid-parser to @mermaid-js/parser 2023-11-26 21:17:08 +05:30
Sidharth Vinod 733d6fe6eb
Move mermaid-parser to @mermaid-js/parser 2023-11-26 21:10:00 +05:30
Matheus Braga 904be162a8
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option 2023-11-25 14:40:56 -03:00
Matheus B 3489fc49b9 Replace multiple calls of getConfig() for a single at top of the scope 2023-11-25 13:51:49 -03:00
Sidharth Vinod 65ee65b3ec
Merge pull request #4915 from Patronud/develop
prevent-inherited-lineheights-on-edgeterminal-4083
2023-11-25 10:33:46 +05:30
Yuta Nakamura 1ff7218558 fix: flowchart image without text 2023-11-24 21:35:50 +09:00
Sidharth Vinod 5b705cf94f
v10.6.2-rc.1 2023-11-24 14:11:49 +05:30
Sidharth Vinod bffbf87cb3
Version for rc release 2023-11-24 14:08:56 +05:30
Sidharth Vinod 63890cc2fd
Version for rc release 2023-11-24 14:07:52 +05:30
Sidharth Vinod 9ade49b39c
Version for rc release 2023-11-24 14:02:55 +05:30
Sidharth Vinod b5ba09500f
Merge branch 'develop' into refactor/unifyEdgeMarkers 2023-11-24 11:14:00 +05:30
Sidharth Vinod 7b0f6c1c74
fix Types 2023-11-24 10:44:18 +05:30
Sidharth Vinod c0fcf4f3b1
Merge branch 'develop' into 5064_EdgeOffsetEdgeCase
* develop:
  fix broken link
  add latest blog post
  fix linting
  fix: set proper shiki theme for light and dark modes
  fix: change shiki theme to github-light
  add latest blog post
  add latest blog post
2023-11-24 10:26:32 +05:30
Sidharth Vinod 55ce05fc75
chore: Add tests for calculateDeltaAndAngle 2023-11-24 10:25:50 +05:30
Ronid1 aaf9fd5f03 update and verify links 2023-11-23 20:44:35 -08:00
Ronid1 783becebf6 alphabetically order sub categories 2023-11-23 20:38:44 -08:00
Ronid1 3e098ab73b sort links alphabetically 2023-11-23 20:38:44 -08:00
Sidharth Vinod 94c3d7fb60
Merge branch 'next' into sidv/splitELK
* next: (39 commits)
  reset the testTimeout to 5 seconds and change it directly in the test
  update testTimeout from 5 seconds to 10 seconds
  Update all patch dependencies
  fix broken link
  add latest blog post
  Update all minor dependencies
  fix linting
  fix: set proper shiki theme for light and dark modes
  fix: change shiki theme to github-light
  add latest blog post
  GitGraph: made reroute fn more readable
  GitGraph: simplified branch check in arrow rerouting fn
  GitGraph: added commit IDs to e2e test to remove false positives
  GitGraph: Moved branch curve check to within reroute check fn
  GitGraph: corrected minor typo in comment.
  GitGraph: added 2x e2e tests for branches not used immediately
  GitGraph: added branch checking to rerouting
  GitGraph: Added e2e tests for deferred branch use.
  GitGraph: e2e tests, added commit IDs to test graphs
  GitGraph: fixed an e2e branch for vertical branch
  ...
2023-11-24 09:55:31 +05:30
Sidharth Vinod a2db4a464a
Merge branch 'develop' into next
* develop: (39 commits)
  reset the testTimeout to 5 seconds and change it directly in the test
  update testTimeout from 5 seconds to 10 seconds
  Update all patch dependencies
  fix broken link
  add latest blog post
  Update all minor dependencies
  fix linting
  fix: set proper shiki theme for light and dark modes
  fix: change shiki theme to github-light
  add latest blog post
  GitGraph: made reroute fn more readable
  GitGraph: simplified branch check in arrow rerouting fn
  GitGraph: added commit IDs to e2e test to remove false positives
  GitGraph: Moved branch curve check to within reroute check fn
  GitGraph: corrected minor typo in comment.
  GitGraph: added 2x e2e tests for branches not used immediately
  GitGraph: added branch checking to rerouting
  GitGraph: Added e2e tests for deferred branch use.
  GitGraph: e2e tests, added commit IDs to test graphs
  GitGraph: fixed an e2e branch for vertical branch
  ...
2023-11-24 09:54:02 +05:30
Sidharth Vinod 8f733c6b01
Merge branch 'master' into develop
* master:
  fix broken link
  add latest blog post
  fix linting
  fix: set proper shiki theme for light and dark modes
  fix: change shiki theme to github-light
  add latest blog post
  add latest blog post
2023-11-24 09:46:21 +05:30
Sidharth Vinod 78e118c876
fix: #5064 Handle case when line has only one point 2023-11-24 09:42:21 +05:30
Sidharth Vinod 5b7ba838f1
Merge branch 'sidv/splitELK' of https://github.com/mermaid-js/mermaid into sidv/splitELK
* 'sidv/splitELK' of https://github.com/mermaid-js/mermaid:
  5043 Allow registered diagrams to be overridden.
2023-11-23 22:15:08 +05:30
Sidharth Vinod ac99eb59d2
Cleanup package.json
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-11-23 22:15:04 +05:30
Omer Priel 9ae00ebcdb reset the testTimeout to 5 seconds and change it directly in the test 2023-11-23 14:55:09 +02:00
Matheus Braga 997a3771f1
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option 2023-11-20 21:28:09 -03:00
Matheus B d79671e04a Resolve lint issue 2023-11-20 21:16:10 -03:00
Matheus B a935380713 Merge branch 'feature/4935_subgraph-title-margin-config-option' of https://github.com/mathbraga/mermaid into feature/4935_subgraph-title-margin-config-option 2023-11-20 21:07:24 -03:00
Matheus B d61bfde167 Replace string concat with string templates 2023-11-20 21:06:38 -03:00
Matheus B fc3018e977 Move subgraph title margin tests to independent file 2023-11-20 20:55:43 -03:00
Matheus B 63c2d36232 Rename file and update imports 2023-11-20 20:49:00 -03:00
Matheus B c0a43f5d5a Change getSubGraphTitleMargins to accept config object as parameter 2023-11-20 20:40:30 -03:00
Matheus B ad6c76116d Modify getSubGraphTitleMargins to use null coalescing operator 2023-11-20 19:13:34 -03:00
Knut Sveidqvist df858dc7b6 #3358 Adding arrows to syntax 2023-11-20 14:00:25 +01:00
renovate[bot] 3ba0fee406
Update all patch dependencies 2023-11-20 09:56:45 +00:00
Steph cbc97dacdf fix broken link 2023-11-19 20:39:18 -08:00
Steph 8405454a1a add latest blog post 2023-11-19 20:32:20 -08:00
renovate[bot] a1c0761ef9
Update all minor dependencies 2023-11-20 01:43:47 +00:00
Sidharth Vinod 38b3a2080b
5043 Allow registered diagrams to be overridden. 2023-11-20 00:29:13 +05:30
Sidharth Vinod 0fec0ef624
5043 Move ELK to standalone package 2023-11-19 00:44:44 +05:30
Matheus Braga 42ac630304
Merge branch 'develop' into feature/4935_subgraph-title-margin-config-option 2023-11-17 21:41:27 -03:00
Matheus B 453c16d08e Remove unnecessary code 2023-11-17 20:20:13 -03:00
RounakJoshi09 c19fa122af
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-11-17 11:28:20 +05:30
RounakJoshi09 aadf5339a4 Error Hash Removed 2023-11-17 09:51:03 +05:30
Sidharth Vinod a47a9e400b
Merge branch 'develop' into refactor/unifyEdgeMarkers 2023-11-16 11:00:33 +05:30
Sidharth Vinod 7ef61d58fd
test: Add packet test for title, accTitle, accDescr 2023-11-16 10:58:25 +05:30
Sidharth Vinod bca645f63d
test: Add packet and xychart into mermaidAPI test 2023-11-16 10:48:25 +05:30
Sidharth Vinod a8105f084e
fix: Use configureSvgSize
Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>
2023-11-16 10:42:41 +05:30
Reda Al Sulais e86f09aaed Apply suggested style from code review
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-11-15 12:53:43 +03:00
Reda Al Sulais 692a7471c1 chore: apply review changes 2023-11-15 12:46:58 +03:00
Sidharth Vinod 480645d22f
fix: Add language to codeblock 2023-11-15 12:26:24 +05:30
Sidharth Vinod 784a853ec7
feat: Add theming to packet 2023-11-15 12:20:28 +05:30
Sidharth Vinod 088fc392ab
Fix SVG width 2023-11-15 09:42:35 +05:30
Sidharth Vinod 0d7644c782
refactor: Fix types 2023-11-15 09:25:49 +05:30
Sidharth Vinod f15d24b4e8
Merge branch 'next' into feat/948_packetDiagram
* next:
  fix text-decoration for abstract attibutes
  ci(pr-labeler): add required `template` option
  ci(pr-labeler): replace TimonVS/pr-labeler-action
  style(pr-labeler): format .github/pr-labeler.yml
  docs(ci/pr-labeler): warn about security issues
  ci(release-draft): handle new release-drafter name
  ci(release-drafter): remove unused `branch` config
  ci(pr-labeler): limit GITHUB_TOKEN permissions
  ci(release-draft): limit GITHUB_TOKEN permissions
2023-11-15 09:10:41 +05:30
Sidharth Vinod 510549f365
Merge branch 'develop' into next
* develop:
  fix text-decoration for abstract attibutes
  ci(pr-labeler): add required `template` option
  ci(pr-labeler): replace TimonVS/pr-labeler-action
  style(pr-labeler): format .github/pr-labeler.yml
  docs(ci/pr-labeler): warn about security issues
  ci(release-draft): handle new release-drafter name
  ci(release-drafter): remove unused `branch` config
  ci(pr-labeler): limit GITHUB_TOKEN permissions
  ci(release-draft): limit GITHUB_TOKEN permissions
2023-11-15 09:10:13 +05:30
Sidharth Vinod f9df193b7b
chore: Fix imports 2023-11-15 01:04:07 +05:30
Sidharth Vinod 113a400952
Add DiagramRenderer type
Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>
2023-11-15 01:02:20 +05:30
Sidharth Vinod fc400ea57b
fix: Langium formatting
Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>
2023-11-15 00:57:39 +05:30
Sidharth Vinod 068a74adeb
chore: Fix magic number
Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>
2023-11-15 00:55:02 +05:30
Sidharth Vinod 1a8743ec11
refactor: Separate default options in styles 2023-11-15 00:52:56 +05:30
Sidharth Vinod 9925b9b455
feat: Add title support to packetDiagram 2023-11-15 00:47:03 +05:30
Reda Al Sulais 4c43bae92d Merge branch next into add-pie-langium-parser 2023-11-14 20:04:16 +03:00
Sidharth Vinod 659db9f04b
chore: Add types and minimums for packet config 2023-11-14 19:44:09 +05:30
Nikolay Rozhkov 52603d7acd
Merge branch 'develop' into bug/4912_gitgraph-merge-routing-colouring 2023-11-14 16:26:19 +03:00
Alois Klink c56025ec3b
Merge pull request #5013 from SteffenLm/bug/5009_static_class_attribute_not_rendered
Fix - static class attributes are not rendered underlined
2023-11-14 09:44:35 +00:00
Sidharth Vinod b88d1dfaa9
fix(packet): Grammar whitespace
Move populate into parser

Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>
2023-11-14 11:59:58 +05:30
Sidharth Vinod 7c79bbd6b0
refactor: Address review comments
Moved some types around
Removed unnecessary params

Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-11-14 11:48:11 +05:30
Sidharth Vinod ce6bfcb7f5
Merge branch 'next' into feat/948_packetDiagram
* next: (193 commits)
  Update all patch dependencies
  Fix docs
  Update packages/mermaid/src/docs/community/questions-and-suggestions.md
  Update packages/mermaid/src/diagrams/class/classRenderer-v2.ts
  update edge ids
  draw top actors with lines  first followed by messages
  Bump GitHub workflow actions to latest versions
  Update docs
  Documentation: clarify sentence
  Fix lint
  Fix typo
  fix typo
  Add new Atlassian integrations
  chore(deps): update all patch dependencies
  Update demos/sequence.html
  chore: release v10.6.1
  fix
  fix
  fix: render the participants in same order as they are created
  fix(flow): fix invalid ellipseText regex
  ...
2023-11-14 11:21:15 +05:30
Sidharth Vinod 6ce543e118
Merge branch 'develop' into next
* develop: (126 commits)
  Update all patch dependencies
  Fix docs
  Update packages/mermaid/src/docs/community/questions-and-suggestions.md
  Update packages/mermaid/src/diagrams/class/classRenderer-v2.ts
  update edge ids
  draw top actors with lines  first followed by messages
  Bump GitHub workflow actions to latest versions
  Update docs
  Documentation: clarify sentence
  Fix lint
  Fix typo
  fix typo
  Add new Atlassian integrations
  chore(deps): update all patch dependencies
  Update demos/sequence.html
  chore: release v10.6.1
  fix
  fix
  fix: render the participants in same order as they are created
  fix(flow): fix invalid ellipseText regex
  ...
2023-11-14 11:20:27 +05:30
Sidharth Vinod 0c0f7a739e
Merge pull request #4934 from RounakJoshi09/bug/#3251_linkStyle-can't-specify-ids
bug/#3251_linkStyle-can't-specify-ids Fixed
2023-11-14 05:38:20 +00:00
Sidharth Vinod 5fdbf5d891
Merge pull request #5017 from ad1992/bug/4946-fix-svg-order-sequence-participant
fix: render the participants in same order as they are created
2023-11-14 05:29:35 +00:00
Nikolay Rozhkov fb031ee11a
Merge branch 'develop' into bug/4912_gitgraph-merge-routing-colouring 2023-11-13 23:14:42 +03:00
Matheus B 56c3809b57 Add logic to add subgraph title margin on layout 2023-11-12 17:32:58 -03:00
Matheus B 8b0a5be6d9 Include subgraph margin into label positioning 2023-11-11 18:18:51 -03:00
Matheus B 52ed38719f Fix nesting of getSubGraphTitleMargins test. 2023-11-10 21:35:58 -03:00
Matheus B 0bcd5d28e8 Create helper function for subgraph title margin fetching. 2023-11-10 21:30:09 -03:00
Matheus B b134766647 Add subgraph title margin config options to schema. 2023-11-10 21:22:31 -03:00
Sidharth Vinod b12b8a9278
Merge pull request #4952 from ajdamico/patch-1
add links to make it easier
2023-11-09 23:46:24 +05:30
Sidharth Vinod 3c13386e5d
Update packages/mermaid/src/docs/community/questions-and-suggestions.md 2023-11-09 23:44:35 +05:30
Sidharth Vinod a177141962
Merge pull request #5028 from mermaid-js/3952-lexical-ids
3952 lexical ids
2023-11-09 18:04:38 +00:00
Justin Greywolf 0f2b941e2d
Update packages/mermaid/src/diagrams/class/classRenderer-v2.ts
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-11-09 08:05:09 -08:00
Justin Greywolf e8ad72a980 Merge branch 'develop' into 3952-lexical-ids 2023-11-09 07:03:40 -08:00
Justin Greywolf a8fe640546 update edge ids 2023-11-09 06:57:51 -08:00
Aakansha Doshi 01bbcc597a draw top actors with lines first followed by messages 2023-11-09 17:52:00 +05:30
Andreas Deininger f47e920a97 Documentation: clarify sentence 2023-11-09 12:50:01 +01:00
Sidharth Vinod 1571b25d29
Merge pull request #4958 from csholmq/fix/tooltip
fix(tooltip): remove redundant scroll offset
2023-11-09 09:01:19 +00:00
Sidharth Vinod 4a92fc5c92
Fix lint 2023-11-09 14:20:06 +05:30
Sidharth Vinod 8d6317b49a
Merge branch 'develop' into pr/csholmq/4958
* develop: (21 commits)
  Fix typo
  fix typo
  Add new Atlassian integrations
  chore(deps): update all patch dependencies
  chore: release v10.6.1
  fix(flow): fix invalid ellipseText regex
  review fixes
  Update XYChart's nav link in the docs template
  Update index.md
  add comment for ts ignore
  move decodeEntities to utils
  review fixes
  chore(deps): update all minor dependencies
  chore: Point to correct changelog
  add spec
  fix: getMessageAPI so it considers entity codes
  Update classDiagram.md
  Chore: Typo fixed in multiple files
  feat(gantt): update styles
  docs(integrations): add Mermaid for Slack
  ...
2023-11-09 14:19:28 +05:30
Sidharth Vinod ee49c4b660
Merge pull request #4933 from REVERB283/bug/4716_fix_target_blank_getting_sanitized
fix: target blank removed from anchor tag
2023-11-09 08:46:33 +00:00
Sidharth Vinod 72038a68a9
Fix typo 2023-11-09 14:06:58 +05:30
Sidharth Vinod 051260e9a8
Merge branch 'develop' of https://github.com/mermaid-js/mermaid into develop
* 'develop' of https://github.com/mermaid-js/mermaid:
  docs: fixed typo
2023-11-09 14:04:33 +05:30
Sidharth Vinod 3cf0a2b290
Merge pull request #4893 from 0xflotus/patch-1
docs: fixed typo
2023-11-09 14:04:17 +05:30
Sidharth Vinod adfb60e045
fix typo 2023-11-09 14:03:38 +05:30
Sidharth Vinod 79bae62ce0
Merge pull request #4973 from SahilNagpure07/patch-1
docs: Update classDiagram.md
2023-11-09 13:57:36 +05:30
Sidharth Vinod 3038ce5864
Merge pull request #5021 from nashtechlabs/docs/patch-1
Add new Atlassian integrations
2023-11-09 13:56:19 +05:30
Sidharth Vinod c8a826dfce
Merge pull request #5012 from StefonSimmons/patch-1
Update index.md
2023-11-09 13:51:27 +05:30
Sidharth Vinod 0075538431
fix linting 2023-11-09 13:49:42 +05:30
Braulio Ruiz 8db9700807
fix: set proper shiki theme for light and dark modes 2023-11-09 13:36:44 +05:30
Braulio Ruiz 1fa8de2771
fix: change shiki theme to github-light 2023-11-09 13:36:44 +05:30
Sidharth Vinod 09d9c31d53
chore: Reset mock in edgeMarker test 2023-11-09 11:36:45 +05:30
nashtechlabs fadae38bec
Merge branch 'develop' into docs/patch-1 2023-11-09 05:34:57 +07:00
Sidharth Vinod e46626d3ed
Merge branch 'develop' into refactor/unifyEdgeMarkers
* develop: (155 commits)
  chore(deps): update all patch dependencies
  chore: release v10.6.1
  fix(flow): fix invalid ellipseText regex
  review fixes
  Update XYChart's nav link in the docs template
  add comment for ts ignore
  move decodeEntities to utils
  review fixes
  chore(deps): update all minor dependencies
  chore: Point to correct changelog
  add spec
  fix: getMessageAPI so it considers entity codes
  chore(deps): update all patch dependencies
  Update integrations-community.md
  docs: upate the list of tools with native support of mermaid
  Fix typo in build-docs.yml
  Updated mermaid version
  Limiting the number of edges that are allowed in the flowchart
  Update README.md
  Update README.md
  ...
2023-11-09 02:39:54 +05:30
Sidharth Vinod 8f572021af
chore: Add test for invalid marker 2023-11-09 02:38:48 +05:30
Sidharth Vinod 4952b13ad0
fix: Ignore unknown arrow type values
Co-authored-by: Alois Klink <alois@aloisklink.com>
2023-11-09 02:37:38 +05:30
Sidharth Vinod d1fba9c567
Merge pull request #4824 from JackuB/patch-1
Docs: add Mermaid for Slack integration
2023-11-08 20:58:40 +00:00
Sidharth Vinod c2e26baf4d
Merge pull request #4930 from Mister-Hope/patch-2
feat(gantt): update styles
2023-11-08 20:42:53 +00:00
Reda Al Sulais 1d88ac43cf enhance `title`, `accTitle`, and `accDescr` regexes 2023-11-08 22:10:36 +03:00
Reda Al Sulais 6102285577 full switch to EOF 2023-11-08 22:10:36 +03:00
Reda Al Sulais b83603488c build(deps): update `langium` to `v2.1.1` 2023-11-08 22:10:35 +03:00
nashtechlabs f6b1e049f1
Merge branch 'develop' into docs/patch-1 2023-11-08 15:56:22 +07:00
Alois Klink f487dcd57b Merge commit 'b61ea4b8aa2f5d38ad6af828ed0620a589ec5786'
This fixes the link to xyChart in the docs on the `master` branch.
2023-11-08 08:42:05 +00:00
Alois Klink 71478f5a64
Merge pull request #5014 from Abrifq/patch-2
Update XYChart's nav link in the docs template
2023-11-08 08:22:30 +00:00
dev1 c9ace33cf1 Add new Atlassian integrations 2023-11-08 14:39:06 +07:00
Steph c117447bb3 add latest blog post 2023-11-07 00:54:32 -08:00
Steph 1f7aec7405 Merge branch 'master' into update-latest-news 2023-11-07 00:50:51 -08: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 d1045ed644 Merge remote-tracking branch 'origin/release/10.6.1' 2023-11-06 14:29:58 +00:00
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
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
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 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 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 3e18e76d31 GitGraph: removed check of branch with main from arrow reroute fn
Checking if branch was same as main turned out to be redundant
for now, since there don't seem to be any cases where routing
curves into main.

This fixes issue found in review by @nirname and avoids a
situation where branching from the same commit results in
unnecessary rerouting.
2023-10-31 17:24:13 +00:00
Guy Pursey 7c87df7cf6 GitGraph: rename overlap check to shouldRerouteArrow
The function also now does an additional check to see
if source branch in overlap check is on main.

As we're no longer purely checking for an overlap and
the only use of this function is to reroute the arrows
to avoid running over commits, this more literal name
should be clearer.
2023-10-31 17:24:13 +00:00
Guy Pursey dba7197fc6 GitGraph: simplified overlapping check fn 2023-10-31 17:24:13 +00:00
Guy Pursey 461a293d71 GitGraph: refactored overlapping fn for efficiency/performance
On previous rewrite, I had created new functions within the
overlapping functions but these were being recreated on each
iteration of Object.some(). I moved them outside this for
clarity and so they're not recreated each iteration.
2023-10-31 17:24:13 +00:00
Guy Pursey 9f8457d249 GitGraph: Rewrote overlap fn to make main branch exception to rule. 2023-10-31 17:24:13 +00:00
Guy Pursey 8c43d2273f GitGraph: added destination branch check into overlapping fn. 2023-10-31 17:24:13 +00:00
Guy Pursey 9469f759a9 GitGraph: Moved overlapping commit arrow colour inside conditional 2023-10-31 17:24:13 +00:00
Guy Pursey 4787bb07df GitGraph: corrected object method in hasOverlappingCommits 2023-10-31 17:24:13 +00:00
Guy Pursey 33050e1812 GitGraph: Update variable names in drawArrow fn 2023-10-31 17:24:13 +00:00
Guy Pursey 6dc8e58b47 GitGraph: Refactor hasOverlappingCommits function
Changed argument names from commit1 and commit2 to
commitA and commitB respectively to prevent confusion
with seq number values.

Replaced Array filter method with array some method
so that as soon as one overlap is found, function is
finished.

Used Object.entries instead of Object.keys to reduce
number of variables needed and make function easier
to read.
2023-10-31 17:24:13 +00:00
Guy Pursey d9daf19055 GitGraph: Correct commit variable in overlap check.
Originally, the function was checking if any commits were on the
same branch as `commit2`, the destination commit.

However, in order to avoid a conflict, we should only need to
check whether any commits are on the same branch as `commit 1`.

Updated and moved commenting as well.
2023-10-31 17:24:13 +00:00
Guy Pursey f42cec282a GitGraph: Add check for direction of merge arrow to determine colour. 2023-10-31 17:24:13 +00:00
Aakansha Doshi fff25e7e2c add spec 2023-10-31 19:39:43 +05:30
Aakansha Doshi 2a8323f951
Merge branch 'develop' into bug/4983-fix-getMessageAPI 2023-10-31 18:35:25 +05:30
Aakansha Doshi 390e22cc0b fix: getMessageAPI so it considers entity codes 2023-10-31 18:28:45 +05:30
Sebastian Holmqvist a3ee21d7fc fix(tooltip): change position of tooltip to not cover node
Position the tooltip centered, just below the node being hovered.

Update packages/mermaid/src/diagrams/flowchart/flowDb.js

Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-10-31 12:51:47 +01:00
Sebastian Holmqvist 8f2a5064cb fix(tooltip): remove redundant scroll offset
window.scrollY is already account for which means document.body.scrollTop incorrectly offsets the tooltip vertically.
The same is not true for horizontal position.
2023-10-31 08:38:19 +01:00
Sidharth Vinod 77667b94d3
Merge pull request #4975 from mermaid-js/add-docusaurus
Docs: add Docusaurus to "Integrations - Community" page
2023-10-31 06:42:09 +00:00
renovate[bot] e8a04faa36
chore(deps): update all patch dependencies 2023-10-31 06:13:41 +00:00
Faris 61fb9e50d3
Merge branch 'develop' into fix/1294_exhaustive-clear-sequenceDb-variables 2023-10-30 13:39:09 +03:00
Alex Titarenko e98aa55577 docs: upate the list of tools with native support of mermaid 2023-10-27 18:58:30 -07:00
Knut Sveidqvist 03c59adaed Parsing of block arrows with directions, creating a dedicated new node for this. 2023-10-26 22:02:16 +02:00
Knut Sveidqvist 7198fe55a9 Parsing of block arrows with directions, creating a dedicated new node for this. 2023-10-26 22:01:44 +02:00
Harshit Anand | Frontend Developer | ReactJS 3394541b41
Merge branch 'develop' into bug/4716_fix_target_blank_getting_sanitized 2023-10-26 14:57:15 +05:30
Sahil Nagpure 36a727d44e
Merge branch 'develop' into patch-1 2023-10-26 11:44:46 +05:30
Harshit Anand 06d2ba8398 fix: added two unit tests to check for the secured anchor tag 2023-10-25 21:17:53 +05:30
Knut Sveidqvist 29942c04dc Updated mermaid version 2023-10-25 11:07:12 +02:00
Knut Sveidqvist fc28c1da63 Limiting the number of edges that are allowed in the flowchart 2023-10-25 11:06:37 +02:00
Sahil Nagpure 9637b0c187
Merge branch 'develop' into patch-1 2023-10-25 12:24:03 +05:30
RounakJoshi09 122e5929bc
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-10-23 20:40:02 +05:30
Harshit Anand 7960f94eba fix: shifted dompurify.addhook functions inside removescript 2023-10-23 16:09:51 +05:30
Harshit Anand b36cdaceca Merge branch 'develop' of https://github.com/mermaid-js/mermaid into bug/4716_fix_target_blank_getting_sanitized 2023-10-23 12:24:22 +05:30
Harshit Anand 3b8c48dd26 fix: added type Element to the node used in callback in the dompurify.addhook 2023-10-23 12:23:08 +05:30
steph bc247b1d46 add docusaurus to community integrations 2023-10-22 14:18:41 -07:00
RounakJoshi09 f92ad6307e
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-10-22 19:34:05 +05:30
Sahil Nagpure f31cddee0c
Update classDiagram.md
Fixed typo.
2023-10-22 12:27:55 +05:30
Remco Haszing ab9b9abdf9
Replace rehype-mermaidjs with rehype-mermaid
The package was renamed.
2023-10-20 16:55:01 +02:00
Knut Sveidqvist d32c18a43c Merge branch 'master' into develop 2023-10-20 14:33:07 +02:00
Knut Sveidqvist b70959daa7 Version 10.5.1 2023-10-20 14:30:52 +02:00
Per Brolin aaf0b474d4 Increased version to 10.5.1 2023-10-20 14:18:07 +02:00
Knut Sveidqvist f3f25c7874 #3358 Adding support for space blocks and different shapes 2023-10-20 12:30:25 +02:00
Knut Sveidqvist 61bc293a95 #4967 Reverting optimimization that breaks subgraphs 2023-10-20 11:12:56 +02:00
Steph 87675e687e add latest blog post 2023-10-19 11:36:46 -07:00
RounakJoshi09 827808dca3
Merge Conflict Resolved 2023-10-19 10:33:32 +05:30
RounakJoshi09 d65191f6c1
Merge branch 'develop' into bug/#4497_unable-to-cherrypick-merge-commit 2023-10-19 10:26:25 +05:30
RounakJoshi09 6eee8973ba Merge branch 'bug/#4497_unable-to-cherrypick-merge-commit' of https://github.com/RounakJoshi09/mermaid into bug/#4497_unable-to-cherrypick-merge-commit 2023-10-18 21:08:14 +05:30
RounakJoshi09 d8500f9e08 Suggested Changes FOR PR DONE 2023-10-18 20:59:55 +05:30
Anthony Damico 31ec3d1496
Update questions-and-suggestions.md 2023-10-17 10:30:29 -04:00
renovate[bot] e4350f80fe
chore(deps): update all patch dependencies 2023-10-16 19:52:01 +00:00
Faris 3128ba73a0
chore(sequence): Update packages/mermaid/src/docs/syntax/sequenceDiagram.md
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
2023-10-16 19:36:44 +03:00