Compare commits

..
Author SHA1 Message Date
Sidharth VinodandGitHub 365d8807cd Merge branch 'master' into release/10.0.1 2023-02-28 22:46:52 +05:30
Sidharth Vinod a511e7d6b5 "mermaid": "10.0.1-rc.3", 2023-02-28 22:20:17 +05:30
Sidharth Vinod 4cc7c401b5 10.0.1-rc.2 2023-02-24 19:48:54 +05:30
Sidharth Vinod d6c25b77f7 10.0.1-rc.1 2023-02-24 18:29:34 +05:30
Sidharth VinodandGitHub 1605536f13 Merge pull request #1164 from mermaid-js/develop
Release v10
2023-02-24 10:51:07 +05:30
Sidharth VinodandGitHub 7dc59f1396 Merge pull request #1160 from mermaid-js/release/10.0.0
Release/10.0.0
2023-02-24 10:50:07 +05:30
Sidharth Vinod 59168d2437 fix: re enable uncompressed URL test 2023-02-24 10:37:29 +05:30
Sidharth Vinod 5a6dccb263 fix: Comment test caret location 2023-02-24 10:36:20 +05:30
Sidharth Vinod 6c16fa76ff fix: Adjust image size 2023-02-24 10:32:10 +05:30
Sidharth Vinod ccbb45a09c fix: E2e Tests 2023-02-24 10:10:52 +05:30
Sidharth Vinod 052665ef09 Actions, default closed 2023-02-22 10:01:16 +05:30
Sidharth Vinod ee1652e9f2 v10 2023-02-21 17:46:00 +05:30
Sidharth Vinod bbd6378065 v10 changes 2023-02-19 20:09:42 +05:30
Sidharth Vinod e93641e41f Release v10 2023-02-19 19:49:50 +05:30
Sidharth Vinod 5925448ca4 Replace moment with dayjs 2023-02-19 00:14:57 +05:30
Sidharth Vinod 5e930d19e7 Merge remote-tracking branch 'origin/develop' into release/9.4
* origin/develop:
  Fix browserlist base branch
  build: update Browserslist db
  Move browserlist update to cron
  Update Browserslist
  Update snapshots
  Fix Preset
  Update Browserslist
  chore(deps): update all non-major dependencies
  chore(deps): update all non-major dependencies
  chore: Cleanup with eslint-unicorn
  Fix tests
  Fix tests
  Update loadSite.spec.ts
  Update snapshots.js
  Also changed 'graph' to 'flowchart' on state.ts
  Replacing "chart" with "flowchart"
2023-02-16 21:04:47 +05:30
Sidharth VinodandGitHub 131dd06cde Merge pull request #1158 from mermaid-js/develop
Release 9.4
2023-02-16 21:02:05 +05:30
Sidharth VinodandGitHub e96225dc69 Merge branch 'master' into develop 2023-02-16 18:02:16 +05:30
Sidharth VinodandGitHub 3a42afd102 Merge pull request #1156 from mermaid-js/browserslist-update
build: update Browserslist db
2023-02-16 17:34:26 +05:30
Sidharth Vinod 5394074ac5 Fix browserlist base branch 2023-02-16 17:33:42 +05:30
Sidharth Vinod 20358bc254 Remove mindmap 2023-02-16 15:56:30 +05:30
Sidharth Vinod 6ece0a8a94 comment out consoles 2023-02-16 15:55:07 +05:30
Sidharth Vinod 71f4097fa0 Log SVG code 2023-02-16 15:51:53 +05:30
Sidharth Vinod 308aec1580 Merge branch 'release/9.4' of https://github.com/mermaid-js/mermaid-live-editor into release/9.4
* 'release/9.4' of https://github.com/mermaid-js/mermaid-live-editor:
  Update Browserslist
2023-02-16 15:48:06 +05:30
Sidharth Vinod 8c07649b10 Remove mindmap 2023-02-16 15:48:02 +05:30
sidharthv96 3a1b8f87c3 Update Browserslist 2023-02-16 10:02:52 +00:00
Sidharth Vinod af4f60874e 9.4.0 2023-02-16 15:31:31 +05:30
GitHub Action e5f303e6e2 build: update Browserslist db 2023-02-15 02:44:06 +00:00
Sidharth VinodandGitHub e461f108f1 Merge pull request #1106 from mermaid-js/sidv/eslint-unicorn
Cleanup with eslint-unicorn
2023-02-10 19:25:54 +00:00
Sidharth VinodandGitHub 64519ba8a1 Merge pull request #1153 from mermaid-js/sidv/browserlist
Move browserlist update to cron
2023-02-10 19:09:03 +00:00
Sidharth Vinod ec5937b4fb Move browserlist update to cron 2023-02-11 00:32:39 +05:30
sidharthv96 10a11cfc32 Update Browserslist 2023-02-10 18:53:40 +00:00
Sidharth Vinod 9ebbd3b36c Merge remote-tracking branch 'origin/develop' into sidv/eslint-unicorn
* origin/develop: (51 commits)
  Update snapshots
  Fix Preset
  Update Browserslist
  chore(deps): update all non-major dependencies
  chore(deps): update all non-major dependencies
  chore(deps): update dependency eslint to v8.33.0
  chore(deps): update all non-major dependencies
  chore(deps): update all non-major dependencies
  chore(deps): update all non-major dependencies
  chore(deps): update all non-major dependencies
  chore(deps): update dependency eslint to v8.30.0
  Fix links
  chore(deps): update all non-major dependencies
  SvelteKit 1.0!
  Update sveltekit
  Skip updatebrowserslit on renovate
  v9.3.0
  mermaid 9.3.0-rc.7
  Fix vite.config.js typing
  mermaid 9.3.0-rc.6
  ...
2023-02-11 00:22:23 +05:30
Sidharth VinodandGitHub 9e25c2d2c4 Merge pull request #654 from victorp13/patch-1
Replacing "graph" with "flowchart"
2023-02-08 12:43:51 +05:30
Sidharth Vinod 9853442201 Update snapshots 2023-02-08 00:16:46 +05:30
Sidharth VinodandGitHub ebca0ebe34 Merge pull request #1151 from mermaid-js/renovate/all-minor-patch
chore(deps): update all non-major dependencies (minor)
2023-02-08 00:15:29 +05:30
Sidharth Vinod abb2405436 Merge branch 'patch-1' of https://github.com/victorp13/mermaid-live-editor into pr/victorp13/654
* 'patch-1' of https://github.com/victorp13/mermaid-live-editor:
  Update Browserslist
2023-02-08 00:09:31 +05:30
Sidharth Vinod a6b1254425 Fix Preset 2023-02-08 00:09:26 +05:30
sidharthv96 95bf41d3e6 Update Browserslist 2023-02-07 18:38:28 +00:00
Sidharth Vinod 68f81df59b Merge remote-tracking branch 'origin/develop' into pr/victorp13/654
* origin/develop: (509 commits)
  chore(deps): update all non-major dependencies
  chore(deps): update dependency eslint to v8.33.0
  chore(deps): update all non-major dependencies
  chore(deps): update all non-major dependencies
  chore(deps): update all non-major dependencies
  chore(deps): update all non-major dependencies
  chore(deps): update dependency eslint to v8.30.0
  Fix links
  chore(deps): update all non-major dependencies
  SvelteKit 1.0!
  Update sveltekit
  Skip updatebrowserslit on renovate
  v9.3.0
  mermaid 9.3.0-rc.7
  Fix vite.config.js typing
  mermaid 9.3.0-rc.6
  rc.5
  fix: Adjust image size
  Update to rc.4
  Update to rc.3
  ...
2023-02-08 00:05:14 +05:30
renovate[bot]andGitHub d3b25e5cb8 chore(deps): update all non-major dependencies 2023-02-07 18:30:45 +00:00
Sidharth VinodandGitHub 65c1ea844c Merge pull request #1145 from mermaid-js/renovate/patch-all-minor-patch
chore(deps): update all non-major dependencies (patch)
2023-02-07 23:59:00 +05:30
renovate[bot]andGitHub 864988e24a chore(deps): update all non-major dependencies 2023-02-07 09:28:56 +00:00
sidharthv96 2fc032f58a Update Browserslist 2023-01-31 16:36:15 +00:00
Sidharth Vinod 2033e9002f 9.4.0-rc.1 2023-01-31 22:04:56 +05:30
Sidharth VinodandGitHub 651a5cb7ef Merge pull request #1146 from mermaid-js/renovate/all-minor-patch
chore(deps): update dependency eslint to v8.33.0
2023-01-30 09:20:01 +05:30
renovate[bot]andGitHub a7454aa8cb chore(deps): update dependency eslint to v8.33.0 2023-01-30 02:01:16 +00:00
Sidharth VinodandGitHub 43ff34178e Merge pull request #1142 from mermaid-js/renovate/all-minor-patch
chore(deps): update all non-major dependencies (minor)
2023-01-29 01:19:45 +05:30
renovate[bot]andGitHub 703744ebf3 chore(deps): update all non-major dependencies 2023-01-27 20:34:14 +00:00
Sidharth VinodandGitHub 15eaee6e9b Merge pull request #1120 from mermaid-js/renovate/patch-all-minor-patch
chore(deps): update all non-major dependencies (patch)
2023-01-21 22:47:07 +05:30
renovate[bot]andGitHub fa9b0344f4 chore(deps): update all non-major dependencies 2023-01-21 14:29:26 +00:00
Sidharth VinodandGitHub 965b39c2f2 Merge pull request #1138 from mermaid-js/renovate/all-minor-patch
chore(deps): update all non-major dependencies (minor)
2023-01-17 21:38:40 +05:30
renovate[bot]andGitHub 26908080cb chore(deps): update all non-major dependencies 2023-01-16 18:05:56 +00:00
Sidharth VinodandGitHub 7c64a65497 Merge pull request #1128 from mermaid-js/renovate/all-minor-patch
chore(deps): update all non-major dependencies (minor)
2022-12-27 13:06:37 +05:30
renovate[bot]andGitHub be75d950bd chore(deps): update all non-major dependencies 2022-12-26 21:02:04 +00:00
Sidharth VinodandGitHub 4022d8d872 Merge pull request #1127 from mermaid-js/renovate/all-minor-patch
chore(deps): update dependency eslint to v8.30.0
2022-12-19 10:24:48 +05:30
renovate[bot]andGitHub ccb294e5df chore(deps): update dependency eslint to v8.30.0 2022-12-19 02:44:15 +00:00
Sidharth Vinod 8d1f3f08f8 Merge branch 'develop' of https://github.com/mermaid-js/mermaid-live-editor into develop
* 'develop' of https://github.com/mermaid-js/mermaid-live-editor:
  chore(deps): update all non-major dependencies
2022-12-17 00:17:50 +05:30
Sidharth Vinod a12e9a3e6d Fix links 2022-12-17 00:17:44 +05:30
Sidharth VinodandGitHub c138e1dc94 Merge pull request #1121 from mermaid-js/renovate/all-minor-patch
chore(deps): update all non-major dependencies (minor)
2022-12-17 00:15:30 +05:30
renovate[bot]andGitHub 74431cdc08 chore(deps): update all non-major dependencies 2022-12-15 15:09:41 +00:00
Sidharth VinodandGitHub 0812b84487 Merge pull request #1124 from mermaid-js/develop
Svelte Kit 1.0 🥳 🍾
2022-12-15 17:50:45 +05:30
Sidharth Vinod cfc5567980 SvelteKit 1.0! 2022-12-15 17:42:40 +05:30
Sidharth Vinod 096f005938 Merge branch 'develop' of https://github.com/mermaid-js/mermaid-live-editor into develop
* 'develop' of https://github.com/mermaid-js/mermaid-live-editor:
  v9.3.0
  mermaid 9.3.0-rc.7
  Fix vite.config.js typing
  mermaid 9.3.0-rc.6
  rc.5
  fix: Adjust image size
  Update to rc.4
  Update to rc.3
  Remove card snapshot
  Update snapshot
  Update to rc.2
  Update Browserslist
  9.3.0-rc.1
2022-12-15 17:31:41 +05:30
Sidharth VinodandGitHub 37d96f9a87 Merge pull request #1123 from mermaid-js/develop
Release 9.3.0
2022-12-15 17:31:14 +05:30
Sidharth Vinod 8c4b7d52d1 Update sveltekit 2022-12-15 17:30:58 +05:30
Sidharth VinodandGitHub cc7411fef8 Merge pull request #1119 from mermaid-js/release/9.3
9.3.0
2022-12-15 17:23:26 +05:30
Sidharth Vinod 1382504456 Skip updatebrowserslit on renovate 2022-12-15 17:20:39 +05:30
Sidharth Vinod 860039a924 v9.3.0 2022-12-15 17:18:24 +05:30
Sidharth Vinod 33a4cbbf78 mermaid 9.3.0-rc.7 2022-12-15 09:15:35 +05:30
Sidharth Vinod 7be86b5fa7 Fix vite.config.js typing 2022-12-14 10:18:21 +05:30
Sidharth Vinod b835e0448d mermaid 9.3.0-rc.6 2022-12-14 09:46:51 +05:30
Sidharth Vinod 7c5f9f1661 rc.5 2022-12-13 13:46:35 +05:30
Sidharth Vinod 0a34cbe9c7 fix: Adjust image size 2022-12-13 12:19:02 +05:30
Sidharth Vinod a2146da8e1 Update to rc.4 2022-12-13 00:40:18 +05:30
Sidharth Vinod d23de5f9e0 Update to rc.3 2022-12-13 00:24:54 +05:30
Sidharth Vinod 7d18fa6b95 Remove card snapshot 2022-12-13 00:11:03 +05:30
Sidharth Vinod 8dbb011b98 Update snapshot 2022-12-13 00:08:20 +05:30
Sidharth Vinod 4c398ed8dd Merge branch 'release/9.3' of https://github.com/mermaid-js/mermaid-live-editor into release/9.3
* 'release/9.3' of https://github.com/mermaid-js/mermaid-live-editor:
  Update Browserslist
2022-12-12 23:58:04 +05:30
Sidharth Vinod 532e7a6537 Update to rc.2 2022-12-12 23:57:59 +05:30
Sidharth Vinod 049635cf3a Update docs button title 2022-12-12 22:34:09 +05:30
sidharthv96 c06511f11f Update Browserslist 2022-12-09 07:14:05 +00:00
Sidharth Vinod e6adff074a 9.3.0-rc.1 2022-12-09 12:42:48 +05:30
Sidharth VinodandGitHub 55988eb750 Merge pull request #1115 from mermaid-js/renovate/patch-all-minor-patch
chore(deps): update all non-major dependencies (patch)
2022-12-06 23:05:09 +05:30
Sidharth VinodandGitHub e368a20b8d Merge pull request #1116 from mermaid-js/renovate/all-minor-patch
chore(deps): update all non-major dependencies (minor)
2022-12-06 23:04:45 +05:30
Sidharth VinodandGitHub 3cc56a0348 Merge pull request #1117 from aswinthaikkat/updatereadme
docs: Improve installation steps
2022-12-06 22:34:29 +05:30
aswin 36b7aba2f4 docs: Add dependency install step 2022-12-06 22:33:16 +05:30
aswin 54485ac068 docs: Improve installation steps 2022-12-06 22:22:41 +05:30
renovate[bot] fc6cf1f014 Update Browserslist 2022-12-05 01:28:05 +00:00
renovate[bot] 048f280b8e Update Browserslist 2022-12-05 01:27:32 +00:00
renovate[bot]andGitHub 19f26ce4b9 chore(deps): update all non-major dependencies 2022-12-05 01:26:57 +00:00
renovate[bot]andGitHub 6f115d4ac2 chore(deps): update all non-major dependencies 2022-12-05 01:26:30 +00:00
Sidharth VinodandGitHub 347d669c9c Merge pull request #1109 from mermaid-js/develop
Release
2022-11-30 14:25:43 +05:30
Sidharth VinodandGitHub df7da711a9 Merge branch 'master' into develop 2022-11-30 14:19:16 +05:30
Sidharth VinodandGitHub 282dfcc701 Merge pull request #1114 from lagraham337/develop
Nav: Fixed broken tutorial link
2022-11-30 14:18:24 +05:30
Lauren Graham 998c5f7fd9 Nav: Fixed broken tutorial link 2022-11-29 20:54:26 -08:00
Sidharth VinodandGitHub 6c907c48c7 Merge pull request #1113 from mermaid-js/renovate/patch-all-minor-patch
chore(deps): update all non-major dependencies (patch)
2022-11-28 10:33:29 +05:30
renovate[bot]andGitHub fe981b7646 chore(deps): update all non-major dependencies 2022-11-28 01:03:14 +00:00
Sidharth Vinod e36b1d42e4 chore: Skip uncompressed URL test 2022-11-25 16:15:01 +05:30
Sidharth Vinod a62a65ea05 Try something 2022-11-25 14:33:49 +05:30
Sidharth Vinod d9cdab3528 test: Change test order 2022-11-25 14:28:45 +05:30
Sidharth VinodandGitHub 5b3b0a499e Merge pull request #1108 from mermaid-js/develop
Release
2022-11-25 14:19:21 +05:30
Sidharth VinodandGitHub 1b6a1910ce Merge pull request #1107 from mermaid-js/sidv/betterErrors
Show properly formatted error messages.
2022-11-25 13:32:58 +05:30
Sidharth Vinod f794fa9e0e chore: cleanup 2022-11-25 13:25:20 +05:30
Sidharth Vinod 17ca5f29d0 fix: Error type 2022-11-25 13:23:42 +05:30
Sidharth Vinod b7aae5f94f chore: Bump node 2022-11-25 13:19:12 +05:30
Sidharth Vinod 6888765e37 Merge branch 'master' into sidv/eslint-unicorn
* master:
2022-11-25 13:06:08 +05:30
Sidharth Vinod 25e186158d chore: Cleanup with eslint-unicorn 2022-11-25 13:05:57 +05:30
Sidharth Vinod ffd68c7551 Show good error messages. 2022-11-25 12:11:11 +05:30
Sidharth VinodandGitHub 909b95ba7b Merge pull request #1105 from mermaid-js/renovate/patch-all-minor-patch
chore(deps): update all non-major dependencies (patch)
2022-11-25 11:27:44 +05:30
Sidharth Vinod f4dd01c4fe chore: fix trailing slash 2022-11-25 11:17:30 +05:30
renovate[bot]andGitHub 7508a555d4 chore(deps): update all non-major dependencies 2022-11-24 22:05:13 +00:00
Sidharth VinodandGitHub 4453a04a05 Merge pull request #1104 from mermaid-js/develop
Release
2022-11-24 22:14:04 +05:30
Sidharth Vinod 9d3a33e593 Block only tests 2022-11-24 22:07:14 +05:30
Sidharth Vinod 0378cd4ba6 Merge branch 'sidv/fixEditorHang' into develop
* sidv/fixEditorHang:
  Remove it.only
2022-11-24 22:05:27 +05:30
Sidharth Vinod c518217ba7 Merge branch 'develop' of https://github.com/mermaid-js/mermaid-live-editor into develop
* 'develop' of https://github.com/mermaid-js/mermaid-live-editor:
  fix #1103
  fix: Remove AsyncQueue
  Update Browserslist
2022-11-24 22:04:52 +05:30
Sidharth Vinod c9a2e6bf09 snapshot 2022-11-24 22:04:48 +05:30
Sidharth Vinod f136f7bd58 Remove it.only 2022-11-24 22:04:15 +05:30
Sidharth VinodandGitHub 03d2be91e6 Merge pull request #1099 from mermaid-js/sidv/fixEditorHang
Remove AsyncQueue
2022-11-24 22:03:50 +05:30
Sidharth Vinod 3e6c28f15a fix #1103 2022-11-24 21:56:20 +05:30
Sidharth Vinod 2b800e960d Merge branch 'develop' into sidv/fixEditorHang
* develop:
  chore(deps): update all non-major dependencies
  Update Browserslist
  chore: Update deps
2022-11-24 21:26:47 +05:30
Sidharth VinodandGitHub 06bd4cf176 Merge pull request #1101 from mermaid-js/renovate/all-minor-patch
chore(deps): update all non-major dependencies (minor)
2022-11-24 21:16:10 +05:30
renovate[bot]andGitHub 42a55e10a6 chore(deps): update all non-major dependencies 2022-11-24 14:57:03 +00:00
Sidharth VinodandGitHub 996db3b198 Merge pull request #1100 from mermaid-js/sidv/updateDeps
chore: Update deps
2022-11-24 20:24:51 +05:30
sidharthv96 7a598f408c Update Browserslist 2022-11-24 10:56:27 +00:00
Sidharth Vinod 924d10aac3 chore: Update deps 2022-11-24 16:25:12 +05:30
Sidharth Vinod 22df217b44 Merge branch 'sidv/fixEditorHang' of https://github.com/mermaid-js/mermaid-live-editor into sidv/fixEditorHang
* 'sidv/fixEditorHang' of https://github.com/mermaid-js/mermaid-live-editor:
  Update Browserslist
2022-11-24 16:20:08 +05:30
Sidharth Vinod 7c4c2a02f9 fix: Remove AsyncQueue 2022-11-24 16:20:01 +05:30
sidharthv96 20c6e9146c Update Browserslist 2022-11-24 10:30:12 +00:00
Sidharth VinodandGitHub afeb649833 Merge pull request #1095 from mermaid-js/develop
Release: Fix editor hang
2022-11-17 13:20:15 +05:30
Sidharth VinodandGitHub fcf53c98c2 Merge pull request #1094 from mermaid-js/sidv/fixEditorHang
Fix #1089: Update monaco-mermaid
2022-11-17 13:19:04 +05:30
Sidharth Vinod 749968e0f5 Fix #1089: Update monaco-mermaid 2022-11-17 11:21:21 +05:30
Sidharth VinodandGitHub ba56f08370 Merge pull request #1091 from mermaid-js/develop
Release
2022-11-15 20:43:45 +05:30
Sidharth VinodandGitHub d92bf85009 Merge pull request #1092 from mermaid-js/renovate/all-minor-patch
chore(deps): update all non-major dependencies (minor)
2022-11-15 20:33:03 +05:30
renovate[bot]andGitHub 6936dc5755 chore(deps): update all non-major dependencies 2022-11-15 14:50:54 +00:00
Sidharth VinodandGitHub b41ff80d9d Merge pull request #1090 from mermaid-js/sidv/capitalizeSvelteComponents
chore: Capitalize components to be inline with svelte standards
2022-11-15 20:15:21 +05:30
Sidharth Vinod 68ab43ac5d fix lint 2022-11-15 19:59:13 +05:30
Sidharth Vinod 68b589a33a chore: Cleanup, fix theme 2022-11-15 19:51:00 +05:30
Sidharth Vinod 9eb39f31a0 fix: Snapshot, env types 2022-11-15 19:00:46 +05:30
Sidharth Vinod 08eaf725b9 chore: Cleanup potentially problematic code. 2022-11-15 18:57:33 +05:30
Sidharth Vinod 85ad89b915 chore: Cleanup potentially
problematic code.
2022-11-15 18:48:16 +05:30
Sidharth Vinod 60c352a849 Fix casing 2022-11-15 17:05:14 +05:30
Sidharth Vinod b0aa0a9cb2 fix: Type errors 2022-11-15 17:03:25 +05:30
Sidharth Vinod 34dafa13c9 test commit 2022-11-15 16:29:49 +05:30
Sidharth Vinod 684bd708de test commit 2022-11-15 16:29:05 +05:30
Sidharth Vinod d5ee6d4c02 Fix card.test.ts 2022-11-15 16:14:41 +05:30
Sidharth Vinod 233f1822d1 chore: Rename components 2022-11-15 16:04:36 +05:30
Sidharth Vinod 0c3ff0d367 Merge branch 'master' into develop
* master:
2022-11-14 12:01:31 +05:30
Sidharth VinodandGitHub 5bf5c4b0f0 Merge pull request #1086 from mermaid-js/renovate/all-minor-patch
chore(deps): update all non-major dependencies (minor)
2022-11-14 11:48:39 +05:30
Sidharth VinodandGitHub bea78ae04e Merge pull request #1085 from mermaid-js/renovate/cypress-11.x
chore(deps): update dependency cypress to v11
2022-11-14 11:48:17 +05:30
Sidharth VinodandGitHub f661a14080 Merge pull request #1084 from mermaid-js/renovate/actions-stale-6.x
chore(deps): update actions/stale action to v6
2022-11-14 11:47:56 +05:30
renovate[bot]andGitHub a1ce7238b0 chore(deps): update all non-major dependencies 2022-11-14 01:45:41 +00:00
renovate[bot]andGitHub 393ce10bc2 chore(deps): update dependency cypress to v11 2022-11-10 06:52:03 +00:00
renovate[bot]andGitHub a35e00134e chore(deps): update actions/stale action to v6 2022-11-10 06:51:40 +00:00
Sidharth VinodandGitHub 6f2113f0cc Merge pull request #1082 from mermaid-js/develop
Release 9.2.2
2022-11-10 00:18:32 +05:30
Sidharth VinodandGitHub faa4834949 Merge pull request #1081 from mermaid-js/sidv/9.2.2-rc.2
9.2.2
2022-11-10 00:09:13 +05:30
sidharthv96 6c9e79f21d Update Browserslist 2022-11-09 18:34:49 +00:00
Sidharth Vinod af7fd3e413 Merge branch 'develop' into sidv/9.2.2-rc.2
* develop:
  Update Browserslist
  fix(deps): update all non-major dependencies
2022-11-10 00:03:34 +05:30
Sidharth Vinod dfcfdc5178 v9.2.2 2022-11-09 23:52:23 +05:30
Sidharth VinodandGitHub a5d3e93643 Merge pull request #1078 from mermaid-js/renovate/all-minor-patch
fix(deps): update all non-major dependencies (minor)
2022-11-09 15:16:42 +05:30
sidharthv96 091682548e Update Browserslist 2022-11-09 09:37:48 +00:00
Sidharth Vinod 59d305b4f9 9.2.2-rc.2 2022-11-09 15:06:31 +05:30
renovate[bot] 5f0c25ca3c Update Browserslist 2022-11-07 00:12:23 +00:00
renovate[bot]andGitHub 4a556e592c fix(deps): update all non-major dependencies 2022-11-07 00:11:21 +00:00
Sidharth VinodandGitHub 397bb646ae Merge pull request #1075 from mermaid-js/sidv/spaces
Sidv/spaces
2022-11-03 14:30:15 +05:30
Sidharth Vinod 70d68368d3 Skip errors on non git install 2022-11-03 14:26:26 +05:30
Sidharth Vinod f252ca5728 Add prettier pass 2022-11-03 14:20:55 +05:30
Sidharth Vinod 2fcf2eb262 Add .git-blame-ignore-revs 2022-11-03 14:17:33 +05:30
Sidharth Vinod 0ac606b8fb chore: Tabs -> Spaces
Github PR reviews will be formatted much better.
Inline with mermaid project.
2022-11-03 14:09:36 +05:30
Sidharth Vinod 7b254a67cc Add Funding.yml 2022-11-03 11:28:40 +05:30
Sidharth VinodandGitHub f6f75255b9 Merge pull request #1071 from mermaid-js/develop
Async Mermaid v9.2.0
2022-11-01 22:02:54 +05:30
Sidharth Vinod 8d20a66266 chore: Add loading message 2022-11-01 21:51:27 +05:30
Sidharth VinodandGitHub 8910b15886 Merge pull request #1067 from mermaid-js/sidv/async
Async Mermaid
2022-11-01 21:35:42 +05:30
Sidharth Vinod 0e08d19b6e Merge branch 'develop' into sidv/async
* develop:
2022-11-01 21:30:04 +05:30
Sidharth Vinod 754673f4e2 v9.2.0 2022-11-01 21:29:23 +05:30
Sidharth VinodandGitHub 436a19820e Merge pull request #1070 from mermaid-js/develop
Release
2022-11-01 19:23:24 +05:30
Sidharth Vinod 95c3de9111 Merge branch 'sidv/async' of https://github.com/mermaid-js/mermaid-live-editor into sidv/async
* 'sidv/async' of https://github.com/mermaid-js/mermaid-live-editor:
  Update Browserslist
2022-11-01 19:11:28 +05:30
Sidharth Vinod 67377f0652 Merge branch 'develop' into sidv/async
* develop:
  Update Browserslist
  chore(deps): update all non-major dependencies
  Update Browserslist
  chore(deps): update all non-major dependencies
2022-11-01 19:11:23 +05:30
Sidharth VinodandGitHub 29161c8834 Merge pull request #1069 from mermaid-js/renovate/all-minor-patch
chore(deps): update all non-major dependencies (minor)
2022-11-01 19:10:12 +05:30
renovate[bot] 0ed6f927ec Update Browserslist 2022-11-01 13:20:24 +00:00
renovate[bot]andGitHub c35bae1769 chore(deps): update all non-major dependencies 2022-11-01 13:19:18 +00:00
Sidharth VinodandGitHub 9e7bdade83 Merge pull request #1068 from mermaid-js/renovate/patch-all-minor-patch
chore(deps): update all non-major dependencies (patch)
2022-11-01 18:48:00 +05:30
sidharthv96 577c26bdf4 Update Browserslist 2022-11-01 13:14:04 +00:00
Sidharth Vinod fd79a65c45 rc10 2022-11-01 18:42:36 +05:30
renovate[bot] aa1811d387 Update Browserslist 2022-10-24 00:26:10 +00:00
renovate[bot]andGitHub 4e8d122437 chore(deps): update all non-major dependencies 2022-10-24 00:25:11 +00:00
Sidharth Vinod ea0aaddc7e Comments 2022-10-20 12:17:06 +05:30
Sidharth Vinod 797bac3370 Comments 2022-10-20 12:16:56 +05:30
Sidharth Vinod 80712d9190 enable Github tests 2022-10-19 18:11:18 +05:30
Sidharth Vinod d952258d0b fix Out of sync tests 2022-10-19 18:05:45 +05:30
Sidharth Vinod e52ad1f650 skip securityLevel test 2022-10-19 17:51:59 +05:30
Sidharth Vinod 6ed2acce75 fix Tests 2022-10-19 17:44:29 +05:30
Sidharth Vinod 4a8875027c fix Tests 2022-10-19 17:08:38 +05:30
Sidharth Vinod a364b5e1bb cleanup 2022-10-19 16:41:08 +05:30
Sidharth Vinod 40c03f7c9f editor flush 2022-10-19 15:58:48 +05:30
Sidharth Vinod 743b1a071c Merge branch 'sidv/async' of https://github.com/mermaid-js/mermaid-live-editor into sidv/async
* 'sidv/async' of https://github.com/mermaid-js/mermaid-live-editor:
  Update Browserslist
2022-10-19 15:51:11 +05:30
Sidharth Vinod 739fdeb987 editor hack 2022-10-19 15:50:31 +05:30
sidharthv96 73d8647a9d Update Browserslist 2022-10-19 09:49:26 +00:00
Sidharth Vinod c967286dab derived 2022-10-19 15:18:00 +05:30
Sidharth Vinod 384e53d02e asyncable 2022-10-19 15:17:52 +05:30
Sidharth VinodandGitHub cfa60122a6 Merge pull request #1066 from mermaid-js/develop
Release
2022-10-18 11:52:22 +05:30
Sidharth VinodandGitHub 6b5aa2c277 Merge pull request #1059 from mermaid-js/develop
Release
2022-10-10 20:58:18 +08:00
Sidharth VinodandGitHub 4c22921e4e Merge pull request #1056 from mermaid-js/develop
Release
2022-10-07 19:13:21 +08:00
Sidharth Vinod bf06bdf71a Fix tests 2022-02-22 23:05:18 +05:30
Sidharth Vinod 68a0d29320 Fix tests 2022-02-22 22:28:32 +05:30
Victor PikulaandGitHub 14ac5f23a5 Update loadSite.spec.ts 2022-02-22 15:17:57 +01:00
Victor PikulaandGitHub e7676cf4a8 Update snapshots.js 2022-02-22 15:17:19 +01:00
Victor PikulaandGitHub 0f34a76ded Also changed 'graph' to 'flowchart' on state.ts 2022-02-21 15:51:32 +01:00
Victor PikulaandGitHub ee934c60b4 Replacing "chart" with "flowchart"
Since the documentation mentions "flowchart" in the example pages, it makes more sense to also show a flowchart as the first example loaded in the editor. It looks to me like "graph" was deprecated? Not 100% sure.
2022-02-16 09:36:26 +01:00
88 changed files with 4581 additions and 4098 deletions
+98 -48
View File
@@ -1,50 +1,100 @@
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' 'plugin:@typescript-eslint/strict',
], 'plugin:unicorn/recommended',
plugins: ['svelte3', 'tailwindcss', '@typescript-eslint', 'es', 'vitest'], 'prettier'
ignorePatterns: [ ],
'docs/*', plugins: [
'*.cjs', 'svelte3',
'*.js', 'tailwindcss',
'*.md', '@typescript-eslint',
'snapshots.js', 'es',
'svelte.config.js', 'vitest',
'renovate.json', 'no-only-tests',
'package.json', 'unicorn'
'tsconfig.json' ],
], ignorePatterns: [
overrides: [{ files: ['*.svelte'], processor: 'svelte3/svelte3' }], 'docs/*',
settings: { '*.cjs',
'svelte3/typescript': () => require('typescript') '*.js',
}, '*.md',
parserOptions: { 'snapshots.js',
sourceType: 'module', 'svelte.config.js',
ecmaVersion: 2020, 'renovate.json',
tsconfigRootDir: __dirname, 'package.json',
project: ['./tsconfig.json'], 'tsconfig.json'
extraFileExtensions: ['.svelte'], ],
allowAutomaticSingleRunInference: true overrides: [
}, { files: ['*.svelte'], processor: 'svelte3/svelte3' },
env: { {
browser: true, files: ['*.ts'],
es2020: true extends: [
}, 'eslint:recommended',
rules: { 'plugin:@typescript-eslint/recommended',
'@typescript-eslint/ban-ts-comment': [ 'plugin:@typescript-eslint/recommended-requiring-type-checking',
'error', 'plugin:@typescript-eslint/strict',
{ 'prettier'
'ts-ignore': 'allow-with-description' ]
} }
], ],
'@typescript-eslint/no-unsafe-member-access': 'off', settings: {
'@typescript-eslint/no-unsafe-assignment': 'off', 'svelte3/typescript': () => require('typescript')
'es/no-regexp-lookbehind-assertions': 'error', },
curly: ['error', 'all'] parserOptions: {
} sourceType: 'module',
ecmaVersion: 2020,
tsconfigRootDir: __dirname,
project: ['./tsconfig.json'],
extraFileExtensions: ['.svelte'],
allowAutomaticSingleRunInference: true
},
env: {
browser: true,
es2020: true
},
rules: {
'@typescript-eslint/ban-ts-comment': [
'error',
{
'ts-ignore': 'allow-with-description'
}
],
'@typescript-eslint/no-unsafe-member-access': 'off',
'@typescript-eslint/no-unsafe-assignment': 'off',
'es/no-regexp-lookbehind-assertions': 'error',
curly: ['error', 'all'],
'no-only-tests/no-only-tests': 'error',
'unicorn/no-null': 'off',
'unicorn/filename-case': [
'error',
{
case: 'camelCase'
}
],
'unicorn/prevent-abbreviations': [
'error',
{
allowList: {
ctx: true,
db: true,
doc: true,
env: true,
fn: true,
i: true,
param: true,
req: true,
res: true,
str: true,
searchParams: true,
temp: true,
ImportMetaEnv: true
}
}
]
}
}; };
+5
View File
@@ -0,0 +1,5 @@
# .git-blame-ignore-revs
# Prettier Pass
6fde9e22a3ba0b80879a1909fb233367ef20b738
# Tabs -> Spaces
0ac606b8fbf6f94215cbda1d4511e2dcd30e4655
+1
View File
@@ -0,0 +1 @@
github: [sidharthv96, knsv]
+1 -1
View File
@@ -16,7 +16,7 @@ jobs:
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: '16' node-version: 18
cache: yarn cache: yarn
- name: Build & Deploy - name: Build & Deploy
+1 -1
View File
@@ -8,7 +8,7 @@ jobs:
stale: stale:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/stale@v5 - uses: actions/stale@v6
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
exempt-issue-labels: 'retained' exempt-issue-labels: 'retained'
+2 -1
View File
@@ -32,7 +32,7 @@ jobs:
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: 16 node-version: 18
cache: 'yarn' cache: 'yarn'
# Install NPM dependencies, cache them correctly # Install NPM dependencies, cache them correctly
@@ -48,3 +48,4 @@ jobs:
parallel: true parallel: true
env: env:
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_CI: true
+1 -1
View File
@@ -26,7 +26,7 @@ jobs:
- uses: actions/setup-node@v3 - uses: actions/setup-node@v3
with: with:
node-version: 16 node-version: 18
cache: 'yarn' cache: 'yarn'
- name: Lint & Test - name: Lint & Test
+27 -13
View File
@@ -1,18 +1,32 @@
name: Update Browserslist name: Update Browserslist database
on: on:
push: schedule:
branches-ignore: - cron: '0 2 1,15 * *'
- 'develop'
- 'master' permissions:
contents: write
pull-requests: write
jobs: jobs:
build: update-browserslist-database:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - name: Checkout repository
- run: npx browserslist@latest --update-db uses: actions/checkout@v3
- name: Commit changes
uses: EndBug/add-and-commit@v9
with: with:
author_name: ${{ github.actor }} fetch-depth: 0
author_email: ${{ github.actor }}@users.noreply.github.com - name: Configure git
message: 'Update Browserslist' run: |
git config --global user.email "action@github.com"
git config --global user.name "GitHub Action"
- name: Update Browserslist database and create PR if applies
uses: c2corg/browserslist-update-action@v2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branch: browserslist-update
base_branch: develop
commit_message: 'build: update Browserslist db'
title: 'build: update Browserslist db'
body: Auto-generated by [browserslist-update-action](https://github.com/c2corg/browserslist-update-action/)
labels: 'chores, github action'
+5 -6
View File
@@ -1,8 +1,7 @@
{ {
"singleQuote": true, "singleQuote": true,
"svelteSortOrder": "options-scripts-markup-styles", "svelteSortOrder": "options-scripts-markup-styles",
"bracketSameLine": true, "bracketSameLine": true,
"useTabs": true, "trailingComma": "none",
"trailingComma": "none", "printWidth": 100
"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}"
} }
] ]
} }
+21 -7
View File
@@ -1,9 +1,23 @@
{ {
"editor.formatOnSave": true, "editor.formatOnSave": true,
"cSpell.words": ["pako", "Serde", "serdes"], "cSpell.words": [
"vitest.commandLine": "yarn test:unit", "Browserslist",
"vitest.enable": true, "KROKI",
"testing.autoRun.mode": "rerun", "Serde",
"svelte.enable-ts-plugin": true, "asyncable",
"githubPullRequests.ignoredPullRequestBranches": ["develop"] "corg",
"cssnano",
"daisyui",
"esserializer",
"localstorage",
"mindmap",
"pako",
"serdes",
"tailwindcss"
],
"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.11.0 as mermaid-live-editor-builder FROM node:18.14.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
+9 -6
View File
@@ -47,17 +47,20 @@ Then open http://localhost:8000
## Setup ## Setup
[Volta](https://volta.sh) is used for managing node and yarn versions. Below link will help you making a copy of the repository in your local system.
This project is set up using [Yarn](https://classic.yarnpkg.com/en/docs/getting-started): https://docs.github.com/en/get-started/quickstart/fork-a-repo
``` ## Requirements
yarn install
``` - [volta](https://volta.sh/) to manage node versions.
- [Node.js](https://nodejs.org/en/). `volta install node`
- [yarn](https://yarnpkg.com/) package manager. `volta install yarn`
## Development ## Development
``` ```sh
yarn install
yarn dev -- --open yarn dev -- --open
``` ```
+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 { verifyFileSizeGreaterThan } from './util';
describe('Check actions', () => { describe('Check actions', () => {
beforeEach(() => { beforeEach(() => {
cy.clearLocalStorage(); cy.clearLocalStorage();
cy.visit('/edit'); cy.visit('/edit');
}); cy.contains('Actions').click();
});
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.skip('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); verifyFileSizeGreaterThan('diagram', 'png', 35_000);
cy.get(`#downloadSVG`).click(); cy.get(`#downloadSVG`).click();
verifyFileSize('diagram', 'svg', 10_000); verifyFileSizeGreaterThan('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').click();
cy.get(`#downloadPNG`).click(); cy.get(`#downloadPNG`).click();
verifyFileSize('diagram', 'png', 46_000); verifyFileSizeGreaterThan('diagram', 'png', 40_000);
cy.get(`#downloadSVG`).click(); cy.get(`#downloadSVG`).click();
verifyFileSize('diagram', 'svg', 12_000); verifyFileSizeGreaterThan('diagram', 'svg', 11_000);
cy.clock().invoke('restore'); cy.clock().invoke('restore');
}); });
}); });
+81 -73
View File
@@ -1,86 +1,94 @@
import { getEditor, cmd } from './util'; import { getEditor, cmd } from './util';
describe('Auto sync tests', () => { describe('Auto sync tests', () => {
beforeEach(() => { beforeEach(() => {
cy.clearLocalStorage(); cy.clearLocalStorage();
cy.visit('/'); cy.visit('/');
}); });
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('#view').should('not.contain.text', 'Diagram out of sync.'); 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.get('#view').should('contain.text', 'Diagram out of sync.'); cy.get('#errorContainer').should('contain.text', 'Diagram out of sync.');
cy.getLocalStorage('codeStore').snapshot(); 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('#view').should('contain.text', 'Diagram out of sync.'); cy.get('#errorContainer').should('contain.text', 'Diagram out of sync.');
getEditor().type(`${cmd}{enter}`); getEditor().type(`${cmd}{enter}`);
cy.get('#view').should('not.contain.text', 'Diagram out of sync.'); cy.get('#errorContainer').should('not.exist');
cy.get('#view').should('not.have.class', 'outOfSync'); 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({ bottom: true, newline: false }).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');
}); });
it('should update diagram after entire text is removed', () => {
// https://github.com/mermaid-js/mermaid-live-editor/issues/1102
getEditor().type(`${cmd} a {backspace}`);
getEditor().type('graph LR');
getEditor().type(' {enter} A-->Car');
cy.get('#view').contains('Car').should('exist');
});
}); });
describe.only('Pan and Zoom', () => { describe('Pan and Zoom', () => {
beforeEach(() => { beforeEach(() => {
cy.clearLocalStorage(); cy.clearLocalStorage();
cy.visit('/'); cy.visit('/');
}); });
it('should toggle pan and zoom', () => { it('should toggle pan and zoom', () => {
cy.get('#svg-pan-zoom-reset-pan-zoom').should('not.exist'); cy.get('#svg-pan-zoom-reset-pan-zoom').should('not.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('exist');
cy.contains('Pan & Zoom').click(); 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('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').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').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').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');
}); });
}); });
+91 -93
View File
@@ -1,105 +1,103 @@
import { getEditor, verifyFileSnapshot } from './util'; import { getEditor, 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');
cy.contains('Actions').click(); cy.contains('History').click();
cy.contains('History').click(); });
});
afterEach(() => { afterEach(() => {
cy.clock().invoke('restore'); cy.clock().invoke('restore');
}); });
it('should load history from localstorage', () => { it('should load history from localstorage', () => {
cy.setLocalStorage( cy.setLocalStorage(
'manualHistoryStore', 'manualHistoryStore',
'[{"state":{"code":"graph TD\\n A[Halloween] -->|Get money| B(Go shopping)","mermaid":"{\\n \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"manual","id":"d7ea820e-21dd-418a-b984-fd58acde09df","name":"hollow-art"},{"state":{"code":"graph TD\\n A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","id":"b749ffc6-522b-4a44-86cf-7c1ffc3146b3","name":"helpful-ocean"}]' '[{"state":{"code":"graph TD\\n A[Halloween] -->|Get money| B(Go shopping)","mermaid":"{\\n \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":false},"time":0,"type":"manual","id":"d7ea820e-21dd-418a-b984-fd58acde09df","name":"hollow-art"},{"state":{"code":"graph TD\\n A[Christmas] -->|Get money| B(Go shopping)","mermaid":"{\\n \\"theme\\": \\"dark\\"\\n}","autoSync":true,"updateDiagram":true},"time":0,"type":"manual","id":"b749ffc6-522b-4a44-86cf-7c1ffc3146b3","name":"helpful-ocean"}]'
); );
cy.setLocalStorage( cy.setLocalStorage(
'autoHistoryStore', '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"}]' '[{"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.reload();
cy.contains('Actions').click(); cy.contains('History').click();
cy.contains('History').click(); cy.get('#historyList').find('li').should('have.length', 2);
cy.get('#historyList').find('li').should('have.length', 2); 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').contains('helpful-ocean');
cy.get('#historyList').contains('helpful-ocean'); cy.get('#historyList').contains('hollow-art');
cy.get('#historyList').contains('hollow-art'); cy.contains('Restore').click();
cy.contains('Restore').click(); cy.contains('Halloween');
cy.contains('Halloween'); cy.contains('Timeline').click();
cy.contains('Timeline').click();
cy.get('#historyList').find('li').should('have.length', 2); cy.get('#historyList').find('li').should('have.length', 2);
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').contains('needy-mosquito'); cy.get('#historyList').contains('needy-mosquito');
cy.get('#historyList').contains('barking-dog'); cy.get('#historyList').contains('barking-dog');
cy.contains('Restore').click(); cy.contains('Restore').click();
cy.contains('New Year'); cy.contains('New Year');
}); });
it('should save when clicked', () => { it('should save when clicked', () => {
cy.get('#historyList').find('li').should('have.length', 0); cy.get('#historyList').find('li').should('have.length', 0);
cy.get('#historyList').contains('No items in History'); cy.get('#historyList').contains('No items in History');
cy.get('#saveHistory').click(); 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.get('#saveHistory').click(); cy.get('#saveHistory').click();
cy.on('window:alert', (str) => { cy.on('window:alert', (str) => {
expect(str).to.equal('State already saved.'); expect(str).to.equal('State already saved.');
}); });
cy.on('window:confirm', () => true); cy.on('window:confirm', () => true);
getEditor().type(' C --> HistoryTest'); getEditor().type(' C --> HistoryTest');
cy.get('#saveHistory').click(); cy.get('#saveHistory').click();
cy.get('#historyList').find('li').should('have.length', 2); cy.get('#historyList').find('li').should('have.length', 2);
}); });
it('should be able to restore and delete', () => { it('should be able to restore and delete', () => {
cy.get('#saveHistory').click(); cy.get('#saveHistory').click();
getEditor().type(' C --> HistoryTest'); getEditor().type(' C --> HistoryTest');
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.contains('HistoryTest');
cy.contains('Restore').click(); cy.contains('Restore').click();
cy.contains('HistoryTest').should('not.exist'); cy.contains('HistoryTest').should('not.exist');
cy.contains('Delete').click(); cy.contains('Delete').click();
cy.get('#historyList').find('li').should('have.length', 0); cy.get('#historyList').find('li').should('have.length', 0);
cy.get('#historyList').contains('No items in History'); cy.get('#historyList').contains('No items in History');
cy.get('#saveHistory').click(); cy.get('#saveHistory').click();
getEditor().type(' C --> HistoryTest'); getEditor().type(' C --> HistoryTest');
cy.get('#saveHistory').click(); cy.get('#saveHistory').click();
cy.get('#editor').type('ing'); cy.get('#editor').type('ing');
cy.get('#clearHistory').click(); cy.get('#clearHistory').click();
cy.on('window:alert', (str) => { cy.on('window:alert', (str) => {
expect(str).to.equal('Clear all saved items?'); expect(str).to.equal('Clear all saved items?');
}); });
cy.on('window:confirm', () => true); cy.on('window:confirm', () => true);
cy.get('#historyList').contains('No items in History'); cy.get('#historyList').contains('No items in History');
}); });
// TODO: Fix #639 // TODO: Fix #639
xit('should auto save history', () => { xit('should auto save history', () => {
getEditor().type(' C --> HistoryTest'); getEditor().type(' C --> HistoryTest');
cy.tick(70000); cy.tick(70_000);
cy.contains('Timeline').click(); cy.contains('Timeline').click();
cy.get('#historyList').find('li').should('have.length', 1); cy.get('#historyList').find('li').should('have.length', 1);
cy.get('#editor').type('ing'); cy.get('#editor').type('ing');
cy.tick(70000); cy.tick(70_000);
cy.get('#historyList').find('li').should('have.length', 2); cy.get('#historyList').find('li').should('have.length', 2);
for (let i = 0; i < 31; i++) { for (let i = 0; i < 31; i++) {
cy.get('#editor').type('.'); cy.get('#editor').type('.');
cy.tick(70000); cy.tick(70_000);
} }
cy.get('#historyList').find('li').should('have.length', 30); cy.get('#historyList').find('li').should('have.length', 30);
}); });
it('should download history', () => { it('should download history', () => {
cy.get('#saveHistory').click(); cy.get('#saveHistory').click();
cy.get(`#downloadHistory`).click(); cy.get(`#downloadHistory`).click();
verifyFileSnapshot('history', 'json', 'A[Christmas] -->|Get money| B(Go shopping)'); verifyFileSnapshot('history', 'json', 'A[Christmas] -->|Get money| B(Go shopping)');
}); });
}); });
+108 -104
View File
@@ -1,118 +1,122 @@
import { toBase64 } from 'js-base64'; import { toBase64 } from 'js-base64';
describe('Site Loads', () => { describe('Site Loads', () => {
beforeEach(() => { beforeEach(() => {
cy.clearLocalStorage(); cy.clearLocalStorage();
cy.visit('/'); cy.visit('/');
}); });
it('Check Home page load', () => {
cy.url().should('include', '/edit');
cy.contains('History').click();
cy.getLocalStorage('codeStore').snapshot();
});
it('Check Redirect from old URL', () => { it('Check Home page load', () => {
cy.visit( cy.url().should('include', '/edit');
'/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9LCJ1cGRhdGVFZGl0b3IiOmZhbHNlfQ' cy.contains('History').click();
); cy.getLocalStorage('codeStore').snapshot();
cy.url().should('include', '/edit#pako:eNp'); });
});
it('should load sample diagrams when clicked', () => { it('Check Redirect from old URL', () => {
cy.contains('Sample Diagrams').click(); cy.visit(
cy.contains('Pie').click(); '/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl0iLCJtZXJtYWlkIjp7InRoZW1lIjoiZGVmYXVsdCJ9LCJ1cGRhdGVFZGl0b3IiOmZhbHNlfQ'
cy.contains('pie title Pets adopted by volunteers'); );
cy.contains('Class').click(); cy.url().should('include', '/edit#pako:eNp');
cy.contains('classDiagram'); });
});
it('should load diagram from gist', () => { it('should load sample diagrams when clicked', () => {
cy.visit(`/edit?gist=https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a`); cy.contains('Sample Diagrams').click();
cy.contains('History').click(); cy.contains('Pie').click();
cy.contains('Go shopping!!'); cy.contains('pie title Pets adopted by volunteers');
cy.contains('Revisions'); cy.contains('Class').click();
cy.contains('sidharthv96 v8f8f1e2'); cy.contains('classDiagram');
cy.contains('sidharthv96 v7851e19'); });
cy.getLocalStorage('codeStore').snapshot();
});
it('should load diagram from gist revision', () => { (Cypress.env('CI') === 'true' ? describe : describe.skip)('github', () => {
cy.visit( it('should load diagram from gist', () => {
'/edit?gist=https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/ec9b4ab0e41e4ff6287326cd3cb47affd7851e19' cy.visit(`/edit?gist=https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a`);
); cy.contains('History').click();
cy.contains('History').click(); cy.contains('Go shopping!!');
cy.contains('Party'); cy.contains('Revisions');
cy.contains('Revisions'); cy.contains('sidharthv96 v8f8f1e2');
cy.contains('sidharthv96 v7851e19'); cy.contains('sidharthv96 v7851e19');
cy.getLocalStorage('codeStore').snapshot(); cy.getLocalStorage('codeStore').snapshot();
}); });
it('should load diagram from raw files', () => { it('should load diagram from gist revision', () => {
cy.visit( cy.visit(
'/edit?code=https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/code.mmd&config=https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/config.json' '/edit?gist=https://gist.github.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/ec9b4ab0e41e4ff6287326cd3cb47affd7851e19'
); );
cy.contains('Party'); cy.contains('History').click();
cy.getLocalStorage('codeStore').snapshot(); cy.contains('Party');
}); cy.contains('Revisions');
cy.contains('sidharthv96 v7851e19');
cy.getLocalStorage('codeStore').snapshot();
});
// Disabled temporarily. Should be enabled after the issue is fixed in Mermaid. it('should load diagram from raw files', () => {
// it('should prevent setting the "securityLevel" option via URL', () => { cy.visit(
// const b64State = toBase64( '/edit?code=https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/code.mmd&config=https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/config.json'
// `{"code":"graph TD\\nA[\\"<img src='https://via.placeholder.com/64' width=64 />\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","autoSync":true,"updateDiagram":true}`, );
// true cy.contains('Party');
// ); 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'`);
// });
it('should allow persisting "securityLevel" using confirm dialogue', () => { // Disabled temporarily. Should be enabled after the issue is fixed in Mermaid.
const b64State = toBase64( // it('should prevent setting the "securityLevel" option via URL', () => {
`{"code":"graph TD\\nA[\\"<img src='https://dummyimage.com/64' width=64/>\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","autoSync":true,"updateDiagram":true}`, // const b64State = toBase64(
true // `{"code":"graph TD\\nA[\\"<img src='https://via.placeholder.com/64' width=64 />\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","autoSync":true,"updateDiagram":true}`,
); // true
cy.on('window:confirm', () => false); // );
cy.visit(`/edit#${b64State}`); // cy.on('window:confirm', () => true);
cy.contains('Config').click(); // cy.visit(`/edit#${b64State}`);
cy.contains('forest'); // cy.contains('Config').click();
cy.contains('securityLevel'); // cy.contains('forest');
cy.get('#view').find('img').should('be.visible'); // 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'`);
// });
it('should show troubleshooting steps if loading fails', () => { it.skip('should allow persisting "securityLevel" using confirm dialogue', () => {
cy.visit('/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAg'); const b64State = toBase64(
cy.reload(true); `{"code":"graph TD\\nA[\\"<img src='https://dummyimage.com/64' width=64/>\\"]","mermaid":"{\\"securityLevel\\": \\"loose\\", \\"theme\\": \\"forest\\"}","autoSync":true,"updateDiagram":true}`,
cy.contains('Please Click here to Raise an issue in github.'); true
}); );
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 load uncompressed URL', () => { it('should show troubleshooting steps if loading fails', () => {
cy.visit( cy.visit('/#/edit/eyJjb2RlIjoiZ3JhcGggVERcbiAg');
'/edit/#eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW05ldyBZZWFyXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICAgIEIgLS0-IEN7TGV0IG1lIHRoaW5rfVxuICAgIEMgLS0-fE9uZXwgRFtMYXB0b3BdXG4gICAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgICBDIC0tPnxUaHJlZXwgRltmYTpmYS1jYXIgQ2FyXSIsIm1lcm1haWQiOiJ7XG4gIFwidGhlbWVcIjogXCJkZWZhdWx0XCJcbn0iLCJ1cGRhdGVFZGl0b3IiOmZhbHNlLCJhdXRvU3luYyI6dHJ1ZSwidXBkYXRlRGlhZ3JhbSI6ZmFsc2V9' cy.reload(true);
); 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 compressed URL', () => { it('should load compressed URL', () => {
cy.visit( cy.visit(
'/edit#pako:eNpVkM2KwkAQhF-l6dMK5gVyEDRxvYi7sF6WjIcm0zqDzg_jBJEk725Hd2G3Tw31VVFUj23QjCWeEkUD-1p5kFs2O77BN1M6QFEshg1ncMHzfYDV2ybA1YQYrT_NXvhqgqDqtxPGkI315_ElVU__h-cB6mZLMYd4-Kvsb2GAdWM_jcT_V0xicb03RyqPVLSUoJI-OEfHyZHV0rqfDAqzYccKS3k1pbNC5Ufhuqgp81rbHBJKxuXKc6Quh6-7b7HMqeNfqLYkC7gfanwAlW1ZvQ' '/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#pako:eNptkU1PwzAMhv9K5BOI9Q9EXBDbJA477YYqITcxndV8QD40weh_Jy1rGR0-OY_tV2_sEyivCSQogzGuGduAtnaixINji0bcf1WVWGfVXdMtx8M1faYm4B8sxR27JLClJd6nwK4VLTlN4bI4jMQd2pLe3C4KFhNNcLQ92jv9ADGLNoTdozc-zIV4ZDsNlud7RtVN7_5Sb_jYrFcN3iN_0pPbEqUZK3QbTP_Ojyv4NdR4bwTHlyMbPcOQ3WJ2CliBpWCRdbnLqFJDOpClGmRJNYauhtr1pS-_6bKMjebkA8hXNJFWgDn5_YdTIFPINDWdb3vu6r8BaWOZRQ' '/edit#pako:eNptkU1PwzAMhv9K5BOI9Q9EXBDbJA477YYqITcxndV8QD40weh_Jy1rGR0-OY_tV2_sEyivCSQogzGuGduAtnaixINji0bcf1WVWGfVXdMtx8M1faYm4B8sxR27JLClJd6nwK4VLTlN4bI4jMQd2pLe3C4KFhNNcLQ92jv9ADGLNoTdozc-zIV4ZDsNlud7RtVN7_5Sb_jYrFcN3iN_0pPbEqUZK3QbTP_Ojyv4NdR4bwTHlyMbPcOQ3WJ2CliBpWCRdbnLqFJDOpClGmRJNYauhtr1pS-_6bKMjebkA8hXNJFWgDn5_YdTIFPINDWdb3vu6r8BaWOZRQ'
); );
cy.contains('Animal'); cy.contains('Animal');
}); });
it('should load uncompressed URL', () => {
cy.visit(
'/edit/#eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW05ldyBZZWFyXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICAgIEIgLS0-IEN7TGV0IG1lIHRoaW5rfVxuICAgIEMgLS0-fE9uZXwgRFtMYXB0b3BdXG4gICAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgICBDIC0tPnxUaHJlZXwgRltmYTpmYS1jYXIgQ2FyXSIsIm1lcm1haWQiOiJ7XG4gIFwidGhlbWVcIjogXCJkZWZhdWx0XCJcbn0iLCJ1cGRhdGVFZGl0b3IiOmZhbHNlLCJhdXRvU3luYyI6dHJ1ZSwidXBkYXRlRGlhZ3JhbSI6ZmFsc2V9'
);
cy.contains('New Year');
cy.visit(
'/edit#eyJjb2RlIjoiY2xhc3NEaWFncmFtXG4gICAgQW5pbWFsIDx8LS0gRHVja1xuICAgIEFuaW1hbCA8fC0tIEZpc2hcbiAgICBBbmltYWwgPHwtLSBaZWJyYVxuICAgIEFuaW1hbCA6ICtpbnQgYWdlXG4gICAgQW5pbWFsIDogK1N0cmluZyBnZW5kZXJcbiAgICBBbmltYWw6ICtpc01hbW1hbCgpXG4gICAgQW5pbWFsOiArbWF0ZSgpXG4gICAgY2xhc3MgRHVja3tcbiAgICAgICtTdHJpbmcgYmVha0NvbG9yXG4gICAgICArc3dpbSgpXG4gICAgICArcXVhY2soKVxuICAgIH1cbiAgICBjbGFzcyBGaXNoe1xuICAgICAgLWludCBzaXplSW5GZWV0XG4gICAgICAtY2FuRWF0KClcbiAgICB9XG4gICAgY2xhc3MgWmVicmF7XG4gICAgICArYm9vbCBpc193aWxkXG4gICAgICArcnVuKClcbiAgICB9XG4gICAgICAgICAgICAiLCJtZXJtYWlkIjoie1xuICBcInRoZW1lXCI6IFwiZGFya1wiXG59IiwidXBkYXRlRWRpdG9yIjpmYWxzZSwiYXV0b1N5bmMiOnRydWUsInVwZGF0ZURpYWdyYW0iOmZhbHNlfQ'
);
cy.contains('Animal');
cy.visit(
'/edit/#base64:eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW05ldyBZZWFyXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICAgIEIgLS0-IEN7TGV0IG1lIHRoaW5rfVxuICAgIEMgLS0-fE9uZXwgRFtMYXB0b3BdXG4gICAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgICBDIC0tPnxUaHJlZXwgRltmYTpmYS1jYXIgQ2FyXSIsIm1lcm1haWQiOiJ7XG4gIFwidGhlbWVcIjogXCJkZWZhdWx0XCJcbn0iLCJ1cGRhdGVFZGl0b3IiOmZhbHNlLCJhdXRvU3luYyI6dHJ1ZSwidXBkYXRlRGlhZ3JhbSI6ZmFsc2V9'
);
cy.contains('New Year');
});
}); });
+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();
}); });
}); });
}); });
+34 -29
View File
@@ -1,41 +1,46 @@
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}`);
const downloadsFolder = Cypress.config('downloadsFolder'); const downloadsFolder = Cypress.config('downloadsFolder');
export const verifyFileSize = ( export const verifyFileSizeGreaterThan = (
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); // eslint-disable-next-line @typescript-eslint/no-unsafe-call
cy.readFile(filePath, null, { cy.verifyDownload(fileName);
log: false cy.readFile(filePath, null, {
}).then((buffer) => expect((buffer as ArrayBuffer).byteLength).to.be.gt(size)); log: false
cy.task('deleteFile', filePath); }).then((buffer: ArrayBuffer) => {
expect(buffer.byteLength).to.be.gt(size);
expect(buffer.byteLength).to.be.lt(size * 1.3);
});
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); // eslint-disable-next-line @typescript-eslint/no-unsafe-call
cy.readFile(filePath, null, { cy.verifyDownload(fileName);
log: false cy.readFile(filePath, null, {
}).then((buffer) => log: false
expect(new TextDecoder('utf-8').decode(buffer as ArrayBuffer)).to.contain(content) }).then((buffer: ArrayBuffer) =>
); expect(new TextDecoder('utf8').decode(buffer)).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"
} }
+4 -4
View File
@@ -1,7 +1,7 @@
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\":\"flowchart TD\\n A[Christmas] -->|Get money| B(Go shopping)\\n B --> C{Let me think}\\n C -->|One| D[Laptop]\\n C -->|Two| E[iPhone]\\n C -->|Three| F[fa:fa-car Car]\\n \",\"mermaid\":\"{\\n \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true}"
}, },
"Check Redirect from old URL": { "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}\",\"autoSync\":true,\"updateDiagram\":true}"
@@ -16,13 +16,13 @@ module.exports = {
"1": "{\"code\":\"graph TD\\n A[Party] -->|Get money| B(Go shopping!!)\\n \",\"mermaid\":\"{\\n \\\"theme\\\": \\\"forest\\\",\\n \\\"test\\\": \\\"hello world\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"files\",\"config\":{\"codeURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/code.mmd\",\"configURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/config.json\"}}}" "1": "{\"code\":\"graph TD\\n A[Party] -->|Get money| B(Go shopping!!)\\n \",\"mermaid\":\"{\\n \\\"theme\\\": \\\"forest\\\",\\n \\\"test\\\": \\\"hello world\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"files\",\"config\":{\"codeURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/code.mmd\",\"configURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/config.json\"}}}"
} }
}, },
"__version": "10.10.0", "__version": "11.2.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\":\"flowchart TD\\n A[Christmas] -->|Get money| B(Go shopping)\\n B --> C{Let me think}\\n C -->|One| D[Laptop]\\n C -->|Two| E[iPhone]\\n C -->|Three| F[fa:fa-car Car]\\n C --> Test\",\"mermaid\":\"{\\n \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":false,\"updateDiagram\":false}"
}, },
"should not dim diagram when code is in sync": { "should not dim diagram when code is in sync": {
"1": "{\"code\":\"graph TD\\n A[Christmas] -->|Get money| B(Go shopping)\\n B --> C{Let me think}\\n C -->|One| D[Laptop]\\n C -->|Two| E[iPhone]\\n C -->|Three| F[fa:fa-car Car]\\n C --> Testing\",\"mermaid\":\"{\\n \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":false}" "1": "{\"code\":\"flowchart TD\\n A[Christmas] -->|Get money| B(Go shopping)\\n B --> C{Let me think}\\n C -->|One| D[Laptop]\\n C -->|Two| E[iPhone]\\n C -->|Three| F[fa:fa-car Car]\\n C --> Testing\",\"mermaid\":\"{\\n \\\"theme\\\": \\\"default\\\"\\n}\",\"autoSync\":true,\"updateDiagram\":false}"
} }
}, },
"Test themes": { "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", "node"]
}, },
"include": ["**/*.ts"] "include": ["**/*.ts"]
} }
+95 -94
View File
@@ -1,96 +1,97 @@
{ {
"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", "dev:force": "MERMAID_LOCAL=true yarn dev --force",
"dev:test": "yarn dev", "dev:test": "yarn dev",
"build": "vite build", "build": "vite build",
"preview": "vite preview", "preview": "vite preview",
"lint": "prettier --check --cache --plugin-search-dir=. .;eslint --ignore-path .gitignore .", "lint": "prettier --check --cache --plugin-search-dir=. .;eslint --ignore-path .gitignore .",
"lint:fix": "prettier --write --cache --plugin-search-dir=. .;eslint --fix --ignore-path .gitignore .", "lint:fix": "prettier --write --cache --plugin-search-dir=. .;eslint --fix --ignore-path .gitignore .",
"format": "prettier --write --cache --plugin-search-dir=. .", "format": "prettier --write --cache --plugin-search-dir=. .",
"pre-commit": "lint-staged", "pre-commit": "lint-staged",
"postinstall": "husky install; svelte-kit sync", "postinstall": "husky install && svelte-kit sync && (git config blame.ignoreRevsFile .git-blame-ignore-revs || true)",
"test:unit": "vitest", "test:unit": "vitest",
"test:ui": "vitest --ui", "test:ui": "vitest --ui",
"test:coverage": "vitest run --coverage", "test:coverage": "vitest run --coverage",
"test:browser": "cypress run", "test:browser": "cypress run",
"test": "test:unit && test:browser", "test": "test:unit && test:browser",
"cy": "cypress open" "cy": "cypress open"
}, },
"devDependencies": { "devDependencies": {
"@cypress/snapshot": "2.1.7", "@cypress/snapshot": "2.1.7",
"@sveltejs/adapter-static": "1.0.0-next.44", "@sveltejs/adapter-static": "1.0.6",
"@sveltejs/kit": "1.0.0-next.516", "@sveltejs/kit": "1.5.0",
"@testing-library/jest-dom": "5.16.5", "@testing-library/jest-dom": "5.16.5",
"@testing-library/svelte": "3.2.2", "@testing-library/svelte": "3.2.2",
"@types/async": "^3.2.15", "@types/pako": "2.0.0",
"@types/pako": "2.0.0", "@types/uuid": "8.3.4",
"@types/uuid": "8.3.4", "@typescript-eslint/eslint-plugin": "5.51.0",
"@typescript-eslint/eslint-plugin": "5.40.1", "@typescript-eslint/parser": "5.51.0",
"@typescript-eslint/parser": "5.40.1", "@vitest/ui": "^0.28.0",
"@vitest/ui": "0.24.3", "autoprefixer": "^10.4.13",
"autoprefixer": "10.4.12", "c8": "7.12.0",
"c8": "7.12.0", "chai": "^4.3.7",
"chai": "4.3.6", "cssnano": "^5.1.14",
"cssnano": "5.1.13", "cy-verify-downloads": "0.1.11",
"cy-verify-downloads": "0.1.11", "cypress": "11.2.0",
"cypress": "10.10.0", "cypress-localstorage-commands": "2.2.2",
"cypress-localstorage-commands": "2.2.1", "eslint": "8.33.0",
"eslint": "8.25.0", "eslint-config-prettier": "8.6.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-no-only-tests": "^3.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.2", "eslint-plugin-tailwindcss": "3.8.3",
"eslint-plugin-vitest": "0.0.11", "eslint-plugin-unicorn": "^45.0.0",
"esserializer": "1.3.2", "eslint-plugin-vitest": "^0.0.32",
"husky": "8.0.1", "esserializer": "1.3.10",
"jsdom": "20.0.1", "font-awesome": "^4.7.0",
"lint-staged": "13.0.3", "husky": "^8.0.2",
"node-html-parser": "6.1.1", "jsdom": "20.0.3",
"postcss": "8.4.18", "lint-staged": "13.1.1",
"postcss-load-config": "4.0.1", "node-html-parser": "^6.1.4",
"prettier": "2.7.1", "postcss": "^8.4.19",
"prettier-plugin-svelte": "2.8.0", "postcss-load-config": "4.0.1",
"svelte": "3.52.0", "prettier": "2.8.3",
"svelte-preprocess": "4.10.7", "prettier-plugin-svelte": "^2.8.1",
"tailwindcss": "3.1.8", "svelte": "3.55.1",
"tslib": "2.4.0", "svelte-preprocess": "4.10.7",
"typescript": "4.8.4", "tailwindcss": "^3.2.4",
"vite": "3.1.8", "tslib": "^2.4.1",
"vitest": "0.24.3" "typescript": "4.9.5",
}, "vite": "^4.0.1",
"dependencies": { "vitest": "^0.28.0"
"analytics": "0.8.1", },
"analytics-plugin-plausible": "0.0.6", "dependencies": {
"async": "^3.2.4", "analytics": "0.8.1",
"daisyui": "2.31.0", "analytics-plugin-plausible": "0.0.6",
"js-base64": "3.7.2", "daisyui": "2.50.0",
"mermaid": "9.2.0-rc6", "dayjs": "^1.11.7",
"moment": "2.29.4", "js-base64": "3.7.4",
"monaco-editor": "0.34.1", "mermaid": "10.0.1-rc.3",
"monaco-mermaid": "1.0.6", "monaco-editor": "0.34.1",
"pako": "2.0.4", "monaco-mermaid": "1.0.8",
"random-word-slugs": "0.1.6", "pako": "2.1.0",
"svg-pan-zoom": "3.6.1", "random-word-slugs": "0.1.6",
"uuid": "9.0.0" "svg-pan-zoom": "3.6.1",
}, "uuid": "9.0.0"
"lint-staged": { },
"*.{ts,svelte,js,css,md,json}": [ "lint-staged": {
"prettier --plugin-search-dir=. --write", "*.{ts,svelte,js,css,md,json}": [
"eslint --ignore-path .gitignore " "prettier --plugin-search-dir=. --write",
] "eslint --ignore-path .gitignore "
}, ]
"volta": { },
"node": "18.5.0", "volta": {
"yarn": "1.22.19" "node": "18.14.0",
}, "yarn": "1.22.19"
"engines": { },
"node": ">=16.7" "engines": {
} "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'
}) })
] ]
}; };
+22 -22
View File
@@ -1,24 +1,24 @@
{ {
"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, "dependencyDashboard": true,
"major": { "major": {
"dependencyDashboardApproval": true "dependencyDashboardApproval": true
}, },
"dependencyDashboardAutoclose": true "dependencyDashboardAutoclose": true
} }
+54 -54
View File
@@ -1,57 +1,57 @@
<!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.svg" />
<link rel="mask-icon" href="%sveltekit.assets%/favicon.svg" color="#000000" /> <link rel="mask-icon" href="%sveltekit.assets%/favicon.svg" color="#000000" />
<meta name="theme-color" content="#6366F1" /> <meta name="theme-color" content="#6366F1" />
<link rel="manifest" href="%sveltekit.assets%/manifest.json" /> <link rel="manifest" href="%sveltekit.assets%/manifest.json" />
<link <link
rel="stylesheet" rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.0/css/all.min.css" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.2.1/css/all.min.css"
integrity="sha512-xh6O/CkQoPOWDdYTDqeRdPCVd1SpvCA9XXcUnZS2FmJNp1coAFzvtCN9BmamE+4aHK8yyUHUSCcJHgXloTyT2A==" integrity="sha512-MV7K8+y+gLIBoVD59lQIYicR65iaqukzvf/nwasF0nqhPay5w/9lJmVM2hMDcnK1OnMGCdVK+iQrJ7lzPJQd1w=="
crossorigin="anonymous" crossorigin="anonymous"
referrerpolicy="no-referrer" /> referrerpolicy="no-referrer" />
<link <link
rel="stylesheet" rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.min.css" href="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.min.css"
integrity="sha512-GzcoZD7y5zvBofYtImXPZaPVhoY7xLPt+ysmbPb/vU+quSKFkcngxaSrxuwprDZL4MALUqGFmnqCxQZqMozv1Q==" integrity="sha512-GzcoZD7y5zvBofYtImXPZaPVhoY7xLPt+ysmbPb/vU+quSKFkcngxaSrxuwprDZL4MALUqGFmnqCxQZqMozv1Q=="
crossorigin="anonymous" crossorigin="anonymous"
referrerpolicy="no-referrer" /> referrerpolicy="no-referrer" />
<script> <script>
var require = { var require = {
paths: { paths: {
vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs' vs: 'https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.0/min/vs'
} }
}; };
</script> </script>
<script <script
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/loader.min.js" src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/loader.min.js"
integrity="sha512-6bIYsGqvLpAiEBXPdRQeFf5cueeBECtAKJjIHer3BhBZNTV3WLcLA8Tm3pDfxUwTMIS+kAZwTUvJ1IrMdX8C5w==" integrity="sha512-6bIYsGqvLpAiEBXPdRQeFf5cueeBECtAKJjIHer3BhBZNTV3WLcLA8Tm3pDfxUwTMIS+kAZwTUvJ1IrMdX8C5w=="
crossorigin="anonymous" crossorigin="anonymous"
referrerpolicy="no-referrer"></script> referrerpolicy="no-referrer"></script>
<script <script
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.nls.min.js" src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.nls.min.js"
integrity="sha512-CCv+DKWw+yZhxf4Z+ExT6HC5G+3S45TeMTYcJyYbdrv4BpK2vyALJ4FoVR/KGWDIPu7w4tNCOC9MJQIkYPR5FA==" integrity="sha512-CCv+DKWw+yZhxf4Z+ExT6HC5G+3S45TeMTYcJyYbdrv4BpK2vyALJ4FoVR/KGWDIPu7w4tNCOC9MJQIkYPR5FA=="
crossorigin="anonymous" crossorigin="anonymous"
referrerpolicy="no-referrer"></script> referrerpolicy="no-referrer"></script>
<script <script
src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.js" src="https://cdnjs.cloudflare.com/ajax/libs/monaco-editor/0.34.1/min/vs/editor/editor.main.js"
integrity="sha512-BtSZPhzoyN8kq1axY6cgOFPSgLJgFwvAZ3WxeDGxEFXeFcFuK2s7Hr+zF75npVHASUY1dxudAfIVzwmgdR89Bw==" integrity="sha512-BtSZPhzoyN8kq1axY6cgOFPSgLJgFwvAZ3WxeDGxEFXeFcFuK2s7Hr+zF75npVHASUY1dxudAfIVzwmgdR89Bw=="
crossorigin="anonymous" crossorigin="anonymous"
referrerpolicy="no-referrer"></script> referrerpolicy="no-referrer"></script>
%sveltekit.head% %sveltekit.head%
</head> </head>
<body> <body>
<div id="svelte">%sveltekit.body%</div> <div id="svelte">%sveltekit.body%</div>
</body> </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;
} }
+7 -7
View File
@@ -1,14 +1,14 @@
/// <reference types="vite/client" /> /// <reference types="vite/client" />
interface ImportMetaEnv { interface ImportMetaEnv {
readonly MERMAID_RENDERER_URL: string; readonly MERMAID_RENDERER_URL?: string;
readonly MERMAID_KROKI_RENDERER_URL: string; readonly MERMAID_KROKI_RENDERER_URL?: string;
readonly MERMAID_CDN_URL: string; readonly MERMAID_CDN_URL?: string;
readonly MERMAID_BASE_URL: string; readonly MERMAID_BASE_URL?: string;
readonly MERMAID_LOCAL: boolean; readonly MERMAID_LOCAL?: boolean;
// more env variables... // more env variables...
} }
interface ImportMeta { interface ImportMeta {
readonly env: ImportMetaEnv; readonly env: ImportMetaEnv;
} }
+7 -6
View File
@@ -6,10 +6,11 @@
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-expect-error
extends TestingLibraryMatchers<typeof expect.stringContaining, R> {} // eslint-disable-next-line no-undef
} extends TestingLibraryMatchers<typeof expect.stringContaining, R> {}
}
} }
+2 -2
View File
@@ -1,6 +1,6 @@
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; return response;
}; };
+265
View File
@@ -0,0 +1,265 @@
<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 dayjs from 'dayjs';
const { krokiRendererUrl, rendererUrl } = env;
type Exporter = (context: CanvasRenderingContext2D, image: HTMLImageElement) => () => void;
const getFileName = (ext: string) =>
`mermaid-diagram-${dayjs().format('YYYY-MM-DD-HHmmss')}.${ext}`;
const getBase64SVG = (svg?: HTMLElement, width?: number, height?: number): string => {
height && svg?.setAttribute('height', `${height}px`);
width && svg?.setAttribute('width', `${width}px`); // Workaround https://stackoverflow.com/questions/28690643/firefox-error-rendering-an-svg-image-to-html5-canvas-with-drawimage
if (!svg) {
svg = getSvgEl();
}
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 | null = document.querySelector('#container svg');
if (!svg) {
throw new Error('svg not found');
}
const box: DOMRect = svg.getBoundingClientRect();
canvas.width = box.width;
canvas.height = box.height;
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');
if (!context) {
throw new Error('context not found');
}
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.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 {
if (!blob) {
throw new Error('blob is empty');
}
void navigator.clipboard.write([
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-expect-error 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(({ code, serialized }) => {
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={false}>
<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
@@ -0,0 +1,31 @@
<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 = '';
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
@@ -0,0 +1,52 @@
<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>
+23
View File
@@ -0,0 +1,23 @@
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', icon: 'fab fa-git-alt' },
{ id: 't2', title: 'title2', icon: 'far fa-bookmark' }
]
});
expect(container).toBeTruthy();
expect(container).toHaveTextContent('TabTest');
expect(container).toHaveTextContent('title1');
expect(container).toHaveTextContent('title2');
expect(container).not.toHaveTextContent('title3');
});
});
+131
View File
@@ -0,0 +1,131 @@
<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 | undefined = undefined;
let editor: monaco.editor.IStandaloneCodeEditor | undefined;
let Monaco: typeof monaco | undefined;
let editorOptions: monaco.editor.IStandaloneEditorConstructionOptions = {
minimap: {
enabled: false
},
theme: 'mermaid',
overviewRulerLanes: 0
};
let text = '';
stateStore.subscribe(({ errorMarkers, editorMode, code, mermaid }) => {
// console.log('editor store subscription', { code, mermaid });
if (!editor || !Monaco) {
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';
const model = editor.getModel();
if (!model) {
console.error("editor model doesn't exist");
return;
}
if (model.getLanguageId() !== language) {
Monaco.editor.setModelLanguage(model, language);
}
// Display/clear errors
Monaco.editor.setModelMarkers(model, 'mermaid', errorMarkers);
});
themeStore.subscribe(({ isDark }) => {
editor && Monaco?.editor.setTheme(isDark ? 'mermaid-dark' : 'mermaid');
});
const handleUpdate = (text: string, mode: EditorMode) => {
// console.log('editor HandleUpdate', { text, mode });
if (mode === 'code') {
updateCode(text);
} else {
updateConfig(text);
}
};
const loadMonaco = async () => {
console.log('Loading Monaco...');
// errorDebug();
let i = 0;
while (i++ < 500) {
// @ts-expect-error : 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
if (!Monaco) {
throw new Error('Monaco failed to load');
}
if (!divEl) {
throw new Error('divEl is undefined');
}
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
initEditor(Monaco);
errorDebug(100);
editor = Monaco.editor.create(divEl, editorOptions);
editor.onDidChangeModelContent(({ isFlush, changes }) => {
const newText = editor?.getValue();
// console.log('editor onDidChangeModelContent', { text, newText, isFlush, changes });
if (!newText || text === newText || isFlush) {
return;
}
text = newText;
handleUpdate(text, $stateStore.editorMode);
});
editor.addAction({
id: 'mermaid-render-diagram',
label: 'Render Diagram',
keybindings: [Monaco.KeyMod.CtrlCmd | Monaco.KeyCode.Enter],
run: function () {
syncDiagram();
logEvent('renderDiagram', {
method: '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
});
});
if (divEl.parentElement) {
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" />
+195
View File
@@ -0,0 +1,195 @@
<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 dayjs from 'dayjs';
import dayjsRelativeTime from 'dayjs/plugin/relativeTime';
import type { HistoryEntry, HistoryType, State, Tab } from '$lib/types';
import { logEvent } from '$lib/util/stats';
dayjs.extend(dayjsRelativeTime);
const HISTORY_SAVE_INTERVAL = 60000;
const tabSelectHandler = (message: CustomEvent<Tab>) => {
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-${dayjs().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: HistoryEntry[] = 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()} (${dayjs(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>
+126
View File
@@ -0,0 +1,126 @@
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: 12_345,
type: 'manual'
});
const [manualEntry] = JSON.parse(
window.localStorage.getItem('manualHistoryStore') ?? '[]'
) as HistoryEntry[];
expect(manualEntry.time).toBe(12_345);
expect(manualEntry.type).toBe('manual');
expect(manualEntry.name).not.toBeNull();
expect(manualEntry.state).not.toBeNull();
addHistoryEntry({
state: defaultState,
time: 54_321,
type: 'auto'
});
const [autoEntry] = JSON.parse(
window.localStorage.getItem('autoHistoryStore') ?? '[]'
) as HistoryEntry[];
expect(autoEntry.time).toBe(54_321);
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: 12_345,
type: 'manual'
});
addHistoryEntry({
state: { ...defaultState, code: 'graph TD\\n A[Christmas] -->|Get money| B(Go shopping)' },
time: 123_456,
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: 54_321,
type: 'auto'
});
addHistoryEntry({
state: { ...defaultState, code: 'graph TD\\n A[Christmas] -->|Get money| B(Go shopping)' },
time: 654_321,
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 = JSON.parse(
window.localStorage.getItem('manualHistoryStore') ?? '[]'
) as HistoryEntry[];
let autoHistoryStore = JSON.parse(
window.localStorage.getItem('autoHistoryStore') ?? '[]'
) as HistoryEntry[];
expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
injectHistoryIDs();
manualHistoryStore = JSON.parse(
window.localStorage.getItem('manualHistoryStore') ?? '[]'
) as HistoryEntry[];
autoHistoryStore = JSON.parse(
window.localStorage.getItem('autoHistoryStore') ?? '[]'
) as HistoryEntry[];
expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
});
});
+152
View File
@@ -0,0 +1,152 @@
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([]);
export const historyStore: Readable<HistoryEntry[]> = derived(
[historyModeStore, autoHistoryStore, manualHistoryStore, loaderHistoryStore],
([historyMode, autoHistories, manualHistories, loadedHistories], set) => {
switch (historyMode) {
case 'auto': {
set(autoHistories);
break;
}
case 'manual': {
set(manualHistories);
break;
}
case 'loader': {
set(loadedHistories);
break;
}
default: {
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((element) => validateEntry(element));
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.');
}
};
const setIDs = (entries: HistoryEntry[]) => {
for (const entry of entries) {
if (!entry.id) {
entry.id = uuidV4();
}
}
return entries;
};
export const injectHistoryIDs = (): void => {
autoHistoryStore.update(setIDs);
manualHistoryStore.update(setIDs);
};
const validateEntry = (entry: HistoryEntry): boolean => {
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
return entry.type && entry.state && entry.time && true;
};
+82
View File
@@ -0,0 +1,82 @@
<script context="module" lang="ts">
import { version } from 'mermaid/package.json';
import { analytics } from '$lib/util/stats';
void 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/intro/n00b-gettingStarted.html'
},
{
title: 'Tutorial',
href: 'https://mermaid-js.github.io/mermaid/config/Tutorials.html'
},
{
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>
@@ -1,21 +1,21 @@
<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: `flowchart 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: `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: `classDiagram
Animal <|-- Duck Animal <|-- Duck
Animal <|-- Fish Animal <|-- Fish
Animal <|-- Zebra Animal <|-- Zebra
@@ -36,14 +36,14 @@
+bool is_wild +bool is_wild
+run() +run()
}`, }`,
State: `stateDiagram-v2 State: `stateDiagram-v2
[*] --> Still [*] --> Still
Still --> [*] Still --> [*]
Still --> Moving Still --> Moving
Moving --> Still Moving --> Still
Moving --> Crash Moving --> Crash
Crash --> [*]`, Crash --> [*]`,
Gantt: `gantt Gantt: `gantt
title A Gantt Diagram title A Gantt Diagram
dateFormat YYYY-MM-DD dateFormat YYYY-MM-DD
section Section section Section
@@ -52,11 +52,11 @@
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: `pie title Pets adopted by volunteers
"Dogs" : 386 "Dogs" : 386
"Cats" : 85 "Cats" : 85
"Rats" : 15`, "Rats" : 15`,
ER: `erDiagram ER: `erDiagram
CUSTOMER }|..|{ DELIVERY-ADDRESS : has CUSTOMER }|..|{ DELIVERY-ADDRESS : has
CUSTOMER ||--o{ ORDER : places CUSTOMER ||--o{ ORDER : places
CUSTOMER ||--o{ INVOICE : "liable for" CUSTOMER ||--o{ INVOICE : "liable for"
@@ -65,7 +65,7 @@
ORDER ||--|{ ORDER-ITEM : includes ORDER ||--|{ ORDER-ITEM : includes
PRODUCT-CATEGORY ||--|{ PRODUCT : contains PRODUCT-CATEGORY ||--|{ PRODUCT : contains
PRODUCT ||--o{ ORDER-ITEM : "ordered in"`, PRODUCT ||--o{ ORDER-ITEM : "ordered in"`,
'User Journey': `journey '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
@@ -74,7 +74,7 @@
section Go home section Go home
Go downstairs: 5: Me Go downstairs: 5: Me
Sit down: 3: Me`, Sit down: 3: Me`,
Git: `gitGraph Git: `gitGraph
commit commit
commit commit
branch develop branch develop
@@ -85,7 +85,7 @@
merge develop merge develop
commit commit
commit`, commit`,
Mindmap: `mindmap Mindmap: `mindmap
root((mindmap)) root((mindmap))
Origins Origins
Long history Long history
@@ -102,43 +102,44 @@
Tools Tools
Pen and paper Pen and paper
Mermaid` Mermaid`
}; };
const loadSampleDiagram = (diagramType: string): void => { type SampleTypes = keyof typeof samples;
updateCode(samples[diagramType], { const loadSampleDiagram = (diagramType: SampleTypes): void => {
updateDiagram: true, updateCode(samples[diagramType], {
resetPanZoom: true updateDiagram: true,
}); resetPanZoom: true
logEvent('loadSampleDiagram', { diagramType }); });
}; logEvent('loadSampleDiagram', { diagramType });
};
// Adding in this array will add an icon to the preset menu // Adding in this array will add an icon to the preset menu
const newDiagrams: Array<keyof typeof samples> = ['Mindmap']; const newDiagrams: SampleTypes[] = ['Mindmap'];
const diagramOrder: Array<keyof typeof samples> = [ const diagramOrder: SampleTypes[] = [
'Sequence', 'Sequence',
'Flow', 'Flow',
'Class', 'Class',
'State', 'State',
'ER', 'ER',
'Gantt', 'Gantt',
'User Journey', 'User Journey',
'Git', 'Git',
'Pie', 'Pie',
'Mindmap' '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 flex-wrap p-2 gap-2">
{#each diagramOrder as sample} {#each diagramOrder as sample}
<button <button
class="btn btn-sm btn-primary w-28 normal-case flex-grow" class="btn btn-sm btn-primary w-28 normal-case flex-grow"
on:click={() => loadSampleDiagram(sample)}> on:click={() => loadSampleDiagram(sample)}>
{sample} {sample}
{#if newDiagrams.includes(sample)} {#if newDiagrams.includes(sample)}
<span class="ml-2 fa fa-heart" /> <span class="ml-2 fa fa-heart" />
{/if} {/if}
</button> </button>
{/each} {/each}
</div> </div>
</Card> </Card>
+64
View File
@@ -0,0 +1,64 @@
<script lang="ts">
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:bordered={$themeStore.theme !== undefined && theme.includes($themeStore.theme)}>
<span
class="btn btn-ghost justify-start"
on:click={() => setTheme(theme)}
on:keypress={() => setTheme(theme)}>{theme}</span>
</li>
{/each}
</ul>
</div>
</div>
+165
View File
@@ -0,0 +1,165 @@
<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 { cmdKey } from '$lib/util/util';
import { render as renderDiagram } from '$lib/util/mermaid';
import type { MermaidConfig } from '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: typeof panzoom | undefined;
const handlePanZoomChange = () => {
if (!pzoom) {
return;
}
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;
void Promise.resolve().then(() => {
const graphDiv = document.getElementById('graph-div');
if (!graphDiv) {
return;
}
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;
const { svg, bindFunctions } = await renderDiagram(
Object.assign({}, JSON.parse(state.mermaid)) as MermaidConfig,
code,
'graph-div'
);
if (svg.length > 0) {
handlePanZoom(state);
container.innerHTML = svg;
console.log({ svg });
const graphDiv = document.getElementById('graph-div');
if (!graphDiv) {
throw new Error('graph-div not found');
}
graphDiv.setAttribute('height', '100%');
graphDiv.style.maxWidth = '100%';
if (bindFunctions) {
bindFunctions(graphDiv);
}
}
view.parentElement!.scrollTop = scroll;
error = false;
} else if (manualUpdate) {
manualUpdate = false;
} else if (code !== state.code || config !== state.mermaid) {
outOfSync = true;
}
} catch (e) {
console.error('view fail', e);
error = true;
}
};
onMount(() => {
stateStore.subscribe((state) => {
void handleStateChange(state);
});
window.addEventListener('resize', () => {
if ($stateStore.panZoom && pzoom) {
pzoom.resize();
}
});
// console.log('View mounted');
});
</script>
{#if (error && $stateStore.error instanceof Error) || outOfSync}
<div
class="absolute w-full p-2 z-10 font-mono {error
? 'text-red-600'
: 'text-yellow-600'} bg-base-100 bg-opacity-80 text-center"
id="errorContainer">
{#if error}
{@html $stateStore.error?.toString().replace(/\n/g, '<br />')}
{:else}
Diagram out of sync. <br />
Press <i class="fas fa-sync" /> (Sync button) or <kbd>{cmdKey} + Enter</kbd> to sync.
{/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>
-259
View File
@@ -1,259 +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(({ code, serialized }) => {
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>
@@ -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>"`;
-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>
-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();
});
});
-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>
-103
View File
@@ -1,103 +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 { 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 }) => {
if (!editor) return;
// Update editor text if it's different
const newText = editorMode === 'code' ? code : mermaid;
if (newText !== text) {
editor.setValue(newText);
text = newText;
}
// Update editor mode if it's different
const language = editorMode === 'code' ? 'mermaid' : 'json';
if (editor.getModel().getLanguageId() !== language) {
Monaco?.editor.setModelLanguage(editor.getModel(), language);
}
// Display/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) => {
if (mode === 'code') {
updateCode(text);
} else {
updateConfig(text);
}
};
const loadMonaco = async () => {
console.log('Loading Monaco...');
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);
editor = Monaco.editor.create(divEl, editorOptions);
editor.onDidChangeModelContent(() => {
text = editor.getValue();
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);
return () => {
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 '../../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>
-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>
-152
View File
@@ -1,152 +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 { cmdKey } from '$lib/util/util';
import { render as renderDiagram, init as mermaidInit } from '$lib/util/mermaid';
const init = mermaidInit();
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 = (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;
if (code === state.code && config === state.mermaid && panZoomEnabled === state.panZoom) {
// Do not render if there is no change in Code/Config/PanZoom
return;
}
code = state.code;
config = state.mermaid;
panZoomEnabled = state.panZoom;
const scroll = view.parentElement.scrollTop;
delete container.dataset.processed;
renderDiagram({
config: Object.assign({}, JSON.parse(state.mermaid)),
code,
id: 'graph-div',
callback: (svgCode, bindFunctions) => {
if (svgCode.length > 0) {
handlePanZoom(state);
container.innerHTML = svgCode;
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;
}
};
onMount(() => {
stateStore.subscribe((state) => {
handleStateChange(state);
});
window.addEventListener('resize', () => {
if ($stateStore.panZoom && pzoom) {
pzoom.resize();
}
});
});
</script>
{#await init}
Loading...
{:then}
{#if error && $stateStore.error instanceof Error}
<div class="p-2 text-red-600" id="errorContainer">{$stateStore.error}</div>
{/if}
{#if outOfSync}
<div class="absolute w-full p-2 z-10 text-yellow-600 bg-base-100 bg-opacity-80 text-center">
Diagram out of sync. <br />
Press <i class="fas fa-sync" /> (Sync button) or <kbd>{cmdKey} + Enter</kbd> to sync.
</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>
{/await}
<style>
#view {
flex: 1;
}
#container {
transition: visibility 0.3s;
}
.error,
.outOfSync {
opacity: 0.5;
}
.hide {
visibility: hidden;
}
</style>
+55 -53
View File
@@ -1,86 +1,88 @@
/**
* Can be made globally available by placing this
* inside `global.d.ts` and removing `export` keyword
*/
export interface Locals {
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 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; updateDiagram: boolean;
autoSync: boolean; autoSync: boolean;
editorMode?: EditorMode; editorMode?: EditorMode;
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; editorMode: EditorMode;
error: unknown; error?: Error;
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 type DocumentationConfig = Record<
[key: string]: { string,
code: string; {
config?: string; code: string;
}; config?: string;
} }
>;
export type EditorMode = 'code' | 'config'; 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>;
export interface ErrorHash {
loc: {
first_line: number;
last_line: number;
first_column: number;
last_column: number;
};
}
+7 -7
View File
@@ -1,9 +1,9 @@
export const env = { export const env = {
rendererUrl: import.meta.env.MERMAID_RENDERER_URL ?? 'https://mermaid.ink', rendererUrl: import.meta.env.MERMAID_RENDERER_URL ?? 'https://mermaid.ink',
krokiRendererUrl: import.meta.env.MERMAID_KROKI_RENDERER_URL ?? 'https://kroki.io', krokiRendererUrl: import.meta.env.MERMAID_KROKI_RENDERER_URL ?? 'https://kroki.io',
mermaidCDNUrl: import.meta.env.MERMAID_CDN_URL ?? 'https://unpkg.com/@mermaid-js', mermaidCDNUrl: import.meta.env.MERMAID_CDN_URL ?? 'https://unpkg.com/@mermaid-js',
mermaidBaseURL: import.meta.env.MERMAID_BASE_URL ?? 'http://localhost:9000', mermaidBaseURL: import.meta.env.MERMAID_BASE_URL ?? 'http://localhost:9000',
useLocalMermaid: import.meta.env.MERMAID_LOCAL ?? false, useLocalMermaid: import.meta.env.MERMAID_LOCAL ?? false,
isDev: import.meta.env.DEV, isDev: import.meta.env.DEV,
baseURL: import.meta.env.BASE_URL baseURL: import.meta.env.BASE_URL
}; };
+102 -82
View File
@@ -3,105 +3,125 @@
/* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* 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 '$lib/util/state';
import { addHistoryEntry } from '../../components/history/history'; import { addHistoryEntry } from '$lib/components/History/history';
import { fetchJSON, fetchText } from '$lib/util/util';
const codeFileName = 'code.mmd'; const codeFileName = 'code.mmd';
const configFileName = 'config.json'; const configFileName = 'config.json';
interface GithubFile {
truncated: boolean;
raw_url: string;
content: string;
}
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: GithubFile): Promise<string> => {
if (file.truncated) { if (file.truncated) {
return await (await fetch(file.raw_url)).text(); return await fetchText(file.raw_url);
} }
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;
}
interface GistResponse {
files: Record<string, GithubFile>;
html_url: string;
history: { url: string; committed_at: string; version: string; user: { login: string } }[];
} }
const getGistData = async (gistURL: string): Promise<GistData> => { const getGistData = async (gistURL: string): Promise<GistData> => {
// eslint-disable-next-line @typescript-eslint/no-unused-vars const path = gistURL.split('github.com').pop();
const [_, __, gistID, revisionID] = gistURL.split('github.com').pop().split('/'); if (!path) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment throw new Error('Invalid GitHub URL' + gistURL);
const { html_url, files, history } = await ( }
await fetch(`https://api.github.com/gists/${gistID}${revisionID ? '/' + revisionID : ''}`) // eslint-disable-next-line @typescript-eslint/no-unused-vars
).json(); const [_, __, gistID, revisionID] = path.split('/');
if (isValidGist(files)) { // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const code = await getFileContent(files[codeFileName]); const { html_url, files, history }: GistResponse = await fetchJSON(
let config: string; `https://api.github.com/gists/${gistID}${revisionID ? '/' + revisionID : ''}`
if (configFileName in files) { );
config = await getFileContent(files[configFileName]); if (isValidGist(files)) {
} const code = await getFileContent(files[codeFileName]);
const currentItem = history[0]; let config = '{}';
return { if (configFileName in files) {
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions config = await getFileContent(files[configFileName]);
url: `${html_url}/${currentItem.version}`, }
code, const currentItem = history[0];
config, return {
author: currentItem.user.login, // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
time: new Date(currentItem.committed_at).getTime(), url: `${html_url}/${currentItem.version}`,
version: (currentItem.version as string).slice(-7) code,
}; config,
} else { author: currentItem.user.login,
throw 'Invalid gist provided'; time: new Date(currentItem.committed_at).getTime(),
} version: currentItem.version.slice(-7)
};
} else {
throw new Error('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 { const path = gistURL.split('github.com').pop();
// eslint-disable-next-line @typescript-eslint/no-unused-vars if (!path) {
const [_, __, gistID, revisionID] = gistURL.split('github.com').pop().split('/'); throw new Error('Invalid GitHub URL' + gistURL);
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment }
const { history } = await ( // eslint-disable-next-line @typescript-eslint/no-unused-vars
await fetch(`https://api.github.com/gists/${gistID}${revisionID ? '/' + revisionID : ''}`) const [_, __, gistID, revisionID] = path.split('/');
).json(); // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const gistHistory: GistData[] = []; const { history }: GistResponse = await fetchJSON(
for (const entry of history) { `https://api.github.com/gists/${gistID}${revisionID ? '/' + revisionID : ''}`
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment );
const data: GistData = await getGistData(entry.url).catch(() => undefined); const gistHistory: GistData[] = [];
data && gistHistory.push(data); for (const entry of history) {
} const data: GistData | undefined = await getGistData(entry.url).catch();
if (gistHistory.length === 0) { data && gistHistory.push(data);
throw 'Invalid gist provided'; }
} if (gistHistory.length === 0) {
gistHistory.reverse(); throw new Error('Invalid gist provided');
const state = getStateFromGist(gistHistory.slice(-1).pop(), gistURL); }
for (const gist of gistHistory) { gistHistory.reverse();
addHistoryEntry({ const entry = gistHistory.slice(-1).pop();
state: getStateFromGist(gist), if (!entry) {
time: gist.time, throw new Error('Invalid gist provided');
type: 'loader', }
url: gist.url, const state = getStateFromGist(entry, gistURL);
name: `${gist.author} v${gist.version}` for (const gist of gistHistory) {
}); addHistoryEntry({
} state: getStateFromGist(gist),
return state; time: gist.time,
} catch (err) { type: 'loader',
console.error(err); url: gist.url,
} name: `${gist.author} v${gist.version}`
});
}
return state;
}; };
+50 -51
View File
@@ -1,59 +1,58 @@
import { loadGistData } from './gist'; import { loadGistData } from './gist';
import { updateCodeStore, defaultState } from '../state'; import { updateCodeStore, defaultState } from '$lib/util/state';
import { fetchText } from '$lib/util/util';
import type { Loader, State } from '$lib/types'; 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 loaded = false;
let loaded = false; const codeURL: string | undefined = searchParams.get('code') ?? undefined;
const codeURL: string = searchParams.get('code'); const configURL: string | undefined = searchParams.get('config') ?? undefined;
const configURL: string = searchParams.get('config');
if (codeURL) { let code: string | undefined;
code = await (await fetch(codeURL)).text(); const config = configURL ? await fetchText(configURL) : defaultState.mermaid;
loaded = true;
} if (codeURL) {
if (configURL) { code = await fetchText(codeURL);
config = await (await fetch(configURL)).text(); loaded = true;
} else { }
config = defaultState.mermaid; if (code) {
} if (!codeURL) {
if (!code) { throw new Error('Code URL is not defined');
// eslint-disable-next-line @typescript-eslint/ban-ts-comment }
// @ts-ignore state = {
// eslint-disable-next-line @typescript-eslint/no-unsafe-call code,
for (const [key, value] of searchParams.entries()) { mermaid: config,
if (key in loaders) { loader: {
try { type: 'files',
state = await loaders[key](value); config: {
loaded = true; codeURL,
break; configURL
} catch (err) { }
console.error(err); }
} };
} } else {
} for (const [key, value] of searchParams.entries()) {
} else { if (key in loaders) {
state = { try {
code, state = await loaders[key](value);
mermaid: config, loaded = true;
loader: { break;
type: 'files', } catch (error) {
config: { console.error(error);
codeURL, }
configURL }
} }
} }
}; loaded &&
} updateCodeStore({
loaded && ...state,
updateCodeStore({ autoSync: true,
...state, updateDiagram: true
autoSync: true, });
updateDiagram: 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;
}; };
+11 -69
View File
@@ -1,74 +1,16 @@
import mermaid from 'mermaid'; import mermaid from 'mermaid';
// We need to export MermaidConfig and all related types from mermaid. import type { MermaidConfig, RenderResult } from 'mermaid';
import type { MermaidConfig } from 'mermaid/dist/config.type';
import { env } from './env';
import queue from 'async/queue';
import type { QueueObject } from 'async';
const { mermaidBaseURL, mermaidCDNUrl, useLocalMermaid } = env;
const getDiagramURL = (name: string, version: string): string => { export const render = async (
if (useLocalMermaid) { config: MermaidConfig,
return `${mermaidBaseURL}/${name}-detector.esm.mjs`; code: string,
} id: string
return `${mermaidCDNUrl}/${name}@${version}/dist/${name}-detector.esm.mjs`; ): Promise<RenderResult> => {
// Should be able to call this multiple times without any issues.
mermaid.initialize(config);
return await mermaid.render(id, code);
}; };
const initialize = mermaid.initializeAsync({ export const parse = async (code: string): Promise<unknown> => {
logLevel: 0, return await mermaid.parse(code);
lazyLoadedDiagrams: [getDiagramURL('mermaid-mindmap', '9.2.0-rc4')],
loadExternalDiagramsAtStartup: true
});
export const init = async () => {
await initialize;
};
interface RenderPayload {
config: MermaidConfig;
code: string;
id: string;
callback: Parameters<typeof mermaid.render>[2];
}
interface ParsePayload {
code: string;
}
interface MermaidTask {
action: 'render' | 'parse';
payload: RenderPayload | ParsePayload;
}
const mermaidQueue: QueueObject<MermaidTask> = queue(async (task: MermaidTask) => {
console.log('adding ', task);
if (task.action === 'render') {
const { config, code, id, callback } = task.payload as RenderPayload;
await mermaid.mermaidAPI.renderAsync(id, code, callback);
}
console.log('done', task);
}, 1);
mermaidQueue.error(function (err, task) {
console.error('task experienced an error', task, err);
});
export const render = async (payload: RenderPayload): Promise<void> => {
// Should be able to call this multiple times without any issues.
// await mermaid.initialize({
// ...config,
// lazyLoadedDiagrams: [
// // We should make SRI mandatory for all lazy-loaded diagrams.
// 'https://unpkg.com/@mermaid-js/mermaid-mindmap@9.2.0-rc2/dist/mermaid-mindmap-detector.esm.mjs'
// ]
// });
// console.log('Rendering', code);
// mermaid.mermaidAPI.render(id, code, callback);
await mermaidQueue.push({
action: 'render',
payload
});
};
export const parse = async (code: string): Promise<boolean> => {
await init();
return mermaid.parseAsync(code);
}; };
+30 -26
View File
@@ -2,33 +2,37 @@ import type { HistoryEntry } from '$lib/types';
import { describe, it, expect, beforeEach } from 'vitest'; import { describe, it, expect, beforeEach } from 'vitest';
describe('migrations', () => { describe('migrations', () => {
beforeEach(() => { beforeEach(() => {
window.localStorage.setItem( window.localStorage.setItem(
'manualHistoryStore', '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"}]' '[{"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( window.localStorage.setItem(
'autoHistoryStore', '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"}]' '[{"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 () => { it('should migrate from v0 to v1', async () => {
const { applyMigrations } = await import('./migrations'); const { applyMigrations } = await import('./migrations');
let manualHistoryStore: HistoryEntry[] = JSON.parse( let manualHistoryStore: HistoryEntry[] = JSON.parse(
window.localStorage.getItem('manualHistoryStore') window.localStorage.getItem('manualHistoryStore') ?? '[]'
); ) as HistoryEntry[];
let autoHistoryStore: HistoryEntry[] = JSON.parse( let autoHistoryStore: HistoryEntry[] = JSON.parse(
window.localStorage.getItem('autoHistoryStore') window.localStorage.getItem('autoHistoryStore') ?? '[]'
); ) as HistoryEntry[];
expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(false); expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(false); expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(false);
applyMigrations(); applyMigrations();
manualHistoryStore = JSON.parse(window.localStorage.getItem('manualHistoryStore')); manualHistoryStore = JSON.parse(
autoHistoryStore = JSON.parse(window.localStorage.getItem('autoHistoryStore')); window.localStorage.getItem('manualHistoryStore') ?? '[]'
expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(true); ) as HistoryEntry[];
expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(true); autoHistoryStore = JSON.parse(
}); window.localStorage.getItem('autoHistoryStore') ?? '[]'
) as HistoryEntry[];
expect(manualHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
expect(autoHistoryStore.every(({ id }) => id !== undefined)).toBe(true);
});
}); });
+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, localStorage } from '$lib/util/persist';
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: Record<string, () => void> = {
injectHistoryIDs injectHistoryIDs
}; };
const migrationStore: Writable<MigrationState> = persist( const migrationStore: Writable<MigrationState> = persist(
writable({ version: -1 }), writable({ version: -1 }),
localStorage(), localStorage(),
'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);
}; };
+159 -167
View File
@@ -29,7 +29,7 @@ import type { Writable } from 'svelte/store';
* Disabled warnings about missing/unavailable storages * Disabled warnings about missing/unavailable storages
*/ */
export function disableWarnings(): void { export function disableWarnings(): void {
noWarnings = true; noWarnings = true;
} }
/** /**
* If set to true, no warning will be emitted if the requested Storage is not found. * If set to true, no warning will be emitted if the requested Storage is not found.
@@ -39,110 +39,101 @@ let noWarnings = false;
/** /**
* List of storages where the warning have already been displayed. * List of storages where the warning have already been displayed.
*/ */
const alreadyWarnFor: Array<string> = []; const alreadyWarnFor: string[] = [];
/** /**
* Add a log to indicate that the requested Storage have not been found. * Add a log to indicate that the requested Storage have not been found.
* @param {string} storageName * @param {string} storageName
*/ */
const warnStorageNotFound = (storageName) => { const warnStorageNotFound = (storageName: string) => {
const isProduction = typeof process !== 'undefined' && process.env?.NODE_ENV === 'production'; const isProduction = typeof process !== 'undefined' && process.env.NODE_ENV === 'production';
if (!noWarnings && alreadyWarnFor.indexOf(storageName) === -1 && !isProduction) { if (!noWarnings && !alreadyWarnFor.includes(storageName) && !isProduction) {
let message = `Unable to find the ${storageName}. No data will be persisted.`; let message = `Unable to find the ${storageName}. No data will be persisted.`;
if (typeof window === 'undefined') { if (typeof window === 'undefined') {
message += message +=
'\n' + '\n' +
'Are you running on a server? Most of storages are not available while running on a server.'; 'Are you running on a server? Most of storages are not available while running on a server.';
} }
console.warn(message); console.warn(message);
alreadyWarnFor.push(storageName); 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 serialize = (value: unknown): string => ESSerializer.serialize(value);
const deserialize = (value: string): unknown => { const deserialize = (value?: string | null): unknown => {
// @TODO: to remove in the next major // @TODO: to remove in the next major
if (value === 'undefined') { if (value === 'undefined') {
return undefined; return undefined;
} }
if (value !== null && value !== undefined) { if (value !== null && value !== undefined) {
try { try {
return ESSerializer.deserialize(value, allowedClasses); return ESSerializer.deserialize(value);
} catch (e) { } catch {
// Do nothing // Do nothing
// use the value "as is" // use the value "as is"
} }
try { try {
return JSON.parse(value); return JSON.parse(value);
} catch (e) { } catch {
// Do nothing // Do nothing
// use the value "as is" // use the value "as is"
} }
} }
return value; return value;
}; };
/** /**
* A store that keep it's value in time. * A store that keep it's value in time.
*/ */
export interface PersistentStore<T> extends Writable<T> { export interface PersistentStore<T> extends Writable<T> {
/** /**
* Delete the store value from the persistent storage * Delete the store value from the persistent storage
*/ */
delete(): void; delete(): void;
} }
/** /**
* Storage interface * Storage interface
*/ */
export interface StorageInterface<T> { export interface StorageInterface<T> {
/** /**
* Get a value from the storage. * Get a value from the storage.
* *
* If the value doesn't exists in the storage, `null` should be returned. * If the value doesn't exists in the storage, `null` should be returned.
* This method MUST be synchronous. * This method MUST be synchronous.
* @param key The key/name of the value to retrieve * @param key The key/name of the value to retrieve
*/ */
getValue(key: string): T | null; getValue(key: string): T | null;
/** /**
* Save a value in the storage. * Save a value in the storage.
* @param key The key/name of the value to save * @param key The key/name of the value to save
* @param value The value to save * @param value The value to save
*/ */
setValue(key: string, value: T): void; setValue(key: string, value: T): void;
/** /**
* Remove a value from the storage * Remove a value from the storage
* @param key The key/name of the value to remove * @param key The key/name of the value to remove
*/ */
deleteValue(key: string): void; deleteValue(key: string): void;
} }
export interface SelfUpdateStorageInterface<T> extends StorageInterface<T> { export interface SelfUpdateStorageInterface<T> extends StorageInterface<T> {
/** /**
* Add a listener to the storage values changes * Add a listener to the storage values changes
* @param {string} key The key to listen * @param {string} key The key to listen
* @param {(newValue: T) => void} listener The listener callback function * @param {(newValue: T) => void} listener The listener callback function
*/ */
addListener(key: string, listener: (newValue: T) => void): void; addListener(key: string, listener: (newValue: T) => void): void;
/** /**
* Remove a listener from the storage values changes * Remove a listener from the storage values changes
* @param {string} key The key that was listened * @param {string} key The key that was listened
* @param {(newValue: T) => void} listener The listener callback function to remove * @param {(newValue: T) => void} listener The listener callback function to remove
*/ */
removeListener(key: string, listener: (newValue: T) => void): void; removeListener(key: string, listener: (newValue: T) => void): void;
} }
/** /**
@@ -152,114 +143,115 @@ export interface SelfUpdateStorageInterface<T> extends StorageInterface<T> {
* @param {string} key The name of the data key * @param {string} key The name of the data key
*/ */
export function persist<T>( export function persist<T>(
store: Writable<T>, store: Writable<T>,
storage: StorageInterface<T>, storage: StorageInterface<T>,
key: string key: string
): PersistentStore<T> { ): PersistentStore<T> {
const initialValue = storage.getValue(key); const initialValue = storage.getValue(key);
if (null !== initialValue) { if (null !== initialValue) {
store.set(initialValue); store.set(initialValue);
} }
if ((storage as SelfUpdateStorageInterface<T>).addListener) { if ('addListener' in storage) {
(storage as SelfUpdateStorageInterface<T>).addListener(key, (newValue) => { (storage as SelfUpdateStorageInterface<T>).addListener(key, (newValue) => {
store.set(newValue); store.set(newValue);
}); });
} }
store.subscribe((value) => { store.subscribe((value) => {
storage.setValue(key, value); storage.setValue(key, value);
}); });
return { return {
...store, ...store,
delete() { delete() {
storage.deleteValue(key); storage.deleteValue(key);
} }
}; };
} }
function getBrowserStorage( function getBrowserStorage(
browserStorage: Storage, browserStorage: Storage,
listenExternalChanges = false listenExternalChanges = false
): SelfUpdateStorageInterface<any> { ): SelfUpdateStorageInterface<any> {
const listeners: Array<{ key: string; listener: (newValue: any) => void }> = []; const listeners: { key: string; listener: (newValue: any) => void }[] = [];
const listenerFunction = (event: StorageEvent) => { const listenerFunction = (event: StorageEvent) => {
const eventKey = event.key; const eventKey = event.key;
if (event.storageArea === browserStorage) { if (event.storageArea === browserStorage) {
listeners for (const { listener } of listeners.filter(({ key }) => key === eventKey)) {
.filter(({ key }) => key === eventKey) listener(deserialize(event.newValue));
.forEach(({ listener }) => { }
listener(deserialize(event.newValue)); }
}); };
} const connect = () => {
}; // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
const connect = () => { if (listenExternalChanges && typeof window !== 'undefined' && window.addEventListener) {
if (listenExternalChanges && typeof window !== 'undefined' && window?.addEventListener) { window.addEventListener('storage', listenerFunction);
window.addEventListener('storage', listenerFunction); }
} };
}; const disconnect = () => {
const disconnect = () => { // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
if (listenExternalChanges && typeof window !== 'undefined' && window?.removeEventListener) { if (listenExternalChanges && typeof window !== 'undefined' && window.removeEventListener) {
window.removeEventListener('storage', listenerFunction); window.removeEventListener('storage', listenerFunction);
} }
}; };
return { return {
addListener(key: string, listener: (newValue: any) => void) { addListener(key: string, listener: (newValue: any) => void) {
listeners.push({ key, listener }); listeners.push({ key, listener });
if (listeners.length === 1) { if (listeners.length === 1) {
connect(); connect();
} }
}, },
removeListener(key: string, listener: (newValue: any) => void) { removeListener(key: string, listener: (newValue: any) => void) {
const index = listeners.indexOf({ key, listener }); const index = listeners.indexOf({ key, listener });
if (index !== -1) { if (index !== -1) {
listeners.splice(index, 1); listeners.splice(index, 1);
} }
if (listeners.length === 0) { if (listeners.length === 0) {
disconnect(); disconnect();
} }
}, },
getValue(key: string): any | null { getValue(key: string): any | null {
const value = browserStorage.getItem(key); const value = browserStorage.getItem(key);
return deserialize(value); return deserialize(value);
}, },
deleteValue(key: string) { deleteValue(key: string) {
browserStorage.removeItem(key); browserStorage.removeItem(key);
}, },
setValue(key: string, value: any) { setValue(key: string, value: any) {
browserStorage.setItem(key, serialize(value)); browserStorage.setItem(key, serialize(value));
} }
}; };
} }
/** /**
* Storage implementation that use the browser local storage * Storage implementation that use the browser local storage
* @param {boolean} listenExternalChanges - Update the store if the localStorage is updated from another page * @param listenExternalChanges - Update the store if the localStorage is updated from another page
*/ */
export function localStorage<T>(listenExternalChanges = false): StorageInterface<T> { export function localStorage<T>(listenExternalChanges = false): StorageInterface<T> {
if (typeof window !== 'undefined' && window?.localStorage) { // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
return getBrowserStorage(window.localStorage, listenExternalChanges); if (typeof window !== 'undefined' && window.localStorage) {
} return getBrowserStorage(window.localStorage, listenExternalChanges);
warnStorageNotFound('window.localStorage'); }
return noopStorage(); warnStorageNotFound('window.localStorage');
return noopStorage();
} }
/** /**
* Storage implementation that do nothing * Storage implementation that do nothing
*/ */
export function noopStorage(): StorageInterface<any> { export function noopStorage<T>(): StorageInterface<T> {
return { return {
getValue(): null { getValue(): null {
return null; return null;
}, },
deleteValue() { deleteValue() {
// Do nothing // Do nothing
}, },
setValue() { setValue() {
// Do nothing // Do nothing
} }
}; };
} }
+30 -30
View File
@@ -3,38 +3,38 @@ import { serializeState, deserializeState, type SerdeType } from './serde';
import { defaultState } from './state'; import { defaultState } from './state';
import type { State } from '$lib/types'; import type { State } from '$lib/types';
const verifySerde = (state: State, serde?: SerdeType): string => {
const serialized = serializeState(state, serde);
const deserialized = deserializeState(serialized);
expect(deserialized).to.deep.equal(state);
return serialized;
};
describe('Serde tests', () => { describe('Serde tests', () => {
const verifySerde = (state: State, serde?: SerdeType): string => { it('should serialize and deserialize with default serde', () => {
const serialized = serializeState(state, serde); expect(verifySerde(defaultState)).toMatchInlineSnapshot(
const deserialized = deserializeState(serialized); '"pako:eNpVjk2Lg0AMhv9KyGkL9Q94WGh1t5fCFurN6SFo7AztfDBGpKj_fcd62c0pvM_zhkzY-JYxx-7px0ZTFKhK5SDNoS50NL1Y6m-QZZ_ziQWsd_ya4fhx8tBrH4Jx993mH1cJium8agyijXssGyre_R_HM5T1mYL4cPtLqtHP8FWbi07n_xMdObW-647yjrKGIhQU3wru0XK0ZNr0_rQmCkWzZYV5WlvuaHiKQuWWpNIg_vpyDeYSB97jEFoSLg3dI9ktXH4B_cJWqw"'
expect(deserialized).to.deep.equal(state); );
return serialized; });
};
it('should serialize and deserialize with default serde', () => { it('should serialize and deserialize with base64 serde', () => {
expect(verifySerde(defaultState)).toMatchInlineSnapshot( expect(verifySerde(defaultState, 'base64')).toMatchInlineSnapshot(
'"pako:eNpVj81qw0AMhF9F6NRC_AI-BGK7zSXQQHLz5iBsObuk-8Naphjb7551fEl1EjPfiNGEjW8Zc7xHChqulXKQ5lCXOppeLPU3yLL9fGQB6x2PMxQfRw-99iEYd__c-GKFoJxOK8Yg2rjHslnlK__jeIaqPlEQH27vzvXPz_BVm7NO5_87OnJKfdcd5R1lDUUoKb4Q3KHlaMm0qfq0KgpFs2WFeVpb7mj4FYXKLQmlQfxldA3mEgfe4RBaEq4MpaftJi5PNtJU8w"' '"base64:eyJjb2RlIjoiZmxvd2NoYXJ0IFREXG4gICAgQVtDaHJpc3RtYXNdIC0tPnxHZXQgbW9uZXl8IEIoR28gc2hvcHBpbmcpXG4gICAgQiAtLT4gQ3tMZXQgbWUgdGhpbmt9XG4gICAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgICBDIC0tPnxUd298IEVbaVBob25lXVxuICAgIEMgLS0-fFRocmVlfCBGW2ZhOmZhLWNhciBDYXJdXG4gICIsIm1lcm1haWQiOiJ7XG4gIFwidGhlbWVcIjogXCJkZWZhdWx0XCJcbn0iLCJhdXRvU3luYyI6dHJ1ZSwidXBkYXRlRGlhZ3JhbSI6dHJ1ZX0"'
); );
}); });
it('should serialize and deserialize with base64 serde', () => { it('should serialize and deserialize with pako serde', () => {
expect(verifySerde(defaultState, 'base64')).toMatchInlineSnapshot( expect(verifySerde(defaultState, 'pako')).toMatchInlineSnapshot(
'"base64:eyJjb2RlIjoiZ3JhcGggVERcbiAgICBBW0NocmlzdG1hc10gLS0-fEdldCBtb25leXwgQihHbyBzaG9wcGluZylcbiAgICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgICBDIC0tPnxPbmV8IERbTGFwdG9wXVxuICAgIEMgLS0-fFR3b3wgRVtpUGhvbmVdXG4gICAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cbiAgIiwibWVybWFpZCI6IntcbiAgXCJ0aGVtZVwiOiBcImRlZmF1bHRcIlxufSIsImF1dG9TeW5jIjp0cnVlLCJ1cGRhdGVEaWFncmFtIjp0cnVlfQ"' '"pako:eNpVjk2Lg0AMhv9KyGkL9Q94WGh1t5fCFurN6SFo7AztfDBGpKj_fcd62c0pvM_zhkzY-JYxx-7px0ZTFKhK5SDNoS50NL1Y6m-QZZ_ziQWsd_ya4fhx8tBrH4Jx993mH1cJium8agyijXssGyre_R_HM5T1mYL4cPtLqtHP8FWbi07n_xMdObW-647yjrKGIhQU3wru0XK0ZNr0_rQmCkWzZYV5WlvuaHiKQuWWpNIg_vpyDeYSB97jEFoSLg3dI9ktXH4B_cJWqw"'
); );
}); });
it('should serialize and deserialize with pako serde', () => { it('should throw error for unrecognized serde', () => {
expect(verifySerde(defaultState, 'pako')).toMatchInlineSnapshot( // eslint-disable-next-line @typescript-eslint/ban-ts-comment
'"pako:eNpVj81qw0AMhF9F6NRC_AI-BGK7zSXQQHLz5iBsObuk-8Naphjb7551fEl1EjPfiNGEjW8Zc7xHChqulXKQ5lCXOppeLPU3yLL9fGQB6x2PMxQfRw-99iEYd__c-GKFoJxOK8Yg2rjHslnlK__jeIaqPlEQH27vzvXPz_BVm7NO5_87OnJKfdcd5R1lDUUoKb4Q3KHlaMm0qfq0KgpFs2WFeVpb7mj4FYXKLQmlQfxldA3mEgfe4RBaEq4MpaftJi5PNtJU8w"' // @ts-expect-error
); expect(() => serializeState(defaultState, 'unknown')).toThrowError(
}); 'Unknown serde type: unknown'
);
it('should throw error for unrecognized serde', () => { expect(() => deserializeState('unknown:hello')).toThrowError('Unknown serde type: unknown');
// eslint-disable-next-line @typescript-eslint/ban-ts-comment });
// @ts-expect-error
expect(() => serializeState(defaultState, 'unknown')).toThrowError(
'Unknown serde type: unknown'
);
expect(() => deserializeState('unknown:hello')).toThrowError('Unknown serde type: unknown');
});
}); });
+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 (!(serde in serdes)) {
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;
}; };
+146 -127
View File
@@ -1,35 +1,29 @@
import { writable, get, derived } from 'svelte/store'; import { writable, get, type Readable, derived } from 'svelte/store';
import { persist, localStorage } from './persist'; import { persist, localStorage } from './persist';
import { saveStatistics, countLines } from './stats'; import { saveStatistics, countLines } from './stats';
import { serializeState, deserializeState } from './serde'; import { serializeState, deserializeState } from './serde';
import { cmdKey } from './util'; import { cmdKey, errorDebug, formatJSON } from './util';
import { parse, init } from './mermaid'; import { parse } from './mermaid';
import type { Readable } from 'svelte/store'; import type { ErrorHash, MarkerData, State, ValidatedState } from '$lib/types';
import type { MarkerData, State, ValidatedState } from '$lib/types'; import type { MermaidConfig } from 'mermaid';
void init();
export const defaultState: State = { export const defaultState: State = {
code: `graph TD code: `flowchart 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: formatJSON({
{ theme: 'default'
theme: 'default' }),
}, autoSync: true,
null, updateDiagram: true
2
),
autoSync: true,
updateDiagram: true
}; };
const urlParseFailedState = `graph TD const urlParseFailedState = `flowchart TD
A[Loading URL failed. We can try to figure out why.] -->|Decode JSON| B(Please check the console to see the JSON and error details.) A[Loading URL failed. We can try to figure out why.] -->|Decode JSON| B(Please check the console to see the JSON and error details.)
B --> C{Is the JSON correct?} B --> C{Is the JSON correct?}
C -->|Yes| D(Please Click here to Raise an issue in github.<br/>Including the broken link in the issue <br/> will speed up the fix.) C -->|Yes| D(Please Click here to Raise an issue in github.<br/>Including the broken link in the issue <br/> will speed up the fix.)
@@ -43,139 +37,164 @@ const urlParseFailedState = `graph TD
// 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), localStorage(), 'codeStore');
// All internal reads should be done via stateStore, but it should not be persisted/shared externally. export const currentState: ValidatedState = (() => {
export const stateStore: Readable<ValidatedState> = derived([inputStateStore], ([state]) => { const state = get(inputStateStore);
const processed: ValidatedState = { return {
...state, ...state,
serialized: '', serialized: serializeState(state),
errorMarkers: [], errorMarkers: [],
error: undefined, error: undefined,
editorMode: state.editorMode ?? 'code' editorMode: state.editorMode ?? 'code'
}; };
})();
// No changes should be done to fields part of `state`. const processState = async (state: State) => {
try { const processed: ValidatedState = {
processed.serialized = serializeState(state); ...state,
// await parse(state.code); serialized: '',
JSON.parse(state.mermaid); errorMarkers: [],
} catch (e) { error: undefined,
processed.error = e; editorMode: state.editorMode ?? 'code'
console.error(e); };
if (e.hash) { // No changes should be done to fields part of `state`.
try { try {
const marker: MarkerData = { processed.serialized = serializeState(state);
severity: 8, // Error await parse(state.code);
startLineNumber: e.hash.loc.first_line, JSON.parse(state.mermaid);
startColumn: e.hash.loc.first_column, } catch (error) {
endLineNumber: e.hash.loc.last_line, processed.error = error as Error;
endColumn: (e.hash.loc.last_column as number) + 1, errorDebug();
message: e.str console.error(error);
}; if ('hash' in error) {
processed.errorMarkers = [marker]; try {
} catch (err) { const {
console.error('Error without line helper', err); loc: { first_line, last_line, first_column, last_column }
} // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
} } = error.hash as ErrorHash;
} const marker: MarkerData = {
return processed; severity: 8, // Error
}); startLineNumber: first_line,
startColumn: first_column,
endLineNumber: last_line,
endColumn: last_column + 1,
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-assignment
message: error.str
};
processed.errorMarkers = [marker];
} catch (error) {
console.error('Error without line helper', error);
}
}
}
return processed;
};
// All internal reads should be done via stateStore, but it should not be persisted/shared externally.
export const stateStore: Readable<ValidatedState> = derived(
[inputStateStore],
([state], set) => {
void processState(state).then(set);
},
currentState
);
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: MermaidConfig =
typeof state.mermaid === 'string' ? JSON.parse(state.mermaid) : state.mermaid; typeof state.mermaid === 'string'
if ( ? (JSON.parse(state.mermaid) as MermaidConfig)
mermaidConfig.securityLevel && : state.mermaid;
mermaidConfig.securityLevel !== 'strict' && if (
confirm( mermaidConfig.securityLevel &&
`Removing "securityLevel":"${mermaidConfig.securityLevel}" from the config for safety.\nClick Cancel if you trust the source of this Diagram.` mermaidConfig.securityLevel !== 'strict' &&
) confirm(
) { `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 )
} ) {
state.mermaid = JSON.stringify(mermaidConfig, null, 2); delete mermaidConfig.securityLevel; // Prevent setting overriding securityLevel when loading state to mitigate possible XSS attack
} catch (e) { }
state = get(inputStateStore); state.mermaid = formatJSON(mermaidConfig);
if (data) { } catch (error) {
console.error('Init error', e); state = get(inputStateStore);
state.code = urlParseFailedState; if (data) {
state.mermaid = defaultState.mermaid; console.error('Init error', error);
} state.code = urlParseFailedState;
} state.mermaid = defaultState.mermaid;
updateCodeStore(state); }
}
updateCodeStore(state);
}; };
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, updateDiagram = false,
resetPanZoom = false resetPanZoom = false
}: { updateDiagram?: boolean; resetPanZoom?: boolean } = {} }: { updateDiagram?: boolean; resetPanZoom?: boolean } = {}
): void => { ): void => {
const lines = countLines(code); // console.log('updateCode', code);
saveStatistics(code); const lines = countLines(code);
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
});
}
}
if (lines > 50 && !prompted && get(stateStore).autoSync) { inputStateStore.update((state) => {
const turnOff = confirm( if (resetPanZoom) {
`Long diagram detected. Turn off Auto Sync? Use ${cmdKey} + Enter or click the sync logo to manually sync.` state.pan = undefined;
); state.zoom = undefined;
prompted = true; }
if (turnOff) { return { ...state, code, updateDiagram };
updateCodeStore({ });
autoSync: false
});
}
}
inputStateStore.update((state) => {
if (resetPanZoom) {
state.pan = undefined;
state.zoom = undefined;
}
return { ...state, code, updateDiagram };
});
}; };
export const updateConfig = (config: string): void => { export const updateConfig = (config: string): void => {
inputStateStore.update((state) => { // console.log('updateConfig', config);
return { ...state, mermaid: config }; inputStateStore.update((state) => {
}); 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) as MermaidConfig;
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: formatJSON(config) };
}); });
}; };
let urlDebounce: number; let urlDebounce: number;
export const initURLSubscription = (): void => { export const initURLSubscription = (): void => {
stateStore.subscribe(({ serialized }: ValidatedState) => { stateStore.subscribe(({ serialized }) => {
if (serialized.length < 5) { clearTimeout(urlDebounce);
return; urlDebounce = window.setTimeout(() => {
} history.replaceState(undefined, '', `#${serialized}`);
clearTimeout(urlDebounce); }, 250);
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));
}; };
+10 -10
View File
@@ -1,19 +1,19 @@
import { describe, it, expect } from 'vitest'; import { describe, it, expect } from 'vitest';
import { detectType } from './stats'; import { detectType } from './stats';
describe('diagram detection', () => { describe('diagram detection', () => {
it('should detect diagrams correctly', () => { it('should detect diagrams correctly', () => {
expect( expect(
detectType(`%%{{ detectType(`%%{{
graph`) graph`)
).toBe('graph'); ).toBe('graph');
expect(detectType(`gitGraph`)).toBe('gitGraph'); expect(detectType(`gitGraph`)).toBe('gitGraph');
expect( expect(
detectType(`%%{{ detectType(`%%{{
flowChart flowChart
graph`) graph`)
).toBe('flowChart'); ).toBe('flowChart');
expect(detectType(`loki -> thor`)).toBe(undefined); expect(detectType(`loki -> thor`)).toBe(undefined);
}); });
}); });
+75 -74
View File
@@ -1,98 +1,99 @@
import { browser } from '$app/environment'; import { browser } from '$app/environment';
import type { AnalyticsInstance } from 'analytics'; import type { AnalyticsInstance } from 'analytics';
export let analytics: AnalyticsInstance; export let analytics: AnalyticsInstance | undefined;
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 }, { default: plausible }] = await Promise.all([
import('analytics'), import('analytics'),
import('analytics-plugin-plausible') import('analytics-plugin-plausible')
]); ]);
analytics = Analytics({ analytics = Analytics({
app: 'mermaid-live-editor', app: 'mermaid-live-editor',
plugins: [ plugins: [
plausible({ plausible({
domain: 'mermaid.live', domain: 'mermaid.live',
hashMode: false, hashMode: false,
trackLocalhost: false, // By default 'false' trackLocalhost: false, // By default 'false'
apiHost: 'https://plausible.io' apiHost: 'https://plausible.io'
}) })
] ]
}); });
} catch (e) { } catch (error) {
console.log(e); console.log(error);
console.info('Analytics blocked ;)'); console.info('Analytics blocked ;)');
} }
} }
}; };
export const detectType = (text: string): string => { export const detectType = (text: string): string | undefined => {
const possibleDiagramTypes = [ const possibleDiagramTypes = [
'classDiagram', 'classDiagram',
'erDiagram', 'erDiagram',
'flowChart', 'flowChart',
'gantt', 'gantt',
'gitGraph', 'gitGraph',
'graph', 'graph',
'journey', 'journey',
'pie', 'pie',
'stateDiagram' 'stateDiagram'
]; ];
const firstLine = text const firstLine = text
.replace(/^\s*%%.*\n/g, '\n') .replace(/^\s*%%.*\n/g, '\n')
.trimStart() .trimStart()
.split(' ')[0] .split(' ')[0]
.toLowerCase(); .toLowerCase();
const detectedDiagram = possibleDiagramTypes.find((d) => firstLine.includes(d.toLowerCase())); const detectedDiagram = possibleDiagramTypes.find((d) => firstLine.includes(d.toLowerCase()));
return detectedDiagram; return detectedDiagram;
}; };
export const countLines = (code: string): number => { export const countLines = (code: string): number => {
return (code.match(/\n/g) || '').length + 1; return (code.match(/\n/g)?.length ?? 0) + 1;
}; };
export const saveStatistics = (graph: string): void => { export const saveStatistics = (graph: string): void => {
const graphType = detectType(graph); const graphType = detectType(graph);
if (!graphType) { if (!graphType) {
return; return;
} }
const length = countLines(graph); const length = countLines(graph);
logEvent('render', { graphType, length }); logEvent('render', { graphType, length });
}; };
const minutesToMilliSeconds = (minutes: number): number => { const minutesToMilliSeconds = (minutes: number): number => {
return minutes * 60_000; return minutes * 60_000;
}; };
const defaultDelay = minutesToMilliSeconds(1); const defaultDelay = minutesToMilliSeconds(1);
const delaysPerEvent = { const delaysPerEvent = {
render: minutesToMilliSeconds(5), render: minutesToMilliSeconds(5),
panZoom: minutesToMilliSeconds(10), panZoom: minutesToMilliSeconds(10),
copyClipboard: defaultDelay, copyClipboard: defaultDelay,
download: defaultDelay, download: defaultDelay,
copyMarkdown: defaultDelay, copyMarkdown: defaultDelay,
loadGist: defaultDelay, loadGist: defaultDelay,
loadSampleDiagram: defaultDelay, loadSampleDiagram: defaultDelay,
renderDiagram: defaultDelay, renderDiagram: defaultDelay,
history: defaultDelay, history: defaultDelay,
migration: defaultDelay, migration: defaultDelay,
themeChange: defaultDelay themeChange: defaultDelay
}; };
export type AnalyticsEvent = keyof typeof delaysPerEvent; export type AnalyticsEvent = keyof typeof delaysPerEvent;
const timeouts: Record<string, number> = {}; const timeouts: Map<string, number> = new Map<string, number>();
// manual debounce to reduce the number of events sent to analytics // manual debounce to reduce the number of events sent to analytics
export const logEvent = (name: AnalyticsEvent, data?: unknown): void => { export const logEvent = (name: AnalyticsEvent, data?: unknown): void => {
if (!analytics) { if (!analytics) {
return; return;
} }
const key = data ? JSON.stringify({ name, data }) : name; const key = data ? JSON.stringify({ name, data }) : name;
if (timeouts[key] === undefined) { if (timeouts.has(key)) {
void analytics.track(name, data); clearTimeout(timeouts.get(key));
} else { } else {
clearTimeout(timeouts[key]); void analytics.track(name, data);
} }
timeouts[key] = window.setTimeout(() => { timeouts.set(
delete timeouts[key]; key,
}, delaysPerEvent[name]); window.setTimeout(() => timeouts.delete(key), delaysPerEvent[name])
);
}; };
+24 -24
View File
@@ -4,35 +4,35 @@ import { persist, localStorage } from '$lib/util/persist';
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(), localStorage(),
'themeStore' 'themeStore'
); );
const darkThemes = [ const darkThemes = new Set([
'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.has(theme);
console.log('Setting theme', theme); console.log('Setting theme', theme);
themeStore.set({ theme, isDark }); themeStore.set({ theme, isDark });
logEvent('themeChange', { theme, isDark }); logEvent('themeChange', { theme, isDark });
}; };
+32 -12
View File
@@ -5,24 +5,44 @@ import { initLoading } from './loading';
import { applyMigrations } from './migrations'; import { applyMigrations } from './migrations';
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(); applyMigrations();
loadStateFromURL(); loadStateFromURL();
await initLoading('Loading Gist...', loadDataFromUrl().catch(console.error)); await initLoading('Loading Gist...', loadDataFromUrl().catch(console.error));
syncDiagram(); syncDiagram();
initURLSubscription(); initURLSubscription();
await initAnalytics(); await initAnalytics();
analytics?.page(); await analytics?.page();
}; };
export const isMac = navigator.platform.toUpperCase().indexOf('MAC') >= 0; export const isMac = navigator.platform.toUpperCase().includes('MAC');
export const cmdKey = isMac ? 'Cmd' : 'Ctrl'; export const cmdKey = isMac ? 'Cmd' : 'Ctrl';
let count = 0;
export const errorDebug = (limit = 100) => {
count += 1;
if (count > limit) {
console.log(count, limit);
// eslint-disable-next-line no-debugger
debugger;
}
};
export const formatJSON = (data: unknown): string => JSON.stringify(data, undefined, 2);
export const fetchJSON = async <T>(url: string): Promise<T> => {
const res = await fetch(url);
return res.json() as T;
};
export const fetchText = async (url: string): Promise<string> => {
const res = await fetch(url);
return res.text();
};
+1
View File
@@ -1,3 +1,4 @@
export const prerender = true; export const prerender = true;
export const csr = true; export const csr = true;
export const ssr = false; export const ssr = false;
export const trailingSlash = 'ignore';
+70 -70
View File
@@ -1,87 +1,87 @@
<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';
// 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) => { window.addEventListener('hashchange', () => {
await initHandler(); void initHandler();
}); });
if ('serviceWorker' in navigator) { if ('serviceWorker' in navigator) {
navigator.serviceWorker navigator.serviceWorker
.register(`${base}/service-worker.js`, { .register(`${base}/service-worker.js`, {
scope: `${base}/` scope: `${base}/`
}) })
.then(function (registration) { .then(function (registration) {
console.log('Registration successful, scope is:', registration.scope); console.log('Registration successful, scope is:', registration.scope);
}) })
.catch(function (error) { .catch(function (error) {
console.log('Service worker registration failed, error:', 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>
+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>
+189 -182
View File
@@ -1,202 +1,209 @@
<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 { inputStateStore, stateStore, updateCodeStore } from '$lib/util/state';
import { cmdKey, initHandler, syncDiagram } from '$lib/util/util'; import { cmdKey, 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 { Tab, DocumentationConfig, EditorMode, ValidatedState } from '$lib/types';
import { base } from '$app/paths'; import { base } from '$app/paths';
const docURLBase = 'https://mermaid-js.github.io/mermaid'; const docURLBase = 'https://mermaid-js.github.io/mermaid';
const docMap: DocConfig = { const docMap: DocumentationConfig = {
graph: { graph: {
code: '/#/flowchart', code: '/#/flowchart',
config: '/#/flowchart?id=configuration' config: '/#/flowchart?id=configuration'
}, },
flowchart: { flowchart: {
code: '/#/flowchart', code: '/#/flowchart',
config: '/#/flowchart?id=configuration' config: '/#/flowchart?id=configuration'
}, },
sequenceDiagram: { sequenceDiagram: {
code: '/#/sequenceDiagram', code: '/#/sequenceDiagram',
config: '/#/sequenceDiagram?id=configuration' config: '/#/sequenceDiagram?id=configuration'
}, },
classDiagram: { classDiagram: {
code: '/#/classDiagram', code: '/#/classDiagram',
config: '/#/classDiagram?id=configuration' config: '/#/classDiagram?id=configuration'
}, },
'stateDiagram-v2': { 'stateDiagram-v2': {
code: '/#/stateDiagram' code: '/#/stateDiagram'
}, },
gantt: { gantt: {
code: '/#/gantt', code: '/#/gantt',
config: '/#/gantt?id=configuration' config: '/#/gantt?id=configuration'
}, },
pie: { pie: {
code: '/#/pie' code: '/#/pie'
}, },
erDiagram: { erDiagram: {
code: '/#/entityRelationshipDiagram', code: '/#/entityRelationshipDiagram',
config: '/#/entityRelationshipDiagram?id=styling' config: '/#/entityRelationshipDiagram?id=styling'
}, },
journey: { journey: {
code: '/#/user-journey' code: '/#/user-journey'
}, },
gitGraph: { gitGraph: {
code: '/#/gitgraph', code: '/#/gitgraph',
config: '/#/gitgraph?id=gitgraph-specific-configuration-options' config: '/#/gitgraph?id=gitgraph-specific-configuration-options'
} }
}; };
let docURL = docURLBase; let docURL = docURLBase;
let activeTabID = 'code'; let activeTabID = 'code';
stateStore.subscribe(({ code, editorMode }: ValidatedState) => { let docKey = '';
activeTabID = editorMode; stateStore.subscribe(({ code, editorMode }: ValidatedState) => {
const codeTypeMatch = /([\S]+)[\s\n]/.exec(code); activeTabID = editorMode;
if (codeTypeMatch && codeTypeMatch.length > 1) { const codeTypeMatch = /([\S]+)[\s\n]/.exec(code);
const docKey = codeTypeMatch[1]; if (codeTypeMatch && codeTypeMatch.length > 1) {
const docConfig = docMap[docKey] ?? { code: '' }; docKey = codeTypeMatch[1];
docURL = docURLBase + (docConfig[editorMode] ?? docConfig.code ?? ''); const docConfig = docMap[docKey] ?? { code: '' };
} docURL = docURLBase + (docConfig[editorMode] ?? docConfig.code ?? '');
}); }
});
const tabSelectHandler = (message: CustomEvent<Tab>) => { const tabSelectHandler = (message: CustomEvent<Tab>) => {
const editorMode: EditorMode = message.detail.id === 'code' ? 'code' : 'config'; const editorMode: EditorMode = message.detail.id === 'code' ? 'code' : 'config';
updateCodeStore({ editorMode }); updateCodeStore({ editorMode });
}; };
const tabs: Tab[] = [ const tabs: Tab[] = [
{ {
id: 'code', id: 'code',
title: 'Code', title: 'Code',
icon: 'fas fa-code' icon: 'fas fa-code'
}, },
{ {
id: 'config', id: 'config',
title: 'Config', title: 'Config',
icon: 'fas fa-cogs' icon: 'fas fa-cogs'
} }
]; ];
onMount(async () => { onMount(async () => {
await initHandler(); await initHandler();
const resizer = document.getElementById('resizeHandler'); const resizer = document.getElementById('resizeHandler');
const element = document.getElementById('editorPane'); const element = document.getElementById('editorPane');
const resize = (e: { pageX: number }) => { if (!resizer || !element) {
const newWidth = e.pageX - element.getBoundingClientRect().left; console.debug('Failed to find resize handler or editor pane', { resizer, element });
if (newWidth > 50) { return;
element.style.width = `${newWidth}px`; }
} const resize = (e: { pageX: number }) => {
}; const newWidth = e.pageX - element.getBoundingClientRect().left;
if (newWidth > 50) {
element.style.width = `${newWidth}px`;
}
};
const stopResize = () => { const stopResize = () => {
window.removeEventListener('mousemove', resize); window.removeEventListener('mousemove', resize);
}; };
resizer.addEventListener('mousedown', (e) => { resizer.addEventListener('mousedown', (e) => {
e.preventDefault(); e.preventDefault();
window.addEventListener('mousemove', resize); window.addEventListener('mousemove', resize);
window.addEventListener('mouseup', stopResize); 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} {activeTabID} 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
<a target="_blank" rel="noreferrer" href={docURL} data-cy="docs"> class="btn btn-secondary btn-xs"
<i class="fas fa-book mr-1" />Docs title="View documentation for {docKey.replace('Diagram', '')} diagram">
</a> <a target="_blank" rel="noreferrer" href={docURL} data-cy="docs">
</button> <i class="fas fa-book mr-1" />Docs
</div> </a>
</button>
</div>
<Editor /> <Editor />
</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" 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>
+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/environment', () => ({
browser: 'window' in globalThis browser: 'window' in globalThis
})); }));
}); });
+17 -18
View File
@@ -3,24 +3,23 @@ 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' }
}
}; };
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: {}
} }
}; };
+17 -15
View File
@@ -1,17 +1,19 @@
{ {
"include": [ "include": [
"src/**/*.d.ts", "src/**/*.d.ts",
"src/**/*.ts", "src/**/*.ts",
"src/**/*.svelte", "src/**/*.svelte",
"cypress/**/*.ts", "cypress/**/*.ts",
"cypress/**/*.js", "cypress/**/*.js",
"static/**/*.js", "cypress/**/*.json",
"static/**/*.json" "static/**/*.js",
], "static/**/*.json"
"compilerOptions": { ],
"resolveJsonModule": true, "compilerOptions": {
"allowSyntheticDefaultImports": true, "resolveJsonModule": true,
"types": ["vitest/importMeta"] "allowSyntheticDefaultImports": true,
}, "strictNullChecks": true,
"extends": "./.svelte-kit/tsconfig.json" "types": ["vitest/importMeta"]
},
"extends": "./.svelte-kit/tsconfig.json"
} }
+25 -25
View File
@@ -1,26 +1,26 @@
import { sveltekit } from '@sveltejs/kit/vite'; import { sveltekit } from '@sveltejs/kit/vite';
/** @type {import('vite').UserConfig} */ import { defineConfig } from 'vitest/config';
const config = {
plugins: [sveltekit()], export default defineConfig({
envPrefix: 'MERMAID_', plugins: [sveltekit()],
optimizeDeps: { include: ['mermaid'] }, envPrefix: 'MERMAID_',
server: { optimizeDeps: { include: ['mermaid'] },
port: 3000, server: {
host: true port: 3000,
}, host: true
preview: { },
port: 3000, preview: {
host: true port: 3000,
}, host: true
test: { },
environment: 'jsdom', test: {
// in-source testing environment: 'jsdom',
includeSource: ['src/**/*.{js,ts,svelte}'], // in-source testing
setupFiles: ['./src/tests/setup.ts'], includeSource: ['src/**/*.{js,ts,svelte}'],
coverage: { setupFiles: ['./src/tests/setup.ts'],
exclude: ['src/mocks', '.svelte-kit', 'src/**/*.test.ts'], coverage: {
reporter: ['text', 'json', 'html', 'lcov'] exclude: ['src/mocks', '.svelte-kit', 'src/**/*.test.ts'],
} reporter: ['text', 'json', 'html', 'lcov']
} }
}; }
export default config; });
+1193 -887
View File
File diff suppressed because it is too large Load Diff