Merge branch 'master' into feature/kotlin2-aliases

# Conflicts: # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassDocs/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassFieldDocs/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWIthNoFields/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithBooleanField/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityConnectionProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/EntityEdgeProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeclaredScalars/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/CarProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/EngineProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithDeeplyNestedComplexField/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithExtendedInterface/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterface/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithInterfaceInheritance/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithListProperties/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedInterfaces/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityConnectionProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/EntityEdgeProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithMappedTypes/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableAndInterface/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableComplexType/expected/client/MyTypeProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableListOfNullableValues/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithNonNullableProperties/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/PersonProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithRecursiveField/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/dataClassWithStringProperties/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/BirdProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/DogProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFields/expected/client/PetProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/DogProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithInterfaceFieldsOfDifferentType/expected/client/PetProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceClassWithNonNullableFields/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/FruitProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/interfaceWithInterfaceInheritance/expected/client/StoneFruitProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithType/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithTypeAndArgs/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/projectionWithUnion/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/union/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionTypesWithoutInterfaceCanDeserialize/expected/client/SearchResultPageProjection.kt # graphql-dgs-codegen-core/src/integTest/kotlin/com/netflix/graphql/dgs/codegen/cases/unionWithExtendedType/expected/client/QueryProjection.kt # graphql-dgs-codegen-core/src/main/kotlin/com/netflix/graphql/dgs/codegen/generators/kotlin2/GenerateKotlin2ClientTypes.kt
Netflix · Apr 20, 2024 · f00d03c · f00d03c
2 parents e1ca748 + a5d4919
commit f00d03c
Show file tree

Hide file tree

Showing 254 changed files with 1,291 additions and 567 deletions.
diff --git a/...kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsClient.kt b/...kotlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/DgsClient.kt
@@ -1,11 +1,14 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.client.QueryProjection
 import graphql.language.OperationDefinition
 import kotlin.String
 
 public object DgsClient {
-  public fun buildQuery(_projection: QueryProjection.() -> QueryProjection): String =
-      GraphQLProjection.asQuery(OperationDefinition.Operation.QUERY, QueryProjection(), _projection)
+  public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null,
+      _projection: QueryProjection.() -> QueryProjection): String =
+      GraphQLProjection.asQuery(OperationDefinition.Operation.QUERY,
+      QueryProjection(inputValueSerializer), _projection)
 }
diff --git a/...flix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/PersonProjection.kt b/...flix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/PersonProjection.kt
@@ -1,8 +1,11 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.client
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 
-public class PersonProjection : GraphQLProjection() {
+public class PersonProjection(
+  inputValueSerializer: InputValueSerializerInterface? = null,
+) : GraphQLProjection(inputValueSerializer) {
   public val firstname: PersonProjection
     get() {
       field("firstname")

diff --git a/...tflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/QueryProjection.kt b/...tflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/client/QueryProjection.kt
@@ -1,16 +1,19 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.client
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 import com.netflix.graphql.dgs.codegen.cases.constantsForInputTypes.expected.types.PersonFilter
 import kotlin.String
 
-public class QueryProjection : GraphQLProjection() {
+public class QueryProjection(
+  inputValueSerializer: InputValueSerializerInterface? = null,
+) : GraphQLProjection(inputValueSerializer) {
   public fun people(
     _alias: String? = null,
     filter: PersonFilter? = default<QueryProjection, PersonFilter?>("filter"),
     _projection: PersonProjection.() -> PersonProjection,
   ): QueryProjection {
-    field(_alias, "people", PersonProjection(), _projection, "filter" to filter)
+    field(_alias, "people", PersonProjection(inputValueSerializer), _projection, "filter" to filter)
     return this
   }
 }
diff --git a/...lin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt b/...lin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Person.kt
@@ -15,17 +15,17 @@ public class Person(
   firstname: () -> String? = firstnameDefault,
   lastname: () -> String? = lastnameDefault,
 ) {
-  private val _firstname: () -> String? = firstname
+  private val __firstname: () -> String? = firstname
 
-  private val _lastname: () -> String? = lastname
+  private val __lastname: () -> String? = lastname
 
   @get:JvmName("getFirstname")
   public val firstname: String?
-    get() = _firstname.invoke()
+    get() = __firstname.invoke()
 
   @get:JvmName("getLastname")
   public val lastname: String?
-    get() = _lastname.invoke()
+    get() = __lastname.invoke()
 
   public companion object {
     private val firstnameDefault: () -> String? = 

diff --git a/...tlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt b/...tlin/com/netflix/graphql/dgs/codegen/cases/constantsForInputTypes/expected/types/Query.kt
@@ -14,11 +14,11 @@ import kotlin.jvm.JvmName
 public class Query(
   people: () -> List<Person?>? = peopleDefault,
 ) {
-  private val _people: () -> List<Person?>? = people
+  private val __people: () -> List<Person?>? = people
 
   @get:JvmName("getPeople")
   public val people: List<Person?>?
-    get() = _people.invoke()
+    get() = __people.invoke()
 
   public companion object {
     private val peopleDefault: () -> List<Person?>? = 

diff --git a/...m/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsClient.kt b/...m/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/DgsClient.kt
@@ -1,11 +1,14 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.client.QueryProjection
 import graphql.language.OperationDefinition
 import kotlin.String
 
 public object DgsClient {
-  public fun buildQuery(_projection: QueryProjection.() -> QueryProjection): String =
-      GraphQLProjection.asQuery(OperationDefinition.Operation.QUERY, QueryProjection(), _projection)
+  public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null,
+      _projection: QueryProjection.() -> QueryProjection): String =
+      GraphQLProjection.asQuery(OperationDefinition.Operation.QUERY,
+      QueryProjection(inputValueSerializer), _projection)
 }
diff --git a/...hql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/PersonProjection.kt b/...hql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/PersonProjection.kt
@@ -1,8 +1,11 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.client
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 
-public class PersonProjection : GraphQLProjection() {
+public class PersonProjection(
+  inputValueSerializer: InputValueSerializerInterface? = null,
+) : GraphQLProjection(inputValueSerializer) {
   public val firstname: PersonProjection
     get() {
       field("firstname")

diff --git a/...phql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/QueryProjection.kt b/...phql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/client/QueryProjection.kt
@@ -1,16 +1,19 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.client
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInputTypes.expected.types.PersonFilter
 import kotlin.String
 
-public class QueryProjection : GraphQLProjection() {
+public class QueryProjection(
+  inputValueSerializer: InputValueSerializerInterface? = null,
+) : GraphQLProjection(inputValueSerializer) {
   public fun people(
     _alias: String? = null,
     filter: PersonFilter? = default<QueryProjection, PersonFilter?>("filter"),
     _projection: PersonProjection.() -> PersonProjection,
   ): QueryProjection {
-    field(_alias, "people", PersonProjection(), _projection, "filter" to filter)
+    field(_alias, "people", PersonProjection(inputValueSerializer), _projection, "filter" to filter)
     return this
   }
 }
diff --git a/...etflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt b/...etflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Person.kt
@@ -15,17 +15,17 @@ public class Person(
   firstname: () -> String? = firstnameDefault,
   lastname: () -> String? = lastnameDefault,
 ) {
-  private val _firstname: () -> String? = firstname
+  private val __firstname: () -> String? = firstname
 
-  private val _lastname: () -> String? = lastname
+  private val __lastname: () -> String? = lastname
 
   @get:JvmName("getFirstname")
   public val firstname: String?
-    get() = _firstname.invoke()
+    get() = __firstname.invoke()
 
   @get:JvmName("getLastname")
   public val lastname: String?
-    get() = _lastname.invoke()
+    get() = __lastname.invoke()
 
   public companion object {
     private val firstnameDefault: () -> String? = 

diff --git a/...netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt b/...netflix/graphql/dgs/codegen/cases/constantsWithExtendedInputTypes/expected/types/Query.kt
@@ -14,11 +14,11 @@ import kotlin.jvm.JvmName
 public class Query(
   people: () -> List<Person?>? = peopleDefault,
 ) {
-  private val _people: () -> List<Person?>? = people
+  private val __people: () -> List<Person?>? = people
 
   @get:JvmName("getPeople")
   public val people: List<Person?>?
-    get() = _people.invoke()
+    get() = __people.invoke()
 
   public companion object {
     private val peopleDefault: () -> List<Person?>? = 

diff --git a/...om/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsClient.kt b/...om/netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/DgsClient.kt
@@ -1,11 +1,14 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.client.QueryProjection
 import graphql.language.OperationDefinition
 import kotlin.String
 
 public object DgsClient {
-  public fun buildQuery(_projection: QueryProjection.() -> QueryProjection): String =
-      GraphQLProjection.asQuery(OperationDefinition.Operation.QUERY, QueryProjection(), _projection)
+  public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null,
+      _projection: QueryProjection.() -> QueryProjection): String =
+      GraphQLProjection.asQuery(OperationDefinition.Operation.QUERY,
+      QueryProjection(inputValueSerializer), _projection)
 }
diff --git a/...phql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/PersonProjection.kt b/...phql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/PersonProjection.kt
@@ -1,8 +1,11 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.client
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 
-public class PersonProjection : GraphQLProjection() {
+public class PersonProjection(
+  inputValueSerializer: InputValueSerializerInterface? = null,
+) : GraphQLProjection(inputValueSerializer) {
   public val firstname: PersonProjection
     get() {
       field("firstname")

diff --git a/...aphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/QueryProjection.kt b/...aphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/client/QueryProjection.kt
@@ -1,12 +1,15 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedInterface.expected.client
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 import kotlin.String
 
-public class QueryProjection : GraphQLProjection() {
+public class QueryProjection(
+  inputValueSerializer: InputValueSerializerInterface? = null,
+) : GraphQLProjection(inputValueSerializer) {
   public fun people(_alias: String? = null, _projection: PersonProjection.() -> PersonProjection):
       QueryProjection {
-    field(_alias, "people", PersonProjection(), _projection)
+    field(_alias, "people", PersonProjection(inputValueSerializer), _projection)
     return this
   }
 }
diff --git a/.../netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt b/.../netflix/graphql/dgs/codegen/cases/constantsWithExtendedInterface/expected/types/Query.kt
@@ -14,11 +14,11 @@ import kotlin.jvm.JvmName
 public class Query(
   people: () -> List<Person?>? = peopleDefault,
 ) {
-  private val _people: () -> List<Person?>? = people
+  private val __people: () -> List<Person?>? = people
 
   @get:JvmName("getPeople")
   public val people: List<Person?>?
-    get() = _people.invoke()
+    get() = __people.invoke()
 
   public companion object {
     private val peopleDefault: () -> List<Person?>? = 

diff --git a/...in/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsClient.kt b/...in/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/DgsClient.kt
@@ -1,11 +1,14 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.client.QueryProjection
 import graphql.language.OperationDefinition
 import kotlin.String
 
 public object DgsClient {
-  public fun buildQuery(_projection: QueryProjection.() -> QueryProjection): String =
-      GraphQLProjection.asQuery(OperationDefinition.Operation.QUERY, QueryProjection(), _projection)
+  public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null,
+      _projection: QueryProjection.() -> QueryProjection): String =
+      GraphQLProjection.asQuery(OperationDefinition.Operation.QUERY,
+      QueryProjection(inputValueSerializer), _projection)
 }
diff --git a/.../graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/PersonProjection.kt b/.../graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/PersonProjection.kt
@@ -1,8 +1,11 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.client
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 
-public class PersonProjection : GraphQLProjection() {
+public class PersonProjection(
+  inputValueSerializer: InputValueSerializerInterface? = null,
+) : GraphQLProjection(inputValueSerializer) {
   public val firstname: PersonProjection
     get() {
       field("firstname")

diff --git a/...x/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/QueryProjection.kt b/...x/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/client/QueryProjection.kt
@@ -1,18 +1,21 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedQuery.expected.client
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 import kotlin.String
 
-public class QueryProjection : GraphQLProjection() {
+public class QueryProjection(
+  inputValueSerializer: InputValueSerializerInterface? = null,
+) : GraphQLProjection(inputValueSerializer) {
   public fun people(_alias: String? = null, _projection: PersonProjection.() -> PersonProjection):
       QueryProjection {
-    field(_alias, "people", PersonProjection(), _projection)
+    field(_alias, "people", PersonProjection(inputValueSerializer), _projection)
     return this
   }
 
   public fun friends(_alias: String? = null, _projection: PersonProjection.() -> PersonProjection):
       QueryProjection {
-    field(_alias, "friends", PersonProjection(), _projection)
+    field(_alias, "friends", PersonProjection(inputValueSerializer), _projection)
     return this
   }
 }
diff --git a/...com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt b/...com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Person.kt
@@ -15,17 +15,17 @@ public class Person(
   firstname: () -> String? = firstnameDefault,
   lastname: () -> String? = lastnameDefault,
 ) {
-  private val _firstname: () -> String? = firstname
+  private val __firstname: () -> String? = firstname
 
-  private val _lastname: () -> String? = lastname
+  private val __lastname: () -> String? = lastname
 
   @get:JvmName("getFirstname")
   public val firstname: String?
-    get() = _firstname.invoke()
+    get() = __firstname.invoke()
 
   @get:JvmName("getLastname")
   public val lastname: String?
-    get() = _lastname.invoke()
+    get() = __lastname.invoke()
 
   public companion object {
     private val firstnameDefault: () -> String? = 

diff --git a/.../com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt b/.../com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedQuery/expected/types/Query.kt
@@ -15,17 +15,17 @@ public class Query(
   people: () -> List<Person?>? = peopleDefault,
   friends: () -> List<Person?>? = friendsDefault,
 ) {
-  private val _people: () -> List<Person?>? = people
+  private val __people: () -> List<Person?>? = people
 
-  private val _friends: () -> List<Person?>? = friends
+  private val __friends: () -> List<Person?>? = friends
 
   @get:JvmName("getPeople")
   public val people: List<Person?>?
-    get() = _people.invoke()
+    get() = __people.invoke()
 
   @get:JvmName("getFriends")
   public val friends: List<Person?>?
-    get() = _friends.invoke()
+    get() = __friends.invoke()
 
   public companion object {
     private val peopleDefault: () -> List<Person?>? = 

diff --git a/...in/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsClient.kt b/...in/com/netflix/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/DgsClient.kt
@@ -1,11 +1,14 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 import com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.client.QueryProjection
 import graphql.language.OperationDefinition
 import kotlin.String
 
 public object DgsClient {
-  public fun buildQuery(_projection: QueryProjection.() -> QueryProjection): String =
-      GraphQLProjection.asQuery(OperationDefinition.Operation.QUERY, QueryProjection(), _projection)
+  public fun buildQuery(inputValueSerializer: InputValueSerializerInterface? = null,
+      _projection: QueryProjection.() -> QueryProjection): String =
+      GraphQLProjection.asQuery(OperationDefinition.Operation.QUERY,
+      QueryProjection(inputValueSerializer), _projection)
 }
diff --git a/.../graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/PersonProjection.kt b/.../graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/PersonProjection.kt
@@ -1,8 +1,11 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.client
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 
-public class PersonProjection : GraphQLProjection() {
+public class PersonProjection(
+  inputValueSerializer: InputValueSerializerInterface? = null,
+) : GraphQLProjection(inputValueSerializer) {
   public val firstname: PersonProjection
     get() {
       field("firstname")

diff --git a/...x/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/QueryProjection.kt b/...x/graphql/dgs/codegen/cases/constantsWithExtendedTypes/expected/client/QueryProjection.kt
@@ -1,12 +1,15 @@
 package com.netflix.graphql.dgs.codegen.cases.constantsWithExtendedTypes.expected.client
 
+import com.netflix.graphql.dgs.client.codegen.InputValueSerializerInterface
 import com.netflix.graphql.dgs.codegen.GraphQLProjection
 import kotlin.String
 
-public class QueryProjection : GraphQLProjection() {
+public class QueryProjection(
+  inputValueSerializer: InputValueSerializerInterface? = null,
+) : GraphQLProjection(inputValueSerializer) {
   public fun people(_alias: String? = null, _projection: PersonProjection.() -> PersonProjection):
       QueryProjection {
-    field(_alias, "people", PersonProjection(), _projection)
+    field(_alias, "people", PersonProjection(inputValueSerializer), _projection)
     return this
   }
 }