Do not add internal to private members (#6213)

apollographql · Oct 22, 2024 · cc5c076 · cc5c076
1 parent dca22ae
commit cc5c076
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 24 deletions.
diff --git a/.../src/main/kotlin/com/apollographql/apollo/compiler/codegen/kotlin/helpers/add_internal.kt b/.../src/main/kotlin/com/apollographql/apollo/compiler/codegen/kotlin/helpers/add_internal.kt
@@ -28,24 +28,36 @@ fun FileSpec.Builder.addInternal(patterns: List<String>): FileSpec.Builder = app
     }
     when (member) {
       is TypeSpec -> {
-        member.toBuilder()
-            .addModifiers(KModifier.INTERNAL)
-            .build()
+        if (member.modifiers.contains(KModifier.PRIVATE)) {
+          member
+        } else {
+          member.toBuilder()
+              .addModifiers(KModifier.INTERNAL)
+              .build()
+        }
       }
 
       is FunSpec -> {
-        member.toBuilder()
-            .addModifiers(KModifier.INTERNAL)
-            .build()
+        if (member.modifiers.contains(KModifier.PRIVATE)) {
+          member
+        } else {
+          member.toBuilder()
+              .addModifiers(KModifier.INTERNAL)
+              .build()
+        }
       }
 
       is PropertySpec -> {
-        member.toBuilder()
-            .addModifiers(KModifier.INTERNAL)
-            .build()
+        if (member.modifiers.contains(KModifier.PRIVATE)) {
+          member
+        } else {
+          member.toBuilder()
+              .addModifiers(KModifier.INTERNAL)
+              .build()
+        }
       }
 
       else -> error("Top Level $member is not supported")
     }
   }
-}
+}
diff --git a/...test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/TestQuery.kt.expected b/...test/graphql/com/example/enum_field/kotlin/responseBased/enum_field/TestQuery.kt.expected
diff --git a/.../enum_field/kotlin/responseBased/enum_field/adapter/TestQuery_ResponseAdapter.kt.expected b/.../enum_field/kotlin/responseBased/enum_field/adapter/TestQuery_ResponseAdapter.kt.expected
diff --git a/...ple/enum_field/kotlin/responseBased/enum_field/selections/TestQuerySelections.kt.expected b/...ple/enum_field/kotlin/responseBased/enum_field/selections/TestQuerySelections.kt.expected
diff --git a/...ql/com/example/enum_field/kotlin/responseBased/enum_field/type/GraphQLBoolean.kt.expected b/...ql/com/example/enum_field/kotlin/responseBased/enum_field/type/GraphQLBoolean.kt.expected
diff --git a/...phql/com/example/enum_field/kotlin/responseBased/enum_field/type/GraphQLFloat.kt.expected b/...phql/com/example/enum_field/kotlin/responseBased/enum_field/type/GraphQLFloat.kt.expected
diff --git a/...graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/GraphQLID.kt.expected b/...graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/GraphQLID.kt.expected
diff --git a/...raphql/com/example/enum_field/kotlin/responseBased/enum_field/type/GraphQLInt.kt.expected b/...raphql/com/example/enum_field/kotlin/responseBased/enum_field/type/GraphQLInt.kt.expected
diff --git a/...hql/com/example/enum_field/kotlin/responseBased/enum_field/type/GraphQLString.kt.expected b/...hql/com/example/enum_field/kotlin/responseBased/enum_field/type/GraphQLString.kt.expected
diff --git a/...t/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/Gravity.kt.expected b/...t/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/Gravity.kt.expected
diff --git a/...hql/com/example/enum_field/kotlin/responseBased/enum_field/type/GravityAsEnum.kt.expected b/...hql/com/example/enum_field/kotlin/responseBased/enum_field/type/GravityAsEnum.kt.expected
diff --git a/...est/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/Query.kt.expected b/...est/graphql/com/example/enum_field/kotlin/responseBased/enum_field/type/Query.kt.expected
diff --git a/...ld/kotlin/responseBased/enum_field/type/adapter/GravityAsEnum_ResponseAdapter.kt.expected b/...ld/kotlin/responseBased/enum_field/type/adapter/GravityAsEnum_ResponseAdapter.kt.expected
diff --git a/...um_field/kotlin/responseBased/enum_field/type/adapter/Gravity_ResponseAdapter.kt.expected b/...um_field/kotlin/responseBased/enum_field/type/adapter/Gravity_ResponseAdapter.kt.expected
diff --git a/libraries/apollo-compiler/src/test/kotlin/com/apollographql/apollo/compiler/CodegenTest.kt b/libraries/apollo-compiler/src/test/kotlin/com/apollographql/apollo/compiler/CodegenTest.kt
@@ -391,7 +391,7 @@ class CodegenTest {
       }
 
       val generateAsInternal = when (folder.name) {
-        "mutation_create_review", "simple_fragment" -> true
+        "mutation_create_review", "simple_fragment", "enum_field" -> true
         else -> false
       }