Fixed Interface inference issue... (#78)

C4InterFlow.Automation/C4InterFlow.Automation.csproj

@@ -7,12 +7,12 @@
 		<Deterministic>true</Deterministic>
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>1.0.0</Version>
+		<Version>1.1.0</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<PackageId>C4InterFlow.Automation</PackageId>
-		<PackageVersion>1.0.0</PackageVersion>
+		<PackageVersion>1.1.0</PackageVersion>
 		<Authors>Slava Vedernikov</Authors>
 		<Description>Revolutionise your Application Architecture Documentation with C4InterFlow. Designed for Architects and Engineers, this tool leverages the widely-recognised C4 Model (Architecture Visualisation framework), enhanced with unique features like Interface and Flow, to describe your Application Architecture as Code. Experience an intuitive, efficient way to document complex systems, ensuring clarity and consistency across your teams and products.</Description>
 		<Copyright>Copyright 2024 Slava Vedernikov</Copyright>

C4InterFlow.Cli/C4InterFlow.Cli.csproj

@@ -5,7 +5,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <Version>1.0.0</Version>
+    <Version>1.1.0</Version>
     <PublishSingleFile>true</PublishSingleFile>
     <SelfContained>true</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

C4InterFlow.Cli/CLI Commands.txt

@@ -4,4 +4,9 @@ draw-diagrams --aac-input-paths "C:\C4InterFlow\Samples\Internet Banking System\
 
 draw-diagrams --aac-input-paths "C:\C4InterFlow\Samples\Internet Banking System\CSV\Architecture\Json" --aac-reader-strategy "C4InterFlow.Automation.Readers.JsonAaCReaderStrategy,C4InterFlow.Automation" --interfaces BigBankPlc.SoftwareSystems.*.Containers.*.Interfaces.* --business-processes BigBankPlc.BusinessProcesses.* --levels-of-details context container --output-dir "C:\C4InterFlow\Samples\Internet Banking System\CSV\Diagrams"
 
-draw-diagrams --aac-input-paths "C:\C4InterFlow\Samples\E-Commerce Platform\Yaml\Architecture" --aac-reader-strategy "C4InterFlow.Automation.Readers.YamlAaCReaderStrategy,C4InterFlow.Automation" --interfaces ECommercePlatform.SoftwareSystems.*.Interfaces.* ECommercePlatform.SoftwareSystems.*.Containers.*.Interfaces.* --levels-of-details context container --output-dir "C:\C4InterFlow\Samples\E-Commerce Platform\Yaml\Diagrams"
+
+
+
+draw-diagrams --aac-input-paths "C:\C4InterFlow\Samples\E-Commerce Platform\Yaml\Architecture" --aac-reader-strategy "C4InterFlow.Automation.Readers.YamlAaCReaderStrategy,C4InterFlow.Automation" --interfaces ECommercePlatform.SoftwareSystems.*.Interfaces.* ECommercePlatform.SoftwareSystems.*.Containers.*.Interfaces.* --levels-of-details context container --output-dir "C:\C4InterFlow\Samples\E-Commerce Platform\Yaml\Diagrams"
+
+draw-diagrams --aac-input-paths "C:\C4InterFlow\Samples\E-Commerce Platform\Yaml\Architecture" --aac-reader-strategy "C4InterFlow.Automation.Readers.YamlAaCReaderStrategy,C4InterFlow.Automation" --interfaces ECommercePlatform.SoftwareSystems.BuyingAndMerchandisingApp.Interfaces.CreatePurchaseOrder --levels-of-details context --scopes software-system-interface --types c4-sequence --output-dir "C:\C4InterFlow\Samples\E-Commerce Platform\Yaml\Diagrams"

C4InterFlow.Cli/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "C4InterFlow.Cli": {
       "commandName": "Project",
-      "commandLineArgs": "draw-diagrams --aac-input-paths \"C:\\C4InterFlow\\Samples\\Internet Banking System\\CSV\\Architecture\\Json\" --aac-reader-strategy \"C4InterFlow.Automation.Readers.JsonAaCReaderStrategy,C4InterFlow.Automation\" --interfaces BigBankPlc.SoftwareSystems.*.Containers.*.Interfaces.* --business-processes BigBankPlc.BusinessProcesses.* --levels-of-details context container --output-dir \"C:\\C4InterFlow\\Samples\\Internet Banking System\\CSV\\Diagrams\"\r\n"
+      "commandLineArgs": "draw-diagrams --aac-input-paths \"C:\\C4InterFlow\\Samples\\E-Commerce Platform\\Yaml\\Architecture\" --aac-reader-strategy \"C4InterFlow.Automation.Readers.YamlAaCReaderStrategy,C4InterFlow.Automation\" --interfaces ECommercePlatform.SoftwareSystems.BuyingAndMerchandisingApp.Interfaces.CreatePurchaseOrder --levels-of-details context --scopes software-system-interface --types c4-sequence --output-dir \"C:\\C4InterFlow\\Samples\\E-Commerce Platform\\Yaml\\Diagrams\""
     }
   }
 }

C4InterFlow/C4InterFlow.csproj

@@ -7,12 +7,12 @@
 		<Deterministic>true</Deterministic>
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<Version>1.0.0</Version>
+		<Version>1.1.0</Version>
 	</PropertyGroup>
 
 	<PropertyGroup>
 		<PackageId>C4InterFlow</PackageId>
-		<PackageVersion>1.0.0</PackageVersion>
+		<PackageVersion>1.1.0</PackageVersion>
 		<Authors>Slava Vedernikov</Authors>
     <Description>Revolutionise your Application Architecture Documentation with C4InterFlow. Designed for Architects and Engineers, this tool leverages the widely-recognised C4 Model (Architecture Visualisation framework), enhanced with unique features like Interface and Flow, to describe your Application Architecture as Code. Experience an intuitive, efficient way to document complex systems, ensuring clarity and consistency across your teams and products.</Description>
 		<Copyright>Copyright 2024 Slava Vedernikov</Copyright>

C4InterFlow/Structures/Flow.cs

@@ -5,6 +5,9 @@ namespace C4InterFlow.Structures
 {    
     public record Flow
     {
+        private static readonly Regex ComponentsRegex = new Regex(@"\.Components\.[^.]*");
+        private static readonly Regex ContainersRegex = new Regex(@"\.Containers\.[^.]*");
+
         public enum FlowType
         {
             None,
@@ -191,7 +194,7 @@ private void CleanUpInferredContainerFlows()
 
             flows.ForEach(x =>
             {
-                if(x.Flows == null || x.Flows.Count == 0 || x.Owner.Contains(".Components."))
+                if(x.Flows == null || x.Flows.Count == 0 || ComponentsRegex.IsMatch(x.Owner))
                 {
                     x.Type = FlowType.None;
                 }
@@ -230,20 +233,36 @@ private void CleanUpInferredSoftwareSystemFlows()
             flows.ForEach(x =>
             {
                 if (x.Flows == null || 
-                x.Flows.Count == 0 || 
-                x.Owner.Contains(".Components.") || 
-                x.Owner.Contains(".Containers."))
+                x.Flows.Count == 0 ||
+                ComponentsRegex.IsMatch(x.Owner) ||
+                ContainersRegex.IsMatch(x.Owner))
                 {
                     x.Type = FlowType.None;
                 }
             });
         }
         private void InferContainerInterfaces(Flow flow, string currentScope)
         {
-            if(flow.Type == FlowType.Use)
+            if (flow.Type == FlowType.Use)
             {
-                flow.Expression = new Regex(@"\.Components\.[^.]*").Replace(flow.Expression, string.Empty);
-                flow.SetOwner(new Regex(@"\.Components\.[^.]*").Replace(flow.Owner, string.Empty), true);
+                var inferredExpression = ComponentsRegex.Replace(flow.Expression, string.Empty);
+                var inferredOwner = ComponentsRegex.Replace(flow.Owner, string.Empty);
+
+                if (flow.Expression.Equals(inferredExpression) && flow.Owner.Equals(inferredOwner))
+                {
+                    if (flow.Flows != null)
+                    {
+                        foreach (var segment in flow.Flows)
+                        {
+                            InferContainerInterfaces(segment, currentScope);
+                        }
+                    }
+
+                    return;
+                }
+
+                flow.Expression = inferredExpression;
+                flow.SetOwner(inferredOwner, true);
 
                 var newScope = Utils.GetContainerAlias(flow.Expression);
 
@@ -272,7 +291,7 @@ private void InferContainerInterfaces(Flow flow, string currentScope)
             }
             else if (flow.Type == FlowType.Return || flow.Type == FlowType.ThrowException) 
             {
-                if(flow.Owner.Contains(".Components."))
+                if(ComponentsRegex.IsMatch(flow.Owner))
                 {
                     flow.Type = FlowType.None;
                 }
@@ -293,11 +312,28 @@ private void InferSoftwareSystemInterfaces(Flow flow, string currentScope)
         {
             if (flow.Type == FlowType.Use)
             {
-                flow.Expression = new Regex(@"\.Components\.[^.]*").Replace(flow.Expression, string.Empty);
-                flow.SetOwner(new Regex(@"\.Components\.[^.]*").Replace(flow.Owner, string.Empty), true);
+                var inferredExpression = ComponentsRegex.Replace(flow.Expression, string.Empty);
+                var inferredOwner = ComponentsRegex.Replace(flow.Owner, string.Empty);
+
+                inferredExpression = ContainersRegex.Replace(inferredExpression, string.Empty);
+                inferredOwner = ContainersRegex.Replace(inferredOwner, string.Empty);
+
+                if (flow.Expression.Equals(inferredExpression) && flow.Owner.Equals(inferredOwner))
+                {
+                    if (flow.Flows != null)
+                    {
+                        foreach (var segment in flow.Flows)
+                        {
+                            InferSoftwareSystemInterfaces(segment, currentScope);
+                        }
+                    }
+
+                    return;
+                }
+
+                flow.Expression = inferredExpression;
+                flow.SetOwner(inferredOwner, true);
 
-                flow.Expression = new Regex(@"\.Containers\.[^.]*").Replace(flow.Expression, string.Empty);
-                flow.SetOwner(new Regex(@"\.Containers\.[^.]*").Replace(flow.Owner, string.Empty), true);
 
                 var newScope = Utils.GetSoftwareSystemAlias(flow.Expression);
 
@@ -321,7 +357,7 @@ private void InferSoftwareSystemInterfaces(Flow flow, string currentScope)
             }
             else if (flow.Type == FlowType.Return || flow.Type == FlowType.ThrowException)
             {
-                if (flow.Owner.Contains(".Components.") || flow.Owner.Contains(".Containers."))
+                if (ComponentsRegex.IsMatch(flow.Owner) || ContainersRegex.IsMatch(flow.Owner))
                 {
                     flow.Type = FlowType.None;
                 }

Samples/ToDoApp/draw-diagrams.bat

@@ -1,6 +1,6 @@
 @echo off
 :: Possible values: TRUE, FALSE
-set "redraw-all=TRUE"
+set "redraw-all=FALSE"
 :::::::::::::::::::::::::::::::
 
 set "aac-root-namespace=ToDoAppExample"

Samples/TraderX/CSV/Diagrams/Business Processes/Execute Trades/Container - C4 Sequence.puml

@@ -47,6 +47,9 @@ group Start
 Rel(TraderX.SoftwareSystems.TraderX.Containers.WebGUI, TraderX.SoftwareSystems.TraderX.Containers.TradeFeed, "Receive Updates To Trades")
 Rel(TraderX.SoftwareSystems.TraderX.Containers.WebGUI, TraderX.SoftwareSystems.TraderX.Containers.TradeFeed, "Receive Updates To Positions")
 Rel(TraderX.SoftwareSystems.TraderX.Containers.WebGUI, TraderX.SoftwareSystems.TraderX.Containers.WebClient, "Send Trade And Position Status Updates")
+group Send Trade And Position Status Updates
+Rel(TraderX.SoftwareSystems.TraderX.Containers.WebClient, TraderX.SoftwareSystems.TraderX.Containers.WebClient, "Update Trade And Position Status View")
+end
 end
 end
 group Trader - Cancel Trade

Samples/TraderX/CSV/Diagrams/Business Processes/Execute Trades/Container - Sequence.puml

@@ -47,6 +47,9 @@ group Start
 TraderX.SoftwareSystems.TraderX.Containers.WebGUI -> TraderX.SoftwareSystems.TraderX.Containers.TradeFeed : Receive Updates To Trades
 TraderX.SoftwareSystems.TraderX.Containers.WebGUI -> TraderX.SoftwareSystems.TraderX.Containers.TradeFeed : Receive Updates To Positions
 TraderX.SoftwareSystems.TraderX.Containers.WebGUI -> TraderX.SoftwareSystems.TraderX.Containers.WebClient : Send Trade And Position Status Updates
+group Send Trade And Position Status Updates
+TraderX.SoftwareSystems.TraderX.Containers.WebClient -> TraderX.SoftwareSystems.TraderX.Containers.WebClient : Update Trade And Position Status View
+end
 end
 end
 group Trader - Cancel Trade

Samples/TraderX/CSV/Diagrams/Software Systems/TraderX/Containers/Web Client/Interfaces/Send Trade And Position Status Updates/Container - C4 Sequence.puml

@@ -10,6 +10,9 @@ System_Boundary(TraderX.SoftwareSystems.TraderX, "TraderX")
 Boundary_End()
 
 Rel(C4InterFlow.SoftwareSystems.ExternalSystem, TraderX.SoftwareSystems.TraderX.Containers.WebClient, "Send Trade And Position Status Updates")
+group Send Trade And Position Status Updates
+Rel(TraderX.SoftwareSystems.TraderX.Containers.WebClient, TraderX.SoftwareSystems.TraderX.Containers.WebClient, "Update Trade And Position Status View")
+end
 
 
 @enduml