Merge branch 'main' into spec-graphql-https

cSpell.json

@@ -33,6 +33,7 @@
     "traversion",
     "Websockets",
     "Newtonsoft",
+    "supergraph",
     "cachable",
     "fricking",
     "runtimes",

src/CookieCrumble/src/CookieCrumble/LocalFactDiscoverer.cs

@@ -6,7 +6,7 @@
 namespace CookieCrumble;
 
 [XunitTestCaseDiscoverer("LocalFactDiscoverer", "YourTestAssemblyName")]
-public class LocalFactAttribute : FactAttribute { }
+public class LocalFactAttribute : FactAttribute;
 
 public class LocalFactDiscoverer : FactDiscoverer
 {

src/HotChocolate/AspNetCore/src/Transport.Abstractions/Serialization/Utf8JsonWriterHelper.cs

@@ -115,6 +115,10 @@ internal static void WriteFieldValue(
             case Dictionary<string, object?> dict:
                 WriteDictionary(writer, dict);
                 break;
+
+            case byte[] bytes:
+                writer.WriteBase64StringValue(bytes);
+                break;
 
             case IList list:
                 WriteList(writer, list);

src/HotChocolate/Core/src/Abstractions/ScopedServiceAttribute.cs

@@ -7,4 +7,4 @@ namespace HotChocolate;
 /// </summary>
 [Obsolete("Use [Service(ServiceKind.Pooled)] or [Service(ServiceKind.Resolver)]")]
 [AttributeUsage(AttributeTargets.Parameter)]
-public sealed class ScopedServiceAttribute : Attribute { }
+public sealed class ScopedServiceAttribute : Attribute;

src/HotChocolate/Core/src/Abstractions/Types/IInputType.cs

@@ -6,4 +6,4 @@ namespace HotChocolate.Types;
 ///
 /// Spec: https://spec.graphql.org/draft/#sec-Input-and-Output-Types
 /// </summary>
-public interface IInputType : IType, IHasRuntimeType { }
+public interface IInputType : IType, IHasRuntimeType;

src/HotChocolate/Core/src/Abstractions/Types/ITypeSystemMember.cs

@@ -4,4 +4,4 @@ namespace HotChocolate.Types;
 /// This marker interface identifies member of the type system like
 /// types, directives, the schema or fields and arguments.
 /// </summary>
-public interface ITypeSystemMember { }
+public interface ITypeSystemMember;

src/HotChocolate/Core/src/Execution/Options/IRequestExecutorOptionsAccessor.cs

@@ -10,5 +10,4 @@ public interface IRequestExecutorOptionsAccessor
     : IErrorHandlerOptionsAccessor
     , IRequestTimeoutOptionsAccessor
     , IComplexityAnalyzerOptionsAccessor
-    , IPersistedQueryOptionsAccessor
-{ }
+    , IPersistedQueryOptionsAccessor;

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

@@ -294,4 +294,4 @@ private static T CreateDataLoader<T>(IServiceProvider services)
     }
 }
 
-internal sealed class GetDataLoaderAttribute : Attribute { }
+internal sealed class GetDataLoaderAttribute : Attribute;

src/HotChocolate/Core/src/Subscriptions/Diagnostics/ISubscriptionDiagnosticEventsListener.cs

@@ -6,4 +6,4 @@ namespace HotChocolate.Subscriptions.Diagnostics;
 /// and they will all be notified in the registration order.
 /// </summary>
 /// <seealso cref="SubscriptionDiagnosticEventsListener"/>
-public interface ISubscriptionDiagnosticEventsListener : ISubscriptionDiagnosticEvents { }
+public interface ISubscriptionDiagnosticEventsListener : ISubscriptionDiagnosticEvents;

src/HotChocolate/Core/src/Types/Types/Relay/Attributes/NodeResolverAttribute.cs

@@ -6,4 +6,4 @@ namespace HotChocolate.Types.Relay;
 /// This attribute marks the node resolver in a relay node type.
 /// </summary>
 [AttributeUsage(AttributeTargets.Method)]
-public sealed class NodeResolverAttribute : Attribute { }
+public sealed class NodeResolverAttribute : Attribute;

src/HotChocolate/Core/test/Abstractions.Tests/MutationResultTests.cs

@@ -2689,13 +2689,13 @@ void Error()
         Assert.Throws<ArgumentException>(Error);
     }
 
-    public class ErrorObj1 { }
+    public class ErrorObj1;
 
-    public class ErrorObj2 { }
+    public class ErrorObj2;
 
-    public class ErrorObj3 { }
+    public class ErrorObj3;
 
-    public class ErrorObj4 { }
+    public class ErrorObj4;
 
-    public class ErrorObj5 { }
+    public class ErrorObj5;
 }

src/HotChocolate/Core/test/Authorization.Tests/AnnotationBasedAuthorizationTests.cs

@@ -1001,7 +1001,7 @@ public sealed record Street(string? Value) : ICityOrStreet;
     public sealed record City(string? Value) : ICityOrStreet;
 
     [UnionType]
-    public interface ICityOrStreet { }
+    public interface ICityOrStreet;
 
     [Node]
     [ExtendObjectType<Street>]
@@ -1090,7 +1090,7 @@ public ValueTask<AuthorizeResult> AuthorizeAsync(
     }
 
     [DirectiveType(DirectiveLocation.Object)]
-    public sealed class FooDirective { }
+    public sealed class FooDirective;
 
     public sealed class FooDirectiveAttribute : ObjectTypeDescriptorAttribute
     {

src/HotChocolate/Core/test/Authorization.Tests/CodeFirstAuthorizationTests.cs

@@ -579,7 +579,7 @@ private sealed record Street(string? Value) : ICityOrStreet;
 
     private sealed record City(string? Value) : ICityOrStreet;
 
-    private interface ICityOrStreet { }
+    private interface ICityOrStreet;
 
     private sealed class AuthHandler : IAuthorizationHandler
     {

src/HotChocolate/Core/test/Execution.Tests/Errors/ErrorHandlerTests.cs

@@ -206,7 +206,7 @@ public IError OnError(IError error)
         }
     }
 
-    public class SomeService { }
+    public class SomeService;
 
     public class AggregateErrorFilter : IErrorFilter
     {

src/HotChocolate/Core/test/Execution.Tests/SchemaDirectiveTests.cs

@@ -211,5 +211,5 @@ protected override void Configure(IDirectiveTypeDescriptor<Resolve> descriptor)
         }
     }
 
-    public sealed class Resolve { }
+    public sealed class Resolve;
 }

src/HotChocolate/Core/test/Types.Analyzers.Tests/SomeQuery.cs

@@ -102,6 +102,6 @@ public static Task<string> GetGenericById(
     }
 }
 
-public class SomeService { }
+public class SomeService;
 
-public class GenericService<T> { }
+public class GenericService<T>;

src/HotChocolate/Core/test/Types.Tests/Configuration/TypeDiscovererTests.cs

@@ -288,5 +288,5 @@ public class QueryWithInferError2
         public string Foo(IMyArg o) => throw new NotImplementedException();
     }
 
-    public interface IMyArg { }
+    public interface IMyArg;
 }

src/HotChocolate/Core/test/Types.Tests/HotChocolate.Types.Tests.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <AssemblyName>HotChocolate.Types.Tests</AssemblyName>
     <RootNamespace>HotChocolate</RootNamespace>
-    <LangVersion>Preview</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/HotChocolate/Core/test/Types.Tests/Internal/TypeInfoTests.cs

@@ -619,5 +619,5 @@ public class Nullability
 
 #nullable disable
 
-    public class Foo { }
+    public class Foo;
 }

src/HotChocolate/Core/test/Types.Tests/Resolvers/ResolverCompilerTests.cs

@@ -1527,9 +1527,9 @@ public string SetLocalState(
         }
     }
 
-    public class Entity { }
+    public class Entity;
 
-    public class MyService { }
+    public class MyService;
 
     public class QueryWithScopedExpressionBuilder
     {

src/HotChocolate/Core/test/Types.Tests/SchemaBuilderTests.cs

@@ -2264,7 +2264,7 @@ protected override void Configure(ISchemaTypeDescriptor descriptor)
         }
     }
 
-    public class MyEnumType : EnumType { }
+    public class MyEnumType : EnumType;
 
     public class QueryWithIntField
     {

src/HotChocolate/Core/test/Types.Tests/Types/EnumTypeTests.cs

@@ -665,7 +665,7 @@ public enum Foo
         Bar2
     }
 
-    public class Bar { }
+    public class Bar;
 
     public enum FooObsolete
     {

src/HotChocolate/Core/test/Types.Tests/Types/InputObjectTypeTests.cs

@@ -836,7 +836,7 @@ protected override void Configure(
         }
     }
 
-    public class FooDirective { }
+    public class FooDirective;
 
     public class QueryType : ObjectType
     {

src/HotChocolate/Core/test/Types.Tests/Types/ObjectTypeTests.cs

@@ -2267,8 +2267,7 @@ public class FooWithDict
     }
 
     public class MyList
-        : MyListBase
-    { }
+        : MyListBase;
 
     public class MyListBase
         : IQueryable<Bar>

src/HotChocolate/Core/test/Types.Tests/Types/UnionTypeAttributeTests.cs

@@ -38,9 +38,9 @@ public void UnionTypeAttribute_Infer_Union()
     }
 
     [SetName]
-    public interface IUnion1 { }
+    public interface IUnion1;
 
-    public class Foo : IUnion1 { }
+    public class Foo : IUnion1;
 
     public class SetNameAttribute : UnionTypeDescriptorAttribute
     {
@@ -54,8 +54,8 @@ protected override void OnConfigure(
     }
 
     [UnionType(Name = "Union")]
-    public interface IUnion2 { }
+    public interface IUnion2;
 
     [ObjectType(Name = "Type")]
-    public class Union2Type1 : IUnion2 { }
+    public class Union2Type1 : IUnion2;
 }

src/HotChocolate/Core/test/Types.Tests/Types/UnionTypeTests.cs

@@ -267,5 +267,5 @@ protected override void Configure(
         }
     }
 
-    public class FooDirective { }
+    public class FooDirective;
 }

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorComparableTests.Create_ShortIn_Expression_NET8_0.snap

@@ -16,9 +16,14 @@
 
 12and13 SQL:
 ---------------
+.param set @__p_0 '[12,13]'
+
 SELECT "d"."Id", "d"."BarDecimal", "d"."BarDouble", "d"."BarFloat", "d"."BarInt", "d"."BarLong", "d"."BarShort"
 FROM "Data" AS "d"
-WHERE "d"."BarShort" IN (12, 13)
+WHERE "d"."BarShort" IN (
+    SELECT "p"."value"
+    FROM json_each(@__p_0) AS "p"
+)
 ---------------
 
 13and14 Result:
@@ -39,9 +44,14 @@ WHERE "d"."BarShort" IN (12, 13)
 
 13and14 SQL:
 ---------------
+.param set @__p_0 '[13,14]'
+
 SELECT "d"."Id", "d"."BarDecimal", "d"."BarDouble", "d"."BarFloat", "d"."BarInt", "d"."BarLong", "d"."BarShort"
 FROM "Data" AS "d"
-WHERE "d"."BarShort" IN (13, 14)
+WHERE "d"."BarShort" IN (
+    SELECT "p"."value"
+    FROM json_each(@__p_0) AS "p"
+)
 ---------------
 
 nullAnd14

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorComparableTests.Create_ShortNotIn_Expression_NET8_0.snap

@@ -13,9 +13,14 @@
 
 12and13 SQL:
 ---------------
+.param set @__p_0 '[12,13]'
+
 SELECT "d"."Id", "d"."BarDecimal", "d"."BarDouble", "d"."BarFloat", "d"."BarInt", "d"."BarLong", "d"."BarShort"
 FROM "Data" AS "d"
-WHERE "d"."BarShort" NOT IN (12, 13)
+WHERE "d"."BarShort" NOT IN (
+    SELECT "p"."value"
+    FROM json_each(@__p_0) AS "p"
+)
 ---------------
 
 13and14 Result:
@@ -33,9 +38,14 @@ WHERE "d"."BarShort" NOT IN (12, 13)
 
 13and14 SQL:
 ---------------
+.param set @__p_0 '[13,14]'
+
 SELECT "d"."Id", "d"."BarDecimal", "d"."BarDouble", "d"."BarFloat", "d"."BarInt", "d"."BarLong", "d"."BarShort"
 FROM "Data" AS "d"
-WHERE "d"."BarShort" NOT IN (13, 14)
+WHERE "d"."BarShort" NOT IN (
+    SELECT "p"."value"
+    FROM json_each(@__p_0) AS "p"
+)
 ---------------
 
 nullAnd14

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorComparableTests.Create_ShortNullableIn_Expression_NET8_0.snap

@@ -16,9 +16,14 @@
 
 12and13 SQL:
 ---------------
+.param set @__p_0 '[12,13]'
+
 SELECT "d"."Id", "d"."BarShort"
 FROM "Data" AS "d"
-WHERE "d"."BarShort" IN (12, 13)
+WHERE EXISTS (
+    SELECT 1
+    FROM json_each(@__p_0) AS "p"
+    WHERE "p"."value" = "d"."BarShort" OR ("p"."value" IS NULL AND "d"."BarShort" IS NULL))
 ---------------
 
 13and14 Result:
@@ -39,9 +44,14 @@ WHERE "d"."BarShort" IN (12, 13)
 
 13and14 SQL:
 ---------------
+.param set @__p_0 '[13,14]'
+
 SELECT "d"."Id", "d"."BarShort"
 FROM "Data" AS "d"
-WHERE "d"."BarShort" IN (13, 14)
+WHERE EXISTS (
+    SELECT 1
+    FROM json_each(@__p_0) AS "p"
+    WHERE "p"."value" = "d"."BarShort" OR ("p"."value" IS NULL AND "d"."BarShort" IS NULL))
 ---------------
 
 13andNull Result:
@@ -62,7 +72,12 @@ WHERE "d"."BarShort" IN (13, 14)
 
 13andNull SQL:
 ---------------
+.param set @__p_0 '[13,null]'
+
 SELECT "d"."Id", "d"."BarShort"
 FROM "Data" AS "d"
-WHERE "d"."BarShort" IS NULL OR "d"."BarShort" = 13
+WHERE EXISTS (
+    SELECT 1
+    FROM json_each(@__p_0) AS "p"
+    WHERE "p"."value" = "d"."BarShort" OR ("p"."value" IS NULL AND "d"."BarShort" IS NULL))
 ---------------

src/HotChocolate/Data/test/Data.Filters.SqlServer.Tests/__snapshots__/QueryableFilterVisitorComparableTests.Create_ShortNullableNotIn_Expression_NET8_0.snap

@@ -16,9 +16,14 @@
 
 12and13 SQL:
 ---------------
+.param set @__p_0 '[12,13]'
+
 SELECT "d"."Id", "d"."BarShort"
 FROM "Data" AS "d"
-WHERE "d"."BarShort" NOT IN (12, 13) OR "d"."BarShort" IS NULL
+WHERE NOT EXISTS (
+    SELECT 1
+    FROM json_each(@__p_0) AS "p"
+    WHERE "p"."value" = "d"."BarShort" OR ("p"."value" IS NULL AND "d"."BarShort" IS NULL))
 ---------------
 
 13and14 Result:
@@ -39,9 +44,14 @@ WHERE "d"."BarShort" NOT IN (12, 13) OR "d"."BarShort" IS NULL
 
 13and14 SQL:
 ---------------
+.param set @__p_0 '[13,14]'
+
 SELECT "d"."Id", "d"."BarShort"
 FROM "Data" AS "d"
-WHERE "d"."BarShort" NOT IN (13, 14) OR "d"."BarShort" IS NULL
+WHERE NOT EXISTS (
+    SELECT 1
+    FROM json_each(@__p_0) AS "p"
+    WHERE "p"."value" = "d"."BarShort" OR ("p"."value" IS NULL AND "d"."BarShort" IS NULL))
 ---------------
 
 13andNull Result:
@@ -62,7 +72,12 @@ WHERE "d"."BarShort" NOT IN (13, 14) OR "d"."BarShort" IS NULL
 
 13andNull SQL:
 ---------------
+.param set @__p_0 '[13,null]'
+
 SELECT "d"."Id", "d"."BarShort"
 FROM "Data" AS "d"
-WHERE "d"."BarShort" IS NOT NULL AND "d"."BarShort" <> 13
+WHERE NOT EXISTS (
+    SELECT 1
+    FROM json_each(@__p_0) AS "p"
+    WHERE "p"."value" = "d"."BarShort" OR ("p"."value" IS NULL AND "d"."BarShort" IS NULL))
 ---------------