Skimmed Schema Improvements for Fusion (#7167)

.build/Helpers.cs

@@ -25,6 +25,7 @@ static class Helpers
         Path.Combine("HotChocolate", "Marten"),
         Path.Combine("HotChocolate", "MongoDb"),
         Path.Combine("HotChocolate", "OpenApi"),
+        Path.Combine("HotChocolate", "Primitives"),
         Path.Combine("HotChocolate", "Raven"),
         Path.Combine("HotChocolate", "Skimmed"),
         Path.Combine("HotChocolate", "Fusion"),

src/CookieCrumble/src/CookieCrumble/CookieCrumble.csproj

@@ -34,9 +34,8 @@
     <ProjectReference Include="..\..\..\HotChocolate\AspNetCore\src\Transport.Abstractions\HotChocolate.Transport.Abstractions.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net8.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
     <ProjectReference Include="..\..\..\HotChocolate\Fusion\src\Core\HotChocolate.Fusion.csproj" />
-    <ProjectReference Include="..\..\..\HotChocolate\Skimmed\src\Skimmed\Skimmed.csproj" />
   </ItemGroup>
 
 </Project>

src/CookieCrumble/src/CookieCrumble/Formatters/QueryPlanSnapshotValueFormatter.cs

@@ -1,4 +1,4 @@
-#if NET7_0_OR_GREATER
+#if NET8_0_OR_GREATER
 using System.Buffers;
 using HotChocolate.Fusion.Execution.Nodes;
 

src/CookieCrumble/src/CookieCrumble/LocalFactDiscoverer.cs

@@ -7,25 +7,29 @@ namespace CookieCrumble;
 [XunitTestCaseDiscoverer("LocalFactDiscoverer", "YourTestAssemblyName")]
 public class LocalFactAttribute : FactAttribute;
 
-public class LocalFactDiscoverer : FactDiscoverer
+public class LocalFactDiscoverer(IMessageSink diagnosticMessageSink) : FactDiscoverer(diagnosticMessageSink)
 {
-    private readonly IMessageSink _diagnosticMessageSink;
+    private readonly IMessageSink _diagnosticMessageSink = diagnosticMessageSink;
 
-    public LocalFactDiscoverer(IMessageSink diagnosticMessageSink) : base(diagnosticMessageSink)
-    {
-        _diagnosticMessageSink = diagnosticMessageSink;
-    }
-
-
-    protected override IXunitTestCase CreateTestCase(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute)
+    protected override IXunitTestCase CreateTestCase(
+        ITestFrameworkDiscoveryOptions discoveryOptions,
+        ITestMethod testMethod,
+        IAttributeInfo factAttribute)
     {
         if (TestEnvironment.IsLocalEnvironment())
         {
-            return new XunitTestCase(_diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), discoveryOptions.MethodDisplayOptionsOrDefault(), testMethod);
-        }
-        else
-        {
-            return new ExecutionErrorTestCase(_diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), discoveryOptions.MethodDisplayOptionsOrDefault(), testMethod, "LocalFact tests cannot run in CI environment");
+            return new XunitTestCase(
+                _diagnosticMessageSink,
+                discoveryOptions.MethodDisplayOrDefault(),
+                discoveryOptions.MethodDisplayOptionsOrDefault(),
+                testMethod);
         }
+
+        return new ExecutionErrorTestCase(
+            _diagnosticMessageSink,
+            discoveryOptions.MethodDisplayOrDefault(),
+            discoveryOptions.MethodDisplayOptionsOrDefault(),
+            testMethod,
+            "LocalFact tests cannot run in CI environment");
     }
 }

src/CookieCrumble/src/CookieCrumble/Snapshot.cs

@@ -31,9 +31,8 @@ public class Snapshot
             new HttpResponseSnapshotValueFormatter(),
             new OperationResultSnapshotValueFormatter(),
             new JsonElementSnapshotValueFormatter(),
-#if NET7_0_OR_GREATER
+#if NET8_0_OR_GREATER
             new QueryPlanSnapshotValueFormatter(),
-            new SkimmedSchemaSnapshotValueFormatter(),
 #endif
         });
     private static readonly JsonSnapshotValueFormatter _defaultFormatter = new();

src/HotChocolate/Core/src/Abstractions/HotChocolate.Abstractions.csproj

@@ -22,7 +22,7 @@
 
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Language\src\Language\HotChocolate.Language.csproj" />
+    <ProjectReference Include="..\..\..\Primitives\src\Primitives\HotChocolate.Primitives.csproj" />
   </ItemGroup>
 
   <ItemGroup>

src/HotChocolate/Core/src/Features/EmptyFeatureCollection.cs

@@ -0,0 +1,44 @@
+using System.Collections;
+using System.Diagnostics.CodeAnalysis;
+
+namespace HotChocolate.Features;
+
+public sealed class EmptyFeatureCollection : IFeatureCollection
+{
+    private EmptyFeatureCollection()
+    {
+    }
+
+    public bool IsReadOnly => true;
+
+    public int Revision => 0;
+
+    public object? this[Type key]
+    {
+        get => default;
+        set => ThrowReadOnly();
+    }
+
+    /// <inheritdoc />
+    public TFeature? Get<TFeature>()
+        => default;
+
+    /// <inheritdoc />
+    public void Set<TFeature>(TFeature? instance)
+        => ThrowReadOnly();
+
+    [DoesNotReturn]
+    private static void ThrowReadOnly()
+        => throw new NotSupportedException("The feature collection is read-only.");
+
+    /// <inheritdoc />
+    public IEnumerator<KeyValuePair<Type, object>> GetEnumerator()
+    {
+        yield break;
+    }
+
+    /// <inheritdoc />
+    IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+
+    public static EmptyFeatureCollection Default { get; } = new();
+}

src/HotChocolate/Core/src/Features/IFeatureProvider.cs

@@ -0,0 +1,14 @@
+// This code was originally forked of https://github.com/dotnet/aspnetcore/tree/c7aae8ff34dce81132d0fb3a976349dcc01ff903/src/Extensions/Features/src
+
+namespace HotChocolate.Features;
+
+/// <summary>
+/// An object that has features.
+/// </summary>
+public interface IFeatureProvider
+{
+    /// <summary>
+    /// Gets the feature collection.
+    /// </summary>
+    IFeatureCollection Features { get; }
+}

src/HotChocolate/Core/src/Features/ReadOnlyFeatureCollection.cs

@@ -66,8 +66,8 @@ public ReadOnlyFeatureCollection(IFeatureCollection features)
     }
 
     /// <inheritdoc />
-    public void Set<TFeature>(TFeature? instance) =>
-        throw new NotSupportedException("The feature collection is read-only.");
+    public void Set<TFeature>(TFeature? instance)
+        => throw new NotSupportedException("The feature collection is read-only.");
 
     /// <inheritdoc />
     public IEnumerator<KeyValuePair<Type, object>> GetEnumerator() => _features.GetEnumerator();

src/HotChocolate/Core/src/Types/Types/DirectiveCollection.cs

@@ -81,7 +81,7 @@ private static IEnumerable<Directive> FindDirectives(Directive[] directives, str
 
         return null;
     }
-    
+
     /// <inheritdoc />
     public Directive? FirstOrDefault<TRuntimeType>()
     {
@@ -230,7 +230,7 @@ public bool ContainsDirective<TRuntimeType>()
 
         // If we had any errors while building the directives list we will
         // clean the null entries out so that the list is consistent.
-        // We only do that so we can collect other schema errors as well and do
+        // We only do that, so we can collect other schema errors as well and do
         // not have to fully fail here but have one SchemaException at the end of
         // the schema creation that contains a list of errors.
         if (hasErrors)

src/HotChocolate/Fusion/Directory.Build.props

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />
 
   <PropertyGroup>
-    <TargetFrameworks>$(Library3TargetFrameworks)</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
 
 </Project>

src/HotChocolate/Fusion/src/Composition/CompositionContext.cs

@@ -59,7 +59,7 @@ internal sealed class CompositionContext
     /// <summary>
     /// Gets the subgraph schemas.
     /// </summary>
-    public List<Schema> Subgraphs { get; } = [];
+    public List<SchemaDefinition> Subgraphs { get; } = [];
 
     /// <summary>
     /// Get the grouped subgraph entities.
@@ -69,7 +69,7 @@ internal sealed class CompositionContext
     /// <summary>
     /// Gets the fusion graph schema.
     /// </summary>
-    public Schema FusionGraph { get; }
+    public SchemaDefinition FusionGraph { get; }
 
     /// <summary>
     /// Gets the fusion types.
@@ -105,7 +105,7 @@ internal sealed class CompositionContext
     /// <returns>
     /// Returns the subgraph schema.
     /// </returns>
-    public Schema GetSubgraphSchema(string subgraphName)
+    public SchemaDefinition GetSubgraphSchema(string subgraphName)
         => Subgraphs.First(t => t.Name.EqualsOrdinal(subgraphName));
 
     /// <summary>
@@ -130,11 +130,11 @@ public Schema GetSubgraphSchema(string subgraphName)
         string subgraphName,
         SchemaCoordinate coordinate,
         [NotNullWhen(true)] out T? member)
-        where T : ITypeSystemMember
+        where T : ITypeSystemMemberDefinition
         => GetSubgraphSchema(subgraphName).TryGetMember(coordinate, out member);
 
     public IEnumerable<T> GetSubgraphMembers<T>(SchemaCoordinate coordinate)
-        where T : ITypeSystemMember
+        where T : ITypeSystemMemberDefinition
     {
         foreach (var subgraph in Subgraphs)
         {

src/HotChocolate/Fusion/src/Composition/Directives/DirectivesHelper.cs

@@ -1,7 +1,7 @@
 using HotChocolate.Language;
 using HotChocolate.Utilities;
 using static HotChocolate.Fusion.Composition.Properties.CompositionResources;
-using IHasDirectives = HotChocolate.Skimmed.IHasDirectives;
+using IDirectivesProvider = HotChocolate.Skimmed.IDirectivesProvider;
 
 namespace HotChocolate.Fusion.Composition;
 
@@ -15,10 +15,10 @@ internal static class DirectivesHelper
     public const string NewNameArg = "newName";
     public const string FieldArg = "field";
 
-    public static bool ContainsIsDirective(this IHasDirectives member)
+    public static bool ContainsIsDirective(this IDirectivesProvider member)
         => member.Directives.ContainsName(IsDirectiveName);
 
-    public static IsDirective GetIsDirective(this IHasDirectives member)
+    public static IsDirective GetIsDirective(this IDirectivesProvider member)
     {
         var directive = member.Directives[IsDirectiveName].First();
 
@@ -40,10 +40,10 @@ public static IsDirective GetIsDirective(this IHasDirectives member)
             DirectivesHelper_GetIsDirective_NoFieldAndNoCoordinate);
     }
 
-    public static bool ContainsRequireDirective(this IHasDirectives member)
+    public static bool ContainsRequireDirective(this IDirectivesProvider member)
         => member.Directives.ContainsName(RequireDirectiveName);
 
-    public static RequireDirective GetRequireDirective(this IHasDirectives member)
+    public static RequireDirective GetRequireDirective(this IDirectivesProvider member)
     {
         var directive = member.Directives[RequireDirectiveName].First();
         var arg = directive.Arguments.FirstOrDefault(t => t.Name.EqualsOrdinal(FieldArg));

src/HotChocolate/Fusion/src/Composition/Entities/EntityPart.cs

@@ -3,12 +3,12 @@
 namespace HotChocolate.Fusion.Composition;
 
 /// <summary>
-/// Represents an entity part that maps to an <see cref="ObjectType"/> in a <see cref="Schema"/>.
+/// Represents an entity part that maps to an <see cref="ObjectTypeDefinition"/> in a <see cref="Schema"/>.
 /// </summary>
 /// <param name="Type">
-/// The <see cref="ObjectType"/> that defines the structure of the entity.
+/// The <see cref="ObjectTypeDefinition"/> that defines the structure of the entity.
 /// </param>
 /// <param name="Schema">
-/// The schema to which the <see cref="ObjectType"/> belongs.
+/// The schema to which the <see cref="ObjectTypeDefinition"/> belongs.
 /// </param>
-internal sealed record EntityPart(ObjectType Type, Schema Schema);
+internal sealed record EntityPart(ObjectTypeDefinition Type, SchemaDefinition Schema);

src/HotChocolate/Fusion/src/Composition/Entities/MemberReference.cs

@@ -3,4 +3,4 @@
 
 namespace HotChocolate.Fusion.Composition;
 
-internal sealed record MemberReference(InputField Argument, FieldNode Requirement);
+internal sealed record MemberReference(InputFieldDefinition Argument, FieldNode Requirement);

src/HotChocolate/Fusion/src/Composition/Extensions/ComplexTypeMergeExtensions.cs

@@ -7,12 +7,12 @@ internal static class ComplexTypeMergeExtensions
 {
     // This extension method creates a new OutputField by replacing the type name of each field
     // in the source with the corresponding type name in the target schema.
-    public static OutputField CreateField(
+    public static OutputFieldDefinition CreateField(
         this CompositionContext context,
-        OutputField source,
-        Schema targetSchema)
+        OutputFieldDefinition source,
+        SchemaDefinition targetSchema)
     {
-        var target = new OutputField(source.Name);
+        var target = new OutputFieldDefinition(source.Name);
         target.MergeDescriptionWith(source);
         target.MergeDeprecationWith(source);
 
@@ -24,14 +24,14 @@ internal static class ComplexTypeMergeExtensions
         // in the source with the corresponding type name in the target schema.
         foreach (var sourceArgument in source.Arguments)
         {
-            var targetArgument = new InputField(sourceArgument.Name);
+            var targetArgument = new InputFieldDefinition(sourceArgument.Name);
             targetArgument.MergeDescriptionWith(sourceArgument);
             targetArgument.DefaultValue = sourceArgument.DefaultValue;
 
             // Replace the type name of the argument in the source with the corresponding type name
             // in the target schema.
             targetArgument.Type = sourceArgument.Type.ReplaceNameType(n => targetSchema.Types[n]);
-            
+
             targetArgument.MergeDeprecationWith(sourceArgument);
 
             target.Arguments.Add(targetArgument);
@@ -45,8 +45,8 @@ internal static class ComplexTypeMergeExtensions
     // names or if the number of arguments does not match.
     public static void MergeField(
         this CompositionContext context,
-        OutputField source,
-        OutputField target,
+        OutputFieldDefinition source,
+        OutputFieldDefinition target,
         string typeName)
     {
         var mergedType = MergeOutputType(source.Type, target.Type);
@@ -85,7 +85,7 @@ internal static class ComplexTypeMergeExtensions
             if (source.Arguments.TryGetField(targetArgument.Name, out var sourceArgument))
             {
                 argMatchCount++;
-                
+
                 var mergedInputType = MergeInputType(sourceArgument.Type, targetArgument.Type);
 
                 if (mergedInputType is null)
@@ -98,7 +98,7 @@ internal static class ComplexTypeMergeExtensions
                             targetArgument.Type));
                     return;
                 }
-                
+
                 if(!targetArgument.Type.Equals(mergedInputType, TypeComparison.Structural))
                 {
                     targetArgument.Type = mergedInputType;
@@ -145,4 +145,4 @@ internal static class ComplexTypeMergeExtensions
             }
         }
     }
-}
+}