Fixes several issues for projecting from node fields. (#5425)

.vscode/tasks.json

@@ -23,7 +23,6 @@
       "args": [
         "build",
         "src/All.sln",
-        "-c Debug",
         // Ask dotnet build to generate full paths for file names.
         "/property:GenerateFullPaths=true",
         // Do not generate summary otherwise it leads to duplicate errors in Problems panel

global.json

@@ -1,6 +1,5 @@
 {
     "sdk": {
-        "version": "7.0.100-preview.7.22377.5", 
-        "rollForward": "latestMinor"
+        "version": "7.0.100-preview.7.22377.5"
     }
-}
+}

src/HotChocolate/Core/src/Abstractions/WellKnownContextData.cs

@@ -183,6 +183,11 @@ public static class WellKnownContextData
     /// </summary>
     public const string InternalId = "HotChocolate.Relay.Node.Id.InternalId";
 
+    /// <summary>
+    /// The key to get the id type name from the context data.
+    /// </summary>
+    public const string InternalTypeName = "HotChocolate.Relay.Node.Id.InternalTypeName";
+
     /// <summary>
     /// The key to get the id type from the context data.
     /// </summary>

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

@@ -14,6 +14,7 @@
   <ItemGroup>
     <InternalsVisibleTo Include="HotChocolate.Types.Mutations" />
     <InternalsVisibleTo Include="HotChocolate.AspNetCore.Tests" />
+    <InternalsVisibleTo Include="HotChocolate.Data" />
     <InternalsVisibleTo Include="HotChocolate.Fusion" />
     <InternalsVisibleTo Include="HotChocolate.Fusion.Tests" />
     <InternalsVisibleTo Include="StrawberryShake.CodeGeneration" />

src/HotChocolate/Core/src/Execution/Processing/OperationCompiler.cs

@@ -466,7 +466,7 @@ private void CollectFields(CompilerContext context)
                     responseName: responseName,
                     isParallelExecutable: field.IsParallelExecutable,
                     arguments: CoerceArgumentValues(field, selection, responseName),
-                    includeCondition: includeCondition);
+                    includeConditions: includeCondition == 0 ? null : new[] { includeCondition });
 
                 context.Fields.Add(responseName, preparedSelection);
 

src/HotChocolate/Core/src/Execution/Processing/Selection.cs

@@ -29,7 +29,7 @@ public class Selection : ISelection
         FieldNode syntaxNode,
         string responseName,
         IArgumentMap? arguments = null,
-        long includeCondition = 0,
+        long[]? includeConditions = null,
         bool isInternal = false,
         bool isParallelExecutable = true,
         FieldDelegate? resolverPipeline = null,
@@ -46,9 +46,7 @@ public class Selection : ISelection
         PureResolver = pureResolver;
         Strategy = InferStrategy(!isParallelExecutable, pureResolver is not null);
 
-        _includeConditions = includeCondition is 0
-            ? Array.Empty<long>()
-            : new[] { includeCondition };
+        _includeConditions = includeConditions ?? Array.Empty<long>();
 
         _flags = isInternal ? Flags.Internal : Flags.None;
 
@@ -152,6 +150,8 @@ public bool HasStreamDirective(long includeFlags)
     public bool IsConditional
         => _includeConditions.Length > 0 || (_flags & Flags.Internal) == Flags.Internal;
 
+    internal ReadOnlySpan<long> IncludeConditions => _includeConditions;
+
     public bool IsIncluded(long includeFlags, bool allowInternals = false)
     {
         // in most case we do not have any include condition,

src/HotChocolate/Core/src/Fetching/Extensions/ObjectFieldDataLoaderExtensions.cs

@@ -67,7 +67,7 @@ public static class DataLoaderObjectFieldExtensions
                                     dataLoaderType);
                             },
                             definition,
-                            ApplyConfigurationOn.Completion));
+                            ApplyConfigurationOn.BeforeCompletion));
                 });
 
         return descriptor;

src/HotChocolate/Core/src/Types.CursorPagination/ConnectionType.cs

@@ -58,14 +58,14 @@ internal class ConnectionType
                         TypeContext.Output);
                 },
                 Definition,
-                ApplyConfigurationOn.Naming,
+                ApplyConfigurationOn.BeforeNaming,
                 nodeType,
                 TypeDependencyKind.Named));
         Definition.Configurations.Add(
             new CompleteConfiguration(
                 (c, _) => EdgeType = c.GetType<IEdgeType>(TypeReference.Create(edgeTypeName)),
                 Definition,
-                ApplyConfigurationOn.Completion));
+                ApplyConfigurationOn.BeforeCompletion));
     }
 
     internal ConnectionType(ITypeReference nodeType, bool withTotalCount)
@@ -110,7 +110,7 @@ internal ConnectionType(ITypeReference nodeType, bool withTotalCount)
                         TypeContext.Output);
                 },
                 Definition,
-                ApplyConfigurationOn.Naming,
+                ApplyConfigurationOn.BeforeNaming,
                 nodeType,
                 TypeDependencyKind.Named));
         Definition.Configurations.Add(
@@ -120,7 +120,7 @@ internal ConnectionType(ITypeReference nodeType, bool withTotalCount)
                     EdgeType = c.GetType<IEdgeType>(edgeType);
                 },
                 Definition,
-                ApplyConfigurationOn.Completion));
+                ApplyConfigurationOn.BeforeCompletion));
     }
 
     /// <summary>

src/HotChocolate/Core/src/Types.CursorPagination/EdgeType.cs

@@ -32,7 +32,7 @@ internal sealed class EdgeType : ObjectType, IEdgeType
             new CompleteConfiguration(
                 (c, _) => NodeType = c.GetType<IOutputType>(nodeType),
                 Definition,
-                ApplyConfigurationOn.Completion));
+                ApplyConfigurationOn.BeforeCompletion));
     }
 
     internal EdgeType(ITypeReference nodeType)
@@ -54,14 +54,14 @@ internal EdgeType(ITypeReference nodeType)
                     ((ObjectTypeDefinition)d).Name = NameHelper.CreateEdgeName(ConnectionName);
                 },
                 Definition,
-                ApplyConfigurationOn.Naming,
+                ApplyConfigurationOn.BeforeNaming,
                 nodeType,
                 TypeDependencyKind.Named));
         Definition.Configurations.Add(
             new CompleteConfiguration(
                 (c, _) => NodeType = c.GetType<IOutputType>(nodeType),
                 Definition,
-                ApplyConfigurationOn.Completion));
+                ApplyConfigurationOn.BeforeCompletion));
     }
 
     /// <summary>

src/HotChocolate/Core/src/Types.Json/FromJsonSchemaDirective.cs

@@ -42,7 +42,7 @@ internal sealed class FromJsonSchemaDirective : ISchemaDirective
                         throw ThrowHelper.CannotInferTypeFromJsonObj(ctx.Type.Name);
                     },
                     fieldDef,
-                    ApplyConfigurationOn.Completion));
+                    ApplyConfigurationOn.BeforeCompletion));
         }
     }
 

src/HotChocolate/Core/src/Types.OffsetPagination/CollectionSegmentType~1.cs

@@ -41,7 +41,7 @@ internal class CollectionSegmentType
                         definition.Name = type.NamedType().Name + "CollectionSegment";
                     },
                     Definition,
-                    ApplyConfigurationOn.Naming,
+                    ApplyConfigurationOn.BeforeNaming,
                     nodeType,
                     TypeDependencyKind.Named));
         }
@@ -57,7 +57,7 @@ internal class CollectionSegmentType
                     nodes.Type = TypeReference.Parse($"[{ItemType.Print()}]", TypeContext.Output);
                 },
                 Definition,
-                ApplyConfigurationOn.Naming,
+                ApplyConfigurationOn.BeforeNaming,
                 nodeType,
                 TypeDependencyKind.Named));
 

src/HotChocolate/Core/src/Types/SchemaErrorBuilder.cs

@@ -6,10 +6,9 @@
 
 namespace HotChocolate;
 
-public partial class SchemaErrorBuilder
-    : ISchemaErrorBuilder
+public partial class SchemaErrorBuilder : ISchemaErrorBuilder
 {
-    private Error _error = new Error();
+    private readonly Error _error = new();
 
     public ISchemaErrorBuilder SetMessage(string message)
     {
@@ -84,5 +83,5 @@ public ISchemaError Build()
         return _error.Clone();
     }
 
-    public static SchemaErrorBuilder New() => new SchemaErrorBuilder();
+    public static SchemaErrorBuilder New() => new();
 }

src/HotChocolate/Core/src/Types/Types/Descriptors/Contracts/ConfigurationKind.cs

@@ -1,8 +1,33 @@
 namespace HotChocolate.Types;
 
+/// <summary>
+/// This enum defines the events on which configurations can be applied.
+/// </summary>
 public enum ApplyConfigurationOn
 {
+
+    /// <summary>
+    /// Before the type is created.
+    /// </summary>
     Create,
-    Naming,
-    Completion
+
+    /// <summary>
+    /// Before the types name is completed.
+    /// </summary>
+    BeforeNaming,
+
+    /// <summary>
+    /// After the types name is completed.
+    /// </summary>
+    AfterNaming,
+
+    /// <summary>
+    /// Before the type is completed.
+    /// </summary>
+    BeforeCompletion,
+
+    /// <summary>
+    /// After the type is completed.
+    /// </summary>
+    AfterCompletion
 }

src/HotChocolate/Core/src/Types/Types/Descriptors/DescriptorBase~1.cs

@@ -109,7 +109,7 @@ private void OnBeforeCreate(Action<IDescriptorContext, T> configure)
         var configuration = new CompleteConfiguration(
             (c, d) => configure(c, (T)d),
             Definition,
-            ApplyConfigurationOn.Naming);
+            ApplyConfigurationOn.BeforeNaming);
 
         Definition.Configurations.Add(configuration);
 
@@ -130,7 +130,7 @@ private void OnBeforeCreate(Action<IDescriptorContext, T> configure)
         var configuration = new CompleteConfiguration(
             (c, d) => configure(c, (T)d),
             Definition,
-            ApplyConfigurationOn.Completion);
+            ApplyConfigurationOn.BeforeCompletion);
 
         Definition.Configurations.Add(configuration);
 

src/HotChocolate/Core/src/Types/Types/Extensions/DirectiveCollectionExtensions.cs

@@ -24,7 +24,7 @@ public static T SingleOrDefault<T>(this IDirectiveCollection directives)
             }
         }
 
-        return default;
+        return default!;
     }
 
     internal static IValueNode? SkipValue(this IReadOnlyList<DirectiveNode> directives)

src/HotChocolate/Core/src/Types/Types/Pagination/PagingHelper.cs

@@ -43,7 +43,7 @@ public static class PagingHelper
                     options,
                     placeholder),
                 definition,
-                ApplyConfigurationOn.Completion));
+                ApplyConfigurationOn.BeforeCompletion));
 
         return descriptor;
     }

src/HotChocolate/Core/src/Types/Types/Relay/Descriptors/NodeDescriptor~1.cs

@@ -33,10 +33,16 @@ public NodeDescriptor(IObjectTypeDescriptor<TNode> descriptor)
     {
         _typeDescriptor = descriptor;
 
-        _typeDescriptor
-            .Implements<NodeType>()
-            .Extend()
-            .OnBeforeCompletion(OnCompleteDefinition);
+        // we use the CompleteConfiguration  instead of the higher level api since
+        // we want to target a specific event.
+        var ownerDef = _typeDescriptor.Implements<NodeType>().Extend().Definition;
+
+        var configuration = new CompleteConfiguration(
+            (c, d) => OnCompleteDefinition(c, (ObjectTypeDefinition)d),
+            ownerDef,
+            ApplyConfigurationOn.AfterNaming);
+
+        ownerDef.Configurations.Add(configuration);
     }
 
     private void OnCompleteDefinition(
@@ -45,7 +51,21 @@ public NodeDescriptor(IObjectTypeDescriptor<TNode> descriptor)
     {
         if (Definition.ResolverField is null)
         {
-            ResolveNodeWith<TNode>();
+            var resolverMethod =
+                Context.TypeInspector.GetNodeResolverMethod(typeof(TNode), typeof(TNode));
+
+            // we allow a node to not have a node resolver.
+            // this opens up type interceptors bringing these in later.
+            // we also introduced a validation option that makes sure that node resolvers are
+            // available after the schema is completed.
+            if (resolverMethod is not null)
+            {
+                ResolveNodeWith(resolverMethod);
+            }
+            else
+            {
+                ConfigureNodeField();
+            }
         }
 
         CompleteResolver(context, definition);
@@ -150,11 +170,13 @@ public INodeDescriptor<TNode> IdField(MemberInfo propertyOrMethod)
     }
 
     /// <inheritdoc cref="INodeDescriptor{TNode}.ResolveNodeWith{TResolver}()"/>
-    public IObjectFieldDescriptor ResolveNodeWith<TResolver>() =>
-        ResolveNodeWith(
+    public IObjectFieldDescriptor ResolveNodeWith<TResolver>()
+    {
+        return ResolveNodeWith(
             Context.TypeInspector.GetNodeResolverMethod(
                 typeof(TNode),
                 typeof(TResolver))!);
+    }
 
     /// <inheritdoc cref="INodeDescriptor{TNode}.ResolveNodeWith(Type)"/>
     public IObjectFieldDescriptor ResolveNodeWith(Type type) =>

src/HotChocolate/Core/src/Types/Types/Relay/Extensions/RelayIdFieldHelpers.cs

@@ -105,7 +105,7 @@ internal static class RelayIdFieldHelpers
                 placeholder,
                 typeName),
             definition,
-            ApplyConfigurationOn.Completion);
+            ApplyConfigurationOn.BeforeCompletion);
 
         definition.Configurations.Add(configuration);
     }

src/HotChocolate/Core/src/Types/Types/Relay/NodeFieldResolvers.cs

@@ -2,6 +2,7 @@
 
 using System;
 using System.Buffers;
+using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using HotChocolate.Execution;
@@ -36,7 +37,7 @@ internal static class NodeFieldResolvers
             type.ContextData.TryGetValue(NodeResolver, out var o) &&
             o is NodeResolverInfo nodeResolverInfo)
         {
-            SetLocalContext(context, nodeId, deserializedId, typeName);
+            SetLocalContext(context, nodeId, deserializedId, type);
             TryReplaceArguments(context, nodeResolverInfo, Id, nodeId);
 
             await nodeResolverInfo.Pipeline.Invoke(context);
@@ -86,7 +87,7 @@ internal static class NodeFieldResolvers
                     {
                         var nodeContext = context.Clone();
 
-                        SetLocalContext(nodeContext, nodeId, deserializedId, typeName);
+                        SetLocalContext(nodeContext, nodeId, deserializedId, type);
                         TryReplaceArguments(nodeContext, nodeResolverInfo, Ids, nodeId);
 
                         tasks[i] = ExecutePipelineAsync(nodeContext, nodeResolverInfo);
@@ -155,7 +156,7 @@ internal static class NodeFieldResolvers
             {
                 var nodeContext = context.Clone();
 
-                SetLocalContext(nodeContext, nodeId, deserializedId, typeName);
+                SetLocalContext(nodeContext, nodeId, deserializedId, type);
                 TryReplaceArguments(nodeContext, nodeResolverInfo, Ids, nodeId);
 
                 result[0] = await ExecutePipelineAsync(nodeContext, nodeResolverInfo);
@@ -188,11 +189,12 @@ internal static class NodeFieldResolvers
         IMiddlewareContext context,
         StringValueNode nodeId,
         IdValue deserializedId,
-        string typeName)
+        ObjectType type)
     {
         context.SetLocalState(NodeId, nodeId.Value);
         context.SetLocalState(InternalId, deserializedId.Value);
-        context.SetLocalState(InternalType, typeName);
+        context.SetLocalState(InternalType, type);
+        context.SetLocalState(InternalTypeName, type.Name);
         context.SetLocalState(WellKnownContextData.IdValue, deserializedId);
     }
 

src/HotChocolate/Core/src/Types/Types/Relay/NodeFieldTypeInterceptor.cs

@@ -3,7 +3,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using HotChocolate.Configuration;
-using HotChocolate.Language;
 using HotChocolate.Types.Descriptors;
 using HotChocolate.Types.Descriptors.Definitions;
 using HotChocolate.Types.Introspection;