Skip to content

Build your personal knowledge base with Trilium Notes

feat(codemirror): highlight Mermaid Cynefin diagrams

Elian Dorancd2a24fd4f6b
diff --git a/packages/codemirror/src/languages/mermaid/index.ts b/packages/codemirror/src/languages/mermaid/index.ts
index 10d1f2bc23..f8ec595f83 100644
--- a/packages/codemirror/src/languages/mermaid/index.ts
+++ b/packages/codemirror/src/languages/mermaid/index.ts
@@ -11,6 +11,7 @@ import { parser as architectureParser } from "./parsers/architecture/parser.js";
import { parser as blockParser } from "./parsers/block/parser.js";
import { parser as c4Parser } from "./parsers/c4/parser.js";
import { parser as classParser } from "./parsers/class/parser.js";
+import { parser as cynefinParser } from "./parsers/cynefin/parser.js";
import { parser as erParser } from "./parsers/er/parser.js";
import { parser as flowchartParser } from "./parsers/flowchart/parser.js";
import { parser as ganttParser } from "./parsers/gantt/parser.js";
@@ -45,6 +46,7 @@ export const DIAGRAM_PARSERS: Record<string, LRParser> = {
BlockDiagram: blockParser,
C4Diagram: c4Parser,
ClassDiagram: classParser,
+ CynefinDiagram: cynefinParser,
ERDiagram: erParser,
FlowchartDiagram: flowchartParser,
GanttDiagram: ganttParser,
diff --git a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts b/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
index b5f9ccb8f2..579adda033 100644
--- a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
+++ b/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
@@ -116,7 +116,8 @@ describe("accessibility lines", () => {
"quadrantChart\n x-axis A --> B", "xychart-beta\n bar [1, 2]",
"packet-beta\n 0-15: \"A\"", "architecture-beta\n service a(server)[A]",
"radar-beta\n axis a", "treemap-beta\n \"A\": 1",
- "treeView-beta\n src", "wardley-beta\n anchor A [0.5, 0.5]"
+ "treeView-beta\n src", "wardley-beta\n anchor A [0.5, 0.5]",
+ "cynefin-beta\n complex"
];
const lines = [
" accTitle: My title", " accDescr: My description", " accDescr {\n Line one\n }"
diff --git a/packages/codemirror/src/languages/mermaid/parsers/cynefin/cynefin.grammar b/packages/codemirror/src/languages/mermaid/parsers/cynefin/cynefin.grammar
new file mode 100644
index 0000000000..3ff20d3c47
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/cynefin/cynefin.grammar
@@ -0,0 +1,36 @@
+// Follows the Langium grammar of Mermaid's Cynefin diagram (`@mermaid-js/parser`).
+@top CynefinDiagram { DiagramName ":"? statement* }
+
+statement { Title | Domain | Transition }
+
+Title { kw<"title"> TitleText? }
+
+Domain { DomainName Item* }
+
+Item { String }
+
+Transition { DomainName "-->" DomainName (":" String)? }
+
+DomainName {
+ @specialize<identifier, "complex"> | @specialize<identifier, "complicated"> |
+ @specialize<identifier, "clear"> | @specialize<identifier, "chaotic"> |
+ @specialize<identifier, "confusion">
+}
+
+DiagramName { @specialize<identifier, "cynefin-beta"> }
+
+kw<term> { @specialize[@name=Keyword]<identifier, term> }
+
+@skip { space | LineComment }
+
+@external tokens titleText from "./tokens.js" { TitleText }
+
+@tokens {
+ space { $[ \t\r\n]+ }
+ identifier { @asciiLetter ($[a-zA-Z0-9_\-]* $[a-zA-Z0-9_])? }
+ String { '"' (!["\\\n] | "\\" _)* '"' | "'" (!['\\\n] | "\\" _)* "'" }
+ LineComment { "%%" ![\n]* }
+ "-->" ":"
+}
+
+@external propSource cynefinHighlighting from "./highlight.js"
diff --git a/packages/codemirror/src/languages/mermaid/parsers/cynefin/highlight.ts b/packages/codemirror/src/languages/mermaid/parsers/cynefin/highlight.ts
new file mode 100644
index 0000000000..8a3321729f
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/cynefin/highlight.ts
@@ -0,0 +1,14 @@
+import { styleTags } from "@lezer/highlight";
+
+import { cynefinTags } from "../../tags/index.js";
+
+export const cynefinHighlighting = styleTags({
+ "DiagramName": cynefinTags.diagramName,
+ "DomainName": cynefinTags.domainName,
+ "Keyword": cynefinTags.keyword,
+ "LineComment": cynefinTags.lineComment,
+ "String": cynefinTags.string,
+ "TitleText": cynefinTags.titleText,
+ "-->": cynefinTags.arrow,
+ ":": cynefinTags.separator
+});
diff --git a/packages/codemirror/src/languages/mermaid/parsers/cynefin/parser.terms.ts b/packages/codemirror/src/languages/mermaid/parsers/cynefin/parser.terms.ts
new file mode 100644
index 0000000000..df63817756
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/cynefin/parser.terms.ts
@@ -0,0 +1,14 @@
+// AUTO-GENERATED by scripts/build_mermaid_grammars.mts from the grammar in this directory.
+// This file was generated by lezer-generator. You probably shouldn't edit it.
+export const
+ TitleText = 1,
+ LineComment = 2,
+ CynefinDiagram = 3,
+ DiagramName = 4,
+ Title = 6,
+ Keyword = 7,
+ Domain = 8,
+ DomainName = 9,
+ Item = 10,
+ String = 11,
+ Transition = 12
diff --git a/packages/codemirror/src/languages/mermaid/parsers/cynefin/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/cynefin/parser.ts
new file mode 100644
index 0000000000..297254fbe8
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/cynefin/parser.ts
@@ -0,0 +1,22 @@
+// AUTO-GENERATED by scripts/build_mermaid_grammars.mts from the grammar in this directory.
+// This file was generated by lezer-generator. You probably shouldn't edit it.
+import {LRParser} from "@lezer/lr"
+import {titleText} from "./tokens.js"
+import {cynefinHighlighting} from "./highlight.js"
+const spec_identifier = {__proto__:null,"cynefin-beta":40, title:14, complex:44, complicated:46, clear:48, chaotic:50, confusion:52}
+export const parser = LRParser.deserialize({
+ version: 14,
+ states: "#lOYQQOOOOQO'#C`'#C`QsQQOOOOQO'#Ce'#CeOzQQO'#CdOOQO'#Cq'#CqOOQO'#Cj'#CjQ_QQOOQ_QQOOO!iQRO'#CbOOQO'#Cf'#CfOOQO'#Ck'#CkO#TQQO,59OObQQO,59SOOQO-E6h-E6hOOQO,58|,58|OOQO-E6i-E6iO#oQQO1G.nO$ZQQO7+$YOOQO<<Gt<<Gt",
+ stateData: "$`~ObOSQOS~OdPO~OVXOfROgROhROiROjRO~OTWO~P_OZYO]]OVWX`WXfWXgWXhWXiWXjWX~OP_OVUX`UXfUXgUXhUXiUXjUX~OZYOVWa`WafWagWahWaiWajWa~OTbOV[i`[if[ig[ih[ii[ij[i~OZcO~O",
+ goto: "!_fPPPPgPjPjowPjP{!SPPPPP!YRQOVTQVWUSQVWRa]TZS[SVQWR^VQ[SR`[VUQVW",
+ nodeNames: "⚠ TitleText LineComment CynefinDiagram DiagramName : Title Keyword Domain DomainName Item String Transition -->",
+ maxTerm: 26,
+ propSources: [cynefinHighlighting],
+ skippedNodes: [0,2],
+ repeatNodeCount: 2,
+ tokenData: "'e~RZXYtYZt]^tpqtrs!Vuv#ywx$h}!O&V![!]&h!c!}&m#T#o&m~ySb~XYtYZt]^tpqt~!YWOY!VZr!Vrs!rs#O!V#O#P!w#P;'S!V;'S;=`#s<%lO!V~!wOZ~~!zRO;'S!V;'S;=`#T;=`O!V~#WXOY!VZr!Vrs!rs#O!V#O#P!w#P;'S!V;'S;=`#s;=`<%l!V<%lO!V~#vP;=`<%l!V~#|Puv$P~$USQ~OY$PZ;'S$P;'S;=`$b<%lO$P~$eP;=`<%l$P~$kWOY$hZw$hwx!rx#O$h#O#P%T#P;'S$h;'S;=`&P<%lO$h~%WRO;'S$h;'S;=`%a;=`O$h~%dXOY$hZw$hwx!rx#O$h#O#P%T#P;'S$h;'S;=`&P;=`<%l$h<%lO$h~&SP;=`<%l$h~&YP}!O&]~&`P!`!a&c~&hO]~~&mOT~~&rTc~}!O'R!Q![&m!c!}&m#R#S&m#T#o&m~'UT}!O'R!Q![&m!c!}&m#R#S&m#T#o&m",
+ tokenizers: [titleText, 0],
+ topRules: {"CynefinDiagram":[0,3]},
+ specialized: [{term: 19, get: (value: keyof typeof spec_identifier) => spec_identifier[value] || -1}],
+ tokenPrec: 0
+})
diff --git a/packages/codemirror/src/languages/mermaid/parsers/cynefin/tokens.ts b/packages/codemirror/src/languages/mermaid/parsers/cynefin/tokens.ts
new file mode 100644
index 0000000000..7ddf9d7db4
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/cynefin/tokens.ts
@@ -0,0 +1,4 @@
+import { lineText } from "../line_text.js";
+import { TitleText } from "./parser.terms.js";
+
+export const titleText = lineText(TitleText);
diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar
index 65257f5234..7223b715ec 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar
@@ -18,6 +18,7 @@
TreemapDiagram |
TreeViewDiagram |
WardleyDiagram |
+ CynefinDiagram |
SankeyDiagram |
XYChartDiagram |
PacketDiagram |
@@ -43,6 +44,7 @@ RadarDiagram { radarText accessible* }
TreemapDiagram { treemapText accessible* }
TreeViewDiagram { treeViewText accessible* }
WardleyDiagram { wardleyText accessible* }
+CynefinDiagram { cynefinText accessible* }
XYChartDiagram { xyChartText accessible* }
PacketDiagram { packetText accessible* }
ArchitectureDiagram { architectureText accessible* }
@@ -94,6 +96,7 @@ AccDescr { accDescrKeyword (":" AccText? | "{" accBlockText? "}") }
treemapText,
treeViewText,
wardleyText,
+ cynefinText,
SankeyDiagram,
xyChartText,
packetText,
diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts
index bf45dfdf52..94816e9bfc 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts
@@ -4,38 +4,39 @@ export const
frontMatterStart = 1,
FrontMatterContent = 2,
frontMatterEnd = 3,
- preDiagramLine = 44,
+ preDiagramLine = 45,
Directive = 4,
LineComment = 5,
- pieText = 45,
+ pieText = 46,
MindmapDiagram = 6,
- flowchartText = 46,
- sequenceText = 47,
- journeyText = 48,
- requirementText = 49,
- ganttText = 50,
+ flowchartText = 47,
+ sequenceText = 48,
+ journeyText = 49,
+ requirementText = 50,
+ ganttText = 51,
TimelineDiagram = 7,
- quadrantText = 51,
- radarText = 52,
- treemapText = 53,
- treeViewText = 54,
- wardleyText = 55,
+ quadrantText = 52,
+ radarText = 53,
+ treemapText = 54,
+ treeViewText = 55,
+ wardleyText = 56,
+ cynefinText = 57,
SankeyDiagram = 8,
- xyChartText = 56,
- packetText = 57,
+ xyChartText = 58,
+ packetText = 59,
KanbanDiagram = 9,
BlockDiagram = 10,
- architectureText = 58,
- classText = 59,
- stateText = 60,
- erText = 61,
- gitText = 62,
- c4Text = 63,
+ architectureText = 60,
+ classText = 61,
+ stateText = 62,
+ erText = 63,
+ gitText = 64,
+ c4Text = 65,
accTitleKeyword = 11,
accDescrKeyword = 12,
AccText = 13,
accBlockText = 14,
- diagramRest = 64,
+ diagramRest = 66,
MermaidDiagram = 15,
FrontMatter = 16,
PieDiagram = 17,
@@ -51,11 +52,12 @@ export const
TreemapDiagram = 30,
TreeViewDiagram = 31,
WardleyDiagram = 32,
- XYChartDiagram = 33,
- PacketDiagram = 34,
- ArchitectureDiagram = 35,
- ClassDiagram = 36,
- StateDiagram = 37,
- ERDiagram = 38,
- GitDiagram = 39,
- C4Diagram = 40
+ CynefinDiagram = 33,
+ XYChartDiagram = 34,
+ PacketDiagram = 35,
+ ArchitectureDiagram = 36,
+ ClassDiagram = 37,
+ StateDiagram = 38,
+ ERDiagram = 39,
+ GitDiagram = 40,
+ C4Diagram = 41
diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts
index f1e77bc379..f30d84979f 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts
@@ -5,15 +5,15 @@ import {frontMatter, diagramText, accessibility} from "./tokens.js"
import {mermaidHighlighting} from "./highlight.js"
export const parser = LRParser.deserialize({
version: 14,
- states: "(vO!|QVOOO#TOQO'#ClOOQS'#DV'#DVOVQTOOO#]QXO'#CmO#kQXO'#CsO#yQXO'#CtO$XQXO'#CuO$gQXO'#CvO$uQXO'#CwO%TQXO'#CxO%cQXO'#CyO%qQXO'#CzO&PQXO'#C{O&_QXO'#C|O&mQXO'#C}O&{QXO'#DOO'ZQXO'#DPO'iQXO'#DQO'wQXO'#DRO(VQXO'#DSO(eQXO'#DTO(sQXO'#DUQOQPOOOVQTOOOOQS,59W,59WO)ROQO,59WOOQS-E7T-E7TO)WQPO'#CnO)]QPO'#CpOOQW'#Dq'#DqOOQW'#DW'#DWO)eQXO,59XO)sQXO,59_O*RQXO,59`O*aQXO,59aO*oQXO,59bO*}QXO,59cO+]QXO,59dO+kQXO,59eO+yQXO,59fO,XQXO,59gO,gQXO,59hO,uQXO,59iO-TQXO,59jO-cQXO,59kO-qQXO,59lO.PQXO,59mO._QXO,59nO.mQXO,59oO.{QXO,59pOOQS1G.r1G.rO/ZQXO,59YO/lQXO,59[O/}QXO,59[OOQW-E7U-E7UOOQW1G.t1G.tOOQW1G.v1G.vO0VQPO1G.vOOQW7+$b7+$b",
- stateData: "0[~O!dOS~OSQOTQOUgOVgOWgOXgOYgO|QO}SO!OTO!PUO!QVO!RWO!SXO!TYO!UZO!V[O!W]O!X^O!Y_O!Z`O![aO!]bO!^cO!_dO!`eO!afO~OPPO~PVOQjORiO~OZlO[mO!bnO{aX~OZlO[mO!bnO{gX~OZlO[mO!bnO{hX~OZlO[mO!bnO{iX~OZlO[mO!bnO{jX~OZlO[mO!bnO{kX~OZlO[mO!bnO{lX~OZlO[mO!bnO{mX~OZlO[mO!bnO{nX~OZlO[mO!bnO{oX~OZlO[mO!bnO{pX~OZlO[mO!bnO{qX~OZlO[mO!bnO{rX~OZlO[mO!bnO{sX~OZlO[mO!bnO{tX~OZlO[mO!bnO{uX~OZlO[mO!bnO{vX~OZlO[mO!bnO{wX~OZlO[mO!bnO{xX~OR!TO~Oc!UO~Oc!VOe!WO~OZlO[mO!bnO{aa~OZlO[mO!bnO{ga~OZlO[mO!bnO{ha~OZlO[mO!bnO{ia~OZlO[mO!bnO{ja~OZlO[mO!bnO{ka~OZlO[mO!bnO{la~OZlO[mO!bnO{ma~OZlO[mO!bnO{na~OZlO[mO!bnO{oa~OZlO[mO!bnO{pa~OZlO[mO!bnO{qa~OZlO[mO!bnO{ra~OZlO[mO!bnO{sa~OZlO[mO!bnO{ta~OZlO[mO!bnO{ua~OZlO[mO!bnO{va~OZlO[mO!bnO{wa~OZlO[mO!bnO{xa~O]!YOZba[ba{ba!bba~O]!ZOZda[da{da!bda~O^![Of!ZO~Of!]O~O",
- goto: "&[!fPPPPPPPPPPPPPPPP!g!j!oP!oPP!j!j!j!j!j!j!j!j!j!j!j!j!j!j!j!j!j!j#i#pPPPPPPPPPPPPPPPPPPPPPPPP%bRhOVgORh!onSTUVWXYZ[]^_`abcdefpqrstuvwxyz{|}!O!P!Q!R!SSROhRkRQpSQqTQrUQsVQtWQuXQvYQwZQx[Qy]Qz^Q{_Q|`Q}aQ!ObQ!PcQ!QdQ!ReQ!Sfw!Xpqrstuvwxyz{|}!O!P!Q!R!S!ooSTUVWXYZ[]^_`abcdefpqrstuvwxyz{|}!O!P!Q!R!S",
- nodeNames: "⚠ DashLine FrontMatterContent DashLine Directive LineComment MindmapDiagram TimelineDiagram SankeyDiagram KanbanDiagram BlockDiagram Keyword Keyword AccText AccText MermaidDiagram FrontMatter PieDiagram AccTitle : AccDescr { } FlowchartDiagram SequenceDiagram JourneyDiagram RequirementDiagram GanttDiagram QuadrantDiagram RadarDiagram TreemapDiagram TreeViewDiagram WardleyDiagram XYChartDiagram PacketDiagram ArchitectureDiagram ClassDiagram StateDiagram ERDiagram GitDiagram C4Diagram",
- maxTerm: 67,
+ states: ")SO#PQVOOO#WOQO'#ClOOQS'#DW'#DWOVQTOOO#`QXO'#CmO#nQXO'#CsO#|QXO'#CtO$[QXO'#CuO$jQXO'#CvO$xQXO'#CwO%WQXO'#CxO%fQXO'#CyO%tQXO'#CzO&SQXO'#C{O&bQXO'#C|O&pQXO'#C}O'OQXO'#DOO'^QXO'#DPO'lQXO'#DQO'zQXO'#DRO(YQXO'#DSO(hQXO'#DTO(vQXO'#DUO)UQXO'#DVQOQPOOOVQTOOOOQS,59W,59WO)dOQO,59WOOQS-E7U-E7UO)iQPO'#CnO)nQPO'#CpOOQW'#Ds'#DsOOQW'#DX'#DXO)vQXO,59XO*UQXO,59_O*dQXO,59`O*rQXO,59aO+QQXO,59bO+`QXO,59cO+nQXO,59dO+|QXO,59eO,[QXO,59fO,jQXO,59gO,xQXO,59hO-WQXO,59iO-fQXO,59jO-tQXO,59kO.SQXO,59lO.bQXO,59mO.pQXO,59nO/OQXO,59oO/^QXO,59pO/lQXO,59qOOQS1G.r1G.rO/zQXO,59YO0]QXO,59[O0nQXO,59[OOQW-E7V-E7VOOQW1G.t1G.tOOQW1G.v1G.vO0vQPO1G.vOOQW7+$b7+$b",
+ stateData: "0{~O!fOS~OSQOTQOUhOVhOWhOXhOYhO}QO!OSO!PTO!QUO!RVO!SWO!TXO!UYO!VZO!W[O!X]O!Y^O!Z_O![`O!]aO!^bO!_cO!`dO!aeO!bfO!cgO~OPPO~PVOQkORjO~OZmO[nO!doO|aX~OZmO[nO!doO|gX~OZmO[nO!doO|hX~OZmO[nO!doO|iX~OZmO[nO!doO|jX~OZmO[nO!doO|kX~OZmO[nO!doO|lX~OZmO[nO!doO|mX~OZmO[nO!doO|nX~OZmO[nO!doO|oX~OZmO[nO!doO|pX~OZmO[nO!doO|qX~OZmO[nO!doO|rX~OZmO[nO!doO|sX~OZmO[nO!doO|tX~OZmO[nO!doO|uX~OZmO[nO!doO|vX~OZmO[nO!doO|wX~OZmO[nO!doO|xX~OZmO[nO!doO|yX~OR!VO~Oc!WO~Oc!XOe!YO~OZmO[nO!doO|aa~OZmO[nO!doO|ga~OZmO[nO!doO|ha~OZmO[nO!doO|ia~OZmO[nO!doO|ja~OZmO[nO!doO|ka~OZmO[nO!doO|la~OZmO[nO!doO|ma~OZmO[nO!doO|na~OZmO[nO!doO|oa~OZmO[nO!doO|pa~OZmO[nO!doO|qa~OZmO[nO!doO|ra~OZmO[nO!doO|sa~OZmO[nO!doO|ta~OZmO[nO!doO|ua~OZmO[nO!doO|va~OZmO[nO!doO|wa~OZmO[nO!doO|xa~OZmO[nO!doO|ya~O]![OZba[ba|ba!dba~O]!]OZda[da|da!dda~O^!^Of!]O~Of!_O~O",
+ goto: "&f!hPPPPPPPPPPPPPPPP!i!l!qP!qPP!l!l!l!l!l!l!l!l!l!l!l!l!l!l!l!l!l!l!l#m#tPPPPPPPPPPPPPPPPPPPPPPPPP%jRiOVhORi!soSTUVWXYZ[]^_`abcdefgqrstuvwxyz{|}!O!P!Q!R!S!T!USROiRlRQqSQrTQsUQtVQuWQvXQwYQxZQy[Qz]Q{^Q|_Q}`Q!OaQ!PbQ!QcQ!RdQ!SeQ!TfQ!Ugy!Zqrstuvwxyz{|}!O!P!Q!R!S!T!U!spSTUVWXYZ[]^_`abcdefgqrstuvwxyz{|}!O!P!Q!R!S!T!U",
+ nodeNames: "⚠ DashLine FrontMatterContent DashLine Directive LineComment MindmapDiagram TimelineDiagram SankeyDiagram KanbanDiagram BlockDiagram Keyword Keyword AccText AccText MermaidDiagram FrontMatter PieDiagram AccTitle : AccDescr { } FlowchartDiagram SequenceDiagram JourneyDiagram RequirementDiagram GanttDiagram QuadrantDiagram RadarDiagram TreemapDiagram TreeViewDiagram WardleyDiagram CynefinDiagram XYChartDiagram PacketDiagram ArchitectureDiagram ClassDiagram StateDiagram ERDiagram GitDiagram C4Diagram",
+ maxTerm: 69,
propSources: [mermaidHighlighting],
skippedNodes: [0],
repeatNodeCount: 2,
- tokenData: "!S~RUXYe]^epqe![!]s#o#px#q#r}~jR!d~XYe]^epqe~xOc~~}Oe~~!SOf~",
+ tokenData: "!S~RUXYe]^epqe![!]s#o#px#q#r}~jR!f~XYe]^epqe~xOc~~}Oe~~!SOf~",
tokenizers: [0, frontMatter, diagramText, accessibility],
topRules: {"MermaidDiagram":[0,15]},
tokenPrec: 0
diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts
index a5576124da..1ad42caeec 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts
@@ -23,6 +23,7 @@ import {
treemapText,
treeViewText,
wardleyText,
+ cynefinText,
SankeyDiagram,
xyChartText,
packetText,
@@ -58,6 +59,7 @@ const diagramMap: Record<string, number> = {
"treemap": treemapText,
"treeView-beta": treeViewText,
"wardley-beta": wardleyText,
+ "cynefin-beta": cynefinText,
"sankey-beta": SankeyDiagram,
"sankey": SankeyDiagram,
"xychart-beta": xyChartText,
@@ -89,7 +91,7 @@ const diagrams = Object.keys(diagramMap);
const accessibleDiagrams = new Set([
pieText, flowchartText, sequenceText, journeyText, requirementText, ganttText, quadrantText,
radarText, treemapText, treeViewText, xyChartText, packetText, architectureText, classText,
- stateText, erText, gitText, c4Text, wardleyText
+ stateText, erText, gitText, c4Text, wardleyText, cynefinText
]);
/**
diff --git a/packages/codemirror/src/languages/mermaid/tags/index.ts b/packages/codemirror/src/languages/mermaid/tags/index.ts
index 83dfda1f0c..91bba915cc 100644
--- a/packages/codemirror/src/languages/mermaid/tags/index.ts
+++ b/packages/codemirror/src/languages/mermaid/tags/index.ts
@@ -267,3 +267,14 @@ export const wardleyTags = {
string: Tag.define(t.string),
titleText: Tag.define(t.string)
};
+
+export const cynefinTags = {
+ arrow: Tag.define(t.operator),
+ diagramName: Tag.define(mermaidTags.diagramName),
+ domainName: Tag.define(t.className),
+ keyword: Tag.define(t.keyword),
+ lineComment: Tag.define(t.lineComment),
+ separator: Tag.define(t.separator),
+ string: Tag.define(t.string),
+ titleText: Tag.define(t.string)
+};
diff --git a/packages/codemirror/src/languages/mermaid/test/cynefin.txt b/packages/codemirror/src/languages/mermaid/test/cynefin.txt
new file mode 100644
index 0000000000..2b9bc8b584
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/test/cynefin.txt
@@ -0,0 +1,66 @@
+# Cynefin
+
+cynefin-beta
+
+==>
+
+CynefinDiagram(DiagramName)
+
+# Trilium's sample
+
+cynefin-beta
+ title Incident Response
+
+ complex
+ "Investigate root cause"
+ "Run chaos experiment"
+
+ clear
+ "Restart service"
+
+ chaotic
+ "Page on-call immediately"
+
+ confusion
+ "Unknown failure mode"
+
+==>
+
+CynefinDiagram(DiagramName,Title(Keyword,TitleText),
+ Domain(DomainName,Item(String),Item(String)),
+ Domain(DomainName,Item(String)),
+ Domain(DomainName,Item(String)),
+ Domain(DomainName,Item(String)))
+
+# Items on one line and transitions
+
+cynefin-beta:
+ complicated "A" 'B'
+ clear --> chaotic : "Collapse" %% a comment
+ chaotic-->clear
+
+==>
+
+CynefinDiagram(DiagramName,":",
+ Domain(DomainName,Item(String),Item(String)),
+ Transition(DomainName,"-->",DomainName,":",String),LineComment,
+ Transition(DomainName,"-->",DomainName))
+
+# Unknown domain (invalid)
+
+cynefin-beta
+ other
+ "x"
+
+==>
+
+CynefinDiagram(DiagramName,⚠,⚠(String))
+
+# Unquoted transition label (invalid)
+
+cynefin-beta
+ complex --> clear : unquoted
+
+==>
+
+CynefinDiagram(DiagramName,Transition(DomainName,"-->",DomainName,":",⚠))
diff --git a/packages/codemirror/src/languages/mermaid/test/mermaid.txt b/packages/codemirror/src/languages/mermaid/test/mermaid.txt
index 3496214d0a..aa3a361ef1 100644
--- a/packages/codemirror/src/languages/mermaid/test/mermaid.txt
+++ b/packages/codemirror/src/languages/mermaid/test/mermaid.txt
@@ -404,3 +404,12 @@ wardley-beta
==>
MermaidDiagram(WardleyDiagram(DiagramName,Anchor(Keyword,Name,Coordinates("[",Number,",",Number,"]"))))
+
+# Cynefin
+
+cynefin-beta
+ complex
+
+==>
+
+MermaidDiagram(CynefinDiagram(DiagramName,Domain(DomainName)))