Compare commits

..
Author SHA1 Message Date
Sidharth Vinod e953c320fb fix store 2022-08-29 20:49:00 +05:30
Sidharth Vinod a4fe43572b Merge branch 'sidv/historyDownlod' into sidv/updatePersistantStore
* sidv/historyDownlod:
  Metrics
  Tests
  Increase retries
  Temp fix for vite bug
  Update sk
  Update Browserslist
  chore(deps): bump node from 18.7.0 to 18.8.0
  chore(deps-dev): bump @typescript-eslint/eslint-plugin
  chore(deps-dev): bump typescript from 4.7.4 to 4.8.2
  feat: Upload history
  Fix #968 : Ability to download and upload history
  chore(deps): bump daisyui from 2.22.0 to 2.24.0
2022-08-28 23:13:31 +05:30
Sidharth Vinod 732e44b6b9 Update lib 2022-08-24 20:25:13 +05:30
96 changed files with 3186 additions and 5292 deletions
+47 -48
View File
@@ -1,50 +1,49 @@
module.exports = { module.exports = {
root: true, root: true,
parser: '@typescript-eslint/parser', parser: '@typescript-eslint/parser',
extends: [ extends: [
'eslint:recommended', 'eslint:recommended',
'plugin:@typescript-eslint/recommended', 'plugin:@typescript-eslint/recommended',
// 'plugin:@typescript-eslint/recommended-requiring-type-checking', // 'plugin:@typescript-eslint/recommended-requiring-type-checking',
'prettier' 'prettier'
], ],
plugins: ['svelte3', 'tailwindcss', '@typescript-eslint', 'es', 'vitest'], plugins: ['svelte3', 'tailwindcss', '@typescript-eslint', 'es', 'vitest'],
ignorePatterns: [ ignorePatterns: [
'docs/*', 'docs/*',
'*.cjs', '*.cjs',
'*.js', '*.js',
'*.md', '*.md',
'snapshots.js', 'snapshots.js',
'svelte.config.js', 'svelte.config.js',
'renovate.json', 'renovate.json',
'package.json', 'package.json',
'tsconfig.json' 'tsconfig.json'
], ],
overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }], overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }],
settings: { settings: {
'svelte3/typescript': () => require('typescript') 'svelte3/typescript': () => require('typescript')
}, },
parserOptions: { parserOptions: {
sourceType: 'module', sourceType: 'module',
ecmaVersion: 2020, ecmaVersion: 2020,
tsconfigRootDir: __dirname, tsconfigRootDir: __dirname,
project: ['./tsconfig.json'], project: ['./tsconfig.json'],
extraFileExtensions: ['.svelte'], extraFileExtensions: ['.svelte'],
allowAutomaticSingleRunInference: true allowAutomaticSingleRunInference: true
}, },
env: { env: {
browser: true, browser: true,
es2020: true es2020: true
}, },
rules: { rules: {
'@typescript-eslint/ban-ts-comment': [ '@typescript-eslint/ban-ts-comment': [
'error', 'error',
{ {
'ts-ignore': 'allow-with-description' 'ts-ignore': 'allow-with-description'
} }
], ],
'@typescript-eslint/no-unsafe-member-access': 'off', '@typescript-eslint/no-unsafe-member-access': 'off',
'@typescript-eslint/no-unsafe-assignment': 'off', '@typescript-eslint/no-unsafe-assignment': 'off',
'es/no-regexp-lookbehind-assertions': 'error', 'es/no-regexp-lookbehind-assertions': 'error'
curly: ['error', 'all'] }
}
}; };
-5
View File
@@ -1,5 +0,0 @@
# .git-blame-ignore-revs
# Prettier Pass
6fde9e22a3ba0b80879a1909fb233367ef20b738
# Tabs -> Spaces
0ac606b8fbf6f94215cbda1d4511e2dcd30e4655
-1
View File
@@ -1 +0,0 @@
github: [sidharthv96, knsv]
+1 -1
View File
@@ -8,7 +8,7 @@ jobs:
stale: stale:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/stale@v6 - uses: actions/stale@v5
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
exempt-issue-labels: 'retained' exempt-issue-labels: 'retained'
-1
View File
@@ -48,4 +48,3 @@ jobs:
parallel: true parallel: true
env: env:
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_CI: true
+4 -3
View File
@@ -1,9 +1,10 @@
name: Update Browserslist name: Update Browserslist
on: on:
workflow_dispatch:
push: push:
branches-ignore: branches:
- 'develop' - develop
- 'master'
jobs: jobs:
build: build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
+1 -1
View File
@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-node@v3 - uses: actions/setup-node@v2
with: with:
node-version: 18 node-version: 18
- name: Update monaco version - name: Update monaco version
+6 -5
View File
@@ -1,7 +1,8 @@
{ {
"singleQuote": true, "singleQuote": true,
"svelteSortOrder": "options-scripts-markup-styles", "svelteSortOrder": "options-scripts-markup-styles",
"bracketSameLine": true, "bracketSameLine": true,
"trailingComma": "none", "useTabs": true,
"printWidth": 100 "trailingComma": "none",
"printWidth": 100
} }
+13 -13
View File
@@ -1,15 +1,15 @@
{ {
// Use IntelliSense to learn about possible attributes. // Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes. // Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"type": "pwa-chrome", "type": "pwa-chrome",
"request": "launch", "request": "launch",
"name": "Launch Chrome against localhost", "name": "Launch Chrome against localhost",
"url": "http://localhost:3000", "url": "http://localhost:3000",
"webRoot": "${workspaceFolder}" "webRoot": "${workspaceFolder}"
} }
] ]
} }
+2 -7
View File
@@ -1,9 +1,4 @@
{ {
"editor.formatOnSave": true, "editor.formatOnSave": true,
"cSpell.words": ["asyncable", "mindmap", "pako", "Serde", "serdes"], "cSpell.words": ["pako", "Serde", "serdes"]
"vitest.commandLine": "yarn test:unit",
"vitest.enable": true,
"testing.autoRun.mode": "rerun",
"svelte.enable-ts-plugin": true,
"githubPullRequests.ignoredPullRequestBranches": ["develop"]
} }
+1 -1
View File
@@ -6,7 +6,7 @@
# Stop : press ctrl + c # Stop : press ctrl + c
# or # or
# docker stop mermaid-live-editor # docker stop mermaid-live-editor
FROM node:18.12.0 as mermaid-live-editor-builder FROM node:18.8.0 as mermaid-live-editor-builder
COPY --chown=node:node . /home COPY --chown=node:node . /home
WORKDIR /home WORKDIR /home
RUN yarn install RUN yarn install
+28 -28
View File
@@ -9,37 +9,37 @@ const monacoVersion = packageJson.dependencies['monaco-editor'].replace('^', '')
// fetch monaco sri info from cdnjs api // fetch monaco sri info from cdnjs api
const cdnjsAPIResp = await fetch( const cdnjsAPIResp = await fetch(
`https://api.cdnjs.com/libraries/monaco-editor/${monacoVersion}?fields=sri` `https://api.cdnjs.com/libraries/monaco-editor/${monacoVersion}?fields=sri`
); );
if (cdnjsAPIResp.ok) { if (cdnjsAPIResp.ok) {
const respJson = await cdnjsAPIResp.json(); const respJson = await cdnjsAPIResp.json();
const htmlPath = path.join('src', 'app.html'); const htmlPath = path.join('src', 'app.html');
const appHtml = fs const appHtml = fs
.readFileSync(htmlPath, 'utf8') .readFileSync(htmlPath, 'utf8')
// update monaco version of every asset in app.html // update monaco version of every asset in app.html
.replaceAll(/[0-9.]+\/min\/vs/g, `${monacoVersion}/min/vs`); .replaceAll(/[0-9.]+\/min\/vs/g, `${monacoVersion}/min/vs`);
const root = parse(appHtml); const root = parse(appHtml);
const updateIntegrity = (tag, attr) => { const updateIntegrity = (tag, attr) => {
for (const node of root for (const node of root
.getElementsByTagName(tag) .getElementsByTagName(tag)
.filter((node) => node.getAttribute(attr)?.includes('monaco-editor'))) { .filter((node) => node.getAttribute(attr)?.includes('monaco-editor'))) {
const file = node.getAttribute(attr).split(`${monacoVersion}/`)[1]; const file = node.getAttribute(attr).split(`${monacoVersion}/`)[1];
node.setAttribute('integrity', respJson.sri[file]); node.setAttribute('integrity', respJson.sri[file]);
} }
}; };
updateIntegrity('script', 'src'); updateIntegrity('script', 'src');
updateIntegrity('link', 'href'); updateIntegrity('link', 'href');
fs.writeFileSync( fs.writeFileSync(
htmlPath, htmlPath,
prettier.format(root.toString(), { prettier.format(root.toString(), {
singleQuote: false, singleQuote: false,
parser: 'html', parser: 'html',
bracketSameLine: true, bracketSameLine: true,
useTabs: true useTabs: true
}) })
); );
} else { } else {
throw Error('Unable to fetch monaco sri data from cdnjs api.'); throw Error('Unable to fetch monaco sri data from cdnjs api.');
} }
+30 -30
View File
@@ -2,34 +2,34 @@ import { defineConfig } from 'cypress';
import fs from 'fs'; import fs from 'fs';
import { isFileExist, findFiles } from 'cy-verify-downloads'; import { isFileExist, findFiles } from 'cy-verify-downloads';
export default defineConfig({ export default defineConfig({
projectId: '2ckppp', projectId: '2ckppp',
viewportWidth: 1440, viewportWidth: 1440,
viewportHeight: 768, viewportHeight: 768,
snapshotFileName: './cypress/snapshots.js', snapshotFileName: './cypress/snapshots.js',
defaultCommandTimeout: 16000, defaultCommandTimeout: 16000,
requestTimeout: 16000, requestTimeout: 16000,
retries: { retries: {
runMode: 4, runMode: 4,
openMode: 0 openMode: 0
}, },
e2e: { e2e: {
setupNodeEvents(on, config) { setupNodeEvents(on, config) {
on('task', { on('task', {
isFileExist, isFileExist,
findFiles, findFiles,
deleteFile(path) { deleteFile(path) {
fs.rmSync(path); fs.rmSync(path);
return null; return null;
}, },
readFileMaybe(filename) { readFileMaybe(filename) {
if (fs.existsSync(filename)) { if (fs.existsSync(filename)) {
return fs.readFileSync(filename, 'utf8'); return fs.readFileSync(filename, 'utf8');
} }
return null; return null;
} }
}); });
}, },
baseUrl: 'http://localhost:3000', baseUrl: 'http://localhost:3000',
specPattern: 'cypress/e2e/**/*.spec.ts' specPattern: 'cypress/e2e/**/*.spec.ts'
} }
}); });
+8 -8
View File
@@ -1,10 +1,10 @@
{ {
"plugins": ["cypress"], "plugins": ["cypress"],
"extends": ["plugin:cypress/recommended"], "extends": ["plugin:cypress/recommended"],
"rules": { "rules": {
"jest/expect-expect": "off" "jest/expect-expect": "off"
}, },
"env": { "env": {
"cypress/globals": true "cypress/globals": true
} }
} }
+38 -37
View File
@@ -1,48 +1,49 @@
import { verifyFileSize } from './util'; import { disableDebounce, verifyFileSize } from './util';
describe('Check actions', () => { describe('Check actions', () => {
beforeEach(() => { beforeEach(() => {
cy.clearLocalStorage(); cy.clearLocalStorage();
cy.visit('/edit'); cy.visit('/edit');
}); disableDebounce();
});
it('should update markdown code', () => { it('should update markdown code', () => {
cy.get('#markdown') cy.get('#markdown')
.invoke('val') .invoke('val')
.then((oldText) => { .then((oldText) => {
cy.get('#editor').click('bottom').type('{enter}C --> HistoryTest'); cy.get('#editor').click('bottom').type('{enter}C --> HistoryTest');
cy.get('#markdown') cy.get('#markdown')
.invoke('val') .invoke('val')
.then((newText) => { .then((newText) => {
expect(oldText).to.not.eq(newText); expect(oldText).to.not.eq(newText);
}); });
}); });
}); });
it('should load gists from URL', () => { it('should load gists from URL', () => {
cy.get('#gist').type('https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a'); cy.get('#gist').type('https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a');
cy.contains('Load Gist').click(); cy.contains('Load Gist').click();
cy.contains('Go shopping!!'); cy.contains('Go shopping!!');
}); });
it('should download png and svg', () => { it('should download png and svg', () => {
cy.clock(new Date(2022, 0, 1).getTime()); cy.clock(new Date(2022, 0, 1).getTime());
cy.get(`#downloadPNG`).click(); cy.get(`#downloadPNG`).click();
verifyFileSize('diagram', 'png', 21_000); verifyFileSize('diagram', 'png', 21_000);
cy.get(`#downloadSVG`).click(); cy.get(`#downloadSVG`).click();
verifyFileSize('diagram', 'svg', 10_000); verifyFileSize('diagram', 'svg', 10_000);
// Verify downloaded file is different for different diagrams // Verify downloaded file is different for different diagrams
cy.contains('Sample Diagrams').click(); cy.contains('Sample Diagrams').click();
cy.contains('ER').click(); cy.contains('ER Diagram').click();
cy.get(`#downloadPNG`).click(); cy.get(`#downloadPNG`).click();
verifyFileSize('diagram', 'png', 46_000); verifyFileSize('diagram', 'png', 46_000);
cy.get(`#downloadSVG`).click(); cy.get(`#downloadSVG`).click();
verifyFileSize('diagram', 'svg', 12_000); verifyFileSize('diagram', 'svg', 12_000);
cy.clock().invoke('restore'); cy.clock().invoke('restore');
}); });
}); });
+72 -74
View File
@@ -1,86 +1,84 @@
import { getEditor, cmd } from './util'; import { getEditor, cmd, disableDebounce } from './util';
describe('Auto sync tests', () => { describe('Auto sync tests', () => {
beforeEach(() => { beforeEach(() => {
cy.clearLocalStorage(); cy.clearLocalStorage();
cy.visit('/'); cy.visit('/');
}); disableDebounce();
});
it('should dim diagram when code is edited', () => { it('should dim diagram when code is edited', () => {
cy.contains('Auto sync').click(); cy.contains('Auto sync').click();
cy.get('#view').should('not.have.class', 'outOfSync'); cy.get('#view').should('not.have.class', 'outOfSync');
cy.get('#errorContainer').should('not.exist'); getEditor().type(' C --> Test');
getEditor({ bottom: true, newline: true }).type(' C --> Test'); cy.get('#view').should('have.class', 'outOfSync');
cy.get('#view').should('have.class', 'outOfSync'); cy.getLocalStorage('codeStore').snapshot();
cy.get('#errorContainer').should('contain.text', 'Diagram out of sync.'); });
cy.getLocalStorage('codeStore').snapshot();
});
it('should update diagram when shortcut is used', () => { it('should update diagram when shortcut is used', () => {
cy.contains('Auto sync').click(); cy.contains('Auto sync').click();
cy.get('#view').should('not.have.class', 'outOfSync'); cy.get('#view').should('not.have.class', 'outOfSync');
getEditor().type(' C --> Test'); getEditor().type(' C --> Test');
cy.get('#view').should('have.class', 'outOfSync'); cy.get('#view').should('have.class', 'outOfSync');
cy.get('#errorContainer').should('contain.text', 'Diagram out of sync.'); getEditor().type(`${cmd}{enter}`);
getEditor().type(`${cmd}{enter}`); cy.get('#view').should('not.have.class', 'outOfSync');
cy.get('#errorContainer').should('not.exist'); });
cy.get('#view').should('not.have.class', 'outOfSync');
});
it('should show/hide sync button with auto sync', () => { it('should show/hide sync button with auto sync', () => {
cy.get('[data-cy=sync]').should('not.exist'); cy.get('[data-cy=sync]').should('not.exist');
cy.contains('Auto sync').click(); cy.contains('Auto sync').click();
cy.get('[data-cy=sync]').should('exist'); cy.get('[data-cy=sync]').should('exist');
cy.get('#autoSync').check(); cy.get('#autoSync').check();
cy.get('[data-cy=sync]').should('not.exist'); cy.get('[data-cy=sync]').should('not.exist');
}); });
it('should not dim diagram when code is in sync', () => { it('should not dim diagram when code is in sync', () => {
cy.contains('Auto sync').click(); cy.contains('Auto sync').click();
cy.get('#view').should('not.have.class', 'outOfSync'); cy.get('#view').should('not.have.class', 'outOfSync');
getEditor().type(' C --> Test'); getEditor().type(' C --> Test');
cy.get('#view').should('have.class', 'outOfSync'); cy.get('#view').should('have.class', 'outOfSync');
cy.get('[data-cy=sync]').click(); cy.get('[data-cy=sync]').click();
cy.get('#view').should('not.have.class', 'outOfSync'); cy.get('#view').should('not.have.class', 'outOfSync');
cy.get('#autoSync').check(); cy.get('#autoSync').check();
getEditor().type('ing'); getEditor().type('ing');
cy.get('#view').should('not.have.class', 'outOfSync'); cy.get('#view').should('not.have.class', 'outOfSync');
cy.getLocalStorage('codeStore').snapshot(); cy.getLocalStorage('codeStore').snapshot();
}); });
it('supports commenting code out/in', () => { it('supports commenting code out/in', () => {
getEditor().type(`{uparrow}${cmd}/`); getEditor().type(`{uparrow}${cmd}/`);
cy.get('#view').contains('Car').should('not.exist'); cy.get('#view').contains('Car').should('not.exist');
getEditor().type(`{uparrow}${cmd}/`); getEditor().type(`{uparrow}${cmd}/`);
cy.get('#view').contains('Car').should('exist'); cy.get('#view').contains('Car').should('exist');
}); });
it('supports editing code when code is incorrect', () => { it('supports editing code when code is incorrect', () => {
cy.visit( cy.visit(
'/edit#pako:eNpljjEKwzAMRa8SNOcEnlt6gK5eVFvYJsgOqkwpIXevg9smEE1PnyfxF3DFExgISW-CczQ2D21cYU7a-SGYXRwyvTp9jUhuKlVP-eHy7zA-leQsMEmg_QOM0BLG5FujZVMsaCQmC6ahR5ks2Lw2r84ela4-aREwKpVGwKrl_s7ut3fnkjAIcg_XDzuaUhs' '/edit#pako:eNpljjEKwzAMRa8SNOcEnlt6gK5eVFvYJsgOqkwpIXevg9smEE1PnyfxF3DFExgISW-CczQ2D21cYU7a-SGYXRwyvTp9jUhuKlVP-eHy7zA-leQsMEmg_QOM0BLG5FujZVMsaCQmC6ahR5ks2Lw2r84ela4-aREwKpVGwKrl_s7ut3fnkjAIcg_XDzuaUhs'
); );
cy.get('#errorContainer').should('not.exist'); cy.get('#errorContainer').should('not.exist');
getEditor({ newline: true }).type(`branch test`); getEditor({ newline: true }).type(`branch test`);
cy.get('#editor').contains('branch test').should('exist'); cy.get('#editor').contains('branch test').should('exist');
cy.get('#errorContainer') cy.get('#errorContainer')
.contains( .contains(
'Error: Trying to checkout branch which is not yet created. (Help try using "branch master")' 'Error: Trying to checkout branch which is not yet created. (Help try using "branch master")'
) )
.should('exist'); .should('exist');
}); });
}); });
describe('Pan and Zoom', () => { describe.only('Pan and Zoom', () => {
beforeEach(() => { beforeEach(() => {
cy.clearLocalStorage(); cy.clearLocalStorage();
cy.visit('/'); cy.visit('/');
}); disableDebounce();
it('should toggle pan and zoom', () => { });
cy.get('#svg-pan-zoom-reset-pan-zoom').should('not.exist'); it('should toggle pan and zoom', () => {
cy.contains('Pan & Zoom').click(); cy.get('#svg-pan-zoom-reset-pan-zoom').should('not.exist');
cy.get('#svg-pan-zoom-reset-pan-zoom').should('exist'); cy.contains('Pan & Zoom').click();
cy.contains('Pan & Zoom').click(); cy.get('#svg-pan-zoom-reset-pan-zoom').should('exist');
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('not.exist');
});
}); });
+27 -27
View File
@@ -1,36 +1,36 @@
describe('Editor docs tests', () => { describe('Editor docs tests', () => {
beforeEach(() => { beforeEach(() => {
cy.on('uncaught:exception', () => { cy.on('uncaught:exception', () => {
return false; return false;
}); });
cy.clearLocalStorage(); cy.clearLocalStorage();
cy.visit('/edit'); cy.visit('/edit');
cy.contains('Sample Diagrams').click(); cy.contains('Sample Diagrams').click();
}); });
it('Test default loading', () => { it('Test default loading', () => {
cy.get(`[data-cy=docs][href^="https://mermaid-js.github.io/mermaid"]`).should('exist'); 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', () => { it('Test to see if the correct URL loads when changing from one diagram to other', () => {
cy.contains('Flow').click(); cy.contains('Flow Chart').click();
cy.get(`[data-cy=docs][href$="/#/flowchart"]`).should('exist'); cy.get(`[data-cy=docs][href$="/#/flowchart"]`).should('exist');
cy.contains('Config').click(); cy.contains('Config').click();
cy.get(`[data-cy=docs][href$="/#/flowchart?id=configuration"]`).should('exist'); cy.get(`[data-cy=docs][href$="/#/flowchart?id=configuration"]`).should('exist');
cy.contains('Sequence').click(); cy.contains('Sequence Diagram').click();
cy.get(`[data-cy=docs][href$="/#/sequenceDiagram?id=configuration"]`).should('exist'); cy.get(`[data-cy=docs][href$="/#/sequenceDiagram?id=configuration"]`).should('exist');
cy.contains('Code').click(); cy.contains('Code').click();
cy.get(`[data-cy=docs][href$="/#/sequenceDiagram"]`).should('exist'); cy.get(`[data-cy=docs][href$="/#/sequenceDiagram"]`).should('exist');
}); });
it("Test to check URLs for a case where config URL doesn't exist", () => { it("Test to check URLs for a case where config URL doesn't exist", () => {
cy.contains('State').click(); cy.contains('State Diagram').click();
cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist'); cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
cy.contains('Config').click(); cy.contains('Config').click();
cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist'); cy.get(`[data-cy=docs][href$="/#/stateDiagram"]`).should('exist');
}); });
}); });
+95 -95
View File
@@ -1,105 +1,105 @@
import { getEditor, verifyFileSnapshot } from './util'; import { getEditor, disableDebounce, verifyFileSnapshot } from './util';
describe('Save History', () => { describe('Save History', () => {
beforeEach(() => { beforeEach(() => {
cy.clock(new Date(2022, 0, 1).getTime()); cy.clock(new Date(2022, 0, 1).getTime());
cy.clearLocalStorage(); cy.clearLocalStorage();
cy.visit('/edit'); cy.visit('/edit');
disableDebounce();
cy.contains('Actions').click();
cy.contains('History').click();
});
cy.contains('Actions').click(); afterEach(() => {
cy.contains('History').click(); cy.clock().invoke('restore');
}); });
afterEach(() => { it('should load history from localstorage', () => {
cy.clock().invoke('restore'); cy.setLocalStorage(
}); 'manualHistoryStore',
'[{"state":{"code":"graph TD\\n A[Halloween] -->|Get money| B(Go shopping)","mermaid":"{\\n \\"theme\\": \\"dark\\"\\n}","updateEditor":false,"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}","updateEditor":true,"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}","updateEditor":false,"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}","updateEditor":true,"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();
it('should load history from localstorage', () => { cy.get('#historyList').find('li').should('have.length', 2);
cy.setLocalStorage( cy.get('#historyList').find('No items in History').should('not.exist');
'manualHistoryStore', cy.get('#historyList').contains('needy-mosquito');
'[{"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.get('#historyList').contains('barking-dog');
); cy.contains('Restore').click();
cy.setLocalStorage( cy.contains('New Year');
'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); it('should save when clicked', () => {
cy.get('#historyList').find('No items in History').should('not.exist'); cy.get('#historyList').find('li').should('have.length', 0);
cy.get('#historyList').contains('needy-mosquito'); cy.get('#historyList').contains('No items in History');
cy.get('#historyList').contains('barking-dog'); cy.get('#saveHistory').click();
cy.contains('Restore').click(); cy.get('#historyList').find('No items in History').should('not.exist');
cy.contains('New Year'); 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 save when clicked', () => { it('should be able to restore and delete', () => {
cy.get('#historyList').find('li').should('have.length', 0); cy.get('#saveHistory').click();
cy.get('#historyList').contains('No items in History'); getEditor().type(' C --> HistoryTest');
cy.get('#saveHistory').click(); cy.get('#historyList').find('No items in History').should('not.exist');
cy.get('#historyList').find('No items in History').should('not.exist'); cy.get('#historyList').find('li').should('have.length', 1);
cy.get('#historyList').find('li').should('have.length', 1); cy.contains('HistoryTest');
cy.get('#saveHistory').click(); cy.contains('Restore').click();
cy.on('window:alert', (str) => { cy.contains('HistoryTest').should('not.exist');
expect(str).to.equal('State already saved.'); cy.contains('Delete').click();
}); cy.get('#historyList').find('li').should('have.length', 0);
cy.on('window:confirm', () => true); cy.get('#historyList').contains('No items in History');
getEditor().type(' C --> HistoryTest'); cy.get('#saveHistory').click();
cy.get('#saveHistory').click(); getEditor().type(' C --> HistoryTest');
cy.get('#historyList').find('li').should('have.length', 2); 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 be able to restore and delete', () => { // TODO: Fix #639
cy.get('#saveHistory').click(); xit('should auto save history', () => {
getEditor().type(' C --> HistoryTest'); getEditor().type(' C --> HistoryTest');
cy.get('#historyList').find('No items in History').should('not.exist'); cy.tick(70000);
cy.get('#historyList').find('li').should('have.length', 1); cy.contains('Timeline').click();
cy.contains('HistoryTest'); cy.get('#historyList').find('li').should('have.length', 1);
cy.contains('Restore').click(); cy.get('#editor').type('ing');
cy.contains('HistoryTest').should('not.exist'); cy.tick(70000);
cy.contains('Delete').click(); cy.get('#historyList').find('li').should('have.length', 2);
cy.get('#historyList').find('li').should('have.length', 0); for (let i = 0; i < 31; i++) {
cy.get('#historyList').contains('No items in History'); cy.get('#editor').type('.');
cy.get('#saveHistory').click(); cy.tick(70000);
getEditor().type(' C --> HistoryTest'); }
cy.get('#saveHistory').click(); cy.get('#historyList').find('li').should('have.length', 30);
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 it('should download history', () => {
xit('should auto save history', () => { cy.get('#saveHistory').click();
getEditor().type(' C --> HistoryTest'); cy.get(`#downloadHistory`).click();
cy.tick(70000); verifyFileSnapshot('history', 'json', 'A[Christmas] -->|Get money| B(Go shopping)');
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)');
});
}); });
+106 -108
View File
@@ -1,122 +1,120 @@
import { toBase64 } from 'js-base64'; import { toBase64 } from 'js-base64';
import { disableDebounce } from './util';
describe('Site Loads', () => { describe('Site Loads', () => {
beforeEach(() => { beforeEach(() => {
cy.clearLocalStorage(); cy.clearLocalStorage();
cy.visit('/'); cy.visit('/');
}); disableDebounce();
});
it('Check Home page load', () => {
cy.url().should('include', '/edit');
cy.contains('History').click();
cy.getLocalStorage('codeStore').snapshot();
});
it('Check Home page load', () => { it('Check Redirect from old URL', () => {
cy.url().should('include', '/edit'); cy.visit(
cy.contains('History').click(); '/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9LCJ1cGRhdGVFZGl0b3IiOmZhbHNlfQ'
cy.getLocalStorage('codeStore').snapshot(); );
}); cy.url().should('include', '/edit#pako:eNp');
});
it('Check Redirect from old URL', () => { it('should load sample diagrams when clicked', () => {
cy.visit( cy.contains('Sample Diagrams').click();
'/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9LCJ1cGRhdGVFZGl0b3IiOmZhbHNlfQ' cy.contains('Pie Chart').click();
); cy.contains('pie title Pets adopted by volunteers');
cy.url().should('include', '/edit#pako:eNp'); cy.contains('Class Diagram').click();
}); cy.contains('classDiagram');
});
it('should load sample diagrams when clicked', () => { it('should load diagram from gist', () => {
cy.contains('Sample Diagrams').click(); cy.visit(`/edit?gist=https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a`);
cy.contains('Pie').click(); cy.contains('History').click();
cy.contains('pie title Pets adopted by volunteers'); cy.contains('Go shopping!!');
cy.contains('Class').click(); cy.contains('Revisions');
cy.contains('classDiagram'); cy.contains('sidharthv96 v8f8f1e2');
}); cy.contains('sidharthv96 v7851e19');
cy.getLocalStorage('codeStore').snapshot();
});
(Cypress.env('CI') === 'true' ? describe : describe.skip)('github', () => { it('should load diagram from gist revision', () => {
it('should load diagram from gist', () => { cy.visit(
cy.visit(`/edit?gist=https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a`); '/edit?gist=https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/ec9b4ab0e41e4ff6287326cd3cb47affd7851e19'
cy.contains('History').click(); );
cy.contains('Go shopping!!'); cy.contains('History').click();
cy.contains('Revisions'); cy.contains('Party');
cy.contains('sidharthv96 v8f8f1e2'); cy.contains('Revisions');
cy.contains('sidharthv96 v7851e19'); cy.contains('sidharthv96 v7851e19');
cy.getLocalStorage('codeStore').snapshot(); cy.getLocalStorage('codeStore').snapshot();
}); });
it('should load diagram from gist revision', () => { it('should load diagram from raw files', () => {
cy.visit( cy.visit(
'/edit?gist=https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/ec9b4ab0e41e4ff6287326cd3cb47affd7851e19' '/edit?code=https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/code.mmd&config=https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/config.json'
); );
cy.contains('History').click(); cy.contains('Party');
cy.contains('Party'); cy.getLocalStorage('codeStore').snapshot();
cy.contains('Revisions'); });
cy.contains('sidharthv96 v7851e19');
cy.getLocalStorage('codeStore').snapshot();
});
it('should load diagram from raw files', () => { // Disabled temporarily. Should be enabled after the issue is fixed in Mermaid.
cy.visit( // it('should prevent setting the "securityLevel" option via URL', () => {
'/edit?code=https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/code.mmd&config=https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/config.json' // 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}`,
cy.contains('Party'); // true
cy.getLocalStorage('codeStore').snapshot(); // );
}); // cy.on('window:confirm', () => true);
}); // cy.visit(`/edit#${b64State}`);
// cy.contains('Config').click();
// cy.contains('forest');
// cy.contains('securityLevel').should('not.exist');
// cy.get('#view').find('img').should('not.exist');
// cy.get('#view').contains('<img');
// cy.get('#view').contains(`src='https://via.placeholder.com/64'`);
// });
// Disabled temporarily. Should be enabled after the issue is fixed in Mermaid. it('should allow persisting "securityLevel" using confirm dialogue', () => {
// it('should prevent setting the "securityLevel" option via URL', () => { const b64State = toBase64(
// const b64State = toBase64( `{"code":"graph TD\\nA[\\"<img src='https://dummyimage.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
// true );
// ); cy.on('window:confirm', () => false);
// cy.on('window:confirm', () => true); cy.visit(`/edit#${b64State}`);
// cy.visit(`/edit#${b64State}`); cy.contains('Config').click();
// cy.contains('Config').click(); cy.contains('forest');
// cy.contains('forest'); cy.contains('securityLevel');
// cy.contains('securityLevel').should('not.exist'); cy.get('#view').find('img').should('be.visible');
// cy.get('#view').find('img').should('not.exist'); });
// cy.get('#view').contains('<img');
// cy.get('#view').contains(`src='https://via.placeholder.com/64'`);
// });
it.skip('should allow persisting "securityLevel" using confirm dialogue', () => { it('should show troubleshooting steps if loading fails', () => {
const b64State = toBase64( cy.visit('/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAg');
`{"code":"graph TD\\nA[\\"<img src='https://dummyimage.com/64' width=64/>\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","autoSync":true,"updateDiagram":true}`, cy.reload(true);
true cy.contains('Please Click here to Raise an issue in github.');
); });
cy.on('window:confirm', () => false);
cy.visit(`/edit#${b64State}`);
cy.get('#editor').type(' ');
cy.contains('Config').click();
cy.contains('forest');
cy.contains('securityLevel');
cy.get('#view').find('img').should('be.visible');
});
it('should show troubleshooting steps if loading fails', () => { it('should load uncompressed URL', () => {
cy.visit('/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAg'); cy.visit(
cy.reload(true); '/edit/#eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW05ldyBZZWFyXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICAgIEIgLS0-IEN7TGV0IG1lIHRoaW5rfVxuICAgIEMgLS0-fE9uZXwgRFtMYXB0b3BdXG4gICAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgICBDIC0tPnxUaHJlZXwgRltmYTpmYS1jYXIgQ2FyXSIsIm1lcm1haWQiOiJ7XG4gIFwidGhlbWVcIjogXCJkZWZhdWx0XCJcbn0iLCJ1cGRhdGVFZGl0b3IiOmZhbHNlLCJhdXRvU3luYyI6dHJ1ZSwidXBkYXRlRGlhZ3JhbSI6ZmFsc2V9'
cy.contains('Please Click here to Raise an issue in github.'); );
}); 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 uncompressed URL', () => { it('should load compressed URL', () => {
cy.visit( cy.visit(
'/edit/#eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW05ldyBZZWFyXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICAgIEIgLS0-IEN7TGV0IG1lIHRoaW5rfVxuICAgIEMgLS0-fE9uZXwgRFtMYXB0b3BdXG4gICAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgICBDIC0tPnxUaHJlZXwgRltmYTpmYS1jYXIgQ2FyXSIsIm1lcm1haWQiOiJ7XG4gIFwidGhlbWVcIjogXCJkZWZhdWx0XCJcbn0iLCJ1cGRhdGVFZGl0b3IiOmZhbHNlLCJhdXRvU3luYyI6dHJ1ZSwidXBkYXRlRGlhZ3JhbSI6ZmFsc2V9' '/edit#pako:eNpVkM2KwkAQhF-l6dMK5gVyEDRxvYi7sF6WjIcm0zqDzg_jBJEk725Hd2G3Tw31VVFUj23QjCWeEkUD-1p5kFs2O77BN1M6QFEshg1ncMHzfYDV2ybA1YQYrT_NXvhqgqDqtxPGkI315_ElVU__h-cB6mZLMYd4-Kvsb2GAdWM_jcT_V0xicb03RyqPVLSUoJI-OEfHyZHV0rqfDAqzYccKS3k1pbNC5Ufhuqgp81rbHBJKxuXKc6Quh6-7b7HMqeNfqLYkC7gfanwAlW1ZvQ'
); );
cy.contains('New Year'); cy.contains('New Year');
cy.visit( cy.visit(
'/edit#eyJjb2RlIjoiY2xhc3NEaWFncmFtXG4gICAgQW5pbWFsIDx8LS0gRHVja1xuICAgIEFuaW1hbCA8fC0tIEZpc2hcbiAgICBBbmltYWwgPHwtLSBaZWJyYVxuICAgIEFuaW1hbCA6ICtpbnQgYWdlXG4gICAgQW5pbWFsIDogK1N0cmluZyBnZW5kZXJcbiAgICBBbmltYWw6ICtpc01hbW1hbCgpXG4gICAgQW5pbWFsOiArbWF0ZSgpXG4gICAgY2xhc3MgRHVja3tcbiAgICAgICtTdHJpbmcgYmVha0NvbG9yXG4gICAgICArc3dpbSgpXG4gICAgICArcXVhY2soKVxuICAgIH1cbiAgICBjbGFzcyBGaXNoe1xuICAgICAgLWludCBzaXplSW5GZWV0XG4gICAgICAtY2FuRWF0KClcbiAgICB9XG4gICAgY2xhc3MgWmVicmF7XG4gICAgICArYm9vbCBpc193aWxkXG4gICAgICArcnVuKClcbiAgICB9XG4gICAgICAgICAgICAiLCJtZXJtYWlkIjoie1xuICBcInRoZW1lXCI6IFwiZGFya1wiXG59IiwidXBkYXRlRWRpdG9yIjpmYWxzZSwiYXV0b1N5bmMiOnRydWUsInVwZGF0ZURpYWdyYW0iOmZhbHNlfQ' '/edit#pako:eNptkU1PwzAMhv9K5BOI9Q9EXBDbJA477YYqITcxndV8QD40weh_Jy1rGR0-OY_tV2_sEyivCSQogzGuGduAtnaixINji0bcf1WVWGfVXdMtx8M1faYm4B8sxR27JLClJd6nwK4VLTlN4bI4jMQd2pLe3C4KFhNNcLQ92jv9ADGLNoTdozc-zIV4ZDsNlud7RtVN7_5Sb_jYrFcN3iN_0pPbEqUZK3QbTP_Ojyv4NdR4bwTHlyMbPcOQ3WJ2CliBpWCRdbnLqFJDOpClGmRJNYauhtr1pS-_6bKMjebkA8hXNJFWgDn5_YdTIFPINDWdb3vu6r8BaWOZRQ'
); );
cy.contains('Animal'); 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');
});
}); });
+50 -50
View File
@@ -1,56 +1,56 @@
describe('Test themes', () => { describe('Test themes', () => {
describe('Test light themes', () => { describe('Test light themes', () => {
beforeEach(() => { beforeEach(() => {
cy.clearLocalStorage(); cy.clearLocalStorage();
cy.visit('/edit', { cy.visit('/edit', {
onBeforeLoad(win) { onBeforeLoad(win) {
cy.stub(win, 'matchMedia') cy.stub(win, 'matchMedia')
.callThrough() .callThrough()
.withArgs('(prefers-color-scheme: dark)') .withArgs('(prefers-color-scheme: dark)')
.returns({ .returns({
matches: false matches: false
}); });
} }
}); });
cy.contains('Change Theme').click(); cy.contains('Change Theme').click();
}); });
it('should set light theme as default', () => { it('should set light theme as default', () => {
cy.contains('light').parent().should('have.class', 'bordered'); cy.contains('light').parent().should('have.class', 'bordered');
cy.contains('dark').parent().should('not.have.class', 'bordered'); cy.contains('dark').parent().should('not.have.class', 'bordered');
cy.getLocalStorage('themeStore').snapshot(); cy.getLocalStorage('themeStore').snapshot();
}); });
it('should change themes when clicked', () => { it('should change themes when clicked', () => {
cy.contains('light').parent().should('have.class', 'bordered'); cy.contains('light').parent().should('have.class', 'bordered');
cy.contains('cupcake').click(); cy.contains('cupcake').click();
cy.contains('cupcake').parent().should('have.class', 'bordered'); cy.contains('cupcake').parent().should('have.class', 'bordered');
cy.contains('light').parent().should('not.have.class', 'bordered'); cy.contains('light').parent().should('not.have.class', 'bordered');
cy.contains('dark').parent().should('not.have.class', 'bordered'); cy.contains('dark').parent().should('not.have.class', 'bordered');
cy.getLocalStorage('themeStore').snapshot(); cy.getLocalStorage('themeStore').snapshot();
}); });
}); });
describe('Test dark mode', () => { describe('Test dark mode', () => {
beforeEach(() => { beforeEach(() => {
cy.clearLocalStorage(); cy.clearLocalStorage();
cy.visit('/edit', { cy.visit('/edit', {
onBeforeLoad(win) { onBeforeLoad(win) {
cy.stub(win, 'matchMedia') cy.stub(win, 'matchMedia')
.callThrough() .callThrough()
.withArgs('(prefers-color-scheme: dark)') .withArgs('(prefers-color-scheme: dark)')
.returns({ .returns({
matches: true matches: true
}); });
} }
}); });
cy.contains('Change Theme').click(); cy.contains('Change Theme').click();
}); });
it('should set dark theme as default', () => { it('should set dark theme as default', () => {
cy.contains('light').parent().should('not.have.class', 'bordered'); cy.contains('light').parent().should('not.have.class', 'bordered');
cy.contains('dark').parent().should('have.class', 'bordered'); cy.contains('dark').parent().should('have.class', 'bordered');
cy.getLocalStorage('themeStore').snapshot(); cy.getLocalStorage('themeStore').snapshot();
}); });
}); });
}); });
+30 -28
View File
@@ -1,41 +1,43 @@
export const cmd = `{${Cypress.platform === 'darwin' ? 'meta' : 'ctrl'}}`; export const cmd = `{${Cypress.platform === 'darwin' ? 'meta' : 'ctrl'}}`;
export const getEditor = ({ bottom = true, newline = false } = {}) => export const getEditor = ({ bottom = true, newline = false } = {}) =>
cy cy
.get('#editor textarea:first') .get('#editor textarea:first')
.click() .click()
.focused() .focused()
.type(`${bottom ? '{pageDown}' : cmd}`) .type(`${bottom ? '{pageDown}' : cmd}`)
.type(`${newline ? '{enter}' : cmd}`); .type(`${newline ? '{enter}' : cmd}`);
export const disableDebounce = () => cy.setLocalStorage('noDebounce', 'true');
const downloadsFolder = Cypress.config('downloadsFolder'); const downloadsFolder = Cypress.config('downloadsFolder');
export const verifyFileSize = ( export const verifyFileSize = (
fileType: 'history' | 'diagram', fileType: 'history' | 'diagram',
extension: string, extension: string,
size: number size: number
) => { ) => {
const fileName = `mermaid-${fileType}-2022-01-01-000000.${extension}`; const fileName = `mermaid-${fileType}-2022-01-01-000000.${extension}`;
const filePath = `${downloadsFolder}/${fileName}`; const filePath = `${downloadsFolder}/${fileName}`;
cy.verifyDownload(fileName); cy.verifyDownload(fileName);
cy.readFile(filePath, null, { cy.readFile(filePath, null, {
log: false log: false
}).then((buffer) => expect((buffer as ArrayBuffer).byteLength).to.be.gt(size)); }).then((buffer) => expect((buffer as ArrayBuffer).byteLength).to.be.gt(size));
cy.task('deleteFile', filePath); cy.task('deleteFile', filePath);
}; };
export const verifyFileSnapshot = ( export const verifyFileSnapshot = (
fileType: 'history' | 'diagram', fileType: 'history' | 'diagram',
extension: string, extension: string,
content: string content: string
) => { ) => {
const fileName = `mermaid-${fileType}-2022-01-01-000000.${extension}`; const fileName = `mermaid-${fileType}-2022-01-01-000000.${extension}`;
const filePath = `${downloadsFolder}/${fileName}`; const filePath = `${downloadsFolder}/${fileName}`;
cy.verifyDownload(fileName); cy.verifyDownload(fileName);
cy.readFile(filePath, null, { cy.readFile(filePath, null, {
log: false log: false
}).then((buffer) => }).then((buffer) =>
expect(new TextDecoder('utf-8').decode(buffer as ArrayBuffer)).to.contain(content) expect(new TextDecoder('utf-8').decode(buffer as ArrayBuffer)).to.contain(content)
); );
cy.task('deleteFile', filePath); cy.task('deleteFile', filePath);
}; };
+3 -3
View File
@@ -1,5 +1,5 @@
{ {
"name": "Using fixtures to represent data", "name": "Using fixtures to represent data",
"email": "hello@cypress.io", "email": "hello@cypress.io",
"body": "Fixtures are a great way to mock data for responses to routes" "body": "Fixtures are a great way to mock data for responses to routes"
} }
+8 -8
View File
@@ -1,28 +1,28 @@
module.exports = { module.exports = {
"Site Loads": { "Site Loads": {
"Check Home page load": { "Check Home page load": {
"1": "{\"code\":\"graph TD\\n A[Christmas] -->|Get money| B(Go shopping)\\n B --> C{Let me think}\\n C -->|One| D[Laptop]\\n C -->|Two| E[iPhone]\\n C -->|Three| F[fa:fa-car Car]\\n \",\"mermaid\":\"{\\n \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true}" "1": "{\"code\":\"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}"
}, },
"Check Redirect from old URL": { "Check Redirect from old URL": {
"1": "{\"code\":\"graph TD\\n A[Christmas] -->|Get money| B(Go shopping)\\n B --> C{Let me think}\\n C -->|One| D[Laptop]\\n C -->|Two| E[iPhone]\\n C -->|Three| F[fa:fa-car Car]\",\"mermaid\":\"{\\n \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true}" "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}"
}, },
"should load diagram from gist": { "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}\",\"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}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"gist\",\"config\":{\"url\":\"https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a\"}}}"
}, },
"should load diagram from gist revision": { "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}\",\"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}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"gist\",\"config\":{\"url\":\"https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/ec9b4ab0e41e4ff6287326cd3cb47affd7851e19\"}}}"
}, },
"should load diagram from raw files": { "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}\",\"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}\",\"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\"}}}"
} }
}, },
"__version": "10.10.0", "__version": "10.6.0",
"Auto sync tests": { "Auto sync tests": {
"should dim diagram when code is edited": { "should dim diagram when code is edited": {
"1": "{\"code\":\"graph TD\\n A[Christmas] -->|Get money| B(Go shopping)\\n B --> C{Let me think}\\n C -->|One| D[Laptop]\\n C -->|Two| E[iPhone]\\n C -->|Three| F[fa:fa-car Car]\\n C --> Test\",\"mermaid\":\"{\\n \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":false,\"updateDiagram\":false}" "1": "{\"code\":\"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}"
}, },
"should not dim diagram when code is in sync": { "should not dim diagram when code is in sync": {
"1": "{\"code\":\"graph TD\\n A[Christmas] -->|Get money| B(Go shopping)\\n B --> C{Let me think}\\n C -->|One| D[Laptop]\\n C -->|Two| E[iPhone]\\n C -->|Three| F[fa:fa-car Car]\\n C --> Testing\",\"mermaid\":\"{\\n \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":false}" "1": "{\"code\":\"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}"
} }
}, },
"Test themes": { "Test themes": {
+6 -6
View File
@@ -27,12 +27,12 @@ import { register } from '@cypress/snapshot';
// eslint-disable-next-line @typescript-eslint/no-unsafe-call // eslint-disable-next-line @typescript-eslint/no-unsafe-call
register(); register();
declare global { declare global {
// eslint-disable-next-line @typescript-eslint/no-namespace // eslint-disable-next-line @typescript-eslint/no-namespace
namespace Cypress { namespace Cypress {
interface Chainable { interface Chainable {
snapshot(): void; snapshot(): void;
} }
} }
} }
import 'cypress-localstorage-commands'; import 'cypress-localstorage-commands';
+4 -4
View File
@@ -21,8 +21,8 @@ require('cy-verify-downloads').addCustomCommand();
// require('./commands') // require('./commands')
Cypress.on('uncaught:exception', (err) => { Cypress.on('uncaught:exception', (err) => {
/* returning false here prevents Cypress from failing the test */ /* returning false here prevents Cypress from failing the test */
if (err.message.includes('ResizeObserver loop limit exceeded')) { if (err.message.includes('ResizeObserver loop limit exceeded')) {
return false; return false;
} }
}); });
+5 -5
View File
@@ -1,7 +1,7 @@
{ {
"compilerOptions": { "compilerOptions": {
"allowJs": true, "allowJs": true,
"types": ["cypress", "cypress-localstorage-commands", "cy-verify-downloads"] "types": ["cypress", "cypress-localstorage-commands", "cy-verify-downloads"]
}, },
"include": ["**/*.ts"] "include": ["**/*.ts"]
} }
+93 -93
View File
@@ -1,95 +1,95 @@
{ {
"name": "mermaid-live-editor", "name": "mermaid-live-editor",
"version": "2.0.67", "version": "2.0.67",
"type": "module", "type": "module",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"dev": "vite dev", "dev": "vite dev",
"dev:force": "MERMAID_LOCAL=true yarn dev --force", "build": "vite build",
"dev:test": "yarn dev", "preview": "vite preview",
"build": "vite build", "lint": "prettier --check --cache --plugin-search-dir=. .;eslint --ignore-path .gitignore .",
"preview": "vite preview", "lint:fix": "prettier --write --cache --plugin-search-dir=. .;eslint --fix --ignore-path .gitignore .",
"lint": "prettier --check --cache --plugin-search-dir=. .;eslint --ignore-path .gitignore .", "format": "prettier --write --cache --plugin-search-dir=. .",
"lint:fix": "prettier --write --cache --plugin-search-dir=. .;eslint --fix --ignore-path .gitignore .", "pre-commit": "lint-staged",
"format": "prettier --write --cache --plugin-search-dir=. .", "postinstall": "husky install; svelte-kit sync",
"pre-commit": "lint-staged", "test:unit": "vitest",
"postinstall": "husky install && svelte-kit sync && (git config blame.ignoreRevsFile .git-blame-ignore-revs || true)", "test:ui": "vitest --ui",
"test:unit": "vitest", "test:coverage": "vitest run --coverage",
"test:ui": "vitest --ui", "test:browser": "cypress run",
"test:coverage": "vitest run --coverage", "test": "test:unit && test:browser",
"test:browser": "cypress run", "cy": "cypress open"
"test": "test:unit && test:browser", },
"cy": "cypress open" "devDependencies": {
}, "@cypress/snapshot": "2.1.7",
"devDependencies": { "@sveltejs/adapter-static": "1.0.0-next.39",
"@cypress/snapshot": "2.1.7", "@sveltejs/kit": "1.0.0-next.442",
"@sveltejs/adapter-static": "1.0.0-next.46", "@testing-library/jest-dom": "5.16.5",
"@sveltejs/kit": "1.0.0-next.522", "@testing-library/svelte": "3.2.1",
"@testing-library/jest-dom": "5.16.5", "@types/mermaid": "8.2.9",
"@testing-library/svelte": "3.2.2", "@types/pako": "1.0.3",
"@types/pako": "2.0.0", "@types/uuid": "^8.3.4",
"@types/uuid": "8.3.4", "@typescript-eslint/eslint-plugin": "5.35.1",
"@typescript-eslint/eslint-plugin": "5.42.0", "@typescript-eslint/parser": "5.34.0",
"@typescript-eslint/parser": "5.42.0", "@vitest/ui": "0.22.1",
"@vitest/ui": "0.25.1", "autoprefixer": "10.4.8",
"autoprefixer": "10.4.12", "c8": "7.12.0",
"c8": "7.12.0", "chai": "4.3.6",
"chai": "4.3.6", "cssnano": "5.1.13",
"cssnano": "5.1.13", "cy-verify-downloads": "0.1.8",
"cy-verify-downloads": "0.1.11", "cypress": "10.6.0",
"cypress": "11.0.1", "cypress-localstorage-commands": "2.2.0",
"cypress-localstorage-commands": "2.2.1", "eslint": "8.22.0",
"eslint": "8.27.0", "eslint-config-prettier": "8.5.0",
"eslint-config-prettier": "8.5.0", "eslint-plugin-cypress": "2.12.1",
"eslint-plugin-cypress": "2.12.1", "eslint-plugin-es": "4.1.0",
"eslint-plugin-es": "4.1.0", "eslint-plugin-postcss-modules": "2.0.0",
"eslint-plugin-postcss-modules": "2.0.0", "eslint-plugin-svelte3": "4.0.0",
"eslint-plugin-svelte3": "4.0.0", "eslint-plugin-tailwindcss": "3.6.0",
"eslint-plugin-tailwindcss": "3.6.2", "eslint-plugin-vitest": "0.0.8",
"eslint-plugin-vitest": "0.0.11", "husky": "8.0.1",
"esserializer": "1.3.2", "jsdom": "20.0.0",
"husky": "8.0.1", "lint-staged": "13.0.3",
"jsdom": "20.0.1", "node-html-parser": "5.4.1",
"lint-staged": "13.0.3", "postcss": "8.4.16",
"node-html-parser": "6.1.1", "postcss-load-config": "4.0.1",
"postcss": "8.4.18", "prettier": "2.7.1",
"postcss-load-config": "4.0.1", "prettier-plugin-svelte": "2.7.0",
"prettier": "2.7.1", "svelte": "3.49.0",
"prettier-plugin-svelte": "2.8.0", "svelte-preprocess": "4.10.7",
"svelte": "3.53.1", "tailwindcss": "3.1.8",
"svelte-preprocess": "4.10.7", "tslib": "2.4.0",
"tailwindcss": "3.2.1", "typescript": "4.8.2",
"tslib": "2.4.0", "vite": "3.0.9",
"typescript": "4.8.4", "vitest": "0.22.1",
"vite": "3.2.2", "vitest-svelte-kit": "0.0.7"
"vitest": "0.25.1" },
}, "dependencies": {
"dependencies": { "@analytics/google-analytics": "1.0.3",
"@mermaid-js/mermaid-mindmap": "9.2.2", "@macfja/svelte-persistent-store": "2.0.0",
"analytics": "0.8.1", "analytics": "0.8.1",
"analytics-plugin-plausible": "0.0.6", "analytics-plugin-plausible": "^0.0.6",
"daisyui": "2.39.1", "daisyui": "2.24.0",
"js-base64": "3.7.2", "js-base64": "3.7.2",
"mermaid": "9.2.2", "mermaid": "9.1.6",
"moment": "2.29.4", "moment": "2.29.4",
"monaco-editor": "0.34.1", "monaco-editor": "0.34.0",
"monaco-mermaid": "1.0.6", "monaco-mermaid": "1.0.6",
"pako": "2.1.0", "pako": "2.0.4",
"random-word-slugs": "0.1.6", "random-word-slugs": "0.1.6",
"svg-pan-zoom": "3.6.1", "svg-pan-zoom": "^3.6.1",
"uuid": "9.0.0" "uuid": "^8.3.2"
}, },
"lint-staged": { "lint-staged": {
"*.{ts,svelte,js,css,md,json}": [ "*.{ts,svelte,js,css,md,json}": [
"prettier --plugin-search-dir=. --write", "prettier --plugin-search-dir=. --write",
"eslint --ignore-path .gitignore " "eslint --ignore-path .gitignore "
] ]
}, },
"volta": { "volta": {
"node": "18.12.0", "node": "18.5.0",
"yarn": "1.22.19" "yarn": "1.22.10"
}, },
"engines": { "engines": {
"node": ">=16.7" "node": ">=16.7"
} }
} }
+10 -10
View File
@@ -6,18 +6,18 @@ const mode = process.env.NODE_ENV;
const dev = mode === 'development'; const dev = mode === 'development';
module.exports = { module.exports = {
plugins: [ plugins: [
// Some plugins, like postcss-nested, need to run before Tailwind // Some plugins, like postcss-nested, need to run before Tailwind
tailwindcss, tailwindcss,
// But others, like autoprefixer, need to run after // But others, like autoprefixer, need to run after
autoprefixer, autoprefixer,
!dev && !dev &&
cssnano({ cssnano({
preset: 'default' preset: 'default'
}) })
] ]
}; };
+26 -22
View File
@@ -1,24 +1,28 @@
{ {
"extends": [ "extends": [
"config:base", "config:base",
":rebaseStalePrs", ":rebaseStalePrs",
"group:allNonMajor", "group:allNonMajor",
"schedule:earlyMondays", "schedule:earlyMondays",
":automergeMinor", ":automergeMinor",
":automergeTesters", ":automergeTesters",
":automergeLinters", ":automergeLinters",
":automergeTypes", ":automergeTypes",
":automergePatch" ":automergePatch"
], ],
"packageRules": [ "packageRules": [
{ {
"matchUpdateTypes": ["minor", "patch", "pin", "digest"], "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
"automerge": true "automerge": true
} },
], {
"dependencyDashboard": true, "matchDatasources": ["npm"],
"major": { "stabilityDays": 3
"dependencyDashboardApproval": true }
}, ],
"dependencyDashboardAutoclose": true "dependencyDashboard": true,
"major": {
"dependencyDashboardApproval": true
},
"dependencyDashboardAutoclose": true
} }
+52 -54
View File
@@ -1,57 +1,55 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Online FlowChart &amp; Diagrams Editor - Mermaid Live Editor</title> <title>Online FlowChart &amp; Diagrams Editor - Mermaid Live Editor</title>
<meta <meta
name="og:image" name="og:image"
content="https://github.com/mermaid-js/mermaid/raw/develop/img/header.png" /> content="https://github.com/mermaid-js/mermaid/raw/develop/img/header.png" />
<link rel="canonical" href="https://mermaid.live" /> <link rel="canonical" href="https://mermaid.live" />
<meta <meta
name="description" 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." /> 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="%sveltekit.assets%/favicon.svg" /> <link rel="icon" type="image/png" href="%sveltekit.assets%/favicon.png" />
<link rel="mask-icon" href="%sveltekit.assets%/favicon.svg" color="#000000" /> <link rel="manifest" href="%sveltekit.assets%/manifest.json" />
<meta name="theme-color" content="#6366F1" /> <link
<link rel="manifest" href="%sveltekit.assets%/manifest.json" /> rel="stylesheet"
<link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css"
rel="stylesheet" integrity="sha512-HK5fgLBL+xu6dm/Ii3z4xhlSUyZgTT9tuc/hSrtw6uzJOvgRr2a9jyxxT1ely+B+xFAmJKVSTbpM/CuL7qxO8w=="
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css" crossorigin="anonymous"
integrity="sha512-xh6O/CkQoPOWDdYTDqeRdPCVd1SpvCA9XXcUnZS2FmJNp1coAFzvtCN9BmamE+4aHK8yyUHUSCcJHgXloTyT2A==" referrerpolicy="no-referrer" />
crossorigin="anonymous" <link
referrerpolicy="no-referrer" /> rel="stylesheet"
<link href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/editor/editor.main.min.css"
rel="stylesheet" integrity="sha512-iQEIc0rsSDujsfjtD+lfyJ1W23Bh/lbgriubKDAym6VlEIDRj9rrbSIyJRyshOrl8s0yRcQ0+gyrZfSLyjJGWQ=="
href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.min.css" crossorigin="anonymous"
integrity="sha512-GzcoZD7y5zvBofYtImXPZaPVhoY7xLPt+ysmbPb/vU+quSKFkcngxaSrxuwprDZL4MALUqGFmnqCxQZqMozv1Q==" referrerpolicy="no-referrer" />
crossorigin="anonymous" <script>
referrerpolicy="no-referrer" /> var require = {
<script> paths: {
var require = { vs: "https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs",
paths: { },
vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs' };
} </script>
}; <script
</script> src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/loader.min.js"
<script integrity="sha512-6bIYsGqvLpAiEBXPdRQeFf5cueeBECtAKJjIHer3BhBZNTV3WLcLA8Tm3pDfxUwTMIS+kAZwTUvJ1IrMdX8C5w=="
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/loader.min.js" crossorigin="anonymous"
integrity="sha512-6bIYsGqvLpAiEBXPdRQeFf5cueeBECtAKJjIHer3BhBZNTV3WLcLA8Tm3pDfxUwTMIS+kAZwTUvJ1IrMdX8C5w==" referrerpolicy="no-referrer"></script>
crossorigin="anonymous" <script
referrerpolicy="no-referrer"></script> src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/editor/editor.main.nls.min.js"
<script integrity="sha512-CCv+DKWw+yZhxf4Z+ExT6HC5G+3S45TeMTYcJyYbdrv4BpK2vyALJ4FoVR/KGWDIPu7w4tNCOC9MJQIkYPR5FA=="
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.nls.min.js" crossorigin="anonymous"
integrity="sha512-CCv+DKWw+yZhxf4Z+ExT6HC5G+3S45TeMTYcJyYbdrv4BpK2vyALJ4FoVR/KGWDIPu7w4tNCOC9MJQIkYPR5FA==" referrerpolicy="no-referrer"></script>
crossorigin="anonymous" <script
referrerpolicy="no-referrer"></script> src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs/editor/editor.main.js"
<script integrity="sha512-TTPQbVI87mnVMV+1KbkKJ8vdQ4QqqbKyuTtJ9wQD8CqnwQLSQgXH7MWOQ88VO7pRzxWhqI1vYDeEV651sAH4ig=="
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.js" crossorigin="anonymous"
integrity="sha512-BtSZPhzoyN8kq1axY6cgOFPSgLJgFwvAZ3WxeDGxEFXeFcFuK2s7Hr+zF75npVHASUY1dxudAfIVzwmgdR89Bw==" referrerpolicy="no-referrer"></script>
crossorigin="anonymous" %sveltekit.head%
referrerpolicy="no-referrer"></script> </head>
%sveltekit.head% <body>
</head> <div id="svelte">%sveltekit.body%</div>
<body> </body>
<div id="svelte">%sveltekit.body%</div>
</body>
</html> </html>
+2 -2
View File
@@ -3,8 +3,8 @@
@tailwind utilities; @tailwind utilities;
.input { .input {
@apply flex-1 border-primary border-solid border-2 rounded; @apply flex-1 border-primary border-solid border-2 rounded;
} }
.action-btn { .action-btn {
@apply btn btn-primary; @apply btn btn-primary;
} }
-14
View File
@@ -1,14 +0,0 @@
/// <reference types="vite/client" />
interface ImportMetaEnv {
readonly MERMAID_RENDERER_URL: string;
readonly MERMAID_KROKI_RENDERER_URL: string;
readonly MERMAID_CDN_URL: string;
readonly MERMAID_BASE_URL: string;
readonly MERMAID_LOCAL: boolean;
// more env variables...
}
interface ImportMeta {
readonly env: ImportMetaEnv;
}
+6 -6
View File
@@ -6,10 +6,10 @@
import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers'; import type { TestingLibraryMatchers } from '@testing-library/jest-dom/matchers';
declare global { declare global {
namespace jest { namespace jest {
interface Matchers<R = void> interface Matchers<R = void>
// eslint-disable-next-line @typescript-eslint/ban-ts-comment // eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore // @ts-ignore
extends TestingLibraryMatchers<typeof expect.stringContaining, R> {} extends TestingLibraryMatchers<typeof expect.stringContaining, R> {}
} }
} }
+5 -2
View File
@@ -1,6 +1,9 @@
import type { Handle } from '@sveltejs/kit'; import type { Handle } from '@sveltejs/kit';
export const handle: Handle = async ({ event, resolve }) => { export const handle: Handle = async ({ event, resolve }) => {
const response = await resolve(event, {}); const response = await resolve(event, {
return response; ssr: false
});
return response;
}; };
-260
View File
@@ -1,260 +0,0 @@
<script lang="ts">
import { browser } from '$app/environment';
import Card from '$lib/components/Card/Card.svelte';
import { env } from '$lib/util/env';
import { pakoSerde } from '$lib/util/serde';
import { stateStore } from '$lib/util/state';
import { logEvent } from '$lib/util/stats';
import { toBase64 } from 'js-base64';
import moment from 'moment';
const { krokiRendererUrl, rendererUrl } = env;
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 = getSvgEl();
}
const svgString = svg.outerHTML
.replaceAll('<br>', '<br/>')
.replaceAll(/<img([^>]*)>/g, (m, g: string) => `<img ${g} />`);
return toBase64(svgString);
};
const exportImage = (event: Event, exporter: Exporter) => {
const canvas: HTMLCanvasElement = document.createElement('canvas');
const svg: HTMLElement = document.querySelector('#container svg');
const box: DOMRect = svg.getBoundingClientRect();
canvas.width = box.width;
canvas.height = box.height;
if (imagemodeselected === 'width') {
const ratio = box.height / box.width;
canvas.width = userimagesize;
canvas.height = userimagesize * ratio;
} else if (imagemodeselected === 'height') {
const ratio = box.width / box.height;
canvas.width = userimagesize * ratio;
canvas.height = userimagesize;
}
const context = canvas.getContext('2d');
context.fillStyle = 'white';
context.fillRect(0, 0, canvas.width, canvas.height);
const image = new Image();
image.onload = exporter(context, image);
image.src = `data:image/svg+xml;base64,${getBase64SVG(svg, canvas.width, canvas.height)}`;
event.stopPropagation();
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;
a.href = href;
a.click();
a.remove();
};
const downloadImage: Exporter = (context, image) => {
return () => {
const { canvas } = context;
context.drawImage(image, 0, 0, canvas.width, canvas.height);
simulateDownload(
getFileName('png'),
canvas.toDataURL('image/png').replace('image/png', 'image/octet-stream')
);
};
};
const isClipboardAvailable = (): boolean => {
return Object.prototype.hasOwnProperty.call(window, 'ClipboardItem') as boolean;
};
const clipboardCopy: Exporter = (context, image) => {
return () => {
const { canvas } = context;
context.drawImage(image, 0, 0, canvas.width, canvas.height);
canvas.toBlob((blob) => {
try {
// @ts-ignore: https://github.com/microsoft/TypeScript-DOM-lib-generator/pull/1004/files
void navigator.clipboard.write([
/* eslint-disable no-undef */
// @ts-ignore: https://github.com/microsoft/TypeScript/issues/43821
new ClipboardItem({
[blob.type]: blob
})
]);
} catch (error) {
console.error(error);
}
});
};
};
const onCopyClipboard = (event: Event) => {
exportImage(event, clipboardCopy);
logEvent('copyClipboard');
};
const onDownloadPNG = (event: Event) => {
exportImage(event, downloadImage);
logEvent('download', {
type: 'png'
});
};
const onDownloadSVG = () => {
simulateDownload(getFileName('svg'), `data:image/svg+xml;base64,${getBase64SVG()}`);
logEvent('download', {
type: 'svg'
});
};
const onCopyMarkdown = () => {
(document.getElementById('markdown') as HTMLInputElement).select();
document.execCommand('Copy');
logEvent('copyMarkdown');
};
let gistURL = '';
stateStore.subscribe(({ loader }) => {
if (loader?.type === 'gist') {
// @ts-ignore Gist will have url
gistURL = loader.config.url;
}
});
const loadGist = () => {
if (!gistURL) {
alert('Please enter a Gist URL first');
}
window.location.href = `${window.location.pathname}?gist=${gistURL}`;
logEvent('loadGist');
};
let iUrl: string;
let svgUrl: string;
let krokiUrl: string;
let mdCode: string;
let imagemodeselected = 'auto';
let userimagesize = 1080;
let isNetlify = false;
if (browser && ['mermaid.live', 'netlify'].some((path) => window.location.host.includes(path))) {
isNetlify = true;
}
stateStore.subscribe(async (state) => {
const { code, serialized } = await state;
iUrl = `${rendererUrl}/img/${serialized}?type=png`;
svgUrl = `${rendererUrl}/svg/${serialized}`;
krokiUrl = `${krokiRendererUrl}/mermaid/svg/${pakoSerde.serialize(code)}`;
mdCode = `[![](${iUrl})](${window.location.protocol}//${window.location.host}${window.location.pathname}#${serialized})`;
});
</script>
<Card title="Actions" isOpen={true}>
<div class="flex flex-wrap gap-2 m-2">
{#if isClipboardAvailable()}
<button class="action-btn w-full" on:click={onCopyClipboard}
><i class="far fa-copy mr-2" /> Copy Image to clipboard
</button>
{/if}
<button id="downloadPNG" class="action-btn flex-grow" on:click={onDownloadPNG}>
<i class="fas fa-download mr-2" /> PNG
</button>
<button id="downloadSVG" class="action-btn flex-grow" on:click={onDownloadSVG}>
<i class="fas fa-download mr-2" /> SVG
</button>
<a target="_blank" rel="noreferrer" class="flex-grow" href={iUrl}>
<button class="action-btn w-full">
<i class="fas fa-external-link-alt mr-2" /> PNG
</button>
</a>
<a target="_blank" rel="noreferrer" class="flex-grow" href={svgUrl}>
<button class="action-btn w-full">
<i class="fas fa-external-link-alt mr-2" /> SVG
</button>
</a>
<a target="_blank" rel="noreferrer" class="flex-grow" href={krokiUrl}>
<button class="action-btn w-full">
<i class="fas fa-external-link-alt mr-2" /> Kroki
</button>
</a>
<div class="flex gap-2 items-center">
PNG size
<label for="autosize">
<input type="radio" value="auto" id="autosize" bind:group={imagemodeselected} /> Auto
</label>
<label for="width">
<input type="radio" value="width" id="width" bind:group={imagemodeselected} /> Width
</label>
<label for="height">
<input type="radio" value="height" id="height" bind:group={imagemodeselected} /> Height
</label>
{#if imagemodeselected !== 'auto'}
<input
id="height"
class="input"
type="number"
min="3"
max="10000"
bind:value={userimagesize} />
{/if}
</div>
<div class="w-full flex gap-2 items-center">
<input class="input" id="markdown" type="text" value={mdCode} on:click={onCopyMarkdown} />
<label for="markdown">
<button class="btn btn-primary btn-md flex-auto" on:click={onCopyMarkdown}>
Copy Markdown
</button>
</label>
</div>
<div class="w-full flex gap-2 items-center">
<input
class="input"
id="gist"
type="text"
bind:value={gistURL}
placeholder="Enter Gist URL" />
<label for="gist">
<button class="btn btn-primary btn-md flex-auto" on:click={loadGist}> Load Gist </button>
</label>
</div>
{#if isNetlify}
<div class="w-full flex items-center justify-center">
<a class="link underline text-gray-500 text-sm" href="https://netlify.com">
This site is powered by Netlify
</a>
</div>
{/if}
</div>
</Card>
-31
View File
@@ -1,31 +0,0 @@
<script lang="ts">
import type { Tab } from '$lib/types';
import { slide } from 'svelte/transition';
import Tabs from './Tabs.svelte';
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;
</script>
<div class="card rounded overflow-hidden m-2 flex-grow flex flex-col shadow-2xl">
<div
class="bg-primary p-2 {isTabsShown ? 'pb-0' : ''} flex-none cursor-pointer"
on:click={() => (isOpen = !isOpen)}
on:keypress={() => (isOpen = !isOpen)}>
<div class="flex justify-between">
<Tabs on:select {tabs} bind:isOpen {title} {isCloseable} {activeTabID} />
<div class="flex gap-x-4 items-center {isTabsShown ? '-mt-2' : ''}">
<slot name="actions" />
</div>
</div>
</div>
{#if isOpen}
<div class="card-body p-0 flex-grow overflow-auto text-base-content" transition:slide>
<slot />
</div>
{/if}
</div>
-52
View File
@@ -1,52 +0,0 @@
<script lang="ts">
import type { Tab, TabEvents } from '$lib/types';
import { createEventDispatcher } from 'svelte';
import { fade } from 'svelte/transition';
export let isCloseable = true;
export let tabs: Tab[];
export let title: string;
export let isOpen = false;
export let activeTabID: string;
if (!activeTabID && tabs.length > 0) {
activeTabID = tabs[0].id;
}
const dispatch = createEventDispatcher<TabEvents>();
const toggleTabs = (tab: Tab) => {
activeTabID = tab.id;
dispatch('select', tab);
};
</script>
<div class="flex cursor-default">
<span
class="mr-2 font-semibold"
on:click|stopPropagation={() => (isOpen = !isOpen)}
on:keypress|stopPropagation={() => (isOpen = !isOpen)}>
{#if isCloseable}
<i class="fas fa-chevron-right icon" class:isOpen />
{/if}
{title}</span>
{#if isOpen && tabs}
<ul class="tabs" transition:fade>
{#each tabs as tab}
<div
class="tab tab-lifted {activeTabID === tab.id ? 'tab-active' : 'text-primary-content'}"
on:click|stopPropagation={() => toggleTabs(tab)}
on:keypress|stopPropagation={() => toggleTabs(tab)}>
<i class="mr-1 {tab.icon}" />
{tab.title}
</div>
{/each}
</ul>
{/if}
</div>
<style>
.icon {
transition-duration: 0.5s;
}
.isOpen {
transform: rotate(90deg);
}
</style>
@@ -1,3 +0,0 @@
// Vitest Snapshot v1
exports[`card.svelte > mounts 1`] = `"<div><div class=\\"card rounded overflow-hidden m-2 flex-grow flex flex-col shadow-2xl\\"><div class=\\"bg-primary p-2 pb-0 flex-none cursor-pointer\\"><div class=\\"flex justify-between\\"><div class=\\"flex cursor-default s-_wx1E_JHsCoF\\"><span class=\\"mr-2 font-semibold s-_wx1E_JHsCoF\\"><i class=\\"fas fa-chevron-right icon s-_wx1E_JHsCoF isOpen\\"></i> TabTest</span> <ul class=\\"tabs s-_wx1E_JHsCoF\\"><div class=\\"tab tab-lifted tab-active s-_wx1E_JHsCoF\\"><i class=\\"mr-1 undefined s-_wx1E_JHsCoF\\"></i> title1 </div><div class=\\"tab tab-lifted text-primary-content s-_wx1E_JHsCoF\\"><i class=\\"mr-1 undefined s-_wx1E_JHsCoF\\"></i> title2 </div></ul></div><!--<Tabs>--> <div class=\\"flex gap-x-4 items-center -mt-2\\"></div></div></div> <div class=\\"card-body p-0 flex-grow overflow-auto text-base-content\\"></div></div><!--<Card>--></div>"`;
-24
View File
@@ -1,24 +0,0 @@
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();
});
});
-115
View File
@@ -1,115 +0,0 @@
<script lang="ts">
import type { EditorMode } from '$lib/types';
import { stateStore, updateCode, updateConfig } from '$lib/util/state';
import { themeStore } from '$lib/util/theme';
import { errorDebug, syncDiagram } from '$lib/util/util';
import type monaco from 'monaco-editor';
import { onMount } from 'svelte';
import initEditor from 'monaco-mermaid';
import { logEvent } from '$lib/util/stats';
let divEl: HTMLDivElement = null;
let editor: monaco.editor.IStandaloneCodeEditor;
let Monaco: typeof monaco;
let editorOptions: monaco.editor.IStandaloneEditorConstructionOptions = {
minimap: {
enabled: false
},
theme: 'mermaid',
overviewRulerLanes: 0
};
let text = '';
stateStore.subscribe(({ errorMarkers, editorMode, code, mermaid }) => {
console.log('editor store subscription', { code, mermaid });
if (!editor) return;
// Update editor text if it's different
const newText = editorMode === 'code' ? code : mermaid;
if (newText !== text) {
console.log('updating editor text', newText);
editor.setValue(newText);
text = newText;
}
// Update editor mode if it's different
const language = editorMode === 'code' ? 'mermaid' : 'json';
if (editor.getModel().getLanguageId() !== language) {
Monaco?.editor.setModelLanguage(editor.getModel(), language);
}
// Display/clear errors
Monaco?.editor.setModelMarkers(editor.getModel(), 'mermaid', errorMarkers);
});
themeStore.subscribe(({ isDark }) => {
editor && Monaco?.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid');
});
const handleUpdate = (text: string, mode: EditorMode) => {
console.log('editor HandleUpdate', { text, mode });
if (mode === 'code') {
updateCode(text);
} else {
updateConfig(text);
}
};
const loadMonaco = async () => {
console.log('Loading Monaco...');
// errorDebug();
let i = 0;
while (i++ < 500) {
// @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco.
Monaco = window.monaco;
if (Monaco !== undefined) {
return;
}
await new Promise((r) => setTimeout(r, 100));
}
alert('Loading Monaco Editor failed. Please try refreshing the page.');
};
onMount(async () => {
await loadMonaco(); // Fix https://github.com/mermaid-js/mermaid-live-editor/issues/175
initEditor(Monaco);
errorDebug(100);
editor = Monaco.editor.create(divEl, editorOptions);
editor.onDidChangeModelContent(({ isFlush, changes }) => {
const newText = editor.getValue();
console.log('editor onDidChangeModelContent', { text, newText, isFlush, changes });
if (text === newText || isFlush) {
return;
}
text = newText;
handleUpdate(text, $stateStore.editorMode);
});
editor.addAction({
id: 'mermaid-render-diagram',
label: 'Render Diagram',
keybindings: [Monaco.KeyMod.CtrlCmd | Monaco.KeyCode.Enter],
run: function () {
syncDiagram();
logEvent('renderDiagram', {
method: 'keyboadShortcut'
});
}
});
Monaco?.editor.setTheme($themeStore.isDark ? 'mermaid-dark' : 'mermaid');
const resizeObserver = new ResizeObserver((entries) => {
editor.layout({
height: entries[0].contentRect.height,
width: entries[0].contentRect.width
});
});
resizeObserver.observe(divEl.parentElement);
console.log(`editor mounted`);
return () => {
console.log(`editor disposed`);
editor.dispose();
};
});
</script>
<div bind:this={divEl} id="editor" class="overflow-hidden" />
-192
View File
@@ -1,192 +0,0 @@
<script lang="ts">
import Card from '$lib/components/Card/Card.svelte';
import { inputStateStore, getStateString } from '$lib/util/state';
import {
addHistoryEntry,
historyModeStore,
clearHistoryData,
getPreviousState,
historyStore,
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;
const tabSelectHandler = (message: CustomEvent<Tab>) => {
historyModeStore.set(message.detail.id as HistoryType);
};
let tabs: Tab[] = [
{
id: 'manual',
title: 'Saved',
icon: 'far fa-bookmark'
},
{
id: 'auto',
title: 'Timeline',
icon: 'fas fa-history'
}
];
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: $inputStateStore,
time: Date.now(),
type: auto ? 'auto' : 'manual'
});
} else if (!auto) {
notify('State already saved.');
}
};
const clearHistory = (id?: string): void => {
if (!id && !prompt('Clear all saved items?')) {
return;
}
clearHistoryData(id);
};
const restoreHistoryItem = (state: State): void => {
inputStateStore.set({ ...state, updateDiagram: true });
};
const relativeTime = (time: number) => {
const t = new Date(time);
return `${new Date(t).toLocaleString()} (${moment(t).fromNow()})`;
};
onMount(() => {
historyModeStore.set('manual');
setInterval(() => {
saveHistory(true);
}, HISTORY_SAVE_INTERVAL);
});
loaderHistoryStore.subscribe((entries) => {
if (entries.length > 0 && tabs.length === 2) {
tabs = [
{
id: 'loader',
title: 'Revisions',
icon: 'fab fa-git-alt'
},
...tabs
];
historyModeStore.set('loader');
}
});
let isOpen = false;
</script>
<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"
on:click|stopPropagation={() => saveHistory()}
title="Save current state"><i class="far fa-save" /></button>
{#if $historyModeStore !== 'loader'}
<button
id="clearHistory"
class="btn btn-xs btn-error w-12"
on:click|stopPropagation={() => clearHistory()}
title="Delete all saved states"><i class="fas fa-trash-alt" /></button>
{/if}
</div>
<ul class="p-2 space-y-2 overflow-auto h-56" id="historyList">
{#if $historyStore.length > 0}
{#each $historyStore as { id, state, time, name, url, type }}
<li class="rounded p-2 shadow flex-col">
<div class="flex">
<div class="flex-1">
<div class="flex flex-col text-base-content">
{#if url}
<a
href={url}
target="_blank"
rel="noreferrer"
title="Open revision in new tab"
class="hover:underline text-blue-500">{name}</a>
{:else}
<span>{name}</span>
{/if}
<span class="text-gray-400 text-sm">{relativeTime(time)}</span>
</div>
</div>
<div class="flex gap-2 content-center">
<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(id)}
><i class="fas fa-trash-alt mr-1" />Delete</button>
{/if}
</div>
</div>
</li>
{/each}
{:else}
<div class="m-2">
No items in History<br />
Click the Save button to save current state and restore it later.<br />
Timeline will automatically be saved every minute.
</div>
{/if}
</ul>
</Card>
-120
View File
@@ -1,120 +0,0 @@
import type { HistoryEntry } from '$lib/types';
import { describe, it, expect } from 'vitest';
import {
addHistoryEntry,
injectHistoryIDs,
clearHistoryData,
historyModeStore,
historyStore
} from './history';
import { defaultState } from '$lib/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);
});
});
-141
View File
@@ -1,141 +0,0 @@
import { derived, writable, get } from 'svelte/store';
import type { Readable, Writable } from 'svelte/store';
import { persist, localStorage } from '$lib/util/persist';
import { generateSlug } from 'random-word-slugs';
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;
export const historyModeStore: Writable<HistoryType> = persist(
writable('manual'),
localStorage(),
'autoHistoryMode'
);
const autoHistoryStore: Writable<HistoryEntry[]> = persist(
writable([]),
localStorage(),
'autoHistoryStore'
);
const manualHistoryStore: Writable<HistoryEntry[]> = persist(
writable([]),
localStorage(),
'manualHistoryStore'
);
export const loaderHistoryStore: Writable<HistoryEntry[]> = writable([] as HistoryEntry[]);
export const historyStore: Readable<HistoryEntry[]> = derived(
[historyModeStore, autoHistoryStore, manualHistoryStore, loaderHistoryStore],
([historyMode, autoHistories, manualHistories, loadedHistories], set) => {
if (historyMode === 'auto') {
set(autoHistories);
} else if (historyMode === 'manual') {
set(manualHistories);
} else if (historyMode === 'loader') {
set(loadedHistories);
} else {
set(autoHistories);
}
}
);
export const addHistoryEntry = (entryToAdd: Optional<HistoryEntry, 'id'>): void => {
const entry: HistoryEntry = {
...entryToAdd,
id: uuidV4()
};
if (entry.type === 'loader') {
loaderHistoryStore.update((entries) => [entry, ...entries]);
return;
}
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]);
logEvent('history', { action: 'save' });
}
};
export const clearHistoryData = (idToClear?: string): void => {
(get(historyModeStore) === 'auto' ? autoHistoryStore : manualHistoryStore).update((entries) => {
if (get(historyModeStore) !== 'loader') {
entries = entries.filter(({ id }) => idToClear && id != idToClear);
logEvent('history', { action: 'clear', type: idToClear ? 'single' : 'all' });
}
return entries;
});
};
export const getPreviousState = (auto: boolean): string => {
const entries = get(auto ? autoHistoryStore : manualHistoryStore);
if (entries.length > 0) {
return JSON.stringify(entries[0].state);
}
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;
};
-82
View File
@@ -1,82 +0,0 @@
<script context="module">
import { version } from 'mermaid/package.json';
import { analytics } from '$lib/util/stats';
analytics?.track('version', {
mermaidVersion: version
});
</script>
<script lang="ts">
import Theme from './Theme.svelte';
interface Link {
title: string;
href: string;
icon?: string;
}
const links: Link[] = [
{
title: 'Documentation',
href: 'https://mermaid-js.github.io/mermaid/#/n00b-gettingStarted'
},
{
title: 'Tutorial',
href: 'https://github.com/mermaid-js/mermaid/blob/develop/docs/Tutorials.md'
},
{
title: 'Mermaid',
href: 'https://github.com/mermaid-js/mermaid'
},
{
title: 'CLI',
href: 'https://github.com/mermaid-js/mermaid-cli'
},
{
title: '',
href: 'https://github.com/mermaid-js/mermaid-live-editor',
icon: 'fab fa-github fa-lg'
}
];
</script>
<div class="navbar shadow-lg bg-primary p-0">
<div class="flex-1 px-2 mx-2">
<span class="text-lg font-bold">
<a href="/">Mermaid<span class="text-xs font-thin">v{version}</span> Live Editor</a>
</span>
</div>
<label for="menu-toggle" class="pointer-cursor lg:hidden block"
><svg
class="fill-current "
xmlns="http://www.w3.org/2000/svg"
width="20"
height="20"
viewBox="0 0 20 20"
><title>Menu</title><path d="M0 3h20v2H0V3zm0 6h20v2H0V9zm0 6h20v2H0v-2z" /></svg
></label>
<input class="hidden" type="checkbox" id="menu-toggle" />
<Theme />
<div class="hidden lg:flex lg:items-center lg:w-auto w-full" id="menu">
<ul class="lg:flex items-center justify-between text-base pt-4 lg:pt-0">
{#each links as { title, href, icon }}
<li>
<a class="btn btn-ghost" target="_blank" rel="noreferrer" {href}>
{#if icon}
<i class={icon} />
{/if}
{title}</a>
</li>
{/each}
</ul>
</div>
</div>
<style>
#menu-toggle:checked + #menu {
display: block;
}
.navbar {
z-index: 10000;
}
</style>
-144
View File
@@ -1,144 +0,0 @@
<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: `graph TD
A[Christmas] -->|Get money| B(Go shopping)
B --> C{Let me think}
C -->|One| D[Laptop]
C -->|Two| E[iPhone]
C -->|Three| F[fa:fa-car Car]`,
Sequence: `sequenceDiagram
Alice->>+John: Hello John, how are you?
Alice->>+John: John, can you hear me?
John-->>-Alice: Hi Alice, I can hear you!
John-->>-Alice: I feel great!`,
Class: `classDiagram
Animal <|-- Duck
Animal <|-- Fish
Animal <|-- Zebra
Animal : +int age
Animal : +String gender
Animal: +isMammal()
Animal: +mate()
class Duck{
+String beakColor
+swim()
+quack()
}
class Fish{
-int sizeInFeet
-canEat()
}
class Zebra{
+bool is_wild
+run()
}`,
State: `stateDiagram-v2
[*] --> Still
Still --> [*]
Still --> Moving
Moving --> Still
Moving --> Crash
Crash --> [*]`,
Gantt: `gantt
title A Gantt Diagram
dateFormat YYYY-MM-DD
section Section
A task :a1, 2014-01-01, 30d
Another task :after a1 , 20d
section Another
Task in sec :2014-01-12 , 12d
another task : 24d`,
Pie: `pie title Pets adopted by volunteers
"Dogs" : 386
"Cats" : 85
"Rats" : 15`,
ER: `erDiagram
CUSTOMER }|..|{ DELIVERY-ADDRESS : has
CUSTOMER ||--o{ ORDER : places
CUSTOMER ||--o{ INVOICE : "liable for"
DELIVERY-ADDRESS ||--o{ ORDER : receives
INVOICE ||--|{ ORDER : covers
ORDER ||--|{ ORDER-ITEM : includes
PRODUCT-CATEGORY ||--|{ PRODUCT : contains
PRODUCT ||--o{ ORDER-ITEM : "ordered in"`,
'User Journey': `journey
title My working day
section Go to work
Make tea: 5: Me
Go upstairs: 3: Me
Do work: 1: Me, Cat
section Go home
Go downstairs: 5: Me
Sit down: 3: Me`,
Git: `gitGraph
commit
commit
branch develop
checkout develop
commit
commit
checkout main
merge develop
commit
commit`,
Mindmap: `mindmap
root((mindmap))
Origins
Long history
::icon(fa fa-book)
Popularisation
British popular psychology author Tony Buzan
Research
On effectivness<br/>and features
On Automatic creation
Uses
Creative techniques
Strategic planning
Argument mapping
Tools
Pen and paper
Mermaid`
};
const loadSampleDiagram = (diagramType: string): void => {
updateCode(samples[diagramType], {
updateDiagram: true,
resetPanZoom: true
});
logEvent('loadSampleDiagram', { diagramType });
};
// Adding in this array will add an icon to the preset menu
const newDiagrams: Array<keyof typeof samples> = ['Mindmap'];
const diagramOrder: Array<keyof typeof samples> = [
'Sequence',
'Flow',
'Class',
'State',
'ER',
'Gantt',
'User Journey',
'Git',
'Pie',
'Mindmap'
];
</script>
<Card title="Sample Diagrams" isOpen={false}>
<div class="flex flex-wrap p-2 gap-2">
{#each diagramOrder as sample}
<button
class="btn btn-sm btn-primary w-28 normal-case flex-grow"
on:click={() => loadSampleDiagram(sample)}>
{sample}
{#if newDiagrams.includes(sample)}
<span class="ml-2 fa fa-heart" />
{/if}
</button>
{/each}
</div>
</Card>
-64
View File
@@ -1,64 +0,0 @@
<script>
import { setTheme, themeStore } from '$lib/util/theme';
const themes = [
'🌝 light',
'🌚 dark',
'🧁 cupcake',
'🐝 bumblebee',
'✳️ emerald',
'🏢 corporate',
'🌃 synthwave',
'👴 retro',
'🤖 cyberpunk',
'🌸 valentine',
'🎃 halloween',
'🌷 garden',
'🌲 forest',
'🐟 aqua',
'👓 lofi',
'🖍 pastel',
'🧚‍♀️ fantasy',
'📝 wireframe',
'🏴 black',
'💎 luxury',
'🧛‍♂️ dracula'
];
</script>
<div class="hidden lg:block dropdown">
<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
<div tabindex="0" class="btn btn-ghost ">
<svg
xmlns="http://www.w3.org/2000/svg"
fill="none"
viewBox="0 0 24 24"
class="inline-block w-6 h-6 stroke-current md:mr-2"
><path
stroke-linecap="round"
stroke-linejoin="round"
stroke-width="2"
d="M7 21a4 4 0 01-4-4V5a2 2 0 012-2h4a2 2 0 012 2v12a4 4 0 01-4 4zm0 0h12a2 2 0 002-2v-4a2 2 0 00-2-2h-2.343M11 7.343l1.657-1.657a2 2 0 012.828 0l2.829 2.829a2 2 0 010 2.828l-8.486 8.485M7 17h.01" /></svg>
<span class="hidden md:inline"> Change Theme </span>
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 1792 1792"
class="inline-block w-4 h-4 ml-1 fill-current"
><path
d="M1395 736q0 13-10 23l-466 466q-10 10-23 10t-23-10l-466-466q-10-10-10-23t10-23l50-50q10-10 23-10t23 10l393 393 393-393q10-10 23-10t23 10l50 50q10 10 10 23z" /></svg>
</div>
<div
class="mt-14 overflow-y-auto shadow-2xl top-px dropdown-content h-96 w-56 bg-base-200 text-base-content">
<!-- svelte-ignore a11y-no-noninteractive-tabindex -->
<ul tabindex="0" class="p-4 menu compact">
{#each themes as theme}
<li class={theme.includes($themeStore.theme) ? 'bordered' : ''}>
<span
class="btn btn-ghost justify-start"
on:click={() => setTheme(theme)}
on:keypress={() => setTheme(theme)}>{theme}</span>
</li>
{/each}
</ul>
</div>
</div>
-157
View File
@@ -1,157 +0,0 @@
<script lang="ts">
import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state';
import { onMount } from 'svelte';
import panzoom from 'svg-pan-zoom';
import type { State, ValidatedState } from '$lib/types';
import { logEvent } from '$lib/util/stats';
import { AsyncQueue, cmdKey } from '$lib/util/util';
import { render as renderDiagram } from '$lib/util/mermaid';
let code = '';
let config = '';
let container: HTMLDivElement;
let view: HTMLDivElement;
let error = false;
let outOfSync = false;
let hide = false;
let manualUpdate = true;
let panZoomEnabled = $stateStore.panZoom;
let pzoom: SvgPanZoom.Instance;
const handlePanZoomChange = () => {
const pan = pzoom.getPan();
const zoom = pzoom.getZoom();
updateCodeStore({ pan, zoom });
logEvent('panZoom');
};
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;
});
};
const handleStateChange = async (state: ValidatedState) => {
if (state.error !== undefined) {
error = true;
return;
}
error = false;
try {
if (container && state && (state.updateDiagram || state.autoSync)) {
if (!state.autoSync) {
$inputStateStore.updateDiagram = false;
}
outOfSync = false;
manualUpdate = true;
// Do not render if there is no change in Code/Config/PanZoom
if (code === state.code && config === state.mermaid && panZoomEnabled === state.panZoom) {
return;
}
code = state.code;
config = state.mermaid;
panZoomEnabled = state.panZoom;
const scroll = view.parentElement.scrollTop;
delete container.dataset.processed;
await renderDiagram(
Object.assign({}, JSON.parse(state.mermaid)),
code,
'graph-div',
(svgCode, bindFunctions) => {
if (svgCode.length > 0) {
handlePanZoom(state);
container.innerHTML = svgCode;
// console.log(container.innerHTML);
const graphDiv = document.getElementById('graph-div');
graphDiv.setAttribute('height', '100%');
graphDiv.style.maxWidth = '100%';
if (bindFunctions) {
bindFunctions(graphDiv);
}
}
}
);
view.parentElement.scrollTop = scroll;
error = false;
} else if (manualUpdate) {
manualUpdate = false;
} else if (code !== state.code || config !== state.mermaid) {
outOfSync = true;
}
} catch (e) {
console.error('view fail', e);
error = true;
}
};
const q = new AsyncQueue(handleStateChange);
onMount(() => {
stateStore.subscribe(async (state) => {
await q.process(state);
});
window.addEventListener('resize', () => {
if ($stateStore.panZoom && pzoom) {
pzoom.resize();
}
});
console.log('View mounted');
});
</script>
{#if (error && $stateStore.error instanceof Error) || outOfSync}
<div
class="absolute w-full p-2 z-10 {error
? 'text-red-600'
: 'text-yellow-600'} bg-base-100 bg-opacity-80 text-center"
id="errorContainer">
{#if error}
{$stateStore.error}
{:else}
Diagram out of sync. <br />
Press <i class="fas fa-sync" /> (Sync button) or <kbd>{cmdKey} + Enter</kbd> to sync.
{/if}
</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 {
flex: 1;
}
#container {
transition: visibility 0.3s;
}
.error,
.outOfSync {
opacity: 0.5;
}
.hide {
visibility: hidden;
}
</style>
+230 -230
View File
@@ -1,260 +1,260 @@
<script lang="ts"> <script lang="ts">
import { browser } from '$app/environment'; import { browser } from '$app/env';
import Card from '$lib/components/Card/Card.svelte'; import Card from '$lib/components/card/card.svelte';
import { env } from '$lib/util/env'; import { krokiRendererUrl, rendererUrl } from '$lib/util/env';
import { pakoSerde } from '$lib/util/serde'; import { pakoSerde } from '$lib/util/serde';
import { stateStore } from '$lib/util/state'; import { stateStore } from '$lib/util/state';
import { logEvent } from '$lib/util/stats'; import { logEvent } from '$lib/util/stats';
import { toBase64 } from 'js-base64'; import { toBase64 } from 'js-base64';
import moment from 'moment'; import moment from 'moment';
const { krokiRendererUrl, rendererUrl } = env;
type Exporter = (context: CanvasRenderingContext2D, image: HTMLImageElement) => () => void; type Exporter = (context: CanvasRenderingContext2D, image: HTMLImageElement) => () => void;
const getFileName = (ext: string) => const getFileName = (ext: string) =>
`mermaid-diagram-${moment().format('YYYY-MM-DD-HHmmss')}.${ext}`; `mermaid-diagram-${moment().format('YYYY-MM-DD-HHmmss')}.${ext}`;
const getBase64SVG = (svg?: HTMLElement, width?: number, height?: number): string => { const getBase64SVG = (svg?: HTMLElement, width?: number, height?: number): string => {
svg?.setAttribute('height', `${height}px`); 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 svg?.setAttribute('width', `${width}px`); // Workaround https://stackoverflow.com/questions/28690643/firefox-error-rendering-an-svg-image-to-html5-canvas-with-drawimage
if (!svg) { if (!svg) {
svg = getSvgEl(); svg = getSvgEl();
} }
const svgString = svg.outerHTML const svgString = svg.outerHTML
.replaceAll('<br>', '<br/>') .replaceAll('<br>', '<br/>')
.replaceAll(/<img([^>]*)>/g, (m, g: string) => `<img ${g} />`); .replaceAll(/<img([^>]*)>/g, (m, g: string) => `<img ${g} />`);
return toBase64(svgString); return toBase64(svgString);
}; };
const exportImage = (event: Event, exporter: Exporter) => { const exportImage = (event: Event, exporter: Exporter) => {
const canvas: HTMLCanvasElement = document.createElement('canvas'); const canvas: HTMLCanvasElement = document.createElement('canvas');
const svg: HTMLElement = document.querySelector('#container svg'); const svg: HTMLElement = document.querySelector('#container svg');
const box: DOMRect = svg.getBoundingClientRect(); const box: DOMRect = svg.getBoundingClientRect();
canvas.width = box.width; canvas.width = box.width;
canvas.height = box.height; canvas.height = box.height;
if (imagemodeselected === 'width') { if (imagemodeselected === 'width') {
const ratio = box.height / box.width; const ratio = box.height / box.width;
canvas.width = userimagesize; canvas.width = userimagesize;
canvas.height = userimagesize * ratio; canvas.height = userimagesize * ratio;
} else if (imagemodeselected === 'height') { } else if (imagemodeselected === 'height') {
const ratio = box.width / box.height; const ratio = box.width / box.height;
canvas.width = userimagesize * ratio; canvas.width = userimagesize * ratio;
canvas.height = userimagesize; canvas.height = userimagesize;
} }
const context = canvas.getContext('2d'); const context = canvas.getContext('2d');
context.fillStyle = 'white'; context.fillStyle = 'white';
context.fillRect(0, 0, canvas.width, canvas.height); context.fillRect(0, 0, canvas.width, canvas.height);
const image = new Image(); const image = new Image();
image.onload = exporter(context, image); image.onload = exporter(context, image);
image.src = `data:image/svg+xml;base64,${getBase64SVG(svg, canvas.width, canvas.height)}`; image.src = `data:image/svg+xml;base64,${getBase64SVG(svg, canvas.width, canvas.height)}`;
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
}; };
const getSvgEl = () => { const getSvgEl = () => {
const svgEl: HTMLElement = document const svgEl: HTMLElement = document
.querySelector('#container svg') .querySelector('#container svg')
.cloneNode(true) as HTMLElement; .cloneNode(true) as HTMLElement;
svgEl.setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink'); svgEl.setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
const fontAwesomeCdnUrl = Array.from(document.head.getElementsByTagName('link')) const fontAwesomeCdnUrl = Array.from(document.head.getElementsByTagName('link'))
.map((l) => l.href) .map((l) => l.href)
.find((h) => h && h.includes('font-awesome')); .find((h) => h && h.includes('font-awesome'));
if (fontAwesomeCdnUrl == null) { if (fontAwesomeCdnUrl == null) {
return svgEl; return svgEl;
} }
const styleEl = document.createElement('style'); const styleEl = document.createElement('style');
styleEl.innerText = `@import url("${fontAwesomeCdnUrl}");'`; styleEl.innerText = `@import url("${fontAwesomeCdnUrl}");'`;
svgEl.prepend(styleEl); svgEl.prepend(styleEl);
return svgEl; return svgEl;
}; };
const simulateDownload = (download: string, href: string): void => { const simulateDownload = (download: string, href: string): void => {
const a = document.createElement('a'); const a = document.createElement('a');
a.download = download; a.download = download;
a.href = href; a.href = href;
a.click(); a.click();
a.remove(); a.remove();
}; };
const downloadImage: Exporter = (context, image) => { const downloadImage: Exporter = (context, image) => {
return () => { return () => {
const { canvas } = context; const { canvas } = context;
context.drawImage(image, 0, 0, canvas.width, canvas.height); context.drawImage(image, 0, 0, canvas.width, canvas.height);
simulateDownload( simulateDownload(
getFileName('png'), getFileName('png'),
canvas.toDataURL('image/png').replace('image/png', 'image/octet-stream') canvas.toDataURL('image/png').replace('image/png', 'image/octet-stream')
); );
}; };
}; };
const isClipboardAvailable = (): boolean => { const isClipboardAvailable = (): boolean => {
return Object.prototype.hasOwnProperty.call(window, 'ClipboardItem') as boolean; return Object.prototype.hasOwnProperty.call(window, 'ClipboardItem') as boolean;
}; };
const clipboardCopy: Exporter = (context, image) => { const clipboardCopy: Exporter = (context, image) => {
return () => { return () => {
const { canvas } = context; const { canvas } = context;
context.drawImage(image, 0, 0, canvas.width, canvas.height); context.drawImage(image, 0, 0, canvas.width, canvas.height);
canvas.toBlob((blob) => { canvas.toBlob((blob) => {
try { try {
// @ts-ignore: https://github.com/microsoft/TypeScript-DOM-lib-generator/pull/1004/files // @ts-ignore: https://github.com/microsoft/TypeScript-DOM-lib-generator/pull/1004/files
void navigator.clipboard.write([ void navigator.clipboard.write([
/* eslint-disable no-undef */ /* eslint-disable no-undef */
// @ts-ignore: https://github.com/microsoft/TypeScript/issues/43821 // @ts-ignore: https://github.com/microsoft/TypeScript/issues/43821
new ClipboardItem({ new ClipboardItem({
[blob.type]: blob [blob.type]: blob
}) })
]); ]);
} catch (error) { } catch (error) {
console.error(error); console.error(error);
} }
}); });
}; };
}; };
const onCopyClipboard = (event: Event) => { const onCopyClipboard = (event: Event) => {
exportImage(event, clipboardCopy); exportImage(event, clipboardCopy);
logEvent('copyClipboard'); void logEvent('copyClipboard');
}; };
const onDownloadPNG = (event: Event) => { const onDownloadPNG = (event: Event) => {
exportImage(event, downloadImage); exportImage(event, downloadImage);
logEvent('download', { void logEvent('download', {
type: 'png' type: 'png'
}); });
}; };
const onDownloadSVG = () => { const onDownloadSVG = () => {
simulateDownload(getFileName('svg'), `data:image/svg+xml;base64,${getBase64SVG()}`); simulateDownload(getFileName('svg'), `data:image/svg+xml;base64,${getBase64SVG()}`);
logEvent('download', { void logEvent('download', {
type: 'svg' type: 'svg'
}); });
}; };
const onCopyMarkdown = () => { const onCopyMarkdown = () => {
(document.getElementById('markdown') as HTMLInputElement).select(); (document.getElementById('markdown') as HTMLInputElement).select();
document.execCommand('Copy'); document.execCommand('Copy');
logEvent('copyMarkdown'); void logEvent('copyMarkdown');
}; };
let gistURL = ''; let gistURL = '';
stateStore.subscribe(({ loader }) => { stateStore.subscribe(({ loader }) => {
if (loader?.type === 'gist') { if (loader?.type === 'gist') {
// @ts-ignore Gist will have url // @ts-ignore Gist will have url
gistURL = loader.config.url; gistURL = loader.config.url;
} }
}); });
const loadGist = () => { const loadGist = () => {
if (!gistURL) { if (!gistURL) {
alert('Please enter a Gist URL first'); alert('Please enter a Gist URL first');
} }
window.location.href = `${window.location.pathname}?gist=${gistURL}`; window.location.href = `${window.location.pathname}?gist=${gistURL}`;
logEvent('loadGist'); void logEvent('loadGist');
}; };
let iUrl: string; let iUrl: string;
let svgUrl: string; let svgUrl: string;
let krokiUrl: string; let krokiUrl: string;
let mdCode: string; let mdCode: string;
let imagemodeselected = 'auto'; let imagemodeselected = 'auto';
let userimagesize = 1080; let userimagesize = 1080;
let isNetlify = false; let isNetlify = false;
if (browser && ['mermaid.live', 'netlify'].some((path) => window.location.host.includes(path))) { if (browser && ['mermaid.live', 'netlify'].some((path) => window.location.host.includes(path))) {
isNetlify = true; isNetlify = true;
} }
stateStore.subscribe(async (state) => { stateStore.subscribe(({ code, serialized }) => {
const { code, serialized } = await state; iUrl = `${rendererUrl}/img/${serialized}`;
iUrl = `${rendererUrl}/img/${serialized}?type=png`; svgUrl = `${rendererUrl}/svg/${serialized}`;
svgUrl = `${rendererUrl}/svg/${serialized}`; krokiUrl = `${krokiRendererUrl}/mermaid/svg/${pakoSerde.serialize(code)}`;
krokiUrl = `${krokiRendererUrl}/mermaid/svg/${pakoSerde.serialize(code)}`; mdCode = `[![](${iUrl})](${window.location.protocol}//${window.location.host}${window.location.pathname}#${serialized})`;
mdCode = `[![](${iUrl})](${window.location.protocol}//${window.location.host}${window.location.pathname}#${serialized})`; });
});
</script> </script>
<Card title="Actions" isOpen={true}> <Card title="Actions" isOpen={true}>
<div class="flex flex-wrap gap-2 m-2"> <div class="flex flex-wrap gap-2 m-2">
{#if isClipboardAvailable()} {#if isClipboardAvailable()}
<button class="action-btn w-full" on:click={onCopyClipboard} <button class="action-btn w-full" on:click={onCopyClipboard}
><i class="far fa-copy mr-2" /> Copy Image to clipboard ><i class="far fa-copy mr-2" /> Copy Image to clipboard
</button> </button>
{/if} {/if}
<button id="downloadPNG" class="action-btn flex-grow" on:click={onDownloadPNG}> <button id="downloadPNG" class="action-btn flex-auto" on:click={onDownloadPNG}>
<i class="fas fa-download mr-2" /> PNG <i class="fas fa-download mr-2" /> PNG
</button> </button>
<button id="downloadSVG" class="action-btn flex-grow" on:click={onDownloadSVG}> <button id="downloadSVG" class="action-btn flex-auto" on:click={onDownloadSVG}>
<i class="fas fa-download mr-2" /> SVG <i class="fas fa-download mr-2" /> SVG
</button> </button>
<a target="_blank" rel="noreferrer" class="flex-grow" href={iUrl}> <a target="_blank" href={iUrl}>
<button class="action-btn w-full"> <button class="action-btn flex-auto">
<i class="fas fa-external-link-alt mr-2" /> PNG <i class="fas fa-external-link-alt mr-2" /> PNG
</button> </button>
</a> </a>
<a target="_blank" rel="noreferrer" class="flex-grow" href={svgUrl}>
<button class="action-btn w-full">
<i class="fas fa-external-link-alt mr-2" /> SVG
</button>
</a>
<a target="_blank" rel="noreferrer" class="flex-grow" href={krokiUrl}>
<button class="action-btn w-full">
<i class="fas fa-external-link-alt mr-2" /> Kroki
</button>
</a>
<div class="flex gap-2 items-center"> <a target="_blank" href={svgUrl}>
PNG size <button class="action-btn flex-auto">
<label for="autosize"> <i class="fas fa-external-link-alt mr-2" /> SVG
<input type="radio" value="auto" id="autosize" bind:group={imagemodeselected} /> Auto </button>
</label> </a>
<label for="width"> <a target="_blank" href={krokiUrl}>
<input type="radio" value="width" id="width" bind:group={imagemodeselected} /> Width <button class="action-btn flex-auto">
</label> <i class="fas fa-external-link-alt mr-2" /> Kroki
</button>
</a>
<label for="height"> <div class="flex gap-2 items-center">
<input type="radio" value="height" id="height" bind:group={imagemodeselected} /> Height PNG size
</label> <label for="autosize">
<input type="radio" value="auto" id="autosize" bind:group={imagemodeselected} /> Auto
</label>
{#if imagemodeselected !== 'auto'} <label for="width">
<input <input type="radio" value="width" id="width" bind:group={imagemodeselected} /> Width
id="height" </label>
class="input"
type="number"
min="3"
max="10000"
bind:value={userimagesize} />
{/if}
</div>
<div class="w-full flex gap-2 items-center"> <label for="height">
<input class="input" id="markdown" type="text" value={mdCode} on:click={onCopyMarkdown} /> <input type="radio" value="height" id="height" bind:group={imagemodeselected} /> Height
<label for="markdown"> </label>
<button class="btn btn-primary btn-md flex-auto" on:click={onCopyMarkdown}>
Copy Markdown
</button>
</label>
</div>
<div class="w-full flex gap-2 items-center"> {#if imagemodeselected !== 'auto'}
<input <input
class="input" id="height"
id="gist" class="input"
type="text" type="number"
bind:value={gistURL} min="3"
placeholder="Enter Gist URL" /> max="10000"
<label for="gist"> bind:value={userimagesize} />
<button class="btn btn-primary btn-md flex-auto" on:click={loadGist}> Load Gist </button> {/if}
</label> </div>
</div>
{#if isNetlify} <div class="w-full flex gap-2 items-center">
<div class="w-full flex items-center justify-center"> <input class="input" id="markdown" type="text" value={mdCode} on:click={onCopyMarkdown} />
<a class="link underline text-gray-500 text-sm" href="https://netlify.com"> <label for="markdown">
This site is powered by Netlify <button class="btn btn-primary btn-md flex-auto" on:click={onCopyMarkdown}>
</a> Copy Markdown
</div> </button>
{/if} </label>
</div> </div>
<div class="w-full flex gap-2 items-center">
<input
class="input"
id="gist"
type="text"
bind:value={gistURL}
placeholder="Enter Gist URL" />
<label for="gist">
<button class="btn btn-primary btn-md flex-auto" on:click={loadGist}> Load Gist </button>
</label>
</div>
{#if isNetlify}
<div class="w-full flex items-center justify-center">
<a class="link underline text-gray-500 text-sm" href="https://netlify.com">
This site is powered by Netlify
</a>
</div>
{/if}
</div>
</Card> </Card>
+24 -26
View File
@@ -1,31 +1,29 @@
<script lang="ts"> <script lang="ts">
import type { Tab } from '$lib/types'; import type { Tab } from '$lib/types';
import { slide } from 'svelte/transition'; import { slide } from 'svelte/transition';
import Tabs from './Tabs.svelte'; import Tabs from './tabs.svelte';
export let isCloseable = true; export let isCloseable = true;
export let isOpen = true; export let isOpen = true;
export let tabs: Tab[] = []; export let tabs: Tab[] = [];
export let activeTabID: string = ''; export let title: string;
export let title: string; $: isOpen = isCloseable ? isOpen : true;
$: isOpen = isCloseable ? isOpen : true; $: isTabsShown = isOpen && tabs.length > 0;
$: isTabsShown = isOpen && tabs.length > 0;
</script> </script>
<div class="card rounded overflow-hidden m-2 flex-grow flex flex-col shadow-2xl"> <div class="card rounded overflow-hidden m-2 flex-grow flex flex-col shadow-2xl">
<div <div
class="bg-primary p-2 {isTabsShown ? 'pb-0' : ''} flex-none cursor-pointer" class="bg-primary p-2 {isTabsShown ? 'pb-0' : ''} flex-none cursor-pointer"
on:click={() => (isOpen = !isOpen)} on:click={() => (isOpen = !isOpen)}>
on:keypress={() => (isOpen = !isOpen)}> <div class="flex justify-between">
<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' : ''}">
<div class="flex gap-x-4 items-center {isTabsShown ? '-mt-2' : ''}"> <slot name="actions" />
<slot name="actions" /> </div>
</div> </div>
</div> </div>
</div> {#if isOpen}
{#if isOpen} <div class="card-body p-0 flex-grow overflow-auto text-base-content" transition:slide>
<div class="card-body p-0 flex-grow overflow-auto text-base-content" transition:slide> <slot />
<slot /> </div>
</div> {/if}
{/if}
</div> </div>
+18 -18
View File
@@ -1,24 +1,24 @@
import { cleanup, render } from '@testing-library/svelte'; import { cleanup, render } from '@testing-library/svelte';
import { describe, expect, it, afterEach } from 'vitest'; import { describe, expect, it, afterEach } from 'vitest';
import Card from './Card.svelte'; import Card from './card.svelte';
describe('card.svelte', () => { describe('card.svelte', () => {
// TODO: @testing-library/svelte claims to add this automatically but it doesn't work without explicit afterEach // TODO: @testing-library/svelte claims to add this automatically but it doesn't work without explicit afterEach
afterEach(() => cleanup()); afterEach(() => cleanup());
it('mounts', () => { it('mounts', () => {
const { container } = render(Card, { const { container } = render(Card, {
title: 'TabTest', title: 'TabTest',
tabs: [ tabs: [
{ id: 't1', title: 'title1' }, { id: 't1', title: 'title1' },
{ id: 't2', title: 'title2' } { id: 't2', title: 'title2' }
] ]
}); });
expect(container).toBeTruthy(); expect(container).toBeTruthy();
expect(container).toHaveTextContent('TabTest'); expect(container).toHaveTextContent('TabTest');
expect(container).toHaveTextContent('title1'); expect(container).toHaveTextContent('title1');
expect(container).toHaveTextContent('title2'); expect(container).toHaveTextContent('title2');
expect(container).not.toHaveTextContent('title3'); expect(container).not.toHaveTextContent('title3');
expect(container.innerHTML).toMatchSnapshot(); expect(container.innerHTML).toMatchSnapshot();
}); });
}); });
+37 -43
View File
@@ -1,52 +1,46 @@
<script lang="ts"> <script lang="ts">
import type { Tab, TabEvents } from '$lib/types'; import type { Tab, TabEvents } from '$lib/types';
import { createEventDispatcher } from 'svelte'; import { createEventDispatcher } from 'svelte';
import { fade } from 'svelte/transition'; import { fade } from 'svelte/transition';
export let isCloseable = true; export let isCloseable = true;
export let tabs: Tab[]; export let tabs: Tab[] = [];
export let title: string; export let title: string;
export let isOpen = false; export let isOpen = false;
export let activeTabID: string;
if (!activeTabID && tabs.length > 0) { $: activeTabID = tabs[0]?.id;
activeTabID = tabs[0].id;
} const dispatch = createEventDispatcher<TabEvents>();
const dispatch = createEventDispatcher<TabEvents>(); const toggleTabs = (tab: Tab) => {
const toggleTabs = (tab: Tab) => { activeTabID = tab.id;
activeTabID = tab.id; dispatch('select', tab);
dispatch('select', tab); };
};
</script> </script>
<div class="flex cursor-default"> <div class="flex cursor-default">
<span <span class="mr-2 font-semibold" on:click|stopPropagation={() => (isOpen = !isOpen)}>
class="mr-2 font-semibold" {#if isCloseable}
on:click|stopPropagation={() => (isOpen = !isOpen)} <i class="fas fa-chevron-right icon" class:isOpen />
on:keypress|stopPropagation={() => (isOpen = !isOpen)}> {/if}
{#if isCloseable} {title}</span>
<i class="fas fa-chevron-right icon" class:isOpen /> {#if isOpen && tabs}
{/if} <ul class="tabs" transition:fade>
{title}</span> {#each tabs as tab}
{#if isOpen && tabs} <div
<ul class="tabs" transition:fade> class="tab tab-lifted {activeTabID === tab.id ? 'tab-active' : 'text-primary-content'}"
{#each tabs as tab} on:click|stopPropagation={() => toggleTabs(tab)}>
<div <i class="mr-1 {tab.icon}" />
class="tab tab-lifted {activeTabID === tab.id ? 'tab-active' : 'text-primary-content'}" {tab.title}
on:click|stopPropagation={() => toggleTabs(tab)} </div>
on:keypress|stopPropagation={() => toggleTabs(tab)}> {/each}
<i class="mr-1 {tab.icon}" /> </ul>
{tab.title} {/if}
</div>
{/each}
</ul>
{/if}
</div> </div>
<style> <style>
.icon { .icon {
transition-duration: 0.5s; transition-duration: 0.5s;
} }
.isOpen { .isOpen {
transform: rotate(90deg); transform: rotate(90deg);
} }
</style> </style>
+100
View File
@@ -0,0 +1,100 @@
<script lang="ts">
import type { EditorEvents } from '$lib/types';
import { stateStore } from '$lib/util/state';
import { themeStore } from '$lib/util/theme';
import { syncDiagram } from '$lib/util/util';
import type monaco from 'monaco-editor';
import { createEventDispatcher, onMount } from 'svelte';
import initEditor from 'monaco-mermaid';
import { logEvent } from '$lib/util/stats';
let divEl: HTMLDivElement = null;
let editor: monaco.editor.IStandaloneCodeEditor;
let Monaco;
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
};
let oldText = text;
$: editor && Monaco?.editor.setModelLanguage(editor.getModel(), language);
const handleTextUpdate = (newText: string) => {
if (newText !== oldText) {
if ($stateStore.updateEditor) {
editor?.setValue(newText);
}
oldText = newText;
}
editor && Monaco?.editor.setModelMarkers(editor.getModel(), 'test', $stateStore.errorMarkers);
};
$: handleTextUpdate(text);
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(() => {
oldText = editor.getValue();
dispatch('update', {
text: oldText
});
});
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" />
+175 -176
View File
@@ -1,192 +1,191 @@
<script lang="ts"> <script lang="ts">
import Card from '$lib/components/Card/Card.svelte'; import Card from '$lib/components/card/card.svelte';
import { inputStateStore, getStateString } from '$lib/util/state'; import { inputStateStore, getStateString } from '$lib/util/state';
import { import {
addHistoryEntry, addHistoryEntry,
historyModeStore, historyModeStore,
clearHistoryData, clearHistoryData,
getPreviousState, getPreviousState,
historyStore, historyStore,
loaderHistoryStore, loaderHistoryStore,
restoreHistory restoreHistory
} from './history'; } from './history';
import { notify, prompt } from '$lib/util/notify'; import { notify, prompt } from '$lib/util/notify';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { get } from 'svelte/store'; import { get } from 'svelte/store';
import moment from 'moment'; import moment from 'moment';
import type { HistoryType, State, Tab } from '$lib/types'; import type { HistoryType, State, Tab } from '$lib/types';
import { logEvent } from '$lib/util/stats'; import { logEvent } from '$lib/util/stats';
const HISTORY_SAVE_INTERVAL = 60000; const HISTORY_SAVE_INTERVAL = 60000;
const tabSelectHandler = (message: CustomEvent<Tab>) => { const tabSelectHandler = (message: CustomEvent<Tab>) => {
historyModeStore.set(message.detail.id as HistoryType); historyModeStore.set(message.detail.id as HistoryType);
}; };
let tabs: Tab[] = [ let tabs: Tab[] = [
{ {
id: 'manual', id: 'manual',
title: 'Saved', title: 'Saved',
icon: 'far fa-bookmark' icon: 'far fa-bookmark'
}, },
{ {
id: 'auto', id: 'auto',
title: 'Timeline', title: 'Timeline',
icon: 'fas fa-history' icon: 'fas fa-history'
} }
]; ];
const downloadHistory = () => { const downloadHistory = () => {
const data = get(historyStore); const data = get(historyStore);
const blob = new Blob([JSON.stringify(data)], { type: 'application/json' }); const blob = new Blob([JSON.stringify(data)], { type: 'application/json' });
const url = URL.createObjectURL(blob); const url = URL.createObjectURL(blob);
const a = document.createElement('a'); const a = document.createElement('a');
a.href = url; a.href = url;
a.download = `mermaid-history-${moment().format('YYYY-MM-DD-HHmmss')}.json`; a.download = `mermaid-history-${moment().format('YYYY-MM-DD-HHmmss')}.json`;
a.click(); a.click();
URL.revokeObjectURL(url); URL.revokeObjectURL(url);
logEvent('history', { logEvent('history', {
action: 'download' action: 'download'
}); });
}; };
const uploadHistory = () => { const uploadHistory = () => {
const input = document.createElement('input'); const input = document.createElement('input');
input.type = 'file'; input.type = 'file';
input.accept = 'application/json'; input.accept = 'application/json';
input.addEventListener('change', ({ target }: Event) => { input.addEventListener('change', ({ target }: Event) => {
const file = (<HTMLInputElement>target).files[0]; const file = (<HTMLInputElement>target).files[0];
if (!file) { if (!file) {
return; return;
} }
const reader = new FileReader(); const reader = new FileReader();
reader.onload = (e) => { reader.onload = (e) => {
const data = JSON.parse(e.target.result as string); const data = JSON.parse(e.target.result as string);
restoreHistory(data); restoreHistory(data);
}; };
reader.readAsText(file); reader.readAsText(file);
}); });
input.click(); input.click();
}; };
const saveHistory = (auto = false) => { const saveHistory = (auto = false) => {
const currentState: string = getStateString(); const currentState: string = getStateString();
const previousState: string = getPreviousState(auto); const previousState: string = getPreviousState(auto);
if (previousState !== currentState) { if (previousState !== currentState) {
addHistoryEntry({ addHistoryEntry({
state: $inputStateStore, state: $inputStateStore,
time: Date.now(), time: Date.now(),
type: auto ? 'auto' : 'manual' type: auto ? 'auto' : 'manual'
}); });
} else if (!auto) { } else if (!auto) {
notify('State already saved.'); notify('State already saved.');
} }
}; };
const clearHistory = (id?: string): void => { const clearHistory = (id?: string): void => {
if (!id && !prompt('Clear all saved items?')) { if (!id && !prompt('Clear all saved items?')) {
return; return;
} }
clearHistoryData(id); clearHistoryData(id);
}; };
const restoreHistoryItem = (state: State): void => { const restoreHistoryItem = (state: State): void => {
inputStateStore.set({ ...state, updateDiagram: true }); inputStateStore.set({ ...state, updateEditor: true, updateDiagram: true });
}; };
const relativeTime = (time: number) => { const relativeTime = (time: number) => {
const t = new Date(time); const t = new Date(time);
return `${new Date(t).toLocaleString()} (${moment(t).fromNow()})`; return `${new Date(t).toLocaleString()} (${moment(t).fromNow()})`;
}; };
onMount(() => { onMount(() => {
historyModeStore.set('manual'); historyModeStore.set('manual');
setInterval(() => { setInterval(() => {
saveHistory(true); saveHistory(true);
}, HISTORY_SAVE_INTERVAL); }, HISTORY_SAVE_INTERVAL);
}); });
loaderHistoryStore.subscribe((entries) => { loaderHistoryStore.subscribe((entries) => {
if (entries.length > 0 && tabs.length === 2) { if (entries.length > 0 && tabs.length === 2) {
tabs = [ tabs = [
{ {
id: 'loader', id: 'loader',
title: 'Revisions', title: 'Revisions',
icon: 'fab fa-git-alt' icon: 'fab fa-git-alt'
}, },
...tabs ...tabs
]; ];
historyModeStore.set('loader'); historyModeStore.set('loader');
} }
}); });
let isOpen = false; let isOpen = false;
</script> </script>
<Card on:select={tabSelectHandler} bind:isOpen {tabs} title="History"> <Card on:select={tabSelectHandler} bind:isOpen {tabs} title="History">
<div slot="actions"> <div slot="actions">
<button <button
id="uploadHistory" id="uploadHistory"
class="btn btn-xs btn-secondary w-12" class="btn btn-xs btn-secondary w-12"
on:click|stopPropagation={() => uploadHistory()} on:click|stopPropagation={() => uploadHistory()}
title="Upload history"><i class="fa fa-upload" /></button> title="Upload history"><i class="fa fa-upload" /></button>
{#if $historyStore.length > 0} {#if $historyStore.length > 0}
<button <button
id="downloadHistory" id="downloadHistory"
class="btn btn-xs btn-secondary w-12" class="btn btn-xs btn-secondary w-12"
on:click|stopPropagation={() => downloadHistory()} on:click|stopPropagation={() => downloadHistory()}
title="Download history"><i class="fa fa-download" /></button> title="Download history"><i class="fa fa-download" /></button>
{/if} {/if}
| |
<button <button
id="saveHistory" id="saveHistory"
class="btn btn-xs btn-success w-12" class="btn btn-xs btn-success w-12"
on:click|stopPropagation={() => saveHistory()} on:click|stopPropagation={() => saveHistory()}
title="Save current state"><i class="far fa-save" /></button> title="Save current state"><i class="far fa-save" /></button>
{#if $historyModeStore !== 'loader'} {#if $historyModeStore !== 'loader'}
<button <button
id="clearHistory" id="clearHistory"
class="btn btn-xs btn-error w-12" class="btn btn-xs btn-error w-12"
on:click|stopPropagation={() => clearHistory()} on:click|stopPropagation={() => clearHistory()}
title="Delete all saved states"><i class="fas fa-trash-alt" /></button> title="Delete all saved states"><i class="fas fa-trash-alt" /></button>
{/if} {/if}
</div> </div>
<ul class="p-2 space-y-2 overflow-auto h-56" id="historyList"> <ul class="p-2 space-y-2 overflow-auto h-56" id="historyList">
{#if $historyStore.length > 0} {#if $historyStore.length > 0}
{#each $historyStore as { id, state, time, name, url, type }} {#each $historyStore as { id, state, time, name, url, type }}
<li class="rounded p-2 shadow flex-col"> <li class="rounded p-2 shadow flex-col">
<div class="flex"> <div class="flex">
<div class="flex-1"> <div class="flex-1">
<div class="flex flex-col text-base-content"> <div class="flex flex-col text-base-content">
{#if url} {#if url}
<a <a
href={url} href={url}
target="_blank" target="_blank"
rel="noreferrer" title="Open revision in new tab"
title="Open revision in new tab" class="hover:underline text-blue-500">{name}</a>
class="hover:underline text-blue-500">{name}</a> {:else}
{:else} <span>{name}</span>
<span>{name}</span> {/if}
{/if} <span class="text-gray-400 text-sm">{relativeTime(time)}</span>
<span class="text-gray-400 text-sm">{relativeTime(time)}</span> </div>
</div> </div>
</div> <div class="flex gap-2 content-center">
<div class="flex gap-2 content-center"> <button class="btn btn-success" on:click={() => restoreHistoryItem(state)}
<button class="btn btn-success" on:click={() => restoreHistoryItem(state)} ><i class="fas fa-undo mr-1" />Restore</button>
><i class="fas fa-undo mr-1" />Restore</button> {#if type !== 'loader'}
{#if type !== 'loader'} <button class="btn btn-error" on:click={() => clearHistory(id)}
<button class="btn btn-error" on:click={() => clearHistory(id)} ><i class="fas fa-trash-alt mr-1" />Delete</button>
><i class="fas fa-trash-alt mr-1" />Delete</button> {/if}
{/if} </div>
</div> </div>
</div> </li>
</li> {/each}
{/each} {:else}
{:else} <div class="m-2">
<div class="m-2"> No items in History<br />
No items in History<br /> Click the Save button to save current state and restore it later.<br />
Click the Save button to save current state and restore it later.<br /> Timeline will automatically be saved every minute.
Timeline will automatically be saved every minute. </div>
</div> {/if}
{/if} </ul>
</ul>
</Card> </Card>
-120
View File
@@ -1,120 +0,0 @@
import type { HistoryEntry } from '$lib/types';
import { describe, it, expect } from 'vitest';
import {
addHistoryEntry,
injectHistoryIDs,
clearHistoryData,
historyModeStore,
historyStore
} from './history';
import { defaultState } from '$lib/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);
});
});
+97 -97
View File
@@ -1,6 +1,6 @@
import { derived, writable, get } from 'svelte/store'; import { derived, writable, get } from 'svelte/store';
import type { Readable, Writable } from 'svelte/store'; import type { Readable, Writable } from 'svelte/store';
import { persist, localStorage } from '$lib/util/persist'; import { persist, createLocalStorage } from '@macfja/svelte-persistent-store';
import { generateSlug } from 'random-word-slugs'; import { generateSlug } from 'random-word-slugs';
import type { HistoryEntry, HistoryType, Optional } from '$lib/types'; import type { HistoryEntry, HistoryType, Optional } from '$lib/types';
import { v4 as uuidV4 } from 'uuid'; import { v4 as uuidV4 } from 'uuid';
@@ -9,133 +9,133 @@ import { logEvent } from '$lib/util/stats';
const MAX_AUTO_HISTORY_LENGTH = 30; const MAX_AUTO_HISTORY_LENGTH = 30;
export const historyModeStore: Writable<HistoryType> = persist( export const historyModeStore: Writable<HistoryType> = persist(
writable('manual'), writable('manual'),
localStorage(), createLocalStorage(),
'autoHistoryMode' 'autoHistoryMode'
); );
const autoHistoryStore: Writable<HistoryEntry[]> = persist( const autoHistoryStore: Writable<HistoryEntry[]> = persist(
writable([]), writable([]),
localStorage(), createLocalStorage(),
'autoHistoryStore' 'autoHistoryStore'
); );
const manualHistoryStore: Writable<HistoryEntry[]> = persist( const manualHistoryStore: Writable<HistoryEntry[]> = persist(
writable([]), writable([]),
localStorage(), createLocalStorage(),
'manualHistoryStore' 'manualHistoryStore'
); );
export const loaderHistoryStore: Writable<HistoryEntry[]> = writable([] as HistoryEntry[]); export const loaderHistoryStore: Writable<HistoryEntry[]> = writable([] as HistoryEntry[]);
export const historyStore: Readable<HistoryEntry[]> = derived( export const historyStore: Readable<HistoryEntry[]> = derived(
[historyModeStore, autoHistoryStore, manualHistoryStore, loaderHistoryStore], [historyModeStore, autoHistoryStore, manualHistoryStore, loaderHistoryStore],
([historyMode, autoHistories, manualHistories, loadedHistories], set) => { ([historyMode, autoHistories, manualHistories, loadedHistories], set) => {
if (historyMode === 'auto') { if (historyMode === 'auto') {
set(autoHistories); set(autoHistories);
} else if (historyMode === 'manual') { } else if (historyMode === 'manual') {
set(manualHistories); set(manualHistories);
} else if (historyMode === 'loader') { } else if (historyMode === 'loader') {
set(loadedHistories); set(loadedHistories);
} else { } else {
set(autoHistories); set(autoHistories);
} }
} }
); );
export const addHistoryEntry = (entryToAdd: Optional<HistoryEntry, 'id'>): void => { export const addHistoryEntry = (entryToAdd: Optional<HistoryEntry, 'id'>): void => {
const entry: HistoryEntry = { const entry: HistoryEntry = {
...entryToAdd, ...entryToAdd,
id: uuidV4() id: uuidV4()
}; };
if (entry.type === 'loader') { if (entry.type === 'loader') {
loaderHistoryStore.update((entries) => [entry, ...entries]); loaderHistoryStore.update((entries) => [entry, ...entries]);
return; return;
} }
if (!entry.name) { if (!entry.name) {
entry.name = generateSlug(2); entry.name = generateSlug(2);
} }
if (entry.type === 'auto') { if (entry.type === 'auto') {
autoHistoryStore.update((entries) => { autoHistoryStore.update((entries) => {
if (entries.length >= MAX_AUTO_HISTORY_LENGTH) { if (entries.length >= MAX_AUTO_HISTORY_LENGTH) {
entries = entries.slice(0, MAX_AUTO_HISTORY_LENGTH - 1); entries = entries.slice(0, MAX_AUTO_HISTORY_LENGTH - 1);
} }
return [entry, ...entries]; return [entry, ...entries];
}); });
} else if (entry.type === 'manual') { } else if (entry.type === 'manual') {
manualHistoryStore.update((entries) => [entry, ...entries]); manualHistoryStore.update((entries) => [entry, ...entries]);
logEvent('history', { action: 'save' }); logEvent('history', { action: 'save' });
} }
}; };
export const clearHistoryData = (idToClear?: string): void => { export const clearHistoryData = (idToClear?: string): void => {
(get(historyModeStore) === 'auto' ? autoHistoryStore : manualHistoryStore).update((entries) => { (get(historyModeStore) === 'auto' ? autoHistoryStore : manualHistoryStore).update((entries) => {
if (get(historyModeStore) !== 'loader') { if (get(historyModeStore) !== 'loader') {
entries = entries.filter(({ id }) => idToClear && id != idToClear); entries = entries.filter(({ id }) => idToClear && id != idToClear);
logEvent('history', { action: 'clear', type: idToClear ? 'single' : 'all' }); logEvent('history', { action: 'clear', type: idToClear ? 'single' : 'all' });
} }
return entries; return entries;
}); });
}; };
export const getPreviousState = (auto: boolean): string => { export const getPreviousState = (auto: boolean): string => {
const entries = get(auto ? autoHistoryStore : manualHistoryStore); const entries = get(auto ? autoHistoryStore : manualHistoryStore);
if (entries.length > 0) { if (entries.length > 0) {
return JSON.stringify(entries[0].state); return JSON.stringify(entries[0].state);
} }
return ''; return '';
}; };
export const restoreHistory = (data: HistoryEntry[]) => { export const restoreHistory = (data: HistoryEntry[]) => {
const entries = data.filter(validateEntry); const entries = data.filter(validateEntry);
const invalidEntryCount = data.length - entries.length; const invalidEntryCount = data.length - entries.length;
if (invalidEntryCount > 0) { if (invalidEntryCount > 0) {
console.error(`${invalidEntryCount} invalid history entries were removed.`); console.error(`${invalidEntryCount} invalid history entries were removed.`);
console.error(data); console.error(data);
} }
if (entries.length > 0) { if (entries.length > 0) {
let entryCount = 0; let entryCount = 0;
(entries[0].type === 'auto' ? autoHistoryStore : manualHistoryStore).update((existing) => { (entries[0].type === 'auto' ? autoHistoryStore : manualHistoryStore).update((existing) => {
const existingIDs = new Set(existing.map(({ id }) => id)); const existingIDs = new Set(existing.map(({ id }) => id));
const newEntries = entries.filter(({ id }) => !existingIDs.has(id)); const newEntries = entries.filter(({ id }) => !existingIDs.has(id));
entryCount = newEntries.length; entryCount = newEntries.length;
const combined = [...existing, ...newEntries]; const combined = [...existing, ...newEntries];
combined.sort((a, b) => b.time - a.time); combined.sort((a, b) => b.time - a.time);
return combined; return combined;
}); });
alert( alert(
`${entryCount} entries restored. ${invalidEntryCount} invalid, ${ `${entryCount} entries restored. ${invalidEntryCount} invalid, ${
entries.length - entryCount entries.length - entryCount
} duplicates.` } duplicates.`
); );
logEvent('history', { logEvent('history', {
action: 'restore', action: 'restore',
success: entryCount, success: entryCount,
invalid: invalidEntryCount, invalid: invalidEntryCount,
duplicates: entries.length - entryCount duplicates: entries.length - entryCount
}); });
} else { } else {
alert('No valid entries found.'); alert('No valid entries found.');
} }
}; };
export const injectHistoryIDs = (): void => { export const injectHistoryIDs = (): void => {
const setIDs = (entries: HistoryEntry[]) => { const setIDs = (entries: HistoryEntry[]) => {
for (const entry of entries) { for (const entry of entries) {
if (!entry.id) { if (!entry.id) {
entry.id = uuidV4(); entry.id = uuidV4();
} }
} }
return entries; return entries;
}; };
autoHistoryStore.update(setIDs); autoHistoryStore.update(setIDs);
manualHistoryStore.update(setIDs); manualHistoryStore.update(setIDs);
}; };
const validateEntry = (entry: HistoryEntry): boolean => { const validateEntry = (entry: HistoryEntry): boolean => {
return entry.type && entry.state && entry.time && true; return entry.type && entry.state && entry.time && true;
}; };
+70 -70
View File
@@ -1,82 +1,82 @@
<script context="module"> <script context="module">
import { version } from 'mermaid/package.json'; import { version } from 'mermaid/package.json';
import { analytics } from '$lib/util/stats'; import { analytics } from '$lib/util/stats';
analytics?.track('version', { analytics?.track('version', {
mermaidVersion: version mermaidVersion: version
}); });
</script> </script>
<script lang="ts"> <script lang="ts">
import Theme from './Theme.svelte'; import Theme from './theme.svelte';
interface Link { interface Link {
title: string; title: string;
href: string; href: string;
icon?: string; icon?: string;
} }
const links: Link[] = [ const links: Link[] = [
{ {
title: 'Documentation', title: 'Documentation',
href: 'https://mermaid-js.github.io/mermaid/#/n00b-gettingStarted' href: 'https://mermaid-js.github.io/mermaid/#/n00b-gettingStarted'
}, },
{ {
title: 'Tutorial', title: 'Tutorial',
href: 'https://github.com/mermaid-js/mermaid/blob/develop/docs/Tutorials.md' href: 'https://github.com/mermaid-js/mermaid/blob/develop/docs/Tutorials.md'
}, },
{ {
title: 'Mermaid', title: 'Mermaid',
href: 'https://github.com/mermaid-js/mermaid' href: 'https://github.com/mermaid-js/mermaid'
}, },
{ {
title: 'CLI', title: 'CLI',
href: 'https://github.com/mermaid-js/mermaid-cli' href: 'https://github.com/mermaid-js/mermaid-cli'
}, },
{ {
title: '', title: '',
href: 'https://github.com/mermaid-js/mermaid-live-editor', href: 'https://github.com/mermaid-js/mermaid-live-editor',
icon: 'fab fa-github fa-lg' icon: 'fab fa-github fa-lg'
} }
]; ];
</script> </script>
<div class="navbar shadow-lg bg-primary p-0"> <div class="navbar mb-2 shadow-lg bg-primary">
<div class="flex-1 px-2 mx-2"> <div class="flex-1 px-2 mx-2">
<span class="text-lg font-bold"> <span class="text-lg font-bold">
<a href="/">Mermaid<span class="text-xs font-thin">v{version}</span> Live Editor</a> <a href="/">Mermaid<span class="text-xs font-thin">v{version}</span> Live Editor</a>
</span> </span>
</div> </div>
<label for="menu-toggle" class="pointer-cursor lg:hidden block" <label for="menu-toggle" class="pointer-cursor lg:hidden block"
><svg ><svg
class="fill-current " class="fill-current "
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
width="20" width="20"
height="20" height="20"
viewBox="0 0 20 20" viewBox="0 0 20 20"
><title>Menu</title><path d="M0 3h20v2H0V3zm0 6h20v2H0V9zm0 6h20v2H0v-2z" /></svg ><title>Menu</title><path d="M0 3h20v2H0V3zm0 6h20v2H0V9zm0 6h20v2H0v-2z" /></svg
></label> ></label>
<input class="hidden" type="checkbox" id="menu-toggle" /> <input class="hidden" type="checkbox" id="menu-toggle" />
<Theme /> <Theme />
<div class="hidden lg:flex lg:items-center lg:w-auto w-full" id="menu"> <div class="hidden lg:flex lg:items-center lg:w-auto w-full" id="menu">
<ul class="lg:flex items-center justify-between text-base pt-4 lg:pt-0"> <ul class="lg:flex items-center justify-between text-base pt-4 lg:pt-0">
{#each links as { title, href, icon }} {#each links as { title, href, icon }}
<li> <li>
<a class="btn btn-ghost" target="_blank" rel="noreferrer" {href}> <a class="btn btn-ghost" target="_blank" {href}>
{#if icon} {#if icon}
<i class={icon} /> <i class={icon} />
{/if} {/if}
{title}</a> {title}</a>
</li> </li>
{/each} {/each}
</ul> </ul>
</div> </div>
</div> </div>
<style> <style>
#menu-toggle:checked + #menu { #menu-toggle:checked + #menu {
display: block; display: block;
} }
.navbar { .navbar {
z-index: 10000; z-index: 10000;
} }
</style> </style>
+60 -89
View File
@@ -1,21 +1,22 @@
<script lang="ts"> <script lang="ts">
import { updateCode } from '$lib/util/state'; import { updateCode } from '$lib/util/state';
import Card from '$lib/components/Card/Card.svelte'; import Card from '$lib/components/card/card.svelte';
import { logEvent } from '$lib/util/stats'; import { logEvent } from '$lib/util/stats';
const samples = { const samples = {
Flow: `graph TD 'Flow Chart': `graph TD
A[Christmas] -->|Get money| B(Go shopping) A[Christmas] -->|Get money| B(Go shopping)
B --> C{Let me think} B --> C{Let me think}
C -->|One| D[Laptop] C -->|One| D[Laptop]
C -->|Two| E[iPhone] C -->|Two| E[iPhone]
C -->|Three| F[fa:fa-car Car]`, C -->|Three| F[fa:fa-car Car]`,
Sequence: `sequenceDiagram 'Sequence Diagram': `sequenceDiagram
Alice->>+John: Hello John, how are you? Alice->>+John: Hello John, how are you?
Alice->>+John: John, can you hear me? Alice->>+John: John, can you hear me?
John-->>-Alice: Hi Alice, I can hear you! John-->>-Alice: Hi Alice, I can hear you!
John-->>-Alice: I feel great!`, John-->>-Alice: I feel great!
Class: `classDiagram `,
'Class Diagram': `classDiagram
Animal <|-- Duck Animal <|-- Duck
Animal <|-- Fish Animal <|-- Fish
Animal <|-- Zebra Animal <|-- Zebra
@@ -35,15 +36,17 @@
class Zebra{ class Zebra{
+bool is_wild +bool is_wild
+run() +run()
}`, }
State: `stateDiagram-v2 `,
'State Diagram': `stateDiagram-v2
[*] --> Still [*] --> Still
Still --> [*] Still --> [*]
Still --> Moving Still --> Moving
Moving --> Still Moving --> Still
Moving --> Crash Moving --> Crash
Crash --> [*]`, Crash --> [*]
Gantt: `gantt `,
'Gantt Chart': `gantt
title A Gantt Diagram title A Gantt Diagram
dateFormat YYYY-MM-DD dateFormat YYYY-MM-DD
section Section section Section
@@ -51,21 +54,24 @@
Another task :after a1 , 20d Another task :after a1 , 20d
section Another section Another
Task in sec :2014-01-12 , 12d Task in sec :2014-01-12 , 12d
another task : 24d`, another task : 24d
Pie: `pie title Pets adopted by volunteers `,
'Pie Chart': `pie title Pets adopted by volunteers
"Dogs" : 386 "Dogs" : 386
"Cats" : 85 "Cats" : 85
"Rats" : 15`, "Rats" : 15
ER: `erDiagram `,
CUSTOMER }|..|{ DELIVERY-ADDRESS : has 'ER Diagram': `erDiagram
CUSTOMER ||--o{ ORDER : places CUSTOMER }|..|{ DELIVERY-ADDRESS : has
CUSTOMER ||--o{ INVOICE : "liable for" CUSTOMER ||--o{ ORDER : places
DELIVERY-ADDRESS ||--o{ ORDER : receives CUSTOMER ||--o{ INVOICE : "liable for"
INVOICE ||--|{ ORDER : covers DELIVERY-ADDRESS ||--o{ ORDER : receives
ORDER ||--|{ ORDER-ITEM : includes INVOICE ||--|{ ORDER : covers
PRODUCT-CATEGORY ||--|{ PRODUCT : contains ORDER ||--|{ ORDER-ITEM : includes
PRODUCT ||--o{ ORDER-ITEM : "ordered in"`, PRODUCT-CATEGORY ||--|{ PRODUCT : contains
'User Journey': `journey PRODUCT ||--o{ ORDER-ITEM : "ordered in"
`,
'User Journey': ` journey
title My working day title My working day
section Go to work section Go to work
Make tea: 5: Me Make tea: 5: Me
@@ -73,72 +79,37 @@
Do work: 1: Me, Cat Do work: 1: Me, Cat
section Go home section Go home
Go downstairs: 5: Me Go downstairs: 5: Me
Sit down: 3: Me`, Sit down: 3: Me
Git: `gitGraph `,
commit 'Git Graph': ` gitGraph
commit commit
branch develop commit
checkout develop branch develop
commit checkout develop
commit commit
checkout main commit
merge develop checkout main
commit merge develop
commit`, commit
Mindmap: `mindmap commit
root((mindmap)) `
Origins };
Long history
::icon(fa fa-book)
Popularisation
British popular psychology author Tony Buzan
Research
On effectivness<br/>and features
On Automatic creation
Uses
Creative techniques
Strategic planning
Argument mapping
Tools
Pen and paper
Mermaid`
};
const loadSampleDiagram = (diagramType: string): void => { const loadSampleDiagram = (diagramType: string): void => {
updateCode(samples[diagramType], { updateCode(samples[diagramType], {
updateDiagram: true, updateDiagram: true,
resetPanZoom: true updateEditor: true,
}); resetPanZoom: true
logEvent('loadSampleDiagram', { diagramType }); });
}; void logEvent('loadSampleDiagram', { diagramType });
};
// Adding in this array will add an icon to the preset menu
const newDiagrams: Array<keyof typeof samples> = ['Mindmap'];
const diagramOrder: Array<keyof typeof samples> = [
'Sequence',
'Flow',
'Class',
'State',
'ER',
'Gantt',
'User Journey',
'Git',
'Pie',
'Mindmap'
];
</script> </script>
<Card title="Sample Diagrams" isOpen={false}> <Card title="Sample Diagrams" isOpen={false}>
<div class="flex flex-wrap p-2 gap-2"> <div class="flex gap-2 flex-wrap p-2">
{#each diagramOrder as sample} {#each Object.keys(samples) as sample}
<button <button class="btn btn-primary normal-case btn-sm" on:click={() => loadSampleDiagram(sample)}
class="btn btn-sm btn-primary w-28 normal-case flex-grow" >{sample}</button>
on:click={() => loadSampleDiagram(sample)}> {/each}
{sample} </div>
{#if newDiagrams.includes(sample)}
<span class="ml-2 fa fa-heart" />
{/if}
</button>
{/each}
</div>
</Card> </Card>
+53 -58
View File
@@ -1,64 +1,59 @@
<script> <script>
import { setTheme, themeStore } from '$lib/util/theme'; import { setTheme, themeStore } from '$lib/util/theme';
const themes = [ const themes = [
'🌝 light', '🌝 light',
'🌚 dark', '🌚 dark',
'🧁 cupcake', '🧁 cupcake',
'🐝 bumblebee', '🐝 bumblebee',
'✳️ emerald', '✳️ emerald',
'🏢 corporate', '🏢 corporate',
'🌃 synthwave', '🌃 synthwave',
'👴 retro', '👴 retro',
'🤖 cyberpunk', '🤖 cyberpunk',
'🌸 valentine', '🌸 valentine',
'🎃 halloween', '🎃 halloween',
'🌷 garden', '🌷 garden',
'🌲 forest', '🌲 forest',
'🐟 aqua', '🐟 aqua',
'👓 lofi', '👓 lofi',
'🖍 pastel', '🖍 pastel',
'🧚‍♀️ fantasy', '🧚‍♀️ fantasy',
'📝 wireframe', '📝 wireframe',
'🏴 black', '🏴 black',
'💎 luxury', '💎 luxury',
'🧛‍♂️ dracula' '🧛‍♂️ dracula'
]; ];
</script> </script>
<div class="hidden lg:block dropdown"> <div class="hidden lg:block dropdown">
<!-- svelte-ignore a11y-no-noninteractive-tabindex --> <div tabindex="0" class="btn btn-ghost ">
<div tabindex="0" class="btn btn-ghost "> <svg
<svg xmlns="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" fill="none"
fill="none" viewBox="0 0 24 24"
viewBox="0 0 24 24" class="inline-block w-6 h-6 stroke-current md:mr-2"
class="inline-block w-6 h-6 stroke-current md:mr-2" ><path
><path stroke-linecap="round"
stroke-linecap="round" stroke-linejoin="round"
stroke-linejoin="round" stroke-width="2"
stroke-width="2" d="M7 21a4 4 0 01-4-4V5a2 2 0 012-2h4a2 2 0 012 2v12a4 4 0 01-4 4zm0 0h12a2 2 0 002-2v-4a2 2 0 00-2-2h-2.343M11 7.343l1.657-1.657a2 2 0 012.828 0l2.829 2.829a2 2 0 010 2.828l-8.486 8.485M7 17h.01" /></svg>
d="M7 21a4 4 0 01-4-4V5a2 2 0 012-2h4a2 2 0 012 2v12a4 4 0 01-4 4zm0 0h12a2 2 0 002-2v-4a2 2 0 00-2-2h-2.343M11 7.343l1.657-1.657a2 2 0 012.828 0l2.829 2.829a2 2 0 010 2.828l-8.486 8.485M7 17h.01" /></svg> <span class="hidden md:inline"> Change Theme </span>
<span class="hidden md:inline"> Change Theme </span> <svg
<svg xmlns="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1792 1792"
viewBox="0 0 1792 1792" class="inline-block w-4 h-4 ml-1 fill-current"
class="inline-block w-4 h-4 ml-1 fill-current" ><path
><path d="M1395 736q0 13-10 23l-466 466q-10 10-23 10t-23-10l-466-466q-10-10-10-23t10-23l50-50q10-10 23-10t23 10l393 393 393-393q10-10 23-10t23 10l50 50q10 10 10 23z" /></svg>
d="M1395 736q0 13-10 23l-466 466q-10 10-23 10t-23-10l-466-466q-10-10-10-23t10-23l50-50q10-10 23-10t23 10l393 393 393-393q10-10 23-10t23 10l50 50q10 10 10 23z" /></svg> </div>
</div> <div
<div class="mt-14 overflow-y-auto shadow-2xl top-px dropdown-content h-96 w-56 bg-base-200 text-base-content">
class="mt-14 overflow-y-auto shadow-2xl top-px dropdown-content h-96 w-56 bg-base-200 text-base-content"> <ul tabindex="0" class="p-4 menu compact">
<!-- svelte-ignore a11y-no-noninteractive-tabindex --> {#each themes as theme}
<ul tabindex="0" class="p-4 menu compact"> <li class={theme.includes($themeStore.theme) ? 'bordered' : ''}>
{#each themes as theme} <span class="btn btn-ghost justify-start" on:click={() => setTheme(theme)}>{theme}</span>
<li class={theme.includes($themeStore.theme) ? 'bordered' : ''}> </li>
<span {/each}
class="btn btn-ghost justify-start" </ul>
on:click={() => setTheme(theme)} </div>
on:keypress={() => setTheme(theme)}>{theme}</span>
</li>
{/each}
</ul>
</div>
</div> </div>
+117 -140
View File
@@ -1,157 +1,134 @@
<script lang="ts"> <script lang="ts">
import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state'; import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import panzoom from 'svg-pan-zoom'; import mermaid from 'mermaid';
import type { State, ValidatedState } from '$lib/types'; import panzoom from 'svg-pan-zoom';
import { logEvent } from '$lib/util/stats'; import type { State } from '$lib/types';
import { AsyncQueue, cmdKey } from '$lib/util/util'; import { logEvent } from '$lib/util/stats';
import { render as renderDiagram } from '$lib/util/mermaid';
let code = ''; let code = '';
let config = ''; let config = '';
let container: HTMLDivElement; let container: HTMLDivElement;
let view: HTMLDivElement; let view: HTMLDivElement;
let error = false; let error = false;
let outOfSync = false; let outOfSync = false;
let hide = false; let hide = false;
let manualUpdate = true; let manualUpdate = true;
let panZoomEnabled = $stateStore.panZoom; let panZoomEnabled = $stateStore.panZoom;
let pzoom: SvgPanZoom.Instance; let pzoom: SvgPanZoom.Instance;
let debounce: number;
const handlePanZoomChange = () => { const handlePanZoomChange = () => {
const pan = pzoom.getPan(); const pan = pzoom.getPan();
const zoom = pzoom.getZoom(); const zoom = pzoom.getZoom();
updateCodeStore({ pan, zoom }); clearTimeout(debounce);
logEvent('panZoom'); debounce = window.setTimeout(() => {
}; updateCodeStore({ pan, zoom });
void logEvent('panZoom');
}, 200);
};
const handlePanZoom = (state: State) => { const handlePanZoom = (state: State) => {
if (!state.panZoom) { if (!state.panZoom) {
return; return;
} }
hide = true; hide = true;
pzoom?.destroy(); pzoom?.destroy();
pzoom = undefined; pzoom = undefined;
Promise.resolve().then(() => { Promise.resolve().then(() => {
const graphDiv = document.getElementById('graph-div'); const graphDiv = document.getElementById('graph-div');
pzoom = panzoom(graphDiv, { pzoom = panzoom(graphDiv, {
onPan: handlePanZoomChange, onPan: handlePanZoomChange,
onZoom: handlePanZoomChange, onZoom: handlePanZoomChange,
controlIconsEnabled: true, controlIconsEnabled: true,
fit: true, fit: true,
center: true center: true
}); });
const { pan, zoom } = state; const { pan, zoom } = state;
if (pan !== undefined && zoom !== undefined && Number.isFinite(zoom)) { if (pan !== undefined && zoom !== undefined && Number.isFinite(zoom)) {
pzoom.zoom(zoom); pzoom.zoom(zoom);
pzoom.pan(pan); pzoom.pan(pan);
} }
hide = false; hide = false;
}); });
}; };
const handleStateChange = async (state: ValidatedState) => { onMount(() => {
if (state.error !== undefined) { stateStore.subscribe((state) => {
error = true; if (state.error !== undefined) {
return; error = true;
} return;
error = false; }
try { error = false;
if (container && state && (state.updateDiagram || state.autoSync)) { try {
if (!state.autoSync) { if (container && state && (state.updateDiagram || state.autoSync)) {
$inputStateStore.updateDiagram = false; if (!state.autoSync) {
} $inputStateStore.updateDiagram = false;
outOfSync = false; }
manualUpdate = true; outOfSync = false;
// Do not render if there is no change in Code/Config/PanZoom manualUpdate = true;
if (code === state.code && config === state.mermaid && panZoomEnabled === state.panZoom) { if (code === state.code && config === state.mermaid && panZoomEnabled === state.panZoom) {
return; // Do not render if there is no change in Code/Config/PanZoom
} return;
code = state.code; }
config = state.mermaid; code = state.code;
panZoomEnabled = state.panZoom; config = state.mermaid;
const scroll = view.parentElement.scrollTop; panZoomEnabled = state.panZoom;
delete container.dataset.processed; const scroll = view.parentElement.scrollTop;
await renderDiagram( delete container.dataset.processed;
Object.assign({}, JSON.parse(state.mermaid)), mermaid.initialize(Object.assign({}, JSON.parse(state.mermaid)));
code, mermaid.render('graph-div', code, (svgCode) => {
'graph-div', if (svgCode.length > 0) {
(svgCode, bindFunctions) => { handlePanZoom(state);
if (svgCode.length > 0) { container.innerHTML = svgCode;
handlePanZoom(state); const graphDiv = document.getElementById('graph-div');
container.innerHTML = svgCode; graphDiv.setAttribute('height', '100%');
// console.log(container.innerHTML); graphDiv.style.maxWidth = '100%';
const graphDiv = document.getElementById('graph-div'); }
graphDiv.setAttribute('height', '100%'); });
graphDiv.style.maxWidth = '100%'; view.parentElement.scrollTop = scroll;
if (bindFunctions) { error = false;
bindFunctions(graphDiv); } else if (manualUpdate) {
} manualUpdate = false;
} } else if (code !== state.code || config !== state.mermaid) {
} outOfSync = true;
); }
view.parentElement.scrollTop = scroll; } catch (e) {
error = false; console.log('view fail', e);
} else if (manualUpdate) { error = true;
manualUpdate = false; }
} else if (code !== state.code || config !== state.mermaid) { });
outOfSync = true; window.addEventListener('resize', () => {
} if ($stateStore.panZoom && pzoom) {
} catch (e) { pzoom.resize();
console.error('view fail', e); }
error = true; });
} });
};
const q = new AsyncQueue(handleStateChange);
onMount(() => {
stateStore.subscribe(async (state) => {
await q.process(state);
});
window.addEventListener('resize', () => {
if ($stateStore.panZoom && pzoom) {
pzoom.resize();
}
});
console.log('View mounted');
});
</script> </script>
{#if (error && $stateStore.error instanceof Error) || outOfSync} {#if error && $stateStore.error instanceof Error}
<div <div class="p-2 text-red-600" id="errorContainer">{$stateStore.error}</div>
class="absolute w-full p-2 z-10 {error
? 'text-red-600'
: 'text-yellow-600'} bg-base-100 bg-opacity-80 text-center"
id="errorContainer">
{#if error}
{$stateStore.error}
{:else}
Diagram out of sync. <br />
Press <i class="fas fa-sync" /> (Sync button) or <kbd>{cmdKey} + Enter</kbd> to sync.
{/if}
</div>
{/if} {/if}
<div id="view" bind:this={view} class="p-2 h-full" class:error class:outOfSync> <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 id="container" bind:this={container} class="h-full overflow-auto" class:hide />
</div> </div>
<style> <style>
#view { #view {
flex: 1; flex: 1;
} }
#container { #container {
transition: visibility 0.3s; transition: visibility 0.3s;
} }
.error, .error,
.outOfSync { .outOfSync {
opacity: 0.5; opacity: 0.5;
} }
.hide { .hide {
visibility: hidden; visibility: hidden;
} }
</style> </style>
+50 -46
View File
@@ -3,84 +3,88 @@
* inside `global.d.ts` and removing `export` keyword * inside `global.d.ts` and removing `export` keyword
*/ */
export interface Locals { export interface Locals {
userid: string; userid: string;
} }
export interface MarkerData { export interface MarkerData {
severity: number; severity: number;
message: string; message: string;
source?: string; source?: string;
startLineNumber: number; startLineNumber: number;
startColumn: number; startColumn: number;
endLineNumber: number; endLineNumber: number;
endColumn: number; endColumn: number;
}
export interface EditorUpdateEvent {
text: string;
}
export interface EditorEvents {
update: EditorUpdateEvent;
} }
export interface TabEvents { export interface TabEvents {
select: Tab; select: Tab;
} }
export interface Tab { export interface Tab {
id: string; id: string;
title: string; title: string;
icon: string; icon: string;
} }
export interface State { export interface State {
code: string; code: string;
mermaid: string; mermaid: string;
updateDiagram: boolean; updateEditor: boolean;
autoSync: boolean; updateDiagram: boolean;
editorMode?: EditorMode; autoSync: boolean;
panZoom?: boolean; panZoom?: boolean;
pan?: { x: number; y: number }; pan?: { x: number; y: number };
zoom?: number; zoom?: number;
loader?: LoaderConfig; loader?: LoaderConfig;
} }
export interface ValidatedState extends State { export interface ValidatedState extends State {
editorMode: EditorMode; error: unknown;
error: unknown; errorMarkers: MarkerData[];
errorMarkers: MarkerData[]; serialized: string;
serialized: string;
} }
export interface GistLoaderConfig { export interface GistLoaderConfig {
url: string; url: string;
} }
export interface LoadingState { export interface LoadingState {
loading: boolean; loading: boolean;
message?: string; message?: string;
} }
export interface FileLoaderConfig { export interface FileLoaderConfig {
codeURL: string; codeURL: string;
configURL?: string; configURL?: string;
} }
export interface LoaderConfig { export interface LoaderConfig {
type: 'gist' | 'files'; type: 'gist' | 'files';
config: GistLoaderConfig | FileLoaderConfig; config: GistLoaderConfig | FileLoaderConfig;
} }
export type HistoryType = 'auto' | 'manual' | 'loader'; export type HistoryType = 'auto' | 'manual' | 'loader';
export type HistoryEntry = { id: string; state: State; time: number; url?: string } & ( export type HistoryEntry = { id: string; state: State; time: number; url?: string } & (
| { | {
type: 'loader'; type: 'loader';
name: string; name: string;
} }
| { | {
type: HistoryType; type: HistoryType;
name?: string; name?: string;
} }
); );
export interface DocConfig { export interface DocConfig {
[key: string]: { [key: string]: {
code: string; code: string;
config?: string; config?: string;
}; };
} }
export type EditorMode = 'code' | 'config';
export type Loader = (url: string) => Promise<State>; export type Loader = (url: string) => Promise<State>;
export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>; export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
+4 -9
View File
@@ -1,9 +1,4 @@
export const env = { export const rendererUrl: string =
rendererUrl: import.meta.env.MERMAID_RENDERER_URL ?? 'https://mermaid.ink', (import.meta.env.MERMAID_RENDERER_URL as string) ?? 'https://mermaid.ink';
krokiRendererUrl: import.meta.env.MERMAID_KROKI_RENDERER_URL ?? 'https://kroki.io', export const krokiRendererUrl: string =
mermaidCDNUrl: import.meta.env.MERMAID_CDN_URL ?? 'https://unpkg.com/@mermaid-js', (import.meta.env.MERMAID_KROKI_RENDERER_URL as string) ?? 'https://kroki.io';
mermaidBaseURL: import.meta.env.MERMAID_BASE_URL ?? 'http://localhost:9000',
useLocalMermaid: import.meta.env.MERMAID_LOCAL ?? false,
isDev: import.meta.env.DEV,
baseURL: import.meta.env.BASE_URL
};
+80 -80
View File
@@ -4,104 +4,104 @@
/* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-explicit-any */
import type { State } from '$lib/types'; import type { State } from '$lib/types';
import { defaultState } from '../state'; import { defaultState } from '../state';
import { addHistoryEntry } from '../../components/History/history'; import { addHistoryEntry } from '../../components/history/history';
const codeFileName = 'code.mmd'; const codeFileName = 'code.mmd';
const configFileName = 'config.json'; const configFileName = 'config.json';
const isValidGist = (files: any): boolean => { const isValidGist = (files: any): boolean => {
return codeFileName in files; return codeFileName in files;
}; };
const getFileContent = async (file: any): Promise<string> => { const getFileContent = async (file: any): Promise<string> => {
if (file.truncated) { if (file.truncated) {
return await (await fetch(file.raw_url)).text(); return await (await fetch(file.raw_url)).text();
} }
return file.content; return file.content;
}; };
interface GistData { interface GistData {
code: string; code: string;
config?: string; config?: string;
author: string; author: string;
time: number; time: number;
version: string; version: string;
url: string; url: string;
} }
const getGistData = async (gistURL: string): Promise<GistData> => { const getGistData = async (gistURL: string): Promise<GistData> => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars // eslint-disable-next-line @typescript-eslint/no-unused-vars
const [_, __, gistID, revisionID] = gistURL.split('github.com').pop().split('/'); const [_, __, gistID, revisionID] = gistURL.split('github.com').pop().split('/');
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const { html_url, files, history } = await ( const { html_url, files, history } = await (
await fetch(`https://api.github.com/gists/${gistID}${revisionID ? '/' + revisionID : ''}`) await fetch(`https://api.github.com/gists/${gistID}${revisionID ? '/' + revisionID : ''}`)
).json(); ).json();
if (isValidGist(files)) { if (isValidGist(files)) {
const code = await getFileContent(files[codeFileName]); const code = await getFileContent(files[codeFileName]);
let config: string; let config: string;
if (configFileName in files) { if (configFileName in files) {
config = await getFileContent(files[configFileName]); config = await getFileContent(files[configFileName]);
} }
const currentItem = history[0]; const currentItem = history[0];
return { return {
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
url: `${html_url}/${currentItem.version}`, url: `${html_url}/${currentItem.version}`,
code, code,
config, config,
author: currentItem.user.login, author: currentItem.user.login,
time: new Date(currentItem.committed_at).getTime(), time: new Date(currentItem.committed_at).getTime(),
version: (currentItem.version as string).slice(-7) version: (currentItem.version as string).slice(-7)
}; };
} else { } else {
throw 'Invalid gist provided'; throw 'Invalid gist provided';
} }
}; };
const getStateFromGist = (gist: GistData, gistURL: string = gist.url): State => { const getStateFromGist = (gist: GistData, gistURL: string = gist.url): State => {
const state: State = { const state: State = {
...defaultState, ...defaultState,
code: gist.code, code: gist.code,
loader: { loader: {
type: 'gist', type: 'gist',
config: { config: {
url: gistURL url: gistURL
} }
} }
}; };
gist.config && (state.mermaid = gist.config); gist.config && (state.mermaid = gist.config);
return state; return state;
}; };
export const loadGistData = async (gistURL: string): Promise<State> => { export const loadGistData = async (gistURL: string): Promise<State> => {
try { try {
// eslint-disable-next-line @typescript-eslint/no-unused-vars // eslint-disable-next-line @typescript-eslint/no-unused-vars
const [_, __, gistID, revisionID] = gistURL.split('github.com').pop().split('/'); const [_, __, gistID, revisionID] = gistURL.split('github.com').pop().split('/');
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const { history } = await ( const { history } = await (
await fetch(`https://api.github.com/gists/${gistID}${revisionID ? '/' + revisionID : ''}`) await fetch(`https://api.github.com/gists/${gistID}${revisionID ? '/' + revisionID : ''}`)
).json(); ).json();
const gistHistory: GistData[] = []; const gistHistory: GistData[] = [];
for (const entry of history) { for (const entry of history) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const data: GistData = await getGistData(entry.url).catch(() => undefined); const data: GistData = await getGistData(entry.url).catch(() => undefined);
data && gistHistory.push(data); data && gistHistory.push(data);
} }
if (gistHistory.length === 0) { if (gistHistory.length === 0) {
throw 'Invalid gist provided'; throw 'Invalid gist provided';
} }
gistHistory.reverse(); gistHistory.reverse();
const state = getStateFromGist(gistHistory.slice(-1).pop(), gistURL); const state = getStateFromGist(gistHistory.slice(-1).pop(), gistURL);
for (const gist of gistHistory) { for (const gist of gistHistory) {
addHistoryEntry({ addHistoryEntry({
state: getStateFromGist(gist), state: getStateFromGist(gist),
time: gist.time, time: gist.time,
type: 'loader', type: 'loader',
url: gist.url, url: gist.url,
name: `${gist.author} v${gist.version}` name: `${gist.author} v${gist.version}`
}); });
} }
return state; return state;
} catch (err) { } catch (err) {
console.error(err); console.error(err);
} }
}; };
+51 -50
View File
@@ -2,58 +2,59 @@ import { loadGistData } from './gist';
import { updateCodeStore, defaultState } from '../state'; import { updateCodeStore, defaultState } from '../state';
import type { Loader, State } from '$lib/types'; import type { Loader, State } from '$lib/types';
const loaders: Record<string, Loader> = { const loaders: Record<string, Loader> = {
gist: loadGistData gist: loadGistData
}; };
export const loadDataFromUrl = async (): Promise<void> => { export const loadDataFromUrl = async (): Promise<void> => {
const searchParams = new URLSearchParams(window.location.search); const searchParams = new URLSearchParams(window.location.search);
let state: Partial<State> = defaultState; let state: Partial<State> = defaultState;
let code: string, config: string; let code: string, config: string;
let loaded = false; let loaded = false;
const codeURL: string = searchParams.get('code'); const codeURL: string = searchParams.get('code');
const configURL: string = searchParams.get('config'); const configURL: string = searchParams.get('config');
if (codeURL) { if (codeURL) {
code = await (await fetch(codeURL)).text(); code = await (await fetch(codeURL)).text();
loaded = true; loaded = true;
} }
if (configURL) { if (configURL) {
config = await (await fetch(configURL)).text(); config = await (await fetch(configURL)).text();
} else { } else {
config = defaultState.mermaid; config = defaultState.mermaid;
} }
if (!code) { if (!code) {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment // eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore // @ts-ignore
// eslint-disable-next-line @typescript-eslint/no-unsafe-call // eslint-disable-next-line @typescript-eslint/no-unsafe-call
for (const [key, value] of searchParams.entries()) { for (const [key, value] of searchParams.entries()) {
if (key in loaders) { if (key in loaders) {
try { try {
state = await loaders[key](value); state = await loaders[key](value);
loaded = true; loaded = true;
break; break;
} catch (err) { } catch (err) {
console.error(err); console.error(err);
} }
} }
} }
} else { } else {
state = { state = {
code, code,
mermaid: config, mermaid: config,
loader: { loader: {
type: 'files', type: 'files',
config: { config: {
codeURL, codeURL,
configURL configURL
} }
} }
}; };
} }
loaded && loaded &&
updateCodeStore({ updateCodeStore({
...state, ...state,
autoSync: true, autoSync: true,
updateDiagram: true updateDiagram: true,
}); updateEditor: true
});
}; };
+10 -10
View File
@@ -3,18 +3,18 @@ import type { Writable } from 'svelte/store';
import type { LoadingState } from '$lib/types'; import type { LoadingState } from '$lib/types';
const defaultLoading: LoadingState = { const defaultLoading: LoadingState = {
loading: false loading: false
}; };
export const loadingStateStore: Writable<LoadingState> = writable(defaultLoading); export const loadingStateStore: Writable<LoadingState> = writable(defaultLoading);
export const initLoading = async <T>(message: string, task: Promise<T>): Promise<T> => { export const initLoading = async <T>(message: string, task: Promise<T>): Promise<T> => {
loadingStateStore.set({ loadingStateStore.set({
loading: true, loading: true,
message message
}); });
const result: T = await task; const result: T = await task;
loadingStateStore.set({ loadingStateStore.set({
loading: false loading: false
}); });
return result; return result;
}; };
-24
View File
@@ -1,24 +0,0 @@
import mermaid, { type MermaidConfig } from 'mermaid';
import mindmap from '@mermaid-js/mermaid-mindmap';
const initialize = mermaid.registerExternalDiagrams([mindmap]);
export const init = async () => {
await initialize;
};
export const render = async (
config: MermaidConfig,
code: string,
id: string,
callback: Parameters<typeof mermaid.render>[2]
): Promise<void> => {
await init();
mermaid.initialize(config);
await mermaid.mermaidAPI.renderAsync(id, code, callback);
};
export const parse = async (code: string): Promise<boolean> => {
await init();
return (await mermaid.parseAsync(code)) as boolean;
};
-34
View File
@@ -1,34 +0,0 @@
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);
});
});
+21 -21
View File
@@ -1,35 +1,35 @@
import { writable, get, type Writable } from 'svelte/store'; import { writable, get, type Writable } from 'svelte/store';
import { persist, localStorage } from '$lib/util/persist'; import { persist, createLocalStorage } from '@macfja/svelte-persistent-store';
import { injectHistoryIDs } from '$lib/components/History/history'; import { injectHistoryIDs } from '$lib/components/history/history';
import { logEvent } from './stats'; import { logEvent } from './stats';
interface MigrationState { interface MigrationState {
version: number; version: number;
} }
const migrations: { [key: string]: () => void } = { const migrations: { [key: string]: () => void } = {
injectHistoryIDs injectHistoryIDs
}; };
const migrationStore: Writable<MigrationState> = persist( const migrationStore: Writable<MigrationState> = persist(
writable({ version: -1 }), writable({ version: -1 }),
localStorage(), createLocalStorage(),
'migrations' 'migrations'
); );
export const applyMigrations = (): void => { export const applyMigrations = (): void => {
const { version }: MigrationState = get(migrationStore); const { version }: MigrationState = get(migrationStore);
const allMigrations = Object.entries(migrations); const allMigrations = Object.entries(migrations);
if (version === allMigrations.length - 1) { if (version === allMigrations.length - 1) {
return; return;
} }
console.log(`Current migration version: v${version}. Migrating to v${allMigrations.length - 1}.`); console.log(`Current migration version: v${version}. Migrating to v${allMigrations.length - 1}.`);
for (let i = version + 1; i < allMigrations.length; i++) { for (let i = version + 1; i < allMigrations.length; i++) {
const [key, fn] = allMigrations[i]; const [key, fn] = allMigrations[i];
console.log(`Applying migration ${i}: ${key}.`); console.log(`Applying migration ${i}: ${key}.`);
fn(); fn();
logEvent('migration', { key }); logEvent('migration', { key });
migrationStore.set({ version: i }); migrationStore.set({ version: i });
} }
logEvent('migration', { status: 'complete', from: version, to: allMigrations.length - 1 }); logEvent('migration', { status: 'complete', from: version, to: allMigrations.length - 1 });
}; };
+2 -2
View File
@@ -1,7 +1,7 @@
export const notify = (message: string): void => { export const notify = (message: string): void => {
alert(message); alert(message);
}; };
export const prompt = (message: string): boolean => { export const prompt = (message: string): boolean => {
return confirm(message); return confirm(message);
}; };
-265
View File
@@ -1,265 +0,0 @@
/* 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
}
};
}
+29 -29
View File
@@ -4,37 +4,37 @@ import { defaultState } from './state';
import type { State } from '$lib/types'; import type { State } from '$lib/types';
describe('Serde tests', () => { describe('Serde tests', () => {
const verifySerde = (state: State, serde?: SerdeType): string => { const verifySerde = (state: State, serde?: SerdeType): string => {
const serialized = serializeState(state, serde); const serialized = serializeState(state, serde);
const deserialized = deserializeState(serialized); const deserialized = deserializeState(serialized);
expect(deserialized).to.deep.equal(state); expect(deserialized).to.deep.equal(state);
return serialized; return serialized;
}; };
it('should serialize and deserialize with default serde', () => { it('should serialize and deserialize with default serde', () => {
expect(verifySerde(defaultState)).toMatchInlineSnapshot( expect(verifySerde(defaultState)).toMatchInlineSnapshot(
'"pako:eNpVj81qw0AMhF9F6NRC_AI-BGK7zSXQQHLz5iBsObuk-8Naphjb7551fEl1EjPfiNGEjW8Zc7xHChqulXKQ5lCXOppeLPU3yLL9fGQB6x2PMxQfRw-99iEYd__c-GKFoJxOK8Yg2rjHslnlK__jeIaqPlEQH27vzvXPz_BVm7NO5_87OnJKfdcd5R1lDUUoKb4Q3KHlaMm0qfq0KgpFs2WFeVpb7mj4FYXKLQmlQfxldA3mEgfe4RBaEq4MpaftJi5PNtJU8w"' '"pako:eNpVkM1qw0AMhF9F6JRC_AI-FBo7ySXQQnPz5iC8cnZp9oe1TAm2373rmEKik5j5ZhAasQ2ascRromjgXCsPeT6ayiTbi6P-AkXxPh1ZwAXP9wl2m2OA3oQYrb--rfxugaAaTwvGIMb6n3m1qkf-0_MEdXOiKCFenp3zb5hg39gvk-tfHZM4pw5NR2VHRUsJKkoPBLfoODmyOp8-LopCMexYYZlXzR0NN1Go_JzRIWoS3msrIWGuuvW8RRokfN99i6Wkgf-h2lL-hFvF-Q9-YFyS"'
); );
}); });
it('should serialize and deserialize with base64 serde', () => { it('should serialize and deserialize with base64 serde', () => {
expect(verifySerde(defaultState, 'base64')).toMatchInlineSnapshot( expect(verifySerde(defaultState, 'base64')).toMatchInlineSnapshot(
'"base64:eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cbiAgIiwibWVybWFpZCI6IntcbiAgXCJ0aGVtZVwiOiBcImRlZmF1bHRcIlxufSIsImF1dG9TeW5jIjp0cnVlLCJ1cGRhdGVEaWFncmFtIjp0cnVlfQ"' '"base64:eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cbiAgIiwibWVybWFpZCI6IntcbiAgXCJ0aGVtZVwiOiBcImRlZmF1bHRcIlxufSIsInVwZGF0ZUVkaXRvciI6ZmFsc2UsImF1dG9TeW5jIjp0cnVlLCJ1cGRhdGVEaWFncmFtIjp0cnVlfQ"'
); );
}); });
it('should serialize and deserialize with pako serde', () => { it('should serialize and deserialize with pako serde', () => {
expect(verifySerde(defaultState, 'pako')).toMatchInlineSnapshot( expect(verifySerde(defaultState, 'pako')).toMatchInlineSnapshot(
'"pako:eNpVj81qw0AMhF9F6NRC_AI-BGK7zSXQQHLz5iBsObuk-8Naphjb7551fEl1EjPfiNGEjW8Zc7xHChqulXKQ5lCXOppeLPU3yLL9fGQB6x2PMxQfRw-99iEYd__c-GKFoJxOK8Yg2rjHslnlK__jeIaqPlEQH27vzvXPz_BVm7NO5_87OnJKfdcd5R1lDUUoKb4Q3KHlaMm0qfq0KgpFs2WFeVpb7mj4FYXKLQmlQfxldA3mEgfe4RBaEq4MpaftJi5PNtJU8w"' '"pako:eNpVkM1qw0AMhF9F6JRC_AI-FBo7ySXQQnPz5iC8cnZp9oe1TAm2373rmEKik5j5ZhAasQ2ascRromjgXCsPeT6ayiTbi6P-AkXxPh1ZwAXP9wl2m2OA3oQYrb--rfxugaAaTwvGIMb6n3m1qkf-0_MEdXOiKCFenp3zb5hg39gvk-tfHZM4pw5NR2VHRUsJKkoPBLfoODmyOp8-LopCMexYYZlXzR0NN1Go_JzRIWoS3msrIWGuuvW8RRokfN99i6Wkgf-h2lL-hFvF-Q9-YFyS"'
); );
}); });
it('should throw error for unrecognized serde', () => { it('should throw error for unrecognized serde', () => {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment // eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error // @ts-expect-error
expect(() => serializeState(defaultState, 'unknown')).toThrowError( expect(() => serializeState(defaultState, 'unknown')).toThrowError(
'Unknown serde type: unknown' 'Unknown serde type: unknown'
); );
expect(() => deserializeState('unknown:hello')).toThrowError('Unknown serde type: unknown'); expect(() => deserializeState('unknown:hello')).toThrowError('Unknown serde type: unknown');
}); });
}); });
+40 -40
View File
@@ -3,61 +3,61 @@ import { toUint8Array, fromUint8Array, toBase64, fromBase64 } from 'js-base64';
import type { State } from '$lib/types'; import type { State } from '$lib/types';
interface Serde { interface Serde {
serialize: (state: string) => string; serialize: (state: string) => string;
deserialize: (state: string) => string; deserialize: (state: string) => string;
} }
const base64Serde: Serde = { const base64Serde: Serde = {
serialize: (state: string): string => { serialize: (state: string): string => {
return toBase64(state, true); return toBase64(state, true);
}, },
deserialize: (state: string): string => { deserialize: (state: string): string => {
return fromBase64(state); return fromBase64(state);
} }
}; };
export const pakoSerde: Serde = { export const pakoSerde: Serde = {
serialize: (state: string): string => { serialize: (state: string): string => {
const data = new TextEncoder().encode(state); const data = new TextEncoder().encode(state);
const compressed = deflate(data, { level: 9 }); const compressed = deflate(data, { level: 9 });
return fromUint8Array(compressed, true); return fromUint8Array(compressed, true);
}, },
deserialize: (state: string): string => { deserialize: (state: string): string => {
const data = toUint8Array(state); const data = toUint8Array(state);
return inflate(data, { to: 'string' }); return inflate(data, { to: 'string' });
} }
}; };
export type SerdeType = 'base64' | 'pako'; export type SerdeType = 'base64' | 'pako';
const serdes: { [key in SerdeType]: Serde } = { const serdes: { [key in SerdeType]: Serde } = {
base64: base64Serde, base64: base64Serde,
pako: pakoSerde pako: pakoSerde
}; };
export const serializeState = (state: State, serde: SerdeType = 'pako'): string => { export const serializeState = (state: State, serde: SerdeType = 'pako'): string => {
if (serdes[serde] === undefined) { if (serdes[serde] === undefined) {
throw new Error(`Unknown serde type: ${serde}`); throw new Error(`Unknown serde type: ${serde}`);
} }
const json = JSON.stringify(state); const json = JSON.stringify(state);
const serialized = serdes[serde].serialize(json); const serialized = serdes[serde].serialize(json);
return `${serde}:${serialized}`; return `${serde}:${serialized}`;
}; };
export const deserializeState = (state: string): State => { export const deserializeState = (state: string): State => {
let type: SerdeType, serialized: string; let type: SerdeType, serialized: string;
if (state.includes(':')) { if (state.includes(':')) {
let tempType: string; let tempType: string;
[tempType, serialized] = state.split(':'); [tempType, serialized] = state.split(':');
if (tempType in serdes) { if (tempType in serdes) {
type = tempType as SerdeType; type = tempType as SerdeType;
} else { } else {
throw new Error(`Unknown serde type: ${tempType}`); throw new Error(`Unknown serde type: ${tempType}`);
} }
} else { } else {
type = 'base64'; type = 'base64';
serialized = state; serialized = state;
} }
const json = serdes[type].deserialize(serialized); const json = serdes[type].deserialize(serialized);
return JSON.parse(json) as State; return JSON.parse(json) as State;
}; };
+122 -154
View File
@@ -1,28 +1,31 @@
import { writable, get, type Readable, derived } from 'svelte/store'; import { writable, get, derived } from 'svelte/store';
import { persist, localStorage } from './persist'; import { persist, createLocalStorage } from '@macfja/svelte-persistent-store';
import { saveStatistics, countLines } from './stats'; import { saveStatistics } from './stats';
import { serializeState, deserializeState } from './serde'; import { serializeState, deserializeState } from './serde';
import { cmdKey, errorDebug, AsyncQueue } from './util'; import { cmdKey } from './util';
import { parse } from './mermaid'; import mermaid from 'mermaid';
import type { Readable } from 'svelte/store';
import type { MarkerData, State, ValidatedState } from '$lib/types'; import type { MarkerData, State, ValidatedState } from '$lib/types';
export const defaultState: State = { export const defaultState: State = {
code: `graph TD code: `graph TD
A[Christmas] -->|Get money| B(Go shopping) A[Christmas] -->|Get money| B(Go shopping)
B --> C{Let me think} B --> C{Let me think}
C -->|One| D[Laptop] C -->|One| D[Laptop]
C -->|Two| E[iPhone] C -->|Two| E[iPhone]
C -->|Three| F[fa:fa-car Car] C -->|Three| F[fa:fa-car Car]
`, `,
mermaid: JSON.stringify( mermaid: JSON.stringify(
{ {
theme: 'default' theme: 'default'
}, },
null, null,
2 2
), ),
autoSync: true, updateEditor: false,
updateDiagram: true autoSync: true,
updateDiagram: true
}; };
const urlParseFailedState = `graph TD const urlParseFailedState = `graph TD
@@ -37,168 +40,133 @@ const urlParseFailedState = `graph TD
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"`; 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"`;
// inputStateStore handles all updates and is shared externally when exporting via URL, History, etc. // inputStateStore handles all updates and is shared externally when exporting via URL, History, etc.
export const inputStateStore = persist(writable(defaultState), localStorage(), 'codeStore'); export const inputStateStore = persist(writable(defaultState), createLocalStorage(), 'codeStore');
export const currentState: ValidatedState = (() => {
const state = get(inputStateStore);
return {
...state,
serialized: serializeState(state),
errorMarkers: [],
error: undefined,
editorMode: state.editorMode ?? 'code'
};
})();
let q: AsyncQueue<State>;
const processState = async (state: 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);
await parse(state.code);
JSON.parse(state.mermaid);
} catch (e) {
processed.error = e;
errorDebug();
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;
};
// All internal reads should be done via stateStore, but it should not be persisted/shared externally. // All internal reads should be done via stateStore, but it should not be persisted/shared externally.
export const stateStore: Readable<ValidatedState> = derived( export const stateStore: Readable<ValidatedState> = derived([inputStateStore], ([state]) => {
[inputStateStore], const processed: ValidatedState = {
([state], set) => { ...state,
if (!q) { serialized: '',
// Initialize the queue for first time. errorMarkers: [],
q = new AsyncQueue(async (state: State) => { error: undefined
const newState = await processState(state); };
set(newState); // No changes should be done to fields part of `state`.
}); try {
} processed.serialized = serializeState(state);
q.process(state); mermaid.parse(state.code);
}, JSON.parse(state.mermaid);
currentState } 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 => { export const loadState = (data: string): void => {
let state: State; let state: State;
console.log(`Loading '${data}'`); console.log(`Loading '${data}'`);
try { try {
state = deserializeState(data); state = deserializeState(data);
const mermaidConfig: { [key: string]: string } = const mermaidConfig: { [key: string]: string } =
typeof state.mermaid === 'string' ? JSON.parse(state.mermaid) : state.mermaid; typeof state.mermaid === 'string' ? JSON.parse(state.mermaid) : state.mermaid;
if ( if (
mermaidConfig.securityLevel && mermaidConfig.securityLevel &&
mermaidConfig.securityLevel !== 'strict' && mermaidConfig.securityLevel !== 'strict' &&
confirm( confirm(
`Removing "securityLevel":"${mermaidConfig.securityLevel}" from the config for safety.\nClick Cancel if you trust the source of this Diagram.` `Removing "securityLevel":"${mermaidConfig.securityLevel}" from the config for safety.\nClick Cancel if you trust the source of this Diagram.`
) )
) { ) {
delete mermaidConfig.securityLevel; // Prevent setting overriding securityLevel when loading state to mitigate possible XSS attack delete mermaidConfig.securityLevel; // Prevent setting overriding securityLevel when loading state to mitigate possible XSS attack
} }
state.mermaid = JSON.stringify(mermaidConfig, null, 2); state.mermaid = JSON.stringify(mermaidConfig, null, 2);
} catch (e) { } catch (e) {
state = get(inputStateStore); state = get(inputStateStore);
if (data) { if (data) {
console.error('Init error', e); console.error('Init error', e);
state.code = urlParseFailedState; state.code = urlParseFailedState;
state.mermaid = defaultState.mermaid; state.mermaid = defaultState.mermaid;
} }
} }
updateCodeStore(state); updateCodeStore({ ...state, updateEditor: true });
}; };
export const updateCodeStore = (newState: Partial<State>): void => { export const updateCodeStore = (newState: Partial<State>): void => {
inputStateStore.update((state) => { inputStateStore.update((state) => {
return { ...state, ...newState }; return { ...state, ...newState };
}); });
}; };
let prompted = false; let prompted = false;
export const updateCode = ( export const updateCode = (
code: string, code: string,
{ {
updateDiagram = false, updateEditor,
resetPanZoom = false updateDiagram = false,
}: { updateDiagram?: boolean; resetPanZoom?: boolean } = {} resetPanZoom = false
}: { updateEditor: boolean; updateDiagram?: boolean; resetPanZoom?: boolean }
): void => { ): void => {
console.log('updateCode', code); saveStatistics(code);
const lines = countLines(code); const lines = (code.match(/\n/g) || '').length + 1;
saveStatistics(code);
errorDebug();
if (lines > 50 && !prompted && get(stateStore).autoSync) {
const turnOff = confirm(
`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
});
}
}
inputStateStore.update((state) => { if (lines > 50 && !prompted && get(stateStore).autoSync) {
if (resetPanZoom) { const turnOff = confirm(
state.pan = undefined; `Long diagram detected. Turn off Auto Sync? Use ${cmdKey} + Enter or click the sync logo to manually sync.`
state.zoom = undefined; );
} prompted = true;
return { ...state, code, updateDiagram }; if (turnOff) {
}); updateCodeStore({
autoSync: false
});
}
}
inputStateStore.update((state) => {
if (resetPanZoom) {
state.pan = undefined;
state.zoom = undefined;
}
return { ...state, code, updateEditor, updateDiagram };
});
}; };
export const updateConfig = (config: string): void => { export const updateConfig = (config: string, updateEditor: boolean): void => {
console.log('updateConfig', config); inputStateStore.update((state) => {
inputStateStore.update((state) => { return { ...state, mermaid: config, updateEditor };
return { ...state, mermaid: config }; });
});
}; };
export const toggleDarkTheme = (dark: boolean): void => { export const toggleDarkTheme = (dark: boolean): void => {
inputStateStore.update((state) => { inputStateStore.update((state) => {
const config = JSON.parse(state.mermaid); const config = JSON.parse(state.mermaid);
if (!config.theme || ['dark', 'default'].includes(config.theme)) { if (!config.theme || ['dark', 'default'].includes(config.theme)) {
config.theme = dark ? 'dark' : 'default'; config.theme = dark ? 'dark' : 'default';
} }
return { ...state, mermaid: JSON.stringify(config, null, 2) }; return { ...state, mermaid: JSON.stringify(config, null, 2), updateEditor: true };
}); });
}; };
let urlDebounce: number;
export const initURLSubscription = (): void => { export const initURLSubscription = (): void => {
stateStore.subscribe(({ serialized }) => { stateStore.subscribe(({ serialized }) => {
clearTimeout(urlDebounce); history.replaceState(undefined, undefined, `#${serialized}`);
urlDebounce = window.setTimeout(() => { });
history.replaceState(undefined, undefined, `#${serialized}`);
}, 250);
});
}; };
export const getStateString = (): string => { export const getStateString = (): string => {
return JSON.stringify(get(inputStateStore)); return JSON.stringify(get(inputStateStore));
}; };
-19
View File
@@ -1,19 +0,0 @@
import { describe, it, expect } from 'vitest';
import { detectType } from './stats';
describe('diagram detection', () => {
it('should detect diagrams correctly', () => {
expect(
detectType(`%%{{
graph`)
).toBe('graph');
expect(detectType(`gitGraph`)).toBe('gitGraph');
expect(
detectType(`%%{{
flowChart
graph`)
).toBe('flowChart');
expect(detectType(`loki -> thor`)).toBe(undefined);
});
});
+50 -86
View File
@@ -1,98 +1,62 @@
import { browser } from '$app/environment'; import { browser } from '$app/env';
import type { AnalyticsInstance } from 'analytics'; import type { AnalyticsInstance } from 'analytics';
export let analytics: AnalyticsInstance; export let analytics: AnalyticsInstance;
export const initAnalytics = async (): Promise<void> => { export const initAnalytics = async (): Promise<void> => {
if (browser && !analytics) { if (browser && !analytics) {
try { try {
const [{ Analytics }, { default: plausible }] = await Promise.all([ const { Analytics } = await import('analytics');
import('analytics'), // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
import('analytics-plugin-plausible') const googleAnalytics = (await import('@analytics/google-analytics')).default;
]); const plausible = (await import('analytics-plugin-plausible')).default;
analytics = Analytics({ analytics = Analytics({
app: 'mermaid-live-editor', app: 'mermaid-live-editor',
plugins: [ // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
plausible({ plugins: [
domain: 'mermaid.live', // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
hashMode: false, googleAnalytics({
trackLocalhost: false, // By default 'false' measurementIds: ['UA-153180559-1']
apiHost: 'https://plausible.io' }),
}) // eslint-disable-next-line @typescript-eslint/ban-ts-comment
] // @ts-ignore
}); plausible({
} catch (e) { domain: 'mermaid.live',
console.log(e); hashMode: false,
console.info('Analytics blocked ;)'); trackLocalhost: false, // By default 'false'
} apiHost: 'https://plausible.io'
} })
]
});
} catch (e) {
console.log(e);
console.info('Analytics blocked ;)');
}
}
}; };
export const detectType = (text: string): string => { const detectType = (text: string): string => {
const possibleDiagramTypes = [ return text
'classDiagram', .replace(/^\s*%%.*\n/g, '\n')
'erDiagram', .trimStart()
'flowChart', .split(' ')[0];
'gantt',
'gitGraph',
'graph',
'journey',
'pie',
'stateDiagram'
];
const firstLine = text
.replace(/^\s*%%.*\n/g, '\n')
.trimStart()
.split(' ')[0]
.toLowerCase();
const detectedDiagram = possibleDiagramTypes.find((d) => firstLine.includes(d.toLowerCase()));
return detectedDiagram;
};
export const countLines = (code: string): number => {
return (code.match(/\n/g) || '').length + 1;
}; };
// manual debounce
let timeout: number;
export const saveStatistics = (graph: string): void => { export const saveStatistics = (graph: string): void => {
const graphType = detectType(graph); if (analytics) {
if (!graphType) { clearTimeout(timeout);
return; // Only save statistics after a 5 sec delay
} timeout = window.setTimeout(() => {
const length = countLines(graph); const graphType = detectType(graph);
logEvent('render', { graphType, length }); console.debug(`ga: send event: render ${graphType}`);
void logEvent('render', { graphType });
}, 5000);
}
}; };
const minutesToMilliSeconds = (minutes: number): number => { // eslint-disable-next-line @typescript-eslint/no-explicit-any
return minutes * 60_000; export const logEvent = async (name: string, data?: any): Promise<void> => {
}; await analytics?.track(name, data);
const defaultDelay = minutesToMilliSeconds(1);
const delaysPerEvent = {
render: minutesToMilliSeconds(5),
panZoom: minutesToMilliSeconds(10),
copyClipboard: defaultDelay,
download: defaultDelay,
copyMarkdown: defaultDelay,
loadGist: defaultDelay,
loadSampleDiagram: defaultDelay,
renderDiagram: defaultDelay,
history: defaultDelay,
migration: defaultDelay,
themeChange: defaultDelay
};
export type AnalyticsEvent = keyof typeof delaysPerEvent;
const timeouts: Record<string, number> = {};
// manual debounce to reduce the number of events sent to analytics
export const logEvent = (name: AnalyticsEvent, data?: unknown): void => {
if (!analytics) {
return;
}
const key = data ? JSON.stringify({ name, data }) : name;
if (timeouts[key] === undefined) {
void analytics.track(name, data);
} else {
clearTimeout(timeouts[key]);
}
timeouts[key] = window.setTimeout(() => {
delete timeouts[key];
}, delaysPerEvent[name]);
}; };
+23 -23
View File
@@ -1,38 +1,38 @@
import { writable } from 'svelte/store'; import { writable } from 'svelte/store';
import type { Writable } from 'svelte/store'; import type { Writable } from 'svelte/store';
import { persist, localStorage } from '$lib/util/persist'; import { persist, createLocalStorage } from '@macfja/svelte-persistent-store';
import { logEvent } from './stats'; import { logEvent } from './stats';
export interface ThemeConfig { export interface ThemeConfig {
isDark: boolean; isDark: boolean;
theme?: string; theme?: string;
} }
export const themeStore: Writable<ThemeConfig> = persist( export const themeStore: Writable<ThemeConfig> = persist(
writable({ writable({
isDark: false isDark: false
}), }),
localStorage(), createLocalStorage(),
'themeStore' 'themeStore'
); );
const darkThemes = [ const darkThemes = [
'dark', 'dark',
'synthwave', 'synthwave',
'halloween', 'halloween',
'aqua', 'aqua',
'forest', 'forest',
'luxury', 'luxury',
'black', 'black',
'dracula' 'dracula'
]; ];
export const setTheme = (theme: string): void => { export const setTheme = (theme: string): void => {
if (theme.includes(' ')) { if (theme.includes(' ')) {
theme = theme.split(' ')[1].trim(); theme = theme.split(' ')[1].trim();
} }
const isDark = darkThemes.includes(theme); const isDark = darkThemes.includes(theme);
console.log('Setting theme', theme); console.log('Setting theme', theme);
themeStore.set({ theme, isDark }); themeStore.set({ theme, isDark });
logEvent('themeChange', { theme, isDark }); void logEvent('themeChange', { theme, isDark });
}; };
+11 -44
View File
@@ -2,60 +2,27 @@ import { initURLSubscription, loadState, updateCodeStore } from './state';
import { analytics, initAnalytics } from './stats'; import { analytics, initAnalytics } from './stats';
import { loadDataFromUrl } from './fileLoaders/loader'; import { loadDataFromUrl } from './fileLoaders/loader';
import { initLoading } from './loading'; import { initLoading } from './loading';
import { applyMigrations } from './migrations';
import { init } from './mermaid';
export const loadStateFromURL = (): void => { export const loadStateFromURL = (): void => {
loadState(window.location.hash.slice(1)); loadState(window.location.hash.slice(1));
}; };
export const syncDiagram = (): void => { export const syncDiagram = (): void => {
updateCodeStore({ updateCodeStore({
updateDiagram: true updateDiagram: true
}); });
}; };
export const initHandler = async (): Promise<void> => { export const initHandler = async (): Promise<void> => {
applyMigrations(); loadStateFromURL();
await initLoading('Loading Mermaid...', init()); await initLoading('Loading Gist...', loadDataFromUrl().catch(console.error));
loadStateFromURL(); syncDiagram();
await initLoading('Loading Gist...', loadDataFromUrl().catch(console.error)); initURLSubscription();
syncDiagram(); await initAnalytics();
initURLSubscription(); analytics?.page();
await initAnalytics();
analytics?.page();
}; };
export const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0; export const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0;
export const cmdKey = isMac ? 'Cmd' : 'Ctrl'; export const cmdKey = isMac ? 'Cmd' : 'Ctrl';
let count = 0; export const debounceEnabled = window.localStorage.getItem('noDebounce') !== 'true';
export const errorDebug = (limit = 100) => {
count += 1;
if (count > limit) {
console.log(count, limit);
// eslint-disable-next-line no-debugger
debugger;
}
};
// To queue async tasks so they are executed one after the other, not concurrently.
export class AsyncQueue<T> {
private readonly queue: T[] = [];
private running = false;
constructor(private processor: (item: T) => Promise<void>) {}
public async process(item: T): Promise<void> {
this.queue.push(item);
if (this.running) {
return;
}
this.running = true;
while (this.queue.length > 0) {
const item = this.queue.shift();
if (item) {
await this.processor(item);
}
}
this.running = false;
}
}
+72 -70
View File
@@ -1,87 +1,89 @@
<script lang="ts"> <script lang="ts">
import '../app.postcss'; import '../app.postcss';
import { base } from '$app/paths'; import { base } from '$app/paths';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { loadingStateStore } from '$lib/util/loading'; import { loadingStateStore } from '$lib/util/loading';
import { setTheme, themeStore } from '$lib/util/theme'; import { setTheme, themeStore } from '$lib/util/theme';
import { toggleDarkTheme } from '$lib/util/state'; import { toggleDarkTheme } from '$lib/util/state';
import { initHandler } from '$lib/util/util'; import { initHandler } from '$lib/util/util';
import { applyMigrations } from '$lib/util/migrations';
// This can be removed once https://github.com/sveltejs/kit/issues/1612 is fixed. // 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. // Then move it into src and vite will bundle it automatically.
onMount(() => { onMount(() => {
window.addEventListener('hashchange', async (ev) => { applyMigrations();
await initHandler(); window.addEventListener('hashchange', async (ev) => {
}); await initHandler();
if ('serviceWorker' in navigator) { });
navigator.serviceWorker if ('serviceWorker' in navigator) {
.register(`${base}/service-worker.js`, { navigator.serviceWorker
scope: `${base}/` .register(`${base}/service-worker.js`, {
}) scope: `${base}/`
.then(function (registration) { })
console.log('Registration successful, scope is:', registration.scope); .then(function (registration) {
}) console.log('Registration successful, scope is:', registration.scope);
.catch(function (error) { })
console.log('Service worker registration failed, error:', error); .catch(function (error) {
}); console.log('Service worker registration failed, error:', error);
} });
}
const isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches; const isDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
if ($themeStore.theme === undefined) { if ($themeStore.theme === undefined) {
setTheme(isDarkMode ? 'dark' : 'light'); setTheme(isDarkMode ? 'dark' : 'light');
} }
themeStore.subscribe(({ theme, isDark }) => { themeStore.subscribe(({ theme, isDark }) => {
if (theme) { if (theme) {
document.getElementsByTagName('html')[0].setAttribute('data-theme', theme); document.getElementsByTagName('html')[0].setAttribute('data-theme', theme);
toggleDarkTheme(isDark); toggleDarkTheme(isDark);
} }
}); });
}); });
</script> </script>
<main class="h-screen text-primary-content"> <main class="h-screen text-primary-content">
<slot /> <slot />
</main> </main>
{#if $loadingStateStore.loading} {#if $loadingStateStore.loading}
<div <div
class="w-screen h-screen z-50 absolute left-0 top-0 bg-gray-600 opacity-50 flex align-middle justify-center"> class="w-screen h-screen z-50 absolute left-0 top-0 bg-gray-600 opacity-50 flex align-middle justify-center">
<div class="text-indigo-100 text-4xl font-bold my-auto"> <div class="text-indigo-100 text-4xl font-bold my-auto">
<div class="loader mx-auto" /> <div class="loader mx-auto" />
<div>{$loadingStateStore.message}</div> <div>{$loadingStateStore.message}</div>
</div> </div>
</div> </div>
{/if} {/if}
<style> <style>
.loader { .loader {
border: 0.45em solid #f3f3f3; border: 0.45em solid #f3f3f3;
border-radius: 50%; border-radius: 50%;
border-top: 0.45em solid #6365f1; border-top: 0.45em solid #6365f1;
width: 3em; width: 3em;
height: 3em; height: 3em;
-webkit-animation: spin 2s linear infinite; /* Safari */ -webkit-animation: spin 2s linear infinite; /* Safari */
animation: spin 2s linear infinite; animation: spin 2s linear infinite;
} }
/* Safari */ /* Safari */
@-webkit-keyframes spin { @-webkit-keyframes spin {
0% { 0% {
-webkit-transform: rotate(0deg); -webkit-transform: rotate(0deg);
} }
100% { 100% {
-webkit-transform: rotate(360deg); -webkit-transform: rotate(360deg);
} }
} }
@keyframes spin { @keyframes spin {
0% { 0% {
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
transform: rotate(360deg); transform: rotate(360deg);
} }
} }
</style> </style>
-3
View File
@@ -1,3 +0,0 @@
export const prerender = true;
export const csr = true;
export const ssr = false;
+14 -14
View File
@@ -1,17 +1,17 @@
<script lang="ts"> <script lang="ts">
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import { base } from '$app/paths'; import { base } from '$app/paths';
onMount(async () => { onMount(async () => {
// Handle old live editor links and redirect to new version // Handle old live editor links and redirect to new version
const hash = window.location.hash.split('/'); const hash = window.location.hash.split('/');
let newURL = 'edit'; let newURL = 'edit';
if (hash.length > 2) { if (hash.length > 2) {
newURL = `${hash[1]}#${hash[2]}`; newURL = `${hash[1]}#${hash[2]}`;
} }
await goto(`${base}/${newURL}`, { await goto(`${base}/${newURL}`, {
replaceState: true replaceState: true
}); });
}); });
</script> </script>
@@ -0,0 +1,4 @@
import type { RequestHandler } from './$types';
import { GET as manifestGet } from '../../manifest.json/+server';
export const GET: RequestHandler = manifestGet;
+220 -182
View File
@@ -1,202 +1,240 @@
<script lang="ts"> <script lang="ts">
import Editor from '$lib/components/Editor.svelte'; import Editor from '$lib/components/editor.svelte';
import Navbar from '$lib/components/Navbar.svelte'; import Navbar from '$lib/components/navbar.svelte';
import Preset from '$lib/components/Preset.svelte'; import Preset from '$lib/components/preset.svelte';
import Actions from '$lib/components/Actions.svelte'; import Actions from '$lib/components/actions.svelte';
import View from '$lib/components/View.svelte'; import View from '$lib/components/view.svelte';
import Card from '$lib/components/Card/Card.svelte'; import Card from '$lib/components/card/card.svelte';
import History from '$lib/components/History/History.svelte'; import History from '$lib/components/history/history.svelte';
import { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state'; import { updateCode, updateConfig, inputStateStore, stateStore } from '$lib/util/state';
import { cmdKey, initHandler, syncDiagram } from '$lib/util/util'; import { cmdKey, debounceEnabled, initHandler, syncDiagram } from '$lib/util/util';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
import type { Tab, DocConfig, EditorMode, ValidatedState } from '$lib/types'; import type { EditorUpdateEvent, State, Tab, DocConfig } from '$lib/types';
import { base } from '$app/paths'; import { base } from '$app/paths';
const docURLBase = 'https://mermaid-js.github.io/mermaid'; type Modes = 'code' | 'config';
const docMap: DocConfig = { type Languages = 'mermaid' | 'json';
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>) => { let selectedMode: Modes = 'code';
const editorMode: EditorMode = message.detail.id === 'code' ? 'code' : 'config'; const languageMap: { [key in Modes]: Languages } = {
updateCodeStore({ editorMode }); code: 'mermaid',
}; config: 'json'
};
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 text = '';
let docURL = docURLBase;
let language: Languages = 'mermaid';
const handleModeUpdate = (mode: Modes) => {
if (mode === 'code') {
text = $stateStore.code;
} else {
text = $stateStore.mermaid;
}
};
$: language = languageMap[selectedMode];
$: handleModeUpdate(selectedMode);
const tabs: Tab[] = [ stateStore.subscribe((state: State) => {
{ if (state.updateEditor) {
id: 'code', text = selectedMode === 'code' ? state.code : state.mermaid;
title: 'Code', }
icon: 'fas fa-code' const codeTypeMatch = /([\S]+)[\s\n]/.exec(state.code);
}, if (codeTypeMatch && codeTypeMatch.length > 1) {
{ const docKey = codeTypeMatch[1];
id: 'config', const docConfig = docMap[docKey] ?? { code: '' };
title: 'Config', docURL = docURLBase + (docConfig[selectedMode] ?? docConfig.code ?? '');
icon: 'fas fa-cogs' }
} });
]; const tabSelectHandler = (message: CustomEvent<Tab>) => {
selectedMode = message.detail.id === 'code' ? 'code' : 'config';
$inputStateStore.updateEditor = true;
};
const tabs: Tab[] = [
{
id: 'code',
title: 'Code',
icon: 'fas fa-code'
},
{
id: 'config',
title: 'Config',
icon: 'fas fa-cogs'
}
];
onMount(async () => { const handleUpdate = (text: string) => {
await initHandler(); if (selectedMode === 'code') {
const resizer = document.getElementById('resizeHandler'); updateCode(text, {
const element = document.getElementById('editorPane'); updateEditor: false
const resize = (e: { pageX: number }) => { });
const newWidth = e.pageX - element.getBoundingClientRect().left; } else {
if (newWidth > 50) { updateConfig(text, false);
element.style.width = `${newWidth}px`; }
} };
};
const stopResize = () => { let debounce: { [key: string]: number } = {};
window.removeEventListener('mousemove', resize); const updateHandler = ({ detail: { text } }: CustomEvent<EditorUpdateEvent>) => {
}; if (debounceEnabled) {
resizer.addEventListener('mousedown', (e) => { clearTimeout(debounce[selectedMode]);
e.preventDefault(); debounce[selectedMode] = window.setTimeout(() => {
window.addEventListener('mousemove', resize); handleUpdate(text);
window.addEventListener('mouseup', stopResize); }, 300);
}); } else {
}); handleUpdate(text);
}
};
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> </script>
<div class="h-full flex flex-col overflow-hidden"> <div class="h-full flex flex-col overflow-hidden">
<Navbar /> <Navbar />
<div class="flex-1 flex overflow-hidden"> <div class="flex-1 flex overflow-hidden">
<div class="hidden md:flex flex-col" id="editorPane" style="width: 40%"> <div class="hidden md:flex flex-col" id="editorPane" style="width: 40%">
<Card on:select={tabSelectHandler} {tabs} isCloseable={false} {activeTabID} title="Mermaid"> <Card on:select={tabSelectHandler} {tabs} isCloseable={false} title="Mermaid">
<div slot="actions" class="flex flex-row items-center"> <div slot="actions" class="flex flex-row items-center">
<div class="form-control flex-row items-center"> <div class="form-control flex-row items-center">
<label class="cursor-pointer label" for="autoSync"> <label class="cursor-pointer label" for="autoSync">
<span> Auto sync</span> <span> Auto sync</span>
<input <input
type="checkbox" type="checkbox"
class="toggle {$stateStore.autoSync ? 'btn-secondary' : 'toggle-primary'} ml-1" class="toggle {$stateStore.autoSync ? 'btn-secondary' : 'toggle-primary'} ml-1"
id="autoSync" id="autoSync"
bind:checked={$inputStateStore.autoSync} /> bind:checked={$inputStateStore.autoSync} />
</label> </label>
</div> </div>
{#if !$stateStore.autoSync} {#if !$stateStore.autoSync}
<button <button
class="btn btn-secondary btn-xs mr-1" class="btn btn-secondary btn-xs mr-1"
title="Sync Diagram ({cmdKey} + Enter)" title="Sync Diagram ({cmdKey} + Enter)"
data-cy="sync" data-cy="sync"
on:click={syncDiagram}><i class="fas fa-sync" /></button> on:click={syncDiagram}><i class="fas fa-sync" /></button>
{/if} {/if}
<button class="btn btn-secondary btn-xs" title="View documentation"> <button class="btn btn-secondary btn-xs" title="View documentation">
<a target="_blank" rel="noreferrer" href={docURL} data-cy="docs"> <a target="_blank" href={docURL} data-cy="docs"><i class="fas fa-book mr-1" />Docs</a>
<i class="fas fa-book mr-1" />Docs </button>
</a> </div>
</button>
</div>
<Editor /> <Editor on:update={updateHandler} {language} {text} />
</Card> </Card>
<div class="-mt-2"> <div class="-mt-2">
<Preset /> <Preset />
<History /> <History />
<Actions /> <Actions />
</div> </div>
</div> </div>
<div id="resizeHandler" class="hidden md:block" /> <div id="resizeHandler" class="hidden md:block" />
<div class="flex-1 flex flex-col overflow-hidden"> <div class="flex-1 flex flex-col overflow-hidden">
<Card title="Diagram" isCloseable={false}> <Card title="Diagram" isCloseable={false}>
<div slot="actions" class="flex flex-row items-center"> <div slot="actions" class="flex flex-row items-center">
<label class="cursor-pointer label py-0" for="panZoom"> <label class="cursor-pointer label py-0" for="panZoom">
<span>Pan & Zoom</span> <span>Pan & Zoom</span>
<input <input
type="checkbox" type="checkbox"
class="toggle {$stateStore.panZoom ? 'btn-secondary' : 'toggle-primary'} ml-1" class="toggle {$stateStore.panZoom ? 'btn-secondary' : 'toggle-primary'} ml-1"
id="panZoom" id="panZoom"
bind:checked={$inputStateStore.panZoom} /> bind:checked={$inputStateStore.panZoom} />
</label> </label>
<a <a
href={`${base}/view#${$stateStore.serialized}`} href={`${base}/view#${$stateStore.serialized}`}
target="_blank" target="_blank"
rel="noreferrer" class="btn btn-secondary btn-xs"
class="btn btn-secondary btn-xs" title="View diagram in new page"
title="View diagram in new page" ><i class="fas fa-external-link-alt mr-1" />Full screen</a>
><i class="fas fa-external-link-alt mr-1" />Full screen</a> </div>
</div>
<div class="flex-1 overflow-auto"> <div class="flex-1 overflow-auto">
<View /> <View />
</div> </div>
</Card> </Card>
<div class="md:hidden rounded shadow p-2 mx-2"> <div class="md:hidden rounded shadow p-2 mx-2">
Code editing not supported on mobile. Please use a desktop browser. Code editing not supported on mobile. Please use a desktop browser.
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<style> <style>
#resizeHandler { #resizeHandler {
cursor: col-resize; cursor: col-resize;
padding: 0 2px; padding: 0 2px;
} }
#resizeHandler::after { #resizeHandler::after {
width: 2px; width: 2px;
height: 100%; height: 100%;
top: 0; top: 0;
content: ''; content: '';
position: absolute; position: absolute;
background-color: hsla(var(--b3)); background-color: hsla(var(--b3));
margin-left: -1px; margin-left: -1px;
transition-duration: 0.2s; transition-duration: 0.2s;
} }
#resizeHandler:hover::after { #resizeHandler:hover::after {
margin-left: -2px; margin-left: -2px;
background-color: hsla(var(--p)); background-color: hsla(var(--p));
width: 4px; width: 4px;
} }
</style> </style>
+29
View File
@@ -0,0 +1,29 @@
import { json } from '@sveltejs/kit';
import { base } from '$app/paths';
import type { RequestHandler } from './$types';
export const GET: RequestHandler = () => {
return json({
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'
});
};
+4 -4
View File
@@ -1,8 +1,8 @@
<script lang="ts"> <script lang="ts">
import View from '$lib/components/View.svelte'; import View from '$lib/components/view.svelte';
import { initHandler } from '$lib/util/util'; import { initHandler } from '$lib/util/util';
import { onMount } from 'svelte'; import { onMount } from 'svelte';
onMount(initHandler); onMount(initHandler);
</script> </script>
<View /> <View />
+3 -3
View File
@@ -5,7 +5,7 @@ expect.extend(matchers);
// TODO: Remove once https://github.com/sveltejs/kit/issues/6259 is closed. // TODO: Remove once https://github.com/sveltejs/kit/issues/6259 is closed.
beforeAll(() => { beforeAll(() => {
vi.mock('$app/environment', () => ({ vi.mock('$app/env', () => ({
browser: 'window' in globalThis browser: 'window' in globalThis
})); }));
}); });
Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 16 KiB

-6
View File
@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 491 491" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<path d="M490.16,84.61C490.16,37.912 452.248,0 405.55,0L84.61,0C37.912,0 0,37.912 0,84.61L0,405.55C0,452.248 37.912,490.16 84.61,490.16L405.55,490.16C452.248,490.16 490.16,452.248 490.16,405.55L490.16,84.61Z" style="fill:rgb(255,54,112);"/>
<path d="M407.48,111.18C335.587,108.103 269.573,152.338 245.08,220C220.587,152.338 154.573,108.103 82.68,111.18C80.285,168.229 107.577,222.632 154.74,254.82C178.908,271.419 193.35,298.951 193.27,328.27L193.27,379.13L296.9,379.13L296.9,328.27C296.816,298.953 311.255,271.42 335.42,254.82C382.596,222.644 409.892,168.233 407.48,111.18Z" style="fill:white;fill-rule:nonzero;"/>
</svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

-18
View File
@@ -1,18 +0,0 @@
{
"short_name": "Mermaid",
"name": "Mermaid Live Editor",
"icons": [
{
"src": "/favicon.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"
}
+21 -18
View File
@@ -3,24 +3,27 @@ import adapter from '@sveltejs/adapter-static';
/** @type {import('@sveltejs/kit').Config} */ /** @type {import('@sveltejs/kit').Config} */
const config = { const config = {
// Consult https://github.com/sveltejs/svelte-preprocess // Consult https://github.com/sveltejs/svelte-preprocess
// for more information about preprocessors // for more information about preprocessors
preprocess: [ preprocess: [
preprocess({ preprocess({
postcss: true postcss: true
}) })
], ],
kit: { kit: {
adapter: adapter({ adapter: adapter({
pages: `docs` pages: `docs`
}), }),
paths: process.env['DEPLOY'] paths: process.env['DEPLOY']
? { ? {
base: `/mermaid-live-editor` base: `/mermaid-live-editor`
} }
: {}, : {},
trailingSlash: 'ignore' trailingSlash: 'ignore',
} prerender: {
default: true
}
}
}; };
export default config; export default config;
+8 -8
View File
@@ -1,10 +1,10 @@
module.exports = { module.exports = {
plugins: [require('daisyui')], plugins: [require('daisyui')],
content: ['./src/**/*.{html,js,svelte,ts}'], content: ['./src/**/*.{html,js,svelte,ts}'],
theme: { theme: {
extend: {} extend: {}
}, },
variants: { variants: {
extend: {} extend: {}
} }
}; };
+14 -16
View File
@@ -1,18 +1,16 @@
{ {
"include": [ "include": [
"src/**/*.d.ts", "src/**/*.d.ts",
"src/**/*.ts", "src/**/*.ts",
"src/**/*.svelte", "src/**/*.svelte",
"cypress/**/*.ts", "cypress/**/*.ts",
"cypress/**/*.js", "cypress/**/*.js",
"cypress/**/*.json", "static/**/*.js"
"static/**/*.js", ],
"static/**/*.json" "compilerOptions": {
], "resolveJsonModule": true,
"compilerOptions": { "allowSyntheticDefaultImports": true,
"resolveJsonModule": true, "types": ["vitest/importMeta"]
"allowSyntheticDefaultImports": true, },
"types": ["vitest/importMeta"] "extends": "./.svelte-kit/tsconfig.json"
},
"extends": "./.svelte-kit/tsconfig.json"
} }
+24 -21
View File
@@ -1,26 +1,29 @@
import { sveltekit } from '@sveltejs/kit/vite'; import { sveltekit } from '@sveltejs/kit/vite';
/** @type {import('vite').UserConfig} */ /** @type {import('vite').UserConfig} */
const config = { const config = {
plugins: [sveltekit()], plugins: [sveltekit()],
envPrefix: 'MERMAID_', envPrefix: 'MERMAID_',
optimizeDeps: { include: ['mermaid'] }, optimizeDeps: { include: ['mermaid'] },
server: { ssr: {
port: 3000, noExternal: ['@macfja/svelte-persistent-store']
host: true },
}, server: {
preview: { port: 3000,
port: 3000, host: true
host: true },
}, preview: {
test: { port: 3000,
environment: 'jsdom', host: true
// in-source testing },
includeSource: ['src/**/*.{js,ts,svelte}'], test: {
setupFiles: ['./src/tests/setup.ts'], environment: 'jsdom',
coverage: { // in-source testing
exclude: ['src/mocks', '.svelte-kit', 'src/**/*.test.ts'], includeSource: ['src/**/*.{js,ts,svelte}'],
reporter: ['text', 'json', 'html', 'lcov'] setupFiles: ['./src/tests/setup.ts'],
} coverage: {
} exclude: ['src/mocks', '.svelte-kit', 'src/**/*.test.ts'],
reporter: ['text', 'json', 'html', 'lcov']
}
}
}; };
export default config; export default config;
+520 -741
View File
File diff suppressed because it is too large Load Diff