From d2eaabc73927fa5e664679df31bb849d96634f06 Mon Sep 17 00:00:00 2001 From: Johannes Norrbacka Date: Tue, 11 Oct 2022 18:57:28 +0200 Subject: [PATCH 1/7] Verify AddCommand can be chained --- .../Builder/CoconaCommandBuilderTest.cs | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs b/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs index fc3856a..8985cb9 100644 --- a/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs +++ b/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs @@ -181,5 +181,23 @@ class UseFilter_Filter2 : IFilterFactory } class UseFilter_Filter3 : IFilterMetadata { } + + [Fact] + public void AddCommand_Chained() + { + var builder = new CoconaCommandsBuilder(); + builder.AddCommand(() => { }).AddCommand(() => { }); + + var built = builder.Build(); + built.Should().HaveCount(2); + built[0].Should().BeOfType(); + built[0].Metadata.Should().HaveCount(2); + built[0].Metadata[0].Should().BeOfType(); + built[0].Metadata[1].Should().BeOfType(); + built[1].Should().BeOfType(); + built[1].Metadata.Should().HaveCount(2); + built[1].Metadata[0].Should().BeOfType(); + built[1].Metadata[1].Should().BeOfType(); + } } } From 160e2b47eb23cfa46e01317220062404fda35990 Mon Sep 17 00:00:00 2001 From: Johannes Norrbacka Date: Tue, 11 Oct 2022 18:57:40 +0200 Subject: [PATCH 2/7] Add functionality to chain AddCommand --- src/Cocona.Core/Builder/CoconaCommandsBuilder.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/Cocona.Core/Builder/CoconaCommandsBuilder.cs b/src/Cocona.Core/Builder/CoconaCommandsBuilder.cs index 05cda02..bc806f7 100644 --- a/src/Cocona.Core/Builder/CoconaCommandsBuilder.cs +++ b/src/Cocona.Core/Builder/CoconaCommandsBuilder.cs @@ -160,6 +160,19 @@ public static CommandConventionBuilder AddCommand(this ICoconaCommandsBuilder bu return new CommandConventionBuilder(conventions).FromBuilder().WithMetadata(new PrimaryCommandAttribute()); } + + /// + /// Adds a primary command definition delegate to the builder and return the builder. + /// + /// + /// + /// + public static ICoconaCommandsBuilder AddCommand(this ICoconaCommandsBuilder builder, Delegate commandBody) + { + builder.AddCommand(commandBody); + return builder; + } + /// /// Adds a command definition delegate to the builder. /// From 19db8a6532dc8b5bbc48f7f2c6f0ffa1a87f7439 Mon Sep 17 00:00:00 2001 From: Johannes Norrbacka Date: Tue, 11 Oct 2022 19:02:26 +0200 Subject: [PATCH 3/7] Changing to AddCommands because it was ambigious ref --- .../Builder/CoconaCommandsBuilder.cs | 11 ++++++---- .../Builder/CoconaCommandBuilderTest.cs | 22 +++++++++++++++++-- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/Cocona.Core/Builder/CoconaCommandsBuilder.cs b/src/Cocona.Core/Builder/CoconaCommandsBuilder.cs index bc806f7..0846ff7 100644 --- a/src/Cocona.Core/Builder/CoconaCommandsBuilder.cs +++ b/src/Cocona.Core/Builder/CoconaCommandsBuilder.cs @@ -160,17 +160,20 @@ public static CommandConventionBuilder AddCommand(this ICoconaCommandsBuilder bu return new CommandConventionBuilder(conventions).FromBuilder().WithMetadata(new PrimaryCommandAttribute()); } - + /// /// Adds a primary command definition delegate to the builder and return the builder. /// /// /// /// - public static ICoconaCommandsBuilder AddCommand(this ICoconaCommandsBuilder builder, Delegate commandBody) + public static ICoconaCommandsBuilder AddCommands(this ICoconaCommandsBuilder builder, params Delegate[] commandBodies) { - builder.AddCommand(commandBody); - return builder; + foreach (var commandBody in commandBodies) + { + builder.AddCommand(commandBody); + } + return builder; } /// diff --git a/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs b/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs index 8985cb9..284c75a 100644 --- a/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs +++ b/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs @@ -183,10 +183,28 @@ class UseFilter_Filter3 : IFilterMetadata { } [Fact] - public void AddCommand_Chained() + public void AddCommands_Chained() { var builder = new CoconaCommandsBuilder(); - builder.AddCommand(() => { }).AddCommand(() => { }); + builder.AddCommands(() => { }).AddCommands(() => { }); + + var built = builder.Build(); + built.Should().HaveCount(2); + built[0].Should().BeOfType(); + built[0].Metadata.Should().HaveCount(2); + built[0].Metadata[0].Should().BeOfType(); + built[0].Metadata[1].Should().BeOfType(); + built[1].Should().BeOfType(); + built[1].Metadata.Should().HaveCount(2); + built[1].Metadata[0].Should().BeOfType(); + built[1].Metadata[1].Should().BeOfType(); + } + + [Fact] + public void AddCommands_Multiparams() + { + var builder = new CoconaCommandsBuilder(); + builder.AddCommands(() => { }, () => { }); var built = builder.Build(); built.Should().HaveCount(2); From 8bc5cd84d778e874fcb77e69a769c65ac4341595 Mon Sep 17 00:00:00 2001 From: Johannes Norrbacka Date: Tue, 11 Oct 2022 19:25:15 +0200 Subject: [PATCH 4/7] Some example and an extension method for casting --- Cocona.sln | 7 +++++++ .../CoconaSample.MinimalApi.AddCommands.csproj | 14 ++++++++++++++ samples/MinimalApi.AddCommands/Program.cs | 12 ++++++++++++ src/Cocona.Core/Builder/CoconaCommandsBuilder.cs | 6 +++--- src/Cocona/CoconaAppExtensions.cs | 10 ++++++++++ .../Builder/CoconaCommandBuilderTest.cs | 7 +++++-- 6 files changed, 51 insertions(+), 5 deletions(-) create mode 100644 samples/MinimalApi.AddCommands/CoconaSample.MinimalApi.AddCommands.csproj create mode 100644 samples/MinimalApi.AddCommands/Program.cs create mode 100644 src/Cocona/CoconaAppExtensions.cs diff --git a/Cocona.sln b/Cocona.sln index 111f335..5e100bb 100644 --- a/Cocona.sln +++ b/Cocona.sln @@ -102,6 +102,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{72 Directory.Build.props = Directory.Build.props EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoconaSample.MinimalApi.AddCommands", "samples\MinimalApi.AddCommands\CoconaSample.MinimalApi.AddCommands.csproj", "{48B3DD2C-AF52-4E9D-8F1E-72266B557C40}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -244,6 +246,10 @@ Global {7A178909-623C-4788-ADD4-9437091128BA}.Debug|Any CPU.Build.0 = Debug|Any CPU {7A178909-623C-4788-ADD4-9437091128BA}.Release|Any CPU.ActiveCfg = Release|Any CPU {7A178909-623C-4788-ADD4-9437091128BA}.Release|Any CPU.Build.0 = Release|Any CPU + {48B3DD2C-AF52-4E9D-8F1E-72266B557C40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {48B3DD2C-AF52-4E9D-8F1E-72266B557C40}.Debug|Any CPU.Build.0 = Debug|Any CPU + {48B3DD2C-AF52-4E9D-8F1E-72266B557C40}.Release|Any CPU.ActiveCfg = Release|Any CPU + {48B3DD2C-AF52-4E9D-8F1E-72266B557C40}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -283,6 +289,7 @@ Global {51E42619-D33A-4046-A80D-A979591C19D3} = {26F0BA96-C75C-4BDF-A1CC-3A9F58A16D9E} {7A178909-623C-4788-ADD4-9437091128BA} = {26F0BA96-C75C-4BDF-A1CC-3A9F58A16D9E} {72AC9837-3045-4692-909B-1BD04F408B48} = {09F6C99E-D874-4C82-90AA-A37E5BE707C4} + {48B3DD2C-AF52-4E9D-8F1E-72266B557C40} = {26F0BA96-C75C-4BDF-A1CC-3A9F58A16D9E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {8DBA26EF-235B-4656-A5DD-00C266A42735} diff --git a/samples/MinimalApi.AddCommands/CoconaSample.MinimalApi.AddCommands.csproj b/samples/MinimalApi.AddCommands/CoconaSample.MinimalApi.AddCommands.csproj new file mode 100644 index 0000000..30ff60f --- /dev/null +++ b/samples/MinimalApi.AddCommands/CoconaSample.MinimalApi.AddCommands.csproj @@ -0,0 +1,14 @@ + + + + Exe + net6.0 + enable + enable + + + + + + + diff --git a/samples/MinimalApi.AddCommands/Program.cs b/samples/MinimalApi.AddCommands/Program.cs new file mode 100644 index 0000000..1d5c962 --- /dev/null +++ b/samples/MinimalApi.AddCommands/Program.cs @@ -0,0 +1,12 @@ +using Cocona; +CoconaApp +.CreateBuilder() +.Build() +.AddCommands +( + ("hello", (string name) => Console.WriteLine($"Hello {name}!")), + ("bye", (string name) => Console.WriteLine($"Bye {name}!")) +) +.AddCommands(("foo", () => Console.WriteLine("Bar"))) +.AsCoconaApp() +.Run(); diff --git a/src/Cocona.Core/Builder/CoconaCommandsBuilder.cs b/src/Cocona.Core/Builder/CoconaCommandsBuilder.cs index 0846ff7..78c5d23 100644 --- a/src/Cocona.Core/Builder/CoconaCommandsBuilder.cs +++ b/src/Cocona.Core/Builder/CoconaCommandsBuilder.cs @@ -167,11 +167,11 @@ public static CommandConventionBuilder AddCommand(this ICoconaCommandsBuilder bu /// /// /// - public static ICoconaCommandsBuilder AddCommands(this ICoconaCommandsBuilder builder, params Delegate[] commandBodies) + public static ICoconaCommandsBuilder AddCommands(this ICoconaCommandsBuilder builder, params (string, Delegate)[] commandBodies) { - foreach (var commandBody in commandBodies) + foreach (var (name, commandBody) in commandBodies) { - builder.AddCommand(commandBody); + builder.AddCommand(name, commandBody); } return builder; } diff --git a/src/Cocona/CoconaAppExtensions.cs b/src/Cocona/CoconaAppExtensions.cs new file mode 100644 index 0000000..3508122 --- /dev/null +++ b/src/Cocona/CoconaAppExtensions.cs @@ -0,0 +1,10 @@ +using Cocona.Builder; + +namespace Cocona +{ + public static class CoconaAppExtensions + { + public static CoconaApp AsCoconaApp(this ICoconaCommandsBuilder coconaCommandsBuilder) => + (CoconaApp)coconaCommandsBuilder; + } +} diff --git a/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs b/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs index 284c75a..a9c6bfe 100644 --- a/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs +++ b/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs @@ -186,7 +186,7 @@ class UseFilter_Filter3 : IFilterMetadata public void AddCommands_Chained() { var builder = new CoconaCommandsBuilder(); - builder.AddCommands(() => { }).AddCommands(() => { }); + builder.AddCommands(("1", () => { })).AddCommands(("2", () => { })); var built = builder.Build(); built.Should().HaveCount(2); @@ -204,7 +204,10 @@ public void AddCommands_Chained() public void AddCommands_Multiparams() { var builder = new CoconaCommandsBuilder(); - builder.AddCommands(() => { }, () => { }); + builder.AddCommands( + ("1", () => { }), + ("2", () => { }) + ); var built = builder.Build(); built.Should().HaveCount(2); From 8a4208bf3b93153e8fdf85de9e25d40e57d630e0 Mon Sep 17 00:00:00 2001 From: Johannes Norrbacka Date: Tue, 11 Oct 2022 19:34:44 +0200 Subject: [PATCH 5/7] Fix tests --- test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs b/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs index a9c6bfe..7fbbb3e 100644 --- a/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs +++ b/test/Cocona.Test/Builder/CoconaCommandBuilderTest.cs @@ -193,11 +193,9 @@ public void AddCommands_Chained() built[0].Should().BeOfType(); built[0].Metadata.Should().HaveCount(2); built[0].Metadata[0].Should().BeOfType(); - built[0].Metadata[1].Should().BeOfType(); built[1].Should().BeOfType(); built[1].Metadata.Should().HaveCount(2); built[1].Metadata[0].Should().BeOfType(); - built[1].Metadata[1].Should().BeOfType(); } [Fact] @@ -214,11 +212,9 @@ public void AddCommands_Multiparams() built[0].Should().BeOfType(); built[0].Metadata.Should().HaveCount(2); built[0].Metadata[0].Should().BeOfType(); - built[0].Metadata[1].Should().BeOfType(); built[1].Should().BeOfType(); built[1].Metadata.Should().HaveCount(2); built[1].Metadata[0].Should().BeOfType(); - built[1].Metadata[1].Should().BeOfType(); } } } From 609fd8cf3cd94f14f2c4329c6993cc5501773bf4 Mon Sep 17 00:00:00 2001 From: Johannes Norrbacka Date: Tue, 11 Oct 2022 19:48:01 +0200 Subject: [PATCH 6/7] Adding extension --- src/Cocona/CoconaAppExtensions.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Cocona/CoconaAppExtensions.cs b/src/Cocona/CoconaAppExtensions.cs index 3508122..e5f5cf8 100644 --- a/src/Cocona/CoconaAppExtensions.cs +++ b/src/Cocona/CoconaAppExtensions.cs @@ -1,4 +1,5 @@ -using Cocona.Builder; +using System; +using Cocona.Builder; namespace Cocona { @@ -6,5 +7,11 @@ public static class CoconaAppExtensions { public static CoconaApp AsCoconaApp(this ICoconaCommandsBuilder coconaCommandsBuilder) => (CoconaApp)coconaCommandsBuilder; + + public static CoconaApp AddCommand(this CoconaApp app, string name, Delegate @delegate) + { + _ = CommandsBuilderExtensions.AddCommand(app, name, @delegate); + return app; + } } } From 945cd7dbf8a2f7903c6efbb88390c754bd005307 Mon Sep 17 00:00:00 2001 From: Johannes Norrbacka Date: Tue, 11 Oct 2022 19:48:06 +0200 Subject: [PATCH 7/7] Updating example --- samples/MinimalApi.AddCommands/Program.cs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/samples/MinimalApi.AddCommands/Program.cs b/samples/MinimalApi.AddCommands/Program.cs index 1d5c962..f64f73b 100644 --- a/samples/MinimalApi.AddCommands/Program.cs +++ b/samples/MinimalApi.AddCommands/Program.cs @@ -2,11 +2,6 @@ CoconaApp .CreateBuilder() .Build() -.AddCommands -( - ("hello", (string name) => Console.WriteLine($"Hello {name}!")), - ("bye", (string name) => Console.WriteLine($"Bye {name}!")) -) -.AddCommands(("foo", () => Console.WriteLine("Bar"))) -.AsCoconaApp() +.AddCommand("hello", (string name) => Console.WriteLine($"Hello {name}!")) +.AddCommand("bye", (string name) => Console.WriteLine($"Bye {name}!")) .Run();