Prune out uneeded types

Author: captainsafia

src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.ValidationsGenerator/Extensions/IncrementalValuesProviderExtensions.cs

@@ -38,11 +38,10 @@ public static IncrementalValuesProvider<TSource> Distinct<TSource>(this Incremen
     }
 
     public static IncrementalValuesProvider<T> Concat<T>(
-        this IncrementalValuesProvider<T> first,
+        this IncrementalValuesProvider<ImmutableArray<T>> first,
         IncrementalValuesProvider<ImmutableArray<T>> second)
     {
         return first
-            .Collect()
             .Combine(second.Collect())
             .SelectMany((tuple, _) =>
             {

src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.ValidationsGenerator/Models/ValidatableEndpoint.cs

@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using System.Threading;
@@ -39,11 +38,10 @@ internal bool FindEndpoints(SyntaxNode syntaxNode, CancellationToken cancellatio
             : null;
     }
 
-    internal ValidatableEndpoint ExtractValidatableEndpoint((IInvocationOperation? Operation, RequiredSymbols RequiredSymbols) input, CancellationToken cancellationToken)
+    internal ImmutableArray<ValidatableType> ExtractValidatableEndpoint((IInvocationOperation? Operation, RequiredSymbols RequiredSymbols) input, CancellationToken cancellationToken)
     {
         AnalyzerDebug.Assert(input.Operation != null, "Operation should not be null.");
-        var validatableTypes = new HashSet<ValidatableType>(ValidatableTypeComparer.Instance);
-        var parameters = ExtractParameters(input.Operation, input.RequiredSymbols, ref validatableTypes);
-        return new ValidatableEndpoint(parameters, [.. validatableTypes]);
+        var validatableTypes = ExtractValidatableTypes(input.Operation, input.RequiredSymbols);
+        return validatableTypes;
     }
 }

src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.ValidationsGenerator/Models/ValidatableParameter.cs

@@ -19,31 +19,19 @@ public sealed partial class ValidationsGenerator : IIncrementalGenerator
         globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Included,
         typeQualificationStyle: SymbolDisplayTypeQualificationStyle.NameAndContainingTypesAndNamespaces);
 
-    internal ImmutableArray<ValidatableParameter> ExtractParameters(IInvocationOperation operation, RequiredSymbols requiredSymbols, ref HashSet<ValidatableType> validatableTypes)
+    internal ImmutableArray<ValidatableType> ExtractValidatableTypes(IInvocationOperation operation, RequiredSymbols requiredSymbols)
     {
         AnalyzerDebug.Assert(operation.SemanticModel != null, "SemanticModel should not be null.");
         var parameters = operation.TryGetRouteHandlerMethod(operation.SemanticModel, out var method)
             ? method.Parameters
             : [];
-        var validatableParameters = ImmutableArray.CreateBuilder<ValidatableParameter>(parameters.Length);
+        var validatableTypes = new HashSet<ValidatableType>(ValidatableTypeComparer.Instance);
         List<ITypeSymbol> visitedTypes = [];
         foreach (var parameter in parameters)
         {
-            var hasValidatableType = TryExtractValidatableType(parameter.Type.UnwrapType(requiredSymbols.IEnumerable), requiredSymbols, ref validatableTypes, ref visitedTypes);
-            var validatableAttributes = ExtractValidationAttributes(parameter, requiredSymbols, out var isRequired);
-            validatableParameters.Add(new ValidatableParameter(
-                Type: parameter.Type.UnwrapType(requiredSymbols.IEnumerable),
-                OriginalType: parameter.Type,
-                Name: parameter.Name,
-                DisplayName: parameter.GetDisplayName(requiredSymbols.DisplayAttribute),
-                Index: parameter.Ordinal,
-                IsNullable: parameter.Type.IsNullable(),
-                IsRequired: isRequired,
-                IsEnumerable: parameter.Type.IsEnumerable(requiredSymbols.IEnumerable),
-                Attributes: validatableAttributes,
-                HasValidatableType: hasValidatableType));
+            _ = TryExtractValidatableType(parameter.Type.UnwrapType(requiredSymbols.IEnumerable), requiredSymbols, ref validatableTypes, ref visitedTypes);
         }
-        return validatableParameters.ToImmutable();
+        return [.. validatableTypes];
     }
 
     internal bool TryExtractValidatableType(ITypeSymbol typeSymbol, RequiredSymbols requiredSymbols, ref HashSet<ValidatableType> validatableTypes, ref List<ITypeSymbol> visitedTypes)

src/Http/Http.Extensions/gen/Microsoft.AspNetCore.Http.ValidationsGenerator/Parsers/ValidationsGenerator.EndpointsParser.cs

@@ -31,13 +31,12 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                 predicate: FindEndpoints,
                 transform: TransformEndpoints)
             .Where(endpoint => endpoint is not null);
-        // Extract all validatable endpoints encountered in the type graph.
-        var validatableEndpoints = endpoints
+        // Extract validatable types from all endpoints.
+        var validatableTypesFromEndpoints = endpoints
             .Combine(requiredSymbols)
             .Select(ExtractValidatableEndpoint);
         // Extract all validatable types encountered in the type graph.
-        var validatableTypes = validatableEndpoints
-            .SelectMany((endpoint, ct) => endpoint.ValidatableTypes)
+        var validatableTypes = validatableTypesFromEndpoints
             .Concat(validatableTypesWithAttribute)
             .Distinct(ValidatableTypeComparer.Instance)
             .Collect();