Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<Product>Diamond.Core Patterns Library</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>10.1.4</Version>
<AssemblyVersion>10.1.4</AssemblyVersion>
<FileVersion>10.1.4</FileVersion>
<Version>10.1.5</Version>
<AssemblyVersion>10.1.5</AssemblyVersion>
<FileVersion>10.1.5</FileVersion>
<PackageProjectUrl>https://github.com/porrey/Diamond.Core-Patterns</PackageProjectUrl>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<RepositoryUrl>https://github.com/porrey/Diamond.Core-Patterns</RepositoryUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<Product>Diamond.Core Patterns Library</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>10.1.4</Version>
<FileVersion>10.1.4</FileVersion>
<AssemblyVersion>10.1.4</AssemblyVersion>
<Version>10.1.5</Version>
<FileVersion>10.1.5</FileVersion>
<AssemblyVersion>10.1.5</AssemblyVersion>
<Authors>Daniel M Porrey</Authors>
<Description>Provides abstractions for Do pattern execution for ASP.NET Core MVC core projects.</Description>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<Product>Diamond.Core Patterns Library</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>10.1.4</Version>
<AssemblyVersion>10.1.4</AssemblyVersion>
<FileVersion>10.1.4</FileVersion>
<Version>10.1.5</Version>
<AssemblyVersion>10.1.5</AssemblyVersion>
<FileVersion>10.1.5</FileVersion>
<PackageProjectUrl>https://github.com/porrey/Diamond.Core-Patterns</PackageProjectUrl>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<RepositoryUrl>https://github.com/porrey/Diamond.Core-Patterns</RepositoryUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace Diamond.Core.AspNetCore.Hosting
/// </summary>
/// <remarks>This method allows additional configuration of the host builder within the web application builder,
/// enabling customization of the hosting environment.</remarks>
public static class WebbApplicationBuilderDecorator
public static class WebApplicationBuilderDecorator
{
/// <summary>
/// Configures the host builder for the specified <see cref="WebApplicationBuilder"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<Product>Diamond.Core Patterns Library</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>10.1.4</Version>
<AssemblyVersion>10.1.4</AssemblyVersion>
<FileVersion>10.1.4</FileVersion>
<Version>10.1.5</Version>
<AssemblyVersion>10.1.5</AssemblyVersion>
<FileVersion>10.1.5</FileVersion>
<PackageProjectUrl>https://github.com/porrey/Diamond.Core-Patterns</PackageProjectUrl>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<RepositoryUrl>https://github.com/porrey/Diamond.Core-Patterns</RepositoryUrl>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<Product>Diamond.Core Patterns Library</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>10.1.4</Version>
<AssemblyVersion>10.1.4</AssemblyVersion>
<FileVersion>10.1.4</FileVersion>
<Version>10.1.5</Version>
<AssemblyVersion>10.1.5</AssemblyVersion>
<FileVersion>10.1.5</FileVersion>
<PackageProjectUrl>https://github.com/porrey/Diamond.Core-Patterns</PackageProjectUrl>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<RepositoryUrl>https://github.com/porrey/Diamond.Core-Patterns</RepositoryUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<Product>Diamond.Core Patterns Library</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>10.1.4</Version>
<AssemblyVersion>10.1.4</AssemblyVersion>
<FileVersion>10.1.4</FileVersion>
<Version>10.1.5</Version>
<AssemblyVersion>10.1.5</AssemblyVersion>
<FileVersion>10.1.5</FileVersion>
<PackageProjectUrl>https://github.com/porrey/Diamond.Core-Patterns</PackageProjectUrl>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<RepositoryUrl>https://github.com/porrey/Diamond.Core-Patterns</RepositoryUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
<Product>Diamond.Core Patterns Library</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>10.1.4</Version>
<Version>10.1.5</Version>
<Authors>Daniel M Porrey</Authors>
<Description>This library provides the Diamond dependency injection extensions for AutoMapper.</Description>
<Copyright>Copyright © Daniel Porrey 2019-2026</Copyright>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/porrey/Diamond.Core-Patterns</PackageProjectUrl>
<RepositoryUrl>https://github.com/porrey/Diamond.Core-Patterns</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<FileVersion>10.1.4</FileVersion>
<AssemblyVersion>10.1.4</AssemblyVersion>
<FileVersion>10.1.5</FileVersion>
<AssemblyVersion>10.1.5</AssemblyVersion>
<PackageIcon>Diamond.Core.128x128.png</PackageIcon>
<NeutralLanguage>en-US</NeutralLanguage>
<PackageIconUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<Product>Diamond.Core Patterns Library</Product>
<Copyright>Copyright © Daniel Porrey 2019-2026</Copyright>
<Description>This library provides abstractions for object cloning.</Description>
<Version>10.1.4</Version>
<FileVersion>10.1.4</FileVersion>
<AssemblyVersion>10.1.4</AssemblyVersion>
<Version>10.1.5</Version>
<FileVersion>10.1.5</FileVersion>
<AssemblyVersion>10.1.5</AssemblyVersion>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/porrey/Diamond.Core-Patterns</PackageProjectUrl>
<RepositoryUrl>https://github.com/porrey/Diamond.Core-Patterns</RepositoryUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<Product>Diamond.Core Patterns Library</Product>
<Copyright>Copyright © Daniel Porrey 2019-2026</Copyright>
<Description>This library provides object cloning using System.Text.Json.</Description>
<Version>10.1.4</Version>
<FileVersion>10.1.4</FileVersion>
<AssemblyVersion>10.1.4</AssemblyVersion>
<Version>10.1.5</Version>
<FileVersion>10.1.5</FileVersion>
<AssemblyVersion>10.1.5</AssemblyVersion>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/porrey/Diamond.Core-Patterns</PackageProjectUrl>
<RepositoryUrl>https://github.com/porrey/Diamond.Core-Patterns</RepositoryUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<Product>Diamond.Core Patterns Library</Product>
<Copyright>Copyright © Daniel Porrey 2019-2026</Copyright>
<Description>This library provides object cloning using Newtonsoft JSON.Net.</Description>
<Version>10.1.4</Version>
<FileVersion>10.1.4</FileVersion>
<AssemblyVersion>10.1.4</AssemblyVersion>
<Version>10.1.5</Version>
<FileVersion>10.1.5</FileVersion>
<AssemblyVersion>10.1.5</AssemblyVersion>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/porrey/Diamond.Core-Patterns</PackageProjectUrl>
<RepositoryUrl>https://github.com/porrey/Diamond.Core-Patterns</RepositoryUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<Product>Diamond.Core Patterns Library</Product>
<Copyright>Copyright © Daniel Porrey 2019-2026</Copyright>
<Description>This library provides object cloning.</Description>
<Version>10.1.4</Version>
<FileVersion>10.1.4</FileVersion>
<AssemblyVersion>10.1.4</AssemblyVersion>
<Version>10.1.5</Version>
<FileVersion>10.1.5</FileVersion>
<AssemblyVersion>10.1.5</AssemblyVersion>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/porrey/Diamond.Core-Patterns</PackageProjectUrl>
<RepositoryUrl>https://github.com/porrey/Diamond.Core-Patterns</RepositoryUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
<Product>Diamond.Core Patterns Library</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>10.1.4</Version>
<Version>10.1.5</Version>
<Authors>Daniel M Porrey</Authors>
<Description>This library provides abstractions for the command line and command pattern.</Description>
<Copyright>Copyright © Daniel Porrey 2019-2026</Copyright>
<PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/porrey/Diamond.Core-Patterns</PackageProjectUrl>
<RepositoryUrl>https://github.com/porrey/Diamond.Core-Patterns</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<FileVersion>10.1.4</FileVersion>
<AssemblyVersion>10.1.4</AssemblyVersion>
<FileVersion>10.1.5</FileVersion>
<AssemblyVersion>10.1.5</AssemblyVersion>
<PackageIcon>Diamond.Core.128x128.png</PackageIcon>
<NeutralLanguage>en-US</NeutralLanguage>
<PackageIconUrl>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<Product>Diamond.Core Patterns Library</Product>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Version>10.1.4</Version>
<FileVersion>10.1.4</FileVersion>
<AssemblyVersion>10.1.4</AssemblyVersion>
<Version>10.1.5</Version>
<FileVersion>10.1.5</FileVersion>
<AssemblyVersion>10.1.5</AssemblyVersion>
<Authors>Daniel M Porrey</Authors>
<Description>This library provides support for creating a command from a model.</Description>
<Copyright>Copyright © Daniel Porrey 2019-2026</Copyright>
Expand Down Expand Up @@ -52,7 +52,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.10" />
<PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.CommandLine" Version="2.0.10" />
</ItemGroup>
Comment on lines 54 to 56
<ItemGroup>
<ProjectReference Include="..\Diamond.Core.CommandLine.Abstractions\Diamond.Core.CommandLine.Abstractions.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
using System;
using System.Collections.Generic;
using System.CommandLine;
using System.CommandLine.Invocation;
using System.CommandLine.NamingConventionBinder;
using System.CommandLine.Parsing;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
Expand All @@ -33,6 +33,16 @@ namespace Diamond.Core.CommandLine.Model
/// </summary>
public class ModelCommand<TModel> : Command, ICommand
{
private static readonly MethodInfo s_getValueByName =
typeof(ParseResult)
.GetMethods(BindingFlags.Public | BindingFlags.Instance)
.First(m => m.Name == "GetValue"
&& m.IsGenericMethod
&& m.GetParameters().Length == 1
&& m.GetParameters()[0].ParameterType == typeof(string));

private readonly List<(PropertyInfo Property, Option Option)> _optionBindings = new();

/// <summary>
///
/// </summary>
Expand All @@ -42,11 +52,7 @@ public ModelCommand(string name, string description = null)
: base(name, description)
{
this.BuildOptions();

this.Handler = CommandHandler.Create<TModel>(async (p) =>
{
return await this.OnHandleCommand(p);
});
this.RegisterAction();
}

/// <summary>
Expand All @@ -60,18 +66,32 @@ public ModelCommand(ILogger<ModelCommand<TModel>> logger, string name, string de
{
this.Logger = logger;
this.BuildOptions();

this.Handler = CommandHandler.Create<TModel>(async (p) =>
{
return await this.OnHandleCommand(p);
});
this.RegisterAction();
}

/// <summary>
///
/// </summary>
protected ILogger<ModelCommand<TModel>> Logger { get; set; } = new NullLogger<ModelCommand<TModel>>();

private void RegisterAction()
{
this.SetAction(async (ParseResult parseResult, CancellationToken cancellationToken) =>
{
TModel model = Activator.CreateInstance<TModel>();

foreach ((PropertyInfo property, Option option) in this._optionBindings)
{
object value = s_getValueByName
.MakeGenericMethod(property.PropertyType)
.Invoke(parseResult, new object[] { option.Name });
property.SetValue(model, value);
}

return await this.OnHandleCommand(model);
});
}

/// <summary>
///
/// </summary>
Expand Down Expand Up @@ -130,7 +150,8 @@ protected void BuildOptions()
Description = (display?.Description) ?? property.Name,
Order = (display?.Order) ?? 0,
IsRequired = isRequired,
PropertyType = property.PropertyType
PropertyType = property.PropertyType,
ModelProperty = property
};

//
Expand All @@ -149,9 +170,11 @@ protected void BuildOptions()

Type[] typeArgs = { item.PropertyType };
Type makeme = typeof(Option<>).MakeGenericType(typeArgs);
object option = Activator.CreateInstance(makeme, new string[] { $"{item.Name}", $"{item.Alias}" }, item.Description);
Option option = (Option)Activator.CreateInstance(makeme, item.Name, new string[] { item.Alias });
option.Description = item.Description;

this.AddOption(option as Option);
this.Add(option);
this._optionBindings.Add((item.ModelProperty, option));
}
}

Expand All @@ -164,13 +187,5 @@ protected virtual Task<int> OnHandleCommand(TModel item)
{
return Task.FromResult(0);
}

/// <summary>
///
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="action"></param>
/// <returns></returns>
protected ICommandHandler CreateCommandHandler<T>(Action<T> action) => HandlerDescriptor.FromDelegate(action).GetCommandHandler();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
// along with this program. If not, see http://www.gnu.org/licenses/.
//
using System;
using System.Reflection;

namespace Diamond.Core.CommandLine.Model
{
Expand Down Expand Up @@ -52,5 +53,10 @@ public class OptionDescriptor
///
/// </summary>
public Type PropertyType { get; set; }

/// <summary>
///
/// </summary>
public PropertyInfo ModelProperty { get; set; }
}
}

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading