fix library generation

AradiPatrik · Mar 29, 2024 · d901737 · d901737
1 parent 1f0c3b0
commit d901737
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/src/generation.rs b/src/generation.rs
@@ -377,6 +377,7 @@ impl<'a> Generator<'a> {
             .join("api/src/main/kotlin")
             .join(&library.app_context.base_package_path_part())
             .join(library.app_context.app_name.to_case(Case::Flat))
+            .join(library.library_name.to_case(Case::Flat))
             .into()
     }
 

diff --git a/src/templates/lib/impl/GetExampleUseCase.kt.handlebars b/src/templates/lib/impl/GetExampleUseCase.kt.handlebars
@@ -1,16 +1,16 @@
 package {{ flat base_package }}.{{ flat module }}.impl.usecase
 
 import android.content.Context
-import {{ flat base_package }}.{{ flat module }}.api.GetExample
-import {{ flat base_package }}.{{ flat module }}.impl.FaceDetection
+import {{ flat base_package }}.{{ flat app }}.{{ flat module }}.GetExample
+import {{ flat base_package }}.{{ flat module }}.impl.{{ pascal module }}
 import com.cardinalblue.platform.ApplicationContext
 import com.cardinalblue.platform.IoDispatcher
 import com.cardinalblue.skeleton.processor.InLibrary
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
-@InLibrary(ImageManipulation::class)
+@InLibrary({{ pascal module }}::class)
 class GetExampleUseCase @Inject constructor(
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
     @ApplicationContext private val context: Context

diff --git a/src/templates/lib/impl/LibDecl.handlebars b/src/templates/lib/impl/LibDecl.handlebars
@@ -1,6 +1,6 @@
 package {{ flat base_package }}.{{ flat module }}.impl
 
-import {{ flat base_package }}.{{ flat module }}.api.{{ pascal module }}Provider
+import {{ flat base_package }}.{{ flat app }}.{{ flat module }}.{{ pascal module }}Provider
 import com.cardinalblue.platform.PlatformProvider
 import com.cardinalblue.skeleton.processor.DeclareLibrary
 

diff --git a/tests/exp/lib/GetExampleUseCase.kt b/tests/exp/lib/GetExampleUseCase.kt
@@ -1,7 +1,7 @@
 package test.base.package.facedetection.impl.usecase
 
 import android.content.Context
-import test.base.package.facedetection.api.GetExample
+import test.base.package.myapp.facedetection.GetExample
 import test.base.package.facedetection.impl.FaceDetection
 import com.cardinalblue.platform.ApplicationContext
 import com.cardinalblue.platform.IoDispatcher
@@ -10,7 +10,7 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 
-@InLibrary(ImageManipulation::class)
+@InLibrary(FaceDetection::class)
 class GetExampleUseCase @Inject constructor(
     @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
     @ApplicationContext private val context: Context

diff --git a/tests/exp/lib/LibDecl.kt b/tests/exp/lib/LibDecl.kt
@@ -1,6 +1,6 @@
 package test.base.package.facedetection.impl
 
-import test.base.package.facedetection.api.FaceDetectionProvider
+import test.base.package.myapp.facedetection.FaceDetectionProvider
 import com.cardinalblue.platform.PlatformProvider
 import com.cardinalblue.skeleton.processor.DeclareLibrary
 

diff --git a/tests/integration_test.rs b/tests/integration_test.rs
@@ -210,14 +210,14 @@ fn generate_library() {
 
     assert_content_eq(
         Path::new(
-            "library/face-detection/api/src/main/kotlin/test/base/package/myapp/FaceDetectionProvider.kt",
+            "library/face-detection/api/src/main/kotlin/test/base/package/myapp/facedetection/FaceDetectionProvider.kt",
         ),
         include_str!("./exp/lib/Provider.kt"),
     );
 
     assert_content_eq(
         Path::new(
-            "library/face-detection/api/src/main/kotlin/test/base/package/myapp/GetExample.kt",
+            "library/face-detection/api/src/main/kotlin/test/base/package/myapp/facedetection/GetExample.kt",
         ),
         include_str!("./exp/lib/GetExample.kt"),
     );