Improved templates

src/Pure.DI.Templates/Templates/Pure.DI.Template.ClassLibrary/ConsoleAdapter.cs

@@ -1,10 +1,10 @@
-using System;
-
 namespace _PureDIProjectName_;
 
 public class ConsoleAdapter: IInput, IOutput
 {
-    public string? ReadLine() => Console.ReadLine();
+    public ValueTask<string?> ReadLineAsync(CancellationToken cancellationToken = default) =>
+        Console.In.ReadLineAsync(cancellationToken);
 
-    public void WriteLine(string? line) => Console.WriteLine(line);
+    public Task WriteLineAsync(string line = "", CancellationToken cancellationToken = default) =>
+        Console.Out.WriteLineAsync(line.AsMemory(), cancellationToken);
 }

src/Pure.DI.Templates/Templates/Pure.DI.Template.ClassLibrary/GlobalUsings.cs

@@ -0,0 +1,6 @@
+global using System;
+global using System.Diagnostics;
+global using System.Threading;
+global using System.Threading.Tasks;
+global using Pure.DI;
+global using static Pure.DI.Lifetime;

src/Pure.DI.Templates/Templates/Pure.DI.Template.ClassLibrary/IInput.cs

@@ -2,5 +2,5 @@
 
 public interface IInput
 {
-    string? ReadLine();
+    ValueTask<string?> ReadLineAsync(CancellationToken cancellationToken = default);
 }

src/Pure.DI.Templates/Templates/Pure.DI.Template.ClassLibrary/IOutput.cs

@@ -2,5 +2,5 @@ namespace _PureDIProjectName_;
 
 public interface IOutput
 {
-    void WriteLine(string? line);
+    Task WriteLineAsync(string line = "", CancellationToken cancellationToken = default);
 }

src/Pure.DI.Templates/Templates/Pure.DI.Template.ClassLibrary/_CompositionName_.cs

@@ -1,16 +1,9 @@
-using System.Diagnostics;
-using Pure.DI;
-using static Pure.DI.Lifetime;
+namespace _PureDIProjectName_;
 
-namespace _PureDIProjectName_;
-
-/// <summary>
-/// Pure.DI Composition Setup. Please see <see href="https://github.com/DevTeam/Pure.DI.Solution">this</see> example.
-/// </summary>
 internal class $(CompositionName)
 {
     [Conditional("DI")]
-    void Setup() => 
+    private void Setup() => 
         DI.Setup(nameof($(CompositionName)), CompositionKind.Global)
             .Bind().As(Singleton).To<ConsoleAdapter>();
 }

src/Pure.DI.Templates/Templates/Pure.DI.Template.ConsoleApp/ConsoleAdapter.cs

@@ -2,7 +2,9 @@ namespace _PureDIProjectName_;
 
 internal class ConsoleAdapter: IInput, IOutput
 {
-    public string? ReadLine() => Console.ReadLine();
+    public ValueTask<string?> ReadLineAsync(CancellationToken cancellationToken = default) =>
+        Console.In.ReadLineAsync(cancellationToken);
 
-    public void WriteLine(string? line) => Console.WriteLine(line);
+    public Task WriteLineAsync(string line = "", CancellationToken cancellationToken = default) =>
+        Console.Out.WriteLineAsync(line.AsMemory(), cancellationToken);
 }

src/Pure.DI.Templates/Templates/Pure.DI.Template.ConsoleApp/GlobalUsings.cs

@@ -1,3 +1,7 @@
 global using _PureDIProjectName_;
 global using System;
-global using System.Diagnostics;
+global using System.Diagnostics;
+global using System.Threading;
+global using System.Threading.Tasks;
+global using Pure.DI;
+global using static Pure.DI.Lifetime;

src/Pure.DI.Templates/Templates/Pure.DI.Template.ConsoleApp/IInput.cs

@@ -2,5 +2,5 @@
 
 internal interface IInput
 {
-    string? ReadLine();
+    ValueTask<string?> ReadLineAsync(CancellationToken cancellationToken = default);
 }

src/Pure.DI.Templates/Templates/Pure.DI.Template.ConsoleApp/IOutput.cs

@@ -2,5 +2,5 @@ namespace _PureDIProjectName_;
 
 internal interface IOutput
 {
-    void WriteLine(string? line);
+    Task WriteLineAsync(string line = "", CancellationToken cancellationToken = default);
 }

src/Pure.DI.Templates/Templates/Pure.DI.Template.ConsoleApp/Program.cs

@@ -1,23 +1,18 @@
-var composition = new $(CompositionName)();
-return composition.Root.Run(args);
+var composition = new $(CompositionName)(args);
+return await composition.Root.RunAsync();
 
-internal partial class Program
+internal partial class Program(
+    string[] args,
+    IInput input,
+    IOutput output)
 {
-    private readonly IInput _input;
-    private readonly IOutput _output;
-
-    internal Program(IInput input, IOutput output)
-    {
-        _input = input ?? throw new ArgumentNullException(nameof(input));
-        _output = output ?? throw new ArgumentNullException(nameof(output));
-    }
-
-    private int Run(string[] args)
+    private async Task<int> RunAsync(CancellationToken cancellationToken = default)
     {
-        _output.WriteLine("Hello!");
+        await output.WriteLineAsync("Hello!", cancellationToken);
+        await output.WriteLineAsync(string.Join(", ", args), cancellationToken);
 
-        _output.WriteLine("Press the Enter key to exit.");
-        _input.ReadLine();
+        await output.WriteLineAsync("Press the Enter key to exit.", cancellationToken);
+        await input.ReadLineAsync(cancellationToken);
 
         return 0;
     }

src/Pure.DI.Templates/Templates/Pure.DI.Template.ConsoleApp/_CompositionName_.cs

@@ -1,16 +1,11 @@
-using Pure.DI;
-using static Pure.DI.Lifetime;
+namespace _PureDIProjectName_;
 
-namespace _PureDIProjectName_;
-
-/// <summary>
-/// Pure.DI Composition Setup. Please see <see href="https://github.com/DevTeam/Pure.DI.Solution">this</see> example.
-/// </summary>
 internal partial class $(CompositionName)
 {
     [Conditional("DI")]
-    void Setup() => 
+    private void Setup() => 
         DI.Setup(nameof($(CompositionName)))
+            .Arg<string[]>("args")
             .Bind().As(Singleton).To<ConsoleAdapter>()
             .Root<Program>("Root");
 }