LaunchArgumentParser.UnknownArguments

DTLib.Logging.Microsoft/DTLib.Logging.Microsoft.csproj

@@ -2,7 +2,7 @@
     <PropertyGroup>
         <!--package info-->
         <PackageId>DTLib.Logging.Microsoft</PackageId>
-        <Version>1.1.1</Version>
+        <Version>1.1.2</Version>
         <Authors>Timerix</Authors>
         <Description>DTLib logger wrapper with dependency injection</Description>
         <RepositoryType>GIT</RepositoryType>
@@ -28,6 +28,6 @@
         <ProjectReference Include="..\DTLib\DTLib.csproj" />
     </ItemGroup>
     <ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
-        <PackageReference Include="DTLib" Version="1.6.*" />
+        <PackageReference Include="DTLib" Version="1.7.2" />
     </ItemGroup>
 </Project>

DTLib.Web/DTLib.Web.csproj

@@ -25,6 +25,6 @@
         <ProjectReference Include="..\DTLib\DTLib.csproj" />
     </ItemGroup>
     <ItemGroup Condition=" '$(Configuration)' != 'Debug' ">
-        <PackageReference Include="DTLib" Version="1.7.1" />
+        <PackageReference Include="DTLib" Version="1.7.2" />
     </ItemGroup>
 </Project>

DTLib/Console/LaunchArgumentParser.cs

@@ -2,71 +2,79 @@ namespace DTLib.Console;
 
 public class LaunchArgumentParser
 {
-    public bool IsAllowedNoArguments;
+    public string HelpMessageHeader = "USAGE:";
+    public bool AllowedNoArguments;
+    public bool AllowedUnknownArguments;
+    // ReSharper disable once CollectionNeverQueried.Global
+    public readonly List<string> UnknownArguments = new();
     
     private readonly Dictionary<string, LaunchArgument> argDict = new();
     private readonly List<LaunchArgument> argList = new();
 
-    public class ExitAfterHelpException : Exception
-    {
-        internal ExitAfterHelpException() : base("your program can use this exception to exit after displaying help message")
-        { }
-    }
-    
-    public string CreateHelpMessage()
-    {
-        StringBuilder b = new();
-        foreach (var arg in argList) 
-            arg.AppendHelpInfo(b).Append('\n');
-        b.Remove(b.Length-1, 1);
-        return b.ToString();
-    }
-    public string CreateHelpArgMessage(string argAlias)
-    {
-        StringBuilder b = new();
-        var arg = Parse(argAlias);
-        arg.AppendHelpInfo(b);
-        return b.ToString();
-    }
-    private void HelpHandler()
-    {
-        System.Console.WriteLine(CreateHelpMessage());
-        throw new ExitAfterHelpException();
-    }
-
-    private void HelpArgHandler(string argAlias)
-    {
-        System.Console.WriteLine(CreateHelpArgMessage(argAlias));
-        throw new ExitAfterHelpException();
-    }
-
-
     public LaunchArgumentParser() 
     {
         var help = new LaunchArgument(new[] { "h", "help" },
             "shows help message", HelpHandler);
         Add(help);
         var helpArg = new LaunchArgument(new[] { "ha", "helparg" },
-            "shows help message for particular argument", 
+            "shows help message for specific argument",
-            HelpArgHandler, "argAlias");
+            HelpArgHandler, "argument");
         Add(helpArg);
     }
+    public LaunchArgumentParser(ICollection<LaunchArgument> arguments) : this() => WithArgs(arguments);
+    public LaunchArgumentParser(params LaunchArgument[] arguments) : this() => WithArgs(arguments);
+
+    public LaunchArgumentParser WithArgs(IEnumerable<LaunchArgument> args)
+    {
+        foreach (var arg in args)
+            Add(arg);
+        return this;
+    }
+    
+    public LaunchArgumentParser WithArgs(params LaunchArgument[] args)
+    {
+        foreach (var arg in args)
+            Add(arg);
+        return this;
+    }
+
+    public LaunchArgumentParser WithHelpMessageHeader(string header)
+    {
+        HelpMessageHeader = header;
+        return this;
+    }
     
     public LaunchArgumentParser AllowNoArguments()
     {
-        IsAllowedNoArguments = true;
+        AllowedNoArguments = true;
         return this;
     }
     
-    public LaunchArgumentParser(ICollection<LaunchArgument> arguments) : this()
+    public LaunchArgumentParser AllowUnknownArguments()
     {
-        foreach (var arg in arguments) 
+        AllowedUnknownArguments = true;
-            Add(arg);
+        return this;
     }
-    public LaunchArgumentParser(params LaunchArgument[] arguments) : this()
+
+    
+    public string CreateHelpMessage()
     {
-        foreach (var arg in arguments)
+        StringBuilder b = new(HelpMessageHeader);
-            Add(arg);
+        foreach (var arg in argList)
+        {
+            b.Append('\n');
+            arg.AppendHelpInfo(b);
+        }
+        return b.ToString();
+    }
+
+    public string CreateHelpArgMessage(string argAlias)
+    {
+        StringBuilder b = new();
+        if(!TryParseArg(argAlias, out var arg))
+            throw new Exception($"unknown argument '{argAlias}'");
+        arg.AppendHelpInfo(b);
+        return b.ToString();
     }
 
     public void Add(LaunchArgument arg)
@@ -76,16 +84,13 @@ public class LaunchArgumentParser
             argDict.Add(alias, arg);
     }
 
-    public LaunchArgument Parse(string argAlias)
+    public bool TryParseArg(string argAlias, out LaunchArgument arg)
     {
         // different argument providing patterns
-        if (!argDict.TryGetValue(argAlias, out var arg) &&    // arg
+        arg = null!;
-            !(argAlias.StartsWith("--") && argDict.TryGetValue(argAlias.Substring(2), out arg)) && // --arg
+        return argAlias.StartsWith("--") && argDict.TryGetValue(argAlias.Substring(2), out arg) || // --arg
-            !(argAlias.StartsWith('-') && argDict.TryGetValue(argAlias.Substring(1), out arg)) &&  // -arg
+               argAlias.StartsWith('-') && argDict.TryGetValue(argAlias.Substring(1), out arg) || // -arg
-            !(argAlias.StartsWith('/') && argDict.TryGetValue(argAlias.Substring(1), out arg)))    // /arg
+               argAlias.StartsWith('/') && argDict.TryGetValue(argAlias.Substring(1), out arg); // /arg
-            throw new Exception($"invalid argument: {argAlias}\n{CreateHelpMessage()}");
-        
-        return arg;
     }
 
     /// <param name="args">program launch args</param>
@@ -95,18 +100,24 @@ public class LaunchArgumentParser
     public void ParseAndHandle(string[] args)
     {
         // show help message and throw ExitAfterHelpException
-        if (args.Length == 0 && !IsAllowedNoArguments) 
+        if (args.Length == 0 && !AllowedNoArguments)
             HelpHandler();
 
         List<LaunchArgument> execQueue = new();
 
         for (int i = 0; i < args.Length; i++)
         {
-            LaunchArgument arg = Parse(args[i]);
+            if (!TryParseArg(args[i], out var arg))
+            {
+                if (!AllowedUnknownArguments)
+                    throw new Exception($"unknown argument '{args[i]}'");
+                UnknownArguments.Add(args[i]);
+            }
             for (int j = 0; j < arg.Params.Length; j++)
             {
                 if (++i >= args.Length)
-                    throw new Exception($"argument '{arg.Aliases[0]}' should have parameter '{arg.Params[j]}' after it");
+                    throw new Exception(
+                        $"argument '{arg.Aliases[0]}' should have parameter '{arg.Params[j]}' after it");
                 arg.Params[j].Value = args[i];
             }
 
@@ -119,4 +130,24 @@ public class LaunchArgumentParser
         foreach (var a in execQueue)
             a.Handle();
     }
+
+    private void HelpHandler()
+    {
+        System.Console.WriteLine(CreateHelpMessage());
+        throw new ExitAfterHelpException();
+    }
+
+    private void HelpArgHandler(string argAlias)
+    {
+        System.Console.WriteLine(CreateHelpArgMessage(argAlias));
+        throw new ExitAfterHelpException();
+    }
+
+    public class ExitAfterHelpException : Exception
+    {
+        public ExitAfterHelpException()
+            : base("your program can use this exception to exit after displaying help message")
+        {
+        }
+    }
 }

DTLib/DTLib.csproj

@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<!--package info-->
 		<PackageId>DTLib</PackageId>
-		<Version>1.7.1</Version>
+		<Version>1.7.3</Version>
 		<Authors>Timerix</Authors>
 		<Description>Library for all my C# projects</Description>
 		<RepositoryType>GIT</RepositoryType>