[Fusion] Fixed introspection fields are no longer printet into the SDL

Author: michaelstaib

src/HotChocolate/AspNetCore/src/AspNetCore.Pipeline/HttpGetSchemaMiddleware.cs

@@ -71,7 +71,7 @@ private bool IsSchemaPath(HttpRequest request)
         return false;
     }
 
-    private async Task HandleRequestAsync(HttpContext context, ExecutorSession session, GraphQLServerOptions options)
+    private static async Task HandleRequestAsync(HttpContext context, ExecutorSession session, GraphQLServerOptions options)
     {
         if (!options.EnableSchemaFileSupport)
         {
@@ -101,7 +101,7 @@ await session.WriteResultAsync(
         }
     }
 
-    private async Task WriteTypesAsync(
+    private static async Task WriteTypesAsync(
         HttpContext context,
         ExecutorSession session,
         string typeNames,
@@ -141,7 +141,7 @@ await session.WriteResultAsync(
         await PrintTypesAsync(types, context.Response.Body, indent, context.RequestAborted);
     }
 
-    private string GetTypesFileName(List<ITypeDefinition> types)
+    private static string GetTypesFileName(List<ITypeDefinition> types)
         => types.Count == 1
             ? $"{types[0].Name}.graphql"
             : "types.graphql";

src/HotChocolate/Core/src/Types.Abstractions/Types/IOutputFieldDefinition.cs

@@ -14,16 +14,16 @@ public interface IOutputFieldDefinition : IFieldDefinition
     /// </summary>
     IReadOnlyFieldDefinitionCollection<IInputValueDefinition> Arguments { get; }
 
+    /// <summary>
+    /// Gets or sets the type of the field.
+    /// </summary>
+    new IOutputType Type { get; }
+
     /// <summary>
     /// Creates a <see cref="FieldDefinitionNode"/> from the current <see cref="IOutputFieldDefinition"/>.
     /// </summary>
     /// <returns>
     /// Returns a <see cref="FieldDefinitionNode"/>.
     /// </returns>
     new FieldDefinitionNode ToSyntaxNode();
-
-    /// <summary>
-    /// Gets or sets the type of the field.
-    /// </summary>
-    new IOutputType Type { get; }
 }

src/HotChocolate/Core/src/Types.Abstractions/Types/SchemaVisitor.cs

@@ -14,6 +14,11 @@ public virtual void VisitTypes(
     {
         foreach (var type in typesDefinition)
         {
+            if (type.IsIntrospectionType)
+            {
+                continue;
+            }
+
             VisitType(type, context);
         }
     }
@@ -154,6 +159,11 @@ public virtual void VisitOutputFields(
     {
         foreach (var field in fields)
         {
+            if (field.IsIntrospectionField)
+            {
+                continue;
+            }
+
             VisitOutputField(field, context);
         }
     }

src/HotChocolate/Fusion-vnext/src/Fusion.Execution.Types/FusionOutputFieldDefinition.cs

@@ -22,6 +22,7 @@ public FusionOutputFieldDefinition(
         Name = name;
         Description = description;
         IsDeprecated = isDeprecated;
+        IsIntrospectionField = name.StartsWith("__");
         DeprecationReason = deprecationReason;
         Arguments = arguments;
 
@@ -56,6 +57,8 @@ private set
 
     public bool IsDeprecated { get; }
 
+    public bool IsIntrospectionField { get; }
+
     public string? DeprecationReason { get; }
 
     public FusionDirectiveCollection Directives

src/HotChocolate/Fusion-vnext/src/Fusion.Execution.Types/Serialization/SchemaFormatter.cs

@@ -170,6 +170,7 @@ public override void VisitTypes(
 
             foreach (var type in typesDefinition
                 .OfType<IObjectTypeDefinition>()
+                .Where(t => !t.IsIntrospectionType)
                 .OrderBy(t => t.Name))
             {
                 if (context.Schema?.QueryType == type
@@ -185,6 +186,7 @@ public override void VisitTypes(
 
             foreach (var type in typesDefinition
                 .OfType<IInterfaceTypeDefinition>()
+                .Where(t => !t.IsIntrospectionType)
                 .OrderBy(t => t.Name))
             {
                 VisitType(type, context);
@@ -193,6 +195,7 @@ public override void VisitTypes(
 
             foreach (var type in typesDefinition
                 .OfType<IUnionTypeDefinition>()
+                .Where(t => !t.IsIntrospectionType)
                 .OrderBy(t => t.Name))
             {
                 VisitType(type, context);
@@ -201,6 +204,7 @@ public override void VisitTypes(
 
             foreach (var type in typesDefinition
                 .OfType<IInputObjectTypeDefinition>()
+                .Where(t => !t.IsIntrospectionType)
                 .OrderBy(t => t.Name))
             {
                 VisitType(type, context);
@@ -209,6 +213,7 @@ public override void VisitTypes(
 
             foreach (var type in typesDefinition
                 .OfType<IEnumTypeDefinition>()
+                .Where(t => !t.IsIntrospectionType)
                 .OrderBy(t => t.Name))
             {
                 VisitType(type, context);
@@ -217,6 +222,7 @@ public override void VisitTypes(
 
             foreach (var type in typesDefinition
                 .OfType<IScalarTypeDefinition>()
+                .Where(t => !t.IsIntrospectionType)
                 .OrderBy(t => t.Name))
             {
                 if (!context.PrintSpecScalars
@@ -402,6 +408,11 @@ public override void VisitOutputFields(
 
             foreach (var field in fields.AsEnumerable().OrderBy(t => t.Name, context.OrderByName))
             {
+                if (field.IsIntrospectionField)
+                {
+                    continue;
+                }
+
                 VisitOutputField(field, context);
                 fieldNodes.Add((FieldDefinitionNode)context.Result!);
             }

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Execution/Nodes/OperationExecutionNode.cs

@@ -1,6 +1,7 @@
 using System.Buffers;
 using System.Diagnostics;
 using System.IO.Hashing;
+using System.Reactive.Disposables;
 using System.Text;
 using HotChocolate.Fusion.Diagnostics;
 using HotChocolate.Fusion.Execution.Clients;
@@ -362,13 +363,16 @@ public async ValueTask<bool> MoveNextAsync()
             }
 
             bool hasResult;
-            var scope = _diagnosticEvents.ExecuteSubscriptionEvent(_context, _node);
-            var start = Stopwatch.GetTimestamp();
+            IDisposable? scope = null;
+            long? start = null;
 
             try
             {
                 hasResult = await _resultEnumerator.MoveNextAsync();
 
+                scope = _diagnosticEvents.ExecuteSubscriptionEvent(_context, _node);
+                start = Stopwatch.GetTimestamp();
+
                 if (hasResult)
                 {
                     _resultBuffer[0] = _resultEnumerator.Current;
@@ -383,8 +387,8 @@ public async ValueTask<bool> MoveNextAsync()
                     _node.Id,
                     Activity.Current,
                     ExecutionStatus.Failed,
-                    scope,
-                    start,
+                    scope ?? Disposable.Empty,
+                    start ?? Stopwatch.GetTimestamp(),
                     Stopwatch.GetTimestamp(),
                     Exception: ex);
                 return true;
@@ -397,7 +401,7 @@ public async ValueTask<bool> MoveNextAsync()
                     Activity.Current,
                     ExecutionStatus.Failed,
                     scope,
-                    start,
+                    start.Value,
                     Stopwatch.GetTimestamp());
                 return true;
             }

src/HotChocolate/Fusion-vnext/test/Fusion.AspNetCore.Tests/IntrospectionTests.cs

@@ -299,6 +299,34 @@ public async Task Typename_On_Object_With_Alias()
         response.MatchSnapshot();
     }
 
+    [Fact]
+    public async Task Download_Schema()
+    {
+        // arrange
+        using var server1 = CreateSourceSchema(
+            "A",
+            b => b.AddQueryType<SourceSchema1.Query>());
+
+        using var server2 = CreateSourceSchema(
+            "B",
+            b => b.AddQueryType<SourceSchema2.Query>());
+
+        using var gateway = await CreateCompositeSchemaAsync(
+        [
+            ("A", server1),
+            ("B", server2),
+        ]);
+
+        // act
+        using var client = gateway.CreateClient();
+
+        using var result = await client.GetAsync("http://localhost:5000/graphql/schema");
+        var sdl = await result.Content.ReadAsStringAsync();
+
+        // assert
+        sdl.MatchSnapshot(extension: ".graphql");
+    }
+
     public static class SourceSchema1
     {
         public record Book(int Id, string Title, Author Author);

src/HotChocolate/Fusion-vnext/test/Fusion.AspNetCore.Tests/__snapshots__/IntrospectionTests.Download_Schema.graphql

@@ -0,0 +1,74 @@
+schema {
+  query: Query
+}
+
+type Query {
+  authors("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int): AuthorsConnection
+  bookById(id: Int!): Book!
+  books("Returns the elements in the list that come after the specified cursor." after: String "Returns the elements in the list that come before the specified cursor." before: String "Returns the first _n_ elements from the list." first: Int "Returns the last _n_ elements from the list." last: Int): BooksConnection
+}
+
+type Author {
+  books: [Book!]!
+  id: Int!
+  name: String!
+}
+
+"A connection to a list of items."
+type AuthorsConnection {
+  "A list of edges."
+  edges: [AuthorsEdge!]
+  "A flattened list of the nodes."
+  nodes: [Author!]
+  "Information to aid in pagination."
+  pageInfo: PageInfo!
+}
+
+"An edge in a connection."
+type AuthorsEdge {
+  "A cursor for use in pagination."
+  cursor: String!
+  "The item at the end of the edge."
+  node: Author!
+}
+
+type Book {
+  author: Author!
+  id: Int!
+  title: String!
+}
+
+"A connection to a list of items."
+type BooksConnection {
+  "A list of edges."
+  edges: [BooksEdge!]
+  "A flattened list of the nodes."
+  nodes: [Book!]
+  "Information to aid in pagination."
+  pageInfo: PageInfo!
+}
+
+"An edge in a connection."
+type BooksEdge {
+  "A cursor for use in pagination."
+  cursor: String!
+  "The item at the end of the edge."
+  node: Book!
+}
+
+"Information about pagination in a connection."
+type PageInfo {
+  "When paginating forwards, the cursor to continue."
+  endCursor: String
+  "Indicates whether more edges exist following the set defined by the clients arguments."
+  hasNextPage: Boolean!
+  "Indicates whether more edges exist prior the set defined by the clients arguments."
+  hasPreviousPage: Boolean!
+  "When paginating backwards, the cursor to continue."
+  startCursor: String
+}
+
+enum fusion__Schema {
+  A
+  B
+}