From d901737274ebee1eaf789b1146e45b0ca50cb7f8 Mon Sep 17 00:00:00 2001
From: Patrik Aradi <aradipatrik@gmail.com>
Date: Fri, 29 Mar 2024 18:14:41 +0800
Subject: [PATCH] fix library generation

---
 src/generation.rs                                      | 1 +
 src/templates/lib/impl/GetExampleUseCase.kt.handlebars | 6 +++---
 src/templates/lib/impl/LibDecl.handlebars              | 2 +-
 tests/exp/lib/GetExampleUseCase.kt                     | 4 ++--
 tests/exp/lib/LibDecl.kt                               | 2 +-
 tests/integration_test.rs                              | 4 ++--
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/generation.rs b/src/generation.rs
index 6f77e9f..9be5b45 100644
--- 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
index 49c7154..2fc3264 100644
--- a/src/templates/lib/impl/GetExampleUseCase.kt.handlebars
+++ b/src/templates/lib/impl/GetExampleUseCase.kt.handlebars
@@ -1,8 +1,8 @@
 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
@@ -10,7 +10,7 @@ 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
index e93db3e..59d8065 100644
--- 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
index 6e18ca7..a07d10a 100644
--- 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
index 174b353..f243afc 100644
--- 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
index d2c8a51..9b56fbb 100644
--- 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"),
     );