allow special names to be uses as field name

andimarek · andimarek · commit ff142bde701a · 2019-07-15T12:23:00.000+10:00
fixes also enum value names and fragment names
diff --git a/src/main/antlr/GraphqlCommon.g4 b/src/main/antlr/GraphqlCommon.g4
@@ -4,7 +4,7 @@ operationType : SUBSCRIPTION | MUTATION | QUERY;
 
 description : stringValue;
 
-enumValue : name ;
+enumValue : enumValueName ;
 
 
 arrayValue: '[' value* ']';
@@ -28,7 +28,11 @@ arguments : '(' argument+ ')';
 
 argument : name ':' valueWithVariable;
 
-name: NAME | FRAGMENT | QUERY | MUTATION | SUBSCRIPTION | SCHEMA | SCALAR | TYPE | INTERFACE | IMPLEMENTS | ENUM | UNION | INPUT | EXTEND | DIRECTIVE;
+baseName: NAME | FRAGMENT | QUERY | MUTATION | SUBSCRIPTION | SCHEMA | SCALAR | TYPE | INTERFACE | IMPLEMENTS | ENUM | UNION | INPUT | EXTEND | DIRECTIVE;
+fragmentName: baseName | BooleanValue | NullValue;
+enumValueName: baseName | ON_KEYWORD;
+
+name: baseName | BooleanValue | NullValue | ON_KEYWORD;
 
 value :
 stringValue |
@@ -86,6 +90,7 @@ UNION: 'union';
 INPUT: 'input';
 EXTEND: 'extend';
 DIRECTIVE: 'directive';
+ON_KEYWORD: 'on';
 NAME: [_A-Za-z][_0-9A-Za-z]*;
 
 
diff --git a/src/main/antlr/GraphqlOperation.g4 b/src/main/antlr/GraphqlOperation.g4
@@ -23,13 +23,11 @@ alias : name ':';
 
 
 
-
 fragmentSpread : '...' fragmentName directives?;
 
 inlineFragment : '...' typeCondition? directives? selectionSet;
 
-fragmentDefinition : 'fragment' fragmentName typeCondition directives? selectionSet;
+fragmentDefinition : FRAGMENT fragmentName typeCondition directives? selectionSet;
 
-fragmentName :  name;
 
-typeCondition : 'on' typeName;
+typeCondition : ON_KEYWORD typeName;
diff --git a/src/test/groovy/graphql/parser/IDLParserTest.groovy b/src/test/groovy/graphql/parser/IDLParserTest.groovy
@@ -30,6 +30,7 @@ import graphql.language.OperationTypeDefinition
 import graphql.language.ScalarTypeDefinition
 import graphql.language.ScalarTypeExtensionDefinition
 import graphql.language.SchemaDefinition
+import graphql.language.TypeDefinition
 import graphql.language.TypeName
 import graphql.language.UnionTypeDefinition
 import graphql.language.UnionTypeExtensionDefinition
@@ -811,5 +812,26 @@ input Gun {
         assert asClass == definition.getClass(), "Could not find expected definition of type " + asClass.getName() + " but was " + definition.getClass().getName()
         return asClass.cast(definition)
     }
+
+    def "able to allow special names for field names"() {
+        given:
+
+        def input = """
+        type Query {
+          true: String
+          fragment: String
+          false: String
+          on: String
+          null: String
+        }
+    """
+        when:
+        Document document = Parser.parse(input)
+        String name = (document.definitions[0] as TypeDefinition).name
+
+        then:
+        name == "Query"
+    }
+
 }
 
diff --git a/src/test/groovy/graphql/parser/ParserTest.groovy b/src/test/groovy/graphql/parser/ParserTest.groovy
@@ -718,4 +718,19 @@ triple3 : """edge cases \\""" "" " \\"" \\" edge cases"""
         ((FloatValue) argumentValue).value.toString() == "1.7976931348155E+308"
     }
 
+    def "parse fragment definition"() {
+        given:
+        def input = """
+            fragment Foo on Bar {
+                hello
+            }
+        """
+        when:
+        Document document = Parser.parse(input)
+        FragmentDefinition fragmentDefinition = (document.definitions[0] as FragmentDefinition)
+
+        then:
+        fragmentDefinition.name == "Foo"
+
+    }
 }
