Interface always has default projection __typename

ermadmi78 · Jun 28, 2021 · 08cb906 · 08cb906
1 parent 498f8a1
commit 08cb906
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/kobby-generator-kotlin/src/main/kotlin/io/github/ermadmi78/kobby/generator/kotlin/entity.kt b/kobby-generator-kotlin/src/main/kotlin/io/github/ermadmi78/kobby/generator/kotlin/entity.kt
@@ -146,7 +146,7 @@ private fun FileSpecBuilder.buildProjection(node: KobbyNode, layout: KotlinLayou
                     }
                 field.lambda?.also {
                     buildParameter(it) {
-                        if (!field.isOverride && field.type.hasDefaults) {
+                        if (!field.isOverride && field.type.node.hasDefaults) {
                             defaultValue("{}")
                         }
                     }
@@ -215,7 +215,9 @@ private fun FileSpecBuilder.buildQualification(node: KobbyNode, layout: KotlinLa
                     addKdoc(it)
                 }
                 buildParameter(entity.projection.projectionArgument, subObject.projectionLambda) {
-                    defaultValue("{}")
+                    if (subObject.hasDefaults) {
+                        defaultValue("{}")
+                    }
                 }
             }
         }

diff --git a/kobby-generator-kotlin/src/main/kotlin/io/github/ermadmi78/kobby/generator/kotlin/layout.kt b/kobby-generator-kotlin/src/main/kotlin/io/github/ermadmi78/kobby/generator/kotlin/layout.kt
@@ -170,10 +170,10 @@ data class KotlinLayout(
             else -> false
         }
 
-    internal val KobbyType.hasDefaults: Boolean
-        get() = when (node.kind) {
-            OBJECT, INTERFACE -> node.fields.values.any { it.isRequired || it.isDefault }
-            else -> true
+    internal val KobbyNode.hasDefaults: Boolean
+        get() = when (kind) {
+            OBJECT -> fields.values.any { it.isRequired || it.isDefault }
+            else -> true // unions and interfaces always has default projection __typename
         }
 
     internal val KobbyField.entityType: TypeName