mirrors
/
mermaid
mirror of https://github.com/mermaid-js/mermaid.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,431 Commits 158 Branches 138 Tags 346 MiB
Commit Graph

8431 Commits

Author SHA1 Message Date
Sidharth Vinod 651bc980d2
Merge branch 'sidv/splitUnicode' of https://github.com/mermaid-js/mermaid into sidv/splitUnicode 
* 'sidv/splitUnicode' of https://github.com/mermaid-js/mermaid:
  Update packages/mermaid/src/rendering-util/types.d.ts
 2023-07-25 20:10:17 +05:30
Sidharth Vinod 841ae15fb5
Add comments 2023-07-25 20:10:05 +05:30
Sidharth Vinod a7d40724b4
Update packages/mermaid/src/rendering-util/types.d.ts 
Co-authored-by: Alois Klink <alois@aloisklink.com>
 2023-07-25 19:13:54 +05:30
Sidharth Vinod 409dedb3ef
Remove redundant test. 
Already checked in lint.
 2023-07-25 19:08:40 +05:30
sidharthv96 4ea1227e29 Update docs 2023-07-25 13:33:37 +00:00
Sidharth Vinod 68305fea9e
Fix lint 2023-07-25 18:56:58 +05:30
Sidharth Vinod ea192ccf4d
Merge branch 'develop' into sidv/splitUnicode 2023-07-25 18:55:34 +05:30
Sidharth Vinod 509a580f9d
Merge pull request #4396 from gjtorikian/patch-2 
Fix a typo
 2023-07-25 18:54:56 +05:30
Sidharth Vinod db9051b03e
Merge pull request #4660 from Incognito/patch-1 
Docs: Corrects name of C4 link
 2023-07-25 18:53:14 +05:30
Sidharth Vinod 91ae9a2901
Merge branch 'master' into pr/Incognito/4660 
* master:
  update latest news section
 2023-07-25 18:41:26 +05:30
Sidharth Vinod 27d98728a6
chore: Rename C4C to C4 2023-07-25 17:42:12 +05:30
Knut Sveidqvist cfbd38d5fa Merge branch 'develop' into release/10.4.0 2023-07-25 13:02:43 +02:00
Knut Sveidqvist c67b4178bd
Merge pull request #4667 from mermaid-js/develop 
2023-07-25
 2023-07-25 11:56:58 +02:00
Sidharth Vinod 9ea4b1388f
Merge pull request #4666 from kgilbert78/docs/add-typora-to-integrations-list 
added Typora to integrations list
 2023-07-25 07:57:14 +00:00
Sidharth Vinod 934735372f
Merge pull request #4655 from mermaid-js/update-latest-news 
Docs: update Latest News section
 2023-07-25 13:26:31 +05:30
Steph 28bb0df6c8 update latest news section 2023-07-24 22:15:22 -07:00
Ibrahim Wassouf 20cd685ae3 Allow escaped quotations in strings 2023-07-24 22:43:55 -03:00
Ibrahim Wassouf 47c100809b Add unit tests for all cases of TEXT and STR combinations 2023-07-24 21:46:28 -03:00
Ibrahim Wassouf 651274bc6f Only allow quotes to wrap entire string 2023-07-24 21:23:21 -03:00
Ibrahim Wassouf 4cfbd0d380 Remove unused definitions 2023-07-24 21:05:17 -03:00
Ibrahim Wassouf 45d92769aa Change rest of grammar statements to use variable name instead of position 2023-07-24 21:04:36 -03:00
kgilbert78 3e3e784fd9 added Typora to integrations list 2023-07-24 13:24:33 -04:00
Sidharth Vinod 1f3902e598
Merge pull request #4662 from mermaid-js/renovate/patch-all-patch 
chore(deps): update all patch dependencies (patch)
 2023-07-24 07:01:06 +00:00
Sidharth Vinod 3ef02ee66f
Merge pull request #4663 from mermaid-js/renovate/all-minor 
chore(deps): update all minor dependencies (minor)
 2023-07-24 07:00:51 +00:00
Ibrahim Wassouf 474e0b9c82 Refactor vertex grammars to use name values instead of position in production 2023-07-23 21:54:42 -03:00
Ibrahim Wassouf 087738df78 Refactor statement grammars to use name values instead of positions in production 2023-07-23 21:39:21 -03:00
Ibrahim Wassouf fa8e02721a Refactor directive grammar to use name instead of position in production 2023-07-23 21:32:52 -03:00
Ibrahim Wassouf 4b9773a272 Refactor token precedence that concern vertex text states 2023-07-23 21:25:19 -03:00
renovate[bot] 45400240d4
chore(deps): update all minor dependencies 2023-07-24 00:19:12 +00:00
renovate[bot] e4699ef02a
chore(deps): update all patch dependencies 2023-07-24 00:18:49 +00:00
Brian Graham 60cf043c3d
Corrects name of C4 link 2023-07-23 08:27:54 +02:00
Ibrahim Wassouf fd88b424b4 Add unit test for vertex and edge having both strings and text 2023-07-22 15:09:24 -03:00
Ibrahim Wassouf 3ab0e9998d Remove href state and give call higher precedence 
Similar to what was done in the class diagram parser,
this will allow string tokens to appear in any state.
This is especially helpful, because it will simplify the
code and any future refactoring
 2023-07-22 14:39:45 -03:00
Ibrahim Wassouf f48a9c8696 Merge branch 'develop' into bug/4645_graph_node_containing_keyword 2023-07-21 21:12:16 -03:00
Ibrahim Wassouf eea0ea5e07 Add unit tests for node id strings with keywords 2023-07-21 21:10:37 -03:00
Ibrahim Wassouf 20011c6882 Add unit tests for edge text 2023-07-21 20:44:37 -03:00
Ibrahim Wassouf 0cc8f89115 Add edgeText states 2023-07-21 19:40:04 -03:00
Ibrahim Wassouf 8ff06e88ce Correct expected error message in unit test 2023-07-21 18:27:20 -03:00
Ibrahim Wassouf 3fa3ed7b18 Remove grammar and unit test that expects HEX token 
This was never really used and had many things wrong with it.
I believe that if a hex was provided in the diagram specification,
the alphanum grammar would break it up into a BRKT and NUM token
and use the first line with the addVertex() function.

Second, the styleLink grammar provides the exact same functionality
with the linkStyle keyword.

Third, updateLink() expects an array of nums, not a hex digit.

Fourth, no documentation is provided on this grammar statement existing.
Fifth, the unit test does not work in version 10.2.4
 2023-07-21 18:15:43 -03:00
Ibrahim Wassouf 0a4e5f5f6b Slightly alter unit test node idString 2023-07-21 18:15:27 -03:00
Ibrahim Wassouf 0d7cc748b8 Replace alphanum with idString where appropriate 2023-07-21 17:33:33 -03:00
Nikolay Rozhkov a3c645c3eb
Merge pull request #4639 from mastersibin/feature/4451-vertical-branches-in-gitgraph 
feat | Vertical branches in Git Diagram
 2023-07-21 16:30:06 +00:00
Sibin Thomas bb7b3491e5
Merge branch 'develop' into feature/4451-vertical-branches-in-gitgraph 2023-07-21 14:00:01 +05:30
Ibrahim Wassouf 69c91ae5ed Add unit test for edge case with lean_right/left vertices 2023-07-21 00:06:18 -03:00
Ibrahim Wassouf 7adb1bccb3 Replace alphanum with NODE_STRING for most usecases 
What this allows is for idStrings that are separated by
dashes or underscores to be considered one whole string
rather than a bunch of tokens mixed together.

This is necessary for examples such as a-node-graph[text].
Now, the last part of the idString 'graph' will be read as
part of the NODE_STRING token rather than attempting to add
a GRAPH token to the idString.
 2023-07-20 23:49:43 -03:00
Alois Klink 38f2ff0bca
Merge pull request #4652 from mermaid-js/dependabot/npm_and_yarn/word-wrap-1.2.4 
build(deps-dev): bump word-wrap from 1.2.3 to 1.2.4
 2023-07-20 22:05:59 +00:00
dependabot[bot] cd0da4e060
build(deps-dev): bump word-wrap from 1.2.3 to 1.2.4 
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.4.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.4)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-20 17:44:05 +00:00
Sibin Thomas df89b92e2c ran docs:build for documentation 2023-07-20 21:45:47 +05:30
Ibrahim Wassouf 5b987dee93 Put parser in stable state 2023-07-20 13:05:18 -03:00
Sibin Thomas 114f918417
Merge branch 'develop' into feature/4451-vertical-branches-in-gitgraph 2023-07-20 21:29:56 +05:30