tk/spectre.console
1
0
Fork 0
mirror of https://github.com/nsnail/spectre.console.git synced 2025-10-31 17:15:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removes automatic registration of settings

Browse Source 
Original intention was to register Settings automatically for DI. This ran into problem when the container verifies the configuration is valid for a settings using the constructor for initialization. It tries to resolve the parameters and fails.

This removes the automatic registration and falls back ActivatorCreateInstance when no Setting is registered.
This commit is contained in:
Phil Scott
2021-04-14 21:20:38 -04:00
committed by Patrik Svensson
parent 23564612c1
commit f5a9c0ca26
3 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Spectre.Console.Tests/Unit/Cli/CommandAppTests.cs
View File

@@ -358,15 +358,15 @@ namespace Spectre.Console.Tests.Unit.Cli
// Then
registrar.Registrations.ContainsKey(typeof(ICommand)).ShouldBeTrue();
registrar.Registrations.ContainsKey(typeof(DogSettings));
registrar.Registrations[typeof(ICommand)].ShouldContain(typeof(DogCommand));
}
[Fact]
public void Should_Register_Default_Command_Settings_When_Configuring_Application()
public void Can_Register_Default_Command_Settings_When_Configuring_Application()
{
// Given
var registrar = new FakeTypeRegistrar();
registrar.Register(typeof(DogSettings), typeof(DogSettings));
var app = new CommandApp<DogCommand>(registrar);
app.Configure(config =>
{
@@ -380,7 +380,7 @@ namespace Spectre.Console.Tests.Unit.Cli
});
// Then
registrar.Registrations.ContainsKey(typeof(DogSettings));
registrar.Registrations.ContainsKey(typeof(DogSettings)).ShouldBeTrue();
registrar.Registrations[typeof(DogSettings)].Count.ShouldBe(1);
registrar.Registrations[typeof(DogSettings)].ShouldContain(typeof(DogSettings));
}
@@ -415,10 +415,12 @@ namespace Spectre.Console.Tests.Unit.Cli
}
[Fact]
public void Should_Register_Command_Settings_When_Configuring_Application()
public void Can_Register_Command_Settings_When_Configuring_Application()
{
// Given
var registrar = new FakeTypeRegistrar();
registrar.Register(typeof(DogSettings), typeof(DogSettings));
registrar.Register(typeof(MammalSettings), typeof(MammalSettings));
var app = new CommandApp(registrar);
app.Configure(config =>
{

16
src/Spectre.Console/Cli/Internal/Binding/CommandPropertyBinder.cs
View File

@@ -25,9 +25,21 @@ namespace Spectre.Console.Cli
private static CommandSettings CreateSettings(ITypeResolver resolver, Type settingsType)
{
if (resolver.Resolve(settingsType) is CommandSettings settings)
try
{
return settings;
if (resolver.Resolve(settingsType) is CommandSettings settings)
{
return settings;
}
}
catch
{
// ignored
}
if (Activator.CreateInstance(settingsType) is CommandSettings instance)
{
return instance;
}
throw CommandParseException.CouldNotCreateSettings(settingsType);

5
src/Spectre.Console/Cli/Internal/Extensions/TypeRegistrarExtensions.cs
View File

@@ -31,11 +31,6 @@ namespace Spectre.Console.Cli
registrar?.Register(command.CommandType, command.CommandType);
}
if (!command.SettingsType.IsAbstract)
{
registrar?.Register(command.SettingsType, command.SettingsType);
}
foreach (var parameter in command.Parameters)
{
var pairDeconstructor = parameter?.PairDeconstructor?.Type;