Release 6.2.x

samples/Basic/C4Sharp.Sample/C4Sharp.Sample.csproj

@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
     <LangVersion>10</LangVersion>
     <ImplicitUsings>true</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

samples/Basic/C4Sharp.Sample/Diagrams/ComponentDiagram.cs

@@ -25,7 +25,7 @@ public class ComponentDiagram: DiagramBuildRunner
 
         protected override DiagramType DiagramType  => DiagramType.Component;
         protected override DiagramLayout FlowVisualization => DiagramLayout.LeftRight;
-        protected override bool LayoutAsSketch => true;
+        protected override bool LayoutAsSketch => false;
 
         protected override IEnumerable<Structure> Structures => new Structure[]
         {

samples/Basic/C4Sharp.Sample/Diagrams/ContainerDiagram.cs

@@ -1,9 +1,9 @@
 using C4Sharp.Diagrams;
 using C4Sharp.Diagrams.Interfaces;
+using C4Sharp.Diagrams.Plantuml.Constants;
+using C4Sharp.Diagrams.Plantuml.Style;
 using C4Sharp.Elements;
 using C4Sharp.Elements.Boundaries;
-using C4Sharp.Elements.Plantuml;
-using C4Sharp.Elements.Plantuml.Constants;
 using C4Sharp.Elements.Relationships;
 using C4Sharp.Sample.Structures;
 
@@ -26,7 +26,7 @@ public class ContainerDiagram: DiagramBuildRunner
                 Spa,
                 MobileApp,
                 SqlDatabase,
-                RabbitMQ,
+                RabbitMq,
                 BackendApi
             )
         };
@@ -41,7 +41,7 @@ public class ContainerDiagram: DiagramBuildRunner
             Spa > BackendApi | ("Uses", "async, JSON/HTTPS"),
             MobileApp > BackendApi | ("Uses", "async, JSON/HTTPS"),
             SqlDatabase < BackendApi | ("Uses", "async, JSON/HTTPS") | Position.Neighbor,
-            RabbitMQ < BackendApi | ("Uses", "async, JSON"),
+            RabbitMq < BackendApi | ("Uses", "async, JSON"),
 
             People.Customer < Systems.MailSystem | "Sends e-mails to",
             Systems.MailSystem < BackendApi | ("Sends e-mails using", "sync, SMTP"),

samples/Basic/C4Sharp.Sample/Diagrams/ContextDiagram.cs

@@ -1,8 +1,8 @@
 using C4Sharp.Diagrams;
 using C4Sharp.Diagrams.Interfaces;
+using C4Sharp.Diagrams.Plantuml.Constants;
+using C4Sharp.Diagrams.Plantuml.Style;
 using C4Sharp.Elements;
-using C4Sharp.Elements.Plantuml;
-using C4Sharp.Elements.Plantuml.Constants;
 using C4Sharp.Elements.Relationships;
 using C4Sharp.Sample.Structures;
 

samples/Basic/C4Sharp.Sample/Diagrams/EnterpriseDiagram.cs

@@ -1,9 +1,9 @@
 using C4Sharp.Diagrams;
 using C4Sharp.Diagrams.Interfaces;
+using C4Sharp.Diagrams.Plantuml.Constants;
+using C4Sharp.Diagrams.Plantuml.Style;
 using C4Sharp.Elements;
 using C4Sharp.Elements.Boundaries;
-using C4Sharp.Elements.Plantuml;
-using C4Sharp.Elements.Plantuml.Constants;
 using C4Sharp.Elements.Relationships;
 using C4Sharp.Sample.Structures;
 

samples/Basic/C4Sharp.Sample/Diagrams/SequenceDiagram.cs

@@ -0,0 +1,34 @@
+using C4Sharp.Diagrams;
+using C4Sharp.Elements;
+using C4Sharp.Elements.Boundaries;
+using C4Sharp.Elements.Relationships;
+
+namespace C4Sharp.Sample.Diagrams;
+
+public class SequenceDiagram: DiagramBuildRunner
+{
+    protected override string Title => "Sequence diagram for Internet Banking System";
+    protected override DiagramType DiagramType => DiagramType.Sequence;
+
+    protected override IEnumerable<Structure> Structures => new Structure[]
+    {
+        new Container("cA", "Single-Page Application", ContainerType.None, "JavaScript and Angular", "Provides all of the Internet banking functionality to customers via their web browser."),
+
+        new SequenceContainerBoundary("b", "Api Application")
+        {
+            Components = new Component[]
+            {
+                new ("cB", "Sign In Controller", ComponentType.None, "Spring MVC Rest Controller", "Allows users to sign in to the Internet Banking System."),
+                new ("cC", "Security Component", ComponentType.None, "Spring Bean", "Provides functionality Related to signing in, changing passwords, etc.")
+            }
+        },
+        new Container("cD", "Database", ContainerType.Database ,"Relational Database Schema", "Stores user registration information, hashed authentication credentials, access logs, etc.")
+    };
+
+    protected override IEnumerable<Relationship> Relationships => new[]
+    {
+        It("cA") > It("cB") | ("Submits credentials to", "JSON/HTTPS"),
+        It("cB") > It("cC") | "Calls isAuthenticated() on",
+        It("cC") > It("cD") | ("select * from users where username = ?o", "JDBCS")
+    };
+}

samples/Basic/C4Sharp.Sample/Program.cs

@@ -1,4 +1,4 @@
-using C4Sharp.Elements.Plantuml.IO;
+using C4Sharp.Diagrams.Plantuml;
 using C4Sharp.Sample.Diagrams;
 
 namespace C4Sharp.Sample;
@@ -14,14 +14,15 @@ private static void Main()
             new ComponentDiagram().Build(),
             new DeploymentDiagram().Build(),
             new EnterpriseDiagram().Build(),
+            new SequenceDiagram().Build()
         };
 
         var context = new PlantumlContext();
 
         context
             .UseDiagramImageBuilder()
-            .UseDiagramSvgImageBuilder()
-            .UseDiagramMermaidBuilder()
+            //.UseDiagramSvgImageBuilder()
+            //.UseDiagramMermaidBuilder()
             //.UseStandardLibraryBaseUrl() //load the resources from github C4plantuml repository
             .Export(diagrams);
     }

samples/Basic/C4Sharp.Sample/Structures/Containers.cs

@@ -43,9 +43,9 @@ public static class Containers
         Technology: "SQL Database"
     );
 
-    public static Queue _rabbitMQ;
+    private static Queue? _rabbitMq = null;
 
-    public static Queue RabbitMQ => _rabbitMQ ?? new Queue(
+    public static Queue RabbitMq => _rabbitMq ?? new Queue(
         Alias: "Queue",
         Label: "RabbitMQ",
         Description: "Stores user registration information, hashed auth credentials, access logs, etc.",

src/C4Sharp.Tools/C4Sharp.Tools.csproj

@@ -4,7 +4,7 @@
         <OutputType>Exe</OutputType>
         <ImplicitUsings>enable</ImplicitUsings>
         <AssemblyName>c4scli</AssemblyName>
-        <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Title>C4SCLI - Tool for C4Sharp</Title>
         <Authors>yanjustino, albertomonteiro</Authors>

src/C4Sharp.Tools/Commands/BuildCommand.cs

@@ -2,7 +2,7 @@
 using System.Reflection;
 using C4Sharp.Diagrams;
 using C4Sharp.Diagrams.Interfaces;
-using C4Sharp.Elements.Plantuml.IO;
+using C4Sharp.Diagrams.Plantuml;
 using C4Sharp.Tools.Commands.Arguments;
 using C4Sharp.Tools.Commands.Options;
 

src/C4Sharp/C4Sharp.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
         <Title>C4Sharp - simple .NET superset of C4-PlantUML</Title>
         <Authors>yanjustino, leisiamedeiros</Authors>

src/C4Sharp/Commons/FileSystem/C4FileException.cs

@@ -1,7 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
-using System.Runtime.Serialization;
 
-namespace C4Sharp.FileSystem;
+namespace C4Sharp.Commons.FileSystem;
 
 /// <summary>
 /// C4File Exception
@@ -27,6 +26,8 @@ public C4FileException(string message, Exception innerException) : base(message,
     {
     }
 
+
+#if NET6
     /// <summary>
     /// Constructor
     /// </summary>
@@ -35,4 +36,5 @@ public C4FileException(string message, Exception innerException) : base(message,
     public C4FileException([NotNull] SerializationInfo info, StreamingContext context) : base(info, context)
     {
     }
+#endif
 }

src/C4Sharp/Commons/FileSystem/C4SharpDirectory.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.FileSystem;
+namespace C4Sharp.Commons.FileSystem;
 
 /// <summary>
 /// Manipulate the C4 folder and their resourcers

src/C4Sharp/Commons/ResourceFile.cs

@@ -1,6 +1,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
-using C4Sharp.Elements.Plantuml.IO;
+using C4Sharp.Diagrams.Plantuml;
 
 namespace C4Sharp.Commons;
 

src/C4Sharp/Diagrams/DiagramConstants.cs

@@ -6,4 +6,5 @@ public static class DiagramConstants
     public const string Container = "C4_Container";
     public const string Context = "C4_Context";
     public const string Deployment = "C4_Deployment";
+    public const string Sequence = "C4_Sequence";
 }

src/C4Sharp/Diagrams/DiagramType.cs

@@ -6,4 +6,5 @@ public record DiagramType(string Value, string Name)
     public static DiagramType Container => new (DiagramConstants.Container, nameof(DiagramConstants.Container));
     public static DiagramType Context => new (DiagramConstants.Context, nameof(DiagramConstants.Context));
     public static DiagramType Deployment => new (DiagramConstants.Deployment, nameof(DiagramConstants.Deployment));
+    public static DiagramType Sequence => new (DiagramConstants.Sequence, nameof(DiagramConstants.Sequence));
 }

src/C4Sharp/Diagrams/Plantuml/Constants/BorderStyle.cs

@@ -0,0 +1,20 @@
+namespace C4Sharp.Diagrams.Plantuml.Constants;
+
+public class BorderStyle
+{
+    /// <summary>
+    /// This call returns the name of the dashed line and can be used as ?lineStyle argument.
+    /// </summary>
+    public static BorderStyle SolidLine => new() { Value = "SolidLine()" };
+    /// <summary>
+    /// This call returns the name of the dotted line and can be used as ?lineStyle argument.
+    /// </summary>
+    public static BorderStyle DashedLine => new() { Value = "DashedLine()" };
+    /// <summary>
+    /// This call returns the name of the bold line and can be used as ?lineStyle argument.
+    /// </summary>
+    public static BorderStyle DottedLine => new() { Value = "DottedLine()" };
+    public static BorderStyle BoldLine => new() { Value = "BoldLine()" };
+
+    public string Value { get; private init; } = string.Empty;    
+}

src/C4Sharp/Diagrams/Plantuml/Constants/ElementName.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Elements.Plantuml.Constants;
+namespace C4Sharp.Diagrams.Plantuml.Constants;
 
 public record ElementName
 {

src/C4Sharp/Diagrams/Plantuml/Constants/LineStyle.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Elements.Plantuml.Constants;
+namespace C4Sharp.Diagrams.Plantuml.Constants;
 
 public record LineStyle
 {

src/C4Sharp/Diagrams/Plantuml/Constants/Shape.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Elements.Plantuml.Constants;
+namespace C4Sharp.Diagrams.Plantuml.Constants;
 
 public record Shape
 {

src/C4Sharp/Diagrams/Plantuml/PlantumlContext.cs

@@ -1,11 +1,8 @@
 using System.Diagnostics;
-using System.Runtime.InteropServices.ComTypes;
 using System.Text;
-using C4Sharp.Diagrams;
-using C4Sharp.Diagrams.Plantuml;
-using C4Sharp.FileSystem;
+using C4Sharp.Commons.FileSystem;
 
-namespace C4Sharp.Elements.Plantuml.IO;
+namespace C4Sharp.Diagrams.Plantuml;
 
 public partial class PlantumlContext : IDisposable
 {
@@ -42,9 +39,10 @@ public PlantumlContext()
     /// use this method
     /// </summary>
     /// <returns>PlantumlSession instance</returns>
+    [Obsolete("Now, we are suporting just embended version")]
     public PlantumlContext UseStandardLibraryBaseUrl()
     {
-        StandardLibraryBaseUrl = true;
+        StandardLibraryBaseUrl = false;
         return this;
     }
 

src/C4Sharp/Diagrams/Plantuml/PlantumlDiagram.cs

@@ -1,6 +1,6 @@
 using System.Text;
+using C4Sharp.Commons.FileSystem;
 using C4Sharp.Elements.Relationships;
-using C4Sharp.FileSystem;
 
 namespace C4Sharp.Diagrams.Plantuml;
 
@@ -49,7 +49,12 @@ private static StringBuilder BuildHeader(this StringBuilder stream, Diagram diag
         }
 
         stream.AppendLine("SHOW_PERSON_PORTRAIT()");
-        stream.AppendLine($"{(diagram.FlowVisualization == DiagramLayout.TopDown ? "LAYOUT_TOP_DOWN()" : "LAYOUT_LEFT_RIGHT()")}");
+        if (diagram.Type != DiagramType.Sequence)
+        {
+            stream.AppendLine(
+                $"{(diagram.FlowVisualization == DiagramLayout.TopDown ? "LAYOUT_TOP_DOWN()" : "LAYOUT_LEFT_RIGHT()")}");
+        }
+
         stream.AppendLine();
 
         if (!string.IsNullOrWhiteSpace(diagram.Title))
@@ -163,7 +168,8 @@ private static StringBuilder BuildMermaidHeader(this StringBuilder stream, Diagr
             DiagramConstants.Context => "C4Context",
             DiagramConstants.Container => "C4Container",
             DiagramConstants.Component => "C4Component",
-            DiagramConstants.Deployment => "C4Deployment"
+            DiagramConstants.Deployment => "C4Deployment",
+            _ => throw new ArgumentOutOfRangeException()
         };
 
         stream.AppendLine(diagramType);

src/C4Sharp/Diagrams/Plantuml/PlantumlException.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Elements.Plantuml.IO;
+namespace C4Sharp.Diagrams.Plantuml;
 
 /// <summary>
 /// PlantumlException

src/C4Sharp/Diagrams/Plantuml/PlantumlResources.cs

@@ -1,7 +1,7 @@
 using C4Sharp.Commons;
-using C4Sharp.FileSystem;
+using C4Sharp.Commons.FileSystem;
 
-namespace C4Sharp.Elements.Plantuml.IO;
+namespace C4Sharp.Diagrams.Plantuml;
 
 internal static class PlantumlResources
 {
@@ -19,6 +19,7 @@ public static void LoadResources(string path)
         LoadResource(local, "C4_Container.puml");
         LoadResource(local, "C4_Context.puml");
         LoadResource(local, "C4_Deployment.puml");
+        LoadResource(local, "C4_Sequence.puml");
     }
 
     /// <summary>

src/C4Sharp/Diagrams/Plantuml/PlantumlStructure.cs

@@ -25,6 +25,7 @@ public static string ToPumlString(this Structure structure)
             Container container => container.ToPumlString(),
             ContainerBoundary containerBoundary => containerBoundary.ToPumlString(),
             EnterpriseBoundary enterpriseBoundary => enterpriseBoundary.ToPumlString(),
+            SequenceContainerBoundary sequenceContainerBoundary => sequenceContainerBoundary.ToPumlString(),
             _ => string.Empty
         };
 
@@ -136,6 +137,22 @@ private static string ToPumlString(this ContainerBoundary boundary)
 
         return stream.ToString();
     }
+
+    private static string ToPumlString(this SequenceContainerBoundary boundary)
+    {
+        var stream = new StringBuilder();
+
+        stream.AppendLine();
+        stream.AppendLine($"Container_Boundary({boundary.Alias}, \"{boundary.Label}\")");
+        foreach (var component in boundary.Components)
+        {
+            stream.AppendLine($"{TabIndentation.Indent()}{component.ToPumlString()}");
+        }
+
+        stream.AppendLine("Boundary_End()");
+
+        return stream.ToString();
+    }    
 
     private static string ToPumlString(this DeploymentNode deployment, int concat = 0)
     {