Merge pull request #8 from EAVFW/tst/option-list

feat: Add AllowMultipleArgumentsPerToken to true for IEnumerable options
EAVFW · Nov 29, 2023 · ca5a015 · ca5a015
2 parents 8cb42b1 + 3838c05
commit ca5a015
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/EAVFW.Extensions.CommandLine/Extensions.cs b/src/EAVFW.Extensions.CommandLine/Extensions.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.DependencyInjection;
+using System.Collections;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using System.Collections.Generic;
 using System.CommandLine.Invocation;
@@ -58,21 +59,21 @@ public static Dictionary<string, Argument> AddArguments(this Command command)
                         typeof(COmmandExtensions).GetMethod(nameof(CreateArgument), 1, new[] { typeof(string) })
                             ?.MakeGenericMethod(prop.PropertyType).Invoke(null,
                                 new object[]
-                                    {
-                                        prop.GetCustomAttribute<DescriptionAttribute>()?.Description
-                                    });
+                                {
+                                    prop.GetCustomAttribute<DescriptionAttribute>()?.Description
+                                });
 
 
                     if (argument is not Argument a) continue;
-                    
+
                     output.Add(prop.Name, a);
                     command.Add(a);
                 }
             }
 
             return output;
         }
-        
+
         public static Dictionary<string, Option> AddOptions(this Command command)
         {
             var o = new Dictionary<string, Option>();
@@ -105,6 +106,11 @@ public static Dictionary<string, Option> AddOptions(this Command command)
                         op.AddAlias(a.Alias);
                     }
 
+                    if (typeof(IEnumerable).IsAssignableFrom(prop.PropertyType))
+                    {
+                        op.AllowMultipleArgumentsPerToken = true;
+                    }
+
                     o[prop.Name] = op;
 
                     command.Add(op);
@@ -139,6 +145,7 @@ Task<int> Run(ParseResult parsed, IConsole console)
                 {
                     cmd.GetType().GetProperty(o.Key).SetValue(cmd, parsed.GetValueForOption(o.Value));
                 }
+
                 foreach (var (key, argument) in arguments)
                 {
                     cmd.GetType().GetProperty(key)!.SetValue(cmd, parsed.GetValueForArgument(argument));
@@ -219,4 +226,4 @@ public static async Task<int> RunConsoleApp<TApp>(this IHost host) where TApp :
             return app.Result;
         }
     }
-}
+}