Fixes #903 as well as adds & support for implements declarations

bbakerman · bbakerman · commit 7ca72d45d1b7 · 2018-02-06T08:19:03.000+11:00
diff --git a/src/main/antlr/Graphql.g4 b/src/main/antlr/Graphql.g4
@@ -145,9 +145,13 @@ inputObjectTypeDefinition
 
 scalarTypeDefinition : description? SCALAR name directives?;
 
-objectTypeDefinition : description? TYPE name implementsInterfaces? directives? '{' fieldDefinition+ '}';
+objectTypeDefinition : description? TYPE name implementsInterfaces? directives? fieldsDefinition?;
 
-implementsInterfaces : IMPLEMENTS typeName+;
+implementsInterfaces :
+    IMPLEMENTS '&'? typeName+ |
+    implementsInterfaces '&' typeName ;
+
+fieldsDefinition : '{' fieldDefinition+ '}';
 
 fieldDefinition : description? name argumentsDefinition? ':' type directives?;
 
diff --git a/src/test/groovy/graphql/parser/IDLParserTest.groovy b/src/test/groovy/graphql/parser/IDLParserTest.groovy
@@ -520,5 +520,67 @@ input Gun {
         commentContent(inputValueDefinitions[1].comments) == [" second"]
     }
 
+    def "empty type definition"() {
+
+        def input = """
+        type EmptyType
+        
+        extend type EmptyType {
+            hero : String
+        }
+"""
+        when:
+        def document = new Parser().parseDocument(input)
+
+        then:
+        ObjectTypeDefinition typeDef = document.definitions[0] as ObjectTypeDefinition
+        typeDef.getName() == 'EmptyType'
+        typeDef.getFieldDefinitions().isEmpty()
+
+        TypeExtensionDefinition extTypeDef = document.definitions[1] as TypeExtensionDefinition
+        extTypeDef.getName() == 'EmptyType'
+        extTypeDef.getFieldDefinitions().size() == 1
+    }
+
+    def "type implements can have & character for extra names"() {
+
+        def input = """
+        interface Bar {
+            bar : String
+        }
+
+        interface Baz {
+            baz : String
+        }
+        
+        type Foo implements Bar & Baz {
+            bar : String
+            baz : String
+        }
+    
+        type Foo2 implements Bar Baz {
+            bar : String
+            baz : String
+        }
+        
+"""
+        when:
+        def document = new Parser().parseDocument(input)
+
+        then:
+        ObjectTypeDefinition typeDef = document.definitions[2] as ObjectTypeDefinition
+        typeDef.getName() == 'Foo'
+        typeDef.getImplements().size() == 2
+        (typeDef.getImplements()[0] as TypeName).getName() == 'Bar'
+        (typeDef.getImplements()[1] as TypeName).getName() == 'Baz'
+
+        then:
+        ObjectTypeDefinition typeDef2 = document.definitions[3] as ObjectTypeDefinition
+        typeDef2.getName() == 'Foo2'
+        typeDef2.getImplements().size() == 2
+        (typeDef2.getImplements()[0] as TypeName).getName() == 'Bar'
+        (typeDef2.getImplements()[1] as TypeName).getName() == 'Baz'
+    }
+
 }
 
