Merge branch 'main' into gai/dotnet-10

Author: glen-84

.markdownlint.yml

@@ -27,3 +27,4 @@ MD033:
     - u
     - Video
 MD036: false # Rationale: Possibly too strict, used frequently in documentation.
+MD059: false # Rationale: Already used in many places in the documentation.

src/All.slnx

@@ -67,16 +67,19 @@
   <Folder Name="/HotChocolate/Caching/" />
   <Folder Name="/HotChocolate/Caching/src/">
     <Project Path="HotChocolate/Caching/src/Caching/HotChocolate.Caching.csproj" />
+    <Project Path="HotChocolate/Caching/src/Caching.Memory/HotChocolate.Caching.Memory.csproj" />
   </Folder>
   <Folder Name="/HotChocolate/Caching/test/">
     <Project Path="HotChocolate/Caching/test/Caching.Tests/HotChocolate.Caching.Tests.csproj" />
+    <Project Path="HotChocolate/Caching/test/Caching.Memory.Tests/HotChocolate.Caching.Memory.Tests.csproj" />
   </Folder>
   <Folder Name="/HotChocolate/Core/" />
   <Folder Name="/HotChocolate/Core/src/">
     <Project Path="HotChocolate/Core/src/Abstractions/HotChocolate.Abstractions.csproj" />
     <Project Path="HotChocolate/Core/src/Authorization/HotChocolate.Authorization.csproj" />
     <Project Path="HotChocolate/Core/src/Core/HotChocolate.Core.csproj" />
     <Project Path="HotChocolate/Core/src/Execution.Abstractions/HotChocolate.Execution.Abstractions.csproj" />
+    <Project Path="HotChocolate/Core/src/Execution.Configuration.Abstractions/HotChocolate.Execution.Configuration.Abstractions.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" />
@@ -107,6 +110,7 @@
   <Folder Name="/HotChocolate/Core/test/">
     <Project Path="HotChocolate/Core/test/Abstractions.Tests/HotChocolate.Abstractions.Tests.csproj" />
     <Project Path="HotChocolate/Core/test/Authorization.Tests/HotChocolate.Authorization.Tests.csproj" />
+    <Project Path="HotChocolate/Core/test/Execution.Abstractions.Tests/HotChocolate.Execution.Abstractions.Tests.csproj" />
     <Project Path="HotChocolate/Core/test/Execution.Tests/HotChocolate.Execution.Tests.csproj" />
     <Project Path="HotChocolate/Core/test/Features.Tests/HotChocolate.Features.Tests.csproj" />
     <Project Path="HotChocolate/Core/test/Fetching.Tests/HotChocolate.Fetching.Tests.csproj" />
@@ -118,6 +122,7 @@
     <Project Path="HotChocolate/Core/test/Subscriptions.Redis.Tests/HotChocolate.Subscriptions.Redis.Tests.csproj" />
     <Project Path="HotChocolate/Core/test/Subscriptions.Tests/HotChocolate.Subscriptions.Tests.csproj" />
     <Project Path="HotChocolate/Core/test/Types.Analyzers.Tests/HotChocolate.Types.Analyzers.Tests.csproj" />
+    <Project Path="HotChocolate/Core/test/Types.Analyzer.Integration.Tests/HotChocolate.Types.Analyzers.Integration.Tests.csproj" />
     <Project Path="HotChocolate/Core/test/Types.CursorPagination.Tests/HotChocolate.Types.CursorPagination.Tests.csproj" />
     <Project Path="HotChocolate/Core/test/Types.Json.Tests/HotChocolate.Types.Json.Tests.csproj" />
     <Project Path="HotChocolate/Core/test/Types.Mutations.Tests/HotChocolate.Types.Mutations.Tests.csproj" />
@@ -131,9 +136,6 @@
     <Project Path="HotChocolate/Core/test/Utilities/HotChocolate.Tests.Utilities.csproj" />
     <Project Path="HotChocolate/Core/test/Validation.Tests/HotChocolate.Validation.Tests.csproj" />
   </Folder>
-  <Folder Name="/HotChocolate/Core/test/Types.Analyzer.Integration.Tests/">
-    <Project Path="HotChocolate/Core/test/Types.Analyzer.Integration.Tests/HotChocolate.Types.Analyzers.Tests.csproj" />
-  </Folder>
   <Folder Name="/HotChocolate/CostAnalysis/" />
   <Folder Name="/HotChocolate/CostAnalysis/src/">
     <Project Path="HotChocolate/CostAnalysis/src/CostAnalysis/HotChocolate.CostAnalysis.csproj" />
@@ -266,6 +268,8 @@
   </Folder>
   <Folder Name="/HotChocolate/Utilities/" />
   <Folder Name="/HotChocolate/Utilities/src/">
+    <Project Path="HotChocolate/Utilities/src/Utilities.Buffers/HotChocolate.Utilities.Buffers.csproj" />
+    <Project Path="HotChocolate/Utilities/src/Utilities.Tasks/HotChocolate.Utilities.Tasks.csproj" />
     <Project Path="HotChocolate/Utilities/src/Utilities.DependencyInjection/HotChocolate.Utilities.DependencyInjection.csproj" />
     <Project Path="HotChocolate/Utilities/src/Utilities.Introspection/HotChocolate.Utilities.Introspection.csproj" />
     <Project Path="HotChocolate/Utilities/src/Utilities/HotChocolate.Utilities.csproj" />

src/CookieCrumble/src/CookieCrumble.HotChocolate/Extensions/SnapshotExtensions.cs

@@ -18,7 +18,7 @@ public static void MatchSnapshot(
             formatter: SnapshotValueFormatters.GraphQL);
 
     public static void MatchSnapshot(
-        this ISchema? value,
+        this ISchemaDefinition? value,
         string? postFix = null)
         => Snapshot.Match(
             value,

src/CookieCrumble/src/CookieCrumble.HotChocolate/Formatters/SchemaSnapshotValueFormatter.cs

@@ -4,8 +4,8 @@
 
 namespace CookieCrumble.HotChocolate.Formatters;
 
-internal sealed class SchemaSnapshotValueFormatter() : SnapshotValueFormatter<ISchema>("graphql")
+internal sealed class SchemaSnapshotValueFormatter() : SnapshotValueFormatter<ISchemaDefinition>("graphql")
 {
-    protected override void Format(IBufferWriter<byte> snapshot, ISchema value)
+    protected override void Format(IBufferWriter<byte> snapshot, ISchemaDefinition value)
         => snapshot.Append(value.ToString());
 }

src/GreenDonut/CHANGELOG.md

@@ -112,7 +112,7 @@ public static ImmutableArray<PageCursor> CreateRelativeForwardCursors<T>(this Pa
             return [];
         }
 
-        var totalPages = (page.TotalCount ?? 0) / (page.RequestedSize ?? 10);
+        var totalPages = Math.Ceiling((double)(page.TotalCount ?? 0) / (page.RequestedSize ?? 10));
 
         if (page.Index >= totalPages)
         {

src/GreenDonut/src/GreenDonut.Data/Extensions/GreenDonutPageExtensions.cs

@@ -728,6 +728,23 @@ await ctx.Brands.Where(t => t.GroupId == 2).OrderBy(t => t.Name).ThenBy(t => t.I
         await Assert.ThrowsAsync<ArgumentException>(Error);
     }
 
+    [Fact]
+    public async Task RequestedSize_Not_Evenly_Divisible_By_TotalCount()
+    {
+        // Arrange
+        var connectionString = CreateConnectionString();
+        await SeedAsync(connectionString);
+        await using var context = new TestContext(connectionString);
+        var arguments = new PagingArguments(12) { EnableRelativeCursors = true };
+
+        // Act
+        var first = await context.Brands.OrderBy(t => t.Name).ThenBy(t => t.Id).ToPageAsync(arguments);
+
+        // Assert
+        Assert.Equal(20, first.TotalCount);
+        Assert.Single(first.CreateRelativeForwardCursors());
+    }
+
     private static async Task SeedAsync(string connectionString)
     {
         await using var context = new TestContext(connectionString);

src/GreenDonut/test/GreenDonut.Data.EntityFramework.Tests/RelativeCursorTests.cs

@@ -30,7 +30,7 @@ public static IRequestExecutorBuilder AddApolloFederation(
         FederationVersion version = FederationVersion.Default)
     {
         ArgumentNullException.ThrowIfNull(builder);
-        builder.SetContextData(FederationContextData.FederationVersion, version);
+        builder.ConfigureSchema(b => b.Features.Set(new ApolloFederationFeature(version)));
         builder.TryAddTypeInterceptor<FederationTypeInterceptor>();
         builder.BindRuntimeType<Policy, StringType>();
         builder.AddTypeConverter<Policy, string>(from => from.Value);

src/HotChocolate/ApolloFederation/src/ApolloFederation/Extensions/ApolloFederationRequestExecutorBuilderExtensions.cs

@@ -1,5 +1,6 @@
+using HotChocolate.Features;
 using HotChocolate.Types.Descriptors;
-using HotChocolate.Types.Descriptors.Definitions;
+using HotChocolate.Types.Descriptors.Configurations;
 
 namespace HotChocolate.ApolloFederation;
 
@@ -31,31 +32,12 @@ [new Uri(FederationVersionUrls.Federation27)] = FederationVersion.Federation27,
 
     public static FederationVersion GetFederationVersion<T>(
         this IDescriptor<T> descriptor)
-        where T : DefinitionBase
-    {
-        var contextData = descriptor.Extend().Context.ContextData;
-        if (contextData.TryGetValue(FederationContextData.FederationVersion, out var value) &&
-            value is FederationVersion version and > FederationVersion.Unknown)
-        {
-            return version;
-        }
-
-        // TODO : resources
-        throw new InvalidOperationException("The configuration state is invalid.");
-    }
+        where T : TypeSystemConfiguration
+        => descriptor.Extend().Context.GetFederationVersion();
 
     public static FederationVersion GetFederationVersion(
         this IDescriptorContext context)
-    {
-        if (context.ContextData.TryGetValue(FederationContextData.FederationVersion, out var value) &&
-            value is FederationVersion version and > FederationVersion.Unknown)
-        {
-            return version;
-        }
-
-        // TODO : resources
-        throw new InvalidOperationException("The configuration state is invalid.");
-    }
+        => context.Features.GetRequired<ApolloFederationFeature>().Version;
 
     public static Uri ToUrl(this FederationVersion version)
     {

src/HotChocolate/ApolloFederation/src/ApolloFederation/Extensions/FederationVersionExtensions.cs

@@ -0,0 +1,3 @@
+namespace HotChocolate.ApolloFederation;
+
+internal sealed record ApolloFederationFeature(FederationVersion Version);

src/HotChocolate/ApolloFederation/src/ApolloFederation/Features/ApolloFederationFeature.cs

@@ -0,0 +1,3 @@
+namespace HotChocolate.ApolloFederation;
+
+internal sealed class ContactMarker;

src/HotChocolate/ApolloFederation/src/ApolloFederation/Features/ContactMarker.cs

@@ -0,0 +1,6 @@
+namespace HotChocolate.ApolloFederation;
+
+internal sealed class ExportedDirectives
+{
+    public List<Type> Directives { get; } = [];
+}

src/HotChocolate/ApolloFederation/src/ApolloFederation/Features/ExportedDirectives.cs

@@ -0,0 +1,9 @@
+using HotChocolate.Language;
+
+namespace HotChocolate.ApolloFederation;
+
+internal sealed class ExternalSetter(Action<ObjectType, IValueNode, object> setter)
+{
+    public void Invoke(ObjectType type, IValueNode data, object obj)
+        => setter(type, data, obj);
+}

src/HotChocolate/ApolloFederation/src/ApolloFederation/Features/ExternalSetter.cs

@@ -0,0 +1,3 @@
+namespace HotChocolate.ApolloFederation;
+
+internal sealed record KeyMarker(bool Resolvable);

src/HotChocolate/ApolloFederation/src/ApolloFederation/Features/KeyMarker.cs

@@ -0,0 +1,5 @@
+using HotChocolate.Resolvers;
+
+namespace HotChocolate.ApolloFederation;
+
+internal sealed record ReferenceResolver(FieldResolverDelegate Resolver);

src/HotChocolate/ApolloFederation/src/ApolloFederation/Features/ReferenceResolver.cs

@@ -4,9 +4,6 @@ internal static class FederationContextData
 {
     public const string KeyMarker = "HotChocolate.ApolloFederation.Key";
     public const string ContactMarker = "HotChocolate.ApolloFederation.Contact";
-    public const string ExternalSetter = "HotChocolate.ApolloFederation.ExternalSetter";
-    public const string EntityResolver = "HotChocolate.ApolloFederation.EntityResolver";
-    public const string FederationVersion = "HotChocolate.ApolloFederation.Version";
     public const string ExportedDirectives = "HotChocolate.ApolloFederation.ExportedDirectives";
     public const string DataField = "data";
     public const string TypeField = "__type";