fix(deps): update all minor dependencies

Merge pull request #6023 from yari-dewalt/fix_lollipop_stroke
Fix: Delete 'stroke: black' from lollipop marker so it matches themes and edge paths
2025-10-12 18:49:37 +02:00 · 2025-10-11 21:00:29 +00:00 · 2025-10-11 20:43:08 +00:00 · 2025-10-11 20:42:53 +00:00 · 2025-10-11 13:27:47 -07:00 · 2025-10-11 13:26:59 -07:00
40 changed files with 1424 additions and 2146 deletions
--- a/.github/workflows/autofix.yml
+++ b/.github/workflows/autofix.yml
@@ -13,13 +13,13 @@ jobs:
  autofix:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
        # uses version from "packageManager" field in package.json

      - name: Setup Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          cache: pnpm
          node-version-file: '.node-version'
--- a/.github/workflows/build-docs.yml
+++ b/.github/workflows/build-docs.yml
@@ -18,12 +18,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0

      - name: Setup Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          cache: pnpm
          node-version-file: '.node-version'
--- a/.github/workflows/check-readme-in-sync.yml
+++ b/.github/workflows/check-readme-in-sync.yml
@@ -18,7 +18,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

      - name: Check for difference in README.md and docs/README.md
        run: |
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -32,11 +32,11 @@ jobs:

    steps:
      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

      # Initializes the CodeQL tools for scanning.
      - name: Initialize CodeQL
-        uses: github/codeql-action/init@5378192d256ef1302a6980fffe5ca04426d43091 # v3.28.21
+        uses: github/codeql-action/init@755f44910c12a3d7ca0d8c6e42c048b3362f7cec # v3.30.8
        with:
          config-file: ./.github/codeql/codeql-config.yml
          languages: ${{ matrix.language }}
@@ -48,7 +48,7 @@ jobs:
      # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
      # If this step fails, then you should remove it and run the build manually (see below)
      - name: Autobuild
-        uses: github/codeql-action/autobuild@5378192d256ef1302a6980fffe5ca04426d43091 # v3.28.21
+        uses: github/codeql-action/autobuild@755f44910c12a3d7ca0d8c6e42c048b3362f7cec # v3.30.8

      # ℹ️ Command-line programs to run using the OS shell.
      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -62,4 +62,4 @@ jobs:
      #   make release

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@5378192d256ef1302a6980fffe5ca04426d43091 # v3.28.21
+        uses: github/codeql-action/analyze@755f44910c12a3d7ca0d8c6e42c048b3362f7cec # v3.30.8
--- a/.github/workflows/dependency-review.yml
+++ b/.github/workflows/dependency-review.yml
@@ -15,6 +15,6 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: 'Checkout Repository'
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
      - name: 'Dependency Review'
-        uses: actions/dependency-review-action@3b139cfc5fae8b618d3eae3675e383bb1769c019 # v4.5.0
+        uses: actions/dependency-review-action@40c09b7dc99638e5ddb0bfd91c1673effc064d8a # v4.8.1
--- a/.github/workflows/e2e-applitools.yml
+++ b/.github/workflows/e2e-applitools.yml
@@ -29,13 +29,13 @@ jobs:
        run: |
          echo "::error,title=Not using Applitools::APPLITOOLS_API_KEY is empty, disabling Applitools for this run."

-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
        # uses version from "packageManager" field in package.json

      - name: Setup Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version-file: '.node-version'

@@ -53,7 +53,7 @@ jobs:
          args: -X POST "$APPLITOOLS_SERVER_URL/api/externals/github/push?apiKey=$APPLITOOLS_API_KEY&CommitSha=$GITHUB_SHA&BranchName=${APPLITOOLS_BRANCH}$&ParentBranchName=$APPLITOOLS_PARENT_BRANCH"

      - name: Cypress run
-        uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
+        uses: cypress-io/github-action@b8ba51a856ba5f4c15cf39007636d4ab04f23e3c # v6.10.2
        id: cypress
        with:
          start: pnpm run dev
--- a/.github/workflows/e2e-timings.yml
+++ b/.github/workflows/e2e-timings.yml
@@ -20,19 +20,19 @@ jobs:
      image: cypress/browsers:node-20.11.0-chrome-121.0.6167.85-1-ff-120.0-edge-121.0.2277.83-1
      options: --user 1001
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
      - name: Setup Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version-file: '.node-version'
      - name: Install dependencies
-        uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
+        uses: cypress-io/github-action@b8ba51a856ba5f4c15cf39007636d4ab04f23e3c # v6.10.2
        with:
          runTests: false

      - name: Cypress run
-        uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
+        uses: cypress-io/github-action@b8ba51a856ba5f4c15cf39007636d4ab04f23e3c # v6.10.2
        id: cypress
        with:
          install: false
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -37,15 +37,15 @@ jobs:
      image: cypress/browsers:node-20.11.0-chrome-121.0.6167.85-1-ff-120.0-edge-121.0.2277.83-1
      options: --user 1001
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
      - name: Setup Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version-file: '.node-version'
      - name: Cache snapshots
        id: cache-snapshot
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: ./cypress/snapshots
          key: ${{ runner.os }}-snapshots-${{ env.targetHash }}
@@ -53,13 +53,13 @@ jobs:
      # If a snapshot for a given Hash is not found, we checkout that commit, run the tests and cache the snapshots.
      - name: Switch to base branch
        if: ${{ steps.cache-snapshot.outputs.cache-hit != 'true' }}
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
        with:
          ref: ${{ env.targetHash }}

      - name: Install dependencies
        if: ${{ steps.cache-snapshot.outputs.cache-hit != 'true' }}
-        uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
+        uses: cypress-io/github-action@b8ba51a856ba5f4c15cf39007636d4ab04f23e3c # v6.10.2
        with:
          # just perform install
          runTests: false
@@ -82,26 +82,26 @@ jobs:
      matrix:
        containers: [1, 2, 3, 4, 5]
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
        # uses version from "packageManager" field in package.json

      - name: Setup Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          node-version-file: '.node-version'

      # These cached snapshots are downloaded, providing the reference snapshots.
      - name: Cache snapshots
        id: cache-snapshot
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: ./cypress/snapshots
          key: ${{ runner.os }}-snapshots-${{ env.targetHash }}

      - name: Install dependencies
-        uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
+        uses: cypress-io/github-action@b8ba51a856ba5f4c15cf39007636d4ab04f23e3c # v6.10.2
        with:
          runTests: false

@@ -117,7 +117,7 @@ jobs:
      # Install NPM dependencies, cache them correctly
      # and run all Cypress tests
      - name: Cypress run
-        uses: cypress-io/github-action@108b8684ae52e735ff7891524cbffbcd4be5b19f # v6.7.16
+        uses: cypress-io/github-action@b8ba51a856ba5f4c15cf39007636d4ab04f23e3c # v6.10.2
        id: cypress
        with:
          install: false
@@ -139,7 +139,7 @@ jobs:
          VITEST_COVERAGE: true

      - name: Upload Coverage to Codecov
-        uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
        # Run step only pushes to develop and pull_requests
        if: ${{ steps.cypress.conclusion == 'success' && (github.event_name == 'pull_request' || github.ref == 'refs/heads/develop')}}
        with:
--- a/.github/workflows/link-checker.yml
+++ b/.github/workflows/link-checker.yml
@@ -29,17 +29,17 @@ jobs:
      # lychee only uses the GITHUB_TOKEN to avoid rate-limiting
      contents: read
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

      - name: Restore lychee cache
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
        with:
          path: .lycheecache
          key: cache-lychee-${{ github.sha }}
          restore-keys: cache-lychee-

      - name: Link Checker
-        uses: lycheeverse/lychee-action@f613c4a64e50d792e0b31ec34bbcbba12263c6a6 # v2.3.0
+        uses: lycheeverse/lychee-action@885c65f3dc543b57c898c8099f4e08c8afd178a2 # v2.6.1
        with:
          args: >-
            --config .github/lychee.toml
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -15,21 +15,21 @@ jobs:
  docker-lint:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

-      - uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf # v3.1.0
+      - uses: hadolint/hadolint-action@2332a7b74a6de0dda2e2221d575162eba76ba5e5 # v3.3.0
        with:
          verbose: true
  lint:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
        # uses version from "packageManager" field in package.json

      - name: Setup Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          cache: pnpm
          node-version-file: '.node-version'
--- a/.github/workflows/pr-labeler.yml
+++ b/.github/workflows/pr-labeler.yml
@@ -31,7 +31,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Add "Sponsored by MermaidChart" label
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        uses: actions/github-script@f28e40c7f34bde8b3046d885e986cb6290c5673b # v7.1.0
        with:
          github-token: ${{ secrets.GITHUB_TOKEN }}
          script: |
--- a/.github/workflows/publish-docs.yml
+++ b/.github/workflows/publish-docs.yml
@@ -23,12 +23,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0

      - name: Setup Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          cache: pnpm
          node-version-file: '.node-version'
--- a/.github/workflows/release-preview-publish.yml
+++ b/.github/workflows/release-preview-publish.yml
@@ -9,14 +9,14 @@ jobs:
  publish-preview:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
        with:
          fetch-depth: 0

-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0

      - name: Setup Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          cache: pnpm
          node-version-file: '.node-version'
--- a/.github/workflows/release-preview.yml
+++ b/.github/workflows/release-preview.yml
@@ -26,12 +26,12 @@ jobs:
    timeout-minutes: 5
    steps:
      - name: Checkout Repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0

      - name: Setup Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          cache: pnpm
          node-version-file: '.node-version'
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,12 +21,12 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Repo
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0

      - name: Setup Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          cache: pnpm
          node-version-file: '.node-version'
@@ -36,7 +36,7 @@ jobs:

      - name: Create Release Pull Request or Publish to npm
        id: changesets
-        uses: changesets/action@06245a4e0a36c064a573d4150030f5ec548e4fcc # v1.4.10
+        uses: changesets/action@e0145edc7d9d8679003495b11f87bd8ef63c0cba # v1.5.3
        with:
          version: pnpm changeset:version
          publish: pnpm changeset:publish
--- a/.github/workflows/scorecard.yml
+++ b/.github/workflows/scorecard.yml
@@ -16,7 +16,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout code
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
        with:
          persist-credentials: false
      - name: Run analysis
@@ -32,6 +32,6 @@ jobs:
          path: results.sarif
          retention-days: 5
      - name: Upload to code-scanning
-        uses: github/codeql-action/upload-sarif@5378192d256ef1302a6980fffe5ca04426d43091 # v3.28.21
+        uses: github/codeql-action/upload-sarif@755f44910c12a3d7ca0d8c6e42c048b3362f7cec # v3.30.8
        with:
          sarif_file: results.sarif
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,13 +9,13 @@ jobs:
  unit-test:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0

-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
        # uses version from "packageManager" field in package.json

      - name: Setup Node.js
-        uses: actions/setup-node@1d0ff469b7ec7b3cb9d8673fde0c81c44821de2a # v4.2.0
+        uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
        with:
          cache: pnpm
          node-version-file: '.node-version'
@@ -43,7 +43,7 @@ jobs:
          pnpm test:check:tsc

      - name: Upload Coverage to Codecov
-        uses: codecov/codecov-action@13ce06bfc6bbe3ecf90edbbf1bc32fe5978ca1d3 # v5.3.1
+        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
        # Run step only pushes to develop and pull_requests
        if: ${{ github.event_name == 'pull_request' || github.ref == 'refs/heads/develop' }}
        with:
--- a/.github/workflows/update-browserlist.yml
+++ b/.github/workflows/update-browserlist.yml
@@ -8,8 +8,8 @@ jobs:
  update-browser-list:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
      - run: npx update-browserslist-db@latest
      - name: Commit changes
        uses: EndBug/add-and-commit@a94899bca583c204427a224a7af87c02f9b325d5 # v9.1.4
--- a/.github/workflows/validate-lockfile.yml
+++ b/.github/workflows/validate-lockfile.yml
@@ -19,9 +19,9 @@ jobs:
      - name: Set up Node.js
        uses: actions/setup-node@v4
        with:
-          node-version: 20
+          node-version: 20.19.5

-      - uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4.1.0
+      - uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0

      - name: Validate pnpm-lock.yaml entries
        id: validate # give this step an ID so we can reference its outputs
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-22.14.0
+22.20.0
--- a/cypress/platform/yari.html
+++ b/cypress/platform/yari.html
@@ -603,6 +603,10 @@
      </div>
      <div class="test">
        <pre class="mermaid">
+          ---
+            config:
+              theme: dark
+          ---
          classDiagram
            test ()--() test2
        </pre>
--- a/demos/er-multiline.html
+++ b/demos/er-multiline.html
@@ -11,7 +11,7 @@
      rel="stylesheet"
    />
    <link
-      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.2/css/all.min.css"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.7.2/css/all.min.css"
      rel="stylesheet"
    />
    <link
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
      - 9000:9000
      - 3333:3333
  cypress:
-    image: cypress/included:14.0.3
+    image: cypress/included:14.5.4
    stdin_open: true
    tty: true
    working_dir: /mermaid
--- a/docs/syntax/classDiagram.md
+++ b/docs/syntax/classDiagram.md
@@ -287,7 +287,6 @@ To describe the visibility (or encapsulation) of an attribute or method/function
 >
 > - `*` Abstract e.g.: `someAbstractMethod()*` or `someAbstractMethod() int*`
 > - `$` Static e.g.: `someStaticMethod()$` or `someStaticMethod() String$`
-> - `$*` OR `*$` Both e.g: `someAbstractStaticMethod()$*` or `someAbstractStaticMethod() int$*`

 > _note_ you can also include additional _classifiers_ to a field definition by adding the following notation to the very end:
 >
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
  "version": "10.2.4",
  "description": "Markdownish syntax for generating flowcharts, sequence diagrams, class diagrams, gantt charts and git graphs.",
  "type": "module",
-  "packageManager": "pnpm@10.4.1+sha512.c753b6c3ad7afa13af388fa6d808035a008e30ea9993f58c6663e2bc5ff21679aa834db094987129aa4d488b86df57f7b634981b2f827cdcacc698cc0cfb88af",
+  "packageManager": "pnpm@10.18.2+sha512.9fb969fa749b3ade6035e0f109f0b8a60b5d08a1a87fdf72e337da90dcc93336e2280ca4e44f2358a649b83c17959e9993e777c2080879f3801e6f0d999ad3dd",
  "keywords": [
    "diagram",
    "markdown",
@@ -109,12 +109,12 @@
    "globals": "^16.4.0",
    "globby": "^14.1.0",
    "husky": "^9.1.7",
-    "jest": "^30.1.3",
+    "jest": "^30.2.0",
    "jison": "^0.4.18",
    "js-yaml": "^4.1.0",
    "jsdom": "^26.1.0",
-    "langium-cli": "3.3.0",
-    "lint-staged": "^16.1.6",
+    "langium-cli": "3.5.2",
+    "lint-staged": "^16.2.4",
    "markdown-table": "^3.0.4",
    "nyc": "^17.1.0",
    "path-browserify": "^1.0.1",
@@ -125,10 +125,10 @@
    "start-server-and-test": "^2.1.2",
    "tslib": "^2.8.1",
    "tsx": "^4.20.5",
-    "typescript": "~5.7.3",
+    "typescript": "~5.9.3",
    "typescript-eslint": "^8.38.0",
    "vite": "^7.0.7",
-    "vite-plugin-istanbul": "^7.0.0",
+    "vite-plugin-istanbul": "^7.2.0",
    "vitest": "^3.2.4"
  },
  "nyc": {
--- a/packages/mermaid-layout-elk/package.json
+++ b/packages/mermaid-layout-elk/package.json
@@ -30,14 +30,14 @@
  "license": "MIT",
  "dependencies": {
    "d3": "^7.9.0",
-    "elkjs": "^0.9.3"
+    "elkjs": "^0.11.0"
  },
  "devDependencies": {
    "@types/d3": "^7.4.3",
    "mermaid": "workspace:^"
  },
  "peerDependencies": {
-    "mermaid": "^11.0.2"
+    "mermaid": "^11.12.0"
  },
  "files": [
    "dist"
--- a/packages/mermaid-layout-tidy-tree/package.json
+++ b/packages/mermaid-layout-tidy-tree/package.json
@@ -38,7 +38,7 @@
    "mermaid": "workspace:^"
  },
  "peerDependencies": {
-    "mermaid": "^11.0.2"
+    "mermaid": "^11.12.0"
  },
  "files": [
    "dist"
--- a/packages/mermaid/package.json
+++ b/packages/mermaid/package.json
@@ -82,7 +82,7 @@
    "katex": "^0.16.22",
    "khroma": "^2.1.0",
    "lodash-es": "^4.17.21",
-    "marked": "^16.3.0",
+    "marked": "^16.4.0",
    "roughjs": "^4.6.6",
    "stylis": "^4.3.6",
    "ts-dedent": "^2.2.0",
@@ -91,7 +91,7 @@
  "devDependencies": {
    "@adobe/jsonschema2md": "^8.0.5",
    "@iconify/types": "^2.0.0",
-    "@types/cytoscape": "^3.21.9",
+    "@types/cytoscape": "^3.31.0",
    "@types/cytoscape-fcose": "^2.2.4",
    "@types/d3-sankey": "^0.12.4",
    "@types/d3-scale": "^4.0.9",
@@ -124,8 +124,8 @@
    "start-server-and-test": "^2.1.2",
    "type-fest": "^4.41.0",
    "typedoc": "^0.28.13",
-    "typedoc-plugin-markdown": "^4.8.1",
-    "typescript": "~5.7.3",
+    "typedoc-plugin-markdown": "^4.9.0",
+    "typescript": "~5.9.3",
    "unist-util-flatmap": "^1.0.0",
    "unist-util-visit": "^5.0.0",
    "vitepress": "^1.6.4",
--- a/packages/mermaid/src/diagrams/class/classDb.ts
+++ b/packages/mermaid/src/diagrams/class/classDb.ts
@@ -265,10 +265,6 @@ export class ClassDB implements DiagramDB {
        theClass.annotations.push(sanitizeText(memberString.substring(2, memberString.length - 2)));
      } else if (memberString.indexOf(')') > 0) {
        //its a method
-        if (memberString.length < 2) {
-          // Too short to be a method, ignore
-          return;
-        }
        theClass.methods.push(new ClassMember(memberString, 'method'));
      } else if (memberString) {
        theClass.members.push(new ClassMember(memberString, 'attribute'));
@@ -631,7 +627,7 @@ export class ClassDB implements DiagramDB {
          padding: config.class!.padding ?? 16,
          // parent node must be one of [rect, roundedWithTitle, noteGroup, divider]
          shape: 'rect',
-          cssStyles: ['fill: none', 'stroke: black'],
+          cssStyles: [],
          look: config.look,
        };
        nodes.push(node);
--- a/packages/mermaid/src/diagrams/class/classTypes.attribute.spec.ts
+++ b/packages/mermaid/src/diagrams/class/classTypes.attribute.spec.ts
@@ -1,317 +0,0 @@
-import { ClassMember } from './classTypes.js';
-import { vi, describe, it, expect } from 'vitest';
-const spyOn = vi.spyOn;
-
-const staticCssStyle = 'text-decoration:underline;';
-const abstractCssStyle = 'font-style:italic;';
-const abstractStaticCssStyle = 'text-decoration:underline;font-style:italic;';
-
-describe('ClassTypes - Attribute Tests', () => {
-  describe('Basic attribute parsing without classifiers', () => {
-    it('should parse attribute with no modifiers', () => {
-      const str = 'name String';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('name String');
-      expect(displayDetails.cssStyle).toBe('');
-    });
-
-    it('should parse attribute with public "+" visibility', () => {
-      const str = '+name String';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('+name String');
-      expect(displayDetails.cssStyle).toBe('');
-    });
-
-    it('should parse attribute with protected "#" visibility', () => {
-      const str = '#name String';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('#name String');
-      expect(displayDetails.cssStyle).toBe('');
-    });
-
-    it('should parse attribute with private "-" visibility', () => {
-      const str = '-name String';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('-name String');
-      expect(displayDetails.cssStyle).toBe('');
-    });
-
-    it('should parse attribute with internal "~" visibility', () => {
-      const str = '~name String';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('~name String');
-      expect(displayDetails.cssStyle).toBe('');
-    });
-
-    it('should parse simple attribute name only', () => {
-      const str = 'id';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('id');
-      expect(displayDetails.cssStyle).toBe('');
-    });
-
-    it('should parse attribute with visibility and name only', () => {
-      const str = '+id';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('+id');
-      expect(displayDetails.cssStyle).toBe('');
-    });
-  });
-
-  describe('Static classifier ($) attributes', () => {
-    it('should parse static attribute without visibility', () => {
-      const str = 'count int$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('count int');
-      expect(displayDetails.cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should parse static attribute with public visibility', () => {
-      const str = '+count int$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('+count int');
-      expect(displayDetails.cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should parse static attribute with protected visibility', () => {
-      const str = '#count int$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('#count int');
-      expect(displayDetails.cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should parse static attribute with private visibility', () => {
-      const str = '-count int$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('-count int');
-      expect(displayDetails.cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should parse static attribute with internal visibility', () => {
-      const str = '~count int$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('~count int');
-      expect(displayDetails.cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should parse static attribute name only', () => {
-      const str = 'MAX_SIZE$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('MAX_SIZE');
-      expect(displayDetails.cssStyle).toBe(staticCssStyle);
-    });
-  });
-
-  describe('Abstract classifier (*) attributes', () => {
-    it('should parse abstract attribute without visibility', () => {
-      const str = 'data String*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('data String');
-      expect(displayDetails.cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should parse abstract attribute with public visibility', () => {
-      const str = '+data String*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('+data String');
-      expect(displayDetails.cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should parse abstract attribute with protected visibility', () => {
-      const str = '#data String*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('#data String');
-      expect(displayDetails.cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should parse abstract attribute with private visibility', () => {
-      const str = '-data String*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('-data String');
-      expect(displayDetails.cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should parse abstract attribute with internal visibility', () => {
-      const str = '~data String*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('~data String');
-      expect(displayDetails.cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should parse abstract attribute name only', () => {
-      const str = 'value*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('value');
-      expect(displayDetails.cssStyle).toBe(abstractCssStyle);
-    });
-  });
-
-  describe('Abstract and Static combined classifiers', () => {
-    it('should parse abstract+static ($*) attribute without visibility', () => {
-      const str = 'config Map$*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('config Map');
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should parse static+abstract (*$) attribute without visibility', () => {
-      const str = 'config Map*$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('config Map');
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should parse abstract+static ($*) attribute with public visibility', () => {
-      const str = '+config Map$*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('+config Map');
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should parse static+abstract (*$) attribute with public visibility', () => {
-      const str = '+config Map*$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('+config Map');
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should parse abstract+static ($*) attribute with protected visibility', () => {
-      const str = '#registry HashMap$*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('#registry HashMap');
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should parse static+abstract (*$) attribute with protected visibility', () => {
-      const str = '#registry HashMap*$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('#registry HashMap');
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should parse abstract+static ($*) attribute with private visibility', () => {
-      const str = '-cache LRUCache$*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('-cache LRUCache');
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should parse static+abstract (*$) attribute with private visibility', () => {
-      const str = '-cache LRUCache*$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('-cache LRUCache');
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should parse abstract+static ($*) attribute with internal visibility', () => {
-      const str = '~pool ThreadPool$*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('~pool ThreadPool');
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should parse static+abstract (*$) attribute with internal visibility', () => {
-      const str = '~pool ThreadPool*$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('~pool ThreadPool');
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should parse abstract+static ($*) attribute name only', () => {
-      const str = 'INSTANCE$*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('INSTANCE');
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should parse static+abstract (*$) attribute name only', () => {
-      const str = 'INSTANCE*$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('INSTANCE');
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-
-  describe('Complex attribute type scenarios', () => {
-    it('should parse generic type attribute with static classifier', () => {
-      const str = '+items List~String~$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('+items List<String>');
-      expect(displayDetails.cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should parse nested generic type attribute with abstract classifier', () => {
-      const str = '#mapping Map~String, List~Integer~~*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('#mapping Map~String, List<Integer~>');
-      expect(displayDetails.cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should parse complex generic type with abstract+static classifiers', () => {
-      const str = '+factory Function~Map~String, Object~, Promise~Result~~$*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe(
-        '+factory Function<Map>String, Object~, Promise<Result~>'
-      );
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should parse attribute with spaces in type name', () => {
-      const str = '+fullName Full Name String$';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('+fullName Full Name String');
-      expect(displayDetails.cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should parse attribute with special characters in name', () => {
-      const str = '+user_name String*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('+user_name String');
-      expect(displayDetails.cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should parse attribute with numeric suffix', () => {
-      const str = '-value123 int$*';
-      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-      expect(displayDetails.displayText).toBe('-value123 int');
-      expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-});
--- a/packages/mermaid/src/diagrams/class/classTypes.classifiers.spec.ts
+++ b/packages/mermaid/src/diagrams/class/classTypes.classifiers.spec.ts
@@ -1,170 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import { ClassMember } from './classTypes.js';
-
-describe('ClassTypes - Enhanced Abstract and Static Combinations', () => {
-  // Test constants to match original test structure
-  const staticCssStyle = 'text-decoration:underline;';
-  const abstractCssStyle = 'font-style:italic;';
-  const abstractStaticCssStyle = 'text-decoration:underline;font-style:italic;';
-
-  describe('Enhanced parseClassifier functionality', () => {
-    describe('when the attribute has static "$" modifier', () => {
-      it('should parse the display text correctly and apply static css style', () => {
-        const str = 'name String$';
-
-        const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-        expect(displayDetails.displayText).toBe('name String');
-        expect(displayDetails.cssStyle).toBe(staticCssStyle);
-      });
-    });
-
-    describe('when the attribute has abstract "*" modifier', () => {
-      it('should parse the display text correctly and apply abstract css style', () => {
-        const str = 'name String*';
-
-        const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-        expect(displayDetails.displayText).toBe('name String');
-        expect(displayDetails.cssStyle).toBe(abstractCssStyle);
-      });
-    });
-
-    describe('when the attribute has abstract static "*$" modifier', () => {
-      it('should parse the display text correctly and apply abstract static css style', () => {
-        const str = 'name String*$';
-
-        const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-        expect(displayDetails.displayText).toBe('name String');
-        expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-      });
-    });
-
-    describe('when the attribute has static abstract "$*" modifier', () => {
-      it('should parse the display text correctly and apply abstract static css style', () => {
-        const str = 'name String$*';
-
-        const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
-
-        expect(displayDetails.displayText).toBe('name String');
-        expect(displayDetails.cssStyle).toBe(abstractStaticCssStyle);
-      });
-
-      it('should handle abstract and static combined (*$) on methods', () => {
-        const str = 'getTime()*$';
-        const classMember = new ClassMember(str, 'method');
-        const details = classMember.getDisplayDetails();
-
-        expect(details.displayText).toBe('getTime()');
-        expect(details.cssStyle).toBe(abstractStaticCssStyle);
-      });
-
-      it('should handle static and abstract combined ($*) on methods', () => {
-        const str = 'getTime()$*';
-        const classMember = new ClassMember(str, 'method');
-        const details = classMember.getDisplayDetails();
-
-        expect(details.displayText).toBe('getTime()');
-        expect(details.cssStyle).toBe(abstractStaticCssStyle);
-      });
-
-      it('should handle abstract and static combined (*$) on attributes', () => {
-        const str = 'data String*$';
-        const classMember = new ClassMember(str, 'attribute');
-        const details = classMember.getDisplayDetails();
-
-        expect(details.displayText).toBe('data String');
-        expect(details.cssStyle).toBe(abstractStaticCssStyle);
-      });
-
-      it('should handle static and abstract combined ($*) on attributes', () => {
-        const str = 'data String$*';
-        const classMember = new ClassMember(str, 'attribute');
-        const details = classMember.getDisplayDetails();
-
-        expect(details.displayText).toBe('data String');
-        expect(details.cssStyle).toBe(abstractStaticCssStyle);
-      });
-
-      it('should handle complex method with abstract static combination', () => {
-        const str = '+processData(Map~String, List~Integer~~) Optional~Result~*$';
-        const classMember = new ClassMember(str, 'method');
-        const details = classMember.getDisplayDetails();
-
-        expect(details.displayText).toBe(
-          '+processData(Map~String, List<Integer~>) : Optional<Result>'
-        );
-        expect(details.cssStyle).toBe(abstractStaticCssStyle);
-      });
-
-      it('should handle attribute with visibility and abstract static combination', () => {
-        const str = '#config Settings$*';
-        const classMember = new ClassMember(str, 'attribute');
-        const details = classMember.getDisplayDetails();
-
-        expect(details.displayText).toBe('#config Settings');
-        expect(details.cssStyle).toBe(abstractStaticCssStyle);
-      });
-
-      // Verify existing classifier functionality still works
-      it('should still handle single static classifier correctly', () => {
-        const str = 'getName()$';
-        const classMember = new ClassMember(str, 'method');
-        const details = classMember.getDisplayDetails();
-
-        expect(details.displayText).toBe('getName()');
-        expect(details.cssStyle).toBe(staticCssStyle);
-      });
-
-      it('should still handle single abstract classifier correctly', () => {
-        const str = 'name String*';
-        const classMember = new ClassMember(str, 'attribute');
-        const details = classMember.getDisplayDetails();
-
-        expect(details.displayText).toBe('name String');
-        expect(details.cssStyle).toBe(abstractCssStyle);
-      });
-
-      it('should handle empty classifier correctly', () => {
-        const str = 'getValue()';
-        const classMember = new ClassMember(str, 'method');
-        const details = classMember.getDisplayDetails();
-
-        expect(details.displayText).toBe('getValue()');
-        expect(details.cssStyle).toBe('');
-      });
-    });
-    it('should return correct css for static classifier', function () {
-      const str = `getTime()$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime()');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should return correct css for abstract classifier', function () {
-      const str = `getTime()*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime()');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should return correct css for abstract static classifier', function () {
-      const str = `getTime()*$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime()');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should return correct css for static abstract classifier', function () {
-      const str = `getTime()$*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime()');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-});
--- a/packages/mermaid/src/diagrams/class/classTypes.method.spec.ts
+++ b/packages/mermaid/src/diagrams/class/classTypes.method.spec.ts
@@ -1,827 +0,0 @@
-import { ClassMember } from './classTypes.js';
-import { vi, describe, it, expect } from 'vitest';
-const spyOn = vi.spyOn;
-
-const staticCssStyle = 'text-decoration:underline;';
-const abstractCssStyle = 'font-style:italic;';
-const abstractStaticCssStyle = 'text-decoration:underline;font-style:italic;';
-
-describe('given text representing a method, ', function () {
-  describe('when method has no parameters', function () {
-    it('should parse correctly', function () {
-      const str = `getTime()`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(str);
-    });
-
-    it('should handle public visibility', function () {
-      const str = `+getTime()`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('+getTime()');
-    });
-
-    it('should handle private visibility', function () {
-      const str = `-getTime()`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('-getTime()');
-    });
-
-    it('should handle protected visibility', function () {
-      const str = `#getTime()`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('#getTime()');
-    });
-
-    it('should handle internal visibility', function () {
-      const str = `~getTime()`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('~getTime()');
-    });
-  });
-
-  describe('when method has single parameter value', function () {
-    it('should parse correctly', function () {
-      const str = `getTime(int)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(str);
-    });
-
-    it('should handle public visibility', function () {
-      const str = `+getTime(int)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('+getTime(int)');
-    });
-
-    it('should handle private visibility', function () {
-      const str = `-getTime(int)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('-getTime(int)');
-    });
-
-    it('should handle protected visibility', function () {
-      const str = `#getTime(int)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('#getTime(int)');
-    });
-
-    it('should handle internal visibility', function () {
-      const str = `~getTime(int)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('~getTime(int)');
-    });
-
-    it('should return correct css for static classifier', function () {
-      const str = `getTime(int)$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(int)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should return correct css for abstract classifier', function () {
-      const str = `getTime(int)*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(int)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should return correct css for abstract static classifier', function () {
-      const str = `getTime(int)*$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(int)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should return correct css for static abstract classifier', function () {
-      const str = `getTime(int)$*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(int)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-
-  describe('when method has single parameter type and name (type first)', function () {
-    it('should parse correctly', function () {
-      const str = `getTime(int count)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(str);
-    });
-
-    it('should handle public visibility', function () {
-      const str = `+getTime(int count)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('+getTime(int count)');
-    });
-
-    it('should handle private visibility', function () {
-      const str = `-getTime(int count)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('-getTime(int count)');
-    });
-
-    it('should handle protected visibility', function () {
-      const str = `#getTime(int count)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('#getTime(int count)');
-    });
-
-    it('should handle internal visibility', function () {
-      const str = `~getTime(int count)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('~getTime(int count)');
-    });
-
-    it('should return correct css for static classifier', function () {
-      const str = `getTime(int count)$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(int count)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should return correct css for abstract classifier', function () {
-      const str = `getTime(int count)*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(int count)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should return correct css for abstract static classifier', function () {
-      const str = `getTime(int count)*$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(int count)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should return correct css for static abstract classifier', function () {
-      const str = `getTime(int count)$*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(int count)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-
-  describe('when method has single parameter type and name (name first)', function () {
-    it('should parse correctly', function () {
-      const str = `getTime(count int)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(str);
-    });
-
-    it('should handle public visibility', function () {
-      const str = `+getTime(count int)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('+getTime(count int)');
-    });
-
-    it('should handle private visibility', function () {
-      const str = `-getTime(count int)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('-getTime(count int)');
-    });
-
-    it('should handle protected visibility', function () {
-      const str = `#getTime(count int)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('#getTime(count int)');
-    });
-
-    it('should handle internal visibility', function () {
-      const str = `~getTime(count int)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('~getTime(count int)');
-    });
-
-    it('should return correct css for static classifier', function () {
-      const str = `getTime(count int)$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(count int)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should return correct css for abstract classifier', function () {
-      const str = `getTime(count int)*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(count int)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should return correct css for abstract static classifier', function () {
-      const str = `getTime(count int)*$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(count int)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should return correct css for static abstract classifier', function () {
-      const str = `getTime(count int)$*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(count int)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-
-  describe('when method has multiple parameters', function () {
-    it('should parse correctly', function () {
-      const str = `getTime(string text, int count)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(str);
-    });
-
-    it('should handle public visibility', function () {
-      const str = `+getTime(string text, int count)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(str);
-    });
-
-    it('should handle private visibility', function () {
-      const str = `-getTime(string text, int count)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(str);
-    });
-
-    it('should handle protected visibility', function () {
-      const str = `#getTime(string text, int count)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(str);
-    });
-
-    it('should handle internal visibility', function () {
-      const str = `~getTime(string text, int count)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(str);
-    });
-
-    it('should return correct css for static classifier', function () {
-      const str = `getTime(string text, int count)$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(string text, int count)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should return correct css for abstract classifier', function () {
-      const str = `getTime(string text, int count)*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(string text, int count)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should return correct css for abstract static classifier', function () {
-      const str = `getTime(string text, int count)*$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(string text, int count)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should return correct css for static abstract classifier', function () {
-      const str = `getTime(string text, int count)$*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime(string text, int count)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-
-  describe('when method has return type', function () {
-    it('should parse correctly', function () {
-      const str = `getTime() DateTime`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime() : DateTime');
-    });
-
-    it('should handle public visibility', function () {
-      const str = `+getTime() DateTime`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('+getTime() : DateTime');
-    });
-
-    it('should handle private visibility', function () {
-      const str = `-getTime() DateTime`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('-getTime() : DateTime');
-    });
-
-    it('should handle protected visibility', function () {
-      const str = `#getTime() DateTime`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('#getTime() : DateTime');
-    });
-
-    it('should handle internal visibility', function () {
-      const str = `~getTime() DateTime`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('~getTime() : DateTime');
-    });
-
-    it('should return correct css for static classifier', function () {
-      const str = `getTime() DateTime$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime() : DateTime');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should return correct css for abstract classifier', function () {
-      const str = `getTime()  DateTime*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime() : DateTime');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should return correct css for abstract static classifier', function () {
-      const str = `getTime()  DateTime*$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime() : DateTime');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should return correct css for static abstract classifier', function () {
-      const str = `getTime()  DateTime$*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTime() : DateTime');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-
-  describe('when method parameter is generic', function () {
-    it('should parse correctly', function () {
-      const str = `getTimes(List~T~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>)');
-    });
-
-    it('should handle public visibility', function () {
-      const str = `+getTimes(List~T~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('+getTimes(List<T>)');
-    });
-
-    it('should handle private visibility', function () {
-      const str = `-getTimes(List~T~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('-getTimes(List<T>)');
-    });
-
-    it('should handle protected visibility', function () {
-      const str = `#getTimes(List~T~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('#getTimes(List<T>)');
-    });
-
-    it('should handle internal visibility', function () {
-      const str = `~getTimes(List~T~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('~getTimes(List<T>)');
-    });
-
-    it('should return correct css for static classifier', function () {
-      const str = `getTimes(List~T~)$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should return correct css for abstract classifier', function () {
-      const str = `getTimes(List~T~)*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should return correct css for abstract static classifier', function () {
-      const str = `getTimes(List~T~)*$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should return correct css for static abstract classifier', function () {
-      const str = `getTimes(List~T~)$*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-
-  describe('when method parameter contains two generic', function () {
-    it('should parse correctly', function () {
-      const str = `getTimes(List~T~, List~OT~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>, List<OT>)');
-    });
-
-    it('should handle public visibility', function () {
-      const str = `+getTimes(List~T~, List~OT~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('+getTimes(List<T>, List<OT>)');
-    });
-
-    it('should handle private visibility', function () {
-      const str = `-getTimes(List~T~, List~OT~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('-getTimes(List<T>, List<OT>)');
-    });
-
-    it('should handle protected visibility', function () {
-      const str = `#getTimes(List~T~, List~OT~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('#getTimes(List<T>, List<OT>)');
-    });
-
-    it('should handle internal visibility', function () {
-      const str = `~getTimes(List~T~, List~OT~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('~getTimes(List<T>, List<OT>)');
-    });
-
-    it('should return correct css for static classifier', function () {
-      const str = `getTimes(List~T~, List~OT~)$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>, List<OT>)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should return correct css for abstract classifier', function () {
-      const str = `getTimes(List~T~, List~OT~)*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>, List<OT>)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should return correct css for abstract static classifier', function () {
-      const str = `getTimes(List~T~, List~OT~)*$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>, List<OT>)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should return correct css for static abstract classifier', function () {
-      const str = `getTimes(List~T~, List~OT~)$*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>, List<OT>)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-
-  describe('when method parameter is a nested generic', function () {
-    it('should parse correctly', function () {
-      const str = `getTimetableList(List~List~T~~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimetableList(List<List<T>>)');
-    });
-
-    it('should handle public visibility', function () {
-      const str = `+getTimetableList(List~List~T~~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('+getTimetableList(List<List<T>>)');
-    });
-
-    it('should handle private visibility', function () {
-      const str = `-getTimetableList(List~List~T~~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('-getTimetableList(List<List<T>>)');
-    });
-
-    it('should handle protected visibility', function () {
-      const str = `#getTimetableList(List~List~T~~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('#getTimetableList(List<List<T>>)');
-    });
-
-    it('should handle internal visibility', function () {
-      const str = `~getTimetableList(List~List~T~~)`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('~getTimetableList(List<List<T>>)');
-    });
-
-    it('should return correct css for static classifier', function () {
-      const str = `getTimetableList(List~List~T~~)$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimetableList(List<List<T>>)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should return correct css for abstract classifier', function () {
-      const str = `getTimetableList(List~List~T~~)*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimetableList(List<List<T>>)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should return correct css for abstract static classifier', function () {
-      const str = `getTimetableList(List~List~T~~)*$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimetableList(List<List<T>>)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should return correct css for static abstract classifier', function () {
-      const str = `getTimetableList(List~List~T~~)$*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimetableList(List<List<T>>)');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-
-  describe('when method parameter is a composite generic', function () {
-    const methodNameAndParameters = 'getTimes(List~K, V~)';
-    const expectedMethodNameAndParameters = 'getTimes(List<K, V>)';
-    it('should parse correctly', function () {
-      const str = methodNameAndParameters;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(expectedMethodNameAndParameters);
-    });
-
-    it('should handle public visibility', function () {
-      const str = '+' + methodNameAndParameters;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(
-        '+' + expectedMethodNameAndParameters
-      );
-    });
-
-    it('should handle private visibility', function () {
-      const str = '-' + methodNameAndParameters;
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(
-        '-' + expectedMethodNameAndParameters
-      );
-    });
-
-    it('should handle protected visibility', function () {
-      const str = '#' + methodNameAndParameters;
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(
-        '#' + expectedMethodNameAndParameters
-      );
-    });
-
-    it('should handle internal visibility', function () {
-      const str = '~' + methodNameAndParameters;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(
-        '~' + expectedMethodNameAndParameters
-      );
-    });
-
-    it('should return correct css for static classifier', function () {
-      const str = methodNameAndParameters + '$';
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(expectedMethodNameAndParameters);
-      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should return correct css for abstract classifier', function () {
-      const str = methodNameAndParameters + '*';
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(expectedMethodNameAndParameters);
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should return correct css for abstract static classifier', function () {
-      const str = methodNameAndParameters + '*$';
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(expectedMethodNameAndParameters);
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should return correct css for static abstract classifier', function () {
-      const str = methodNameAndParameters + '$*';
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(expectedMethodNameAndParameters);
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-
-  describe('when method return type is generic', function () {
-    it('should parse correctly', function () {
-      const str = `getTimes() List~T~`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes() : List<T>');
-    });
-
-    it('should handle public visibility', function () {
-      const str = `+getTimes() List~T~`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('+getTimes() : List<T>');
-    });
-
-    it('should handle private visibility', function () {
-      const str = `-getTimes() List~T~`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('-getTimes() : List<T>');
-    });
-
-    it('should handle protected visibility', function () {
-      const str = `#getTimes() List~T~`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('#getTimes() : List<T>');
-    });
-
-    it('should handle internal visibility', function () {
-      const str = `~getTimes() List~T~`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('~getTimes() : List<T>');
-    });
-
-    it('should return correct css for static classifier', function () {
-      const str = `getTimes() List~T~$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes() : List<T>');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should return correct css for abstract classifier', function () {
-      const str = `getTimes() List~T~*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes() : List<T>');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should return correct css for abstract static classifier', function () {
-      const str = `getTimes() List~T~*$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes() : List<T>');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should return correct css for static abstract classifier', function () {
-      const str = `getTimes() List~T~$*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getTimes() : List<T>');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-
-  describe('when method return type is a nested generic', function () {
-    it('should parse correctly', function () {
-      const str = `getTimetableList() List~List~T~~`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(
-        'getTimetableList() : List<List<T>>'
-      );
-    });
-
-    it('should handle public visibility', function () {
-      const str = `+getTimetableList() List~List~T~~`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(
-        '+getTimetableList() : List<List<T>>'
-      );
-    });
-
-    it('should handle private visibility', function () {
-      const str = `-getTimetableList() List~List~T~~`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(
-        '-getTimetableList() : List<List<T>>'
-      );
-    });
-
-    it('should handle protected visibility', function () {
-      const str = `#getTimetableList() List~List~T~~`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(
-        '#getTimetableList() : List<List<T>>'
-      );
-    });
-
-    it('should handle internal visibility', function () {
-      const str = `~getTimetableList() List~List~T~~`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(
-        '~getTimetableList() : List<List<T>>'
-      );
-    });
-
-    it('should return correct css for static classifier', function () {
-      const str = `getTimetableList() List~List~T~~$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(
-        'getTimetableList() : List<List<T>>'
-      );
-      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
-    });
-
-    it('should return correct css for abstract classifier', function () {
-      const str = `getTimetableList() List~List~T~~*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(
-        'getTimetableList() : List<List<T>>'
-      );
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
-    });
-
-    it('should return correct css for abstract static classifier', function () {
-      const str = `getTimetableList() List~List~T~~*$`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(
-        'getTimetableList() : List<List<T>>'
-      );
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-
-    it('should return correct css for static abstract classifier', function () {
-      const str = `getTimetableList() List~List~T~~$*`;
-
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe(
-        'getTimetableList() : List<List<T>>'
-      );
-      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractStaticCssStyle);
-    });
-  });
-});
--- a/packages/mermaid/src/diagrams/class/classTypes.spec.ts
+++ b/packages/mermaid/src/diagrams/class/classTypes.spec.ts
@@ -4,9 +4,664 @@ const spyOn = vi.spyOn;

 const staticCssStyle = 'text-decoration:underline;';
 const abstractCssStyle = 'font-style:italic;';
-const abstractStaticCssStyle = 'text-decoration:underline;font-style:italic;';

 describe('given text representing a method, ', function () {
+  describe('when method has no parameters', function () {
+    it('should parse correctly', function () {
+      const str = `getTime()`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(str);
+    });
+
+    it('should handle public visibility', function () {
+      const str = `+getTime()`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('+getTime()');
+    });
+
+    it('should handle private visibility', function () {
+      const str = `-getTime()`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('-getTime()');
+    });
+
+    it('should handle protected visibility', function () {
+      const str = `#getTime()`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('#getTime()');
+    });
+
+    it('should handle internal visibility', function () {
+      const str = `~getTime()`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('~getTime()');
+    });
+
+    it('should return correct css for static classifier', function () {
+      const str = `getTime()$`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTime()');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
+    });
+
+    it('should return correct css for abstract classifier', function () {
+      const str = `getTime()*`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTime()');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
+    });
+  });
+
+  describe('when method has single parameter value', function () {
+    it('should parse correctly', function () {
+      const str = `getTime(int)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(str);
+    });
+
+    it('should handle public visibility', function () {
+      const str = `+getTime(int)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('+getTime(int)');
+    });
+
+    it('should handle private visibility', function () {
+      const str = `-getTime(int)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('-getTime(int)');
+    });
+
+    it('should handle protected visibility', function () {
+      const str = `#getTime(int)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('#getTime(int)');
+    });
+
+    it('should handle internal visibility', function () {
+      const str = `~getTime(int)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('~getTime(int)');
+    });
+
+    it('should return correct css for static classifier', function () {
+      const str = `getTime(int)$`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTime(int)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
+    });
+
+    it('should return correct css for abstract classifier', function () {
+      const str = `getTime(int)*`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTime(int)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
+    });
+  });
+
+  describe('when method has single parameter type and name (type first)', function () {
+    it('should parse correctly', function () {
+      const str = `getTime(int count)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(str);
+    });
+
+    it('should handle public visibility', function () {
+      const str = `+getTime(int count)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('+getTime(int count)');
+    });
+
+    it('should handle private visibility', function () {
+      const str = `-getTime(int count)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('-getTime(int count)');
+    });
+
+    it('should handle protected visibility', function () {
+      const str = `#getTime(int count)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('#getTime(int count)');
+    });
+
+    it('should handle internal visibility', function () {
+      const str = `~getTime(int count)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('~getTime(int count)');
+    });
+
+    it('should return correct css for static classifier', function () {
+      const str = `getTime(int count)$`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTime(int count)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
+    });
+
+    it('should return correct css for abstract classifier', function () {
+      const str = `getTime(int count)*`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTime(int count)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
+    });
+  });
+
+  describe('when method has single parameter type and name (name first)', function () {
+    it('should parse correctly', function () {
+      const str = `getTime(count int)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(str);
+    });
+
+    it('should handle public visibility', function () {
+      const str = `+getTime(count int)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('+getTime(count int)');
+    });
+
+    it('should handle private visibility', function () {
+      const str = `-getTime(count int)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('-getTime(count int)');
+    });
+
+    it('should handle protected visibility', function () {
+      const str = `#getTime(count int)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('#getTime(count int)');
+    });
+
+    it('should handle internal visibility', function () {
+      const str = `~getTime(count int)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('~getTime(count int)');
+    });
+
+    it('should return correct css for static classifier', function () {
+      const str = `getTime(count int)$`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTime(count int)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
+    });
+
+    it('should return correct css for abstract classifier', function () {
+      const str = `getTime(count int)*`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTime(count int)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
+    });
+  });
+
+  describe('when method has multiple parameters', function () {
+    it('should parse correctly', function () {
+      const str = `getTime(string text, int count)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(str);
+    });
+
+    it('should handle public visibility', function () {
+      const str = `+getTime(string text, int count)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(str);
+    });
+
+    it('should handle private visibility', function () {
+      const str = `-getTime(string text, int count)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(str);
+    });
+
+    it('should handle protected visibility', function () {
+      const str = `#getTime(string text, int count)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(str);
+    });
+
+    it('should handle internal visibility', function () {
+      const str = `~getTime(string text, int count)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(str);
+    });
+
+    it('should return correct css for static classifier', function () {
+      const str = `getTime(string text, int count)$`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTime(string text, int count)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
+    });
+
+    it('should return correct css for abstract classifier', function () {
+      const str = `getTime(string text, int count)*`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTime(string text, int count)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
+    });
+  });
+
+  describe('when method has return type', function () {
+    it('should parse correctly', function () {
+      const str = `getTime() DateTime`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTime() : DateTime');
+    });
+
+    it('should handle public visibility', function () {
+      const str = `+getTime() DateTime`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('+getTime() : DateTime');
+    });
+
+    it('should handle private visibility', function () {
+      const str = `-getTime() DateTime`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('-getTime() : DateTime');
+    });
+
+    it('should handle protected visibility', function () {
+      const str = `#getTime() DateTime`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('#getTime() : DateTime');
+    });
+
+    it('should handle internal visibility', function () {
+      const str = `~getTime() DateTime`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('~getTime() : DateTime');
+    });
+
+    it('should return correct css for static classifier', function () {
+      const str = `getTime() DateTime$`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTime() : DateTime');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
+    });
+
+    it('should return correct css for abstract classifier', function () {
+      const str = `getTime()  DateTime*`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTime() : DateTime');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
+    });
+  });
+
+  describe('when method parameter is generic', function () {
+    it('should parse correctly', function () {
+      const str = `getTimes(List~T~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>)');
+    });
+
+    it('should handle public visibility', function () {
+      const str = `+getTimes(List~T~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('+getTimes(List<T>)');
+    });
+
+    it('should handle private visibility', function () {
+      const str = `-getTimes(List~T~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('-getTimes(List<T>)');
+    });
+
+    it('should handle protected visibility', function () {
+      const str = `#getTimes(List~T~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('#getTimes(List<T>)');
+    });
+
+    it('should handle internal visibility', function () {
+      const str = `~getTimes(List~T~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('~getTimes(List<T>)');
+    });
+
+    it('should return correct css for static classifier', function () {
+      const str = `getTimes(List~T~)$`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
+    });
+
+    it('should return correct css for abstract classifier', function () {
+      const str = `getTimes(List~T~)*`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
+    });
+  });
+
+  describe('when method parameter contains two generic', function () {
+    it('should parse correctly', function () {
+      const str = `getTimes(List~T~, List~OT~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>, List<OT>)');
+    });
+
+    it('should handle public visibility', function () {
+      const str = `+getTimes(List~T~, List~OT~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('+getTimes(List<T>, List<OT>)');
+    });
+
+    it('should handle private visibility', function () {
+      const str = `-getTimes(List~T~, List~OT~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('-getTimes(List<T>, List<OT>)');
+    });
+
+    it('should handle protected visibility', function () {
+      const str = `#getTimes(List~T~, List~OT~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('#getTimes(List<T>, List<OT>)');
+    });
+
+    it('should handle internal visibility', function () {
+      const str = `~getTimes(List~T~, List~OT~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('~getTimes(List<T>, List<OT>)');
+    });
+
+    it('should return correct css for static classifier', function () {
+      const str = `getTimes(List~T~, List~OT~)$`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>, List<OT>)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
+    });
+
+    it('should return correct css for abstract classifier', function () {
+      const str = `getTimes(List~T~, List~OT~)*`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTimes(List<T>, List<OT>)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
+    });
+  });
+
+  describe('when method parameter is a nested generic', function () {
+    it('should parse correctly', function () {
+      const str = `getTimetableList(List~List~T~~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTimetableList(List<List<T>>)');
+    });
+
+    it('should handle public visibility', function () {
+      const str = `+getTimetableList(List~List~T~~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('+getTimetableList(List<List<T>>)');
+    });
+
+    it('should handle private visibility', function () {
+      const str = `-getTimetableList(List~List~T~~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('-getTimetableList(List<List<T>>)');
+    });
+
+    it('should handle protected visibility', function () {
+      const str = `#getTimetableList(List~List~T~~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('#getTimetableList(List<List<T>>)');
+    });
+
+    it('should handle internal visibility', function () {
+      const str = `~getTimetableList(List~List~T~~)`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('~getTimetableList(List<List<T>>)');
+    });
+
+    it('should return correct css for static classifier', function () {
+      const str = `getTimetableList(List~List~T~~)$`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTimetableList(List<List<T>>)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
+    });
+
+    it('should return correct css for abstract classifier', function () {
+      const str = `getTimetableList(List~List~T~~)*`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTimetableList(List<List<T>>)');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
+    });
+  });
+
+  describe('when method parameter is a composite generic', function () {
+    const methodNameAndParameters = 'getTimes(List~K, V~)';
+    const expectedMethodNameAndParameters = 'getTimes(List<K, V>)';
+    it('should parse correctly', function () {
+      const str = methodNameAndParameters;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(expectedMethodNameAndParameters);
+    });
+
+    it('should handle public visibility', function () {
+      const str = '+' + methodNameAndParameters;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(
+        '+' + expectedMethodNameAndParameters
+      );
+    });
+
+    it('should handle private visibility', function () {
+      const str = '-' + methodNameAndParameters;
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(
+        '-' + expectedMethodNameAndParameters
+      );
+    });
+
+    it('should handle protected visibility', function () {
+      const str = '#' + methodNameAndParameters;
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(
+        '#' + expectedMethodNameAndParameters
+      );
+    });
+
+    it('should handle internal visibility', function () {
+      const str = '~' + methodNameAndParameters;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(
+        '~' + expectedMethodNameAndParameters
+      );
+    });
+
+    it('should return correct css for static classifier', function () {
+      const str = methodNameAndParameters + '$';
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(expectedMethodNameAndParameters);
+      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
+    });
+
+    it('should return correct css for abstract classifier', function () {
+      const str = methodNameAndParameters + '*';
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(expectedMethodNameAndParameters);
+      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
+    });
+  });
+
+  describe('when method return type is generic', function () {
+    it('should parse correctly', function () {
+      const str = `getTimes() List~T~`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTimes() : List<T>');
+    });
+
+    it('should handle public visibility', function () {
+      const str = `+getTimes() List~T~`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('+getTimes() : List<T>');
+    });
+
+    it('should handle private visibility', function () {
+      const str = `-getTimes() List~T~`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('-getTimes() : List<T>');
+    });
+
+    it('should handle protected visibility', function () {
+      const str = `#getTimes() List~T~`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('#getTimes() : List<T>');
+    });
+
+    it('should handle internal visibility', function () {
+      const str = `~getTimes() List~T~`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('~getTimes() : List<T>');
+    });
+
+    it('should return correct css for static classifier', function () {
+      const str = `getTimes() List~T~$`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTimes() : List<T>');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
+    });
+
+    it('should return correct css for abstract classifier', function () {
+      const str = `getTimes() List~T~*`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe('getTimes() : List<T>');
+      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
+    });
+  });
+
+  describe('when method return type is a nested generic', function () {
+    it('should parse correctly', function () {
+      const str = `getTimetableList() List~List~T~~`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(
+        'getTimetableList() : List<List<T>>'
+      );
+    });
+
+    it('should handle public visibility', function () {
+      const str = `+getTimetableList() List~List~T~~`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(
+        '+getTimetableList() : List<List<T>>'
+      );
+    });
+
+    it('should handle private visibility', function () {
+      const str = `-getTimetableList() List~List~T~~`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(
+        '-getTimetableList() : List<List<T>>'
+      );
+    });
+
+    it('should handle protected visibility', function () {
+      const str = `#getTimetableList() List~List~T~~`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(
+        '#getTimetableList() : List<List<T>>'
+      );
+    });
+
+    it('should handle internal visibility', function () {
+      const str = `~getTimetableList() List~List~T~~`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(
+        '~getTimetableList() : List<List<T>>'
+      );
+    });
+
+    it('should return correct css for static classifier', function () {
+      const str = `getTimetableList() List~List~T~~$`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(
+        'getTimetableList() : List<List<T>>'
+      );
+      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
+    });
+
+    it('should return correct css for abstract classifier', function () {
+      const str = `getTimetableList() List~List~T~~*`;
+
+      const classMember = new ClassMember(str, 'method');
+      expect(classMember.getDisplayDetails().displayText).toBe(
+        'getTimetableList() : List<List<T>>'
+      );
+      expect(classMember.getDisplayDetails().cssStyle).toBe(abstractCssStyle);
+    });
+  });
+
  describe('--uncategorized tests--', function () {
    it('member name should handle double colons', function () {
      const str = `std::map ~int,string~ pMap;`;
@@ -25,82 +680,83 @@ describe('given text representing a method, ', function () {
      expect(classMember.getDisplayDetails().cssStyle).toBe(staticCssStyle);
    });
  });
+});

-  describe('Edge Cases and Additional Scenarios', () => {
-    it('should handle method with special characters in name', function () {
-      const str = `operator++(int value)`;
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('operator++(int value)');
-      expect(classMember.id).toBe('operator++');
+describe('given text representing an attribute', () => {
+  describe('when the attribute has no modifiers', () => {
+    it('should parse the display text correctly', () => {
+      const str = 'name String';
+
+      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
+
+      expect(displayDetails.displayText).toBe('name String');
+      expect(displayDetails.cssStyle).toBe('');
    });
+  });

-    it('should handle method with numbers in name', function () {
-      const str = `method123(param)`;
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('method123(param)');
-      expect(classMember.id).toBe('method123');
+  describe('when the attribute has public "+" modifier', () => {
+    it('should parse the display text correctly', () => {
+      const str = '+name String';
+
+      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
+
+      expect(displayDetails.displayText).toBe('+name String');
+      expect(displayDetails.cssStyle).toBe('');
    });
+  });

-    it('should handle method with underscores and hyphens', function () {
-      const str = `get_user_data(user_id int)`;
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('get_user_data(user_id int)');
-      expect(classMember.id).toBe('get_user_data');
+  describe('when the attribute has protected "#" modifier', () => {
+    it('should parse the display text correctly', () => {
+      const str = '#name String';
+
+      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
+
+      expect(displayDetails.displayText).toBe('#name String');
+      expect(displayDetails.cssStyle).toBe('');
    });
+  });

-    it('should handle method with no spaces around parentheses', function () {
-      const str = `method(param)`;
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('method(param)');
+  describe('when the attribute has private "-" modifier', () => {
+    it('should parse the display text correctly', () => {
+      const str = '-name String';
+
+      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
+
+      expect(displayDetails.displayText).toBe('-name String');
+      expect(displayDetails.cssStyle).toBe('');
    });
+  });

-    it('should handle method with array parameters', function () {
-      const str = `processArray(int[] numbers)`;
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('processArray(int[] numbers)');
+  describe('when the attribute has internal "~" modifier', () => {
+    it('should parse the display text correctly', () => {
+      const str = '~name String';
+
+      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
+
+      expect(displayDetails.displayText).toBe('~name String');
+      expect(displayDetails.cssStyle).toBe('');
    });
+  });

-    it('should handle method with function pointer parameter', function () {
-      const str = `callback(void (*fn)(int))`;
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('callback(void (*fn)(int))');
+  describe('when the attribute has static "$" modifier', () => {
+    it('should parse the display text correctly and apply static css style', () => {
+      const str = 'name String$';
+
+      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();
+
+      expect(displayDetails.displayText).toBe('name String');
+      expect(displayDetails.cssStyle).toBe(staticCssStyle);
    });
+  });

-    it('should handle method with complex nested generics (HTML encoded)', function () {
-      const str = `process(Map<String, List<Map<Integer, String>>> data)`;
-      const classMember = new ClassMember(str, 'method');
-      // Current behavior: parseGenericTypes converts < > to HTML entities
-      expect(classMember.getDisplayDetails().displayText).toBe('process(Map&gt;&gt; data)');
-    });
+  describe('when the attribute has abstract "*" modifier', () => {
+    it('should parse the display text correctly and apply abstract css style', () => {
+      const str = 'name String*';

-    it('should handle method with colon in return type', function () {
-      const str = `getNamespace() std::string`;
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('getNamespace() : std::string');
-    });
+      const displayDetails = new ClassMember(str, 'attribute').getDisplayDetails();

-    it('should handle malformed input gracefully - no parentheses', function () {
-      const str = `not_a_method_missing_parentheses`;
-      const classMember = new ClassMember(str, 'method');
-      // This will not match the method regex, so should handle gracefully
-      // But currently throws when parseGenericTypes gets undefined
-      expect(() => classMember.getDisplayDetails()).toThrow();
-    });
-
-    it('should handle empty parameter list with classifier', function () {
-      const str = `emptyMethod()$*`;
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('emptyMethod()');
-      expect(classMember.getDisplayDetails().cssStyle).toBe(
-        'text-decoration:underline;font-style:italic;'
-      );
-    });
-
-    it('should handle method with constructor-like name', function () {
-      const str = `Class()`;
-      const classMember = new ClassMember(str, 'method');
-      expect(classMember.getDisplayDetails().displayText).toBe('Class()');
-      expect(classMember.id).toBe('Class');
+      expect(displayDetails.displayText).toBe('name String');
+      expect(displayDetails.cssStyle).toBe(abstractCssStyle);
    });
  });
 });
--- a/packages/mermaid/src/diagrams/class/classTypes.ts
+++ b/packages/mermaid/src/diagrams/class/classTypes.ts
@@ -81,42 +81,64 @@ export class ClassMember {
    let potentialClassifier = '';

    if (this.memberType === 'method') {
-      const methodRegEx = /([#+~-])?(.+)\((.*)\)([$*]{0,2})(.*?)([$*]{0,2})$/;
+      const methodRegEx = /([#+~-])?(.+)\((.*)\)([\s$*])?(.*)([$*])?/;
      const match = methodRegEx.exec(input);
      if (match) {
-        this.visibility = (match[1] ? match[1].trim() : '') as Visibility;
-        this.id = match[2].trim();
+        const detectedVisibility = match[1] ? match[1].trim() : '';
+
+        if (visibilityValues.includes(detectedVisibility)) {
+          this.visibility = detectedVisibility as Visibility;
+        }
+
+        this.id = match[2];
        this.parameters = match[3] ? match[3].trim() : '';
        potentialClassifier = match[4] ? match[4].trim() : '';
        this.returnType = match[5] ? match[5].trim() : '';

        if (potentialClassifier === '') {
-          potentialClassifier = match[6] ? match[6].trim() : '';
+          const lastChar = this.returnType.substring(this.returnType.length - 1);
+          if (/[$*]/.exec(lastChar)) {
+            potentialClassifier = lastChar;
+            this.returnType = this.returnType.substring(0, this.returnType.length - 1);
+          }
        }
      }
    } else {
-      const fieldRegEx = /([#+~-])?(.*?)([$*]{0,2})$/;
-      const match = fieldRegEx.exec(input);
+      const length = input.length;
+      const firstChar = input.substring(0, 1);
+      const lastChar = input.substring(length - 1);

-      if (match) {
-        this.visibility = (match[1] ? match[1].trim() : '') as Visibility;
-        this.id = match[2] ? match[2].trim() : '';
-        potentialClassifier = match[3] ? match[3].trim() : '';
+      if (visibilityValues.includes(firstChar)) {
+        this.visibility = firstChar as Visibility;
      }
+
+      if (/[$*]/.exec(lastChar)) {
+        potentialClassifier = lastChar;
+      }
+
+      this.id = input.substring(
+        this.visibility === '' ? 0 : 1,
+        potentialClassifier === '' ? length : length - 1
+      );
    }

    this.classifier = potentialClassifier;
+    // Preserve one space only
+    this.id = this.id.startsWith(' ') ? ' ' + this.id.trim() : this.id.trim();
+
+    const combinedText = `${this.visibility ? '\\' + this.visibility : ''}${parseGenericTypes(this.id)}${this.memberType === 'method' ? `(${parseGenericTypes(this.parameters)})${this.returnType ? ' : ' + parseGenericTypes(this.returnType) : ''}` : ''}`;
+    this.text = combinedText.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+    if (this.text.startsWith('\\&lt;')) {
+      this.text = this.text.replace('\\&lt;', '~');
+    }
  }

  parseClassifier() {
    switch (this.classifier) {
-      case '$':
-        return 'text-decoration:underline;';
      case '*':
        return 'font-style:italic;';
-      case '$*':
-      case '*$':
-        return 'text-decoration:underline;font-style:italic;';
+      case '$':
+        return 'text-decoration:underline;';
      default:
        return '';
    }
--- a/packages/mermaid/src/diagrams/class/styles.js
+++ b/packages/mermaid/src/diagrams/class/styles.js
@@ -13,6 +13,30 @@ const getStyles = (options) =>

 }

+  .cluster-label text {
+    fill: ${options.titleColor};
+  }
+  .cluster-label span {
+    color: ${options.titleColor};
+  }
+  .cluster-label span p {
+    background-color: transparent;
+  }
+
+  .cluster rect {
+    fill: ${options.clusterBkg};
+    stroke: ${options.clusterBorder};
+    stroke-width: 1px;
+  }
+
+  .cluster text {
+    fill: ${options.titleColor};
+  }
+
+  .cluster span {
+    color: ${options.titleColor};
+  }
+
 .nodeLabel, .edgeLabel {
  color: ${options.classText};
 }
--- a/packages/mermaid/src/docs/package.json
+++ b/packages/mermaid/src/docs/package.json
@@ -19,7 +19,7 @@
    "@mdi/font": "^7.4.47",
    "@vueuse/core": "^13.9.0",
    "font-awesome": "^4.7.0",
-    "jiti": "^2.4.2",
+    "jiti": "^2.6.1",
    "mermaid": "workspace:^",
    "vue": "^3.5.21"
  },
--- a/packages/mermaid/src/docs/syntax/classDiagram.md
+++ b/packages/mermaid/src/docs/syntax/classDiagram.md
@@ -175,7 +175,6 @@ To describe the visibility (or encapsulation) of an attribute or method/function
 >
 > - `*` Abstract e.g.: `someAbstractMethod()*` or `someAbstractMethod() int*`
 > - `$` Static e.g.: `someStaticMethod()$` or `someStaticMethod() String$`
-> - `$*` OR `*$` Both e.g: `someAbstractStaticMethod()$*` or `someAbstractStaticMethod() int$*`

 > _note_ you can also include additional _classifiers_ to a field definition by adding the following notation to the very end:
 >
--- a/packages/mermaid/src/rendering-util/rendering-elements/markers.js
+++ b/packages/mermaid/src/rendering-util/rendering-elements/markers.js
@@ -130,7 +130,6 @@ const lollipop = (elem, type, id) => {
    .attr('markerHeight', 240)
    .attr('orient', 'auto')
    .append('circle')
-    .attr('stroke', 'black')
    .attr('fill', 'transparent')
    .attr('cx', 7)
    .attr('cy', 7)
@@ -147,7 +146,6 @@ const lollipop = (elem, type, id) => {
    .attr('markerHeight', 240)
    .attr('orient', 'auto')
    .append('circle')
-    .attr('stroke', 'black')
    .attr('fill', 'transparent')
    .attr('cx', 7)
    .attr('cy', 7)
--- a/packages/parser/package.json
+++ b/packages/parser/package.json
@@ -33,7 +33,7 @@
    "ast"
  ],
  "dependencies": {
-    "langium": "3.3.1"
+    "langium": "3.5.0"
  },
  "devDependencies": {
    "chevrotain": "^11.0.3"
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
Author	SHA1	Message	Date
renovate[bot]	423fe9626e	fix(deps): update all minor dependencies	2025-10-11 21:00:29 +00:00
Justin Greywolf	d80a638e55	Merge pull request #6023 from yari-dewalt/fix_lollipop_stroke Fix: Delete 'stroke: black' from lollipop marker so it matches themes and edge paths	2025-10-11 20:43:08 +00:00
Justin Greywolf	7a869c08a2	Merge pull request #6026 from yari-dewalt/bug/5669_class-diagram-fix-namespace-themes Fix: Class diagram namespaces black lines, not responding to theme variables	2025-10-11 20:42:53 +00:00
Justin Greywolf	44e8cbb1de	Merge branch 'develop' into bug/5669_class-diagram-fix-namespace-themes	2025-10-11 13:27:47 -07:00
Justin Greywolf	efe38b8425	Merge branch 'develop' into fix_lollipop_stroke	2025-10-11 13:26:59 -07:00
autofix-ci[bot]	47297f7c26	[autofix.ci] apply automated fixes	2025-02-26 17:49:51 +00:00
Yari DeWalt	967aa0629e	Merge branch 'develop' into bug/5669_class-diagram-fix-namespace-themes	2025-02-26 09:45:14 -08:00
Yari DeWalt	04b20a79b9	Merge branch 'develop' into fix_lollipop_stroke	2025-02-26 09:20:16 -08:00
yari-dewalt	4ff2ae9f4e	Add styles for clusters and remove hard-coded styling for namespace nodes	2024-11-06 09:00:21 -08:00
Yari DeWalt	7a729e8f16	Merge branch 'develop' into fix_lollipop_stroke	2024-11-04 10:21:00 -08:00
yari-dewalt	3c7fd95617	Remove black stroke from lollipops so it matches edge paths	2024-11-04 10:15:51 -08:00
@@ -1 +1 @@
 .14.0
 .20.0