Skip to content

Commit d6c55ec

Browse files
dotansimhadotansimha
committed
fixes
1 parent 478a05c commit d6c55ec

File tree

6 files changed

+28
-41
lines changed

6 files changed

+28
-41
lines changed

‎src/ast/collect_fields.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,6 @@ fn does_fragment_condition_match<'a>(
3434
) -> bool {
3535
if let Some(TypeCondition::On(type_name)) = fragment_condition {
3636
if let Some(conditional_type) = type_info_registry.type_by_name.get(type_name) {
37-
println!("conditional_type: {}", conditional_type.name());
38-
println!(
39-
"current_selection_set_type: {}",
40-
current_selection_set_type.name()
41-
);
4237
if conditional_type
4338
.name()
4439
.eq(&current_selection_set_type.name())
@@ -73,7 +68,6 @@ fn collect_fields_inner(
7368
result_arr: &mut HashMap<String, Vec<query::Field>>,
7469
visited_fragments_names: &mut Vec<String>,
7570
) {
76-
println!("collect_fields_inner");
7771
selection_set.items.iter().for_each(|item| match item {
7872
Selection::Field(f) => {
7973
let existing = result_arr.entry(f.name.clone()).or_insert(vec![]);

‎src/ast/query_visitor.rs

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -111,19 +111,15 @@ pub trait QueryVisitor<T = DefaultVisitorContext> {
111111
self.enter_field(field, visitor_context);
112112

113113
for directive in &field.directives {
114-
self.enter_directive(&directive, field, visitor_context);
115-
self.leave_directive(&directive, field, visitor_context);
114+
self.enter_directive(&directive, visitor_context);
115+
self.leave_directive(&directive, visitor_context);
116116
}
117117

118118
for (name, argument) in &field.arguments {
119119
self.enter_field_argument(name, argument, field, visitor_context);
120120

121-
println!("args: {}", name);
122-
123121
match argument {
124122
Value::Variable(variable) => {
125-
println!("variable: {}", argument);
126-
127123
self.enter_variable(
128124
variable,
129125
(name, argument),
@@ -148,10 +144,22 @@ pub trait QueryVisitor<T = DefaultVisitorContext> {
148144
}
149145
Selection::FragmentSpread(fragment_spread) => {
150146
self.enter_fragment_spread(fragment_spread, visitor_context);
147+
148+
for directive in &fragment_spread.directives {
149+
self.enter_directive(&directive, visitor_context);
150+
self.leave_directive(&directive, visitor_context);
151+
}
152+
151153
self.leave_fragment_spread(fragment_spread, visitor_context);
152154
}
153155
Selection::InlineFragment(inline_fragment) => {
154156
self.enter_inline_fragment(inline_fragment, visitor_context);
157+
158+
for directive in &inline_fragment.directives {
159+
self.enter_directive(&directive, visitor_context);
160+
self.leave_directive(&directive, visitor_context);
161+
}
162+
155163
self.__visit_selection_set(&inline_fragment.selection_set, visitor_context);
156164
self.leave_inline_fragment(inline_fragment, visitor_context);
157165
}
@@ -208,20 +216,8 @@ pub trait QueryVisitor<T = DefaultVisitorContext> {
208216
fn enter_field(&self, _node: &Field, _visitor_context: &mut T) {}
209217
fn leave_field(&self, _node: &Field, _visitor_context: &mut T) {}
210218

211-
fn enter_directive(
212-
&self,
213-
_directive: &Directive,
214-
_parent_field: &Field,
215-
_visitor_context: &mut T,
216-
) {
217-
}
218-
fn leave_directive(
219-
&self,
220-
_directive: &Directive,
221-
_parent_field: &Field,
222-
_visitor_context: &mut T,
223-
) {
224-
}
219+
fn enter_directive(&self, _directive: &Directive, _visitor_context: &mut T) {}
220+
fn leave_directive(&self, _directive: &Directive, _visitor_context: &mut T) {}
225221

226222
fn enter_field_argument(
227223
&self,

‎src/ast/type_info_query_visitor.rs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,8 +235,8 @@ pub trait TypeInfoQueryVisitor<T = DefaultVisitorContext> {
235235
self.enter_field(field, visitor_context, type_info);
236236

237237
for directive in &field.directives {
238-
self.enter_directive(&directive, field, visitor_context, type_info);
239-
self.leave_directive(&directive, field, visitor_context, type_info);
238+
self.enter_directive(&directive, visitor_context, type_info);
239+
self.leave_directive(&directive, visitor_context, type_info);
240240
}
241241

242242
for (argument_name, argument_type) in &field.arguments {
@@ -320,6 +320,10 @@ pub trait TypeInfoQueryVisitor<T = DefaultVisitorContext> {
320320
}
321321
query::Selection::FragmentSpread(fragment_spread) => {
322322
self.enter_fragment_spread(fragment_spread, visitor_context, type_info);
323+
for directive in &fragment_spread.directives {
324+
self.enter_directive(&directive, visitor_context, type_info);
325+
self.leave_directive(&directive, visitor_context, type_info);
326+
}
323327
self.leave_fragment_spread(fragment_spread, visitor_context, type_info);
324328
}
325329
query::Selection::InlineFragment(inline_fragment) => {
@@ -333,6 +337,12 @@ pub trait TypeInfoQueryVisitor<T = DefaultVisitorContext> {
333337
}
334338

335339
self.enter_inline_fragment(inline_fragment, visitor_context, type_info);
340+
341+
for directive in &inline_fragment.directives {
342+
self.enter_directive(&directive, visitor_context, type_info);
343+
self.leave_directive(&directive, visitor_context, type_info);
344+
}
345+
336346
self.__visit_selection_set(
337347
&inline_fragment.selection_set,
338348
visitor_context,
@@ -497,15 +507,13 @@ pub trait TypeInfoQueryVisitor<T = DefaultVisitorContext> {
497507
fn enter_directive(
498508
&self,
499509
_directive: &Directive,
500-
_parent_field: &query::Field,
501510
_visitor_context: &mut T,
502511
_type_info: &TypeInfo,
503512
) {
504513
}
505514
fn leave_directive(
506515
&self,
507516
_directive: &Directive,
508-
_parent_field: &query::Field,
509517
_visitor_context: &mut T,
510518
_type_info: &TypeInfo,
511519
) {

‎src/validation/rules/known_argument_names.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ impl<'a> TypeInfoQueryVisitor<ValidationErrorContext<'a>> for KnownArgumentNames
1717
fn enter_directive(
1818
&self,
1919
directive: &crate::static_graphql::query::Directive,
20-
_parent_field: &crate::static_graphql::query::Field,
2120
visitor_context: &mut ValidationErrorContext<'a>,
2221
_type_info: &TypeInfo,
2322
) {
@@ -27,10 +26,6 @@ impl<'a> TypeInfoQueryVisitor<ValidationErrorContext<'a>> for KnownArgumentNames
2726
.as_ref()
2827
.unwrap()
2928
.directives;
30-
println!(
31-
"enter_directive, directive name: {}, known_directives: {:?}",
32-
directive.name, known_directives
33-
);
3429

3530
if let Some(directive_def) = known_directives.get(&directive.name) {
3631
let known_directive_args = &directive_def.arguments;

‎src/validation/rules/no_undefined_variables.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ impl<'a> QueryVisitor<NoUndefinedVariablesHelper<'a>> for NoUndefinedVariables {
5555
visitor_context: &mut NoUndefinedVariablesHelper<'a>,
5656
) {
5757
let in_use = node.get_variables_in_use(&visitor_context.error_ctx.ctx.fragments);
58-
println!("defined: {:?}", visitor_context.current_op_variables);
59-
println!("in use: {:?}", in_use);
6058

6159
in_use.iter().for_each(|v| {
6260
if !visitor_context.current_op_variables.contains(v) {

‎src/validation/rules/possible_fragment_spreads.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,6 @@ fn interface_into_implemented_object() {
267267
);
268268

269269
let messages = get_messages(&errors);
270-
println!("{:?}", messages);
271270
assert_eq!(messages.len(), 0);
272271
}
273272

@@ -315,7 +314,6 @@ fn interface_into_overlapping_union() {
315314
);
316315

317316
let messages = get_messages(&errors);
318-
println!("{:?}", messages);
319317
assert_eq!(messages.len(), 0);
320318
}
321319

@@ -333,8 +331,6 @@ fn ignores_incorrect_type() {
333331
);
334332

335333
let messages = get_messages(&errors);
336-
println!("{:#?}", errors);
337-
338334
assert_eq!(messages.len(), 0);
339335
}
340336

0 commit comments

Comments
 (0)