Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
id("com.bnorm.power.kotlin-power-assert")
}

val graphqlJavaVersion = "0.0.0-2026-01-20T01-18-55-e5f21b8"
val graphqlJavaVersion = "0.0.0-2026-03-18T00-52-57-e53ab1a"
val slf4jVersion = "1.7.25"

dependencies {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package graphql.nadel.definition.coordinates

import graphql.Directives
import graphql.language.Document
import graphql.language.NamedNode
import graphql.nadel.engine.util.AnySDLDefinition
Expand All @@ -13,7 +14,6 @@ import graphql.nadel.schema.NadelSchemaTraverserVisitor
import graphql.schema.GraphQLDirective
import graphql.schema.GraphQLNamedType
import graphql.schema.GraphQLSchema
import graphql.schema.idl.DirectiveInfo
import graphql.schema.idl.ScalarInfo

class NadelSchemaMemberCoordinatesFactory {
Expand Down Expand Up @@ -199,7 +199,7 @@ internal class NadelSchemaCoordinateCollectorTraverserVisitor(
element: NadelSchemaTraverserElement.Directive,
): Boolean {
// Ignore built in directives
if (DirectiveInfo.isGraphqlSpecifiedDirective(element.node.name)) {
if (Directives.isBuiltInDirective(element.node.name)) {
return false
}

Expand Down Expand Up @@ -243,7 +243,7 @@ internal class NadelSchemaDefinitionCoordinateCollectorTraverserVisitor(

override fun visitGraphQLDirective(element: NadelSchemaDefinitionTraverserElement.Directive): Boolean {
// Ignore built in directives
if (DirectiveInfo.isGraphqlSpecifiedDirective(element.node.name)) {
if (Directives.isBuiltInDirective(element.node.name)) {
return false
}

Expand Down Expand Up @@ -306,7 +306,7 @@ internal class NadelSchemaDefinitionCoordinateCollectorTraverserVisitor(
val typeName = element.node.unwrapAll().name

// Can't resolve built in scalars
if (ScalarInfo.isGraphqlSpecifiedScalar(typeName) || DirectiveInfo.isGraphqlSpecifiedDirective(typeName)) {
if (ScalarInfo.isGraphqlSpecifiedScalar(typeName) || Directives.isBuiltInDirective(typeName)) {
return false
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package graphql.nadel.schema

import graphql.Directives
import graphql.introspection.Introspection
import graphql.schema.GraphQLSchema
import graphql.schema.idl.DirectiveInfo
import graphql.schema.idl.ScalarInfo

/**
Expand All @@ -26,7 +26,7 @@ internal class NadelSchemaTraverser {
}
val directiveRoots = schema.directives.asSequence()
.filterNot { directive ->
DirectiveInfo.isGraphqlSpecifiedDirective(directive.name)
Directives.isBuiltInDirective(directive.name)
}
.map { directive ->
NadelSchemaTraverserElement.from(directive)
Expand Down
Loading