Feat: Add dependency injection support for commands

Introduced dependency injection for command creation using `ActivatorUtilities`. Added methods to `ICliParserBuilder` to load commands from assemblies. Enhanced regex in `ParameterDictionary` for improved value parsing and added corresponding unit tests.

Author: AnnaSasDev

src/CodeOfChaos.CliArgsParser.Contracts/ICliParserBuilder.cs

@@ -1,6 +1,8 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
+using System.Reflection;
+
 namespace CodeOfChaos.CliArgsParser;
 
 // ---------------------------------------------------------------------------------------------------------------------
@@ -9,6 +11,8 @@ namespace CodeOfChaos.CliArgsParser;
 public interface ICliParserBuilder {
     ICliParserBuilder AddServices(IServiceProvider provider);
     ICliParserBuilder AddServices(Func<IServiceProvider> provider);
+    ICliParserBuilder AddCommandsFromAssembly<TEntrypoint>();
+    ICliParserBuilder AddCommandsFromAssembly(Assembly assembly);
 
     ICliParser Build();
 }

src/CodeOfChaos.CliArgsParser/CliParser.cs

@@ -1,6 +1,7 @@
 // ---------------------------------------------------------------------------------------------------------------------
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
+using Microsoft.Extensions.DependencyInjection;
 using System.Text.RegularExpressions;
 
 namespace CodeOfChaos.CliArgsParser;
@@ -37,10 +38,11 @@ public async ValueTask ExecuteAsync(string input, CancellationToken ct = default
         string parameterInput = string.Join(" ", tokens.Skip(1));
 
         if (!CommandProvider.TryGetCommand(commandName, out Type? commandType)) throw new Exception("no Command found");
-
+        
         ICliCommand? command = ServiceProvider is not null
-            ? Activator.CreateInstance(commandType, ServiceProvider.Value) as ICliCommand
+            ? (ICliCommand?)ActivatorUtilities.CreateInstance(ServiceProvider.Value, commandType)
             : Activator.CreateInstance(commandType) as ICliCommand;
+
 
         if (command is null) throw new Exception("no Command found");
 

src/CodeOfChaos.CliArgsParser/CodeOfChaos.CliArgsParser.csproj

@@ -33,6 +33,7 @@
 
     <ItemGroup>
       <PackageReference Include="CodeOfChaos.Extensions" Version="0.66.1" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.5" />
     </ItemGroup>
 
 </Project>

src/CodeOfChaos.CliArgsParser/ParameterDictionary.cs

@@ -13,7 +13,7 @@ public partial class ParameterDictionary : IParameterDictionary {
     private uint _quotedStringCounter;
 
     [GeneratedRegex("""
-    (?<keyValue>(?<key>--[\w\-_]+|-[\w\-_])\s*=\s*(?<value>\\?"[^"]*\\?"))
+    (?<keyValue>(?<key>--[\w\-_]+|-[\w\-_])\s*=\s*(?<value>\\?"[^"]*\\?"|\w+))
     |(?<flag>(?:--[\w\-_]+|-[\w\-_])(?=\s|$))
     |(?<quotedString>\\?"(?<quoted>[^"]*)\\?")
     |(?<positional>\S+)

tests/Tests.CodeOfChaos.CliArgsParser/CliArgsParserTests.cs

@@ -2,6 +2,8 @@
 // Imports
 // ---------------------------------------------------------------------------------------------------------------------
 using CodeOfChaos.CliArgsParser;
+using Microsoft.Extensions.DependencyInjection;
+using Tests.CodeOfChaos.CliArgsParser.TestCommands;
 
 namespace Tests.CodeOfChaos.CliArgsParser;
 
@@ -23,4 +25,27 @@ public async Task ExecuteAsync_Test() {
         // Assert
 
     }
+    
+    [Test]
+    public async Task ExecuteAsync_TestWithServices() {
+        // Arrange
+        const string input = "test-service-command --test-required-string=\"something\"";
+        var services = new ServiceCollection();
+        services.AddSingleton<IService, Service>();
+        ServiceProvider provider = services.BuildServiceProvider();
+        
+        ICliParser parser = CliParser.FromBuilder()
+            .AddServices(provider)
+            .AddCommandsFromAssembly(typeof(CliParserTests).Assembly)
+            .Build();
+        
+        // Act
+        await parser.ExecuteAsync(input);
+
+        // Assert
+        var service = provider.GetRequiredService<IService>();
+        TestCommandParameters? parameters = service.Parameters;
+        await Assert.That(parameters).IsNotNull();
+        await Assert.That(parameters!.TestRequiredString).IsEqualTo("something");
+    }
 }

tests/Tests.CodeOfChaos.CliArgsParser/TestCommands/TestServiceCommand.cs

@@ -0,0 +1,26 @@
+// ---------------------------------------------------------------------------------------------------------------------
+// Imports
+// ---------------------------------------------------------------------------------------------------------------------
+using CodeOfChaos.CliArgsParser;
+
+namespace Tests.CodeOfChaos.CliArgsParser.TestCommands;
+
+// ---------------------------------------------------------------------------------------------------------------------
+// Code
+// ---------------------------------------------------------------------------------------------------------------------
+[CliData, AutoName]
+public partial class TestServiceCommand(IService service) : ICliCommand<TestCommandParameters> {
+    public ValueTask ExecuteAsync(TestCommandParameters parameters, CancellationToken ct = default) {
+        service.Parameters = parameters;
+        return ValueTask.CompletedTask;
+    }
+}
+
+
+public class Service : IService {
+    public TestCommandParameters? Parameters { get; set; }
+}
+
+public interface IService {
+    TestCommandParameters? Parameters { get; set; }
+}

tests/Tests.CodeOfChaos.CliArgsParser/Tests.CodeOfChaos.CliArgsParser.csproj

@@ -11,6 +11,7 @@
 
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" Version="2024.3.0"/>
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.5" />
         <PackageReference Include="Moq" Version="4.20.72"/>
         <PackageReference Include="TUnit" Version="0.19.148" />
         <PackageReference Include="Bogus" Version="35.6.3" />