Fix nullable setting and add RankDir for graph

vfrz · Aug 7, 2023 · d8fbe9c · d8fbe9c
1 parent 29b989c
commit d8fbe9c
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 16 deletions.
diff --git a/Sources/DotNetGraph.Tests/Core/DotGraphTests.cs b/Sources/DotNetGraph.Tests/Core/DotGraphTests.cs
@@ -54,4 +54,20 @@ public async Task CompileEmptyDirectedGraph()
         var result = writer.GetStringBuilder().ToString();
         result.Should().Be("digraph \"Test\" {\n}\n");
     }
+
+    [TestMethod]
+    public async Task CompileEmptyDirectedGraphWithRankDir()
+    {
+        var graph = new DotGraph()
+            .WithIdentifier("Test")
+            .WithRankDir(DotRankDir.RL)
+            .Directed();
+
+        await using var writer = new StringWriter();
+        var context = new CompilationContext(writer, new CompilationOptions());
+        await graph.CompileAsync(context);
+
+        var result = writer.GetStringBuilder().ToString();
+        result.Should().Be("digraph \"Test\" {\n\trankdir=\"RL\"\n}\n");
+    }
 }
diff --git a/Sources/DotNetGraph.Tests/Extensions/DotBaseGraphExtensionsTests.cs b/Sources/DotNetGraph.Tests/Extensions/DotBaseGraphExtensionsTests.cs
@@ -28,6 +28,15 @@ public void WithIdentifierHtml()
         graph.Identifier.IsHtml.Should().Be(true);
     }
 
+    [TestMethod]
+    public void WithRankDir()
+    {
+        var graph = new DotGraph()
+            .WithRankDir(DotRankDir.TB);
+
+        graph.RankDir.Should().Be(DotRankDir.TB);
+    }
+
     [TestMethod]
     public void Add()
     {

diff --git a/Sources/DotNetGraph/Core/DotBaseGraph.cs b/Sources/DotNetGraph/Core/DotBaseGraph.cs
@@ -7,9 +7,27 @@ namespace DotNetGraph.Core
     public abstract class DotBaseGraph : DotElement
     {
         public DotIdentifier Identifier { get; set; }
+
+        public DotRankDir? RankDir { get; set; }
 
         public List<IDotElement> Elements { get; } = new List<IDotElement>();
 
         public abstract override Task CompileAsync(CompilationContext context);
+
+        protected async Task CompileBodyAsync(CompilationContext context)
+        {
+            await Identifier.CompileAsync(context);
+            await context.WriteLineAsync(" {");
+            context.IndentationLevel++;
+            if (RankDir != null)
+            {
+                await context.WriteIndentationAsync();
+                await context.WriteLineAsync($"rankdir=\"{RankDir.ToString()}\"");
+            }
+            await CompileAttributesAsync(context);
+            context.IndentationLevel--;
+            await context.WriteIndentationAsync();
+            await context.WriteLineAsync("}");
+        }
     }
 }
diff --git a/Sources/DotNetGraph/Core/DotGraph.cs b/Sources/DotNetGraph/Core/DotGraph.cs
@@ -8,21 +8,15 @@ public class DotGraph : DotBaseGraph
         public bool Strict { get; set; }
 
         public bool Directed { get; set; }
-
+        
         public override async Task CompileAsync(CompilationContext context)
         {
             context.DirectedGraph = Directed;
             await context.WriteIndentationAsync();
             if (Strict)
                 await context.WriteAsync("strict ");
             await context.WriteAsync(Directed ? "digraph " : "graph ");
-            await Identifier.CompileAsync(context);
-            await context.WriteLineAsync(" {");
-            context.IndentationLevel++;
-            await CompileAttributesAsync(context);
-            context.IndentationLevel--;
-            await context.WriteIndentationAsync();
-            await context.WriteLineAsync("}");
+            await CompileBodyAsync(context);
         }
     }
 }
diff --git a/Sources/DotNetGraph/Core/DotRankDir.cs b/Sources/DotNetGraph/Core/DotRankDir.cs
@@ -0,0 +1,11 @@
+// ReSharper disable InconsistentNaming
+namespace DotNetGraph.Core
+{
+    public enum DotRankDir
+    {
+        TB = 0,
+        BT = 1,
+        LR = 2,
+        RL = 3
+    }
+}
diff --git a/Sources/DotNetGraph/Core/DotSubgraph.cs b/Sources/DotNetGraph/Core/DotSubgraph.cs
@@ -22,13 +22,7 @@ public override async Task CompileAsync(CompilationContext context)
         {
             await context.WriteIndentationAsync();
             await context.WriteAsync("subgraph ");
-            await Identifier.CompileAsync(context);
-            await context.WriteLineAsync(" {");
-            context.IndentationLevel++;
-            await CompileAttributesAsync(context);
-            context.IndentationLevel--;
-            await context.WriteIndentationAsync();
-            await context.WriteLineAsync("}");
+            await CompileBodyAsync(context);
         }
     }
 }
diff --git a/Sources/DotNetGraph/DotNetGraph.csproj b/Sources/DotNetGraph/DotNetGraph.csproj
@@ -2,7 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
-        <Nullable>enable</Nullable>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Sources/DotNetGraph/Extensions/DotBaseGraphExtensions.cs b/Sources/DotNetGraph/Extensions/DotBaseGraphExtensions.cs
@@ -10,6 +10,12 @@ public static T WithIdentifier<T>(this T graph, string identifier, bool isHtml =
             return graph;
         }
 
+        public static T WithRankDir<T>(this T graph, DotRankDir? rankDir) where T : DotBaseGraph
+        {
+            graph.RankDir = rankDir;
+            return graph;
+        }
+
         public static T Add<T>(this T graph, IDotElement element) where T : DotBaseGraph
         {
             graph.Elements.Add(element);