Add support for labels. Packages can be included and excluded. Update nugets

Author: AndriiLab

SDV.App/MainWindow.xaml

@@ -20,18 +20,29 @@
                         Margin="10,10,0,0" />
             </WrapPanel>
 
-            <WrapPanel HorizontalAlignment="Left" Margin="0,10,0,10">
-                <Label Content="Filter mode" />
-                <ComboBox x:Name="Mode" Width="200"></ComboBox>
+            <WrapPanel HorizontalAlignment="Left" Margin="0,10,0,0">
+                <Label Content="Included packages" />
+                <TextBox x:Name="PackageFiltersInclude" Width="450" />
             </WrapPanel>
-
+            <WrapPanel HorizontalAlignment="Center" Margin="0,0,0,10">
+                <TextBlock Text="Comma separated values" FontSize="10" />
+            </WrapPanel>
+            
             <WrapPanel HorizontalAlignment="Left" Margin="0,10,0,0">
-                <Label Content="Filtered packages" />
-                <TextBox x:Name="PackagePrefixes" Width="465" />
+                <Label Content="Excluded packages" />
+                <TextBox x:Name="PackageFiltersExclude" Width="450" />
             </WrapPanel>
             <WrapPanel HorizontalAlignment="Center" Margin="0,0,0,10">
                 <TextBlock Text="Comma separated values" FontSize="10" />
             </WrapPanel>
+            
+            <WrapPanel HorizontalAlignment="Left" Margin="0,10,0,0">
+                <Label Content="Labels" />
+                <TextBox x:Name="Labels" Width="450" />
+            </WrapPanel>
+            <WrapPanel HorizontalAlignment="Center" Margin="0,0,0,10">
+                <TextBlock Text="Comma separated values. Like: Microsoft.*=⭐ (Emoji as labels recommended)" FontSize="10" />
+            </WrapPanel>
 
             <WrapPanel HorizontalAlignment="Left" Margin="0,10,0,0">
                 <CheckBox x:Name="IncludeDependentProjects" Content="Include dependencies between projects" />

SDV.App/MainWindow.xaml.cs

@@ -11,7 +11,6 @@
 using Microsoft.Win32;
 using SDV.App.Logging;
 using Serilog.Events;
-using SDV.DependenciesAnalyzer.Interfaces;
 using SDV.GraphGenerator.Interfaces;
 
 namespace SDV.App
@@ -36,10 +35,10 @@ public MainWindow(ILogger<MainWindow> logger, WindowLogSink logSink, IGraphBuild
             {
                 Filter = "solution files (*.sln)|*.sln"
             };
-            PackagePrefixes.Text = "Microsoft.*, System.*";
+            PackageFiltersExclude.Text = "Microsoft.*, System.*";
             IncludeDependentProjects.IsChecked = true;
             ClearSelectionButton.IsEnabled = false;
-            SetupModeComboBox();
+            Labels.Text = "IsNuget=\ud83d\udce6";
             logSink.OnLogEmitted = OnLogEmitted;
         }
 
@@ -69,19 +68,25 @@ private async void btnBuild_Click(object sender, RoutedEventArgs e)
                 _logger.LogError("Please, select sln file to proceed");
                 return;
             }
-            
+
             ToggleControlsAs(false);
 
             try
             {
                 var request = new GraphBuilderRequest(_slnFilePaths)
                 {
-                    Mode = (PackageFilterMode)Mode.SelectedValue,
-                    PackageFilters = PackagePrefixes.Text.Split(",").Select(t => t.Trim()).Where(t => !string.IsNullOrEmpty(t)).ToArray(),
+                    FiltersInclude = GetCommaSeparatedValues(PackageFiltersInclude.Text).ToArray(),
+                    FiltersExclude = GetCommaSeparatedValues(PackageFiltersExclude.Text).ToArray(),
+                    Labels = GetCommaSeparatedValues(Labels.Text).Select(s => s.Split('=')).Where(a => a.Length == 2)
+                        .GroupBy(s => s[0].Trim())
+                        .ToDictionary(
+                            g => g.Key,
+                            g => g.SelectMany(v => v).Select(s => s.Trim())
+                                .Where(s => !string.IsNullOrEmpty(s) && s != g.Key).ToArray()),
                     IncludeDependentProjects = IncludeDependentProjects.IsChecked ?? false,
                     MergeProjects = MergeProjects.IsChecked ?? false
                 };
-                
+
                 var path = await BuildGraphAndGetFilePathAsync(request);
 
                 OpenUrl(path);
@@ -97,12 +102,17 @@ private async void btnBuild_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        private Task<string> BuildGraphAndGetFilePathAsync(GraphBuilderRequest graphBuilderRequest) => 
+        private static IEnumerable<string> GetCommaSeparatedValues(string str)
+        {
+            return str.Split(",").Select(t => t.Trim()).Where(t => !string.IsNullOrEmpty(t));
+        }
+
+        private Task<string> BuildGraphAndGetFilePathAsync(GraphBuilderRequest graphBuilderRequest) =>
             Task.Run(() => _builder.BuildGraphAndGetFilePath(graphBuilderRequest));
 
         private void btnClearSelection_Click(object sender, RoutedEventArgs e)
         {
-            _slnFilePaths = new HashSet<string>();
+            _slnFilePaths = [];
             Log.Text = string.Empty;
             _logger.LogInformation("Selection cleared");
             ClearSelectionButton.IsEnabled = false;
@@ -136,27 +146,17 @@ private static void OpenUrl(string url)
             }
         }
 
-        private void SetupModeComboBox()
-        {
-            var item = Tuple.Create("Disabled", PackageFilterMode.None);
-            Mode.DisplayMemberPath = nameof(item.Item1);
-            Mode.SelectedValuePath = nameof(item.Item2);
-            Mode.SelectedValue = PackageFilterMode.Exclude;
-            Mode.Items.Add(item);
-            Mode.Items.Add(Tuple.Create("Include listed packages", PackageFilterMode.Include));
-            Mode.Items.Add(Tuple.Create("Exclude listed packages", PackageFilterMode.Exclude));
-        }
-
         private void ToggleControlsAs(bool state)
         {
             SlnFileSelectorButton.IsEnabled = state;
-            Mode.IsEnabled = state;
-            PackagePrefixes.IsEnabled = state;
+            PackageFiltersInclude.IsEnabled = state;
+            PackageFiltersExclude.IsEnabled = state;
+            Labels.IsEnabled = state;
             IncludeDependentProjects.IsEnabled = state;
             MergeProjects.IsEnabled = state;
             BuildGraphButton.IsEnabled = state;
         }
-        
+
         private void OnLogEmitted(LogEventLevel level, string log)
         {
             Log.Dispatcher.Invoke(DispatcherPriority.Background, () =>
@@ -167,7 +167,7 @@ private void OnLogEmitted(LogEventLevel level, string log)
             });
         }
 
-        private static Brush GetBrushForLevel(LogEventLevel level)
+        private static SolidColorBrush GetBrushForLevel(LogEventLevel level)
         {
             return level switch
             {

SDV.App/SDV.App.csproj

@@ -5,7 +5,7 @@
         <TargetFramework>net8.0-windows</TargetFramework>
         <Nullable>enable</Nullable>
         <UseWPF>true</UseWPF>
-        <Version>1.0.2</Version>
+        <Version>1.0.4</Version>
         <LangVersion>default</LangVersion>
     </PropertyGroup>
 

SDV.DependenciesAnalyzer/Dependencies/DependenciesUtils.cs

@@ -12,26 +12,21 @@ public class DependenciesUtils
     public DependenciesUtils(ILogger log)
     {
         _log = log;
-        _configuration = new TreeGeneratorConfiguration(string.Empty, []);
+        _configuration = new TreeGeneratorConfiguration(string.Empty, [], []);
     }
 
     public DependencyTree[] CreateDependencyTree(IExtractor extractor, TreeGeneratorConfiguration configuration)
     {
         _configuration = configuration;
         var rootTree = _configuration.IncludeDependentProjects
             ? extractor.DependentProjects().Select(p => DependencyTree.AsProject(p.Id, p.Version)).ToList()
-            : new List<DependencyTree>();
+            : [];
         var rootDependencies = extractor.DirectDependencies();
         var allDependencies = extractor.AllDependencies();
         var childrenMap = extractor.ChildrenMap();
 
-        foreach (var rootId in rootDependencies)
+        foreach (var rootId in rootDependencies.Where(_configuration.IsPackageEnabled))
         {
-            if (!CanBeProcessed(rootId))
-            {
-                continue;
-            }
-            
             if (allDependencies.TryGetValue(rootId, out var dependency))
             {
                 var childrenDependencies = FindChildrenDependencies(rootId, allDependencies, childrenMap).ToList();
@@ -55,14 +50,9 @@ private IEnumerable<DependencyTree> FindChildrenDependencies(string id,
         {
             yield break;
         }
-        
-        foreach (var childId in childArray)
+
+        foreach (var childId in childArray.Where(_configuration.IsPackageEnabled))
         {
-            if (!CanBeProcessed(childId))
-            {
-                continue;
-            }
-            
             if (allDependencies.TryGetValue(childId, out var dependency))
             {
                 var childrenDependencies = FindChildrenDependencies(childId, allDependencies, childrenMap).ToList();
@@ -74,7 +64,4 @@ private IEnumerable<DependencyTree> FindChildrenDependencies(string id,
             }
         }
     }
-
-
-    private bool CanBeProcessed(string name) => _configuration.IsPackageEnabled(name);
 }

SDV.DependenciesAnalyzer/Helpers/FilterHelper.cs

@@ -0,0 +1,45 @@
+namespace SDV.DependenciesAnalyzer.Helpers;
+
+public static class FilterHelper
+{
+    private const char Mask = '*';
+
+    public static Func<string, bool>? BuildFilter(string packagePrefix)
+    {
+        if (string.IsNullOrWhiteSpace(packagePrefix))
+            return null;
+
+        packagePrefix = packagePrefix.Trim();
+        var split = packagePrefix.Split(Mask);
+        switch (split.Length)
+        {
+            // filter
+            case 1:
+                return s => split[0].Equals(s);
+            case 2:
+            {
+                if(split.First() != string.Empty && split.Last() != string.Empty) // fil*ter
+                {
+                    return s => s.StartsWith(split.First()) && packagePrefix.EndsWith(split.Last());
+
+                }
+                if (split.First() == string.Empty && split.Last() == string.Empty) // *
+                {
+                    throw new ArgumentException($"Unknown filter specified: {packagePrefix}");
+                }
+                if (split.First() == string.Empty) // *filter
+                {
+                    return s => s.EndsWith(split.Last());
+                }
+                // filter*
+                return s => s.StartsWith(split.First());
+                
+            }
+            case 3 when split.First() == string.Empty && split.Last() == string.Empty:
+                return s => s.Contains(split[1]);
+            default:
+                throw new ArgumentException($"Unknown filter specified: {packagePrefix}");
+        }
+    }
+
+}

SDV.DependenciesAnalyzer/Interfaces/INugetDependenciesGenerator.cs

@@ -1,4 +1,5 @@
-using SDV.DependenciesAnalyzer.Models;
+using SDV.DependenciesAnalyzer.Helpers;
+using SDV.DependenciesAnalyzer.Models;
 
 namespace SDV.DependenciesAnalyzer.Interfaces;
 
@@ -16,81 +17,32 @@ public interface INugetDependenciesGenerator
 
 public class TreeGeneratorConfiguration
 {
-    public string SlnFilePath { get; }
-    public PackageFilterMode Mode { get; init; }
+    public string SlnFilePath { get; set; }
     public bool IncludeDependentProjects { get; init; }
 
-    private readonly List<Func<string, bool>> _filters;
-    private const char Mask = '*';
+    private readonly Func<string, bool>[] _filtersInclude;
+    private readonly Func<string, bool>[] _filtersExclude;
 
-    public TreeGeneratorConfiguration(string slnFilePath, string[] packageFilters)
+    public TreeGeneratorConfiguration(string slnFilePath, string[] filtersInclude, string[] filtersExclude)
     {
-        _filters = new List<Func<string, bool>>();
+        _filtersInclude = filtersInclude.Select(FilterHelper.BuildFilter).Where(f => f != null).ToArray()!;
+        _filtersExclude = filtersExclude.Select(FilterHelper.BuildFilter).Where(f => f != null).ToArray()!;
         SlnFilePath = slnFilePath;
-        Mode = PackageFilterMode.None;
         IncludeDependentProjects = false;
-        BuildFilters(packageFilters);
     }
 
     public bool IsPackageEnabled(string packageName)
     {
-        if (Mode == PackageFilterMode.None || _filters.Count == 0)
-            return true;
-        
-        var isMatched = _filters.Any(f => f(packageName));
-        var shouldBeProcessed = Mode == PackageFilterMode.Include ? isMatched : !isMatched;
+        return IsIncluded(packageName) && !IsExcluded(packageName);
+    }
 
-        return shouldBeProcessed;
+    private bool IsIncluded(string packageName)
+    {
+        return _filtersInclude.Length < 1 || _filtersInclude.Any(f => f(packageName));
     }
 
-    private void BuildFilters(string[] packagePrefixes)
+    private bool IsExcluded(string packageName)
     {
-        foreach (var filter in packagePrefixes.Where(p => !string.IsNullOrWhiteSpace(p)).Select(p => p.Trim()))
-        {
-            var split = filter.Split(Mask);
-            if (split.Length == 1) // filter
-            {
-                _filters.Add(s => split[0].Equals(s));
-                return;
-            }
-
-            if (split.Length == 2)
-            {
-                if(split.First() != string.Empty && split.Last() != string.Empty) // fil*ter
-                {
-                    _filters.Add(s => s.StartsWith(split.First()) && filter.EndsWith(split.Last()));
-
-                }
-                else if (split.First() == string.Empty && split.Last() == string.Empty) // *
-                {
-                    throw new ArgumentException($"Unknown filter specified: {filter}");
-                }
-                else if (split.First() == string.Empty) // *filter
-                {
-                    _filters.Add(s => s.EndsWith(split.Last()));
-                }
-                else // filter*
-                {
-                    _filters.Add(s => s.StartsWith(split.First()));
-                }
-                
-                return;
-            }
-
-            if (split.Length == 3 && split.First() == string.Empty && split.Last() == string.Empty)
-            {
-                _filters.Add(s => s.Contains(split[1]));
-                return;
-            }
-
-            throw new ArgumentException($"Unknown filter specified: {filter}");
-        }
+        return _filtersExclude.Any(f => f(packageName));
     }
-}
-
-public enum PackageFilterMode
-{
-    None = 0,
-    Include = 1,
-    Exclude = 2
 }

SDV.DependenciesAnalyzer/Models/DependencyTree.cs

@@ -19,7 +19,7 @@ private DependencyTree(string id, string version, List<DependencyTree> dependenc
 
     public static DependencyTree AsProject(string id, string version)
     {
-        return new DependencyTree(id, version, new List<DependencyTree>(0), DependencyType.Project);
+        return new DependencyTree(id, version, [], DependencyType.Project);
     }
 
     public static DependencyTree AsPackage(string id, string version, List<DependencyTree> dependencies)
@@ -28,6 +28,7 @@ public static DependencyTree AsPackage(string id, string version, List<Dependenc
     }
 }
 
+[Flags]
 public enum DependencyType
 {
     Project = 1,

SDV.DependenciesAnalyzer/NugetDependenciesGenerator.cs

@@ -20,7 +20,7 @@ public NugetDependenciesGenerator(ILogger<NugetDependenciesGenerator> log)
 
     public Tree Generate(string slnFilePath)
     {
-        return Generate(new TreeGeneratorConfiguration(slnFilePath, []));
+        return Generate(new TreeGeneratorConfiguration(slnFilePath, [], []));
     }
 
     public Tree Generate(TreeGeneratorConfiguration configuration)