properly identify prefixed args during binding

Author: daningalla

assets/docs.md

@@ -260,7 +260,7 @@ catch (CliArgumentException exception)
 }
 ```
 
-## Adnvanced usage
+## Advanced usage
 
 ### Assign unbound properties
 

src/lib/Vertical/Cli/Binding/BindingValuesLookup.cs

@@ -123,14 +123,11 @@ private static void TakeOptions(
                 continue;
             }
 
-            if (node?.Value is { PrefixType: OptionPrefixType.None } operandArgument)
-            {
-                entries.Add((parameter.BindingName, operandArgument));
-                node = argumentList.Remove(node, node.Next);
-                continue;
-            }
-
-            throw Exceptions.OptionValueNotProvided(route, parameter, argument);
+            if (node?.Value is not { PrefixType: OptionPrefixType.None } operandArgument)
+                throw Exceptions.OptionValueNotProvided(route, parameter, argument);
+            
+            entries.Add((parameter.BindingName, operandArgument));
+            node = argumentList.Remove(node, node.Next);
         }
     }
 

test/UnitTests/Vertical/Cli/Binding/OperandTests.cs

@@ -19,15 +19,15 @@ public override KeyValuePair<string, string> Convert(string str)
         }
     }
 
-    public record Options(KeyValuePair<string, string>[] Properties, string? LogLevel);
+    public record Options(KeyValuePair<string, string>[] Properties, string? LogLevel, bool Test);
 
     [Fact]
-    public void Bind_Argument_Text_Returns_Expected()
+    public void Bind_Option_Argument_Text_Returns_Expected()
     {
         var app = new CliApplicationBuilder("test")
             .AddConverters([new KeyValuePairConverter()])
             .MapModel<Options>(map => map.Option(x => x.Properties, ["--watermark"], Arity.ZeroOrMany))
-            .Route<Options>("test", opt => 0)
+            .Route<Options>("test", _ => 0)
             .Build();
 
         var context = CliEngine.GetBindingContext(app, ["--watermark", "id=value"]);
@@ -38,12 +38,12 @@ public void Bind_Argument_Text_Returns_Expected()
     }
 
     [Fact]
-    public void Bind_Operand_Value_Returns_Expected()
+    public void Bind_Option_Operand_Value_Returns_Expected()
     {
         var app = new CliApplicationBuilder("test")
             .AddConverters([new StringConverter()])
             .MapModel<Options>(map => map.Option(x => x.LogLevel, ["--level"]))
-            .Route<Options>("test", opt => 0)
+            .Route<Options>("test", _ => 0)
             .Build();
 
         CliEngine
@@ -61,4 +61,18 @@ public void Bind_Operand_Value_Returns_Expected()
             .GetValue<string?>(nameof(Options.LogLevel))
             .ShouldBe("debug");
     }
+
+    [Fact]
+    public void Bind_Switch_Returns_Expected()
+    {
+        var app = new CliApplicationBuilder("test")
+            .AddConverters([new ParsableConverter<bool>()])
+            .MapModel<Options>(map => map.Switch(x => x.Test, ["--test"]))
+            .Route<Options>("test", _ => 0)
+            .Build();
+
+        CliEngine.GetBindingContext(app, ["--test"])
+            .GetValue<bool>(nameof(Options.Test))
+            .ShouldBeTrue();
+    }
 }