Adds ResultDocument to HotChocolate Core

src/All.slnx

@@ -90,9 +90,7 @@
     <Project Path="HotChocolate/Core/src/Execution.Operation.Abstractions/HotChocolate.Execution.Operation.Abstractions.csproj" />
     <Project Path="HotChocolate/Core/src/Execution.Pipeline/HotChocolate.Execution.Pipeline.csproj" />
     <Project Path="HotChocolate/Core/src/Execution.Projections/HotChocolate.Execution.Projections.csproj" />
-    <Project Path="HotChocolate/Core/src/Execution/HotChocolate.Execution.csproj" />
     <Project Path="HotChocolate/Core/src/Features/HotChocolate.Features.csproj" />
-    <Project Path="HotChocolate/Core/src/Fetching/HotChocolate.Fetching.csproj" />
     <Project Path="HotChocolate/Core/src/Subscriptions.InMemory/HotChocolate.Subscriptions.InMemory.csproj" />
     <Project Path="HotChocolate/Core/src/Subscriptions.Nats/HotChocolate.Subscriptions.Nats.csproj" />
     <Project Path="HotChocolate/Core/src/Subscriptions.Postgres/HotChocolate.Subscriptions.Postgres.csproj" />
@@ -112,7 +110,6 @@
     <Project Path="HotChocolate/Core/src/Types.Queries/HotChocolate.Types.Queries.csproj" />
     <Project Path="HotChocolate/Core/src/Types.Scalars.Upload/HotChocolate.Types.Scalars.Upload.csproj" />
     <Project Path="HotChocolate/Core/src/Types.Scalars/HotChocolate.Types.Scalars.csproj" />
-    <Project Path="HotChocolate/Core/src/Types.Shared/HotChocolate.Types.Shared.csproj" />
     <Project Path="HotChocolate/Core/src/Types.Validation/HotChocolate.Types.Validation.csproj" />
     <Project Path="HotChocolate/Core/src/Types/HotChocolate.Types.csproj" />
     <Project Path="HotChocolate/Core/src/Validation/HotChocolate.Validation.csproj" />

src/CookieCrumble/src/CookieCrumble.HotChocolate/CookieCrumble.HotChocolate.csproj

@@ -10,7 +10,6 @@
     <ProjectReference Include="..\CookieCrumble\CookieCrumble.csproj" />
     <ProjectReference Include="..\..\..\HotChocolate\AspNetCore\src\Transport.Abstractions\HotChocolate.Transport.Abstractions.csproj" />
     <ProjectReference Include="..\..\..\HotChocolate\AspNetCore\src\Transport.Http\HotChocolate.Transport.Http.csproj" />
-    <ProjectReference Include="..\..\..\HotChocolate\Core\src\Execution\HotChocolate.Execution.csproj" />
     <ProjectReference Include="..\..\..\HotChocolate\Core\src\Types\HotChocolate.Types.csproj" />
     <ProjectReference Include="..\..\..\HotChocolate\Language\src\Language.SyntaxTree\HotChocolate.Language.SyntaxTree.csproj" />
   </ItemGroup>

src/CookieCrumble/src/CookieCrumble.HotChocolate/Extensions/CommonTestExtensions.cs

@@ -15,11 +15,7 @@ public static ValueTask<IRequestExecutor> CreateExceptionExecutor(
                 await next(context);
                 if (context.ContextData.TryGetValue("ex", out var queryString))
                 {
-                    context.Result =
-                        OperationResultBuilder
-                            .FromResult(context.Result!.ExpectOperationResult())
-                            .SetContextData("ex", queryString)
-                            .Build();
+                    context.Result!.ContextData = context.Result.ContextData.SetItem("ex", queryString);
                 }
             })
             .UseDefaultPipeline()

src/HotChocolate/Adapters/src/Adapters.Mcp.Core/Handlers/CallToolHandler.cs

@@ -1,10 +1,8 @@
 using System.Security.Claims;
 using System.Text;
-using System.Text.Json;
 using System.Text.Json.Nodes;
 using HotChocolate.Buffers;
 using HotChocolate.Execution;
-using HotChocolate.Language;
 using HotChocolate.Transport.Formatters;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
@@ -39,27 +37,18 @@ public static async ValueTask<CallToolResult> HandleAsync(
         }
 
         var requestExecutor = services.GetRequiredService<IRequestExecutor>();
-        var arguments = context.Params?.Arguments ?? Enumerable.Empty<KeyValuePair<string, JsonElement>>();
-
-        Dictionary<string, object?> variableValues = [];
-        using var buffer = new PooledArrayWriter();
-        var jsonValueParser = new JsonValueParser(buffer: buffer);
+        var rootServiceProvider = services.GetRequiredService<IRootServiceProviderAccessor>().ServiceProvider;
+        var httpContext = rootServiceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext!;
+        var requestBuilder = CreateRequestBuilder(httpContext);
 
-        foreach (var (name, value) in arguments)
+        if (context.Params?.Arguments is { Count: > 0 } arguments)
         {
-            variableValues.Add(name, jsonValueParser.Parse(value));
+            requestBuilder.SetVariableValues(arguments);
         }
 
-        var rootServiceProvider = services.GetRequiredService<IRootServiceProviderAccessor>().ServiceProvider;
-        var httpContext = rootServiceProvider.GetRequiredService<IHttpContextAccessor>().HttpContext!;
-        var requestBuilder = CreateRequestBuilder(httpContext);
-        var request =
-            requestBuilder
-                .SetDocument(tool.DocumentNode)
-                .SetVariableValues(variableValues)
-                .Build();
+        var request = requestBuilder.SetDocument(tool.DocumentNode).Build();
         var result = await requestExecutor.ExecuteAsync(request, cancellationToken).ConfigureAwait(false);
-        var operationResult = (IOperationResult)result;
+        var operationResult = result.ExpectOperationResult();
 
         using var writer = new PooledArrayWriter();
 

src/HotChocolate/Adapters/src/Adapters.Mcp/HotChocolate.Adapters.Mcp.csproj

@@ -6,7 +6,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Core\src\Execution\HotChocolate.Execution.csproj" />
     <ProjectReference Include="..\..\..\Core\src\Types\HotChocolate.Types.csproj" />
     <ProjectReference Include="..\Adapters.Mcp.Core\HotChocolate.Adapters.Mcp.Core.csproj" />
   </ItemGroup>

src/HotChocolate/Adapters/src/Adapters.OpenApi.Core/Execution/DynamicEndpointMiddleware.cs

@@ -1,12 +1,12 @@
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Routing;
+using Microsoft.Extensions.DependencyInjection;
 using HotChocolate.AspNetCore;
 using HotChocolate.Buffers;
 using HotChocolate.Execution;
 using HotChocolate.Language;
 using HotChocolate.Types;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace HotChocolate.Adapters.OpenApi;
 
@@ -62,22 +62,22 @@ await Results.Problem(
                 requestBuilder.Build(),
                 cancellationToken).ConfigureAwait(false);
 
-            // If the request was cancelled, we do not attempt to write a response.
+            // If the request was canceled, we do not attempt to write a response.
             if (cancellationToken.IsCancellationRequested)
             {
                 return;
             }
 
-            // If we do not have an operation result, something went wrong and we return HTTP 500.
-            if (executionResult is not IOperationResult operationResult)
+            // If we do not have an operation result, something went wrong, and we return HTTP 500.
+            if (executionResult is not OperationResult operationResult)
             {
                 await Results.InternalServerError().ExecuteAsync(context);
                 return;
             }
 
             // If the request had validation errors or execution didn't start, we return HTTP 400.
-            if (operationResult.ContextData?.ContainsKey(ExecutionContextData.ValidationErrors) == true
-                || operationResult is OperationResult { IsDataSet: false })
+            if (operationResult.ContextData.ContainsKey(ExecutionContextData.ValidationErrors)
+                || operationResult is { IsDataSet: false })
             {
                 var firstErrorMessage = operationResult.Errors?.FirstOrDefault()?.Message;
 
@@ -279,7 +279,7 @@ private static bool TryGetValueForParameter(
         IQueryCollection query,
         [NotNullWhen(true)] out IValueNode? parameterValue)
     {
-        parameterValue = default;
+        parameterValue = null;
 
         if (leaf.ParameterType is OpenApiEndpointParameterType.Route)
         {

src/HotChocolate/Adapters/src/Adapters.OpenApi.Core/Execution/IOpenApiResultFormatter.cs

@@ -6,7 +6,7 @@ namespace HotChocolate.Adapters.OpenApi;
 internal interface IOpenApiResultFormatter
 {
     Task FormatResultAsync(
-        IOperationResult operationResult,
+        OperationResult operationResult,
         HttpContext httpContext,
         OpenApiEndpointDescriptor endpoint,
         CancellationToken cancellationToken);

src/HotChocolate/Adapters/src/Adapters.OpenApi/OpenApiResultFormatter.cs

@@ -1,28 +1,40 @@
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using HotChocolate.Execution;
+using HotChocolate.Text.Json;
 using Microsoft.AspNetCore.Http;
 
 namespace HotChocolate.Adapters.OpenApi;
 
 internal sealed class OpenApiResultFormatter : IOpenApiResultFormatter
 {
     private static readonly JsonWriterOptions s_jsonWriterOptions =
-        new JsonWriterOptions { Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
+        new() { Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
 
     private static readonly JsonSerializerOptions s_jsonSerializerOptions =
-        new JsonSerializerOptions { Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
+        new() { Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping };
 
     public async Task FormatResultAsync(
-        IOperationResult operationResult,
+        OperationResult operationResult,
         HttpContext httpContext,
         OpenApiEndpointDescriptor endpoint,
         CancellationToken cancellationToken)
     {
-        // If the root field is null and we don't have any errors,
+        if (operationResult.Data is not ResultDocument resultDocument)
+        {
+            await Results.InternalServerError().ExecuteAsync(httpContext);
+            return;
+        }
+
+        if (!resultDocument.Data.TryGetProperty(endpoint.ResponseNameToExtract, out var rootProperty))
+        {
+            await Results.InternalServerError().ExecuteAsync(httpContext);
+            return;
+        }
+
+        // If the root field is null, and we don't have any errors,
         // we return HTTP 404 for queries and HTTP 500 otherwise.
-        if (operationResult.Data?.TryGetValue(endpoint.ResponseNameToExtract, out var responseData) != true
-            || responseData is null)
+        if (rootProperty.IsNullOrInvalidated)
         {
             var result = endpoint.HttpMethod == HttpMethods.Get
                 ? Results.NotFound()
@@ -35,11 +47,10 @@ public async Task FormatResultAsync(
         httpContext.Response.StatusCode = StatusCodes.Status200OK;
         httpContext.Response.ContentType = "application/json";
 
-        var jsonWriter = new Utf8JsonWriter(httpContext.Response.BodyWriter, s_jsonWriterOptions);
+        var bodyWriter = httpContext.Response.BodyWriter;
 
-        JsonValueFormatter.WriteValue(jsonWriter, responseData, s_jsonSerializerOptions,
-            JsonNullIgnoreCondition.None);
+        rootProperty.WriteTo(bodyWriter);
 
-        await jsonWriter.FlushAsync(cancellationToken);
+        await bodyWriter.FlushAsync(cancellationToken);
     }
 }

src/HotChocolate/Adapters/src/Fusion.Adapters.OpenApi/FusionOpenApiResultFormatter.cs

@@ -1,24 +1,24 @@
 using HotChocolate.Execution;
-using HotChocolate.Fusion.Execution.Results;
+using HotChocolate.Fusion.Text.Json;
 using Microsoft.AspNetCore.Http;
 
 namespace HotChocolate.Adapters.OpenApi;
 
 internal sealed class FusionOpenApiResultFormatter : IOpenApiResultFormatter
 {
     public async Task FormatResultAsync(
-        IOperationResult operationResult,
+        OperationResult operationResult,
         HttpContext httpContext,
         OpenApiEndpointDescriptor endpoint,
         CancellationToken cancellationToken)
     {
-        if (operationResult is not RawOperationResult rawOperationResult)
+        if (operationResult.Data is not CompositeResultDocument resultDocument)
         {
             await Results.InternalServerError().ExecuteAsync(httpContext);
             return;
         }
 
-        if (!rawOperationResult.Result.Data.TryGetProperty(endpoint.ResponseNameToExtract, out var rootProperty))
+        if (!resultDocument.Data.TryGetProperty(endpoint.ResponseNameToExtract, out var rootProperty))
         {
             await Results.InternalServerError().ExecuteAsync(httpContext);
             return;

src/HotChocolate/ApolloFederation/src/ApolloFederation/Resolvers/ArgumentParser.cs

@@ -69,7 +69,7 @@ private static bool TryGetValue<T>(
                     break;
                 }
 
-                var literal = scalarType.ParseLiteral(valueNode)!;
+                var literal = scalarType.CoerceInputLiteral(valueNode)!;
 
                 if (DefaultTypeConverter.Default.TryConvert(typeof(T), literal, out var converted))
                 {
@@ -85,7 +85,7 @@ private static bool TryGetValue<T>(
                     break;
                 }
 
-                value = (T)enumType.ParseLiteral(valueNode)!;
+                value = (T)enumType.CoerceInputLiteral(valueNode)!;
                 return true;
         }
 

src/HotChocolate/ApolloFederation/src/ApolloFederation/ThrowHelper.cs

@@ -14,9 +14,9 @@ internal static class ThrowHelper
     /// Either the syntax node is invalid when parsing the literal or the syntax
     /// node value has an invalid format.
     /// </summary>
-    public static SerializationException FieldSet_InvalidFormat(
+    public static LeafCoercionException FieldSet_InvalidFormat(
         FieldSetType fieldSetType) =>
-        new SerializationException(
+        new LeafCoercionException(
             ErrorBuilder.New()
                 .SetMessage(ThrowHelper_FieldSet_HasInvalidFormat)
                 .SetCode(ErrorCodes.Scalars.InvalidSyntaxFormat)
@@ -27,9 +27,9 @@ public static SerializationException FieldSet_InvalidFormat(
     /// Either the syntax node is invalid when parsing the literal or the syntax
     /// node value has an invalid format.
     /// </summary>
-    public static SerializationException Any_InvalidFormat(
+    public static LeafCoercionException Any_InvalidFormat(
         _AnyType anyType) =>
-        new SerializationException(
+        new LeafCoercionException(
             ErrorBuilder.New()
                 .SetMessage(ThrowHelper_Any_HasInvalidFormat)
                 .SetCode(ErrorCodes.Scalars.InvalidSyntaxFormat)
@@ -70,10 +70,10 @@ public static SchemaException ReferenceResolverAttribute_EntityResolverNotFound(
     /// <summary>
     /// The runtime type is not supported by the scalars ParseValue method.
     /// </summary>
-    public static SerializationException Scalar_CannotParseValue(
+    public static LeafCoercionException Scalar_CannotParseValue(
         ScalarType scalarType,
         Type valueType) =>
-        new SerializationException(
+        new LeafCoercionException(
             ErrorBuilder.New()
                 .SetMessage(
                     ThrowHelper_Scalar_CannotParseValue,

src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/FieldSetType.cs

@@ -78,7 +78,7 @@ public override IValueNode ParseResult(object? resultValue)
     }
 
     /// <inheritdoc />
-    public override bool TrySerialize(object? runtimeValue, out object? resultValue)
+    public override bool TryCoerceOutputValue(object? runtimeValue, out object? resultValue)
     {
         if (runtimeValue is null)
         {

src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/PolicyType.cs

@@ -34,7 +34,7 @@ protected override Policy ParseLiteral(StringValueNode valueSyntax)
         => new(valueSyntax.Value);
 
     public override IValueNode ParseResult(object? resultValue)
-        => ParseValue(resultValue);
+        => CoerceInputValue(resultValue);
 
     protected override StringValueNode ParseValue(Policy runtimeValue)
         => new(runtimeValue.Value);

src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/ScopeType.cs

@@ -34,7 +34,7 @@ protected override Scope ParseLiteral(StringValueNode valueSyntax)
         => new(valueSyntax.Value);
 
     public override IValueNode ParseResult(object? resultValue)
-        => ParseValue(resultValue);
+        => CoerceInputValue(resultValue);
 
     protected override StringValueNode ParseValue(Scope runtimeValue)
         => new(runtimeValue.Value);

src/HotChocolate/ApolloFederation/src/ApolloFederation/Types/_AnyType.cs

@@ -11,7 +11,7 @@
 /// from external services into the root _entities field for execution.
 /// </summary>
 // ReSharper disable once InconsistentNaming
 public sealed class _AnyType : ScalarType<Representation, ObjectValueNode>
 {
     public const string TypeNameField = "__typename";
 
@@ -39,13 +39,13 @@
     }
 
     /// <inheritdoc />
     protected override bool IsInstanceOfType(ObjectValueNode valueSyntax)
     {
         return valueSyntax.Fields.Any(field => field.Name.Value == TypeNameField);
     }
 
     /// <inheritdoc />
     public override IValueNode ParseResult(object? resultValue)
     {
         if (resultValue is null)
         {
@@ -61,7 +61,7 @@
     }
 
     /// <inheritdoc />
     protected override Representation ParseLiteral(ObjectValueNode valueSyntax)
     {
         if (valueSyntax.Fields.FirstOrDefault(
             field => field.Name.Value.EqualsOrdinal("__typename")) is { Value: StringValueNode s })
@@ -73,7 +73,7 @@
     }
 
     /// <inheritdoc />
-    public override bool TrySerialize(object? runtimeValue, out object? resultValue)
+    public override bool TryCoerceOutputValue(object? runtimeValue, out object? resultValue)
     {
         if (runtimeValue is null)
         {
@@ -83,7 +83,7 @@
 
         if (runtimeValue is Representation)
         {
-            resultValue = ParseValue(runtimeValue);
+            resultValue = CoerceInputValue(runtimeValue);
             return true;
         }
 
@@ -92,13 +92,13 @@
     }
 
     /// <inheritdoc />
     protected override ObjectValueNode ParseValue(Representation runtimeValue)
     {
         return new ObjectValueNode(runtimeValue.Data.Fields);
     }
 
     /// <inheritdoc />
     public override bool TryDeserialize(object? resultValue, out object? runtimeValue)
     {
         if (resultValue is null)
         {