feat(apollo-parser, apollo-compiler): support parsing and validating FieldSet #685
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In order to support `FieldSet` work in `federation-next`, we'd like to allow specific `field_set` parsing. It can be accessed after constructing the parser by calling `.parse_fieldset`.
```rust
let source = r#"{ a }"#;
let parser = Parser::new(source);
let cst: SyntaxTree<cst::SelectionSet> = parser.parse_fieldset();
let errors = cst.errors().collect::<Vec<_>>();
assert_eq!(errors.len(), 0);
let sel_set: cst::SelectionSet = cst.selection_set();
let _ = sel_set.selections().map(|sel| {
if let cst::Selection::Field(f) = sel {
assert_eq!(f.name().unwrap().text().as_ref(), "a")
}
});
```
lrlna
added
the
apollo-compiler
lrlna
commented
Oct 9, 2023
| @@ -164,17 +190,30 @@ impl SyntaxTreeBuilder { | |||
|
|
|||
| pub(crate) fn finish( | |||
| self, | |||
| field_set: bool, | |||
There was a problem hiding this comment.
Alternatively, we could also have pub(crate) fn finish_document and pub(crate) fn finish_fieldset. I am pretty indifferent here.
lrlna
commented
Oct 9, 2023
| } | ||
| } | ||
|
|
||
| pub fn parse_fieldset(mut self) -> SyntaxTree<SelectionSet> { |
There was a problem hiding this comment.
i am almost certain i'd like this to be called parse_selection_set. fieldset is a federation specific term based on a non-spec scalar definition. I'd rather have the parser be by the spec
This follows specification naming more closely, rather than aligning the parser to federation implementation
…`@requires` Because field sets may or may not have opening braces, we are no longer strictly following the graphql specification. As part of this change, the API points referencing parsing `selection_set` are now renamed to `field_set`
This commit creates several wrapper types to handle FieldSet.
- apollo-compiler's parser endpoint now has `parse_field_set` public API and an internal `parse_field_set_ast`,
- executable document now has a `FieldSet` struct that allows us to store build errors along with the actual selection set
- internal compiler's ast now has an implementation for `FieldSet` with source information for diagnostics and the actual selection set
- it additionally implements a `FieldSet::from_cst` and `FieldSet::to_field_set` (which converts this to executable HIR `FieldSet` type)
SimonSapin
force-pushed
the
field_set_parsing
branch
from
b8b425f
to
1ee4d47
Compare
lrlna
commented
Oct 10, 2023
lrlna
commented
Oct 10, 2023
lrlna
commented
Oct 10, 2023
SimonSapin
approved these changes
Oct 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This starts work on supporting FieldSet.
The current items in scope:
SyntaxTree::selection_setgetter method for accessing selection set created from FieldSet parsingcloses #681