From aba1042a201a95bc19c65f19467e3bad19d7aa11 Mon Sep 17 00:00:00 2001
From: drmathias <adamshirt@outlook.com>
Date: Sun, 5 Jul 2026 10:39:11 +0100
Subject: [PATCH] Expose argument name and value in parse exceptions

---
 .../ConsoleApp.Abstractions.cs                | 18 +++++++++++-
 src/ConsoleAppFramework/ConsoleAppBaseCode.cs | 28 +++++++++++++++----
 2 files changed, 39 insertions(+), 7 deletions(-)

diff --git a/src/ConsoleAppFramework.Abstractions/ConsoleApp.Abstractions.cs b/src/ConsoleAppFramework.Abstractions/ConsoleApp.Abstractions.cs
index 1247131c..015ea92c 100644
--- a/src/ConsoleAppFramework.Abstractions/ConsoleApp.Abstractions.cs
+++ b/src/ConsoleAppFramework.Abstractions/ConsoleApp.Abstractions.cs
@@ -105,6 +105,22 @@ public sealed class ConsoleAppFilterAttribute<T> : Attribute
 {
 }
 
-public sealed class ArgumentParseFailedException(string message) : Exception(message)
+public class ArgumentParseFailedException : Exception
 {
+    public ArgumentParseFailedException(string message, string argumentName) : base(message)
+    {
+        ArgumentName = argumentName;
+    }
+
+    public string ArgumentName { get; }
 }
+
+public sealed class ArgumentParseInvalidValueException : ArgumentParseFailedException
+{
+    public ArgumentParseInvalidValueException(string message, string argumentName, string argumentValue) : base(message, argumentName)
+    {
+        ArgumentValue = argumentValue;
+    }
+
+    public string ArgumentValue { get; }
+}
\ No newline at end of file
diff --git a/src/ConsoleAppFramework/ConsoleAppBaseCode.cs b/src/ConsoleAppFramework/ConsoleAppBaseCode.cs
index fd0f373e..0326b689 100644
--- a/src/ConsoleAppFramework/ConsoleAppBaseCode.cs
+++ b/src/ConsoleAppFramework/ConsoleAppBaseCode.cs
@@ -140,8 +140,24 @@ internal sealed class ConsoleAppFilterAttribute<T> : Attribute
 {
 }
 
-internal sealed class ArgumentParseFailedException(string message) : Exception(message)
+internal class ArgumentParseFailedException : Exception
 {
+    public ArgumentParseFailedException(string message, string argumentName) : base(message)
+    {
+        ArgumentName = argumentName;
+    }
+
+    public string ArgumentName { get; }
+}
+
+internal sealed class ArgumentParseInvalidValueException : ArgumentParseFailedException
+{
+    public ArgumentParseInvalidValueException(string message, string argumentName, string argumentValue) : base(message, argumentName)
+    {
+        ArgumentValue = argumentValue;
+    }
+
+    public string ArgumentValue { get; }
 }
 
 #endif
@@ -254,23 +270,23 @@ public static Task RunAsync(string[] args, Delegate command)
 
     static void ThrowArgumentParseFailed(string argumentName, string value)
     {
-        throw new ArgumentParseFailedException($"Argument '{argumentName}' failed to parse, provided value: {value}");
+        throw new ArgumentParseInvalidValueException($"Argument '{argumentName}' failed to parse, provided value: {value}", argumentName, value);
     }
 
     static void ThrowArgumentParseFailedEnum(Type enumType, string argumentName, string value)
     {
         var values = string.Join(", ", Enum.GetNames(enumType));
-        throw new ArgumentParseFailedException($"Argument '{argumentName}' is invalid. Provided value: {value}. Valid values: {values}");
+        throw new ArgumentParseInvalidValueException($"Argument '{argumentName}' is invalid. Provided value: {value}. Valid values: {values}", argumentName, value);
     }
 
     static void ThrowRequiredArgumentNotParsed(string name)
     {
-        throw new ArgumentParseFailedException($"Required argument '{name}' was not specified.");
+        throw new ArgumentParseFailedException($"Required argument '{name}' was not specified.", name);
     }
 
-    static void ThrowArgumentNameNotFound(string argumentName)
+    static void ThrowArgumentNameNotFound(string name)
     {
-        throw new ArgumentParseFailedException($"Argument '{argumentName}' is not recognized.");
+        throw new ArgumentParseFailedException($"Argument '{name}' is not recognized.", name);
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]