marcel/mermaid
1
0
Fork 0
mirror of https://github.com/mermaid-js/mermaid.git synced 2025-09-21 08:19:43 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,244 Commits 209 Branches 187 Tags
13d4a238d4359e288b32883f74458c56cbb9480c
Commit Graph

12244 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ashish Jain
13d4a238d4 Merge pull request #15 from Mermaid-Chart/ci/disable-argos-in-ci 
ci: disable Argos in CI
 2024-11-07 14:14:45 +01:00
Alois Klink
f550f17dc0 ci: disable Argos in CI 
Argos only works in open-source repos, it doesn't work for this private
repo.
 2024-11-07 21:49:01 +09:00
Alois Klink
191cd27b2b Merge pull request #14 from Mermaid-Chart/merge-fix/make-parse-error-on-invalid-shape 
Merge https://github.com/mermaid-js/mermaid/pull/6002
 2024-11-07 12:40:51 +00:00
Ashish Jain
4ad85974c6 Merge pull request #11 from Mermaid-Chart/merge-refactor/improving-rendering-shape-types 
Merge https://github.com/mermaid-js/mermaid/pull/5974
 2024-11-07 13:34:51 +01:00
Alois Klink
91ed9bb9c2 Merge commit '848be3d1297b833c4e8b2e25fabafec4d7c4db02' into merge-fix/make-parse-error-on-invalid-shape 
Pulls PR https://github.com/mermaid-js/mermaid/pull/6002 into Alana.

Fixes a semantic merge conflict in
- `docs/config/setup/interfaces/mermaid.LayoutData.md`

See: https://github.com/mermaid-js/mermaid/pull/6002
 2024-10-30 22:31:31 +09:00
autofix-ci[bot]
848be3d129 [autofix.ci] apply automated fixes 2024-10-28 14:33:47 +00:00
Alois Klink
5fabd414fb fix: error mermaid.parse on invalid shapes 
Currently, invalid shapes cause an error when rendering, but not when
parsing. This confuses the Mermaid Live Editor, e.g. by not showing the
error message.

Instead, I've added an `isValidShape()` that validates if the shape is
valid at parse time. This only checks shapes using the new extended
shapes syntax. Currenlty, using `A(-this is an ellipse node-)` is broken
(see #5976) and also causes an invalid shape error at render time, but
I've ignored it in this PR, so it will continue pass at parse-time
(we have unit tests checking ellipse parsing).

See: https://github.com/mermaid-js/mermaid/issues/5976
 2024-10-28 23:17:13 +09:00
Alois Klink
17e2f9e0d4 refactor: fix addVertex type parameter 
I went through
`packages/mermaid/src/diagrams/flowchart/parser/flow.jison` and found
every possible value this `type` parameter could be.
 2024-10-28 23:17:13 +09:00
Alois Klink
7fa8b35bdc refactor: convert if-statements to switch..case 2024-10-28 23:17:13 +09:00
Sidharth Vinod
e765007b21 Merge pull request #5974 from aloisklink/refactor/improving-rendering-shape-types 
refactor: TypeScript improvements to `packages/mermaid/src/rendering-util/rendering-elements`
 2024-10-28 18:22:23 +05:30
Sidharth Vinod
b5cd101d86 Merge branch 'develop' into refactor/improving-rendering-shape-types 2024-10-28 18:11:41 +05:30
Alois Klink
93239b5f34 Merge commit 'f8746bee0454b01378726d04f9c65bbc3974eb3a' into merge-refactor/improving-rendering-shape-types 
See https://github.com/mermaid-js/mermaid/pull/5974

Conflicts:
	docs/config/setup/interfaces/mermaid.RenderResult.md
	packages/mermaid/src/rendering-util/rendering-elements/shapes/util.ts
 2024-10-28 21:03:19 +09:00
Ashish Jain
807820f199 Update alana version to v11.3.0-b.4 2024-10-23 10:47:08 +02:00
Knut Sveidqvist
030aeb8c88 Merge pull request #12 from Mermaid-Chart/subgraph-NaN-fix 
fix NaN error while adding subgraph
 2024-10-22 16:58:18 +02:00
Feroz Mujawar
0d1212e463 fix NaN error while adding subgraph 2024-10-22 19:42:27 +05:30
Alois Klink
f8746bee04 refactor: move MaybePromise type to src/types.ts 
Suggested-by: https://github.com/mermaid-js/mermaid/pull/5974#discussion_r1810562136
Co-authored-by: Sidharth Vinod <sidharthv96@gmail.com>
 2024-10-22 21:49:23 +09:00
Alois Klink
bb97fdbd1e refactor: use parseFontSize() 
Handle `NaN` values by using `parseFontSize()`.

Suggested-by: https://github.com/mermaid-js/mermaid/pull/5974#discussion_r1810570967
 2024-10-22 21:49:02 +09:00
Alois Klink
6cc0132e0a refactor(elk): add LabelData type for layout-elk 
I don't know what exactly the type does or is for, but I've tried to
type it to what it seems to be.
 2024-10-21 22:23:36 +09:00
Alois Klink
4bc70b7325 refactor: use more standard types 
See: https://github.com/mermaid-js/mermaid/pull/5974#discussion_r1806473749
See: https://github.com/mermaid-js/mermaid/pull/5974#discussion_r1808511738

Co-authored-by: saurabhg772244 <saurabh@mermaidchart.com>
 2024-10-21 22:23:36 +09:00
Alois Klink
d16e46a386 Merge pull request #5972 from gabeidx/zed-mermaid 
docs(ecosystem): Add Zed extension zed-mermaid
 2024-10-18 08:45:30 +00:00
Alois Klink
97820a50c2 Merge pull request #5918 from vorburger/patch-2 
docs: Fix inconsistency in Block Diagram doc example
 2024-10-18 08:42:34 +00:00
Alois Klink
df948bcf2c Merge pull request #5968 from eitsupi/fix-ssg 
docs(integrations): fix listing order
 2024-10-18 08:39:31 +00:00
Alois Klink
cfd097b029 Merge pull request #5967 from yihui/patch-1 
docs: bullet lists should not be code blocks
 2024-10-18 08:37:12 +00:00
Alois Klink
ffc1fef599 Merge pull request #5957 from TomasHubelbauer/patch-1 
Remove extraneous period
 2024-10-18 08:36:31 +00:00
Alois Klink
1e8e4e4b73 Merge branch 'develop' into patch-2 2024-10-18 08:34:07 +00:00
Alois Klink
92d706f677 Merge commit '16a5fc05d65165f02966eb7f33154f136394a534' into merge-refactor/improving-rendering-shape-types 
See https://github.com/mermaid-js/mermaid/pull/5974

There were a lot of merge conflicts!

Conflicts:
	packages/mermaid/src/rendering-util/rendering-elements/shapes/bowTieRect.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/card.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/crossedCircle.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/cylinder.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/drawRect.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/filledCircle.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/flippedTriangle.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/hourglass.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/iconRounded.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/iconSquare.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/imageSquare.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/lightningBolt.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/linedCylinder.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/roundedRect.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/shadedProcess.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/stateStart.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/subroutine.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/taggedRect.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/taggedWaveEdgedRectangle.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/tiltedCylinder.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/triangle.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/util.ts
	packages/mermaid/src/rendering-util/rendering-elements/shapes/windowPane.ts
 2024-10-18 02:49:26 +09:00
autofix-ci[bot]
606ecf8990 [autofix.ci] apply automated fixes 2024-10-17 17:42:10 +00:00
Alois Klink
16a5fc05d6 refactor: remove some any types from render() 
This let's us confirm that the types we're passing to `insertNode()` are
valid.
 2024-10-18 01:51:53 +09:00
Alois Klink
62fd359c0e refactor: convert shapes/util.js to TypeScript 
Convert the
`packages/mermaid/src/rendering-util/rendering-elements/shapes/util.js`
file to TypeScript at:
`packages/mermaid/src/rendering-util/rendering-elements/shapes/util.ts`.
 2024-10-18 01:51:53 +09:00
Alois Klink
b0f4ace3a1 refactor: convert rendering-elements/nodes to TS 
Convert the
`packages/mermaid/src/rendering-util/rendering-elements/nodes.js`
file to TypeScript at
`packages/mermaid/src/rendering-util/rendering-elements/nodes.ts`
 2024-10-18 01:51:53 +09:00
Alois Klink
9afb181d06 refactor: correct shapes types 
All of the shapes in
`packages/mermaid/src/rendering-util/rendering-elements/shapes/` use
`D3.Selection`s as input parameters and as return parameters.

Although, for some reason, passing them to roughjs seems to work?
 2024-10-17 22:29:38 +09:00
Alois Klink
cfe7cce41d refactor: improve types of shapes 
Instead of being a `Record<string, ShapeHandler>`, the type now knows
every key in the variable.
 2024-10-17 18:59:43 +09:00
Ashish Jain
44e7e68e0b Update alana version to v11.3.0-b.3 2024-10-17 10:57:28 +02:00
autofix-ci[bot]
33029c8bd2 [autofix.ci] apply automated fixes 2024-10-17 08:31:48 +00:00
Gabriel Silva
e54d10c706 docs(ecosystem): Add Zed extension zed-mermaid to community integrations 2024-10-17 10:21:15 +02:00
Knut Sveidqvist
7d59a624d7 Updating fontsize to 14px 2024-10-16 18:25:27 +02:00
Ashish Jain
e2dc9e557c Update alana version to v11.3.0-b.2 2024-10-16 14:54:25 +02:00
eitsupi
8aa87c7091 docs(integrations): fix listing order 2024-10-16 21:36:26 +09:00
Knut Sveidqvist
c7adb37a1f Fix for points to rearrange function for issue when using dagre 2024-10-16 13:52:06 +02:00
autofix-ci[bot]
e1024838e8 [autofix.ci] apply automated fixes 2024-10-16 03:52:48 +00:00
Yihui Xie
4cce43f0a1 Bullet lists should not be code blocks 2024-10-15 22:45:38 -05:00
autofix-ci[bot]
c69ab34eac [autofix.ci] apply automated fixes 2024-10-11 20:27:05 +00:00
Tomáš Hübelbauer
7353be3b16 Remove extraneous period 
Other cells in the table do not end with one.
 2024-10-11 22:21:23 +02:00
Sidharth Vinod
742531a2c2 Merge pull request #5951 from gbremond/docs/5949_update-icon-name-for-database 
docs(architecture): update icon name for database in exemple
 2024-10-11 06:12:42 +00:00
g.bremont-ext
2c31a599af docs(architecture): use right icon for database in exemple 2024-10-10 17:00:13 +02:00
autofix-ci[bot]
2655be0bad [autofix.ci] apply automated fixes 2024-10-10 14:21:46 +00:00
g.bremont-ext
4f97c8c70e docs(architecture): update icon name for database in exemple 2024-10-10 16:15:23 +02:00
Ashish Jain
3b5ca1c638 Updated alana version to v11.3.0-b.1 2024-10-10 14:47:01 +02:00
omkarht
ff9fffef90 fixed resizing issue for iconCircle shape 2024-10-10 17:04:37 +05:30
Sidharth Vinod
f85977246c Merge pull request #5945 from mermaid-js/saurabh/doc-update 
Updated doc for image and icon shapes
 2024-10-10 16:46:02 +05:30