update tests

Release live editor

.eslintrc.cjs

@@ -5,9 +5,19 @@ module.exports = {
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended',
     // 'plugin:@typescript-eslint/recommended-requiring-type-checking',
+    'plugin:@typescript-eslint/strict',
+    'plugin:unicorn/recommended',
     'prettier'
   ],
-  plugins: ['svelte3', 'tailwindcss', '@typescript-eslint', 'es', 'vitest'],
+  plugins: [
+    'svelte3',
+    'tailwindcss',
+    '@typescript-eslint',
+    'es',
+    'vitest',
+    'no-only-tests',
+    'unicorn'
+  ],
   ignorePatterns: [
     'docs/*',
     '*.cjs',
@@ -19,7 +29,19 @@ module.exports = {
     'package.json',
     'tsconfig.json'
   ],
-  overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
+  overrides: [
+    { files: ['*.svelte'], processor: 'svelte3/svelte3' },
+    {
+      files: ['*.ts'],
+      extends: [
+        'eslint:recommended',
+        'plugin:@typescript-eslint/recommended',
+        'plugin:@typescript-eslint/recommended-requiring-type-checking',
+        'plugin:@typescript-eslint/strict',
+        'prettier'
+      ]
+    }
+  ],
   settings: {
     'svelte3/typescript': () => require('typescript')
   },
@@ -45,6 +67,34 @@ module.exports = {
     '@typescript-eslint/no-unsafe-member-access': 'off',
     '@typescript-eslint/no-unsafe-assignment': 'off',
     'es/no-regexp-lookbehind-assertions': 'error',
-    curly: ['error', 'all']
+    curly: ['error', 'all'],
+    'no-only-tests/no-only-tests': 'error',
+    'unicorn/no-null': 'off',
+    'unicorn/filename-case': [
+      'error',
+      {
+        case: 'camelCase'
+      }
+    ],
+    'unicorn/prevent-abbreviations': [
+      'error',
+      {
+        allowList: {
+          ctx: true,
+          db: true,
+          doc: true,
+          env: true,
+          fn: true,
+          i: true,
+          param: true,
+          req: true,
+          res: true,
+          str: true,
+          searchParams: true,
+          temp: true,
+          ImportMetaEnv: true
+        }
+      }
+    ]
   }
 };

.github/workflows/deploy.yml

@@ -16,7 +16,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: '16'
+          node-version: 18
           cache: yarn
 
       - name: Build & Deploy

.github/workflows/release-pr.yml

@@ -0,0 +1,21 @@
+name: Create release pull request
+on:
+  push:
+    branches:
+      - develop
+jobs:
+  productionPromotion:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: master
+      - name: Reset promotion branch
+        run: |
+          git fetch origin develop:develop
+          git reset --hard develop
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v5
+        with:
+          branch: release-promotion
+          title: Release live editor

.github/workflows/stale.yml

@@ -8,7 +8,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v8
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           exempt-issue-labels: 'retained'

.github/workflows/tests.yml

@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
 
       # Install NPM dependencies, cache them correctly

.github/workflows/unit-tests.yml

@@ -26,7 +26,7 @@ jobs:
 
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: 'yarn'
 
       - name: Lint & Test

.github/workflows/update-browserlist.yml

@@ -1,18 +1,32 @@
-name: Update Browserslist
+name: Update Browserslist database
+
 on:
-  push:
+  schedule:
-    branches-ignore:
+    - cron: '0 2 1,15 * *'
-      - 'develop'
+
-      - 'master'
+permissions:
+  contents: write
+  pull-requests: write
+
 jobs:
-  build:
+  update-browserslist-database:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout repository
-      - run: npx browserslist@latest --update-db
+        uses: actions/checkout@v3
-      - name: Commit changes
-        uses: EndBug/add-and-commit@v9
         with:
-          author_name: ${{ github.actor }}
+          fetch-depth: 0
-          author_email: ${{ github.actor }}@users.noreply.github.com
+      - name: Configure git
-          message: 'Update Browserslist'
+        run: |
+          git config --global user.email "action@github.com"
+          git config --global user.name "GitHub Action"
+      - name: Update Browserslist database and create PR if applies
+        uses: c2corg/browserslist-update-action@v2
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          branch: browserslist-update
+          base_branch: develop
+          commit_message: 'build: update Browserslist db'
+          title: 'build: update Browserslist db'
+          body: Auto-generated by [browserslist-update-action](https://github.com/c2corg/browserslist-update-action/)
+          labels: 'chores, github action'

.github/workflows/update-monaco-editor.yml

@@ -1,25 +0,0 @@
-name: Update Monaco-editor
-on:
-  workflow_dispatch:
-  push:
-    branches:
-      - 'dependabot/npm_and_yarn/develop/monaco-editor-**'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-      - name: Update monaco version
-        run: |
-          yarn install
-          node ./bin/update-monaco.js
-      - name: Commit changes
-        uses: EndBug/add-and-commit@v9
-        with:
-          author_name: ${{ github.actor }}
-          author_email: ${{ github.actor }}@users.noreply.github.com
-          message: 'Update Monaco-editor'

.vscode/settings.json

@@ -1,6 +1,24 @@
 {
   "editor.formatOnSave": true,
-  "cSpell.words": ["asyncable", "mindmap", "pako", "Serde", "serdes"],
+  "cSpell.blockCheckingWhenLineLengthGreaterThan": 150,
+  "cSpell.words": [
+    "asyncable",
+    "Browserslist",
+    "ckppp",
+    "corg",
+    "cssnano",
+    "daisyui",
+    "esserializer",
+    "KROKI",
+    "localstorage",
+    "mermaidchart",
+    "mindmap",
+    "pako",
+    "Serde",
+    "serdes",
+    "tailwindcss",
+    "uparrow"
+  ],
   "vitest.commandLine": "yarn test:unit",
   "vitest.enable": true,
   "testing.autoRun.mode": "rerun",

Dockerfile

@@ -1,17 +1,17 @@
 # Two-stage  docker container for mermaid-js/mermaid-live-editor
 # Build              : docker build -t mermaid-js/mermaid-live-editor .
-# Run                : docker run --name mermaid-live-editor --publish 8080:80 mermaid-js/mermaid-live-editor
+# Run                : docker run --name mermaid-live-editor --publish 8080:8080 mermaid-js/mermaid-live-editor
 # Start              : docker start mermaid-live-editor
 # Use webbrowser     : http://localhost:8080
 # Stop               : press ctrl + c 
 #                                     or 
 #                                        docker stop mermaid-live-editor
-FROM node:18.12.0 as mermaid-live-editor-builder 
+FROM node:18.17.1 as mermaid-live-editor-builder 
 COPY --chown=node:node . /home
 WORKDIR /home
 RUN yarn install
 RUN yarn build
 
-FROM nginx:alpine as mermaid-live-editor-runner
+FROM nginxinc/nginx-unprivileged:alpine as mermaid-live-editor-runner
 COPY ./nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=mermaid-live-editor-builder --chown=nginx:nginx /home/docs /usr/share/nginx/html

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM node:18
+FROM node:18.17.1
 WORKDIR /app
 COPY package.json .
 COPY yarn.lock .

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 - 2021 Knut Sveidqvist
+Copyright (c) 2020 - 2023 Knut Sveidqvist
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -24,7 +24,7 @@ You can try out a live version [here](https://mermaid.live/).
 ### Run published image
 
 ```bash
-docker run --publish 8000:80 ghcr.io/mermaid-js/mermaid-live-editor
+docker run --platform linux/amd64 --publish 8000:8080 ghcr.io/mermaid-js/mermaid-live-editor
 ```
 
 ### To configure renderer URL
@@ -43,21 +43,24 @@ Default is `https://kroki.io`
 docker compose up --build
 ```
 
-Then open http://localhost:8000
+Then open http://localhost:3000
 
 ## Setup
 
-[Volta](https://volta.sh) is used for managing node and yarn versions.
+Below link will help you making a copy of the repository in your local system.
 
-This project is set up using [Yarn](https://classic.yarnpkg.com/en/docs/getting-started):
+https://docs.github.com/en/get-started/quickstart/fork-a-repo
 
-```
+## Requirements
-yarn install
+
-```
+- [volta](https://volta.sh/) to manage node versions.
+- [Node.js](https://nodejs.org/en/). `volta install node`
+- [yarn](https://yarnpkg.com/) package manager. `volta install yarn`
 
 ## Development
 
-```
+```sh
+yarn install
 yarn dev -- --open
 ```
 

cypress.config.js

@@ -6,10 +6,10 @@ export default defineConfig({
   viewportWidth: 1440,
   viewportHeight: 768,
   snapshotFileName: './cypress/snapshots.js',
-  defaultCommandTimeout: 16000,
+  defaultCommandTimeout: 5000,
-  requestTimeout: 16000,
+  requestTimeout: 5000,
   retries: {
-    runMode: 4,
+    runMode: 2,
     openMode: 0
   },
   e2e: {

cypress/e2e/actions.spec.ts

@@ -1,15 +1,16 @@
-import { verifyFileSize } from './util';
+import { typeInEditor, verifyFileSizeGreaterThan } from './util';
 describe('Check actions', () => {
   beforeEach(() => {
     cy.clearLocalStorage();
     cy.visit('/edit');
+    cy.contains('Actions').click();
   });
 
   it('should update markdown code', () => {
     cy.get('#markdown')
       .invoke('val')
       .then((oldText) => {
-        cy.get('#editor').click('bottom').type('{enter}C --> HistoryTest');
+        typeInEditor('C --> HistoryTest', { bottom: true, newline: true });
         cy.get('#markdown')
           .invoke('val')
           .then((newText) => {
@@ -18,7 +19,7 @@ describe('Check actions', () => {
       });
   });
 
-  it('should load gists from URL', () => {
+  it.skip('should load gists from URL', () => {
     cy.get('#gist').type('https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a');
     cy.contains('Load Gist').click();
     cy.contains('Go shopping!!');
@@ -28,20 +29,20 @@ describe('Check actions', () => {
     cy.clock(new Date(2022, 0, 1).getTime());
 
     cy.get(`#downloadPNG`).click();
-    verifyFileSize('diagram', 'png', 21_000);
+    verifyFileSizeGreaterThan('diagram', 'png', 34_000);
 
     cy.get(`#downloadSVG`).click();
-    verifyFileSize('diagram', 'svg', 10_000);
+    verifyFileSizeGreaterThan('diagram', 'svg', 10_000);
 
     // Verify downloaded file is different for different diagrams
     cy.contains('Sample Diagrams').click();
     cy.contains('ER').click();
 
     cy.get(`#downloadPNG`).click();
-    verifyFileSize('diagram', 'png', 46_000);
+    verifyFileSizeGreaterThan('diagram', 'png', 40_000);
 
     cy.get(`#downloadSVG`).click();
-    verifyFileSize('diagram', 'svg', 12_000);
+    verifyFileSizeGreaterThan('diagram', 'svg', 11_000);
 
     cy.clock().invoke('restore');
   });

cypress/e2e/diagramUpdate.spec.ts

@@ -1,16 +1,18 @@
-import { getEditor, cmd } from './util';
+import { typeInEditor, cmd } from './util';
 
 describe('Auto sync tests', () => {
   beforeEach(() => {
     cy.clearLocalStorage();
     cy.visit('/');
+    cy.url().should('contain', '/edit#pako');
+    cy.window().should('have.property', 'editorLoaded', true);
   });
 
   it('should dim diagram when code is edited', () => {
     cy.contains('Auto sync').click();
     cy.get('#view').should('not.have.class', 'outOfSync');
     cy.get('#errorContainer').should('not.exist');
-    getEditor({ bottom: true, newline: true }).type('  C --> Test');
+    typeInEditor('  C --> Test', { bottom: true });
     cy.get('#view').should('have.class', 'outOfSync');
     cy.get('#errorContainer').should('contain.text', 'Diagram out of sync.');
     cy.getLocalStorage('codeStore').snapshot();
@@ -19,10 +21,10 @@ describe('Auto sync tests', () => {
   it('should update diagram when shortcut is used', () => {
     cy.contains('Auto sync').click();
     cy.get('#view').should('not.have.class', 'outOfSync');
-    getEditor().type('  C --> Test');
+    typeInEditor('  C --> Test');
     cy.get('#view').should('have.class', 'outOfSync');
     cy.get('#errorContainer').should('contain.text', 'Diagram out of sync.');
-    getEditor().type(`${cmd}{enter}`);
+    typeInEditor(`${cmd}{enter}`);
     cy.get('#errorContainer').should('not.exist');
     cy.get('#view').should('not.have.class', 'outOfSync');
   });
@@ -38,21 +40,22 @@ describe('Auto sync tests', () => {
   it('should not dim diagram when code is in sync', () => {
     cy.contains('Auto sync').click();
     cy.get('#view').should('not.have.class', 'outOfSync');
-    getEditor().type('  C --> Test');
+    typeInEditor('  C --> Test');
     cy.get('#view').should('have.class', 'outOfSync');
     cy.get('[data-cy=sync]').click();
     cy.get('#view').should('not.have.class', 'outOfSync');
     cy.get('#autoSync').check();
-    getEditor().type('ing');
+    typeInEditor('ing');
     cy.get('#view').should('not.have.class', 'outOfSync');
     cy.getLocalStorage('codeStore').snapshot();
   });
 
   it('supports commenting code out/in', () => {
-    getEditor().type(`{uparrow}${cmd}/`);
+    cy.get('#editor').contains('Car').click();
+    cy.get('#editor').get('textarea').type(`${cmd}/`, { force: true });
     cy.get('#view').contains('Car').should('not.exist');
 
-    getEditor().type(`{uparrow}${cmd}/`);
+    typeInEditor(`{uparrow}${cmd}/`);
     cy.get('#view').contains('Car').should('exist');
   });
 
@@ -61,7 +64,7 @@ describe('Auto sync tests', () => {
       '/edit#pako:eNpljjEKwzAMRa8SNOcEnlt6gK5eVFvYJsgOqkwpIXevg9smEE1PnyfxF3DFExgISW-CczQ2D21cYU7a-SGYXRwyvTp9jUhuKlVP-eHy7zA-leQsMEmg_QOM0BLG5FujZVMsaCQmC6ahR5ks2Lw2r84ela4-aREwKpVGwKrl_s7ut3fnkjAIcg_XDzuaUhs'
     );
     cy.get('#errorContainer').should('not.exist');
-    getEditor({ newline: true }).type(`branch test`);
+    typeInEditor(`branch test`, { bottom: true, newline: true });
     cy.get('#editor').contains('branch test').should('exist');
     cy.get('#errorContainer')
       .contains(
@@ -69,6 +72,14 @@ describe('Auto sync tests', () => {
       )
       .should('exist');
   });
+
+  it('should update diagram after entire text is removed', () => {
+    // https://github.com/mermaid-js/mermaid-live-editor/issues/1102
+    typeInEditor(`${cmd} a {backspace}`);
+    typeInEditor('graph LR');
+    typeInEditor(' {enter}  A-->Car');
+    cy.get('#view').contains('Car').should('exist');
+  });
 });
 
 describe('Pan and Zoom', () => {

cypress/e2e/docMap.spec.ts

@@ -14,23 +14,23 @@ describe('Editor docs tests', () => {
 
   it('Test to see if the correct URL loads when changing from one diagram to other', () => {
     cy.contains('Flow').click();
-    cy.get(`[data-cy=docs][href$="/#/flowchart"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/syntax/flowchart"]`).should('exist');
 
     cy.contains('Config').click();
-    cy.get(`[data-cy=docs][href$="/#/flowchart?id=configuration"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/syntax/flowchart?id=configuration"]`).should('exist');
 
     cy.contains('Sequence').click();
-    cy.get(`[data-cy=docs][href$="/#/sequenceDiagram?id=configuration"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/syntax/sequenceDiagram?id=configuration"]`).should('exist');
 
     cy.contains('Code').click();
-    cy.get(`[data-cy=docs][href$="/#/sequenceDiagram"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/syntax/sequenceDiagram"]`).should('exist');
   });
 
   it("Test to check URLs for a case where config URL doesn't exist", () => {
     cy.contains('State').click();
-    cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/syntax/stateDiagram"]`).should('exist');
 
     cy.contains('Config').click();
-    cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
+    cy.get(`[data-cy=docs][href$="/syntax/stateDiagram"]`).should('exist');
   });
 });

cypress/e2e/history.spec.ts

@@ -1,4 +1,4 @@
-import { getEditor, verifyFileSnapshot } from './util';
+import { typeInEditor, verifyFileSnapshot } from './util';
 
 describe('Save History', () => {
   beforeEach(() => {
@@ -6,7 +6,6 @@ describe('Save History', () => {
     cy.clearLocalStorage();
     cy.visit('/edit');
 
-    cy.contains('Actions').click();
     cy.contains('History').click();
   });
 
@@ -24,7 +23,6 @@ describe('Save History', () => {
       '[{"state":{"code":"graph TD\\n    A[New Year] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"auto","id":"69ea820e-522b-4a44-86cf-fd58acde09df","name":"barking-dog"},{"state":{"code":"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","id":"x749ffc6-21dd-418a-b984-7c1ffc3146b3","name":"needy-mosquito"}]'
     );
     cy.reload();
-    cy.contains('Actions').click();
     cy.contains('History').click();
     cy.get('#historyList').find('li').should('have.length', 2);
     cy.get('#historyList').find('No items in History').should('not.exist');
@@ -53,14 +51,14 @@ describe('Save History', () => {
       expect(str).to.equal('State already saved.');
     });
     cy.on('window:confirm', () => true);
-    getEditor().type('  C --> HistoryTest');
+    typeInEditor('  C --> HistoryTest');
     cy.get('#saveHistory').click();
     cy.get('#historyList').find('li').should('have.length', 2);
   });
 
   it('should be able to restore and delete', () => {
     cy.get('#saveHistory').click();
-    getEditor().type('  C --> HistoryTest');
+    typeInEditor('  C --> HistoryTest');
     cy.get('#historyList').find('No items in History').should('not.exist');
     cy.get('#historyList').find('li').should('have.length', 1);
     cy.contains('HistoryTest');
@@ -70,7 +68,7 @@ describe('Save History', () => {
     cy.get('#historyList').find('li').should('have.length', 0);
     cy.get('#historyList').contains('No items in History');
     cy.get('#saveHistory').click();
-    getEditor().type('  C --> HistoryTest');
+    typeInEditor('  C --> HistoryTest');
     cy.get('#saveHistory').click();
     cy.get('#editor').type('ing');
     cy.get('#clearHistory').click();
@@ -83,16 +81,16 @@ describe('Save History', () => {
 
   // TODO: Fix #639
   xit('should auto save history', () => {
-    getEditor().type('  C --> HistoryTest');
+    typeInEditor('  C --> HistoryTest');
-    cy.tick(70000);
+    cy.tick(70_000);
     cy.contains('Timeline').click();
     cy.get('#historyList').find('li').should('have.length', 1);
     cy.get('#editor').type('ing');
-    cy.tick(70000);
+    cy.tick(70_000);
     cy.get('#historyList').find('li').should('have.length', 2);
     for (let i = 0; i < 31; i++) {
       cy.get('#editor').type('.');
-      cy.tick(70000);
+      cy.tick(70_000);
     }
     cy.get('#historyList').find('li').should('have.length', 30);
   });

cypress/e2e/loadSite.spec.ts

@@ -4,6 +4,7 @@ describe('Site Loads', () => {
   beforeEach(() => {
     cy.clearLocalStorage();
     cy.visit('/');
+    cy.url().should('include', '/edit#pako');
   });
 
   it('Check Home page load', () => {
@@ -12,6 +13,12 @@ describe('Site Loads', () => {
     cy.getLocalStorage('codeStore').snapshot();
   });
 
+  it('should keep code after reload', () => {
+    cy.get('#editor').contains('Car');
+    cy.reload();
+    cy.get('#editor').contains('Car');
+  });
+
   it('Check Redirect from old URL', () => {
     cy.visit(
       '/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9LCJ1cGRhdGVFZGl0b3IiOmZhbHNlfQ'
@@ -93,22 +100,9 @@ describe('Site Loads', () => {
     cy.reload(true);
     cy.contains('Please Click here to Raise an issue in github.');
   });
+});
 
-  it('should load uncompressed URL', () => {
+describe('Verify types of URLs', () => {
-    cy.visit(
-      '/edit/#eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW05ldyBZZWFyXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICAgIEIgLS0-IEN7TGV0IG1lIHRoaW5rfVxuICAgIEMgLS0-fE9uZXwgRFtMYXB0b3BdXG4gICAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgICBDIC0tPnxUaHJlZXwgRltmYTpmYS1jYXIgQ2FyXSIsIm1lcm1haWQiOiJ7XG4gIFwidGhlbWVcIjogXCJkZWZhdWx0XCJcbn0iLCJ1cGRhdGVFZGl0b3IiOmZhbHNlLCJhdXRvU3luYyI6dHJ1ZSwidXBkYXRlRGlhZ3JhbSI6ZmFsc2V9'
-    );
-    cy.contains('New Year');
-    cy.visit(
-      '/edit#eyJjb2RlIjoiY2xhc3NEaWFncmFtXG4gICAgQW5pbWFsIDx8LS0gRHVja1xuICAgIEFuaW1hbCA8fC0tIEZpc2hcbiAgICBBbmltYWwgPHwtLSBaZWJyYVxuICAgIEFuaW1hbCA6ICtpbnQgYWdlXG4gICAgQW5pbWFsIDogK1N0cmluZyBnZW5kZXJcbiAgICBBbmltYWw6ICtpc01hbW1hbCgpXG4gICAgQW5pbWFsOiArbWF0ZSgpXG4gICAgY2xhc3MgRHVja3tcbiAgICAgICtTdHJpbmcgYmVha0NvbG9yXG4gICAgICArc3dpbSgpXG4gICAgICArcXVhY2soKVxuICAgIH1cbiAgICBjbGFzcyBGaXNoe1xuICAgICAgLWludCBzaXplSW5GZWV0XG4gICAgICAtY2FuRWF0KClcbiAgICB9XG4gICAgY2xhc3MgWmVicmF7XG4gICAgICArYm9vbCBpc193aWxkXG4gICAgICArcnVuKClcbiAgICB9XG4gICAgICAgICAgICAiLCJtZXJtYWlkIjoie1xuICBcInRoZW1lXCI6IFwiZGFya1wiXG59IiwidXBkYXRlRWRpdG9yIjpmYWxzZSwiYXV0b1N5bmMiOnRydWUsInVwZGF0ZURpYWdyYW0iOmZhbHNlfQ'
-    );
-    cy.contains('Animal');
-    cy.visit(
-      '/edit/#base64:eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW05ldyBZZWFyXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICAgIEIgLS0-IEN7TGV0IG1lIHRoaW5rfVxuICAgIEMgLS0-fE9uZXwgRFtMYXB0b3BdXG4gICAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgICBDIC0tPnxUaHJlZXwgRltmYTpmYS1jYXIgQ2FyXSIsIm1lcm1haWQiOiJ7XG4gIFwidGhlbWVcIjogXCJkZWZhdWx0XCJcbn0iLCJ1cGRhdGVFZGl0b3IiOmZhbHNlLCJhdXRvU3luYyI6dHJ1ZSwidXBkYXRlRGlhZ3JhbSI6ZmFsc2V9'
-    );
-    cy.contains('New Year');
-  });
-
   it('should load compressed URL', () => {
     cy.visit(
       '/edit#pako:eNpVkM2KwkAQhF-l6dMK5gVyEDRxvYi7sF6WjIcm0zqDzg_jBJEk725Hd2G3Tw31VVFUj23QjCWeEkUD-1p5kFs2O77BN1M6QFEshg1ncMHzfYDV2ybA1YQYrT_NXvhqgqDqtxPGkI315_ElVU__h-cB6mZLMYd4-Kvsb2GAdWM_jcT_V0xicb03RyqPVLSUoJI-OEfHyZHV0rqfDAqzYccKS3k1pbNC5Ufhuqgp81rbHBJKxuXKc6Quh6-7b7HMqeNfqLYkC7gfanwAlW1ZvQ'
@@ -119,4 +113,24 @@ describe('Site Loads', () => {
     );
     cy.contains('Animal');
   });
+
+  describe('Uncompressed URLs', () => {
+    it('should load URL without specifier', () => {
+      cy.visit(
+        '/edit/#eyJjb2RlIjoiZ3JhcGhcbiAgICBUZXN0TGFiZWwiLCJtZXJtYWlkIjoie1xuICBcInRoZW1lXCI6IFwiZGVmYXVsdFwiXG59IiwidXBkYXRlRWRpdG9yIjpmYWxzZSwiYXV0b1N5bmMiOnRydWUsInVwZGF0ZURpYWdyYW0iOmZhbHNlfQ'
+      );
+      cy.contains('TestLabel');
+      cy.visit(
+        '/edit#eyJjb2RlIjoiY2xhc3NEaWFncmFtXG4gICAgQW5pbWFsIDx8LS0gRHVja1xuICAgIEFuaW1hbCA8fC0tIEZpc2hcbiAgICBBbmltYWwgPHwtLSBaZWJyYVxuICAgIEFuaW1hbCA6ICtpbnQgYWdlXG4gICAgQW5pbWFsIDogK1N0cmluZyBnZW5kZXJcbiAgICBBbmltYWw6ICtpc01hbW1hbCgpXG4gICAgQW5pbWFsOiArbWF0ZSgpXG4gICAgY2xhc3MgRHVja3tcbiAgICAgICtTdHJpbmcgYmVha0NvbG9yXG4gICAgICArc3dpbSgpXG4gICAgICArcXVhY2soKVxuICAgIH1cbiAgICBjbGFzcyBGaXNoe1xuICAgICAgLWludCBzaXplSW5GZWV0XG4gICAgICAtY2FuRWF0KClcbiAgICB9XG4gICAgY2xhc3MgWmVicmF7XG4gICAgICArYm9vbCBpc193aWxkXG4gICAgICArcnVuKClcbiAgICB9XG4gICAgICAgICAgICAiLCJtZXJtYWlkIjoie1xuICBcInRoZW1lXCI6IFwiZGFya1wiXG59IiwidXBkYXRlRWRpdG9yIjpmYWxzZSwiYXV0b1N5bmMiOnRydWUsInVwZGF0ZURpYWdyYW0iOmZhbHNlfQ'
+      );
+      cy.contains('Animal');
+    });
+
+    it('should load URL with "base64" specifier', () => {
+      cy.visit(
+        '/edit/#base64:eyJjb2RlIjoiZ3JhcGhcbiAgICBUZXN0TGFiZWwiLCJtZXJtYWlkIjoie1xuICBcInRoZW1lXCI6IFwiZGVmYXVsdFwiXG59IiwidXBkYXRlRWRpdG9yIjpmYWxzZSwiYXV0b1N5bmMiOnRydWUsInVwZGF0ZURpYWdyYW0iOmZhbHNlfQ'
+      );
+      cy.contains('TestLabel');
+    });
+  });
 });

cypress/e2e/themes.spec.ts

@@ -12,7 +12,7 @@ describe('Test themes', () => {
             });
         }
       });
-      cy.contains('Change Theme').click();
+      cy.contains('Theme').click();
     });
 
     it('should set light theme as default', () => {
@@ -44,7 +44,7 @@ describe('Test themes', () => {
             });
         }
       });
-      cy.contains('Change Theme').click();
+      cy.contains('Theme').click();
     });
 
     it('should set dark theme as default', () => {

cypress/e2e/util.ts

@@ -1,26 +1,44 @@
 export const cmd = `{${Cypress.platform === 'darwin' ? 'meta' : 'ctrl'}}`;
 
-export const getEditor = ({ bottom = true, newline = false } = {}) =>
+interface EditorOptions {
-  cy
+  bottom?: boolean;
-    .get('#editor textarea:first')
+  newline?: boolean;
-    .click()
+}
-    .focused()
+
-    .type(`${bottom ? '{pageDown}' : cmd}`)
+export const typeInEditor = (
-    .type(`${newline ? '{enter}' : cmd}`);
+  text: string,
+  { bottom = true, newline = false }: EditorOptions = {}
+) => {
+  cy.window().should('have.property', 'editorLoaded', true);
+  cy.get('#editor').click();
+  cy.get('#editor').within(($editor) => {
+    if (bottom) {
+      cy.get('textarea').type('{pageDown}', { force: true });
+    }
+    if (newline) {
+      cy.get('textarea').type('{enter}', { force: true });
+    }
+    cy.get('textarea').type(text, { force: true });
+  });
+};
 
 const downloadsFolder = Cypress.config('downloadsFolder');
 
-export const verifyFileSize = (
+export const verifyFileSizeGreaterThan = (
   fileType: 'history' | 'diagram',
   extension: string,
   size: number
 ) => {
   const fileName = `mermaid-${fileType}-2022-01-01-000000.${extension}`;
   const filePath = `${downloadsFolder}/${fileName}`;
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call
   cy.verifyDownload(fileName);
   cy.readFile(filePath, null, {
     log: false
-  }).then((buffer) => expect((buffer as ArrayBuffer).byteLength).to.be.gt(size));
+  }).then((buffer: ArrayBuffer) => {
+    expect(buffer.byteLength).to.be.gt(size);
+    expect(buffer.byteLength).to.be.lt(size * 1.3);
+  });
   cy.task('deleteFile', filePath);
 };
 
@@ -31,11 +49,12 @@ export const verifyFileSnapshot = (
 ) => {
   const fileName = `mermaid-${fileType}-2022-01-01-000000.${extension}`;
   const filePath = `${downloadsFolder}/${fileName}`;
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call
   cy.verifyDownload(fileName);
   cy.readFile(filePath, null, {
     log: false
-  }).then((buffer) =>
+  }).then((buffer: ArrayBuffer) =>
-    expect(new TextDecoder('utf-8').decode(buffer as ArrayBuffer)).to.contain(content)
+    expect(new TextDecoder('utf8').decode(buffer)).to.contain(content)
   );
   cy.task('deleteFile', filePath);
 };

cypress/snapshots.js

@@ -1,7 +1,7 @@
 module.exports = {
   "Site Loads": {
     "Check Home page load": {
-      "1": "{\"code\":\"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\\n  \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true}"
+      "1": "{\"code\":\"flowchart TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\\n  \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true}"
     },
     "Check Redirect from old URL": {
       "1": "{\"code\":\"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true}"
@@ -16,13 +16,13 @@ module.exports = {
       "1": "{\"code\":\"graph TD\\n    A[Party] -->|Get money| B(Go shopping!!)\\n    \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"forest\\\",\\n  \\\"test\\\": \\\"hello world\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"files\",\"config\":{\"codeURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/code.mmd\",\"configURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/config.json\"}}}"
     }
   },
-  "__version": "10.10.0",
+  "__version": "12.17.4",
   "Auto sync tests": {
     "should dim diagram when code is edited": {
-      "1": "{\"code\":\"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\\n    C --> Test\",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":false,\"updateDiagram\":false}"
+      "1": "{\"code\":\"flowchart TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\\n    C --> Test\",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":false,\"updateDiagram\":false}"
     },
     "should not dim diagram when code is in sync": {
-      "1": "{\"code\":\"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\\n    C --> Testing\",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":false}"
+      "1": "{\"code\":\"flowchart TD\\n    A[Christmas] -->|Get money| B(Go shopping)\\n    B --> C{Let me think}\\n    C -->|One| D[Laptop]\\n    C -->|Two| E[iPhone]\\n    C -->|Three| F[fa:fa-car Car]\\n    C --> Testing\",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":false}"
     }
   },
   "Test themes": {

cypress/tsconfig.json

@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "allowJs": true,
-    "types": ["cypress", "cypress-localstorage-commands", "cy-verify-downloads"]
+    "types": ["cypress", "cypress-localstorage-commands", "cy-verify-downloads", "node"]
   },
   "include": ["**/*.ts"]
 }

docker-compose.yml

@@ -7,5 +7,5 @@ services:
     volumes:
       - ./src:/app/src
     ports:
-      - 8080:8080
+      - 3000:3000
       - 24678:24678

nginx.conf

@@ -1,5 +1,5 @@
 server { 
- listen 80;
+ listen 8080;
  server_name mermaid;
  location / {
    root /usr/share/nginx/html;

package.json

@@ -23,61 +23,62 @@
   },
   "devDependencies": {
     "@cypress/snapshot": "2.1.7",
-    "@sveltejs/adapter-static": "1.0.0-next.46",
+    "@sveltejs/adapter-static": "2.0.3",
-    "@sveltejs/kit": "1.0.0-next.522",
+    "@sveltejs/kit": "1.25.0",
-    "@testing-library/jest-dom": "5.16.5",
+    "@testing-library/jest-dom": "5.17.0",
     "@testing-library/svelte": "3.2.2",
     "@types/pako": "2.0.0",
-    "@types/uuid": "8.3.4",
+    "@types/uuid": "9.0.4",
-    "@typescript-eslint/eslint-plugin": "5.42.0",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
-    "@typescript-eslint/parser": "5.42.0",
+    "@typescript-eslint/parser": "5.62.0",
-    "@vitest/ui": "0.25.1",
+    "@vitest/ui": "^0.34.0",
-    "autoprefixer": "10.4.12",
+    "autoprefixer": "^10.4.14",
-    "c8": "7.12.0",
+    "c8": "7.14.0",
-    "chai": "4.3.6",
+    "chai": "^4.3.7",
-    "cssnano": "5.1.13",
+    "cssnano": "^6.0.0",
-    "cy-verify-downloads": "0.1.11",
+    "cy-verify-downloads": "0.2.0",
-    "cypress": "11.0.1",
+    "cypress": "12.17.4",
-    "cypress-localstorage-commands": "2.2.1",
+    "cypress-localstorage-commands": "2.2.4",
-    "eslint": "8.27.0",
+    "eslint": "8.49.0",
-    "eslint-config-prettier": "8.5.0",
+    "eslint-config-prettier": "8.10.0",
-    "eslint-plugin-cypress": "2.12.1",
+    "eslint-plugin-cypress": "2.14.0",
     "eslint-plugin-es": "4.1.0",
+    "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-postcss-modules": "2.0.0",
     "eslint-plugin-svelte3": "4.0.0",
-    "eslint-plugin-tailwindcss": "3.6.2",
+    "eslint-plugin-tailwindcss": "3.13.0",
-    "eslint-plugin-vitest": "0.0.11",
+    "eslint-plugin-unicorn": "^46.0.0",
-    "esserializer": "1.3.2",
+    "eslint-plugin-vitest": "^0.3.0",
-    "husky": "8.0.1",
+    "esserializer": "1.3.11",
-    "jsdom": "20.0.1",
+    "font-awesome": "^4.7.0",
-    "lint-staged": "13.0.3",
+    "husky": "^8.0.3",
-    "node-html-parser": "6.1.1",
+    "jsdom": "21.1.2",
-    "postcss": "8.4.18",
+    "lint-staged": "13.3.0",
+    "node-html-parser": "^6.1.5",
+    "postcss": "^8.4.21",
     "postcss-load-config": "4.0.1",
-    "prettier": "2.7.1",
+    "prettier": "2.8.8",
-    "prettier-plugin-svelte": "2.8.0",
+    "prettier-plugin-svelte": "^2.10.0",
-    "svelte": "3.53.1",
+    "svelte": "3.59.2",
-    "svelte-preprocess": "4.10.7",
+    "svelte-preprocess": "5.0.4",
-    "tailwindcss": "3.2.1",
+    "tailwindcss": "^3.3.1",
-    "tslib": "2.4.0",
+    "tslib": "^2.5.0",
-    "typescript": "4.8.4",
+    "typescript": "5.2.2",
-    "vite": "3.2.2",
+    "vite": "^4.3.9",
-    "vitest": "0.25.1"
+    "vitest": "^0.34.0"
   },
   "dependencies": {
-    "@mermaid-js/mermaid-mindmap": "9.2.2",
+    "analytics": "0.8.9",
-    "analytics": "0.8.1",
     "analytics-plugin-plausible": "0.0.6",
-    "daisyui": "2.39.1",
+    "daisyui": "2.52.0",
-    "js-base64": "3.7.2",
+    "dayjs": "^1.11.7",
-    "mermaid": "9.2.2",
+    "js-base64": "3.7.5",
-    "moment": "2.29.4",
+    "mermaid": "10.5.0",
-    "monaco-editor": "0.34.1",
+    "monaco-editor": "0.43.0",
-    "monaco-mermaid": "1.0.6",
     "pako": "2.1.0",
-    "random-word-slugs": "0.1.6",
+    "random-word-slugs": "0.1.7",
     "svg-pan-zoom": "3.6.1",
-    "uuid": "9.0.0"
+    "uuid": "9.0.1"
   },
   "lint-staged": {
     "*.{ts,svelte,js,css,md,json}": [
@@ -86,7 +87,7 @@
     ]
   },
   "volta": {
-    "node": "18.12.0",
+    "node": "18.17.1",
     "yarn": "1.22.19"
   },
   "engines": {

renovate.json

@@ -11,6 +11,10 @@
     ":automergePatch"
   ],
   "packageRules": [
+    {
+      "matchPackagePatterns": ["^mermaid"],
+      "groupName": "Mermaid packages"
+    },
     {
       "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
       "automerge": true

src/app.html

@@ -17,38 +17,10 @@
     <link rel="manifest" href="%sveltekit.assets%/manifest.json" />
     <link
       rel="stylesheet"
-      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.2/css/all.min.css"
-      integrity="sha512-xh6O/CkQoPOWDdYTDqeRdPCVd1SpvCA9XXcUnZS2FmJNp1coAFzvtCN9BmamE+4aHK8yyUHUSCcJHgXloTyT2A=="
+      integrity="sha512-z3gLpd7yknf1YoNbCzqRKc4qyor8gaKU1qmn+CShxbuBusANI9QpRohGBreCFkKxLhei6S9CQXFEbbKuqLg0DA=="
       crossorigin="anonymous"
       referrerpolicy="no-referrer" />
-    <link
-      rel="stylesheet"
-      href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.min.css"
-      integrity="sha512-GzcoZD7y5zvBofYtImXPZaPVhoY7xLPt+ysmbPb/vU+quSKFkcngxaSrxuwprDZL4MALUqGFmnqCxQZqMozv1Q=="
-      crossorigin="anonymous"
-      referrerpolicy="no-referrer" />
-    <script>
-      var require = {
-        paths: {
-          vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs'
-        }
-      };
-    </script>
-    <script
-      src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/loader.min.js"
-      integrity="sha512-6bIYsGqvLpAiEBXPdRQeFf5cueeBECtAKJjIHer3BhBZNTV3WLcLA8Tm3pDfxUwTMIS+kAZwTUvJ1IrMdX8C5w=="
-      crossorigin="anonymous"
-      referrerpolicy="no-referrer"></script>
-    <script
-      src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.nls.min.js"
-      integrity="sha512-CCv+DKWw+yZhxf4Z+ExT6HC5G+3S45TeMTYcJyYbdrv4BpK2vyALJ4FoVR/KGWDIPu7w4tNCOC9MJQIkYPR5FA=="
-      crossorigin="anonymous"
-      referrerpolicy="no-referrer"></script>
-    <script
-      src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.js"
-      integrity="sha512-BtSZPhzoyN8kq1axY6cgOFPSgLJgFwvAZ3WxeDGxEFXeFcFuK2s7Hr+zF75npVHASUY1dxudAfIVzwmgdR89Bw=="
-      crossorigin="anonymous"
-      referrerpolicy="no-referrer"></script>
     %sveltekit.head%
   </head>
   <body>

src/env.d.ts

@@ -1,11 +1,11 @@
 /// <reference types="vite/client" />
 
 interface ImportMetaEnv {
-  readonly MERMAID_RENDERER_URL: string;
+  readonly MERMAID_RENDERER_URL?: string;
-  readonly MERMAID_KROKI_RENDERER_URL: string;
+  readonly MERMAID_KROKI_RENDERER_URL?: string;
-  readonly MERMAID_CDN_URL: string;
+  readonly MERMAID_CDN_URL?: string;
-  readonly MERMAID_BASE_URL: string;
+  readonly MERMAID_BASE_URL?: string;
-  readonly MERMAID_LOCAL: boolean;
+  readonly MERMAID_LOCAL?: boolean;
   // more env variables...
 }
 

src/global.d.ts

@@ -9,7 +9,8 @@ declare global {
   namespace jest {
     interface Matchers<R = void>
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
+      // @ts-expect-error
+      // eslint-disable-next-line no-undef
       extends TestingLibraryMatchers<typeof expect.stringContaining, R> {}
   }
 }

src/lib/components/Actions.svelte

@@ -1,22 +1,22 @@
 <script lang="ts">
   import { browser } from '$app/environment';
-  import Card from '$lib/components/card/card.svelte';
+  import Card from '$lib/components/Card/Card.svelte';
   import { env } from '$lib/util/env';
   import { pakoSerde } from '$lib/util/serde';
   import { stateStore } from '$lib/util/state';
   import { logEvent } from '$lib/util/stats';
   import { toBase64 } from 'js-base64';
-  import moment from 'moment';
+  import dayjs from 'dayjs';
   const { krokiRendererUrl, rendererUrl } = env;
 
   type Exporter = (context: CanvasRenderingContext2D, image: HTMLImageElement) => () => void;
 
   const getFileName = (ext: string) =>
-    `mermaid-diagram-${moment().format('YYYY-MM-DD-HHmmss')}.${ext}`;
+    `mermaid-diagram-${dayjs().format('YYYY-MM-DD-HHmmss')}.${ext}`;
 
   const getBase64SVG = (svg?: HTMLElement, width?: number, height?: number): string => {
-    svg?.setAttribute('height', `${height}px`);
+    height && svg?.setAttribute('height', `${height}px`);
-    svg?.setAttribute('width', `${width}px`); // Workaround https://stackoverflow.com/questions/28690643/firefox-error-rendering-an-svg-image-to-html5-canvas-with-drawimage
+    width && svg?.setAttribute('width', `${width}px`); // Workaround https://stackoverflow.com/questions/28690643/firefox-error-rendering-an-svg-image-to-html5-canvas-with-drawimage
     if (!svg) {
       svg = getSvgEl();
     }
@@ -28,7 +28,10 @@
 
   const exportImage = (event: Event, exporter: Exporter) => {
     const canvas: HTMLCanvasElement = document.createElement('canvas');
-    const svg: HTMLElement = document.querySelector('#container svg');
+    const svg: HTMLElement | null = document.querySelector('#container svg');
+    if (!svg) {
+      throw new Error('svg not found');
+    }
     const box: DOMRect = svg.getBoundingClientRect();
     canvas.width = box.width;
     canvas.height = box.height;
@@ -43,6 +46,9 @@
     }
 
     const context = canvas.getContext('2d');
+    if (!context) {
+      throw new Error('context not found');
+    }
     context.fillStyle = 'white';
     context.fillRect(0, 0, canvas.width, canvas.height);
 
@@ -56,12 +62,12 @@
 
   const getSvgEl = () => {
     const svgEl: HTMLElement = document
-      .querySelector('#container svg')
+      .querySelector('#container svg')!
       .cloneNode(true) as HTMLElement;
     svgEl.setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
     const fontAwesomeCdnUrl = Array.from(document.head.getElementsByTagName('link'))
       .map((l) => l.href)
-      .find((h) => h && h.includes('font-awesome'));
+      .find((h) => h.includes('font-awesome'));
     if (fontAwesomeCdnUrl == null) {
       return svgEl;
     }
@@ -99,10 +105,10 @@
       context.drawImage(image, 0, 0, canvas.width, canvas.height);
       canvas.toBlob((blob) => {
         try {
-          // @ts-ignore: https://github.com/microsoft/TypeScript-DOM-lib-generator/pull/1004/files
+          if (!blob) {
+            throw new Error('blob is empty');
+          }
           void navigator.clipboard.write([
-            /* eslint-disable no-undef */
-            // @ts-ignore: https://github.com/microsoft/TypeScript/issues/43821
             new ClipboardItem({
               [blob.type]: blob
             })
@@ -142,7 +148,7 @@
   let gistURL = '';
   stateStore.subscribe(({ loader }) => {
     if (loader?.type === 'gist') {
-      // @ts-ignore Gist will have url
+      // @ts-expect-error Gist will have url
       gistURL = loader.config.url;
     }
   });
@@ -166,8 +172,7 @@
   if (browser && ['mermaid.live', 'netlify'].some((path) => window.location.host.includes(path))) {
     isNetlify = true;
   }
-  stateStore.subscribe(async (state) => {
+  stateStore.subscribe(({ code, serialized }) => {
-    const { code, serialized } = await state;
     iUrl = `${rendererUrl}/img/${serialized}?type=png`;
     svgUrl = `${rendererUrl}/svg/${serialized}`;
     krokiUrl = `${krokiRendererUrl}/mermaid/svg/${pakoSerde.serialize(code)}`;
@@ -175,7 +180,7 @@
   });
 </script>
 
-<Card title="Actions" isOpen={true}>
+<Card title="Actions" isOpen={false}>
   <div class="flex flex-wrap gap-2 m-2">
     {#if isClipboardAvailable()}
       <button class="action-btn w-full" on:click={onCopyClipboard}

src/lib/components/Card/Card.svelte

@@ -1,11 +1,11 @@
 <script lang="ts">
   import type { Tab } from '$lib/types';
   import { slide } from 'svelte/transition';
-  import Tabs from './tabs.svelte';
+  import Tabs from './Tabs.svelte';
   export let isCloseable = true;
   export let isOpen = true;
   export let tabs: Tab[] = [];
-  export let activeTabID: string = '';
+  export let activeTabID = '';
   export let title: string;
   $: isOpen = isCloseable ? isOpen : true;
   $: isTabsShown = isOpen && tabs.length > 0;

src/lib/components/Card/card.test.ts

@@ -1,6 +1,6 @@
 import { cleanup, render } from '@testing-library/svelte';
 import { describe, expect, it, afterEach } from 'vitest';
-import Card from './card.svelte';
+import Card from './Card.svelte';
 
 describe('card.svelte', () => {
   // TODO: @testing-library/svelte claims to add this automatically but it doesn't work without explicit afterEach
@@ -10,8 +10,8 @@ describe('card.svelte', () => {
     const { container } = render(Card, {
       title: 'TabTest',
       tabs: [
-        { id: 't1', title: 'title1' },
+        { id: 't1', title: 'title1', icon: 'fab fa-git-alt' },
-        { id: 't2', title: 'title2' }
+        { id: 't2', title: 'title2', icon: 'far fa-bookmark' }
       ]
     });
     expect(container).toBeTruthy();
@@ -19,6 +19,5 @@ describe('card.svelte', () => {
     expect(container).toHaveTextContent('title1');
     expect(container).toHaveTextContent('title2');
     expect(container).not.toHaveTextContent('title3');
-    expect(container.innerHTML).toMatchSnapshot();
   });
 });

src/lib/components/Editor.svelte

@@ -0,0 +1,128 @@
+<script lang="ts">
+  import type { EditorMode } from '$lib/types';
+  import { stateStore, updateCode, updateConfig } from '$lib/util/state';
+  import { themeStore } from '$lib/util/theme';
+  import { errorDebug, syncDiagram } from '$lib/util/util';
+  import * as monaco from 'monaco-editor';
+  import monacoJsonWorker from 'monaco-editor/esm/vs/language/json/json.worker?worker';
+  import monacoEditorWorker from 'monaco-editor/esm/vs/editor/editor.worker?worker';
+  import { onMount } from 'svelte';
+  import { initEditor } from '$lib/util/monacoExtra';
+  import { logEvent } from '$lib/util/stats';
+
+  let divEl: HTMLDivElement | undefined = undefined;
+  let editor: monaco.editor.IStandaloneCodeEditor | undefined;
+  let editorOptions: monaco.editor.IStandaloneEditorConstructionOptions = {
+    minimap: {
+      enabled: false
+    },
+    theme: 'mermaid',
+    overviewRulerLanes: 0
+  };
+  let text = '';
+
+  stateStore.subscribe(({ errorMarkers, editorMode, code, mermaid }) => {
+    // console.log('editor store subscription', { code, mermaid });
+    if (!editor) {
+      return;
+    }
+
+    // Update editor text if it's different
+    const newText = editorMode === 'code' ? code : mermaid;
+    if (newText !== text) {
+      // console.log('updating editor text', newText);
+      editor.setScrollTop(0);
+      editor.setValue(newText);
+      text = newText;
+    }
+
+    // Update editor mode if it's different
+    const language = editorMode === 'code' ? 'mermaid' : 'json';
+    const model = editor.getModel();
+    if (!model) {
+      console.error("editor model doesn't exist");
+      return;
+    }
+    if (model.getLanguageId() !== language) {
+      monaco.editor.setModelLanguage(model, language);
+    }
+
+    // Display/clear errors
+    monaco.editor.setModelMarkers(model, 'mermaid', errorMarkers);
+  });
+
+  themeStore.subscribe(({ isDark }) => {
+    editor && monaco.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid');
+  });
+
+  const handleUpdate = (text: string, mode: EditorMode) => {
+    // console.log('editor HandleUpdate', { text, mode });
+    if (mode === 'code') {
+      updateCode(text);
+    } else {
+      updateConfig(text);
+    }
+  };
+
+  onMount(async () => {
+    self.MonacoEnvironment = {
+      getWorker(_, label) {
+        if (label === 'json') {
+          return new monacoJsonWorker();
+        }
+        return new monacoEditorWorker();
+      }
+    };
+
+    if (!divEl) {
+      throw new Error('divEl is undefined');
+    }
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+    initEditor(monaco);
+    errorDebug(100);
+    editor = monaco.editor.create(divEl, editorOptions);
+    editor.onDidChangeModelContent(({ isFlush, changes }) => {
+      const newText = editor?.getValue();
+      // console.log('editor onDidChangeModelContent', { text, newText, isFlush, changes });
+      if (!newText || text === newText || isFlush) {
+        return;
+      }
+      text = newText;
+      handleUpdate(text, $stateStore.editorMode);
+    });
+    editor.addAction({
+      id: 'mermaid-render-diagram',
+      label: 'Render Diagram',
+      keybindings: [monaco.KeyMod.CtrlCmd | monaco.KeyCode.Enter],
+      run: function () {
+        syncDiagram();
+        logEvent('renderDiagram', {
+          method: 'keyboardShortcut'
+        });
+      }
+    });
+    monaco.editor.setTheme($themeStore.isDark ? 'mermaid-dark' : 'mermaid');
+    const resizeObserver = new ResizeObserver((entries) => {
+      editor?.layout({
+        height: entries[0].contentRect.height,
+        width: entries[0].contentRect.width
+      });
+    });
+
+    if (divEl.parentElement) {
+      resizeObserver.observe(divEl.parentElement);
+    }
+
+    // @ts-ignore
+    if (window.Cypress) {
+      // @ts-ignore
+      window.editorLoaded = true;
+    }
+    return () => {
+      // console.log(`editor disposed`);
+      editor?.dispose();
+    };
+  });
+</script>
+
+<div bind:this={divEl} id="editor" class="overflow-hidden" />

src/lib/components/History/History.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import Card from '$lib/components/card/card.svelte';
+  import Card from '$lib/components/Card/Card.svelte';
   import { inputStateStore, getStateString } from '$lib/util/state';
   import {
     addHistoryEntry,
@@ -13,10 +13,13 @@
   import { notify, prompt } from '$lib/util/notify';
   import { onMount } from 'svelte';
   import { get } from 'svelte/store';
-  import moment from 'moment';
+  import dayjs from 'dayjs';
-  import type { HistoryType, State, Tab } from '$lib/types';
+  import dayjsRelativeTime from 'dayjs/plugin/relativeTime';
+  import type { HistoryEntry, HistoryType, State, Tab } from '$lib/types';
   import { logEvent } from '$lib/util/stats';
 
+  dayjs.extend(dayjsRelativeTime);
+
   const HISTORY_SAVE_INTERVAL = 60000;
 
   const tabSelectHandler = (message: CustomEvent<Tab>) => {
@@ -41,7 +44,7 @@
     const url = URL.createObjectURL(blob);
     const a = document.createElement('a');
     a.href = url;
-    a.download = `mermaid-history-${moment().format('YYYY-MM-DD-HHmmss')}.json`;
+    a.download = `mermaid-history-${dayjs().format('YYYY-MM-DD-HHmmss')}.json`;
     a.click();
     URL.revokeObjectURL(url);
     logEvent('history', {
@@ -60,7 +63,7 @@
       }
       const reader = new FileReader();
       reader.onload = (e) => {
-        const data = JSON.parse(e.target.result as string);
+        const data: HistoryEntry[] = JSON.parse(e.target.result as string);
         restoreHistory(data);
       };
       reader.readAsText(file);
@@ -95,7 +98,7 @@
 
   const relativeTime = (time: number) => {
     const t = new Date(time);
-    return `${new Date(t).toLocaleString()} (${moment(t).fromNow()})`;
+    return `${new Date(t).toLocaleString()} (${dayjs(t).fromNow()})`;
   };
 
   onMount(() => {
@@ -161,7 +164,6 @@
                   <a
                     href={url}
                     target="_blank"
-                    rel="noreferrer"
                     title="Open revision in new tab"
                     class="hover:underline text-blue-500">{name}</a>
                 {:else}

src/lib/components/History/history.test.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unnecessary-condition */
 import type { HistoryEntry } from '$lib/types';
 import { describe, it, expect } from 'vitest';
 import {
@@ -7,7 +8,7 @@ import {
   historyModeStore,
   historyStore
 } from './history';
-import { defaultState } from '../../util/state';
+import { defaultState } from '$lib/util/state';
 import { get } from 'svelte/store';
 
 describe('history', () => {
@@ -17,28 +18,30 @@ describe('history', () => {
 
     addHistoryEntry({
       state: defaultState,
-      time: 12345,
+      time: 12_345,
       type: 'manual'
     });
 
-    const [manualEntry]: HistoryEntry[] = JSON.parse(
+    const [manualEntry] = JSON.parse(
-      window.localStorage.getItem('manualHistoryStore')
+      window.localStorage.getItem('manualHistoryStore') ?? '[]'
-    );
+    ) as HistoryEntry[];
 
-    expect(manualEntry.time).toBe(12345);
+    expect(manualEntry.time).toBe(12_345);
     expect(manualEntry.type).toBe('manual');
     expect(manualEntry.name).not.toBeNull();
     expect(manualEntry.state).not.toBeNull();
 
     addHistoryEntry({
       state: defaultState,
-      time: 54321,
+      time: 54_321,
       type: 'auto'
     });
 
-    const [autoEntry]: HistoryEntry[] = JSON.parse(window.localStorage.getItem('autoHistoryStore'));
+    const [autoEntry] = JSON.parse(
+      window.localStorage.getItem('autoHistoryStore') ?? '[]'
+    ) as HistoryEntry[];
 
-    expect(autoEntry.time).toBe(54321);
+    expect(autoEntry.time).toBe(54_321);
     expect(autoEntry.type).toBe('auto');
     expect(autoEntry.name).not.toBeNull();
     expect(autoEntry.state).not.toBeNull();
@@ -54,12 +57,12 @@ describe('history', () => {
   it('should clear history entries', () => {
     addHistoryEntry({
       state: defaultState,
-      time: 12345,
+      time: 12_345,
       type: 'manual'
     });
     addHistoryEntry({
       state: { ...defaultState, code: 'graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)' },
-      time: 123456,
+      time: 123_456,
       type: 'manual'
     });
 
@@ -74,12 +77,12 @@ describe('history', () => {
     historyModeStore.set('auto');
     addHistoryEntry({
       state: defaultState,
-      time: 54321,
+      time: 54_321,
       type: 'auto'
     });
     addHistoryEntry({
       state: { ...defaultState, code: 'graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)' },
-      time: 654321,
+      time: 654_321,
       type: 'auto'
     });
     expect(get(historyStore).length).toBe(2);
@@ -101,19 +104,23 @@ describe('history migration', () => {
       'autoHistoryStore',
       '[{"state":{"code":"graph TD\\n    A[New Year] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"auto","name":"barking-dog"},{"state":{"code":"graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","name":"needy-mosquito"}]'
     );
-    let manualHistoryStore: HistoryEntry[] = JSON.parse(
+    let manualHistoryStore = JSON.parse(
-      window.localStorage.getItem('manualHistoryStore')
+      window.localStorage.getItem('manualHistoryStore') ?? '[]'
-    );
+    ) as HistoryEntry[];
-    let autoHistoryStore: HistoryEntry[] = JSON.parse(
+    let autoHistoryStore = JSON.parse(
-      window.localStorage.getItem('autoHistoryStore')
+      window.localStorage.getItem('autoHistoryStore') ?? '[]'
-    );
+    ) as HistoryEntry[];
     expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
     expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
 
     injectHistoryIDs();
 
-    manualHistoryStore = JSON.parse(window.localStorage.getItem('manualHistoryStore'));
+    manualHistoryStore = JSON.parse(
-    autoHistoryStore = JSON.parse(window.localStorage.getItem('autoHistoryStore'));
+      window.localStorage.getItem('manualHistoryStore') ?? '[]'
+    ) as HistoryEntry[];
+    autoHistoryStore = JSON.parse(
+      window.localStorage.getItem('autoHistoryStore') ?? '[]'
+    ) as HistoryEntry[];
     expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
     expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
   });

src/lib/components/History/history.ts

@@ -26,19 +26,27 @@ const manualHistoryStore: Writable<HistoryEntry[]> = persist(
   'manualHistoryStore'
 );
 
-export const loaderHistoryStore: Writable<HistoryEntry[]> = writable([] as HistoryEntry[]);
+export const loaderHistoryStore: Writable<HistoryEntry[]> = writable([]);
 
 export const historyStore: Readable<HistoryEntry[]> = derived(
   [historyModeStore, autoHistoryStore, manualHistoryStore, loaderHistoryStore],
   ([historyMode, autoHistories, manualHistories, loadedHistories], set) => {
-    if (historyMode === 'auto') {
+    switch (historyMode) {
-      set(autoHistories);
+      case 'auto': {
-    } else if (historyMode === 'manual') {
+        set(autoHistories);
-      set(manualHistories);
+        break;
-    } else if (historyMode === 'loader') {
+      }
-      set(loadedHistories);
+      case 'manual': {
-    } else {
+        set(manualHistories);
-      set(autoHistories);
+        break;
+      }
+      case 'loader': {
+        set(loadedHistories);
+        break;
+      }
+      default: {
+        set(autoHistories);
+      }
     }
   }
 );
@@ -65,10 +73,10 @@ export const addHistoryEntry = (entryToAdd: Optional<HistoryEntry, 'id'>): void
       }
       return [entry, ...entries];
     });
-  } else if (entry.type === 'manual') {
-    manualHistoryStore.update((entries) => [entry, ...entries]);
-    logEvent('history', { action: 'save' });
   }
+
+  manualHistoryStore.update((entries) => [entry, ...entries]);
+  logEvent('history', { action: 'save' });
 };
 
 export const clearHistoryData = (idToClear?: string): void => {
@@ -90,7 +98,7 @@ export const getPreviousState = (auto: boolean): string => {
 };
 
 export const restoreHistory = (data: HistoryEntry[]) => {
-  const entries = data.filter(validateEntry);
+  const entries = data.filter((element) => validateEntry(element));
   const invalidEntryCount = data.length - entries.length;
   if (invalidEntryCount > 0) {
     console.error(`${invalidEntryCount} invalid history entries were removed.`);
@@ -122,20 +130,23 @@ export const restoreHistory = (data: HistoryEntry[]) => {
     alert('No valid entries found.');
   }
 };
+const setIDs = (entries: HistoryEntry[]) => {
+  for (const entry of entries) {
+    if (!entry.id) {
+      entry.id = uuidV4();
+    }
+  }
+  return entries;
+};
 
 export const injectHistoryIDs = (): void => {
-  const setIDs = (entries: HistoryEntry[]) => {
-    for (const entry of entries) {
-      if (!entry.id) {
-        entry.id = uuidV4();
-      }
-    }
-    return entries;
-  };
   autoHistoryStore.update(setIDs);
   manualHistoryStore.update(setIDs);
 };
 
 const validateEntry = (entry: HistoryEntry): boolean => {
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-expect-error
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
   return entry.type && entry.state && entry.time && true;
 };

src/lib/components/Navbar.svelte

@@ -1,27 +1,28 @@
-<script context="module">
+<script context="module" lang="ts">
   import { version } from 'mermaid/package.json';
   import { analytics } from '$lib/util/stats';
-  analytics?.track('version', {
+  void analytics?.track('version', {
     mermaidVersion: version
   });
 </script>
 
 <script lang="ts">
-  import Theme from './theme.svelte';
+  import Theme from './Theme.svelte';
 
   interface Link {
-    title: string;
     href: string;
+    title?: string;
     icon?: string;
+    img?: string;
   }
   const links: Link[] = [
     {
       title: 'Documentation',
-      href: 'https://mermaid-js.github.io/mermaid/#/n00b-gettingStarted'
+      href: 'https://mermaid.js.org/intro/n00b-gettingStarted.html'
     },
     {
       title: 'Tutorial',
-      href: 'https://github.com/mermaid-js/mermaid/blob/develop/docs/Tutorials.md'
+      href: 'https://mermaid.js.org/config/Tutorials.html'
     },
     {
       title: 'Mermaid',
@@ -32,9 +33,12 @@
       href: 'https://github.com/mermaid-js/mermaid-cli'
     },
     {
-      title: '',
       href: 'https://github.com/mermaid-js/mermaid-live-editor',
       icon: 'fab fa-github fa-lg'
+    },
+    {
+      href: 'https://mermaidchart.com',
+      img: '/mermaidchart-logo.svg'
     }
   ];
 </script>
@@ -47,7 +51,7 @@
   </div>
   <label for="menu-toggle" class="pointer-cursor lg:hidden block"
     ><svg
-      class="fill-current "
+      class="fill-current"
       xmlns="http://www.w3.org/2000/svg"
       width="20"
       height="20"
@@ -59,13 +63,18 @@
   <Theme />
   <div class="hidden lg:flex lg:items-center lg:w-auto w-full" id="menu">
     <ul class="lg:flex items-center justify-between text-base pt-4 lg:pt-0">
-      {#each links as { title, href, icon }}
+      {#each links as { title, href, icon, img }}
         <li>
-          <a class="btn btn-ghost" target="_blank" rel="noreferrer" {href}>
+          <a class="btn btn-ghost" target="_blank" {href}>
             {#if icon}
               <i class={icon} />
+            {:else if img}
+              <img src={img} alt={title} />
             {/if}
-            {title}</a>
+            {#if title}
+              {title}
+            {/if}
+          </a>
         </li>
       {/each}
     </ul>
@@ -79,4 +88,9 @@
   .navbar {
     z-index: 10000;
   }
+
+  img {
+    width: 1.5rem;
+    height: 1.5rem;
+  }
 </style>

src/lib/components/Preset.svelte

@@ -1,10 +1,10 @@
 <script lang="ts">
   import { updateCode } from '$lib/util/state';
-  import Card from '$lib/components/card/card.svelte';
+  import Card from '$lib/components/Card/Card.svelte';
   import { logEvent } from '$lib/util/stats';
 
   const samples = {
-    Flow: `graph TD
+    Flow: `flowchart TD
     A[Christmas] -->|Get money| B(Go shopping)
     B --> C{Let me think}
     C -->|One| D[Laptop]
@@ -101,10 +101,25 @@
             Argument mapping
     Tools
       Pen and paper
-      Mermaid`
+      Mermaid`,
+    QuadrantChart: `quadrantChart
+    title Reach and engagement of campaigns
+    x-axis Low Reach --> High Reach
+    y-axis Low Engagement --> High Engagement
+    quadrant-1 We should expand
+    quadrant-2 Need to promote
+    quadrant-3 Re-evaluate
+    quadrant-4 May be improved
+    Campaign A: [0.3, 0.6]
+    Campaign B: [0.45, 0.23]
+    Campaign C: [0.57, 0.69]
+    Campaign D: [0.78, 0.34]
+    Campaign E: [0.40, 0.34]
+    Campaign F: [0.35, 0.78]`
   };
 
-  const loadSampleDiagram = (diagramType: string): void => {
+  type SampleTypes = keyof typeof samples;
+  const loadSampleDiagram = (diagramType: SampleTypes): void => {
     updateCode(samples[diagramType], {
       updateDiagram: true,
       resetPanZoom: true
@@ -113,8 +128,8 @@
   };
 
   // Adding in this array will add an icon to the preset menu
-  const newDiagrams: Array<keyof typeof samples> = ['Mindmap'];
+  const newDiagrams: SampleTypes[] = ['Mindmap', 'QuadrantChart'];
-  const diagramOrder: Array<keyof typeof samples> = [
+  const diagramOrder: SampleTypes[] = [
     'Sequence',
     'Flow',
     'Class',
@@ -124,7 +139,8 @@
     'User Journey',
     'Git',
     'Pie',
-    'Mindmap'
+    'Mindmap',
+    'QuadrantChart'
   ];
 </script>
 

src/lib/components/Theme.svelte

@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { setTheme, themeStore } from '$lib/util/theme';
 
   const themes = [
@@ -28,7 +28,7 @@
 
 <div class="hidden lg:block dropdown">
   <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
-  <div tabindex="0" class="btn btn-ghost ">
+  <div tabindex="0" class="btn btn-ghost">
     <svg
       xmlns="http://www.w3.org/2000/svg"
       fill="none"
@@ -39,7 +39,7 @@
         stroke-linejoin="round"
         stroke-width="2"
         d="M7 21a4 4 0 01-4-4V5a2 2 0 012-2h4a2 2 0 012 2v12a4 4 0 01-4 4zm0 0h12a2 2 0 002-2v-4a2 2 0 00-2-2h-2.343M11 7.343l1.657-1.657a2 2 0 012.828 0l2.829 2.829a2 2 0 010 2.828l-8.486 8.485M7 17h.01" /></svg>
-    <span class="hidden md:inline"> Change Theme </span>
+    <span class="hidden md:inline">Theme</span>
     <svg
       xmlns="http://www.w3.org/2000/svg"
       viewBox="0 0 1792 1792"
@@ -52,7 +52,7 @@
     <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
     <ul tabindex="0" class="p-4 menu compact">
       {#each themes as theme}
-        <li class={theme.includes($themeStore.theme) ? 'bordered' : ''}>
+        <li class:bordered={$themeStore.theme !== undefined && theme.includes($themeStore.theme)}>
           <span
             class="btn btn-ghost justify-start"
             on:click={() => setTheme(theme)}

src/lib/components/View.svelte

@@ -4,8 +4,9 @@
   import panzoom from 'svg-pan-zoom';
   import type { State, ValidatedState } from '$lib/types';
   import { logEvent } from '$lib/util/stats';
-  import { AsyncQueue, cmdKey } from '$lib/util/util';
+  import { cmdKey } from '$lib/util/util';
   import { render as renderDiagram } from '$lib/util/mermaid';
+  import type { MermaidConfig } from 'mermaid';
 
   let code = '';
   let config = '';
@@ -16,9 +17,12 @@
   let hide = false;
   let manualUpdate = true;
   let panZoomEnabled = $stateStore.panZoom;
-  let pzoom: SvgPanZoom.Instance;
+  let pzoom: typeof panzoom | undefined;
 
   const handlePanZoomChange = () => {
+    if (!pzoom) {
+      return;
+    }
     const pan = pzoom.getPan();
     const zoom = pzoom.getZoom();
     updateCodeStore({ pan, zoom });
@@ -32,8 +36,11 @@
     hide = true;
     pzoom?.destroy();
     pzoom = undefined;
-    Promise.resolve().then(() => {
+    void Promise.resolve().then(() => {
       const graphDiv = document.getElementById('graph-div');
+      if (!graphDiv) {
+        return;
+      }
       pzoom = panzoom(graphDiv, {
         onPan: handlePanZoomChange,
         onZoom: handlePanZoomChange,
@@ -70,27 +77,30 @@
         code = state.code;
         config = state.mermaid;
         panZoomEnabled = state.panZoom;
-        const scroll = view.parentElement.scrollTop;
+        const scroll = view.parentElement!.scrollTop;
         delete container.dataset.processed;
-        await renderDiagram(
+        const { svg, bindFunctions } = await renderDiagram(
-          Object.assign({}, JSON.parse(state.mermaid)),
+          Object.assign({}, JSON.parse(state.mermaid)) as MermaidConfig,
           code,
-          'graph-div',
+          'graph-div'
-          (svgCode, bindFunctions) => {
-            if (svgCode.length > 0) {
-              handlePanZoom(state);
-              container.innerHTML = svgCode;
-              // console.log(container.innerHTML);
-              const graphDiv = document.getElementById('graph-div');
-              graphDiv.setAttribute('height', '100%');
-              graphDiv.style.maxWidth = '100%';
-              if (bindFunctions) {
-                bindFunctions(graphDiv);
-              }
-            }
-          }
         );
-        view.parentElement.scrollTop = scroll;
+
+        if (svg.length > 0) {
+          handlePanZoom(state);
+          container.innerHTML = svg;
+          console.log({ svg });
+          const graphDiv = document.getElementById('graph-div');
+          if (!graphDiv) {
+            throw new Error('graph-div not found');
+          }
+          graphDiv.setAttribute('height', '100%');
+          graphDiv.style.maxWidth = '100%';
+          if (bindFunctions) {
+            bindFunctions(graphDiv);
+          }
+        }
+
+        view.parentElement!.scrollTop = scroll;
         error = false;
       } else if (manualUpdate) {
         manualUpdate = false;
@@ -103,29 +113,26 @@
     }
   };
 
-  const q = new AsyncQueue(handleStateChange);
-
   onMount(() => {
-    stateStore.subscribe(async (state) => {
+    stateStore.subscribe((state) => {
-      await q.process(state);
+      void handleStateChange(state);
     });
     window.addEventListener('resize', () => {
       if ($stateStore.panZoom && pzoom) {
         pzoom.resize();
       }
     });
-    console.log('View mounted');
   });
 </script>
 
 {#if (error && $stateStore.error instanceof Error) || outOfSync}
   <div
-    class="absolute w-full p-2 z-10 {error
+    class="absolute w-full p-2 z-10 font-mono {error
       ? 'text-red-600'
-      : 'text-yellow-600'} bg-base-100 bg-opacity-80 text-center"
+      : 'text-yellow-600'} bg-base-100 bg-opacity-80 text-left"
     id="errorContainer">
     {#if error}
-      {$stateStore.error}
+      {@html $stateStore.error?.toString().replace(/\n/g, '<br />')}
     {:else}
       Diagram out of sync. <br />
       Press <i class="fas fa-sync" /> (Sync button) or <kbd>{cmdKey} + Enter</kbd> to sync.

src/lib/components/card/__snapshots__/card.test.ts.snap

@@ -1,3 +0,0 @@
-// Vitest Snapshot v1
-
-exports[`card.svelte > mounts 1`] = `"<div><div class=\\"card rounded overflow-hidden m-2 flex-grow flex flex-col shadow-2xl\\"><div class=\\"bg-primary p-2 pb-0 flex-none cursor-pointer\\"><div class=\\"flex justify-between\\"><div class=\\"flex cursor-default s-_wx1E_JHsCoF\\"><span class=\\"mr-2 font-semibold s-_wx1E_JHsCoF\\"><i class=\\"fas fa-chevron-right icon s-_wx1E_JHsCoF isOpen\\"></i> TabTest</span> <ul class=\\"tabs s-_wx1E_JHsCoF\\"><div class=\\"tab tab-lifted tab-active s-_wx1E_JHsCoF\\"><i class=\\"mr-1 undefined s-_wx1E_JHsCoF\\"></i> title1 </div><div class=\\"tab tab-lifted text-primary-content s-_wx1E_JHsCoF\\"><i class=\\"mr-1 undefined s-_wx1E_JHsCoF\\"></i> title2 </div></ul></div><!--<Tabs>--> <div class=\\"flex gap-x-4 items-center -mt-2\\"></div></div></div> <div class=\\"card-body p-0 flex-grow overflow-auto text-base-content\\"></div></div><!--<Card>--></div>"`;

src/lib/components/editor.svelte

@@ -1,115 +0,0 @@
-<script lang="ts">
-  import type { EditorMode } from '$lib/types';
-  import { stateStore, updateCode, updateConfig } from '$lib/util/state';
-  import { themeStore } from '$lib/util/theme';
-  import { errorDebug, syncDiagram } from '$lib/util/util';
-  import type monaco from 'monaco-editor';
-  import { onMount } from 'svelte';
-  import initEditor from 'monaco-mermaid';
-  import { logEvent } from '$lib/util/stats';
-
-  let divEl: HTMLDivElement = null;
-  let editor: monaco.editor.IStandaloneCodeEditor;
-  let Monaco: typeof monaco;
-  let editorOptions: monaco.editor.IStandaloneEditorConstructionOptions = {
-    minimap: {
-      enabled: false
-    },
-    theme: 'mermaid',
-    overviewRulerLanes: 0
-  };
-  let text = '';
-
-  stateStore.subscribe(({ errorMarkers, editorMode, code, mermaid }) => {
-    console.log('editor store subscription', { code, mermaid });
-    if (!editor) return;
-
-    // Update editor text if it's different
-    const newText = editorMode === 'code' ? code : mermaid;
-    if (newText !== text) {
-      console.log('updating editor text', newText);
-      editor.setValue(newText);
-      text = newText;
-    }
-
-    // Update editor mode if it's different
-    const language = editorMode === 'code' ? 'mermaid' : 'json';
-    if (editor.getModel().getLanguageId() !== language) {
-      Monaco?.editor.setModelLanguage(editor.getModel(), language);
-    }
-
-    // Display/clear errors
-    Monaco?.editor.setModelMarkers(editor.getModel(), 'mermaid', errorMarkers);
-  });
-
-  themeStore.subscribe(({ isDark }) => {
-    editor && Monaco?.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid');
-  });
-
-  const handleUpdate = (text: string, mode: EditorMode) => {
-    console.log('editor HandleUpdate', { text, mode });
-    if (mode === 'code') {
-      updateCode(text);
-    } else {
-      updateConfig(text);
-    }
-  };
-
-  const loadMonaco = async () => {
-    console.log('Loading Monaco...');
-    // errorDebug();
-    let i = 0;
-    while (i++ < 500) {
-      // @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco.
-      Monaco = window.monaco;
-      if (Monaco !== undefined) {
-        return;
-      }
-      await new Promise((r) => setTimeout(r, 100));
-    }
-    alert('Loading Monaco Editor failed. Please try refreshing the page.');
-  };
-
-  onMount(async () => {
-    await loadMonaco(); // Fix https://github.com/mermaid-js/mermaid-live-editor/issues/175
-    initEditor(Monaco);
-    errorDebug(100);
-    editor = Monaco.editor.create(divEl, editorOptions);
-    editor.onDidChangeModelContent(({ isFlush, changes }) => {
-      const newText = editor.getValue();
-      console.log('editor onDidChangeModelContent', { text, newText, isFlush, changes });
-      if (text === newText || isFlush) {
-        return;
-      }
-      text = newText;
-      handleUpdate(text, $stateStore.editorMode);
-    });
-    editor.addAction({
-      id: 'mermaid-render-diagram',
-      label: 'Render Diagram',
-      keybindings: [Monaco.KeyMod.CtrlCmd | Monaco.KeyCode.Enter],
-      run: function () {
-        syncDiagram();
-        logEvent('renderDiagram', {
-          method: 'keyboadShortcut'
-        });
-      }
-    });
-    Monaco?.editor.setTheme($themeStore.isDark ? 'mermaid-dark' : 'mermaid');
-    const resizeObserver = new ResizeObserver((entries) => {
-      editor.layout({
-        height: entries[0].contentRect.height,
-        width: entries[0].contentRect.width
-      });
-    });
-
-    resizeObserver.observe(divEl.parentElement);
-    console.log(`editor mounted`);
-    return () => {
-      console.log(`editor disposed`);
-      editor.dispose();
-    };
-  });
-</script>
-
-<div bind:this={divEl} id="editor" class="overflow-hidden" />

src/lib/types.d.ts

@@ -1,11 +1,3 @@
-/**
- * Can be made globally available by placing this
- * inside `global.d.ts` and removing `export` keyword
- */
-export interface Locals {
-  userid: string;
-}
-
 export interface MarkerData {
   severity: number;
   message: string;
@@ -40,7 +32,7 @@ export interface State {
 
 export interface ValidatedState extends State {
   editorMode: EditorMode;
-  error: unknown;
+  error?: Error;
   errorMarkers: MarkerData[];
   serialized: string;
 }
@@ -73,14 +65,24 @@ export type HistoryEntry = { id: string; state: State; time: number; url?: strin
     }
 );
 
-export interface DocConfig {
+export type DocumentationConfig = Record<
-  [key: string]: {
+  string,
+  {
     code: string;
     config?: string;
-  };
+  }
-}
+>;
 
 export type EditorMode = 'code' | 'config';
 
 export type Loader = (url: string) => Promise<State>;
 export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
+
+export interface ErrorHash {
+  loc: {
+    first_line: number;
+    last_line: number;
+    first_column: number;
+    last_column: number;
+  };
+}

src/lib/util/fileLoaders/gist.ts

@@ -3,19 +3,26 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { State } from '$lib/types';
-import { defaultState } from '../state';
+import { defaultState } from '$lib/util/state';
-import { addHistoryEntry } from '../../components/history/history';
+import { addHistoryEntry } from '$lib/components/History/history';
+import { fetchJSON, fetchText } from '$lib/util/util';
 
 const codeFileName = 'code.mmd';
 const configFileName = 'config.json';
 
+interface GithubFile {
+  truncated: boolean;
+  raw_url: string;
+  content: string;
+}
+
 const isValidGist = (files: any): boolean => {
   return codeFileName in files;
 };
 
-const getFileContent = async (file: any): Promise<string> => {
+const getFileContent = async (file: GithubFile): Promise<string> => {
   if (file.truncated) {
-    return await (await fetch(file.raw_url)).text();
+    return await fetchText(file.raw_url);
   }
   return file.content;
 };
@@ -29,16 +36,26 @@ interface GistData {
   url: string;
 }
 
+interface GistResponse {
+  files: Record<string, GithubFile>;
+  html_url: string;
+  history: { url: string; committed_at: string; version: string; user: { login: string } }[];
+}
+
 const getGistData = async (gistURL: string): Promise<GistData> => {
+  const path = gistURL.split('github.com').pop();
+  if (!path) {
+    throw new Error('Invalid GitHub URL' + gistURL);
+  }
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const [_, __, gistID, revisionID] = gistURL.split('github.com').pop().split('/');
+  const [_, __, gistID, revisionID] = path.split('/');
   // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  const { html_url, files, history } = await (
+  const { html_url, files, history }: GistResponse = await fetchJSON(
-    await fetch(`https://api.github.com/gists/${gistID}${revisionID ? '/' + revisionID : ''}`)
+    `https://api.github.com/gists/${gistID}${revisionID ? '/' + revisionID : ''}`
-  ).json();
+  );
   if (isValidGist(files)) {
     const code = await getFileContent(files[codeFileName]);
-    let config: string;
+    let config = '{}';
     if (configFileName in files) {
       config = await getFileContent(files[configFileName]);
     }
@@ -50,10 +67,10 @@ const getGistData = async (gistURL: string): Promise<GistData> => {
       config,
       author: currentItem.user.login,
       time: new Date(currentItem.committed_at).getTime(),
-      version: (currentItem.version as string).slice(-7)
+      version: currentItem.version.slice(-7)
     };
   } else {
-    throw 'Invalid gist provided';
+    throw new Error('Invalid gist provided');
   }
 };
 
@@ -73,35 +90,38 @@ const getStateFromGist = (gist: GistData, gistURL: string = gist.url): State =>
 };
 
 export const loadGistData = async (gistURL: string): Promise<State> => {
-  try {
+  const path = gistURL.split('github.com').pop();
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  if (!path) {
-    const [_, __, gistID, revisionID] = gistURL.split('github.com').pop().split('/');
+    throw new Error('Invalid GitHub URL' + gistURL);
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const { history } = await (
-      await fetch(`https://api.github.com/gists/${gistID}${revisionID ? '/' + revisionID : ''}`)
-    ).json();
-    const gistHistory: GistData[] = [];
-    for (const entry of history) {
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      const data: GistData = await getGistData(entry.url).catch(() => undefined);
-      data && gistHistory.push(data);
-    }
-    if (gistHistory.length === 0) {
-      throw 'Invalid gist provided';
-    }
-    gistHistory.reverse();
-    const state = getStateFromGist(gistHistory.slice(-1).pop(), gistURL);
-    for (const gist of gistHistory) {
-      addHistoryEntry({
-        state: getStateFromGist(gist),
-        time: gist.time,
-        type: 'loader',
-        url: gist.url,
-        name: `${gist.author} v${gist.version}`
-      });
-    }
-    return state;
-  } catch (err) {
-    console.error(err);
   }
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const [_, __, gistID, revisionID] = path.split('/');
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+  const { history }: GistResponse = await fetchJSON(
+    `https://api.github.com/gists/${gistID}${revisionID ? '/' + revisionID : ''}`
+  );
+  const gistHistory: GistData[] = [];
+  for (const entry of history) {
+    const data: GistData | undefined = await getGistData(entry.url).catch();
+    data && gistHistory.push(data);
+  }
+  if (gistHistory.length === 0) {
+    throw new Error('Invalid gist provided');
+  }
+  gistHistory.reverse();
+  const entry = gistHistory.slice(-1).pop();
+  if (!entry) {
+    throw new Error('Invalid gist provided');
+  }
+  const state = getStateFromGist(entry, gistURL);
+  for (const gist of gistHistory) {
+    addHistoryEntry({
+      state: getStateFromGist(gist),
+      time: gist.time,
+      type: 'loader',
+      url: gist.url,
+      name: `${gist.author} v${gist.version}`
+    });
+  }
+  return state;
 };

src/lib/util/fileLoaders/loader.ts

@@ -1,6 +1,8 @@
 import { loadGistData } from './gist';
-import { updateCodeStore, defaultState } from '../state';
+import { updateCodeStore, defaultState } from '$lib/util/state';
+import { fetchText } from '$lib/util/util';
 import type { Loader, State } from '$lib/types';
+
 const loaders: Record<string, Loader> = {
   gist: loadGistData
 };
@@ -8,36 +10,21 @@ const loaders: Record<string, Loader> = {
 export const loadDataFromUrl = async (): Promise<void> => {
   const searchParams = new URLSearchParams(window.location.search);
   let state: Partial<State> = defaultState;
-  let code: string, config: string;
   let loaded = false;
-  const codeURL: string = searchParams.get('code');
+  const codeURL: string | undefined = searchParams.get('code') ?? undefined;
-  const configURL: string = searchParams.get('config');
+  const configURL: string | undefined = searchParams.get('config') ?? undefined;
+
+  let code: string | undefined;
+  const config = configURL ? await fetchText(configURL) : defaultState.mermaid;
 
   if (codeURL) {
-    code = await (await fetch(codeURL)).text();
+    code = await fetchText(codeURL);
     loaded = true;
   }
-  if (configURL) {
+  if (code) {
-    config = await (await fetch(configURL)).text();
+    if (!codeURL) {
-  } else {
+      throw new Error('Code URL is not defined');
-    config = defaultState.mermaid;
-  }
-  if (!code) {
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    for (const [key, value] of searchParams.entries()) {
-      if (key in loaders) {
-        try {
-          state = await loaders[key](value);
-          loaded = true;
-          break;
-        } catch (err) {
-          console.error(err);
-        }
-      }
     }
-  } else {
     state = {
       code,
       mermaid: config,
@@ -49,6 +36,18 @@ export const loadDataFromUrl = async (): Promise<void> => {
         }
       }
     };
+  } else {
+    for (const [key, value] of searchParams.entries()) {
+      if (key in loaders) {
+        try {
+          state = await loaders[key](value);
+          loaded = true;
+          break;
+        } catch (error) {
+          console.error(error);
+        }
+      }
+    }
   }
   loaded &&
     updateCodeStore({

src/lib/util/mermaid.ts

@@ -1,27 +1,16 @@
-import mermaid, { type MermaidConfig } from 'mermaid';
+import mermaid from 'mermaid';
-import mindmap from '@mermaid-js/mermaid-mindmap';
+import type { MermaidConfig, RenderResult } from 'mermaid';
-
-const initialize = mermaid.registerExternalDiagrams([mindmap]);
-
-export const init = async () => {
-  await initialize;
-};
 
 export const render = async (
   config: MermaidConfig,
   code: string,
-  id: string,
+  id: string
-  callback: Parameters<typeof mermaid.render>[2]
+): Promise<RenderResult> => {
-): Promise<void> => {
   // Should be able to call this multiple times without any issues.
   mermaid.initialize(config);
-  // console.log('Rendering', code);
+  return await mermaid.render(id, code);
-  // mermaid.mermaidAPI.render(id, code, callback);
-  await init();
-  await mermaid.mermaidAPI.renderAsync(id, code, callback);
 };
 
-export const parse = async (code: string): Promise<boolean> => {
+export const parse = async (code: string): Promise<unknown> => {
-  await init();
+  return await mermaid.parse(code);
-  return (await mermaid.parseAsync(code)) as boolean;
 };

src/lib/util/migrations.test.ts

@@ -16,18 +16,22 @@ describe('migrations', () => {
   it('should migrate from v0 to v1', async () => {
     const { applyMigrations } = await import('./migrations');
     let manualHistoryStore: HistoryEntry[] = JSON.parse(
-      window.localStorage.getItem('manualHistoryStore')
+      window.localStorage.getItem('manualHistoryStore') ?? '[]'
-    );
+    ) as HistoryEntry[];
     let autoHistoryStore: HistoryEntry[] = JSON.parse(
-      window.localStorage.getItem('autoHistoryStore')
+      window.localStorage.getItem('autoHistoryStore') ?? '[]'
-    );
+    ) as HistoryEntry[];
     expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
     expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
 
     applyMigrations();
 
-    manualHistoryStore = JSON.parse(window.localStorage.getItem('manualHistoryStore'));
+    manualHistoryStore = JSON.parse(
-    autoHistoryStore = JSON.parse(window.localStorage.getItem('autoHistoryStore'));
+      window.localStorage.getItem('manualHistoryStore') ?? '[]'
+    ) as HistoryEntry[];
+    autoHistoryStore = JSON.parse(
+      window.localStorage.getItem('autoHistoryStore') ?? '[]'
+    ) as HistoryEntry[];
     expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
     expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
   });

src/lib/util/migrations.ts

@@ -1,13 +1,13 @@
 import { writable, get, type Writable } from 'svelte/store';
 import { persist, localStorage } from '$lib/util/persist';
-import { injectHistoryIDs } from '$lib/components/history/history';
+import { injectHistoryIDs } from '$lib/components/History/history';
 import { logEvent } from './stats';
 
 interface MigrationState {
   version: number;
 }
 
-const migrations: { [key: string]: () => void } = {
+const migrations: Record<string, () => void> = {
   injectHistoryIDs
 };
 

src/lib/util/monacoExtra.ts

@@ -0,0 +1,621 @@
+// Modified from https://github.com/Yash-Singh1/monaco-mermaid/blob/main/index.ts
+
+import type * as Monaco from 'monaco-editor';
+
+export const initEditor = (monacoEditor: typeof Monaco): void => {
+  monacoEditor.languages.register({ id: 'mermaid' });
+  const requirementDiagrams = [
+    'requirement',
+    'functionalRequirement',
+    'interfaceRequirement',
+    'performanceRequirement',
+    'physicalRequirement',
+    'designConstraint'
+  ];
+  const keywords: Record<
+    string,
+    {
+      typeKeywords: string[];
+      blockKeywords: string[];
+      keywords: string[];
+    }
+  > = {
+    flowchart: {
+      typeKeywords: ['flowchart', 'flowchart-v2', 'graph'],
+      blockKeywords: ['subgraph', 'end'],
+      keywords: [
+        'TB',
+        'TD',
+        'BT',
+        'RL',
+        'LR',
+        'click',
+        'call',
+        'href',
+        '_self',
+        '_blank',
+        '_parent',
+        '_top',
+        'linkStyle',
+        'style',
+        'classDef',
+        'class',
+        'direction',
+        'interpolate'
+      ]
+    },
+    sequenceDiagram: {
+      typeKeywords: ['sequenceDiagram'],
+      blockKeywords: ['alt', 'par', 'and', 'loop', 'else', 'end', 'rect', 'opt', 'alt', 'rect'],
+      keywords: [
+        'participant',
+        'as',
+        'Note',
+        'note',
+        'right of',
+        'left of',
+        'over',
+        'activate',
+        'deactivate',
+        'autonumber',
+        'title',
+        'actor',
+        'accDescription',
+        'link',
+        'links'
+      ]
+    },
+    classDiagram: {
+      typeKeywords: ['classDiagram', 'classDiagram-v2'],
+      blockKeywords: ['class'],
+      keywords: [
+        'link',
+        'click',
+        'callback',
+        'call',
+        'href',
+        'cssClass',
+        'direction',
+        'TB',
+        'BT',
+        'RL',
+        'LR',
+        'title',
+        'accDescription',
+        'order'
+      ]
+    },
+    stateDiagram: {
+      typeKeywords: ['stateDiagram', 'stateDiagram-v2'],
+      blockKeywords: ['state', 'note', 'end'],
+      keywords: ['state', 'as', 'hide empty description', 'direction', 'TB', 'BT', 'RL', 'LR']
+    },
+    erDiagram: {
+      typeKeywords: ['erDiagram'],
+      blockKeywords: [],
+      keywords: ['title', 'accDescription']
+    },
+    journey: {
+      typeKeywords: ['journey'],
+      blockKeywords: ['section'],
+      keywords: ['title']
+    },
+    info: {
+      typeKeywords: ['info'],
+      blockKeywords: [],
+      keywords: ['showInfo']
+    },
+    gantt: {
+      typeKeywords: ['gantt'],
+      blockKeywords: [],
+      keywords: [
+        'title',
+        'dateFormat',
+        'axisFormat',
+        'todayMarker',
+        'section',
+        'excludes',
+        'inclusiveEndDates'
+      ]
+    },
+    requirementDiagram: {
+      typeKeywords: ['requirement', 'requirementDiagram'],
+      blockKeywords: [...requirementDiagrams, 'element'],
+      keywords: []
+    },
+    gitGraph: {
+      typeKeywords: ['gitGraph'],
+      blockKeywords: [],
+      keywords: [
+        'accTitle',
+        'accDescr',
+        'commit',
+        'cherry-pick',
+        'branch',
+        'merge',
+        'reset',
+        'checkout',
+        'LR',
+        'BT',
+        'id',
+        'msg',
+        'type',
+        'tag',
+        'NORMAL',
+        'REVERSE',
+        'HIGHLIGHT'
+      ]
+    },
+    pie: {
+      typeKeywords: ['pie'],
+      blockKeywords: [],
+      keywords: ['showData', 'title', 'accDescr', 'accTitle']
+    },
+    c4Diagram: {
+      typeKeywords: ['C4Context', 'C4Container', 'C4Component', 'C4Dynamic', 'C4Deployment'],
+      blockKeywords: [
+        'Boundary',
+        'Enterprise_Boundary',
+        'System_Boundary',
+        'Container_Boundary',
+        'Node',
+        'Node_L',
+        'Node_R'
+      ],
+      keywords: [
+        'title',
+        'accDescription',
+        'direction',
+        'TB',
+        'BT',
+        'RL',
+        'LR',
+        'Person_Ext',
+        'Person',
+        'SystemQueue_Ext',
+        'SystemDb_Ext',
+        'System_Ext',
+        'SystemQueue',
+        'SystemDb',
+        'System',
+        'ContainerQueue_Ext',
+        'ContainerDb_Ext',
+        'Container_Ext',
+        'ContainerQueue',
+        'ContainerDb',
+        'Container',
+        'ComponentQueue_Ext',
+        'ComponentDb_Ext',
+        'Component_Ext',
+        'ComponentQueue',
+        'ComponentDb',
+        'Component',
+        'Deployment_Node',
+        'Rel',
+        'BiRel',
+        'Rel_Up',
+        'Rel_U',
+        'Rel_Down',
+        'Rel_D',
+        'Rel_Left',
+        'Rel_L',
+        'Rel_Right',
+        'Rel_R',
+        'Rel_Back',
+        'RelIndex'
+      ]
+    },
+    sankey: {
+      typeKeywords: ['sankey-beta'],
+      blockKeywords: [],
+      keywords: []
+    }
+  };
+
+  const configDirectiveHandler = [
+    /^\s*%%(?={)/,
+    {
+      token: 'string',
+      next: '@configDirective',
+      nextEmbedded: 'javascript'
+    }
+  ] as Monaco.languages.IShortMonarchLanguageRule1;
+
+  // Register a tokens provider for the mermaid language
+  monacoEditor.languages.setMonarchTokensProvider('mermaid', {
+    ...Object.entries(keywords)
+      .map((entry) =>
+        Object.fromEntries(
+          Object.entries(entry[1]).map((deepEntry) => [
+            entry[0] + deepEntry[0][0].toUpperCase() + deepEntry[0].slice(1),
+            deepEntry[1]
+          ])
+        )
+      )
+      // eslint-disable-next-line unicorn/no-array-reduce
+      .reduce(
+        (overallKeywords, nextKeyword) => ({
+          ...overallKeywords,
+          ...nextKeyword
+        }),
+        {}
+      ),
+    tokenizer: {
+      root: [
+        [/^\s*gitGraph/m, 'typeKeyword', 'gitGraph'],
+        [/^\s*info/m, 'typeKeyword', 'info'],
+        [/^\s*pie/m, 'typeKeyword', 'pie'],
+        [/^\s*(flowchart|flowchart-v2|graph)/m, 'typeKeyword', 'flowchart'],
+        [/^\s*sequenceDiagram/, 'typeKeyword', 'sequenceDiagram'],
+        [/^\s*classDiagram(-v2)?/, 'typeKeyword', 'classDiagram'],
+        [/^\s*journey/, 'typeKeyword', 'journey'],
+        [/^\s*gantt/, 'typeKeyword', 'gantt'],
+        [/^\s*stateDiagram(-v2)?/, 'typeKeyword', 'stateDiagram'],
+        [/^\s*er(Diagram)?/, 'typeKeyword', 'erDiagram'],
+        [/^\s*requirement(Diagram)?/, 'typeKeyword', 'requirementDiagram'],
+        [/^\s*sankey-beta/m, 'typeKeyword', 'sankey'],
+        [
+          /^\s*(C4Context|C4Container|C4Component|C4Dynamic|C4Deployment)/m,
+          'typeKeyword',
+          'c4Diagram'
+        ],
+        configDirectiveHandler,
+        [/%%[^${].*$/, 'comment']
+      ],
+      configDirective: [[/%%$/, { token: 'string', next: '@pop', nextEmbedded: '@pop' }]],
+      gitGraph: [
+        configDirectiveHandler,
+        [/option(?=s)/, { token: 'typeKeyword', next: 'optionsGitGraph' }],
+        [/(accTitle|accDescr)(\s*:)(\s*[^\n\r]+$)/, ['keyword', 'delimiter.bracket', 'string']],
+        [
+          /(^\s*branch)(.*?)(\s+order)(:\s*)(\d+\s*$)/,
+          ['keyword', 'variable', 'keyword', 'delimiter.bracket', 'number']
+        ],
+        [/".*?"/, 'string'],
+        [
+          /(^\s*)(branch|reset|merge|checkout)(\s*\S+)/m,
+          ['delimiter.bracket', 'keyword', 'variable']
+        ],
+        [
+          /[A-Za-z][\w$]*/,
+          {
+            cases: {
+              '@gitGraphBlockKeywords': 'typeKeyword',
+              '@gitGraphKeywords': 'keyword'
+            }
+          }
+        ],
+        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
+        [/\^/, 'delimiter.bracket']
+      ],
+      optionsGitGraph: [
+        [
+          /s$/,
+          {
+            token: 'typeKeyword',
+            nextEmbedded: 'json'
+          }
+        ],
+        ['end', { token: 'typeKeyword', next: '@pop', nextEmbedded: '@pop' }]
+      ],
+      info: [
+        [
+          /[A-Za-z][\w$]*/,
+          {
+            cases: {
+              '@infoBlockKeywords': 'typeKeyword',
+              '@infoKeywords': 'keyword'
+            }
+          }
+        ]
+      ],
+      pie: [
+        configDirectiveHandler,
+        [/(title|accDescription)(.*$)/, ['keyword', 'string']],
+        [
+          /[A-Za-z][\w$]*/,
+          {
+            cases: {
+              '@pieBlockKeywords': 'typeKeyword',
+              '@pieKeywords': 'keyword'
+            }
+          }
+        ],
+        [/".*?"/, 'string'],
+        [/\s*\d+/, 'number'],
+        [/:/, 'delimiter.bracket'],
+        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
+      ],
+      flowchart: [
+        configDirectiveHandler,
+        [/[ox]?(--+|==+)[ox]/, 'transition'],
+        [
+          /[A-Za-z][\w$]*/,
+          {
+            cases: {
+              '@flowchartBlockKeywords': 'typeKeyword',
+              '@flowchartKeywords': 'keyword',
+              '@default': 'variable'
+            }
+          }
+        ],
+        [/\|+.+?\|+/, 'string'],
+        [/\[+(\\.+?[/\\]|\/.+?[/\\])]+/, 'string'],
+        [/[>[]+[^[\]|]+?]+/, 'string'],
+        [/{+.+?}+/, 'string'],
+        [/\(+.+?\)+/, 'string'],
+        [/-\.+->?/, 'transition'],
+        [/(-[.-])([^>-][^-]+?)(-{3,}|-{2,}>|\.-+>)/, ['transition', 'string', 'transition']],
+        [/(==+)([^=]+?)(={3,}|={2,}>)/, ['transition', 'string', 'transition']],
+        [/<?(--+|==+)>|===+|---+/, 'transition'],
+        [/:::/, 'transition'],
+        [/[&;]/, 'delimiter.bracket'],
+        [/".*?"/, 'string'],
+        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
+      ],
+      sequenceDiagram: [
+        configDirectiveHandler,
+        [/(title:?|accDescription)([^\n\r;]*$)/, ['keyword', 'string']],
+        [/(autonumber)([^\S\n\r]+off[^\S\n\r]*$)/, ['keyword', 'keyword']],
+        [/(autonumber)((?:[^\S\n\r]+\d+){2}[^\S\n\r]*$)/, ['keyword', 'number']],
+        [/(autonumber)([^\S\n\r]+\d+[^\S\n\r]*$)/, ['keyword', 'number']],
+        [
+          /(link\s+)(.*?)(:)(\s*.*?)(\s*@)(\s*[^\n\r;]+)/,
+          ['keyword', 'variable', 'delimiter.bracket', 'string', 'delimiter.bracket', 'string']
+        ],
+        [
+          /((?:links|properties)\s+)([^\n\r:]*?)(:\s+)/,
+          [
+            { token: 'keyword' },
+            { token: 'variable' },
+            {
+              token: 'delimiter.bracket',
+              nextEmbedded: 'javascript',
+              next: '@sequenceDiagramLinksProps'
+            }
+          ]
+        ],
+        [
+          /[A-Za-z][\w$]*/,
+          {
+            cases: {
+              '@sequenceDiagramBlockKeywords': 'typeKeyword',
+              '@sequenceDiagramKeywords': 'keyword',
+              '@default': 'variable'
+            }
+          }
+        ],
+        [/(--?>?>|--?[)x])[+-]?/, 'transition'],
+        [/(:)([^\n:]*?$)/, ['delimiter.bracket', 'string']],
+        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
+      ],
+      sequenceDiagramLinksProps: [
+        // [/^:/, { token: 'delimiter.bracket', nextEmbedded: 'json' }],
+        [/$|;/, { nextEmbedded: '@pop', next: '@pop', token: 'delimiter.bracket' }]
+      ],
+      classDiagram: [
+        configDirectiveHandler,
+        [/(^\s*(?:title|accDescription))(\s+.*$)/, ['keyword', 'string']],
+        [
+          /(\*|<\|?|o|)(--|\.\.)(\*|\|?>|o|)([\t ]*[A-Za-z]+[\t ]*)(:)(.*?$)/,
+          ['transition', 'transition', 'transition', 'variable', 'delimiter.bracket', 'string']
+        ],
+        [/(?!class\s)([A-Za-z]+)(\s+[A-Za-z]+)/, ['type', 'variable']],
+        [/(\*|<\|?|o)?(--|\.\.)(\*|\|?>|o)?/, 'transition'],
+        [/^\s*class\s(?!.*{)/, 'keyword'],
+        [
+          /[A-Za-z][\w$]*/,
+          {
+            cases: {
+              '@classDiagramBlockKeywords': 'typeKeyword',
+              '@classDiagramKeywords': 'keyword',
+              '@default': 'variable'
+            }
+          }
+        ],
+        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
+        [/(<<)(.+?)(>>)/, ['delimiter.bracket', 'annotation', 'delimiter.bracket']],
+        [/".*?"/, 'string'],
+        [/:::/, 'transition'],
+        [/:|\+|-|#|~|\*\s*$|\$\s*$|\(|\)|{|}/, 'delimiter.bracket']
+      ],
+      journey: [
+        configDirectiveHandler,
+        [/(title)(.*)/, ['keyword', 'string']],
+        [/(section)(.*)/, ['typeKeyword', 'string']],
+        [
+          /[A-Za-z][\w$]*/,
+          {
+            cases: {
+              '@journeyBlockKeywords': 'typeKeyword',
+              '@journeyKeywords': 'keyword',
+              '@default': 'variable'
+            }
+          }
+        ],
+        [
+          /(^\s*.+?)(:)(.*?)(:)(.*?)([$,])/,
+          [
+            'string',
+            'delimiter.bracket',
+            'number',
+            'delimiter.bracket',
+            'variable',
+            'delimiter.bracket'
+          ]
+        ],
+        [/,/, 'delimiter.bracket'],
+        [/(^\s*.+?)(:)([^:]*?)$/, ['string', 'delimiter.bracket', 'variable']],
+        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
+      ],
+      gantt: [
+        configDirectiveHandler,
+        [/(title)(.*)/, ['keyword', 'string']],
+        [/(section)(.*)/, ['typeKeyword', 'string']],
+        [/^\s*([^\n:]*?)(:)/, ['string', 'delimiter.bracket']],
+        [
+          /[A-Za-z][\w$]*/,
+          {
+            cases: {
+              '@ganttBlockKeywords': 'typeKeyword',
+              '@ganttKeywords': 'keyword'
+            }
+          }
+        ],
+        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
+        [/:/, 'delimiter.bracket']
+      ],
+      stateDiagram: [
+        configDirectiveHandler,
+        [/note[^:]*$/, { token: 'typeKeyword', next: 'stateDiagramNote' }],
+        ['hide empty description', 'keyword'],
+        [/^\s*state\s(?!.*{)/, 'keyword'],
+        [/(<<)(fork|join|choice)(>>)/, 'annotation'],
+        [/(\[\[)(fork|join|choice)(]])/, ['delimiter.bracket', 'annotation', 'delimiter.bracket']],
+        [
+          /[A-Za-z][\w$]*/,
+          {
+            cases: {
+              '@stateDiagramBlockKeywords': 'typeKeyword',
+              '@stateDiagramKeywords': 'keyword',
+              '@default': 'variable'
+            }
+          }
+        ],
+        [/".*?"/, 'string'],
+        [/(:)([^\n:]*?$)/, ['delimiter.bracket', 'string']],
+        [/{|}/, 'delimiter.bracket'],
+        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
+        [/-->/, 'transition'],
+        [/\[.*?]/, 'string']
+      ],
+      stateDiagramNote: [
+        [/^\s*end note$/, { token: 'typeKeyword', next: '@pop' }],
+        [/.*/, 'string']
+      ],
+      erDiagram: [
+        configDirectiveHandler,
+        [/(title|accDescription)(.*$)/, ['keyword', 'string']],
+        [/[|}][o|](--|\.\.)[o|][{|]/, 'transition'],
+        [/".*?"/, 'string'],
+        [/(:)(.*?$)/, ['delimiter.bracket', 'string']],
+        [/[:{}]/, 'delimiter.bracket'],
+        [/([A-Za-z]+)(\s+[A-Za-z]+)/, ['type', 'variable']],
+        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
+        [/[A-Z_a-z-][\w$]*/, 'variable']
+      ],
+      requirementDiagram: [
+        configDirectiveHandler,
+        [/->|<-|-/, 'transition'],
+        [/(\d+\.)*\d+/, 'number'],
+        [
+          /[A-Z_a-z-][\w$]*/,
+          {
+            cases: {
+              '@requirementDiagramBlockKeywords': 'typeKeyword',
+              '@default': 'variable'
+            }
+          }
+        ],
+        [/[/:{}]/, 'delimiter.bracket'],
+        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
+        [/".*?"/, 'string']
+      ],
+      c4Diagram: [
+        configDirectiveHandler,
+        [/(title|accDescription)(.*$)/, ['keyword', 'string']],
+        [/\(/, { token: 'delimiter.bracket', next: 'c4DiagramParenthesis' }],
+        [
+          /[A-Z_a-z-][\w$]*/,
+          {
+            cases: {
+              '@c4DiagramBlockKeywords': 'typeKeyword',
+              '@c4DiagramKeywords': 'keyword',
+              '@default': 'variable'
+            }
+          }
+        ],
+        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
+      ],
+      c4DiagramParenthesis: [
+        [/,/, 'delimiter.bracket'],
+        [/\)/, { next: '@pop', token: 'delimiter.bracket' }],
+        [/[^),]/, 'string']
+      ],
+      sankey: [
+        configDirectiveHandler,
+        [/(title)(.*)/, ['keyword', 'string']],
+        [/(accTitle|accDescr)(\s*:)(\s*[^\n\r]+$)/, ['keyword', 'delimiter.bracket', 'string']],
+        [/".*?"/, 'string'],
+        [/[A-Za-z]+/, 'string'],
+        [/\s*\d+/, 'number'],
+        [/,/, 'delimiter.bracket'],
+        [/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
+      ]
+    }
+  });
+
+  monacoEditor.editor.defineTheme('mermaid-dark', {
+    base: 'vs-dark',
+    inherit: true,
+    colors: {},
+    rules: [
+      { token: 'typeKeyword', foreground: '9650c8', fontStyle: 'bold' },
+      { token: 'transition', foreground: '008800', fontStyle: 'bold' },
+      { token: 'identifier', foreground: '9cdcfe' }
+    ]
+  });
+
+  monacoEditor.editor.defineTheme('mermaid', {
+    base: 'vs',
+    inherit: true,
+    colors: {},
+    rules: [
+      { token: 'typeKeyword', foreground: '9650c8', fontStyle: 'bold' },
+      { token: 'keyword', foreground: '649696' },
+      { token: 'custom-error', foreground: 'ff0000', fontStyle: 'bold' },
+      { token: 'string', foreground: 'AA8500' },
+      { token: 'transition', foreground: '008800', fontStyle: 'bold' },
+      { token: 'delimiter.bracket', foreground: '000000', fontStyle: 'bold' },
+      { token: 'annotation', foreground: '4b4b96' },
+      { token: 'number', foreground: '4b4b96' },
+      { token: 'comment', foreground: '888c89' },
+      { token: 'variable', foreground: 'A22889' },
+      { token: 'type', foreground: '2BDEA8' },
+      { token: 'identifier', foreground: '9cdcfe' }
+    ]
+  });
+
+  monacoEditor.languages.registerCompletionItemProvider('mermaid', {
+    provideCompletionItems: () => {
+      return {
+        suggestions: []
+      };
+    }
+  });
+
+  monacoEditor.languages.setLanguageConfiguration('mermaid', {
+    autoClosingPairs: [
+      {
+        open: '(',
+        close: ')'
+      },
+      {
+        open: '{',
+        close: '}'
+      },
+      {
+        open: '[',
+        close: ']'
+      }
+    ],
+    brackets: [
+      ['(', ')'],
+      ['{', '}'],
+      ['[', ']']
+    ],
+    comments: {
+      lineComment: '%%'
+    }
+  });
+};

src/lib/util/persist.ts

@@ -39,16 +39,16 @@ let noWarnings = false;
 /**
  * List of storages where the warning have already been displayed.
  */
-const alreadyWarnFor: Array<string> = [];
+const alreadyWarnFor: string[] = [];
 
 /**
  * Add a log to indicate that the requested Storage have not been found.
  * @param {string} storageName
  */
-const warnStorageNotFound = (storageName) => {
+const warnStorageNotFound = (storageName: string) => {
-  const isProduction = typeof process !== 'undefined' && process.env?.NODE_ENV === 'production';
+  const isProduction = typeof process !== 'undefined' && process.env.NODE_ENV === 'production';
 
-  if (!noWarnings && alreadyWarnFor.indexOf(storageName) === -1 && !isProduction) {
+  if (!noWarnings && !alreadyWarnFor.includes(storageName) && !isProduction) {
     let message = `Unable to find the ${storageName}. No data will be persisted.`;
     if (typeof window === 'undefined') {
       message +=
@@ -60,17 +60,8 @@ const warnStorageNotFound = (storageName) => {
   }
 };
 
-const allowedClasses = [];
-/**
- * Add a class to the allowed list of classes to be serialized
- * @param classDef The class to add to the list
- */
-export const addSerializableClass = (classDef: () => unknown): void => {
-  allowedClasses.push(classDef);
-};
-
 const serialize = (value: unknown): string => ESSerializer.serialize(value);
-const deserialize = (value: string): unknown => {
+const deserialize = (value?: string | null): unknown => {
   // @TODO: to remove in the next major
   if (value === 'undefined') {
     return undefined;
@@ -78,14 +69,14 @@ const deserialize = (value: string): unknown => {
 
   if (value !== null && value !== undefined) {
     try {
-      return ESSerializer.deserialize(value, allowedClasses);
+      return ESSerializer.deserialize(value);
-    } catch (e) {
+    } catch {
       // Do nothing
       // use the value "as is"
     }
     try {
       return JSON.parse(value);
-    } catch (e) {
+    } catch {
       // Do nothing
       // use the value "as is"
     }
@@ -162,7 +153,7 @@ export function persist<T>(
     store.set(initialValue);
   }
 
-  if ((storage as SelfUpdateStorageInterface<T>).addListener) {
+  if ('addListener' in storage) {
     (storage as SelfUpdateStorageInterface<T>).addListener(key, (newValue) => {
       store.set(newValue);
     });
@@ -184,24 +175,24 @@ function getBrowserStorage(
   browserStorage: Storage,
   listenExternalChanges = false
 ): SelfUpdateStorageInterface<any> {
-  const listeners: Array<{ key: string; listener: (newValue: any) => void }> = [];
+  const listeners: { key: string; listener: (newValue: any) => void }[] = [];
   const listenerFunction = (event: StorageEvent) => {
     const eventKey = event.key;
     if (event.storageArea === browserStorage) {
-      listeners
+      for (const { listener } of listeners.filter(({ key }) => key === eventKey)) {
-        .filter(({ key }) => key === eventKey)
+        listener(deserialize(event.newValue));
-        .forEach(({ listener }) => {
+      }
-          listener(deserialize(event.newValue));
-        });
     }
   };
   const connect = () => {
-    if (listenExternalChanges && typeof window !== 'undefined' && window?.addEventListener) {
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (listenExternalChanges && typeof window !== 'undefined' && window.addEventListener) {
       window.addEventListener('storage', listenerFunction);
     }
   };
   const disconnect = () => {
-    if (listenExternalChanges && typeof window !== 'undefined' && window?.removeEventListener) {
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+    if (listenExternalChanges && typeof window !== 'undefined' && window.removeEventListener) {
       window.removeEventListener('storage', listenerFunction);
     }
   };
@@ -237,10 +228,11 @@ function getBrowserStorage(
 
 /**
  * Storage implementation that use the browser local storage
- * @param {boolean} listenExternalChanges - Update the store if the localStorage is updated from another page
+ * @param listenExternalChanges - Update the store if the localStorage is updated from another page
  */
 export function localStorage<T>(listenExternalChanges = false): StorageInterface<T> {
-  if (typeof window !== 'undefined' && window?.localStorage) {
+  // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+  if (typeof window !== 'undefined' && window.localStorage) {
     return getBrowserStorage(window.localStorage, listenExternalChanges);
   }
   warnStorageNotFound('window.localStorage');
@@ -250,7 +242,7 @@ export function localStorage<T>(listenExternalChanges = false): StorageInterface
 /**
  * Storage implementation that do nothing
  */
-export function noopStorage(): StorageInterface<any> {
+export function noopStorage<T>(): StorageInterface<T> {
   return {
     getValue(): null {
       return null;

src/lib/util/serde.test.ts

@@ -3,29 +3,29 @@ import { serializeState, deserializeState, type SerdeType } from './serde';
 import { defaultState } from './state';
 import type { State } from '$lib/types';
 
-describe('Serde tests', () => {
+const verifySerde = (state: State, serde?: SerdeType): string => {
-  const verifySerde = (state: State, serde?: SerdeType): string => {
+  const serialized = serializeState(state, serde);
-    const serialized = serializeState(state, serde);
+  const deserialized = deserializeState(serialized);
-    const deserialized = deserializeState(serialized);
+  expect(deserialized).to.deep.equal(state);
-    expect(deserialized).to.deep.equal(state);
+  return serialized;
-    return serialized;
+};
-  };
 
+describe('Serde tests', () => {
   it('should serialize and deserialize with default serde', () => {
     expect(verifySerde(defaultState)).toMatchInlineSnapshot(
-      '"pako:eNpVj81qw0AMhF9F6NRC_AI-BGK7zSXQQHLz5iBsObuk-8Naphjb7551fEl1EjPfiNGEjW8Zc7xHChqulXKQ5lCXOppeLPU3yLL9fGQB6x2PMxQfRw-99iEYd__c-GKFoJxOK8Yg2rjHslnlK__jeIaqPlEQH27vzvXPz_BVm7NO5_87OnJKfdcd5R1lDUUoKb4Q3KHlaMm0qfq0KgpFs2WFeVpb7mj4FYXKLQmlQfxldA3mEgfe4RBaEq4MpaftJi5PNtJU8w"'
+      '"pako:eNpVjk2Lg0AMhv9KyGkL9Q94WGh1t5fCFurN6SFo7AztfDBGpKj_fcd62c0pvM_zhkzY-JYxx-7px0ZTFKhK5SDNoS50NL1Y6m-QZZ_ziQWsd_ya4fhx8tBrH4Jx993mH1cJium8agyijXssGyre_R_HM5T1mYL4cPtLqtHP8FWbi07n_xMdObW-647yjrKGIhQU3wru0XK0ZNr0_rQmCkWzZYV5WlvuaHiKQuWWpNIg_vpyDeYSB97jEFoSLg3dI9ktXH4B_cJWqw"'
     );
   });
 
   it('should serialize and deserialize with base64 serde', () => {
     expect(verifySerde(defaultState, 'base64')).toMatchInlineSnapshot(
-      '"base64:eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cbiAgIiwibWVybWFpZCI6IntcbiAgXCJ0aGVtZVwiOiBcImRlZmF1bHRcIlxufSIsImF1dG9TeW5jIjp0cnVlLCJ1cGRhdGVEaWFncmFtIjp0cnVlfQ"'
+      '"base64:eyJjb2RlIjoiZmxvd2NoYXJ0IFREXG4gICAgQVtDaHJpc3RtYXNdIC0tPnxHZXQgbW9uZXl8IEIoR28gc2hvcHBpbmcpXG4gICAgQiAtLT4gQ3tMZXQgbWUgdGhpbmt9XG4gICAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgICBDIC0tPnxUd298IEVbaVBob25lXVxuICAgIEMgLS0-fFRocmVlfCBGW2ZhOmZhLWNhciBDYXJdXG4gICIsIm1lcm1haWQiOiJ7XG4gIFwidGhlbWVcIjogXCJkZWZhdWx0XCJcbn0iLCJhdXRvU3luYyI6dHJ1ZSwidXBkYXRlRGlhZ3JhbSI6dHJ1ZX0"'
     );
   });
 
   it('should serialize and deserialize with pako serde', () => {
     expect(verifySerde(defaultState, 'pako')).toMatchInlineSnapshot(
-      '"pako:eNpVj81qw0AMhF9F6NRC_AI-BGK7zSXQQHLz5iBsObuk-8Naphjb7551fEl1EjPfiNGEjW8Zc7xHChqulXKQ5lCXOppeLPU3yLL9fGQB6x2PMxQfRw-99iEYd__c-GKFoJxOK8Yg2rjHslnlK__jeIaqPlEQH27vzvXPz_BVm7NO5_87OnJKfdcd5R1lDUUoKb4Q3KHlaMm0qfq0KgpFs2WFeVpb7mj4FYXKLQmlQfxldA3mEgfe4RBaEq4MpaftJi5PNtJU8w"'
+      '"pako:eNpVjk2Lg0AMhv9KyGkL9Q94WGh1t5fCFurN6SFo7AztfDBGpKj_fcd62c0pvM_zhkzY-JYxx-7px0ZTFKhK5SDNoS50NL1Y6m-QZZ_ziQWsd_ya4fhx8tBrH4Jx993mH1cJium8agyijXssGyre_R_HM5T1mYL4cPtLqtHP8FWbi07n_xMdObW-647yjrKGIhQU3wru0XK0ZNr0_rQmCkWzZYV5WlvuaHiKQuWWpNIg_vpyDeYSB97jEFoSLg3dI9ktXH4B_cJWqw"'
     );
   });
 

src/lib/util/serde.ts

@@ -36,7 +36,7 @@ const serdes: { [key in SerdeType]: Serde } = {
 };
 
 export const serializeState = (state: State, serde: SerdeType = 'pako'): string => {
-  if (serdes[serde] === undefined) {
+  if (!(serde in serdes)) {
     throw new Error(`Unknown serde type: ${serde}`);
   }
   const json = JSON.stringify(state);

src/lib/util/state.ts

@@ -2,30 +2,28 @@ import { writable, get, type Readable, derived } from 'svelte/store';
 import { persist, localStorage } from './persist';
 import { saveStatistics, countLines } from './stats';
 import { serializeState, deserializeState } from './serde';
-import { cmdKey, errorDebug, AsyncQueue } from './util';
+import { cmdKey, errorDebug, formatJSON } from './util';
 import { parse } from './mermaid';
 
-import type { MarkerData, State, ValidatedState } from '$lib/types';
+import type { ErrorHash, MarkerData, State, ValidatedState } from '$lib/types';
+import type { MermaidConfig } from 'mermaid';
+
 export const defaultState: State = {
-  code: `graph TD
+  code: `flowchart TD
     A[Christmas] -->|Get money| B(Go shopping)
     B --> C{Let me think}
     C -->|One| D[Laptop]
     C -->|Two| E[iPhone]
     C -->|Three| F[fa:fa-car Car]
   `,
-  mermaid: JSON.stringify(
+  mermaid: formatJSON({
-    {
+    theme: 'default'
-      theme: 'default'
+  }),
-    },
-    null,
-    2
-  ),
   autoSync: true,
   updateDiagram: true
 };
 
-const urlParseFailedState = `graph TD
+const urlParseFailedState = `flowchart TD
     A[Loading URL failed. We can try to figure out why.] -->|Decode JSON| B(Please check the console to see the JSON and error details.)
     B --> C{Is the JSON correct?}
     C -->|Yes| D(Please Click here to Raise an issue in github.<br/>Including the broken link in the issue <br/> will speed up the fix.)
@@ -50,8 +48,6 @@ export const currentState: ValidatedState = (() => {
   };
 })();
 
-let q: AsyncQueue<State>;
-
 const processState = async (state: State) => {
   const processed: ValidatedState = {
     ...state,
@@ -65,23 +61,28 @@ const processState = async (state: State) => {
     processed.serialized = serializeState(state);
     await parse(state.code);
     JSON.parse(state.mermaid);
-  } catch (e) {
+  } catch (error) {
-    processed.error = e;
+    processed.error = error as Error;
     errorDebug();
-    console.error(e);
+    console.error(error);
-    if (e.hash) {
+    if ('hash' in error) {
       try {
+        const {
+          loc: { first_line, last_line, first_column, last_column }
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        } = error.hash as ErrorHash;
         const marker: MarkerData = {
           severity: 8, // Error
-          startLineNumber: e.hash.loc.first_line,
+          startLineNumber: first_line,
-          startColumn: e.hash.loc.first_column,
+          startColumn: first_column,
-          endLineNumber: e.hash.loc.last_line,
+          endLineNumber: last_line,
-          endColumn: (e.hash.loc.last_column as number) + 1,
+          endColumn: last_column + 1,
-          message: e.str
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
+          message: error.str
         };
         processed.errorMarkers = [marker];
-      } catch (err) {
+      } catch (error) {
-        console.error('Error without line helper', err);
+        console.error('Error without line helper', error);
       }
     }
   }
@@ -92,14 +93,7 @@ const processState = async (state: State) => {
 export const stateStore: Readable<ValidatedState> = derived(
   [inputStateStore],
   ([state], set) => {
-    if (!q) {
+    void processState(state).then(set);
-      // Initialize the queue for first time.
-      q = new AsyncQueue(async (state: State) => {
-        const newState = await processState(state);
-        set(newState);
-      });
-    }
-    q.process(state);
   },
   currentState
 );
@@ -109,8 +103,10 @@ export const loadState = (data: string): void => {
   console.log(`Loading '${data}'`);
   try {
     state = deserializeState(data);
-    const mermaidConfig: { [key: string]: string } =
+    const mermaidConfig: MermaidConfig =
-      typeof state.mermaid === 'string' ? JSON.parse(state.mermaid) : state.mermaid;
+      typeof state.mermaid === 'string'
+        ? (JSON.parse(state.mermaid) as MermaidConfig)
+        : state.mermaid;
     if (
       mermaidConfig.securityLevel &&
       mermaidConfig.securityLevel !== 'strict' &&
@@ -120,11 +116,11 @@ export const loadState = (data: string): void => {
     ) {
       delete mermaidConfig.securityLevel; // Prevent setting overriding securityLevel when loading state to mitigate possible XSS attack
     }
-    state.mermaid = JSON.stringify(mermaidConfig, null, 2);
+    state.mermaid = formatJSON(mermaidConfig);
-  } catch (e) {
+  } catch (error) {
     state = get(inputStateStore);
     if (data) {
-      console.error('Init error', e);
+      console.error('Init error', error);
       state.code = urlParseFailedState;
       state.mermaid = defaultState.mermaid;
     }
@@ -146,7 +142,7 @@ export const updateCode = (
     resetPanZoom = false
   }: { updateDiagram?: boolean; resetPanZoom?: boolean } = {}
 ): void => {
-  console.log('updateCode', code);
+  // console.log('updateCode', code);
   const lines = countLines(code);
   saveStatistics(code);
   errorDebug();
@@ -172,7 +168,7 @@ export const updateCode = (
 };
 
 export const updateConfig = (config: string): void => {
-  console.log('updateConfig', config);
+  // console.log('updateConfig', config);
   inputStateStore.update((state) => {
     return { ...state, mermaid: config };
   });
@@ -180,12 +176,12 @@ export const updateConfig = (config: string): void => {
 
 export const toggleDarkTheme = (dark: boolean): void => {
   inputStateStore.update((state) => {
-    const config = JSON.parse(state.mermaid);
+    const config = JSON.parse(state.mermaid) as MermaidConfig;
     if (!config.theme || ['dark', 'default'].includes(config.theme)) {
       config.theme = dark ? 'dark' : 'default';
     }
 
-    return { ...state, mermaid: JSON.stringify(config, null, 2) };
+    return { ...state, mermaid: formatJSON(config) };
   });
 };
 
@@ -194,7 +190,7 @@ export const initURLSubscription = (): void => {
   stateStore.subscribe(({ serialized }) => {
     clearTimeout(urlDebounce);
     urlDebounce = window.setTimeout(() => {
-      history.replaceState(undefined, undefined, `#${serialized}`);
+      history.replaceState(undefined, '', `#${serialized}`);
     }, 250);
   });
 };

src/lib/util/stats.ts

@@ -1,6 +1,6 @@
 import { browser } from '$app/environment';
 import type { AnalyticsInstance } from 'analytics';
-export let analytics: AnalyticsInstance;
+export let analytics: AnalyticsInstance | undefined;
 
 export const initAnalytics = async (): Promise<void> => {
   if (browser && !analytics) {
@@ -15,19 +15,19 @@ export const initAnalytics = async (): Promise<void> => {
           plausible({
             domain: 'mermaid.live',
             hashMode: false,
-            trackLocalhost: false, // By default 'false'
+            // All tracked stats are public and available at https://p.mermaid.live/mermaid.live
-            apiHost: 'https://plausible.io'
+            apiHost: 'https://p.mermaid.live'
           })
         ]
       });
-    } catch (e) {
+    } catch (error) {
-      console.log(e);
+      console.log(error);
       console.info('Analytics blocked ;)');
     }
   }
 };
 
-export const detectType = (text: string): string => {
+export const detectType = (text: string): string | undefined => {
   const possibleDiagramTypes = [
     'classDiagram',
     'erDiagram',
@@ -37,7 +37,9 @@ export const detectType = (text: string): string => {
     'graph',
     'journey',
     'pie',
-    'stateDiagram'
+    'stateDiagram',
+    'quadrantChart',
+    'mindmap'
   ];
   const firstLine = text
     .replace(/^\s*%%.*\n/g, '\n')
@@ -49,7 +51,7 @@ export const detectType = (text: string): string => {
 };
 
 export const countLines = (code: string): number => {
-  return (code.match(/\n/g) || '').length + 1;
+  return (code.match(/\n/g)?.length ?? 0) + 1;
 };
 
 export const saveStatistics = (graph: string): void => {
@@ -58,7 +60,27 @@ export const saveStatistics = (graph: string): void => {
     return;
   }
   const length = countLines(graph);
-  logEvent('render', { graphType, length });
+  const lengthBucket =
+    length < 10
+      ? '0-10'
+      : length < 25
+      ? '10-25'
+      : length < 50
+      ? '25-50'
+      : length < 100
+      ? '50-100'
+      : length < 200
+      ? '100-200'
+      : length < 500
+      ? '200-500'
+      : length < 700
+      ? '500-700'
+      : length < 1000
+      ? '700-1000'
+      : length < 1500
+      ? '1000-1500'
+      : '1500+';
+  logEvent('render', { graphType, length, lengthBucket });
 };
 
 const minutesToMilliSeconds = (minutes: number): number => {
@@ -80,19 +102,20 @@ const delaysPerEvent = {
   themeChange: defaultDelay
 };
 export type AnalyticsEvent = keyof typeof delaysPerEvent;
-const timeouts: Record<string, number> = {};
+const timeouts: Map<string, number> = new Map<string, number>();
 // manual debounce to reduce the number of events sent to analytics
 export const logEvent = (name: AnalyticsEvent, data?: unknown): void => {
   if (!analytics) {
     return;
   }
   const key = data ? JSON.stringify({ name, data }) : name;
-  if (timeouts[key] === undefined) {
+  if (timeouts.has(key)) {
-    void analytics.track(name, data);
+    clearTimeout(timeouts.get(key));
   } else {
-    clearTimeout(timeouts[key]);
+    void analytics.track(name, data);
   }
-  timeouts[key] = window.setTimeout(() => {
+  timeouts.set(
-    delete timeouts[key];
+    key,
-  }, delaysPerEvent[name]);
+    window.setTimeout(() => timeouts.delete(key), delaysPerEvent[name])
+  );
 };

src/lib/util/theme.ts

@@ -16,7 +16,7 @@ export const themeStore: Writable<ThemeConfig> = persist(
   'themeStore'
 );
 
-const darkThemes = [
+const darkThemes = new Set([
   'dark',
   'synthwave',
   'halloween',
@@ -25,13 +25,13 @@ const darkThemes = [
   'luxury',
   'black',
   'dracula'
-];
+]);
 
 export const setTheme = (theme: string): void => {
   if (theme.includes(' ')) {
     theme = theme.split(' ')[1].trim();
   }
-  const isDark = darkThemes.includes(theme);
+  const isDark = darkThemes.has(theme);
   console.log('Setting theme', theme);
   themeStore.set({ theme, isDark });
   logEvent('themeChange', { theme, isDark });

src/lib/util/util.ts

@@ -3,7 +3,6 @@ import { analytics, initAnalytics } from './stats';
 import { loadDataFromUrl } from './fileLoaders/loader';
 import { initLoading } from './loading';
 import { applyMigrations } from './migrations';
-import { init } from './mermaid';
 
 export const loadStateFromURL = (): void => {
   loadState(window.location.hash.slice(1));
@@ -17,16 +16,15 @@ export const syncDiagram = (): void => {
 
 export const initHandler = async (): Promise<void> => {
   applyMigrations();
-  await initLoading('Loading Mermaid...', init());
   loadStateFromURL();
   await initLoading('Loading Gist...', loadDataFromUrl().catch(console.error));
   syncDiagram();
   initURLSubscription();
   await initAnalytics();
-  analytics?.page();
+  await analytics?.page();
 };
 
-export const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
+export const isMac = navigator.platform.toUpperCase().includes('MAC');
 export const cmdKey = isMac ? 'Cmd' : 'Ctrl';
 
 let count = 0;
@@ -39,23 +37,12 @@ export const errorDebug = (limit = 100) => {
   }
 };
 
-// To queue async tasks so they are executed one after the other, not concurrently.
+export const formatJSON = (data: unknown): string => JSON.stringify(data, undefined, 2);
-export class AsyncQueue<T> {
+export const fetchJSON = async <T>(url: string): Promise<T> => {
-  private readonly queue: T[] = [];
+  const res = await fetch(url);
-  private running = false;
+  return res.json() as T;
-  constructor(private processor: (item: T) => Promise<void>) {}
+};
-  public async process(item: T): Promise<void> {
+export const fetchText = async (url: string): Promise<string> => {
-    this.queue.push(item);
+  const res = await fetch(url);
-    if (this.running) {
+  return res.text();
-      return;
+};
-    }
-    this.running = true;
-    while (this.queue.length > 0) {
-      const item = this.queue.shift();
-      if (item) {
-        await this.processor(item);
-      }
-    }
-    this.running = false;
-  }
-}

src/routes/+layout.js

@@ -1,3 +1,4 @@
 export const prerender = true;
 export const csr = true;
 export const ssr = false;
+export const trailingSlash = 'ignore';

src/routes/+layout.svelte

@@ -10,8 +10,8 @@
   // This can be removed once https://github.com/sveltejs/kit/issues/1612 is fixed.
   // Then move it into src and vite will bundle it automatically.
   onMount(() => {
-    window.addEventListener('hashchange', async (ev) => {
+    window.addEventListener('hashchange', () => {
-      await initHandler();
+      void initHandler();
     });
     if ('serviceWorker' in navigator) {
       navigator.serviceWorker

src/routes/edit/+page.svelte

@@ -1,64 +1,74 @@
 <script lang="ts">
-  import Editor from '$lib/components/editor.svelte';
+  import Editor from '$lib/components/Editor.svelte';
-  import Navbar from '$lib/components/navbar.svelte';
+  import Navbar from '$lib/components/Navbar.svelte';
-  import Preset from '$lib/components/preset.svelte';
+  import Preset from '$lib/components/Preset.svelte';
-  import Actions from '$lib/components/actions.svelte';
+  import Actions from '$lib/components/Actions.svelte';
-  import View from '$lib/components/view.svelte';
+  import View from '$lib/components/View.svelte';
-  import Card from '$lib/components/card/card.svelte';
+  import Card from '$lib/components/Card/Card.svelte';
-  import History from '$lib/components/history/history.svelte';
+  import History from '$lib/components/History/History.svelte';
   import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state';
   import { cmdKey, initHandler, syncDiagram } from '$lib/util/util';
   import { onMount } from 'svelte';
-  import type { Tab, DocConfig, EditorMode, ValidatedState } from '$lib/types';
   import { base } from '$app/paths';
+  import { dev } from '$app/environment';
+  import type { Tab, DocumentationConfig, EditorMode, ValidatedState } from '$lib/types';
 
+  const MCBaseURL = dev ? 'http://localhost:5174' : 'https://mermaidchart.com';
   const docURLBase = 'https://mermaid-js.github.io/mermaid';
-  const docMap: DocConfig = {
+  const docMap: DocumentationConfig = {
-    graph: {
-      code: '/#/flowchart',
-      config: '/#/flowchart?id=configuration'
-    },
-    flowchart: {
-      code: '/#/flowchart',
-      config: '/#/flowchart?id=configuration'
-    },
-    sequenceDiagram: {
-      code: '/#/sequenceDiagram',
-      config: '/#/sequenceDiagram?id=configuration'
-    },
     classDiagram: {
-      code: '/#/classDiagram',
+      code: '/syntax/classDiagram',
-      config: '/#/classDiagram?id=configuration'
+      config: '/syntax/classDiagram#configuration'
-    },
-    'stateDiagram-v2': {
-      code: '/#/stateDiagram'
-    },
-    gantt: {
-      code: '/#/gantt',
-      config: '/#/gantt?id=configuration'
-    },
-    pie: {
-      code: '/#/pie'
     },
     erDiagram: {
-      code: '/#/entityRelationshipDiagram',
+      code: '/syntax/entityRelationshipDiagram'
-      config: '/#/entityRelationshipDiagram?id=styling'
     },
-    journey: {
+    flowchart: {
-      code: '/#/user-journey'
+      code: '/syntax/flowchart',
+      config: '/syntax/flowchart#configuration'
+    },
+    gantt: {
+      code: '/syntax/gantt',
+      config: '/syntax/gantt#configuration'
     },
     gitGraph: {
-      code: '/#/gitgraph',
+      code: '/syntax/gitgraph',
-      config: '/#/gitgraph?id=gitgraph-specific-configuration-options'
+      config: '/syntax/gitgraph#gitgraph-specific-configuration-options'
+    },
+    graph: {
+      code: '/syntax/flowchart',
+      config: '/syntax/flowchart#configuration'
+    },
+    journey: {
+      code: '/syntax/userJourney'
+    },
+    mindmap: {
+      code: '/syntax/mindmap'
+    },
+    pie: {
+      code: '/syntax/pie',
+      config: '/syntax/pie#configuration'
+    },
+    quadrantChart: {
+      code: '/syntax/quadrantChart',
+      config: '/syntax/quadrantChart#chart-configurations'
+    },
+    sequenceDiagram: {
+      code: '/syntax/sequenceDiagram',
+      config: '/syntax/sequenceDiagram#configuration'
+    },
+    'stateDiagram-v2': {
+      code: '/syntax/stateDiagram'
     }
   };
   let docURL = docURLBase;
   let activeTabID = 'code';
+  let docKey = '';
   stateStore.subscribe(({ code, editorMode }: ValidatedState) => {
     activeTabID = editorMode;
     const codeTypeMatch = /([\S]+)[\s\n]/.exec(code);
     if (codeTypeMatch && codeTypeMatch.length > 1) {
-      const docKey = codeTypeMatch[1];
+      docKey = codeTypeMatch[1];
       const docConfig = docMap[docKey] ?? { code: '' };
       docURL = docURLBase + (docConfig[editorMode] ?? docConfig.code ?? '');
     }
@@ -86,6 +96,10 @@
     await initHandler();
     const resizer = document.getElementById('resizeHandler');
     const element = document.getElementById('editorPane');
+    if (!resizer || !element) {
+      console.debug('Failed to find resize handler or editor pane', { resizer, element });
+      return;
+    }
     const resize = (e: { pageX: number }) => {
       const newWidth = e.pageX - element.getBoundingClientRect().left;
       if (newWidth > 50) {
@@ -129,8 +143,10 @@
               on:click={syncDiagram}><i class="fas fa-sync" /></button>
           {/if}
 
-          <button class="btn btn-secondary btn-xs" title="View documentation">
+          <button
-            <a target="_blank" rel="noreferrer" href={docURL} data-cy="docs">
+            class="btn btn-secondary btn-xs"
+            title="View documentation for {docKey.replace('Diagram', '')} diagram">
+            <a target="_blank" href={docURL} data-cy="docs">
               <i class="fas fa-book mr-1" />Docs
             </a>
           </button>
@@ -148,22 +164,27 @@
     <div id="resizeHandler" class="hidden md:block" />
     <div class="flex-1 flex flex-col overflow-hidden">
       <Card title="Diagram" isCloseable={false}>
-        <div slot="actions" class="flex flex-row items-center">
+        <div slot="actions" class="flex flex-row items-center gap-2">
           <label class="cursor-pointer label py-0" for="panZoom">
             <span>Pan & Zoom</span>
             <input
               type="checkbox"
-              class="toggle {$stateStore.panZoom ? 'btn-secondary' : 'toggle-primary'} ml-1"
+              class="toggle {$stateStore.panZoom ? 'btn-secondary' : 'toggle-primary'}"
               id="panZoom"
               bind:checked={$inputStateStore.panZoom} />
           </label>
           <a
             href={`${base}/view#${$stateStore.serialized}`}
             target="_blank"
-            rel="noreferrer"
+            class="btn btn-secondary btn-xs gap-1"
-            class="btn btn-secondary btn-xs"
+            title="View diagram in new page"><i class="fas fa-external-link-alt" />Full screen</a>
-            title="View diagram in new page"
+          <a
-            ><i class="fas fa-external-link-alt mr-1" />Full screen</a>
+            href={`${MCBaseURL}/app/plugin/save?state=${$stateStore.serialized}`}
+            target="_blank"
+            class="btn btn-secondary btn-xs gap-1 bg-[#FF3570]"
+            title="Save diagram in Mermaid Chart"
+            ><img src="/mermaidchart-logo.svg" class="w-5 h-5" alt="Mermaid chart logo" />Save to
+            Mermaid Chart</a>
         </div>
 
         <div class="flex-1 overflow-auto">

src/routes/view/+page.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import View from '$lib/components/view.svelte';
+  import View from '$lib/components/View.svelte';
   import { initHandler } from '$lib/util/util';
   import { onMount } from 'svelte';
   onMount(initHandler);

static/mermaidchart-logo.svg

@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 490.16 490.16"><defs><style>.cls-1{fill:#ff3670;}.cls-2{fill:#fff;}</style></defs><rect class="cls-1" width="490.16" height="490.16" rx="84.61"/><path class="cls-2" d="M407.48,111.18A165.2,165.2,0,0,0,245.08,220,165.2,165.2,0,0,0,82.68,111.18a165.5,165.5,0,0,0,72.06,143.64,88.81,88.81,0,0,1,38.53,73.45v50.86H296.9V328.27a88.8,88.8,0,0,1,38.52-73.45,165.41,165.41,0,0,0,72.06-143.64Z"/><path class="cls-2" d="M160.63,328.27a56.09,56.09,0,0,0-24.27-46.49,198.74,198.74,0,0,1-28.54-23.66A196.87,196.87,0,0,1,82.53,227V379.13h78.1Z"/><path class="cls-2" d="M329.53,328.27a56.09,56.09,0,0,1,24.27-46.49,198.74,198.74,0,0,0,28.54-23.66A196.87,196.87,0,0,0,407.63,227V379.13h-78.1Z"/></svg>

svelte.config.js

@@ -18,8 +18,7 @@ const config = {
       ? {
           base: `/mermaid-live-editor`
         }
-      : {},
+      : {}
-    trailingSlash: 'ignore'
   }
 };
 

tsconfig.json

@@ -12,6 +12,7 @@
   "compilerOptions": {
     "resolveJsonModule": true,
     "allowSyntheticDefaultImports": true,
+    "strictNullChecks": true,
     "types": ["vitest/importMeta"]
   },
   "extends": "./.svelte-kit/tsconfig.json"

vite.config.js

@@ -1,6 +1,7 @@
 import { sveltekit } from '@sveltejs/kit/vite';
-/** @type {import('vite').UserConfig} */
+import { defineConfig } from 'vitest/config';
-const config = {
+
+export default defineConfig({
   plugins: [sveltekit()],
   envPrefix: 'MERMAID_',
   optimizeDeps: { include: ['mermaid'] },
@@ -22,5 +23,4 @@ const config = {
       reporter: ['text', 'json', 'html', 'lcov']
     }
   }
-};
+});
-export default config;