Pull out SchemaOptions configuration for easier access

Author: tobias-tengler

src/HotChocolate/AspNetCore/src/AspNetCore/Warmup/RequestExecutorWarmupService.cs

@@ -13,17 +13,14 @@ public async Task StartAsync(CancellationToken cancellationToken)
 
         foreach (var schemaName in provider.SchemaNames)
         {
-            // TODO: Maybe this isn't the best approach...
-            var options = await executorOptionsMonitor.GetAsync(schemaName, cancellationToken);
-            // var setup = optionsMonitor.Get(schemaName);
-            //
-            // var requestOptions = FusionRequestExecutorManager.CreateRequestOptions(setup);
+            var setup = await executorOptionsMonitor.GetAsync(schemaName, cancellationToken);
+            var options = RequestExecutorManager.CreateSchemaOptions(setup);
 
-            // if (!requestOptions.LazyInitialization)
-            // {
-            //     var warmupTask = WarmupAsync(schemaName, cancellationToken);
-            //     warmupTasks.Add(warmupTask);
-            // }
+            if (!options.LazyInitialization)
+            {
+                var warmupTask = WarmupAsync(schemaName, cancellationToken);
+                warmupTasks.Add(warmupTask);
+            }
         }
 
         await Task.WhenAll(warmupTasks).ConfigureAwait(false);

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

@@ -12,6 +12,7 @@ public sealed class RequestExecutorSetup
     private readonly List<OnConfigureRequestExecutorOptionsAction> _onConfigureRequestExecutorOptionsHooks = [];
     private readonly List<RequestMiddlewareConfiguration> _pipeline = [];
     private readonly List<Action<IList<RequestMiddlewareConfiguration>>> _pipelineModifiers = [];
+    private readonly List<Action<SchemaOptions>> _schemaOptionModifiers = [];
     private readonly List<OnConfigureSchemaServices> _onConfigureSchemaServicesHooks = [];
     private readonly List<OnRequestExecutorCreatedAction> _onRequestExecutorCreatedHooks = [];
     private readonly List<OnRequestExecutorEvictedAction> _onRequestExecutorEvictedHooks = [];
@@ -23,11 +24,6 @@ public sealed class RequestExecutorSetup
     /// </summary>
     public Schema? Schema { get; set; }
 
-    /// <summary>
-    /// Gets or sets the schema builder that is used to create the schema.
-    /// </summary>
-    public ISchemaBuilder? SchemaBuilder { get; set; }
-
     /// <summary>
     /// Gets or sets the request executor options.
     /// </summary>
@@ -97,6 +93,9 @@ public IList<RequestMiddlewareConfiguration> Pipeline
     public IList<Action<IList<RequestMiddlewareConfiguration>>> PipelineModifiers
         => _pipelineModifiers;
 
+    public IList<Action<SchemaOptions>> SchemaOptionModifiers
+        => _schemaOptionModifiers;
+
     /// <summary>
     /// Gets or sets the default pipeline factory.
     /// </summary>
@@ -111,7 +110,6 @@ public IList<Action<IList<RequestMiddlewareConfiguration>>> PipelineModifiers
     public void CopyTo(RequestExecutorSetup options)
     {
         options.Schema = Schema;
-        options.SchemaBuilder = SchemaBuilder;
         options.RequestExecutorOptions = RequestExecutorOptions;
         options._onConfigureSchemaBuilderHooks.AddRange(_onConfigureSchemaBuilderHooks);
         options._onConfigureRequestExecutorOptionsHooks.AddRange(_onConfigureRequestExecutorOptionsHooks);
@@ -121,6 +119,7 @@ public void CopyTo(RequestExecutorSetup options)
         options._onRequestExecutorEvictedHooks.AddRange(_onRequestExecutorEvictedHooks);
         options._onBuildDocumentValidatorHooks.AddRange(_onBuildDocumentValidatorHooks);
         options._pipelineModifiers.AddRange(_pipelineModifiers);
+        options._schemaOptionModifiers.AddRange(_schemaOptionModifiers);
         options._typeModules.AddRange(_typeModules);
         options.EvictionTimeout = EvictionTimeout;
 

src/HotChocolate/Core/src/Execution/DependencyInjection/SchemaRequestExecutorBuilderExtensions.cs

@@ -28,7 +28,7 @@ public static IRequestExecutorBuilder ModifyOptions(
         ArgumentNullException.ThrowIfNull(builder);
         ArgumentNullException.ThrowIfNull(configure);
 
-        return builder.ConfigureSchema(b => b.ModifyOptions(configure));
+        return builder.Configure(setup => setup.SchemaOptionModifiers.Add(configure));
     }
 
     /// <summary>

src/HotChocolate/Core/src/Execution/RequestExecutorManager.cs

@@ -150,9 +150,12 @@ private async Task<RegisteredExecutor> CreateRequestExecutorAsync(
             await _optionsMonitor.GetAsync(schemaName, cancellationToken)
                 .ConfigureAwait(false);
 
+        var options = CreateSchemaOptions(setup);
+        var schemaBuilder = SchemaBuilder.New(options);
+
         var context = new ConfigurationContext(
             schemaName,
-            setup.SchemaBuilder ?? SchemaBuilder.New(),
+            schemaBuilder,
             _applicationServices);
 
         var typeModuleChangeMonitor = new TypeModuleChangeMonitor(this, context.SchemaName);
@@ -241,6 +244,18 @@ private static async Task RunEvictionEvents(RegisteredExecutor registeredExecuto
         }
     }
 
+    internal static SchemaOptions CreateSchemaOptions(RequestExecutorSetup setup)
+    {
+        var options = new SchemaOptions();
+
+        foreach (var configure in setup.SchemaOptionModifiers)
+        {
+            configure(options);
+        }
+
+        return options;
+    }
+
     private async Task<ServiceProvider> CreateSchemaServicesAsync(
         ConfigurationContext context,
         RequestExecutorSetup setup,

src/HotChocolate/Core/src/Types/SchemaBuilder.cs

@@ -22,13 +22,15 @@ public partial class SchemaBuilder : ISchemaBuilder
     private readonly List<CreateRef> _types = [];
     private readonly Dictionary<OperationType, CreateRef> _operations = [];
 
-    private readonly SchemaOptions _options = new();
+    private readonly SchemaOptions _options;
     private IsOfTypeFallback? _isOfType;
     private IServiceProvider? _services;
     private CreateRef? _schema;
 
-    private SchemaBuilder()
+    private SchemaBuilder(SchemaOptions options)
     {
+        _options = options;
+
         var typeInterceptors = new TypeInterceptorCollection();
 
         typeInterceptors.TryAdd(new IntrospectionTypeInterceptor());
@@ -238,5 +240,7 @@ public ISchemaBuilder AddServices(IServiceProvider services)
     /// <returns>
     /// Returns a new instance of <see cref="SchemaBuilder"/>.
     /// </returns>
-    public static SchemaBuilder New() => new();
+    public static SchemaBuilder New() => new(new SchemaOptions());
+
+    internal static SchemaBuilder New(SchemaOptions options) => new(options);
 }