exclude empty keyfields

apollographql · May 26, 2022 · 270491e · 270491e
1 parent 2187cce
commit 270491e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/apollo-ast/src/main/kotlin/com/apollographql/apollo3/ast/internal/SchemaValidationScope.kt b/apollo-ast/src/main/kotlin/com/apollographql/apollo3/ast/internal/SchemaValidationScope.kt
@@ -204,6 +204,8 @@ private fun SchemaValidationScope.keyFields(
   }
 
   val interfacesKeyFields = interfaces.map { keyFields(allTypeDefinition[it]!!, allTypeDefinition, keyFieldsCache) }
+      .filter { it.isNotEmpty() }
+
   val distinct = interfacesKeyFields.distinct()
   if (distinct.size > 1) {
     val extra = interfaces.indices.map {

diff --git a/...lo-compiler/src/test/kotlin/com/apollographql/apollo3/compiler/keyfields/KeyFieldsTest.kt b/...lo-compiler/src/test/kotlin/com/apollographql/apollo3/compiler/keyfields/KeyFieldsTest.kt
@@ -17,6 +17,7 @@ import org.junit.Test
 import java.io.File
 import kotlin.test.assertContains
 import kotlin.test.assertEquals
+import kotlin.test.assertTrue
 
 class KeyFieldsTest {
   @Test
@@ -87,4 +88,12 @@ class KeyFieldsTest {
     )
     assertEquals(13, issue.sourceLocation.line)
   }
+
+  @Test
+  fun testInterfacesWithoutKeyFields() {
+    val doc = File("src/test/kotlin/com/apollographql/apollo3/compiler/keyfields/interfacesWithoutKeyFields.graphqls")
+        .toSchemaGQLDocument()
+        .withApolloDefinitions()
+    assertTrue(doc.validateAsSchema().issues.isEmpty())
+  }
 }
diff --git a/...t/kotlin/com/apollographql/apollo3/compiler/keyfields/interfacesWithoutKeyFields.graphqls b/...t/kotlin/com/apollographql/apollo3/compiler/keyfields/interfacesWithoutKeyFields.graphqls
@@ -0,0 +1,17 @@
+type Query {
+  book: Book!
+}
+
+interface Node @typePolicy(keyFields: "id") {
+  id: String!
+}
+
+interface Product {
+  upc: String!
+}
+
+type Book implements Node & Product{
+  id: String!
+  upc: String!
+  title: String!
+}