room di

kotlitecture · Jul 11, 2024 · de601f2 · de601f2
1 parent a473203
commit de601f2
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 10 deletions.
diff --git a/processor/src/main/kotlin/kotli/template/multiplatform/compose/Rules.kt b/processor/src/main/kotlin/kotli/template/multiplatform/compose/Rules.kt
@@ -33,12 +33,12 @@ object Rules {
     const val BackendDir = "backend"
 
     // kotlin
+    const val DIKt = "*/DI*.kt"
     const val CommonAppSrcDir = "app/src"
     const val SharedDesignSrcDir = "shared/design/src"
     const val CommonAppMainDir = "${CommonAppSrcDir}/commonMain"
     const val AppIconsProviderKt = "${SharedDesignSrcDir}/commonMain/kotlin/shared/design/icon/AppIconsProvider.kt"
     const val AppModuleKt = "${CommonAppMainDir}/kotlin/kotli/app/di/presentation/AppModule.kt"
-    const val AppDIKt = "${CommonAppMainDir}/kotlin/kotli/app/di/DI.kt"
     const val AppWebPackConfigDir = "app/webpack.config.d"
     const val AppSqlDelightConfigJs = "${AppWebPackConfigDir}/sqljs-config.js"
     const val AppPresentationDir = "${CommonAppMainDir}/kotlin/kotli/app/presentation"

diff --git a/...otli/template/multiplatform/compose/dataflow/analytics/facade/FacadeAnalyticsProcessor.kt b/...otli/template/multiplatform/compose/dataflow/analytics/facade/FacadeAnalyticsProcessor.kt
@@ -23,7 +23,7 @@ object FacadeAnalyticsProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDIKt,
+            Rules.DIKt,
             RemoveMarkedLine("AnalyticsSource")
         )
     }

diff --git a/...n/kotlin/kotli/template/multiplatform/compose/dataflow/cache/basic/BasicCacheProcessor.kt b/...n/kotlin/kotli/template/multiplatform/compose/dataflow/cache/basic/BasicCacheProcessor.kt
@@ -39,7 +39,7 @@ object BasicCacheProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDIKt,
+            Rules.DIKt,
             RemoveMarkedLine("CacheSource")
         )
         state.onApplyRules(

diff --git a/...tlin/kotli/template/multiplatform/compose/dataflow/config/facade/FacadeConfigProcessor.kt b/...tlin/kotli/template/multiplatform/compose/dataflow/config/facade/FacadeConfigProcessor.kt
@@ -23,7 +23,7 @@ object FacadeConfigProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDIKt,
+            Rules.DIKt,
             RemoveMarkedLine("ConfigSource")
         )
     }

diff --git a/.../main/kotlin/kotli/template/multiplatform/compose/dataflow/database/room/RoomProcessor.kt b/.../main/kotlin/kotli/template/multiplatform/compose/dataflow/database/room/RoomProcessor.kt
@@ -78,6 +78,10 @@ object RoomProcessor : BaseFeatureProcessor() {
             "app/schemas",
             RemoveFile()
         )
+        state.onApplyRules(
+            Rules.DIKt,
+            RemoveMarkedLine("RoomSource")
+        )
     }
 
 }
diff --git a/.../kotli/template/multiplatform/compose/dataflow/database/sqldelight/SqlDelightProcessor.kt b/.../kotli/template/multiplatform/compose/dataflow/database/sqldelight/SqlDelightProcessor.kt
@@ -77,7 +77,7 @@ object SqlDelightProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDIKt,
+            Rules.DIKt,
             RemoveMarkedLine("SqlDelightSource")
         )
         state.onApplyRules(

diff --git a/.../main/kotlin/kotli/template/multiplatform/compose/dataflow/http/ktor/KtorHttpProcessor.kt b/.../main/kotlin/kotli/template/multiplatform/compose/dataflow/http/ktor/KtorHttpProcessor.kt
@@ -31,7 +31,7 @@ object KtorHttpProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDIKt,
+            Rules.DIKt,
             RemoveMarkedLine("HttpSource")
         )
         state.onApplyRules(

diff --git a/.../kotli/template/multiplatform/compose/dataflow/keyvalue/common/CommonKeyValueProcessor.kt b/.../kotli/template/multiplatform/compose/dataflow/keyvalue/common/CommonKeyValueProcessor.kt
@@ -27,7 +27,7 @@ object CommonKeyValueProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDIKt,
+            Rules.DIKt,
             RemoveMarkedLine("KeyValueSource")
         )
     }

diff --git a/...in/kotli/template/multiplatform/compose/dataflow/paging/cashapp/CashAppPagingProcessor.kt b/...in/kotli/template/multiplatform/compose/dataflow/paging/cashapp/CashAppPagingProcessor.kt
@@ -31,7 +31,7 @@ object CashAppPagingProcessor : BaseFeatureProcessor() {
             RemoveFile()
         )
         state.onApplyRules(
-            Rules.AppDIKt,
+            Rules.DIKt,
             RemoveMarkedLine("PagingSource")
         )
         state.onApplyRules(

diff --git a/...kotlin/kotli/template/multiplatform/compose/userflow/navigation/NavigationBarProcessor.kt b/...kotlin/kotli/template/multiplatform/compose/userflow/navigation/NavigationBarProcessor.kt
@@ -24,7 +24,7 @@ object NavigationBarProcessor : BaseFeatureProcessor() {
 
     override fun doRemove(state: TemplateState) {
         state.onApplyRules(
-            Rules.AppDIKt,
+            Rules.DIKt,
             RemoveMarkedLine("navigationBarModule")
         )
         state.onApplyRules(

diff --git a/.../kotlin/kotli/template/multiplatform/compose/MultiplatformComposeTemplateProcessorTest.kt b/.../kotlin/kotli/template/multiplatform/compose/MultiplatformComposeTemplateProcessorTest.kt
@@ -136,7 +136,7 @@ class MultiplatformComposeTemplateProcessorTest {
         }
     }
 
-    @RepeatedTest(1)
+    @RepeatedTest(3)
     fun `compose template with random features`() {
         runBlocking {
             val processors = processor.getFeatureProviders()

diff --git a/template/app/src/androidMain/kotlin/kotli/app/di/DI.android.kt b/template/app/src/androidMain/kotlin/kotli/app/di/DI.android.kt
@@ -1,6 +1,10 @@
 package kotli.app.di
 
+import kotli.app.di.data.roomSourceModule
 import org.koin.core.KoinApplication
 
 actual fun configure(app: KoinApplication) {
+    app.modules(
+        roomSourceModule
+    )
 }
diff --git a/template/app/src/androidMain/kotlin/kotli/app/di/data/RoomSourceModule.kt b/template/app/src/androidMain/kotlin/kotli/app/di/data/RoomSourceModule.kt
@@ -0,0 +1,8 @@
+package kotli.app.di.data
+
+import kotli.app.data.source.database.room.AppRoomSource
+import org.koin.dsl.module
+
+val roomSourceModule = module {
+    single { AppRoomSource() }
+}
diff --git a/template/app/src/iosMain/kotlin/kotli/app/di/DI.ios.kt b/template/app/src/iosMain/kotlin/kotli/app/di/DI.ios.kt
@@ -1,6 +1,10 @@
 package kotli.app.di
 
+import kotli.app.di.data.roomSourceModule
 import org.koin.core.KoinApplication
 
 actual fun configure(app: KoinApplication) {
+    app.modules(
+        roomSourceModule
+    )
 }
diff --git a/template/app/src/iosMain/kotlin/kotli/app/di/data/RoomSourceModule.kt b/template/app/src/iosMain/kotlin/kotli/app/di/data/RoomSourceModule.kt
@@ -0,0 +1,8 @@
+package kotli.app.di.data
+
+import kotli.app.data.source.database.room.AppRoomSource
+import org.koin.dsl.module
+
+val roomSourceModule = module {
+    single { AppRoomSource() }
+}
diff --git a/template/app/src/jvmMain/kotlin/kotli/app/di/DI.jvm.kt b/template/app/src/jvmMain/kotlin/kotli/app/di/DI.jvm.kt
@@ -1,6 +1,10 @@
 package kotli.app.di
 
+import kotli.app.di.data.roomSourceModule
 import org.koin.core.KoinApplication
 
 actual fun configure(app: KoinApplication) {
+    app.modules(
+        roomSourceModule
+    )
 }
diff --git a/template/app/src/jvmMain/kotlin/kotli/app/di/data/RoomSourceModule.kt b/template/app/src/jvmMain/kotlin/kotli/app/di/data/RoomSourceModule.kt
@@ -0,0 +1,8 @@
+package kotli.app.di.data
+
+import kotli.app.data.source.database.room.AppRoomSource
+import org.koin.dsl.module
+
+val roomSourceModule = module {
+    single { AppRoomSource() }
+}