Merge branch 'main' into gai/migration-disable-format-check

Author: glen-84

src/CookieCrumble/src/CookieCrumble/Snapshot.cs

@@ -505,8 +505,11 @@ private static bool MatchSnapshot(
     {
         if (OperatingSystem.IsWindows())
         {
-            // Normalize escaped line endings
-            after = after.Replace("\\r\\n", "\\n");
+            // Normalize escaped line endings if the expected value does not explicitly contain them.
+            if (!before.Contains("\\r\\n", StringComparison.Ordinal))
+            {
+                after = after.Replace("\\r\\n", "\\n");
+            }
         }
 
         var diff = InlineDiffBuilder.Diff(before, after);

src/HotChocolate/AspNetCore/test/AspNetCore.Tests/HttpGetSchemaMiddlewareTests.cs

@@ -54,6 +54,8 @@ public async Task Download_GraphQL_Schema(string path)
 
         // assert
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        response.Headers.Remove("ETag");
+        response.Content.Headers.ContentLength = null;
 
         response.MatchMarkdownSnapshot();
     }
@@ -81,6 +83,8 @@ public async Task Download_GraphQL_Schema_Slicing_Args_Enabled(string path)
 
         // assert
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+        response.Headers.Remove("ETag");
+        response.Content.Headers.ContentLength = null;
 
         response.MatchMarkdownSnapshot();
     }

src/HotChocolate/AspNetCore/test/AspNetCore.Tests/__snapshots__/HttpGetSchemaMiddlewareTests.Download_GraphQL_Schema.md

@@ -2,12 +2,10 @@
 
 ```text
 Headers:
-ETag: "1-9lT+j9S1VOCU5XKHoaNVEuxjYrB+yk/yPGmxKIktwoY="
 Cache-Control: public, must-revalidate, max-age=3600
 Content-Type: application/graphql; charset=utf-8
 Content-Disposition: attachment; filename="schema.graphql"
 Last-Modified: Fri, 01 Jan 2021 00:00:00 GMT
-Content-Length: 7466
 -------------------------->
 Status Code: OK
 -------------------------->

src/HotChocolate/AspNetCore/test/AspNetCore.Tests/__snapshots__/HttpGetSchemaMiddlewareTests.Download_GraphQL_Schema_Slicing_Args_Enabled.md

@@ -2,12 +2,10 @@
 
 ```text
 Headers:
-ETag: "1-273kV/JyKVpBuGqgpSjbHzLG6jb6xKsQlr4kTrMaNmg="
 Cache-Control: public, must-revalidate, max-age=3600
 Content-Type: application/graphql; charset=utf-8
 Content-Disposition: attachment; filename="schema.graphql"
 Last-Modified: Fri, 01 Jan 2021 00:00:00 GMT
-Content-Length: 7398
 -------------------------->
 Status Code: OK
 -------------------------->

src/HotChocolate/Core/src/Execution.Abstractions/ErrorBuilder.cs

@@ -85,6 +85,38 @@ public ErrorBuilder AddLocation(Location location)
         return this;
     }
 
+    /// <summary>
+    /// Adds a GraphQL operation document location to the error, if the error does not already have a location.
+    /// </summary>
+    /// <param name="location">The location of the error.</param>
+    /// <returns>The error builder.</returns>
+    public ErrorBuilder TryAddLocation(Location location)
+    {
+        if (_locations == null || _locations.Count == 0)
+        {
+            _locations ??= [];
+            _locations.Add(location);
+        }
+
+        return this;
+    }
+
+    /// <summary>
+    /// Adds a GraphQL operation document location to the error.
+    /// </summary>
+    /// <param name="location">The location of the error.</param>
+    /// <returns>The error builder.</returns>
+    public ErrorBuilder TryAddLocation(Language.Location? location)
+    {
+        if (location != null && (_locations == null || _locations.Count == 0))
+        {
+            _locations ??= [];
+            _locations.Add(new Location(location.Line, location.Column));
+        }
+
+        return this;
+    }
+
     /// <summary>
     /// Clears the locations of the error.
     /// </summary>

src/HotChocolate/Core/src/Execution.Abstractions/ErrorBuilderExtensions.cs

@@ -12,15 +12,30 @@ public static class ErrorBuilderExtensions
     /// Sets the field coordinate of the error.
     /// </summary>
     /// <param name="builder">The error builder.</param>
-    /// <param name="fieldCoordinate">The field coordinate.</param>
+    /// <param name="coordinate">The field coordinate.</param>
     /// <returns>The error builder.</returns>
-    public static ErrorBuilder SetFieldCoordinate(
+    public static ErrorBuilder SetCoordinate(
         this ErrorBuilder builder,
-        SchemaCoordinate fieldCoordinate)
+        SchemaCoordinate coordinate)
     {
         ArgumentNullException.ThrowIfNull(builder);
 
-        return builder.SetExtension(nameof(fieldCoordinate), fieldCoordinate.ToString());
+        return builder.SetExtension(nameof(coordinate), coordinate.ToString());
+    }
+
+    /// <summary>
+    /// Sets the input path of the error.
+    /// </summary>
+    /// <param name="builder">The error builder.</param>
+    /// <param name="inputPath">The input path.</param>
+    /// <returns>The error builder.</returns>
+    public static ErrorBuilder SetInputPath(
+        this ErrorBuilder builder,
+        Path inputPath)
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+
+        return builder.SetExtension(nameof(inputPath), inputPath);
     }
 
     /// <summary>
@@ -58,6 +73,23 @@ public static ErrorBuilder AddLocation(this ErrorBuilder builder, ISyntaxNode no
         return builder;
     }
 
+    /// <summary>
+    /// Adds a location to the error if the error does not already have a location.
+    /// </summary>
+    /// <param name="builder">The error builder.</param>
+    /// <param name="node">The syntax node.</param>
+    /// <returns>The error builder.</returns>
+    public static ErrorBuilder TryAddLocation(this ErrorBuilder builder, ISyntaxNode? node)
+    {
+        if (node?.Location is null)
+        {
+            return builder;
+        }
+
+        builder.TryAddLocation(new Location(node.Location.Line, node.Location.Column));
+        return builder;
+    }
+
     /// <summary>
     /// Adds multiple locations to the error.
     /// </summary>

src/HotChocolate/Core/src/Execution/Configuration/RequestExecutorSetup.cs

@@ -33,6 +33,11 @@ public sealed class RequestExecutorSetup
     /// </summary>
     public RequestExecutorOptions? RequestExecutorOptions { get; set; }
 
+    /// <summary>
+    /// Gets or sets the time that the executor manager waits to dispose the schema services.
+    /// </summary>
+    public TimeSpan EvictionTimeout { get; set; } = TimeSpan.FromSeconds(30);
+
     /// <summary>
     /// Gets the request executor options actions.
     /// This hook is invoke first in the schema creation process.
@@ -117,6 +122,7 @@ public void CopyTo(RequestExecutorSetup options)
         options._onBuildDocumentValidatorHooks.AddRange(_onBuildDocumentValidatorHooks);
         options._pipelineModifiers.AddRange(_pipelineModifiers);
         options._typeModules.AddRange(_typeModules);
+        options.EvictionTimeout = EvictionTimeout;
 
         if (DefaultPipelineFactory is not null)
         {

src/HotChocolate/Core/src/Execution/ErrorHelper.cs

@@ -10,36 +10,23 @@ internal static class ErrorHelper
 {
     public static IError ArgumentNonNullError(
         ArgumentNode argument,
-        string responseName,
         ArgumentNonNullValidator.ValidationResult validationResult)
     {
         return ErrorBuilder.New()
             .SetMessage(
                 ErrorHelper_ArgumentNonNullError_Message,
                 argument.Name.Value)
             .AddLocation(argument)
-            .SetExtension("responseName", responseName)
             .SetExtension("errorPath", validationResult.Path)
             .Build();
     }
 
     public static IError ArgumentValueIsInvalid(
-        ArgumentNode argument,
-        string responseName,
+        ArgumentNode? argument,
         GraphQLException exception)
     {
         return ErrorBuilder.FromError(exception.Errors[0])
-            .AddLocation(argument)
-            .SetExtension("responseName", responseName)
-            .Build();
-    }
-
-    public static IError ArgumentDefaultValueIsInvalid(
-        string responseName,
-        GraphQLException exception)
-    {
-        return ErrorBuilder.FromError(exception.Errors[0])
-            .SetExtension("responseName", responseName)
+            .TryAddLocation(argument)
             .Build();
     }
 
@@ -49,7 +36,7 @@ public static IError InvalidLeafValue(
         Path path)
     {
         return ErrorBuilder.FromError(exception.Errors[0])
-            .AddLocation(field)
+            .TryAddLocation(field)
             .SetPath(path)
             .SetCode(ErrorCodes.Execution.CannotSerializeLeafValue)
             .Build();

src/HotChocolate/Core/src/Execution/HotChocolate.Execution.csproj

@@ -24,6 +24,7 @@
     <InternalsVisibleTo Include="HotChocolate.Execution.Projections" />
     <InternalsVisibleTo Include="HotChocolate.Execution.Tests" />
     <InternalsVisibleTo Include="HotChocolate.Fusion.Tests" />
+    <InternalsVisibleTo Include="HotChocolate.Types.Tests" />
     <InternalsVisibleTo Include="HotChocolate.Fusion" />
     <InternalsVisibleTo Include="HotChocolate.Types.Mutations" />
     <InternalsVisibleTo Include="StrawberryShake.CodeGeneration" />
@@ -219,6 +220,15 @@
     <Compile Update="DependencyInjection\RequestExecutorBuilderExtensions.Services.cs">
       <DependentUpon>RequestExecutorBuilderExtensions.cs</DependentUpon>
     </Compile>
+    <Compile Update="RequestExecutorManager.Events.cs">
+      <DependentUpon>RequestExecutorManager.cs</DependentUpon>
+    </Compile>
+    <Compile Update="RequestExecutorManager.Hooks.cs">
+      <DependentUpon>RequestExecutorManager.cs</DependentUpon>
+    </Compile>
+    <Compile Update="RequestExecutorManager.Warmup.cs">
+      <DependentUpon>RequestExecutorManager.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
 
   <ItemGroup>

src/HotChocolate/Core/src/Execution/Options/NodeIdSerializerOptions.cs

@@ -1,5 +1,4 @@
 using HotChocolate.Execution.Relay;
-using HotChocolate.Types.Relay;
 
 namespace HotChocolate.Execution.Options;