Convert Mindmap to TS #5247

sidharthv96 · 2024-01-28T10:36:11Z

📑 Summary

Convert mindmap and related files to TS

📏 Design Decisions

📋 Tasks

Make sure you

📖 have read the contribution guidelines
💻 have added necessary unit/e2e tests.
📓 have added documentation. Make sure MERMAID_RELEASE_VERSION is used for all new features.
🔖 targeted develop branch

netlify · 2024-01-28T10:36:16Z

✅ Deploy Preview for mermaid-js ready!

Name	Link
🔨 Latest commit	`45f4d3d`
🔍 Latest deploy log	https://app.netlify.com/sites/mermaid-js/deploys/65ba17dc8c792900082ccb8d
😎 Deploy Preview	https://deploy-preview-5247--mermaid-js.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

codecov · 2024-01-28T10:38:55Z

Codecov Report

Attention: 16 lines in your changes are missing coverage. Please review.

Comparison is base (7503694) 43.21% compared to head (45f4d3d) 80.08%.
Report is 3 commits behind head on develop.

Additional details and impacted files

@@             Coverage Diff              @@
##           develop    #5247       +/-   ##
============================================
+ Coverage    43.21%   80.08%   +36.87%     
============================================
  Files           23      167      +144     
  Lines         5033    13875     +8842     
  Branches        23      741      +718     
============================================
+ Hits          2175    11112     +8937     
+ Misses        2857     2597      -260     
- Partials         1      166      +165

Flag	Coverage Δ
e2e	`86.07% <78.57%> (?)`
unit	`43.22% <50.00%> (+<0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files	Coverage Δ
...mermaid/src/diagrams/mindmap/mindmap-definition.ts	`100.00% <100.00%> (ø)`
packages/mermaid/src/diagrams/mindmap/styles.ts	`100.00% <100.00%> (ø)`
...ages/mermaid/src/diagrams/sankey/sankeyRenderer.ts	`74.19% <ø> (ø)`
packages/mermaid/src/utils.ts	`64.44% <50.00%> (+22.37%)`	⬆️
packages/mermaid/src/diagrams/mindmap/svgDraw.ts	`81.25% <85.71%> (ø)`
...es/mermaid/src/diagrams/mindmap/mindmapRenderer.ts	`93.10% <77.77%> (ø)`
packages/mermaid/src/diagrams/mindmap/mindmapDb.ts	`75.00% <73.07%> (ø)`

... and 156 files with indirect coverage changes

Yokozuna59

Thanks for doing this refactoring! I have some small notes to be considered.

packages/mermaid/src/diagrams/mindmap/mindmapDb.ts

packages/mermaid/src/config.ts

patches/cytoscape@3.28.1.patch

packages/mermaid/src/diagrams/mindmap/svgDraw.ts

packages/mermaid/src/diagrams/mindmap/mindmapRenderer.ts

Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>

packages/mermaid/src/diagrams/mindmap/styles.ts

packages/mermaid/src/config.ts

packages/mermaid/src/diagrams/mindmap/mindmapDb.ts

packages/mermaid/src/config.ts

Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>

Yokozuna59

LGTM, thanks!

Yokozuna59 · 2024-01-30T14:36:34Z

Maybe update the PR description since it would implemented in a different PR.

* develop: Update container Update container Remove pnpm cache Use `.node-version` file in workflows fix: Redirect of old URLs Remove node version from matrix Update to Node v20 Update to Node v20 fix lint add latest blog post update discord invite link remove holiday promo text

[![Mend Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [mermaid](https://togithub.com/mermaid-js/mermaid) | [`10.7.0` -> `10.8.0`](https://renovatebot.com/diffs/npm/mermaid/10.7.0/10.8.0) | [![age](https://developer.mend.io/api/mc/badges/age/npm/mermaid/10.8.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/npm/mermaid/10.8.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/npm/mermaid/10.7.0/10.8.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/npm/mermaid/10.7.0/10.8.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>mermaid-js/mermaid (mermaid)</summary> ### [`v10.8.0`](https://togithub.com/mermaid-js/mermaid/releases/tag/v10.8.0) [Compare Source](https://togithub.com/mermaid-js/mermaid/compare/v10.7.0...v10.8.0) ### v10.8.0 #### Features <img width="375" alt="image" src="https://github.com/mermaid-js/mermaid/assets/5837277/c17405fb-2a06-4f7c-9c77-5eaba6c76747"> - Adding new diagram type - Block Diagram by [@knsv](https://togithub.com/knsv) in [mermaid-js/mermaid#5221 - Feature/5114 add parallel commit config by [@mathbraga](https://togithub.com/mathbraga) in [mermaid-js/mermaid#5161 - Changes to Gantt Parsers to allow hashes and semicolons to titles, sections, and task data. by [@FutzMonitor](https://togithub.com/FutzMonitor) in [mermaid-js/mermaid#5095 - Feature/4653 add actor-top class to sequence diagram by [@Ronid1](https://togithub.com/Ronid1) in [mermaid-js/mermaid#5241 #### Documentation - Updated gantt chart docs to show all config options by [@murdoa](https://togithub.com/murdoa) in [mermaid-js/mermaid#5192 - Contribution documentation improvements by [@nirname](https://togithub.com/nirname) in [mermaid-js/mermaid#5132 - Update flowchart.md - how to use font-awesome [#5195](https://togithub.com/mermaid-js/mermaid/issues/5195) by [@arukiidou](https://togithub.com/arukiidou) in [mermaid-js/mermaid#5196 - Add more detailed docs for Gantt tasks by [@sorenisanerd](https://togithub.com/sorenisanerd) in [mermaid-js/mermaid#5194 - Docs/4974 reorder integration links by [@Ronid1](https://togithub.com/Ronid1) in [mermaid-js/mermaid#5066 - docs: fix swimm link by [@Yokozuna59](https://togithub.com/Yokozuna59) in [mermaid-js/mermaid#5219 - Update Slack community links to Discord by [@Olegt0rr](https://togithub.com/Olegt0rr) in [mermaid-js/mermaid#5225 - Docs: Mermaid chart updates by [@huynhicode](https://togithub.com/huynhicode) in [mermaid-js/mermaid#5232 - Fix typos in timeline syntax samples by [@sblom](https://togithub.com/sblom) in [mermaid-js/mermaid#5139 #### Bug fixes - Bug/5059 fix external connection after updating edges by [@mathbraga](https://togithub.com/mathbraga) in [mermaid-js/mermaid#5127 - \[Fix] Sequence diagram actor menu popup by [@vitorsss](https://togithub.com/vitorsss) in [mermaid-js/mermaid#5160 - fix: Dompurify Hooks by [@sidharthv96](https://togithub.com/sidharthv96) in [mermaid-js/mermaid#5236 - Accurate pie chart labeling for text alignment by [@JenningsWilliam](https://togithub.com/JenningsWilliam) in [mermaid-js/mermaid#5141 - fix: Redirect of old URLs by [@sidharthv96](https://togithub.com/sidharthv96) in [mermaid-js/mermaid#5250 - Fixed Typo in ErrorRenderer.ts by [@FutzMonitor](https://togithub.com/FutzMonitor) in [mermaid-js/mermaid#5256 #### Chores - Revert "Revert 5041 feature/4935 subgraph title margin config option" by [@mathbraga](https://togithub.com/mathbraga) in [mermaid-js/mermaid#5205 - build(deps-dev): bump follow-redirects from 1.15.2 to 1.15.5 by [@dependabot](https://togithub.com/dependabot) in [mermaid-js/mermaid#5200 - chore(deps): update all patch dependencies (patch) by [@renovate](https://togithub.com/renovate) in [mermaid-js/mermaid#5150 - E2E Image comparison by [@sidharthv96](https://togithub.com/sidharthv96) in [mermaid-js/mermaid#5208 - E2E test by [@sidharthv96](https://togithub.com/sidharthv96) in [mermaid-js/mermaid#5210 - Optimise caching of test results by [@sidharthv96](https://togithub.com/sidharthv96) in [mermaid-js/mermaid#5213 - Update update-browserlist.yml to fix deprecation and action fails by [@Abrifq](https://togithub.com/Abrifq) in [mermaid-js/mermaid#5151 - UpdateCypress by [@sidharthv96](https://togithub.com/sidharthv96) in [mermaid-js/mermaid#5228 - Use node v20 by [@sidharthv96](https://togithub.com/sidharthv96) in [mermaid-js/mermaid#5248 - Convert Mindmap to TS by [@sidharthv96](https://togithub.com/sidharthv96) in [mermaid-js/mermaid#5247 - chore: Add interface naming Convention by [@sidharthv96](https://togithub.com/sidharthv96) in [mermaid-js/mermaid#5254 #### New Contributors - [@murdoa](https://togithub.com/murdoa) made their first contribution in [mermaid-js/mermaid#5192 - [@arukiidou](https://togithub.com/arukiidou) made their first contribution in [mermaid-js/mermaid#5196 - [@sorenisanerd](https://togithub.com/sorenisanerd) made their first contribution in [mermaid-js/mermaid#5194 - [@Ronid1](https://togithub.com/Ronid1) made their first contribution in [mermaid-js/mermaid#5066 - [@Olegt0rr](https://togithub.com/Olegt0rr) made their first contribution in [mermaid-js/mermaid#5225 - [@vitorsss](https://togithub.com/vitorsss) made their first contribution in [mermaid-js/mermaid#5160 - [@sblom](https://togithub.com/sblom) made their first contribution in [mermaid-js/mermaid#5139 - [@JenningsWilliam](https://togithub.com/JenningsWilliam) made their first contribution in [mermaid-js/mermaid#5141 **Full Changelog**: mermaid-js/mermaid@v10.7.0...v10.8.0 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/levaintech/contented).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

sidharthv96 added 7 commits January 28, 2024 16:04

Rename files to TS

12dc3d8

Convert mindmap.spec.js

e046da1

Add MindmapDB type

b71f4c7

Cleanup svgDraw.js

f30c264

Add MermaidConfigWithDefaults

ba0bddf

Convert MindmapDB.ts

f069de5

Convert MindmapRenderer.ts

d346a77

sidharthv96 requested a review from knsv January 28, 2024 10:39

sidharthv96 added 11 commits January 28, 2024 21:43

chore: Fix config type

e1a23f1

refactor: Fix types and imports

9651d0c

chore: Fix mindmapDb exports

cffac84

refactor: Remove db import from svgDraw

23d843b

Rename styles.js

bde6a9f

Fix styles.ts

13e052f

Rename svgDraw.js

75ec719

Convert svgDraw.ts

b51d8ff

Lint

d21461f

Lint

4c551b2

Merge branch 'develop' into sidv/mindmapToTs

95dcd30

Yokozuna59 reviewed Jan 29, 2024

View reviewed changes

chore: Address review comments

ff6988e

Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>

sidharthv96 requested a review from Yokozuna59 January 30, 2024 04:28

Organize imports

78f1631

Yokozuna59 reviewed Jan 30, 2024

View reviewed changes

Remove MermaidConfigWithDefaults

80c20a7

Yokozuna59 reviewed Jan 30, 2024

View reviewed changes

packages/mermaid/src/config.ts Outdated Show resolved Hide resolved

Use config from defaultConfig

726d633

Co-authored-by: Reda Al Sulais <u.yokozuna@gmail.com>

Yokozuna59 approved these changes Jan 30, 2024

View reviewed changes

sidharthv96 added 2 commits January 31, 2024 14:10

Merge branch 'develop' into sidv/mindmapToTs

45f4d3d

knsv approved these changes Feb 1, 2024

View reviewed changes

knsv added this pull request to the merge queue Feb 1, 2024

Merged via the queue into develop with commit 5c9857c Feb 1, 2024
30 checks passed

knsv deleted the sidv/mindmapToTs branch February 1, 2024 13:40

Yokozuna59 mentioned this pull request Feb 9, 2024

feat: add pie langium parser #4751

Merged

2 tasks

renovate bot mentioned this pull request Feb 21, 2024

fix(deps): update all non-major dependencies marimo-team/marimo#730

Merged

1 task

sidharthv96 mentioned this pull request Mar 22, 2024

feat(parser): reimplement parser in langium instead of jison #4401

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Convert Mindmap to TS #5247

Convert Mindmap to TS #5247

sidharthv96 commented Jan 28, 2024 •

edited

netlify bot commented Jan 28, 2024 •

edited

codecov bot commented Jan 28, 2024 •

edited

Yokozuna59 left a comment

Yokozuna59 left a comment

Yokozuna59 commented Jan 30, 2024

Convert Mindmap to TS #5247

Convert Mindmap to TS #5247

Conversation

sidharthv96 commented Jan 28, 2024 • edited

📑 Summary

📏 Design Decisions

📋 Tasks

netlify bot commented Jan 28, 2024 • edited

✅ Deploy Preview for mermaid-js ready!

codecov bot commented Jan 28, 2024 • edited

Codecov Report

Yokozuna59 left a comment

Choose a reason for hiding this comment

Yokozuna59 left a comment

Choose a reason for hiding this comment

Yokozuna59 commented Jan 30, 2024

sidharthv96 commented Jan 28, 2024 •

edited

netlify bot commented Jan 28, 2024 •

edited

codecov bot commented Jan 28, 2024 •

edited