Skip to content

Build your personal knowledge base with Trilium Notes

feat(codemirror): highlight Mermaid Wardley maps

Elian Doran56681e1932a0
diff --git a/packages/codemirror/src/languages/mermaid/index.ts b/packages/codemirror/src/languages/mermaid/index.ts
index 0bcf622c5c..10d1f2bc23 100644
--- a/packages/codemirror/src/languages/mermaid/index.ts
+++ b/packages/codemirror/src/languages/mermaid/index.ts
@@ -30,6 +30,7 @@ import { parser as stateParser } from "./parsers/state/parser.js";
import { parser as timelineParser } from "./parsers/timeline/parser.js";
import { parser as treemapParser } from "./parsers/treemap/parser.js";
import { parser as treeViewParser } from "./parsers/treeview/parser.js";
+import { parser as wardleyParser } from "./parsers/wardley/parser.js";
import { parser as xychartParser } from "./parsers/xychart/parser.js";
export { foldByIndent } from "./extensions/index.js";
@@ -62,6 +63,7 @@ export const DIAGRAM_PARSERS: Record<string, LRParser> = {
TimelineDiagram: timelineParser,
TreemapDiagram: treemapParser,
TreeViewDiagram: treeViewParser,
+ WardleyDiagram: wardleyParser,
XYChartDiagram: xychartParser
};
diff --git a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts b/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
index 7a74c71356..b5f9ccb8f2 100644
--- a/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
+++ b/packages/codemirror/src/languages/mermaid/mermaid.spec.ts
@@ -116,7 +116,7 @@ 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"
+ "treeView-beta\n src", "wardley-beta\n anchor A [0.5, 0.5]"
];
const lines = [
" accTitle: My title", " accDescr: My description", " accDescr {\n Line one\n }"
diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar
index 277fcbcdb7..65257f5234 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/mermaid.grammar
@@ -17,6 +17,7 @@
RadarDiagram |
TreemapDiagram |
TreeViewDiagram |
+ WardleyDiagram |
SankeyDiagram |
XYChartDiagram |
PacketDiagram |
@@ -41,6 +42,7 @@ QuadrantDiagram { quadrantText accessible* }
RadarDiagram { radarText accessible* }
TreemapDiagram { treemapText accessible* }
TreeViewDiagram { treeViewText accessible* }
+WardleyDiagram { wardleyText accessible* }
XYChartDiagram { xyChartText accessible* }
PacketDiagram { packetText accessible* }
ArchitectureDiagram { architectureText accessible* }
@@ -91,6 +93,7 @@ AccDescr { accDescrKeyword (":" AccText? | "{" accBlockText? "}") }
radarText,
treemapText,
treeViewText,
+ wardleyText,
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 b6ac1170d5..bf45dfdf52 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.terms.ts
@@ -4,37 +4,38 @@ export const
frontMatterStart = 1,
FrontMatterContent = 2,
frontMatterEnd = 3,
- preDiagramLine = 43,
+ preDiagramLine = 44,
Directive = 4,
LineComment = 5,
- pieText = 44,
+ pieText = 45,
MindmapDiagram = 6,
- flowchartText = 45,
- sequenceText = 46,
- journeyText = 47,
- requirementText = 48,
- ganttText = 49,
+ flowchartText = 46,
+ sequenceText = 47,
+ journeyText = 48,
+ requirementText = 49,
+ ganttText = 50,
TimelineDiagram = 7,
- quadrantText = 50,
- radarText = 51,
- treemapText = 52,
- treeViewText = 53,
+ quadrantText = 51,
+ radarText = 52,
+ treemapText = 53,
+ treeViewText = 54,
+ wardleyText = 55,
SankeyDiagram = 8,
- xyChartText = 54,
- packetText = 55,
+ xyChartText = 56,
+ packetText = 57,
KanbanDiagram = 9,
BlockDiagram = 10,
- architectureText = 56,
- classText = 57,
- stateText = 58,
- erText = 59,
- gitText = 60,
- c4Text = 61,
+ architectureText = 58,
+ classText = 59,
+ stateText = 60,
+ erText = 61,
+ gitText = 62,
+ c4Text = 63,
accTitleKeyword = 11,
accDescrKeyword = 12,
AccText = 13,
accBlockText = 14,
- diagramRest = 62,
+ diagramRest = 64,
MermaidDiagram = 15,
FrontMatter = 16,
PieDiagram = 17,
@@ -49,11 +50,12 @@ export const
RadarDiagram = 29,
TreemapDiagram = 30,
TreeViewDiagram = 31,
- XYChartDiagram = 32,
- PacketDiagram = 33,
- ArchitectureDiagram = 34,
- ClassDiagram = 35,
- StateDiagram = 36,
- ERDiagram = 37,
- GitDiagram = 38,
- C4Diagram = 39
+ WardleyDiagram = 32,
+ XYChartDiagram = 33,
+ PacketDiagram = 34,
+ ArchitectureDiagram = 35,
+ ClassDiagram = 36,
+ StateDiagram = 37,
+ ERDiagram = 38,
+ GitDiagram = 39,
+ C4Diagram = 40
diff --git a/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/mermaid/parser.ts
index 81c702eb08..f1e77bc379 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: "(jO!yQVOOO#QOQO'#ClOOQS'#DU'#DUOVQTOOO#YQXO'#CmO#hQXO'#CsO#vQXO'#CtO$UQXO'#CuO$dQXO'#CvO$rQXO'#CwO%QQXO'#CxO%`QXO'#CyO%nQXO'#CzO%|QXO'#C{O&[QXO'#C|O&jQXO'#C}O&xQXO'#DOO'WQXO'#DPO'fQXO'#DQO'tQXO'#DRO(SQXO'#DSO(bQXO'#DTQOQPOOOVQTOOOOQS,59W,59WO(pOQO,59WOOQS-E7S-E7SO(uQPO'#CnO(zQPO'#CpOOQW'#Do'#DoOOQW'#DV'#DVO)SQXO,59XO)bQXO,59_O)pQXO,59`O*OQXO,59aO*^QXO,59bO*lQXO,59cO*zQXO,59dO+YQXO,59eO+hQXO,59fO+vQXO,59gO,UQXO,59hO,dQXO,59iO,rQXO,59jO-QQXO,59kO-`QXO,59lO-nQXO,59mO-|QXO,59nO.[QXO,59oOOQS1G.r1G.rO.jQXO,59YO.{QXO,59[O/^QXO,59[OOQW-E7T-E7TOOQW1G.t1G.tOOQW1G.v1G.vO/fQPO1G.vOOQW7+$b7+$b",
- stateData: "/k~O!bOS~OSQOTQOUfOVfOWfOXfOYfO{QO|SO}TO!OUO!PVO!QWO!RXO!SYO!TZO!U[O!V]O!W^O!X_O!Y`O!ZaO![bO!]cO!^dO!_eO~OPPO~PVOQiORhO~OZkO[lO!`mOzaX~OZkO[lO!`mOzgX~OZkO[lO!`mOzhX~OZkO[lO!`mOziX~OZkO[lO!`mOzjX~OZkO[lO!`mOzkX~OZkO[lO!`mOzlX~OZkO[lO!`mOzmX~OZkO[lO!`mOznX~OZkO[lO!`mOzoX~OZkO[lO!`mOzpX~OZkO[lO!`mOzqX~OZkO[lO!`mOzrX~OZkO[lO!`mOzsX~OZkO[lO!`mOztX~OZkO[lO!`mOzuX~OZkO[lO!`mOzvX~OZkO[lO!`mOzwX~OR!RO~Oc!SO~Oc!TOe!UO~OZkO[lO!`mOzaa~OZkO[lO!`mOzga~OZkO[lO!`mOzha~OZkO[lO!`mOzia~OZkO[lO!`mOzja~OZkO[lO!`mOzka~OZkO[lO!`mOzla~OZkO[lO!`mOzma~OZkO[lO!`mOzna~OZkO[lO!`mOzoa~OZkO[lO!`mOzpa~OZkO[lO!`mOzqa~OZkO[lO!`mOzra~OZkO[lO!`mOzsa~OZkO[lO!`mOzta~OZkO[lO!`mOzua~OZkO[lO!`mOzva~OZkO[lO!`mOzwa~O]!WOZba[bazba!`ba~O]!XOZda[dazda!`da~O^!YOf!XO~Of!ZO~O",
- goto: "&Q!dPPPPPPPPPPPPPPPP!e!h!mP!mPP!h!h!h!h!h!h!h!h!h!h!h!h!h!h!h!h!h#e#lPPPPPPPPPPPPPPPPPPPPPPP%YRgOVfORg!kmSTUVWXYZ[]^_`abcdeopqrstuvwxyz{|}!O!P!QSROgRjRQoSQpTQqUQrVQsWQtXQuYQvZQw[Qx]Qy^Qz_Q{`Q|aQ}bQ!OcQ!PdQ!Qeu!Vopqrstuvwxyz{|}!O!P!Q!knSTUVWXYZ[]^_`abcdeopqrstuvwxyz{|}!O!P!Q",
- 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 XYChartDiagram PacketDiagram ArchitectureDiagram ClassDiagram StateDiagram ERDiagram GitDiagram C4Diagram",
- maxTerm: 65,
+ 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,
propSources: [mermaidHighlighting],
skippedNodes: [0],
repeatNodeCount: 2,
- tokenData: "!S~RUXYe]^epqe![!]s#o#px#q#r}~jR!b~XYe]^epqe~xOc~~}Oe~~!SOf~",
+ tokenData: "!S~RUXYe]^epqe![!]s#o#px#q#r}~jR!d~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 9967b90b57..a5576124da 100644
--- a/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts
+++ b/packages/codemirror/src/languages/mermaid/parsers/mermaid/tokens.ts
@@ -22,6 +22,7 @@ import {
radarText,
treemapText,
treeViewText,
+ wardleyText,
SankeyDiagram,
xyChartText,
packetText,
@@ -56,6 +57,7 @@ const diagramMap: Record<string, number> = {
"treemap-beta": treemapText,
"treemap": treemapText,
"treeView-beta": treeViewText,
+ "wardley-beta": wardleyText,
"sankey-beta": SankeyDiagram,
"sankey": SankeyDiagram,
"xychart-beta": xyChartText,
@@ -87,7 +89,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
+ stateText, erText, gitText, c4Text, wardleyText
]);
/**
diff --git a/packages/codemirror/src/languages/mermaid/parsers/wardley/highlight.ts b/packages/codemirror/src/languages/mermaid/parsers/wardley/highlight.ts
new file mode 100644
index 0000000000..58cf9f7463
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/wardley/highlight.ts
@@ -0,0 +1,18 @@
+import { styleTags } from "@lezer/highlight";
+
+import { wardleyTags } from "../../tags/index.js";
+
+export const wardleyHighlighting = styleTags({
+ "Arrow Port": wardleyTags.arrow,
+ "DiagramName": wardleyTags.diagramName,
+ "Keyword": wardleyTags.keyword,
+ "LineComment": wardleyTags.lineComment,
+ "LinkLabel": wardleyTags.linkLabel,
+ "Name": wardleyTags.name,
+ "Number": wardleyTags.number,
+ "Strategy": wardleyTags.strategy,
+ "String": wardleyTags.string,
+ "TitleText": wardleyTags.titleText,
+ "[ ] ( ) { }": wardleyTags.bracket,
+ ', @ "/"': wardleyTags.separator
+});
diff --git a/packages/codemirror/src/languages/mermaid/parsers/wardley/parser.terms.ts b/packages/codemirror/src/languages/mermaid/parsers/wardley/parser.terms.ts
new file mode 100644
index 0000000000..c35b2f24cb
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/wardley/parser.terms.ts
@@ -0,0 +1,46 @@
+// 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,
+ titleKeyword = 2,
+ sizeKeyword = 3,
+ evolutionKeyword = 4,
+ anchorKeyword = 5,
+ componentKeyword = 6,
+ labelKeyword = 7,
+ inertiaKeyword = 8,
+ evolveKeyword = 9,
+ pipelineKeyword = 10,
+ noteKeyword = 11,
+ annotationsKeyword = 12,
+ annotationKeyword = 13,
+ acceleratorKeyword = 14,
+ deacceleratorKeyword = 15,
+ Strategy = 16,
+ Name = 17,
+ LineComment = 18,
+ WardleyDiagram = 19,
+ DiagramName = 20,
+ Title = 21,
+ Size = 22,
+ Coordinates = 23,
+ Number = 25,
+ Evolution = 28,
+ Stage = 29,
+ String = 30,
+ Arrow = 33,
+ Anchor = 34,
+ Component = 35,
+ LabelOffset = 36,
+ Decorator = 37,
+ Link = 40,
+ Port = 41,
+ LinkLabel = 42,
+ Evolve = 43,
+ Pipeline = 44,
+ PipelineComponent = 46,
+ Note = 48,
+ Annotations = 49,
+ Annotation = 50,
+ Accelerator = 51,
+ Deaccelerator = 52
diff --git a/packages/codemirror/src/languages/mermaid/parsers/wardley/parser.ts b/packages/codemirror/src/languages/mermaid/parsers/wardley/parser.ts
new file mode 100644
index 0000000000..3bf7667592
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/wardley/parser.ts
@@ -0,0 +1,20 @@
+// 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, words} from "./tokens.js"
+import {wardleyHighlighting} from "./highlight.js"
+export const parser = LRParser.deserialize({
+ version: 14,
+ states: ".WOYQSOOOOQQ'#Cp'#CpQ_QUOOO!]QVO'#CqO#aQSO'#CrOOQQ'#Dk'#DkO!TQUO'#CxO!TQUO'#DOO!TQUO'#DPO#fQUO'#DUO!TQUO'#DXO!TQUO'#DYO#tQSO'#D^O#aQSO'#D_O#yQSO'#D`O!TQUO'#DaO!TQUO'#DbOOQQ'#Dj'#DjOOQQ'#Dc'#DcQ_QUOOOOQQ,59],59]O$OQSO'#CsOOQQ,59^,59^O$TQUO'#CyO%_QSO,59dO#aQSO,59jO#aQSO,59kO%dQUO,59pO!TQUO,59pO&kQUO,59pO&vQSO,59sO&{QSO,59tO#aQSO,59xOOQQ,59y,59yO'QQSO,59zO#aQSO,59{O#aQSO,59|OOQQ-E7a-E7aO'VQSO,59_O!TQUO,59eO'_QSO,59eO!TQUO'#DdO'dQUO1G/OOOQQ1G/U1G/UO(hQUO1G/VOOQQ1G/[1G/[O)rQUO1G/[O*vQUO1G/[O!TQUO1G/[OOQQ1G/_1G/_O*}QUO1G/`OOQQ1G/d1G/dO#aQSO1G/fOOQQ1G/g1G/gOOQQ1G/h1G/hOOQQ1G.y1G.yO+VQSO1G.yOOQQ1G/P1G/PO+[QUO1G/POOQQ,5:O,5:OOOQQ-E7b-E7bO#aQSO'#DQO,cQUO7+$qOOQQ7+$q7+$qO-oQUO7+$qO-vQUO7+$qOOQQ7+$v7+$vO-}QUO7+$vO/RQUO7+$vO!TQUO'#D[OOQQ'#De'#DeO/YQUO7+$zOOQQ7+$z7+$zO/bQSO7+%QO/gQSO7+$eO!TQUO7+$kOOQQ,59l,59lO/lQSO,59mO/qQSO<<H]OOQQ<<H]<<H]O/vQUO<<H]O/{QUO<<H]O0TQUO<<H]OOQQ<<Hb<<HbO1[QUO<<HbO#aQSO,59vOOQQ-E7c-E7cOOQQ<<Hf<<HfOOQQ<<Hl<<HlOOQQ<<HP<<HPOOQQ<<HV<<HVOOQQ1G/X1G/XOOQQAN=wAN=wO2`QSOAN=wO2eQUOAN=wOOQQAN=|AN=|O2jQUO1G/bOOQQG23cG23cO2uQSOG23cOOQQ7+$|7+$|OOQQLD(}LD(}",
+ stateData: "2z~O![OSbOS~O!]PO~OQRORSOSUOTVOUWOXYOYZOZ[O[]O]^O^_O_`OaTOnTO~OPdOQeXReXSeXTeXUeXXeXYeXZeX[eX]eX^eX_eXaeXneX!YeX~OheO~OaTOnTOqlOymO~OnpO~OirO~OivO~OoxOpwOqmXQmXRmXSmXTmXUmXXmXYmXZmX[mX]mX^mX_mXamXnmX!YmX~OqyO~Oy!OOz}OQxaRxaSxaTxaUxaXxaYxaZxa[xa]xa^xa_xaaxanxa!Yxa~OaTOnTOq!QO~Oi!RO~O}!SO~Oj!UO~Oj!YOk!XO~Oi![O~OqyOQliRliSliTliUliXliYliZli[li]li^li_lialinli!Yli~OV!_OW!aOv!`OQsiRsiSsiTsiUsiXsiYsiZsi[si]si^si_siasinsi!Ysi~Oz!dOQxiRxiSxiTxiUxiXxiYxiZxi[xi]xi^xi_xiaxinxi!Yxi~Oy!eO~P)rOU!gO!P!jO~Oi!lO~Op!mOqmiQmiRmiSmiTmiUmiXmiYmiZmi[mi]mi^mi_miaminmi!Ymi~OW!pO`!oO~OW!qOQsqRsqSsqTsqUsqXsqYsqZsq[sq]sq^sq_sqasqnsq!Ysq~Ov!rO~P,kOv!sO~P,kOz!uOQxqRxqSxqTxqUxqXxqYxqZxq[xq]xq^xq_xqaxqnxq!Yxq~Oy!vO~P-}OU!gO!P!yO~On!zO~Ok!{O~Ow!}O~Ow#OO~OW#PO~OW#PO`!oO~OW#OOv#QOQsyRsySsyTsyUsyXsyYsyZsy[sy]sy^sy_syasynsy!Ysy~Oz#ROQxyRxySxyTxyUxyXxyYxyZxy[xy]xy^xy_xyaxynxy!Yxy~Ow#TO~OW#UO~OV!_OU!Oi!P!Oi~Ow#WO~O",
+ goto: "%T!`PPPPPPPPPPPPPPPPPPPP!a!d!d!hPPPP!d#WPPPP!d!d#^#dPP!dPP!d!dP#jP!d!d!d!d!d#n#t#zPPPP$Q$URQOTaQcQfSQq]Q{iQ|jQ!TpQ!VsQ!WtQ!k!UQ!n!_R#S!wQhUR!]yQ!c|R#V#SQ!b|R!t!cT!h!S!iQcQRucQzhR!^zQ!i!SR!x!iTbQcSXQcSgUyQiVQjWQkXQnYQoZQs_Qt`S!PlmQ!ZwQ!f!QQ!w!gR!|!m",
+ nodeNames: "⚠ TitleText Keyword Keyword Keyword Keyword Keyword Keyword Keyword Keyword Keyword Keyword Keyword Keyword Keyword Keyword Strategy Name LineComment WardleyDiagram DiagramName Title Size Coordinates [ Number , ] Evolution Stage String @ / Arrow Anchor Component LabelOffset Decorator ( ) Link Port LinkLabel Evolve Pipeline { PipelineComponent } Note Annotations Annotation Accelerator Deaccelerator",
+ maxTerm: 61,
+ propSources: [wardleyHighlighting],
+ skippedNodes: [0,18],
+ repeatNodeCount: 3,
+ tokenData: ",j~RfXY!gYZ!g]^!gpq!grs!xuv$lwx%Zxy&xyz&}{|'S|}(m}!O(r!P!Q)x!Q![)_!]!^)}!`!a(T!b!c*f!}#O*k#P#Q*p#k#l*u#o#p,`#q#r,e~!lS![~XY!gYZ!g]^!gpq!g~!{WOY!xZr!xrs#es#O!x#O#P#j#P;'S!x;'S;=`$f<%lO!x~#jOn~~#mRO;'S!x;'S;=`#v;=`O!x~#yXOY!xZr!xrs#es#O!x#O#P#j#P;'S!x;'S;=`$f;=`<%l!x<%lO!x~$iP;=`<%l!x~$oPuv$r~$wSb~OY$rZ;'S$r;'S;=`%T<%lO$r~%WP;=`<%l$r~%^WOY%ZZw%Zwx#ex#O%Z#O#P%v#P;'S%Z;'S;=`&r<%lO%Z~%yRO;'S%Z;'S;=`&S;=`O%Z~&VXOY%ZZw%Zwx#ex#O%Z#O#P%v#P;'S%Z;'S;=`&r;=`<%l%Z<%lO%Z~&uP;=`<%l%Z~&}Ov~~'SOw~~'VRwx'`!^!_(`!`!a(h~'cTOw'`wx'rx;'S'`;'S;=`(Y<%lO'`~'uQ!^!_'{!`!a(T~(QPq~!`!a(T~(YOq~~(]P;=`<%l'`~(ePy~!`!a(h~(mOy~~(rOj~~(uS}!O)R!O!P)X!Q![)_!`!a(T~)UP!`!a(T~)[P}!O)R~)dQi~!O!P)j!Q![)_~)mP!Q![)p~)uPi~!Q![)p~)}Op~~*SSz~OY)}Z;'S)};'S;=`*`<%lO)}~*cP;=`<%l)}~*kOo~~*pOh~~*uOk~~*xP#T#U*{~+OP#f#g+R~+UP#W#X+X~+[P#`#a+_~+bP#X#Y+e~+hP#m#n+k~+nP}!O+q~+tP#U#V+w~+zP#X#Y+}~,QP#h#i,T~,WP#T#U,Z~,`O!]~~,eO}~~,jO!P~",
+ tokenizers: [titleText, words, 0],
+ topRules: {"WardleyDiagram":[0,19]},
+ tokenPrec: 0
+})
diff --git a/packages/codemirror/src/languages/mermaid/parsers/wardley/tokens.ts b/packages/codemirror/src/languages/mermaid/parsers/wardley/tokens.ts
new file mode 100644
index 0000000000..181c926742
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/wardley/tokens.ts
@@ -0,0 +1,94 @@
+import { ExternalTokenizer, type InputStream } from "@lezer/lr";
+
+import { lineText } from "../line_text.js";
+import {
+ acceleratorKeyword,
+ anchorKeyword,
+ annotationKeyword,
+ annotationsKeyword,
+ componentKeyword,
+ deacceleratorKeyword,
+ evolutionKeyword,
+ evolveKeyword,
+ inertiaKeyword,
+ labelKeyword,
+ Name,
+ noteKeyword,
+ pipelineKeyword,
+ sizeKeyword,
+ Strategy,
+ titleKeyword,
+ TitleText
+} from "./parser.terms.js";
+
+const keywords: Record<string, number> = {
+ accelerator: acceleratorKeyword,
+ anchor: anchorKeyword,
+ annotation: annotationKeyword,
+ annotations: annotationsKeyword,
+ build: Strategy,
+ buy: Strategy,
+ component: componentKeyword,
+ deaccelerator: deacceleratorKeyword,
+ evolution: evolutionKeyword,
+ evolve: evolveKeyword,
+ inertia: inertiaKeyword,
+ label: labelKeyword,
+ market: Strategy,
+ note: noteKeyword,
+ outsource: Strategy,
+ pipeline: pipelineKeyword,
+ size: sizeKeyword,
+ title: titleKeyword
+};
+
+export const titleText = lineText(TitleText);
+
+/**
+ * A keyword where the grammar takes it (`(build)` reads `build`, though `)` can be part of a
+ * name), or else a name: words of letters, digits, `_`, `(`, `)`,
+ * `&` and `-` (not before `>`), joined by spaces or tabs, each after the first starting with a
+ * letter or `(`, as Mermaid's `NAME_WITH_SPACES` reads them.
+ */
+export const words = new ExternalTokenizer((input, stack) => {
+ if (!isLetter(input.next)) return;
+
+ let letters = 0;
+ let word = "";
+ for (; isLetter(input.peek(letters)); letters++) {
+ word += String.fromCharCode(input.peek(letters));
+ }
+ const after = input.peek(letters);
+ const keyword = keywords[word];
+ if (keyword !== undefined && stack.canShift(keyword) && !isDigit(after) && after !== 95) {
+ input.acceptToken(keyword, letters);
+ return;
+ }
+
+ let end = wordLength(input, 0);
+ for (;;) {
+ let next = end;
+ while (input.peek(next) === 32 || input.peek(next) === 9) next++;
+ if (next === end || !(isLetter(input.peek(next)) || input.peek(next) === 40)) break;
+ end = next + wordLength(input, next);
+ }
+ input.acceptToken(Name, end);
+});
+
+function wordLength(input: InputStream, offset: number) {
+ let length = 1;
+ for (let next = input.peek(offset + length); ; next = input.peek(offset + length)) {
+ const dash = next === 45 && input.peek(offset + length + 1) !== 62;
+ if (!(isLetter(next) || isDigit(next) || [ 95, 40, 41, 38 ].includes(next) || dash)) break;
+ length++;
+ }
+ return length;
+}
+
+function isLetter(code: number) {
+ return (code >= 65 && code <= 90) || (code >= 97 && code <= 122);
+}
+
+function isDigit(code: number) {
+ return code >= 48 && code <= 57;
+}
diff --git a/packages/codemirror/src/languages/mermaid/parsers/wardley/wardley.grammar b/packages/codemirror/src/languages/mermaid/parsers/wardley/wardley.grammar
new file mode 100644
index 0000000000..0556906e99
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/parsers/wardley/wardley.grammar
@@ -0,0 +1,88 @@
+// Follows the Langium grammar of Mermaid's Wardley map (`@mermaid-js/parser`). Names can hold
+// spaces (`Cup of Tea`), so the `words` tokenizer reads a keyword where the grammar takes one and a
+// name otherwise. Newlines are skipped: a name never spans lines, so statements stay apart.
+@top WardleyDiagram { DiagramName statement* }
+
+statement {
+ Title | Size | Evolution | Anchor | Component | Link | Evolve | Pipeline | Note | Annotations |
+ Annotation | Accelerator | Deaccelerator
+}
+
+Title { titleKeyword TitleText? }
+
+Size { sizeKeyword Coordinates }
+
+Evolution { evolutionKeyword Stage (Arrow Stage)+ }
+
+Stage { name ("@" Number)? ("/" name)? }
+
+Anchor { anchorKeyword name Coordinates }
+
+Component {
+ componentKeyword name Coordinates LabelOffset? Decorator?
+ (inertiaKeyword | "(" inertiaKeyword ")")?
+}
+
+LabelOffset { labelKeyword Coordinates }
+
+Decorator { "(" Strategy ")" }
+
+Link { name Port? Arrow? name Port? LinkLabel? }
+
+Evolve { evolveKeyword name Number }
+
+Pipeline { pipelineKeyword name "{" PipelineComponent* "}" }
+
+PipelineComponent { componentKeyword name Coordinates LabelOffset? }
+
+Note { noteKeyword String Coordinates }
+
+Annotations { annotationsKeyword Coordinates }
+
+Annotation { annotationKeyword Number "," Coordinates String }
+
+Accelerator { acceleratorKeyword name Coordinates }
+
+Deaccelerator { deacceleratorKeyword name Coordinates }
+
+Coordinates { "[" Number ("," Number)? "]" }
+
+name { Name | String }
+
+DiagramName { "wardley-beta" }
+
+@skip { space | LineComment }
+
+@external tokens titleText from "./tokens.js" { TitleText }
+
+@external tokens words from "./tokens.js" {
+ titleKeyword[@name=Keyword],
+ sizeKeyword[@name=Keyword],
+ evolutionKeyword[@name=Keyword],
+ anchorKeyword[@name=Keyword],
+ componentKeyword[@name=Keyword],
+ labelKeyword[@name=Keyword],
+ inertiaKeyword[@name=Keyword],
+ evolveKeyword[@name=Keyword],
+ pipelineKeyword[@name=Keyword],
+ noteKeyword[@name=Keyword],
+ annotationsKeyword[@name=Keyword],
+ annotationKeyword[@name=Keyword],
+ acceleratorKeyword[@name=Keyword],
+ deacceleratorKeyword[@name=Keyword],
+ Strategy,
+ Name
+}
+
+@tokens {
+ space { $[ \t\r\n]+ }
+ Number { "-"? @digit+ ("." @digit+)? }
+ String { '"' (!["\\\n] | "\\" _)* '"' | "'" (!['\\\n] | "\\" _)* "'" }
+ Arrow { "->" | "-->" | "-.->" | ">" | "+'" ![']* "'" ("<>" | "<" | ">") }
+ Port { "+<>" | "+>" | "+<" }
+ LinkLabel { ";" ![\n]* }
+ LineComment { "%%" ![\n]* }
+ "[" "]" "(" ")" "{" "}" "," "@" "/"
+}
+
+@external propSource wardleyHighlighting from "./highlight.js"
diff --git a/packages/codemirror/src/languages/mermaid/tags/index.ts b/packages/codemirror/src/languages/mermaid/tags/index.ts
index f8896fe325..83dfda1f0c 100644
--- a/packages/codemirror/src/languages/mermaid/tags/index.ts
+++ b/packages/codemirror/src/languages/mermaid/tags/index.ts
@@ -252,3 +252,18 @@ export const treeViewTags = {
name: Tag.define(t.string),
titleText: Tag.define(t.string)
};
+
+export const wardleyTags = {
+ arrow: Tag.define(t.operator),
+ bracket: Tag.define(t.bracket),
+ diagramName: Tag.define(mermaidTags.diagramName),
+ keyword: Tag.define(t.keyword),
+ lineComment: Tag.define(t.lineComment),
+ linkLabel: Tag.define(t.string),
+ name: Tag.define(t.variableName),
+ number: Tag.define(t.number),
+ separator: Tag.define(t.separator),
+ strategy: Tag.define(t.atom),
+ string: Tag.define(t.string),
+ titleText: Tag.define(t.string)
+};
diff --git a/packages/codemirror/src/languages/mermaid/test/mermaid.txt b/packages/codemirror/src/languages/mermaid/test/mermaid.txt
index fbb789de34..3496214d0a 100644
--- a/packages/codemirror/src/languages/mermaid/test/mermaid.txt
+++ b/packages/codemirror/src/languages/mermaid/test/mermaid.txt
@@ -395,3 +395,12 @@ treeView-beta
==>
MermaidDiagram(TreeViewDiagram(DiagramName,Node(Name)))
+
+# Wardley map
+
+wardley-beta
+ anchor A [0.5, 0.5]
+
+==>
+
+MermaidDiagram(WardleyDiagram(DiagramName,Anchor(Keyword,Name,Coordinates("[",Number,",",Number,"]"))))
diff --git a/packages/codemirror/src/languages/mermaid/test/wardley.txt b/packages/codemirror/src/languages/mermaid/test/wardley.txt
new file mode 100644
index 0000000000..b2600b9f52
--- /dev/null
+++ b/packages/codemirror/src/languages/mermaid/test/wardley.txt
@@ -0,0 +1,121 @@
+# Wardley map
+
+wardley-beta
+
+==>
+
+WardleyDiagram(DiagramName)
+
+# Trilium's sample
+
+wardley-beta
+ title Tea Shop
+
+ anchor Customers [0.95, 0.63]
+ anchor Business [0.95, 0.27]
+
+ component Cup of Tea [0.79, 0.61]
+ component Tea [0.63, 0.81]
+
+ Customers -> Cup of Tea
+ Cup of Tea -> Tea
+
+==>
+
+WardleyDiagram(DiagramName,Title(Keyword,TitleText),Anchor(Keyword,Name,Coordinates("[",Number,",",Number,"]")),Anchor(Keyword,Name,Coordinates("[",Number,",",Number,"]")),Component(Keyword,Name,Coordinates("[",Number,",",Number,"]")),Component(Keyword,Name,Coordinates("[",Number,",",Number,"]")),Link(Name,Arrow,Name),Link(Name,Arrow,Name))
+
+# Size and evolution stages
+
+wardley-beta
+ size [800, 600]
+ evolution Genesis -> [email protected] -> Product / Rental -> Commodity
+
+==>
+
+WardleyDiagram(DiagramName,Size(Keyword,Coordinates("[",Number,",",Number,"]")),Evolution(Keyword,Stage(Name),Arrow,Stage(Name,"@",Number),Arrow,Stage(Name,"/",Name),Arrow,Stage(Name)))
+
+# Component label, decorator and inertia
+
+wardley-beta
+ component Tea [0.63, 0.81] label [-10, 5] (build) inertia
+ component Pot [0.6, 0.8] (inertia)
+
+==>
+
+WardleyDiagram(DiagramName,Component(Keyword,Name,Coordinates("[",Number,",",Number,"]"),LabelOffset(Keyword,Coordinates("[",Number,",",Number,"]")),Decorator("(",Strategy,")"),Keyword),Component(Keyword,Name,Coordinates("[",Number,",",Number,"]"),"(",Keyword,")"))
+
+# Keywords inside names
+
+wardley-beta
+ component builder [0.5, 0.5]
+ component size_2 [0.5, 0.5]
+ component Tea(hot) [0.5, 0.5]
+
+==>
+
+WardleyDiagram(DiagramName,Component(Keyword,Name,Coordinates("[",Number,",",Number,"]")),Component(Keyword,Name,Coordinates("[",Number,",",Number,"]")),Component(Keyword,Name,Coordinates("[",Number,",",Number,"]")))
+
+# Link ports, arrows and labels
+
+wardley-beta
+ A +> -.-> B +< ; uses it
+ A +'limits'> B
+ evolve A 0.8
+
+==>
+
+WardleyDiagram(DiagramName,Link(Name,Port,Arrow,Name,Port,LinkLabel),Link(Name,Arrow,Name),Evolve(Keyword,Name,Number))
+
+# Pipeline
+
+wardley-beta
+ pipeline Kettle {
+ component Electric [0.4]
+ component Gas [0.6] label [5, 5]
+ }
+
+==>
+
+WardleyDiagram(DiagramName,Pipeline(Keyword,Name,"{",PipelineComponent(Keyword,Name,Coordinates("[",Number,"]")),PipelineComponent(Keyword,Name,Coordinates("[",Number,"]"),LabelOffset(Keyword,Coordinates("[",Number,",",Number,"]"))),"}"))
+
+# Notes, annotations and accelerators
+
+wardley-beta
+ note "A note" [0.5, 0.5]
+ annotations [0.1, 0.9]
+ annotation 1, [0.2, 0.3] "First"
+ accelerator Faster [0.5, 0.5]
+ deaccelerator Slower [0.4, 0.4] %% a comment
+
+==>
+
+WardleyDiagram(DiagramName,Note(Keyword,String,Coordinates("[",Number,",",Number,"]")),Annotations(Keyword,Coordinates("[",Number,",",Number,"]")),Annotation(Keyword,Number,",",Coordinates("[",Number,",",Number,"]"),String),Accelerator(Keyword,Name,Coordinates("[",Number,",",Number,"]")),Deaccelerator(Keyword,Name,Coordinates("[",Number,",",Number,"]")),LineComment)
+
+# Names on separate lines (invalid, parses as a link)
+
+wardley-beta
+ A
+ B
+
+==>
+
+WardleyDiagram(DiagramName,Link(Name,Name))
+
+# Ampersand starting a word (invalid)
+
+wardley-beta
+ component Tea & Co [0.5, 0.5]
+
+==>
+
+WardleyDiagram(DiagramName,Component(Keyword,Name,⚠,⚠,Coordinates("[",Number,",",Number,"]")))
+
+# Hyphenated name before an arrow
+
+wardley-beta
+ component Tea-pot [0.5, 0.5]
+ Tea-pot->B
+
+==>
+
+WardleyDiagram(DiagramName,Component(Keyword,Name,Coordinates("[",Number,",",Number,"]")),Link(Name,Arrow,Name))