Added Experimental Support for Aspire (#6973)

Author: michaelstaib

global.json

@@ -1,6 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.100",
-    "rollForward": "major"
+    "version": "8.0.100"
   }
 }

src/HotChocolate/Core/src/Abstractions/SchemaFactory.cs

@@ -0,0 +1,11 @@
+using HotChocolate.Language;
+
+namespace HotChocolate;
+
+/// <summary>
+/// Implement this interface to enable design-time services to create the GraphQL type system.
+/// </summary>
+public interface IDesignTimeSchemaDocumentFactory
+{
+    DocumentNode CreateSchemaDocument(string[] args);
+}

src/HotChocolate/Core/src/Types.Analyzers/Inspectors/DataLoaderDefaultsInfo.cs

@@ -1,26 +1,20 @@
 namespace HotChocolate.Types.Analyzers.Inspectors;
 
-public sealed class DataLoaderDefaultsInfo : ISyntaxInfo, IEquatable<DataLoaderDefaultsInfo>
+public sealed class DataLoaderDefaultsInfo(
+    bool? scoped,
+    bool? isPublic,
+    bool? isInterfacePublic,
+    bool registerServices)
+    : ISyntaxInfo
+    , IEquatable<DataLoaderDefaultsInfo>
 {
-    public DataLoaderDefaultsInfo(
-        bool? scoped,
-        bool? isPublic,
-        bool? isInterfacePublic,
-        bool registerServices)
-    {
-        Scoped = scoped;
-        IsPublic = isPublic;
-        IsInterfacePublic = isInterfacePublic;
-        RegisterServices = registerServices;
-    }
-
-    public bool? Scoped { get; }
+    public bool? Scoped { get; } = scoped;
 
-    public bool? IsPublic { get; }
+    public bool? IsPublic { get; } = isPublic;
 
-    public bool? IsInterfacePublic { get; }
+    public bool? IsInterfacePublic { get; } = isInterfacePublic;
 
-    public bool RegisterServices { get; }
+    public bool RegisterServices { get; } = registerServices;
 
     public bool Equals(DataLoaderDefaultsInfo? other)
     {

src/HotChocolate/Core/src/Types.Analyzers/Inspectors/RequestMiddlewareInspector.cs

@@ -89,7 +89,7 @@ ctor is not
                 var parameterTypeName = parameter.Type.ToFullyQualified();
 
                 if (parameterTypeName.Equals("global::HotChocolate.Schema") ||
-                    parameterTypeName.Equals("global::HotChocolate.!Schema"))
+                    parameterTypeName.Equals("global::HotChocolate.ISchema"))
                 {
                     kind = RequestMiddlewareParameterKind.Schema;
                 }
@@ -108,26 +108,7 @@ ctor is not
 
                 invokeParameters.Add(new RequestMiddlewareParameterInfo(kind, parameterTypeName));
             }
-
-
-            /*
-             public static IRequestExecutorBuilder UseRequest<TMiddleware>(
-               this IRequestExecutorBuilder builder)
-               where TMiddleware : class
-
-             [InterceptsLocation(@"C:\testapp\Program.cs", line: 4, column: 5)]
-               public static RouteHandlerBuilder InterceptMapGet( // 👈 The interceptor must
-                   this IEndpointRouteBuilder endpoints,          // have the same signature
-                   string pattern,                                // as the method being
-                   Delegate handler)                              // intercepted
-               {
-                   Console.WriteLine($"Intercepted '{pattern}'" );
-
-                   return endpoints.MapGet(pattern, handler);
-               }
-             */
-
-
+            
             syntaxInfo = new RequestMiddlewareInfo(
                 middlewareType.Name,
                 middlewareType.ToFullyQualified(),

src/HotChocolate/Core/src/Types/Types/Factories/SchemaSyntaxVisitorContext.cs

@@ -7,13 +7,8 @@
 
 namespace HotChocolate.Types.Factories;
 
-internal class SchemaSyntaxVisitorContext : ISyntaxVisitorContext
+internal class SchemaSyntaxVisitorContext(IDescriptorContext directiveContext)
 {
-    public SchemaSyntaxVisitorContext(IDescriptorContext directiveContext)
-    {
-        DirectiveContext = directiveContext;
-    }
-
     public List<TypeReference> Types { get; } = [];
 
     public IReadOnlyCollection<DirectiveNode>? Directives { get; set; }
@@ -26,5 +21,5 @@ public SchemaSyntaxVisitorContext(IDescriptorContext directiveContext)
 
     public string? Description { get; set; }
 
-    public IDescriptorContext DirectiveContext { get; }
+    public IDescriptorContext DirectiveContext { get; } = directiveContext;
 }

src/HotChocolate/Core/src/Types/Types/Scalars/JsonType.cs

@@ -268,14 +268,9 @@ protected override ISyntaxVisitorAction Enter(
             }
         }
 
-        private sealed class JsonFormatterContext : ISyntaxVisitorContext
+        private sealed class JsonFormatterContext(Utf8JsonWriter writer)
         {
-            public JsonFormatterContext(Utf8JsonWriter writer)
-            {
-                Writer = writer;
-            }
-
-            public Utf8JsonWriter Writer { get; }
+            public Utf8JsonWriter Writer { get; } = writer;
         }
     }
 }

src/HotChocolate/Core/src/Validation/IDocumentValidatorContext.cs

@@ -10,7 +10,7 @@ namespace HotChocolate.Validation;
 /// This interface represents the document validation context that can
 /// be used by validation visitors to build up state.
 /// </summary>
-public interface IDocumentValidatorContext : ISyntaxVisitorContext
+public interface IDocumentValidatorContext
 {
     /// <summary>
     /// Gets the schema on which the validation is executed.

src/HotChocolate/Data/src/Data/Filters/Visitor/IFilterVisitorContext.cs

@@ -7,7 +7,7 @@ namespace HotChocolate.Data.Filters;
 /// <summary>
 /// A context object that is passed along the visitation cycle
 /// </summary>
-public interface IFilterVisitorContext : ISyntaxVisitorContext
+public interface IFilterVisitorContext
 {
     /// <summary>
     /// The already visited types

src/HotChocolate/Data/src/Data/Projections/Expressions/Optimizers/QueryablePagingProjectionOptimizer.cs

@@ -155,8 +155,7 @@ private static void CollectSelectionOfNodes(
         SelectionSetOptimizerContext context,
         List<ISelectionNode> selections)
     {
-        if (context.Selections.Values.FirstOrDefault(
-                x => x.Field.Name == "nodes") is { } nodeSelection)
+        if (context.Selections.Values.FirstOrDefault(x => x.Field.Name == "nodes") is { } nodeSelection)
         {
             foreach (var nodeField in nodeSelection.SelectionSet!.Selections)
             {
@@ -167,7 +166,7 @@ private static void CollectSelectionOfNodes(
         }
     }
 
-    private static readonly ISyntaxRewriter<ISyntaxVisitorContext> _cloneSelectionSetRewriter =
+    private static readonly ISyntaxRewriter<object?> _cloneSelectionSetRewriter =
         SyntaxRewriter.Create(
             n => n.Kind is SyntaxKind.SelectionSet
                 ? new SelectionSetNode(((SelectionSetNode)n).Selections)

src/HotChocolate/Data/src/Data/Sorting/Visitor/ISortVisitorContext.cs

@@ -1,10 +1,8 @@
-using System.Collections.Generic;
-using HotChocolate.Language.Visitors;
 using HotChocolate.Types;
 
 namespace HotChocolate.Data.Sorting;
 
-public interface ISortVisitorContext : ISyntaxVisitorContext
+public interface ISortVisitorContext
 {
     Stack<IType> Types { get; }