Skip to content

Fix issue where non-conditional fields become conditional. #9706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelstaib merged 3 commits into from
May 15, 2026
Merged

Fix issue where non-conditional fields become conditional. #9706

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a73604f
Fix issue where non-conditional fields become conditional.
michaelstaib May 15, 2026
fdb05f3
Fix more tests
michaelstaib May 15, 2026
0190ec9
Merge branch 'main' into mst/conditional-selections
michaelstaib May 15, 2026
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
3 changes: 1 addition & 2 deletions src/HotChocolate/Core/src/Types/Execution/Processing/OperationCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,13 +291,12 @@ private SelectionSet BuildSelectionSet(
var includeFlags = new List<ulong>();
var deferUsages = new List<DeferUsage>();
var selectionSetId = ++lastId;
var alwaysIncluded = false;

foreach (var (responseName, nodes) in fieldMap)
{
includeFlags.Clear();
deferUsages.Clear();

var alwaysIncluded = false;
var first = nodes[0];
var isInternal = IsInternal(first.Node);
var hasNonDeferredNode = first.DeferUsage is null;
Expand Down
140 changes: 140 additions & 0 deletions src/HotChocolate/Core/test/Execution.Tests/Processing/SelectionIncludeConditionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,12 +758,134 @@ fragment B on Person {
""");
}

[Fact]
public async Task Complementary_Fragment_Spreads_Should_Use_Full_Fragment_When_Minimal_Is_False()
{
// arrange
var result = await ExecuteComplementaryFragmentQueryAsync(minimal: false);

// assert
result.MatchInlineSnapshot(
"""
{
"data": {
"series": [
{
"streams": [
{
"__typename": "Stream",
"id": "stream-1",
"hasDrm": true,
"title": "Stream One",
"publishedAt": "2026-01-01"
}
]
}
]
}
}
""");
}

[Fact]
public async Task Complementary_Fragment_Spreads_Should_Use_Minimal_Fragment_When_Minimal_Is_True()
{
// arrange
var result = await ExecuteComplementaryFragmentQueryAsync(minimal: true);

// assert
result.MatchInlineSnapshot(
"""
{
"data": {
"series": [
{
"streams": [
{
"__typename": "Stream",
"id": "stream-1",
"hasDrm": true
}
]
}
]
}
}
""");
}

private static async Task<IExecutionResult> ExecuteComplementaryFragmentQueryAsync(bool minimal)
{
var schema = SchemaBuilder.New()
.AddDocumentFromString(
"""
type Query {
series: [Series!]!
}

type Series {
id: ID!
streams: [Stream!]!
}

type Stream {
id: ID!
title: String
hasDrm: Boolean
publishedAt: String
}
""")
.AddResolver<Query>()
.Create();

return await schema.MakeExecutable().ExecuteAsync(
OperationRequestBuilder.New()
.SetDocument(
"""
query TestQuery($minimal: Boolean = false) {
series {
streams {
__typename
...streamFields
}
}
}

fragment streamFields on Stream {
__typename
...MinimalStream @include(if: $minimal)
...FullStream @skip(if: $minimal)
}

fragment MinimalStream on Stream {
id
hasDrm
}

fragment FullStream on Stream {
id
title
hasDrm
publishedAt
}
""")
.SetVariableValues(
$$"""
{
"minimal": {{minimal.ToString().ToLowerInvariant()}}
}
""")
.Build());
}

public sealed class Query
{
public Person Person() => new Person();

[UsePaging]
public Person[] Persons() => [new Person()];

public Series[] Series() => [new Series()];
}

public sealed class Person
Expand All @@ -772,4 +894,22 @@ public sealed class Person

public string Address { get; } = "world";
}

public sealed class Series
{
public string Id { get; } = "series-1";

public Stream[] Streams() => [new Stream()];
}

public sealed class Stream
{
public string Id { get; } = "stream-1";

public string Title { get; } = "Stream One";

public bool HasDrm { get; } = true;

public string PublishedAt { get; } = "2026-01-01";
}
}
4 changes: 3 additions & 1 deletion src/HotChocolate/Fusion/src/Fusion.Execution/Execution/Nodes/Operation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,10 @@ public ulong CreateIncludeFlags(IVariableValueCollection variables)
{
if (includeCondition.IsIncluded(variables))
{
includeFlags |= 1ul << index++;
includeFlags |= 1ul << index;
}

index++;
}

return includeFlags;
Expand Down
17 changes: 15 additions & 2 deletions src/HotChocolate/Fusion/src/Fusion.Execution/Execution/Nodes/OperationCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,11 +245,16 @@ private SelectionSet BuildSelectionSet(
includeFlags.Clear();
deliveryGroups.Clear();

var alwaysIncluded = false;
var first = nodes[0];
var isInternal = IsInternal(first.Node);
var hasImmediateNode = first.DeliveryGroup is null;

if (first.PathIncludeFlags > 0)
if (first.PathIncludeFlags == 0)
{
alwaysIncluded = true;
}
else
{
includeFlags.Add(first.PathIncludeFlags);
}
Expand All @@ -271,7 +276,15 @@ private SelectionSet BuildSelectionSet(
$"The syntax nodes for the response name {responseName} are not all the same.");
}

if (next.PathIncludeFlags > 0)
if (next.PathIncludeFlags == 0)
{
alwaysIncluded = true;
if (includeFlags.Count > 0)
{
includeFlags.Clear();
}
}
else if (!alwaysIncluded)
{
includeFlags.Add(next.PathIncludeFlags);
}
Expand Down
Loading
Loading