Skip to content

Commit ac7b5f2

Browse files
goto-bus-stopgoto-bus-stop
authored
fix(parser): object values can be empty, fixes #744 (#745)
* fix(parser): object values can be empty, fixes #744 * spaces * changelog * links
1 parent 0960e58 commit ac7b5f2

File tree

4 files changed

+123
-85
lines changed

4 files changed

+123
-85
lines changed

‎crates/apollo-parser/CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,20 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
3838
[issue/715]: https://github.com/apollographql/apollo-rs/issues/715
3939
[fieldtype]: https://specs.apollo.dev/join/v0.3/#@field
4040

41+
## Fixes
42+
43+
- **Input object values can be empty - [goto-bus-stop], [pull/745] fixing [issue/744]**
44+
`apollo-parser` version 0.7.3 introduced a regression where empty input objects failed to parse.
45+
This is now fixed.
46+
47+
```graphql
48+
{ field(argument: {}) }
49+
```
50+
51+
[goto-bus-stop]: https://github.com/goto-bus-stop
52+
[pull/745]: https://github.com/apollographql/apollo-rs/pull/745
53+
[issue/744]: https://github.com/apollographql/apollo-rs/issues/744
54+
4155
# [0.7.3](https://crates.io/crates/apollo-parser/0.7.3) - 2023-11-07
4256

4357
## Fixes

‎crates/apollo-parser/src/parser/grammar/value.rs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,6 @@ pub(crate) fn object_value(p: &mut Parser) {
110110
let _g = p.start_node(SyntaxKind::OBJECT_VALUE);
111111
p.bump(S!['{']);
112112

113-
if let Some(TokenKind::Name) = p.peek() {
114-
object_field(p);
115-
} else {
116-
p.err("expected Object Value");
117-
}
118113
while let Some(TokenKind::Name) = p.peek() {
119114
object_field(p);
120115
}

‎crates/apollo-parser/test_data/parser/ok/0030_values.graphql‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
11
{
2-
user(id: 4, size: $size value: "string", input: [ "one", 1.34 ], otherInput: { key: false, output: null })
3-
}
2+
user(
3+
id: 4,
4+
size: $size
5+
value: "string",
6+
input: [ "one", 1.34 ],
7+
otherInput: { key: false, output: null }
8+
emptyList: []
9+
emptyObject: {}
10+
)
11+
}

‎crates/apollo-parser/test_data/parser/ok/0030_values.txt‎

Lines changed: 99 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,107 @@
1-
- DOCUMENT@0..114
2-
- OPERATION_DEFINITION@0..114
3-
- SELECTION_SET@0..114
1+
- DOCUMENT@0..207
2+
- OPERATION_DEFINITION@0..206
3+
- SELECTION_SET@0..206
44
- [email protected] "{"
55
- [email protected] "\n "
6-
- FIELD@6..112
6+
- FIELD@6..204
77
- [email protected]
88
- [email protected] "user"
9-
- ARGUMENTS@10..112
9+
- ARGUMENTS@10..204
1010
- [email protected] "("
11-
- [email protected]
12-
- [email protected]
13-
- [email protected] "id"
14-
- [email protected] ":"
15-
- [email protected] " "
16-
- [email protected]
17-
- [email protected] "4"
18-
- [email protected] ","
19-
- [email protected] " "
20-
- [email protected]
21-
- [email protected]
22-
- [email protected] "size"
11+
- [email protected] "\n "
12+
- [email protected]
13+
- [email protected]
14+
- [email protected] "id"
2315
- [email protected] ":"
2416
- [email protected] " "
25-
- [email protected]
26-
- [email protected] "$"
27-
- [email protected]
28-
- [email protected] "size"
29-
- [email protected] " "
30-
- [email protected]
31-
- [email protected]
32-
- [email protected] "value"
33-
- [email protected] ":"
34-
- [email protected] " "
35-
- [email protected]
36-
- [email protected] "\"string\""
37-
- [email protected] ","
38-
- [email protected] " "
39-
- [email protected]
40-
- [email protected]
41-
- [email protected] "input"
42-
- [email protected] ":"
43-
- [email protected] " "
44-
- [email protected]
45-
- [email protected] "["
46-
- [email protected] " "
47-
- [email protected]
48-
- [email protected] "\"one\""
49-
- [email protected] ","
50-
- [email protected] " "
51-
- [email protected]
52-
- [email protected] "1.34"
53-
- [email protected] " "
54-
- [email protected] "]"
55-
- [email protected] ","
56-
- [email protected] " "
57-
- [email protected]
58-
- [email protected]
59-
- [email protected] "otherInput"
60-
- [email protected] ":"
61-
- [email protected] " "
62-
- [email protected]
63-
- [email protected] "{"
64-
- [email protected] " "
65-
- [email protected]
66-
- [email protected]
67-
- [email protected] "key"
68-
- [email protected] ":"
69-
- [email protected] " "
70-
- [email protected]
71-
- [email protected] "false"
72-
- [email protected] ","
73-
- [email protected] " "
74-
- [email protected]
75-
- [email protected]
76-
- [email protected] "output"
77-
- [email protected] ":"
78-
- [email protected] " "
79-
- [email protected]
80-
- [email protected] "null"
81-
- [email protected] " "
82-
- [email protected] "}"
83-
- [email protected] ")"
84-
- [email protected] "\n"
85-
- [email protected] "}"
17+
- [email protected]
18+
- [email protected] "4"
19+
- [email protected] ","
20+
- [email protected] "\n "
21+
- [email protected]
22+
- [email protected]
23+
- [email protected] "size"
24+
- [email protected] ":"
25+
- [email protected] " "
26+
- [email protected]
27+
- [email protected] "$"
28+
- [email protected]
29+
- [email protected] "size"
30+
- [email protected] "\n "
31+
- [email protected]
32+
- [email protected]
33+
- [email protected] "value"
34+
- [email protected] ":"
35+
- [email protected] " "
36+
- [email protected]
37+
- [email protected] "\"string\""
38+
- [email protected] ","
39+
- [email protected] "\n "
40+
- [email protected]
41+
- [email protected]
42+
- [email protected] "input"
43+
- [email protected] ":"
44+
- [email protected] " "
45+
- [email protected]
46+
- [email protected] "["
47+
- [email protected] " "
48+
- [email protected]
49+
- [email protected] "\"one\""
50+
- [email protected] ","
51+
- [email protected] " "
52+
- [email protected]
53+
- [email protected] "1.34"
54+
- [email protected] " "
55+
- [email protected] "]"
56+
- [email protected] ","
57+
- [email protected] "\n "
58+
- [email protected]
59+
- [email protected]
60+
- [email protected] "otherInput"
61+
- [email protected] ":"
62+
- [email protected] " "
63+
- [email protected]
64+
- [email protected] "{"
65+
- [email protected] " "
66+
- [email protected]
67+
- [email protected]
68+
- [email protected] "key"
69+
- [email protected] ":"
70+
- [email protected] " "
71+
- [email protected]
72+
- [email protected] "false"
73+
- [email protected] ","
74+
- [email protected] " "
75+
- [email protected]
76+
- [email protected]
77+
- [email protected] "output"
78+
- [email protected] ":"
79+
- [email protected] " "
80+
- [email protected]
81+
- [email protected] "null"
82+
- [email protected] " "
83+
- [email protected] "}"
84+
- [email protected] "\n "
85+
- [email protected]
86+
- [email protected]
87+
- [email protected] "emptyList"
88+
- [email protected] ":"
89+
- [email protected] " "
90+
- [email protected]
91+
- [email protected] "["
92+
- [email protected] "]"
93+
- [email protected] "\n "
94+
- [email protected]
95+
- [email protected]
96+
- [email protected] "emptyObject"
97+
- [email protected] ":"
98+
- [email protected] " "
99+
- [email protected]
100+
- [email protected] "{"
101+
- [email protected] "}"
102+
- [email protected] "\n "
103+
- [email protected] ")"
104+
- [email protected] "\n"
105+
- [email protected] "}"
106+
- [email protected] "\n"
86107
recursion limit: 500, high: 2

0 commit comments

Comments
 (0)