Disable debounce removal

* develop:
  Fix test
  Update SvelteKit
  Update SK
  SvelteKit 453

.eslintignore

@@ -0,0 +1,8 @@
+docs/**
+.svelte-kit/**
+static/**
+build/**
+node_modules/**
+coverage/**
+__snapshots__/**
+snapshots.js

.eslintrc.cjs

@@ -7,10 +7,11 @@ module.exports = {
 		// 'plugin:@typescript-eslint/recommended-requiring-type-checking',
 		'prettier'
 	],
-	plugins: ['svelte3', 'tailwindcss', '@typescript-eslint', 'es'],
+	plugins: ['svelte3', 'tailwindcss', '@typescript-eslint', 'es', 'vitest'],
 	ignorePatterns: [
 		'docs/*',
 		'*.cjs',
+		'*.js',
 		'*.md',
 		'snapshots.js',
 		'svelte.config.js',
@@ -24,15 +25,15 @@ module.exports = {
 	},
 	parserOptions: {
 		sourceType: 'module',
-		ecmaVersion: 2019,
+		ecmaVersion: 2020,
 		tsconfigRootDir: __dirname,
 		project: ['./tsconfig.json'],
-		extraFileExtensions: ['.svelte']
+		extraFileExtensions: ['.svelte'],
+		allowAutomaticSingleRunInference: true
 	},
 	env: {
 		browser: true,
-		es2017: true,
+		es2020: true
-		node: true
 	},
 	rules: {
 		'@typescript-eslint/ban-ts-comment': [

.github/workflows/codeql-analysis.yml

@@ -35,11 +35,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v1
+        uses: github/codeql-action/init@v2
         with:
           config-file: ./.github/codeql/config.yml
           languages: ${{ matrix.language }}
@@ -65,4 +65,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v1
+        uses: github/codeql-action/analyze@v2

.github/workflows/deploy.yml

@@ -11,37 +11,22 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-node@v2
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-node@v3
         with:
           node-version: '16'
-
+          cache: yarn
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Get yarn cache directory path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-
-      - uses: actions/cache@v2
-        id: yarn-cache
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
 
       - name: Build & Deploy
         run: |
-          npm i -g yarn
           export DEPLOY=true
-          [ "$GITHUB_EVENT_NAME" == "pull_request" ] && export BETA=true && rm -rf docs/beta/
           [ "$GITHUB_EVENT_NAME" != "pull_request" ] && rm -rf docs/_app/
           yarn install
-          yarn run lint
           version=$(yarn version --patch --no-git-tag-version | grep "New version" | cut -d':' -f 2)
           yarn build
-          cd bin
+          yarn run lint
-          ./fix-path
           cd ..
 
       - name: Deploy

.github/workflows/docker-publish.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Run tests
         run: |
@@ -38,7 +38,7 @@ jobs:
     if: github.event_name == 'push'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Build image
         run: docker build . --file Dockerfile --tag $IMAGE_NAME

.github/workflows/stale.yml

@@ -8,10 +8,13 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v4
+      - uses: actions/stale@v5
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           exempt-issue-labels: 'retained'
           exempt-pr-labels: 'retained'
-          stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days'
+          stale-issue-message: 'This issue is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 30 days'
-          stale-pr-message: 'This pr is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 7 days'
+          stale-pr-message: 'This pr is stale because it has been open 90 days with no activity. Remove stale label or comment or this will be closed in 30 days'
+          days-before-stale: 90
+          days-before-close: 30
+          days-before-pr-close: -1

.github/workflows/tests.yml

@@ -1,4 +1,4 @@
-name: Cypress Tests
+name: Tests
 
 on:
   pull_request:
@@ -9,14 +9,17 @@ on:
 jobs:
   cypress-run:
     runs-on: ubuntu-latest
-    # Update after https://github.com/cypress-io/cypress-docker-images/issues/487
+    strategy:
-    container: cypress/browsers:node14.16.0-chrome90-ff88
+      fail-fast: false
+      matrix:
+        # run 3 copies of the current job in parallel
+        containers: [1, 2, 3]
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         id: yarn-and-build-cache
         with:
           path: |
@@ -27,20 +30,22 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-node_modules-build-
 
-      - name: Lint
+      - uses: actions/setup-node@v3
-        run: |
+        with:
-          yarn install
+          node-version: 16
-          yarn run lint
+          cache: 'yarn'
 
       # Install NPM dependencies, cache them correctly
       # and run all Cypress tests
       - name: Cypress run
-        uses: cypress-io/github-action@v2
+        uses: cypress-io/github-action@v3
         with:
           build: yarn build
           start: yarn preview
           wait-on: 'http://localhost:3000'
           record: true
           headless: true
+          parallel: true
         env:
           CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          MERMAID_DISABLE_DEBOUNCE: 'true'

.github/workflows/unit-tests.yml

@@ -0,0 +1,36 @@
+name: Unit Tests
+
+on:
+  pull_request:
+    branches:
+      - master
+      - develop
+
+jobs:
+  unit-tests:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/cache@v3
+        id: yarn-and-build-cache
+        with:
+          path: |
+            build
+            node_modules
+          key: ${{ runner.os }}-node_modules-build-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-node_modules-build-
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
+          cache: 'yarn'
+
+      - name: Lint & Test
+        run: |
+          yarn install
+          yarn lint
+          yarn test:unit

.github/workflows/update-browserlist.yml

@@ -1,15 +1,18 @@
 name: Update Browserslist
 on:
   workflow_dispatch:
+  push:
+    branches:
+      - develop
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - run: npx browserslist@latest --update-db
       - name: Commit changes
-        uses: EndBug/add-and-commit@v7
+        uses: EndBug/add-and-commit@v9
         with:
           author_name: ${{ github.actor }}
           author_email: ${{ github.actor }}@users.noreply.github.com

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

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

.gitignore

@@ -9,5 +9,6 @@ yarn-error.log
 /build
 /functions
 /snapshots.js
+/cypress/downloads
 /cypress/videos
 /cypress/screenshots

.prettierignore

@@ -3,4 +3,6 @@ docs/**
 static/**
 build/**
 node_modules/**
+coverage/**
+__snapshots__/**
 snapshots.js

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+	// Use IntelliSense to learn about possible attributes.
+	// Hover to view descriptions of existing attributes.
+	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"type": "pwa-chrome",
+			"request": "launch",
+			"name": "Launch Chrome against localhost",
+			"url": "http://localhost:3000",
+			"webRoot": "${workspaceFolder}"
+		}
+	]
+}

.vscode/settings.json

@@ -0,0 +1,8 @@
+{
+	"editor.formatOnSave": true,
+	"cSpell.words": ["pako", "Serde", "serdes"],
+	"vitest.commandLine": "yarn test:unit",
+	"vitest.enable": true,
+	"testing.autoRun.mode": "rerun",
+	"svelte.enable-ts-plugin": true
+}

Dockerfile

@@ -6,11 +6,12 @@
 # Stop               : press ctrl + c 
 #                                     or 
 #                                        docker stop mermaid-live-editor
-FROM node:17.3.1 as mermaid-live-editor-builder 
+FROM node:18.8.0 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
+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:17
+FROM node:18
 WORKDIR /app
 COPY package.json .
 COPY yarn.lock .

README.md

@@ -32,6 +32,11 @@ docker run --publish 8000:80 ghcr.io/mermaid-js/mermaid-live-editor
 When building, Set the Environment variable MERMAID_RENDERER_URL to the rendering service.
 Default is `https://mermaid.ink`
 
+### To configure Kroki Instance URL
+
+When building, Set the Environment variable MERMAID_KROKI_RENDERER_URL to your Kroki instance.
+Default is `https://kroki.io`
+
 ### Development
 
 ```bash

SECURITY.md

@@ -0,0 +1,13 @@
+# Security Policy
+
+## Supported Versions
+
+Live editor only has a single version, which will be maintained.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| latest  | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+To report a vulnerability, please e-mail security@mermaid.live with a description of the issue, the steps you took to create the issue, affected versions, and if known, mitigations for the issue.

bin/update-monaco

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-monacoVersion="$(jq -r '.dependencies."monaco-editor"' package.json)"
-monacoVersion="${monacoVersion:1}"
-
-if [[ $(uname) == "Darwin" ]]; 
-then
-    sed -i '' -E "s/monaco-editor\/[^/]*/monaco-editor\/$monacoVersion/g" ./src/app.html
-else
-    sed -i'' -E "s/monaco-editor\/[^/]*/monaco-editor\/$monacoVersion/g" ./src/app.html
-fi
-

bin/update-monaco.js

@@ -0,0 +1,45 @@
+import fs from 'fs';
+import path from 'path';
+import { parse } from 'node-html-parser';
+import prettier from 'prettier';
+
+// parse monaco version out of package.json
+const packageJson = JSON.parse(fs.readFileSync('package.json'));
+const monacoVersion = packageJson.dependencies['monaco-editor'].replace('^', '');
+
+// fetch monaco sri info from cdnjs api
+const cdnjsAPIResp = await fetch(
+	`https://api.cdnjs.com/libraries/monaco-editor/${monacoVersion}?fields=sri`
+);
+if (cdnjsAPIResp.ok) {
+	const respJson = await cdnjsAPIResp.json();
+	const htmlPath = path.join('src', 'app.html');
+	const appHtml = fs
+		.readFileSync(htmlPath, 'utf8')
+		// update monaco version of every asset in app.html
+		.replaceAll(/[0-9.]+\/min\/vs/g, `${monacoVersion}/min/vs`);
+	const root = parse(appHtml);
+	const updateIntegrity = (tag, attr) => {
+		for (const node of root
+			.getElementsByTagName(tag)
+			.filter((node) => node.getAttribute(attr)?.includes('monaco-editor'))) {
+			const file = node.getAttribute(attr).split(`${monacoVersion}/`)[1];
+			node.setAttribute('integrity', respJson.sri[file]);
+		}
+	};
+
+	updateIntegrity('script', 'src');
+	updateIntegrity('link', 'href');
+
+	fs.writeFileSync(
+		htmlPath,
+		prettier.format(root.toString(), {
+			singleQuote: false,
+			parser: 'html',
+			bracketSameLine: true,
+			useTabs: true
+		})
+	);
+} else {
+	throw Error('Unable to fetch monaco sri data from cdnjs api.');
+}

cypress.config.js

@@ -0,0 +1,35 @@
+import { defineConfig } from 'cypress';
+import fs from 'fs';
+import { isFileExist, findFiles } from 'cy-verify-downloads';
+export default defineConfig({
+	projectId: '2ckppp',
+	viewportWidth: 1440,
+	viewportHeight: 768,
+	snapshotFileName: './cypress/snapshots.js',
+	defaultCommandTimeout: 16000,
+	requestTimeout: 16000,
+	retries: {
+		runMode: 4,
+		openMode: 0
+	},
+	e2e: {
+		setupNodeEvents(on, config) {
+			on('task', {
+				isFileExist,
+				findFiles,
+				deleteFile(path) {
+					fs.rmSync(path);
+					return null;
+				},
+				readFileMaybe(filename) {
+					if (fs.existsSync(filename)) {
+						return fs.readFileSync(filename, 'utf8');
+					}
+					return null;
+				}
+			});
+		},
+		baseUrl: 'http://localhost:3000',
+		specPattern: 'cypress/e2e/**/*.spec.ts'
+	}
+});

cypress.json

@@ -1,11 +0,0 @@
-{
-	"projectId": "2ckppp",
-	"$schema": "https://on.cypress.io/cypress.schema.json",
-	"baseUrl": "http://localhost:3000",
-	"pluginsFile": "./cypress/plugins/index.cjs",
-	"viewportWidth": 1440,
-	"viewportHeight": 768,
-	"snapshotFileName": "./cypress/snapshots.js",
-	"defaultCommandTimeout": 16000,
-	"requestTimeout": 16000
-}

cypress/.eslintrc

@@ -1,12 +1,10 @@
 {
-	"plugins": ["cypress", "mocha"],
+	"plugins": ["cypress"],
-	"extends": ["plugin:cypress/recommended", "plugin:mocha/recommended"],
+	"extends": ["plugin:cypress/recommended"],
 	"rules": {
-		"jest/expect-expect": "off",
+		"jest/expect-expect": "off"
-		"mocha/no-mocha-arrows": "off"
 	},
 	"env": {
-		"cypress/globals": true,
+		"cypress/globals": true
-		"mocha": true
 	}
 }

cypress/e2e/actions.spec.ts

@@ -1,8 +1,10 @@
+import { verifyFileSize } from './util';
 describe('Check actions', () => {
 	beforeEach(() => {
 		cy.clearLocalStorage();
 		cy.visit('/edit');
 	});
+
 	it('should update markdown code', () => {
 		cy.get('#markdown')
 			.invoke('val')
@@ -21,4 +23,26 @@ describe('Check actions', () => {
 		cy.contains('Load Gist').click();
 		cy.contains('Go shopping!!');
 	});
+
+	it('should download png and svg', () => {
+		cy.clock(new Date(2022, 0, 1).getTime());
+
+		cy.get(`#downloadPNG`).click();
+		verifyFileSize('diagram', 'png', 21_000);
+
+		cy.get(`#downloadSVG`).click();
+		verifyFileSize('diagram', 'svg', 10_000);
+
+		// Verify downloaded file is different for different diagrams
+		cy.contains('Sample Diagrams').click();
+		cy.contains('ER Diagram').click();
+
+		cy.get(`#downloadPNG`).click();
+		verifyFileSize('diagram', 'png', 46_000);
+
+		cy.get(`#downloadSVG`).click();
+		verifyFileSize('diagram', 'svg', 12_000);
+
+		cy.clock().invoke('restore');
+	});
 });

cypress/e2e/diagramUpdate.spec.ts

@@ -0,0 +1,82 @@
+import { getEditor, cmd } from './util';
+
+describe('Auto sync tests', () => {
+	beforeEach(() => {
+		cy.clearLocalStorage();
+		cy.visit('/');
+	});
+
+	it('should dim diagram when code is edited', () => {
+		cy.contains('Auto sync').click();
+		cy.get('#view').should('not.have.class', 'outOfSync');
+		getEditor().type('  C --> Test');
+		cy.get('#view').should('have.class', 'outOfSync');
+		cy.getLocalStorage('codeStore').snapshot();
+	});
+
+	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');
+		cy.get('#view').should('have.class', 'outOfSync');
+		getEditor().type(`${cmd}{enter}`);
+		cy.get('#view').should('not.have.class', 'outOfSync');
+	});
+
+	it('should show/hide sync button with auto sync', () => {
+		cy.get('[data-cy=sync]').should('not.exist');
+		cy.contains('Auto sync').click();
+		cy.get('[data-cy=sync]').should('exist');
+		cy.get('#autoSync').check();
+		cy.get('[data-cy=sync]').should('not.exist');
+	});
+
+	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');
+		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');
+		cy.get('#view').should('not.have.class', 'outOfSync');
+		cy.getLocalStorage('codeStore').snapshot();
+	});
+
+	it('supports commenting code out/in', () => {
+		getEditor().type(`{uparrow}${cmd}/`);
+		cy.get('#view').contains('Car').should('not.exist');
+
+		getEditor().type(`{uparrow}${cmd}/`);
+		cy.get('#view').contains('Car').should('exist');
+	});
+
+	it('supports editing code when code is incorrect', () => {
+		cy.visit(
+			'/edit#pako:eNpljjEKwzAMRa8SNOcEnlt6gK5eVFvYJsgOqkwpIXevg9smEE1PnyfxF3DFExgISW-CczQ2D21cYU7a-SGYXRwyvTp9jUhuKlVP-eHy7zA-leQsMEmg_QOM0BLG5FujZVMsaCQmC6ahR5ks2Lw2r84ela4-aREwKpVGwKrl_s7ut3fnkjAIcg_XDzuaUhs'
+		);
+		cy.get('#errorContainer').should('not.exist');
+		getEditor({ newline: true }).type(`branch test`);
+		cy.get('#editor').contains('branch test').should('exist');
+		cy.get('#errorContainer')
+			.contains(
+				'Error: Trying to checkout branch which is not yet created. (Help try using "branch master")'
+			)
+			.should('exist');
+	});
+});
+
+describe.only('Pan and Zoom', () => {
+	beforeEach(() => {
+		cy.clearLocalStorage();
+		cy.visit('/');
+	});
+	it('should toggle pan and zoom', () => {
+		cy.get('#svg-pan-zoom-reset-pan-zoom').should('not.exist');
+		cy.contains('Pan & Zoom').click();
+		cy.get('#svg-pan-zoom-reset-pan-zoom').should('exist');
+		cy.contains('Pan & Zoom').click();
+		cy.get('#svg-pan-zoom-reset-pan-zoom').should('not.exist');
+	});
+});

cypress/e2e/docMap.spec.ts

@@ -0,0 +1,36 @@
+describe('Editor docs tests', () => {
+	beforeEach(() => {
+		cy.on('uncaught:exception', () => {
+			return false;
+		});
+		cy.clearLocalStorage();
+		cy.visit('/edit');
+		cy.contains('Sample Diagrams').click();
+	});
+
+	it('Test default loading', () => {
+		cy.get(`[data-cy=docs][href^="https://mermaid-js.github.io/mermaid"]`).should('exist');
+	});
+
+	it('Test to see if the correct URL loads when changing from one diagram to other', () => {
+		cy.contains('Flow Chart').click();
+		cy.get(`[data-cy=docs][href$="/#/flowchart"]`).should('exist');
+
+		cy.contains('Config').click();
+		cy.get(`[data-cy=docs][href$="/#/flowchart?id=configuration"]`).should('exist');
+
+		cy.contains('Sequence Diagram').click();
+		cy.get(`[data-cy=docs][href$="/#/sequenceDiagram?id=configuration"]`).should('exist');
+
+		cy.contains('Code').click();
+		cy.get(`[data-cy=docs][href$="/#/sequenceDiagram"]`).should('exist');
+	});
+
+	it("Test to check URLs for a case where config URL doesn't exist", () => {
+		cy.contains('State Diagram').click();
+		cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
+
+		cy.contains('Config').click();
+		cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
+	});
+});

cypress/e2e/history.spec.ts

@@ -0,0 +1,105 @@
+import { getEditor, verifyFileSnapshot } from './util';
+
+describe('Save History', () => {
+	beforeEach(() => {
+		cy.clock(new Date(2022, 0, 1).getTime());
+		cy.clearLocalStorage();
+		cy.visit('/edit');
+
+		cy.contains('Actions').click();
+		cy.contains('History').click();
+	});
+
+	afterEach(() => {
+		cy.clock().invoke('restore');
+	});
+
+	it('should load history from localstorage', () => {
+		cy.setLocalStorage(
+			'manualHistoryStore',
+			'[{"state":{"code":"graph TD\\n    A[Halloween] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"manual","id":"d7ea820e-21dd-418a-b984-fd58acde09df","name":"hollow-art"},{"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":"b749ffc6-522b-4a44-86cf-7c1ffc3146b3","name":"helpful-ocean"}]'
+		);
+		cy.setLocalStorage(
+			'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","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');
+		cy.get('#historyList').contains('helpful-ocean');
+		cy.get('#historyList').contains('hollow-art');
+		cy.contains('Restore').click();
+		cy.contains('Halloween');
+		cy.contains('Timeline').click();
+
+		cy.get('#historyList').find('li').should('have.length', 2);
+		cy.get('#historyList').find('No items in History').should('not.exist');
+		cy.get('#historyList').contains('needy-mosquito');
+		cy.get('#historyList').contains('barking-dog');
+		cy.contains('Restore').click();
+		cy.contains('New Year');
+	});
+
+	it('should save when clicked', () => {
+		cy.get('#historyList').find('li').should('have.length', 0);
+		cy.get('#historyList').contains('No items in History');
+		cy.get('#saveHistory').click();
+		cy.get('#historyList').find('No items in History').should('not.exist');
+		cy.get('#historyList').find('li').should('have.length', 1);
+		cy.get('#saveHistory').click();
+		cy.on('window:alert', (str) => {
+			expect(str).to.equal('State already saved.');
+		});
+		cy.on('window:confirm', () => true);
+		getEditor().type('  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');
+		cy.get('#historyList').find('No items in History').should('not.exist');
+		cy.get('#historyList').find('li').should('have.length', 1);
+		cy.contains('HistoryTest');
+		cy.contains('Restore').click();
+		cy.contains('HistoryTest').should('not.exist');
+		cy.contains('Delete').click();
+		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');
+		cy.get('#saveHistory').click();
+		cy.get('#editor').type('ing');
+		cy.get('#clearHistory').click();
+		cy.on('window:alert', (str) => {
+			expect(str).to.equal('Clear all saved items?');
+		});
+		cy.on('window:confirm', () => true);
+		cy.get('#historyList').contains('No items in History');
+	});
+
+	// TODO: Fix #639
+	xit('should auto save history', () => {
+		getEditor().type('  C --> HistoryTest');
+		cy.tick(70000);
+		cy.contains('Timeline').click();
+		cy.get('#historyList').find('li').should('have.length', 1);
+		cy.get('#editor').type('ing');
+		cy.tick(70000);
+		cy.get('#historyList').find('li').should('have.length', 2);
+		for (let i = 0; i < 31; i++) {
+			cy.get('#editor').type('.');
+			cy.tick(70000);
+		}
+		cy.get('#historyList').find('li').should('have.length', 30);
+	});
+
+	it('should download history', () => {
+		cy.get('#saveHistory').click();
+		cy.get(`#downloadHistory`).click();
+		verifyFileSnapshot('history', 'json', 'A[Christmas] -->|Get money| B(Go shopping)');
+	});
+});

cypress/e2e/loadSite.spec.ts

@@ -3,9 +3,9 @@ import { toBase64 } from 'js-base64';
 describe('Site Loads', () => {
 	beforeEach(() => {
 		cy.clearLocalStorage();
+		cy.visit('/');
 	});
 	it('Check Home page load', () => {
-		cy.visit('/');
 		cy.url().should('include', '/edit');
 		cy.contains('History').click();
 		cy.getLocalStorage('codeStore').snapshot();
@@ -15,12 +15,7 @@ describe('Site Loads', () => {
 		cy.visit(
 			'/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9LCJ1cGRhdGVFZGl0b3IiOmZhbHNlfQ'
 		);
-		cy.url().should(
+		cy.url().should('include', '/edit#pako:eNp');
-			'include',
-			'/edit#eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9LCJ1cGRhdGVFZGl0b3IiOmZhbHNlfQ'
-		);
-		cy.contains('History').click();
-		cy.getLocalStorage('codeStore').snapshot();
 	});
 
 	it('should load sample diagrams when clicked', () => {
@@ -63,7 +58,7 @@ describe('Site Loads', () => {
 	// Disabled temporarily. Should be enabled after the issue is fixed in Mermaid.
 	// it('should prevent setting the "securityLevel" option via URL', () => {
 	// 	const b64State = toBase64(
-	// 		`{"code":"graph TD\\nA[\\"<img src='https://via.placeholder.com/64' width=64 />\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","updateEditor":true,"autoSync":true,"updateDiagram":true}`,
+	// 		`{"code":"graph TD\\nA[\\"<img src='https://via.placeholder.com/64' width=64 />\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","autoSync":true,"updateDiagram":true}`,
 	// 		true
 	// 	);
 	// 	cy.on('window:confirm', () => true);
@@ -78,7 +73,7 @@ describe('Site Loads', () => {
 
 	it('should allow persisting "securityLevel" using confirm dialogue', () => {
 		const b64State = toBase64(
-			`{"code":"graph TD\\nA[\\"<img src='https://via.placeholder.com/64' width=64/>\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","updateEditor":true,"autoSync":true,"updateDiagram":true}`,
+			`{"code":"graph TD\\nA[\\"<img src='https://dummyimage.com/64' width=64/>\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","autoSync":true,"updateDiagram":true}`,
 			true
 		);
 		cy.on('window:confirm', () => false);
@@ -91,6 +86,33 @@ describe('Site Loads', () => {
 
 	it('should show troubleshooting steps if loading fails', () => {
 		cy.visit('/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAg');
+		cy.reload(true);
 		cy.contains('Please Click here to Raise an issue in github.');
 	});
+
+	it('should load uncompressed URL', () => {
+		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'
+		);
+		cy.contains('New Year');
+		cy.visit(
+			'/edit#pako:eNptkU1PwzAMhv9K5BOI9Q9EXBDbJA477YYqITcxndV8QD40weh_Jy1rGR0-OY_tV2_sEyivCSQogzGuGduAtnaixINji0bcf1WVWGfVXdMtx8M1faYm4B8sxR27JLClJd6nwK4VLTlN4bI4jMQd2pLe3C4KFhNNcLQ92jv9ADGLNoTdozc-zIV4ZDsNlud7RtVN7_5Sb_jYrFcN3iN_0pPbEqUZK3QbTP_Ojyv4NdR4bwTHlyMbPcOQ3WJ2CliBpWCRdbnLqFJDOpClGmRJNYauhtr1pS-_6bKMjebkA8hXNJFWgDn5_YdTIFPINDWdb3vu6r8BaWOZRQ'
+		);
+		cy.contains('Animal');
+	});
 });

cypress/e2e/themes.spec.ts

@@ -32,7 +32,6 @@ describe('Test themes', () => {
 	});
 
 	describe('Test dark mode', () => {
-		// eslint-disable-next-line mocha/no-hooks-for-single-case
 		beforeEach(() => {
 			cy.clearLocalStorage();
 			cy.visit('/edit', {

cypress/e2e/util.ts

@@ -0,0 +1,41 @@
+export const cmd = `{${Cypress.platform === 'darwin' ? 'meta' : 'ctrl'}}`;
+
+export const getEditor = ({ bottom = true, newline = false } = {}) =>
+	cy
+		.get('#editor textarea:first')
+		.click()
+		.focused()
+		.type(`${bottom ? '{pageDown}' : cmd}`)
+		.type(`${newline ? '{enter}' : cmd}`);
+
+const downloadsFolder = Cypress.config('downloadsFolder');
+
+export const verifyFileSize = (
+	fileType: 'history' | 'diagram',
+	extension: string,
+	size: number
+) => {
+	const fileName = `mermaid-${fileType}-2022-01-01-000000.${extension}`;
+	const filePath = `${downloadsFolder}/${fileName}`;
+	cy.verifyDownload(fileName);
+	cy.readFile(filePath, null, {
+		log: false
+	}).then((buffer) => expect((buffer as ArrayBuffer).byteLength).to.be.gt(size));
+	cy.task('deleteFile', filePath);
+};
+
+export const verifyFileSnapshot = (
+	fileType: 'history' | 'diagram',
+	extension: string,
+	content: string
+) => {
+	const fileName = `mermaid-${fileType}-2022-01-01-000000.${extension}`;
+	const filePath = `${downloadsFolder}/${fileName}`;
+	cy.verifyDownload(fileName);
+	cy.readFile(filePath, null, {
+		log: false
+	}).then((buffer) =>
+		expect(new TextDecoder('utf-8').decode(buffer as ArrayBuffer)).to.contain(content)
+	);
+	cy.task('deleteFile', filePath);
+};

cypress/integration/diagramUpdate.spec.ts

@@ -1,33 +0,0 @@
-describe('Auto sync tests', () => {
-	beforeEach(() => {
-		cy.clearLocalStorage();
-		cy.visit('/');
-	});
-	it('should dim diagram when code is edited', () => {
-		cy.contains('Auto sync').click();
-		cy.get('#view').should('not.have.class', 'outOfSync');
-		cy.get('#editor').type('  C --> Test');
-		cy.get('#view').should('have.class', 'outOfSync');
-		cy.getLocalStorage('codeStore').snapshot();
-	});
-
-	it('should show/hide sync button with auto sync', () => {
-		cy.get('[data-cy=sync]').should('not.exist');
-		cy.contains('Auto sync').click();
-		cy.get('[data-cy=sync]').should('exist');
-		cy.get('#autoSync').check();
-		cy.get('[data-cy=sync]').should('not.exist');
-	});
-	it('should not dim diagram when code is in sync', () => {
-		cy.contains('Auto sync').click();
-		cy.get('#view').should('not.have.class', 'outOfSync');
-		cy.get('#editor').type('  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();
-		cy.get('#editor').type('ing');
-		cy.get('#view').should('not.have.class', 'outOfSync');
-		cy.getLocalStorage('codeStore').snapshot();
-	});
-});

cypress/integration/history.spec.ts

@@ -1,63 +0,0 @@
-describe('Save History', () => {
-	beforeEach(() => {
-		cy.clock();
-		cy.clearLocalStorage();
-		cy.visit('/edit');
-		cy.contains('Actions').click();
-		cy.contains('History').click();
-	});
-
-	it('should save when clicked', () => {
-		cy.get('#historyList').find('li').should('have.length', 0);
-		cy.get('#historyList').contains('No items in History');
-		cy.get('#saveHistory').click();
-		cy.get('#historyList').find('No items in History').should('not.exist');
-		cy.get('#historyList').find('li').should('have.length', 1);
-		cy.get('#saveHistory').click();
-		cy.on('window:alert', (str) => {
-			expect(str).to.equal('State already saved.');
-		});
-		cy.on('window:confirm', () => true);
-		cy.get('#editor').type('  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();
-		cy.get('#editor').type('  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');
-		cy.contains('Restore').click();
-		cy.contains('HistoryTest').should('not.exist');
-		cy.contains('Delete').click();
-		cy.get('#historyList').find('li').should('have.length', 0);
-		cy.get('#historyList').contains('No items in History');
-		cy.get('#saveHistory').click();
-		cy.get('#editor').type('  C --> HistoryTest');
-		cy.get('#saveHistory').click();
-		cy.get('#editor').type('ing');
-		cy.get('#clearHistory').click();
-		cy.on('window:alert', (str) => {
-			expect(str).to.equal('Clear all saved items?');
-		});
-		cy.on('window:confirm', () => true);
-		cy.get('#historyList').contains('No items in History');
-	});
-
-	it('should auto save history', () => {
-		cy.get('#editor').type('  C --> HistoryTest');
-		cy.tick(70000);
-		cy.contains('Timeline').click();
-		cy.get('#historyList').find('li').should('have.length', 1);
-		cy.get('#editor').type('ing');
-		cy.tick(70000);
-		cy.get('#historyList').find('li').should('have.length', 2);
-		for (let i = 0; i < 31; i++) {
-			cy.get('#editor').type('.');
-			cy.tick(70000);
-		}
-		cy.get('#historyList').find('li').should('have.length', 30);
-	});
-});

cypress/plugins/index.cjs

@@ -1,31 +0,0 @@
-/// <reference types="cypress" />
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-/**
- * @type {Cypress.PluginConfig}
- */
-// eslint-disable-next-line no-unused-vars
-import * as fs from 'fs';
-
-module.exports = (on, config) => {
-	on('task', {
-		readFileMaybe(filename) {
-			if (fs.existsSync(filename)) {
-				return fs.readFileSync(filename, 'utf8');
-			}
-
-			return null;
-		}
-	});
-};

cypress/snapshots.js

@@ -1,28 +1,28 @@
 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}\",\"updateEditor\":true,\"autoSync\":true,\"updateDiagram\":true}"
+      "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}"
     },
     "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}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":true}"
+      "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}"
     },
     "should load diagram from gist": {
-      "1": "{\"code\":\"graph TD\\n    A[Party] -->|Get money| B(Go shopping!!)\\n    \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"forest\\\",\\n  \\\"test\\\": \\\"hello world\\\"\\n}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"gist\",\"config\":{\"url\":\"https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a\"}}}"
+      "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\":\"gist\",\"config\":{\"url\":\"https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a\"}}}"
     },
     "should load diagram from gist revision": {
-      "1": "{\"code\":\"graph TD\\n    A[Party] -->|Get money| B(Go shopping)\\n    \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"forest\\\",\\n  \\\"test\\\": \\\"hello\\\"\\n}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"gist\",\"config\":{\"url\":\"https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/ec9b4ab0e41e4ff6287326cd3cb47affd7851e19\"}}}"
+      "1": "{\"code\":\"graph TD\\n    A[Party] -->|Get money| B(Go shopping)\\n    \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"forest\\\",\\n  \\\"test\\\": \\\"hello\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"gist\",\"config\":{\"url\":\"https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/ec9b4ab0e41e4ff6287326cd3cb47affd7851e19\"}}}"
     },
     "should load diagram from raw files": {
-      "1": "{\"code\":\"graph TD\\n    A[Party] -->|Get money| B(Go shopping!!)\\n    \",\"mermaid\":\"{\\n  \\\"theme\\\": \\\"forest\\\",\\n  \\\"test\\\": \\\"hello world\\\"\\n}\",\"updateEditor\":false,\"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\"}}}"
+      "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": "9.1.1",
+  "__version": "10.6.0",
   "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}\",\"updateEditor\":false,\"autoSync\":false,\"updateDiagram\":false}"
+      "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}"
     },
     "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}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":false}"
+      "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}"
     }
   },
   "Test themes": {

cypress/support/e2e.js

@@ -15,6 +15,7 @@
 
 // Import commands.js using ES2015 syntax:
 import './commands';
+require('cy-verify-downloads').addCustomCommand();
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')

cypress/tsconfig.json

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

nginx.conf

@@ -0,0 +1,9 @@
+server { 
+ listen 80;
+ server_name mermaid;
+ location / {
+   root /usr/share/nginx/html;
+	 # Fallback to index.html for other paths
+   try_files $uri /index.html;
+ }
+}

package.json

@@ -1,63 +1,83 @@
 {
 	"name": "mermaid-live-editor",
 	"version": "2.0.67",
+	"type": "module",
+	"license": "MIT",
 	"scripts": {
-		"dev": "svelte-kit dev --host 0.0.0.0",
+		"dev": "vite dev",
-		"build": "svelte-kit build",
+		"dev:test": "MERMAID_DISABLE_DEBOUNCE=true yarn dev",
-		"preview": "svelte-kit preview",
+		"build": "vite build",
-		"lint": "prettier --check --plugin-search-dir=. . && eslint --ignore-path .gitignore .",
+		"preview": "vite preview",
-		"lint:fix": "prettier --write --plugin-search-dir=. . && eslint --fix --ignore-path .gitignore .",
+		"lint": "prettier --check --cache --plugin-search-dir=. .;eslint --ignore-path .gitignore .",
-		"format": "prettier --write --plugin-search-dir=. .",
+		"lint:fix": "prettier --write --cache --plugin-search-dir=. .;eslint --fix --ignore-path .gitignore .",
+		"format": "prettier --write --cache --plugin-search-dir=. .",
 		"pre-commit": "lint-staged",
-		"postinstall": "husky install",
+		"postinstall": "husky install; svelte-kit sync",
-		"test": "cypress run",
+		"test:unit": "vitest",
+		"test:ui": "vitest --ui",
+		"test:coverage": "vitest run --coverage",
+		"test:browser": "cypress run",
+		"test": "test:unit && test:browser",
 		"cy": "cypress open"
 	},
 	"devDependencies": {
-		"@cypress/snapshot": "^2.1.7",
+		"@cypress/snapshot": "2.1.7",
-		"@sveltejs/adapter-static": "1.0.0-next.22",
+		"@sveltejs/adapter-static": "1.0.0-next.41",
-		"@sveltejs/kit": "1.0.0-next.202",
+		"@sveltejs/kit": "1.0.0-next.463",
-		"@types/mermaid": "^8.2.7",
+		"@testing-library/jest-dom": "5.16.5",
-		"@typescript-eslint/eslint-plugin": "^4.33.0",
+		"@testing-library/svelte": "3.2.1",
-		"@typescript-eslint/parser": "^4.33.0",
+		"@types/mermaid": "8.2.9",
-		"autoprefixer": "^10.4.0",
+		"@types/pako": "1.0.3",
-		"chai": "^4.3.4",
+		"@types/uuid": "^8.3.4",
-		"cssnano": "^5.0.14",
+		"@typescript-eslint/eslint-plugin": "5.35.1",
-		"cypress": "9.2.0",
+		"@typescript-eslint/parser": "5.36.1",
-		"cypress-localstorage-commands": "^1.6.1",
+		"@vitest/ui": "0.22.1",
-		"eslint": "^7.32.0",
+		"autoprefixer": "10.4.8",
-		"eslint-config-prettier": "^8.1.0",
+		"c8": "7.12.0",
-		"eslint-plugin-cypress": "^2.12.1",
+		"chai": "4.3.6",
-		"eslint-plugin-es": "^4.1.0",
+		"cssnano": "5.1.13",
-		"eslint-plugin-mocha": "^10.0.3",
+		"cy-verify-downloads": "0.1.8",
-		"eslint-plugin-postcss-modules": "^2.0.0",
+		"cypress": "10.7.0",
-		"eslint-plugin-svelte3": "^3.2.1",
+		"cypress-localstorage-commands": "2.2.0",
-		"eslint-plugin-tailwindcss": "^1.17.2",
+		"eslint": "8.23.0",
-		"husky": "^7.0.4",
+		"eslint-config-prettier": "8.5.0",
-		"lint-staged": "^12.1.4",
+		"eslint-plugin-cypress": "2.12.1",
-		"mocha": "^9.1.3",
+		"eslint-plugin-es": "4.1.0",
-		"node-html-parser": "^5.2.0",
+		"eslint-plugin-postcss-modules": "2.0.0",
-		"postcss": "^8.4.5",
+		"eslint-plugin-svelte3": "4.0.0",
-		"postcss-load-config": "^3.1.0",
+		"eslint-plugin-tailwindcss": "3.6.1",
-		"prettier": "~2.5.1",
+		"eslint-plugin-vitest": "0.0.8",
-		"prettier-plugin-svelte": "^2.5.1",
+		"esserializer": "^1.3.2",
-		"svelte": "^3.46.1",
+		"husky": "8.0.1",
-		"svelte-preprocess": "^4.10.1",
+		"jsdom": "20.0.0",
-		"tailwindcss": "^3.0.13",
+		"lint-staged": "13.0.3",
-		"tslib": "^2.3.1",
+		"node-html-parser": "5.4.2",
-		"typescript": "^4.5.4"
+		"postcss": "8.4.16",
+		"postcss-load-config": "4.0.1",
+		"prettier": "2.7.1",
+		"prettier-plugin-svelte": "2.7.0",
+		"svelte": "3.49.0",
+		"svelte-preprocess": "4.10.7",
+		"tailwindcss": "3.1.8",
+		"tslib": "2.4.0",
+		"typescript": "4.8.2",
+		"vite": "3.1.0-beta.2",
+		"vitest": "0.22.1"
 	},
-	"type": "module",
 	"dependencies": {
-		"@analytics/google-analytics": "^0.5.3",
+		"@analytics/google-analytics": "1.0.3",
-		"@macfja/svelte-persistent-store": "^1.2.0",
+		"analytics": "0.8.1",
-		"analytics": "^0.7.19",
+		"analytics-plugin-plausible": "^0.0.6",
-		"daisyui": "1.21.0",
+		"daisyui": "2.24.0",
-		"js-base64": "^3.7.2",
+		"js-base64": "3.7.2",
-		"mermaid": "8.13.8",
+		"mermaid": "9.1.6",
-		"moment": "^2.29.1",
+		"moment": "2.29.4",
-		"monaco-editor": "^0.31.1",
+		"monaco-editor": "0.34.0",
-		"random-word-slugs": "^0.1.6"
+		"monaco-mermaid": "1.0.6",
+		"pako": "2.0.4",
+		"random-word-slugs": "0.1.6",
+		"svg-pan-zoom": "^3.6.1",
+		"uuid": "^8.3.2"
 	},
 	"lint-staged": {
 		"*.{ts,svelte,js,css,md,json}": [
@@ -66,8 +86,10 @@
 		]
 	},
 	"volta": {
-		"node": "14.16.1",
+		"node": "18.5.0",
-		"yarn": "1.22.10",
+		"yarn": "1.22.10"
-		"npm": "7.11.2"
+	},
+	"engines": {
+		"node": ">=16.7"
 	}
 }

src/app.html

@@ -11,37 +11,45 @@
 		<meta
 			name="description"
 			content="Simplify documentation and avoid heavy tools. Open source Visio Alternative. Commonly used for explaining your code! Mermaid is a simple markdown-like script language for generating charts from text via javascript." />
-		<link rel="icon" type="image/png" href="favicon.png" />
+		<link rel="icon" type="image/png" href="%sveltekit.assets%/favicon.png" />
-		<link rel="manifest" href="manifest.json" />
+		<link rel="manifest" href="%sveltekit.assets%/manifest.json" />
 		<link
 			rel="stylesheet"
-			href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css" />
+			href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css"
+			integrity="sha512-HK5fgLBL+xu6dm/Ii3z4xhlSUyZgTT9tuc/hSrtw6uzJOvgRr2a9jyxxT1ely+B+xFAmJKVSTbpM/CuL7qxO8w=="
+			crossorigin="anonymous"
+			referrerpolicy="no-referrer" />
 		<link
 			rel="stylesheet"
-			href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.31.1/min/vs/editor/editor.main.min.css"
+			href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/editor/editor.main.min.css"
+			integrity="sha512-iQEIc0rsSDujsfjtD+lfyJ1W23Bh/lbgriubKDAym6VlEIDRj9rrbSIyJRyshOrl8s0yRcQ0+gyrZfSLyjJGWQ=="
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer" />
 		<script>
 			var require = {
-				paths: { vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.31.1/min/vs' }
+				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.31.1/min/vs/loader.min.js"
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/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.31.1/min/vs/editor/editor.main.nls.min.js"
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/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.31.1/min/vs/editor/editor.main.js"
+			src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/editor/editor.main.js"
+			integrity="sha512-TTPQbVI87mnVMV+1KbkKJ8vdQ4QqqbKyuTtJ9wQD8CqnwQLSQgXH7MWOQ88VO7pRzxWhqI1vYDeEV651sAH4ig=="
 			crossorigin="anonymous"
 			referrerpolicy="no-referrer"></script>
-
+		%sveltekit.head%
-		%svelte.head%
 	</head>
 	<body>
-		<div id="svelte">%svelte.body%</div>
+		<div id="svelte">%sveltekit.body%</div>
 	</body>
 </html>

src/global.d.ts

@@ -1 +1,15 @@
+/* eslint-disable @typescript-eslint/no-empty-interface */
+/* eslint-disable @typescript-eslint/ban-types */
+/* eslint-disable @typescript-eslint/no-unused-vars */
+
 /// <reference types="@sveltejs/kit" />
+import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers';
+
+declare global {
+	namespace jest {
+		interface Matchers<R = void>
+			// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+			// @ts-ignore
+			extends TestingLibraryMatchers<typeof expect.stringContaining, R> {}
+	}
+}

src/hooks.ts

@@ -0,0 +1,6 @@
+import type { Handle } from '@sveltejs/kit';
+
+export const handle: Handle = async ({ event, resolve }) => {
+	const response = await resolve(event, {});
+	return response;
+};

src/lib/components/actions.svelte

@@ -1,23 +1,27 @@
 <script lang="ts">
-	import { browser } from '$app/env';
+	import { browser } from '$app/environment';
-
 	import Card from '$lib/components/card/card.svelte';
-	import { rendererUrl } from '$lib/util/env';
+	import { krokiRendererUrl, rendererUrl } from '$lib/util/env';
-	import { base64State, codeStore } from '$lib/util/state';
+	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';
 
 	type Exporter = (context: CanvasRenderingContext2D, image: HTMLImageElement) => () => void;
 
+	const getFileName = (ext: string) =>
+		`mermaid-diagram-${moment().format('YYYY-MM-DD-HHmmss')}.${ext}`;
+
 	const getBase64SVG = (svg?: HTMLElement, width?: number, height?: number): string => {
 		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
 		if (!svg) {
-			svg = document.querySelector('#container svg');
+			svg = getSvgEl();
 		}
 		const svgString = svg.outerHTML
 			.replaceAll('<br>', '<br/>')
-			.replaceAll(/<img([^>]*)>/g, (m, g) => `<img ${g} />`);
+			.replaceAll(/<img([^>]*)>/g, (m, g: string) => `<img ${g} />`);
 		return toBase64(svgString);
 	};
 
@@ -49,6 +53,23 @@
 		event.preventDefault();
 	};
 
+	const getSvgEl = () => {
+		const svgEl: HTMLElement = document
+			.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'));
+		if (fontAwesomeCdnUrl == null) {
+			return svgEl;
+		}
+		const styleEl = document.createElement('style');
+		styleEl.innerText = `@import url("${fontAwesomeCdnUrl}");'`;
+		svgEl.prepend(styleEl);
+		return svgEl;
+	};
+
 	const simulateDownload = (download: string, href: string): void => {
 		const a = document.createElement('a');
 		a.download = download;
@@ -61,7 +82,7 @@
 			const { canvas } = context;
 			context.drawImage(image, 0, 0, canvas.width, canvas.height);
 			simulateDownload(
-				`mermaid-diagram-${moment().format('YYYYMMDDHHmmss')}.png`,
+				getFileName('png'),
 				canvas.toDataURL('image/png').replace('image/png', 'image/octet-stream')
 			);
 		};
@@ -78,7 +99,7 @@
 			canvas.toBlob((blob) => {
 				try {
 					// @ts-ignore: https://github.com/microsoft/TypeScript-DOM-lib-generator/pull/1004/files
-					navigator.clipboard.write([
+					void navigator.clipboard.write([
 						/* eslint-disable no-undef */
 						// @ts-ignore: https://github.com/microsoft/TypeScript/issues/43821
 						new ClipboardItem({
@@ -94,29 +115,34 @@
 
 	const onCopyClipboard = (event: Event) => {
 		exportImage(event, clipboardCopy);
+		void logEvent('copyClipboard');
 	};
 
 	const onDownloadPNG = (event: Event) => {
 		exportImage(event, downloadImage);
+		void logEvent('download', {
+			type: 'png'
+		});
 	};
 
 	const onDownloadSVG = () => {
-		simulateDownload(
+		simulateDownload(getFileName('svg'), `data:image/svg+xml;base64,${getBase64SVG()}`);
-			`mermaid-diagram-${moment().format('YYYYMMDDHHmmss')}.svg`,
+		void logEvent('download', {
-			`data:image/svg+xml;base64,${getBase64SVG()}`
+			type: 'svg'
-		);
+		});
 	};
 
 	const onCopyMarkdown = () => {
-		document.getElementById('markdown').select();
+		(document.getElementById('markdown') as HTMLInputElement).select();
 		document.execCommand('Copy');
+		void logEvent('copyMarkdown');
 	};
 
 	let gistURL = '';
-	codeStore.subscribe((state) => {
+	stateStore.subscribe(({ loader }) => {
-		if (state.loader?.type === 'gist') {
+		if (loader?.type === 'gist') {
 			// @ts-ignore Gist will have url
-			gistURL = state.loader.config.url;
+			gistURL = loader.config.url;
 		}
 	});
 
@@ -125,10 +151,12 @@
 			alert('Please enter a Gist URL first');
 		}
 		window.location.href = `${window.location.pathname}?gist=${gistURL}`;
+		void logEvent('loadGist');
 	};
 
 	let iUrl: string;
 	let svgUrl: string;
+	let krokiUrl: string;
 	let mdCode: string;
 	let imagemodeselected = 'auto';
 	let userimagesize = 1080;
@@ -137,15 +165,11 @@
 	if (browser && ['mermaid.live', 'netlify'].some((path) => window.location.host.includes(path))) {
 		isNetlify = true;
 	}
-	base64State.subscribe((encodedState: string) => {
+	stateStore.subscribe(({ code, serialized }) => {
-		const stateCopy = JSON.parse(JSON.stringify($codeStore));
+		iUrl = `${rendererUrl}/img/${serialized}`;
-		if (typeof stateCopy.mermaid === 'string') {
+		svgUrl = `${rendererUrl}/svg/${serialized}`;
-			stateCopy.mermaid = JSON.parse(stateCopy.mermaid);
+		krokiUrl = `${krokiRendererUrl}/mermaid/svg/${pakoSerde.serialize(code)}`;
-		}
+		mdCode = `[![](${iUrl})](${window.location.protocol}//${window.location.host}${window.location.pathname}#${serialized})`;
-		const b64Code = toBase64(JSON.stringify(stateCopy), true);
-		iUrl = `${rendererUrl}/img/${b64Code}`;
-		svgUrl = `${rendererUrl}/svg/${b64Code}`;
-		mdCode = `[![](${iUrl})](${window.location.protocol}//${window.location.host}${window.location.pathname}#${encodedState})`;
 	});
 </script>
 
@@ -156,18 +180,29 @@
 				><i class="far fa-copy mr-2" /> Copy Image to clipboard
 			</button>
 		{/if}
-		<button class="action-btn flex-auto" on:click={onDownloadPNG}>
+		<button id="downloadPNG" class="action-btn flex-auto" on:click={onDownloadPNG}>
 			<i class="fas fa-download mr-2" /> PNG
 		</button>
-		<button class="action-btn flex-auto" on:click={onDownloadSVG}>
+		<button id="downloadSVG" class="action-btn flex-auto" on:click={onDownloadSVG}>
 			<i class="fas fa-download mr-2" /> SVG
 		</button>
-		<button class="action-btn flex-auto">
+		<a target="_blank" href={iUrl}>
-			<a target="_blank" href={iUrl}><i class="fas fa-external-link-alt mr-2" /> PNG</a>
+			<button class="action-btn flex-auto">
-		</button>
+				<i class="fas fa-external-link-alt mr-2" /> PNG
-		<button class="action-btn flex-auto">
+			</button>
-			<a target="_blank" href={svgUrl}><i class="fas fa-external-link-alt mr-2" /> SVG</a>
+		</a>
-		</button>
+
+		<a target="_blank" href={svgUrl}>
+			<button class="action-btn flex-auto">
+				<i class="fas fa-external-link-alt mr-2" /> SVG
+			</button>
+		</a>
+
+		<a target="_blank" href={krokiUrl}>
+			<button class="action-btn flex-auto">
+				<i class="fas fa-external-link-alt mr-2" /> Kroki
+			</button>
+		</a>
 
 		<div class="flex gap-2 items-center">
 			PNG size

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

@@ -0,0 +1,3 @@
+// 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/card/card.svelte

@@ -5,6 +5,7 @@
 	export let isCloseable = true;
 	export let isOpen = true;
 	export let tabs: Tab[] = [];
+	export let activeTabID: string = '';
 	export let title: string;
 	$: isOpen = isCloseable ? isOpen : true;
 	$: isTabsShown = isOpen && tabs.length > 0;
@@ -15,7 +16,7 @@
 		class="bg-primary p-2 {isTabsShown ? 'pb-0' : ''} flex-none cursor-pointer"
 		on:click={() => (isOpen = !isOpen)}>
 		<div class="flex justify-between">
-			<Tabs on:select {tabs} bind:isOpen {title} {isCloseable} />
+			<Tabs on:select {tabs} bind:isOpen {title} {isCloseable} {activeTabID} />
 			<div class="flex gap-x-4 items-center {isTabsShown ? '-mt-2' : ''}">
 				<slot name="actions" />
 			</div>

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

@@ -0,0 +1,24 @@
+import { cleanup, render } from '@testing-library/svelte';
+import { describe, expect, it, afterEach } from 'vitest';
+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
+	afterEach(() => cleanup());
+
+	it('mounts', () => {
+		const { container } = render(Card, {
+			title: 'TabTest',
+			tabs: [
+				{ id: 't1', title: 'title1' },
+				{ id: 't2', title: 'title2' }
+			]
+		});
+		expect(container).toBeTruthy();
+		expect(container).toHaveTextContent('TabTest');
+		expect(container).toHaveTextContent('title1');
+		expect(container).toHaveTextContent('title2');
+		expect(container).not.toHaveTextContent('title3');
+		expect(container.innerHTML).toMatchSnapshot();
+	});
+});

src/lib/components/card/tabs.svelte

@@ -3,12 +3,14 @@
 	import { createEventDispatcher } from 'svelte';
 	import { fade } from 'svelte/transition';
 	export let isCloseable = true;
-	export let tabs: Tab[] = [];
+	export let tabs: Tab[];
 	export let title: string;
 	export let isOpen = false;
+	export let activeTabID: string;
 
-	$: activeTabID = tabs[0]?.id;
+	if (!activeTabID && tabs.length > 0) {
-
+		activeTabID = tabs[0].id;
+	}
 	const dispatch = createEventDispatcher<TabEvents>();
 	const toggleTabs = (tab: Tab) => {
 		activeTabID = tab.id;
@@ -26,7 +28,7 @@
 		<ul class="tabs" transition:fade>
 			{#each tabs as tab}
 				<div
-					class="tab tab-lifted text-primary-content {activeTabID === tab.id ? 'tab-active' : ''}"
+					class="tab tab-lifted {activeTabID === tab.id ? 'tab-active' : 'text-primary-content'}"
 					on:click|stopPropagation={() => toggleTabs(tab)}>
 					<i class="mr-1 {tab.icon}" />
 					{tab.title}

src/lib/components/editor.svelte

@@ -0,0 +1,120 @@
+<script lang="ts">
+	import type { EditorMode } from '$lib/types';
+	import { stateStore, updateCode, updateConfig } from '$lib/util/state';
+	import { themeStore } from '$lib/util/theme';
+	import { 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';
+	import { debounceEnabled } from '$lib/util/env';
+
+	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 }) => {
+		if (!editor) return;
+
+		// Update editor text if it's different
+		const newText = editorMode === 'code' ? code : mermaid;
+		if (newText !== text) {
+			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 errors if present
+		if (errorMarkers.length > 0) {
+			Monaco?.editor.setModelMarkers(editor.getModel(), 'test', errorMarkers);
+		}
+	});
+
+	themeStore.subscribe(({ isDark }) => {
+		editor && Monaco?.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid');
+	});
+
+	const handleUpdate = (text: string, mode: EditorMode) => {
+		if (mode === 'code') {
+			updateCode(text);
+		} else {
+			updateConfig(text);
+		}
+	};
+
+	// Debounce state updates to avoid performance issues
+	let debounce: { [key: string]: number } = {};
+	const updateHandler = (newText: string) => {
+		text = newText;
+		const mode = $stateStore.editorMode;
+		if (debounceEnabled) {
+			clearTimeout(debounce[mode]);
+			debounce[mode] = window.setTimeout(() => {
+				handleUpdate(text, mode);
+			}, 300);
+		} else {
+			handleUpdate(text, mode);
+		}
+	};
+
+	const loadMonaco = async () => {
+		let i = 0;
+		while (i++ < 500) {
+			try {
+				// @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco.
+				Monaco = window.monaco;
+				return;
+			} catch {
+				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);
+		editor = Monaco.editor.create(divEl, editorOptions);
+		editor.onDidChangeModelContent(() => {
+			updateHandler(editor.getValue());
+		});
+		editor.addAction({
+			id: 'mermaid-render-diagram',
+			label: 'Render Diagram',
+			keybindings: [Monaco.KeyMod.CtrlCmd | Monaco.KeyCode.Enter],
+			run: function () {
+				syncDiagram();
+				void 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);
+		return () => {
+			editor.dispose();
+		};
+	});
+</script>
+
+<div bind:this={divEl} id="editor" class="overflow-hidden" />

src/lib/components/editor/editor.svelte

@@ -1,85 +0,0 @@
-<script lang="ts">
-	import type { EditorEvents } from '$lib/types';
-	import { codeStore } from '$lib/util/state';
-	import { themeStore } from '$lib/util/theme';
-	import type monaco from 'monaco-editor';
-	import { createEventDispatcher, onMount } from 'svelte';
-	import { initEditor } from './util';
-
-	let divEl: HTMLDivElement = null;
-	let editor: monaco.editor.IStandaloneCodeEditor;
-	let Monaco;
-
-	export let text: string;
-	export let language: string;
-	export let editorOptions: monaco.editor.IStandaloneEditorConstructionOptions = {
-		value: text,
-		language: language,
-		minimap: {
-			enabled: false
-		},
-		theme: 'mermaid',
-		overviewRulerLanes: 0
-	};
-	export let errorMarkers: monaco.editor.IMarkerData[] = [];
-	let oldText = text;
-	$: editor && Monaco?.editor.setModelLanguage(editor.getModel(), language);
-	$: {
-		if (text !== oldText) {
-			if ($codeStore.updateEditor) {
-				editor?.setValue(text);
-			}
-			oldText = text;
-		}
-		editor && Monaco?.editor.setModelMarkers(editor.getModel(), 'test', errorMarkers);
-	}
-
-	themeStore.subscribe(({ isDark }) => {
-		editor && Monaco?.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid');
-	});
-
-	const dispatch = createEventDispatcher<EditorEvents>();
-	const loadMonaco = async () => {
-		let i = 0;
-		while (i++ < 10) {
-			try {
-				// @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco.
-				Monaco = monaco;
-				return;
-			} catch {
-				await new Promise((r) => setTimeout(r, 500));
-			}
-		}
-		alert('Loading Monaco Editor failed. Please try refreshing the page.');
-	};
-	onMount(async () => {
-		try {
-			// @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco.
-			Monaco = monaco;
-		} catch {
-			await loadMonaco(); // Fix https://github.com/mermaid-js/mermaid-live-editor/issues/175
-		}
-		initEditor(Monaco);
-		editor = Monaco.editor.create(divEl, editorOptions);
-		editor.onDidChangeModelContent(() => {
-			text = editor.getValue();
-			dispatch('update', {
-				text
-			});
-		});
-		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);
-		return () => {
-			editor.dispose();
-		};
-	});
-</script>
-
-<div bind:this={divEl} id="editor" class="overflow-hidden" />

src/lib/components/editor/util.ts

@@ -1,552 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-export const initEditor = (monacoEditor): void => {
-	monacoEditor.languages.register({ id: 'mermaid' });
-
-	const requirementDiagrams = [
-		'requirement',
-		'functionalRequirement',
-		'interfaceRequirement',
-		'performanceRequirement',
-		'physicalRequirement',
-		'designConstraint'
-	];
-
-	const keywords: {
-		[key: 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'
-			]
-		},
-		classDiagram: {
-			typeKeywords: ['classDiagram', 'classDiagram-v2'],
-			blockKeywords: ['class'],
-			keywords: [
-				'link',
-				'click',
-				'callback',
-				'call',
-				'href',
-				'cssClass',
-				'direction',
-				'TB',
-				'BT',
-				'RL',
-				'LR'
-			]
-		},
-		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: []
-		},
-		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.concat('element'),
-			keywords: []
-		},
-		gitGraph: {
-			typeKeywords: ['gitGraph'],
-			blockKeywords: [],
-			keywords: ['commit', 'branch', 'merge', 'reset', 'checkout', 'LR', 'BT']
-		},
-		pie: {
-			typeKeywords: ['pie'],
-			blockKeywords: [],
-			keywords: ['title', 'showData']
-		}
-	};
-
-	// 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]
-					])
-				)
-			)
-			.reduce((overallKeywords, nextKeyword) => ({ ...overallKeywords, ...nextKeyword }), {}),
-		tokenizer: {
-			root: [
-				[/%%(?=.*%%$)/, { token: 'string', nextEmbedded: 'json' }],
-				[/%%$/, { token: 'string', nextEmbedded: '@pop' }],
-				[/^\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*erDiagram/, 'typeKeyword', 'erDiagram'],
-				[/^\s*requirement(Diagram)?/, 'typeKeyword', 'requirementDiagram'],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
-			],
-			gitGraph: [
-				[/option(?=s)/, { token: 'typeKeyword', next: 'optionsGitGraph' }],
-				[/(^\s*branch|reset|merge|checkout)(.*$)/, ['keyword', 'variable']],
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@gitGraphBlockKeywords': 'typeKeyword',
-							'@gitGraphKeywords': 'keyword'
-						}
-					}
-				],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-				[/".*?"/, 'string'],
-				[/\^/, 'delimiter.bracket']
-			],
-			optionsGitGraph: [
-				[/s$/, { token: 'typeKeyword', nextEmbedded: 'json', matchOnlyAtLineStart: false }],
-				['end', { token: 'typeKeyword', next: '@pop', nextEmbedded: '@pop' }]
-			],
-			info: [
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@infoBlockKeywords': 'typeKeyword',
-							'@infoKeywords': 'keyword'
-						}
-					}
-				]
-			],
-			pie: [
-				[/(title)(.*$)/, ['keyword', 'string']],
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@pieBlockKeywords': 'typeKeyword',
-							'@pieKeywords': 'keyword'
-						}
-					}
-				],
-				[/".*?"/, 'string'],
-				[/\s*\d+/, 'number'],
-				[/:/, 'delimiter.bracket'],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
-			],
-			flowchart: [
-				[/[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: [
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@sequenceDiagramBlockKeywords': 'typeKeyword',
-							'@sequenceDiagramKeywords': 'keyword',
-							'@default': 'variable'
-						}
-					}
-				],
-				[/(--?>?>|--?[)x])[+-]?/, 'transition'],
-				[/(:)([^:\n]*?$)/, ['delimiter.bracket', 'string']],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment']
-			],
-			classDiagram: [
-				[/(?!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: [
-				[/(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: [
-				[/(title)(.*)/, ['keyword', 'string']],
-				[/(section)(.*)/, ['typeKeyword', 'string']],
-				[
-					/[a-zA-Z][\w$]*/,
-					{
-						cases: {
-							'@ganttBlockKeywords': 'typeKeyword',
-							'@ganttKeywords': 'keyword'
-						}
-					}
-				],
-				[/(^\s*.*?)(:)/, ['string', 'delimiter.bracket']],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-				[/:/, 'delimiter.bracket']
-			],
-			stateDiagram: [
-				[/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: [
-				[/[}|][o|](--|\.\.)[o|][{|]/, 'transition'],
-				[/".*?"/, 'string'],
-				[/(:)(.*?$)/, ['delimiter.bracket', 'string']],
-				[/:|{|}/, 'delimiter.bracket'],
-				[/([a-zA-Z]+)(\s+[a-zA-Z]+)/, ['type', 'variable']],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-				[/[a-zA-Z_-][\w$]*/, 'variable']
-			],
-			requirementDiagram: [
-				[/->|<-|-/, 'transition'],
-				[/(\d+\.)*\d+/, 'number'],
-				[
-					/[a-zA-Z_-][\w$]*/,
-					{
-						cases: {
-							'@requirementDiagramBlockKeywords': 'typeKeyword',
-							'@default': 'variable'
-						}
-					}
-				],
-				[/:|{|}|\//, 'delimiter.bracket'],
-				[/%%[^$]([^%]*(?!%%$)%?)*$/, 'comment'],
-				[/".*?"/, 'string']
-			]
-		}
-	});
-
-	monacoEditor.editor.defineTheme('mermaid-dark', {
-		base: 'vs-dark',
-		inherit: true,
-		rules: [
-			{ token: 'typeKeyword', foreground: '9650c8', fontStyle: 'bold' },
-			{ token: 'transition', foreground: '008800', fontStyle: 'bold' }
-		],
-		colors: {}
-	});
-
-	monacoEditor.editor.defineTheme('mermaid', {
-		base: 'vs',
-		inherit: true,
-		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' }
-		],
-		colors: {}
-	});
-
-	// Register a completion item provider for the mermaid language
-	monacoEditor.languages.registerCompletionItemProvider('mermaid', {
-		provideCompletionItems: () => {
-			const suggestions = [
-				{
-					label: 'loop',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['loop ${1:Loop text}', '\t$0', 'end'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Sequence Diagram Loops'
-				},
-				{
-					label: 'alt',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['alt ${1:Describing text}', '\t$0', 'else', '\t', 'end'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Alternative Path'
-				},
-				{
-					label: 'opt',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['opt ${1:Describing text}', '\t$0', 'end'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Optional Path'
-				},
-				{
-					label: 'par',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: [
-						'par ${1:[Action 1]}',
-						'\t$0',
-						'and ${2:[Action 2]}',
-						'\t',
-						'and ${3:[Action 3]}',
-						'\t',
-						'end'
-					].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Parallel Actions'
-				},
-				{
-					label: 'rect',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['rect ${1:rgb(0, 255, 0)}', '\t$0', 'end'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Background Color'
-				},
-				{
-					label: 'subgraph',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['subgraph ${1:title}', '\t$0', 'end'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Subgraph'
-				},
-				{
-					label: 'class',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['class ${1:className} {', '\t$0', '}'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Class'
-				},
-				{
-					label: 'state',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['state ${1:stateName} {', '\t$0', '}'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'State'
-				},
-				{
-					label: 'note',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['note ${1:right of State1}', '\t$0', 'end note'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'State'
-				},
-				{
-					label: 'section',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['section ${1:Go to work}', '\t$0'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'User-journey Section'
-				},
-				{
-					label: 'element',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['element ${1:test_entity} {', '\t$0', '}'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Requirement Diagram Element'
-				},
-				{
-					label: 'options',
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: ['options', '{', '    $0', '}', 'end'].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: 'Git Graph Options'
-				},
-				...requirementDiagrams.map((requirementDiagramType) => ({
-					label: requirementDiagramType,
-					kind: monacoEditor.languages.CompletionItemKind.Snippet,
-					insertText: [
-						requirementDiagramType + ' ${1:test_req} {',
-						'\tid: 1',
-						'\ttext: the test text.',
-						'\trisk: high',
-						'\tverifyMethod: test',
-						'}'
-					].join('\n'),
-					insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet,
-					documentation: requirementDiagramType
-						.split(/(?=[A-Z])/)
-						.map((part) => part[0].toUpperCase() + part.slice(1))
-						.join(' ')
-				})),
-				...[
-					...new Set(
-						Object.values(keywords)
-							.map((diagramKeywords) =>
-								Object.entries(diagramKeywords)
-									.filter((keywordType) => keywordType[0] !== 'annotations')
-									.map((entry) => entry[1])
-							)
-							.flat(2)
-					)
-				].map((keyword) => ({
-					label: keyword,
-					kind: monacoEditor.languages.CompletionItemKind.Keyword,
-					insertText: keyword
-				}))
-			];
-			return { suggestions: suggestions };
-		}
-	});
-
-	monacoEditor.languages.setLanguageConfiguration('mermaid', {
-		autoClosingPairs: [
-			{
-				open: '(',
-				close: ')'
-			},
-			{
-				open: '{',
-				close: '}'
-			},
-			{
-				open: '[',
-				close: ']'
-			}
-		],
-		brackets: [
-			['(', ')'],
-			['{', '}'],
-			['[', ']']
-		]
-	});
-};

src/lib/components/history/history.svelte

@@ -1,18 +1,21 @@
 <script lang="ts">
 	import Card from '$lib/components/card/card.svelte';
-	import { codeStore, getStateString } from '$lib/util/state';
+	import { inputStateStore, getStateString } from '$lib/util/state';
 	import {
 		addHistoryEntry,
 		historyModeStore,
 		clearHistoryData,
 		getPreviousState,
 		historyStore,
-		loaderHistoryStore
+		loaderHistoryStore,
+		restoreHistory
 	} from './history';
 	import { notify, prompt } from '$lib/util/notify';
 	import { onMount } from 'svelte';
+	import { get } from 'svelte/store';
 	import moment from 'moment';
 	import type { HistoryType, State, Tab } from '$lib/types';
+	import { logEvent } from '$lib/util/stats';
 
 	const HISTORY_SAVE_INTERVAL = 60000;
 
@@ -32,12 +35,45 @@
 		}
 	];
 
+	const downloadHistory = () => {
+		const data = get(historyStore);
+		const blob = new Blob([JSON.stringify(data)], { type: 'application/json' });
+		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.click();
+		URL.revokeObjectURL(url);
+		logEvent('history', {
+			action: 'download'
+		});
+	};
+
+	const uploadHistory = () => {
+		const input = document.createElement('input');
+		input.type = 'file';
+		input.accept = 'application/json';
+		input.addEventListener('change', ({ target }: Event) => {
+			const file = (<HTMLInputElement>target).files[0];
+			if (!file) {
+				return;
+			}
+			const reader = new FileReader();
+			reader.onload = (e) => {
+				const data = JSON.parse(e.target.result as string);
+				restoreHistory(data);
+			};
+			reader.readAsText(file);
+		});
+		input.click();
+	};
+
 	const saveHistory = (auto = false) => {
 		const currentState: string = getStateString();
 		const previousState: string = getPreviousState(auto);
 		if (previousState !== currentState) {
 			addHistoryEntry({
-				state: $codeStore,
+				state: $inputStateStore,
 				time: Date.now(),
 				type: auto ? 'auto' : 'manual'
 			});
@@ -46,15 +82,15 @@
 		}
 	};
 
-	const clearHistory = (date?: number): void => {
+	const clearHistory = (id?: string): void => {
-		if (!date && !prompt('Clear all saved items?')) {
+		if (!id && !prompt('Clear all saved items?')) {
 			return;
 		}
-		clearHistoryData(date);
+		clearHistoryData(id);
 	};
 
-	const restoreHistory = (state: State): void => {
+	const restoreHistoryItem = (state: State): void => {
-		codeStore.set({ ...state, updateEditor: true, updateDiagram: true });
+		inputStateStore.set({ ...state, updateDiagram: true });
 	};
 
 	const relativeTime = (time: number) => {
@@ -88,6 +124,19 @@
 
 <Card on:select={tabSelectHandler} bind:isOpen {tabs} title="History">
 	<div slot="actions">
+		<button
+			id="uploadHistory"
+			class="btn btn-xs btn-secondary w-12"
+			on:click|stopPropagation={() => uploadHistory()}
+			title="Upload history"><i class="fa fa-upload" /></button>
+		{#if $historyStore.length > 0}
+			<button
+				id="downloadHistory"
+				class="btn btn-xs btn-secondary w-12"
+				on:click|stopPropagation={() => downloadHistory()}
+				title="Download history"><i class="fa fa-download" /></button>
+		{/if}
+		|
 		<button
 			id="saveHistory"
 			class="btn btn-xs btn-success w-12"
@@ -103,7 +152,7 @@
 	</div>
 	<ul class="p-2 space-y-2 overflow-auto h-56" id="historyList">
 		{#if $historyStore.length > 0}
-			{#each $historyStore as { state, time, name, url, type }}
+			{#each $historyStore as { id, state, time, name, url, type }}
 				<li class="rounded p-2 shadow flex-col">
 					<div class="flex">
 						<div class="flex-1">
@@ -121,10 +170,10 @@
 							</div>
 						</div>
 						<div class="flex gap-2 content-center">
-							<button class="btn btn-success" on:click={() => restoreHistory(state)}
+							<button class="btn btn-success" on:click={() => restoreHistoryItem(state)}
 								><i class="fas fa-undo mr-1" />Restore</button>
 							{#if type !== 'loader'}
-								<button class="btn btn-error" on:click={() => clearHistory(time)}
+								<button class="btn btn-error" on:click={() => clearHistory(id)}
 									><i class="fas fa-trash-alt mr-1" />Delete</button>
 							{/if}
 						</div>

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

@@ -0,0 +1,120 @@
+import type { HistoryEntry } from '$lib/types';
+import { describe, it, expect } from 'vitest';
+import {
+	addHistoryEntry,
+	injectHistoryIDs,
+	clearHistoryData,
+	historyModeStore,
+	historyStore
+} from './history';
+import { defaultState } from '../../util/state';
+import { get } from 'svelte/store';
+
+describe('history', () => {
+	it('should handle saving individual history entry', () => {
+		expect(window.localStorage.getItem('manualHistoryStore')).toBe('[]');
+		expect(window.localStorage.getItem('autoHistoryStore')).toBe('[]');
+
+		addHistoryEntry({
+			state: defaultState,
+			time: 12345,
+			type: 'manual'
+		});
+
+		const [manualEntry]: HistoryEntry[] = JSON.parse(
+			window.localStorage.getItem('manualHistoryStore')
+		);
+
+		expect(manualEntry.time).toBe(12345);
+		expect(manualEntry.type).toBe('manual');
+		expect(manualEntry.name).not.toBeNull();
+		expect(manualEntry.state).not.toBeNull();
+
+		addHistoryEntry({
+			state: defaultState,
+			time: 54321,
+			type: 'auto'
+		});
+
+		const [autoEntry]: HistoryEntry[] = JSON.parse(window.localStorage.getItem('autoHistoryStore'));
+
+		expect(autoEntry.time).toBe(54321);
+		expect(autoEntry.type).toBe('auto');
+		expect(autoEntry.name).not.toBeNull();
+		expect(autoEntry.state).not.toBeNull();
+
+		historyModeStore.set('manual');
+		clearHistoryData();
+		historyModeStore.set('auto');
+		clearHistoryData();
+		expect(window.localStorage.getItem('manualHistoryStore')).toBe('[]');
+		expect(window.localStorage.getItem('autoHistoryStore')).toBe('[]');
+	});
+
+	it('should clear history entries', () => {
+		addHistoryEntry({
+			state: defaultState,
+			time: 12345,
+			type: 'manual'
+		});
+		addHistoryEntry({
+			state: { ...defaultState, code: 'graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)' },
+			time: 123456,
+			type: 'manual'
+		});
+
+		historyModeStore.set('manual');
+		const store: HistoryEntry[] = get(historyStore);
+		expect(store.length).toBe(2);
+		clearHistoryData(store[1].id);
+		expect(get(historyStore).length).toBe(1);
+		clearHistoryData();
+		expect(get(historyStore).length).toBe(0);
+
+		historyModeStore.set('auto');
+		addHistoryEntry({
+			state: defaultState,
+			time: 54321,
+			type: 'auto'
+		});
+		addHistoryEntry({
+			state: { ...defaultState, code: 'graph TD\\n    A[Christmas] -->|Get money| B(Go shopping)' },
+			time: 654321,
+			type: 'auto'
+		});
+		expect(get(historyStore).length).toBe(2);
+		clearHistoryData();
+		expect(get(historyStore).length).toBe(0);
+		// Test calling when history is empty
+		clearHistoryData();
+		expect(get(historyStore).length).toBe(0);
+	});
+});
+
+describe('history migration', () => {
+	it('should inject history IDs as migration', () => {
+		window.localStorage.setItem(
+			'manualHistoryStore',
+			'[{"state":{"code":"graph TD\\n    A[Halloween] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"manual","name":"hollow-art"},{"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":"helpful-ocean"}]'
+		);
+		window.localStorage.setItem(
+			'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(
+			window.localStorage.getItem('manualHistoryStore')
+		);
+		let autoHistoryStore: HistoryEntry[] = JSON.parse(
+			window.localStorage.getItem('autoHistoryStore')
+		);
+		expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
+		expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
+
+		injectHistoryIDs();
+
+		manualHistoryStore = JSON.parse(window.localStorage.getItem('manualHistoryStore'));
+		autoHistoryStore = JSON.parse(window.localStorage.getItem('autoHistoryStore'));
+		expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
+		expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
+	});
+});

src/lib/components/history/history.ts

@@ -1,8 +1,10 @@
 import { derived, writable, get } from 'svelte/store';
 import type { Readable, Writable } from 'svelte/store';
-import { persist, localStorage } from '@macfja/svelte-persistent-store';
+import { persist, localStorage } from '$lib/util/persist';
 import { generateSlug } from 'random-word-slugs';
-import type { HistoryEntry, HistoryType } from '$lib/types';
+import type { HistoryEntry, HistoryType, Optional } from '$lib/types';
+import { v4 as uuidV4 } from 'uuid';
+import { logEvent } from '$lib/util/stats';
 
 const MAX_AUTO_HISTORY_LENGTH = 30;
 
@@ -41,28 +43,39 @@ export const historyStore: Readable<HistoryEntry[]> = derived(
 	}
 );
 
-export const addHistoryEntry = (entry: HistoryEntry): void => {
+export const addHistoryEntry = (entryToAdd: Optional<HistoryEntry, 'id'>): void => {
+	const entry: HistoryEntry = {
+		...entryToAdd,
+		id: uuidV4()
+	};
+
 	if (entry.type === 'loader') {
 		loaderHistoryStore.update((entries) => [entry, ...entries]);
 		return;
 	}
-	entry.name = generateSlug(2);
+
-	if (entry.type !== 'auto') {
+	if (!entry.name) {
+		entry.name = generateSlug(2);
+	}
+
+	if (entry.type === 'auto') {
+		autoHistoryStore.update((entries) => {
+			if (entries.length >= MAX_AUTO_HISTORY_LENGTH) {
+				entries = entries.slice(0, MAX_AUTO_HISTORY_LENGTH - 1);
+			}
+			return [entry, ...entries];
+		});
+	} else if (entry.type === 'manual') {
 		manualHistoryStore.update((entries) => [entry, ...entries]);
-		return;
+		logEvent('history', { action: 'save' });
 	}
-	autoHistoryStore.update((entries) => {
-		if (entries.length === MAX_AUTO_HISTORY_LENGTH) {
-			entries.pop();
-		}
-		return [entry, ...entries];
-	});
 };
 
-export const clearHistoryData = (time?: number): void => {
+export const clearHistoryData = (idToClear?: string): void => {
 	(get(historyModeStore) === 'auto' ? autoHistoryStore : manualHistoryStore).update((entries) => {
 		if (get(historyModeStore) !== 'loader') {
-			entries = entries.filter((entry) => time && entry.time != time);
+			entries = entries.filter(({ id }) => idToClear && id != idToClear);
+			logEvent('history', { action: 'clear', type: idToClear ? 'single' : 'all' });
 		}
 		return entries;
 	});
@@ -75,3 +88,54 @@ export const getPreviousState = (auto: boolean): string => {
 	}
 	return '';
 };
+
+export const restoreHistory = (data: HistoryEntry[]) => {
+	const entries = data.filter(validateEntry);
+	const invalidEntryCount = data.length - entries.length;
+	if (invalidEntryCount > 0) {
+		console.error(`${invalidEntryCount} invalid history entries were removed.`);
+		console.error(data);
+	}
+	if (entries.length > 0) {
+		let entryCount = 0;
+		(entries[0].type === 'auto' ? autoHistoryStore : manualHistoryStore).update((existing) => {
+			const existingIDs = new Set(existing.map(({ id }) => id));
+			const newEntries = entries.filter(({ id }) => !existingIDs.has(id));
+			entryCount = newEntries.length;
+			const combined = [...existing, ...newEntries];
+			combined.sort((a, b) => b.time - a.time);
+			return combined;
+		});
+
+		alert(
+			`${entryCount} entries restored. ${invalidEntryCount} invalid, ${
+				entries.length - entryCount
+			} duplicates.`
+		);
+		logEvent('history', {
+			action: 'restore',
+			success: entryCount,
+			invalid: invalidEntryCount,
+			duplicates: entries.length - entryCount
+		});
+	} else {
+		alert('No valid entries found.');
+	}
+};
+
+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 => {
+	return entry.type && entry.state && entry.time && true;
+};

src/lib/components/preset.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
 	import { updateCode } from '$lib/util/state';
 	import Card from '$lib/components/card/card.svelte';
+	import { logEvent } from '$lib/util/stats';
 
 	const samples = {
 		'Flow Chart': `graph TD
@@ -79,11 +80,27 @@
     section Go home
       Go downstairs: 5: Me
       Sit down: 3: Me
-      `
+      `,
+		'Git Graph': `    gitGraph
+      commit
+      commit
+      branch develop
+      checkout develop
+      commit
+      commit
+      checkout main
+      merge develop
+      commit
+      commit
+`
 	};
 
 	const loadSampleDiagram = (diagramType: string): void => {
-		updateCode(samples[diagramType], true, true);
+		updateCode(samples[diagramType], {
+			updateDiagram: true,
+			resetPanZoom: true
+		});
+		void logEvent('loadSampleDiagram', { diagramType });
 	};
 </script>
 

src/lib/components/view.svelte

@@ -1,9 +1,10 @@
 <script lang="ts">
-	import { errorStore } from '$lib/util/error';
+	import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state';
-
-	import { codeStore } from '$lib/util/state';
 	import { onMount } from 'svelte';
 	import mermaid from 'mermaid';
+	import panzoom from 'svg-pan-zoom';
+	import type { State } from '$lib/types';
+	import { logEvent } from '$lib/util/stats';
 
 	let code = '';
 	let config = '';
@@ -11,62 +12,123 @@
 	let view: HTMLDivElement;
 	let error = false;
 	let outOfSync = false;
+	let hide = false;
 	let manualUpdate = true;
+	let panZoomEnabled = $stateStore.panZoom;
+	let pzoom: SvgPanZoom.Instance;
+	let debounce: number;
+
+	const handlePanZoomChange = () => {
+		const pan = pzoom.getPan();
+		const zoom = pzoom.getZoom();
+		clearTimeout(debounce);
+		debounce = window.setTimeout(() => {
+			updateCodeStore({ pan, zoom });
+			void logEvent('panZoom');
+		}, 200);
+	};
+
+	const handlePanZoom = (state: State) => {
+		if (!state.panZoom) {
+			return;
+		}
+		hide = true;
+		pzoom?.destroy();
+		pzoom = undefined;
+		Promise.resolve().then(() => {
+			const graphDiv = document.getElementById('graph-div');
+			pzoom = panzoom(graphDiv, {
+				onPan: handlePanZoomChange,
+				onZoom: handlePanZoomChange,
+				controlIconsEnabled: true,
+				fit: true,
+				center: true
+			});
+			const { pan, zoom } = state;
+			if (pan !== undefined && zoom !== undefined && Number.isFinite(zoom)) {
+				pzoom.zoom(zoom);
+				pzoom.pan(pan);
+			}
+			hide = false;
+		});
+	};
+
 	onMount(() => {
-		codeStore.subscribe((state) => {
+		stateStore.subscribe((state) => {
+			if (state.error !== undefined) {
+				error = true;
+				return;
+			}
+			error = false;
 			try {
 				if (container && state && (state.updateDiagram || state.autoSync)) {
 					if (!state.autoSync) {
-						$codeStore.updateDiagram = false;
+						$inputStateStore.updateDiagram = false;
 					}
 					outOfSync = false;
 					manualUpdate = true;
-					if (code === state.code && config === state.mermaid) {
+					if (code === state.code && config === state.mermaid && panZoomEnabled === state.panZoom) {
-						// Do not render if there is no change in Code/Config
+						// Do not render if there is no change in Code/Config/PanZoom
 						return;
 					}
 					code = state.code;
 					config = state.mermaid;
+					panZoomEnabled = state.panZoom;
 					const scroll = view.parentElement.scrollTop;
 					delete container.dataset.processed;
 					mermaid.initialize(Object.assign({}, JSON.parse(state.mermaid)));
 					mermaid.render('graph-div', code, (svgCode) => {
-						container.innerHTML = svgCode;
+						if (svgCode.length > 0) {
+							handlePanZoom(state);
+							container.innerHTML = svgCode;
+							const graphDiv = document.getElementById('graph-div');
+							graphDiv.setAttribute('height', '100%');
+							graphDiv.style.maxWidth = '100%';
+						}
 					});
 					view.parentElement.scrollTop = scroll;
 					error = false;
 				} else if (manualUpdate) {
 					manualUpdate = false;
-				} else {
+				} else if (code !== state.code || config !== state.mermaid) {
 					outOfSync = true;
 				}
 			} catch (e) {
-				console.log('view fail', e);
+				console.error('view fail', e);
 				error = true;
 			}
 		});
-		errorStore.subscribe((err) => {
+		window.addEventListener('resize', () => {
-			if (typeof err === 'undefined') {
+			if ($stateStore.panZoom && pzoom) {
-				error = false;
+				pzoom.resize();
-			} else {
-				error = true;
-				console.log('Error: ', err);
 			}
 		});
 	});
 </script>
 
-<div id="view" bind:this={view} class="p-2" class:error class:outOfSync>
+{#if error && $stateStore.error instanceof Error}
-	<div id="container" bind:this={container} class="flex-1 overflow-auto" />
+	<div class="p-2 text-red-600" id="errorContainer">{$stateStore.error}</div>
+{/if}
+
+<div id="view" bind:this={view} class="p-2 h-full" class:error class:outOfSync>
+	<div id="container" bind:this={container} class="h-full overflow-auto" class:hide />
 </div>
 
 <style>
 	#view {
-		border: 1px solor darkred;
 		flex: 1;
 	}
+
+	#container {
+		transition: visibility 0.3s;
+	}
+
 	.error,
 	.outOfSync {
 		opacity: 0.5;
 	}
+
+	.hide {
+		visibility: hidden;
+	}
 </style>

src/lib/types.d.ts

@@ -6,11 +6,14 @@ export interface Locals {
 	userid: string;
 }
 
-export interface EditorUpdateEvent {
+export interface MarkerData {
-	text: string;
+	severity: number;
-}
+	message: string;
-export interface EditorEvents {
+	source?: string;
-	update: EditorUpdateEvent;
+	startLineNumber: number;
+	startColumn: number;
+	endLineNumber: number;
+	endColumn: number;
 }
 
 export interface TabEvents {
@@ -26,12 +29,22 @@ export interface Tab {
 export interface State {
 	code: string;
 	mermaid: string;
-	updateEditor: boolean;
 	updateDiagram: boolean;
 	autoSync: boolean;
+	editorMode?: EditorMode;
+	panZoom?: boolean;
+	pan?: { x: number; y: number };
+	zoom?: number;
 	loader?: LoaderConfig;
 }
 
+export interface ValidatedState extends State {
+	editorMode: EditorMode;
+	error: unknown;
+	errorMarkers: MarkerData[];
+	serialized: string;
+}
+
 export interface GistLoaderConfig {
 	url: string;
 }
@@ -49,12 +62,25 @@ export interface LoaderConfig {
 	config: GistLoaderConfig | FileLoaderConfig;
 }
 export type HistoryType = 'auto' | 'manual' | 'loader';
-export interface HistoryEntry {
+export type HistoryEntry = { id: string; state: State; time: number; url?: string } & (
-	state: State;
+	| {
-	time: number;
+			type: 'loader';
-	name?: string;
+			name: string;
-	type: HistoryType;
+	  }
-	url?: string;
+	| {
+			type: HistoryType;
+			name?: string;
+	  }
+);
+
+export interface DocConfig {
+	[key: string]: {
+		code: string;
+		config?: string;
+	};
 }
 
-type Loader = (url: string) => Promise<State>;
+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>;

src/lib/util/env.ts

@@ -1 +1,5 @@
-export const rendererUrl = import.meta.env.MERMAID_RENDERER_URL ?? 'https://mermaid.ink';
+export const rendererUrl: string =
+	(import.meta.env.MERMAID_RENDERER_URL as string) ?? 'https://mermaid.ink';
+export const krokiRendererUrl: string =
+	(import.meta.env.MERMAID_KROKI_RENDERER_URL as string) ?? 'https://kroki.io';
+export const debounceEnabled: boolean = import.meta.env.MERMAID_DISABLE_DEBOUNCE !== 'true';

src/lib/util/error.ts

@@ -1,3 +0,0 @@
-import { writable } from 'svelte/store';
-
-export const errorStore = writable(undefined);

src/lib/util/fileLoaders/gist.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-explicit-any */
@@ -43,6 +44,7 @@ const getGistData = async (gistURL: string): Promise<GistData> => {
 		}
 		const currentItem = history[0];
 		return {
+			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 			url: `${html_url}/${currentItem.version}`,
 			code,
 			config,

src/lib/util/fileLoaders/loader.ts

@@ -7,7 +7,7 @@ const loaders: Record<string, Loader> = {
 
 export const loadDataFromUrl = async (): Promise<void> => {
 	const searchParams = new URLSearchParams(window.location.search);
-	let state: State = defaultState;
+	let state: Partial<State> = defaultState;
 	let code: string, config: string;
 	let loaded = false;
 	const codeURL: string = searchParams.get('code');
@@ -23,6 +23,9 @@ export const loadDataFromUrl = async (): Promise<void> => {
 		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 {
@@ -45,14 +48,12 @@ export const loadDataFromUrl = async (): Promise<void> => {
 					configURL
 				}
 			}
-		} as State;
+		};
 	}
 	loaded &&
 		updateCodeStore({
 			...state,
 			autoSync: true,
-			updateDiagram: true,
+			updateDiagram: true
-			updateEditor: true
 		});
-	// window.location.search = '';
 };

src/lib/util/migrations.test.ts

@@ -0,0 +1,34 @@
+import type { HistoryEntry } from '$lib/types';
+import { describe, it, expect, beforeEach } from 'vitest';
+
+describe('migrations', () => {
+	beforeEach(() => {
+		window.localStorage.setItem(
+			'manualHistoryStore',
+			'[{"state":{"code":"graph TD\\n    A[Halloween] -->|Get money| B(Go shopping)","mermaid":"{\\n  \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"manual","name":"hollow-art"},{"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":"helpful-ocean"}]'
+		);
+		window.localStorage.setItem(
+			'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"}]'
+		);
+	});
+
+	it('should migrate from v0 to v1', async () => {
+		const { applyMigrations } = await import('./migrations');
+		let manualHistoryStore: HistoryEntry[] = JSON.parse(
+			window.localStorage.getItem('manualHistoryStore')
+		);
+		let autoHistoryStore: HistoryEntry[] = JSON.parse(
+			window.localStorage.getItem('autoHistoryStore')
+		);
+		expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
+		expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
+
+		applyMigrations();
+
+		manualHistoryStore = JSON.parse(window.localStorage.getItem('manualHistoryStore'));
+		autoHistoryStore = JSON.parse(window.localStorage.getItem('autoHistoryStore'));
+		expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
+		expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
+	});
+});

src/lib/util/migrations.ts

@@ -0,0 +1,35 @@
+import { writable, get, type Writable } from 'svelte/store';
+import { persist, localStorage } from '$lib/util/persist';
+import { injectHistoryIDs } from '$lib/components/history/history';
+import { logEvent } from './stats';
+
+interface MigrationState {
+	version: number;
+}
+
+const migrations: { [key: string]: () => void } = {
+	injectHistoryIDs
+};
+
+const migrationStore: Writable<MigrationState> = persist(
+	writable({ version: -1 }),
+	localStorage(),
+	'migrations'
+);
+
+export const applyMigrations = (): void => {
+	const { version }: MigrationState = get(migrationStore);
+	const allMigrations = Object.entries(migrations);
+	if (version === allMigrations.length - 1) {
+		return;
+	}
+	console.log(`Current migration version: v${version}. Migrating to v${allMigrations.length - 1}.`);
+	for (let i = version + 1; i < allMigrations.length; i++) {
+		const [key, fn] = allMigrations[i];
+		console.log(`Applying migration ${i}: ${key}.`);
+		fn();
+		logEvent('migration', { key });
+		migrationStore.set({ version: i });
+	}
+	logEvent('migration', { status: 'complete', from: version, to: allMigrations.length - 1 });
+};

src/lib/util/persist.ts

@@ -0,0 +1,265 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+// Copied from https://github.com/MacFJA/svelte-persistent-store
+// # The MIT License (MIT)
+
+// Copyright (c) 2021 [MacFJA](https://github.com/MacFJA)
+
+// > Permission is hereby granted, free of charge, to any person obtaining a copy
+// > of this software and associated documentation files (the "Software"), to deal
+// > in the Software without restriction, including without limitation the rights
+// > to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// > copies of the Software, and to permit persons to whom the Software is
+// > furnished to do so, subject to the following conditions:
+// >
+// > The above copyright notice and this permission notice shall be included in
+// > all copies or substantial portions of the Software.
+// >
+// > THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// > IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// > FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// > AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// > LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// > OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// > THE SOFTWARE.
+
+import ESSerializer from 'esserializer';
+import type { Writable } from 'svelte/store';
+
+/**
+ * Disabled warnings about missing/unavailable storages
+ */
+export function disableWarnings(): void {
+	noWarnings = true;
+}
+/**
+ * If set to true, no warning will be emitted if the requested Storage is not found.
+ * This option can be useful when the lib is used on a server.
+ */
+let noWarnings = false;
+/**
+ * List of storages where the warning have already been displayed.
+ */
+const alreadyWarnFor: Array<string> = [];
+
+/**
+ * Add a log to indicate that the requested Storage have not been found.
+ * @param {string} storageName
+ */
+const warnStorageNotFound = (storageName) => {
+	const isProduction = typeof process !== 'undefined' && process.env?.NODE_ENV === 'production';
+
+	if (!noWarnings && alreadyWarnFor.indexOf(storageName) === -1 && !isProduction) {
+		let message = `Unable to find the ${storageName}. No data will be persisted.`;
+		if (typeof window === 'undefined') {
+			message +=
+				'\n' +
+				'Are you running on a server? Most of storages are not available while running on a server.';
+		}
+		console.warn(message);
+		alreadyWarnFor.push(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 => {
+	// @TODO: to remove in the next major
+	if (value === 'undefined') {
+		return undefined;
+	}
+
+	if (value !== null && value !== undefined) {
+		try {
+			return ESSerializer.deserialize(value, allowedClasses);
+		} catch (e) {
+			// Do nothing
+			// use the value "as is"
+		}
+		try {
+			return JSON.parse(value);
+		} catch (e) {
+			// Do nothing
+			// use the value "as is"
+		}
+	}
+	return value;
+};
+
+/**
+ * A store that keep it's value in time.
+ */
+export interface PersistentStore<T> extends Writable<T> {
+	/**
+	 * Delete the store value from the persistent storage
+	 */
+	delete(): void;
+}
+
+/**
+ * Storage interface
+ */
+export interface StorageInterface<T> {
+	/**
+	 * Get a value from the storage.
+	 *
+	 * If the value doesn't exists in the storage, `null` should be returned.
+	 * This method MUST be synchronous.
+	 * @param key The key/name of the value to retrieve
+	 */
+	getValue(key: string): T | null;
+
+	/**
+	 * Save a value in the storage.
+	 * @param key The key/name of the value to save
+	 * @param value The value to save
+	 */
+	setValue(key: string, value: T): void;
+
+	/**
+	 * Remove a value from the storage
+	 * @param key The key/name of the value to remove
+	 */
+	deleteValue(key: string): void;
+}
+
+export interface SelfUpdateStorageInterface<T> extends StorageInterface<T> {
+	/**
+	 * Add a listener to the storage values changes
+	 * @param {string} key The key to listen
+	 * @param {(newValue: T) => void} listener The listener callback function
+	 */
+	addListener(key: string, listener: (newValue: T) => void): void;
+	/**
+	 * Remove a listener from the storage values changes
+	 * @param {string} key The key that was listened
+	 * @param {(newValue: T) => void} listener The listener callback function to remove
+	 */
+	removeListener(key: string, listener: (newValue: T) => void): void;
+}
+
+/**
+ * Make a store persistent
+ * @param {Writable<*>} store The store to enhance
+ * @param {StorageInterface} storage The storage to use
+ * @param {string} key The name of the data key
+ */
+export function persist<T>(
+	store: Writable<T>,
+	storage: StorageInterface<T>,
+	key: string
+): PersistentStore<T> {
+	const initialValue = storage.getValue(key);
+
+	if (null !== initialValue) {
+		store.set(initialValue);
+	}
+
+	if ((storage as SelfUpdateStorageInterface<T>).addListener) {
+		(storage as SelfUpdateStorageInterface<T>).addListener(key, (newValue) => {
+			store.set(newValue);
+		});
+	}
+
+	store.subscribe((value) => {
+		storage.setValue(key, value);
+	});
+
+	return {
+		...store,
+		delete() {
+			storage.deleteValue(key);
+		}
+	};
+}
+
+function getBrowserStorage(
+	browserStorage: Storage,
+	listenExternalChanges = false
+): SelfUpdateStorageInterface<any> {
+	const listeners: Array<{ key: string; listener: (newValue: any) => void }> = [];
+	const listenerFunction = (event: StorageEvent) => {
+		const eventKey = event.key;
+		if (event.storageArea === browserStorage) {
+			listeners
+				.filter(({ key }) => key === eventKey)
+				.forEach(({ listener }) => {
+					listener(deserialize(event.newValue));
+				});
+		}
+	};
+	const connect = () => {
+		if (listenExternalChanges && typeof window !== 'undefined' && window?.addEventListener) {
+			window.addEventListener('storage', listenerFunction);
+		}
+	};
+	const disconnect = () => {
+		if (listenExternalChanges && typeof window !== 'undefined' && window?.removeEventListener) {
+			window.removeEventListener('storage', listenerFunction);
+		}
+	};
+
+	return {
+		addListener(key: string, listener: (newValue: any) => void) {
+			listeners.push({ key, listener });
+			if (listeners.length === 1) {
+				connect();
+			}
+		},
+		removeListener(key: string, listener: (newValue: any) => void) {
+			const index = listeners.indexOf({ key, listener });
+			if (index !== -1) {
+				listeners.splice(index, 1);
+			}
+			if (listeners.length === 0) {
+				disconnect();
+			}
+		},
+		getValue(key: string): any | null {
+			const value = browserStorage.getItem(key);
+			return deserialize(value);
+		},
+		deleteValue(key: string) {
+			browserStorage.removeItem(key);
+		},
+		setValue(key: string, value: any) {
+			browserStorage.setItem(key, serialize(value));
+		}
+	};
+}
+
+/**
+ * Storage implementation that use the browser local storage
+ * @param {boolean} 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) {
+		return getBrowserStorage(window.localStorage, listenExternalChanges);
+	}
+	warnStorageNotFound('window.localStorage');
+	return noopStorage();
+}
+
+/**
+ * Storage implementation that do nothing
+ */
+export function noopStorage(): StorageInterface<any> {
+	return {
+		getValue(): null {
+			return null;
+		},
+		deleteValue() {
+			// Do nothing
+		},
+		setValue() {
+			// Do nothing
+		}
+	};
+}

src/lib/util/serde.test.ts

@@ -0,0 +1,40 @@
+import { describe, expect, it } from 'vitest';
+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 serialized = serializeState(state, serde);
+		const deserialized = deserializeState(serialized);
+		expect(deserialized).to.deep.equal(state);
+		return serialized;
+	};
+
+	it('should serialize and deserialize with default serde', () => {
+		expect(verifySerde(defaultState)).toMatchInlineSnapshot(
+			'"pako:eNpVj81qw0AMhF9F6NRC_AI-BGK7zSXQQHLz5iBsObuk-8Naphjb7551fEl1EjPfiNGEjW8Zc7xHChqulXKQ5lCXOppeLPU3yLL9fGQB6x2PMxQfRw-99iEYd__c-GKFoJxOK8Yg2rjHslnlK__jeIaqPlEQH27vzvXPz_BVm7NO5_87OnJKfdcd5R1lDUUoKb4Q3KHlaMm0qfq0KgpFs2WFeVpb7mj4FYXKLQmlQfxldA3mEgfe4RBaEq4MpaftJi5PNtJU8w"'
+		);
+	});
+
+	it('should serialize and deserialize with base64 serde', () => {
+		expect(verifySerde(defaultState, 'base64')).toMatchInlineSnapshot(
+			'"base64:eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cbiAgIiwibWVybWFpZCI6IntcbiAgXCJ0aGVtZVwiOiBcImRlZmF1bHRcIlxufSIsImF1dG9TeW5jIjp0cnVlLCJ1cGRhdGVEaWFncmFtIjp0cnVlfQ"'
+		);
+	});
+
+	it('should serialize and deserialize with pako serde', () => {
+		expect(verifySerde(defaultState, 'pako')).toMatchInlineSnapshot(
+			'"pako:eNpVj81qw0AMhF9F6NRC_AI-BGK7zSXQQHLz5iBsObuk-8Naphjb7551fEl1EjPfiNGEjW8Zc7xHChqulXKQ5lCXOppeLPU3yLL9fGQB6x2PMxQfRw-99iEYd__c-GKFoJxOK8Yg2rjHslnlK__jeIaqPlEQH27vzvXPz_BVm7NO5_87OnJKfdcd5R1lDUUoKb4Q3KHlaMm0qfq0KgpFs2WFeVpb7mj4FYXKLQmlQfxldA3mEgfe4RBaEq4MpaftJi5PNtJU8w"'
+		);
+	});
+
+	it('should throw error for unrecognized serde', () => {
+		// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+		// @ts-expect-error
+		expect(() => serializeState(defaultState, 'unknown')).toThrowError(
+			'Unknown serde type: unknown'
+		);
+		expect(() => deserializeState('unknown:hello')).toThrowError('Unknown serde type: unknown');
+	});
+});

src/lib/util/serde.ts

@@ -0,0 +1,63 @@
+import { deflate, inflate } from 'pako';
+import { toUint8Array, fromUint8Array, toBase64, fromBase64 } from 'js-base64';
+import type { State } from '$lib/types';
+
+interface Serde {
+	serialize: (state: string) => string;
+	deserialize: (state: string) => string;
+}
+
+const base64Serde: Serde = {
+	serialize: (state: string): string => {
+		return toBase64(state, true);
+	},
+	deserialize: (state: string): string => {
+		return fromBase64(state);
+	}
+};
+
+export const pakoSerde: Serde = {
+	serialize: (state: string): string => {
+		const data = new TextEncoder().encode(state);
+		const compressed = deflate(data, { level: 9 });
+		return fromUint8Array(compressed, true);
+	},
+	deserialize: (state: string): string => {
+		const data = toUint8Array(state);
+		return inflate(data, { to: 'string' });
+	}
+};
+
+export type SerdeType = 'base64' | 'pako';
+
+const serdes: { [key in SerdeType]: Serde } = {
+	base64: base64Serde,
+	pako: pakoSerde
+};
+
+export const serializeState = (state: State, serde: SerdeType = 'pako'): string => {
+	if (serdes[serde] === undefined) {
+		throw new Error(`Unknown serde type: ${serde}`);
+	}
+	const json = JSON.stringify(state);
+	const serialized = serdes[serde].serialize(json);
+	return `${serde}:${serialized}`;
+};
+
+export const deserializeState = (state: string): State => {
+	let type: SerdeType, serialized: string;
+	if (state.includes(':')) {
+		let tempType: string;
+		[tempType, serialized] = state.split(':');
+		if (tempType in serdes) {
+			type = tempType as SerdeType;
+		} else {
+			throw new Error(`Unknown serde type: ${tempType}`);
+		}
+	} else {
+		type = 'base64';
+		serialized = state;
+	}
+	const json = serdes[type].deserialize(serialized);
+	return JSON.parse(json) as State;
+};

src/lib/util/state.ts

@@ -1,9 +1,12 @@
 import { writable, get, derived } from 'svelte/store';
-import type { Readable } from 'svelte/store';
+import { persist, localStorage } from './persist';
-import { toBase64, fromBase64 } from 'js-base64';
-import { persist, localStorage } from '@macfja/svelte-persistent-store';
-import type { State } from '$lib/types';
 import { saveStatistics } from './stats';
+import { serializeState, deserializeState } from './serde';
+import { cmdKey } from './util';
+import mermaid from 'mermaid';
+
+import type { Readable } from 'svelte/store';
+import type { MarkerData, State, ValidatedState } from '$lib/types';
 
 export const defaultState: State = {
 	code: `graph TD
@@ -20,7 +23,6 @@ export const defaultState: State = {
 		null,
 		2
 	),
-	updateEditor: false,
 	autoSync: true,
 	updateDiagram: true
 };
@@ -36,18 +38,52 @@ const urlParseFailedState = `graph TD
     G --> |"No :("| H(Try using the Timeline tab in History <br/>from same browser you used to create the diagram.)
     click D href "https://github.com/mermaid-js/mermaid-live-editor/issues/new?assignees=&labels=bug&template=bug_report.md&title=Broken%20link" "Raise issue"`;
 
-export const codeStore = persist(writable(defaultState), localStorage(), 'codeStore');
+// inputStateStore handles all updates and is shared externally when exporting via URL, History, etc.
-export const base64State: Readable<string> = derived([codeStore], ([code], set) => {
+export const inputStateStore = persist(writable(defaultState), localStorage(), 'codeStore');
-	set(toBase64(JSON.stringify(code), true));
+
+// All internal reads should be done via stateStore, but it should not be persisted/shared externally.
+export const stateStore: Readable<ValidatedState> = derived([inputStateStore], ([state]) => {
+	const processed: ValidatedState = {
+		...state,
+		serialized: '',
+		errorMarkers: [],
+		error: undefined,
+		editorMode: state.editorMode ?? 'code'
+	};
+
+	// No changes should be done to fields part of `state`.
+	try {
+		processed.serialized = serializeState(state);
+		mermaid.parse(state.code);
+		JSON.parse(state.mermaid);
+	} catch (e) {
+		processed.error = e;
+		console.error(e);
+		if (e.hash) {
+			try {
+				const marker: MarkerData = {
+					severity: 8, // Error
+					startLineNumber: e.hash.loc.first_line,
+					startColumn: e.hash.loc.first_column,
+					endLineNumber: e.hash.loc.last_line,
+					endColumn: (e.hash.loc.last_column as number) + 1,
+					message: e.str
+				};
+				processed.errorMarkers = [marker];
+			} catch (err) {
+				console.error('Error without line helper', err);
+			}
+		}
+	}
+	return processed;
 });
 
 export const loadState = (data: string): void => {
 	let state: State;
+	console.log(`Loading '${data}'`);
 	try {
-		const stateStr = fromBase64(data);
+		state = deserializeState(data);
-		console.log(`Trying to load state: ${stateStr}`);
+		const mermaidConfig: { [key: string]: string } =
-		state = JSON.parse(stateStr);
-		const mermaidConfig =
 			typeof state.mermaid === 'string' ? JSON.parse(state.mermaid) : state.mermaid;
 		if (
 			mermaidConfig.securityLevel &&
@@ -58,69 +94,80 @@ 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);
 	} catch (e) {
-		state = get(codeStore);
+		state = get(inputStateStore);
 		if (data) {
 			console.error('Init error', e);
 			state.code = urlParseFailedState;
+			state.mermaid = defaultState.mermaid;
 		}
 	}
-	updateCodeStore({ ...state, updateEditor: true });
+	updateCodeStore({ ...state });
 };
 
-export const updateCodeStore = (newState: State): void => {
+export const updateCodeStore = (newState: Partial<State>): void => {
-	codeStore.update((state) => {
+	inputStateStore.update((state) => {
+		// console.log({ newState, state });
 		return { ...state, ...newState };
 	});
 };
 
 let prompted = false;
-export const updateCode = (code: string, updateEditor: boolean, updateDiagram = false): void => {
+export const updateCode = (
+	code: string,
+	{
+		updateDiagram = false,
+		resetPanZoom = false
+	}: { updateDiagram?: boolean; resetPanZoom?: boolean } = {}
+): void => {
 	saveStatistics(code);
 	const lines = (code.match(/\n/g) || '').length + 1;
 
-	if (lines > 50 && !prompted && get(codeStore).autoSync) {
+	if (lines > 50 && !prompted && get(stateStore).autoSync) {
 		const turnOff = confirm(
-			'Long diagram detected. Turn off Auto Sync? Click the sync logo to manually sync.'
+			`Long diagram detected. Turn off Auto Sync? Use ${cmdKey} + Enter or click the sync logo to manually sync.`
 		);
 		prompted = true;
 		if (turnOff) {
 			updateCodeStore({
 				autoSync: false
-			} as State);
+			});
 		}
 	}
 
-	codeStore.update((state) => {
+	inputStateStore.update((state) => {
-		return { ...state, code, updateEditor, updateDiagram };
+		if (resetPanZoom) {
+			state.pan = undefined;
+			state.zoom = undefined;
+		}
+		return { ...state, code, updateDiagram };
 	});
 };
 
-export const updateConfig = (config: string, updateEditor: boolean): void => {
+export const updateConfig = (config: string): void => {
-	codeStore.update((state) => {
+	inputStateStore.update((state) => {
-		return { ...state, mermaid: config, updateEditor };
+		return { ...state, mermaid: config };
 	});
 };
 
 export const toggleDarkTheme = (dark: boolean): void => {
-	codeStore.update((state) => {
+	inputStateStore.update((state) => {
 		const config = JSON.parse(state.mermaid);
 		if (!config.theme || ['dark', 'default'].includes(config.theme)) {
 			config.theme = dark ? 'dark' : 'default';
 		}
 
-		return { ...state, mermaid: JSON.stringify(config, null, 2), updateEditor: true };
+		return { ...state, mermaid: JSON.stringify(config, null, 2) };
 	});
 };
 
 export const initURLSubscription = (): void => {
-	base64State.subscribe((state: string) => {
+	stateStore.subscribe(({ serialized }) => {
-		history.replaceState(undefined, undefined, `#${state}`);
+		history.replaceState(undefined, undefined, `#${serialized}`);
 	});
 };
 
 export const getStateString = (): string => {
-	return JSON.stringify(get(codeStore));
+	return JSON.stringify(get(inputStateStore));
 };

src/lib/util/stats.ts

@@ -1,4 +1,4 @@
-import { browser } from '$app/env';
+import { browser } from '$app/environment';
 import type { AnalyticsInstance } from 'analytics';
 
 export let analytics: AnalyticsInstance;
@@ -8,18 +8,28 @@ export const initAnalytics = async (): Promise<void> => {
 		try {
 			const { Analytics } = await import('analytics');
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-			const googleAnalytics = await import('@analytics/google-analytics');
+			const googleAnalytics = (await import('@analytics/google-analytics')).default;
+			const plausible = (await import('analytics-plugin-plausible')).default;
 			analytics = Analytics({
 				app: 'mermaid-live-editor',
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 				plugins: [
 					// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-					googleAnalytics.init({
+					googleAnalytics({
-						trackingId: 'UA-153180559-1'
+						measurementIds: ['UA-153180559-1']
+					}),
+					// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+					// @ts-ignore
+					plausible({
+						domain: 'mermaid.live',
+						hashMode: false,
+						trackLocalhost: false, // By default 'false'
+						apiHost: 'https://plausible.io'
 					})
 				]
 			});
-		} catch {
+		} catch (e) {
+			console.log(e);
 			console.info('Analytics blocked ;)');
 		}
 	}
@@ -33,17 +43,20 @@ const detectType = (text: string): string => {
 };
 
 // manual debounce
-let timeout;
+let timeout: number;
 export const saveStatistics = (graph: string): void => {
 	if (analytics) {
 		clearTimeout(timeout);
 		// Only save statistics after a 5 sec delay
-		timeout = setTimeout(function () {
+		timeout = window.setTimeout(() => {
 			const graphType = detectType(graph);
-			console.debug('ga:', 'send', 'event', 'render', graphType);
+			console.debug(`ga: send event: render ${graphType}`);
-			void analytics.track('render', {
+			void logEvent('render', { graphType });
-				graphType
-			});
 		}, 5000);
 	}
 };
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export const logEvent = async (name: string, data?: any): Promise<void> => {
+	await analytics?.track(name, data);
+};

src/lib/util/theme.ts

@@ -1,6 +1,7 @@
 import { writable } from 'svelte/store';
 import type { Writable } from 'svelte/store';
-import { persist, localStorage } from '@macfja/svelte-persistent-store';
+import { persist, localStorage } from '$lib/util/persist';
+import { logEvent } from './stats';
 
 export interface ThemeConfig {
 	isDark: boolean;
@@ -33,4 +34,5 @@ export const setTheme = (theme: string): void => {
 	const isDark = darkThemes.includes(theme);
 	console.log('Setting theme', theme);
 	themeStore.set({ theme, isDark });
+	void logEvent('themeChange', { theme, isDark });
 };

src/lib/util/util.ts

@@ -1,8 +1,8 @@
-import type { State } from '$lib/types';
 import { initURLSubscription, loadState, updateCodeStore } from './state';
 import { analytics, initAnalytics } from './stats';
 import { loadDataFromUrl } from './fileLoaders/loader';
 import { initLoading } from './loading';
+import { applyMigrations } from './migrations';
 
 export const loadStateFromURL = (): void => {
 	loadState(window.location.hash.slice(1));
@@ -11,10 +11,11 @@ export const loadStateFromURL = (): void => {
 export const syncDiagram = (): void => {
 	updateCodeStore({
 		updateDiagram: true
-	} as State);
+	});
 };
 
 export const initHandler = async (): Promise<void> => {
+	applyMigrations();
 	loadStateFromURL();
 	await initLoading('Loading Gist...', loadDataFromUrl().catch(console.error));
 	syncDiagram();
@@ -22,3 +23,6 @@ export const initHandler = async (): Promise<void> => {
 	await initAnalytics();
 	analytics?.page();
 };
+
+export const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
+export const cmdKey = isMac ? 'Cmd' : 'Ctrl';

src/routes/+layout.js

@@ -0,0 +1,3 @@
+export const prerender = true;
+export const csr = true;
+export const ssr = false;

src/routes/+layout.svelte

@@ -5,10 +5,14 @@
 	import { loadingStateStore } from '$lib/util/loading';
 	import { setTheme, themeStore } from '$lib/util/theme';
 	import { toggleDarkTheme } from '$lib/util/state';
+	import { initHandler } from '$lib/util/util';
 
 	// 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) => {
+			await initHandler();
+		});
 		if ('serviceWorker' in navigator) {
 			navigator.serviceWorker
 				.register(`${base}/service-worker.js`, {

src/routes/[fallback]/manifest.json.ts

@@ -1,2 +0,0 @@
-import { get as manifestGet } from '../manifest.json';
-export const get = manifestGet;

src/routes/edit.svelte

@@ -1,203 +0,0 @@
-<script lang="ts">
-	import Editor from '$lib/components/editor/editor.svelte';
-	import Navbar from '$lib/components/navbar.svelte';
-	import Preset from '$lib/components/preset.svelte';
-	import Actions from '$lib/components/actions.svelte';
-	import View from '$lib/components/view.svelte';
-	import Card from '$lib/components/card/card.svelte';
-	import History from '$lib/components/history/history.svelte';
-	import { updateCode, updateConfig, codeStore, base64State } from '$lib/util/state';
-	import { initHandler, syncDiagram } from '$lib/util/util';
-	import { errorStore } from '$lib/util/error';
-	import { onMount } from 'svelte';
-	import mermaid from 'mermaid';
-	import type monaco from 'monaco-editor';
-	import type { EditorUpdateEvent, State, Tab } from '$lib/types';
-	import { base } from '$app/paths';
-
-	base64State; // Weird fix for error > base64State is not defined. Treeshaking?
-	let selectedMode = 'code';
-	const languageMap = {
-		code: 'mermaid',
-		config: 'json'
-	};
-	let text = '';
-	let language: 'mermaid' | 'json' = 'mermaid';
-	let errorMarkers: monaco.editor.IMarkerData[] = [];
-	$: language = languageMap[selectedMode];
-	$: {
-		if (selectedMode === 'code') {
-			text = $codeStore.code;
-		} else {
-			text = $codeStore.mermaid;
-		}
-	}
-
-	codeStore.subscribe((state: State) => {
-		if (state.updateEditor) {
-			text = selectedMode === 'code' ? state.code : state.mermaid;
-		}
-	});
-	const tabSelectHandler = (message: CustomEvent<Tab>) => {
-		$codeStore.updateEditor = true;
-		selectedMode = message.detail.id;
-	};
-	const tabs: Tab[] = [
-		{
-			id: 'code',
-			title: 'Code',
-			icon: 'fas fa-code'
-		},
-		{
-			id: 'config',
-			title: 'Config',
-			icon: 'fas fa-cogs'
-		}
-	];
-
-	const handleCodeUpdate = (code: string): void => {
-		mermaid.parse(code);
-		updateCode(code, false);
-	};
-
-	const handleConfigUpdate = (config: string): void => {
-		JSON.parse(config);
-		updateConfig(config, false);
-	};
-
-	const updateHandler = (message: CustomEvent<EditorUpdateEvent>) => {
-		try {
-			if (selectedMode === 'code') {
-				handleCodeUpdate(message.detail.text);
-			} else {
-				handleConfigUpdate(message.detail.text);
-			}
-			errorStore.set(undefined);
-			errorMarkers = [];
-		} catch (e) {
-			errorStore.set(e);
-			if (e.hash) {
-				const marker: monaco.editor.IMarkerData = {
-					severity: 8, //Error
-					startLineNumber: e.hash.loc.first_line,
-					startColumn: e.hash.loc.first_column,
-					endLineNumber: e.hash.loc.last_line,
-					endColumn: e.hash.loc.last_column + 1,
-					message: e.str
-				};
-				errorMarkers.push(marker);
-				// Clear all previous errors before this error.
-				errorMarkers = errorMarkers.filter(
-					(m) => m.startLineNumber >= marker.startLineNumber && m.startColumn >= marker.startColumn
-				);
-			}
-			console.error(e);
-		}
-	};
-
-	const viewDiagram = () => {
-		window.open(`${base}/view#${$base64State}`, '_blank').focus();
-	};
-
-	onMount(async () => {
-		await initHandler();
-		const resizer = document.getElementById('resizeHandler');
-		const element = document.getElementById('editorPane');
-		const resize = (e) => {
-			const newWidth = e.pageX - element.getBoundingClientRect().left;
-			if (newWidth > 50) {
-				element.style.width = `${newWidth}px`;
-			}
-		};
-
-		const stopResize = () => {
-			window.removeEventListener('mousemove', resize);
-		};
-		resizer.addEventListener('mousedown', (e) => {
-			e.preventDefault();
-			window.addEventListener('mousemove', resize);
-			window.addEventListener('mouseup', stopResize);
-		});
-	});
-</script>
-
-<div class="h-full flex flex-col overflow-hidden">
-	<Navbar />
-	<div class="flex-1 flex overflow-hidden">
-		<div class="hidden md:flex flex-col" id="editorPane" style="width: 40%">
-			<Card on:select={tabSelectHandler} {tabs} isCloseable={false} title="Mermaid">
-				<div slot="actions">
-					<div class="flex flex-row items-center">
-						{#if !$codeStore.autoSync}
-							<button
-								class="btn btn-secondary btn-xs"
-								title="Sync Diagram"
-								data-cy="sync"
-								on:click={syncDiagram}><i class="fas fa-sync" /></button>
-						{/if}
-
-						<div class="form-control">
-							<label class="cursor-pointer label" for="autoSync">
-								<input
-									type="checkbox"
-									class="toggle toggle-primary mr-1"
-									id="autoSync"
-									bind:checked={$codeStore.autoSync} />
-								<span> Auto sync</span>
-							</label>
-						</div>
-					</div>
-				</div>
-
-				<Editor on:update={updateHandler} {language} bind:text {errorMarkers} />
-			</Card>
-
-			<div class="-mt-2">
-				<Preset />
-				<History />
-				<Actions />
-			</div>
-		</div>
-		<div id="resizeHandler" class="hidden md:block" />
-		<div class="flex-1 flex flex-col overflow-hidden">
-			<Card title="Diagram" isCloseable={false}>
-				<button
-					slot="actions"
-					class="btn btn-primary btn-xs shadow-lg"
-					title="View diagram in new page"
-					on:click|stopPropagation={() => viewDiagram()}><i class="far fa-eye mr-2" /> View</button>
-
-				<div class="flex-1 overflow-auto">
-					<View />
-				</div>
-			</Card>
-			<div class="md:hidden rounded shadow p-2 mx-2">
-				Code editing not supported on mobile. Please use a desktop browser.
-			</div>
-		</div>
-	</div>
-</div>
-
-<style>
-	#resizeHandler {
-		cursor: col-resize;
-		padding: 0 2px;
-	}
-
-	#resizeHandler::after {
-		width: 2px;
-		height: 100%;
-		top: 0;
-		content: '';
-		position: absolute;
-		background-color: hsla(var(--b3));
-		margin-left: -1px;
-		transition-duration: 0.2s;
-	}
-
-	#resizeHandler:hover::after {
-		margin-left: -2px;
-		background-color: hsla(var(--p));
-		width: 4px;
-	}
-</style>

src/routes/edit/+page.svelte

@@ -0,0 +1,199 @@
+<script lang="ts">
+	import Editor from '$lib/components/editor.svelte';
+	import Navbar from '$lib/components/navbar.svelte';
+	import Preset from '$lib/components/preset.svelte';
+	import Actions from '$lib/components/actions.svelte';
+	import View from '$lib/components/view.svelte';
+	import Card from '$lib/components/card/card.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';
+
+	const docURLBase = 'https://mermaid-js.github.io/mermaid';
+	const docMap: DocConfig = {
+		graph: {
+			code: '/#/flowchart',
+			config: '/#/flowchart?id=configuration'
+		},
+		flowchart: {
+			code: '/#/flowchart',
+			config: '/#/flowchart?id=configuration'
+		},
+		sequenceDiagram: {
+			code: '/#/sequenceDiagram',
+			config: '/#/sequenceDiagram?id=configuration'
+		},
+		classDiagram: {
+			code: '/#/classDiagram',
+			config: '/#/classDiagram?id=configuration'
+		},
+		'stateDiagram-v2': {
+			code: '/#/stateDiagram'
+		},
+		gantt: {
+			code: '/#/gantt',
+			config: '/#/gantt?id=configuration'
+		},
+		pie: {
+			code: '/#/pie'
+		},
+		erDiagram: {
+			code: '/#/entityRelationshipDiagram',
+			config: '/#/entityRelationshipDiagram?id=styling'
+		},
+		journey: {
+			code: '/#/user-journey'
+		},
+		gitGraph: {
+			code: '/#/gitgraph',
+			config: '/#/gitgraph?id=gitgraph-specific-configuration-options'
+		}
+	};
+	let docURL = docURLBase;
+	let activeTabID = 'code';
+	stateStore.subscribe(({ code, editorMode }: ValidatedState) => {
+		activeTabID = editorMode;
+		const codeTypeMatch = /([\S]+)[\s\n]/.exec(code);
+		if (codeTypeMatch && codeTypeMatch.length > 1) {
+			const docKey = codeTypeMatch[1];
+			const docConfig = docMap[docKey] ?? { code: '' };
+			docURL = docURLBase + (docConfig[editorMode] ?? docConfig.code ?? '');
+		}
+	});
+
+	const tabSelectHandler = (message: CustomEvent<Tab>) => {
+		const editorMode: EditorMode = message.detail.id === 'code' ? 'code' : 'config';
+		updateCodeStore({ editorMode });
+	};
+
+	const tabs: Tab[] = [
+		{
+			id: 'code',
+			title: 'Code',
+			icon: 'fas fa-code'
+		},
+		{
+			id: 'config',
+			title: 'Config',
+			icon: 'fas fa-cogs'
+		}
+	];
+
+	onMount(async () => {
+		await initHandler();
+		const resizer = document.getElementById('resizeHandler');
+		const element = document.getElementById('editorPane');
+		const resize = (e: { pageX: number }) => {
+			const newWidth = e.pageX - element.getBoundingClientRect().left;
+			if (newWidth > 50) {
+				element.style.width = `${newWidth}px`;
+			}
+		};
+
+		const stopResize = () => {
+			window.removeEventListener('mousemove', resize);
+		};
+		resizer.addEventListener('mousedown', (e) => {
+			e.preventDefault();
+			window.addEventListener('mousemove', resize);
+			window.addEventListener('mouseup', stopResize);
+		});
+	});
+</script>
+
+<div class="h-full flex flex-col overflow-hidden">
+	<Navbar />
+	<div class="flex-1 flex overflow-hidden">
+		<div class="hidden md:flex flex-col" id="editorPane" style="width: 40%">
+			<Card on:select={tabSelectHandler} {tabs} isCloseable={false} {activeTabID} title="Mermaid">
+				<div slot="actions" class="flex flex-row items-center">
+					<div class="form-control flex-row items-center">
+						<label class="cursor-pointer label" for="autoSync">
+							<span> Auto sync</span>
+							<input
+								type="checkbox"
+								class="toggle {$stateStore.autoSync ? 'btn-secondary' : 'toggle-primary'} ml-1"
+								id="autoSync"
+								bind:checked={$inputStateStore.autoSync} />
+						</label>
+					</div>
+
+					{#if !$stateStore.autoSync}
+						<button
+							class="btn btn-secondary btn-xs mr-1"
+							title="Sync Diagram ({cmdKey} + Enter)"
+							data-cy="sync"
+							on:click={syncDiagram}><i class="fas fa-sync" /></button>
+					{/if}
+
+					<button class="btn btn-secondary btn-xs" title="View documentation">
+						<a target="_blank" href={docURL} data-cy="docs"><i class="fas fa-book mr-1" />Docs</a>
+					</button>
+				</div>
+
+				<Editor />
+			</Card>
+
+			<div class="-mt-2">
+				<Preset />
+				<History />
+				<Actions />
+			</div>
+		</div>
+		<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">
+					<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"
+							id="panZoom"
+							bind:checked={$inputStateStore.panZoom} />
+					</label>
+					<a
+						href={`${base}/view#${$stateStore.serialized}`}
+						target="_blank"
+						class="btn btn-secondary btn-xs"
+						title="View diagram in new page"
+						><i class="fas fa-external-link-alt mr-1" />Full screen</a>
+				</div>
+
+				<div class="flex-1 overflow-auto">
+					<View />
+				</div>
+			</Card>
+			<div class="md:hidden rounded shadow p-2 mx-2">
+				Code editing not supported on mobile. Please use a desktop browser.
+			</div>
+		</div>
+	</div>
+</div>
+
+<style>
+	#resizeHandler {
+		cursor: col-resize;
+		padding: 0 2px;
+	}
+
+	#resizeHandler::after {
+		width: 2px;
+		height: 100%;
+		top: 0;
+		content: '';
+		position: absolute;
+		background-color: hsla(var(--b3));
+		margin-left: -1px;
+		transition-duration: 0.2s;
+	}
+
+	#resizeHandler:hover::after {
+		margin-left: -2px;
+		background-color: hsla(var(--p));
+		width: 4px;
+	}
+</style>

src/routes/manifest.json.ts

@@ -1,28 +0,0 @@
-import { base } from '$app/paths';
-export const get = (): { body: unknown } => {
-	return {
-		body: {
-			short_name: 'Mermaid',
-			name: 'Mermaid Live Editor',
-			icons: [
-				{
-					src: `${base}/icon-192.png`,
-					type: 'image/png',
-					sizes: '192x192'
-				},
-				{
-					src: `${base}/icon-512.png`,
-					type: 'image/png',
-					sizes: '512x512'
-				}
-			],
-			start_url: `${base}/edit/`,
-			background_color: '#6366F1',
-			display: 'standalone',
-			scope: `${base}/edit/`,
-			theme_color: '#6366F1',
-			description: 'FlowChart & Diagrams Editor.',
-			orientation: 'landscape'
-		}
-	};
-};

src/tests/setup.ts

@@ -0,0 +1,11 @@
+import matchers from '@testing-library/jest-dom/matchers';
+import { expect, beforeAll, vi } from 'vitest';
+
+expect.extend(matchers);
+
+// TODO: Remove once https://github.com/sveltejs/kit/issues/6259 is closed.
+beforeAll(() => {
+	vi.mock('$app/environment', () => ({
+		browser: 'window' in globalThis
+	}));
+});

static/manifest.json

@@ -0,0 +1,23 @@
+{
+	"short_name": "Mermaid",
+	"name": "Mermaid Live Editor",
+	"icons": [
+		{
+			"src": "/icon-192.png",
+			"type": "image/png",
+			"sizes": "192x192"
+		},
+		{
+			"src": "/icon-512.png",
+			"type": "image/png",
+			"sizes": "512x512"
+		}
+	],
+	"start_url": "/edit/",
+	"background_color": "#6366F1",
+	"display": "standalone",
+	"scope": "/edit/",
+	"theme_color": "#6366F1",
+	"description": "FlowChart & Diagrams Editor.",
+	"orientation": "landscape"
+}

svelte.config.js

@@ -12,21 +12,14 @@ const config = {
 	],
 	kit: {
 		adapter: adapter({
-			pages: `docs${process.env['BETA'] ? '/beta' : ''}`
+			pages: `docs`
 		}),
 		paths: process.env['DEPLOY']
 			? {
-					base: `/mermaid-live-editor${process.env['BETA'] ? '/beta' : ''}`
+					base: `/mermaid-live-editor`
 			  }
 			: {},
-		ssr: false,
+		trailingSlash: 'ignore'
-		// hydrate the <div id="svelte"> element in src/app.html
-		target: '#svelte',
-		trailingSlash: 'ignore',
-		vite: {
-			envPrefix: 'MERMAID_',
-			optimizeDeps: { include: ['mermaid'] }
-		}
 	}
 };
 

tsconfig.json

@@ -1,38 +1,17 @@
 {
-	"compilerOptions": {
-		"moduleResolution": "node",
-		"module": "es2020",
-		"lib": ["es2020", "ESNext", "DOM.Iterable"],
-		"target": "es2019",
-		/**
-			svelte-preprocess cannot figure out whether you have a value or a type, so tell TypeScript
-			to enforce using \`import type\` instead of \`import\` for Types.
-			*/
-		"importsNotUsedAsValues": "error",
-		"isolatedModules": true,
-		"resolveJsonModule": true,
-		/**
-			To have warnings/errors of the Svelte compiler at the correct position,
-			enable source maps by default.
-			*/
-		"sourceMap": true,
-		"esModuleInterop": true,
-		"skipLibCheck": true,
-		"forceConsistentCasingInFileNames": true,
-		"baseUrl": ".",
-		"allowJs": true,
-		"checkJs": true,
-		"paths": {
-			"$lib/*": ["src/lib/*"]
-		}
-	},
 	"include": [
 		"src/**/*.d.ts",
-		"src/**/*.js",
 		"src/**/*.ts",
 		"src/**/*.svelte",
 		"cypress/**/*.ts",
 		"cypress/**/*.js",
-		"static/**/*.js"
+		"static/**/*.js",
-	]
+		"static/**/*.json"
+	],
+	"compilerOptions": {
+		"resolveJsonModule": true,
+		"allowSyntheticDefaultImports": true,
+		"types": ["vitest/importMeta"]
+	},
+	"extends": "./.svelte-kit/tsconfig.json"
 }

vite.config.js

@@ -0,0 +1,26 @@
+import { sveltekit } from '@sveltejs/kit/vite';
+/** @type {import('vite').UserConfig} */
+const config = {
+	plugins: [sveltekit()],
+	envPrefix: 'MERMAID_',
+	optimizeDeps: { include: ['mermaid'] },
+	server: {
+		port: 3000,
+		host: true
+	},
+	preview: {
+		port: 3000,
+		host: true
+	},
+	test: {
+		environment: 'jsdom',
+		// in-source testing
+		includeSource: ['src/**/*.{js,ts,svelte}'],
+		setupFiles: ['./src/tests/setup.ts'],
+		coverage: {
+			exclude: ['src/mocks', '.svelte-kit', 'src/**/*.test.ts'],
+			reporter: ['text', 'json', 'html', 'lcov']
+		}
+	}
+};
+export default config;