Skimmed Schema Improvements for Fusion (#7167)

Author: michaelstaib

.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/Formatters/SkimmedSchemaSnapshotValueFormatter.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/LocalFactDiscoverer.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/CookieCrumble/src/CookieCrumble/Snapshot.cs

@@ -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/Abstractions/HotChocolate.Abstractions.csproj

@@ -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/EmptyFeatureCollection.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/IFeatureProvider.cs

@@ -66,8 +66,8 @@ public object? this[Type key]
     }
 
     /// <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();