Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Saurabh/refactor/convert class db to class #6212

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from

Conversation

saurabhg772244
Copy link
Collaborator

📑 Summary

  • Refactors the existing classDb implementation from a functional approach to a class-based architecture to improve code organization, maintainability, and extensibility.
  • Return a new DB object when diagramObject.db is called.
  • Introduces new ClassDB class to encapsulate database operations and state
  • Migrates existing functions to class methods
  • Maintains existing API interface for backwards compatibility
  • Following functions still uses common DB:
    • addRelation
    • cleanupLabel
    • setAccTitle
    • setAccDescription
    • addClassesToNamespace
    • addNamespace
    • setCssClass
    • addMembers
    • addClass
    • setClassLabel
    • addAnnotation
    • addMember
    • addNote
    • defineClass
    • setDirection
    • relationType
    • lineType
    • setClickEvent
    • setTooltip
    • setLink
    • setCssStyle
  • Reason why above functions still uses common DB: Refactor: Change flowDB to class based architecture. #6161 (comment)

Resolves #

📏 Design Decisions

  • The classDb module previously relied on functions and global variables. Consequently, each call to mermaid.parse or mermaid.render resulted in changes to global variables.
  • This behavior caused issues when rendering multiple diagrams using the same Mermaid API, as the database object (DB) for the diagrams would get mixed up.
  • To address this, classDb was refactored into a class-based structure. This change ensures that each diagramObject.db call creates a new instance of the database (DB), preventing conflicts between diagrams.

📋 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.
  • 🦋 If your PR makes a change that should be noted in one or more packages' changelogs, generate a changeset by running pnpm changeset and following the prompts. Changesets that add features should be minor and those that fix bugs should be patch. Please prefix changeset messages with feat:, fix:, or chore:.

Copy link

changeset-bot bot commented Jan 22, 2025

🦋 Changeset detected

Latest commit: 90bbf90

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 1 package
Name Type
mermaid Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

@github-actions github-actions bot added the Type: Other Not an enhancement or a bug label Jan 22, 2025
Copy link

netlify bot commented Jan 22, 2025

Deploy Preview for mermaid-js ready!

Name Link
🔨 Latest commit 90bbf90
🔍 Latest deploy log https://app.netlify.com/sites/mermaid-js/deploys/6790fc2022f2b700080006cb
😎 Deploy Preview https://deploy-preview-6212--mermaid-js.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

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

Copy link

pkg-pr-new bot commented Jan 22, 2025

Open in Stackblitz

npm i https://pkg.pr.new/mermaid-js/mermaid@6212
npm i https://pkg.pr.new/mermaid-js/mermaid/@mermaid-js/layout-elk@6212
npm i https://pkg.pr.new/mermaid-js/mermaid/@mermaid-js/mermaid-zenuml@6212
npm i https://pkg.pr.new/mermaid-js/mermaid/@mermaid-js/parser@6212

commit: 90bbf90

Copy link

codecov bot commented Jan 22, 2025

Codecov Report

Attention: Patch coverage is 0% with 672 lines in your changes missing coverage. Please review.

Project coverage is 4.47%. Comparing base (bc2cc61) to head (90bbf90).
Report is 23 commits behind head on develop.

Files with missing lines Patch % Lines
packages/mermaid/src/diagrams/class/classDb.ts 0.00% 664 Missing ⚠️
...ages/mermaid/src/diagrams/class/classDiagram-v2.ts 0.00% 4 Missing ⚠️
...ackages/mermaid/src/diagrams/class/classDiagram.ts 0.00% 4 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           develop   #6212      +/-   ##
==========================================
- Coverage     4.47%   4.47%   -0.01%     
==========================================
  Files          383     385       +2     
  Lines        54142   54189      +47     
  Branches       596     598       +2     
==========================================
  Hits          2425    2425              
- Misses       51717   51764      +47     
Flag Coverage Δ
unit 4.47% <0.00%> (-0.01%) ⬇️

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

Files with missing lines Coverage Δ
...ages/mermaid/src/diagrams/class/classDiagram-v2.ts 0.00% <0.00%> (ø)
...ackages/mermaid/src/diagrams/class/classDiagram.ts 0.00% <0.00%> (ø)
packages/mermaid/src/diagrams/class/classDb.ts 0.00% <0.00%> (ø)

... and 7 files with indirect coverage changes

Copy link
Member

@aloisklink aloisklink left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To avoid the ESLint @typescript-eslint/unbound-method errors in the packages/mermaid/src/diagrams/class/classDiagram.spec.ts file, I'd recommend just adding a comment in the file like /* eslint-disable @typescript-eslint/unbound-method -- Broken for Vitest mocks, see https://github.com/vitest-dev/eslint-plugin-vitest/pull/286 */

this.notes = [];
this.interfaces = [];
this.functions = [];
this.functions.push(this.setupToolTips);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we turn setupToolTips into a normal class method and use .bind(this); here?

Suggested change
this.functions.push(this.setupToolTips);
this.functions.push(this.setupToolTips.bind(this));

See also

this.functions.push(this.setupToolTips);

* @param type - The type to look for
* @returns The arrow marker
*/
private readonly getArrowMarker = (type: number) => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to be an arrow function? Can we change it to a normal class method?

this.setTooltip = this.setTooltip.bind(this);
this.setClickEvent = this.setClickEvent.bind(this);
this.setCssStyle = this.setCssStyle.bind(this);
this.setClickFunc = this.setClickFunc.bind(this);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain why this is needed? I can't see it being used in the JISON file.

Comment on lines +43 to +46

private sanitizeText(txt: string) {
return common.sanitizeText(txt, getConfig());
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since this function is private and doesn't need this, should we move it out of the class?

Comment on lines +467 to +478
public lineType = {
LINE: 0,
DOTTED_LINE: 1,
};

public relationType = {
AGGREGATION: 0,
EXTENSION: 1,
COMPOSITION: 2,
DEPENDENCY: 3,
LOLLIPOP: 4,
};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you make these readonly so we can't change them?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Other Not an enhancement or a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants