Fix registration file hierarchy setting retention from library settings

utopia-rise · Nov 3, 2024 · 94d80b3 · 94d80b3
1 parent ac2a1bd
commit 94d80b3
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 41 deletions.
diff --git a/...odot/tests/library/flattened/FLSimple.gdj → ...cies/flattened-library-tests/FLSimple.gdj b/...odot/tests/library/flattened/FLSimple.gdj → ...cies/flattened-library-tests/FLSimple.gdj
@@ -20,4 +20,4 @@ properties = [
 ]
 functions = [
     provide_greeting
-]
+]
diff --git a/...y-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/EntryGenerator.kt b/...y-generation/godot-entry-generator/src/main/kotlin/godot/entrygenerator/EntryGenerator.kt
@@ -39,6 +39,7 @@ object EntryGenerator {
         classRegistrarFromDependencyCount: Int,
         logger: Logger,
         sourceFiles: List<SourceFile>,
+        isRegistrationFileHierarchyEnabled: Boolean,
         jvmTypeFqNamesProvider: (JvmType) -> Set<String>,
         compilationTimeRelativeRegistrationFilePathProvider: (RegisteredClass) -> String,
         classRegistrarAppendableProvider: (RegisteredClass) -> BufferedWriter,
@@ -67,7 +68,8 @@ object EntryGenerator {
                             projectName = projectName,
                             registeredClass = registeredClass,
                             registrarAppendableProvider = classRegistrarAppendableProvider,
-                            compilationTimeRelativeRegistrationFilePath = compilationTimeRelativeRegistrationFilePathProvider(registeredClass)
+                            compilationTimeRelativeRegistrationFilePath = compilationTimeRelativeRegistrationFilePathProvider(registeredClass),
+                            isRegistrationFileHierarchyEnabled = isRegistrationFileHierarchyEnabled,
                         )
                     )
                 }

diff --git a/...y-generator/src/main/kotlin/godot/entrygenerator/filebuilder/ClassRegistrarFileBuilder.kt b/...y-generator/src/main/kotlin/godot/entrygenerator/filebuilder/ClassRegistrarFileBuilder.kt
@@ -22,6 +22,7 @@ class ClassRegistrarFileBuilder(
     private val registeredClass: RegisteredClass,
     private val compilationTimeRelativeRegistrationFilePath: String,
     private val registrarAppendableProvider: (RegisteredClass) -> BufferedWriter,
+    isRegistrationFileHierarchyEnabled: Boolean,
 ) {
     private val classRegistrarBuilder = TypeSpec
         .classBuilder("${registeredClass.registeredName}Registrar")
@@ -41,6 +42,7 @@ class ClassRegistrarFileBuilder(
                         .addMember("%S", registeredClass.signals.joinToString(",") { it.fqName })
                         .addMember("%S", registeredClass.properties.joinToString(",") { it.fqName })
                         .addMember("%S", registeredClass.functions.filter { it.name != GodotFunctions.notification }.joinToString(",") { it.fqName })
+                        .addMember("%L", isRegistrationFileHierarchyEnabled)
                         .build()
                 )
             }

diff --git a/...-generator/src/main/kotlin/godot/entrygenerator/model/RegisteredClassMetadataContainer.kt b/...-generator/src/main/kotlin/godot/entrygenerator/model/RegisteredClassMetadataContainer.kt
@@ -11,4 +11,5 @@ data class RegisteredClassMetadataContainer(
     val signals: String,
     val properties: String,
     val functions: String,
+    val isRegistrationFileHierarchyEnabled: Boolean,
 )
diff --git a/...symbol-processor/src/main/kotlin/godot/annotation/processor/GodotKotlinSymbolProcessor.kt b/...symbol-processor/src/main/kotlin/godot/annotation/processor/GodotKotlinSymbolProcessor.kt
@@ -106,6 +106,7 @@ class GodotKotlinSymbolProcessor(
                 ?: throw IllegalStateException("No isRegistrationFileHierarchyEnabled option provided or not a boolean"),
             isRegistrationFileGenerationEnabled = options["isRegistrationFileGenerationEnabled"]?.toBooleanStrictOrNull()
                 ?: throw IllegalStateException("No isRegistrationFileGenerationEnabled option provided or not a boolean"),
+            registeredClassMetadataContainers = emptyList(),
         )
     }
 

diff --git a/...tion/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/Settings.kt b/...tion/godot-kotlin-symbol-processor/src/main/kotlin/godot/annotation/processor/Settings.kt
@@ -1,5 +1,6 @@
 package godot.annotation.processor
 
+import godot.entrygenerator.model.RegisteredClassMetadataContainer
 import java.io.File
 
 internal data class Settings(
@@ -10,4 +11,5 @@ internal data class Settings(
     val isFqNameRegistrationEnabled: Boolean,
     val isRegistrationFileHierarchyEnabled: Boolean,
     val isRegistrationFileGenerationEnabled: Boolean,
+    var registeredClassMetadataContainers: List<RegisteredClassMetadataContainer>,
 )
diff --git a/...sor/src/main/kotlin/godot/annotation/processor/ext/RegisteredClassMetadataContainerExt.kt b/...sor/src/main/kotlin/godot/annotation/processor/ext/RegisteredClassMetadataContainerExt.kt
@@ -1,16 +1,23 @@
 package godot.annotation.processor.ext
 
+import godot.annotation.processor.Settings
 import godot.tools.common.constants.FileExtensions
 import org.jetbrains.kotlin.konan.properties.suffix
 
 internal fun provideRegistrationFilePathForInitialGenerationWithoutExtension(
-    isRegistrationFileHierarchyEnabled: Boolean,
+    settings: Settings,
     fqName: String,
     registeredName: String,
     compilationProjectName: String,
     classProjectName: String,
     registrationFileOutDir: String
 ): String {
+    val registrationMetadata = settings.registeredClassMetadataContainers.firstOrNull { it.fqName == fqName }
+    val isRegistrationFileHierarchyEnabled = if (registrationMetadata != null) {
+        registrationMetadata.isRegistrationFileHierarchyEnabled
+    } else {
+        settings.isRegistrationFileHierarchyEnabled
+    }
     val registrationFileRelativePath = if (isRegistrationFileHierarchyEnabled && fqName.contains(".")) {
         fqName.substringBeforeLast(".").replace(".", "/")
     } else ""

diff --git a/...lin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksTypeReferenceExt.kt b/...lin-symbol-processor/src/main/kotlin/godot/annotation/processor/ext/ksTypeReferenceExt.kt
@@ -56,42 +56,48 @@ internal fun KSType.provideRegisteredClassName(
 internal fun KSDeclaration.provideRegisteredClassName(
     settings: Settings,
 ): String? {
-    val registerClassAnnotation = annotations
-        .firstOrNull { it.fqNameUnsafe == RegisterClass::class.qualifiedName }
+    return settings
+        .registeredClassMetadataContainers
+        .firstOrNull { it.fqName == this.qualifiedName?.asString() }
+        ?.registeredName
+        ?: run {
+            val registerClassAnnotation = annotations
+                .firstOrNull { it.fqNameUnsafe == RegisterClass::class.qualifiedName }
 
-    val customName = registerClassAnnotation
-        ?.arguments
-        ?.first()
-        ?.value as? String
+            val customName = registerClassAnnotation
+                ?.arguments
+                ?.first()
+                ?.value as? String
 
-    val fqName = this.qualifiedName?.asString() ?: return null
+            val fqName = this.qualifiedName?.asString() ?: return null
 
-    val registeredName = if (customName.isNullOrEmpty()) {
-        if (settings.isFqNameRegistrationEnabled) {
-            fqName.replace(".", "_")
-        } else {
-            if (fqName.contains(".")) {
-                fqName.substringAfterLast(".")
+            val registeredName = if (customName.isNullOrEmpty()) {
+                if (settings.isFqNameRegistrationEnabled) {
+                    fqName.replace(".", "_")
+                } else {
+                    if (fqName.contains(".")) {
+                        fqName.substringAfterLast(".")
+                    } else {
+                        fqName
+                    }
+                }
             } else {
-                fqName
+                customName
             }
-        }
-    } else {
-        customName
-    }
 
-    return if (settings.classPrefix != null) {
-        if (registeredName.contains("_")) {
-            val packageName = registeredName.substringBeforeLast("_")
-            val classNameWithPrefix = registeredName
-                .substringAfterLast("_")
-                .let { className -> "${settings.classPrefix.uppercase()}$className" }
+            if (settings.classPrefix != null) {
+                if (registeredName.contains("_")) {
+                    val packageName = registeredName.substringBeforeLast("_")
+                    val classNameWithPrefix = registeredName
+                        .substringAfterLast("_")
+                        .let { className -> "${settings.classPrefix.uppercase()}$className" }
 
-            "${packageName}_$classNameWithPrefix"
-        } else {
-            "${settings.classPrefix.uppercase()}$registeredName"
+                    "${packageName}_$classNameWithPrefix"
+                } else {
+                    "${settings.classPrefix.uppercase()}$registeredName"
+                }
+            } else {
+                registeredName
+            }
         }
-    } else {
-        registeredName
-    }
 }
diff --git a/...ssor/processing/RoundGenerateRegistrarsForCurrentProjectAndDependencyRegistrationFiles.kt b/...ssor/processing/RoundGenerateRegistrarsForCurrentProjectAndDependencyRegistrationFiles.kt
@@ -29,6 +29,12 @@ internal class RoundGenerateRegistrarsForCurrentProjectAndDependencyRegistration
     private val settings: Settings,
 ) : BaseRound() {
     override fun executeInternal(): List<KSAnnotated> {
+        val metadataAnnotationVisitor = MetadataAnnotationVisitor()
+        resolver.getDeclarationsFromPackage(godotEntryBasePackage).forEach { declaration ->
+            declaration.accept(metadataAnnotationVisitor, Unit)
+        }
+        settings.registeredClassMetadataContainers = metadataAnnotationVisitor.registeredClassMetadataContainers
+
         val registerAnnotationVisitor = RegistrationAnnotationVisitor(
             settings = settings,
         )
@@ -37,11 +43,6 @@ internal class RoundGenerateRegistrarsForCurrentProjectAndDependencyRegistration
             it.accept(registerAnnotationVisitor, Unit)
         }
 
-        val metadataAnnotationVisitor = MetadataAnnotationVisitor()
-        resolver.getDeclarationsFromPackage(godotEntryBasePackage).forEach { declaration ->
-            declaration.accept(metadataAnnotationVisitor, Unit)
-        }
-
 
         // generate entry files for this compilation
         EntryGenerator.generateEntryFiles(
@@ -51,14 +52,15 @@ internal class RoundGenerateRegistrarsForCurrentProjectAndDependencyRegistration
             classRegistrarFromDependencyCount = metadataAnnotationVisitor.registeredClassMetadataContainers.size,
             logger = LoggerWrapper(logger),
             sourceFiles = registerAnnotationVisitor.sourceFilesContainingRegisteredClasses,
+            isRegistrationFileHierarchyEnabled = settings.isRegistrationFileHierarchyEnabled,
             jvmTypeFqNamesProvider = JvmTypeProvider(),
             compilationTimeRelativeRegistrationFilePathProvider = { registeredClass ->
                 val registrationFile = blackboard
                     .existingRegistrationFilesMap["${registeredClass.registeredName}.${FileExtensions.GodotKotlinJvm.registrationFile}"]
                     ?.relativeTo(settings.projectBaseDir)
                     ?: File(
                         provideRegistrationFilePathForInitialGenerationWithoutExtension(
-                            isRegistrationFileHierarchyEnabled = settings.isRegistrationFileHierarchyEnabled,
+                            settings = settings,
                             fqName = registeredClass.fqName,
                             registeredName = registeredClass.registeredName,
                             compilationProjectName = settings.projectName,
@@ -100,7 +102,7 @@ internal class RoundGenerateRegistrarsForCurrentProjectAndDependencyRegistration
                     blackboard.alreadyGeneratedRegistrationFiles.add(metadata.fqName)
 
                     val registrationFile = provideRegistrationFilePathForInitialGenerationWithoutExtension(
-                        isRegistrationFileHierarchyEnabled = settings.isRegistrationFileHierarchyEnabled,
+                        settings = settings,
                         fqName = metadata.fqName,
                         registeredName = metadata.registeredName,
                         compilationProjectName = settings.projectName,

diff --git a/...ot/annotation/processor/processing/RoundGenerateRegistrationFilesForCurrentCompilation.kt b/...ot/annotation/processor/processing/RoundGenerateRegistrationFilesForCurrentCompilation.kt
@@ -41,7 +41,7 @@ internal class RoundGenerateRegistrationFilesForCurrentCompilation(
                     blackboard.alreadyGeneratedRegistrationFiles.add(metadata.fqName)
 
                     val resourcePathFromProjectRoot = provideRegistrationFilePathForInitialGenerationWithoutExtension(
-                        isRegistrationFileHierarchyEnabled = settings.isRegistrationFileHierarchyEnabled,
+                        settings = settings,
                         fqName = metadata.fqName,
                         registeredName = metadata.registeredName,
                         compilationProjectName = settings.projectName,

diff --git a/...processor/src/main/kotlin/godot/annotation/processor/visitor/MetadataAnnotationVisitor.kt b/...processor/src/main/kotlin/godot/annotation/processor/visitor/MetadataAnnotationVisitor.kt
@@ -34,6 +34,7 @@ internal class MetadataAnnotationVisitor: KSVisitorVoid() {
                             signals = annotation.signals,
                             properties = annotation.properties,
                             functions = annotation.functions,
+                            isRegistrationFileHierarchyEnabled = annotation.isRegistrationFileHierarchyEnabled
                         )
                     )
                 }

diff --git a/kt/godot-library/src/main/kotlin/godot/annotation/RegisteredClassMetadata.kt b/kt/godot-library/src/main/kotlin/godot/annotation/RegisteredClassMetadata.kt
@@ -13,4 +13,5 @@ annotation class RegisteredClassMetadata(
     val signals: String,
     val properties: String,
     val functions: String,
+    val isRegistrationFileHierarchyEnabled: Boolean
 )