fix: Parser fails to parse object type def with no fields (#901)

trevor-scheer · web-flow · commit b0a9b49682ed · 2024-09-06T18:07:57.000+02:00
According to the spec, a syntactically valid object type definition can have no fields (if the curlies are omitted). See the second option: https://spec.graphql.org/draft/#ObjectTypeDefinition This removes the parse expectation that the only `TokenKind::Name` which can follow a type's name is `implements`, since it can also be the beginning of a following definition or extension. Credit to @swcollard for spotting this bug during LSP QA!
diff --git a/crates/apollo-parser/src/parser/grammar/object.rs b/crates/apollo-parser/src/parser/grammar/object.rs
@@ -35,8 +35,6 @@ pub(crate) fn object_type_definition(p: &mut Parser) {
     if let Some(TokenKind::Name) = p.peek() {
         if p.peek_data().unwrap() == "implements" {
             implements_interfaces(p);
-        } else {
-            p.err("unexpected Name");
         }
     }
 
diff --git a/crates/apollo-parser/test_data/parser/ok/0042_object_type_definition_without_fields.graphql b/crates/apollo-parser/test_data/parser/ok/0042_object_type_definition_without_fields.graphql
@@ -0,0 +1,6 @@
+"A type with no fields"
+type AnObjectTypeWithoutFields
+
+extend type AnObjectTypeWithoutFields {
+  id: ID!
+}
diff --git a/crates/apollo-parser/test_data/parser/ok/0042_object_type_definition_without_fields.txt b/crates/apollo-parser/test_data/parser/ok/0042_object_type_definition_without_fields.txt
@@ -0,0 +1,35 @@
+- DOCUMENT@0..107
+    - OBJECT_TYPE_DEFINITION@0..54
+        - DESCRIPTION@0..23
+            - STRING_VALUE@0..23
+                - STRING@0..23 "\"A type with no fields\""
+        - WHITESPACE@23..24 "\n"
+        - type_KW@24..28 "type"
+        - WHITESPACE@28..29 " "
+        - NAME@29..54
+            - IDENT@29..54 "AnObjectTypeWithoutFields"
+    - WHITESPACE@54..56 "\n\n"
+    - OBJECT_TYPE_EXTENSION@56..107
+        - extend_KW@56..62 "extend"
+        - WHITESPACE@62..63 " "
+        - type_KW@63..67 "type"
+        - WHITESPACE@67..68 " "
+        - NAME@68..93
+            - IDENT@68..93 "AnObjectTypeWithoutFields"
+        - WHITESPACE@93..94 " "
+        - FIELDS_DEFINITION@94..107
+            - L_CURLY@94..95 "{"
+            - WHITESPACE@95..98 "\n  "
+            - FIELD_DEFINITION@98..105
+                - NAME@98..100
+                    - IDENT@98..100 "id"
+                - COLON@100..101 ":"
+                - WHITESPACE@101..102 " "
+                - NON_NULL_TYPE@102..105
+                    - NAMED_TYPE@102..104
+                        - NAME@102..104
+                            - IDENT@102..104 "ID"
+                    - BANG@104..105 "!"
+            - WHITESPACE@105..106 "\n"
+            - R_CURLY@106..107 "}"
+recursion limit: 500, high: 0
diff --git a/crates/apollo-parser/test_data/parser/ok/0043_interface_type_definition_without_fields.graphql b/crates/apollo-parser/test_data/parser/ok/0043_interface_type_definition_without_fields.graphql
@@ -0,0 +1,6 @@
+"An interface with no fields"
+interface AnInterfaceWithoutFields
+
+extend interface AnInterfaceWithoutFields {
+  id: ID!
+}
diff --git a/crates/apollo-parser/test_data/parser/ok/0043_interface_type_definition_without_fields.txt b/crates/apollo-parser/test_data/parser/ok/0043_interface_type_definition_without_fields.txt
@@ -0,0 +1,36 @@
+- DOCUMENT@0..122
+    - INTERFACE_TYPE_DEFINITION@0..64
+        - DESCRIPTION@0..29
+            - STRING_VALUE@0..29
+                - STRING@0..29 "\"An interface with no fields\""
+        - WHITESPACE@29..30 "\n"
+        - interface_KW@30..39 "interface"
+        - WHITESPACE@39..40 " "
+        - NAME@40..64
+            - IDENT@40..64 "AnInterfaceWithoutFields"
+    - WHITESPACE@64..66 "\n\n"
+    - INTERFACE_TYPE_EXTENSION@66..121
+        - extend_KW@66..72 "extend"
+        - WHITESPACE@72..73 " "
+        - interface_KW@73..82 "interface"
+        - WHITESPACE@82..83 " "
+        - NAME@83..107
+            - IDENT@83..107 "AnInterfaceWithoutFields"
+        - WHITESPACE@107..108 " "
+        - FIELDS_DEFINITION@108..121
+            - L_CURLY@108..109 "{"
+            - WHITESPACE@109..112 "\n  "
+            - FIELD_DEFINITION@112..119
+                - NAME@112..114
+                    - IDENT@112..114 "id"
+                - COLON@114..115 ":"
+                - WHITESPACE@115..116 " "
+                - NON_NULL_TYPE@116..119
+                    - NAMED_TYPE@116..118
+                        - NAME@116..118
+                            - IDENT@116..118 "ID"
+                    - BANG@118..119 "!"
+            - WHITESPACE@119..120 "\n"
+            - R_CURLY@120..121 "}"
+    - WHITESPACE@121..122 "\n"
+recursion limit: 500, high: 0
diff --git a/crates/apollo-parser/test_data/parser/ok/0044_input_type_definition_without_input_values.graphql b/crates/apollo-parser/test_data/parser/ok/0044_input_type_definition_without_input_values.graphql
@@ -0,0 +1,6 @@
+"An input with no input values"
+input AnInputWithoutInputValues
+
+extend input AnInputWithoutInputValues {
+  limit: Int!
+}
diff --git a/crates/apollo-parser/test_data/parser/ok/0044_input_type_definition_without_input_values.txt b/crates/apollo-parser/test_data/parser/ok/0044_input_type_definition_without_input_values.txt
@@ -0,0 +1,36 @@
+- DOCUMENT@0..122
+    - INPUT_OBJECT_TYPE_DEFINITION@0..63
+        - DESCRIPTION@0..31
+            - STRING_VALUE@0..31
+                - STRING@0..31 "\"An input with no input values\""
+        - WHITESPACE@31..32 "\n"
+        - input_KW@32..37 "input"
+        - WHITESPACE@37..38 " "
+        - NAME@38..63
+            - IDENT@38..63 "AnInputWithoutInputValues"
+    - WHITESPACE@63..65 "\n\n"
+    - INPUT_OBJECT_TYPE_EXTENSION@65..121
+        - extend_KW@65..71 "extend"
+        - WHITESPACE@71..72 " "
+        - input_KW@72..77 "input"
+        - WHITESPACE@77..78 " "
+        - NAME@78..103
+            - IDENT@78..103 "AnInputWithoutInputValues"
+        - WHITESPACE@103..104 " "
+        - INPUT_FIELDS_DEFINITION@104..121
+            - L_CURLY@104..105 "{"
+            - WHITESPACE@105..108 "\n  "
+            - INPUT_VALUE_DEFINITION@108..119
+                - NAME@108..113
+                    - IDENT@108..113 "limit"
+                - COLON@113..114 ":"
+                - WHITESPACE@114..115 " "
+                - NON_NULL_TYPE@115..119
+                    - NAMED_TYPE@115..118
+                        - NAME@115..118
+                            - IDENT@115..118 "Int"
+                    - BANG@118..119 "!"
+            - WHITESPACE@119..120 "\n"
+            - R_CURLY@120..121 "}"
+    - WHITESPACE@121..122 "\n"
+recursion limit: 500, high: 0

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@ pub(crate) fn object_type_definition(p: &mut Parser) {`
`35`	`35`	`if let Some(TokenKind::Name) = p.peek() {`
`36`	`36`	`if p.peek_data().unwrap() == "implements" {`
`37`	`37`	`implements_interfaces(p);`
`38`		`- } else {`
`39`		`- p.err("unexpected Name");`
`40`	`38`	`}`
`41`	`39`	`}`
`42`	`40`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,35 @@ @@
 +- [email protected]
 +    - [email protected]
 +        - [email protected]
 +            - [email protected]
 +                - [email protected] "\"A type with no fields\""
 +        - [email protected] "\n"
 +        - [email protected] "type"
 +        - [email protected] " "
 +        - [email protected]
 +            - [email protected] "AnObjectTypeWithoutFields"
 +    - [email protected] "\n\n"
 +    - [email protected]
 +        - [email protected] "extend"
 +        - [email protected] " "
 +        - [email protected] "type"
 +        - [email protected] " "
 +        - [email protected]
 +            - [email protected] "AnObjectTypeWithoutFields"
 +        - [email protected] " "
 +        - [email protected]
 +            - [email protected] "{"
 +            - [email protected] "\n  "
 +            - [email protected]
 +                - [email protected]
 +                    - [email protected] "id"
 +                - [email protected] ":"
 +                - [email protected] " "
 +                - [email protected]
 +                    - [email protected]
 +                        - [email protected]
 +                            - [email protected] "ID"
 +                    - [email protected] "!"
 +            - [email protected] "\n"
 +            - [email protected] "}"
 +recursion limit: 500, high: 0