Extended supported types for directives

Author: oliemansm

src/main/kotlin/com/coxautodev/graphql/tools/SchemaParser.kt

@@ -134,8 +134,7 @@ class SchemaParser internal constructor(scanResult: ScannedSchemaObjects, privat
             .definition(definition)
             .description(getDocumentation(definition))
 
-        val directiveDefinitions = setOf<GraphQLDirective>()
-        builder.withDirectives(*buildDirectives(definition.directives, directiveDefinitions, Introspection.DirectiveLocation.OBJECT))
+        builder.withDirectives(*buildDirectives(definition.directives, setOf(), Introspection.DirectiveLocation.OBJECT))
 
         definition.implements.forEach { implementsDefinition ->
             val interfaceName = (implementsDefinition as TypeName).name
@@ -177,6 +176,8 @@ class SchemaParser internal constructor(scanResult: ScannedSchemaObjects, privat
             .definition(definition)
             .description(getDocumentation(definition))
 
+        builder.withDirectives(*buildDirectives(definition.directives, setOf(), Introspection.DirectiveLocation.INPUT_OBJECT))
+
         definition.inputValueDefinitions.forEach { inputDefinition ->
             builder.field { field ->
                 field.name(inputDefinition.name)
@@ -187,7 +188,7 @@ class SchemaParser internal constructor(scanResult: ScannedSchemaObjects, privat
             }
         }
 
-        return builder.build()
+        return directiveGenerator.onInputObject(builder.build(), DirectiveBehavior.Params(runtimeWiring))
     }
 
     private fun createEnumObject(definition: EnumTypeDefinition): GraphQLEnumType {
@@ -200,6 +201,8 @@ class SchemaParser internal constructor(scanResult: ScannedSchemaObjects, privat
             .definition(definition)
             .description(getDocumentation(definition))
 
+        builder.withDirectives(*buildDirectives(definition.directives, setOf(), Introspection.DirectiveLocation.ENUM))
+
         definition.enumValueDefinitions.forEach { enumDefinition ->
             val enumName = enumDefinition.name
             val enumValue = type.unwrap().enumConstants.find { (it as Enum<*>).name == enumName } ?: throw SchemaError("Expected value for name '$enumName' in enum '${type.unwrap().simpleName}' but found none!")
@@ -211,7 +214,7 @@ class SchemaParser internal constructor(scanResult: ScannedSchemaObjects, privat
             }
         }
 
-        return builder.build()
+        return directiveGenerator.onEnum(builder.build(), DirectiveBehavior.Params(runtimeWiring))
     }
 
     private fun createInterfaceObject(definition: InterfaceTypeDefinition): GraphQLInterfaceType {
@@ -222,11 +225,13 @@ class SchemaParser internal constructor(scanResult: ScannedSchemaObjects, privat
             .description(getDocumentation(definition))
             .typeResolver(TypeResolverProxy())
 
+        builder.withDirectives(*buildDirectives(definition.directives, setOf(), Introspection.DirectiveLocation.INTERFACE))
+
         definition.fieldDefinitions.forEach { fieldDefinition ->
             builder.field { field -> createField(field, fieldDefinition) }
         }
 
-        return builder.build()
+        return directiveGenerator.onInterface(builder.build(), DirectiveBehavior.Params(runtimeWiring))
     }
 
     private fun createUnionObject(definition: UnionTypeDefinition, types: List<GraphQLObjectType>): GraphQLUnionType {
@@ -237,8 +242,10 @@ class SchemaParser internal constructor(scanResult: ScannedSchemaObjects, privat
             .description(getDocumentation(definition))
             .typeResolver(TypeResolverProxy())
 
+        builder.withDirectives(*buildDirectives(definition.directives, setOf(), Introspection.DirectiveLocation.UNION))
+
         getLeafUnionObjects(definition, types).forEach { builder.possibleType(it) }
-        return builder.build()
+        return directiveGenerator.onUnion(builder.build(), DirectiveBehavior.Params(runtimeWiring))
     }
 
     private fun getLeafUnionObjects(definition: UnionTypeDefinition, types: List<GraphQLObjectType>): List<GraphQLObjectType> {

src/main/kotlin/graphql/schema/idl/DirectiveBehavior.kt

@@ -1,7 +1,15 @@
 package graphql.schema.idl
 
+import graphql.schema.GraphQLArgument
+import graphql.schema.GraphQLEnumType
+import graphql.schema.GraphQLEnumValueDefinition
 import graphql.schema.GraphQLFieldDefinition
+import graphql.schema.GraphQLInputObjectField
+import graphql.schema.GraphQLInputObjectType
+import graphql.schema.GraphQLInterfaceType
 import graphql.schema.GraphQLObjectType
+import graphql.schema.GraphQLScalarType
+import graphql.schema.GraphQLUnionType
 
 class DirectiveBehavior {
 
@@ -15,6 +23,30 @@ class DirectiveBehavior {
         return directiveHelper.onField(element, params.toParameters())
     }
 
+    fun onInterface(element: GraphQLInterfaceType, params: Params): GraphQLInterfaceType =
+            directiveHelper.onInterface(element, params.toParameters())
+
+    fun onUnion(element: GraphQLUnionType, params: Params): GraphQLUnionType =
+            directiveHelper.onUnion(element, params.toParameters())
+
+    fun onScalar(element: GraphQLScalarType, params: Params): GraphQLScalarType =
+            directiveHelper.onScalar(element, params.toParameters())
+
+    fun onEnum(element: GraphQLEnumType, params: Params): GraphQLEnumType =
+            directiveHelper.onEnum(element, params.toParameters())
+
+    fun onEnumValue(element: GraphQLEnumValueDefinition, params: Params): GraphQLEnumValueDefinition =
+            directiveHelper.onEnumValue(element, params.toParameters())
+
+    fun onArgument(element: GraphQLArgument, params: Params): GraphQLArgument =
+            directiveHelper.onArgument(element, params.toParameters())
+
+    fun onInputObject(element: GraphQLInputObjectType, params: Params): GraphQLInputObjectType =
+            directiveHelper.onInputObjectType(element, params.toParameters())
+
+    fun onInputObjectField(element: GraphQLInputObjectField, params: Params): GraphQLInputObjectField =
+            directiveHelper.onInputObjectField(element, params.toParameters())
+
     data class Params(val runtimeWiring: RuntimeWiring) {
         internal fun toParameters() = SchemaGeneratorDirectiveHelper.Parameters(null, runtimeWiring, null, null)
     }