From 93d462e028472df25d140f99e632c5635bd7a911 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 13:59:55 -0700 Subject: [PATCH 01/38] Update README.md --- docs/README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/README.md b/docs/README.md index 2fefa92b4..c2aea24be 100644 --- a/docs/README.md +++ b/docs/README.md @@ -16,7 +16,13 @@ Check out the list of [Integrations and Usages of Mermaid](./integrations.md) **Mermaid was nominated and won the JS Open Source Awards (2019) in the category "The most exciting use of technology"!!! Thanks to all involved, people committing pull requests, people answering questions and special thanks to Tyler Long who is helping me maintain the project.** -# New [Configuration Protocols in version 8.6.0](https://github.com/NeilCuzon/mermaid/edit/develop/docs/8.6.0_docs.md) +## [CDN](https://unpkg.com/mermaid/) + + +## [Documentation](https://mermaidjs.github.io) + + +## New [Configuration Protocols in version 8.6.0](https://github.com/NeilCuzon/mermaid/edit/develop/docs/8.6.0_docs.md) ## New diagrams in 8.5 @@ -184,10 +190,6 @@ to support mermaid on your website, all you have to do is add Mermaid’s JavaSc ## it can then be followed by the diagram definitions as could be found in the examples in the documentation. -# Documentation - -https://mermaidjs.github.io - ## Sibling projects From a677608f1d079a82a22dc3b981e197398116b191 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 14:42:57 -0700 Subject: [PATCH 02/38] Update 8.6.0_docs.md --- docs/8.6.0_docs.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/8.6.0_docs.md b/docs/8.6.0_docs.md index ffd22c3ec..ce4cbff22 100644 --- a/docs/8.6.0_docs.md +++ b/docs/8.6.0_docs.md @@ -1,7 +1,9 @@ # Version 8.6.0 Changes -**Edit this Page** [![N|Solid](/img/GitHub-Mark-32px.png)](https://github.com/medmaid-js/mermaid/edit/develop/docs/8.6.0_docs.md) +**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](https://github.com/medmaid-js/mermaid/edit/develop/docs/8.6.0_docs.md) -**Try out the Beta Version of the [[New Mermaid Live-Editor](https://mermaid-js.github.io/docs/mermaid-live-editor-beta/#/edit/eyJjb2RlIjoiJSV7aW5pdDoge1widGhlbWVcIjogXCJmb3Jlc3RcIiwgXCJsb2dMZXZlbFwiOiAxIH19JSVcbmdyYXBoIFREXG4gIEFbQ2hyaXN0bWFzXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cblx0XHQiLCJtZXJtYWlkIjp7InRoZW1lIjoiZGFyayJ9fQ)]** +## CDN : https://unpkg.com/mermaid/ + +## Try out the Beta Version of the [[New Mermaid Live-Editor](https://mermaid-js.github.io/docs/mermaid-live-editor-beta/#/edit/eyJjb2RlIjoiJSV7aW5pdDoge1widGhlbWVcIjogXCJmb3Jlc3RcIiwgXCJsb2dMZXZlbFwiOiAxIH19JSVcbmdyYXBoIFREXG4gIEFbQ2hyaXN0bWFzXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cblx0XHQiLCJtZXJtYWlkIjp7InRoZW1lIjoiZGFyayJ9fQ)]** With version 8.6.0 comes the release of directives for mermaid and a new system for configurations, with the aim of establishing centralized, sane defaults and simple implementation. @@ -89,7 +91,7 @@ It is a non-argument directive and can be executed thusly: **an example of text wrapping in a sequence diagram**: -![Image showing wrapped text](/img/wrapped%20text.png) +![Image showing wrapped text](./img/wrapped%20text.png) # Resetting Configurations: @@ -108,12 +110,12 @@ There are two more functions in the mermaidAPI that can be called by site owners Example of **assignWithDepth**: -![Image showing assignWithDepth](/img/assignWithDepth.png) +![Image showing assignWithDepth](./img/assignWithDepth.png) Example of **object.Assign**: -![Image showing object.assign without depth](/img/object.assign%20without%20depth.png) +![Image showing object.assign without depth](./img/object.assign%20without%20depth.png) • **calculateTextDimensions, calculateTextWidth,** and **calculateTextHeight** - for measuring text dimensions, width and height. From 1908af6f54c350825ea3318a28f26393454d34b8 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 14:45:55 -0700 Subject: [PATCH 03/38] Update 8.6.0_docs.md --- docs/8.6.0_docs.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/8.6.0_docs.md b/docs/8.6.0_docs.md index ce4cbff22..233e0c9d3 100644 --- a/docs/8.6.0_docs.md +++ b/docs/8.6.0_docs.md @@ -1,9 +1,10 @@ # Version 8.6.0 Changes + **Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](https://github.com/medmaid-js/mermaid/edit/develop/docs/8.6.0_docs.md) -## CDN : https://unpkg.com/mermaid/ +## [New Mermaid Live-Editor Beta](https://mermaid-js.github.io/docs/mermaid-live-editor-beta/#/edit/eyJjb2RlIjoiJSV7aW5pdDoge1widGhlbWVcIjogXCJmb3Jlc3RcIiwgXCJsb2dMZXZlbFwiOiAxIH19JSVcbmdyYXBoIFREXG4gIEFbQ2hyaXN0bWFzXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cblx0XHQiLCJtZXJtYWlkIjp7InRoZW1lIjoiZGFyayJ9fQ) -## Try out the Beta Version of the [[New Mermaid Live-Editor](https://mermaid-js.github.io/docs/mermaid-live-editor-beta/#/edit/eyJjb2RlIjoiJSV7aW5pdDoge1widGhlbWVcIjogXCJmb3Jlc3RcIiwgXCJsb2dMZXZlbFwiOiAxIH19JSVcbmdyYXBoIFREXG4gIEFbQ2hyaXN0bWFzXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cblx0XHQiLCJtZXJtYWlkIjp7InRoZW1lIjoiZGFyayJ9fQ)]** +## [CDN](https://unpkg.com/mermaid/) With version 8.6.0 comes the release of directives for mermaid and a new system for configurations, with the aim of establishing centralized, sane defaults and simple implementation. From 9fdab327c8426705149b0a2a6803f3e344592afe Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 14:46:47 -0700 Subject: [PATCH 04/38] Update 8.6.0_docs.md --- docs/8.6.0_docs.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/8.6.0_docs.md b/docs/8.6.0_docs.md index 233e0c9d3..2d1e4eaf0 100644 --- a/docs/8.6.0_docs.md +++ b/docs/8.6.0_docs.md @@ -59,6 +59,7 @@ init would be an argument-directive: %%{init: { **insert argument here**}}%% The json object that is passed as {**argument** } must be valid, quoted json or it will be ignored. **for example**: + %%{init: {"theme": default, "logLevel": 1 }}%% Configurations that are passed through init cannot change the parameters in secure arrays of higher levels. In the event of a conflict, mermaid will give priority to secure arrays and parse the request, without changing the values of the parameters in conflict. From 7684f79e64797381faa6be55cb0916e24b4c5221 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 14:47:36 -0700 Subject: [PATCH 05/38] Update README.md --- docs/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/README.md b/docs/README.md index c2aea24be..447677df6 100644 --- a/docs/README.md +++ b/docs/README.md @@ -5,6 +5,7 @@ [![Join the chat at https://gitter.im/knsv/mermaid](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/knsv/mermaid?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ![banner](./img/header.png) +**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](https://github.com/mermaid-js/mermaid/edit/release/8.6.0/docs/README.md Generation of diagrams and flowcharts from text in a similar manner as markdown. From e5ac55179533449321a3d00d4c4a8cd3778cd3a4 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 14:47:52 -0700 Subject: [PATCH 06/38] Update README.md --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 447677df6..644cd8027 100644 --- a/docs/README.md +++ b/docs/README.md @@ -5,7 +5,7 @@ [![Join the chat at https://gitter.im/knsv/mermaid](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/knsv/mermaid?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ![banner](./img/header.png) -**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](https://github.com/mermaid-js/mermaid/edit/release/8.6.0/docs/README.md +**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](https://github.com/mermaid-js/mermaid/edit/release/8.6.0/docs/README.md) Generation of diagrams and flowcharts from text in a similar manner as markdown. From deccf8891da9e43c1d6fbb9ef549a58085da15f5 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 14:56:24 -0700 Subject: [PATCH 07/38] Update README.md --- docs/README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/README.md b/docs/README.md index 644cd8027..9e7bcac90 100644 --- a/docs/README.md +++ b/docs/README.md @@ -5,13 +5,14 @@ [![Join the chat at https://gitter.im/knsv/mermaid](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/knsv/mermaid?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ![banner](./img/header.png) -**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](https://github.com/mermaid-js/mermaid/edit/release/8.6.0/docs/README.md) +**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](./README.md) -Generation of diagrams and flowcharts from text in a similar manner as markdown. -Ever wanted to simplify documentation and avoid heavy tools like Visio when explaining your code? +Mermaid is a tool that generates diagrams and charts, from markdown-inspired text definitions -This is why mermaid was born, a simple markdown-like script language for generating charts from text via javascript. +Have you ever wanted to simplify the generation and updating of your diagrams and charts, while avoiding time-intensive and heavy tools like visio? + +This is why mermaid was born, a simple markdown-inspired script language for generating charts from text-definitions, via javascript. Check out the list of [Integrations and Usages of Mermaid](./integrations.md) From e54d9cf629353926f67f051b4ed996491d6e4065 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 14:56:28 -0700 Subject: [PATCH 08/38] Update 8.6.0_docs.md --- docs/8.6.0_docs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/8.6.0_docs.md b/docs/8.6.0_docs.md index 2d1e4eaf0..5cf8b5478 100644 --- a/docs/8.6.0_docs.md +++ b/docs/8.6.0_docs.md @@ -1,6 +1,6 @@ # Version 8.6.0 Changes -**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](https://github.com/medmaid-js/mermaid/edit/develop/docs/8.6.0_docs.md) +**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](./8.6.0_docs.md) ## [New Mermaid Live-Editor Beta](https://mermaid-js.github.io/docs/mermaid-live-editor-beta/#/edit/eyJjb2RlIjoiJSV7aW5pdDoge1widGhlbWVcIjogXCJmb3Jlc3RcIiwgXCJsb2dMZXZlbFwiOiAxIH19JSVcbmdyYXBoIFREXG4gIEFbQ2hyaXN0bWFzXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cblx0XHQiLCJtZXJtYWlkIjp7InRoZW1lIjoiZGFyayJ9fQ) From 38359e176f51ce08c2fb1b1578bbc570a8d3fe35 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 17:12:29 -0700 Subject: [PATCH 09/38] Update README.md --- docs/README.md | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/docs/README.md b/docs/README.md index 9e7bcac90..f43e15be2 100644 --- a/docs/README.md +++ b/docs/README.md @@ -8,23 +8,33 @@ **Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](./README.md) +**Mermaid was nominated and won the JS Open Source Awards (2019) in the category "The most exciting use of technology"!!! Thanks to all involved, people committing pull requests, people answering questions and special thanks to Tyler Long who is helping me maintain the project.** + + Mermaid is a tool that generates diagrams and charts, from markdown-inspired text definitions -Have you ever wanted to simplify the generation and updating of your diagrams and charts, while avoiding time-intensive and heavy tools like visio? +This allows user to simplify the generation and updating of even the most complex diagrams and charts, while avoiding time-damanding and heavy tools like visio? -This is why mermaid was born, a simple markdown-inspired script language for generating charts from text-definitions, via javascript. +mermaid, as a simple markdown-inspired script language for generating charts from text-definitions, via javascript and online. This cuts the times it takes to create, modify and render diagrams. + +Even non-programmers can use mermaid through the [mermaid live editor](https://github.com/mermaidjs/mermaid-live-editor). + +For a more detailed introduction to mermaid, look [Getting Started] Check out the list of [Integrations and Usages of Mermaid](./integrations.md) + **Mermaid was nominated and won the JS Open Source Awards (2019) in the category "The most exciting use of technology"!!! Thanks to all involved, people committing pull requests, people answering questions and special thanks to Tyler Long who is helping me maintain the project.** +## [New Mermaid Live-Editor Beta](https://mermaid-js.github.io/docs/mermaid-live-editor-beta/#/edit/eyJjb2RlIjoiJSV7aW5pdDoge1widGhlbWVcIjogXCJmb3Jlc3RcIiwgXCJsb2dMZXZlbFwiOiAxIH19JSVcbmdyYXBoIFREXG4gIEFbQ2hyaXN0bWFzXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cblx0XHQiLCJtZXJtYWlkIjp7InRoZW1lIjoiZGFyayJ9fQ) + ## [CDN](https://unpkg.com/mermaid/) ## [Documentation](https://mermaidjs.github.io) -## New [Configuration Protocols in version 8.6.0](https://github.com/NeilCuzon/mermaid/edit/develop/docs/8.6.0_docs.md) +## [New Configuration Protocols in version 8.6.0](https://github.com/NeilCuzon/mermaid/edit/develop/docs/8.6.0_docs.md) ## New diagrams in 8.5 @@ -194,9 +204,8 @@ to support mermaid on your website, all you have to do is add Mermaid’s JavaSc ## Sibling projects - -- [mermaid CLI](https://github.com/mermaidjs/mermaid.cli) - [mermaid live editor](https://github.com/mermaidjs/mermaid-live-editor) +- [mermaid CLI](https://github.com/mermaidjs/mermaid.cli) - [mermaid webpack demo](https://github.com/mermaidjs/mermaid-webpack-demo) - [mermaid Parcel demo](https://github.com/mermaidjs/mermaid-parcel-demo) From 11d35c8410761ba8f35161c2230fff776404462f Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 17:13:07 -0700 Subject: [PATCH 10/38] Update README.md --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index f43e15be2..93d69cbce 100644 --- a/docs/README.md +++ b/docs/README.md @@ -19,7 +19,7 @@ mermaid, as a simple markdown-inspired script language for generating charts fro Even non-programmers can use mermaid through the [mermaid live editor](https://github.com/mermaidjs/mermaid-live-editor). -For a more detailed introduction to mermaid, look [Getting Started] +For a more detailed introduction to mermaid, look [Getting Started](https://mermaid-js.github.io/mermaid/#/n00b-overview) Check out the list of [Integrations and Usages of Mermaid](./integrations.md) From ea0cd80ea71a3ddbd8b228e8d95ab6ddf33813e1 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 17:58:25 -0700 Subject: [PATCH 11/38] Add files via upload --- docs/img/user-journey.png | Bin 0 -> 36968 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/img/user-journey.png diff --git a/docs/img/user-journey.png b/docs/img/user-journey.png new file mode 100644 index 0000000000000000000000000000000000000000..825d467d8564bf6140ce2274bc2aea62bc77d4bf GIT binary patch literal 36968 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 Date: Mon, 13 Jul 2020 18:00:50 -0700 Subject: [PATCH 12/38] Add files via upload From 26c3f5a2cc23bfe964cb302d71b8bbc3f7f2863c Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 18:01:43 -0700 Subject: [PATCH 13/38] Update README.md --- docs/README.md | 54 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/docs/README.md b/docs/README.md index 93d69cbce..85f929e54 100644 --- a/docs/README.md +++ b/docs/README.md @@ -26,16 +26,15 @@ Check out the list of [Integrations and Usages of Mermaid](./integrations.md) **Mermaid was nominated and won the JS Open Source Awards (2019) in the category "The most exciting use of technology"!!! Thanks to all involved, people committing pull requests, people answering questions and special thanks to Tyler Long who is helping me maintain the project.** +# Version 8.6.0 comes with + ## [New Mermaid Live-Editor Beta](https://mermaid-js.github.io/docs/mermaid-live-editor-beta/#/edit/eyJjb2RlIjoiJSV7aW5pdDoge1widGhlbWVcIjogXCJmb3Jlc3RcIiwgXCJsb2dMZXZlbFwiOiAxIH19JSVcbmdyYXBoIFREXG4gIEFbQ2hyaXN0bWFzXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cblx0XHQiLCJtZXJtYWlkIjp7InRoZW1lIjoiZGFyayJ9fQ) -## [CDN](https://unpkg.com/mermaid/) - - -## [Documentation](https://mermaidjs.github.io) - - ## [New Configuration Protocols in version 8.6.0](https://github.com/NeilCuzon/mermaid/edit/develop/docs/8.6.0_docs.md) +## [CDN](https://unpkg.com/mermaid/) + +## [Documentation](https://mermaidjs.github.io) ## New diagrams in 8.5 @@ -45,10 +44,19 @@ With version 8.5 there are some bug fixes and enhancements, plus a new diagram t ## Special note regarding version 8.2 -In version 8.2 a security improvement was introduced. A securityLevel configuration was introduced which sets the level of trust to be used on the parsed diagrams. +In version 8.2 a security improvement was introduced. A **securityLevel** configuration was introduced which sets the level of trust to be used on the parsed diagrams. + +## securityLevel + +| Parameter | Description | Type | Required | Values | +| ------------- | --------------------------------- | ------ | -------- | ------------- | +| securitylevel | Level of trust for parsed diagram | String | Required | Strict, Loose | + +\*\*Notes: + +- **strict**: (**default**) tags in text are encoded, click functionality is disabeled +- **loose**: tags in text are allowed, click functionality is enabled -- **true**: (default) tags in text are encoded, click functionality is disabled -- false: tags in text are allowed, click functionality is enabled Closed issues: @@ -64,9 +72,9 @@ mermaidAPI.initialize({ **🖖 Keep a steady pulse: mermaid needs more Collaborators [#866](https://github.com/knsv/mermaid/issues/866)** -## Diagrams +# Diagrams that mermaid can render: -### Flowchart +### [Flowchart](https://mermaid-js.github.io/mermaid/#/flowchart) ``` graph TD; @@ -78,7 +86,7 @@ graph TD; ![Flowchart](./img/flow.png) -### Sequence diagram +### [Sequence diagram](https://mermaid-js.github.io/mermaid/#/sequenceDiagram) ``` sequenceDiagram @@ -96,7 +104,7 @@ sequenceDiagram ![Sequence diagram](./img/sequence.png) -### Gantt diagram +### [Gantt diagram](https://mermaid-js.github.io/mermaid/#/gantt) ``` gantt @@ -113,7 +121,7 @@ Future task2 : des4, after des3, 5d ![Gantt diagram](./img/gantt.png) -### Class diagram - :exclamation: experimental +### [Class diagram - :exclamation: experimental](https://mermaid-js.github.io/mermaid/#/classDiagram) ``` classDiagram @@ -158,7 +166,7 @@ merge newbranch ![Git graph](./img/git.png) -### Entity Relationship Diagram - :exclamation: experimental +### [Entity Relationship Diagram - :exclamation: experimental](https://mermaid-js.github.io/mermaid/#/entityRelationshipDiagram) ``` erDiagram @@ -170,6 +178,22 @@ erDiagram ![ER diagram](./img/simple-er.png) +[User Journey Diagram](https://mermaid-js.github.io/mermaid/#/user-journey) + +```markdown +journey + title My working day + section Go to work + Make tea: 5: Me + Go upstairs: 3: Me + Do work: 1: Me, Cat + section Go home + Go downstairs: 5: Me + Sit down: 5: Me +``` + +![Journey diagram](./img/user-journey.pn) + ## Installation ### CDN From 0658581bcdee5d7392ee1d90e3bba371f6a19520 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 18:02:38 -0700 Subject: [PATCH 14/38] Update README.md --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 85f929e54..d2df14f37 100644 --- a/docs/README.md +++ b/docs/README.md @@ -192,7 +192,7 @@ journey Sit down: 5: Me ``` -![Journey diagram](./img/user-journey.pn) +###![Journey diagram](./img/user-journey.png) ## Installation From d5a9cbe5a32d249c9ebc0addf7a731a13ee1f872 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 18:03:36 -0700 Subject: [PATCH 15/38] Update README.md --- docs/README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/README.md b/docs/README.md index d2df14f37..825386c7d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -178,7 +178,7 @@ erDiagram ![ER diagram](./img/simple-er.png) -[User Journey Diagram](https://mermaid-js.github.io/mermaid/#/user-journey) +### [User Journey Diagram](https://mermaid-js.github.io/mermaid/#/user-journey) ```markdown journey @@ -191,8 +191,7 @@ journey Go downstairs: 5: Me Sit down: 5: Me ``` - -###![Journey diagram](./img/user-journey.png) +![Journey diagram](./img/user-journey.png) ## Installation From eb6c90152730966cda1236054084abacf4333661 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 18:04:41 -0700 Subject: [PATCH 16/38] Update README.md --- docs/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 825386c7d..9de3d5179 100644 --- a/docs/README.md +++ b/docs/README.md @@ -163,7 +163,6 @@ commit merge newbranch ``` - ![Git graph](./img/git.png) ### [Entity Relationship Diagram - :exclamation: experimental](https://mermaid-js.github.io/mermaid/#/entityRelationshipDiagram) From b2af5390fb327f14ec1ea3de20beb75227893a8e Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Mon, 13 Jul 2020 18:14:59 -0700 Subject: [PATCH 17/38] Update README.md --- docs/README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/README.md b/docs/README.md index 9de3d5179..48a330f8c 100644 --- a/docs/README.md +++ b/docs/README.md @@ -11,20 +11,20 @@ **Mermaid was nominated and won the JS Open Source Awards (2019) in the category "The most exciting use of technology"!!! Thanks to all involved, people committing pull requests, people answering questions and special thanks to Tyler Long who is helping me maintain the project.** + Mermaid is a tool that generates diagrams and charts, from markdown-inspired text definitions -This allows user to simplify the generation and updating of even the most complex diagrams and charts, while avoiding time-damanding and heavy tools like visio? +This allows for simplified generation and updating of even the most complex diagrams and charts, while avoiding time-damanding and heavy tools like visio. -mermaid, as a simple markdown-inspired script language for generating charts from text-definitions, via javascript and online. This cuts the times it takes to create, modify and render diagrams. +mermaid, is a simple markdown-inspired script language for generating charts from text-definitions, via javascript. As such, using it cuts the times it takes to create, modify and render diagrams. -Even non-programmers can use mermaid through the [mermaid live editor](https://github.com/mermaidjs/mermaid-live-editor). +Even non-programmers can create diagrams through the [mermaid live editor](https://github.com/mermaidjs/mermaid-live-editor). -For a more detailed introduction to mermaid, look [Getting Started](https://mermaid-js.github.io/mermaid/#/n00b-overview) +For a more detailed introduction to mermaid, look to the [Getting Started](https://mermaid-js.github.io/mermaid/#/n00b-overview) section. -Check out the list of [Integrations and Usages of Mermaid](./integrations.md) +You should also Check out the list of [Integrations and Usages of Mermaid](./integrations.md) - -**Mermaid was nominated and won the JS Open Source Awards (2019) in the category "The most exciting use of technology"!!! Thanks to all involved, people committing pull requests, people answering questions and special thanks to Tyler Long who is helping me maintain the project.** +You can also watch some popular mermaid tutorials. # Version 8.6.0 comes with From 557a3f0896aa657fe84f698f5a4e41ab3b37304a Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Tue, 14 Jul 2020 14:25:37 -0700 Subject: [PATCH 18/38] Update gantt.md --- docs/gantt.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/gantt.md b/docs/gantt.md index c031eaef4..171085a2b 100755 --- a/docs/gantt.md +++ b/docs/gantt.md @@ -1,5 +1,7 @@ # Gantt diagrams +**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](./gantt.md) + > A Gantt chart is a type of bar chart, first developed by Karol Adamiecki in 1896, and independently by Henry Gantt in the 1910s, that illustrates a project schedule and the amount of time it would take for any one project to finish. Gantt charts illustrate number of days between the start and finish dates of the terminal elements and summary elements of a project. ## A note to users From e8c7ffa87263cad6df7e8e1b10aa9813713ffd4e Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Tue, 14 Jul 2020 14:25:40 -0700 Subject: [PATCH 19/38] Update flowchart.md --- docs/flowchart.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/flowchart.md b/docs/flowchart.md index 26b230ff1..e00fbe1ff 100644 --- a/docs/flowchart.md +++ b/docs/flowchart.md @@ -1,5 +1,6 @@ # Flowcharts - Basic Syntax +**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](./flowchart.md) ## Graph This statement declares the direction of the Flowchart. From 78bb5e09e597f32eb4dd1a872b59b2f8e9a1a797 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Tue, 14 Jul 2020 14:25:43 -0700 Subject: [PATCH 20/38] Update sequenceDiagram.md --- docs/sequenceDiagram.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/sequenceDiagram.md b/docs/sequenceDiagram.md index d41f11f0b..409a1b681 100755 --- a/docs/sequenceDiagram.md +++ b/docs/sequenceDiagram.md @@ -1,5 +1,7 @@ # Sequence diagrams +**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](./sequenceDiagram.md) + > A Sequence diagram is an interaction diagram that shows how processes operate with one another and in what order. Mermaid can render sequence diagrams. From c2e34cd0f52ebf1691962ec2cdfb1b34d8e19c6d Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Tue, 14 Jul 2020 14:25:46 -0700 Subject: [PATCH 21/38] Update pie.md --- docs/pie.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/pie.md b/docs/pie.md index 57d2a7b85..e361bf048 100644 --- a/docs/pie.md +++ b/docs/pie.md @@ -1,5 +1,7 @@ # Pie chart diagrams +**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](./pie.md) + > A pie chart (or a circle chart) is a circular statistical graphic, which is divided into slices to illustrate numerical proportion. In a pie chart, the arc length of each slice (and consequently its central angle and area), is proportional to the quantity it represents. While it is named for its resemblance to a pie which has been sliced, there are variations on the way it can be presented. The earliest known pie chart is generally credited to William Playfair's Statistical Breviary of 1801 -Wikipedia From 2b9960e05f778985f84d28f1b194131a7ca81975 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Tue, 14 Jul 2020 14:25:49 -0700 Subject: [PATCH 22/38] Update stateDiagram.md --- docs/stateDiagram.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/stateDiagram.md b/docs/stateDiagram.md index c593aa2b8..e1de656a6 100755 --- a/docs/stateDiagram.md +++ b/docs/stateDiagram.md @@ -1,5 +1,7 @@ # State diagrams +**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](./stateDiagram.md) + > "A state diagram is a type of diagram used in computer science and related fields to describe the behavior of systems. State diagrams require that the system described is composed of a finite number of states; sometimes, this is indeed the case, while at other times this is a reasonable abstraction." Wikipedia Mermaid can render state diagrams. The syntax tries to be compliant with the syntax used in plantUml as this will make it easier for users to share diagrams between mermaid and plantUml. From 1878e39dfce4bc3c559178885208b1311cf58a11 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Tue, 14 Jul 2020 18:11:36 -0700 Subject: [PATCH 23/38] Update config.js --- src/config.js | 68 ++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 56 insertions(+), 12 deletions(-) diff --git a/src/config.js b/src/config.js index feece2097..4e95f3be7 100644 --- a/src/config.js +++ b/src/config.js @@ -820,10 +820,19 @@ const siteConfig = assignWithDepth({}, defaultConfig); const currentConfig = assignWithDepth({}, defaultConfig); /** - * Sets the siteConfig. The siteConfig is a protected configuration for repeat use. Calls to reset() will reset - * the currentConfig to siteConfig. Calls to reset(configApi.defaultConfig) will reset siteConfig and currentConfig - * to the defaultConfig - * Note: currentConfig is set in this function + *## setSiteConfig + + *| Function | Description | Type | Values | + *| --------- | ------------------- | ------- | ------------------ | + *| setSiteConfig|Sets the siteConfig to desired values | Put Request | Any Values, except ones in secure array| + + ***Notes:** + *Sets the siteConfig. The siteConfig is a protected configuration for repeat use. Calls to reset() will reset + *the currentConfig to siteConfig. Calls to reset(configApi.defaultConfig) will reset siteConfig and currentConfig + *to the defaultConfig + *Note: currentConfig is set in this function + + **Default value: At default, will mirror Global Config** * @param conf - the base currentConfig to use as siteConfig * @returns {*} - the siteConfig */ @@ -833,16 +842,29 @@ export const setSiteConfig = conf => { return getSiteConfig(); }; /** - * Obtains the current siteConfig base configuration + *## getSiteConfig + *| Function | Description | Type | Values | + *| --------- | ------------------- | ------- | ------------------ | + *| setSiteConfig|Returns the current siteConfig base configuration | Get Request | Returns Any Values in siteConfig| + + ***Notes**: + *Returns **any** values in siteConfig. * @returns {*} */ export const getSiteConfig = () => { return assignWithDepth({}, siteConfig); }; /** - * Sets the currentConfig. The param conf is sanitized based on the siteConfig.secure keys. Any - * values found in conf with key found in siteConfig.secure will be replaced with the corresponding - * siteConfig value. + *## setConfig + *| Function | Description | Type | Values | + *| --------- | ------------------- | ------- | ------------------ | + *| setSiteConfig|Sets the siteConfig to desired values | Put Request| Any Values, except ones in secure array| + + + ***Notes**: + *Sets the currentConfig. The parameter conf is sanitized based on the siteConfig.secure keys. Any + *values found in conf with key found in siteConfig.secure will be replaced with the corresponding + *siteConfig value. * @param conf - the potential currentConfig * @returns {*} - the currentConfig merged with the sanitized conf */ @@ -852,15 +874,26 @@ export const setConfig = conf => { return getConfig(); }; /** - * Obtains the currentConfig + * ## getConfig + *| Function | Description | Type | Return Values | + *| --------- | ------------------- | ------- | ------------------ | + *| getConfig |Obtains the currentConfig | Get Request | Any Values from currentConfig| + + ***Notes**: + *Returns **any** the currentConfig * @returns {*} - the currentConfig */ export const getConfig = () => { return assignWithDepth({}, currentConfig); }; /** - * Ensures options parameter does not attempt to override siteConfig secure keys - * Note: modifies options in-place + *## sanitize + *| Function | Description | Type | Values | + *| --------- | ------------------- | ------- | ------------------ | + *| sanitize |Sets the siteConfig to desired values. | Put Request |None| + + *Ensures options parameter does not attempt to override siteConfig secure keys + *Note: modifies options in-place * @param options - the potential setConfig parameter */ export const sanitize = options => { @@ -877,7 +910,18 @@ export const sanitize = options => { }); }; /** - * Resets this currentConfig to conf + * ## reset + + *| Function | Description | Type | Required | Values | + *| --------- | ------------------- | ------- | -------- | ------------------ | + *| reset|Resets currentConfig to conf| Put Request | Required | None| + * + *| Parameter | Description |Type | Required | Values| + *| --- | --- | --- | --- | --- | + *| conf| base set of values, which currentConfig coul be **reset** to.| Dictionary | Required | Any Values, with respect to the secure Array| + * + **Notes : + (default: current siteConfig ) (optional, default `getSiteConfig()`) * @param conf - the base currentConfig to reset to (default: current siteConfig ) */ export const reset = (conf = getSiteConfig()) => { From 9a2321a6699d88bb39a291b3b0afe071a8b8ee9c Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Tue, 14 Jul 2020 18:15:42 -0700 Subject: [PATCH 24/38] Update config.js --- src/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config.js b/src/config.js index 4e95f3be7..fb74d8e01 100644 --- a/src/config.js +++ b/src/config.js @@ -910,7 +910,7 @@ export const sanitize = options => { }); }; /** - * ## reset + *## reset *| Function | Description | Type | Required | Values | *| --------- | ------------------- | ------- | -------- | ------------------ | From 66ee81c55fbec72b98953f51d1995dac0423de00 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Tue, 14 Jul 2020 19:27:00 -0700 Subject: [PATCH 25/38] Update 8.6.0_docs.md --- docs/8.6.0_docs.md | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/docs/8.6.0_docs.md b/docs/8.6.0_docs.md index 5cf8b5478..8b6b20ecd 100644 --- a/docs/8.6.0_docs.md +++ b/docs/8.6.0_docs.md @@ -122,3 +122,91 @@ Example of **object.Assign**: • **calculateTextDimensions, calculateTextWidth,** and **calculateTextHeight** - for measuring text dimensions, width and height. **Notes**:For more information on usage, parameters, and return info for these new functions take a look at the jsdocs for them in the utils package. + + +# New API Requests Introduced in Version 8.6.0 + +## setSiteConfig + + | Function | Description | Type | Values | + | --------- | ------------------- | ------- | ------------------ | + | setSiteConfig|Sets the siteConfig to desired values | Put Request | Any Values, except ones in secure array| + + **Notes: + Sets the siteConfig. The siteConfig is a protected configuration for repeat use. Calls to reset() will reset + the currentConfig to siteConfig. Calls to reset(configApi.defaultConfig) will reset siteConfig and currentConfig + to the defaultConfig + Note: currentConfig is set in this function + Default value: At default, will mirror Global Config + + @param conf - the base currentConfig to use as siteConfig + @returns { } - the siteConfig + +export const setSiteConfig = conf => { + assignWithDepth(currentConfig, conf, { clobber: true }); + assignWithDepth(siteConfig, conf); + return getSiteConfig(); +}; + + ## getSiteConfig + | Function | Description | Type | Values | + | --------- | ------------------- | ------- | ------------------ | + | setSiteConfig|Returns the current siteConfig base configuration | Get Request | Returns Any Values in siteConfig| + + **Notes : + Returns any values in siteConfig. + @returns { } + +export const getSiteConfig = () => { + return assignWithDepth({}, siteConfig); +}; + + ## setConfig + | Function | Description | Type | Values | + | --------- | ------------------- | ------- | ------------------ | + | setSiteConfig|Sets the siteConfig to desired values | Put Request| Any Values, except ones in secure array| + + + **Notes : + Sets the currentConfig. The parameter conf is sanitized based on the siteConfig.secure keys. Any + values found in conf with key found in siteConfig.secure will be replaced with the corresponding + siteConfig value. + @param conf - the potential currentConfig + @returns { } - the currentConfig merged with the sanitized conf + + + + ## getConfig + | Function | Description | Type | Return Values | + | --------- | ------------------- | ------- | ------------------ | + | getConfig |Obtains the currentConfig | Get Request | Any Values from currentConfig| + + **Notes : + Returns any values in the currentConfig + + + ## sanitize + | Function | Description | Type | Values | + | --------- | ------------------- | ------- | ------------------ | + | sanitize |Sets the siteConfig to desired values. | Put Request |None| + + Ensures options parameter does not attempt to override siteConfig secure keys + Note: modifies options in-place + + + ## reset + + | Function | Description | Type | Required | Values | + | --------- | ------------------- | ------- | -------- | ------------------ | + | reset|Resets currentConfig to conf| Put Request | Required | None| + + ## onf + | Parameter | Description |Type | Required | Values| + | --- | --- | --- | --- | --- | + | conf| base set of values, which currentConfig coul be reset to.| Dictionary | Required | Any Values, with respect to the secure Array| + + **Notes : + default: current siteConfig (optional, default `getSiteConfig()`) + @param conf - the base currentConfig to reset to (default: current siteConfig ) + +## for more information, read [Setup](https://mermaid-js.github.io/mermaid/#/Setup) From 5d4583c77fe30edb031f9a3a98b2f592b2370f4e Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Tue, 14 Jul 2020 19:33:06 -0700 Subject: [PATCH 26/38] Update 8.6.0_docs.md --- docs/8.6.0_docs.md | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/docs/8.6.0_docs.md b/docs/8.6.0_docs.md index 8b6b20ecd..02262a9e8 100644 --- a/docs/8.6.0_docs.md +++ b/docs/8.6.0_docs.md @@ -128,9 +128,9 @@ Example of **object.Assign**: ## setSiteConfig - | Function | Description | Type | Values | - | --------- | ------------------- | ------- | ------------------ | - | setSiteConfig|Sets the siteConfig to desired values | Put Request | Any Values, except ones in secure array| + | Function | Description | Type | Values |Parameters|Returns| + | --------- | ------------------- | ------- | ------------------ | ------------------ | ------------------ | + | setSiteConfig|Sets the siteConfig to desired values | Put Request | Any Values, except ones in secure array|conf|siteConfig| **Notes: Sets the siteConfig. The siteConfig is a protected configuration for repeat use. Calls to reset() will reset @@ -139,14 +139,14 @@ Example of **object.Assign**: Note: currentConfig is set in this function Default value: At default, will mirror Global Config + + | Parameter | Description |Type | Required | Values| + | --- | --- | --- | --- | --- | + | conf| base set of values, which currentConfig coul be reset to.| Dictionary | Required | Any Values, with respect to the secure Array| + @param conf - the base currentConfig to use as siteConfig @returns { } - the siteConfig -export const setSiteConfig = conf => { - assignWithDepth(currentConfig, conf, { clobber: true }); - assignWithDepth(siteConfig, conf); - return getSiteConfig(); -}; ## getSiteConfig | Function | Description | Type | Values | @@ -157,9 +157,6 @@ export const setSiteConfig = conf => { Returns any values in siteConfig. @returns { } -export const getSiteConfig = () => { - return assignWithDepth({}, siteConfig); -}; ## setConfig | Function | Description | Type | Values | @@ -170,7 +167,8 @@ export const getSiteConfig = () => { **Notes : Sets the currentConfig. The parameter conf is sanitized based on the siteConfig.secure keys. Any values found in conf with key found in siteConfig.secure will be replaced with the corresponding - siteConfig value. + siteConfig value.** + @param conf - the potential currentConfig @returns { } - the currentConfig merged with the sanitized conf @@ -182,25 +180,24 @@ export const getSiteConfig = () => { | getConfig |Obtains the currentConfig | Get Request | Any Values from currentConfig| **Notes : - Returns any values in the currentConfig + Returns any values in currentConfig.** ## sanitize - | Function | Description | Type | Values | + | Function | Description | Type | Values | | --------- | ------------------- | ------- | ------------------ | - | sanitize |Sets the siteConfig to desired values. | Put Request |None| + | sanitize |Sets the siteConfig to desired values. | Put Request(?) |None| - Ensures options parameter does not attempt to override siteConfig secure keys - Note: modifies options in-place - + **Note: modifies options in-place + Ensures options parameter does not attempt to override siteConfig secure keys.** ## reset - | Function | Description | Type | Required | Values | - | --------- | ------------------- | ------- | -------- | ------------------ | - | reset|Resets currentConfig to conf| Put Request | Required | None| + | Function | Description | Type | Required | Values |Parameter| + | --------- | -------------------| ------- | -------- | ------------------ |---------| + | reset|Resets currentConfig to conf| Put Request | Required | None| conf| - ## onf + ## conf | Parameter | Description |Type | Required | Values| | --- | --- | --- | --- | --- | | conf| base set of values, which currentConfig coul be reset to.| Dictionary | Required | Any Values, with respect to the secure Array| @@ -209,4 +206,4 @@ export const getSiteConfig = () => { default: current siteConfig (optional, default `getSiteConfig()`) @param conf - the base currentConfig to reset to (default: current siteConfig ) -## for more information, read [Setup](https://mermaid-js.github.io/mermaid/#/Setup) + ## for more information, read [Setup](https://mermaid-js.github.io/mermaid/#/Setup). From 1866244a2acc16e98cc1511af4a9f8000ae93222 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Tue, 14 Jul 2020 19:37:05 -0700 Subject: [PATCH 27/38] Update 8.6.0_docs.md --- docs/8.6.0_docs.md | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/docs/8.6.0_docs.md b/docs/8.6.0_docs.md index 02262a9e8..5918964ab 100644 --- a/docs/8.6.0_docs.md +++ b/docs/8.6.0_docs.md @@ -137,15 +137,7 @@ Example of **object.Assign**: the currentConfig to siteConfig. Calls to reset(configApi.defaultConfig) will reset siteConfig and currentConfig to the defaultConfig Note: currentConfig is set in this function - Default value: At default, will mirror Global Config - - - | Parameter | Description |Type | Required | Values| - | --- | --- | --- | --- | --- | - | conf| base set of values, which currentConfig coul be reset to.| Dictionary | Required | Any Values, with respect to the secure Array| - - @param conf - the base currentConfig to use as siteConfig - @returns { } - the siteConfig + Default value: At default, will mirror Global Config** ## getSiteConfig @@ -154,14 +146,13 @@ Example of **object.Assign**: | setSiteConfig|Returns the current siteConfig base configuration | Get Request | Returns Any Values in siteConfig| **Notes : - Returns any values in siteConfig. - @returns { } + Returns any values in siteConfig.** ## setConfig - | Function | Description | Type | Values | - | --------- | ------------------- | ------- | ------------------ | - | setSiteConfig|Sets the siteConfig to desired values | Put Request| Any Values, except ones in secure array| + | Function | Description | Type | Values |Parameters|Returns| + | --------- | ------------------- | ------- | ------------------ |----------|-------| + | setSiteConfig|Sets the siteConfig to desired values | Put Request| Any Values, those in secure array|conf|currentConfig merged with the sanitized conf| **Notes : @@ -169,9 +160,6 @@ Example of **object.Assign**: values found in conf with key found in siteConfig.secure will be replaced with the corresponding siteConfig value.** - @param conf - the potential currentConfig - @returns { } - the currentConfig merged with the sanitized conf - ## getConfig @@ -203,7 +191,6 @@ Example of **object.Assign**: | conf| base set of values, which currentConfig coul be reset to.| Dictionary | Required | Any Values, with respect to the secure Array| **Notes : - default: current siteConfig (optional, default `getSiteConfig()`) - @param conf - the base currentConfig to reset to (default: current siteConfig ) + default: current siteConfig (optional, default `getSiteConfig()`)** - ## for more information, read [Setup](https://mermaid-js.github.io/mermaid/#/Setup). + ## For more information, read [Setup](https://mermaid-js.github.io/mermaid/#/Setup). From 5a9fa66b0418fe2074cafa17767a4f9ea8806f76 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Tue, 14 Jul 2020 21:00:45 -0700 Subject: [PATCH 28/38] Update _sidebar.md --- docs/_sidebar.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_sidebar.md b/docs/_sidebar.md index eb27ad957..fb6c8ccf9 100644 --- a/docs/_sidebar.md +++ b/docs/_sidebar.md @@ -21,10 +21,10 @@ - Guide - [Development](development.md) - - [Setup](Setup.md) + - [Configurations](Setup.md) - [Changelog](CHANGELOG.md) -- I'm a n00b +- Beginner's Guide - [overview](n00b-overview.md) - [Getting started - easier](n00b-gettingStarted.md) - [Diagram syntax intro](n00b-syntaxReference.md) From cd23899e028e8db52cfcb3b7569d0f9b0f21cdec Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Tue, 14 Jul 2020 21:01:01 -0700 Subject: [PATCH 29/38] Update README.md --- docs/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index 48a330f8c..bd027372e 100644 --- a/docs/README.md +++ b/docs/README.md @@ -20,13 +20,13 @@ mermaid, is a simple markdown-inspired script language for generating charts fro Even non-programmers can create diagrams through the [mermaid live editor](https://github.com/mermaidjs/mermaid-live-editor). -For a more detailed introduction to mermaid, look to the [Getting Started](https://mermaid-js.github.io/mermaid/#/n00b-overview) section. +For a more detailed introduction to mermaid, look to the [Beginner's Guide](https://mermaid-js.github.io/mermaid/#/n00b-overview) section. You should also Check out the list of [Integrations and Usages of Mermaid](./integrations.md) You can also watch some popular mermaid tutorials. -# Version 8.6.0 comes with +# New in Version 8.6.0 ## [New Mermaid Live-Editor Beta](https://mermaid-js.github.io/docs/mermaid-live-editor-beta/#/edit/eyJjb2RlIjoiJSV7aW5pdDoge1widGhlbWVcIjogXCJmb3Jlc3RcIiwgXCJsb2dMZXZlbFwiOiAxIH19JSVcbmdyYXBoIFREXG4gIEFbQ2hyaXN0bWFzXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cblx0XHQiLCJtZXJtYWlkIjp7InRoZW1lIjoiZGFyayJ9fQ) From 64e33103760c14e5f91d6313fa6a5cf302afd3fc Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Wed, 15 Jul 2020 10:34:34 -0700 Subject: [PATCH 30/38] Update directives.md --- docs/directives.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/directives.md b/docs/directives.md index 18fb04abf..0915705ea 100644 --- a/docs/directives.md +++ b/docs/directives.md @@ -1,4 +1,6 @@ -### Directives +## Directives +**Edit this Page** [![N|Solid](/img/GitHub-Mark-32px.png)](./directives.md) +Directives were added in [Version 8.6.0](/8.6.0_docs.md) #### Init directives @@ -54,4 +56,4 @@ Multiline directives, however, will pose an issue and will render an error. This ### Wrapping -The `%%{wrap}%%` directive and the inline `wrap:` text hint have also been added for sequence diagrams. This has been explained in my previous comments and has not materially changed. \ No newline at end of file +The `%%{wrap}%%` directive and the inline `wrap:` text hint have also been added for sequence diagrams. This has been explained in my previous comments and has not materially changed. From e34396015fe053ebe0d2845dae1a953c1b5f065f Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Wed, 15 Jul 2020 10:34:57 -0700 Subject: [PATCH 31/38] Update directives.md --- docs/directives.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/directives.md b/docs/directives.md index 0915705ea..a064ddb61 100644 --- a/docs/directives.md +++ b/docs/directives.md @@ -1,5 +1,5 @@ ## Directives -**Edit this Page** [![N|Solid](/img/GitHub-Mark-32px.png)](./directives.md) +**Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](./directives.md) Directives were added in [Version 8.6.0](/8.6.0_docs.md) #### Init directives From a4ece6c1c501421f8684b0356cc43ab3d9de033a Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Wed, 15 Jul 2020 10:35:19 -0700 Subject: [PATCH 32/38] Update directives.md --- docs/directives.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/directives.md b/docs/directives.md index a064ddb61..e11f832be 100644 --- a/docs/directives.md +++ b/docs/directives.md @@ -1,6 +1,6 @@ ## Directives **Edit this Page** [![N|Solid](./img/GitHub-Mark-32px.png)](./directives.md) -Directives were added in [Version 8.6.0](/8.6.0_docs.md) +### Directives were added in [Version 8.6.0](/8.6.0_docs.md) #### Init directives From 9677ed9e2d1344e487361feaa67f7701f695cc7f Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Wed, 15 Jul 2020 10:35:50 -0700 Subject: [PATCH 33/38] Update README.md --- docs/README.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/docs/README.md b/docs/README.md index bd027372e..eb0fe0b28 100644 --- a/docs/README.md +++ b/docs/README.md @@ -26,15 +26,17 @@ You should also Check out the list of [Integrations and Usages of Mermaid](./int You can also watch some popular mermaid tutorials. +## [CDN](https://unpkg.com/mermaid/) + +## [Documentation](https://mermaidjs.github.io) + + # New in Version 8.6.0 ## [New Mermaid Live-Editor Beta](https://mermaid-js.github.io/docs/mermaid-live-editor-beta/#/edit/eyJjb2RlIjoiJSV7aW5pdDoge1widGhlbWVcIjogXCJmb3Jlc3RcIiwgXCJsb2dMZXZlbFwiOiAxIH19JSVcbmdyYXBoIFREXG4gIEFbQ2hyaXN0bWFzXSAtLT58R2V0IG1vbmV5fCBCKEdvIHNob3BwaW5nKVxuICBCIC0tPiBDe0xldCBtZSB0aGlua31cbiAgQyAtLT58T25lfCBEW0xhcHRvcF1cbiAgQyAtLT58VHdvfCBFW2lQaG9uZV1cbiAgQyAtLT58VGhyZWV8IEZbZmE6ZmEtY2FyIENhcl1cblx0XHQiLCJtZXJtYWlkIjp7InRoZW1lIjoiZGFyayJ9fQ) ## [New Configuration Protocols in version 8.6.0](https://github.com/NeilCuzon/mermaid/edit/develop/docs/8.6.0_docs.md) -## [CDN](https://unpkg.com/mermaid/) - -## [Documentation](https://mermaidjs.github.io) ## New diagrams in 8.5 @@ -215,6 +217,7 @@ to support mermaid on your website, all you have to do is add Mermaid’s JavaSc 2. yarn add mermaid 3. yarn add --dev mermaid + this will add mermaid as a dev dependency ``` ## To install mermaid without a bundler, one can use the script tag like so: @@ -225,6 +228,8 @@ to support mermaid on your website, all you have to do is add Mermaid’s JavaSc ## it can then be followed by the diagram definitions as could be found in the examples in the documentation. +## the renderer will then scour the document for all the objects defined as mermaid. which will then be rendered as an SVG file. + ## Sibling projects - [mermaid live editor](https://github.com/mermaidjs/mermaid-live-editor) - [mermaid CLI](https://github.com/mermaidjs/mermaid.cli) From dcfab0f4ddadaba6343605a9536d6d182d49fcaa Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Wed, 15 Jul 2020 13:27:54 -0700 Subject: [PATCH 34/38] Update README.md --- docs/README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/README.md b/docs/README.md index eb0fe0b28..7768a028b 100644 --- a/docs/README.md +++ b/docs/README.md @@ -202,11 +202,15 @@ journey https://unpkg.com/mermaid@/dist/ ``` -Replace `` with expected version number. +To select a version: -Example: https://unpkg.com/mermaid@7.1.0/dist/ +Replace `` with the desired version number. -##Incorporating mermaid to a website +Alternatively, you can also adjust the version number in the page itself. + +Latest Version: https://unpkg.com/browse/mermaid@8.6.0/ + +## Incorporating mermaid to a website to support mermaid on your website, all you have to do is add Mermaid’s JavaScript package ``` From 789200d454f1764866e928191ce172b617b89eb5 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Wed, 15 Jul 2020 14:11:35 -0700 Subject: [PATCH 35/38] Update README.md --- docs/README.md | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/docs/README.md b/docs/README.md index 7768a028b..84eb94db3 100644 --- a/docs/README.md +++ b/docs/README.md @@ -30,6 +30,8 @@ You can also watch some popular mermaid tutorials. ## [Documentation](https://mermaidjs.github.io) +## [Contribution](https://github.com/mermaid-js/mermaid/blob/develop/CONTRIBUTING.md) + # New in Version 8.6.0 @@ -216,12 +218,14 @@ to support mermaid on your website, all you have to do is add Mermaid’s JavaSc ``` 1.You will need to isntall node v10 or 12, which would have npm -2. download yarn using npm +2. download yarn using npm. -2. yarn add mermaid +2. enter the following command: + yarn add mermaid -3. yarn add --dev mermaid - this will add mermaid as a dev dependency +3. You can then add mermaid as a dev dependency using this command: + yarn add --dev mermaid + ``` ## To install mermaid without a bundler, one can use the script tag like so: @@ -230,9 +234,7 @@ to support mermaid on your website, all you have to do is add Mermaid’s JavaSc ## it can then be followed by the diagram definitions as could be found in the examples in the documentation. - - -## the renderer will then scour the document for all the objects defined as mermaid. which will then be rendered as an SVG file. +## Further down on your page mermaid will look for tags with class="mermaid". From these tags mermaid will try to read the chart definiton and replace it with an svg chart. ## Sibling projects - [mermaid live editor](https://github.com/mermaidjs/mermaid-live-editor) From 369e6d1e61527749d7f7f3fa5bba0f06820db398 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Wed, 15 Jul 2020 14:15:28 -0700 Subject: [PATCH 36/38] Update README.md --- docs/README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index 84eb94db3..6c4ae2c4d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -233,8 +233,10 @@ to support mermaid on your website, all you have to do is add Mermaid’s JavaSc -## it can then be followed by the diagram definitions as could be found in the examples in the documentation. -## Further down on your page mermaid will look for tags with class="mermaid". From these tags mermaid will try to read the chart definiton and replace it with an svg chart. +## it can then be followed by the diagram definitions as could be found in the [examples in the documentation](https://mermaid-js.github.io/mermaid/#/n00b-gettingStarted). + + +## On your page mermaid will look for tags with class="mermaid". From these tags mermaid will try to read the chart definiton and replace it with an svg chart. ## Sibling projects - [mermaid live editor](https://github.com/mermaidjs/mermaid-live-editor) From 14388f4bb15d144ea4af10e2202bf221c6f486f0 Mon Sep 17 00:00:00 2001 From: Neil Cuzon <58763315+NeilCuzon@users.noreply.github.com> Date: Wed, 15 Jul 2020 21:30:23 -0700 Subject: [PATCH 37/38] Update n00b-gettingStarted.md --- docs/n00b-gettingStarted.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/n00b-gettingStarted.md b/docs/n00b-gettingStarted.md index 484baefdd..594a4d00c 100644 --- a/docs/n00b-gettingStarted.md +++ b/docs/n00b-gettingStarted.md @@ -1,16 +1,16 @@ # A basic mermaid User-Guide for Beginners -Creating diagrams and charts, using mermaid code is simple. +Creating diagrams and charts using mermaid code is simple. But how is the code turned into a diagram in a web page? This is done with the use of a mermaid renderer. Thankfully the mermaid renderer is very accessible, in essence it is a piece of javascript that can be called. -Most widely used web browsers, such as Firefox, Chrome and Safari, can render mermaid, Internet Explorer however cannot. The web browser also needs access to the online mermaid renderer which it downloads from https://cdn.jsdelivr.net/npm/mermaid +Most web browsers, such as Firefox, Chrome and Safari, can render mermaid, Internet Explorer however cannot. The web browser also needs access to the online mermaid renderer which it downloads from https://cdn.jsdelivr.net/npm/mermaid # For beginners, there are three relatively easy ways you can use mermaid: 1. Using the mermaid [live editor](https://mermaid-js.github.io/mermaid-live-editor/) -2. Using a mermaid plugin, such as that for Confluence or [Atom](https://atom.io/packages/atom-mermaid). +2. Using one of the many mermaid plugins 3. Calling mermaid renderer with HTML, deployed in a friendly browser. # Following either of these examples, you can get started with creating your own diagrams using mermaid code. @@ -126,10 +126,11 @@ This is what needs to go into the html file: # *Finally* # If the three steps mentioned are followed you will end up with something like this: + ``` - + Here is one mermaid diagram: @@ -150,7 +151,7 @@ This is what needs to go into the html file: ``` -# Save this to a html file and fetch it with a browser from the web server (or just drag it into your web browser window) and voila! +# Save this to an html file and open it with a browser from the web server (or just drag it into your web browser window) and voila! --- From b6b76eb137cda6d03a25e3de5da1f2a6f7d77138 Mon Sep 17 00:00:00 2001 From: Knut Sveidqvist Date: Thu, 16 Jul 2020 12:17:21 +0200 Subject: [PATCH 38/38] Docs updated from code --- docs/Setup.md | 55 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/docs/Setup.md b/docs/Setup.md index 09637bb36..1db5019ed 100644 --- a/docs/Setup.md +++ b/docs/Setup.md @@ -794,11 +794,20 @@ mermaidAPI.initialize({ ## setSiteConfig +## setSiteConfig + +| Function | Description | Type | Values | +| ------------- | ------------------------------------- | ----------- | --------------------------------------- | +| setSiteConfig | Sets the siteConfig to desired values | Put Request | Any Values, except ones in secure array | + +**Notes:** Sets the siteConfig. The siteConfig is a protected configuration for repeat use. Calls to reset() will reset the currentConfig to siteConfig. Calls to reset(configApi.defaultConfig) will reset siteConfig and currentConfig to the defaultConfig Note: currentConfig is set in this function +\*Default value: At default, will mirror Global Config\*\* + ### Parameters - `conf` the base currentConfig to use as siteConfig @@ -807,13 +816,27 @@ Returns **any** the siteConfig ## getSiteConfig -Obtains the current siteConfig base configuration +## getSiteConfig + +| Function | Description | Type | Values | +| ------------- | ------------------------------------------------- | ----------- | --------------------------------- | +| setSiteConfig | Returns the current siteConfig base configuration | Get Request | Returns Any Values in siteConfig | + +**Notes**: +Returns **any** values in siteConfig. Returns **any** ## setConfig -Sets the currentConfig. The param conf is sanitized based on the siteConfig.secure keys. Any +## setConfig + +| Function | Description | Type | Values | +| ------------- | ------------------------------------- | ----------- | --------------------------------------- | +| setSiteConfig | Sets the siteConfig to desired values | Put Request | Any Values, except ones in secure array | + +**Notes**: +Sets the currentConfig. The parameter conf is sanitized based on the siteConfig.secure keys. Any values found in conf with key found in siteConfig.secure will be replaced with the corresponding siteConfig value. @@ -825,12 +848,25 @@ Returns **any** the currentConfig merged with the sanitized conf ## getConfig -Obtains the currentConfig +## getConfig + +| Function | Description | Type | Return Values | +| --------- | ------------------------- | ----------- | ----------------------------- | +| getConfig | Obtains the currentConfig | Get Request | Any Values from currentConfig | + +**Notes**: +Returns **any** the currentConfig Returns **any** the currentConfig ## sanitize +## sanitize + +| Function | Description | Type | Values | +| -------- | -------------------------------------- | ----------- | ------ | +| sanitize | Sets the siteConfig to desired values. | Put Request | None | + Ensures options parameter does not attempt to override siteConfig secure keys Note: modifies options in-place @@ -840,7 +876,18 @@ Note: modifies options in-place ## reset -Resets this currentConfig to conf +## reset + +| Function | Description | Type | Required | Values | +| -------- | ---------------------------- | ----------- | -------- | ------ | +| reset | Resets currentConfig to conf | Put Request | Required | None | + +| Parameter | Description | Type | Required | Values | +| --------- | ------------------------------------------------------------- | ---------- | -------- | -------------------------------------------- | +| conf | base set of values, which currentConfig coul be **reset** to. | Dictionary | Required | Any Values, with respect to the secure Array | + +\*Notes : +(default: current siteConfig ) (optional, default `getSiteConfig()`) ### Parameters