graphql: Make SelectionSet.items private

Author: lutter

graphql/src/execution/ast.rs

@@ -15,7 +15,7 @@ pub struct FragmentDefinition {
 #[derive(Debug, Clone, PartialEq)]
 pub struct SelectionSet {
     span: (Pos, Pos),
-    pub items: Vec<Selection>,
+    items: Vec<Selection>,
 }
 
 impl SelectionSet {
@@ -29,6 +29,28 @@ impl SelectionSet {
             items: Vec::new(),
         }
     }
+
+    pub fn is_empty(&self) -> bool {
+        self.items.is_empty()
+    }
+
+    pub fn included(&self) -> impl Iterator<Item = &Selection> {
+        self.items.iter().filter(|selection| selection.selected())
+    }
+
+    pub fn selections(&self) -> impl Iterator<Item = &Selection> {
+        self.items.iter()
+    }
+
+    pub fn push(&mut self, field: Field) {
+        self.items.push(Selection::Field(field))
+    }
+}
+
+impl Extend<Selection> for SelectionSet {
+    fn extend<T: IntoIterator<Item = Selection>>(&mut self, iter: T) {
+        self.items.extend(iter)
+    }
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -51,7 +73,7 @@ impl Selection {
     }
 
     /// Returns true if a selection should be skipped (as per the `@skip` directive).
-    pub fn skip(&self) -> bool {
+    fn skip(&self) -> bool {
         match self.get_directive("skip") {
             Some(directive) => match directive.argument_value("if") {
                 Some(val) => match val {
@@ -66,7 +88,7 @@ impl Selection {
     }
 
     /// Returns true if a selection should be included (as per the `@include` directive).
-    pub fn include(&self) -> bool {
+    fn include(&self) -> bool {
         match self.get_directive("include") {
             Some(directive) => match directive.argument_value("if") {
                 Some(val) => match val {
@@ -79,6 +101,10 @@ impl Selection {
             None => true,
         }
     }
+
+    fn selected(&self) -> bool {
+        !self.skip() && self.include()
+    }
 }
 
 #[derive(Debug, Clone, PartialEq)]

graphql/src/execution/execution.rs

@@ -293,25 +293,25 @@ pub fn execute_root_selection_set_uncached(
         // non-existent fields; those will cause an error later when we execute
         // the data_set SelectionSet
         if is_introspection_field(&name) {
-            intro_set.items.extend(selections)
+            intro_set.extend(selections)
         } else if &name == META_FIELD_NAME {
             meta_items.extend(selections)
         } else {
-            data_set.items.extend(selections)
+            data_set.extend(selections)
         }
     }
 
     // If we are getting regular data, prefetch it from the database
-    let mut values = if data_set.items.is_empty() && meta_items.is_empty() {
+    let mut values = if data_set.is_empty() && meta_items.is_empty() {
         Object::default()
     } else {
         let initial_data = ctx.resolver.prefetch(&ctx, &data_set)?;
-        data_set.items.extend(meta_items);
+        data_set.extend(meta_items);
         execute_selection_set_to_map(&ctx, iter::once(&data_set), root_type, initial_data)?
     };
 
     // Resolve introspection fields, if there are any
-    if !intro_set.items.is_empty() {
+    if !intro_set.is_empty() {
         let ictx = ctx.as_introspection_context();
 
         values.extend(execute_selection_set_to_map(
@@ -588,13 +588,7 @@ pub fn collect_fields_inner<'a>(
 ) {
     for selection_set in selection_sets {
         // Only consider selections that are not skipped and should be included
-        let selections = selection_set
-            .items
-            .iter()
-            .filter(|selection| !selection.skip())
-            .filter(|selection| selection.include());
-
-        for selection in selections {
+        for selection in selection_set.included() {
             match selection {
                 a::Selection::Field(ref field) => {
                     let response_key = field.response_key();

graphql/src/execution/query.rs

@@ -86,7 +86,7 @@ struct SelectedFields<'a>(&'a a::SelectionSet);
 impl<'a> std::fmt::Display for SelectedFields<'a> {
     fn fmt(&self, fmt: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
         let mut first = true;
-        for item in &self.0.items {
+        for item in self.0.selections() {
             match item {
                 a::Selection::Field(field) => {
                     if !first {
@@ -258,7 +258,7 @@ impl Query {
         let mut bcs = HashMap::new();
         let mut errors = Vec::new();
 
-        for field in self.selection_set.items.iter().filter_map(|sel| match sel {
+        for field in self.selection_set.selections().filter_map(|sel| match sel {
             Field(f) => Some(f),
             _ => None,
         }) {
@@ -299,7 +299,7 @@ impl Query {
                     field_error_policy,
                 )
             });
-            selection_set.items.push(Field(field.clone()));
+            selection_set.push(field.clone());
             if field_error_policy == ErrorPolicy::Deny {
                 *error_policy = ErrorPolicy::Deny;
             }

graphql/src/store/prefetch.rs

@@ -890,14 +890,7 @@ fn collect_fields_inner<'a>(
         }
     }
 
-    // Only consider selections that are not skipped and should be included
-    let selections = selection_set
-        .items
-        .iter()
-        .filter(|selection| !selection.skip())
-        .filter(|selection| selection.include());
-
-    for selection in selections {
+    for selection in selection_set.included() {
         match selection {
             a::Selection::Field(ref field) => {
                 let response_key = field.response_key();

graphql/src/store/query.rs

@@ -327,7 +327,7 @@ pub fn collect_entities_from_query_field(
 
                     // If the query field has a non-empty selection set, this means we
                     // need to recursively process it
-                    for selection in field.selection_set.items.iter() {
+                    for selection in field.selection_set.selections() {
                         if let a::Selection::Field(sub_field) = selection {
                             queue.push_back((object_type, sub_field))
                         }