Merge branch 'main' into personal/dr/non-resolvable-key

.build/Build.Tests.2.cs

@@ -49,6 +49,10 @@ partial class Build
         .Produces(TestResultDirectory / "*.trx")
         .Executes(() => RunTests(SourceDirectory / "HotChocolate" / "Core" / "HotChocolate.Core.sln"));
 
+    Target TestHotChocolateCostAnalysis => _ => _
+        .Produces(TestResultDirectory / "*.trx")
+        .Executes(() => RunTests(SourceDirectory / "HotChocolate" / "CostAnalysis" / "HotChocolate.CostAnalysis.sln"));
+
     Target TestHotChocolateData => _ => _
         .Produces(TestResultDirectory / "*.trx")
         .Executes(() => RunTests(SourceDirectory / "HotChocolate" / "Data" / "HotChocolate.Data.sln"));

.build/Helpers.cs

@@ -16,6 +16,7 @@ static class Helpers
         Path.Combine("HotChocolate", "AspNetCore"),
         Path.Combine("HotChocolate", "AzureFunctions"),
         Path.Combine("HotChocolate", "Core"),
+        Path.Combine("HotChocolate", "CostAnalysis"),
         Path.Combine("HotChocolate", "Caching"),
         Path.Combine("HotChocolate", "Diagnostics"),
         Path.Combine("HotChocolate", "Language"),

.editorconfig

@@ -9,6 +9,10 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 rulers = 120
 
+# ReSharper properties
+resharper_align_multiline_statement_conditions = false
+resharper_braces_for_ifelse = not_required
+
 [*.md]
 trim_trailing_whitespace = false
 

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/CertificationSchema/AnnotationBased/__snapshots__/CertificationTests.Schema_Snapshot.snap

@@ -1,4 +1,4 @@
-schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@provides", "FieldSet", "@external" ]) {
+schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@external", "@provides", "FieldSet" ]) {
   query: Query
 }
 

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/CertificationSchema/AnnotationBased/__snapshots__/CertificationTests.Subgraph_SDL.snap

@@ -1,4 +1,4 @@
-schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@provides", "FieldSet", "@external" ]) {
+schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@external", "@provides", "FieldSet" ]) {
   query: Query
 }
 

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/__snapshots__/ComposeDirectiveTests.TestServiceTypeEmptyQueryTypePureCodeFirst.graphql

@@ -1,4 +1,4 @@
-schema @composeDirective(name: "custom") @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@composeDirective", "@key", "FieldSet" ]) @link(url: "https:\/\/specs.custom.dev\/custom\/v1.0", import: [ "@custom" ]) {
+schema @composeDirective(name: "custom") @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "FieldSet", "@composeDirective" ]) @link(url: "https:\/\/specs.custom.dev\/custom\/v1.0", import: [ "@custom" ]) {
   query: Query
 }
 

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/__snapshots__/ExternalDirectiveTests.AnnotateExternalToTypeFieldAnnotationBased.snap

@@ -1,4 +1,4 @@
-schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@external", "@key", "FieldSet" ]) {
+schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@external", "FieldSet" ]) {
   query: Query
 }
 

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/__snapshots__/ExternalDirectiveTests.AnnotateExternalToTypeFieldCodeFirst.snap

@@ -1,4 +1,4 @@
-schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@key", "@external", "FieldSet" ]) {
+schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.6", import: [ "@external", "@key", "FieldSet" ]) {
   query: Query
 }
 

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/__snapshots__/OverrideDirectiveTests.OverrideDirective_Annotation.snap

@@ -1,4 +1,4 @@
-schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.0", import: [ "@override", "@key", "FieldSet" ]) {
+schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.0", import: [ "@key", "@override", "FieldSet" ]) {
   query: Query
 }
 

src/HotChocolate/ApolloFederation/test/ApolloFederation.Tests/Directives/__snapshots__/OverrideDirectiveTests.OverrideDirective_Progressive_Annotation.snap

@@ -1,4 +1,4 @@
-schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.7", import: [ "@override", "@key", "FieldSet" ]) {
+schema @link(url: "https:\/\/specs.apollo.dev\/federation\/v2.7", import: [ "@key", "@override", "FieldSet" ]) {
   query: Query
 }
 

src/HotChocolate/AspNetCore/src/AspNetCore/DefaultHttpRequestInterceptor.cs

@@ -34,6 +34,12 @@ public virtual ValueTask OnCreateAsync(
             requestBuilder.TryAddGlobalState(WellKnownContextData.IncludeQueryPlan, true);
         }
 
+        var costSwitch = context.TryGetCostSwitch();
+        if (costSwitch is not null)
+        {
+            requestBuilder.TryAddGlobalState(costSwitch, true);
+        }
+
         return default;
     }
 }

src/HotChocolate/AspNetCore/src/AspNetCore/Extensions/HotChocolateAspNetCoreHostingBuilderExtensions.cs

@@ -5,12 +5,32 @@
 
 namespace Microsoft.Extensions.Hosting;
 
+/// <summary>
+/// Provides <see cref="IHostApplicationBuilder"/> extension methods to configure a GraphQL server.
+/// </summary>
 public static class HotChocolateAspNetCoreHostingBuilderExtensions
 {
+    /// <summary>
+    /// Adds the GraphQL server to the application.
+    /// </summary>
+    /// <param name="builder">
+    /// The <see cref="IHostApplicationBuilder"/>.
+    /// </param>
+    /// <param name="schemaName">
+    /// The name of the GraphQL schema.
+    /// </param>
+    /// <param name="maxAllowedRequestSize">
+    /// The max allowed GraphQL request size.
+    /// </param>
+    /// <param name="disableCostAnalyzer">
+    /// Defines if the cost analyzer should be disabled.
+    /// </param>
+    /// <returns></returns>
     public static IRequestExecutorBuilder AddGraphQL(
-        this IHostApplicationBuilder builder,        
+        this IHostApplicationBuilder builder,
         string? schemaName = default,
-        int maxAllowedRequestSize = MaxAllowedRequestSize)
-        => builder.Services.AddGraphQLServer(schemaName, maxAllowedRequestSize);
+        int maxAllowedRequestSize = MaxAllowedRequestSize,
+        bool disableCostAnalyzer = false)
+        => builder.Services.AddGraphQLServer(schemaName, maxAllowedRequestSize, disableCostAnalyzer);
 }
-#endif
+#endif

src/HotChocolate/AspNetCore/src/AspNetCore/Extensions/HotChocolateAspNetCoreServiceCollectionExtensions.cs

@@ -82,8 +82,67 @@ public static IServiceCollection AddGraphQLServerCore(
 
         return services;
     }
+#if NET7_0_OR_GREATER
+    /// <summary>
+    /// Adds a GraphQL server configuration to the DI.
+    /// </summary>
+    /// <param name="services">
+    /// The <see cref="IServiceCollection"/>.
+    /// </param>
+    /// <param name="schemaName">
+    /// The name of the schema. Use explicit schema names if you host multiple schemas.
+    /// </param>
+    /// <param name="maxAllowedRequestSize">
+    /// The max allowed GraphQL request size.
+    /// </param>
+    /// <param name="disableCostAnalyzer">
+    /// Defines if the cost analyzer should be disabled.
+    /// </param>
+    /// <returns>
+    /// Returns the <see cref="IRequestExecutorBuilder"/> so that configuration can be chained.
+    /// </returns>
+    public static IRequestExecutorBuilder AddGraphQLServer(
+        this IServiceCollection services,
+        string? schemaName = default,
+        int maxAllowedRequestSize = MaxAllowedRequestSize,
+        bool disableCostAnalyzer = false)
+    {
+        var builder = services
+            .AddGraphQLServerCore(maxAllowedRequestSize)
+            .AddGraphQL(schemaName)
+            .AddDefaultHttpRequestInterceptor()
+            .AddSubscriptionServices();
+
+        if (!disableCostAnalyzer)
+        {
+            builder.AddCostAnalyzer();
+        }
+
+        return builder;
+    }
 
     /// <summary>
+    /// Adds a GraphQL server configuration to the DI.
+    /// </summary>
+    /// <param name="builder">
+    /// The <see cref="IServiceCollection"/>.
+    /// </param>
+    /// <param name="schemaName">
+    /// The name of the schema. Use explicit schema names if you host multiple schemas.
+    /// </param>
+    /// <param name="disableCostAnalyzer">
+    /// Defines if the cost analyzer should be disabled.
+    /// </param>
+    /// <returns>
+    /// Returns the <see cref="IRequestExecutorBuilder"/> so that configuration can be chained.
+    /// </returns>
+    public static IRequestExecutorBuilder AddGraphQLServer(
+        this IRequestExecutorBuilder builder,
+        string? schemaName = default,
+        bool disableCostAnalyzer = false)
+        => builder.Services.AddGraphQLServer(schemaName, disableCostAnalyzer: disableCostAnalyzer);
+#else
+/// <summary>
     /// Adds a GraphQL server configuration to the DI.
     /// </summary>
     /// <param name="services">
@@ -122,9 +181,9 @@ public static IRequestExecutorBuilder AddGraphQLServer(
     /// </returns>
     public static IRequestExecutorBuilder AddGraphQLServer(
         this IRequestExecutorBuilder builder,
-        string? schemaName = default) =>
-        builder.Services.AddGraphQLServer(schemaName);
-
+        string? schemaName = default)
+        => builder.Services.AddGraphQLServer(schemaName);
+#endif
     /// <summary>
     /// Registers the GraphQL Upload Scalar.
     /// </summary>
@@ -145,4 +204,4 @@ public static IRequestExecutorBuilder AddUploadType(
         builder.AddType<UploadType>();
         return builder;
     }
-}
+}

src/HotChocolate/AspNetCore/src/AspNetCore/Extensions/HttpContextExtensions.cs

@@ -35,4 +35,30 @@ public static bool IncludeQueryPlan(this HttpContext context)
 
         return false;
     }
+
+    public static string? TryGetCostSwitch(this HttpContext context)
+    {
+        var headers = context.Request.Headers;
+        if (headers.TryGetValue(HttpHeaderKeys.Cost, out var values))
+        {
+            var value = values.FirstOrDefault();
+
+            if (value is null)
+            {
+                return null;
+            }
+
+            if(value.Equals(HttpHeaderValues.ReportCost, StringComparison.OrdinalIgnoreCase))
+            {
+                return WellKnownContextData.ReportCost;
+            }
+
+            if(value.Equals(HttpHeaderValues.ValidateCost, StringComparison.OrdinalIgnoreCase))
+            {
+                return WellKnownContextData.ValidateCost;
+            }
+        }
+
+        return null;
+    }
 }

src/HotChocolate/AspNetCore/src/AspNetCore/HttpHeaderKeys.cs

@@ -11,4 +11,6 @@ internal static class HttpHeaderKeys
     public const string CacheControl = "Cache-Control";
 
     public const string Preflight = "GraphQL-Preflight";
+
+    public const string Cost = "GraphQL-Cost";
 }

src/HotChocolate/AspNetCore/src/AspNetCore/HttpHeaderValues.cs

@@ -7,4 +7,8 @@ internal static class HttpHeaderValues
     public const string IncludeQueryPlan = "1";
 
     public const string NoCache = "no-cache";
+
+    public const string ReportCost = "report";
+
+    public const string ValidateCost = "validate";
 }

src/HotChocolate/AspNetCore/test/AspNetCore.Tests.Utilities/ServerTestBase.cs

@@ -33,7 +33,22 @@ protected virtual TestServer CreateStarWarsServer(
                     .AddTypeExtension<SubscriptionsExtensions>()
                     .AddStarWarsRepositories()
                     .AddInMemorySubscriptions()
-                    .UseAutomaticPersistedQueryPipeline()
+                    .UseInstrumentation()
+                    .UseExceptions()
+                    .UseTimeout()
+                    .UseDocumentCache()
+                    .UseReadPersistedQuery()
+                    .UseAutomaticPersistedQueryNotFound()
+                    .UseWritePersistedQuery()
+                    .UseDocumentParser()
+                    .UseDocumentValidation()
+#if NET7_0_OR_GREATER
+                    .UseCostAnalyzer()
+#endif
+                    .UseOperationCache()
+                    .UseOperationResolver()
+                    .UseOperationVariableCoercion()
+                    .UseOperationExecution()
                     .ConfigureSchemaServices(
                         s => s.AddSingleton<IOperationDocumentStorage, TestOperationDocumentStorage>())
                     .ModifyOptions(
@@ -102,7 +117,8 @@ protected virtual TestServer CreateStarWarsServer(
                             .WithOptions(new GraphQLServerOptions
                             {
                                 EnableBatching = true,
-                                AllowedGetOperations = AllowedGetOperations.Query | AllowedGetOperations.Subscription,
+                                AllowedGetOperations =
+                                    AllowedGetOperations.Query | AllowedGetOperations.Subscription,
                             });
 
                         configureConventions?.Invoke(builder);
@@ -112,12 +128,11 @@ protected virtual TestServer CreateStarWarsServer(
                         endpoints.MapGraphQL("/upload", "upload");
                         endpoints.MapGraphQL("/starwars", "StarWars");
                         endpoints.MapGraphQL("/test", "test");
-                        endpoints.MapGraphQL("/batching").
-                            WithOptions(new GraphQLServerOptions
-                            {
-                                // with defaults
-                                // EnableBatching = false
-                            });
+                        endpoints.MapGraphQL("/batching").WithOptions(new GraphQLServerOptions
+                        {
+                            // with defaults
+                            // EnableBatching = false
+                        });
                     }));
     }