Skip to content

Fix pair deconstruction with default values #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
patriksvensson merged 2 commits into from
May 6, 2026
Merged

Fix pair deconstruction with default values #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75a2300
Add test for pair deconstruction with default values
0xced May 6, 2026
acdd222
Fix pair deconstruction with default values
0xced May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions src/Spectre.Console.Cli.Tests/CommandAppTests.Pairs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ public sealed class ReadOnlyDictionarySettings : CommandSettings
public IReadOnlyDictionary<string, string>? Values { get; set; }
}

public sealed class DefaultValuesSettings : CommandSettings
{
[CommandOption("--var <VALUE>")]
[DefaultValue(new[] { "Monday=1", "Tuesday=2" })]
public IReadOnlyDictionary<DayOfWeek, int>? Values { get; set; }
}

public sealed class StringIntDeconstructor : PairDeconstructor<string, string>
{
protected override (string Key, string Value) Deconstruct(string? value)
Expand Down Expand Up @@ -312,5 +319,30 @@ public void Should_Map_ReadOnly_Dictionary_Values()
pair.Values["baz"].ShouldBe("qux");
});
}

[Fact]
public void Should_Map_Default_Values()
{
// Given
var app = new CommandAppTester();
app.SetDefaultCommand<GenericCommand<DefaultValuesSettings>>();
app.Configure(config =>
{
config.PropagateExceptions();
});

// When
var result = app.Run();

// Then
result.ExitCode.ShouldBe(0);
result.Settings.ShouldBeOfType<DefaultValuesSettings>().And(pair =>
{
pair.Values.ShouldNotBeNull();
pair.Values.Count.ShouldBe(2);
pair.Values[DayOfWeek.Monday].ShouldBe(1);
pair.Values[DayOfWeek.Tuesday].ShouldBe(2);
});
}
}
}
9 changes: 6 additions & 3 deletions src/Spectre.Console.Cli/Internal/Binding/CommandValueBinder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,13 @@ private object GetLookup(CommandParameter parameter, ITypeResolver resolver, obj
}

// Deconstruct and add to multimap.
var pair = deconstructor.Deconstruct(resolver, genericTypes[0], genericTypes[1], value as string);
if (pair.Key != null)
foreach (var text in value as IEnumerable<string?> ?? [ value as string ])
{
multimap.Add(pair);
var pair = deconstructor.Deconstruct(resolver, genericTypes[0], genericTypes[1], text);
if (pair.Key != null)
{
multimap.Add(pair);
}
}

return multimap;
Expand Down