introduced the view model and removed the console property from the command.

Author: lastunicorn

sources/ConsoleTools.Commando.Demo.Autofac.Builder/Commands/DefaultCommand.cs renamed to sources/ConsoleTools.Commando.Demo.Autofac.Builder/Commands/Default/DefaultCommand.cs

@@ -14,24 +14,21 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands;
+namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands.Default;
 
 [AnonymousCommand(Description = "Default command to be executed when no command name is specified.")]
-public class DefaultCommand : ConsoleCommandBase
+public class DefaultCommand : IConsoleCommand<DefaultViewModel>
 {
-    [NamedParameter("text")]
+    [NamedParameter("text", ShortName = 't')]
     public string Text { get; set; }
 
-    public DefaultCommand(EnhancedConsole enhancedConsole)
-        : base(enhancedConsole)
+    public Task<DefaultViewModel> Execute()
     {
-    }
-
-    public override Task Execute()
-    {
-        Console.WriteTitle("Default command");
-        Console.WriteValue("Text", Text);
+        DefaultViewModel viewModel = new()
+        {
+            Text = Text
+        };
 
-        return Task.CompletedTask;
+        return Task.FromResult(viewModel);
     }
 }

sources/ConsoleTools.Commando.Demo.Autofac.Builder/Commands/Default/DefaultView.cs

@@ -0,0 +1,26 @@
+// ConsoleTools.Commando
+// Copyright (C) 2022-2023 Dust in the Wind
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands.Default;
+
+public class DefaultView : ViewBase<DefaultViewModel>
+{
+    public override void Display(DefaultViewModel viewModel)
+    {
+        WriteTitle("Default command");
+        WriteValue("Text", viewModel.Text);
+    }
+}

sources/ConsoleTools.Commando/ConsoleCommandBase.cs renamed to sources/ConsoleTools.Commando.Demo.Autofac.Builder/Commands/Default/DefaultViewModel.cs

@@ -14,12 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace DustInTheWind.ConsoleTools.Commando;
+namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands.Default;
 
-public abstract class ConsoleCommandBase : ConsoleCommandBase<EnhancedConsole>
+public class DefaultViewModel
 {
-    protected ConsoleCommandBase(EnhancedConsole console)
-        : base(console)
-    {
-    }
+    public string Text { get; set; }
 }

sources/ConsoleTools.Commando.Demo.Autofac.Builder/Commands/DummyCommand.cs renamed to sources/ConsoleTools.Commando.Demo.Autofac.Builder/Commands/Dummy/DummyCommand.cs

@@ -14,10 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands;
+namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands.Dummy;
 
 [NamedCommand("dummy", Description = "A dummy command that shows how to create parameters of different types.")]
-public class DummyCommand : ConsoleCommandBase
+public class DummyCommand : IConsoleCommand<DummyViewModel>
 {
     [NamedParameter("text", ShortName = 't', IsOptional = true, Description = "A simple text.")]
     public string Text { get; set; }
@@ -43,33 +43,20 @@ public class DummyCommand : ConsoleCommandBase
     [AnonymousParameter(Order = 2, IsOptional = true, Description = "An anonymous number. It is identified based on its index in the list of arguments.")]
     public int? Param2 { get; set; }
 
-    public DummyCommand(EnhancedConsole console)
-        : base(console)
+    public Task<DummyViewModel> Execute()
     {
-    }
-
-    public override Task Execute()
-    {
-        Console.WriteTitle("Dummy Command");
-
-        Console.WithIndentation("Initial values:", () =>
+        DummyViewModel result = new()
         {
-            Console.WriteValue("Text", Text);
-            Console.WriteValue("Flag", Flag);
-            Console.WriteValue("Integer Number", IntegerNumber);
-            Console.WriteValue("Real Number", RealNumber);
-            Console.WriteValue("Character", Character);
-            Console.WriteValue("Param 1", Param1);
-            Console.WriteValue("Param 2", Param2);
-        });
-        Console.WriteLine();
-
-        Text = "This is a new text.";
-        Flag = false;
-        IntegerNumber = 184603;
-        RealNumber = 3.141592653f;
-        Character = '╢';
-
-        return Task.CompletedTask;
+            Text = Text,
+            Flag = Flag,
+            Flag2 = Flag2,
+            IntegerNumber = IntegerNumber,
+            RealNumber = RealNumber,
+            Character = Character,
+            Param1 = Param1,
+            Param2 = Param2
+        };
+
+        return Task.FromResult(result);
     }
 }

sources/ConsoleTools.Commando.Demo.Autofac.Builder/Commands/DummyView.cs renamed to sources/ConsoleTools.Commando.Demo.Autofac.Builder/Commands/Dummy/DummyView.cs

@@ -14,21 +14,21 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands;
+namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands.Dummy;
 
-public class DummyView : ViewBase<DummyCommand>
+public class DummyView : ViewBase<DummyViewModel>
 {
-    public override void Display(DummyCommand dummyCommand)
+    public override void Display(DummyViewModel viewModel)
     {
-        WithIndentation("Same values after command finished execution:", () =>
+        WithIndentation("The result of the command execution:", () =>
         {
-            WriteValue("Text", dummyCommand.Text);
-            WriteValue("Flag", dummyCommand.Flag);
-            WriteValue("Integer Number", dummyCommand.IntegerNumber);
-            WriteValue("Real Number", dummyCommand.RealNumber);
-            WriteValue("Character", dummyCommand.Character);
-            WriteValue("Param 1", dummyCommand.Param1);
-            WriteValue("Param 2", dummyCommand.Param2);
+            WriteValue("Text", viewModel.Text);
+            WriteValue("Flag", viewModel.Flag);
+            WriteValue("Integer Number", viewModel.IntegerNumber);
+            WriteValue("Real Number", viewModel.RealNumber);
+            WriteValue("Character", viewModel.Character);
+            WriteValue("Param 1", viewModel.Param1);
+            WriteValue("Param 2", viewModel.Param2);
         });
     }
 }

sources/ConsoleTools.Commando.Demo.Autofac.Builder/Commands/Dummy/DummyViewModel.cs

@@ -0,0 +1,36 @@
+// ConsoleTools.Commando
+// Copyright (C) 2022-2023 Dust in the Wind
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands.Dummy;
+
+public class DummyViewModel
+{
+    public string Text { get; set; }
+
+    public bool Flag { get; set; }
+
+    public bool Flag2 { get; set; }
+
+    public int IntegerNumber { get; set; }
+
+    public float RealNumber { get; set; }
+
+    public char Character { get; set; }
+
+    public string Param1 { get; set; }
+
+    public int? Param2 { get; set; }
+}

sources/ConsoleTools.Commando.Demo.Autofac.Builder/Commands/ReadFileCommand.cs renamed to sources/ConsoleTools.Commando.Demo.Autofac.Builder/Commands/ReadFile/ReadFileCommand.cs

@@ -16,33 +16,29 @@
 
 using System.Text;
 
-namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands;
+namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands.ReadFile;
 
 [NamedCommand("read", Description = "Display the content of a text file.")]
-public class ReadFileCommand : ConsoleCommandBase
+public class ReadFileCommand : IConsoleCommand<ReadFileViewModel>
 {
-    [AnonymousParameter(Order = 1, Description = "The path to the file that should be displayed.")]
+    [AnonymousParameter(Order = 1, DisplayName = "file path", Description = "The path to the file that should be displayed.")]
     public string FilePath { get; set; }
 
     [NamedParameter("encoding", ShortName = 'e', IsOptional = true, Description = "The text encoding to be used when reading the file.")]
     public Encoding Encoding { get; set; }
 
-    public ReadFileCommand(EnhancedConsole console)
-        : base(console)
+    public Task<ReadFileViewModel> Execute()
     {
-    }
-
-    public override Task Execute()
-    {
-        Console.WriteTitle("Reading a text file");
-        Console.WriteValue("File", FilePath);
-
         string content = Encoding == null
             ? File.ReadAllText(FilePath)
             : File.ReadAllText(FilePath, Encoding);
 
-        Console.WriteValueBelowName("Content", content);
+        ReadFileViewModel viewModel = new()
+        {
+            FilePath = FilePath,
+            Content = content
+        };
 
-        return Task.CompletedTask;
+        return Task.FromResult(viewModel);
     }
 }

sources/ConsoleTools.Commando.Demo.Autofac.Builder/Commands/ReadFile/ReadFileView.cs

@@ -0,0 +1,27 @@
+// ConsoleTools.Commando
+// Copyright (C) 2022-2023 Dust in the Wind
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands.ReadFile;
+
+internal class ReadFileView : ViewBase<ReadFileViewModel>
+{
+    public override void Display(ReadFileViewModel viewModel)
+    {
+        WriteTitle("Reading a text file");
+        WriteValue("File", viewModel.FilePath);
+        WriteValueBelowName("Content", viewModel.Content);
+    }
+}

sources/ConsoleTools.Commando.Demo.Autofac.Builder/Commands/ReadFile/ReadFileViewModel.cs

@@ -0,0 +1,24 @@
+// ConsoleTools.Commando
+// Copyright (C) 2022-2023 Dust in the Wind
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands.ReadFile;
+
+public class ReadFileViewModel
+{
+    public string FilePath { get; set; }
+
+    public string Content { get; set; }
+}

sources/ConsoleTools.Commando.Demo.Autofac.Builder/Program.cs

@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-using DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands;
+using DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder.Commands.Dummy;
 using DustInTheWind.ConsoleTools.Commando.Setup.Autofac;
 
 namespace DustInTheWind.ConsoleTools.Commando.Demo.Autofac.Builder;