[Codegen] Add CompiledArgumentDefinition

libraries/apollo-compiler/api/apollo-compiler.api

@@ -554,6 +554,7 @@ public final class com/apollographql/apollo3/compiler/codegen/ResolverKey$Compan
 }
 
 public final class com/apollographql/apollo3/compiler/codegen/ResolverKeyKind : java/lang/Enum {
+	public static final field ArgumentDefinition Lcom/apollographql/apollo3/compiler/codegen/ResolverKeyKind;
 	public static final field BuilderFun Lcom/apollographql/apollo3/compiler/codegen/ResolverKeyKind;
 	public static final field BuilderType Lcom/apollographql/apollo3/compiler/codegen/ResolverKeyKind;
 	public static final field CustomScalarAdapters Lcom/apollographql/apollo3/compiler/codegen/ResolverKeyKind;

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/Resolver.kt

@@ -33,6 +33,7 @@ enum class ResolverKeyKind {
   Schema,
   CustomScalarAdapters,
   Pagination,
+  ArgumentDefinition,
 }
 
 @Serializable

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/JavaResolver.kt

@@ -424,6 +424,9 @@ internal class JavaResolver(
 
   fun registerSchema(className: ClassName) = register(ResolverKeyKind.Schema, "", className)
   fun resolveSchema(): ClassName = resolveAndAssert(ResolverKeyKind.Schema, "")
+
+  fun registerArgumentDefinition(id: String, className: ClassName) = register(ResolverKeyKind.ArgumentDefinition, id, className)
+  fun resolveArgumentDefinition(id: String): ClassName = resolveAndAssert(ResolverKeyKind.ArgumentDefinition, id)
 }
 
 

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/operations/CompiledSelectionsBuilder.kt

@@ -59,7 +59,7 @@ internal class CompiledSelectionsBuilder(
       builder.add(".condition($L)", condition.toCompiledConditionInitializer())
     }
     if (arguments.isNotEmpty()) {
-      builder.add(".arguments($L)", arguments.sortedBy { it.name }.map { it.codeBlock() }.toListInitializerCodeblock())
+      builder.add(".arguments($L)", arguments.sortedBy { it.definitionId }.map { it.codeBlock() }.toListInitializerCodeblock())
     }
     if (selectionSetName != null) {
       builder.add(".selections($L)", "__$selectionSetName")
@@ -120,11 +120,10 @@ internal class CompiledSelectionsBuilder(
   private fun IrArgument.codeBlock(): CodeBlock {
     val argumentBuilder = CodeBlock.builder()
     argumentBuilder.add(
-        "new $T($T.${L}__$L)",
+        "new $T($T.$L)",
         JavaClassNames.CompiledArgument,
-        context.resolver.resolveSchemaType(parentType),
-        parentField,
-        name,
+        context.resolver.resolveArgumentDefinition(definitionId),
+        definitionPropertyName,
     )
     if (this.value != null) {
       argumentBuilder.add(".value($L)", value.codeBlock())

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/java/schema/ObjectBuilder.kt

@@ -28,6 +28,11 @@ internal class ObjectBuilder(
 
   override fun prepare() {
     context.resolver.registerSchemaType(obj.name, ClassName.get(packageName, simpleName))
+    for (fieldDefinition in obj.fieldDefinitions) {
+      fieldDefinition.argumentDefinitions.forEach { argumentDefinition ->
+        context.resolver.registerArgumentDefinition(argumentDefinition.id, ClassName.get(packageName, simpleName))
+      }
+    }
   }
 
   override fun build(): CodegenJavaFile {
@@ -54,7 +59,7 @@ internal fun List<IrFieldDefinition>.fieldSpecs(): List<FieldSpec> {
     fieldDefinition.argumentDefinitions.map { argumentDefinition ->
       FieldSpec.builder(
           JavaClassNames.CompiledArgumentDefinition,
-          "${fieldDefinition.name}__${argumentDefinition.name}",
+          argumentDefinition.propertyName,
           Modifier.PUBLIC,
           Modifier.STATIC,
           Modifier.FINAL,

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/KotlinResolver.kt

@@ -382,4 +382,7 @@ internal class KotlinResolver(
   }
 
   fun resolveCustomScalarAdapters(): ClassName = resolveAndAssert(ResolverKeyKind.CustomScalarAdapters, "")
+
+  fun registerArgumentDefinition(id: String, className: ClassName) = register(ResolverKeyKind.ArgumentDefinition, id, className)
+  fun resolveArgumentDefinition(id: String) = resolveAndAssert(ResolverKeyKind.ArgumentDefinition, id)
 }

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/operations/CompiledSelectionsBuilder.kt

@@ -63,7 +63,7 @@ internal class CompiledSelectionsBuilder(
       builder.add(".condition(%L)\n", condition.toCompiledConditionInitializer())
     }
     if (arguments.isNotEmpty()) {
-      builder.add(".arguments(%L)\n", arguments.sortedBy { it.name }.map { it.codeBlock() }.toListInitializerCodeblock(true))
+      builder.add(".arguments(%L)\n", arguments.sortedBy { it.definitionId }.map { it.codeBlock() }.toListInitializerCodeblock(true))
     }
     if (selectionSetName != null) {
       builder.add(".selections(%N)\n", "__$selectionSetName")
@@ -125,11 +125,10 @@ internal class CompiledSelectionsBuilder(
   private fun IrArgument.codeBlock(): CodeBlock {
     val argumentBuilder = CodeBlock.builder()
     argumentBuilder.add(
-        "%T(%T.%L__%L)",
+        "%T(%T.%L)",
         KotlinSymbols.CompiledArgument,
-        context.resolver.resolveSchemaType(parentType),
-        parentField,
-        name,
+        context.resolver.resolveArgumentDefinition(definitionId),
+        definitionPropertyName,
     )
 
     if (this.value != null) {

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/codegen/kotlin/schema/ObjectBuilder.kt

@@ -40,6 +40,11 @@ internal class ObjectBuilder(
     context.resolver.registerMapType(obj.name, ClassName(packageName, mapName))
     context.resolver.registerBuilderType(obj.name, ClassName(packageName, builderName))
     context.resolver.registerBuilderFun(obj.name, MemberName(packageName, "build${obj.name.capitalizeFirstLetter()}"))
+    for (fieldDefinition in obj.fieldDefinitions) {
+      fieldDefinition.argumentDefinitions.forEach { argumentDefinition ->
+        context.resolver.registerArgumentDefinition(argumentDefinition.id, ClassName(packageName, simpleName))
+      }
+    }
   }
 
   override fun build(): CgFile {
@@ -98,7 +103,7 @@ internal fun List<IrFieldDefinition>.propertySpecs(): List<PropertySpec> {
   return flatMap { fieldDefinition ->
     fieldDefinition.argumentDefinitions.map { argumentDefinition ->
       PropertySpec.builder(
-          name = "${fieldDefinition.name}__${argumentDefinition.name}",
+          name = argumentDefinition.propertyName,
           type = KotlinSymbols.CompiledArgumentDefinition,
       )
           .initializer(argumentDefinition.codeBlock())

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrOperations.kt

@@ -95,9 +95,8 @@ data class IrField(
 @Serializable
 @ApolloExperimental
 data class IrArgument(
-    val parentType: String,
-    val parentField: String,
-    val name: String,
+    val definitionId: String,
+    val definitionPropertyName: String,
     /**
      * The value for this argument. May be null if the argument is absent
      */

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/IrSchema.kt

@@ -129,10 +129,17 @@ internal class IrCompositeType2(val name: String) : IrType2
 
 @Serializable
 internal data class IrArgumentDefinition(
+    val id: String,
     val name: String,
+    val propertyName: String,
     val isKey: Boolean,
     val isPagination: Boolean,
-)
+) {
+  companion object {
+    fun id(type: String, field: String, argument: String) = "$type.$field.$argument"
+    fun propertyName(fieldName: String, argumentName: String) = "__${fieldName}_${argumentName}"
+  }
+}
 
 @Serializable
 internal data class IrMapProperty(
@@ -322,6 +329,8 @@ private fun GQLFieldDefinition.toIrFieldDefinition(
           null
         } else {
           IrArgumentDefinition(
+              id = IrArgumentDefinition.id(parentType, name, it.name),
+              propertyName = IrArgumentDefinition.propertyName(name, it.name),
               name = it.name,
               isKey = keyArgs.contains(it.name),
               isPagination = paginationArgs.contains(it.name)

libraries/apollo-compiler/src/main/kotlin/com/apollographql/apollo3/compiler/ir/SelectionSetsBuilder.kt

@@ -73,9 +73,8 @@ internal class SelectionSetsBuilder(
       val schemaArgument = fieldDefinition.arguments.first { it.name == fieldArgument.name }
       val userValue = fieldArgument.value.coerceInExecutableContextOrThrow(schemaArgument.type, schema)
       IrArgument(
-          parentType = parentType,
-          parentField = fieldDefinition.name,
-          name = schemaArgument.name,
+          definitionId = IrArgumentDefinition.id(parentType, fieldDefinition.name, schemaArgument.name),
+          definitionPropertyName = IrArgumentDefinition.propertyName(fieldDefinition.name, schemaArgument.name),
           value = userValue.toIrValue(),
       )
     }