Feat: Refactor and improve CLI parser functionality

Renamed builder and related interfaces for consistency and clarity. Adjusted regex patterns and handling for better argument parsing, including quoted strings. Updated example command and enhanced `TestCommand` to print parameter values.

Author: AnnaSasDev

src/CodeOfChaos.CliArgsParser.Contracts/ICliArgsParserBuilder.cs renamed to src/CodeOfChaos.CliArgsParser.Contracts/ICliParserBuilder.cs

@@ -6,9 +6,9 @@ namespace CodeOfChaos.CliArgsParser;
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------
-public interface ICliArgsParserBuilder {
-    ICliArgsParserBuilder AddServices(IServiceProvider provider);
-    ICliArgsParserBuilder AddServices(Func<IServiceProvider> provider);
+public interface ICliParserBuilder {
+    ICliParserBuilder AddServices(IServiceProvider provider);
+    ICliParserBuilder AddServices(Func<IServiceProvider> provider);
 
     ICliParser Build();
 }

src/CodeOfChaos.CliArgsParser/CliParser.cs

@@ -17,12 +17,13 @@ public partial class CliParser : ICliParser {
     // Methods
     // -----------------------------------------------------------------------------------------------------------------
     internal CliParser() { }
-    public static CliArgsParserBuilder FromBuilder() {
-        return new CliArgsParserBuilder();
+    public static CliParserBuilder FromBuilder() {
+        return new CliParserBuilder();
     }
 
     public ValueTask ExecuteAsync(string[] args, CancellationToken ct = default) => ExecuteAsync(ArgsInputHelper.ToOneLine(args), ct);
     public async ValueTask ExecuteAsync(string input, CancellationToken ct = default) {
+        input = input.Replace("\\\"", "\"");
         if (input.Contains("&&")) {
             IEnumerable<Task> tasks = input
                 .Split("&&")
@@ -33,7 +34,7 @@ public async ValueTask ExecuteAsync(string input, CancellationToken ct = default
 
         string[] tokens = FindEmptySpacesRegex.Split(input);
         string commandName = tokens[0];
-        string parameterInput = ArgsInputHelper.ToOneLine(tokens.Skip(1));
+        string parameterInput = string.Join(" ", tokens.Skip(1));
 
         if (!CommandProvider.TryGetCommand(commandName, out Type? commandType)) throw new Exception("no Command found");
 

src/CodeOfChaos.CliArgsParser/CliArgsParserBuilder.cs renamed to src/CodeOfChaos.CliArgsParser/CliParserBuilder.cs

@@ -9,7 +9,7 @@ namespace CodeOfChaos.CliArgsParser;
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------
-public partial class CliArgsParserBuilder : ICliArgsParserBuilder {
+public partial class CliParserBuilder : ICliParserBuilder {
     private Func<IServiceProvider>? ServiceProvider { get; set; }
     private CommandProvider CommandProvider { get; set; } = new();
 
@@ -19,19 +19,19 @@ public partial class CliArgsParserBuilder : ICliArgsParserBuilder {
     // -----------------------------------------------------------------------------------------------------------------
     // Methods
     // -----------------------------------------------------------------------------------------------------------------
-    public ICliArgsParserBuilder AddServices(IServiceProvider provider) {
+    public ICliParserBuilder AddServices(IServiceProvider provider) {
         ServiceProvider = () => provider;
         return this;
     }
 
-    public ICliArgsParserBuilder AddServices(Func<IServiceProvider> provider) {
+    public ICliParserBuilder AddServices(Func<IServiceProvider> provider) {
         ServiceProvider = provider;
         return this;   
     }
 
-    public ICliArgsParserBuilder AddCommandsFromAssembly<TEntrypoint>() => AddCommandsFromAssembly(typeof(TEntrypoint).Assembly);
+    public ICliParserBuilder AddCommandsFromAssembly<TEntrypoint>() => AddCommandsFromAssembly(typeof(TEntrypoint).Assembly);
 
-    public ICliArgsParserBuilder AddCommandsFromAssembly(Assembly assembly) {
+    public ICliParserBuilder AddCommandsFromAssembly(Assembly assembly) {
         Type[] types = assembly.GetTypes();
         Type? staticDictionaryType = types.FirstOrDefault(t => FindCommandDictionary.IsMatch(t.Name) && t.IsClass);
         var commandsDictionary = staticDictionaryType?.GetField("Commands")?.GetValue(null) as Dictionary<string, Type>;

src/CodeOfChaos.CliArgsParser/ParameterDictionary.cs

@@ -12,7 +12,12 @@ public partial class ParameterDictionary : IParameterDictionary {
     private uint _positionalCounter;
     private uint _quotedStringCounter;
 
-    [GeneratedRegex("""(?:(?<keyValue>(?<key>--[\w\-_]+|-[\w\-_])\s*=\s*(?<value>"[^"]*"|[^ ]+)))|(?<flag>(?:--[\w\-_]+|-[\w\-_])(?=\s|$))|(?<quotedString>"(?<quoted>[^"]*)")|(?<positional>\S+)""")]
+    [GeneratedRegex("""
+    (?<keyValue>(?<key>--[\w\-_]+|-[\w\-_])\s*=\s*(?<value>\\?"[^"]*\\?"))
+    |(?<flag>(?:--[\w\-_]+|-[\w\-_])(?=\s|$))
+    |(?<quotedString>\\?"(?<quoted>[^"]*)\\?")
+    |(?<positional>\S+)
+    """, RegexOptions.IgnorePatternWhitespace)]
     private static partial Regex GatherValuesRegex { get; }
 
     // -----------------------------------------------------------------------------------------------------------------

src/Sample.CodeOfChaos.CliArgsParser/Progam.cs

@@ -10,7 +10,7 @@ namespace Sample.CodeOfChaos.CliArgsParser;
 // ---------------------------------------------------------------------------------------------------------------------
 public static class Program {
     public static async Task Main(string[] args) {
-        var parser = CliParser.FromBuilder()
+        ICliParser parser = CliParser.FromBuilder()
             .AddCommandsFromAssembly<TestCommand>()
             .Build();
 

src/Sample.CodeOfChaos.CliArgsParser/Properties/launchSettings.json

@@ -2,7 +2,7 @@
   "profiles": {
     "Run Example": {
       "commandName": "Project",
-      "commandLineArgs": "example --test=\"Some Value\" -v"
+      "commandLineArgs": "test-command --test-string=\"Some Value\" --test-int=2 --test-bool --test-required-string=alpha"
     }
   }
 }

src/Sample.CodeOfChaos.CliArgsParser/TestCommand.cs

@@ -14,6 +14,9 @@ namespace Sample.CodeOfChaos.CliArgsParser;
 [CliData, AutoName]
 public partial class TestCommand : ICliCommand<TestCommandParameters> {
     public async ValueTask ExecuteAsync(TestCommandParameters parameters, CancellationToken ct = default) {
-        throw new NotImplementedException();
+        Console.WriteLine(parameters.TestString);
+        Console.WriteLine(parameters.TestInt);
+        Console.WriteLine(parameters.TestBool);
+        Console.WriteLine(parameters.TestRequiredString);
     }
 }

src/Sample.CodeOfChaos.CliArgsParser/TestCommandParameters.cs

@@ -8,8 +8,8 @@ namespace Sample.CodeOfChaos.CliArgsParser;
 // ---------------------------------------------------------------------------------------------------------------------
 // Code
 // ---------------------------------------------------------------------------------------------------------------------
-public record TestCommandParameters : ICliParameters{
-    [CliData, AutoName] public string TestString { get; init; }
+public record TestCommandParameters : ICliParameters {
+    [CliData, AutoName] public string TestString { get; init; } = string.Empty;
     [CliData, AutoName] public int TestInt { get; init; }
     [CliData, AutoName] public bool TestBool { get; init; }
     [CliData, AutoName] public required string TestRequiredString { get; init; }