refactor graph viz, add settings context

Author: bjornregnell

src/main/scala/05-GraphVizGen.scala

@@ -1,6 +1,23 @@
 package reqt
 
 object GraphVizGen:
+  case class GraphVizSettings(
+    fontName: String = "Sans",
+    fontSize: Int = 10,
+    rankDir: String = "LR",
+    ordering: String = "out",
+    noJustify: Boolean = true,
+    edgeArrowhead: String = "empty",
+    nodeShape: String = "record",
+    compound: Boolean = true,
+  )
+  object GraphVizSettings:
+    given default: GraphVizSettings = GraphVizSettings()
+
+  extension (m: Model)
+    def toGraphViz(using settings: GraphVizSettings): String = 
+      val s = settings.copy(rankDir = "LR")
+      ???
 
   def recordNode(
     nodeName: String,
@@ -14,37 +31,32 @@ object GraphVizGen:
 
   def edge(fromNode: String, toNode: String): String = s"  $fromNode -> $toNode"
 
-  def directedGraph(
-    name: String, 
-    fontName: String = "Sans",
-    fontSize: Int = 10,
-    rankDir: String = "BT",
-    ordering: String = "out",
-    noJustify: Boolean = true,
-    edgeArrowhead: String = "empty",
-    nodeShape: String = "record",
-  )(rankSame: Seq[Seq[String]])(edges: Seq[(String, String)])(nodeFormats: Seq[String]) = 
-    s"""|digraph $name {
-        |  fontname = "$fontName"
-        |  fontsize = $fontSize
-        |  rankdir =  "$rankDir"
-        |  ordering = "$ordering"
-        |  nojustify = $noJustify
-        |
-        |  node [
-        |    fontname = "$fontName"
-        |    fontsize = $fontSize
-        |    shape = "$nodeShape"
-        |  ]
-        |
-        |  edge [
-        |    arrowhead = "$edgeArrowhead"
-        |  ]
-        |
-        |${rankSame.map(_.mkString("  { rank = same; ", "; ", "; }")).mkString("  ", "\n  ", "\n")}
-        |
-        |${nodeFormats.mkString("  ", "\n  ", "\n")}
-        |
-        |${edges.map((f,t) => edge(f,t)).mkString("  ", "\n  ", "\n")}
-        |}
-        |""".stripMargin
+  def classDiagram(title: String)
+    (rankSame: Seq[Seq[String]])(edges: Seq[(String, String)])(nodeFormats: Seq[String]) 
+    (using settings: GraphVizSettings) =
+      val s = settings.copy(rankDir = "BT")
+      import s.*
+      s"""|digraph $title {
+          |  fontname = "$fontName"
+          |  fontsize = $fontSize
+          |  rankdir =  "$rankDir"
+          |  ordering = "$ordering"
+          |  nojustify = $noJustify
+          |
+          |  node [
+          |    fontname = "$fontName"
+          |    fontsize = $fontSize
+          |    shape = "$nodeShape"
+          |  ]
+          |
+          |  edge [
+          |    arrowhead = "$edgeArrowhead"
+          |  ]
+          |
+          |${rankSame.map(_.mkString("  { rank = same; ", "; ", "; }")).mkString("  ", "\n  ", "\n")}
+          |
+          |${nodeFormats.mkString("  ", "\n  ", "\n")}
+          |
+          |${edges.map((f,t) => edge(f,t)).mkString("  ", "\n  ", "\n")}
+          |}
+          |""".stripMargin

src/test/scala/generateLang.scala

@@ -23,7 +23,7 @@ def graphFile(mod: String) = docsDir + s"/metamodel$mod-GENERATED.dot"
   println(s"Generating $conceptFile")
   meta.csv("\t").saveTo(conceptFile)
 
-  println(s"Generating $graphFile")
+  println(s"Generating graph files: metamodel-*-GENERATED.dot")
   meta.graph(showElem=false, showElemType=false).saveTo(graphFile("-Model"))
   meta.graph(showElem=true, showElemType=false).saveTo(graphFile("-Elem"))
   meta.graph(showElem=false, showElemType=true).saveTo(graphFile("-ElemType"))