Cleaned up generics and handling INodes with generics.

User should only ever need to use .Call() at the top of a node tree.

Author: DerekGooding

ConsoleHero.InjectionExample/Data.cs

@@ -1,47 +1,35 @@
 using ConsoleHero.Interfaces;
 using System.Drawing;
 namespace ConsoleHero.InjectionExample;
-public record struct Fruit(string Name) : IMenuOption
-{
-    public ColorText Print() => Name.DefaultColor();
-}
-public record struct ColorFruit(string Name, Color Color) : IMenuOption
-{
-    public ColorText Print() => Name.Color(Color);
-}
-public record struct Number(int Value) : IMenuOption
-{
-    public ColorText Print() => Value.ToString().DefaultColor();
-}
 
 [Singleton]
 public class Data
 {
     public string Name { get; set; } = "Person";
 
-    public readonly List<Fruit> Fruit =
+    public readonly List<string> Fruit =
     [
         new("Apple"),
         new("Banana"),
         new("Cantaloupe"),
         new("Artichoke"),
     ];
 
-    public readonly List<ColorFruit> ColoredFruit =
+    public readonly List<ColorText> ColoredFruit =
     [
-        new("Apple",Color.Red),
-        new("Banana",Color.Yellow),
-        new("Cantaloupe", GlobalSettings.DefaultTextColor),
-        new("Another Cantaloupe", Color.White),
-        new("Artichoke", Color.Green),
+        "Apple".Color(Color.Red),
+        "Banana".Color(Color.Yellow),
+        "Cantaloupe".DefaultColor(),
+        "Another Cantaloupe".Color(Color.White),
+        "Artichoke".Color(Color.Green),
     ];
 
-    public readonly List<Number> Numbers =
+    public readonly List<int> Numbers =
     [
-        new(7000),
-        new(8888),
-        new(9001),
-        new(55),
+        7000,
+        8888,
+        9001,
+        55,
     ];
 
     public readonly List<Player> Players =

ConsoleHero.InjectionExample/Menus.cs

@@ -34,22 +34,22 @@ public class Menus(Paragraphs paragraphs, Requests requests, Tunes tunes, Data d
 
     public Menu FruitMenu =>
     Title("|---- Fruit ----|", Color.Green).
-    OptionsFromList(_data.Fruit, (x) => _paragraphs.Eat(x).Call()).
+    OptionsFromList(_data.Fruit, _paragraphs.Eat).
     Cancel();
 
     public Menu FruitMenuColored =>
     Title("|---- Fruit ----|", Color.Green).
-    OptionsFromList(_data.ColoredFruit, (x) => _paragraphs.Eat(x).Call()).
+    OptionsFromList(_data.ColoredFruit, _paragraphs.Eat).
     Cancel();
 
     public Menu FruitMenuWithA =>
     Title("|---- Fruit ----|", Color.Green).
-    OptionsFromList(_data.Fruit, (x) => _paragraphs.Eat(x).Call(), x => x.StartsWith('A')).
+    OptionsFromList(_data.Fruit, _paragraphs.Eat, x => x.StartsWith('A')).
     Cancel();
 
     public Menu NumberMenu =>
     NoTitle().
-    OptionsFromList(_data.Numbers, (x) => _paragraphs.ReadNumbers(x).Call()).
+    OptionsFromList(_data.Numbers, _paragraphs.ReadNumbers).
     Cancel();
 
     public Menu ReviewPlayers =>

ConsoleHero.InjectionExample/Paragraphs.cs

@@ -7,21 +7,21 @@ public class Paragraphs(Data data)
 {
     private readonly Data _data = data;
 
-    public Paragraph Eat(ColorFruit fruit) =>
-        Line("You just ate a ").Text(fruit.Name, fruit.Color).Text($", {_data.Name}.").
+    public Paragraph Eat(ColorText fruit) =>
+        Line("You just ate a ").Text(fruit).Text($", {_data.Name}.").
         PressToContinue();
 
-    public Paragraph Eat(Fruit fruit) =>
-        Line($"You just ate a {fruit.Name}, {_data.Name}.").
+    public Paragraph Eat(string fruit) =>
+        Line($"You just ate a {fruit}, {_data.Name}.").
         PressToContinue();
 
     public Paragraph Crying =>
         Line("You cry and cry!", Color.DarkBlue).
         PressToContinue();
 
-    public Paragraph ReadNumbers(Number n) =>
-        Line($"You read the number {n.Value}.").
-        Line($"Twice that number is {n.Value * 2}").Text(".").
+    public Paragraph ReadNumbers(int n) =>
+        Line($"You read the number {n}").
+        Line($"Twice that number is {n * 2}").Text(".").
         Line("This is ").Text("red", Color.Red).Text(" Text.").
         PressToContinue();
 

ConsoleHero.StaticExample/Data.cs

@@ -2,45 +2,33 @@
 using System.Drawing;
 
 namespace ConsoleHero.StaticExample;
-public record struct Fruit(string Name) : IMenuOption
-{
-    public ColorText Print() => Name.DefaultColor();
-}
-public record struct ColorFruit(string Name, Color Color) : IMenuOption
-{
-    public ColorText Print() => Name.Color(Color);
-}
-public record struct Number(int Value) : IMenuOption
-{
-    public ColorText Print() => Value.ToString().DefaultColor();
-}
 public static class Data
 {
     public static string Name { get; set; } = "Person";
 
-    public static readonly List<Fruit> Fruit =
+    public static readonly List<string> Fruit =
     [
-        new("Apple"),
-        new("Banana"),
-        new("Cantaloupe"),
-        new("Artichoke"),
+        "Apple",
+        "Banana",
+        "Cantaloupe",
+        "Artichoke",
     ];
 
-    public static readonly List<ColorFruit> ColoredFruit =
+    public static readonly List<ColorText> ColoredFruit =
     [
-        new("Apple",Color.Red),
-        new("Banana",Color.Yellow),
-        new("Cantaloupe", GlobalSettings.DefaultTextColor),
-        new("Another Cantaloupe", Color.White),
-        new("Artichoke", Color.Green),
+        "Apple".Color(Color.Red),
+        "Banana".Color(Color.Yellow),
+        "Cantaloupe".DefaultColor(),
+        "Another Cantaloupe".Color(Color.White),
+        "Artichoke".Color(Color.Green),
     ];
 
-    public static readonly List<Number> Numbers =
+    public static readonly List<int> Numbers =
     [
-        new(7000),
-        new(8888),
-        new(9001),
-        new(55),
+        7000,
+        8888,
+        9001,
+        55,
     ];
 
     public static readonly List<Player> Players =

ConsoleHero.StaticExample/Menus.cs

@@ -27,22 +27,22 @@ public static class Menus
 
     public static Menu FruitMenu =>
     Title("|---- Fruit ----|", Color.Green).
-    OptionsFromList(Data.Fruit, (x) => Paragraphs.Eat(x).Call()).
+    OptionsFromList(Data.Fruit, Paragraphs.Eat).
     Cancel();
 
     public static Menu FruitMenuColored =>
     Title("|---- Fruit ----|", Color.Green).
-    OptionsFromList(Data.ColoredFruit, (x) => Paragraphs.Eat(x).Call()).
+    OptionsFromList(Data.ColoredFruit, Paragraphs.Eat).
     Cancel();
 
     public static Menu FruitMenuWithA =>
     Title("|---- Fruit ----|", Color.Green).
-    OptionsFromList(Data.Fruit, (x) => Paragraphs.Eat(x).Call(), x => x.StartsWith('A')).
+    OptionsFromList(Data.Fruit, Paragraphs.Eat, x => x.StartsWith('A')).
     Cancel();
 
     public static Menu NumberMenu =>
     NoTitle().
-    OptionsFromList(Data.Numbers, (x) => Paragraphs.ReadNumbers(x).Call()).
+    OptionsFromList(Data.Numbers, Paragraphs.ReadNumbers).
     Cancel();
 
     public static Menu ReviewPlayers =>

ConsoleHero.StaticExample/Paragraphs.cs

@@ -4,21 +4,21 @@
 namespace ConsoleHero.StaticExample;
 public static class Paragraphs
 {
-    public static Paragraph Eat(ColorFruit fruit) =>
-        Line("You just ate a ").Text(fruit.Name, fruit.Color).Text($", {Data.Name}.").
+    public static Paragraph Eat(ColorText fruit) =>
+        Line("You just ate a ").Text(fruit).Text($", {Data.Name}.").
         PressToContinue();
 
-    public static Paragraph Eat(Fruit fruit) =>
-        Line($"You just ate a {fruit.Name}, {Data.Name}.").
+    public static Paragraph Eat(string fruit) =>
+        Line($"You just ate a {fruit}, {Data.Name}.").
         PressToContinue();
 
     public static Paragraph Crying =>
         Line("You cry and cry!", Color.DarkBlue).
         PressToContinue();
 
-    public static Paragraph ReadNumbers(Number n) =>
-        Line($"You read the number {n.Value}.").
-        Line($"Twice that number is {n.Value * 2}").Text(".").
+    public static Paragraph ReadNumbers(int n) =>
+        Line($"You read the number {n}.").
+        Line($"Twice that number is {n * 2}").Text(".").
         Line("This is ").Text("red", Color.Red).Text(" Text.").
         PressToContinue();
 

ConsoleHero/ConsoleHero.csproj

@@ -8,7 +8,7 @@
 
 	<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>ConsoleHero</PackageId>
-    <Version>0.4.8</Version>
+    <Version>0.5.0</Version>
     <Authors>Derek Gooding</Authors>
     <Description>A library for making quick menus in a console application.</Description>
 	<PackageTags>Console CLI Menu Navigation FluentAPI UserInterface CommandLine Framework CSharp Tools</PackageTags>

ConsoleHero/ListExtensions.cs

@@ -69,18 +69,40 @@ internal static MenuOption[] ToOptions(this IEnumerable<ColorText> list, INode n
     internal static MenuOption[] ToOptions(this IEnumerable<string> list, INode node, Func<string, bool>? condition = null)
         => list.ToOptions(node.Call, condition);
 
-    internal static MenuOption[] ToOptions<T>(this IEnumerable<T> list, Action<T> effect, Func<string, bool>? condition = null) where T : IMenuOption
+    internal static MenuOption[] ToOptions<T>(this IEnumerable<T> list, Action<T> effect, Func<string, bool>? condition = null)
     {
         List<MenuOption> options = new();
-        foreach (IMenuOption x in list)
+        foreach (T x in list)
         {
-            ColorText colorText = x.Print();
+            ColorText colorText = x is IMenuOption iMenuOption ? iMenuOption.Print() : (x?.ToString() ?? string.Empty).DefaultColor();
             Color color = colorText.Color;
             MenuOption menuOption = new()
             {
                 Description = colorText.Text,
                 Color = color,
-                Effect = () => effect((T)x)
+                Effect = () => effect(x)
+            };
+            if (condition != null)
+            {
+                menuOption.Check = () => condition(colorText.Text);
+            }
+            options.Add(menuOption);
+        }
+        return options.ToArray();
+    }
+
+    internal static MenuOption[] ToOptions<T>(this IEnumerable<T> list, Func<T, INode> effect, Func<string, bool>? condition = null)
+    {
+        List<MenuOption> options = new();
+        foreach (T x in list)
+        {
+            ColorText colorText = x is IMenuOption iMenuOption ? iMenuOption.Print() : (x?.ToString() ?? string.Empty).DefaultColor();
+            Color color = colorText.Color;
+            MenuOption menuOption = new()
+            {
+                Description = colorText.Text,
+                Color = color,
+                Effect = () => effect(x).Call()
             };
             if (condition != null)
             {

ConsoleHero/MenuBuilder.cs

@@ -78,6 +78,12 @@ public interface IAddOptions
         /// Creates a set of <see cref="MenuOption"/> base off IMenuOptions. Only works with custom GoTo logic.
         /// </summary>
         public IAddOptions OptionsFromList<T>(IEnumerable<T> list, Action<T> effect, Func<string, bool>? condition = null) where T : IMenuOption;
+
+        /// <summary>
+        /// Creates a set of <see cref="MenuOption"/> base off IMenuOptions. Only works with custom GoTo logic that requires T as an input.
+        /// </summary>
+        public IAddOptions OptionsFromList<T>(IEnumerable<T> list, Func<T, INode> effect, Func<string, bool>? condition = null);
+
         /// <summary>
         /// Creates a set of <see cref="MenuOption"/> based of a list.
         /// </summary>
@@ -249,7 +255,7 @@ public IAddOptions GoTo(Action action)
 
         public IAddOptions GoTo(INode node)
         {
-            _menuOption.Effect = () => node.Call();
+            _menuOption.Effect = node.Call;
             _item.Add(_menuOption);
             _menuOption = new();
             return this;
@@ -263,6 +269,14 @@ public IAddOptions OptionsFromList<T>(IEnumerable<T> list, Action<T> effect, Fun
             }
             return this;
         }
+        public IAddOptions OptionsFromList<T>(IEnumerable<T> list, Func<T, INode> effect, Func<string, bool>? condition = null)
+        {
+            foreach (MenuOption option in list.ToOptions(effect, condition))
+            {
+                _item.Add(option);
+            }
+            return this;
+        }
         public IAddOptions OptionsFromList(IEnumerable<ColorText> list, Action effect, Func<string, bool>? condition = null)
         {
             foreach (MenuOption option in list.ToOptions(effect, condition))

ConsoleHero/ParagraphBuilder.cs

@@ -1,4 +1,5 @@
 using ConsoleHero.Interfaces;
+using System.Drawing;
 
 namespace ConsoleHero;
 /// <summary>
@@ -47,6 +48,10 @@ public interface ISetLines
         /// </summary>
         public ISetLines Text(string text, Color color);
         /// <summary>
+        /// Add additional text to the end of this line. Custom color.
+        /// </summary>
+        public ISetLines Text(ColorText colorText);
+        /// <summary>
         /// After displaying this paragraph, will wait before continuing without input.
         /// </summary>
         public Paragraph Delay(TimeSpan delay);
@@ -110,28 +115,21 @@ public ISetLines ClearOnCall()
             return this;
         }
 
-        public ISetLines Line(string text)
-        {
-            ParagraphLine line = new();
-            line.Components.Add(new ColorText(text));
-            _item.Outputs.Add(line);
-            return this;
-        }
-        public ISetLines Line(string text, Color color)
+        public ISetLines Line(string text) => Line(new ColorText(text));
+        public ISetLines Line(string text, Color color) => Line(new ColorText(text, color));
+        public ISetLines Line(ColorText colorText)
         {
             ParagraphLine line = new();
-            line.Components.Add(new ColorText(text, color));
+            line.Components.Add(colorText);
             _item.Outputs.Add(line);
             return this;
         }
-        public ISetLines Text(string text)
-        {
-            _item.Outputs[^1].Components.Add(new ColorText(text));
-            return this;
-        }
-        public ISetLines Text(string text, Color color)
+
+        public ISetLines Text(string text) => Text(new ColorText(text));
+        public ISetLines Text(string text, Color color) => Text(new ColorText(text, color));
+        public ISetLines Text(ColorText colorText)
         {
-            _item.Outputs[^1].Components.Add(new ColorText(text, color));
+            _item.Outputs[^1].Components.Add(colorText);
             return this;
         }
         public Paragraph Delay(TimeSpan delay)