Fix applied directive support

gnawf · gnawf · commit 46853149d53e · 2026-02-24T10:05:11.000+11:00
diff --git a/lib/src/main/java/graphql/nadel/definition/coordinates/NadelSchemaMemberCoordinatesFactory.kt b/lib/src/main/java/graphql/nadel/definition/coordinates/NadelSchemaMemberCoordinatesFactory.kt
@@ -160,7 +160,7 @@ class NadelSchemaMemberCoordinatesFactory {
                         element: NadelSchemaTraverserElement.AppliedDirective,
                     ): Boolean {
                         coordinates.add(element.coordinates())
-                        return true
+                        return false // Don't traverse argument further
                     }
 
                     override fun visitGraphQLAppliedDirectiveArgument(
diff --git a/lib/src/main/java/graphql/nadel/engine/blueprint/NadelSchemaTraverserElement.kt b/lib/src/main/java/graphql/nadel/engine/blueprint/NadelSchemaTraverserElement.kt
@@ -71,7 +71,7 @@ internal sealed interface NadelSchemaTraverserElement {
         override fun coordinates(): NadelArgumentParentCoordinates
     }
 
-    sealed interface Argument : NadelSchemaTraverserElement {
+    sealed interface Argument : NadelSchemaTraverserElement, AppliedDirectiveParent {
         override val parent: ArgumentParent
 
         override val node: GraphQLArgument
@@ -82,6 +82,10 @@ internal sealed interface NadelSchemaTraverserElement {
 
         override fun forEachChild(onElement: (NadelSchemaTraverserElement) -> Unit) {
             onElement(InputType.from(node.type))
+
+            node.appliedDirectives.forEach {
+                onElement(AppliedDirective(this, it))
+            }
         }
     }
 
@@ -144,7 +148,7 @@ internal sealed interface NadelSchemaTraverserElement {
 
     data class UnionType(
         override val node: GraphQLUnionType,
-    ) : NadelSchemaTraverserElement, Type, OutputType {
+    ) : NadelSchemaTraverserElement, Type, OutputType, AppliedDirectiveParent {
         override val parent: NadelSchemaTraverserElement? = null
 
         override fun coordinates(): NadelUnionCoordinates {
@@ -155,6 +159,10 @@ internal sealed interface NadelSchemaTraverserElement {
             node.types.forEach { member ->
                 onElement(UnionMemberType(this, member as GraphQLObjectType))
             }
+
+            node.appliedDirectives.forEach {
+                onElement(AppliedDirective(this, it))
+            }
         }
     }
 
@@ -179,7 +187,7 @@ internal sealed interface NadelSchemaTraverserElement {
 
     data class InterfaceType(
         override val node: GraphQLInterfaceType,
-    ) : NadelSchemaTraverserElement, Type, OutputType, FieldsContainer {
+    ) : NadelSchemaTraverserElement, Type, OutputType, FieldsContainer, AppliedDirectiveParent {
         override val parent: NadelSchemaTraverserElement? = null
 
         override fun coordinates(): NadelInterfaceCoordinates {
@@ -193,12 +201,15 @@ internal sealed interface NadelSchemaTraverserElement {
             node.interfaces.forEach { parentType ->
                 onElement(InterfaceType(parentType as GraphQLInterfaceType))
             }
+            node.appliedDirectives.forEach {
+                onElement(AppliedDirective(this, it))
+            }
         }
     }
 
     data class EnumType(
         override val node: GraphQLEnumType,
-    ) : NadelSchemaTraverserElement, Type, InputType, OutputType {
+    ) : NadelSchemaTraverserElement, Type, InputType, OutputType, AppliedDirectiveParent {
         override val parent: NadelSchemaTraverserElement? = null
 
         override fun coordinates(): NadelEnumCoordinates {
@@ -209,25 +220,32 @@ internal sealed interface NadelSchemaTraverserElement {
             node.values.forEach { value ->
                 onElement(EnumValueDefinition(this, value))
             }
+
+            node.appliedDirectives.forEach {
+                onElement(AppliedDirective(this, it))
+            }
         }
     }
 
     data class EnumValueDefinition(
         override val parent: EnumType,
         override val node: GraphQLEnumValueDefinition,
-    ) : NadelSchemaTraverserElement {
+    ) : NadelSchemaTraverserElement, AppliedDirectiveParent {
         override fun coordinates(): NadelEnumValueCoordinates {
             return parent.coordinates().enumValue(node.name)
         }
 
         override fun forEachChild(onElement: (NadelSchemaTraverserElement) -> Unit) {
+            node.appliedDirectives.forEach {
+                onElement(AppliedDirective(this, it))
+            }
         }
     }
 
     data class FieldDefinition(
         override val parent: FieldsContainer,
         override val node: GraphQLFieldDefinition,
-    ) : NadelSchemaTraverserElement, ArgumentParent {
+    ) : NadelSchemaTraverserElement, ArgumentParent, AppliedDirectiveParent {
         override fun coordinates(): NadelFieldCoordinates {
             return parent.coordinates().field(node.name)
         }
@@ -238,25 +256,33 @@ internal sealed interface NadelSchemaTraverserElement {
             node.arguments.forEach { arg ->
                 onElement(FieldArgument(this, arg))
             }
+
+            node.appliedDirectives.forEach {
+                onElement(AppliedDirective(this, it))
+            }
         }
     }
 
     data class InputObjectField(
         override val parent: InputObjectType,
         override val node: GraphQLInputObjectField,
-    ) : NadelSchemaTraverserElement {
+    ) : NadelSchemaTraverserElement, AppliedDirectiveParent {
         override fun coordinates(): NadelInputObjectFieldCoordinates {
             return parent.coordinates().field(node.name)
         }
 
         override fun forEachChild(onElement: (NadelSchemaTraverserElement) -> Unit) {
             onElement(InputType.from(node.type))
+
+            node.appliedDirectives.forEach {
+                onElement(AppliedDirective(this, it))
+            }
         }
     }
 
     data class InputObjectType(
         override val node: GraphQLInputObjectType,
-    ) : NadelSchemaTraverserElement, Type, InputType {
+    ) : NadelSchemaTraverserElement, Type, InputType, AppliedDirectiveParent {
         override val parent: NadelSchemaTraverserElement? = null
 
         override fun coordinates(): NadelInputObjectCoordinates {
@@ -267,12 +293,16 @@ internal sealed interface NadelSchemaTraverserElement {
             node.fields.forEach { field ->
                 onElement(InputObjectField(this, field))
             }
+
+            node.appliedDirectives.forEach {
+                onElement(AppliedDirective(this, it))
+            }
         }
     }
 
     data class ObjectType(
         override val node: GraphQLObjectType,
-    ) : NadelSchemaTraverserElement, Type, OutputType, FieldsContainer {
+    ) : NadelSchemaTraverserElement, Type, OutputType, FieldsContainer, AppliedDirectiveParent {
         override val parent: NadelSchemaTraverserElement? = null
 
         override fun coordinates(): NadelObjectCoordinates {
@@ -287,19 +317,26 @@ internal sealed interface NadelSchemaTraverserElement {
             node.interfaces.forEach { parentType ->
                 onElement(InterfaceType(parentType as GraphQLInterfaceType))
             }
+
+            node.appliedDirectives.forEach {
+                onElement(AppliedDirective(this, it))
+            }
         }
     }
 
     data class ScalarType(
         override val node: GraphQLScalarType,
-    ) : NadelSchemaTraverserElement, Type, InputType, OutputType {
+    ) : NadelSchemaTraverserElement, Type, InputType, OutputType , AppliedDirectiveParent{
         override val parent: NadelSchemaTraverserElement? = null
 
         override fun coordinates(): NadelScalarCoordinates {
             return node.coordinates()
         }
 
         override fun forEachChild(onElement: (NadelSchemaTraverserElement) -> Unit) {
+            node.appliedDirectives.forEach {
+                onElement(AppliedDirective(this, it))
+            }
         }
     }
 
@@ -323,15 +360,15 @@ internal sealed interface NadelSchemaTraverserElement {
         override val parent: AppliedDirectiveParent,
         override val node: GraphQLAppliedDirective,
     ) : NadelSchemaTraverserElement {
+        override fun coordinates(): NadelAppliedDirectiveCoordinates {
+            return parent.coordinates().appliedDirective(node.name)
+        }
+
         override fun forEachChild(onElement: (NadelSchemaTraverserElement) -> Unit) {
             node.arguments.forEach { arg ->
                 onElement(AppliedDirectiveArgument(this, arg))
             }
         }
-
-        override fun coordinates(): NadelAppliedDirectiveCoordinates {
-            return parent.coordinates().appliedDirective(node.name)
-        }
     }
 
     companion object {
diff --git a/lib/src/test/kotlin/graphql/nadel/definition/coordinates/NadelSchemaMemberCoordinatesFactoryTest.kt b/lib/src/test/kotlin/graphql/nadel/definition/coordinates/NadelSchemaMemberCoordinatesFactoryTest.kt
@@ -87,6 +87,7 @@ class NadelSchemaMemberCoordinatesFactoryTest {
             }
             type Query {
                 me: AuthenticationContext!
+                authContext: AuthenticationContext @deprecated(reason: "Hello world")
                 user(accountId: ID!): User
                 users(accountIds: [ID!]!): [User!]
                 thirdPartyUsers(ids: [ID!]!): [ThirdPartyUser!]
@@ -96,6 +97,8 @@ class NadelSchemaMemberCoordinatesFactoryTest {
         val expectedSet = setOf(
             NadelObjectCoordinates("Query"),
             NadelObjectCoordinates("Query").field("me"),
+            NadelObjectCoordinates("Query").field("authContext"),
+            NadelObjectCoordinates("Query").field("authContext").appliedDirective("deprecated"),
             NadelObjectCoordinates("AuthenticationContext"),
             NadelObjectCoordinates("AuthenticationContext").field("user"),
             NadelInterfaceCoordinates("User"),

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ class NadelSchemaMemberCoordinatesFactory {`
`160`	`160`	`element: NadelSchemaTraverserElement.AppliedDirective,`
`161`	`161`	`): Boolean {`
`162`	`162`	`coordinates.add(element.coordinates())`
`163`		`- return true`
	`163`	`+ return false // Don't traverse argument further`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`override fun visitGraphQLAppliedDirectiveArgument(`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ internal sealed interface NadelSchemaTraverserElement {`
`71`	`71`	`override fun coordinates(): NadelArgumentParentCoordinates`
`72`	`72`	`}`
`73`	`73`
`74`		`- sealed interface Argument : NadelSchemaTraverserElement {`
	`74`	`+ sealed interface Argument : NadelSchemaTraverserElement, AppliedDirectiveParent {`
`75`	`75`	`override val parent: ArgumentParent`
`76`	`76`
`77`	`77`	`override val node: GraphQLArgument`
`@@ -82,6 +82,10 @@ internal sealed interface NadelSchemaTraverserElement {`
`82`	`82`
`83`	`83`	`override fun forEachChild(onElement: (NadelSchemaTraverserElement) -> Unit) {`
`84`	`84`	`onElement(InputType.from(node.type))`
	`85`	`+`
	`86`	`+ node.appliedDirectives.forEach {`
	`87`	`+ onElement(AppliedDirective(this, it))`
	`88`	`+ }`
`85`	`89`	`}`
`86`	`90`	`}`
`87`	`91`
`@@ -144,7 +148,7 @@ internal sealed interface NadelSchemaTraverserElement {`
`144`	`148`
`145`	`149`	`data class UnionType(`
`146`	`150`	`override val node: GraphQLUnionType,`
`147`		`- ) : NadelSchemaTraverserElement, Type, OutputType {`
	`151`	`+ ) : NadelSchemaTraverserElement, Type, OutputType, AppliedDirectiveParent {`
`148`	`152`	`override val parent: NadelSchemaTraverserElement? = null`
`149`	`153`
`150`	`154`	`override fun coordinates(): NadelUnionCoordinates {`
`@@ -155,6 +159,10 @@ internal sealed interface NadelSchemaTraverserElement {`
`155`	`159`	`node.types.forEach { member ->`
`156`	`160`	`onElement(UnionMemberType(this, member as GraphQLObjectType))`
`157`	`161`	`}`
	`162`	`+`
	`163`	`+ node.appliedDirectives.forEach {`
	`164`	`+ onElement(AppliedDirective(this, it))`
	`165`	`+ }`
`158`	`166`	`}`
`159`	`167`	`}`
`160`	`168`
`@@ -179,7 +187,7 @@ internal sealed interface NadelSchemaTraverserElement {`
`179`	`187`
`180`	`188`	`data class InterfaceType(`
`181`	`189`	`override val node: GraphQLInterfaceType,`
`182`		`- ) : NadelSchemaTraverserElement, Type, OutputType, FieldsContainer {`
	`190`	`+ ) : NadelSchemaTraverserElement, Type, OutputType, FieldsContainer, AppliedDirectiveParent {`
`183`	`191`	`override val parent: NadelSchemaTraverserElement? = null`
`184`	`192`
`185`	`193`	`override fun coordinates(): NadelInterfaceCoordinates {`
`@@ -193,12 +201,15 @@ internal sealed interface NadelSchemaTraverserElement {`
`193`	`201`	`node.interfaces.forEach { parentType ->`
`194`	`202`	`onElement(InterfaceType(parentType as GraphQLInterfaceType))`
`195`	`203`	`}`
	`204`	`+ node.appliedDirectives.forEach {`
	`205`	`+ onElement(AppliedDirective(this, it))`
	`206`	`+ }`
`196`	`207`	`}`
`197`	`208`	`}`
`198`	`209`
`199`	`210`	`data class EnumType(`
`200`	`211`	`override val node: GraphQLEnumType,`
`201`		`- ) : NadelSchemaTraverserElement, Type, InputType, OutputType {`
	`212`	`+ ) : NadelSchemaTraverserElement, Type, InputType, OutputType, AppliedDirectiveParent {`
`202`	`213`	`override val parent: NadelSchemaTraverserElement? = null`
`203`	`214`
`204`	`215`	`override fun coordinates(): NadelEnumCoordinates {`
`@@ -209,25 +220,32 @@ internal sealed interface NadelSchemaTraverserElement {`
`209`	`220`	`node.values.forEach { value ->`
`210`	`221`	`onElement(EnumValueDefinition(this, value))`
`211`	`222`	`}`
	`223`	`+`
	`224`	`+ node.appliedDirectives.forEach {`
	`225`	`+ onElement(AppliedDirective(this, it))`
	`226`	`+ }`
`212`	`227`	`}`
`213`	`228`	`}`
`214`	`229`
`215`	`230`	`data class EnumValueDefinition(`
`216`	`231`	`override val parent: EnumType,`
`217`	`232`	`override val node: GraphQLEnumValueDefinition,`
`218`		`- ) : NadelSchemaTraverserElement {`
	`233`	`+ ) : NadelSchemaTraverserElement, AppliedDirectiveParent {`
`219`	`234`	`override fun coordinates(): NadelEnumValueCoordinates {`
`220`	`235`	`return parent.coordinates().enumValue(node.name)`
`221`	`236`	`}`
`222`	`237`
`223`	`238`	`override fun forEachChild(onElement: (NadelSchemaTraverserElement) -> Unit) {`
	`239`	`+ node.appliedDirectives.forEach {`
	`240`	`+ onElement(AppliedDirective(this, it))`
	`241`	`+ }`
`224`	`242`	`}`
`225`	`243`	`}`
`226`	`244`
`227`	`245`	`data class FieldDefinition(`
`228`	`246`	`override val parent: FieldsContainer,`
`229`	`247`	`override val node: GraphQLFieldDefinition,`
`230`		`- ) : NadelSchemaTraverserElement, ArgumentParent {`
	`248`	`+ ) : NadelSchemaTraverserElement, ArgumentParent, AppliedDirectiveParent {`
`231`	`249`	`override fun coordinates(): NadelFieldCoordinates {`
`232`	`250`	`return parent.coordinates().field(node.name)`
`233`	`251`	`}`
`@@ -238,25 +256,33 @@ internal sealed interface NadelSchemaTraverserElement {`
`238`	`256`	`node.arguments.forEach { arg ->`
`239`	`257`	`onElement(FieldArgument(this, arg))`
`240`	`258`	`}`
	`259`	`+`
	`260`	`+ node.appliedDirectives.forEach {`
	`261`	`+ onElement(AppliedDirective(this, it))`
	`262`	`+ }`
`241`	`263`	`}`
`242`	`264`	`}`
`243`	`265`
`244`	`266`	`data class InputObjectField(`
`245`	`267`	`override val parent: InputObjectType,`
`246`	`268`	`override val node: GraphQLInputObjectField,`
`247`		`- ) : NadelSchemaTraverserElement {`
	`269`	`+ ) : NadelSchemaTraverserElement, AppliedDirectiveParent {`
`248`	`270`	`override fun coordinates(): NadelInputObjectFieldCoordinates {`
`249`	`271`	`return parent.coordinates().field(node.name)`
`250`	`272`	`}`
`251`	`273`
`252`	`274`	`override fun forEachChild(onElement: (NadelSchemaTraverserElement) -> Unit) {`
`253`	`275`	`onElement(InputType.from(node.type))`
	`276`	`+`
	`277`	`+ node.appliedDirectives.forEach {`
	`278`	`+ onElement(AppliedDirective(this, it))`
	`279`	`+ }`
`254`	`280`	`}`
`255`	`281`	`}`
`256`	`282`
`257`	`283`	`data class InputObjectType(`
`258`	`284`	`override val node: GraphQLInputObjectType,`
`259`		`- ) : NadelSchemaTraverserElement, Type, InputType {`
	`285`	`+ ) : NadelSchemaTraverserElement, Type, InputType, AppliedDirectiveParent {`
`260`	`286`	`override val parent: NadelSchemaTraverserElement? = null`
`261`	`287`
`262`	`288`	`override fun coordinates(): NadelInputObjectCoordinates {`
`@@ -267,12 +293,16 @@ internal sealed interface NadelSchemaTraverserElement {`
`267`	`293`	`node.fields.forEach { field ->`
`268`	`294`	`onElement(InputObjectField(this, field))`
`269`	`295`	`}`
	`296`	`+`
	`297`	`+ node.appliedDirectives.forEach {`
	`298`	`+ onElement(AppliedDirective(this, it))`
	`299`	`+ }`
`270`	`300`	`}`
`271`	`301`	`}`
`272`	`302`
`273`	`303`	`data class ObjectType(`
`274`	`304`	`override val node: GraphQLObjectType,`
`275`		`- ) : NadelSchemaTraverserElement, Type, OutputType, FieldsContainer {`
	`305`	`+ ) : NadelSchemaTraverserElement, Type, OutputType, FieldsContainer, AppliedDirectiveParent {`
`276`	`306`	`override val parent: NadelSchemaTraverserElement? = null`
`277`	`307`
`278`	`308`	`override fun coordinates(): NadelObjectCoordinates {`
`@@ -287,19 +317,26 @@ internal sealed interface NadelSchemaTraverserElement {`
`287`	`317`	`node.interfaces.forEach { parentType ->`
`288`	`318`	`onElement(InterfaceType(parentType as GraphQLInterfaceType))`
`289`	`319`	`}`
	`320`	`+`
	`321`	`+ node.appliedDirectives.forEach {`
	`322`	`+ onElement(AppliedDirective(this, it))`
	`323`	`+ }`
`290`	`324`	`}`
`291`	`325`	`}`
`292`	`326`
`293`	`327`	`data class ScalarType(`
`294`	`328`	`override val node: GraphQLScalarType,`
`295`		`- ) : NadelSchemaTraverserElement, Type, InputType, OutputType {`
	`329`	`+ ) : NadelSchemaTraverserElement, Type, InputType, OutputType , AppliedDirectiveParent{`
`296`	`330`	`override val parent: NadelSchemaTraverserElement? = null`
`297`	`331`
`298`	`332`	`override fun coordinates(): NadelScalarCoordinates {`
`299`	`333`	`return node.coordinates()`
`300`	`334`	`}`
`301`	`335`
`302`	`336`	`override fun forEachChild(onElement: (NadelSchemaTraverserElement) -> Unit) {`
	`337`	`+ node.appliedDirectives.forEach {`
	`338`	`+ onElement(AppliedDirective(this, it))`
	`339`	`+ }`
`303`	`340`	`}`
`304`	`341`	`}`
`305`	`342`
`@@ -323,15 +360,15 @@ internal sealed interface NadelSchemaTraverserElement {`
`323`	`360`	`override val parent: AppliedDirectiveParent,`
`324`	`361`	`override val node: GraphQLAppliedDirective,`
`325`	`362`	`) : NadelSchemaTraverserElement {`
	`363`	`+ override fun coordinates(): NadelAppliedDirectiveCoordinates {`
	`364`	`+ return parent.coordinates().appliedDirective(node.name)`
	`365`	`+ }`
	`366`	`+`
`326`	`367`	`override fun forEachChild(onElement: (NadelSchemaTraverserElement) -> Unit) {`
`327`	`368`	`node.arguments.forEach { arg ->`
`328`	`369`	`onElement(AppliedDirectiveArgument(this, arg))`
`329`	`370`	`}`
`330`	`371`	`}`
`331`		`-`
`332`		`- override fun coordinates(): NadelAppliedDirectiveCoordinates {`
`333`		`- return parent.coordinates().appliedDirective(node.name)`
`334`		`- }`
`335`	`372`	`}`
`336`	`373`
`337`	`374`	`companion object {`