diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
new file mode 100644
index 000000000..66909e1df
--- /dev/null
+++ b/.github/codeql/codeql-config.yml
@@ -0,0 +1,4 @@
+name: "CodeQL config"
+paths-ignore:
+ - dist
+ - cypress
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 000000000..a44fe228c
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,59 @@
+
+name: "CodeQL"
+
+on:
+ push:
+ branches: [ develop ]
+ pull_request:
+ # The branches below must be a subset of the branches above
+ branches: [ develop ]
+
+jobs:
+ analyze:
+ name: Analyze
+ runs-on: ubuntu-latest
+ permissions:
+ actions: read
+ contents: read
+ security-events: write
+
+ strategy:
+ fail-fast: false
+ matrix:
+ language: [ 'javascript' ]
+ # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+ # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+
+ # Initializes the CodeQL tools for scanning.
+ - name: Initialize CodeQL
+ uses: github/codeql-action/init@v2
+ with:
+ config-file: ./.github/codeql/codeql-config.yml
+ languages: ${{ matrix.language }}
+ # If you wish to specify custom queries, you can do so here or in a config file.
+ # By default, queries listed here will override any specified in a config file.
+ # Prefix the list here with "+" to use these queries and those in the config file.
+ # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+ # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
+ # If this step fails, then you should remove it and run the build manually (see below)
+ - name: Autobuild
+ uses: github/codeql-action/autobuild@v2
+
+ # ℹ️ Command-line programs to run using the OS shell.
+ # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+
+ # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+ # and modify them (or add more) to build your code if your project
+ # uses a compiled language
+
+ #- run: |
+ # make bootstrap
+ # make release
+
+ - name: Perform CodeQL Analysis
+ uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
new file mode 100644
index 000000000..0e72a00ef
--- /dev/null
+++ b/.github/workflows/dependency-review.yml
@@ -0,0 +1,20 @@
+# Dependency Review Action
+#
+# This Action will scan dependency manifest files that change as part of a Pull Reqest, surfacing known-vulnerable versions of the packages declared or updated in the PR. Once installed, if the workflow run is marked as required, PRs introducing known-vulnerable packages will be blocked from merging.
+#
+# Source repository: https://github.com/actions/dependency-review-action
+# Public documentation: https://docs.github.com/en/code-security/supply-chain-security/understanding-your-software-supply-chain/about-dependency-review#dependency-review-enforcement
+name: 'Dependency Review'
+on: [pull_request]
+
+permissions:
+ contents: read
+
+jobs:
+ dependency-review:
+ runs-on: ubuntu-latest
+ steps:
+ - name: 'Checkout Repository'
+ uses: actions/checkout@v3
+ - name: 'Dependency Review'
+ uses: actions/dependency-review-action@v1
diff --git a/README.md b/README.md
index db1ddc3ce..3e0742314 100644
--- a/README.md
+++ b/README.md
@@ -23,11 +23,14 @@ Diagramming and documentation costs precious developer time and gets outdated qu
But not having diagrams or docs ruins productivity and hurts organizational learning.
Mermaid addresses this problem by enabling users to create easily modifiable diagrams, it can also be made part of production scripts (and other pieces of code).
-Mermaid allows even non-programmers to easily create detailed and diagrams through the [Mermaid Live Editor](https://mermaid-js.github.io/mermaid-live-editor/).
+
+Mermaid allows even non-programmers to easily create detailed diagrams through the [Mermaid Live Editor](https://mermaid-js.github.io/mermaid-live-editor/).
[Tutorials](./docs/Tutorials.md) has video tutorials.
Use Mermaid with your favorite applications, check out the list of [Integrations and Usages of Mermaid](./docs/integrations.md).
-For a more detailed introduction to Mermaid and some of its more basic uses, look to the [Beginner's Guide](./docs/n00b-overview.md) and [Usage](./docs/usage.md).
+You can also use Mermaid within [GitHub](https://github.blog/2022-02-14-include-diagrams-markdown-files-mermaid/) as well many of your other favorite applications, check out the list of [Integrations and Usages of Mermaid](./docs/integrations.md).
+
+For a more detailed introduction to Mermaid and some of its more basic uses, look to the [Beginner's Guide](./docs/n00b-overview.md), [Usage](./docs/usage.md) and [Tutorials](./docs/Tutorials.md).
🌐 [CDN](https://unpkg.com/mermaid/) | 📖 [Documentation](https://mermaidjs.github.io) | 🙌 [Contribution](https://github.com/mermaid-js/mermaid/blob/develop/CONTRIBUTING.md) | 📜 [Changelog](./docs/CHANGELOG.md)
diff --git a/README.zh-CN.md b/README.zh-CN.md
index 33212e3b5..63a3ee4aa 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -2,13 +2,13 @@
[English](./README.md) | 简体中文
-
+
:trophy: **Mermaid 被提名并获得了 [JS Open Source Awards (2019)](https://osawards.com/javascript/2019) 的 "The most exciting use of technology" 奖项!!!**
**感谢所有参与进来提交 PR,解答疑问的人们! 🙏**
-
+
## 关于 Mermaid
@@ -23,7 +23,7 @@ Mermaid 通过允许用户创建便于修改的图表来解决这一难题,它
Mermaid 甚至能让非程序员也能通过 [Mermaid Live Editor](https://mermaid-js.github.io/mermaid-live-editor/) 轻松创建详细的图表。
你可以访问 [教程](./docs/Tutorials.md) 来查看 Live Editor 的视频教程,也可以查看 [Mermaid 的集成和使用](./docs/integrations.md) 这个清单来检查你的文档工具是否已经集成了 Mermaid 支持。
-如果想要查看关于 Mermaid 更详细的介绍及基础使用方式,可以查看 [入门指引](./docs/n00b-overview.md) and [用法](./docs/usage.md).
+如果想要查看关于 Mermaid 更详细的介绍及基础使用方式,可以查看 [入门指引](./docs/n00b-overview.md), [用法](./docs/usage.md) 和 [教程](./docs/Tutorials.md).
🌐 [CDN](https://unpkg.com/mermaid/) | 📖 [文档](https://mermaidjs.github.io) | 🙌 [贡献](https://github.com/mermaid-js/mermaid/blob/develop/CONTRIBUTING.md) | 📜 [更新日志](./docs/CHANGELOG.md)
@@ -35,7 +35,7 @@ __下面是一些可以使用 Mermaid 创建的图表示例。点击 [语法](ht
-## 流程图 [文档 - live editor]
+### 流程图 [文档 - live editor]
```
flowchart LR
@@ -52,7 +52,7 @@ C -->|One| D[Result 1]
C -->|Two| E[Result 2]
```
-## 时序图 [文档 - live editor]
+### 时序图 [文档 - live editor]
```
sequenceDiagram
@@ -77,7 +77,7 @@ John->>Bob: How about you?
Bob-->>John: Jolly good!
```
-## 甘特图 [文档 - live editor]
+### 甘特图 [文档 - live editor]
```
gantt
@@ -100,7 +100,7 @@ gantt
Parallel 4 : des6, after des4, 1d
```
-## 类图 [文档 - live editor]
+### 类图 [文档 - live editor]
```
classDiagram
@@ -139,7 +139,7 @@ class Class10 {
}
```
-## 状态图 [文档 - live editor]
+### 状态图 [[docs - live editor]
```
stateDiagram-v2
@@ -160,7 +160,7 @@ Moving --> Crash
Crash --> [*]
```
-## 饼图 [文档 - live editor]
+### 饼图 [文档 - live editor]
```
pie
@@ -175,9 +175,9 @@ pie
"Rats" : 15
```
-## Git图 [实验特性 - live editor]
+### Git图 [实验特性 - live editor]
-## 用户体验旅程图 [文档 - live editor]
+### 用户体验旅程图 [文档 - live editor]
```
journey
@@ -202,7 +202,7 @@ pie
Sit down: 3: Me
```
-### 发布
+## 发布
对于有权限的同学来说,你可以通过以下步骤来完成发布操作:
diff --git a/dist/mermaid.core.js b/dist/mermaid.core.js
index 8ca2f0415..e9b66b4e1 100644
--- a/dist/mermaid.core.js
+++ b/dist/mermaid.core.js
@@ -3635,12 +3635,12 @@ if ( true && __webpack_require__.c[__webpack_require__.s] === module) {
}
*/
var parser = (function(){
-var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,4],$V1=[1,7],$V2=[1,5],$V3=[1,9],$V4=[1,6],$V5=[2,6],$V6=[1,16],$V7=[6,8,14,18,20,21,22,37,41],$V8=[8,14,18,20,21,22],$V9=[8,13,14,18,20,21,22],$Va=[1,26],$Vb=[6,8,14,37,41],$Vc=[8,14,41],$Vd=[1,53],$Ve=[1,54],$Vf=[1,55],$Vg=[8,14,24,28,29,41];
+var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,4],$V1=[1,7],$V2=[1,5],$V3=[1,9],$V4=[1,6],$V5=[2,6],$V6=[1,16],$V7=[6,8,14,19,21,22,25,38,42],$V8=[8,14,19,21,22,25],$V9=[8,13,14,19,21,22,25],$Va=[1,26],$Vb=[6,8,14,38,42],$Vc=[8,14,42],$Vd=[1,54],$Ve=[1,55],$Vf=[1,56],$Vg=[8,14,23,29,30,42];
var parser = {trace: function trace () { },
yy: {},
-symbols_: {"error":2,"start":3,"eol":4,"directive":5,"GG":6,"document":7,"EOF":8,":":9,"DIR":10,"options":11,"body":12,"OPT":13,"NL":14,"line":15,"statement":16,"commitStatement":17,"BRANCH":18,"ID":19,"CHECKOUT":20,"MERGE":21,"COMMIT":22,"commit_arg":23,"COMMIT_TAG":24,"STR":25,"COMMIT_TYPE":26,"commitType":27,"COMMIT_ID":28,"COMMIT_MSG":29,"NORMAL":30,"REVERSE":31,"HIGHLIGHT":32,"openDirective":33,"typeDirective":34,"closeDirective":35,"argDirective":36,"open_directive":37,"type_directive":38,"arg_directive":39,"close_directive":40,";":41,"$accept":0,"$end":1},
-terminals_: {2:"error",6:"GG",8:"EOF",9:":",10:"DIR",13:"OPT",14:"NL",18:"BRANCH",19:"ID",20:"CHECKOUT",21:"MERGE",22:"COMMIT",24:"COMMIT_TAG",25:"STR",26:"COMMIT_TYPE",28:"COMMIT_ID",29:"COMMIT_MSG",30:"NORMAL",31:"REVERSE",32:"HIGHLIGHT",37:"open_directive",38:"type_directive",39:"arg_directive",40:"close_directive",41:";"},
-productions_: [0,[3,2],[3,2],[3,3],[3,4],[3,5],[7,0],[7,2],[11,2],[11,1],[12,0],[12,2],[15,2],[15,1],[16,1],[16,2],[16,2],[16,2],[17,2],[17,3],[17,3],[17,5],[17,5],[17,3],[17,5],[17,5],[17,5],[17,5],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,3],[17,5],[17,5],[17,5],[17,5],[17,5],[17,5],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[23,0],[23,1],[27,1],[27,1],[27,1],[5,3],[5,5],[33,1],[34,1],[36,1],[35,1],[4,1],[4,1],[4,1]],
+symbols_: {"error":2,"start":3,"eol":4,"directive":5,"GG":6,"document":7,"EOF":8,":":9,"DIR":10,"options":11,"body":12,"OPT":13,"NL":14,"line":15,"statement":16,"commitStatement":17,"mergeStatement":18,"BRANCH":19,"ID":20,"CHECKOUT":21,"MERGE":22,"COMMIT_TAG":23,"STR":24,"COMMIT":25,"commit_arg":26,"COMMIT_TYPE":27,"commitType":28,"COMMIT_ID":29,"COMMIT_MSG":30,"NORMAL":31,"REVERSE":32,"HIGHLIGHT":33,"openDirective":34,"typeDirective":35,"closeDirective":36,"argDirective":37,"open_directive":38,"type_directive":39,"arg_directive":40,"close_directive":41,";":42,"$accept":0,"$end":1},
+terminals_: {2:"error",6:"GG",8:"EOF",9:":",10:"DIR",13:"OPT",14:"NL",19:"BRANCH",20:"ID",21:"CHECKOUT",22:"MERGE",23:"COMMIT_TAG",24:"STR",25:"COMMIT",27:"COMMIT_TYPE",29:"COMMIT_ID",30:"COMMIT_MSG",31:"NORMAL",32:"REVERSE",33:"HIGHLIGHT",38:"open_directive",39:"type_directive",40:"arg_directive",41:"close_directive",42:";"},
+productions_: [0,[3,2],[3,2],[3,3],[3,4],[3,5],[7,0],[7,2],[11,2],[11,1],[12,0],[12,2],[15,2],[15,1],[16,1],[16,1],[16,2],[16,2],[18,2],[18,4],[17,2],[17,3],[17,3],[17,5],[17,5],[17,3],[17,5],[17,5],[17,5],[17,5],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,3],[17,5],[17,5],[17,5],[17,5],[17,5],[17,5],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,7],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[17,9],[26,0],[26,1],[28,1],[28,1],[28,1],[5,3],[5,5],[34,1],[35,1],[37,1],[36,1],[4,1],[4,1],[4,1]],
performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
/* this == yyval */
@@ -3670,241 +3670,244 @@ break;
case 12:
this.$ =$$[$0-1]
break;
-case 15:
+case 16:
yy.branch($$[$0])
break;
-case 16:
+case 17:
yy.checkout($$[$0])
break;
-case 17:
+case 18:
yy.merge($$[$0])
break;
-case 18:
-yy.commit($$[$0])
-break;
case 19:
-yy.commit('','',yy.commitType.NORMAL,$$[$0])
+yy.merge($$[$0-2], $$[$0])
break;
case 20:
-yy.commit('','',$$[$0],'')
+yy.commit($$[$0])
break;
case 21:
-yy.commit('','',$$[$0],$$[$0-2])
+yy.commit('','',yy.commitType.NORMAL,$$[$0])
break;
case 22:
-yy.commit('','',$$[$0-2],$$[$0])
+yy.commit('','',$$[$0],'')
break;
case 23:
-yy.commit('',$$[$0],yy.commitType.NORMAL,'')
+yy.commit('','',$$[$0],$$[$0-2])
break;
case 24:
-yy.commit('',$$[$0-2],yy.commitType.NORMAL,$$[$0])
+yy.commit('','',$$[$0-2],$$[$0])
break;
case 25:
-yy.commit('',$$[$0],yy.commitType.NORMAL,$$[$0-2])
+yy.commit('',$$[$0],yy.commitType.NORMAL,'')
break;
case 26:
-yy.commit('',$$[$0-2],$$[$0],'')
+yy.commit('',$$[$0-2],yy.commitType.NORMAL,$$[$0])
break;
case 27:
-yy.commit('',$$[$0],$$[$0-2],'')
+yy.commit('',$$[$0],yy.commitType.NORMAL,$$[$0-2])
break;
case 28:
-yy.commit('',$$[$0-4],$$[$0-2],$$[$0])
+yy.commit('',$$[$0-2],$$[$0],'')
break;
case 29:
-yy.commit('',$$[$0-4],$$[$0],$$[$0-2])
+yy.commit('',$$[$0],$$[$0-2],'')
break;
case 30:
-yy.commit('',$$[$0-2],$$[$0-4],$$[$0])
+yy.commit('',$$[$0-4],$$[$0-2],$$[$0])
break;
case 31:
-yy.commit('',$$[$0],$$[$0-4],$$[$0-2])
+yy.commit('',$$[$0-4],$$[$0],$$[$0-2])
break;
case 32:
-yy.commit('',$$[$0],$$[$0-2],$$[$0-4])
+yy.commit('',$$[$0-2],$$[$0-4],$$[$0])
break;
case 33:
-yy.commit('',$$[$0-2],$$[$0],$$[$0-4])
+yy.commit('',$$[$0],$$[$0-4],$$[$0-2])
break;
case 34:
-yy.commit($$[$0],'',yy.commitType.NORMAL,'')
+yy.commit('',$$[$0],$$[$0-2],$$[$0-4])
break;
case 35:
-yy.commit($$[$0],'',yy.commitType.NORMAL,$$[$0-2])
+yy.commit('',$$[$0-2],$$[$0],$$[$0-4])
break;
case 36:
-yy.commit($$[$0-2],'',yy.commitType.NORMAL,$$[$0])
+yy.commit($$[$0],'',yy.commitType.NORMAL,'')
break;
case 37:
-yy.commit($$[$0-2],'',$$[$0],'')
+yy.commit($$[$0],'',yy.commitType.NORMAL,$$[$0-2])
break;
case 38:
-yy.commit($$[$0],'',$$[$0-2],'')
+yy.commit($$[$0-2],'',yy.commitType.NORMAL,$$[$0])
break;
case 39:
-yy.commit($$[$0],$$[$0-2],yy.commitType.NORMAL,'')
+yy.commit($$[$0-2],'',$$[$0],'')
break;
case 40:
-yy.commit($$[$0-2],$$[$0],yy.commitType.NORMAL,'')
+yy.commit($$[$0],'',$$[$0-2],'')
break;
case 41:
-yy.commit($$[$0-4],'',$$[$0-2],$$[$0])
+yy.commit($$[$0],$$[$0-2],yy.commitType.NORMAL,'')
break;
case 42:
-yy.commit($$[$0-4],'',$$[$0],$$[$0-2])
+yy.commit($$[$0-2],$$[$0],yy.commitType.NORMAL,'')
break;
case 43:
-yy.commit($$[$0-2],'',$$[$0-4],$$[$0])
+yy.commit($$[$0-4],'',$$[$0-2],$$[$0])
break;
case 44:
-yy.commit($$[$0],'',$$[$0-4],$$[$0-2])
+yy.commit($$[$0-4],'',$$[$0],$$[$0-2])
break;
case 45:
-yy.commit($$[$0],'',$$[$0-2],$$[$0-4])
+yy.commit($$[$0-2],'',$$[$0-4],$$[$0])
break;
case 46:
-yy.commit($$[$0-2],'',$$[$0],$$[$0-4])
+yy.commit($$[$0],'',$$[$0-4],$$[$0-2])
break;
case 47:
-yy.commit($$[$0-4],$$[$0],$$[$0-2],'')
+yy.commit($$[$0],'',$$[$0-2],$$[$0-4])
break;
case 48:
-yy.commit($$[$0-4],$$[$0-2],$$[$0],'')
+yy.commit($$[$0-2],'',$$[$0],$$[$0-4])
break;
case 49:
-yy.commit($$[$0-2],$$[$0],$$[$0-4],'')
+yy.commit($$[$0-4],$$[$0],$$[$0-2],'')
break;
case 50:
-yy.commit($$[$0],$$[$0-2],$$[$0-4],'')
+yy.commit($$[$0-4],$$[$0-2],$$[$0],'')
break;
case 51:
-yy.commit($$[$0],$$[$0-4],$$[$0-2],'')
+yy.commit($$[$0-2],$$[$0],$$[$0-4],'')
break;
case 52:
-yy.commit($$[$0-2],$$[$0-4],$$[$0],'')
+yy.commit($$[$0],$$[$0-2],$$[$0-4],'')
break;
case 53:
-yy.commit($$[$0-4],$$[$0],yy.commitType.NORMAL,$$[$0-2])
+yy.commit($$[$0],$$[$0-4],$$[$0-2],'')
break;
case 54:
-yy.commit($$[$0-4],$$[$0-2],yy.commitType.NORMAL,$$[$0])
+yy.commit($$[$0-2],$$[$0-4],$$[$0],'')
break;
case 55:
-yy.commit($$[$0-2],$$[$0],yy.commitType.NORMAL,$$[$0-4])
+yy.commit($$[$0-4],$$[$0],yy.commitType.NORMAL,$$[$0-2])
break;
case 56:
-yy.commit($$[$0],$$[$0-2],yy.commitType.NORMAL,$$[$0-4])
+yy.commit($$[$0-4],$$[$0-2],yy.commitType.NORMAL,$$[$0])
break;
case 57:
-yy.commit($$[$0],$$[$0-4],yy.commitType.NORMAL,$$[$0-2])
+yy.commit($$[$0-2],$$[$0],yy.commitType.NORMAL,$$[$0-4])
break;
case 58:
-yy.commit($$[$0-2],$$[$0-4],yy.commitType.NORMAL,$$[$0])
+yy.commit($$[$0],$$[$0-2],yy.commitType.NORMAL,$$[$0-4])
break;
case 59:
-yy.commit($$[$0-6],$$[$0-4],$$[$0-2],$$[$0])
+yy.commit($$[$0],$$[$0-4],yy.commitType.NORMAL,$$[$0-2])
break;
case 60:
-yy.commit($$[$0-6],$$[$0-4],$$[$0],$$[$0-2])
+yy.commit($$[$0-2],$$[$0-4],yy.commitType.NORMAL,$$[$0])
break;
case 61:
-yy.commit($$[$0-6],$$[$0-2],$$[$0-4],$$[$0])
+yy.commit($$[$0-6],$$[$0-4],$$[$0-2],$$[$0])
break;
case 62:
-yy.commit($$[$0-6],$$[$0],$$[$0-4],$$[$0-2])
+yy.commit($$[$0-6],$$[$0-4],$$[$0],$$[$0-2])
break;
case 63:
-yy.commit($$[$0-6],$$[$0-2],$$[$0],$$[$0-4])
+yy.commit($$[$0-6],$$[$0-2],$$[$0-4],$$[$0])
break;
case 64:
-yy.commit($$[$0-6],$$[$0],$$[$0-2],$$[$0-4])
+yy.commit($$[$0-6],$$[$0],$$[$0-4],$$[$0-2])
break;
case 65:
-yy.commit($$[$0-4],$$[$0-6],$$[$0-2],$$[$0])
+yy.commit($$[$0-6],$$[$0-2],$$[$0],$$[$0-4])
break;
case 66:
-yy.commit($$[$0-4],$$[$0-6],$$[$0],$$[$0-2])
+yy.commit($$[$0-6],$$[$0],$$[$0-2],$$[$0-4])
break;
case 67:
-yy.commit($$[$0-2],$$[$0-6],$$[$0-4],$$[$0])
+yy.commit($$[$0-4],$$[$0-6],$$[$0-2],$$[$0])
break;
case 68:
-yy.commit($$[$0],$$[$0-6],$$[$0-4],$$[$0-2])
+yy.commit($$[$0-4],$$[$0-6],$$[$0],$$[$0-2])
break;
case 69:
-yy.commit($$[$0-2],$$[$0-6],$$[$0],$$[$0-4])
+yy.commit($$[$0-2],$$[$0-6],$$[$0-4],$$[$0])
break;
case 70:
-yy.commit($$[$0],$$[$0-6],$$[$0-2],$$[$0-4])
+yy.commit($$[$0],$$[$0-6],$$[$0-4],$$[$0-2])
break;
case 71:
-yy.commit($$[$0],$$[$0-4],$$[$0-2],$$[$0-6])
+yy.commit($$[$0-2],$$[$0-6],$$[$0],$$[$0-4])
break;
case 72:
-yy.commit($$[$0-2],$$[$0-4],$$[$0],$$[$0-6])
+yy.commit($$[$0],$$[$0-6],$$[$0-2],$$[$0-4])
break;
case 73:
-yy.commit($$[$0],$$[$0-2],$$[$0-4],$$[$0-6])
+yy.commit($$[$0],$$[$0-4],$$[$0-2],$$[$0-6])
break;
case 74:
-yy.commit($$[$0-2],$$[$0],$$[$0-4],$$[$0-6])
+yy.commit($$[$0-2],$$[$0-4],$$[$0],$$[$0-6])
break;
case 75:
-yy.commit($$[$0-4],$$[$0-2],$$[$0],$$[$0-6])
+yy.commit($$[$0],$$[$0-2],$$[$0-4],$$[$0-6])
break;
case 76:
-yy.commit($$[$0-4],$$[$0],$$[$0-2],$$[$0-6])
+yy.commit($$[$0-2],$$[$0],$$[$0-4],$$[$0-6])
break;
case 77:
-yy.commit($$[$0-2],$$[$0-4],$$[$0-6],$$[$0])
+yy.commit($$[$0-4],$$[$0-2],$$[$0],$$[$0-6])
break;
case 78:
-yy.commit($$[$0],$$[$0-4],$$[$0-6],$$[$0-2])
+yy.commit($$[$0-4],$$[$0],$$[$0-2],$$[$0-6])
break;
case 79:
-yy.commit($$[$0-2],$$[$0],$$[$0-6],$$[$0-4])
+yy.commit($$[$0-2],$$[$0-4],$$[$0-6],$$[$0])
break;
case 80:
-yy.commit($$[$0],$$[$0-2],$$[$0-6],$$[$0-4])
+yy.commit($$[$0],$$[$0-4],$$[$0-6],$$[$0-2])
break;
case 81:
-yy.commit($$[$0-4],$$[$0-2],$$[$0-6],$$[$0])
+yy.commit($$[$0-2],$$[$0],$$[$0-6],$$[$0-4])
break;
case 82:
-yy.commit($$[$0-4],$$[$0],$$[$0-6],$$[$0-2])
+yy.commit($$[$0],$$[$0-2],$$[$0-6],$$[$0-4])
break;
case 83:
-this.$ = ""
+yy.commit($$[$0-4],$$[$0-2],$$[$0-6],$$[$0])
break;
case 84:
-this.$=$$[$0]
+yy.commit($$[$0-4],$$[$0],$$[$0-6],$$[$0-2])
break;
case 85:
- this.$=yy.commitType.NORMAL;
+this.$ = ""
break;
case 86:
- this.$=yy.commitType.REVERSE;
+this.$=$$[$0]
break;
case 87:
+ this.$=yy.commitType.NORMAL;
+break;
+case 88:
+ this.$=yy.commitType.REVERSE;
+break;
+case 89:
this.$=yy.commitType.HIGHLIGHT;
break;
-case 90:
+case 92:
yy.parseDirective('%%{', 'open_directive');
break;
-case 91:
+case 93:
yy.parseDirective($$[$0], 'type_directive');
break;
-case 92:
+case 94:
$$[$0] = $$[$0].trim().replace(/'/g, '"'); yy.parseDirective($$[$0], 'arg_directive');
break;
-case 93:
+case 95:
yy.parseDirective('}%%', 'close_directive', 'gitGraph');
break;
}
},
-table: [{3:1,4:2,5:3,6:$V0,8:$V1,14:$V2,33:8,37:$V3,41:$V4},{1:[3]},{3:10,4:2,5:3,6:$V0,8:$V1,14:$V2,33:8,37:$V3,41:$V4},{3:11,4:2,5:3,6:$V0,8:$V1,14:$V2,33:8,37:$V3,41:$V4},{7:12,8:$V5,9:[1,13],10:[1,14],11:15,14:$V6},o($V7,[2,94]),o($V7,[2,95]),o($V7,[2,96]),{34:17,38:[1,18]},{38:[2,90]},{1:[2,1]},{1:[2,2]},{8:[1,19]},{7:20,8:$V5,11:15,14:$V6},{9:[1,21]},o($V8,[2,10],{12:22,13:[1,23]}),o($V9,[2,9]),{9:[1,25],35:24,40:$Va},o([9,40],[2,91]),{1:[2,3]},{8:[1,27]},{7:28,8:$V5,11:15,14:$V6},{8:[2,7],14:[1,31],15:29,16:30,17:32,18:[1,33],20:[1,34],21:[1,35],22:[1,36]},o($V9,[2,8]),o($Vb,[2,88]),{36:37,39:[1,38]},o($Vb,[2,93]),{1:[2,4]},{8:[1,39]},o($V8,[2,11]),{4:40,8:$V1,14:$V2,41:$V4},o($V8,[2,13]),o($Vc,[2,14]),{19:[1,41]},{19:[1,42]},{19:[1,43]},o($Vc,[2,83],{23:44,24:[1,45],25:[1,49],26:[1,46],28:[1,47],29:[1,48]}),{35:50,40:$Va},{40:[2,92]},{1:[2,5]},o($V8,[2,12]),o($Vc,[2,15]),o($Vc,[2,16]),o($Vc,[2,17]),o($Vc,[2,18]),{25:[1,51]},{27:52,30:$Vd,31:$Ve,32:$Vf},{25:[1,56]},{25:[1,57]},o($Vc,[2,84]),o($Vb,[2,89]),o($Vc,[2,19],{26:[1,58],28:[1,59],29:[1,60]}),o($Vc,[2,20],{24:[1,61],28:[1,62],29:[1,63]}),o($Vg,[2,85]),o($Vg,[2,86]),o($Vg,[2,87]),o($Vc,[2,23],{24:[1,64],26:[1,65],29:[1,66]}),o($Vc,[2,34],{24:[1,67],26:[1,68],28:[1,69]}),{27:70,30:$Vd,31:$Ve,32:$Vf},{25:[1,71]},{25:[1,72]},{25:[1,73]},{25:[1,74]},{25:[1,75]},{25:[1,76]},{27:77,30:$Vd,31:$Ve,32:$Vf},{25:[1,78]},{25:[1,79]},{27:80,30:$Vd,31:$Ve,32:$Vf},{25:[1,81]},o($Vc,[2,21],{28:[1,82],29:[1,83]}),o($Vc,[2,25],{26:[1,84],29:[1,85]}),o($Vc,[2,35],{26:[1,86],28:[1,87]}),o($Vc,[2,22],{28:[1,88],29:[1,89]}),o($Vc,[2,27],{24:[1,90],29:[1,91]}),o($Vc,[2,38],{24:[1,92],28:[1,93]}),o($Vc,[2,24],{26:[1,94],29:[1,95]}),o($Vc,[2,26],{24:[1,96],29:[1,97]}),o($Vc,[2,39],{24:[1,99],26:[1,98]}),o($Vc,[2,36],{26:[1,100],28:[1,101]}),o($Vc,[2,37],{24:[1,102],28:[1,103]}),o($Vc,[2,40],{24:[1,105],26:[1,104]}),{25:[1,106]},{25:[1,107]},{27:108,30:$Vd,31:$Ve,32:$Vf},{25:[1,109]},{27:110,30:$Vd,31:$Ve,32:$Vf},{25:[1,111]},{25:[1,112]},{25:[1,113]},{25:[1,114]},{25:[1,115]},{25:[1,116]},{25:[1,117]},{27:118,30:$Vd,31:$Ve,32:$Vf},{25:[1,119]},{25:[1,120]},{25:[1,121]},{27:122,30:$Vd,31:$Ve,32:$Vf},{25:[1,123]},{27:124,30:$Vd,31:$Ve,32:$Vf},{25:[1,125]},{25:[1,126]},{25:[1,127]},{27:128,30:$Vd,31:$Ve,32:$Vf},{25:[1,129]},o($Vc,[2,32],{29:[1,130]}),o($Vc,[2,45],{28:[1,131]}),o($Vc,[2,33],{29:[1,132]}),o($Vc,[2,56],{26:[1,133]}),o($Vc,[2,46],{28:[1,134]}),o($Vc,[2,55],{26:[1,135]}),o($Vc,[2,31],{29:[1,136]}),o($Vc,[2,44],{28:[1,137]}),o($Vc,[2,30],{29:[1,138]}),o($Vc,[2,50],{24:[1,139]}),o($Vc,[2,43],{28:[1,140]}),o($Vc,[2,49],{24:[1,141]}),o($Vc,[2,29],{29:[1,142]}),o($Vc,[2,57],{26:[1,143]}),o($Vc,[2,28],{29:[1,144]}),o($Vc,[2,51],{24:[1,145]}),o($Vc,[2,52],{24:[1,146]}),o($Vc,[2,58],{26:[1,147]}),o($Vc,[2,42],{28:[1,148]}),o($Vc,[2,53],{26:[1,149]}),o($Vc,[2,41],{28:[1,150]}),o($Vc,[2,47],{24:[1,151]}),o($Vc,[2,48],{24:[1,152]}),o($Vc,[2,54],{26:[1,153]}),{25:[1,154]},{25:[1,155]},{25:[1,156]},{27:157,30:$Vd,31:$Ve,32:$Vf},{25:[1,158]},{27:159,30:$Vd,31:$Ve,32:$Vf},{25:[1,160]},{25:[1,161]},{25:[1,162]},{25:[1,163]},{25:[1,164]},{25:[1,165]},{25:[1,166]},{27:167,30:$Vd,31:$Ve,32:$Vf},{25:[1,168]},{25:[1,169]},{25:[1,170]},{27:171,30:$Vd,31:$Ve,32:$Vf},{25:[1,172]},{27:173,30:$Vd,31:$Ve,32:$Vf},{25:[1,174]},{25:[1,175]},{25:[1,176]},{27:177,30:$Vd,31:$Ve,32:$Vf},o($Vc,[2,73]),o($Vc,[2,74]),o($Vc,[2,71]),o($Vc,[2,72]),o($Vc,[2,76]),o($Vc,[2,75]),o($Vc,[2,80]),o($Vc,[2,79]),o($Vc,[2,78]),o($Vc,[2,77]),o($Vc,[2,82]),o($Vc,[2,81]),o($Vc,[2,70]),o($Vc,[2,69]),o($Vc,[2,68]),o($Vc,[2,67]),o($Vc,[2,65]),o($Vc,[2,66]),o($Vc,[2,64]),o($Vc,[2,63]),o($Vc,[2,62]),o($Vc,[2,61]),o($Vc,[2,59]),o($Vc,[2,60])],
-defaultActions: {9:[2,90],10:[2,1],11:[2,2],19:[2,3],27:[2,4],38:[2,92],39:[2,5]},
+table: [{3:1,4:2,5:3,6:$V0,8:$V1,14:$V2,34:8,38:$V3,42:$V4},{1:[3]},{3:10,4:2,5:3,6:$V0,8:$V1,14:$V2,34:8,38:$V3,42:$V4},{3:11,4:2,5:3,6:$V0,8:$V1,14:$V2,34:8,38:$V3,42:$V4},{7:12,8:$V5,9:[1,13],10:[1,14],11:15,14:$V6},o($V7,[2,96]),o($V7,[2,97]),o($V7,[2,98]),{35:17,39:[1,18]},{39:[2,92]},{1:[2,1]},{1:[2,2]},{8:[1,19]},{7:20,8:$V5,11:15,14:$V6},{9:[1,21]},o($V8,[2,10],{12:22,13:[1,23]}),o($V9,[2,9]),{9:[1,25],36:24,41:$Va},o([9,41],[2,93]),{1:[2,3]},{8:[1,27]},{7:28,8:$V5,11:15,14:$V6},{8:[2,7],14:[1,31],15:29,16:30,17:32,18:33,19:[1,34],21:[1,35],22:[1,37],25:[1,36]},o($V9,[2,8]),o($Vb,[2,90]),{37:38,40:[1,39]},o($Vb,[2,95]),{1:[2,4]},{8:[1,40]},o($V8,[2,11]),{4:41,8:$V1,14:$V2,42:$V4},o($V8,[2,13]),o($Vc,[2,14]),o($Vc,[2,15]),{20:[1,42]},{20:[1,43]},o($Vc,[2,85],{26:44,23:[1,45],24:[1,49],27:[1,46],29:[1,47],30:[1,48]}),{20:[1,50]},{36:51,41:$Va},{41:[2,94]},{1:[2,5]},o($V8,[2,12]),o($Vc,[2,16]),o($Vc,[2,17]),o($Vc,[2,20]),{24:[1,52]},{28:53,31:$Vd,32:$Ve,33:$Vf},{24:[1,57]},{24:[1,58]},o($Vc,[2,86]),o($Vc,[2,18],{23:[1,59]}),o($Vb,[2,91]),o($Vc,[2,21],{27:[1,60],29:[1,61],30:[1,62]}),o($Vc,[2,22],{23:[1,63],29:[1,64],30:[1,65]}),o($Vg,[2,87]),o($Vg,[2,88]),o($Vg,[2,89]),o($Vc,[2,25],{23:[1,66],27:[1,67],30:[1,68]}),o($Vc,[2,36],{23:[1,69],27:[1,70],29:[1,71]}),{24:[1,72]},{28:73,31:$Vd,32:$Ve,33:$Vf},{24:[1,74]},{24:[1,75]},{24:[1,76]},{24:[1,77]},{24:[1,78]},{24:[1,79]},{28:80,31:$Vd,32:$Ve,33:$Vf},{24:[1,81]},{24:[1,82]},{28:83,31:$Vd,32:$Ve,33:$Vf},{24:[1,84]},o($Vc,[2,19]),o($Vc,[2,23],{29:[1,85],30:[1,86]}),o($Vc,[2,27],{27:[1,87],30:[1,88]}),o($Vc,[2,37],{27:[1,89],29:[1,90]}),o($Vc,[2,24],{29:[1,91],30:[1,92]}),o($Vc,[2,29],{23:[1,93],30:[1,94]}),o($Vc,[2,40],{23:[1,95],29:[1,96]}),o($Vc,[2,26],{27:[1,97],30:[1,98]}),o($Vc,[2,28],{23:[1,99],30:[1,100]}),o($Vc,[2,41],{23:[1,102],27:[1,101]}),o($Vc,[2,38],{27:[1,103],29:[1,104]}),o($Vc,[2,39],{23:[1,105],29:[1,106]}),o($Vc,[2,42],{23:[1,108],27:[1,107]}),{24:[1,109]},{24:[1,110]},{28:111,31:$Vd,32:$Ve,33:$Vf},{24:[1,112]},{28:113,31:$Vd,32:$Ve,33:$Vf},{24:[1,114]},{24:[1,115]},{24:[1,116]},{24:[1,117]},{24:[1,118]},{24:[1,119]},{24:[1,120]},{28:121,31:$Vd,32:$Ve,33:$Vf},{24:[1,122]},{24:[1,123]},{24:[1,124]},{28:125,31:$Vd,32:$Ve,33:$Vf},{24:[1,126]},{28:127,31:$Vd,32:$Ve,33:$Vf},{24:[1,128]},{24:[1,129]},{24:[1,130]},{28:131,31:$Vd,32:$Ve,33:$Vf},{24:[1,132]},o($Vc,[2,34],{30:[1,133]}),o($Vc,[2,47],{29:[1,134]}),o($Vc,[2,35],{30:[1,135]}),o($Vc,[2,58],{27:[1,136]}),o($Vc,[2,48],{29:[1,137]}),o($Vc,[2,57],{27:[1,138]}),o($Vc,[2,33],{30:[1,139]}),o($Vc,[2,46],{29:[1,140]}),o($Vc,[2,32],{30:[1,141]}),o($Vc,[2,52],{23:[1,142]}),o($Vc,[2,45],{29:[1,143]}),o($Vc,[2,51],{23:[1,144]}),o($Vc,[2,31],{30:[1,145]}),o($Vc,[2,59],{27:[1,146]}),o($Vc,[2,30],{30:[1,147]}),o($Vc,[2,53],{23:[1,148]}),o($Vc,[2,54],{23:[1,149]}),o($Vc,[2,60],{27:[1,150]}),o($Vc,[2,44],{29:[1,151]}),o($Vc,[2,55],{27:[1,152]}),o($Vc,[2,43],{29:[1,153]}),o($Vc,[2,49],{23:[1,154]}),o($Vc,[2,50],{23:[1,155]}),o($Vc,[2,56],{27:[1,156]}),{24:[1,157]},{24:[1,158]},{24:[1,159]},{28:160,31:$Vd,32:$Ve,33:$Vf},{24:[1,161]},{28:162,31:$Vd,32:$Ve,33:$Vf},{24:[1,163]},{24:[1,164]},{24:[1,165]},{24:[1,166]},{24:[1,167]},{24:[1,168]},{24:[1,169]},{28:170,31:$Vd,32:$Ve,33:$Vf},{24:[1,171]},{24:[1,172]},{24:[1,173]},{28:174,31:$Vd,32:$Ve,33:$Vf},{24:[1,175]},{28:176,31:$Vd,32:$Ve,33:$Vf},{24:[1,177]},{24:[1,178]},{24:[1,179]},{28:180,31:$Vd,32:$Ve,33:$Vf},o($Vc,[2,75]),o($Vc,[2,76]),o($Vc,[2,73]),o($Vc,[2,74]),o($Vc,[2,78]),o($Vc,[2,77]),o($Vc,[2,82]),o($Vc,[2,81]),o($Vc,[2,80]),o($Vc,[2,79]),o($Vc,[2,84]),o($Vc,[2,83]),o($Vc,[2,72]),o($Vc,[2,71]),o($Vc,[2,70]),o($Vc,[2,69]),o($Vc,[2,67]),o($Vc,[2,68]),o($Vc,[2,66]),o($Vc,[2,65]),o($Vc,[2,64]),o($Vc,[2,63]),o($Vc,[2,61]),o($Vc,[2,62])],
+defaultActions: {9:[2,92],10:[2,1],11:[2,2],19:[2,3],27:[2,4],39:[2,94],40:[2,5]},
parseError: function parseError (str, hash) {
if (hash.recoverable) {
this.trace(str);
@@ -4382,15 +4385,15 @@ options: {"case-insensitive":true},
performAction: function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
var YYSTATE=YY_START;
switch($avoiding_name_collisions) {
-case 0: this.begin('open_directive'); return 37;
+case 0: this.begin('open_directive'); return 38;
break;
-case 1: this.begin('type_directive'); return 38;
+case 1: this.begin('type_directive'); return 39;
break;
case 2: this.popState(); this.begin('arg_directive'); return 9;
break;
-case 3: this.popState(); this.popState(); return 40;
+case 3: this.popState(); this.popState(); return 41;
break;
-case 4:return 39;
+case 4:return 40;
break;
case 5:/*{console.log('New line');return 14;}*/ return 14;
break;
@@ -4402,27 +4405,27 @@ case 8:/* skip comments */
break;
case 9:return 6;
break;
-case 10:return 22;
+case 10:return 25;
break;
-case 11:return 28;
+case 11:return 29;
break;
-case 12:return 26;
+case 12:return 27;
break;
-case 13:return 29;
+case 13:return 30;
break;
-case 14:return 30;
+case 14:return 31;
break;
-case 15:return 31;
+case 15:return 32;
break;
-case 16:return 32;
+case 16:return 33;
break;
-case 17:return 24;
+case 17:return 23;
break;
-case 18:return 18;
+case 18:return 19;
break;
-case 19:return 21;
+case 19:return 22;
break;
-case 20:return 20;
+case 20:return 21;
break;
case 21:return 10;
break;
@@ -4432,25 +4435,25 @@ case 23:return 9;
break;
case 24:return 'CARET'
break;
-case 25:this.begin("options");
+case 25:this.begin("options"); //
break;
-case 26:this.popState();
+case 26:this.popState(); // not used anymore in the renderer, fixed for backward compatibility
break;
-case 27:return 13;
+case 27:return 13; //
break;
case 28:this.begin("string");
break;
case 29:this.popState();
break;
-case 30:return 25;
+case 30:return 24;
break;
-case 31:return 19;
+case 31:return 20;
break;
case 32:return 8;
break;
}
},
-rules: [/^(?:%%\{)/i,/^(?:((?:(?!\}%%)[^:.])*))/i,/^(?::)/i,/^(?:\}%%)/i,/^(?:((?:(?!\}%%).|\n)*))/i,/^(?:(\r?\n)+)/i,/^(?:\s+)/i,/^(?:#[^\n]*)/i,/^(?:%[^\n]*)/i,/^(?:gitGraph\b)/i,/^(?:commit\b)/i,/^(?:id:)/i,/^(?:type:)/i,/^(?:msg:)/i,/^(?:NORMAL\b)/i,/^(?:REVERSE\b)/i,/^(?:HIGHLIGHT\b)/i,/^(?:tag:)/i,/^(?:branch\b)/i,/^(?:merge\b)/i,/^(?:checkout\b)/i,/^(?:LR\b)/i,/^(?:BT\b)/i,/^(?::)/i,/^(?:\^)/i,/^(?:options\r?\n)/i,/^(?:end\r?\n)/i,/^(?:[^\n]+\r?\n)/i,/^(?:["])/i,/^(?:["])/i,/^(?:[^"]*)/i,/^(?:[a-zA-Z][-_\.a-zA-Z0-9]*[-_a-zA-Z0-9])/i,/^(?:$)/i],
+rules: [/^(?:%%\{)/i,/^(?:((?:(?!\}%%)[^:.])*))/i,/^(?::)/i,/^(?:\}%%)/i,/^(?:((?:(?!\}%%).|\n)*))/i,/^(?:(\r?\n)+)/i,/^(?:\s+)/i,/^(?:#[^\n]*)/i,/^(?:%[^\n]*)/i,/^(?:gitGraph\b)/i,/^(?:commit\b)/i,/^(?:id:)/i,/^(?:type:)/i,/^(?:msg:)/i,/^(?:NORMAL\b)/i,/^(?:REVERSE\b)/i,/^(?:HIGHLIGHT\b)/i,/^(?:tag:)/i,/^(?:branch\b)/i,/^(?:merge\b)/i,/^(?:checkout\b)/i,/^(?:LR\b)/i,/^(?:BT\b)/i,/^(?::)/i,/^(?:\^)/i,/^(?:options\r?\n)/i,/^(?:[ \r\n\t]+end\b)/i,/^(?:[\s\S]+(?=[ \r\n\t]+end))/i,/^(?:["])/i,/^(?:["])/i,/^(?:[^"]*)/i,/^(?:[a-zA-Z][-_\./a-zA-Z0-9]*[-_a-zA-Z0-9])/i,/^(?:$)/i],
conditions: {"close_directive":{"rules":[],"inclusive":false},"arg_directive":{"rules":[3,4],"inclusive":false},"type_directive":{"rules":[2,3],"inclusive":false},"open_directive":{"rules":[1],"inclusive":false},"options":{"rules":[26,27],"inclusive":false},"string":{"rules":[29,30],"inclusive":false},"INITIAL":{"rules":[0,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,28,31,32],"inclusive":true}}
});
return lexer;
@@ -6694,12 +6697,12 @@ if ( true && __webpack_require__.c[__webpack_require__.s] === module) {
}
*/
var parser = (function(){
-var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,2],$V1=[1,3],$V2=[1,5],$V3=[1,7],$V4=[2,5],$V5=[1,15],$V6=[1,17],$V7=[1,18],$V8=[1,19],$V9=[1,21],$Va=[1,22],$Vb=[1,23],$Vc=[1,29],$Vd=[1,30],$Ve=[1,31],$Vf=[1,32],$Vg=[1,33],$Vh=[1,34],$Vi=[1,35],$Vj=[1,36],$Vk=[1,39],$Vl=[1,40],$Vm=[1,41],$Vn=[1,42],$Vo=[1,43],$Vp=[1,44],$Vq=[1,47],$Vr=[1,4,5,16,20,22,23,24,30,31,32,33,34,35,36,37,39,41,42,43,48,49,50,51,59,69],$Vs=[4,5,16,20,22,23,24,30,31,32,33,34,35,36,37,39,43,48,49,50,51,59,69],$Vt=[4,5,16,20,22,23,24,30,31,32,33,34,35,36,37,39,42,43,48,49,50,51,59,69],$Vu=[4,5,16,20,22,23,24,30,31,32,33,34,35,36,37,39,41,43,48,49,50,51,59,69],$Vv=[57,58,59],$Vw=[1,104],$Vx=[1,4,5,7,16,20,22,23,24,30,31,32,33,34,35,36,37,39,41,42,43,48,49,50,51,59,69];
+var o=function(k,v,o,l){for(o=o||{},l=k.length;l--;o[k[l]]=v);return o},$V0=[1,2],$V1=[1,3],$V2=[1,5],$V3=[1,7],$V4=[2,5],$V5=[1,15],$V6=[1,17],$V7=[1,18],$V8=[1,19],$V9=[1,21],$Va=[1,22],$Vb=[1,23],$Vc=[1,29],$Vd=[1,30],$Ve=[1,31],$Vf=[1,32],$Vg=[1,33],$Vh=[1,34],$Vi=[1,35],$Vj=[1,36],$Vk=[1,39],$Vl=[1,40],$Vm=[1,41],$Vn=[1,42],$Vo=[1,43],$Vp=[1,44],$Vq=[1,47],$Vr=[1,4,5,16,20,22,25,26,32,33,34,35,36,37,38,39,41,43,44,45,50,51,52,53,61,71],$Vs=[4,5,16,20,22,25,26,32,33,34,35,36,37,38,39,41,45,50,51,52,53,61,71],$Vt=[4,5,16,20,22,25,26,32,33,34,35,36,37,38,39,41,44,45,50,51,52,53,61,71],$Vu=[4,5,16,20,22,25,26,32,33,34,35,36,37,38,39,41,43,45,50,51,52,53,61,71],$Vv=[59,60,61],$Vw=[1,110],$Vx=[1,4,5,7,16,20,22,25,26,32,33,34,35,36,37,38,39,41,43,44,45,50,51,52,53,61,71];
var parser = {trace: function trace () { },
yy: {},
-symbols_: {"error":2,"start":3,"SPACE":4,"NEWLINE":5,"directive":6,"SD":7,"document":8,"line":9,"statement":10,"openDirective":11,"typeDirective":12,"closeDirective":13,":":14,"argDirective":15,"participant":16,"actor":17,"AS":18,"restOfLine":19,"participant_actor":20,"signal":21,"autonumber":22,"activate":23,"deactivate":24,"note_statement":25,"links_statement":26,"link_statement":27,"properties_statement":28,"details_statement":29,"title":30,"legacy_title":31,"accDescription":32,"loop":33,"end":34,"rect":35,"opt":36,"alt":37,"else_sections":38,"par":39,"par_sections":40,"and":41,"else":42,"note":43,"placement":44,"text2":45,"over":46,"actor_pair":47,"links":48,"link":49,"properties":50,"details":51,"spaceList":52,",":53,"left_of":54,"right_of":55,"signaltype":56,"+":57,"-":58,"ACTOR":59,"SOLID_OPEN_ARROW":60,"DOTTED_OPEN_ARROW":61,"SOLID_ARROW":62,"DOTTED_ARROW":63,"SOLID_CROSS":64,"DOTTED_CROSS":65,"SOLID_POINT":66,"DOTTED_POINT":67,"TXT":68,"open_directive":69,"type_directive":70,"arg_directive":71,"close_directive":72,"$accept":0,"$end":1},
-terminals_: {2:"error",4:"SPACE",5:"NEWLINE",7:"SD",14:":",16:"participant",18:"AS",19:"restOfLine",20:"participant_actor",22:"autonumber",23:"activate",24:"deactivate",30:"title",31:"legacy_title",32:"accDescription",33:"loop",34:"end",35:"rect",36:"opt",37:"alt",39:"par",41:"and",42:"else",43:"note",46:"over",48:"links",49:"link",50:"properties",51:"details",53:",",54:"left_of",55:"right_of",57:"+",58:"-",59:"ACTOR",60:"SOLID_OPEN_ARROW",61:"DOTTED_OPEN_ARROW",62:"SOLID_ARROW",63:"DOTTED_ARROW",64:"SOLID_CROSS",65:"DOTTED_CROSS",66:"SOLID_POINT",67:"DOTTED_POINT",68:"TXT",69:"open_directive",70:"type_directive",71:"arg_directive",72:"close_directive"},
-productions_: [0,[3,2],[3,2],[3,2],[3,2],[8,0],[8,2],[9,2],[9,1],[9,1],[6,4],[6,6],[10,5],[10,3],[10,5],[10,3],[10,2],[10,1],[10,3],[10,3],[10,2],[10,2],[10,2],[10,2],[10,2],[10,1],[10,1],[10,1],[10,4],[10,4],[10,4],[10,4],[10,4],[10,1],[40,1],[40,4],[38,1],[38,4],[25,4],[25,4],[26,3],[27,3],[28,3],[29,3],[52,2],[52,1],[47,3],[47,1],[44,1],[44,1],[21,5],[21,5],[21,4],[17,1],[56,1],[56,1],[56,1],[56,1],[56,1],[56,1],[56,1],[56,1],[45,1],[11,1],[12,1],[15,1],[13,1]],
+symbols_: {"error":2,"start":3,"SPACE":4,"NEWLINE":5,"directive":6,"SD":7,"document":8,"line":9,"statement":10,"openDirective":11,"typeDirective":12,"closeDirective":13,":":14,"argDirective":15,"participant":16,"actor":17,"AS":18,"restOfLine":19,"participant_actor":20,"signal":21,"autonumber":22,"NUM":23,"off":24,"activate":25,"deactivate":26,"note_statement":27,"links_statement":28,"link_statement":29,"properties_statement":30,"details_statement":31,"title":32,"legacy_title":33,"accDescription":34,"loop":35,"end":36,"rect":37,"opt":38,"alt":39,"else_sections":40,"par":41,"par_sections":42,"and":43,"else":44,"note":45,"placement":46,"text2":47,"over":48,"actor_pair":49,"links":50,"link":51,"properties":52,"details":53,"spaceList":54,",":55,"left_of":56,"right_of":57,"signaltype":58,"+":59,"-":60,"ACTOR":61,"SOLID_OPEN_ARROW":62,"DOTTED_OPEN_ARROW":63,"SOLID_ARROW":64,"DOTTED_ARROW":65,"SOLID_CROSS":66,"DOTTED_CROSS":67,"SOLID_POINT":68,"DOTTED_POINT":69,"TXT":70,"open_directive":71,"type_directive":72,"arg_directive":73,"close_directive":74,"$accept":0,"$end":1},
+terminals_: {2:"error",4:"SPACE",5:"NEWLINE",7:"SD",14:":",16:"participant",18:"AS",19:"restOfLine",20:"participant_actor",22:"autonumber",23:"NUM",24:"off",25:"activate",26:"deactivate",32:"title",33:"legacy_title",34:"accDescription",35:"loop",36:"end",37:"rect",38:"opt",39:"alt",41:"par",43:"and",44:"else",45:"note",48:"over",50:"links",51:"link",52:"properties",53:"details",55:",",56:"left_of",57:"right_of",59:"+",60:"-",61:"ACTOR",62:"SOLID_OPEN_ARROW",63:"DOTTED_OPEN_ARROW",64:"SOLID_ARROW",65:"DOTTED_ARROW",66:"SOLID_CROSS",67:"DOTTED_CROSS",68:"SOLID_POINT",69:"DOTTED_POINT",70:"TXT",71:"open_directive",72:"type_directive",73:"arg_directive",74:"close_directive"},
+productions_: [0,[3,2],[3,2],[3,2],[3,2],[8,0],[8,2],[9,2],[9,1],[9,1],[6,4],[6,6],[10,5],[10,3],[10,5],[10,3],[10,2],[10,4],[10,3],[10,3],[10,2],[10,3],[10,3],[10,2],[10,2],[10,2],[10,2],[10,2],[10,1],[10,1],[10,1],[10,4],[10,4],[10,4],[10,4],[10,4],[10,1],[42,1],[42,4],[40,1],[40,4],[27,4],[27,4],[28,3],[29,3],[30,3],[31,3],[54,2],[54,1],[49,3],[49,1],[46,1],[46,1],[21,5],[21,5],[21,4],[17,1],[58,1],[58,1],[58,1],[58,1],[58,1],[58,1],[58,1],[58,1],[47,1],[11,1],[12,1],[15,1],[13,1]],
performAction: function anonymous(yytext, yyleng, yylineno, yy, yystate /* action[1] */, $$ /* vstack */, _$ /* lstack */) {
/* this == yyval */
@@ -6733,42 +6736,51 @@ case 15:
$$[$0-1].type='addActor'; this.$=$$[$0-1];
break;
case 17:
-yy.enableSequenceNumbers()
+ this.$= {type:'sequenceIndex',sequenceIndex: Number($$[$0-2]), sequenceIndexStep:Number($$[$0-1]), sequenceVisible:true, signalType:yy.LINETYPE.AUTONUMBER};
break;
case 18:
-this.$={type: 'activeStart', signalType: yy.LINETYPE.ACTIVE_START, actor: $$[$0-1]};
+ this.$ = {type:'sequenceIndex',sequenceIndex: Number($$[$0-1]), sequenceIndexStep:1, sequenceVisible:true, signalType:yy.LINETYPE.AUTONUMBER};
break;
case 19:
+ this.$ = {type:'sequenceIndex', sequenceVisible:false, signalType:yy.LINETYPE.AUTONUMBER};
+break;
+case 20:
+this.$ = {type:'sequenceIndex', sequenceVisible:true, signalType:yy.LINETYPE.AUTONUMBER};
+break;
+case 21:
+this.$={type: 'activeStart', signalType: yy.LINETYPE.ACTIVE_START, actor: $$[$0-1]};
+break;
+case 22:
this.$={type: 'activeEnd', signalType: yy.LINETYPE.ACTIVE_END, actor: $$[$0-1]};
break;
-case 25:
+case 28:
yy.setTitle($$[$0].substring(6));this.$=$$[$0].substring(6);
break;
-case 26:
+case 29:
yy.setTitle($$[$0].substring(7));this.$=$$[$0].substring(7);
break;
-case 27:
+case 30:
yy.setAccDescription($$[$0].substring(15));this.$=$$[$0].substring(15);
break;
-case 28:
+case 31:
$$[$0-1].unshift({type: 'loopStart', loopText:yy.parseMessage($$[$0-2]), signalType: yy.LINETYPE.LOOP_START});
$$[$0-1].push({type: 'loopEnd', loopText:$$[$0-2], signalType: yy.LINETYPE.LOOP_END});
this.$=$$[$0-1];
break;
-case 29:
+case 32:
$$[$0-1].unshift({type: 'rectStart', color:yy.parseMessage($$[$0-2]), signalType: yy.LINETYPE.RECT_START });
$$[$0-1].push({type: 'rectEnd', color:yy.parseMessage($$[$0-2]), signalType: yy.LINETYPE.RECT_END });
this.$=$$[$0-1];
break;
-case 30:
+case 33:
$$[$0-1].unshift({type: 'optStart', optText:yy.parseMessage($$[$0-2]), signalType: yy.LINETYPE.OPT_START});
$$[$0-1].push({type: 'optEnd', optText:yy.parseMessage($$[$0-2]), signalType: yy.LINETYPE.OPT_END});
this.$=$$[$0-1];
break;
-case 31:
+case 34:
// Alt start
$$[$0-1].unshift({type: 'altStart', altText:yy.parseMessage($$[$0-2]), signalType: yy.LINETYPE.ALT_START});
@@ -6777,7 +6789,7 @@ case 31:
$$[$0-1].push({type: 'altEnd', signalType: yy.LINETYPE.ALT_END});
this.$=$$[$0-1];
break;
-case 32:
+case 35:
// Parallel start
$$[$0-1].unshift({type: 'parStart', parText:yy.parseMessage($$[$0-2]), signalType: yy.LINETYPE.PAR_START});
@@ -6786,17 +6798,17 @@ case 32:
$$[$0-1].push({type: 'parEnd', signalType: yy.LINETYPE.PAR_END});
this.$=$$[$0-1];
break;
-case 35:
+case 38:
this.$ = $$[$0-3].concat([{type: 'and', parText:yy.parseMessage($$[$0-1]), signalType: yy.LINETYPE.PAR_AND}, $$[$0]]);
break;
-case 37:
+case 40:
this.$ = $$[$0-3].concat([{type: 'else', altText:yy.parseMessage($$[$0-1]), signalType: yy.LINETYPE.ALT_ELSE}, $$[$0]]);
break;
-case 38:
+case 41:
this.$ = [$$[$0-1], {type:'addNote', placement:$$[$0-2], actor:$$[$0-1].actor, text:$$[$0]}];
break;
-case 39:
+case 42:
// Coerce actor_pair into a [to, from, ...] array
$$[$0-2] = [].concat($$[$0-1], $$[$0-1]).slice(0, 2);
@@ -6804,97 +6816,97 @@ case 39:
$$[$0-2][1] = $$[$0-2][1].actor;
this.$ = [$$[$0-1], {type:'addNote', placement:yy.PLACEMENT.OVER, actor:$$[$0-2].slice(0, 2), text:$$[$0]}];
break;
-case 40:
+case 43:
this.$ = [$$[$0-1], {type:'addLinks', actor:$$[$0-1].actor, text:$$[$0]}];
break;
-case 41:
+case 44:
this.$ = [$$[$0-1], {type:'addALink', actor:$$[$0-1].actor, text:$$[$0]}];
break;
-case 42:
+case 45:
this.$ = [$$[$0-1], {type:'addProperties', actor:$$[$0-1].actor, text:$$[$0]}];
break;
-case 43:
+case 46:
this.$ = [$$[$0-1], {type:'addDetails', actor:$$[$0-1].actor, text:$$[$0]}];
break;
-case 46:
+case 49:
this.$ = [$$[$0-2], $$[$0]];
break;
-case 47:
+case 50:
this.$ = $$[$0];
break;
-case 48:
+case 51:
this.$ = yy.PLACEMENT.LEFTOF;
break;
-case 49:
+case 52:
this.$ = yy.PLACEMENT.RIGHTOF;
break;
-case 50:
+case 53:
this.$ = [$$[$0-4],$$[$0-1],{type: 'addMessage', from:$$[$0-4].actor, to:$$[$0-1].actor, signalType:$$[$0-3], msg:$$[$0]},
{type: 'activeStart', signalType: yy.LINETYPE.ACTIVE_START, actor: $$[$0-1]}
]
break;
-case 51:
+case 54:
this.$ = [$$[$0-4],$$[$0-1],{type: 'addMessage', from:$$[$0-4].actor, to:$$[$0-1].actor, signalType:$$[$0-3], msg:$$[$0]},
{type: 'activeEnd', signalType: yy.LINETYPE.ACTIVE_END, actor: $$[$0-4]}
]
break;
-case 52:
+case 55:
this.$ = [$$[$0-3],$$[$0-1],{type: 'addMessage', from:$$[$0-3].actor, to:$$[$0-1].actor, signalType:$$[$0-2], msg:$$[$0]}]
break;
-case 53:
+case 56:
this.$={ type: 'addParticipant', actor:$$[$0]}
break;
-case 54:
+case 57:
this.$ = yy.LINETYPE.SOLID_OPEN;
break;
-case 55:
+case 58:
this.$ = yy.LINETYPE.DOTTED_OPEN;
break;
-case 56:
+case 59:
this.$ = yy.LINETYPE.SOLID;
break;
-case 57:
+case 60:
this.$ = yy.LINETYPE.DOTTED;
break;
-case 58:
+case 61:
this.$ = yy.LINETYPE.SOLID_CROSS;
break;
-case 59:
+case 62:
this.$ = yy.LINETYPE.DOTTED_CROSS;
break;
-case 60:
+case 63:
this.$ = yy.LINETYPE.SOLID_POINT;
break;
-case 61:
+case 64:
this.$ = yy.LINETYPE.DOTTED_POINT;
break;
-case 62:
+case 65:
this.$ = yy.parseMessage($$[$0].trim().substring(1))
break;
-case 63:
+case 66:
yy.parseDirective('%%{', 'open_directive');
break;
-case 64:
+case 67:
yy.parseDirective($$[$0], 'type_directive');
break;
-case 65:
+case 68:
$$[$0] = $$[$0].trim().replace(/'/g, '"'); yy.parseDirective($$[$0], 'arg_directive');
break;
-case 66:
+case 69:
yy.parseDirective('}%%', 'close_directive', 'sequence');
break;
}
},
-table: [{3:1,4:$V0,5:$V1,6:4,7:$V2,11:6,69:$V3},{1:[3]},{3:8,4:$V0,5:$V1,6:4,7:$V2,11:6,69:$V3},{3:9,4:$V0,5:$V1,6:4,7:$V2,11:6,69:$V3},{3:10,4:$V0,5:$V1,6:4,7:$V2,11:6,69:$V3},o([1,4,5,16,20,22,23,24,30,31,32,33,35,36,37,39,43,48,49,50,51,59,69],$V4,{8:11}),{12:12,70:[1,13]},{70:[2,63]},{1:[2,1]},{1:[2,2]},{1:[2,3]},{1:[2,4],4:$V5,5:$V6,6:37,9:14,10:16,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,23:$Va,24:$Vb,25:24,26:25,27:26,28:27,29:28,30:$Vc,31:$Vd,32:$Ve,33:$Vf,35:$Vg,36:$Vh,37:$Vi,39:$Vj,43:$Vk,48:$Vl,49:$Vm,50:$Vn,51:$Vo,59:$Vp,69:$V3},{13:45,14:[1,46],72:$Vq},o([14,72],[2,64]),o($Vr,[2,6]),{6:37,10:48,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,23:$Va,24:$Vb,25:24,26:25,27:26,28:27,29:28,30:$Vc,31:$Vd,32:$Ve,33:$Vf,35:$Vg,36:$Vh,37:$Vi,39:$Vj,43:$Vk,48:$Vl,49:$Vm,50:$Vn,51:$Vo,59:$Vp,69:$V3},o($Vr,[2,8]),o($Vr,[2,9]),{17:49,59:$Vp},{17:50,59:$Vp},{5:[1,51]},o($Vr,[2,17]),{17:52,59:$Vp},{17:53,59:$Vp},{5:[1,54]},{5:[1,55]},{5:[1,56]},{5:[1,57]},{5:[1,58]},o($Vr,[2,25]),o($Vr,[2,26]),o($Vr,[2,27]),{19:[1,59]},{19:[1,60]},{19:[1,61]},{19:[1,62]},{19:[1,63]},o($Vr,[2,33]),{56:64,60:[1,65],61:[1,66],62:[1,67],63:[1,68],64:[1,69],65:[1,70],66:[1,71],67:[1,72]},{44:73,46:[1,74],54:[1,75],55:[1,76]},{17:77,59:$Vp},{17:78,59:$Vp},{17:79,59:$Vp},{17:80,59:$Vp},o([5,18,53,60,61,62,63,64,65,66,67,68],[2,53]),{5:[1,81]},{15:82,71:[1,83]},{5:[2,66]},o($Vr,[2,7]),{5:[1,85],18:[1,84]},{5:[1,87],18:[1,86]},o($Vr,[2,16]),{5:[1,88]},{5:[1,89]},o($Vr,[2,20]),o($Vr,[2,21]),o($Vr,[2,22]),o($Vr,[2,23]),o($Vr,[2,24]),o($Vs,$V4,{8:90}),o($Vs,$V4,{8:91}),o($Vs,$V4,{8:92}),o($Vt,$V4,{38:93,8:94}),o($Vu,$V4,{40:95,8:96}),{17:99,57:[1,97],58:[1,98],59:$Vp},o($Vv,[2,54]),o($Vv,[2,55]),o($Vv,[2,56]),o($Vv,[2,57]),o($Vv,[2,58]),o($Vv,[2,59]),o($Vv,[2,60]),o($Vv,[2,61]),{17:100,59:$Vp},{17:102,47:101,59:$Vp},{59:[2,48]},{59:[2,49]},{45:103,68:$Vw},{45:105,68:$Vw},{45:106,68:$Vw},{45:107,68:$Vw},o($Vx,[2,10]),{13:108,72:$Vq},{72:[2,65]},{19:[1,109]},o($Vr,[2,13]),{19:[1,110]},o($Vr,[2,15]),o($Vr,[2,18]),o($Vr,[2,19]),{4:$V5,5:$V6,6:37,9:14,10:16,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,23:$Va,24:$Vb,25:24,26:25,27:26,28:27,29:28,30:$Vc,31:$Vd,32:$Ve,33:$Vf,34:[1,111],35:$Vg,36:$Vh,37:$Vi,39:$Vj,43:$Vk,48:$Vl,49:$Vm,50:$Vn,51:$Vo,59:$Vp,69:$V3},{4:$V5,5:$V6,6:37,9:14,10:16,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,23:$Va,24:$Vb,25:24,26:25,27:26,28:27,29:28,30:$Vc,31:$Vd,32:$Ve,33:$Vf,34:[1,112],35:$Vg,36:$Vh,37:$Vi,39:$Vj,43:$Vk,48:$Vl,49:$Vm,50:$Vn,51:$Vo,59:$Vp,69:$V3},{4:$V5,5:$V6,6:37,9:14,10:16,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,23:$Va,24:$Vb,25:24,26:25,27:26,28:27,29:28,30:$Vc,31:$Vd,32:$Ve,33:$Vf,34:[1,113],35:$Vg,36:$Vh,37:$Vi,39:$Vj,43:$Vk,48:$Vl,49:$Vm,50:$Vn,51:$Vo,59:$Vp,69:$V3},{34:[1,114]},{4:$V5,5:$V6,6:37,9:14,10:16,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,23:$Va,24:$Vb,25:24,26:25,27:26,28:27,29:28,30:$Vc,31:$Vd,32:$Ve,33:$Vf,34:[2,36],35:$Vg,36:$Vh,37:$Vi,39:$Vj,42:[1,115],43:$Vk,48:$Vl,49:$Vm,50:$Vn,51:$Vo,59:$Vp,69:$V3},{34:[1,116]},{4:$V5,5:$V6,6:37,9:14,10:16,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,23:$Va,24:$Vb,25:24,26:25,27:26,28:27,29:28,30:$Vc,31:$Vd,32:$Ve,33:$Vf,34:[2,34],35:$Vg,36:$Vh,37:$Vi,39:$Vj,41:[1,117],43:$Vk,48:$Vl,49:$Vm,50:$Vn,51:$Vo,59:$Vp,69:$V3},{17:118,59:$Vp},{17:119,59:$Vp},{45:120,68:$Vw},{45:121,68:$Vw},{45:122,68:$Vw},{53:[1,123],68:[2,47]},{5:[2,40]},{5:[2,62]},{5:[2,41]},{5:[2,42]},{5:[2,43]},{5:[1,124]},{5:[1,125]},{5:[1,126]},o($Vr,[2,28]),o($Vr,[2,29]),o($Vr,[2,30]),o($Vr,[2,31]),{19:[1,127]},o($Vr,[2,32]),{19:[1,128]},{45:129,68:$Vw},{45:130,68:$Vw},{5:[2,52]},{5:[2,38]},{5:[2,39]},{17:131,59:$Vp},o($Vx,[2,11]),o($Vr,[2,12]),o($Vr,[2,14]),o($Vt,$V4,{8:94,38:132}),o($Vu,$V4,{8:96,40:133}),{5:[2,50]},{5:[2,51]},{68:[2,46]},{34:[2,37]},{34:[2,35]}],
-defaultActions: {7:[2,63],8:[2,1],9:[2,2],10:[2,3],47:[2,66],75:[2,48],76:[2,49],83:[2,65],103:[2,40],104:[2,62],105:[2,41],106:[2,42],107:[2,43],120:[2,52],121:[2,38],122:[2,39],129:[2,50],130:[2,51],131:[2,46],132:[2,37],133:[2,35]},
+table: [{3:1,4:$V0,5:$V1,6:4,7:$V2,11:6,71:$V3},{1:[3]},{3:8,4:$V0,5:$V1,6:4,7:$V2,11:6,71:$V3},{3:9,4:$V0,5:$V1,6:4,7:$V2,11:6,71:$V3},{3:10,4:$V0,5:$V1,6:4,7:$V2,11:6,71:$V3},o([1,4,5,16,20,22,25,26,32,33,34,35,37,38,39,41,45,50,51,52,53,61,71],$V4,{8:11}),{12:12,72:[1,13]},{72:[2,66]},{1:[2,1]},{1:[2,2]},{1:[2,3]},{1:[2,4],4:$V5,5:$V6,6:37,9:14,10:16,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,25:$Va,26:$Vb,27:24,28:25,29:26,30:27,31:28,32:$Vc,33:$Vd,34:$Ve,35:$Vf,37:$Vg,38:$Vh,39:$Vi,41:$Vj,45:$Vk,50:$Vl,51:$Vm,52:$Vn,53:$Vo,61:$Vp,71:$V3},{13:45,14:[1,46],74:$Vq},o([14,74],[2,67]),o($Vr,[2,6]),{6:37,10:48,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,25:$Va,26:$Vb,27:24,28:25,29:26,30:27,31:28,32:$Vc,33:$Vd,34:$Ve,35:$Vf,37:$Vg,38:$Vh,39:$Vi,41:$Vj,45:$Vk,50:$Vl,51:$Vm,52:$Vn,53:$Vo,61:$Vp,71:$V3},o($Vr,[2,8]),o($Vr,[2,9]),{17:49,61:$Vp},{17:50,61:$Vp},{5:[1,51]},{5:[1,54],23:[1,52],24:[1,53]},{17:55,61:$Vp},{17:56,61:$Vp},{5:[1,57]},{5:[1,58]},{5:[1,59]},{5:[1,60]},{5:[1,61]},o($Vr,[2,28]),o($Vr,[2,29]),o($Vr,[2,30]),{19:[1,62]},{19:[1,63]},{19:[1,64]},{19:[1,65]},{19:[1,66]},o($Vr,[2,36]),{58:67,62:[1,68],63:[1,69],64:[1,70],65:[1,71],66:[1,72],67:[1,73],68:[1,74],69:[1,75]},{46:76,48:[1,77],56:[1,78],57:[1,79]},{17:80,61:$Vp},{17:81,61:$Vp},{17:82,61:$Vp},{17:83,61:$Vp},o([5,18,55,62,63,64,65,66,67,68,69,70],[2,56]),{5:[1,84]},{15:85,73:[1,86]},{5:[2,69]},o($Vr,[2,7]),{5:[1,88],18:[1,87]},{5:[1,90],18:[1,89]},o($Vr,[2,16]),{5:[1,92],23:[1,91]},{5:[1,93]},o($Vr,[2,20]),{5:[1,94]},{5:[1,95]},o($Vr,[2,23]),o($Vr,[2,24]),o($Vr,[2,25]),o($Vr,[2,26]),o($Vr,[2,27]),o($Vs,$V4,{8:96}),o($Vs,$V4,{8:97}),o($Vs,$V4,{8:98}),o($Vt,$V4,{40:99,8:100}),o($Vu,$V4,{42:101,8:102}),{17:105,59:[1,103],60:[1,104],61:$Vp},o($Vv,[2,57]),o($Vv,[2,58]),o($Vv,[2,59]),o($Vv,[2,60]),o($Vv,[2,61]),o($Vv,[2,62]),o($Vv,[2,63]),o($Vv,[2,64]),{17:106,61:$Vp},{17:108,49:107,61:$Vp},{61:[2,51]},{61:[2,52]},{47:109,70:$Vw},{47:111,70:$Vw},{47:112,70:$Vw},{47:113,70:$Vw},o($Vx,[2,10]),{13:114,74:$Vq},{74:[2,68]},{19:[1,115]},o($Vr,[2,13]),{19:[1,116]},o($Vr,[2,15]),{5:[1,117]},o($Vr,[2,18]),o($Vr,[2,19]),o($Vr,[2,21]),o($Vr,[2,22]),{4:$V5,5:$V6,6:37,9:14,10:16,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,25:$Va,26:$Vb,27:24,28:25,29:26,30:27,31:28,32:$Vc,33:$Vd,34:$Ve,35:$Vf,36:[1,118],37:$Vg,38:$Vh,39:$Vi,41:$Vj,45:$Vk,50:$Vl,51:$Vm,52:$Vn,53:$Vo,61:$Vp,71:$V3},{4:$V5,5:$V6,6:37,9:14,10:16,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,25:$Va,26:$Vb,27:24,28:25,29:26,30:27,31:28,32:$Vc,33:$Vd,34:$Ve,35:$Vf,36:[1,119],37:$Vg,38:$Vh,39:$Vi,41:$Vj,45:$Vk,50:$Vl,51:$Vm,52:$Vn,53:$Vo,61:$Vp,71:$V3},{4:$V5,5:$V6,6:37,9:14,10:16,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,25:$Va,26:$Vb,27:24,28:25,29:26,30:27,31:28,32:$Vc,33:$Vd,34:$Ve,35:$Vf,36:[1,120],37:$Vg,38:$Vh,39:$Vi,41:$Vj,45:$Vk,50:$Vl,51:$Vm,52:$Vn,53:$Vo,61:$Vp,71:$V3},{36:[1,121]},{4:$V5,5:$V6,6:37,9:14,10:16,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,25:$Va,26:$Vb,27:24,28:25,29:26,30:27,31:28,32:$Vc,33:$Vd,34:$Ve,35:$Vf,36:[2,39],37:$Vg,38:$Vh,39:$Vi,41:$Vj,44:[1,122],45:$Vk,50:$Vl,51:$Vm,52:$Vn,53:$Vo,61:$Vp,71:$V3},{36:[1,123]},{4:$V5,5:$V6,6:37,9:14,10:16,11:6,16:$V7,17:38,20:$V8,21:20,22:$V9,25:$Va,26:$Vb,27:24,28:25,29:26,30:27,31:28,32:$Vc,33:$Vd,34:$Ve,35:$Vf,36:[2,37],37:$Vg,38:$Vh,39:$Vi,41:$Vj,43:[1,124],45:$Vk,50:$Vl,51:$Vm,52:$Vn,53:$Vo,61:$Vp,71:$V3},{17:125,61:$Vp},{17:126,61:$Vp},{47:127,70:$Vw},{47:128,70:$Vw},{47:129,70:$Vw},{55:[1,130],70:[2,50]},{5:[2,43]},{5:[2,65]},{5:[2,44]},{5:[2,45]},{5:[2,46]},{5:[1,131]},{5:[1,132]},{5:[1,133]},o($Vr,[2,17]),o($Vr,[2,31]),o($Vr,[2,32]),o($Vr,[2,33]),o($Vr,[2,34]),{19:[1,134]},o($Vr,[2,35]),{19:[1,135]},{47:136,70:$Vw},{47:137,70:$Vw},{5:[2,55]},{5:[2,41]},{5:[2,42]},{17:138,61:$Vp},o($Vx,[2,11]),o($Vr,[2,12]),o($Vr,[2,14]),o($Vt,$V4,{8:100,40:139}),o($Vu,$V4,{8:102,42:140}),{5:[2,53]},{5:[2,54]},{70:[2,49]},{36:[2,40]},{36:[2,38]}],
+defaultActions: {7:[2,66],8:[2,1],9:[2,2],10:[2,3],47:[2,69],78:[2,51],79:[2,52],86:[2,68],109:[2,43],110:[2,65],111:[2,44],112:[2,45],113:[2,46],127:[2,55],128:[2,41],129:[2,42],136:[2,53],137:[2,54],138:[2,49],139:[2,40],140:[2,38]},
parseError: function parseError (str, hash) {
if (hash.recoverable) {
this.trace(str);
@@ -7373,15 +7385,15 @@ options: {"case-insensitive":true},
performAction: function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
var YYSTATE=YY_START;
switch($avoiding_name_collisions) {
-case 0: this.begin('open_directive'); return 69;
+case 0: this.begin('open_directive'); return 71;
break;
-case 1: this.begin('type_directive'); return 70;
+case 1: this.begin('type_directive'); return 72;
break;
case 2: this.popState(); this.begin('arg_directive'); return 14;
break;
-case 3: this.popState(); this.popState(); return 72;
+case 3: this.popState(); this.popState(); return 74;
break;
-case 4:return 71;
+case 4:return 73;
break;
case 5:return 5;
break;
@@ -7395,81 +7407,81 @@ case 9:/* skip comments */
break;
case 10:/* skip comments */
break;
-case 11: this.begin('ID'); return 16;
+case 11:return 23;
break;
-case 12: this.begin('ID'); return 20;
+case 12: this.begin('ID'); return 16;
break;
-case 13: yy_.yytext = yy_.yytext.trim(); this.begin('ALIAS'); return 59;
+case 13: this.begin('ID'); return 20;
break;
-case 14: this.popState(); this.popState(); this.begin('LINE'); return 18;
+case 14: yy_.yytext = yy_.yytext.trim(); this.begin('ALIAS'); return 61;
break;
-case 15: this.popState(); this.popState(); return 5;
+case 15: this.popState(); this.popState(); this.begin('LINE'); return 18;
break;
-case 16: this.begin('LINE'); return 33;
+case 16: this.popState(); this.popState(); return 5;
break;
case 17: this.begin('LINE'); return 35;
break;
-case 18: this.begin('LINE'); return 36;
+case 18: this.begin('LINE'); return 37;
break;
-case 19: this.begin('LINE'); return 37;
+case 19: this.begin('LINE'); return 38;
break;
-case 20: this.begin('LINE'); return 42;
+case 20: this.begin('LINE'); return 39;
break;
-case 21: this.begin('LINE'); return 39;
+case 21: this.begin('LINE'); return 44;
break;
case 22: this.begin('LINE'); return 41;
break;
-case 23: this.popState(); return 19;
+case 23: this.begin('LINE'); return 43;
break;
-case 24:return 34;
+case 24: this.popState(); return 19;
break;
-case 25:return 54;
+case 25:return 36;
break;
-case 26:return 55;
+case 26:return 56;
break;
-case 27:return 48;
+case 27:return 57;
break;
-case 28:return 49;
+case 28:return 50;
break;
-case 29:return 50;
+case 29:return 51;
break;
-case 30:return 51;
+case 30:return 52;
break;
-case 31:return 46;
+case 31:return 53;
break;
-case 32:return 43;
+case 32:return 48;
break;
-case 33: this.begin('ID'); return 23;
+case 33:return 45;
break;
-case 34: this.begin('ID'); return 24;
+case 34: this.begin('ID'); return 25;
break;
-case 35:return 30;
+case 35: this.begin('ID'); return 26;
break;
-case 36:return 31;
+case 36:return 32;
break;
-case 37:return 32;
+case 37:return 33;
break;
-case 38:return 7;
+case 38:return 34;
break;
-case 39:return 22;
+case 39:return 7;
break;
-case 40:return 53;
+case 40:return 22;
break;
-case 41:return 5;
+case 41:return 24;
break;
-case 42: yy_.yytext = yy_.yytext.trim(); return 59;
+case 42:return 55;
break;
-case 43:return 62;
+case 43:return 5;
break;
-case 44:return 63;
+case 44: yy_.yytext = yy_.yytext.trim(); return 61;
break;
-case 45:return 60;
+case 45:return 64;
break;
-case 46:return 61;
+case 46:return 65;
break;
-case 47:return 64;
+case 47:return 62;
break;
-case 48:return 65;
+case 48:return 63;
break;
case 49:return 66;
break;
@@ -7477,18 +7489,22 @@ case 50:return 67;
break;
case 51:return 68;
break;
-case 52:return 57;
+case 52:return 69;
break;
-case 53:return 58;
+case 53:return 70;
break;
-case 54:return 5;
+case 54:return 59;
break;
-case 55:return 'INVALID';
+case 55:return 60;
+break;
+case 56:return 5;
+break;
+case 57:return 'INVALID';
break;
}
},
-rules: [/^(?:%%\{)/i,/^(?:((?:(?!\}%%)[^:.])*))/i,/^(?::)/i,/^(?:\}%%)/i,/^(?:((?:(?!\}%%).|\n)*))/i,/^(?:[\n]+)/i,/^(?:\s+)/i,/^(?:((?!\n)\s)+)/i,/^(?:#[^\n]*)/i,/^(?:%(?!\{)[^\n]*)/i,/^(?:[^\}]%%[^\n]*)/i,/^(?:participant\b)/i,/^(?:actor\b)/i,/^(?:[^\->:\n,;]+?(?=((?!\n)\s)+as(?!\n)\s|[#\n;]|$))/i,/^(?:as\b)/i,/^(?:(?:))/i,/^(?:loop\b)/i,/^(?:rect\b)/i,/^(?:opt\b)/i,/^(?:alt\b)/i,/^(?:else\b)/i,/^(?:par\b)/i,/^(?:and\b)/i,/^(?:(?:[:]?(?:no)?wrap)?[^#\n;]*)/i,/^(?:end\b)/i,/^(?:left of\b)/i,/^(?:right of\b)/i,/^(?:links\b)/i,/^(?:link\b)/i,/^(?:properties\b)/i,/^(?:details\b)/i,/^(?:over\b)/i,/^(?:note\b)/i,/^(?:activate\b)/i,/^(?:deactivate\b)/i,/^(?:title\s[^#\n;]+)/i,/^(?:title:\s[^#\n;]+)/i,/^(?:accDescription\s[^#\n;]+)/i,/^(?:sequenceDiagram\b)/i,/^(?:autonumber\b)/i,/^(?:,)/i,/^(?:;)/i,/^(?:[^\+\->:\n,;]+((?!(-x|--x|-\)|--\)))[\-]*[^\+\->:\n,;]+)*)/i,/^(?:->>)/i,/^(?:-->>)/i,/^(?:->)/i,/^(?:-->)/i,/^(?:-[x])/i,/^(?:--[x])/i,/^(?:-[\)])/i,/^(?:--[\)])/i,/^(?::(?:(?:no)?wrap)?[^#\n;]+)/i,/^(?:\+)/i,/^(?:-)/i,/^(?:$)/i,/^(?:.)/i],
-conditions: {"open_directive":{"rules":[1,8],"inclusive":false},"type_directive":{"rules":[2,3,8],"inclusive":false},"arg_directive":{"rules":[3,4,8],"inclusive":false},"ID":{"rules":[7,8,13],"inclusive":false},"ALIAS":{"rules":[7,8,14,15],"inclusive":false},"LINE":{"rules":[7,8,23],"inclusive":false},"INITIAL":{"rules":[0,5,6,8,9,10,11,12,16,17,18,19,20,21,22,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55],"inclusive":true}}
+rules: [/^(?:%%\{)/i,/^(?:((?:(?!\}%%)[^:.])*))/i,/^(?::)/i,/^(?:\}%%)/i,/^(?:((?:(?!\}%%).|\n)*))/i,/^(?:[\n]+)/i,/^(?:\s+)/i,/^(?:((?!\n)\s)+)/i,/^(?:#[^\n]*)/i,/^(?:%(?!\{)[^\n]*)/i,/^(?:[^\}]%%[^\n]*)/i,/^(?:[0-9]+(?=[ \n]+))/i,/^(?:participant\b)/i,/^(?:actor\b)/i,/^(?:[^\->:\n,;]+?(?=((?!\n)\s)+as(?!\n)\s|[#\n;]|$))/i,/^(?:as\b)/i,/^(?:(?:))/i,/^(?:loop\b)/i,/^(?:rect\b)/i,/^(?:opt\b)/i,/^(?:alt\b)/i,/^(?:else\b)/i,/^(?:par\b)/i,/^(?:and\b)/i,/^(?:(?:[:]?(?:no)?wrap)?[^#\n;]*)/i,/^(?:end\b)/i,/^(?:left of\b)/i,/^(?:right of\b)/i,/^(?:links\b)/i,/^(?:link\b)/i,/^(?:properties\b)/i,/^(?:details\b)/i,/^(?:over\b)/i,/^(?:note\b)/i,/^(?:activate\b)/i,/^(?:deactivate\b)/i,/^(?:title\s[^#\n;]+)/i,/^(?:title:\s[^#\n;]+)/i,/^(?:accDescription\s[^#\n;]+)/i,/^(?:sequenceDiagram\b)/i,/^(?:autonumber\b)/i,/^(?:off\b)/i,/^(?:,)/i,/^(?:;)/i,/^(?:[^\+\->:\n,;]+((?!(-x|--x|-\)|--\)))[\-]*[^\+\->:\n,;]+)*)/i,/^(?:->>)/i,/^(?:-->>)/i,/^(?:->)/i,/^(?:-->)/i,/^(?:-[x])/i,/^(?:--[x])/i,/^(?:-[\)])/i,/^(?:--[\)])/i,/^(?::(?:(?:no)?wrap)?[^#\n;]+)/i,/^(?:\+)/i,/^(?:-)/i,/^(?:$)/i,/^(?:.)/i],
+conditions: {"open_directive":{"rules":[1,8],"inclusive":false},"type_directive":{"rules":[2,3,8],"inclusive":false},"arg_directive":{"rules":[3,4,8],"inclusive":false},"ID":{"rules":[7,8,14],"inclusive":false},"ALIAS":{"rules":[7,8,15,16],"inclusive":false},"LINE":{"rules":[7,8,24],"inclusive":false},"INITIAL":{"rules":[0,5,6,8,9,10,11,12,13,17,18,19,20,21,22,23,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57],"inclusive":true}}
});
return lexer;
})();
@@ -9134,7 +9150,6 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
- // debugger;
var defaultConfig = Object.freeze(_defaultConfig__WEBPACK_IMPORTED_MODULE_0__["default"]);
var siteConfig = (0,_utils__WEBPACK_IMPORTED_MODULE_1__.assignWithDepth)({}, defaultConfig);
@@ -9157,7 +9172,7 @@ var updateCurrentConfig = function updateCurrentConfig(siteCfg, _directives) {
cfg = (0,_utils__WEBPACK_IMPORTED_MODULE_1__.assignWithDepth)(cfg, sumOfDirectives);
- if (sumOfDirectives.theme) {
+ if (sumOfDirectives.theme && _themes__WEBPACK_IMPORTED_MODULE_2__["default"][sumOfDirectives.theme]) {
var tmpConfigFromInitialize = (0,_utils__WEBPACK_IMPORTED_MODULE_1__.assignWithDepth)({}, configFromInitialize);
var themeVariables = (0,_utils__WEBPACK_IMPORTED_MODULE_1__.assignWithDepth)(tmpConfigFromInitialize.themeVariables || {}, sumOfDirectives.themeVariables);
cfg.themeVariables = _themes__WEBPACK_IMPORTED_MODULE_2__["default"][cfg.theme].getThemeVariables(themeVariables);
@@ -9186,7 +9201,7 @@ var setSiteConfig = function setSiteConfig(conf) {
siteConfig = (0,_utils__WEBPACK_IMPORTED_MODULE_1__.assignWithDepth)({}, defaultConfig);
siteConfig = (0,_utils__WEBPACK_IMPORTED_MODULE_1__.assignWithDepth)(siteConfig, conf);
- if (conf.theme) {
+ if (conf.theme && _themes__WEBPACK_IMPORTED_MODULE_2__["default"][conf.theme]) {
siteConfig.themeVariables = _themes__WEBPACK_IMPORTED_MODULE_2__["default"][conf.theme].getThemeVariables(conf.themeVariables);
}
@@ -12732,6 +12747,8 @@ var config = {
/** The object containing configurations specific for sequence diagrams */
sequence: {
+ hideUnusedParticipants: false,
+
/**
* | Parameter | Description | Type | Required | Values |
* | --------------- | ---------------------------- | ------- | -------- | ------------------ |
@@ -13951,7 +13968,7 @@ var setupToolTips = function setupToolTips(element) {
var rect = this.getBoundingClientRect();
tooltipElem.transition().duration(200).style('opacity', '.9');
- tooltipElem.html(el.attr('title')).style('left', window.scrollX + rect.left + (rect.right - rect.left) / 2 + 'px').style('top', window.scrollY + rect.top - 14 + document.body.scrollTop + 'px');
+ tooltipElem.text(el.attr('title')).style('left', window.scrollX + rect.left + (rect.right - rect.left) / 2 + 'px').style('top', window.scrollY + rect.top - 14 + document.body.scrollTop + 'px');
el.classed('hover', true);
}).on('mouseout', function () {
tooltipElem.transition().duration(500).style('opacity', 0);
@@ -15161,10 +15178,11 @@ var removeScript = function removeScript(txt) {
}
var decodedText = removeEscapes(rs);
- decodedText = decodedText.replace(/script>/gi, '#');
- decodedText = decodedText.replace(/javascript:/gi, '#');
- decodedText = decodedText.replace(/onerror=/gi, 'onerror:');
- decodedText = decodedText.replace(/