Skip to content

Commit

Permalink
fix(parser): object values can be empty, fixes #744 (#745)
Browse files Browse the repository at this point in the history 
* fix(parser): object values can be empty, fixes #744

* spaces

* changelog

* links
  • Loading branch information
@goto-bus-stop
goto-bus-stop authored Nov 16, 2023
1 parent 0960e58 commit ac7b5f2
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 85 deletions.
14 changes: 14 additions & 0 deletions crates/apollo-parser/CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,20 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
[issue/715]: https://github.com/apollographql/apollo-rs/issues/715
[fieldtype]: https://specs.apollo.dev/join/v0.3/#@field

## Fixes

- **Input object values can be empty - [goto-bus-stop], [pull/745] fixing [issue/744]**
`apollo-parser` version 0.7.3 introduced a regression where empty input objects failed to parse.
This is now fixed.

```graphql
{ field(argument: {}) }
```

[goto-bus-stop]: https://github.com/goto-bus-stop
[pull/745]: https://github.com/apollographql/apollo-rs/pull/745
[issue/744]: https://github.com/apollographql/apollo-rs/issues/744

# [0.7.3](https://crates.io/crates/apollo-parser/0.7.3) - 2023-11-07

## Fixes
Expand Down
5 changes: 0 additions & 5 deletions crates/apollo-parser/src/parser/grammar/value.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,6 @@ pub(crate) fn object_value(p: &mut Parser) {
let _g = p.start_node(SyntaxKind::OBJECT_VALUE);
p.bump(S!['{']);

if let Some(TokenKind::Name) = p.peek() {
object_field(p);
} else {
p.err("expected Object Value");
}
while let Some(TokenKind::Name) = p.peek() {
object_field(p);
}
Expand Down
12 changes: 10 additions & 2 deletions crates/apollo-parser/test_data/parser/ok/0030_values.graphql
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
{
user(id: 4, size: $size value: "string", input: [ "one", 1.34 ], otherInput: { key: false, output: null })
}
user(
id: 4,
size: $size
value: "string",
input: [ "one", 1.34 ],
otherInput: { key: false, output: null }
emptyList: []
emptyObject: {}
)
}
177 changes: 99 additions & 78 deletions crates/apollo-parser/test_data/parser/ok/0030_values.txt
View file
Original file line number Diff line number Diff line change
@@ -1,86 +1,107 @@
- DOCUMENT@0..114
- OPERATION_DEFINITION@0..114
- SELECTION_SET@0..114
- DOCUMENT@0..207
- OPERATION_DEFINITION@0..206
- SELECTION_SET@0..206
- L_CURLY@0..1 "{"
- WHITESPACE@1..6 "\n "
- FIELD@6..112
- FIELD@6..204
- NAME@6..10
- IDENT@6..10 "user"
- ARGUMENTS@10..112
- ARGUMENTS@10..204
- L_PAREN@10..11 "("
- ARGUMENT@11..16
- NAME@11..13
- IDENT@11..13 "id"
- COLON@13..14 ":"
- WHITESPACE@14..15 " "
- INT_VALUE@15..16
- INT@15..16 "4"
- COMMA@16..17 ","
- WHITESPACE@17..18 " "
- ARGUMENT@18..29
- NAME@18..22
- IDENT@18..22 "size"
- WHITESPACE@11..20 "\n "
- ARGUMENT@20..25
- NAME@20..22
- IDENT@20..22 "id"
- COLON@22..23 ":"
- WHITESPACE@23..24 " "
- VARIABLE@24..29
- DOLLAR@24..25 "$"
- NAME@25..29
- IDENT@25..29 "size"
- WHITESPACE@29..30 " "
- ARGUMENT@30..45
- NAME@30..35
- IDENT@30..35 "value"
- COLON@35..36 ":"
- WHITESPACE@36..37 " "
- STRING_VALUE@37..45
- STRING@37..45 "\"string\""
- COMMA@45..46 ","
- WHITESPACE@46..47 " "
- ARGUMENT@47..69
- NAME@47..52
- IDENT@47..52 "input"
- COLON@52..53 ":"
- WHITESPACE@53..54 " "
- LIST_VALUE@54..69
- L_BRACK@54..55 "["
- WHITESPACE@55..56 " "
- STRING_VALUE@56..61
- STRING@56..61 "\"one\""
- COMMA@61..62 ","
- WHITESPACE@62..63 " "
- FLOAT_VALUE@63..67
- FLOAT@63..67 "1.34"
- WHITESPACE@67..68 " "
- R_BRACK@68..69 "]"
- COMMA@69..70 ","
- WHITESPACE@70..71 " "
- ARGUMENT@71..111
- NAME@71..81
- IDENT@71..81 "otherInput"
- COLON@81..82 ":"
- WHITESPACE@82..83 " "
- OBJECT_VALUE@83..111
- L_CURLY@83..84 "{"
- WHITESPACE@84..85 " "
- OBJECT_FIELD@85..95
- NAME@85..88
- IDENT@85..88 "key"
- COLON@88..89 ":"
- WHITESPACE@89..90 " "
- BOOLEAN_VALUE@90..95
- false_KW@90..95 "false"
- COMMA@95..96 ","
- WHITESPACE@96..97 " "
- OBJECT_FIELD@97..109
- NAME@97..103
- IDENT@97..103 "output"
- COLON@103..104 ":"
- WHITESPACE@104..105 " "
- NULL_VALUE@105..109
- null_KW@105..109 "null"
- WHITESPACE@109..110 " "
- R_CURLY@110..111 "}"
- R_PAREN@111..112 ")"
- WHITESPACE@112..113 "\n"
- R_CURLY@113..114 "}"
- INT_VALUE@24..25
- INT@24..25 "4"
- COMMA@25..26 ","
- WHITESPACE@26..35 "\n "
- ARGUMENT@35..46
- NAME@35..39
- IDENT@35..39 "size"
- COLON@39..40 ":"
- WHITESPACE@40..41 " "
- VARIABLE@41..46
- DOLLAR@41..42 "$"
- NAME@42..46
- IDENT@42..46 "size"
- WHITESPACE@46..55 "\n "
- ARGUMENT@55..70
- NAME@55..60
- IDENT@55..60 "value"
- COLON@60..61 ":"
- WHITESPACE@61..62 " "
- STRING_VALUE@62..70
- STRING@62..70 "\"string\""
- COMMA@70..71 ","
- WHITESPACE@71..80 "\n "
- ARGUMENT@80..102
- NAME@80..85
- IDENT@80..85 "input"
- COLON@85..86 ":"
- WHITESPACE@86..87 " "
- LIST_VALUE@87..102
- L_BRACK@87..88 "["
- WHITESPACE@88..89 " "
- STRING_VALUE@89..94
- STRING@89..94 "\"one\""
- COMMA@94..95 ","
- WHITESPACE@95..96 " "
- FLOAT_VALUE@96..100
- FLOAT@96..100 "1.34"
- WHITESPACE@100..101 " "
- R_BRACK@101..102 "]"
- COMMA@102..103 ","
- WHITESPACE@103..112 "\n "
- ARGUMENT@112..152
- NAME@112..122
- IDENT@112..122 "otherInput"
- COLON@122..123 ":"
- WHITESPACE@123..124 " "
- OBJECT_VALUE@124..152
- L_CURLY@124..125 "{"
- WHITESPACE@125..126 " "
- OBJECT_FIELD@126..136
- NAME@126..129
- IDENT@126..129 "key"
- COLON@129..130 ":"
- WHITESPACE@130..131 " "
- BOOLEAN_VALUE@131..136
- false_KW@131..136 "false"
- COMMA@136..137 ","
- WHITESPACE@137..138 " "
- OBJECT_FIELD@138..150
- NAME@138..144
- IDENT@138..144 "output"
- COLON@144..145 ":"
- WHITESPACE@145..146 " "
- NULL_VALUE@146..150
- null_KW@146..150 "null"
- WHITESPACE@150..151 " "
- R_CURLY@151..152 "}"
- WHITESPACE@152..161 "\n "
- ARGUMENT@161..174
- NAME@161..170
- IDENT@161..170 "emptyList"
- COLON@170..171 ":"
- WHITESPACE@171..172 " "
- LIST_VALUE@172..174
- L_BRACK@172..173 "["
- R_BRACK@173..174 "]"
- WHITESPACE@174..183 "\n "
- ARGUMENT@183..198
- NAME@183..194
- IDENT@183..194 "emptyObject"
- COLON@194..195 ":"
- WHITESPACE@195..196 " "
- OBJECT_VALUE@196..198
- L_CURLY@196..197 "{"
- R_CURLY@197..198 "}"
- WHITESPACE@198..203 "\n "
- R_PAREN@203..204 ")"
- WHITESPACE@204..205 "\n"
- R_CURLY@205..206 "}"
- WHITESPACE@206..207 "\n"
recursion limit: 500, high: 2

0 comments on commit ac7b5f2

Please sign in to comment.