Skip to content
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

Jump to bottom

Fix type conversion in the default pair deconstructor implementation #618

Merged
merged 1 commit into from
Nov 22, 2021
Merged

Fix type conversion in the default pair deconstructor implementation #618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions src/Spectre.Console/Cli/Internal/DefaultPairDeconstructor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ internal sealed class DefaultPairDeconstructor : IPairDeconstructor
throw new ArgumentNullException(nameof(value));
}

var keyConverter = GetConverter(keyType);
var valueConverter = GetConverter(valueType);

var parts = value.Split(new[] { '=' }, StringSplitOptions.None);
if (parts.Length < 1 || parts.Length > 2)
{
Expand All @@ -47,15 +44,16 @@ internal sealed class DefaultPairDeconstructor : IPairDeconstructor
}
}

return (Parse(keyConverter, keyType, stringkey),
Parse(valueConverter, valueType, stringValue));
return (Parse(stringkey, keyType),
Parse(stringValue, valueType));
}

private static object Parse(TypeConverter converter, Type type, string value)
private static object? Parse(string value, Type targetType)
{
try
{
return converter.ConvertTo(value, type);
var converter = GetConverter(targetType);
return converter.ConvertFrom(value);
}
catch
{
Expand Down
35 changes: 35 additions & 0 deletions test/Spectre.Console.Tests/Unit/Cli/CommandAppTests.Pairs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ public sealed class DefaultPairDeconstructorSettings : CommandSettings
public IDictionary<string, int> Values { get; set; }
}

public sealed class DefaultPairDeconstructorEnumValueSettings : CommandSettings
{
[CommandOption("--var <VALUE>")]
public IDictionary<string, DayOfWeek> Values { get; set; }
}

public sealed class LookupSettings : CommandSettings
{
[CommandOption("--var <VALUE>")]
Expand Down Expand Up @@ -153,6 +159,35 @@ public void Should_Map_Pairs_To_Pair_Deconstructable_Collection_Using_Default_De
});
}

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

// When
var result = app.Run(new[]
{
"--var", "foo=Monday",
"--var", "bar=Tuesday",
});

// Then
result.ExitCode.ShouldBe(0);
result.Settings.ShouldBeOfType<DefaultPairDeconstructorEnumValueSettings>().And(pair =>
{
pair.Values.ShouldNotBeNull();
pair.Values.Count.ShouldBe(2);
pair.Values["foo"].ShouldBe(DayOfWeek.Monday);
pair.Values["bar"].ShouldBe(DayOfWeek.Tuesday);
});
}

[Theory]
[InlineData("foo=1=2", "Error: The value 'foo=1=2' is not in a correct format")]
[InlineData("foo=1=2=3", "Error: The value 'foo=1=2=3' is not in a correct format")]
Expand Down