From dec0c580922ec5351c3f288217b657eca831c155 Mon Sep 17 00:00:00 2001 From: Yash Singh Date: Sat, 14 Aug 2021 21:49:17 -0700 Subject: [PATCH 01/50] More arrows --- src/lib/components/editor/util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index b5e734be..88c14edf 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -20,7 +20,7 @@ export const initEditor = (monacoEditor): void => { 'journey' ], keywords: ['participant', 'as'], - arrows: ['---', '===', '-->', '==>', '->>', '->'], + arrows: ['---', '===', '-->', '==>', '->>', '-->>', '->', '-)', '--)', '-x', '--x'], tokenizer: { root: [ [/[{}]/, 'delimiter.bracket'], From b4814d7b138860811c3abd144c03e0b6802bd8a2 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 15 Aug 2021 17:36:26 -0700 Subject: [PATCH 02/50] Fix for + and - --- cypress/snapshots.js | 2 +- src/lib/components/editor/util.ts | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/cypress/snapshots.js b/cypress/snapshots.js index 0162dd5c..5422b1e8 100644 --- a/cypress/snapshots.js +++ b/cypress/snapshots.js @@ -7,7 +7,7 @@ module.exports = { "1": "{\"code\":\"graph TD\\n A[Christmas] -->|Get money| B(Go shopping)\\n B --> C{Let me think}\\n C -->|One| D[Laptop]\\n C -->|Two| E[iPhone]\\n C -->|Three| F[fa:fa-car Car]\",\"mermaid\":\"{\\n \\\"theme\\\": \\\"default\\\"\\n}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":false}" } }, - "__version": "8.2.0", + "__version": "8.1.0", "Auto sync tests": { "should dim diagram when code is edited": { "1": "{\"code\":\"graph TD\\n A[Christmas] -->|Get money| B(Go shopping)\\n B --> C{Let me think}\\n C -->|One| D[Laptop]\\n C -->|Two| E[iPhone]\\n C -->|Three| F[fa:fa-car Car]\\n C --> Test\",\"mermaid\":\"{\\n \\\"theme\\\": \\\"default\\\"\\n}\",\"updateEditor\":false,\"autoSync\":false,\"updateDiagram\":false}" diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 88c14edf..9b158bf0 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -20,12 +20,15 @@ export const initEditor = (monacoEditor): void => { 'journey' ], keywords: ['participant', 'as'], - arrows: ['---', '===', '-->', '==>', '->>', '-->>', '->', '-)', '--)', '-x', '--x'], + arrows: ['---', '===', '-->>', '-->', '==>', '->>', '->', '--)', '-)', '--x', '-x'].reduce( + (accumalator, arrow) => accumalator.concat(arrow, arrow + '+', arrow + '-'), + [] + ), tokenizer: { root: [ [/[{}]/, 'delimiter.bracket'], [/[a-z_$][\w$]*/, { cases: { '@typeKeywords': 'keyword', '@keywords': 'keyword' } }], - [/[-=>ox]+/, { cases: { '@arrows': 'transition' } }], + [/[-+=>ox]+/, { cases: { '@arrows': 'transition' } }], [/[[{(}]+.+?[)\]}]+/, 'string'], [/".*"/, 'string'] ] From b73afb400beddb1c1cf978da98d7ee2db555e2a8 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Mon, 16 Aug 2021 17:31:21 -0700 Subject: [PATCH 03/50] Info diagrams --- src/lib/components/editor/util.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 9b158bf0..3ddc4e7b 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -17,9 +17,10 @@ export const initEditor = (monacoEditor): void => { 'flowchart', 'gantt', 'gitGraph', - 'journey' + 'journey', + 'info' ], - keywords: ['participant', 'as'], + keywords: ['participant', 'as', 'showInfo'], arrows: ['---', '===', '-->>', '-->', '==>', '->>', '->', '--)', '-)', '--x', '-x'].reduce( (accumalator, arrow) => accumalator.concat(arrow, arrow + '+', arrow + '-'), [] From 3b63e9a9aa8b9aa6c71875acb2e92e50f2dc4b0b Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Mon, 16 Aug 2021 17:57:54 -0700 Subject: [PATCH 04/50] Finalize sequence diagrams --- src/lib/components/editor/util.ts | 59 ++++++++++++++++++++++--------- 1 file changed, 42 insertions(+), 17 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 3ddc4e7b..a247229c 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -5,7 +5,7 @@ export const initEditor = (monacoEditor): void => { monacoEditor.languages.register({ id: 'mermaid' }); - // Register a tokens provider for the language + // Register a tokens provider for the mermaid language monacoEditor.languages.setMonarchTokensProvider('mermaid', { typeKeywords: [ 'graph', @@ -20,7 +20,7 @@ export const initEditor = (monacoEditor): void => { 'journey', 'info' ], - keywords: ['participant', 'as', 'showInfo'], + keywords: ['participant', 'as', 'showInfo', 'autonumber'], arrows: ['---', '===', '-->>', '-->', '==>', '->>', '->', '--)', '-)', '--x', '-x'].reduce( (accumalator, arrow) => accumalator.concat(arrow, arrow + '+', arrow + '-'), [] @@ -52,27 +52,52 @@ export const initEditor = (monacoEditor): void => { ] }); - // Register a completion item provider for the new language + // Register a completion item provider for the mermaid language monacoEditor.languages.registerCompletionItemProvider('mermaid', { provideCompletionItems: () => { const suggestions = [ { - label: 'simpleText', - kind: monacoEditor.languages.CompletionItemKind.Text, - insertText: 'simpleText' - }, - { - label: 'testing', - kind: monacoEditor.languages.CompletionItemKind.Keyword, - insertText: 'testing(${1:condition})', - insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet - }, - { - label: 'ifelse', + label: 'loop', kind: monacoEditor.languages.CompletionItemKind.Snippet, - insertText: ['if (${1:condition}) {', '\t$0', '} else {', '\t', '}'].join('\n'), + insertText: ['loop ${1:Loop text}', '\t$0', 'end'].join('\n'), insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, - documentation: 'If-Else Statement' + documentation: 'Sequence Diagram Loops' + }, + { + label: 'alt', + kind: monacoEditor.languages.CompletionItemKind.Snippet, + insertText: ['alt ${1:Describing text}', '\t$0', 'else', '\t', 'end'].join('\n'), + insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, + documentation: 'Alternative Path' + }, + { + label: 'opt', + kind: monacoEditor.languages.CompletionItemKind.Snippet, + insertText: ['opt ${1:Describing text}', '\t$0', 'end'].join('\n'), + insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, + documentation: 'Optional Path' + }, + { + label: 'par', + kind: monacoEditor.languages.CompletionItemKind.Snippet, + insertText: [ + 'par ${1:[Action 1]}', + '\t$0', + 'and ${2:[Action 2]}', + '\t', + 'and ${3:[Action 3]}', + '\t', + 'end' + ].join('\n'), + insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, + documentation: 'Parallel Actions' + }, + { + label: 'rect', + kind: monacoEditor.languages.CompletionItemKind.Snippet, + insertText: ['rect ${1:rgb(0, 255, 0)}', '\t$0', 'end'].join('\n'), + insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, + documentation: 'Background Color' } ]; return { suggestions: suggestions }; From 76a70be939315049960b0696cce3a86a31cc93ab Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Tue, 17 Aug 2021 16:54:23 -0700 Subject: [PATCH 05/50] Proper theme name --- src/lib/components/editor/editor.svelte | 2 +- src/lib/components/editor/util.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/components/editor/editor.svelte b/src/lib/components/editor/editor.svelte index 07ecbe3e..7d2e7916 100644 --- a/src/lib/components/editor/editor.svelte +++ b/src/lib/components/editor/editor.svelte @@ -18,7 +18,7 @@ minimap: { enabled: false }, - theme: 'myCoolTheme', + theme: 'mermaidTheme', overviewRulerLanes: 0 }; export let errorMarkers: monaco.editor.IMarkerData[] = []; diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index a247229c..d1d5988e 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -40,7 +40,7 @@ export const initEditor = (monacoEditor): void => { ] }); - monacoEditor.editor.defineTheme('myCoolTheme', { + monacoEditor.editor.defineTheme('mermaidTheme', { base: 'vs', inherit: false, rules: [ From ca07ed764d64f440b8243afdbfe0d16c75261a49 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Tue, 17 Aug 2021 17:01:08 -0700 Subject: [PATCH 06/50] HTML Entities --- src/lib/components/editor/util.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index d1d5988e..847ad4b5 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -31,7 +31,8 @@ export const initEditor = (monacoEditor): void => { [/[a-z_$][\w$]*/, { cases: { '@typeKeywords': 'keyword', '@keywords': 'keyword' } }], [/[-+=>ox]+/, { cases: { '@arrows': 'transition' } }], [/[[{(}]+.+?[)\]}]+/, 'string'], - [/".*"/, 'string'] + [/".*"/, 'string'], + [/#(\d|[a-zA-Z])*;/, 'html.entity'] ] }, whitespace: [ @@ -48,7 +49,8 @@ export const initEditor = (monacoEditor): void => { { token: 'custom-error', foreground: 'ff0000', fontStyle: 'bold' }, { token: 'string', foreground: 'AA8500' }, { token: 'transition', foreground: '008800', fontStyle: 'bold' }, - { token: 'delimiter.bracket', foreground: '000000', fontStyle: 'bold' } + { token: 'delimiter.bracket', foreground: '000000', fontStyle: 'bold' }, + { token: 'html.entity', foreground: 'f5b436' } ] }); From ae2880c8a2d04f4120704cc5dd6f225eda44c9dd Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Tue, 17 Aug 2021 17:11:22 -0700 Subject: [PATCH 07/50] Asymmetric, rhombus, hexagonal nodes --- src/lib/components/editor/util.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 847ad4b5..eb85b3a2 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -27,10 +27,10 @@ export const initEditor = (monacoEditor): void => { ), tokenizer: { root: [ - [/[{}]/, 'delimiter.bracket'], [/[a-z_$][\w$]*/, { cases: { '@typeKeywords': 'keyword', '@keywords': 'keyword' } }], + [/[[{(}>]+.+?[)\]}]+/, 'string'], [/[-+=>ox]+/, { cases: { '@arrows': 'transition' } }], - [/[[{(}]+.+?[)\]}]+/, 'string'], + [/[{}]/, 'delimiter.bracket'], [/".*"/, 'string'], [/#(\d|[a-zA-Z])*;/, 'html.entity'] ] From ff48d906aec2f80f2a4c4536dab5bc1755e62c2a Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Tue, 17 Aug 2021 17:36:45 -0700 Subject: [PATCH 08/50] Non-bold non-type-keywords and orientations --- src/lib/components/editor/util.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index eb85b3a2..6ee8b14e 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -21,13 +21,15 @@ export const initEditor = (monacoEditor): void => { 'info' ], keywords: ['participant', 'as', 'showInfo', 'autonumber'], + orientation: ['TB', 'TD', 'BT', 'RL', 'LR'], arrows: ['---', '===', '-->>', '-->', '==>', '->>', '->', '--)', '-)', '--x', '-x'].reduce( (accumalator, arrow) => accumalator.concat(arrow, arrow + '+', arrow + '-'), [] ), tokenizer: { root: [ - [/[a-z_$][\w$]*/, { cases: { '@typeKeywords': 'keyword', '@keywords': 'keyword' } }], + [/[a-z_$][\w$]*/, { cases: { '@typeKeywords': 'typeKeyword', '@keywords': 'keyword' } }], + [/[A-Z$][\w$]*/, { cases: { '@orientation': 'keyword' } }], [/[[{(}>]+.+?[)\]}]+/, 'string'], [/[-+=>ox]+/, { cases: { '@arrows': 'transition' } }], [/[{}]/, 'delimiter.bracket'], @@ -45,7 +47,8 @@ export const initEditor = (monacoEditor): void => { base: 'vs', inherit: false, rules: [ - { token: 'keyword', foreground: '880000', fontStyle: 'bold' }, + { token: 'typeKeyword', foreground: '880000', fontStyle: 'bold' }, + { token: 'keyword', foreground: '880000' }, { token: 'custom-error', foreground: 'ff0000', fontStyle: 'bold' }, { token: 'string', foreground: 'AA8500' }, { token: 'transition', foreground: '008800', fontStyle: 'bold' }, From 7983b5d94cf34f71a2d063d64e363f044b70f4dd Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Tue, 17 Aug 2021 17:43:20 -0700 Subject: [PATCH 09/50] Different color for keywords --- src/lib/components/editor/util.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 6ee8b14e..3a21ed17 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -47,8 +47,8 @@ export const initEditor = (monacoEditor): void => { base: 'vs', inherit: false, rules: [ - { token: 'typeKeyword', foreground: '880000', fontStyle: 'bold' }, - { token: 'keyword', foreground: '880000' }, + { token: 'typeKeyword', foreground: '9650c8', fontStyle: 'bold' }, + { token: 'keyword', foreground: '649696' }, { token: 'custom-error', foreground: 'ff0000', fontStyle: 'bold' }, { token: 'string', foreground: 'AA8500' }, { token: 'transition', foreground: '008800', fontStyle: 'bold' }, From c5348e9a81ac8a9d6bf51ce45fb953b5f6bc391c Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Tue, 17 Aug 2021 17:44:11 -0700 Subject: [PATCH 10/50] Add more code block keywords --- src/lib/components/editor/util.ts | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 3a21ed17..44ad20d2 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -20,7 +20,18 @@ export const initEditor = (monacoEditor): void => { 'journey', 'info' ], - keywords: ['participant', 'as', 'showInfo', 'autonumber'], + keywords: [ + 'participant', + 'as', + 'showInfo', + 'autonumber', + 'rect', + 'opt', + 'alt', + 'loop', + 'else', + 'end' + ], orientation: ['TB', 'TD', 'BT', 'RL', 'LR'], arrows: ['---', '===', '-->>', '-->', '==>', '->>', '->', '--)', '-)', '--x', '-x'].reduce( (accumalator, arrow) => accumalator.concat(arrow, arrow + '+', arrow + '-'), From 3a4c4375361ee65e10675e378cbe5cacdcc948b8 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sat, 21 Aug 2021 19:21:24 -0700 Subject: [PATCH 11/50] Auto closing brackets --- src/lib/components/editor/editor.svelte | 3 +- src/lib/components/editor/util.ts | 44 ++++++++++++++++++++----- 2 files changed, 38 insertions(+), 9 deletions(-) diff --git a/src/lib/components/editor/editor.svelte b/src/lib/components/editor/editor.svelte index 7d2e7916..25b28b27 100644 --- a/src/lib/components/editor/editor.svelte +++ b/src/lib/components/editor/editor.svelte @@ -19,7 +19,8 @@ enabled: false }, theme: 'mermaidTheme', - overviewRulerLanes: 0 + overviewRulerLanes: 0, + autoClosingBrackets: 'always' }; export let errorMarkers: monaco.editor.IMarkerData[] = []; let oldText = text; diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 44ad20d2..3c4eb00d 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -8,6 +8,7 @@ export const initEditor = (monacoEditor): void => { // Register a tokens provider for the mermaid language monacoEditor.languages.setMonarchTokensProvider('mermaid', { typeKeywords: [ + 'flowchart', 'graph', 'stateDiagram', 'sequenceDiagram', @@ -20,17 +21,21 @@ export const initEditor = (monacoEditor): void => { 'journey', 'info' ], + blockKeywords: ['subgraph', 'rect', 'opt', 'alt', 'loop', 'else', 'end'], keywords: [ 'participant', 'as', 'showInfo', 'autonumber', - 'rect', - 'opt', - 'alt', - 'loop', - 'else', - 'end' + 'rgba', + 'rgb', + 'hsla', + 'hsl', + 'linkStyle', + 'style', + 'classDef', + 'class', + 'direction' ], orientation: ['TB', 'TD', 'BT', 'RL', 'LR'], arrows: ['---', '===', '-->>', '-->', '==>', '->>', '->', '--)', '-)', '--x', '-x'].reduce( @@ -45,7 +50,8 @@ export const initEditor = (monacoEditor): void => { [/[-+=>ox]+/, { cases: { '@arrows': 'transition' } }], [/[{}]/, 'delimiter.bracket'], [/".*"/, 'string'], - [/#(\d|[a-zA-Z])*;/, 'html.entity'] + [/#(\d|[a-zA-Z])*;/, 'html.entity/hex-color-code'], + [/#(?:[0-9a-fA-F]{3}){1,2}/, 'html.entity/hex-color-code'] ] }, whitespace: [ @@ -64,7 +70,7 @@ export const initEditor = (monacoEditor): void => { { token: 'string', foreground: 'AA8500' }, { token: 'transition', foreground: '008800', fontStyle: 'bold' }, { token: 'delimiter.bracket', foreground: '000000', fontStyle: 'bold' }, - { token: 'html.entity', foreground: 'f5b436' } + { token: 'html.entity/hex-color-code', foreground: 'f5b436' } ] }); @@ -119,4 +125,26 @@ export const initEditor = (monacoEditor): void => { return { suggestions: suggestions }; } }); + + monacoEditor.languages.setLanguageConfiguration('mermaid', { + autoClosingPairs: [ + { + open: '(', + close: ')' + }, + { + open: '{', + close: '}' + }, + { + open: '[', + close: ']' + } + ], + brackets: [ + ['(', ')'], + ['{', '}'], + ['[', ']'] + ] + }); }; From 3b5af96ab03532e2a1fd8e5f85e4336ce8e3b36f Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sat, 21 Aug 2021 19:38:03 -0700 Subject: [PATCH 12/50] Keyword snippets --- src/lib/components/editor/util.ts | 74 ++++++++++++++++++------------- 1 file changed, 42 insertions(+), 32 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 3c4eb00d..e4c5eb52 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -5,39 +5,44 @@ export const initEditor = (monacoEditor): void => { monacoEditor.languages.register({ id: 'mermaid' }); + const orientations = ['TB', 'TD', 'BT', 'RL', 'LR']; + const typeKeywords = [ + 'flowchart', + 'graph', + 'stateDiagram', + 'sequenceDiagram', + 'classDiagram', + 'pie', + 'erDiagram', + 'flowchart', + 'gantt', + 'gitGraph', + 'journey', + 'info' + ]; + const blockKeywords = ['subgraph', 'rect', 'opt', 'alt', 'loop', 'else', 'end']; + const keywords = [ + 'participant', + 'as', + 'showInfo', + 'autonumber', + 'rgba', + 'rgb', + 'hsla', + 'hsl', + 'linkStyle', + 'style', + 'classDef', + 'class', + 'direction' + ]; + // Register a tokens provider for the mermaid language monacoEditor.languages.setMonarchTokensProvider('mermaid', { - typeKeywords: [ - 'flowchart', - 'graph', - 'stateDiagram', - 'sequenceDiagram', - 'classDiagram', - 'pie', - 'erDiagram', - 'flowchart', - 'gantt', - 'gitGraph', - 'journey', - 'info' - ], - blockKeywords: ['subgraph', 'rect', 'opt', 'alt', 'loop', 'else', 'end'], - keywords: [ - 'participant', - 'as', - 'showInfo', - 'autonumber', - 'rgba', - 'rgb', - 'hsla', - 'hsl', - 'linkStyle', - 'style', - 'classDef', - 'class', - 'direction' - ], - orientation: ['TB', 'TD', 'BT', 'RL', 'LR'], + typeKeywords, + blockKeywords, + keywords, + orientation: orientations, arrows: ['---', '===', '-->>', '-->', '==>', '->>', '->', '--)', '-)', '--x', '-x'].reduce( (accumalator, arrow) => accumalator.concat(arrow, arrow + '+', arrow + '-'), [] @@ -120,7 +125,12 @@ export const initEditor = (monacoEditor): void => { insertText: ['rect ${1:rgb(0, 255, 0)}', '\t$0', 'end'].join('\n'), insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, documentation: 'Background Color' - } + }, + ...[...orientations, ...typeKeywords, ...blockKeywords, ...keywords].map((keyword) => ({ + label: keyword, + kind: monacoEditor.languages.CompletionItemKind.Keyword, + insertText: keyword + })) ]; return { suggestions: suggestions }; } From 7ef1f1325be2c5e64679cdde3a1d39289d6dd493 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sat, 21 Aug 2021 20:30:01 -0700 Subject: [PATCH 13/50] finally...done...with...regexp --- src/lib/components/editor/util.ts | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index e4c5eb52..f150ef2a 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -20,7 +20,7 @@ export const initEditor = (monacoEditor): void => { 'journey', 'info' ]; - const blockKeywords = ['subgraph', 'rect', 'opt', 'alt', 'loop', 'else', 'end']; + const blockKeywords = ['subgraph', 'rect', 'opt', 'alt', 'par', 'and', 'loop', 'else', 'end']; const keywords = [ 'participant', 'as', @@ -34,7 +34,9 @@ export const initEditor = (monacoEditor): void => { 'style', 'classDef', 'class', - 'direction' + 'direction', + 'activate', + 'deactivate' ]; // Register a tokens provider for the mermaid language @@ -43,17 +45,23 @@ export const initEditor = (monacoEditor): void => { blockKeywords, keywords, orientation: orientations, - arrows: ['---', '===', '-->>', '-->', '==>', '->>', '->', '--)', '-)', '--x', '-x'].reduce( + noEatingSequenceArrows: ['-)', '--)', '->>', '-->>'].reduce( + (accumalator, arrow) => accumalator.concat(arrow, arrow + '+', arrow + '-'), + [] + ), + eatingSequenceArrows: ['->', '-x'].reduce( (accumalator, arrow) => accumalator.concat(arrow, arrow + '+', arrow + '-'), [] ), tokenizer: { root: [ + [/-{1,2}\)|-{1,2}>>/, { cases: { '@noEatingSequenceArrows': 'transition' } }], + [/[ox<]?(-{2,}|-+\.+-+|={2,})[ox>]?/, 'transition'], + [/[-+>]+/, { cases: { '@eatingSequenceArrows': 'transition' } }], [/[a-z_$][\w$]*/, { cases: { '@typeKeywords': 'typeKeyword', '@keywords': 'keyword' } }], [/[A-Z$][\w$]*/, { cases: { '@orientation': 'keyword' } }], [/[[{(}>]+.+?[)\]}]+/, 'string'], - [/[-+=>ox]+/, { cases: { '@arrows': 'transition' } }], - [/[{}]/, 'delimiter.bracket'], + [/[{}&]/, 'delimiter.bracket'], [/".*"/, 'string'], [/#(\d|[a-zA-Z])*;/, 'html.entity/hex-color-code'], [/#(?:[0-9a-fA-F]{3}){1,2}/, 'html.entity/hex-color-code'] From ea0e8b9883d9a3b3189fc8f52c53fb0cb7640697 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sat, 21 Aug 2021 20:55:50 -0700 Subject: [PATCH 14/50] class, annotations, callbacks, classes, and much more --- src/lib/components/editor/util.ts | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index f150ef2a..35d73c27 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -36,7 +36,13 @@ export const initEditor = (monacoEditor): void => { 'class', 'direction', 'activate', - 'deactivate' + 'deactivate', + 'cssClass', + 'link', + 'callback', + 'click', + 'href', + 'call' ]; // Register a tokens provider for the mermaid language @@ -56,15 +62,20 @@ export const initEditor = (monacoEditor): void => { tokenizer: { root: [ [/-{1,2}\)|-{1,2}>>/, { cases: { '@noEatingSequenceArrows': 'transition' } }], + [/\*--\*?|--\*/, 'transition'], + [/(<\|?)(\.{2}|-{2})(\|?>)?|(\.{2}|-{2})(\|?>)/, 'transition'], [/[ox<]?(-{2,}|-+\.+-+|={2,})[ox>]?/, 'transition'], [/[-+>]+/, { cases: { '@eatingSequenceArrows': 'transition' } }], + [':::', 'transition'], [/[a-z_$][\w$]*/, { cases: { '@typeKeywords': 'typeKeyword', '@keywords': 'keyword' } }], [/[A-Z$][\w$]*/, { cases: { '@orientation': 'keyword' } }], + [/\[\[(fork|join|choice)\]\]/, 'annotation'], [/[[{(}>]+.+?[)\]}]+/, 'string'], [/[{}&]/, 'delimiter.bracket'], [/".*"/, 'string'], [/#(\d|[a-zA-Z])*;/, 'html.entity/hex-color-code'], - [/#(?:[0-9a-fA-F]{3}){1,2}/, 'html.entity/hex-color-code'] + [/#(?:[0-9a-fA-F]{3}){1,2}/, 'html.entity/hex-color-code'], + [/<<.+>>/, 'annotation'] ] }, whitespace: [ @@ -83,7 +94,8 @@ export const initEditor = (monacoEditor): void => { { token: 'string', foreground: 'AA8500' }, { token: 'transition', foreground: '008800', fontStyle: 'bold' }, { token: 'delimiter.bracket', foreground: '000000', fontStyle: 'bold' }, - { token: 'html.entity/hex-color-code', foreground: 'f5b436' } + { token: 'html.entity/hex-color-code', foreground: 'f5b436' }, + { token: 'annotation', foreground: '4b4b96' } ] }); From 7a04384b7d74e9f1c23b52dbabaeac7c3569c8fc Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sat, 21 Aug 2021 21:00:06 -0700 Subject: [PATCH 15/50] class is a block and its snippet --- src/lib/components/editor/util.ts | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 35d73c27..ddc5d475 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -20,7 +20,18 @@ export const initEditor = (monacoEditor): void => { 'journey', 'info' ]; - const blockKeywords = ['subgraph', 'rect', 'opt', 'alt', 'par', 'and', 'loop', 'else', 'end']; + const blockKeywords = [ + 'subgraph', + 'rect', + 'opt', + 'class', + 'alt', + 'par', + 'and', + 'loop', + 'else', + 'end' + ]; const keywords = [ 'participant', 'as', @@ -33,7 +44,6 @@ export const initEditor = (monacoEditor): void => { 'linkStyle', 'style', 'classDef', - 'class', 'direction', 'activate', 'deactivate', @@ -146,6 +156,13 @@ export const initEditor = (monacoEditor): void => { insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, documentation: 'Background Color' }, + { + label: 'class', + kind: monacoEditor.languages.CompletionItemKind.Snippet, + insertText: ['class ${1:className} {', '\t$0', '}'].join('\n'), + insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, + documentation: 'Class' + }, ...[...orientations, ...typeKeywords, ...blockKeywords, ...keywords].map((keyword) => ({ label: keyword, kind: monacoEditor.languages.CompletionItemKind.Keyword, From 00bdd4500e9f50e80ede43f7912518c70a7f25b6 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Sun, 22 Aug 2021 18:55:48 +0530 Subject: [PATCH 16/50] chore: Update svelte --- package.json | 4 ++-- yarn.lock | 36 ++++++++++++++++++------------------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index cd4bcbf1..d942378e 100644 --- a/package.json +++ b/package.json @@ -15,8 +15,8 @@ }, "devDependencies": { "@cypress/snapshot": "^2.1.7", - "@sveltejs/adapter-static": "1.0.0-next.16", - "@sveltejs/kit": "1.0.0-next.147", + "@sveltejs/adapter-static": "1.0.0-next.17", + "@sveltejs/kit": "1.0.0-next.155", "@types/mermaid": "^8.2.7", "@typescript-eslint/eslint-plugin": "^4.29.2", "@typescript-eslint/parser": "^4.29.2", diff --git a/yarn.lock b/yarn.lock index 1fac0ec6..e95d935d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -614,20 +614,20 @@ estree-walker "^2.0.1" picomatch "^2.2.2" -"@sveltejs/adapter-static@1.0.0-next.16": - version "1.0.0-next.16" - resolved "https://registry.yarnpkg.com/@sveltejs/adapter-static/-/adapter-static-1.0.0-next.16.tgz#656c90666edd730ccc9bfb89e3f7ece56e7ac7c8" - integrity sha512-xGFcg+GHF0BL1fyWx2vCzlYj4S4R+Od9cF00soo1TVp/scGOi1G9grSYYW4x5H+iDn1sscoJ65OGBGWIcOgrXg== +"@sveltejs/adapter-static@1.0.0-next.17": + version "1.0.0-next.17" + resolved "https://registry.yarnpkg.com/@sveltejs/adapter-static/-/adapter-static-1.0.0-next.17.tgz#63537e4d2b8c1fabb6db96b56f69ec41e56b6334" + integrity sha512-RKYNkQxtsMgt0wD8PhfXR1hGT1Tmq1E5eZeTr1KxIerczITRnWVT8LElfu/9Kusv44yYlyQtNc1mLoYqgloOQw== -"@sveltejs/kit@1.0.0-next.147": - version "1.0.0-next.147" - resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.147.tgz#1dad06fd7f4365405beebdcd12b410a52c3a03b0" - integrity sha512-rAABsKlC1K/B4VfqT2SaVO29t+OV8deseSJ9l+hV7j9zkswTwiJ7h37tZ5SfnvMgCHemcNjXg8Gzg+0U1MCfEA== +"@sveltejs/kit@1.0.0-next.155": + version "1.0.0-next.155" + resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.155.tgz#8abea1750d32f01dbe71434a2362404b28c05297" + integrity sha512-cAQxR0HS+ywEGPL8LvUdoWCsISYtdJ6d3fCNFhJxvDDMDUCnGxmueHNA0+jIkLaaLY6TCb0oJ54rRdqfn5gGEA== dependencies: "@sveltejs/vite-plugin-svelte" "^1.0.0-next.16" cheap-watch "^1.0.3" sade "^1.7.4" - vite "^2.4.3" + vite "^2.5.0" "@sveltejs/vite-plugin-svelte@^1.0.0-next.16": version "1.0.0-next.17" @@ -2331,10 +2331,10 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -esbuild@^0.12.8: - version "0.12.20" - resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.12.20.tgz" - integrity sha512-u7+0qTo9Z64MD9PhooEngCmzyEYJ6ovFhPp8PLNh3UasR5Ihjv6HWVXqm8uHmasdQlpsAf0IsY4U0YVUfCpt4Q== +esbuild@^0.12.17: + version "0.12.22" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.12.22.tgz#6031a1257b8d0307d306bed673b79c3668607f51" + integrity sha512-yWCr9RoFehpqoe/+MwZXJpYOEIt7KOEvNnjIeMZpMSyQt+KCBASM3y7yViiN5dJRphf1wGdUz1+M4rTtWd/ulA== escalade@^3.1.1: version "3.1.1" @@ -5781,12 +5781,12 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vite@^2.4.3: - version "2.4.4" - resolved "https://registry.npmjs.org/vite/-/vite-2.4.4.tgz" - integrity sha512-m1wK6pFJKmaYA6AeZIUXyiAgUAAJzVXhIMYCdZUpCaFMGps0v0IlNJtbmPvkUhVEyautalajmnW5X6NboUPsnw== +vite@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/vite/-/vite-2.5.0.tgz#111ba3679432d426e44566acf480005a7914cbd6" + integrity sha512-Dn4B+g54PJsMG5WCc4QeFy1ygMXRdTtFrUPegqfk4+vzVQcbF/DqqmI/1bxezArzbujBJg/67QeT5wz8edfJVQ== dependencies: - esbuild "^0.12.8" + esbuild "^0.12.17" postcss "^8.3.6" resolve "^1.20.0" rollup "^2.38.5" From a1a085e5264b1f52f2b5715ee00f749f8855b011 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Sun, 22 Aug 2021 19:32:35 +0530 Subject: [PATCH 17/50] fix: Writable --- package.json | 2 +- src/lib/components/history/history.ts | 3 ++- src/lib/util/loading.ts | 3 ++- yarn.lock | 12 ++++++------ 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index d942378e..67060ea4 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "devDependencies": { "@cypress/snapshot": "^2.1.7", "@sveltejs/adapter-static": "1.0.0-next.17", - "@sveltejs/kit": "1.0.0-next.155", + "@sveltejs/kit": "1.0.0-next.147", "@types/mermaid": "^8.2.7", "@typescript-eslint/eslint-plugin": "^4.29.2", "@typescript-eslint/parser": "^4.29.2", diff --git a/src/lib/components/history/history.ts b/src/lib/components/history/history.ts index 8dc0809b..94586223 100644 --- a/src/lib/components/history/history.ts +++ b/src/lib/components/history/history.ts @@ -1,4 +1,5 @@ -import { derived, Readable, Writable, writable, get } from 'svelte/store'; +import { derived, writable, get } from 'svelte/store'; +import type { Readable, Writable } from 'svelte/store'; import { persist, localStorage } from '@macfja/svelte-persistent-store'; import { generateSlug } from 'random-word-slugs'; import type { HistoryEntry, HistoryType } from '$lib/types'; diff --git a/src/lib/util/loading.ts b/src/lib/util/loading.ts index 84205ebf..0d483c91 100644 --- a/src/lib/util/loading.ts +++ b/src/lib/util/loading.ts @@ -1,4 +1,5 @@ -import { writable, Writable } from 'svelte/store'; +import { writable } from 'svelte/store'; +import type { Writable } from 'svelte/store'; import type { LoadingState } from '$lib/types'; const defaultLoading: LoadingState = { diff --git a/yarn.lock b/yarn.lock index e95d935d..20dab5f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -619,15 +619,15 @@ resolved "https://registry.yarnpkg.com/@sveltejs/adapter-static/-/adapter-static-1.0.0-next.17.tgz#63537e4d2b8c1fabb6db96b56f69ec41e56b6334" integrity sha512-RKYNkQxtsMgt0wD8PhfXR1hGT1Tmq1E5eZeTr1KxIerczITRnWVT8LElfu/9Kusv44yYlyQtNc1mLoYqgloOQw== -"@sveltejs/kit@1.0.0-next.155": - version "1.0.0-next.155" - resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.155.tgz#8abea1750d32f01dbe71434a2362404b28c05297" - integrity sha512-cAQxR0HS+ywEGPL8LvUdoWCsISYtdJ6d3fCNFhJxvDDMDUCnGxmueHNA0+jIkLaaLY6TCb0oJ54rRdqfn5gGEA== +"@sveltejs/kit@1.0.0-next.147": + version "1.0.0-next.147" + resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.147.tgz#1dad06fd7f4365405beebdcd12b410a52c3a03b0" + integrity sha512-rAABsKlC1K/B4VfqT2SaVO29t+OV8deseSJ9l+hV7j9zkswTwiJ7h37tZ5SfnvMgCHemcNjXg8Gzg+0U1MCfEA== dependencies: "@sveltejs/vite-plugin-svelte" "^1.0.0-next.16" cheap-watch "^1.0.3" sade "^1.7.4" - vite "^2.5.0" + vite "^2.4.3" "@sveltejs/vite-plugin-svelte@^1.0.0-next.16": version "1.0.0-next.17" @@ -5781,7 +5781,7 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vite@^2.5.0: +vite@^2.4.3: version "2.5.0" resolved "https://registry.yarnpkg.com/vite/-/vite-2.5.0.tgz#111ba3679432d426e44566acf480005a7914cbd6" integrity sha512-Dn4B+g54PJsMG5WCc4QeFy1ygMXRdTtFrUPegqfk4+vzVQcbF/DqqmI/1bxezArzbujBJg/67QeT5wz8edfJVQ== From db5ce6b74be9aa0953920f72dc3868238adea4fb Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 09:45:46 -0700 Subject: [PATCH 18/50] block keyword highlighting and class is also a normal keyword --- src/lib/components/editor/util.ts | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index ddc5d475..bdd764e5 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -51,6 +51,7 @@ export const initEditor = (monacoEditor): void => { 'link', 'callback', 'click', + 'class', 'href', 'call' ]; @@ -77,7 +78,16 @@ export const initEditor = (monacoEditor): void => { [/[ox<]?(-{2,}|-+\.+-+|={2,})[ox>]?/, 'transition'], [/[-+>]+/, { cases: { '@eatingSequenceArrows': 'transition' } }], [':::', 'transition'], - [/[a-z_$][\w$]*/, { cases: { '@typeKeywords': 'typeKeyword', '@keywords': 'keyword' } }], + [ + /[a-z_$][\w$]*/, + { + cases: { + '@typeKeywords': 'typeKeyword', + '@blockKeywords': 'typeKeyword', + '@keywords': 'keyword' + } + } + ], [/[A-Z$][\w$]*/, { cases: { '@orientation': 'keyword' } }], [/\[\[(fork|join|choice)\]\]/, 'annotation'], [/[[{(}>]+.+?[)\]}]+/, 'string'], From b60718a18ebe3efe14b38e7e728ebf11265c8ab9 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 09:50:35 -0700 Subject: [PATCH 19/50] Prevent dup keywords --- src/lib/components/editor/util.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index bdd764e5..5a8498bb 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -173,11 +173,13 @@ export const initEditor = (monacoEditor): void => { insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, documentation: 'Class' }, - ...[...orientations, ...typeKeywords, ...blockKeywords, ...keywords].map((keyword) => ({ - label: keyword, - kind: monacoEditor.languages.CompletionItemKind.Keyword, - insertText: keyword - })) + ...[...new Set([...orientations, ...typeKeywords, ...blockKeywords, ...keywords])].map( + (keyword) => ({ + label: keyword, + kind: monacoEditor.languages.CompletionItemKind.Keyword, + insertText: keyword + }) + ) ]; return { suggestions: suggestions }; } From bcb8031c8f9be0864eeb5a3e8566bf347dd6a2ae Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 09:52:31 -0700 Subject: [PATCH 20/50] style comments --- src/lib/components/editor/util.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 5a8498bb..e8c831e4 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -95,13 +95,11 @@ export const initEditor = (monacoEditor): void => { [/".*"/, 'string'], [/#(\d|[a-zA-Z])*;/, 'html.entity/hex-color-code'], [/#(?:[0-9a-fA-F]{3}){1,2}/, 'html.entity/hex-color-code'], - [/<<.+>>/, 'annotation'] + [/<<.+>>/, 'annotation'], + [/%%.*$/, 'comment'] ] }, - whitespace: [ - [/[ \t\r\n]+/, 'white'], - [/%%.*$/, 'comment'] - ] + whitespace: [[/[ \t\r\n]+/, 'white']] }); monacoEditor.editor.defineTheme('mermaidTheme', { @@ -115,7 +113,8 @@ export const initEditor = (monacoEditor): void => { { token: 'transition', foreground: '008800', fontStyle: 'bold' }, { token: 'delimiter.bracket', foreground: '000000', fontStyle: 'bold' }, { token: 'html.entity/hex-color-code', foreground: 'f5b436' }, - { token: 'annotation', foreground: '4b4b96' } + { token: 'annotation', foreground: '4b4b96' }, + { token: 'comment', foreground: '888c89' } ] }); From 3f843f29bf02a45f970659560481419c528d6bfb Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 10:06:37 -0700 Subject: [PATCH 21/50] directives arent comments --- src/lib/components/editor/util.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index e8c831e4..ea2825dd 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -96,7 +96,7 @@ export const initEditor = (monacoEditor): void => { [/#(\d|[a-zA-Z])*;/, 'html.entity/hex-color-code'], [/#(?:[0-9a-fA-F]{3}){1,2}/, 'html.entity/hex-color-code'], [/<<.+>>/, 'annotation'], - [/%%.*$/, 'comment'] + [/%%.*(? Date: Sun, 22 Aug 2021 10:57:20 -0700 Subject: [PATCH 22/50] stateDiagram-v2 --- src/lib/components/editor/util.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index ea2825dd..9409e89c 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -9,6 +9,7 @@ export const initEditor = (monacoEditor): void => { const typeKeywords = [ 'flowchart', 'graph', + 'stateDiagram-v2', 'stateDiagram', 'sequenceDiagram', 'classDiagram', @@ -79,7 +80,7 @@ export const initEditor = (monacoEditor): void => { [/[-+>]+/, { cases: { '@eatingSequenceArrows': 'transition' } }], [':::', 'transition'], [ - /[a-z_$][\w$]*/, + /[a-z_$][\w$]*((?<=stateDiagram)-v2)?/, { cases: { '@typeKeywords': 'typeKeyword', From bfa35ca86e58117dc62d34aaa2456f11df22d64c Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 11:00:52 -0700 Subject: [PATCH 23/50] States --- src/lib/components/editor/util.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 9409e89c..18e85e4f 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -54,7 +54,8 @@ export const initEditor = (monacoEditor): void => { 'click', 'class', 'href', - 'call' + 'call', + 'state' ]; // Register a tokens provider for the mermaid language @@ -173,6 +174,13 @@ export const initEditor = (monacoEditor): void => { insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, documentation: 'Class' }, + { + label: 'state', + kind: monacoEditor.languages.CompletionItemKind.Snippet, + insertText: ['state ${1:stateName} {', '\t$0', '}'].join('\n'), + insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, + documentation: 'State' + }, ...[...new Set([...orientations, ...typeKeywords, ...blockKeywords, ...keywords])].map( (keyword) => ({ label: keyword, From d7e7121666a4703f993065d974ae3bb003962bcc Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 11:01:43 -0700 Subject: [PATCH 24/50] Allow scroll behind end to prevent suggestion cuts --- src/lib/components/editor/editor.svelte | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/components/editor/editor.svelte b/src/lib/components/editor/editor.svelte index 25b28b27..fd86bc54 100644 --- a/src/lib/components/editor/editor.svelte +++ b/src/lib/components/editor/editor.svelte @@ -14,7 +14,6 @@ export let editorOptions: monaco.editor.IStandaloneEditorConstructionOptions = { value: text, language: language, - scrollBeyondLastLine: false, minimap: { enabled: false }, From 0dd010336a494a2426176808b2caaab5da6ee048 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 11:04:14 -0700 Subject: [PATCH 25/50] States are blocks and notes --- src/lib/components/editor/util.ts | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 18e85e4f..5a7732b5 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -31,7 +31,8 @@ export const initEditor = (monacoEditor): void => { 'and', 'loop', 'else', - 'end' + 'end', + 'state' ]; const keywords = [ 'participant', @@ -55,7 +56,9 @@ export const initEditor = (monacoEditor): void => { 'class', 'href', 'call', - 'state' + 'state', + 'note', + 'Note' ]; // Register a tokens provider for the mermaid language @@ -181,6 +184,13 @@ export const initEditor = (monacoEditor): void => { insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, documentation: 'State' }, + { + label: 'note', + kind: monacoEditor.languages.CompletionItemKind.Snippet, + insertText: ['note ${1:right of State1}', '\t$0', 'end note'].join('\n'), + insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, + documentation: 'State' + }, ...[...new Set([...orientations, ...typeKeywords, ...blockKeywords, ...keywords])].map( (keyword) => ({ label: keyword, From 6868b0d761e4fb445c361c5e6dba1fcfe2295355 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 11:11:28 -0700 Subject: [PATCH 26/50] Entity relationship diagrams --- src/lib/components/editor/util.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 5a7732b5..96148b1f 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -80,6 +80,7 @@ export const initEditor = (monacoEditor): void => { [/-{1,2}\)|-{1,2}>>/, { cases: { '@noEatingSequenceArrows': 'transition' } }], [/\*--\*?|--\*/, 'transition'], [/(<\|?)(\.{2}|-{2})(\|?>)?|(\.{2}|-{2})(\|?>)/, 'transition'], + [/(\|o|\|\||}o|}\|)(-{2}|\.{2})(o\||\|\||o\{|\|\{)/, 'transition'], [/[ox<]?(-{2,}|-+\.+-+|={2,})[ox>]?/, 'transition'], [/[-+>]+/, { cases: { '@eatingSequenceArrows': 'transition' } }], [':::', 'transition'], @@ -95,7 +96,7 @@ export const initEditor = (monacoEditor): void => { ], [/[A-Z$][\w$]*/, { cases: { '@orientation': 'keyword' } }], [/\[\[(fork|join|choice)\]\]/, 'annotation'], - [/[[{(}>]+.+?[)\]}]+/, 'string'], + [/[[{(}>|]+.+?[)\]}|]+/, 'string'], [/[{}&]/, 'delimiter.bracket'], [/".*"/, 'string'], [/#(\d|[a-zA-Z])*;/, 'html.entity/hex-color-code'], From 4ae314c5c0eca7a1c919e78b94151faa153b66ef Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 11:14:11 -0700 Subject: [PATCH 27/50] User-journey diagrams --- src/lib/components/editor/util.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 96148b1f..2860cdf6 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -32,7 +32,8 @@ export const initEditor = (monacoEditor): void => { 'loop', 'else', 'end', - 'state' + 'state', + 'section' ]; const keywords = [ 'participant', @@ -58,7 +59,8 @@ export const initEditor = (monacoEditor): void => { 'call', 'state', 'note', - 'Note' + 'Note', + 'title' ]; // Register a tokens provider for the mermaid language @@ -192,6 +194,13 @@ export const initEditor = (monacoEditor): void => { insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, documentation: 'State' }, + { + label: 'section', + kind: monacoEditor.languages.CompletionItemKind.Snippet, + insertText: ['section ${1:Go to work}', '\t$0'].join('\n'), + insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, + documentation: 'User-journey Section' + }, ...[...new Set([...orientations, ...typeKeywords, ...blockKeywords, ...keywords])].map( (keyword) => ({ label: keyword, From d6d987e962fbe4abf10d91c7125bee7225a5762c Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 11:17:20 -0700 Subject: [PATCH 28/50] Ganntt diagrams --- src/lib/components/editor/util.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 2860cdf6..a65c4ad7 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -60,7 +60,11 @@ export const initEditor = (monacoEditor): void => { 'state', 'note', 'Note', - 'title' + 'title', + 'excludes', + 'dateFormat', + 'axisFormat', + 'todayMarker' ]; // Register a tokens provider for the mermaid language From 536db58698b11790de68f8eefc3cf9ff7418a74a Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 11:45:07 -0700 Subject: [PATCH 29/50] Pie charts --- src/lib/components/editor/util.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index a65c4ad7..f1c53e2d 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -64,7 +64,8 @@ export const initEditor = (monacoEditor): void => { 'excludes', 'dateFormat', 'axisFormat', - 'todayMarker' + 'todayMarker', + 'showData' ]; // Register a tokens provider for the mermaid language From c8e217d0c9ca3bf8ea8bcd3a7cfb0f0072c6e9b2 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 11:47:29 -0700 Subject: [PATCH 30/50] Git graphs --- src/lib/components/editor/util.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index f1c53e2d..013fbc62 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -65,7 +65,13 @@ export const initEditor = (monacoEditor): void => { 'dateFormat', 'axisFormat', 'todayMarker', - 'showData' + 'showData', + 'options', + 'commit', + 'branch', + 'merge', + 'reset', + 'checkout' ]; // Register a tokens provider for the mermaid language From b34942355f94602ac9d50f737e6f29cb0b691a64 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 12:54:00 -0700 Subject: [PATCH 31/50] Requirement diagrams --- src/lib/components/editor/util.ts | 41 ++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 013fbc62..f56f3743 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -5,6 +5,15 @@ export const initEditor = (monacoEditor): void => { monacoEditor.languages.register({ id: 'mermaid' }); + const requirementDiagrams = [ + 'requirement', + 'functionalRequirement', + 'interfaceRequirement', + 'performanceRequirement', + 'physicalRequirement', + 'designConstraint' + ]; + const orientations = ['TB', 'TD', 'BT', 'RL', 'LR']; const typeKeywords = [ 'flowchart', @@ -19,7 +28,8 @@ export const initEditor = (monacoEditor): void => { 'gantt', 'gitGraph', 'journey', - 'info' + 'info', + 'requirementDiagram' ]; const blockKeywords = [ 'subgraph', @@ -33,8 +43,9 @@ export const initEditor = (monacoEditor): void => { 'else', 'end', 'state', - 'section' - ]; + 'section', + 'element' + ].concat(requirementDiagrams); const keywords = [ 'participant', 'as', @@ -212,6 +223,30 @@ export const initEditor = (monacoEditor): void => { insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, documentation: 'User-journey Section' }, + { + label: 'element', + kind: monacoEditor.languages.CompletionItemKind.Snippet, + insertText: ['element ${1:test_entity} {', '\t$0', '}'].join('\n'), + insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, + documentation: 'User-journey Section' + }, + ...requirementDiagrams.map((requirementDiagramType) => ({ + label: requirementDiagramType, + kind: monacoEditor.languages.CompletionItemKind.Snippet, + insertText: [ + requirementDiagramType + ' ${1:test_req} {', + '\tid: 1', + '\ttext: the test text.', + '\trisk: high', + '\tverifyMethod: test', + '}' + ].join('\n'), + insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, + documentation: requirementDiagramType + .split(/(?=[A-Z])/) + .map((part) => part[0].toUpperCase() + part.slice(1)) + .join(' ') + })), ...[...new Set([...orientations, ...typeKeywords, ...blockKeywords, ...keywords])].map( (keyword) => ({ label: keyword, From b8d4ada693146544e9ad09620dc1cfff9635f8e6 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 13:59:11 -0700 Subject: [PATCH 32/50] Directives highlighting --- src/lib/components/editor/editor.svelte | 7 +++---- src/lib/components/editor/util.ts | 3 +++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/lib/components/editor/editor.svelte b/src/lib/components/editor/editor.svelte index fd86bc54..065c0247 100644 --- a/src/lib/components/editor/editor.svelte +++ b/src/lib/components/editor/editor.svelte @@ -18,8 +18,7 @@ enabled: false }, theme: 'mermaidTheme', - overviewRulerLanes: 0, - autoClosingBrackets: 'always' + overviewRulerLanes: 0 }; export let errorMarkers: monaco.editor.IMarkerData[] = []; let oldText = text; @@ -39,7 +38,7 @@ let i = 0; while (i++ < 10) { try { - //@ts-ignore : This is a hack to handle a svelte-kit error when importing monaco. + // @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco. Monaco = monaco; return; } catch { @@ -50,7 +49,7 @@ }; onMount(async () => { try { - //@ts-ignore : This is a hack to handle a svelte-kit error when importing monaco. + // @ts-ignore : This is a hack to handle a svelte-kit error when importing monaco. Monaco = monaco; } catch { await loadMonaco(); // Fix https://github.com/mermaid-js/mermaid-live-editor/issues/175 diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index f56f3743..95f09545 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -101,6 +101,8 @@ export const initEditor = (monacoEditor): void => { ), tokenizer: { root: [ + [/%%(?=.*%%$)/, { token: 'string', nextEmbedded: 'json' }], + [/%%$/, { token: 'string', nextEmbedded: '@pop' }], [/-{1,2}\)|-{1,2}>>/, { cases: { '@noEatingSequenceArrows': 'transition' } }], [/\*--\*?|--\*/, 'transition'], [/(<\|?)(\.{2}|-{2})(\|?>)?|(\.{2}|-{2})(\|?>)/, 'transition'], @@ -144,6 +146,7 @@ export const initEditor = (monacoEditor): void => { { token: 'delimiter.bracket', foreground: '000000', fontStyle: 'bold' }, { token: 'html.entity/hex-color-code', foreground: 'f5b436' }, { token: 'annotation', foreground: '4b4b96' }, + { token: 'number', foreground: '4b4b96' }, { token: 'comment', foreground: '888c89' } ] }); From 13581856928550a16ac19557a034ee92649af7e2 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 22 Aug 2021 14:54:26 -0700 Subject: [PATCH 33/50] Gitgraph options --- src/lib/components/editor/util.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 95f09545..8a3acad1 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -44,7 +44,8 @@ export const initEditor = (monacoEditor): void => { 'end', 'state', 'section', - 'element' + 'element', + 'options' ].concat(requirementDiagrams); const keywords = [ 'participant', @@ -77,7 +78,6 @@ export const initEditor = (monacoEditor): void => { 'axisFormat', 'todayMarker', 'showData', - 'options', 'commit', 'branch', 'merge', @@ -110,6 +110,7 @@ export const initEditor = (monacoEditor): void => { [/[ox<]?(-{2,}|-+\.+-+|={2,})[ox>]?/, 'transition'], [/[-+>]+/, { cases: { '@eatingSequenceArrows': 'transition' } }], [':::', 'transition'], + ['option(?=s)', { token: 'typeKeyword', next: 'optionsGitGraph' }], [ /[a-z_$][\w$]*((?<=stateDiagram)-v2)?/, { @@ -129,6 +130,10 @@ export const initEditor = (monacoEditor): void => { [/#(?:[0-9a-fA-F]{3}){1,2}/, 'html.entity/hex-color-code'], [/<<.+>>/, 'annotation'], [/%%.*(? { insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, documentation: 'User-journey Section' }, + { + label: 'options', + kind: monacoEditor.languages.CompletionItemKind.Snippet, + insertText: ['options', '{', ' $0', '}', 'end'].join('\n'), + insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, + documentation: 'Git Graph Options' + }, ...requirementDiagrams.map((requirementDiagramType) => ({ label: requirementDiagramType, kind: monacoEditor.languages.CompletionItemKind.Snippet, From f612a5c7038893d383f0c63b4ec6efb85f24c773 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Aug 2021 13:02:43 +0000 Subject: [PATCH 34/50] chore(deps-dev): bump svelte from 3.42.2 to 3.42.3 Bumps [svelte](https://github.com/sveltejs/svelte) from 3.42.2 to 3.42.3. - [Release notes](https://github.com/sveltejs/svelte/releases) - [Changelog](https://github.com/sveltejs/svelte/blob/master/CHANGELOG.md) - [Commits](https://github.com/sveltejs/svelte/compare/v3.42.2...v3.42.3) --- updated-dependencies: - dependency-name: svelte dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 67060ea4..cffe2d60 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "postcss-load-config": "^3.1.0", "prettier": "~2.3.2", "prettier-plugin-svelte": "^2.3.1", - "svelte": "^3.42.2", + "svelte": "^3.42.3", "svelte-preprocess": "^4.7.4", "tailwindcss": "^2.2.7", "tslib": "^2.3.1", diff --git a/yarn.lock b/yarn.lock index 20dab5f9..5bf6c67a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5453,10 +5453,10 @@ svelte-preprocess@^4.7.4: detect-indent "^6.0.0" strip-indent "^3.0.0" -svelte@^3.42.2: - version "3.42.2" - resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.42.2.tgz#0246c175c820c1aeca07300c48573a15aae3c1e4" - integrity sha512-FOyNYKXb8wdE0Ot+Ctt2/OyDLsNBP8+V6PUE9ag6ZKeLslIou0LnMu1fhtWUA+HjzKTbAM1yj+4PFLtg/3pMJA== +svelte@^3.42.3: + version "3.42.3" + resolved "https://registry.yarnpkg.com/svelte/-/svelte-3.42.3.tgz#a7687a43ff6aa12263e03cf56219cd21eff5372d" + integrity sha512-pbdtdNZEx2GBqSM6XEgPoHbwtvWBwFLt/1bRmzsyXZO+i424wFnPe7O5B3GOJDPFSxPRztumAW3mL5LPzecWUg== svgo@^2.3.0: version "2.4.0" From bba0ae4ba16337ac5cdba87a35694c6642fc0dc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Aug 2021 13:02:53 +0000 Subject: [PATCH 35/50] chore(deps-dev): bump autoprefixer from 10.3.1 to 10.3.3 Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.3.1 to 10.3.3. - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/autoprefixer/compare/10.3.1...10.3.3) --- updated-dependencies: - dependency-name: autoprefixer dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 78 +++++++++++++++++++++------------------------------- 2 files changed, 32 insertions(+), 48 deletions(-) diff --git a/package.json b/package.json index 67060ea4..8d272518 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "@types/mermaid": "^8.2.7", "@typescript-eslint/eslint-plugin": "^4.29.2", "@typescript-eslint/parser": "^4.29.2", - "autoprefixer": "^10.3.1", + "autoprefixer": "^10.3.3", "chai": "^4.3.4", "cssnano": "^5.0.8", "cypress": "8.3.0", diff --git a/yarn.lock b/yarn.lock index 20dab5f9..73447f7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1032,14 +1032,14 @@ atob@^2.1.2: resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@^10.3.1: - version "10.3.1" - resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.1.tgz" - integrity sha512-L8AmtKzdiRyYg7BUXJTzigmhbQRCXFKz6SA1Lqo0+AR2FBbQ4aTAPFSDlOutnFkjhiz8my4agGXog1xlMjPJ6A== +autoprefixer@^10.3.3: + version "10.3.3" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.3.3.tgz#4bac89c74ef98e6a40fe1c5b76c0d1c91db153ce" + integrity sha512-yRzjxfnggrP/+qVHlUuZz5FZzEbkT+Yt0/Df6ScEMnbbZBLzYB2W0KLxoQCW+THm1SpOsM1ZPcTHAwuvmibIsQ== dependencies: - browserslist "^4.16.6" - caniuse-lite "^1.0.30001243" - colorette "^1.2.2" + browserslist "^4.16.8" + caniuse-lite "^1.0.30001252" + colorette "^1.3.0" fraction.js "^4.1.1" normalize-range "^0.1.2" postcss-value-parser "^4.1.0" @@ -1173,27 +1173,16 @@ browser-stdout@1.3.1: resolved "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== -browserslist@^4.0.0, browserslist@^4.16.0: - version "4.16.6" - resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz" - integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== +browserslist@^4.0.0, browserslist@^4.16.0, browserslist@^4.16.6, browserslist@^4.16.8: + version "4.16.8" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.8.tgz#cb868b0b554f137ba6e33de0ecff2eda403c4fb0" + integrity sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ== dependencies: - caniuse-lite "^1.0.30001219" - colorette "^1.2.2" - electron-to-chromium "^1.3.723" + caniuse-lite "^1.0.30001251" + colorette "^1.3.0" + electron-to-chromium "^1.3.811" escalade "^3.1.1" - node-releases "^1.1.71" - -browserslist@^4.16.6: - version "4.16.7" - resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz" - integrity sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA== - dependencies: - caniuse-lite "^1.0.30001248" - colorette "^1.2.2" - electron-to-chromium "^1.3.793" - escalade "^3.1.1" - node-releases "^1.1.73" + node-releases "^1.1.75" buffer-crc32@~0.2.3: version "0.2.13" @@ -1290,15 +1279,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001243: - version "1.0.30001248" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz" - integrity sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw== - -caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001248: - version "1.0.30001249" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz" - integrity sha512-vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001251, caniuse-lite@^1.0.30001252: + version "1.0.30001252" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz#cb16e4e3dafe948fc4a9bb3307aea054b912019a" + integrity sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw== caseless@~0.12.0: version "0.12.0" @@ -1523,10 +1507,10 @@ colord@^2.6: resolved "https://registry.yarnpkg.com/colord/-/colord-2.7.0.tgz#706ea36fe0cd651b585eb142fe64b6480185270e" integrity sha512-pZJBqsHz+pYyw3zpX6ZRXWoCHM1/cvFikY9TV8G3zcejCaKE0lhankoj8iScyrrePA8C7yJ5FStfA9zbcOnw7Q== -colorette@^1.2.2: - version "1.2.2" - resolved "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz" - integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== +colorette@^1.2.2, colorette@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af" + integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w== colors@^1.1.2: version "1.4.0" @@ -2295,10 +2279,10 @@ editorconfig@^0.15.3: semver "^5.6.0" sigmund "^1.0.1" -electron-to-chromium@^1.3.723, electron-to-chromium@^1.3.793: - version "1.3.796" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.796.tgz" - integrity sha512-agwJFgM0FUC1UPPbQ4aII3HamaaJ09fqWGAWYHmzxDWqdmTleCHyyA0kt3fJlTd5M440IaeuBfzXzXzCotnZcQ== +electron-to-chromium@^1.3.811: + version "1.3.820" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.820.tgz#3b2672b59ed17847ed19f1281547f37bbfda87bb" + integrity sha512-5cFwDmo2yzEA9hn55KZ9+cX/b6DSFvpKz8Hb2fiDmriXWB+DBoXKXmncQwNRFBBTlUdsvPHCoy594OoMLAO0Tg== emoji-regex@^8.0.0: version "8.0.0" @@ -4097,10 +4081,10 @@ node-modules-regexp@^1.0.0: resolved "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= -node-releases@^1.1.71, node-releases@^1.1.73: - version "1.1.73" - resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz" - integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg== +node-releases@^1.1.75: + version "1.1.75" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe" + integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw== nopt@~4.0.1: version "4.0.3" From 4238f1285c1eafb580cecd0fd2232492e1c96dce Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Aug 2021 13:03:40 +0000 Subject: [PATCH 36/50] chore(deps-dev): bump typescript from 4.3.5 to 4.4.2 Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.3.5 to 4.4.2. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v4.3.5...v4.4.2) --- updated-dependencies: - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 67060ea4..d366cae6 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "svelte-preprocess": "^4.7.4", "tailwindcss": "^2.2.7", "tslib": "^2.3.1", - "typescript": "^4.3.5" + "typescript": "^4.4.2" }, "type": "module", "dependencies": { diff --git a/yarn.lock b/yarn.lock index 20dab5f9..71f01357 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5667,10 +5667,10 @@ type-fest@^0.21.3: resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz" integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== -typescript@^4.3.5: - version "4.3.5" - resolved "https://registry.npmjs.org/typescript/-/typescript-4.3.5.tgz" - integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== +typescript@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.2.tgz#6d618640d430e3569a1dfb44f7d7e600ced3ee86" + integrity sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ== union-value@^1.0.0: version "1.0.1" From f2451808821cac42830caeeef3f660b5870b92ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 28 Aug 2021 04:01:27 +0000 Subject: [PATCH 37/50] chore(deps-dev): bump @typescript-eslint/eslint-plugin Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.29.2 to 4.29.3. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.29.3/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 4 +- yarn.lock | 138 +++++++++++++++++++++++++++++---------------------- 2 files changed, 80 insertions(+), 62 deletions(-) diff --git a/package.json b/package.json index bf2c49a6..3b3a86a8 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,9 @@ "@sveltejs/adapter-static": "1.0.0-next.17", "@sveltejs/kit": "1.0.0-next.147", "@types/mermaid": "^8.2.7", - "@typescript-eslint/eslint-plugin": "^4.29.2", + "@typescript-eslint/eslint-plugin": "^4.29.3", "@typescript-eslint/parser": "^4.29.2", - "autoprefixer": "^10.3.1", + "autoprefixer": "^10.3.3", "chai": "^4.3.4", "cssnano": "^5.0.8", "cypress": "8.3.0", diff --git a/yarn.lock b/yarn.lock index f4724c01..78fc0840 100644 --- a/yarn.lock +++ b/yarn.lock @@ -700,28 +700,28 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^4.29.2": - version "4.29.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz#f54dc0a32b8f61c6024ab8755da05363b733838d" - integrity sha512-x4EMgn4BTfVd9+Z+r+6rmWxoAzBaapt4QFqE+d8L8sUtYZYLDTK6VG/y/SMMWA5t1/BVU5Kf+20rX4PtWzUYZg== +"@typescript-eslint/eslint-plugin@^4.29.3": + version "4.29.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz#95cb8029a8bd8bd9c7f4ab95074a7cb2115adefa" + integrity sha512-tBgfA3K/3TsZY46ROGvoRxQr1wBkclbVqRQep97MjVHJzcRBURRY3sNFqLk0/Xr//BY5hM9H2p/kp+6qim85SA== dependencies: - "@typescript-eslint/experimental-utils" "4.29.2" - "@typescript-eslint/scope-manager" "4.29.2" + "@typescript-eslint/experimental-utils" "4.29.3" + "@typescript-eslint/scope-manager" "4.29.3" debug "^4.3.1" functional-red-black-tree "^1.0.1" regexpp "^3.1.0" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@4.29.2": - version "4.29.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz#5f67fb5c5757ef2cb3be64817468ba35c9d4e3b7" - integrity sha512-P6mn4pqObhftBBPAv4GQtEK7Yos1fz/MlpT7+YjH9fTxZcALbiiPKuSIfYP/j13CeOjfq8/fr9Thr2glM9ub7A== +"@typescript-eslint/experimental-utils@4.29.3": + version "4.29.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz#52e437a689ccdef73e83c5106b34240a706f15e1" + integrity sha512-ffIvbytTVWz+3keg+Sy94FG1QeOvmV9dP2YSdLFHw/ieLXWCa3U1TYu8IRCOpMv2/SPS8XqhM1+ou1YHsdzKrg== dependencies: "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.29.2" - "@typescript-eslint/types" "4.29.2" - "@typescript-eslint/typescript-estree" "4.29.2" + "@typescript-eslint/scope-manager" "4.29.3" + "@typescript-eslint/types" "4.29.3" + "@typescript-eslint/typescript-estree" "4.29.3" eslint-scope "^5.1.1" eslint-utils "^3.0.0" @@ -743,11 +743,24 @@ "@typescript-eslint/types" "4.29.2" "@typescript-eslint/visitor-keys" "4.29.2" +"@typescript-eslint/scope-manager@4.29.3": + version "4.29.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.3.tgz#497dec66f3a22e459f6e306cf14021e40ec86e19" + integrity sha512-x+w8BLXO7iWPkG5mEy9bA1iFRnk36p/goVlYobVWHyDw69YmaH9q6eA+Fgl7kYHmFvWlebUTUfhtIg4zbbl8PA== + dependencies: + "@typescript-eslint/types" "4.29.3" + "@typescript-eslint/visitor-keys" "4.29.3" + "@typescript-eslint/types@4.29.2": version "4.29.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.2.tgz#fc0489c6b89773f99109fb0aa0aaddff21f52fcd" integrity sha512-K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ== +"@typescript-eslint/types@4.29.3": + version "4.29.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.3.tgz#d7980c49aef643d0af8954c9f14f656b7fd16017" + integrity sha512-s1eV1lKNgoIYLAl1JUba8NhULmf+jOmmeFO1G5MN/RBCyyzg4TIOfIOICVNC06lor+Xmy4FypIIhFiJXOknhIg== + "@typescript-eslint/typescript-estree@4.29.2": version "4.29.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz#a0ea8b98b274adbb2577100ba545ddf8bf7dc219" @@ -761,6 +774,19 @@ semver "^7.3.5" tsutils "^3.21.0" +"@typescript-eslint/typescript-estree@4.29.3": + version "4.29.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz#1bafad610015c4ded35c85a70b6222faad598b40" + integrity sha512-45oQJA0bxna4O5TMwz55/TpgjX1YrAPOI/rb6kPgmdnemRZx/dB0rsx+Ku8jpDvqTxcE1C/qEbVHbS3h0hflag== + dependencies: + "@typescript-eslint/types" "4.29.3" + "@typescript-eslint/visitor-keys" "4.29.3" + debug "^4.3.1" + globby "^11.0.3" + is-glob "^4.0.1" + semver "^7.3.5" + tsutils "^3.21.0" + "@typescript-eslint/visitor-keys@4.29.2": version "4.29.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz#d2da7341f3519486f50655159f4e5ecdcb2cd1df" @@ -769,6 +795,14 @@ "@typescript-eslint/types" "4.29.2" eslint-visitor-keys "^2.0.0" +"@typescript-eslint/visitor-keys@4.29.3": + version "4.29.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz#c691760a00bd86bf8320d2a90a93d86d322f1abf" + integrity sha512-MGGfJvXT4asUTeVs0Q2m+sY63UsfnA+C/FDgBKV3itLBmM9H0u+URcneePtkd0at1YELmZK6HSolCqM4Fzs6yA== + dependencies: + "@typescript-eslint/types" "4.29.3" + eslint-visitor-keys "^2.0.0" + "@ungap/promise-all-settled@1.1.2": version "1.1.2" resolved "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz" @@ -1032,14 +1066,14 @@ atob@^2.1.2: resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== -autoprefixer@^10.3.1: - version "10.3.1" - resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.1.tgz" - integrity sha512-L8AmtKzdiRyYg7BUXJTzigmhbQRCXFKz6SA1Lqo0+AR2FBbQ4aTAPFSDlOutnFkjhiz8my4agGXog1xlMjPJ6A== +autoprefixer@^10.3.3: + version "10.3.3" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.3.3.tgz#4bac89c74ef98e6a40fe1c5b76c0d1c91db153ce" + integrity sha512-yRzjxfnggrP/+qVHlUuZz5FZzEbkT+Yt0/Df6ScEMnbbZBLzYB2W0KLxoQCW+THm1SpOsM1ZPcTHAwuvmibIsQ== dependencies: - browserslist "^4.16.6" - caniuse-lite "^1.0.30001243" - colorette "^1.2.2" + browserslist "^4.16.8" + caniuse-lite "^1.0.30001252" + colorette "^1.3.0" fraction.js "^4.1.1" normalize-range "^0.1.2" postcss-value-parser "^4.1.0" @@ -1173,27 +1207,16 @@ browser-stdout@1.3.1: resolved "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== -browserslist@^4.0.0, browserslist@^4.16.0: - version "4.16.6" - resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.16.6.tgz" - integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== +browserslist@^4.0.0, browserslist@^4.16.0, browserslist@^4.16.6, browserslist@^4.16.8: + version "4.16.8" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.8.tgz#cb868b0b554f137ba6e33de0ecff2eda403c4fb0" + integrity sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ== dependencies: - caniuse-lite "^1.0.30001219" - colorette "^1.2.2" - electron-to-chromium "^1.3.723" + caniuse-lite "^1.0.30001251" + colorette "^1.3.0" + electron-to-chromium "^1.3.811" escalade "^3.1.1" - node-releases "^1.1.71" - -browserslist@^4.16.6: - version "4.16.7" - resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz" - integrity sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA== - dependencies: - caniuse-lite "^1.0.30001248" - colorette "^1.2.2" - electron-to-chromium "^1.3.793" - escalade "^3.1.1" - node-releases "^1.1.73" + node-releases "^1.1.75" buffer-crc32@~0.2.3: version "0.2.13" @@ -1290,15 +1313,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001243: - version "1.0.30001248" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz" - integrity sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw== - -caniuse-lite@^1.0.30001219, caniuse-lite@^1.0.30001248: - version "1.0.30001249" - resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz" - integrity sha512-vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001251, caniuse-lite@^1.0.30001252: + version "1.0.30001252" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz#cb16e4e3dafe948fc4a9bb3307aea054b912019a" + integrity sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw== caseless@~0.12.0: version "0.12.0" @@ -1523,10 +1541,10 @@ colord@^2.6: resolved "https://registry.yarnpkg.com/colord/-/colord-2.7.0.tgz#706ea36fe0cd651b585eb142fe64b6480185270e" integrity sha512-pZJBqsHz+pYyw3zpX6ZRXWoCHM1/cvFikY9TV8G3zcejCaKE0lhankoj8iScyrrePA8C7yJ5FStfA9zbcOnw7Q== -colorette@^1.2.2: - version "1.2.2" - resolved "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz" - integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== +colorette@^1.2.2, colorette@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af" + integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w== colors@^1.1.2: version "1.4.0" @@ -2295,10 +2313,10 @@ editorconfig@^0.15.3: semver "^5.6.0" sigmund "^1.0.1" -electron-to-chromium@^1.3.723, electron-to-chromium@^1.3.793: - version "1.3.796" - resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.796.tgz" - integrity sha512-agwJFgM0FUC1UPPbQ4aII3HamaaJ09fqWGAWYHmzxDWqdmTleCHyyA0kt3fJlTd5M440IaeuBfzXzXzCotnZcQ== +electron-to-chromium@^1.3.811: + version "1.3.820" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.820.tgz#3b2672b59ed17847ed19f1281547f37bbfda87bb" + integrity sha512-5cFwDmo2yzEA9hn55KZ9+cX/b6DSFvpKz8Hb2fiDmriXWB+DBoXKXmncQwNRFBBTlUdsvPHCoy594OoMLAO0Tg== emoji-regex@^8.0.0: version "8.0.0" @@ -4097,10 +4115,10 @@ node-modules-regexp@^1.0.0: resolved "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz" integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= -node-releases@^1.1.71, node-releases@^1.1.73: - version "1.1.73" - resolved "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz" - integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg== +node-releases@^1.1.75: + version "1.1.75" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.75.tgz#6dd8c876b9897a1b8e5a02de26afa79bb54ebbfe" + integrity sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw== nopt@~4.0.1: version "4.0.3" From 7fc789ab0f83b511cc1c3452e8154a80748fde7f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 28 Aug 2021 04:01:45 +0000 Subject: [PATCH 38/50] chore(deps-dev): bump cypress from 8.3.0 to 8.3.1 Bumps [cypress](https://github.com/cypress-io/cypress) from 8.3.0 to 8.3.1. - [Release notes](https://github.com/cypress-io/cypress/releases) - [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js) - [Commits](https://github.com/cypress-io/cypress/compare/v8.3.0...v8.3.1) --- updated-dependencies: - dependency-name: cypress dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 26 +++++++++++++++----------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index de4fc1cc..64fc1d7d 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "autoprefixer": "^10.3.3", "chai": "^4.3.4", "cssnano": "^5.0.8", - "cypress": "8.3.0", + "cypress": "8.3.1", "cypress-localstorage-commands": "^1.5.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.1.0", diff --git a/yarn.lock b/yarn.lock index 1adf53c2..1deb1e2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -403,10 +403,10 @@ resolved "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz" integrity sha512-GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg== -"@cypress/request@^2.88.5": - version "2.88.5" - resolved "https://registry.npmjs.org/@cypress/request/-/request-2.88.5.tgz" - integrity sha512-TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA== +"@cypress/request@^2.88.6": + version "2.88.6" + resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.6.tgz#a970dd675befc6bdf8a8921576c01f51cc5798e9" + integrity sha512-z0UxBE/+qaESAHY9p9sM2h8Y4XqtsbDCt0/DPOrqA/RZgKi4PkxdpXyK4wCCnSk1xHqWHZZAE+gV6aDAR6+caQ== dependencies: aws-sign2 "~0.7.0" aws4 "^1.8.0" @@ -421,13 +421,12 @@ isstream "~0.1.2" json-stringify-safe "~5.0.1" mime-types "~2.1.19" - oauth-sign "~0.9.0" performance-now "^2.1.0" qs "~6.5.2" safe-buffer "^5.1.2" tough-cookie "~2.5.0" tunnel-agent "^0.6.0" - uuid "^3.3.2" + uuid "^8.3.2" "@cypress/snapshot@^2.1.7": version "2.1.7" @@ -1727,12 +1726,12 @@ cypress-localstorage-commands@^1.5.0: resolved "https://registry.npmjs.org/cypress-localstorage-commands/-/cypress-localstorage-commands-1.5.0.tgz" integrity sha512-gl1uKeviYdyJG4dLcZ9hfoUjLciwkkfbaQ3gvRtmipsPxC612ZBJhSjbunnJcUGwkryaM+82VrY9ij0tLSg7LA== -cypress@8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.3.0.tgz#ba906d2170888073ad94b2be1b994a749bbb7c7d" - integrity sha512-zA5Rcq8AZIfRfPXU0CCcauofF+YpaU9HYbfqkunFTmFV0Kdlo14tNjH2E3++MkjXKFnv3/pXq+HgxWtw8CSe8Q== +cypress@8.3.1: + version "8.3.1" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.3.1.tgz#c6760dbb907df2570b0e1ac235fa31c30f9260a6" + integrity sha512-1v6pfx+/5cXhaT5T6QKOvnkawmEHWHLiVzm3MYMoQN1fkX2Ma1C32STd3jBStE9qT5qPSTILjGzypVRxCBi40g== dependencies: - "@cypress/request" "^2.88.5" + "@cypress/request" "^2.88.6" "@cypress/xvfb" "^1.2.4" "@types/node" "^14.14.31" "@types/sinonjs__fake-timers" "^6.0.2" @@ -5738,6 +5737,11 @@ uuid@^3.0.0, uuid@^3.3.2: resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + v8-compile-cache@^2.0.3: version "2.3.0" resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz" From 980706b487a93d05d7c48f0e0e4e4abc20745144 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 28 Aug 2021 04:01:58 +0000 Subject: [PATCH 39/50] chore(deps-dev): bump svelte-preprocess from 4.7.4 to 4.8.0 Bumps [svelte-preprocess](https://github.com/sveltejs/svelte-preprocess) from 4.7.4 to 4.8.0. - [Release notes](https://github.com/sveltejs/svelte-preprocess/releases) - [Changelog](https://github.com/sveltejs/svelte-preprocess/blob/main/CHANGELOG.md) - [Commits](https://github.com/sveltejs/svelte-preprocess/compare/v4.7.4...v4.8.0) --- updated-dependencies: - dependency-name: svelte-preprocess dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index de4fc1cc..f52b712b 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "prettier": "~2.3.2", "prettier-plugin-svelte": "^2.3.1", "svelte": "^3.42.3", - "svelte-preprocess": "^4.7.4", + "svelte-preprocess": "^4.8.0", "tailwindcss": "^2.2.7", "tslib": "^2.3.1", "typescript": "^4.4.2" diff --git a/yarn.lock b/yarn.lock index 1adf53c2..50e78159 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5427,10 +5427,10 @@ svelte-hmr@^0.14.7: resolved "https://registry.npmjs.org/svelte-hmr/-/svelte-hmr-0.14.7.tgz" integrity sha512-pDrzgcWSoMaK6AJkBWkmgIsecW0GChxYZSZieIYfCP0v2oPyx2CYU/zm7TBIcjLVUPP714WxmViE9Thht4etog== -svelte-preprocess@^4.7.4: - version "4.7.4" - resolved "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.7.4.tgz" - integrity sha512-mDAmaltQl6e5zU2VEtoWEf7eLTfuOTGr9zt+BpA3AGHo8MIhKiNSPE9OLTCTOMgj0vj/uL9QBbaNmpG4G1CgIA== +svelte-preprocess@^4.8.0: + version "4.8.0" + resolved "https://registry.yarnpkg.com/svelte-preprocess/-/svelte-preprocess-4.8.0.tgz#fd3ebc19aae1b8a49ac9e30db1af572bf4619245" + integrity sha512-i9Z17cwGlp+kuSSv3kJWdAdAP2L26A5yMzHHdDj8YL+86sN64Yz5/gfjQp3Xb6fiaToo4sB+wTpid/23Gz0yvw== dependencies: "@types/pug" "^2.0.4" "@types/sass" "^1.16.0" From a49819e12086f0fa1ef2dd246138f3e365bbb13b Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 29 Aug 2021 11:56:49 -0700 Subject: [PATCH 40/50] Refactor syntax highlighting --- src/lib/components/editor/util.ts | 410 ++++++++++++++++++++++-------- 1 file changed, 308 insertions(+), 102 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 8a3acad1..64e04b1b 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -14,83 +14,125 @@ export const initEditor = (monacoEditor): void => { 'designConstraint' ]; - const orientations = ['TB', 'TD', 'BT', 'RL', 'LR']; - const typeKeywords = [ - 'flowchart', - 'graph', - 'stateDiagram-v2', - 'stateDiagram', - 'sequenceDiagram', - 'classDiagram', - 'pie', - 'erDiagram', - 'flowchart', - 'gantt', - 'gitGraph', - 'journey', - 'info', - 'requirementDiagram' - ]; - const blockKeywords = [ - 'subgraph', - 'rect', - 'opt', - 'class', - 'alt', - 'par', - 'and', - 'loop', - 'else', - 'end', - 'state', - 'section', - 'element', - 'options' - ].concat(requirementDiagrams); - const keywords = [ - 'participant', - 'as', - 'showInfo', - 'autonumber', - 'rgba', - 'rgb', - 'hsla', - 'hsl', - 'linkStyle', - 'style', - 'classDef', - 'direction', - 'activate', - 'deactivate', - 'cssClass', - 'link', - 'callback', - 'click', - 'class', - 'href', - 'call', - 'state', - 'note', - 'Note', - 'title', - 'excludes', - 'dateFormat', - 'axisFormat', - 'todayMarker', - 'showData', - 'commit', - 'branch', - 'merge', - 'reset', - 'checkout' - ]; + const keywords: { + [key: string]: { + typeKeywords: string[]; + blockKeywords: string[]; + keywords: string[]; + }; + } = { + flowchart: { + typeKeywords: ['flowchart', 'flowchart-v2', 'graph'], + blockKeywords: ['subgraph', 'end'], + keywords: [ + 'TB', + 'TD', + 'BT', + 'RL', + 'LR', + 'click', + 'call', + 'href', + '_self', + '_blank', + '_parent', + '_top', + 'linkStyle', + 'style', + 'classDef', + 'class', + 'direction', + 'interpolate' + ] + }, + sequenceDiagram: { + typeKeywords: ['sequenceDiagram'], + blockKeywords: ['alt', 'par', 'and', 'loop', 'else', 'end', 'rect', 'opt', 'alt', 'rect'], + keywords: [ + 'participant', + 'as', + 'Note', + 'note', + 'right of', + 'left of', + 'over', + 'activate', + 'deactivate', + 'autonumber', + 'title' + ] + }, + classDiagram: { + typeKeywords: ['classDiagram', 'classDiagram-v2'], + blockKeywords: ['class'], + keywords: [ + 'link', + 'click', + 'callback', + 'call', + 'href', + 'cssClass', + 'direction', + 'TB', + 'BT', + 'RL', + 'LR' + ] + }, + stateDiagram: { + typeKeywords: ['stateDiagram', 'stateDiagram-v2'], + blockKeywords: ['state', 'note', 'end'], + keywords: ['state', 'as', 'hide empty description', 'direction', 'TB', 'BT', 'RL', 'LR'] + }, + erDiagram: { + typeKeywords: ['erDiagram'], + blockKeywords: [], + keywords: [] + }, + journey: { + typeKeywords: ['journey'], + blockKeywords: ['section'], + keywords: ['title'] + }, + info: { + typeKeywords: ['info'], + blockKeywords: [], + keywords: ['showInfo'] + }, + gantt: { + typeKeywords: ['gantt'], + blockKeywords: [], + keywords: ['title', 'dateFormat', 'axisFormat', 'todayMarker', 'section'] + }, + requirementDiagram: { + typeKeywords: ['requirement', 'requirementDiagram'], + blockKeywords: requirementDiagrams.concat('element'), + keywords: [] + }, + gitGraph: { + typeKeywords: ['gitGraph'], + blockKeywords: [], + keywords: ['commit', 'branch', 'merge', 'reset', 'checkout', 'LR', 'BT'] + }, + pie: { + typeKeywords: ['pie'], + blockKeywords: [], + keywords: ['title', 'showData'] + } + }; // Register a tokens provider for the mermaid language monacoEditor.languages.setMonarchTokensProvider('mermaid', { - typeKeywords, - blockKeywords, - keywords, - orientation: orientations, + ...Object.entries(keywords) + .map((entry) => + Object.fromEntries( + Object.entries(entry[1]).map((deepEntry) => [ + entry[0] + deepEntry[0][0].toUpperCase() + deepEntry[0].slice(1), + deepEntry[1] + ]) + ) + ) + .reduce((overallKeywords, nextKeyword) => ({ ...overallKeywords, ...nextKeyword }), {}), noEatingSequenceArrows: ['-)', '--)', '->>', '-->>'].reduce( (accumalator, arrow) => accumalator.concat(arrow, arrow + '+', arrow + '-'), [] @@ -103,37 +145,194 @@ export const initEditor = (monacoEditor): void => { root: [ [/%%(?=.*%%$)/, { token: 'string', nextEmbedded: 'json' }], [/%%$/, { token: 'string', nextEmbedded: '@pop' }], - [/-{1,2}\)|-{1,2}>>/, { cases: { '@noEatingSequenceArrows': 'transition' } }], - [/\*--\*?|--\*/, 'transition'], - [/(<\|?)(\.{2}|-{2})(\|?>)?|(\.{2}|-{2})(\|?>)/, 'transition'], - [/(\|o|\|\||}o|}\|)(-{2}|\.{2})(o\||\|\||o\{|\|\{)/, 'transition'], - [/[ox<]?(-{2,}|-+\.+-+|={2,})[ox>]?/, 'transition'], - [/[-+>]+/, { cases: { '@eatingSequenceArrows': 'transition' } }], - [':::', 'transition'], + [/^\s*gitGraph/m, { token: 'typeKeyword', next: 'gitGraph' }], + [/^\s*info/m, { token: 'typeKeyword', next: 'info' }], + [/^\s*pie/m, { token: 'typeKeyword', next: 'pie' }], + [/^\s*(flowchart|flowchart-v2|graph)/m, { token: 'typeKeyword', next: 'flowchart' }], + [/^\s*sequenceDiagram/, { token: 'typeKeyword', next: 'sequenceDiagram' }], + [/^\s*classDiagram(-v2)?/, { token: 'typeKeyword', next: 'classDiagram' }], + [/^\s*journey/, { token: 'typeKeyword', next: 'journey' }], + [/^\s*gantt/, { token: 'typeKeyword', next: 'gantt' }], + [/^\s*stateDiagram(-v2)?/, { token: 'typeKeyword', next: 'stateDiagram' }], + [/^\s*erDiagram/, { token: 'typeKeyword', next: 'erDiagram' }], + [/^\s*requirement(Diagram)?/, { token: 'typeKeyword', next: 'requirementDiagram' }], + [/%%.*(?|]+.+?[)\]}|]+/, 'string'], - [/[{}&]/, 'delimiter.bracket'], - [/".*"/, 'string'], - [/#(\d|[a-zA-Z])*;/, 'html.entity/hex-color-code'], - [/#(?:[0-9a-fA-F]{3}){1,2}/, 'html.entity/hex-color-code'], - [/<<.+>>/, 'annotation'], - [/%%.*(?]+[^\]|[]+?\]+/, 'string'], + [/{+.+?}+/, 'string'], + [/\(+.+?\)+/, 'string'], + [/-\.+->?/, 'transition'], + [/(-[-.])([^-]+?)(-{3,}|-{2,}>|\.-+>)/, ['transition', 'string', 'transition']], + [/(==+)([^=]+?)(={3,}|={2,}>)/, ['transition', 'string', 'transition']], + [/|===+|---+/, 'transition'], + [/:::/, 'transition'], + [/[;&]/, 'delimiter.bracket'], + [/".*?"/, 'string'], + [/%%.*(??>|--?[)x])[+-]?/, 'transition'], + [/(:)([^:\n]*?$)/, ['delimiter.bracket', 'string']], + [/%%.*(?|o)?/, 'transition'], + [/^\s*class\s(?!.*\{)/, 'keyword'], + [ + /[a-zA-Z_$][\w$]*/, + { + cases: { + '@classDiagramBlockKeywords': 'typeKeyword', + '@classDiagramKeywords': 'keyword' + } + } + ], + [/%%.*(?>/, 'annotation'], + [/".*?"/, 'string'], + [/:::/, 'transition'] + ], + journey: [ + [/(title)(.*)/, ['keyword', 'string']], + [/(section)(.*)/, ['typeKeyword', 'string']], + [ + /[a-zA-Z_$][\w$]*/, + { + cases: { + '@journeyBlockKeywords': 'typeKeyword', + '@journeyKeywords': 'keyword' + } + } + ], + [ + /(^\s*.+?)(:)(.*?)(:)(.*?)$/, + ['string', 'delimiter.bracket', 'number', 'delimiter.bracket', null] + ], + [/(^\s*.+?)(:)([^:]*?)$/, ['string', 'delimiter.bracket', null]], + [/%%.*(?>/, 'annotation'], + [/\[\[(fork|join|choice)]]/, 'annotation'], + [ + /[a-zA-Z_$][\w$]*/, + { + cases: { + '@stateDiagramBlockKeywords': 'typeKeyword', + '@stateDiagramKeywords': 'keyword' + } + } + ], + [/".*?"/, 'string'], + [/(:)([^:\n]*?$)/, ['delimiter.bracket', 'string']], + [/%%.*(?/, 'transition'] + ], + stateDiagramNote: [ + [/^\s*end note$/, { token: 'typeKeyword', next: '@pop' }], + [/.*/, 'string'] + ], + erDiagram: [ + [/(\|o|\|\||\}o|\}\|)(--|\.\.)(o\||\|\||o\{|\|\{)/, 'transition'], + [/".*?"/, 'string'], + [/:/, 'delimiter.bracket'] + ], + requirementDiagram: [ + [ + /[a-zA-Z_$][\w$]*/, + { + cases: { + '@requirementDiagramBlockKeywords': 'typeKeyword' + } + } + ], + [/{|}/, 'delimiter.bracket'], + [/->|<-|-/, 'transition'], + [/".*?"/, 'string'] ] }, whitespace: [[/[ \t\r\n]+/, 'white']] @@ -149,7 +348,6 @@ export const initEditor = (monacoEditor): void => { { token: 'string', foreground: 'AA8500' }, { token: 'transition', foreground: '008800', fontStyle: 'bold' }, { token: 'delimiter.bracket', foreground: '000000', fontStyle: 'bold' }, - { token: 'html.entity/hex-color-code', foreground: 'f5b436' }, { token: 'annotation', foreground: '4b4b96' }, { token: 'number', foreground: '4b4b96' }, { token: 'comment', foreground: '888c89' } @@ -262,13 +460,21 @@ export const initEditor = (monacoEditor): void => { .map((part) => part[0].toUpperCase() + part.slice(1)) .join(' ') })), - ...[...new Set([...orientations, ...typeKeywords, ...blockKeywords, ...keywords])].map( - (keyword) => ({ - label: keyword, - kind: monacoEditor.languages.CompletionItemKind.Keyword, - insertText: keyword - }) - ) + ...[ + ...new Set( + Object.values(keywords) + .map((diagramKeywords) => + Object.entries(diagramKeywords) + .filter((keywordType) => keywordType[0] !== 'annotations') + .map((entry) => entry[1]) + ) + .flat(2) + ) + ].map((keyword) => ({ + label: keyword, + kind: monacoEditor.languages.CompletionItemKind.Keyword, + insertText: keyword + })) ]; return { suggestions: suggestions }; } From 65a1fa72a0004ca57fc40ee835d3308f77d0dc81 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 29 Aug 2021 12:44:36 -0700 Subject: [PATCH 41/50] Remove unneccessary groups --- src/lib/components/editor/util.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 64e04b1b..3ede9ff9 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -133,14 +133,6 @@ export const initEditor = (monacoEditor): void => { ) ) .reduce((overallKeywords, nextKeyword) => ({ ...overallKeywords, ...nextKeyword }), {}), - noEatingSequenceArrows: ['-)', '--)', '->>', '-->>'].reduce( - (accumalator, arrow) => accumalator.concat(arrow, arrow + '+', arrow + '-'), - [] - ), - eatingSequenceArrows: ['->', '-x'].reduce( - (accumalator, arrow) => accumalator.concat(arrow, arrow + '+', arrow + '-'), - [] - ), tokenizer: { root: [ [/%%(?=.*%%$)/, { token: 'string', nextEmbedded: 'json' }], From 51c9488d0e72754d9ca8ae73f253ef13344b6f29 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 29 Aug 2021 12:46:21 -0700 Subject: [PATCH 42/50] colons are brackets in class diagrams --- src/lib/components/editor/util.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 3ede9ff9..a942974e 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -249,7 +249,8 @@ export const initEditor = (monacoEditor): void => { [/%%.*(?>/, 'annotation'], [/".*?"/, 'string'], - [/:::/, 'transition'] + [/:::/, 'transition'], + [/:/, 'delimiter.bracket'] ], journey: [ [/(title)(.*)/, ['keyword', 'string']], From 4bdb5a0750b4716f8ee3faf02c53396ebe8f04ec Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 29 Aug 2021 19:34:21 -0700 Subject: [PATCH 43/50] Add variables, types, and multiple refactors and fixes --- src/lib/components/editor/util.ts | 135 +++++++++++++++++++----------- 1 file changed, 88 insertions(+), 47 deletions(-) diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index a942974e..466d994a 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -102,7 +102,15 @@ export const initEditor = (monacoEditor): void => { gantt: { typeKeywords: ['gantt'], blockKeywords: [], - keywords: ['title', 'dateFormat', 'axisFormat', 'todayMarker', 'section'] + keywords: [ + 'title', + 'dateFormat', + 'axisFormat', + 'todayMarker', + 'section', + 'excludes', + 'inclusiveEndDates' + ] }, requirementDiagram: { typeKeywords: ['requirement', 'requirementDiagram'], @@ -137,23 +145,24 @@ export const initEditor = (monacoEditor): void => { root: [ [/%%(?=.*%%$)/, { token: 'string', nextEmbedded: 'json' }], [/%%$/, { token: 'string', nextEmbedded: '@pop' }], - [/^\s*gitGraph/m, { token: 'typeKeyword', next: 'gitGraph' }], - [/^\s*info/m, { token: 'typeKeyword', next: 'info' }], - [/^\s*pie/m, { token: 'typeKeyword', next: 'pie' }], - [/^\s*(flowchart|flowchart-v2|graph)/m, { token: 'typeKeyword', next: 'flowchart' }], - [/^\s*sequenceDiagram/, { token: 'typeKeyword', next: 'sequenceDiagram' }], - [/^\s*classDiagram(-v2)?/, { token: 'typeKeyword', next: 'classDiagram' }], - [/^\s*journey/, { token: 'typeKeyword', next: 'journey' }], - [/^\s*gantt/, { token: 'typeKeyword', next: 'gantt' }], - [/^\s*stateDiagram(-v2)?/, { token: 'typeKeyword', next: 'stateDiagram' }], - [/^\s*erDiagram/, { token: 'typeKeyword', next: 'erDiagram' }], - [/^\s*requirement(Diagram)?/, { token: 'typeKeyword', next: 'requirementDiagram' }], + [/^\s*gitGraph/m, 'typeKeyword', 'gitGraph'], + [/^\s*info/m, 'typeKeyword', 'info'], + [/^\s*pie/m, 'typeKeyword', 'pie'], + [/^\s*(flowchart|flowchart-v2|graph)/m, 'typeKeyword', 'flowchart'], + [/^\s*sequenceDiagram/, 'typeKeyword', 'sequenceDiagram'], + [/^\s*classDiagram(-v2)?/, 'typeKeyword', 'classDiagram'], + [/^\s*journey/, 'typeKeyword', 'journey'], + [/^\s*gantt/, 'typeKeyword', 'gantt'], + [/^\s*stateDiagram(-v2)?/, 'typeKeyword', 'stateDiagram'], + [/^\s*erDiagram/, 'typeKeyword', 'erDiagram'], + [/^\s*requirement(Diagram)?/, 'typeKeyword', 'requirementDiagram'], [/%%.*(? { } ], [/%%.*(? { ], info: [ [ - /[a-zA-Z_$][\w$]*/, + /[a-zA-Z][\w$]*/, { cases: { '@infoBlockKeywords': 'typeKeyword', @@ -182,7 +192,7 @@ export const initEditor = (monacoEditor): void => { pie: [ [/(title)(.*$)/, ['keyword', 'string']], [ - /[a-zA-Z_$][\w$]*/, + /[a-zA-Z][\w$]*/, { cases: { '@pieBlockKeywords': 'typeKeyword', @@ -198,11 +208,12 @@ export const initEditor = (monacoEditor): void => { flowchart: [ [/[ox]?(--+|==+)[ox]/, 'transition'], [ - /[a-zA-Z_$][\w$]*/, + /[a-zA-Z][\w$]*/, { cases: { '@flowchartBlockKeywords': 'typeKeyword', - '@flowchartKeywords': 'keyword' + '@flowchartKeywords': 'keyword', + '@default': 'variable' } } ], @@ -212,7 +223,7 @@ export const initEditor = (monacoEditor): void => { [/{+.+?}+/, 'string'], [/\(+.+?\)+/, 'string'], [/-\.+->?/, 'transition'], - [/(-[-.])([^-]+?)(-{3,}|-{2,}>|\.-+>)/, ['transition', 'string', 'transition']], + [/(-[-.])([^->]+?)(-{3,}|-{2,}>|\.-+>)/, ['transition', 'string', 'transition']], [/(==+)([^=]+?)(={3,}|={2,}>)/, ['transition', 'string', 'transition']], [/|===+|---+/, 'transition'], [/:::/, 'transition'], @@ -222,11 +233,12 @@ export const initEditor = (monacoEditor): void => { ], sequenceDiagram: [ [ - /[a-zA-Z_$][\w$]*/, + /[a-zA-Z][\w$]*/, { cases: { '@sequenceDiagramBlockKeywords': 'typeKeyword', - '@sequenceDiagramKeywords': 'keyword' + '@sequenceDiagramKeywords': 'keyword', + '@default': 'variable' } } ], @@ -235,47 +247,58 @@ export const initEditor = (monacoEditor): void => { [/%%.*(?|o)?/, 'transition'], [/^\s*class\s(?!.*\{)/, 'keyword'], [ - /[a-zA-Z_$][\w$]*/, + /[a-zA-Z][\w$]*/, { cases: { '@classDiagramBlockKeywords': 'typeKeyword', - '@classDiagramKeywords': 'keyword' + '@classDiagramKeywords': 'keyword', + '@default': 'variable' } } ], [/%%.*(?>/, 'annotation'], + [/(<<)(.+?)(>>)/, ['delimiter.bracket', 'annotation', 'delimiter.bracket']], [/".*?"/, 'string'], [/:::/, 'transition'], - [/:/, 'delimiter.bracket'] + [/:|\+|-|#|~|\*\s*$|\$\s*$|\(|\)|{|}/, 'delimiter.bracket'] ], journey: [ [/(title)(.*)/, ['keyword', 'string']], [/(section)(.*)/, ['typeKeyword', 'string']], [ - /[a-zA-Z_$][\w$]*/, + /[a-zA-Z][\w$]*/, { cases: { '@journeyBlockKeywords': 'typeKeyword', - '@journeyKeywords': 'keyword' + '@journeyKeywords': 'keyword', + '@default': 'variable' } } ], [ - /(^\s*.+?)(:)(.*?)(:)(.*?)$/, - ['string', 'delimiter.bracket', 'number', 'delimiter.bracket', null] + /(^\s*.+?)(:)(.*?)(:)(.*?)([,$])/, + [ + 'string', + 'delimiter.bracket', + 'number', + 'delimiter.bracket', + 'variable', + 'delimiter.bracket' + ] ], - [/(^\s*.+?)(:)([^:]*?)$/, ['string', 'delimiter.bracket', null]], + [/,/, 'delimiter.bracket'], + [/(^\s*.+?)(:)([^:]*?)$/, ['string', 'delimiter.bracket', 'variable']], [/%%.*(? { } ], [/(^\s*.*?)(:)/, ['string', 'delimiter.bracket']], - [/%%.*(?>/, 'annotation'], - [/\[\[(fork|join|choice)]]/, 'annotation'], + [/(<<)(fork|join|choice)(>>)/, 'annotation'], + [/(\[\[)(fork|join|choice)(]])/, ['delimiter.bracket', 'annotation', 'delimiter.bracket']], [ - /[a-zA-Z_$][\w$]*/, + /[a-zA-Z][\w$]*/, { cases: { '@stateDiagramBlockKeywords': 'typeKeyword', - '@stateDiagramKeywords': 'keyword' + '@stateDiagramKeywords': 'keyword', + '@default': 'variable' } } ], [/".*?"/, 'string'], [/(:)([^:\n]*?$)/, ['delimiter.bracket', 'string']], + [/{|}/, 'delimiter.bracket'], [/%%.*(?/, 'transition'] + [/-->/, 'transition'], + [/\[.*?]/, 'string'] ], stateDiagramNote: [ [/^\s*end note$/, { token: 'typeKeyword', next: '@pop' }], [/.*/, 'string'] ], erDiagram: [ - [/(\|o|\|\||\}o|\}\|)(--|\.\.)(o\||\|\||o\{|\|\{)/, 'transition'], + [/[}|][o|](--|\.\.)[o|][{|]/, 'transition'], [/".*?"/, 'string'], - [/:/, 'delimiter.bracket'] + [/(:)(.*?$)/, ['delimiter.bracket', 'string']], + [/:|{|}/, 'delimiter.bracket'], + [/([a-zA-Z]+)(\s+[a-zA-Z]+)/, ['type', 'variable']], + [/[a-zA-Z_-][\w$]*/, 'variable'] ], requirementDiagram: [ + [/->|<-|-/, 'transition'], + [/(\d+\.)*\d+/, 'number'], [ - /[a-zA-Z_$][\w$]*/, + /[a-zA-Z_-][\w$]*/, { cases: { - '@requirementDiagramBlockKeywords': 'typeKeyword' + '@requirementDiagramBlockKeywords': 'typeKeyword', + '@default': 'variable' } } ], - [/{|}/, 'delimiter.bracket'], - [/->|<-|-/, 'transition'], + [/:|{|}|\//, 'delimiter.bracket'], [/".*?"/, 'string'] ] - }, - whitespace: [[/[ \t\r\n]+/, 'white']] + } }); monacoEditor.editor.defineTheme('mermaidTheme', { @@ -343,7 +375,9 @@ export const initEditor = (monacoEditor): void => { { token: 'delimiter.bracket', foreground: '000000', fontStyle: 'bold' }, { token: 'annotation', foreground: '4b4b96' }, { token: 'number', foreground: '4b4b96' }, - { token: 'comment', foreground: '888c89' } + { token: 'comment', foreground: '888c89' }, + { token: 'variable', foreground: 'A22889' }, + { token: 'type', foreground: '2BDEA8' } ] }); @@ -394,6 +428,13 @@ export const initEditor = (monacoEditor): void => { insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, documentation: 'Background Color' }, + { + label: 'subgraph', + kind: monacoEditor.languages.CompletionItemKind.Snippet, + insertText: ['subgraph ${1:title}', '\t$0', 'end'].join('\n'), + insertTextRules: monacoEditor.languages.CompletionItemInsertTextRule.InsertAsSnippet, + documentation: 'Subgraph' + }, { label: 'class', kind: monacoEditor.languages.CompletionItemKind.Snippet, From 5bcb495569c8d86c89fbd96436626a7951c6a998 Mon Sep 17 00:00:00 2001 From: Yash-Singh1 Date: Sun, 29 Aug 2021 19:42:27 -0700 Subject: [PATCH 44/50] Comment support --- cypress/snapshots.js | 2 +- src/lib/components/editor/util.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cypress/snapshots.js b/cypress/snapshots.js index b11755db..8651cd02 100644 --- a/cypress/snapshots.js +++ b/cypress/snapshots.js @@ -16,7 +16,7 @@ module.exports = { "1": "{\"code\":\"graph TD\\n A[Party] -->|Get money| B(Go shopping!!)\\n \",\"mermaid\":\"{\\n \\\"theme\\\": \\\"forest\\\",\\n \\\"test\\\": \\\"hello world\\\"\\n}\",\"updateEditor\":false,\"autoSync\":true,\"updateDiagram\":true,\"loader\":{\"type\":\"files\",\"config\":{\"codeURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/code.mmd\",\"configURL\":\"https://gist.githubusercontent.com/sidharthv96/6268a23e673a533dcb198f241fd7012a/raw/4eb03887e6a41397e80bdcdbf94017c498f8f1e2/config.json\"}}}" } }, - "__version": "8.1.0", + "__version": "8.3.0", "Auto sync tests": { "should dim diagram when code is edited": { "1": "{\"code\":\"graph TD\\n A[Christmas] -->|Get money| B(Go shopping)\\n B --> C{Let me think}\\n C -->|One| D[Laptop]\\n C -->|Two| E[iPhone]\\n C -->|Three| F[fa:fa-car Car]\\n C --> Test\",\"mermaid\":\"{\\n \\\"theme\\\": \\\"default\\\"\\n}\",\"updateEditor\":false,\"autoSync\":false,\"updateDiagram\":false}" diff --git a/src/lib/components/editor/util.ts b/src/lib/components/editor/util.ts index 466d994a..ef9d348a 100644 --- a/src/lib/components/editor/util.ts +++ b/src/lib/components/editor/util.ts @@ -343,6 +343,7 @@ export const initEditor = (monacoEditor): void => { [/(:)(.*?$)/, ['delimiter.bracket', 'string']], [/:|{|}/, 'delimiter.bracket'], [/([a-zA-Z]+)(\s+[a-zA-Z]+)/, ['type', 'variable']], + [/%%.*(? { } ], [/:|{|}|\//, 'delimiter.bracket'], + [/%%.*(? Date: Wed, 1 Sep 2021 04:39:37 +0000 Subject: [PATCH 45/50] chore(deps-dev): bump husky from 7.0.1 to 7.0.2 Bumps [husky](https://github.com/typicode/husky) from 7.0.1 to 7.0.2. - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v7.0.1...v7.0.2) --- updated-dependencies: - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 6 ++--- yarn.lock | 76 +++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 58 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index de4fc1cc..abe6d794 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@sveltejs/adapter-static": "1.0.0-next.17", "@sveltejs/kit": "1.0.0-next.147", "@types/mermaid": "^8.2.7", - "@typescript-eslint/eslint-plugin": "^4.29.2", + "@typescript-eslint/eslint-plugin": "^4.29.3", "@typescript-eslint/parser": "^4.29.2", "autoprefixer": "^10.3.3", "chai": "^4.3.4", @@ -32,7 +32,7 @@ "eslint-plugin-postcss-modules": "^1.2.1", "eslint-plugin-svelte3": "^3.2.0", "eslint-plugin-tailwindcss": "^1.14.3", - "husky": "^7.0.1", + "husky": "^7.0.2", "lint-staged": "^11.1.2", "mocha": "^9.1.0", "postcss": "^8.3.6", @@ -40,7 +40,7 @@ "prettier": "~2.3.2", "prettier-plugin-svelte": "^2.3.1", "svelte": "^3.42.3", - "svelte-preprocess": "^4.7.4", + "svelte-preprocess": "^4.8.0", "tailwindcss": "^2.2.7", "tslib": "^2.3.1", "typescript": "^4.4.2" diff --git a/yarn.lock b/yarn.lock index 1adf53c2..ebb7e83b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -700,28 +700,28 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^4.29.2": - version "4.29.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz#f54dc0a32b8f61c6024ab8755da05363b733838d" - integrity sha512-x4EMgn4BTfVd9+Z+r+6rmWxoAzBaapt4QFqE+d8L8sUtYZYLDTK6VG/y/SMMWA5t1/BVU5Kf+20rX4PtWzUYZg== +"@typescript-eslint/eslint-plugin@^4.29.3": + version "4.29.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz#95cb8029a8bd8bd9c7f4ab95074a7cb2115adefa" + integrity sha512-tBgfA3K/3TsZY46ROGvoRxQr1wBkclbVqRQep97MjVHJzcRBURRY3sNFqLk0/Xr//BY5hM9H2p/kp+6qim85SA== dependencies: - "@typescript-eslint/experimental-utils" "4.29.2" - "@typescript-eslint/scope-manager" "4.29.2" + "@typescript-eslint/experimental-utils" "4.29.3" + "@typescript-eslint/scope-manager" "4.29.3" debug "^4.3.1" functional-red-black-tree "^1.0.1" regexpp "^3.1.0" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@4.29.2": - version "4.29.2" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz#5f67fb5c5757ef2cb3be64817468ba35c9d4e3b7" - integrity sha512-P6mn4pqObhftBBPAv4GQtEK7Yos1fz/MlpT7+YjH9fTxZcALbiiPKuSIfYP/j13CeOjfq8/fr9Thr2glM9ub7A== +"@typescript-eslint/experimental-utils@4.29.3": + version "4.29.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz#52e437a689ccdef73e83c5106b34240a706f15e1" + integrity sha512-ffIvbytTVWz+3keg+Sy94FG1QeOvmV9dP2YSdLFHw/ieLXWCa3U1TYu8IRCOpMv2/SPS8XqhM1+ou1YHsdzKrg== dependencies: "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.29.2" - "@typescript-eslint/types" "4.29.2" - "@typescript-eslint/typescript-estree" "4.29.2" + "@typescript-eslint/scope-manager" "4.29.3" + "@typescript-eslint/types" "4.29.3" + "@typescript-eslint/typescript-estree" "4.29.3" eslint-scope "^5.1.1" eslint-utils "^3.0.0" @@ -743,11 +743,24 @@ "@typescript-eslint/types" "4.29.2" "@typescript-eslint/visitor-keys" "4.29.2" +"@typescript-eslint/scope-manager@4.29.3": + version "4.29.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.3.tgz#497dec66f3a22e459f6e306cf14021e40ec86e19" + integrity sha512-x+w8BLXO7iWPkG5mEy9bA1iFRnk36p/goVlYobVWHyDw69YmaH9q6eA+Fgl7kYHmFvWlebUTUfhtIg4zbbl8PA== + dependencies: + "@typescript-eslint/types" "4.29.3" + "@typescript-eslint/visitor-keys" "4.29.3" + "@typescript-eslint/types@4.29.2": version "4.29.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.2.tgz#fc0489c6b89773f99109fb0aa0aaddff21f52fcd" integrity sha512-K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ== +"@typescript-eslint/types@4.29.3": + version "4.29.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.3.tgz#d7980c49aef643d0af8954c9f14f656b7fd16017" + integrity sha512-s1eV1lKNgoIYLAl1JUba8NhULmf+jOmmeFO1G5MN/RBCyyzg4TIOfIOICVNC06lor+Xmy4FypIIhFiJXOknhIg== + "@typescript-eslint/typescript-estree@4.29.2": version "4.29.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz#a0ea8b98b274adbb2577100ba545ddf8bf7dc219" @@ -761,6 +774,19 @@ semver "^7.3.5" tsutils "^3.21.0" +"@typescript-eslint/typescript-estree@4.29.3": + version "4.29.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz#1bafad610015c4ded35c85a70b6222faad598b40" + integrity sha512-45oQJA0bxna4O5TMwz55/TpgjX1YrAPOI/rb6kPgmdnemRZx/dB0rsx+Ku8jpDvqTxcE1C/qEbVHbS3h0hflag== + dependencies: + "@typescript-eslint/types" "4.29.3" + "@typescript-eslint/visitor-keys" "4.29.3" + debug "^4.3.1" + globby "^11.0.3" + is-glob "^4.0.1" + semver "^7.3.5" + tsutils "^3.21.0" + "@typescript-eslint/visitor-keys@4.29.2": version "4.29.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz#d2da7341f3519486f50655159f4e5ecdcb2cd1df" @@ -769,6 +795,14 @@ "@typescript-eslint/types" "4.29.2" eslint-visitor-keys "^2.0.0" +"@typescript-eslint/visitor-keys@4.29.3": + version "4.29.3" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz#c691760a00bd86bf8320d2a90a93d86d322f1abf" + integrity sha512-MGGfJvXT4asUTeVs0Q2m+sY63UsfnA+C/FDgBKV3itLBmM9H0u+URcneePtkd0at1YELmZK6HSolCqM4Fzs6yA== + dependencies: + "@typescript-eslint/types" "4.29.3" + eslint-visitor-keys "^2.0.0" + "@ungap/promise-all-settled@1.1.2": version "1.1.2" resolved "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz" @@ -3078,10 +3112,10 @@ human-signals@^2.1.0: resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== -husky@^7.0.1: - version "7.0.1" - resolved "https://registry.npmjs.org/husky/-/husky-7.0.1.tgz" - integrity sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA== +husky@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.2.tgz#21900da0f30199acca43a46c043c4ad84ae88dff" + integrity sha512-8yKEWNX4z2YsofXAMT7KvA1g8p+GxtB1ffV8XtpAEGuXNAbCV5wdNKH+qTpw8SM9fh4aMPDR+yQuKfgnreyZlg== iconv-lite@0.4, iconv-lite@^0.4.24: version "0.4.24" @@ -5427,10 +5461,10 @@ svelte-hmr@^0.14.7: resolved "https://registry.npmjs.org/svelte-hmr/-/svelte-hmr-0.14.7.tgz" integrity sha512-pDrzgcWSoMaK6AJkBWkmgIsecW0GChxYZSZieIYfCP0v2oPyx2CYU/zm7TBIcjLVUPP714WxmViE9Thht4etog== -svelte-preprocess@^4.7.4: - version "4.7.4" - resolved "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.7.4.tgz" - integrity sha512-mDAmaltQl6e5zU2VEtoWEf7eLTfuOTGr9zt+BpA3AGHo8MIhKiNSPE9OLTCTOMgj0vj/uL9QBbaNmpG4G1CgIA== +svelte-preprocess@^4.8.0: + version "4.8.0" + resolved "https://registry.yarnpkg.com/svelte-preprocess/-/svelte-preprocess-4.8.0.tgz#fd3ebc19aae1b8a49ac9e30db1af572bf4619245" + integrity sha512-i9Z17cwGlp+kuSSv3kJWdAdAP2L26A5yMzHHdDj8YL+86sN64Yz5/gfjQp3Xb6fiaToo4sB+wTpid/23Gz0yvw== dependencies: "@types/pug" "^2.0.4" "@types/sass" "^1.16.0" From 2c0d7db7cc8443127ffb3b4b8473c2f0aafe4ee9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 06:11:54 +0000 Subject: [PATCH 46/50] chore(deps-dev): bump mocha from 9.1.0 to 9.1.1 Bumps [mocha](https://github.com/mochajs/mocha) from 9.1.0 to 9.1.1. - [Release notes](https://github.com/mochajs/mocha/releases) - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md) - [Commits](https://github.com/mochajs/mocha/compare/v9.1.0...v9.1.1) --- updated-dependencies: - dependency-name: mocha dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 6 +++--- yarn.lock | 42 +++++++++++++++++++++++------------------- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/package.json b/package.json index d0c89602..2beb01f9 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "autoprefixer": "^10.3.3", "chai": "^4.3.4", "cssnano": "^5.0.8", - "cypress": "8.3.0", + "cypress": "8.3.1", "cypress-localstorage-commands": "^1.5.0", "eslint": "^7.32.0", "eslint-config-prettier": "^8.1.0", @@ -32,9 +32,9 @@ "eslint-plugin-postcss-modules": "^1.2.1", "eslint-plugin-svelte3": "^3.2.0", "eslint-plugin-tailwindcss": "^1.14.3", - "husky": "^7.0.1", + "husky": "^7.0.2", "lint-staged": "^11.1.2", - "mocha": "^9.1.0", + "mocha": "^9.1.1", "postcss": "^8.3.6", "postcss-load-config": "^3.1.0", "prettier": "~2.3.2", diff --git a/yarn.lock b/yarn.lock index 4d00f29b..8c1d404f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -403,10 +403,10 @@ resolved "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-3.1.0.tgz" integrity sha512-GcIY79elgB+azP74j8vqkiXz8xLFfIzbQJdlwOPisgbKT00tviJQuEghOXSMVxJ00HoYJbGswr4kcllUc4xCcg== -"@cypress/request@^2.88.5": - version "2.88.5" - resolved "https://registry.npmjs.org/@cypress/request/-/request-2.88.5.tgz" - integrity sha512-TzEC1XMi1hJkywWpRfD2clreTa/Z+lOrXDCxxBTBPEcY5azdPi56A6Xw+O4tWJnaJH3iIE7G5aDXZC6JgRZLcA== +"@cypress/request@^2.88.6": + version "2.88.6" + resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.6.tgz#a970dd675befc6bdf8a8921576c01f51cc5798e9" + integrity sha512-z0UxBE/+qaESAHY9p9sM2h8Y4XqtsbDCt0/DPOrqA/RZgKi4PkxdpXyK4wCCnSk1xHqWHZZAE+gV6aDAR6+caQ== dependencies: aws-sign2 "~0.7.0" aws4 "^1.8.0" @@ -421,13 +421,12 @@ isstream "~0.1.2" json-stringify-safe "~5.0.1" mime-types "~2.1.19" - oauth-sign "~0.9.0" performance-now "^2.1.0" qs "~6.5.2" safe-buffer "^5.1.2" tough-cookie "~2.5.0" tunnel-agent "^0.6.0" - uuid "^3.3.2" + uuid "^8.3.2" "@cypress/snapshot@^2.1.7": version "2.1.7" @@ -1761,12 +1760,12 @@ cypress-localstorage-commands@^1.5.0: resolved "https://registry.npmjs.org/cypress-localstorage-commands/-/cypress-localstorage-commands-1.5.0.tgz" integrity sha512-gl1uKeviYdyJG4dLcZ9hfoUjLciwkkfbaQ3gvRtmipsPxC612ZBJhSjbunnJcUGwkryaM+82VrY9ij0tLSg7LA== -cypress@8.3.0: - version "8.3.0" - resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.3.0.tgz#ba906d2170888073ad94b2be1b994a749bbb7c7d" - integrity sha512-zA5Rcq8AZIfRfPXU0CCcauofF+YpaU9HYbfqkunFTmFV0Kdlo14tNjH2E3++MkjXKFnv3/pXq+HgxWtw8CSe8Q== +cypress@8.3.1: + version "8.3.1" + resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.3.1.tgz#c6760dbb907df2570b0e1ac235fa31c30f9260a6" + integrity sha512-1v6pfx+/5cXhaT5T6QKOvnkawmEHWHLiVzm3MYMoQN1fkX2Ma1C32STd3jBStE9qT5qPSTILjGzypVRxCBi40g== dependencies: - "@cypress/request" "^2.88.5" + "@cypress/request" "^2.88.6" "@cypress/xvfb" "^1.2.4" "@types/node" "^14.14.31" "@types/sinonjs__fake-timers" "^6.0.2" @@ -3112,10 +3111,10 @@ human-signals@^2.1.0: resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz" integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== -husky@^7.0.1: - version "7.0.1" - resolved "https://registry.npmjs.org/husky/-/husky-7.0.1.tgz" - integrity sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA== +husky@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.2.tgz#21900da0f30199acca43a46c043c4ad84ae88dff" + integrity sha512-8yKEWNX4z2YsofXAMT7KvA1g8p+GxtB1ffV8XtpAEGuXNAbCV5wdNKH+qTpw8SM9fh4aMPDR+yQuKfgnreyZlg== iconv-lite@0.4, iconv-lite@^0.4.24: version "0.4.24" @@ -3983,10 +3982,10 @@ mkdirp@~0.5.1: dependencies: minimist "^1.2.5" -mocha@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.0.tgz#0a7aa6fc4f59d1015d4e11747d9104b752553c67" - integrity sha512-Kjg/XxYOFFUi0h/FwMOeb6RoroiZ+P1yOfya6NK7h3dNhahrJx1r2XIT3ge4ZQvJM86mdjNA+W5phqRQh7DwCg== +mocha@^9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.1.tgz#33df2eb9c6262434630510c5f4283b36efda9b61" + integrity sha512-0wE74YMgOkCgBUj8VyIDwmLUjTsS13WV1Pg7l0SHea2qzZzlq7MDnfbPsHKcELBRk3+izEVkRofjmClpycudCA== dependencies: "@ungap/promise-all-settled" "1.1.2" ansi-colors "4.1.1" @@ -5772,6 +5771,11 @@ uuid@^3.0.0, uuid@^3.3.2: resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +uuid@^8.3.2: + version "8.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" + integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== + v8-compile-cache@^2.0.3: version "2.3.0" resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz" From 7ad1c2098cfa90b38379c6460303e1cafe58cb95 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Sep 2021 06:15:36 +0000 Subject: [PATCH 47/50] chore(deps-dev): bump @typescript-eslint/eslint-plugin Bumps [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) from 4.29.3 to 4.30.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.30.0/packages/eslint-plugin) --- updated-dependencies: - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 68 ++++++++++++++++++++++++++-------------------------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/package.json b/package.json index 60d6169c..3f14cb31 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@sveltejs/adapter-static": "1.0.0-next.17", "@sveltejs/kit": "1.0.0-next.147", "@types/mermaid": "^8.2.7", - "@typescript-eslint/eslint-plugin": "^4.29.3", + "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.29.2", "autoprefixer": "^10.3.3", "chai": "^4.3.4", diff --git a/yarn.lock b/yarn.lock index cb561b8c..fa270158 100644 --- a/yarn.lock +++ b/yarn.lock @@ -699,28 +699,28 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz#95cb8029a8bd8bd9c7f4ab95074a7cb2115adefa" - integrity sha512-tBgfA3K/3TsZY46ROGvoRxQr1wBkclbVqRQep97MjVHJzcRBURRY3sNFqLk0/Xr//BY5hM9H2p/kp+6qim85SA== +"@typescript-eslint/eslint-plugin@^4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz#4a0c1ae96b953f4e67435e20248d812bfa55e4fb" + integrity sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g== dependencies: - "@typescript-eslint/experimental-utils" "4.29.3" - "@typescript-eslint/scope-manager" "4.29.3" + "@typescript-eslint/experimental-utils" "4.30.0" + "@typescript-eslint/scope-manager" "4.30.0" debug "^4.3.1" functional-red-black-tree "^1.0.1" regexpp "^3.1.0" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz#52e437a689ccdef73e83c5106b34240a706f15e1" - integrity sha512-ffIvbytTVWz+3keg+Sy94FG1QeOvmV9dP2YSdLFHw/ieLXWCa3U1TYu8IRCOpMv2/SPS8XqhM1+ou1YHsdzKrg== +"@typescript-eslint/experimental-utils@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz#9e49704fef568432ae16fc0d6685c13d67db0fd5" + integrity sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw== dependencies: "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.29.3" - "@typescript-eslint/types" "4.29.3" - "@typescript-eslint/typescript-estree" "4.29.3" + "@typescript-eslint/scope-manager" "4.30.0" + "@typescript-eslint/types" "4.30.0" + "@typescript-eslint/typescript-estree" "4.30.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" @@ -742,23 +742,23 @@ "@typescript-eslint/types" "4.29.2" "@typescript-eslint/visitor-keys" "4.29.2" -"@typescript-eslint/scope-manager@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.3.tgz#497dec66f3a22e459f6e306cf14021e40ec86e19" - integrity sha512-x+w8BLXO7iWPkG5mEy9bA1iFRnk36p/goVlYobVWHyDw69YmaH9q6eA+Fgl7kYHmFvWlebUTUfhtIg4zbbl8PA== +"@typescript-eslint/scope-manager@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz#1a3ffbb385b1a06be85cd5165a22324f069a85ee" + integrity sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A== dependencies: - "@typescript-eslint/types" "4.29.3" - "@typescript-eslint/visitor-keys" "4.29.3" + "@typescript-eslint/types" "4.30.0" + "@typescript-eslint/visitor-keys" "4.30.0" "@typescript-eslint/types@4.29.2": version "4.29.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.2.tgz#fc0489c6b89773f99109fb0aa0aaddff21f52fcd" integrity sha512-K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ== -"@typescript-eslint/types@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.3.tgz#d7980c49aef643d0af8954c9f14f656b7fd16017" - integrity sha512-s1eV1lKNgoIYLAl1JUba8NhULmf+jOmmeFO1G5MN/RBCyyzg4TIOfIOICVNC06lor+Xmy4FypIIhFiJXOknhIg== +"@typescript-eslint/types@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.30.0.tgz#fb9d9b0358426f18687fba82eb0b0f869780204f" + integrity sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw== "@typescript-eslint/typescript-estree@4.29.2": version "4.29.2" @@ -773,13 +773,13 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz#1bafad610015c4ded35c85a70b6222faad598b40" - integrity sha512-45oQJA0bxna4O5TMwz55/TpgjX1YrAPOI/rb6kPgmdnemRZx/dB0rsx+Ku8jpDvqTxcE1C/qEbVHbS3h0hflag== +"@typescript-eslint/typescript-estree@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz#ae57833da72a753f4846cd3053758c771670c2ac" + integrity sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg== dependencies: - "@typescript-eslint/types" "4.29.3" - "@typescript-eslint/visitor-keys" "4.29.3" + "@typescript-eslint/types" "4.30.0" + "@typescript-eslint/visitor-keys" "4.30.0" debug "^4.3.1" globby "^11.0.3" is-glob "^4.0.1" @@ -794,12 +794,12 @@ "@typescript-eslint/types" "4.29.2" eslint-visitor-keys "^2.0.0" -"@typescript-eslint/visitor-keys@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz#c691760a00bd86bf8320d2a90a93d86d322f1abf" - integrity sha512-MGGfJvXT4asUTeVs0Q2m+sY63UsfnA+C/FDgBKV3itLBmM9H0u+URcneePtkd0at1YELmZK6HSolCqM4Fzs6yA== +"@typescript-eslint/visitor-keys@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz#a47c6272fc71b0c627d1691f68eaecf4ad71445e" + integrity sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw== dependencies: - "@typescript-eslint/types" "4.29.3" + "@typescript-eslint/types" "4.30.0" eslint-visitor-keys "^2.0.0" "@ungap/promise-all-settled@1.1.2": From 015e112e6b6e77b30b5e4d5d7a68e889226ff24b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Sep 2021 03:56:24 +0000 Subject: [PATCH 48/50] chore(deps-dev): bump prettier-plugin-svelte from 2.3.1 to 2.4.0 Bumps [prettier-plugin-svelte](https://github.com/sveltejs/prettier-plugin-svelte) from 2.3.1 to 2.4.0. - [Release notes](https://github.com/sveltejs/prettier-plugin-svelte/releases) - [Changelog](https://github.com/sveltejs/prettier-plugin-svelte/blob/master/CHANGELOG.md) - [Commits](https://github.com/sveltejs/prettier-plugin-svelte/compare/v2.3.1...v2.4.0) --- updated-dependencies: - dependency-name: prettier-plugin-svelte dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package.json | 6 ++-- yarn.lock | 84 ++++++++++++++++++++++++++-------------------------- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/package.json b/package.json index 60d6169c..0c87b259 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@sveltejs/adapter-static": "1.0.0-next.17", "@sveltejs/kit": "1.0.0-next.147", "@types/mermaid": "^8.2.7", - "@typescript-eslint/eslint-plugin": "^4.29.3", + "@typescript-eslint/eslint-plugin": "^4.30.0", "@typescript-eslint/parser": "^4.29.2", "autoprefixer": "^10.3.3", "chai": "^4.3.4", @@ -34,11 +34,11 @@ "eslint-plugin-tailwindcss": "^1.14.3", "husky": "^7.0.2", "lint-staged": "^11.1.2", - "mocha": "^9.1.0", + "mocha": "^9.1.1", "postcss": "^8.3.6", "postcss-load-config": "^3.1.0", "prettier": "~2.3.2", - "prettier-plugin-svelte": "^2.3.1", + "prettier-plugin-svelte": "^2.4.0", "svelte": "^3.42.3", "svelte-preprocess": "^4.8.0", "tailwindcss": "^2.2.7", diff --git a/yarn.lock b/yarn.lock index cb561b8c..2b00bc3e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -699,28 +699,28 @@ dependencies: "@types/node" "*" -"@typescript-eslint/eslint-plugin@^4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.3.tgz#95cb8029a8bd8bd9c7f4ab95074a7cb2115adefa" - integrity sha512-tBgfA3K/3TsZY46ROGvoRxQr1wBkclbVqRQep97MjVHJzcRBURRY3sNFqLk0/Xr//BY5hM9H2p/kp+6qim85SA== +"@typescript-eslint/eslint-plugin@^4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.30.0.tgz#4a0c1ae96b953f4e67435e20248d812bfa55e4fb" + integrity sha512-NgAnqk55RQ/SD+tZFD9aPwNSeHmDHHe5rtUyhIq0ZeCWZEvo4DK9rYz7v9HDuQZFvn320Ot+AikaCKMFKLlD0g== dependencies: - "@typescript-eslint/experimental-utils" "4.29.3" - "@typescript-eslint/scope-manager" "4.29.3" + "@typescript-eslint/experimental-utils" "4.30.0" + "@typescript-eslint/scope-manager" "4.30.0" debug "^4.3.1" functional-red-black-tree "^1.0.1" regexpp "^3.1.0" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.3.tgz#52e437a689ccdef73e83c5106b34240a706f15e1" - integrity sha512-ffIvbytTVWz+3keg+Sy94FG1QeOvmV9dP2YSdLFHw/ieLXWCa3U1TYu8IRCOpMv2/SPS8XqhM1+ou1YHsdzKrg== +"@typescript-eslint/experimental-utils@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.30.0.tgz#9e49704fef568432ae16fc0d6685c13d67db0fd5" + integrity sha512-K8RNIX9GnBsv5v4TjtwkKtqMSzYpjqAQg/oSphtxf3xxdt6T0owqnpojztjjTcatSteH3hLj3t/kklKx87NPqw== dependencies: "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.29.3" - "@typescript-eslint/types" "4.29.3" - "@typescript-eslint/typescript-estree" "4.29.3" + "@typescript-eslint/scope-manager" "4.30.0" + "@typescript-eslint/types" "4.30.0" + "@typescript-eslint/typescript-estree" "4.30.0" eslint-scope "^5.1.1" eslint-utils "^3.0.0" @@ -742,23 +742,23 @@ "@typescript-eslint/types" "4.29.2" "@typescript-eslint/visitor-keys" "4.29.2" -"@typescript-eslint/scope-manager@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.3.tgz#497dec66f3a22e459f6e306cf14021e40ec86e19" - integrity sha512-x+w8BLXO7iWPkG5mEy9bA1iFRnk36p/goVlYobVWHyDw69YmaH9q6eA+Fgl7kYHmFvWlebUTUfhtIg4zbbl8PA== +"@typescript-eslint/scope-manager@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.30.0.tgz#1a3ffbb385b1a06be85cd5165a22324f069a85ee" + integrity sha512-VJ/jAXovxNh7rIXCQbYhkyV2Y3Ac/0cVHP/FruTJSAUUm4Oacmn/nkN5zfWmWFEanN4ggP0vJSHOeajtHq3f8A== dependencies: - "@typescript-eslint/types" "4.29.3" - "@typescript-eslint/visitor-keys" "4.29.3" + "@typescript-eslint/types" "4.30.0" + "@typescript-eslint/visitor-keys" "4.30.0" "@typescript-eslint/types@4.29.2": version "4.29.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.2.tgz#fc0489c6b89773f99109fb0aa0aaddff21f52fcd" integrity sha512-K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ== -"@typescript-eslint/types@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.3.tgz#d7980c49aef643d0af8954c9f14f656b7fd16017" - integrity sha512-s1eV1lKNgoIYLAl1JUba8NhULmf+jOmmeFO1G5MN/RBCyyzg4TIOfIOICVNC06lor+Xmy4FypIIhFiJXOknhIg== +"@typescript-eslint/types@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.30.0.tgz#fb9d9b0358426f18687fba82eb0b0f869780204f" + integrity sha512-YKldqbNU9K4WpTNwBqtAerQKLLW/X2A/j4yw92e3ZJYLx+BpKLeheyzoPfzIXHfM8BXfoleTdiYwpsvVPvHrDw== "@typescript-eslint/typescript-estree@4.29.2": version "4.29.2" @@ -773,13 +773,13 @@ semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/typescript-estree@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.3.tgz#1bafad610015c4ded35c85a70b6222faad598b40" - integrity sha512-45oQJA0bxna4O5TMwz55/TpgjX1YrAPOI/rb6kPgmdnemRZx/dB0rsx+Ku8jpDvqTxcE1C/qEbVHbS3h0hflag== +"@typescript-eslint/typescript-estree@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.30.0.tgz#ae57833da72a753f4846cd3053758c771670c2ac" + integrity sha512-6WN7UFYvykr/U0Qgy4kz48iGPWILvYL34xXJxvDQeiRE018B7POspNRVtAZscWntEPZpFCx4hcz/XBT+erenfg== dependencies: - "@typescript-eslint/types" "4.29.3" - "@typescript-eslint/visitor-keys" "4.29.3" + "@typescript-eslint/types" "4.30.0" + "@typescript-eslint/visitor-keys" "4.30.0" debug "^4.3.1" globby "^11.0.3" is-glob "^4.0.1" @@ -794,12 +794,12 @@ "@typescript-eslint/types" "4.29.2" eslint-visitor-keys "^2.0.0" -"@typescript-eslint/visitor-keys@4.29.3": - version "4.29.3" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.3.tgz#c691760a00bd86bf8320d2a90a93d86d322f1abf" - integrity sha512-MGGfJvXT4asUTeVs0Q2m+sY63UsfnA+C/FDgBKV3itLBmM9H0u+URcneePtkd0at1YELmZK6HSolCqM4Fzs6yA== +"@typescript-eslint/visitor-keys@4.30.0": + version "4.30.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.30.0.tgz#a47c6272fc71b0c627d1691f68eaecf4ad71445e" + integrity sha512-pNaaxDt/Ol/+JZwzP7MqWc8PJQTUhZwoee/PVlQ+iYoYhagccvoHnC9e4l+C/krQYYkENxznhVSDwClIbZVxRw== dependencies: - "@typescript-eslint/types" "4.29.3" + "@typescript-eslint/types" "4.30.0" eslint-visitor-keys "^2.0.0" "@ungap/promise-all-settled@1.1.2": @@ -3982,10 +3982,10 @@ mkdirp@~0.5.1: dependencies: minimist "^1.2.5" -mocha@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.0.tgz#0a7aa6fc4f59d1015d4e11747d9104b752553c67" - integrity sha512-Kjg/XxYOFFUi0h/FwMOeb6RoroiZ+P1yOfya6NK7h3dNhahrJx1r2XIT3ge4ZQvJM86mdjNA+W5phqRQh7DwCg== +mocha@^9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-9.1.1.tgz#33df2eb9c6262434630510c5f4283b36efda9b61" + integrity sha512-0wE74YMgOkCgBUj8VyIDwmLUjTsS13WV1Pg7l0SHea2qzZzlq7MDnfbPsHKcELBRk3+izEVkRofjmClpycudCA== dependencies: "@ungap/promise-all-settled" "1.1.2" ansi-colors "4.1.1" @@ -4743,10 +4743,10 @@ prelude-ls@^1.2.1: resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz" integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== -prettier-plugin-svelte@^2.3.1: - version "2.3.1" - resolved "https://registry.npmjs.org/prettier-plugin-svelte/-/prettier-plugin-svelte-2.3.1.tgz" - integrity sha512-F1/r6OYoBq8Zgurhs1MN25tdrhPw0JW5JjioPRqpxbYdmrZ3gY/DzHGs0B6zwd4DLyRsfGB2gqhxUCbHt/D1fw== +prettier-plugin-svelte@^2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/prettier-plugin-svelte/-/prettier-plugin-svelte-2.4.0.tgz#482bb6003bf1d5bd7ff002261a42a32b87d42d00" + integrity sha512-JwJ9bOz4XHLQtiLnX4mTSSDUdhu12WH8sTwy/XTDCSyPlah6IcV7NWeYBZscPEcceu2YnW8Y9sJCP40Z2UH9GA== prettier@~2.3.2: version "2.3.2" From 8b398363537b08e24e69d8e799d827a5deef0413 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 3 Sep 2021 03:59:20 +0000 Subject: [PATCH 49/50] chore(deps-dev): bump tailwindcss from 2.2.7 to 2.2.9 Bumps [tailwindcss](https://github.com/tailwindlabs/tailwindcss) from 2.2.7 to 2.2.9. - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/master/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v2.2.7...v2.2.9) --- updated-dependencies: - dependency-name: tailwindcss dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 85 +++++++++++++++++++++++++--------------------------- 2 files changed, 41 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index ee97412c..7a7eed2d 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "prettier-plugin-svelte": "^2.3.1", "svelte": "^3.42.3", "svelte-preprocess": "^4.8.0", - "tailwindcss": "^2.2.7", + "tailwindcss": "^2.2.9", "tslib": "^2.3.1", "typescript": "^4.4.2" }, diff --git a/yarn.lock b/yarn.lock index 441e3054..7c5b02eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -969,10 +969,10 @@ arch@^2.2.0: resolved "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz" integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== -arg@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/arg/-/arg-5.0.0.tgz" - integrity sha512-4P8Zm2H+BRS+c/xX1LrHw0qKpEhdlZjLCgWy+d78T9vqa2Z2SiD2wMrYuWIAFy5IZUD7nnNXroRttz+0RzlrzQ== +arg@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" + integrity sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA== argparse@^1.0.7: version "1.0.10" @@ -1354,7 +1354,7 @@ chalk@^2.0.0, chalk@^2.4.2: escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -1490,7 +1490,7 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0, color-convert@^1.9.3: +color-convert@^1.9.0: version "1.9.3" resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -1522,12 +1522,12 @@ color-string@^1.6.0: color-name "^1.0.0" simple-swizzle "^0.2.2" -color@^3.2.0: - version "3.2.1" - resolved "https://registry.npmjs.org/color/-/color-3.2.1.tgz" - integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== +color@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/color/-/color-4.0.1.tgz#21df44cd10245a91b1ccf5ba031609b0e10e7d67" + integrity sha512-rpZjOKN5O7naJxkH2Rx1sZzzBgaiWECc6BYXjeCE6kF0kcASJYbUq02u7JqIHwCb/j3NhV+QhRL2683aICeGZA== dependencies: - color-convert "^1.9.3" + color-convert "^2.0.1" color-string "^1.6.0" colord@^2.0.1: @@ -1632,10 +1632,10 @@ cosmiconfig@^5.0.0: js-yaml "^3.13.1" parse-json "^4.0.0" -cosmiconfig@^7.0.0: - version "7.0.0" - resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.0.tgz" - integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA== +cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" + integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== dependencies: "@types/parse-json" "^4.0.0" import-fresh "^3.2.1" @@ -2942,10 +2942,10 @@ glob-parent@^5.1.2, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob-parent@^6.0.0: - version "6.0.0" - resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.0.tgz" - integrity sha512-Hdd4287VEJcZXUwv1l8a+vXC1GjOQqXe+VS30w/ypihpcnu9M1n3xeYeJu5CBpeEQj2nAab2xxz28GuA3vp4Ww== +glob-parent@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.1.tgz#42054f685eb6a44e7a7d189a96efa40a54971aa7" + integrity sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog== dependencies: is-glob "^4.0.1" @@ -3790,11 +3790,6 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "^3.0.0" -lodash.toarray@^4.4.0: - version "4.4.0" - resolved "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz" - integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE= - lodash.topath@^4.5.2: version "4.5.2" resolved "https://registry.npmjs.org/lodash.topath/-/lodash.topath-4.5.2.tgz" @@ -4102,12 +4097,12 @@ node-dir@^0.1.17: dependencies: minimatch "^3.0.2" -node-emoji@^1.8.1: - version "1.10.0" - resolved "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz" - integrity sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw== +node-emoji@^1.11.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/node-emoji/-/node-emoji-1.11.0.tgz#69a0150e6946e2f115e9d7ea4df7971e2628301c" + integrity sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A== dependencies: - lodash.toarray "^4.4.0" + lodash "^4.17.21" node-modules-regexp@^1.0.0: version "1.0.0" @@ -4587,12 +4582,12 @@ postcss-modules-values@^3.0.0: icss-utils "^4.0.0" postcss "^7.0.6" -postcss-nested@5.0.5: - version "5.0.5" - resolved "https://registry.npmjs.org/postcss-nested/-/postcss-nested-5.0.5.tgz" - integrity sha512-GSRXYz5bccobpTzLQZXOnSOfKl6TwVr5CyAQJUPub4nuRJSOECK5AqurxVgmtxP48p0Kc/ndY/YyS1yqldX0Ew== +postcss-nested@5.0.6: + version "5.0.6" + resolved "https://registry.yarnpkg.com/postcss-nested/-/postcss-nested-5.0.6.tgz#466343f7fc8d3d46af3e7dba3fcd47d052a945bc" + integrity sha512-rKqm2Fk0KbA8Vt3AdGN0FB9OBOMDVajMG6ZCf/GoHgdxUJ4sBFp0A/uMIRm+MJUdo33YXEtjqIz8u7DAp8B7DA== dependencies: - postcss-selector-parser "^6.0.4" + postcss-selector-parser "^6.0.6" postcss-normalize-charset@^5.0.1: version "5.0.1" @@ -5500,34 +5495,34 @@ table@^6.0.9: string-width "^4.2.0" strip-ansi "^6.0.0" -tailwindcss@^2.1.2, tailwindcss@^2.2.7: - version "2.2.7" - resolved "https://registry.npmjs.org/tailwindcss/-/tailwindcss-2.2.7.tgz" - integrity sha512-jv35rugP5j8PpzbXnsria7ZAry7Evh0KtQ4MZqNd+PhF+oIKPwJTVwe/rmfRx9cZw3W7iPZyzBmeoAoNwfJ1yg== +tailwindcss@^2.1.2, tailwindcss@^2.2.9: + version "2.2.9" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-2.2.9.tgz#1484bd45a4a9f9f5de7faabf74c11bf0aeb5ad98" + integrity sha512-P8zCKFkEthfUvqcnun8DqGGXw4QqyDw971NAM23e8QQ+m5HW1agp4upq50rFGwGNtphVYvr+0zvVLSXo5/I9Qg== dependencies: - arg "^5.0.0" + arg "^5.0.1" bytes "^3.0.0" - chalk "^4.1.1" + chalk "^4.1.2" chokidar "^3.5.2" - color "^3.2.0" - cosmiconfig "^7.0.0" + color "^4.0.1" + cosmiconfig "^7.0.1" detective "^5.2.0" didyoumean "^1.2.2" dlv "^1.1.3" fast-glob "^3.2.7" fs-extra "^10.0.0" - glob-parent "^6.0.0" + glob-parent "^6.0.1" html-tags "^3.1.0" is-glob "^4.0.1" lodash "^4.17.21" lodash.topath "^4.5.2" modern-normalize "^1.1.0" - node-emoji "^1.8.1" + node-emoji "^1.11.0" normalize-path "^3.0.0" object-hash "^2.2.0" postcss-js "^3.0.3" postcss-load-config "^3.1.0" - postcss-nested "5.0.5" + postcss-nested "5.0.6" postcss-selector-parser "^6.0.6" postcss-value-parser "^4.1.0" pretty-hrtime "^1.0.3" From 5a307c354741691c3a55b849b8257e1a8a6596e4 Mon Sep 17 00:00:00 2001 From: Sidharth Vinod Date: Fri, 3 Sep 2021 09:34:04 +0530 Subject: [PATCH 50/50] update --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ee97412c..974f1764 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@sveltejs/kit": "1.0.0-next.147", "@types/mermaid": "^8.2.7", "@typescript-eslint/eslint-plugin": "^4.30.0", - "@typescript-eslint/parser": "^4.29.2", + "@typescript-eslint/parser": "^4.30.0", "autoprefixer": "^10.3.3", "chai": "^4.3.4", "cssnano": "^5.0.8",