Updated to 2.0.0-beta5.25174.1, fix color handling

      - Updated to latest daily build 2.0.0-beta5.25174.1 of System.CommandLine.
      - Fixed: On Unix-like platforms, Console.ForegroundColor and Console.BackgroundColor is unset/unknown so prevent setting them to
        ConsoleColor.Gray and ConsoleColor.Black on non-Windows platforms when theme color is null (unset).
        Also will try to fix color visibility by making some assumptions (e.g. on OSX background color is white)
        as it's impossible to detect terminal colors.
      - Added: [NO_COLOR](https://no-color.org/) support, i.e. if `NO_COLOR` environment variable is set, the colors will be disabled.
      - Improved: Added CustomizeLayout method in CliHelpBuilder to mimic the base class HelpBuilder in System.Commandline.
        A delegate can be passed to customize the default layout sections in help output.
      - Fixed: System.CommandLine.RootCommand returned by Cli.GetConfiguration should have correct parents. This did not
        effect the working of Cli, however for metadata purpose we will populate accurate command hierarchy even if
        Cli.GetConfiguration is called for a command which is in the middle of the hierarchy.

Author: calacayir

docs/README.md

@@ -8,7 +8,7 @@ What if you had an easy class-based layer combined with a good parser?
 
 DotMake.CommandLine is a library which provides declarative syntax for 
 [System.CommandLine](https://github.com/dotnet/command-line-api) 
-via attributes for easy, fast, strongly-typed (no reflection) usage. The library includes includes a source generator 
+via attributes for easy, fast, strongly-typed (no reflection) usage. The library includes a source generator 
 which automagically converts your classes to CLI commands and properties to CLI options or CLI arguments. 
 Supports 
 [trimming](https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/trim-self-contained), 
@@ -329,6 +329,9 @@ Cli.Run<RootCliCommand>(args, new CliSettings
     }
 });
 ```
+
+Note that [NO_COLOR](https://no-color.org/) is supported, i.e. if `NO_COLOR` environment variable is set, the colors will be disabled.
+
 ### Localization
 
 Localizing commands, options and arguments is supported.

src/Directory.Build.props

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <!-- https://learn.microsoft.com/en-us/dotnet/core/project-sdk/msbuild-props#generateassemblyinfo -->
-    <VersionPrefix>1.9.0</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
     <Product>DotMake Command-Line</Product>
     <Company>DotMake</Company>
     <!-- Copyright is also used for NuGet metadata -->

src/DotMake.CommandLine.Shared/Attributes/CliArgumentAttribute.cs

@@ -28,6 +28,7 @@ namespace DotMake.CommandLine
     /// <example>
     ///     <inheritdoc cref="Cli" path="/example/code[@id='gettingStartedDelegate']" />
     ///     <inheritdoc cref="Cli" path="/example/code[@id='gettingStartedClass']" />
+    ///     <inheritdoc cref="Cli" path="/example/code[@id='gettingStartedClass2']" />
     ///     <code source="..\TestApp\Commands\ParentCommandAccessorCliCommand.cs" region="ParentCommandAccessorCliCommand" language="cs" />
     /// </example>
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Parameter)]

src/DotMake.CommandLine.Shared/Attributes/CliCommandAttribute.cs

@@ -36,6 +36,7 @@ namespace DotMake.CommandLine
     /// </summary>
     /// <example>
     ///     <inheritdoc cref="Cli" path="/example/code[@id='gettingStartedClass']" />
+    ///     <inheritdoc cref="Cli" path="/example/code[@id='gettingStartedClass2']" />
     ///     <code source="..\TestApp\Commands\WriteFileCliCommand.cs" region="WriteFileCliCommand" language="cs" />
     ///     <code source="..\TestApp\Commands\ArgumentConverterCliCommand.cs" region="ArgumentConverterCliCommand" language="cs" />
     ///     <code source="..\TestApp\Commands\EnumerableCliCommand.cs" region="EnumerableCliCommand" language="cs" />

src/DotMake.CommandLine.Shared/Attributes/CliOptionAttribute.cs

@@ -42,6 +42,7 @@ namespace DotMake.CommandLine
     /// <example>
     ///     <inheritdoc cref="Cli" path="/example/code[@id='gettingStartedDelegate']" />
     ///     <inheritdoc cref="Cli" path="/example/code[@id='gettingStartedClass']" />
+    ///     <inheritdoc cref="Cli" path="/example/code[@id='gettingStartedClass2']" />
     ///     <code source="..\TestApp\Commands\RecursiveOptionCliCommand.cs" region="RecursiveOptionCliCommand" language="cs" />
     ///     <code source="..\TestApp\Commands\ParentCommandAccessorCliCommand.cs" region="ParentCommandAccessorCliCommand" language="cs" />
     ///     <code source="..\TestApp\Commands\OptionBundlingCliCommand.cs" region="OptionBundlingCliCommand" language="cs" />

src/DotMake.CommandLine.SourceGeneration/CliCommandInfo.cs

@@ -337,12 +337,17 @@ public void AppendCSharpDefineString(CodeStringBuilder sb, bool addNamespaceBloc
                         sb.AppendLine($"{varCommand}.Add({varArgument});");
                     }
 
+                    /*
+                    From now on, we will handle this in Cli.GetConfiguration where Build() is called and command is created.
+                    We don't want it to be recursive here, because we will also create the parents.
+
                     sb.AppendLine();
                     sb.AppendLine("// Add nested or external registered children");
                     using (sb.AppendBlockStart("foreach (var child in Children)"))
                     {
                         sb.AppendLine($"{varCommand}.Add(child.Build());");
                     }
+                    */
 
                     sb.AppendLine();
                     var varParseResult = "parseResult";

src/DotMake.CommandLine/Cli.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.CommandLine;
 using System.CommandLine.Completions;
 using System.CommandLine.Help;
@@ -20,6 +21,7 @@ namespace DotMake.CommandLine
     ///         <code source="..\TestApp\CliExamples.cs" region="CliRun" language="cs" />
     ///         <code source="..\TestApp\CliExamples.cs" region="CliParse" language="cs" />
     ///     </code>
+    ///     <code id="gettingStartedClass2" source="..\TestApp\RootHelpOnEmptyCliCommand.cs" region="RootHelpOnEmptyCliCommand" language="cs" />
     ///     <code>
     ///         <code source="..\TestApp\CliExamples.cs" region="CliRunWithReturn" language="cs" />
     ///         <code source="..\TestApp\CliExamples.cs" region="CliRunAsync" language="cs" />
@@ -83,6 +85,53 @@ public static CommandLineConfiguration GetConfiguration(Type definitionType, Cli
             var commandBuilder = CliCommandBuilder.Get(definitionType);
             var command = commandBuilder.Build();
 
+            // Add nested or external registered parent commands
+            var currentCommand = command;
+            foreach (var parent in commandBuilder.Parents)
+            {
+                var parentCommand = parent.Build();
+                parentCommand.Add(currentCommand);
+                currentCommand = parentCommand;
+            }
+
+            // Add nested or external registered children commands
+            var queue = new Queue<Tuple<CliCommandBuilder, Command>>();
+            queue.Enqueue(Tuple.Create(commandBuilder, command));
+            while (queue.Count > 0)
+            {
+                var currentTuple= queue.Dequeue();
+                var current = currentTuple.Item1;
+                var currentCommand2 = currentTuple.Item2;
+
+                foreach (var child in current.Children)
+                {
+                    var childCommand = child.Build();
+                    currentCommand2.Add(childCommand);
+                    queue.Enqueue(Tuple.Create(child, childCommand));
+                }
+            }
+
+
+            /*
+            //Testing command hierarchy
+            var topCommandBuilder = commandBuilder.Parents.LastOrDefault() ?? commandBuilder;
+            var queue2 = new Queue<CliCommandBuilder>();
+            queue2.Enqueue(topCommandBuilder);
+            while (queue2.Count > 0)
+            {
+                var current = queue2.Dequeue();
+
+                var depth = current.Parents.Count();
+                Console.Write(new string(' ', 2 * depth));
+                Console.WriteLine($@"{current.DefinitionType.Name} (depth: {depth})");
+
+                foreach (var child in current.Children)
+                {
+                    queue2.Enqueue(child);
+                }
+            }
+            */
+
             settings ??= new CliSettings();
             var configuration = new CommandLineConfiguration(command)
             {

src/DotMake.CommandLine/CliCommandBuilder.cs

@@ -63,6 +63,16 @@ protected CliCommandBuilder()
         /// </summary>
         public bool ShortFormAutoGenerate { get; protected set; }
 
+        /// <summary>
+        /// Gets the command builders that are nested/external children of this command builder.
+        /// </summary>
+        public IEnumerable<CliCommandBuilder> Children => GetChildren(DefinitionType);
+
+        /// <summary>
+        /// Gets the command builders that are nested/external parents of this command builder.
+        /// </summary>
+        public IEnumerable<CliCommandBuilder> Parents => GetParents(DefinitionType);
+
         /// <summary>
         /// Builds a <see cref="Command"/> instance, populated with sub-commands, options, arguments and settings.
         /// </summary>
@@ -89,11 +99,6 @@ public object Bind(ParseResult parseResult)
                 return Binder(pr);
             });
         }
-        
-        /// <summary>
-        /// Gets the command builders that are nested/external children of this command builder.
-        /// </summary>
-        public IEnumerable<CliCommandBuilder> Children => GetChildren(DefinitionType);
 
         /// <summary>
         /// Registers this command builder so that it can be found by the definition class,
@@ -110,10 +115,10 @@ public void Register()
 
         #region Static
 
-        private static readonly Dictionary<Type, CliCommandBuilder> RegisteredDefinitionTypes =
+        private static readonly Dictionary<Type, CliCommandBuilder> RegisteredCommandBuilders =
             new Dictionary<Type, CliCommandBuilder>();
 
-        private static readonly Dictionary<Type, HashSet<CliCommandBuilder>> RegisteredParentDefinitionTypes =
+        private static readonly Dictionary<Type, HashSet<CliCommandBuilder>> RegisteredChildCommandBuilders =
             new Dictionary<Type, HashSet<CliCommandBuilder>>();
 
         /// <summary>
@@ -135,7 +140,7 @@ public static void Register<TDefinition>(CliCommandBuilder commandBuilder)
         /// <param name="commandBuilder">A command builder which builds a <see cref="Command"/>.</param>
         public static void Register(Type definitionType, CliCommandBuilder commandBuilder)
         {
-            RegisteredDefinitionTypes[definitionType] = commandBuilder;
+            RegisteredCommandBuilders[definitionType] = commandBuilder;
         }
 
         /// <summary>
@@ -157,7 +162,7 @@ public static CliCommandBuilder Get<TDefinition>()
         /// <returns>The registered <see cref="CliCommandBuilder" /> instance.</returns>
         public static CliCommandBuilder Get(Type definitionType)
         {
-            if (!RegisteredDefinitionTypes.TryGetValue(definitionType, out var commandBuilder))
+            if (!RegisteredCommandBuilders.TryGetValue(definitionType, out var commandBuilder))
             {
                 if (definitionType.GetCustomAttribute<CliCommandAttribute>() == null)
                     throw new Exception($"The class '{definitionType.Name}' should have [CliCommand] attribute.");
@@ -194,10 +199,18 @@ public static void RegisterAsChild<TParentDefinition>(CliCommandBuilder childCom
         /// <param name="childCommandBuilder">The nested/external child command builder.</param>
         public static void RegisterAsChild(Type parentDefinitionType, CliCommandBuilder childCommandBuilder)
         {
-            if (!RegisteredParentDefinitionTypes.TryGetValue(parentDefinitionType, out var children))
-                RegisteredParentDefinitionTypes[parentDefinitionType] = children = new HashSet<CliCommandBuilder>();
+            if (!RegisteredChildCommandBuilders.TryGetValue(parentDefinitionType, out var children))
+                RegisteredChildCommandBuilders[parentDefinitionType] = children = new HashSet<CliCommandBuilder>();
 
             children.Add(childCommandBuilder);
+
+            /*
+            if (childCommandBuilder.ParentDefinitionType != null)
+            {
+                if (RegisteredDefinitionTypes.TryGetValue(childCommandBuilder.ParentDefinitionType, out var parent))
+                    RegisteredParentDefinitionTypes[childCommandBuilder.DefinitionType] = parent;
+            }
+            */
         }
 
         /// <summary>
@@ -220,12 +233,49 @@ public static IEnumerable<CliCommandBuilder> GetChildren<TParentDefinition>()
         public static IEnumerable<CliCommandBuilder> GetChildren(Type parentDefinitionType)
         {
             if (parentDefinitionType == null
-                || !RegisteredParentDefinitionTypes.TryGetValue(parentDefinitionType, out var children))
+                || !RegisteredChildCommandBuilders.TryGetValue(parentDefinitionType, out var children))
                 return Enumerable.Empty<CliCommandBuilder>();
 
             return children;
         }
 
+        /// <summary>
+        /// Gets the command builders that are registered as nested/external parents of a child definition.
+        /// </summary>
+        /// <typeparam name="TDefinition">The child definition class.</typeparam>
+        /// <returns>An enumerable whose elements are the <see cref="CliCommandBuilder" /> instances registered as nested/external parents.</returns>
+        public static IEnumerable<CliCommandBuilder> GetParents<TDefinition>()
+        {
+            var definitionType = typeof(TDefinition);
+
+            return GetParents(definitionType);
+        }
+
+
+        /// <summary>
+        /// Gets the command builders that are registered as nested/external parents of a child definition.
+        /// </summary>
+        /// <param name="definitionType">The type of the child definition class.</param>
+        /// <returns>An enumerable whose elements are the <see cref="CliCommandBuilder" /> instances registered as nested/external parents.</returns>
+        public static IEnumerable<CliCommandBuilder> GetParents(Type definitionType)
+        {
+            while (definitionType != null)
+            {
+                if (RegisteredCommandBuilders.TryGetValue(definitionType, out var commandBuilder)
+                    && commandBuilder.ParentDefinitionType != null
+                    && RegisteredChildCommandBuilders.TryGetValue(commandBuilder.ParentDefinitionType, out var children)
+                    && children.Contains(commandBuilder)
+                    && RegisteredCommandBuilders.TryGetValue(commandBuilder.ParentDefinitionType, out var parentCommandBuilder))
+                {
+                    yield return parentCommandBuilder;
+
+                    definitionType = parentCommandBuilder.ParentDefinitionType;
+                }
+                else
+                    yield break;
+            }
+        }
+
         /// <summary>
         /// Gets an argument parser method for an argument type, if it's a collection type.
         /// <para>

src/DotMake.CommandLine/CliHelpBuilder.cs

@@ -19,7 +19,7 @@ public class CliHelpBuilder : HelpBuilder
     {
         private const string Indent = "  ";
         private readonly CliTheme theme;
-        private Func<HelpContext, IEnumerable<Func<HelpContext, bool>>>? _getLayout;
+        private Func<HelpContext, IEnumerable<Func<HelpContext, bool>>> customGetLayout;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="CliHelpBuilder" /> class.
@@ -63,8 +63,9 @@ public override void Write(HelpContext helpContext)
             {
                 return;
             }
-            var layout = _getLayout ?? GetLayout;     
-            var writeSections = layout(helpContext).ToArray();
+
+            var getLayout = customGetLayout ?? GetLayout;     
+            var writeSections = getLayout(helpContext).ToArray();
             foreach (var writeSection in writeSections)
             {
                 if (writeSection(helpContext))
@@ -77,7 +78,7 @@ public override void Write(HelpContext helpContext)
         /// <param name="getLayout">A delegate that returns the layout sections.</param>
         public new void CustomizeLayout(Func<HelpContext, IEnumerable<Func<HelpContext, bool>>> getLayout)
         {
-            _getLayout = getLayout ?? throw new ArgumentNullException(nameof(getLayout));
+            customGetLayout = getLayout ?? throw new ArgumentNullException(nameof(getLayout));
         }
 
         /// <summary>

src/DotMake.CommandLine/CliSession.cs

@@ -17,8 +17,11 @@ public CliSession(CliSettings settings)
                 //otherwise it's not updated until next execution of the app.
                 //Related: https://stackoverflow.com/questions/45513075/why-does-checking-the-console-outputencoding-take-so-long
                 ConsoleExtensions.SetOutputEncoding(Encoding.UTF8);
-                ConsoleExtensions.SetColor(settings.Theme.DefaultColor);
+
                 ConsoleExtensions.SetBgColor(settings.Theme.DefaultBgColor);
+                ConsoleExtensions.SetColor(settings.Theme.DefaultColor);
+                //Console.WriteLine($@"BackgroundColor: {Console.BackgroundColor}");
+                //Console.WriteLine($@"ForegroundColor: {Console.ForegroundColor}");
             }
 
             AppDomain.CurrentDomain.ProcessExit += OnProcessExit;