Skip to content

Commit

Permalink
finish object value, tweak values to parse input correctly
Browse files Browse the repository at this point in the history
  • Loading branch information
@lrlna
lrlna committed Aug 24, 2021
1 parent fde19b0 commit 5790ed8
Show file tree
Hide file tree
Showing 3 changed files with 170 additions and 46 deletions.
39 changes: 7 additions & 32 deletions crates/apollo-parser/src/parser/argument.rs
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,25 @@
use crate::parser::{name, value};
use crate::{create_err, Parser, SyntaxKind, TokenKind};

/// See: https://spec.graphql.org/June2018/#Valuehttps://spec.graphql.org/June2018/#Argument
/// See: https://spec.graphql.org/June2018/#Argument
///
/// ```txt
/// Argument
/// Name : Value
/// ```
pub(crate) fn argument(parser: &mut Parser, is_argument: bool) {
pub(crate) fn argument(parser: &mut Parser, mut is_argument: bool) {
if let Some(TokenKind::Node) = parser.peek() {
let guard = parser.start_node(SyntaxKind::ARGUMENT);
name::name(parser);
if let Some(TokenKind::Colon) = parser.peek() {
parser.bump(SyntaxKind::COLON);
match parser.peek() {
Some(TokenKind::Node) | Some(TokenKind::Dollar) => {
value::value(parser);
if parser.peek().is_some() {
guard.finish_node();
argument(parser, true);
}
}
_ => {
parser.push_err(create_err!(
parser
.peek_data()
.unwrap_or_else(|| String::from("no further data")),
"Expected Argument to have a Value, got {}",
parser
.peek_data()
.unwrap_or_else(|| String::from("no further data"))
));
}
value::value(parser);
is_argument = true;
if parser.peek().is_some() {
guard.finish_node();
argument(parser, is_argument);
}
}
} else {
parser.push_err(create_err!(
parser
.peek_data()
.unwrap_or_else(|| String::from("no further data")),
"Expected Argument to have a Name, got {}",
parser
.peek_data()
.unwrap_or_else(|| String::from("no further data"))
));
}
if let Some(TokenKind::Comma) = parser.peek() {
parser.bump(SyntaxKind::COMMA);
Expand Down Expand Up @@ -77,7 +53,6 @@ pub(crate) fn arguments(parser: &mut Parser) {
parser.bump(SyntaxKind::R_PAREN);
guard.finish_node();
}
// missing a closing RParen
_ => parser.push_err(create_err!(
parser
.peek_data()
Expand Down
16 changes: 14 additions & 2 deletions crates/apollo-parser/src/parser/operation.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,19 @@ pub(crate) fn operation_type_definition(parser: &mut Parser, is_operation_type:

pub(crate) fn operation_definition(parser: &mut Parser) {
let _guard = parser.start_node(SyntaxKind::OPERATION_DEFINITION);
operation_type(parser);
match parser.peek() {
Some(TokenKind::Node) => operation_type(parser),
Some(TokenKind::LCurly) => selection::selection_set(parser),
_ => parser.push_err(create_err!(
parser
.peek_data()
.unwrap_or_else(|| String::from("no further data")),
"Expected an Operation Type or a Selection Set, got {}",
parser
.peek_data()
.unwrap_or_else(|| String::from("no further data"))
)),
}
if let Some(TokenKind::Node) = parser.peek() {
name::name(parser);
}
Expand All @@ -75,7 +87,7 @@ pub(crate) fn operation_definition(parser: &mut Parser) {
directive::directives(parser);
}
if let Some(TokenKind::LCurly) = parser.peek() {
selection::selection_set(parser);
selection::selection_set(parser)
}
}

Expand Down
161 changes: 149 additions & 12 deletions crates/apollo-parser/src/parser/value.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,45 +41,182 @@ pub(crate) fn value(parser: &mut Parser) {
}
}

/// See: https://spec.graphql.org/June2018/#ListValue
/// ```txt
/// ListValueConst
/// [ ]
/// [ Value [?const][list] ]
/// ```
pub(crate) fn list_value(parser: &mut Parser) {
let guard = parser.start_node(SyntaxKind::LIST_VALUE);
parser.bump(SyntaxKind::L_BRACK);
while let Some(node) = parser.peek() {
if node == TokenKind::RBracket {
parser.bump(SyntaxKind::R_BRACK);
guard.finish_node();
break;
} else if node == TokenKind::Comma {
parser.bump(SyntaxKind::COMMA);
value(parser);
} else {
value(parser);
}
}
}

/// See: https://spec.graphql.org/June2018/#ObjectValue
///
/// ```txt
/// ObjectValue [Const]
/// { }
/// { ObjectField [Const][list] }
pub(crate) fn object_value(parser: &mut Parser) {
let guard = parser.start_node(SyntaxKind::OBJECT_VALUE);
parser.bump(SyntaxKind::L_CURLY);
match parser.peek() {
Some(TokenKind::Node) => {
value(parser);
if let Some(TokenKind::RBracket) = parser.peek() {
parser.bump(SyntaxKind::R_BRACK);
object_field(parser);
if let Some(TokenKind::RCurly) = parser.peek() {
parser.bump(SyntaxKind::R_CURLY);
guard.finish_node()
} else {
parser.push_err(create_err!(
parser
.peek_data()
.unwrap_or_else(|| String::from("no further data")),
"Expected a closing ] to follow a List Value, got {}",
"Expected a closing }} to follow an Object Value , got {}",
parser
.peek_data()
.unwrap_or_else(|| String::from("no further data"))
));
}
}
Some(TokenKind::RBracket) => {}
Some(TokenKind::RCurly) => {
parser.bump(SyntaxKind::R_CURLY);
guard.finish_node()
}
_ => {
parser.push_err(create_err!(
parser
.peek_data()
.unwrap_or_else(|| String::from("no further data")),
"Expected a List Value, got {}",
"Expected an Object Value, got {}",
parser
.peek_data()
.unwrap_or_else(|| String::from("no further data"))
));
}
}
}
/// ObjectValueConst
/// { }
/// { ObjectField [Const][list] }
pub(crate) fn object_value(parser: &mut Parser) {
let guard = parser.start_node(SyntaxKind::OBJECT_VALUE);
parser.bump(SyntaxKind::L_CURLY);

/// See: https://spec.graphql.org/June2018/#ObjectField
///
/// ```txt
/// ObjectField [Const]
/// Name : Value [const]
/// ```
pub(crate) fn object_field(parser: &mut Parser) {
if let Some(TokenKind::Node) = parser.peek() {
let guard = parser.start_node(SyntaxKind::OBJECT_FIELD);
name::name(parser);
if let Some(TokenKind::Colon) = parser.peek() {
parser.bump(SyntaxKind::COLON);
value(parser);
if parser.peek().is_some() {
guard.finish_node();
object_field(parser);
}
}
}
if let Some(TokenKind::Comma) = parser.peek() {
parser.bump(SyntaxKind::COMMA);
return object_field(parser);
}
}

#[cfg(test)]
mod test {
use crate::parser::utils;

#[test]
fn it_returns_values() {
utils::check_ast(
r#"
{
user(id: 4, size: $size value: "string", input: [ "one", 1.34 ], otherInput: { key: false, output: null })
}"#,
r#"
- DOCUMENT@0..91
- OPERATION_DEFINITION@0..91
- SELECTION_SET@0..91
- L_CURLY@0..1 "{"
- SELECTION@1..90
- FIELD@1..90
- NAME@1..5
- IDENT@1..5 "user"
- ARGUMENTS@5..90
- L_PAREN@5..6 "("
- ARGUMENT@6..10
- NAME@6..8
- IDENT@6..8 "id"
- COLON@8..9 ":"
- VALUE@9..10
- INT_VALUE@9..10 "4"
- COMMA@10..11 ","
- ARGUMENT@11..21
- NAME@11..15
- IDENT@11..15 "size"
- COLON@15..16 ":"
- VALUE@16..21
- VARIABLE@16..21
- DOLLAR@16..17 "$"
- NAME@17..21
- IDENT@17..21 "size"
- ARGUMENT@21..35
- NAME@21..26
- IDENT@21..26 "value"
- COLON@26..27 ":"
- VALUE@27..35
- STRING_VALUE@27..35 "\"string\""
- COMMA@35..36 ","
- ARGUMENT@36..54
- NAME@36..41
- IDENT@36..41 "input"
- COLON@41..42 ":"
- VALUE@42..54
- LIST_VALUE@42..54
- L_BRACK@42..43 "["
- VALUE@43..48
- STRING_VALUE@43..48 "\"one\""
- COMMA@48..49 ","
- VALUE@49..53
- FLOAT_VALUE@49..53 "1.34"
- R_BRACK@53..54 "]"
- COMMA@54..55 ","
- ARGUMENT@55..89
- NAME@55..65
- IDENT@55..65 "otherInput"
- COLON@65..66 ":"
- VALUE@66..89
- OBJECT_VALUE@66..89
- L_CURLY@66..67 "{"
- OBJECT_FIELD@67..76
- NAME@67..70
- IDENT@67..70 "key"
- COLON@70..71 ":"
- VALUE@71..76
- BOOLEAN_VALUE@71..76 "false"
- COMMA@76..77 ","
- OBJECT_FIELD@77..88
- NAME@77..83
- IDENT@77..83 "output"
- COLON@83..84 ":"
- VALUE@84..88
- NULL_VALUE@84..88 "null"
- R_CURLY@88..89 "}"
- R_PAREN@89..90 ")"
- R_CURLY@90..91 "}"
"#,
);
}
}

0 comments on commit 5790ed8

Please sign in to comment.