Introduce stable names for cycle groups (#38)

Author: ATrefzer

ApprovalTestTool/ApprovalTestTool.csproj

@@ -13,7 +13,7 @@
 
     <ItemGroup>
         <ProjectReference Include="..\CodeParser\CodeParser.csproj"/>
-        <ProjectReference Include="..\Contracts\Contracts.csproj"/>
+        <ProjectReference Include="..\CodeGraph\CodeGraph.csproj"/>
     </ItemGroup>
 
     <ItemGroup>

CSharpCodeAnalyst.sln

@@ -24,7 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Contracts", "Contracts\Contracts.csproj", "{7D5EA751-84A3-43F1-BCCE-C9D10536AB1B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeGraph", "CodeGraph\CodeGraph.csproj", "{7D5EA751-84A3-43F1-BCCE-C9D10536AB1B}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApprovalTestTool", "ApprovalTestTool\ApprovalTestTool.csproj", "{767539BE-FBE3-4B46-9A5E-21D60E1B278B}"
 EndProject

CSharpCodeAnalyst/Analyzers/ArchitecturalRules/Analyzer.cs

@@ -2,7 +2,6 @@
 using System.IO;
 using System.Text.Json;
 using System.Windows;
-using Contracts.Graph;
 using CSharpCodeAnalyst.Analyzers.ArchitecturalRules.Presentation;
 using CSharpCodeAnalyst.Analyzers.ArchitecturalRules.Rules;
 using CSharpCodeAnalyst.Common;
@@ -13,13 +12,13 @@ namespace CSharpCodeAnalyst.Analyzers.ArchitecturalRules;
 
 public class Analyzer : IAnalyzer
 {
-    private readonly IUserNotification _userNotification;
     private readonly IPublisher _messaging;
+    private readonly IUserNotification _userNotification;
+    private CodeGraph.Graph.CodeGraph? _currentGraph;
+    private bool _isDirty;
+    private ArchitecturalRulesDialog? _openDialog;
     private List<RuleBase> _rules = [];
     private string _rulesText;
-    private ArchitecturalRulesDialog? _openDialog;
-    private CodeGraph? _currentGraph;
-    private bool _isDirty;
 
     public Analyzer(IPublisher messaging, IUserNotification userNotification)
     {
@@ -35,7 +34,7 @@ public Analyzer(IPublisher messaging, IUserNotification userNotification)
         _rulesText = GetSampleRules();
     }
 
-    public void Analyze(CodeGraph graph)
+    public void Analyze(CodeGraph.Graph.CodeGraph graph)
     {
         // If dialog is already open, just bring it to front
         if (_openDialog != null)
@@ -70,43 +69,6 @@ public void Analyze(CodeGraph graph)
         _openDialog.Show();
     }
 
-    private void OnValidateRules(string rulesText)
-    {
-        if (_currentGraph == null)
-        {
-            return;
-        }
-
-        try
-        {
-            ParseAndStoreRules(rulesText);
-        }
-        catch (Exception ex)
-        {
-            _userNotification.ShowError($"Error parsing rules: {ex.Message}");
-            return;
-        }
-
-        // Execute analysis
-        var violations = ExecuteAnalysis(_currentGraph);
-
-        if (violations.Count == 0)
-        {
-            _userNotification.ShowSuccess("No rule violations found!");
-        }
-        else
-        {
-            // Show violations in tabular format
-            var violationsViewModel = new RuleViolationsViewModel(violations, _currentGraph);
-            _messaging.Publish(new ShowTabularDataRequest(violationsViewModel));
-        }
-    }
-
-    private void OnApplicationExit(object sender, ExitEventArgs e)
-    {
-        _openDialog?.Close();
-    }
-
     public string Name
     {
         get => "Architectural rules";
@@ -119,19 +81,10 @@ public string Id
         get => "ArchitecturalRules";
     }
 
-    void SetDirty(bool isDirty)
-    {
-        _isDirty = isDirty;
-        if (_isDirty)
-        {
-            DataChanged?.Invoke(this, EventArgs.Empty);
-        }
-    }
-
     public string? GetPersistentData()
     {
         SetDirty(false);
-        
+
         if (string.IsNullOrEmpty(_rulesText))
         {
             return null;
@@ -151,7 +104,7 @@ public void SetPersistentData(string? data)
         {
             _rulesText = string.Empty;
             _rules.Clear();
-           SetDirty(false);
+            SetDirty(false);
             return;
         }
 
@@ -181,10 +134,56 @@ public bool IsDirty()
 
     public event EventHandler? DataChanged;
 
+    private void OnValidateRules(string rulesText)
+    {
+        if (_currentGraph == null)
+        {
+            return;
+        }
+
+        try
+        {
+            ParseAndStoreRules(rulesText);
+        }
+        catch (Exception ex)
+        {
+            _userNotification.ShowError($"Error parsing rules: {ex.Message}");
+            return;
+        }
+
+        // Execute analysis
+        var violations = ExecuteAnalysis(_currentGraph);
+
+        if (violations.Count == 0)
+        {
+            _userNotification.ShowSuccess("No rule violations found!");
+        }
+        else
+        {
+            // Show violations in tabular format
+            var violationsViewModel = new RuleViolationsViewModel(violations, _currentGraph);
+            _messaging.Publish(new ShowTabularDataRequest(violationsViewModel));
+        }
+    }
+
+    private void OnApplicationExit(object sender, ExitEventArgs e)
+    {
+        _openDialog?.Close();
+    }
+
+    private void SetDirty(bool isDirty)
+    {
+        _isDirty = isDirty;
+        if (_isDirty)
+        {
+            DataChanged?.Invoke(this, EventArgs.Empty);
+        }
+    }
+
     /// <summary>
     ///     Direct analysis with rules from file (for command-line use)
     /// </summary>
-    public List<Violation> Analyze(CodeGraph graph, string fileToRules)
+    public List<Violation> Analyze(CodeGraph.Graph.CodeGraph graph, string fileToRules)
     {
         ParseAndStoreRules(File.ReadAllText(fileToRules));
         return ExecuteAnalysis(graph);
@@ -216,16 +215,16 @@ private static string GetSampleRules()
     private void ParseAndStoreRules(string rulesText)
     {
         _rules = RuleParser.ParseRules(rulesText);
-        
+
         if (!_isDirty && _rulesText != rulesText)
         {
             SetDirty(true);
         }
-         
+
         _rulesText = rulesText;
     }
 
-    private List<Violation> ExecuteAnalysis(CodeGraph graph)
+    private List<Violation> ExecuteAnalysis(CodeGraph.Graph.CodeGraph graph)
     {
         var violations = new List<Violation>();
 

CSharpCodeAnalyst/Analyzers/ArchitecturalRules/PatternMatcher.cs

@@ -1,4 +1,4 @@
-using Contracts.Graph;
+using CodeGraph.Graph;
 
 namespace CSharpCodeAnalyst.Analyzers.ArchitecturalRules;
 
@@ -8,7 +8,7 @@ public static class PatternMatcher
     ///     Resolves a pattern like "Business.**" to a set of CodeElement IDs
     ///     Pattern format: "Base.Path" or "Base.Path.*" or "Base.Path.**"
     /// </summary>
-    public static HashSet<string> ResolvePattern(string pattern, CodeGraph codeGraph)
+    public static HashSet<string> ResolvePattern(string pattern, CodeGraph.Graph.CodeGraph codeGraph)
     {
         var matchingIds = new HashSet<string>();
 
@@ -47,7 +47,7 @@ private static (string basePath, ExpansionMode mode) ParsePattern(string pattern
         return (pattern, ExpansionMode.Self);
     }
 
-    private static CodeElement? FindStartElement(string basePath, CodeGraph codeGraph)
+    private static CodeElement? FindStartElement(string basePath, CodeGraph.Graph.CodeGraph codeGraph)
     {
         // Find element with exact FullName match
         return codeGraph.Nodes.Values.FirstOrDefault(element =>

CSharpCodeAnalyst/Analyzers/ArchitecturalRules/Presentation/RelationshipViewModel.cs

@@ -1,4 +1,4 @@
-using Contracts.Graph;
+using CodeGraph.Graph;
 
 namespace CSharpCodeAnalyst.Analyzers.ArchitecturalRules.Presentation;
 

CSharpCodeAnalyst/Analyzers/ArchitecturalRules/Presentation/RuleViolationViewModel.cs

@@ -2,7 +2,6 @@
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Media;
-using Contracts.Graph;
 using CSharpCodeAnalyst.Analyzers.ArchitecturalRules.Rules;
 using CSharpCodeAnalyst.Resources;
 using CSharpCodeAnalyst.Shared.DynamicDataGrid.Contracts.TabularData;
@@ -13,10 +12,10 @@ namespace CSharpCodeAnalyst.Analyzers.ArchitecturalRules.Presentation;
 
 public class RuleViolationViewModel : TableRow
 {
-    private readonly CodeGraph _codeGraph;
+    private readonly CodeGraph.Graph.CodeGraph _codeGraph;
     private readonly Violation _violation;
 
-    public RuleViolationViewModel(Violation violation, CodeGraph codeGraph)
+    public RuleViolationViewModel(Violation violation, CodeGraph.Graph.CodeGraph codeGraph)
     {
         ErrorIcon = IconLoader.LoadIcon("Resources/error.png");
         _violation = violation;

CSharpCodeAnalyst/Analyzers/ArchitecturalRules/Presentation/RuleViolationsViewModel.cs

@@ -1,6 +1,5 @@
 using System.Collections.ObjectModel;
 using System.Windows;
-using Contracts.Graph;
 using CSharpCodeAnalyst.Shared.DynamicDataGrid.Contracts.TabularData;
 
 namespace CSharpCodeAnalyst.Analyzers.ArchitecturalRules.Presentation;
@@ -9,7 +8,7 @@ public class RuleViolationsViewModel : Table
 {
     private readonly ObservableCollection<TableRow> _violations;
 
-    public RuleViolationsViewModel(List<Violation> violations, CodeGraph codeGraph)
+    public RuleViolationsViewModel(List<Violation> violations, CodeGraph.Graph.CodeGraph codeGraph)
     {
         var violationViewModels = violations.Select(v => new RuleViolationViewModel(v, codeGraph));
         _violations = new ObservableCollection<TableRow>(violationViewModels);

CSharpCodeAnalyst/Analyzers/ArchitecturalRules/Rules/DenyRule.cs

@@ -1,4 +1,4 @@
-using Contracts.Graph;
+using CodeGraph.Graph;
 
 namespace CSharpCodeAnalyst.Analyzers.ArchitecturalRules.Rules;
 

CSharpCodeAnalyst/Analyzers/ArchitecturalRules/Rules/IsolateRule.cs

@@ -1,4 +1,4 @@
-using Contracts.Graph;
+using CodeGraph.Graph;
 
 namespace CSharpCodeAnalyst.Analyzers.ArchitecturalRules.Rules;
 

CSharpCodeAnalyst/Analyzers/ArchitecturalRules/Rules/RestrictRule.cs

@@ -1,4 +1,4 @@
-using Contracts.Graph;
+using CodeGraph.Graph;
 
 namespace CSharpCodeAnalyst.Analyzers.ArchitecturalRules.Rules;