Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using HotChocolate.Data.Projections;
using HotChocolate.Language;
using HotChocolate.Resolvers;
using HotChocolate.Types.Descriptors;
using HotChocolate.Types.Descriptors.Configurations;

namespace HotChocolate.Types;
Expand Down Expand Up @@ -49,8 +51,10 @@ private static IObjectFieldDescriptor ApplyMiddleware(

var selectionType = typeInfo.NamedType;
definition.ResultType = selectionType;
definition.Type =
context.TypeInspector.GetTypeRef(selectionType, TypeContext.Output);
if (ShouldRewriteFieldType(definition.Type))
{
definition.Type = context.TypeInspector.GetTypeRef(selectionType, TypeContext.Output);
}

definition.Tasks.Add(
new OnCompleteTypeSystemConfigurationTask<ObjectFieldConfiguration>(
Expand All @@ -69,6 +73,16 @@ private static IObjectFieldDescriptor ApplyMiddleware(
return descriptor;
}

private static bool ShouldRewriteFieldType(TypeReference? typeReference)
=> typeReference switch
{
null => true,
ExtendedTypeReference extended => extended.Type.IsArrayOrList,
SyntaxTypeReference syntax => syntax.Type.IsListType(),
FactoryTypeReference factory => factory.TypeStructure.IsListType(),
_ => false
};

private static void CompileMiddleware(
Type type,
ObjectFieldConfiguration definition,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,45 @@ public async Task ExecuteAsync_Should_ReturnNull_When_FirstOrDefaultZero_AsyncEn
result.MatchSnapshot();
}

[Fact]
public async Task UseSingleOrDefault_Should_Respect_Explicit_Field_Type()
{
// arrange
var users = new SingleOrDefaultUser[]
{
new SingleOrDefaultActiveUser
{
Name = "Alice",
IsActive = true
}
}.AsQueryable();

var executor = await new ServiceCollection()
.AddGraphQL()
.AddQueryType(
x => x
.Name("Query")
.Field("user")
.Type<ObjectType<SingleOrDefaultActiveUser>>()
.Resolve(users)
.UseSingleOrDefault())
.BuildRequestExecutorAsync();

// act
var result = await executor.ExecuteAsync(
"""
{
user {
name
isActive
}
}
""");

// assert
result.MatchSnapshot();
}

[Fact]
public async Task UseProjection_Should_Preserve_Entity_Constructor_DbContext_Injection()
{
Expand Down Expand Up @@ -659,4 +698,14 @@ public class ConstructorInjectionPost

public int BlogId { get; set; }
}

public class SingleOrDefaultUser
{
public string Name { get; set; } = string.Empty;
}

public class SingleOrDefaultActiveUser : SingleOrDefaultUser
{
public bool IsActive { get; set; }
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"data": {
"user": {
"name": "Alice",
"isActive": true
}
}
}
Loading