Commit Graph

255 Commits

Author SHA1 Message Date
Reda Al Sulais 0abb4f8c6f Merge branch develop into next 2023-09-06 02:16:25 +03:00
Sidharth Vinod 88d1885cdc
Merge branch 'develop' into fix/4775_allow-leading-underscore-entity-name 2023-09-05 11:04:52 +00:00
Subhash Halder c3a9bb9a23 Fixed more edge cases 2023-09-03 20:48:10 +05:30
Subhash Halder cc5190c1ba Fix some space management issue 2023-09-03 13:38:47 +05:30
Sidharth Vinod 697ac18872
Merge branch 'develop' into next
* develop:
  chore: Align with convention
  add additional test case
  added test case
  add sanitize text
  Update docs
  modifications to generic parser
  improvements to parseGenericTypes
  Update packages/mermaid/src/diagrams/class/svgDraw.js
  return comment
  add tsdoc comments
  update tests
  apply suggesitons
  Update packages/mermaid/src/diagrams/class/classTypes.ts
  Update packages/mermaid/src/diagrams/class/classTypes.ts
  update tests and db name
  Fix tests
  spec changes
  update classes to handle , in generic
  Update and add tests
  Create new type for member handling
2023-09-03 12:27:44 +05:30
Subhash Halder 060d961f39 Fixed directive related issue 2023-09-02 21:15:21 +05:30
Subhash Halder fc9ff6c6f3 Added documentations 2023-09-02 20:48:11 +05:30
Subhash Halder e0418eb661 Made the axis title optional 2023-09-02 18:08:59 +05:30
Subhash Halder f57b5271df Merge branch 'develop' into feature/4269_add_xychart 2023-09-02 16:02:27 +05:30
Subhash Halder b2669aaca9 Fixed some space management issue 2023-09-01 21:27:10 +05:30
Tom PERRILLAT-COLLOMB 264f7920f0 fix(er): allow underscore as leading char 2023-08-27 00:15:50 +02:00
Justin Greywolf b513169f12 Merge branch 'develop' into UpdateClassMemberHandling 2023-08-26 14:01:42 -07:00
Sidharth Vinod 9bcfba6620
Merge branch 'develop' into next
* develop:
  fix(er): bug if relationship is declared first
  test(er): add cypress test on entity name alias
  feat(er): use square brackets to add aliases
  docs(er): add release version for entity name aliases
  feat(er): add entity name alias
2023-08-26 23:09:05 +05:30
Justin Greywolf 8e64995047 Merge branch 'develop' into UpdateClassMemberHandling 2023-08-25 10:58:49 -07:00
Sidharth Vinod 866909b803
Merge branch 'develop' into next
* develop:
  chore: Update editor.bash to build latest version
  chore: Build after clone
  chore: Force install npm to avoid cache.
  fix: live editor exists error
  chore: Add netlify.toml
  chore: Update editor script
  chore: Add live editor build script for previews
  docs: Fix sankey demo
  feat(sankey): Show values (#4674)
2023-08-25 10:07:46 +05:30
Sidharth Vinod a4ba192aad
Merge branch 'develop' into feat/4746_add_er_alias 2023-08-25 03:06:47 +00:00
Tom PERRILLAT-COLLOMB a7ae1b6890 feat(er): use square brackets to add aliases 2023-08-22 11:05:09 +02:00
Sidharth Vinod ce6992ea9b
docs: Fix sankey demo 2023-08-22 14:06:46 +05:30
Sidharth Vinod f946c3da06
Merge branch 'develop' into next
* develop:
  chore: Remove circular dependency
  Update docs
  docs: Add frontmatter config demos
  docs: Add frontmatter config docs
  fix: XSS vulnerability
  chore: Minor typo fixes
  chore: Add test with both frontmatter and directive
  Update docs
  feat: Add support for config in frontmatter
  chore: Fix type in assignWithDepth
  refactor: Move `sanitizeDirective` into `addDirective`
  refactor: Rename and cleanup `directiveSanitizer`
2023-08-22 13:58:24 +05:30
Tom PERRILLAT-COLLOMB e5315f2933 feat(er): add entity name alias 2023-08-21 23:33:42 +02:00
Sidharth Vinod d21eb29672
Merge branch 'feature/frontmatterConfig' into feature/4674_sankeyValues
* feature/frontmatterConfig:
  Update docs
  docs: Add frontmatter config demos
  docs: Add frontmatter config docs
  fix: XSS vulnerability
  chore: Minor typo fixes
  chore: Add test with both frontmatter and directive
  Update docs
  feat: Add support for config in frontmatter
  deps: Update unocss and webpack to address vulnerability.
  chore: Fix type in assignWithDepth
  refactor: Move `sanitizeDirective` into `addDirective`
  refactor: Rename and cleanup `directiveSanitizer`
  chore(deps): update all patch dependencies
  ci(release-drafter): add more release notes categories
2023-08-21 20:23:08 +05:30
Sidharth Vinod 2b9dc0ea80
docs: Add frontmatter config demos 2023-08-21 15:02:29 +05:30
Sidharth Vinod 4d84f1cd71
feat(sankey): Show values (#4674) 2023-08-20 21:18:09 +05:30
Sidharth Vinod fd731c5ccd
Merge branch 'develop' into next
* develop: (56 commits)
  chore: Add comments on redirectMaps
  remove `chart` from `pie.spec.ts` description
  Update docs
  change `defaultConfig` type to `RequiredDeep` and use it in `pieDb`
  use `DiagramStylesProvider` in `pieStyles.ts`
  remove `setConfig` and `resetConfig` in pie
  add `structuredClone` in pie `getConfig`
  cleanAndMerge pieConfig
  remove cleanClone
  feat: Add cleanAndMerge and tests
  chore: Rename utils.spec.ts
  move db assignment from `beforeEach` to `beforeAll`
  create `structuredCleanClone` helper function
  add more types to pieRenderer
  add `resetConfig` to `clear` in pieDb
  rename `reset` to `resetConfig`
  use `structedClone` in `pieDb`
  remove `PieDiagramConfig` and import generated one
  remove unnecessary lines in pie files
  remove unused `HTML` import in pieRenderer
  ...
2023-08-20 20:28:52 +05:30
Subhash Halder 5a64cec9ca Merge branch 'develop' into feature/4269_add_xychart 2023-08-20 18:09:51 +05:30
Subhash Halder 6c2bd33f36 Addressed all requested changes 2023-08-20 17:51:53 +05:30
Sidharth Vinod 718d52a72c
chore: Move liveReload code into script. 2023-08-17 14:30:47 +05:30
Justin Greywolf 9a9abac5b1 Merge branch 'develop' into UpdateClassMemberHandling 2023-08-15 10:08:42 -07:00
Justin Greywolf 6ed0c9bc36 update tests 2023-08-15 10:02:31 -07:00
Reda Al Sulais 0d179c501e
Merge branch 'develop' into standardized-pie-definitions 2023-08-15 14:01:09 +03:00
Sidharth Vinod fc99d9be41
chore: Add build times to live reload 2023-08-14 00:55:41 +05:30
Sidharth Vinod 9fb9bed806
chore: Add live-reload 2023-08-14 00:55:34 +05:30
Sidharth Vinod da7ff777d1
chore: Add esbuild (Breaking change)
mermaid.min.js and mermaid.js will now be IIFE instead of UMD.
2023-08-14 00:52:45 +05:30
Sidharth Vinod 06e4a6398c
docs: Add development example page. 2023-08-09 14:59:50 +05:30
Reda Al Sulais 7d69ad2d5b Merge remote-tracking branch upstream/develop into standardized-pie-definitions 2023-08-02 15:54:23 +03:00
Subhash Halder 6e98759ee7 Improve plot color selection 2023-07-21 22:42:46 +05:30
Subhash Halder 958f63ecd2 Improved parsing to work for minimal configuration possible. 2023-07-19 20:49:04 +05:30
Subhash Halder 355263a4fb Fixed some issue related to rendering and space management 2023-07-19 20:45:44 +05:30
Subhash Halder 597f7a8e87 Rendering the chart with all the property from chart config 2023-07-19 20:45:44 +05:30
Subhash Halder ebd329149b Able to draw till axis from chart configuration
- there is some issue with drawing the plot from chart data
2023-07-19 20:45:44 +05:30
Subhash Halder 93697b74f4 Generated the base architecture 2023-07-19 20:44:21 +05:30
Subhash Halder 14e290bf1a Added base structure for xychart 2023-07-19 20:44:21 +05:30
Nikolay Rozhkov e251baa61c Started layout and rendering 2023-07-11 02:51:10 +03:00
Nikolay Rozhkov d165e8a642 Started block diag db development 2023-07-10 23:33:11 +03:00
NicolasNewman c2f60568cf chore(katex): lint-fix 2023-07-08 11:49:41 +09:00
Nicolas Newman 6518e1300f
Update sequence.html 2023-07-08 11:39:37 +09:00
NicolasNewman f15e8c9edb Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-07-08 10:45:36 +09:00
Justin Greywolf e29d2b29a9 apply suggesitons 2023-07-03 09:40:25 -07:00
Justin Greywolf 1d391d9408 Merge branch 'develop' into UpdateClassMemberHandling 2023-07-02 17:45:30 -07:00
Nikolay Rozhkov 8ed2ee30ec Sankey alignment tests 2023-07-02 02:15:23 +03:00
Nikolay Rozhkov 084b765e9f Added tests for colors and fully setup cypress in Docker 2023-07-02 01:10:06 +03:00
Nikolay Rozhkov 9177350a39 Fixed double quotes, docs, demo and added more examples to run script 2023-06-29 20:16:25 +03:00
Justin Greywolf 6abf0f1d19 Merge branch 'develop' into UpdateClassMemberHandling 2023-06-29 08:55:37 -07:00
Nikolay Rozhkov e7ad294283 Merge branch 'develop' into feature/4492_sankey-diagrams 2023-06-29 16:50:38 +03:00
Justin Greywolf 3718274a1c Merge branch 'develop' into UpdateClassMemberHandling 2023-06-28 08:26:33 -07:00
Nikolay Rozhkov a38733346f Removed unnecessary configs and extra code 2023-06-25 21:56:14 +03:00
Tom PERRILLAT-COLLOMB 61e5dbeaa6 fix(class): keep members in namespace classes 2023-06-25 00:15:35 +02:00
Nikolay Rozhkov b23e86aea3 Added options for coloring 2023-06-25 00:22:36 +03:00
Nikolay Rozhkov 1674f12b62 Renamed sankey to sankey-beta 2023-06-24 23:11:54 +03:00
NicolasNewman f979ced49d refactor(katex): revision changes 2023-06-24 16:56:42 +09:00
NicolasNewman 8b42302f9b Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-06-23 16:57:30 +09:00
Nikolay Rozhkov 104aece46e Cleanup sankey diagrams according code review 2023-06-22 17:35:46 +03:00
Nikolay Rozhkov 9a29066426 Ensure that sankey keyword does not intefere with csv 2023-06-22 16:53:44 +03:00
Nikolay Rozhkov 272615e580 Fixed tests and added node alignment 2023-06-21 03:54:55 +03:00
Nikolay Rozhkov 362648b74b Trim trailing spaces 2023-06-21 01:37:06 +03:00
Nikolay Rozhkov a2c055ba5d CSV syntax implementation 2023-06-21 01:29:34 +03:00
Yokozuna59 906d909d87 Merge branch develop into standardized-pie-definitions 2023-06-19 13:39:41 +03:00
Nikolay Rozhkov fd3ffdc22a Prettify 2023-06-19 04:34:41 +03:00
Nikolay Rozhkov 6722ac7540 Multiple improvements on syntax
Syntax has been simplified
Removed extra initial states
Removed unused groups
Nodes can be wrapped in double qotes
Updated demo page
2023-06-19 04:02:40 +03:00
Nikolay Rozhkov 9dbb9872bc Fix linters 2023-06-19 01:05:33 +03:00
Nikolay Rozhkov 19f858b73b Fixed nodes duplicates 2023-06-19 01:05:33 +03:00
Nikolay Rozhkov afaf87e414 At last something is working 2023-06-19 01:05:20 +03:00
Nikolay Rozhkov 40f7105ae4 Started renderer development 2023-06-19 01:05:20 +03:00
Nikolay Rozhkov c874d74faf Some fixes to docker and demos 2023-06-19 01:02:50 +03:00
Sidharth Vinod bfa76af434
Merge branch 'develop' into pr/tomperr/3923
* develop: (783 commits)
  chore(deps): update all minor dependencies
  chore: Run codecov based on E2E test status
  change REAMDME.md coverage from coveralls into codecov
  Add codecov.yaml
  Upload E2E
  set normal mode for vitest coverage
  Fix path name
  Add codecov to unit tests
  Add codecov to E2E
  chore: Add coverage scripts
  chore: add excludes
  chore: update deps
  Merge coverages
  Add coverage paths
  Rebuild
  chore: update pnpm
  Add coverage for E2E tests
  rename plugin variable into info in infoDetector.ts
  remove cypress/platform/index.html
  update pnpm-lock.yaml
  ...
2023-06-18 12:45:58 +05:30
Yokozuna59 afea3e8f37 clean up demos/pie.html 2023-06-16 23:03:42 +03:00
Yokozuna59 896a8a23ca indent info.html files 2023-06-15 23:51:03 +03:00
Yokozuna59 35e81f3fd4 format and add theme to cypress info.html 2023-06-15 02:56:29 +03:00
Yokozuna59 9deae27c82 add messing timeline and info demoes links 2023-06-15 02:30:51 +03:00
Justin Greywolf 164605b442 update classes to handle , in generic 2023-06-12 11:31:29 -07:00
NicolasNewman b193013c84 fix(katex): resolved removed class from demo during merging 2023-05-31 17:39:34 +09:00
NicolasNewman 0605b85d99 Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-05-31 17:27:42 +09:00
Sidharth Vinod 97be4983f0
Merge branch 'develop' into sidv/zenuml
* develop: (66 commits)
  Update docs
  Update docs
  Improve the wording of security level values
  Added quadrantChart to the side bar
  Added e2e test cases with some fixes
  Added documentation for the quadrantChart
  Restructured the build function and addressed more review comment
  Fixed some parser issue and added test cases for the parser
  Fixed review comment
  Update docs
  Converted files to typescript and added proper types
  Fix blog linting
  Debug fetch-contributors
  Fix lockfile
  Revert "Replace esno & ts-node with tsx"
  [draft] Added support for quadrant chart
  Fix lockfile
  Fix build
  Update pnpm-lock
  Replace esno & ts-node with tsx
  ...
2023-05-16 23:26:35 +05:30
Subhash Halder 1253733962 Fixed review comment 2023-05-11 12:19:59 +05:30
Subhash Halder 9a7dbab5ed Converted files to typescript and added proper types 2023-05-09 20:17:04 +05:30
Subhash Halder 272ccded93 [draft] Added support for quadrant chart 2023-05-08 19:23:58 +05:30
NicolasNewman e7a1d8390c Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-05-06 17:32:15 +09:00
NicolasNewman 4202488da0 feat(katex): added KaTeX support to sequence diagrams 2023-05-06 17:19:31 +09:00
Justin Greywolf 06fdb95389 Allow overlapping notes 2023-05-03 22:15:59 -07:00
Sidharth Vinod 12ed81855a
Add zenuml 2023-04-23 00:34:59 +05:30
raghvendra ff3104ad9c pie diagram mermaid module import fix 2023-04-19 11:25:32 +05:30
NicolasNewman f3b939e03a Merge branch 'develop' of https://github.com/NicolasNewman/mermaid into feature/2776_katex_math 2023-04-13 09:36:48 +09:00
Knut Sveidqvist 057c9e4b81
Merge branch 'develop' into feature/1618_repeating_tasks 2023-03-31 08:42:10 +02:00
Sidharth Vinod 46ab6f46f2
fix(#4256): Keep error diagram on screen 2023-03-30 23:09:46 +05:30
Jeremy Funk ba1c5dc6c7 Change to using display mode yaml 2023-03-25 01:56:50 +01:00
Jeremy Funk 8c0550b2b7 Code refactoring, add e2e test 2023-03-23 23:45:59 +01:00
Jeremy Funk 45c0c5fee0 Bugfix 2023-03-23 22:54:58 +01:00
Jeremy Funk a535fe1679 Bugfixes, refactor, add compact 2023-03-23 22:38:04 +01:00
Sidharth Vinod 4e4f2fcfc5
Merge branch 'master' into develop
* master:
  Updated import of cytoscape for consistent behavior
  v9.4.3
  fix: dayjs import extension
  9.4.2
  Fix mindmap demo
  9.4.2-rc.2
  chore: Rename diagram-definitions with specific names
  Use cytoscape esm
  Revert "chore: Defer elk loading"
  Revert "Split cytoscape"
  test(gantt): test daylight savings in ganttdb
  refactor(deps): replace `moment` with `dayjs`
  fix(E2E): Add cors package
  fix Server
  Fix lockfile
  Remove Readme
2023-03-08 00:13:54 +05:30
Sidharth Vinod 328f3968d1
Merge branch 'release/9.4.2'
* release/9.4.2:
  9.4.2
  Fix mindmap demo
  9.4.2-rc.2
  chore: Rename diagram-definitions with specific names
  Use cytoscape esm
  Revert "chore: Defer elk loading"
  Revert "Split cytoscape"
  test(gantt): test daylight savings in ganttdb
  refactor(deps): replace `moment` with `dayjs`
  fix(E2E): Add cors package
  fix Server
  Fix lockfile
  Remove Readme
2023-03-07 21:33:23 +05:30