Skip to content

Commit dd5b95b

Browse files
wip
1 parent 7200dec commit dd5b95b

File tree

10 files changed

+867
-985
lines changed

10 files changed

+867
-985
lines changed

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Execution/Nodes/OperationCompiler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace HotChocolate.Fusion.Execution.Nodes;
99
public sealed class OperationCompiler
1010
{
1111
private readonly ISchemaDefinition _schema;
12-
private readonly InlineFragmentOperationRewriterNew _inlineRewriter;
12+
private readonly OperationRewriter _operationRewriter;
1313
private readonly ObjectPool<OrderedDictionary<string, List<FieldSelectionNode>>> _fieldsPool;
1414
private readonly TypeNameField _typeNameField;
1515

@@ -22,7 +22,7 @@ public OperationCompiler(
2222

2323
_schema = schema;
2424
_fieldsPool = fieldsPool;
25-
_inlineRewriter = new InlineFragmentOperationRewriterNew(schema/*, removeStaticallyExcludedSelections: true*/);
25+
_operationRewriter = new OperationRewriter(schema, removeStaticallyExcludedSelections: true);
2626
var nonNullStringType = new NonNullType(_schema.Types.GetType<IScalarTypeDefinition>(SpecScalarNames.String));
2727
_typeNameField = new TypeNameField(nonNullStringType);
2828
}
@@ -33,7 +33,7 @@ public Operation Compile(string id, string hash, OperationDefinitionNode operati
3333
ArgumentNullException.ThrowIfNull(operationDefinition);
3434

3535
var document = new DocumentNode(new IDefinitionNode[] { operationDefinition });
36-
document = _inlineRewriter.RewriteDocument(document);
36+
document = _operationRewriter.RewriteDocument(document);
3737
operationDefinition = (OperationDefinitionNode)document.Definitions[0];
3838

3939
var includeConditions = new IncludeConditionCollection();

src/HotChocolate/Fusion-vnext/src/Fusion.Execution/Execution/Pipeline/OperationPlanMiddleware.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace HotChocolate.Fusion.Execution.Pipeline;
1111
internal sealed class OperationPlanMiddleware
1212
{
1313
private readonly OperationPlanner _planner;
14-
private readonly InlineFragmentOperationRewriterNew _rewriter;
14+
private readonly OperationRewriter _operationRewriter;
1515
private readonly IOperationPlannerInterceptor[] _interceptors;
1616
private readonly IFusionExecutionDiagnosticEvents _diagnosticsEvents;
1717

@@ -21,7 +21,7 @@ private OperationPlanMiddleware(
2121
IEnumerable<IOperationPlannerInterceptor>? interceptors,
2222
IFusionExecutionDiagnosticEvents diagnosticsEvents)
2323
{
24-
_rewriter = new InlineFragmentOperationRewriterNew(schema);
24+
_operationRewriter = new OperationRewriter(schema);
2525
_planner = planner;
2626
_interceptors = interceptors?.ToArray() ?? [];
2727
_diagnosticsEvents = diagnosticsEvents;
@@ -61,7 +61,7 @@ private void PlanOperation(
6161
try
6262
{
6363
// Before we can plan an operation, we must defragmentize it and remove statical include conditions.
64-
var rewritten = _rewriter.RewriteDocument(operationDocument, context.Request.OperationName);
64+
var rewritten = _operationRewriter.RewriteDocument(operationDocument, context.Request.OperationName);
6565
var operation = rewritten.GetOperation(context.Request.OperationName);
6666

6767
// After optimizing the query structure we can begin the planning process.

0 commit comments

Comments
 (0)