introduce OutputOptions record instead of interface

DavidVollmers · May 5, 2024 · f29f4fd · f29f4fd
1 parent 3c519aa
commit f29f4fd
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 21 deletions.
diff --git a/src/Doki.CommandLine/Json/JsonOutputOptionsProvider.cs b/src/Doki.CommandLine/Json/JsonOutputOptionsProvider.cs
@@ -18,7 +18,7 @@ internal class JsonOutputOptionsProvider(FileSystemInfo workingDirectory) : IOut
     };
 
     public TOptions? GetOptions<TOutput, TOptions>(string outputType) where TOutput : class, IOutput
-        where TOptions : class, IOutputOptions<TOutput>
+        where TOptions : OutputOptions<TOutput>
     {
         ArgumentNullException.ThrowIfNull(outputType);
 

diff --git a/src/Doki.Output.Abstractions/IOutputOptions.cs b/src/Doki.Output.Abstractions/IOutputOptions.cs
diff --git a/...tput.Abstractions/DefaultOutputOptions.cs → ...Doki.Output.Abstractions/OutputOptions.cs b/...tput.Abstractions/DefaultOutputOptions.cs → ...Doki.Output.Abstractions/OutputOptions.cs
@@ -2,10 +2,8 @@
 
 namespace Doki.Output;
 
-/// <summary>
-/// Default output options.
-/// </summary>
-public sealed record DefaultOutputOptions<T> : IOutputOptions<T> where T : IOutput
+// ReSharper disable once UnusedTypeParameter
+public record OutputOptions<T> where T : IOutput
 {
     [JsonPropertyName("outputPath")] public DirectoryInfo OutputDirectory { get; init; } = null!;
 }
diff --git a/src/Doki.Output.ClassLibrary/ClassLibraryOutput.cs b/src/Doki.Output.ClassLibrary/ClassLibraryOutput.cs
@@ -1,6 +1,6 @@
 namespace Doki.Output.ClassLibrary;
 
-internal class ClassLibraryOutput(IOutputOptions<ClassLibraryOutput> options) : IOutput
+public sealed class ClassLibraryOutput(ClassLibraryOutputOptions options) : IOutput
 {
     public async Task WriteAsync(ContentList contentList, CancellationToken cancellationToken = default)
     {

diff --git a/src/Doki.Output.ClassLibrary/ClassLibraryOutputOptions.cs b/src/Doki.Output.ClassLibrary/ClassLibraryOutputOptions.cs
@@ -2,7 +2,7 @@
 
 namespace Doki.Output.ClassLibrary;
 
-public sealed record ClassLibraryOutputOptions : IOutputOptions<ClassLibraryOutput>
+public sealed record ClassLibraryOutputOptions : OutputOptions<ClassLibraryOutput>
 {
     [JsonPropertyName("namespace")] public string Namespace { get; init; } = "Doki.Content";
 
@@ -11,6 +11,4 @@ public sealed record ClassLibraryOutputOptions : IOutputOptions<ClassLibraryOutp
     [JsonPropertyName("targetFramework")] public string TargetFramework { get; init; } = "net8.0";
 
     [JsonPropertyName("targetFrameworks")] public string[]? TargetFrameworks { get; init; }
-
-    [JsonPropertyName("outputPath")] public DirectoryInfo OutputDirectory { get; init; } = null!;
 }
diff --git a/src/Doki.Output.Extensions/IOutputOptionsProvider.cs b/src/Doki.Output.Extensions/IOutputOptionsProvider.cs
@@ -3,5 +3,5 @@
 public interface IOutputOptionsProvider
 {
     TOptions? GetOptions<TOutput, TOptions>(string outputType) where TOutput : class, IOutput
-        where TOptions : class, IOutputOptions<TOutput>;
+        where TOptions : OutputOptions<TOutput>;
 }
diff --git a/src/Doki.Output.Extensions/OutputExtensions.cs b/src/Doki.Output.Extensions/OutputExtensions.cs
@@ -7,16 +7,16 @@ public static class OutputExtensions
     public static IServiceCollection AddOutputOptions<TOutput>(this IServiceCollection services, string outputType)
         where TOutput : class, IOutput
     {
-        return services.AddOutputOptions<TOutput, DefaultOutputOptions<TOutput>>(outputType);
+        return services.AddOutputOptions<TOutput, OutputOptions<TOutput>>(outputType);
     }
 
     public static IServiceCollection AddOutputOptions<TOutput, TOptions>(this IServiceCollection services,
-        string outputType) where TOutput : class, IOutput where TOptions : class, IOutputOptions<TOutput>
+        string outputType) where TOutput : class, IOutput where TOptions : OutputOptions<TOutput>
     {
         ArgumentNullException.ThrowIfNull(services);
         ArgumentNullException.ThrowIfNull(outputType);
 
-        services.AddSingleton<IOutputOptions<TOutput>>(provider =>
+        services.AddSingleton<OutputOptions<TOutput>>(provider =>
         {
             var optionsProvider = provider.GetService<IOutputOptionsProvider>();
             var options = optionsProvider?.GetOptions<TOutput, TOptions>(outputType);

diff --git a/src/Doki.Output.Markdown/MarkdownOutput.cs b/src/Doki.Output.Markdown/MarkdownOutput.cs
@@ -3,7 +3,7 @@
 
 namespace Doki.Output.Markdown;
 
-internal class MarkdownOutput(IOutputOptions<MarkdownOutput> options) : IOutput
+public sealed class MarkdownOutput(OutputOptions<MarkdownOutput> options) : IOutput
 {
     public async Task WriteAsync(ContentList contentList, CancellationToken cancellationToken = default)
     {