Skip to content

Fix QueryContext selector to respect @include and @skip directives #9135

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 2 commits into from
Feb 18, 2026
Merged

Fix QueryContext selector to respect @include and @skip directives #9135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f72d5dd
Fix QueryContext selector to respect @include and @skip directives (#…
michaelstaib Feb 18, 2026
f4edf38
Merge branch 'main' into mst/querycontext-includeflags
michaelstaib Feb 18, 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
62 changes: 55 additions & 7 deletions ...ate/Core/src/Execution.Projections/Extensions/HotChocolateExecutionSelectionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,24 @@ public static Expression<Func<TValue, TValue>> AsSelector<TValue>(
return AsSelector<TValue>(casted);
}

/// <summary>
/// Creates a selector expression from a GraphQL selection and applies
/// runtime include/skip directive flags.
/// </summary>
public static Expression<Func<TValue, TValue>> AsSelector<TValue>(
this ISelection selection,
ulong includeFlags)
{
if (selection is not Selection casted)
{
throw new ArgumentException(
$"Expected {typeof(Selection).FullName!}.",
nameof(selection));
}

return AsSelector<TValue>(casted, includeFlags);
}

/// <summary>
/// Creates a selector expression from a GraphQL selection.
/// </summary>
Expand All @@ -54,10 +72,17 @@ public static Expression<Func<TValue, TValue>> AsSelector<TValue>(
/// </returns>
public static Expression<Func<TValue, TValue>> AsSelector<TValue>(
this Selection selection)
=> AsSelector<TValue>(selection, 0);

public static Expression<Func<TValue, TValue>> AsSelector<TValue>(
this Selection selection,
ulong includeFlags)
{
var isConditional = selection.DeclaringOperation.RootSelectionSet.IsConditional;

// we first check if we already have an expression for this selection,
// this would be the cheapest way to get the expression.
if (TryGetExpression<TValue>(selection, out var expression))
if (!isConditional && TryGetExpression<TValue>(selection, out var expression))
{
return expression;
}
Expand All @@ -74,10 +99,15 @@ public static Expression<Func<TValue, TValue>> AsSelector<TValue>(
var count = GetConnectionSelections(selection, buffer);
for (var i = 0; i < count; i++)
{
builder.Add(buffer[i].GetOrCreateExpression<TValue>());
builder.Add(
isConditional
? buffer[i].GetExpression<TValue>(includeFlags)
: buffer[i].GetOrCreateExpression<TValue>());
}
ArrayPool<Selection>.Shared.Return(buffer);
return selection.GetOrCreateExpression<TValue>(builder);
return isConditional
? selection.GetExpression<TValue>(builder)
: selection.GetOrCreateExpression<TValue>(builder);
}

if ((flags & CoreFieldFlags.CollectionSegment) == CoreFieldFlags.CollectionSegment)
Expand All @@ -87,19 +117,28 @@ public static Expression<Func<TValue, TValue>> AsSelector<TValue>(
var count = GetCollectionSelections(selection, buffer);
for (var i = 0; i < count; i++)
{
builder.Add(buffer[i].GetOrCreateExpression<TValue>());
builder.Add(
isConditional
? buffer[i].GetExpression<TValue>(includeFlags)
: buffer[i].GetOrCreateExpression<TValue>());
}
ArrayPool<Selection>.Shared.Return(buffer);
return selection.GetOrCreateExpression<TValue>(builder);
return isConditional
? selection.GetExpression<TValue>(builder)
: selection.GetOrCreateExpression<TValue>(builder);
}

if ((flags & CoreFieldFlags.GlobalIdNodeField) == CoreFieldFlags.GlobalIdNodeField
|| (flags & CoreFieldFlags.GlobalIdNodesField) == CoreFieldFlags.GlobalIdNodesField)
{
return selection.GetOrCreateNodeExpression<TValue>();
return isConditional
? selection.GetNodeExpression<TValue>(includeFlags)
: selection.GetOrCreateNodeExpression<TValue>();
}

return selection.GetOrCreateExpression<TValue>();
return isConditional
? selection.GetExpression<TValue>(includeFlags)
: selection.GetOrCreateExpression<TValue>();
}

private static bool TryGetExpression<TValue>(
Expand Down Expand Up @@ -179,10 +218,19 @@ file static class Extensions
public Expression<Func<TValue, TValue>> GetOrCreateExpression<TValue>()
=> selection.Features.GetOrSetSafe(() => s_builder.BuildExpression<TValue>(selection));

public Expression<Func<TValue, TValue>> GetExpression<TValue>(ulong includeFlags)
=> s_builder.BuildExpression<TValue>(selection, includeFlags);

public Expression<Func<TValue, TValue>> GetOrCreateExpression<TValue>(ISelectorBuilder expressionBuilder)
=> selection.Features.GetOrSetSafe(() => expressionBuilder.TryCompile<TValue>()!);

public Expression<Func<TValue, TValue>> GetExpression<TValue>(ISelectorBuilder expressionBuilder)
=> expressionBuilder.TryCompile<TValue>()!;

public Expression<Func<TValue, TValue>> GetOrCreateNodeExpression<TValue>()
=> selection.Features.GetOrSetSafe(() => s_builder.BuildNodeExpression<TValue>(selection));

public Expression<Func<TValue, TValue>> GetNodeExpression<TValue>(ulong includeFlags)
=> s_builder.BuildNodeExpression<TValue>(selection, includeFlags);
}
}
20 changes: 15 additions & 5 deletions src/HotChocolate/Core/src/Execution.Projections/SelectionExpressionBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@ internal sealed class SelectionExpressionBuilder
typeof(char?)
];

public Expression<Func<TRoot, TRoot>> BuildExpression<TRoot>(Selection selection)
public Expression<Func<TRoot, TRoot>> BuildExpression<TRoot>(
Selection selection,
ulong includeFlags = 0)
{
var rootType = typeof(TRoot);
var parameter = Expression.Parameter(rootType, "root");
var requirements = selection.DeclaringOperation.Schema.Features.GetRequired<FieldRequirementsMetadata>();
var context = new Context(parameter, rootType, requirements, new NullabilityInfoContext());
var context = new Context(parameter, rootType, requirements, new NullabilityInfoContext(), includeFlags);
var root = new TypeContainer();

CollectTypes(context, selection, root);
Expand All @@ -56,12 +58,14 @@ public Expression<Func<TRoot, TRoot>> BuildExpression<TRoot>(Selection selection
return Expression.Lambda<Func<TRoot, TRoot>>(selectionSetExpression, parameter);
}

public Expression<Func<TRoot, TRoot>> BuildNodeExpression<TRoot>(Selection selection)
public Expression<Func<TRoot, TRoot>> BuildNodeExpression<TRoot>(
Selection selection,
ulong includeFlags = 0)
{
var rootType = typeof(TRoot);
var parameter = Expression.Parameter(rootType, "root");
var requirements = selection.DeclaringOperation.Schema.Features.GetRequired<FieldRequirementsMetadata>();
var context = new Context(parameter, rootType, requirements, new NullabilityInfoContext());
var context = new Context(parameter, rootType, requirements, new NullabilityInfoContext(), includeFlags);
var root = new TypeContainer();

var entityType = selection.DeclaringOperation
Expand Down Expand Up @@ -272,6 +276,11 @@ private void CollectSelections(
{
foreach (var selection in selectionSet.Selections)
{
if (!selection.IsIncluded(context.IncludeFlags))
{
continue;
}

var requirements = context.GetRequirements(selection);
if (requirements is not null)
{
Expand Down Expand Up @@ -342,7 +351,8 @@ private readonly record struct Context(
Expression Parent,
Type ParentType,
FieldRequirementsMetadata Requirements,
NullabilityInfoContext NullabilityInfoContext)
NullabilityInfoContext NullabilityInfoContext,
ulong IncludeFlags)
{
public TypeNode? GetRequirements(Selection selection)
{
Expand Down
2 changes: 1 addition & 1 deletion src/HotChocolate/Core/src/Types.Analyzers/FileBuilders/TypeFileBuilderBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1210,7 +1210,7 @@ private void WriteResolverArguments(Resolver resolver, IMethodSymbol resolverMet
using (Writer.IncreaseIndent())
{
Writer.WriteIndentedLine(
"global::{0}.AsSelector<{1}>(args{2}_selection),",
"global::{0}.AsSelector<{1}>(args{2}_selection, context.IncludeFlags),",
WellKnownTypes.HotChocolateExecutionSelectionExtensions,
entityType,
i);
Expand Down
2 changes: 1 addition & 1 deletion ...pshots__/NodeResolverIdParameterAnalyzerTests.FirstParameter_NamedId_NoError.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ namespace TestNamespace
var args2_filter = global::HotChocolate.Data.Filters.FilterContextResolverContextExtensions.GetFilterContext(context);
var args2_sorting = global::HotChocolate.Data.Sorting.SortingContextResolverContextExtensions.GetSortingContext(context);
var args2 = new global::GreenDonut.Data.QueryContext<global::TestNamespace.Product>(
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection),
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection, context.IncludeFlags),
args2_filter?.AsPredicate<global::TestNamespace.Product>(),
args2_sorting?.AsSortDefinition<global::TestNamespace.Product>());
var args3 = context.RequestAborted;
Expand Down
2 changes: 1 addition & 1 deletion ...deResolverIdParameterAnalyzerTests.FirstParameter_NamedId_WithString_NoError.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ namespace TestNamespace
var args2_filter = global::HotChocolate.Data.Filters.FilterContextResolverContextExtensions.GetFilterContext(context);
var args2_sorting = global::HotChocolate.Data.Sorting.SortingContextResolverContextExtensions.GetSortingContext(context);
var args2 = new global::GreenDonut.Data.QueryContext<global::TestNamespace.Product>(
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection),
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection, context.IncludeFlags),
args2_filter?.AsPredicate<global::TestNamespace.Product>(),
args2_sorting?.AsSortDefinition<global::TestNamespace.Product>());
var args3 = context.RequestAborted;
Expand Down
2 changes: 1 addition & 1 deletion ...ameterAnalyzerTests.FirstParameter_NotNamedId_NoFixableParameter_RaisesError.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ namespace TestNamespace
var args1_filter = global::HotChocolate.Data.Filters.FilterContextResolverContextExtensions.GetFilterContext(context);
var args1_sorting = global::HotChocolate.Data.Sorting.SortingContextResolverContextExtensions.GetSortingContext(context);
var args1 = new global::GreenDonut.Data.QueryContext<global::TestNamespace.Product>(
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args1_selection),
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args1_selection, context.IncludeFlags),
args1_filter?.AsPredicate<global::TestNamespace.Product>(),
args1_sorting?.AsSortDefinition<global::TestNamespace.Product>());
var args2 = context.RequestAborted;
Expand Down
2 changes: 1 addition & 1 deletion ...olverIdParameterAnalyzerTests.GuidIdParameter_NotInFirstPosition_RaisesError.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ namespace TestNamespace
var args2_filter = global::HotChocolate.Data.Filters.FilterContextResolverContextExtensions.GetFilterContext(context);
var args2_sorting = global::HotChocolate.Data.Sorting.SortingContextResolverContextExtensions.GetSortingContext(context);
var args2 = new global::GreenDonut.Data.QueryContext<global::TestNamespace.Product>(
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection),
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection, context.IncludeFlags),
args2_filter?.AsPredicate<global::TestNamespace.Product>(),
args2_sorting?.AsSortDefinition<global::TestNamespace.Product>());
var args3 = context.RequestAborted;
Expand Down
2 changes: 1 addition & 1 deletion ...eResolverIdParameterAnalyzerTests.IdParameter_NotInFirstPosition_RaisesError.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ namespace TestNamespace
var args2_filter = global::HotChocolate.Data.Filters.FilterContextResolverContextExtensions.GetFilterContext(context);
var args2_sorting = global::HotChocolate.Data.Sorting.SortingContextResolverContextExtensions.GetSortingContext(context);
var args2 = new global::GreenDonut.Data.QueryContext<global::TestNamespace.Product>(
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection),
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection, context.IncludeFlags),
args2_filter?.AsPredicate<global::TestNamespace.Product>(),
args2_sorting?.AsSortDefinition<global::TestNamespace.Product>());
var args3 = context.RequestAborted;
Expand Down
2 changes: 1 addition & 1 deletion ...ots__/NodeResolverIdParameterAnalyzerTests.MethodWithoutNodeResolver_NoError.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ namespace TestNamespace
var args2_filter = global::HotChocolate.Data.Filters.FilterContextResolverContextExtensions.GetFilterContext(context);
var args2_sorting = global::HotChocolate.Data.Sorting.SortingContextResolverContextExtensions.GetSortingContext(context);
var args2 = new global::GreenDonut.Data.QueryContext<global::TestNamespace.Product>(
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection),
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection, context.IncludeFlags),
args2_filter?.AsPredicate<global::TestNamespace.Product>(),
args2_sorting?.AsSortDefinition<global::TestNamespace.Product>());
var args3 = context.RequestAborted;
Expand Down
2 changes: 1 addition & 1 deletion ...dParameterAnalyzerTests.ParameterEndingWithId_NotInFirstPosition_RaisesError.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ namespace TestNamespace
var args2_filter = global::HotChocolate.Data.Filters.FilterContextResolverContextExtensions.GetFilterContext(context);
var args2_sorting = global::HotChocolate.Data.Sorting.SortingContextResolverContextExtensions.GetSortingContext(context);
var args2 = new global::GreenDonut.Data.QueryContext<global::TestNamespace.Product>(
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection),
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection, context.IncludeFlags),
args2_filter?.AsPredicate<global::TestNamespace.Product>(),
args2_sorting?.AsSortDefinition<global::TestNamespace.Product>());
var args3 = context.RequestAborted;
Expand Down
2 changes: 1 addition & 1 deletion ...verIdParameterAnalyzerTests.StringIdParameter_NotInFirstPosition_RaisesError.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ namespace TestNamespace
var args2_filter = global::HotChocolate.Data.Filters.FilterContextResolverContextExtensions.GetFilterContext(context);
var args2_sorting = global::HotChocolate.Data.Sorting.SortingContextResolverContextExtensions.GetSortingContext(context);
var args2 = new global::GreenDonut.Data.QueryContext<global::TestNamespace.Product>(
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection),
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args2_selection, context.IncludeFlags),
args2_filter?.AsPredicate<global::TestNamespace.Product>(),
args2_sorting?.AsSortDefinition<global::TestNamespace.Product>());
var args3 = context.RequestAborted;
Expand Down
2 changes: 1 addition & 1 deletion ...s.Analyzers.Tests/__snapshots__/OperationTests.Root_Projection_Single_Entity.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ namespace TestNamespace
var args0_filter = global::HotChocolate.Data.Filters.FilterContextResolverContextExtensions.GetFilterContext(context);
var args0_sorting = global::HotChocolate.Data.Sorting.SortingContextResolverContextExtensions.GetSortingContext(context);
var args0 = new global::GreenDonut.Data.QueryContext<global::TestNamespace.Foo>(
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Foo>(args0_selection),
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Foo>(args0_selection, context.IncludeFlags),
args0_filter?.AsPredicate<global::TestNamespace.Foo>(),
args0_sorting?.AsSortDefinition<global::TestNamespace.Foo>());
var result = global::TestNamespace.Query.GetTest(args0);
Expand Down
2 changes: 1 addition & 1 deletion ...pshots__/QueryContextConnectionAnalyzerTests.CorrectGenericTypeMatch_NoError.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ namespace TestNamespace
var args1_filter = global::HotChocolate.Data.Filters.FilterContextResolverContextExtensions.GetFilterContext(context);
var args1_sorting = global::HotChocolate.Data.Sorting.SortingContextResolverContextExtensions.GetSortingContext(context);
var args1 = new global::GreenDonut.Data.QueryContext<global::TestNamespace.Product>(
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args1_selection),
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args1_selection, context.IncludeFlags),
args1_filter?.AsPredicate<global::TestNamespace.Product>(),
args1_sorting?.AsSortDefinition<global::TestNamespace.Product>());
var args2 = _binding_GetProductsAsync_productService.Execute<global::TestNamespace.ProductService>(context);
Expand Down
2 changes: 1 addition & 1 deletion ...ontextConnectionAnalyzerTests.CorrectGenericTypeMatch_WithConnection_NoError.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ namespace TestNamespace
var args1_filter = global::HotChocolate.Data.Filters.FilterContextResolverContextExtensions.GetFilterContext(context);
var args1_sorting = global::HotChocolate.Data.Sorting.SortingContextResolverContextExtensions.GetSortingContext(context);
var args1 = new global::GreenDonut.Data.QueryContext<global::TestNamespace.Product>(
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args1_selection),
global::HotChocolate.Execution.Processing.HotChocolateExecutionSelectionExtensions.AsSelector<global::TestNamespace.Product>(args1_selection, context.IncludeFlags),
args1_filter?.AsPredicate<global::TestNamespace.Product>(),
args1_sorting?.AsSortDefinition<global::TestNamespace.Product>());
var args2 = _binding_GetProductsAsync_productService.Execute<global::TestNamespace.ProductService>(context);
Expand Down
Loading
Loading