🐛 Consider files with or without packages

toggl · Nov 1, 2023 · 9a45ac5 · 9a45ac5
1 parent dadf372
commit 9a45ac5
Show file tree

Hide file tree

Showing 4 changed files with 191 additions and 2 deletions.
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
diff --git a/komposable-architecture-compiler/src/main/kotlin/processors/ActionMappingSymbolProcessor.kt b/komposable-architecture-compiler/src/main/kotlin/processors/ActionMappingSymbolProcessor.kt
@@ -36,7 +36,9 @@ class ActionMappingSymbolProcessor(
                         val childActionClassName = childAction.toClassName()
 
                         val sealedParentActionTypeName = parentActionSealedType.toClassName().simpleName
-                        val parentActionTypeName = parentActionClassName.canonicalName.substring(parentActionClassName.packageName.length, parentActionClassName.canonicalName.length)
+                        val parentActionTypeName = parentActionClassName.canonicalName
+                            .substring(parentActionClassName.packageName.length, parentActionClassName.canonicalName.length)
+                            .trim('.')
                         val childActionTypeName = childActionClassName.simpleName
 
                         val childActionArgumentName = childActionTypeName.toCamelCase()

diff --git a/komposable-architecture-compiler/src/test/kotlin/ActionMappingSymbolProcessorTests.kt b/komposable-architecture-compiler/src/test/kotlin/ActionMappingSymbolProcessorTests.kt
@@ -26,6 +26,27 @@ class ActionMappingSymbolProcessorTests {
         sources.single().readText().contentEquals(SourceFiles.generatedSettingsFile)
     }
 
+    @Test
+    fun `Action mapping methods are generated on files without a package`() {
+        // Arrange
+        val compilation = KotlinCompilation().apply {
+            sources = listOf(SourceFiles.appActionWithoutPackage, SourceFiles.settingsActionWithoutPackage)
+            symbolProcessorProviders = listOf(ActionMappingSymbolProcessorProvider())
+            inheritClassPath = true
+            messageOutputStream = System.out
+        }
+
+        // Act
+        val result = compilation.compile()
+
+        // Assert
+        result.exitCode shouldBe KotlinCompilation.ExitCode.OK
+
+        val sources = result.kspGeneratedSources()
+        sources.size.shouldBe(1)
+        sources.single().readText().contentEquals(SourceFiles.generatedSettingsFileWithoutPackage)
+    }
+
     @Test
     fun `If a class annotated with @WrapperAction has multiple properties then the compilation fails`() {
         // Arrange

diff --git a/komposable-architecture-compiler/src/test/kotlin/SourceFiles.kt b/komposable-architecture-compiler/src/test/kotlin/SourceFiles.kt
@@ -6,6 +6,17 @@ object SourceFiles {
     val settingsAction = SourceFile.kotlin(
         "SettingsAction.kt",
         """
+    package com.toggl.komposable.compiler.testing
+    
+    sealed interface SettingsAction {
+        data class ChangeSomeSetting(val newValue: Boolean) : SettingsAction
+    }
+        """.trimIndent(),
+    )
+
+    val settingsActionWithoutPackage = SourceFile.kotlin(
+        "SettingsAction.kt",
+        """
     sealed interface SettingsAction {
         data class ChangeSomeSetting(val newValue: Boolean) : SettingsAction
     }
@@ -15,6 +26,22 @@ object SourceFiles {
     val appAction = SourceFile.kotlin(
         "AppAction.kt",
         """
+    package com.toggl.komposable.compiler.testing
+    
+    import com.toggl.komposable.architecture.WrapperAction
+    
+    sealed interface AppAction {
+        data object ClearList : AppAction
+    
+        @WrapperAction
+        data class Settings(val settingsAction: SettingsAction) : AppAction
+    }
+        """.trimIndent(),
+    )
+
+    val appActionWithoutPackage = SourceFile.kotlin(
+        "AppAction.kt",
+        """    
     import com.toggl.komposable.architecture.WrapperAction
     
     sealed interface AppAction {
@@ -29,6 +56,8 @@ object SourceFiles {
     val appActionWithMultipleProperties = SourceFile.kotlin(
         "AppAction.kt",
         """
+    package com.toggl.komposable.compiler.testing
+    
     import com.toggl.komposable.architecture.WrapperAction
     
     sealed interface AppAction {
@@ -41,7 +70,20 @@ object SourceFiles {
     )
 
     @Language("kotlin")
-    val generatedSettingsFile = """import AppAction.Settings
+    val generatedSettingsFile = """
+    package com.toggl.komposable.compiler.testing
+    
+    import AppAction.Settings
+    
+    public fun mapAppActionToSettingsAction(appAction: AppAction): SettingsAction? = if(appAction is
+        AppAction.Settings) appAction.settingsAction else null
+    
+    public fun mapSettingsActionToAppAction(settingsAction: SettingsAction): AppAction.Settings =
+        AppAction.Settings(settingsAction)
+    """.trimIndent()
+
+    @Language("kotlin")
+    val generatedSettingsFileWithoutPackage = """import AppAction.Settings
 
 public fun mapAppActionToSettingsAction(appAction: AppAction): SettingsAction? = if(appAction is
     AppAction.Settings) appAction.settingsAction else null