Use Spectre.Console.Cli for commands

.editorconfig

@@ -0,0 +1,2 @@
+[*.{cs,vb}]
+dotnet_diagnostic.CA1515.severity = none

.github/workflows/update-material-symbols.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Restore generator
         run: dotnet restore src/GoogleMaterialDesignIconsGenerator/GoogleMaterialDesignIconsGenerator.csproj
       - name: Generate Material Symbols
-        run: dotnet run --project src/GoogleMaterialDesignIconsGenerator/GoogleMaterialDesignIconsGenerator.csproj --configuration Release --no-restore -- materialsymbols
+        run: dotnet run --project src/GoogleMaterialDesignIconsGenerator/GoogleMaterialDesignIconsGenerator.csproj --configuration Release --no-restore -- --icon-type MaterialSymbols
       - name: Check Material Symbols font changes
         id: changes
         run: |

src/GoogleMaterialDesignIconsGenerator/GenerateCommand.cs

@@ -0,0 +1,47 @@
+using GoogleMaterialDesignIconsGenerator.Extensions;
+using GoogleMaterialDesignIconsGenerator.Model;
+using GoogleMaterialDesignIconsGenerator.Service;
+using Spectre.Console;
+using Spectre.Console.Cli;
+
+namespace GoogleMaterialDesignIconsGenerator;
+
+public sealed class GenerateCommand : AsyncCommand<GenerateCommandSettings>
+{
+    public override async Task<int> ExecuteAsync(CommandContext context, GenerateCommandSettings settings, CancellationToken cancellationToken)
+    {
+        ArgumentNullException.ThrowIfNull(settings);
+        var iconType = ResolveIconType(settings);
+
+        var codeGenerator = new CodeGenerationService();
+        using var client = new IconHttpClientService();
+        var metadata = await client.ParseIconsAsync().ConfigureAwait(false);
+        var filteredIcons = Utility.IconFilter.FilterByFamily(metadata, iconType);
+        var groupedIcons = Utility.IconFilter.GroupIconsByFamilies(filteredIcons, iconType);
+        var outputFolder = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, $"../../../../MudBlazor.FontIcons.{iconType.GetDescription()}"));
+
+        codeGenerator.GenerateCsFilesUsingRoslyn(iconType, groupedIcons, folder: outputFolder);
+
+        if (iconType == IconType.MaterialSymbols)
+        {
+            await client.DownloadMaterialSymbolsFontsAsync(Path.Combine(outputFolder, "wwwroot", "font"), cancellationToken).ConfigureAwait(false);
+        }
+
+        return 0;
+    }
+
+    private static IconType ResolveIconType(GenerateCommandSettings settings)
+    {
+        if (settings.IconType is { } iconTypeFromOption)
+        {
+            return iconTypeFromOption;
+        }
+
+        return AnsiConsole.Prompt(
+            new SelectionPrompt<IconType>()
+                .Title("What [green]icon[/] pack to generate?")
+                .PageSize(10)
+                .MoreChoicesText("[grey](Move up and down to reveal more options)[/]")
+                .AddChoices(IconType.MaterialIcons, IconType.MaterialSymbols));
+    }
+}

src/GoogleMaterialDesignIconsGenerator/GenerateCommandSettings.cs

@@ -0,0 +1,10 @@
+using Spectre.Console.Cli;
+using GoogleMaterialDesignIconsGenerator.Model;
+
+namespace GoogleMaterialDesignIconsGenerator;
+
+public sealed class GenerateCommandSettings : CommandSettings
+{
+    [CommandOption("-t|--icon-type <ICON_TYPE>")]
+    public IconType? IconType { get; init; }
+}

src/GoogleMaterialDesignIconsGenerator/Generator/IGenerator.cs

@@ -5,7 +5,7 @@ namespace GoogleMaterialDesignIconsGenerator.Generator;
 
 public interface IGenerator
 {
-    public string RootNamespace { get; }
+    string RootNamespace { get; }
 
     CompilationUnitSyntax GetCompilationUnitSyntax(KeyValuePair<string, IReadOnlyCollection<Icon>> group, string className, string familyPath);
 }

src/GoogleMaterialDesignIconsGenerator/GoogleMaterialDesignIconsGenerator.csproj

@@ -16,7 +16,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0-3.final" />
-    <PackageReference Include="Spectre.Console" Version="0.49.1" />
+    <PackageReference Include="Spectre.Console" Version="0.54.0" />
+    <PackageReference Include="Spectre.Console.Cli" Version="0.53.1" />
   </ItemGroup>
 
   <ItemGroup>

src/GoogleMaterialDesignIconsGenerator/Model/Google/Icon.cs

@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace GoogleMaterialDesignIconsGenerator.Model.Google;
 

src/GoogleMaterialDesignIconsGenerator/Model/Google/IconsMetadata.cs

@@ -1,5 +1,4 @@
-using System.Collections.ObjectModel;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace GoogleMaterialDesignIconsGenerator.Model.Google;
 

src/GoogleMaterialDesignIconsGenerator/Program.cs

@@ -1,97 +1,17 @@
-using GoogleMaterialDesignIconsGenerator.Extensions;
-using GoogleMaterialDesignIconsGenerator.Model;
-using GoogleMaterialDesignIconsGenerator.Service;
-using Spectre.Console;
+using Spectre.Console.Cli;
 
 namespace GoogleMaterialDesignIconsGenerator;
 
 public static class Program
 {
-    public static async Task Main(string[] args)
+    public static Task<int> Main(string[] args)
     {
-        var iconType = ResolveIconType(args);
-
-        var codeGenerator = new CodeGenerationService();
-        using var client = new IconHttpClientService();
-        var metadata = await client.ParseIconsAsync().ConfigureAwait(false);
-        var filteredIcons = Utility.IconFilter.FilterByFamily(metadata, iconType);
-        var groupedIcons = Utility.IconFilter.GroupIconsByFamilies(filteredIcons, iconType);
-        var outputFolder = Path.GetFullPath(Path.Combine(AppContext.BaseDirectory, $"../../../../MudBlazor.FontIcons.{iconType.GetDescription()}"));
-
-        codeGenerator.GenerateCsFilesUsingRoslyn(iconType, groupedIcons, folder: outputFolder);
-
-        if (iconType == IconType.MaterialSymbols)
-        {
-            await client.DownloadMaterialSymbolsFontsAsync(Path.Combine(outputFolder, "wwwroot", "font")).ConfigureAwait(false);
-        }
-    }
-
-    private static IconType ResolveIconType(IReadOnlyList<string> args)
-    {
-        if (TryGetIconTypeFromArgs(args, out var iconType))
-        {
-            return iconType;
-        }
-
-        return AnsiConsole.Prompt(
-            new SelectionPrompt<IconType>()
-                .Title("What [green]icon[/] pack to generate?")
-                .PageSize(10)
-                .MoreChoicesText("[grey](Move up and down to reveal more options)[/]")
-                .AddChoices([
-                    IconType.MaterialIcons,
-                    IconType.MaterialSymbols
-                ]));
-    }
-
-    private static bool TryGetIconTypeFromArgs(IReadOnlyList<string> args, out IconType iconType)
-    {
-        iconType = default;
-        if (args.Count == 0)
-        {
-            return false;
-        }
-
-        for (var i = 0; i < args.Count; i++)
-        {
-            if (!args[i].Equals("--icon-type", StringComparison.OrdinalIgnoreCase) &&
-                !args[i].Equals("-t", StringComparison.OrdinalIgnoreCase))
-            {
-                continue;
-            }
-
-            if (i + 1 >= args.Count)
-            {
-                throw new ArgumentException("Missing value for --icon-type.");
-            }
-
-            iconType = ParseIconType(args[i + 1]);
-            return true;
-        }
-
-        iconType = ParseIconType(args[0]);
-        return true;
-    }
-
-    private static IconType ParseIconType(string value)
-    {
-        var normalized = value
-            .Replace("-", string.Empty, StringComparison.Ordinal)
-            .Replace("_", string.Empty, StringComparison.Ordinal)
-            .Trim();
-
-        if (normalized.Equals("materialsymbols", StringComparison.OrdinalIgnoreCase) ||
-            normalized.Equals("symbols", StringComparison.OrdinalIgnoreCase))
-        {
-            return IconType.MaterialSymbols;
-        }
-
-        if (normalized.Equals("materialicons", StringComparison.OrdinalIgnoreCase) ||
-            normalized.Equals("icons", StringComparison.OrdinalIgnoreCase))
+        var app = new CommandApp<GenerateCommand>();
+        app.Configure(config =>
         {
-            return IconType.MaterialIcons;
-        }
+            config.SetApplicationName("GoogleMaterialDesignIconsGenerator");
+        });
 
-        throw new ArgumentException($"Unsupported icon type '{value}'. Use 'materialsymbols' or 'materialicons'.");
+        return app.RunAsync(args);
     }
 }

src/GoogleMaterialDesignIconsGenerator/Service/CodeGenerationService.cs

@@ -7,7 +7,7 @@
 
 public class CodeGenerationService
 {
     public void GenerateCsFilesUsingRoslyn(IconType iconType, Dictionary<string, IReadOnlyCollection<Icon>> groupedIcons, string folder)
     {
         ArgumentNullException.ThrowIfNull(groupedIcons);
 
@@ -26,5 +26,4 @@
             File.WriteAllText(path, code);
         }
     }
-
 }