Renaming: All value sources but constants include calculations

Author: KathleenDollard

src/System.CommandLine.Subsystems.Tests/System.CommandLine.Subsystems.Tests.csproj

@@ -4,12 +4,8 @@
     <TargetFrameworks>$(TargetFrameworkForNETSDK)</TargetFrameworks>
     <GenerateProgramFile>false</GenerateProgramFile>
     <DefaultExcludesInProjectFolder>$(DefaultExcludesInProjectFolder);TestApps\**</DefaultExcludesInProjectFolder>
-    <OutputType>Library</OutputType>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>annotations</Nullable>
-    <!--   
-    <Nullable>enable</Nullable>
-    -->
     <EnableDefaultCompileItems>False</EnableDefaultCompileItems>
   </PropertyGroup>
 

src/System.CommandLine.Subsystems.Tests/ValueSourceTests.cs

@@ -108,7 +108,7 @@ public void CalculatedValueSource_from_extension_produces_value()
     public void RelativeToSymbolValueSource_produces_value_that_was_set()
     {
         var option = new CliOption<int>("-a");
-        var valueSource = new RelativeToSymbolValueSource<int>(option);
+        var valueSource = new SymbolValueSource<int>(option);
 
         var found = valueSource.TryGetTypedValue(EmptyPipelineResult("-a 42", option), out var value);
 
@@ -137,7 +137,7 @@ public void RelativeToSymbolValueSource_implicitly_converted_produces_value_that
     public void RelativeToSymbolValueSource_from_extension_produces_value_that_was_set()
     {
         var option = new CliOption<int>("-a");
-        var valueSource = new RelativeToSymbolValueSource<int>(option);
+        var valueSource = new SymbolValueSource<int>(option);
 
         var found = valueSource.TryGetTypedValue(EmptyPipelineResult("-a 42", option), out var value);
 
@@ -151,7 +151,7 @@ public void RelativeToSymbolValueSource_from_extension_produces_value_that_was_s
     public void RelativeToEnvironmentVariableValueSource_produces_value_that_was_set()
     {
         var envName = "SYSTEM_COMMANDLINE_TESTING";
-        var valueSource = new RelativeToEnvironmentVariableValueSource<int>(envName);
+        var valueSource = new EnvironmentVariableValueSource<int>(envName);
 
         Environment.SetEnvironmentVariable(envName, "42");
         var found = valueSource.TryGetTypedValue(EmptyPipelineResult(), out var value);
@@ -184,7 +184,7 @@ public void RelativeToEnvironmentVariableValueSource_from_extension_produces_val
     public void RelativeToSymbolValueSource_false_if_other_symbol_has_no_default_and_is_missing()
     {
         var option = new CliOption<int>("-a");
-        var valueSource = new RelativeToSymbolValueSource<int>(option);
+        var valueSource = new SymbolValueSource<int>(option);
 
         var found = valueSource.TryGetTypedValue(EmptyPipelineResult("", option), out var value);
         found.Should()
@@ -197,7 +197,7 @@ public void RelativeToSymbolValueSource_false_if_other_symbol_has_no_default_and
     public void RelativeToEnvironmentVariable_false_if_environment_variable_missing()
     {
         var envName = "SYSTEM_COMMANDLINE_TESTING";
-        var valueSource = new RelativeToEnvironmentVariableValueSource<int>(envName);
+        var valueSource = new EnvironmentVariableValueSource<int>(envName);
 
         var found = valueSource.TryGetTypedValue(EmptyPipelineResult(), out var value);
 

src/System.CommandLine.Subsystems/Validation/ValidationContext.cs

@@ -3,7 +3,6 @@
 
 using System.CommandLine.Parsing;
 using System.CommandLine.ValueSources;
-using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace System.CommandLine.Validation;
 

src/System.CommandLine.Subsystems/ValueSources/RelativeToSymbolsValueSource.cs src/System.CommandLine.Subsystems/ValueSources/CollectionValueSource.cs

@@ -12,10 +12,10 @@ namespace System.CommandLine.ValueSources;
 /// <param name="calculation">A delegate that returns the requested type.</param>
 /// <param name="description">The description of this value, used to clarify the intent of the values that appear in error messages.</param>
     // TODO: Do we want this to be an aggregate, such that you could build a type from other symbols, calcs and env variables. Ooo aahh
-public sealed class RelativeToSymbolsValueSource<T>
+public sealed class CollectionValueSource<T>
     : ValueSource<T>
 {
-    internal RelativeToSymbolsValueSource(
+    internal CollectionValueSource(
        Func<IEnumerable<object?>, (bool success, T? value)> calculation,
        bool onlyUserEnteredValues = false,
        string? description = null,

src/System.CommandLine.Subsystems/ValueSources/RelativeToEnvironmentVariableValueSource.cs src/System.CommandLine.Subsystems/ValueSources/EnvironmentVariableValueSource.cs

@@ -11,10 +11,10 @@ namespace System.CommandLine.ValueSources;
 /// <param name="environmentVariableName">The name of then environment variable. Note that for some systems, this is case sensitive.</param>
 /// <param name="calculation">A delegate that returns the requested type. If it is not specified, standard type conversions are used.</param>
 /// <param name="description">The description of this value, used to clarify the intent of the values that appear in error messages.</param>
-public sealed class RelativeToEnvironmentVariableValueSource<T>
+public sealed class EnvironmentVariableValueSource<T>
     : ValueSource<T>
 {
-    internal RelativeToEnvironmentVariableValueSource(
+    internal EnvironmentVariableValueSource(
         string environmentVariableName,
         Func<string?, (bool success, T? value)>? calculation = null,
         string? description = null)

src/System.CommandLine.Subsystems/ValueSources/AggregateValueSource.cs src/System.CommandLine.Subsystems/ValueSources/FallbackValueSource.cs

@@ -3,11 +3,11 @@
 
 namespace System.CommandLine.ValueSources;
 
-public sealed class AggregateValueSource<T> : ValueSource<T>
+public sealed class FallbackValueSource<T> : ValueSource<T>
 {
     private List<ValueSource<T>> valueSources = [];
 
-    internal AggregateValueSource(ValueSource<T> firstSource,
+    internal FallbackValueSource(ValueSource<T> firstSource,
                                  ValueSource<T> secondSource,
                                  string? description = null,
                                  params ValueSource<T>[] otherSources)
@@ -45,10 +45,10 @@ internal static int GetPrecedence(ValueSource<T> source)
         return source switch
         {
             SimpleValueSource<T> => 0,
-            RelativeToSymbolValueSource<T> => 1,
+            SymbolValueSource<T> => 1,
             CalculatedValueSource<T> => 2,
             //RelativeToConfigurationValueSource<T> => 3,
-            RelativeToEnvironmentVariableValueSource<T> => 4,
+            EnvironmentVariableValueSource<T> => 4,
             _ => 5
         };
     }

src/System.CommandLine.Subsystems/ValueSources/RelativeToSymbolValueSource.cs src/System.CommandLine.Subsystems/ValueSources/SymbolValueSource.cs

@@ -11,11 +11,11 @@ namespace System.CommandLine.ValueSources;
 /// <param name="otherSymbol">The option or argument to return, with the calculation supplied if it is not null.</param>
 /// <param name="calculation">A delegate that returns the requested type.</param>
 /// <param name="description">The description of this value, used to clarify the intent of the values that appear in error messages.</param>
-public sealed class RelativeToSymbolValueSource<T>
+public sealed class SymbolValueSource<T>
     : ValueSource<T>
 {
     // TODO: API differences between this adn RelativeToSymbols are very annoying
-    internal RelativeToSymbolValueSource(
+    internal SymbolValueSource(
        CliValueSymbol otherSymbol,
        Func<object?, (bool success, T? value)>? calculation = null,
        bool onlyUserEnteredValues = false,

src/System.CommandLine.Subsystems/ValueSources/ValueSource.cs

@@ -34,25 +34,25 @@ public static ValueSource<T> Create<T>(CliValueSymbol otherSymbol,
                                            Func<object?, (bool success, T? value)>? calculation = null,
                                            bool userEnteredValueOnly = false,
                                            string? description = null)
-        => new RelativeToSymbolValueSource<T>(otherSymbol, calculation, userEnteredValueOnly, description);
+        => new SymbolValueSource<T>(otherSymbol, calculation, userEnteredValueOnly, description);
 
     public static ValueSource<T> Create<T>(
                                        Func<IEnumerable<object?>, (bool success, T? value)> calculation,
                                        bool userEnteredValueOnly = false,
                                        string? description = null,
                                        params CliValueSymbol[] otherSymbols)
-        => new RelativeToSymbolsValueSource<T>(calculation, userEnteredValueOnly, description, otherSymbols);
+        => new CollectionValueSource<T>(calculation, userEnteredValueOnly, description, otherSymbols);
 
     public static ValueSource<T> Create<T>(ValueSource<T> firstSource,
                                            ValueSource<T> secondSource,
                                            string? description = null,
                                            params ValueSource<T>[] otherSources)
-        => new AggregateValueSource<T>(firstSource, secondSource, description, otherSources);
+        => new FallbackValueSource<T>(firstSource, secondSource, description, otherSources);
 
     public static ValueSource<T> CreateFromEnvironmentVariable<T>(string environmentVariableName,
                                                                   Func<string?, (bool success, T? value)>? calculation = null,
                                                                   string? description = null)
-        => new RelativeToEnvironmentVariableValueSource<T>(environmentVariableName, calculation, description);
+        => new EnvironmentVariableValueSource<T>(environmentVariableName, calculation, description);
 }
 
 // TODO: Determine philosophy for custom value sources and whether they can build on existing sources.
@@ -84,7 +84,7 @@ public override bool TryGetValue(PipelineResult pipelineResult,
 
     public static implicit operator ValueSource<T>(T value) => new SimpleValueSource<T>(value);
     public static implicit operator ValueSource<T>(Func<(bool success, T? value)> calculated) => new CalculatedValueSource<T>(calculated);
-    public static implicit operator ValueSource<T>(CliValueSymbol symbol) => new RelativeToSymbolValueSource<T>(symbol);
+    public static implicit operator ValueSource<T>(CliValueSymbol symbol) => new SymbolValueSource<T>(symbol);
     // Environment variable does not have an explicit operator, because converting to string was too broad
 }