yume/juniper
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add LookAheadMethods::applies_for() method (, )

Browse source
This commit is contained in:
daviddanielarch-nextroll 2023-03-01 13:11:57 -03:00 • committed by GitHub
parent 7e5c8819c2
commit 91064e9554
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 337 additions and 358 deletions

3
juniper/CHANGELOG.md
View file

@ -62,6 +62,7 @@ All user visible changes to `juniper` crate will be documented in this file. Thi
- [`bigdecimal` crate] integration behind `bigdecimal` [Cargo feature]. ([#1060]) - [`bigdecimal` crate] integration behind `bigdecimal` [Cargo feature]. ([#1060])
- [`rust_decimal` crate] integration behind `rust_decimal` [Cargo feature]. ([#1060]) - [`rust_decimal` crate] integration behind `rust_decimal` [Cargo feature]. ([#1060])
- `js` [Cargo feature] enabling `js-sys` and `wasm-bindgen` support for `wasm32-unknown-unknown` target. ([#1118], [#1147]) - `js` [Cargo feature] enabling `js-sys` and `wasm-bindgen` support for `wasm32-unknown-unknown` target. ([#1118], [#1147])
- `LookAheadMethods::applies_for()` method. ([#1138], [#1145])
### Changed ### Changed
@ -115,6 +116,8 @@ All user visible changes to `juniper` crate will be documented in this file. Thi
[#1086]: /../../pull/1086 [#1086]: /../../pull/1086
[#1118]: /../../issues/1118 [#1118]: /../../issues/1118
[#1119]: /../../pull/1119 [#1119]: /../../pull/1119
[#1138]: /../../issues/1138
[#1145]: /../../pull/1145
[#1147]: /../../pull/1147 [#1147]: /../../pull/1147
[ba1ed85b]: /../../commit/ba1ed85b3c3dd77fbae7baf6bc4e693321a94083 [ba1ed85b]: /../../commit/ba1ed85b3c3dd77fbae7baf6bc4e693321a94083
[CVE-2022-31173]: /../../security/advisories/GHSA-4rx6-g5vg-5f3j [CVE-2022-31173]: /../../security/advisories/GHSA-4rx6-g5vg-5f3j

689
juniper/src/executor/look_ahead.rs
View file

@ -96,20 +96,14 @@ where
} }
} }
#[doc(hidden)]
#[derive(Debug, Clone, PartialEq)]
pub struct ChildSelection<'a, S: 'a> {
pub(super) inner: LookAheadSelection<'a, S>,
pub(super) applies_for: Applies<'a>,
}
/// A selection performed by a query /// A selection performed by a query
#[derive(Debug, Clone, PartialEq)] #[derive(Debug, Clone, PartialEq)]
pub struct LookAheadSelection<'a, S: 'a> { pub struct LookAheadSelection<'a, S: 'a> {
pub(super) name: &'a str, pub(super) name: &'a str,
pub(super) alias: Option<&'a str>, pub(super) alias: Option<&'a str>,
pub(super) arguments: Vec<LookAheadArgument<'a, S>>, pub(super) arguments: Vec<LookAheadArgument<'a, S>>,
pub(super) children: Vec<ChildSelection<'a, S>>, pub(super) children: Vec<LookAheadSelection<'a, S>>,
pub(super) applies_for: Applies<'a>,
} }
// Implemented manually to omit redundant `S: Default` trait bound, imposed by // Implemented manually to omit redundant `S: Default` trait bound, imposed by
@ -121,6 +115,7 @@ impl<'a, S: 'a> Default for LookAheadSelection<'a, S> {
alias: None, alias: None,
arguments: vec![], arguments: vec![],
children: vec![], children: vec![],
applies_for: Applies::All,
} }
} }
} }
@ -217,11 +212,17 @@ where
.collect() .collect()
}) })
.unwrap_or_else(Vec::new); .unwrap_or_else(Vec::new);
let applies_for = match &parent {
Some(p) => p.applies_for,
None => Applies::All,
};
let mut ret = LookAheadSelection { let mut ret = LookAheadSelection {
name, name,
alias, alias,
arguments, arguments,
children: Vec::new(), children: Vec::new(),
applies_for,
}; };
for c in field for c in field
.selection_set .selection_set
@ -239,10 +240,7 @@ where
assert!(s.is_none()); assert!(s.is_none());
} }
if let Some(p) = parent { if let Some(p) = parent {
p.children.push(ChildSelection { p.children.push(ret);
inner: ret,
applies_for: Applies::All,
});
None None
} else { } else {
Some(ret) Some(ret)
@ -307,16 +305,15 @@ where
.children .children
.iter() .iter()
.filter_map(|c| match c.applies_for { .filter_map(|c| match c.applies_for {
Applies::OnlyType(t) if t == type_name => { Applies::OnlyType(t) if t == type_name => Some(c.for_explicit_type(type_name)),
Some(c.inner.for_explicit_type(type_name)) Applies::All => Some(c.for_explicit_type(type_name)),
}
Applies::All => Some(c.inner.for_explicit_type(type_name)),
Applies::OnlyType(_) => None, Applies::OnlyType(_) => None,
}) })
.collect(), .collect(),
name: self.name, name: self.name,
alias: self.alias, alias: self.alias,
arguments: self.arguments.clone(), arguments: self.arguments.clone(),
applies_for: self.applies_for,
} }
} }
} }
@ -328,6 +325,7 @@ pub struct ConcreteLookAheadSelection<'a, S: 'a> {
alias: Option<&'a str>, alias: Option<&'a str>,
arguments: Vec<LookAheadArgument<'a, S>>, arguments: Vec<LookAheadArgument<'a, S>>,
children: Vec<ConcreteLookAheadSelection<'a, S>>, children: Vec<ConcreteLookAheadSelection<'a, S>>,
applies_for: Applies<'a>,
} }
/// Set of common methods for `ConcreteLookAheadSelection` and `LookAheadSelection`. /// Set of common methods for `ConcreteLookAheadSelection` and `LookAheadSelection`.
@ -367,6 +365,9 @@ pub trait LookAheadMethods<'sel, S> {
/// Get an iterator over the children for the current selection /// Get an iterator over the children for the current selection
fn children(&self) -> Vec<&Self>; fn children(&self) -> Vec<&Self>;
/// Get the parent type in case there is any for this selection
fn applies_for(&self) -> Option<&str>;
} }
impl<'a, S> LookAheadMethods<'a, S> for ConcreteLookAheadSelection<'a, S> { impl<'a, S> LookAheadMethods<'a, S> for ConcreteLookAheadSelection<'a, S> {
@ -397,6 +398,13 @@ impl<'a, S> LookAheadMethods<'a, S> for ConcreteLookAheadSelection<'a, S> {
fn children(&self) -> Vec<&Self> { fn children(&self) -> Vec<&Self> {
self.children.iter().collect() self.children.iter().collect()
} }
fn applies_for(&self) -> Option<&str> {
match self.applies_for {
Applies::OnlyType(typ) => Some(typ),
Applies::All => None,
}
}
} }
impl<'a, S> LookAheadMethods<'a, S> for LookAheadSelection<'a, S> { impl<'a, S> LookAheadMethods<'a, S> for LookAheadSelection<'a, S> {
@ -405,10 +413,7 @@ impl<'a, S> LookAheadMethods<'a, S> for LookAheadSelection<'a, S> {
} }
fn select_child(&self, name: &str) -> Option<&Self> { fn select_child(&self, name: &str) -> Option<&Self> {
self.children self.children.iter().find(|c| c.field_name() == name)
.iter()
.find(|c| c.inner.field_name() == name)
.map(|s| &s.inner)
} }
fn arguments(&self) -> &[LookAheadArgument<S>] { fn arguments(&self) -> &[LookAheadArgument<S>] {
@ -416,7 +421,7 @@ impl<'a, S> LookAheadMethods<'a, S> for LookAheadSelection<'a, S> {
} }
fn child_names(&self) -> Vec<&'a str> { fn child_names(&self) -> Vec<&'a str> {
self.children.iter().map(|c| c.inner.field_name()).collect() self.children.iter().map(|c| c.field_name()).collect()
} }
fn has_arguments(&self) -> bool { fn has_arguments(&self) -> bool {
@ -428,10 +433,14 @@ impl<'a, S> LookAheadMethods<'a, S> for LookAheadSelection<'a, S> {
} }
fn children(&self) -> Vec<&Self> { fn children(&self) -> Vec<&Self> {
self.children self.children.iter().collect()
.iter() }
.map(|child_selection| &child_selection.inner)
.collect() fn applies_for(&self) -> Option<&str> {
match self.applies_for {
Applies::OnlyType(typ) => Some(typ),
Applies::All => None,
}
} }
} }
@ -501,23 +510,20 @@ query Hero {
name: "hero", name: "hero",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
applies_for: Applies::All,
children: vec![ children: vec![
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "id",
name: "id", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "name",
name: "name", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
], ],
@ -555,23 +561,20 @@ query Hero {
name: "hero", name: "hero",
alias: Some("custom_hero"), alias: Some("custom_hero"),
arguments: Vec::new(), arguments: Vec::new(),
applies_for: Applies::All,
children: vec![ children: vec![
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "id",
name: "id", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "name",
name: "name", alias: Some("my_name"),
alias: Some("my_name"), arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
], ],
@ -613,51 +616,42 @@ query Hero {
name: "hero", name: "hero",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
applies_for: Applies::All,
children: vec![ children: vec![
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "id",
name: "id", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "name",
name: "name", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "friends",
name: "friends", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: vec![
children: vec![ LookAheadSelection {
ChildSelection { name: "name",
inner: LookAheadSelection { alias: None,
name: "name", arguments: Vec::new(),
alias: None, children: Vec::new(),
arguments: Vec::new(), applies_for: Applies::All,
children: Vec::new(), },
}, LookAheadSelection {
applies_for: Applies::All, name: "id",
}, alias: None,
ChildSelection { arguments: Vec::new(),
inner: LookAheadSelection { children: Vec::new(),
name: "id", applies_for: Applies::All,
alias: None, },
arguments: Vec::new(), ],
children: Vec::new(),
},
applies_for: Applies::All,
},
],
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
], ],
@ -698,26 +692,23 @@ query Hero {
name: "episode", name: "episode",
value: LookAheadValue::Enum("EMPIRE"), value: LookAheadValue::Enum("EMPIRE"),
}], }],
applies_for: Applies::All,
children: vec![ children: vec![
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "id",
name: "id", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "name",
name: "name", alias: None,
alias: None, arguments: vec![LookAheadArgument {
arguments: vec![LookAheadArgument { name: "uppercase",
name: "uppercase", value: LookAheadValue::Scalar(&DefaultScalarValue::Boolean(true)),
value: LookAheadValue::Scalar(&DefaultScalarValue::Boolean(true)), }],
}], children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
], ],
@ -758,23 +749,20 @@ query Hero($episode: Episode) {
name: "episode", name: "episode",
value: LookAheadValue::Enum("JEDI"), value: LookAheadValue::Enum("JEDI"),
}], }],
applies_for: Applies::All,
children: vec![ children: vec![
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "id",
name: "id", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "name",
name: "name", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
], ],
@ -814,13 +802,12 @@ query Hero($episode: Episode) {
name: "episode", name: "episode",
value: LookAheadValue::Null, value: LookAheadValue::Null,
}], }],
children: vec![ChildSelection { applies_for: Applies::All,
inner: LookAheadSelection { children: vec![LookAheadSelection {
name: "id", name: "id",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
children: Vec::new(), children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}], }],
}; };
@ -861,32 +848,27 @@ fragment commonFields on Character {
name: "hero", name: "hero",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
applies_for: Applies::All,
children: vec![ children: vec![
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "id",
name: "id", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "name",
name: "name", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "appearsIn",
name: "appearsIn", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
], ],
@ -925,23 +907,20 @@ query Hero {
name: "hero", name: "hero",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
applies_for: Applies::All,
children: vec![ children: vec![
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "id",
name: "id", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "height",
name: "height", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
], ],
@ -983,32 +962,27 @@ query Hero {
name: "hero", name: "hero",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
applies_for: Applies::All,
children: vec![ children: vec![
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "name",
name: "name", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "primaryFunction",
name: "primaryFunction", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::OnlyType("Droid"), applies_for: Applies::OnlyType("Droid"),
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "height",
name: "height", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::OnlyType("Human"), applies_for: Applies::OnlyType("Human"),
}, },
], ],
@ -1048,13 +1022,12 @@ query HeroAndHuman {
name: "hero", name: "hero",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
children: vec![ChildSelection { applies_for: Applies::All,
inner: LookAheadSelection { children: vec![LookAheadSelection {
name: "id", name: "id",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
children: Vec::new(), children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}], }],
}; };
@ -1070,13 +1043,12 @@ query HeroAndHuman {
name: "human", name: "human",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
children: vec![ChildSelection { applies_for: Applies::All,
inner: LookAheadSelection { children: vec![LookAheadSelection {
name: "name", name: "name",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
children: Vec::new(), children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}], }],
}; };
@ -1130,115 +1102,92 @@ fragment comparisonFields on Character {
name: "id", name: "id",
value: LookAheadValue::Scalar(&DefaultScalarValue::Int(42)), value: LookAheadValue::Scalar(&DefaultScalarValue::Int(42)),
}], }],
applies_for: Applies::All,
children: vec![ children: vec![
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "id",
name: "id", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "__typename",
name: "__typename", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "name",
name: "name", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "appearsIn",
name: "appearsIn", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "primaryFunction",
name: "primaryFunction", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::OnlyType("Droid"), applies_for: Applies::OnlyType("Droid"),
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "height",
name: "height", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::OnlyType("Human"), applies_for: Applies::OnlyType("Human"),
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "friends",
name: "friends", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(),
children: vec![
ChildSelection {
inner: LookAheadSelection {
name: "__typename",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All,
},
ChildSelection {
inner: LookAheadSelection {
name: "name",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All,
},
ChildSelection {
inner: LookAheadSelection {
name: "appearsIn",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All,
},
ChildSelection {
inner: LookAheadSelection {
name: "primaryFunction",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::OnlyType("Droid"),
},
ChildSelection {
inner: LookAheadSelection {
name: "height",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::OnlyType("Human"),
},
],
},
applies_for: Applies::All, applies_for: Applies::All,
children: vec![
LookAheadSelection {
name: "__typename",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
applies_for: Applies::All,
},
LookAheadSelection {
name: "name",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
applies_for: Applies::All,
},
LookAheadSelection {
name: "appearsIn",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
applies_for: Applies::All,
},
LookAheadSelection {
name: "primaryFunction",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
applies_for: Applies::OnlyType("Droid"),
},
LookAheadSelection {
name: "height",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
applies_for: Applies::OnlyType("Human"),
},
],
}, },
], ],
}; };
@ -1280,18 +1229,21 @@ query Hero {
name: "hero", name: "hero",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
applies_for: Applies::All,
children: vec![ children: vec![
ConcreteLookAheadSelection { ConcreteLookAheadSelection {
name: "name", name: "name",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
children: Vec::new(), children: Vec::new(),
applies_for: Applies::All,
}, },
ConcreteLookAheadSelection { ConcreteLookAheadSelection {
name: "height", name: "height",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
children: Vec::new(), children: Vec::new(),
applies_for: Applies::OnlyType("Human"),
}, },
], ],
}; };
@ -1307,43 +1259,36 @@ query Hero {
name: "hero", name: "hero",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
applies_for: Applies::All,
children: vec![ children: vec![
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "id",
name: "id", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "friends",
name: "friends", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(),
children: vec![
ChildSelection {
inner: LookAheadSelection {
name: "id",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All,
},
ChildSelection {
inner: LookAheadSelection {
name: "name",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All,
},
],
},
applies_for: Applies::All, applies_for: Applies::All,
children: vec![
LookAheadSelection {
name: "id",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
applies_for: Applies::All,
},
LookAheadSelection {
name: "name",
alias: None,
arguments: Vec::new(),
children: Vec::new(),
applies_for: Applies::All,
},
],
}, },
], ],
}; };
@ -1356,6 +1301,7 @@ query Hero {
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
children: Vec::new(), children: Vec::new(),
applies_for: Applies::All,
}; };
assert_eq!(id, Some(&expected)); assert_eq!(id, Some(&expected));
assert_eq!( assert_eq!(
@ -1369,23 +1315,20 @@ query Hero {
name: "friends", name: "friends",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
applies_for: Applies::All,
children: vec![ children: vec![
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "id",
name: "id", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
ChildSelection { LookAheadSelection {
inner: LookAheadSelection { name: "name",
name: "name", alias: None,
alias: None, arguments: Vec::new(),
arguments: Vec::new(), children: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All, applies_for: Applies::All,
}, },
], ],
@ -1428,22 +1371,19 @@ fragment heroFriendNames on Hero {
name: "hero", name: "hero",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
children: vec![ChildSelection { applies_for: Applies::All,
inner: LookAheadSelection { children: vec![LookAheadSelection {
name: "friends", name: "friends",
alias: None,
arguments: Vec::new(),
applies_for: Applies::All,
children: vec![LookAheadSelection {
name: "name",
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
children: vec![ChildSelection { children: Vec::new(),
inner: LookAheadSelection { applies_for: Applies::All,
name: "name", }],
alias: None,
arguments: Vec::new(),
children: Vec::new(),
},
applies_for: Applies::All,
}],
},
applies_for: Applies::All,
}], }],
}; };
assert_eq!(look_ahead, expected); assert_eq!(look_ahead, expected);
@ -1541,4 +1481,39 @@ query Hero {
panic!("No Operation found"); panic!("No Operation found");
} }
} }
#[test]
fn check_resolves_applies_for() {
let docs = parse_document_source::<DefaultScalarValue>(
"
query Hero {
hero {
... on Human {
height
}
}
}",
)
.unwrap();
let fragments = extract_fragments(&docs);
if let crate::ast::Definition::Operation(ref op) = docs[0] {
let vars = graphql_vars! {};
let look_ahead = LookAheadSelection::build_from_selection(
&op.item.selection_set[0],
&vars,
&fragments,
)
.unwrap()
.for_explicit_type("Human");
let mut children = look_ahead.children().into_iter();
let heights_child = children.next().unwrap();
assert_eq!(heights_child.name, "height");
assert_eq!(heights_child.applies_for, Applies::OnlyType("Human"));
assert_eq!(heights_child.applies_for().unwrap(), "Human");
} else {
panic!("No Operation found");
}
}
} }

3
juniper/src/executor/mod.rs
View file

@ -37,7 +37,7 @@ use crate::{
pub use self::{ pub use self::{
look_ahead::{ look_ahead::{
Applies, ChildSelection, ConcreteLookAheadSelection, LookAheadArgument, LookAheadMethods, Applies, ConcreteLookAheadSelection, LookAheadArgument, LookAheadMethods,
LookAheadSelection, LookAheadValue, LookAheadSelection, LookAheadValue,
}, },
owned_executor::OwnedExecutor, owned_executor::OwnedExecutor,
@ -729,6 +729,7 @@ where
alias: None, alias: None,
arguments: Vec::new(), arguments: Vec::new(),
children: Vec::new(), children: Vec::new(),
applies_for: Applies::All,
}; };
// Add in all the children - this will mutate `ret` // Add in all the children - this will mutate `ret`