Bug/24 cant parse named diagrams (#96)

* Test for #24: Can't parse named diagrams * add named diagram with spaces * parse diagram name
Enteee · Mar 27, 2023 · e3327a9 · e3327a9
1 parent cdf2fdb
commit e3327a9
Show file tree

Hide file tree

Showing 11 changed files with 78 additions and 1 deletion.
diff --git a/src/plantuml.pegjs b/src/plantuml.pegjs
@@ -56,7 +56,7 @@ PlantUMLFile
 Diagrams
   = diagrams:(
     (!"@startuml" .)*
-    "@startuml" _ DiagramId? _ NewLine
+    "@startuml" DiagramId? (" " _ DiagramName)? _ NewLine
       uml:UML
     "@enduml" _ NewLine?
     (!"@startuml" .)*
@@ -68,6 +68,9 @@ Diagrams
 DiagramId
   = "(" _ "id" _ "=" Name ")"
 
+DiagramName
+  = (!NewLine .)+
+
 UML
   = elements:UMLElement*
   {

diff --git a/test/fixtures/diagram-names-with-spaces/in.plantuml b/test/fixtures/diagram-names-with-spaces/in.plantuml
@@ -0,0 +1,2 @@
+@startuml System Context of Project Collector System
+@enduml
diff --git a/test/fixtures/diagram-names-with-spaces/parse-out.default b/test/fixtures/diagram-names-with-spaces/parse-out.default
@@ -0,0 +1,5 @@
+[
+  {
+    "elements": []
+  }
+]
diff --git a/test/fixtures/diagram-names-with-spaces/parse-out.graph b/test/fixtures/diagram-names-with-spaces/parse-out.graph
@@ -0,0 +1,4 @@
+{
+  "nodes": [],
+  "edges": []
+}
diff --git a/test/fixtures/diagram-names-with-spaces/parseFile-out.default b/test/fixtures/diagram-names-with-spaces/parseFile-out.default
@@ -0,0 +1,10 @@
+[
+  {
+    "name": "test/fixtures/diagram-names-with-spaces/in.plantuml",
+    "diagrams": [
+      {
+        "elements": []
+      }
+    ]
+  }
+]
diff --git a/test/fixtures/diagram-names-with-spaces/parseFile-out.graph b/test/fixtures/diagram-names-with-spaces/parseFile-out.graph
@@ -0,0 +1,16 @@
+{
+  "nodes": [
+    {
+      "name": "test/fixtures/diagram-names-with-spaces/in.plantuml",
+      "diagrams": [
+        {
+          "elements": []
+        }
+      ],
+      "id": "test/fixtures/diagram-names-with-spaces/in.plantuml",
+      "type": "File",
+      "hidden": true
+    }
+  ],
+  "edges": []
+}
diff --git a/test/fixtures/diagram-names/in.plantuml b/test/fixtures/diagram-names/in.plantuml
@@ -0,0 +1,2 @@
+@startuml diagramname
+@enduml
diff --git a/test/fixtures/diagram-names/parse-out.default b/test/fixtures/diagram-names/parse-out.default
@@ -0,0 +1,5 @@
+[
+  {
+    "elements": []
+  }
+]
diff --git a/test/fixtures/diagram-names/parse-out.graph b/test/fixtures/diagram-names/parse-out.graph
@@ -0,0 +1,4 @@
+{
+  "nodes": [],
+  "edges": []
+}
diff --git a/test/fixtures/diagram-names/parseFile-out.default b/test/fixtures/diagram-names/parseFile-out.default
@@ -0,0 +1,10 @@
+[
+  {
+    "name": "test/fixtures/diagram-names/in.plantuml",
+    "diagrams": [
+      {
+        "elements": []
+      }
+    ]
+  }
+]
diff --git a/test/fixtures/diagram-names/parseFile-out.graph b/test/fixtures/diagram-names/parseFile-out.graph
@@ -0,0 +1,16 @@
+{
+  "nodes": [
+    {
+      "name": "test/fixtures/diagram-names/in.plantuml",
+      "diagrams": [
+        {
+          "elements": []
+        }
+      ],
+      "id": "test/fixtures/diagram-names/in.plantuml",
+      "type": "File",
+      "hidden": true
+    }
+  ],
+  "edges": []
+}