refac

docs/Dataflow/Basic In-Memory Cache API/usage.md

@@ -3,8 +3,8 @@
 ## Overview
 
 The API can be accessed through:
-- `shared.data.datasource.cache.CacheSource` - facade interface at the core module level.
-- `app.datasource.cache.AppCacheSource` - decorator class at the app level.
+- `shared.data.source.cache.CacheSource` - facade interface at the core module level.
+- `app.data.source.cache.AppCacheSource` - decorator class at the app level.
 
 The difference is that the class serves as a **decorator** and can provide extra methods without impacting facade implementations.
 

docs/Dataflow/Cash App Paging Library/usage.md

@@ -3,10 +3,10 @@
 ## Overview
 
 - DI integration: `app.di.datasource.ProvidesPagingSource`
-- Data source: `app.datasource.paging.AppPagingSource`
+- Data source: `app.data.source.paging.AppPagingSource`
 - UI component: `shared.design.component.AppPagingList`
 
-The integration includes an `AppPagingSource` class located in `app.datasource.paging` to facilitate working with the Paging Library.
+The integration includes an `AppPagingSource` class located in `app.data.source.paging` to facilitate working with the Paging Library.
 
 ## Example
 

docs/Dataflow/Facade Analytics API/usage.md

@@ -3,8 +3,8 @@
 ## Overview
 
 The API can be accessed through:
-- `shared.data.datasource.analytics.AnalyticsSource` - facade interface at the core module level.
-- `app.datasource.analytics.AppAnalyticsSource` - decorator class at the app level.
+- `shared.data.source.analytics.AnalyticsSource` - facade interface at the core module level.
+- `app.data.source.analytics.AppAnalyticsSource` - decorator class at the app level.
 
 The difference is that the class serves as a **decorator** and can provide extra methods without impacting facade implementations. 
 

docs/Dataflow/Facade Config API/usage.md

@@ -3,8 +3,8 @@
 ## Overview
 
 The API can be accessed through:
-- `shared.data.datasource.config.ConfigSource` - facade interface at the core module level.
-- `app.datasource.config.AppConfigSource` - decorator class at the app level.
+- `shared.data.source.config.ConfigSource` - facade interface at the core module level.
+- `app.data.source.config.AppConfigSource` - decorator class at the app level.
 
 The difference is that the class serves as a **decorator** and can provide extra methods without impacting facade implementations. 
 

docs/Dataflow/Ktor Client/usage.md

@@ -2,7 +2,7 @@
 
 ## Overview
 
-The data source is available within the class `shared.data.datasource.http.HttpSource`. An instance of this class can be obtained through dependency injection (DI) as a singleton in `app.di.datasource.ProvidesHttpSource`.
+The data source is available within the class `shared.data.source.http.HttpSource`. An instance of this class can be obtained through dependency injection (DI) as a singleton in `app.di.datasource.ProvidesHttpSource`.
 
 The class provides the next functionality:
 

docs/Dataflow/Multiplatform Settings/usage.md

@@ -3,8 +3,8 @@
 ## Overview
 
 The API can be accessed through:
-- `shared.data.datasource.keyvalue.KeyValueSource` - facade interface at the core module level.
-- `app.datasource.keyvalue.AppKeyValueSource` - decorator class at the app level.
+- `shared.data.source.keyvalue.KeyValueSource` - facade interface at the core module level.
+- `app.data.source.keyvalue.AppKeyValueSource` - decorator class at the app level.
 
 The difference is that the class serves as a **decorator** and can provide extra methods without impacting facade implementations.
 

docs/Dataflow/SQLDelight/usage.md

@@ -2,7 +2,7 @@
 
 ## Overview
 
-- Component package: `app.datasource.database.sqldelight`
+- Component package: `app.data.source.database.sqldelight`
 - DI integration: `app.di.datasource.ProvidesSqlDelightSource`
 
 The integration includes the following components:

docs/Essentials/Material 3/usage.md

@@ -3,8 +3,8 @@
 ## Overview
 
 - Component package: `app.ui.theme`
-- State management: `shared.presentation.theme.ThemeState`
-- DI integration: `app.di.state.ProvidesThemeState`
+- State management: `shared.presentation.theme.ThemeStore`
+- DI integration: `app.di.state.ProvidesThemeStore`
 
 This state instance is utilized by `app.ui.theme.AppThemeProvider`, which is pre-defined at the app level to furnish themes for the entire application.
 
@@ -19,7 +19,7 @@ fun App() = ViewModelProvider(remember { AppViewModelFactory }) {
 
 ## Change Themes
 
-By default, `ThemeState` is initialized with pre-defined dark and light themes in the `design` module. To edit these themes:
+By default, `ThemeStore` is initialized with pre-defined dark and light themes in the `design` module. To edit these themes:
 
 1. Visit the [Material 3 Theme Builder](https://m3.material.io/theme-builder#/custom).
 2. Customize the desired color theme.

docs/Userflow/Save Theme API/usage.md

@@ -4,7 +4,7 @@
 
 Component package: `app.ui.theme`
 
-The current theme state is managed by an instance of `shared.presentation.theme.ThemeState`. This class provides a `configStore` property representing the currently selected theme configuration.
+The current theme state is managed by an instance of `shared.presentation.theme.ThemeStore`. This class provides a `configStore` property representing the currently selected theme configuration.
 
 The feature utilizes `AppThemeProvider` to control the value of this property:
 - Persist its state whenever it changes.
@@ -16,19 +16,19 @@ Thus, whenever you update the current active application theme, it is automatica
 
 ```kotlin
 class ToggleThemeViewModel(
-    private val themeState: ThemeState = get()
+    private val themeStore: ThemeStore = get()
 ) : BaseViewModel() {
 
     fun onSetLightTheme() {
-        themeState.setLight()
+        themeStore.setLight()
     }
 
     fun onSetDarkTheme() {
-        themeState.setDark()
+        themeStore.setDark()
     }
 
     fun onSetCustomTheme() {
-        themeState.configStore.set(
+        themeStore.configStore.set(
             ThemeConfig(
                 ...
             )

processor/src/main/kotlin/kotli/template/multiplatform/compose/Rules.kt

@@ -74,17 +74,17 @@ object Rules {
     const val ShowcasesLoaderDir = "${ShowcasesDir}/feature/loader"
     const val ShowcasesPasscodeDir = "${ShowcasesDir}/feature/passcode"
     const val ShowcasesKt = "${ShowcasesDir}/Showcases.kt"
-    const val ThemeStateKt = "${SharedPresentationDir}/src/commonMain/kotlin/shared/presentation/theme/ThemeState.kt"
+    const val ThemeStoreKt = "${SharedPresentationDir}/src/commonMain/kotlin/shared/presentation/theme/ThemeStore.kt"
     // dataflow
     const val AppConfigSource = "${CommonAppMainDir}/kotlin/kotli/app/datasource/config/AppConfigSource.kt"
-    const val AnalyticsSource = "*/*AnalyticsSource.kt"
+    const val AnalyticsSource = "*/*AnalyticsSource*.kt"
     const val CacheSource = "*/*CacheSource*.kt"
-    const val SqlDelightSource = "*/*SqlDelightSource.kt"
-    const val ConfigSource = "*/*ConfigSource.kt"
+    const val SqlDelightSource = "*/*SqlDelightSource*.kt"
+    const val ConfigSource = "*/*ConfigSource*.kt"
     const val PagingSource = "*/*Paging*.kt"
-    const val HttpSource = "*/*HttpSource.kt"
-    const val KeyValueSource = "*/*KeyValueSource.kt"
-    const val SettingsKeyValueSource = "*/*SettingsKeyValueSource.kt"
+    const val HttpSource = "*/*HttpSource*.kt"
+    const val KeyValueSource = "*/*KeyValueSource*.kt"
+    const val SettingsKeyValueSource = "*/*SettingsKeyValueSource*.kt"
     const val AppSqlDelightDir = "*/sqldelight/*"
 
 }

processor/src/main/kotlin/kotli/template/multiplatform/compose/userflow/theme/save/SaveThemeProcessor.kt

@@ -33,7 +33,7 @@ object SaveThemeProcessor : BaseFeatureProcessor() {
 
     override fun doRemove(state: TemplateState) {
         state.onApplyRules(
-            Rules.ThemeStateKt,
+            Rules.ThemeStoreKt,
             RemoveMarkedLine(
                 marker = "theme_config",
                 singleLine = true

processor/src/main/resources/kotli/template/multiplatform/compose/dataflow/analytics/facade/usage.md

@@ -1,8 +1,8 @@
 ## Overview
 
 The API can be accessed through:
-- `shared.data.datasource.analytics.AnalyticsSource` - facade interface at the core module level.
-- `app.datasource.analytics.AppAnalyticsSource` - decorator class at the app level.
+- `shared.data.source.analytics.AnalyticsSource` - facade interface at the core module level.
+- `app.data.source.analytics.AppAnalyticsSource` - decorator class at the app level.
 
 The difference is that the class serves as a **decorator** and can provide extra methods without impacting facade implementations. 
 

processor/src/main/resources/kotli/template/multiplatform/compose/dataflow/cache/basic/usage.md

@@ -1,8 +1,8 @@
 ## Overview
 
 The API can be accessed through:
-- `shared.data.datasource.cache.CacheSource` - facade interface at the core module level.
-- `app.datasource.cache.AppCacheSource` - decorator class at the app level.
+- `shared.data.source.cache.CacheSource` - facade interface at the core module level.
+- `app.data.source.cache.AppCacheSource` - decorator class at the app level.
 
 The difference is that the class serves as a **decorator** and can provide extra methods without impacting facade implementations.
 

processor/src/main/resources/kotli/template/multiplatform/compose/dataflow/config/facade/usage.md

@@ -1,8 +1,8 @@
 ## Overview
 
 The API can be accessed through:
-- `shared.data.datasource.config.ConfigSource` - facade interface at the core module level.
-- `app.datasource.config.AppConfigSource` - decorator class at the app level.
+- `shared.data.source.config.ConfigSource` - facade interface at the core module level.
+- `app.data.source.config.AppConfigSource` - decorator class at the app level.
 
 The difference is that the class serves as a **decorator** and can provide extra methods without impacting facade implementations. 
 

processor/src/main/resources/kotli/template/multiplatform/compose/dataflow/database/sqldelight/usage.md

@@ -1,6 +1,6 @@
 ## Overview
 
-- Component package: `app.datasource.database.sqldelight`
+- Component package: `app.data.source.database.sqldelight`
 - DI integration: `app.di.datasource.ProvidesSqlDelightSource`
 
 The integration includes the following components:

processor/src/main/resources/kotli/template/multiplatform/compose/dataflow/http/ktor/usage.md

@@ -1,6 +1,6 @@
 ## Overview
 
-The data source is available within the class `shared.data.datasource.http.HttpSource`. An instance of this class can be obtained through dependency injection (DI) as a singleton in `app.di.datasource.ProvidesHttpSource`.
+The data source is available within the class `shared.data.source.http.HttpSource`. An instance of this class can be obtained through dependency injection (DI) as a singleton in `app.di.datasource.ProvidesHttpSource`.
 
 The class provides the next functionality:
 

processor/src/main/resources/kotli/template/multiplatform/compose/dataflow/keyvalue/settings/usage.md

@@ -1,8 +1,8 @@
 ## Overview
 
 The API can be accessed through:
-- `shared.data.datasource.keyvalue.KeyValueSource` - facade interface at the core module level.
-- `app.datasource.keyvalue.AppKeyValueSource` - decorator class at the app level.
+- `shared.data.source.keyvalue.KeyValueSource` - facade interface at the core module level.
+- `app.data.source.keyvalue.AppKeyValueSource` - decorator class at the app level.
 
 The difference is that the class serves as a **decorator** and can provide extra methods without impacting facade implementations.
 

processor/src/main/resources/kotli/template/multiplatform/compose/dataflow/paging/cashapp/usage.md

@@ -1,10 +1,10 @@
 ## Overview
 
 - DI integration: `app.di.datasource.ProvidesPagingSource`
-- Data source: `app.datasource.paging.AppPagingSource`
+- Data source: `app.data.source.paging.AppPagingSource`
 - UI component: `shared.design.component.AppPagingList`
 
-The integration includes an `AppPagingSource` class located in `app.datasource.paging` to facilitate working with the Paging Library.
+The integration includes an `AppPagingSource` class located in `app.data.source.paging` to facilitate working with the Paging Library.
 
 ## Example
 

processor/src/main/resources/kotli/template/multiplatform/compose/essentials/design/material3/usage.md

@@ -1,8 +1,8 @@
 ## Overview
 
 - Component package: `app.ui.theme`
-- State management: `shared.presentation.theme.ThemeState`
-- DI integration: `app.di.state.ProvidesThemeState`
+- State management: `shared.presentation.theme.ThemeStore`
+- DI integration: `app.di.state.ProvidesThemeStore`
 
 This state instance is utilized by `app.ui.theme.AppThemeProvider`, which is pre-defined at the app level to furnish themes for the entire application.
 
@@ -17,7 +17,7 @@ fun App() = ViewModelProvider(remember { AppViewModelFactory }) {
 
 ## Change Themes
 
-By default, `ThemeState` is initialized with pre-defined dark and light themes in the `design` module. To edit these themes:
+By default, `ThemeStore` is initialized with pre-defined dark and light themes in the `design` module. To edit these themes:
 
 1. Visit the [Material 3 Theme Builder](https://m3.material.io/theme-builder#/custom).
 2. Customize the desired color theme.

processor/src/main/resources/kotli/template/multiplatform/compose/userflow/theme/save/usage.md

@@ -2,7 +2,7 @@
 
 Component package: `app.ui.theme`
 
-The current theme state is managed by an instance of `shared.presentation.theme.ThemeState`. This class provides a `configStore` property representing the currently selected theme configuration.
+The current theme state is managed by an instance of `shared.presentation.theme.ThemeStore`. This class provides a `configStore` property representing the currently selected theme configuration.
 
 The feature utilizes `AppThemeProvider` to control the value of this property:
 - Persist its state whenever it changes.
@@ -14,19 +14,19 @@ Thus, whenever you update the current active application theme, it is automatica
 
 ```kotlin
 class ToggleThemeViewModel(
-    private val themeState: ThemeState = get()
+    private val themeStore: ThemeStore = get()
 ) : BaseViewModel() {
 
     fun onSetLightTheme() {
-        themeState.setLight()
+        themeStore.setLight()
     }
 
     fun onSetDarkTheme() {
-        themeState.setDark()
+        themeStore.setDark()
     }
 
     fun onSetCustomTheme() {
-        themeState.configStore.set(
+        themeStore.configStore.set(
             ThemeConfig(
                 ...
             )

template/app/build.gradle.kts

@@ -110,7 +110,7 @@ kotlin {
 sqldelight {
     databases {
         create("AppDatabase") {
-            packageName.set("kotli.app.datasource.database.sqldelight")
+            packageName.set("kotli.app.data.source.database.sqldelight")
             generateAsync.set(true)
         }
     }

template/app/src/androidMain/kotlin/kotli/app/datasource/database/sqldelight/AppSqlDelightSource.android.kt → template/app/src/androidMain/kotlin/kotli/app/data/source/database/sqldelight/AppSqlDelightSource.android.kt

@@ -1,10 +1,11 @@
-package kotli.app.datasource.database.sqldelight
+package kotli.app.data.source.database.sqldelight
 
 import android.content.Context
 import app.cash.sqldelight.async.coroutines.synchronous
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.driver.android.AndroidSqliteDriver
 import kotli.app.Application
+import kotli.app.data.source.database.sqldelight.AppDatabase
 
 actual fun createSqlDriver(name: String): SqlDriver {
     val context: Context = Application.instance

template/app/src/commonMain/kotlin/kotli/app/AppScreen.kt

@@ -14,14 +14,14 @@ import shared.presentation.viewmodel.provideViewModel
 @Composable
 fun AppScreen() {
     val viewModel: AppViewModel = provideViewModel()
-    val navigationState = viewModel.navigationState
+    val navigationState = viewModel.navigationStore
     val navigationContext = rememberNavigationContext(navigationState)
     NavigationBarProvider { // {userflow.navigation}
         AppScaffold(
-            snackbarState = viewModel.snackbarState,
+            snackbarState = viewModel.snackbarStore,
             navigationContext = navigationContext,
             bottomBar = { BottomProvider() }
         )
     } // {userflow.navigation}
-    LoaderProvider(viewModel.appState)
+    LoaderProvider(viewModel.appStore)
 }

template/app/src/commonMain/kotlin/kotli/app/AppViewModel.kt

@@ -1,6 +1,6 @@
 package kotli.app
 
-import shared.design.component.AppSnackbarState
+import shared.design.component.AppSnackbarStore
 import shared.presentation.viewmodel.BaseViewModel
 import shared.presentation.navigation.NavigationStore
 
@@ -9,15 +9,15 @@ import shared.presentation.navigation.NavigationStore
  */
 class AppViewModel(
     private val navigationRouter: AppNavigationRouter,
-    val navigationState: NavigationStore,
-    val snackbarState: AppSnackbarState,
-    val appState: AppStore
+    val navigationStore: NavigationStore,
+    val snackbarStore: AppSnackbarStore,
+    val appStore: AppStore
 ) : BaseViewModel() {
 
     override fun doBind() {
         launchAsync("doBind") {
             val startDestination = navigationRouter.getStartDestination()
-            navigationState.setStartDestination(startDestination)
+            navigationStore.setStartDestination(startDestination)
         }
     }
 

template/app/src/commonMain/kotlin/kotli/app/datasource/analytics/AppAnalyticsSource.kt → template/app/src/commonMain/kotlin/kotli/app/data/source/analytics/AppAnalyticsSource.kt

@@ -1,4 +1,4 @@
-package kotli.app.datasource.analytics
+package kotli.app.data.source.analytics
 
 import shared.data.source.analytics.CompositeAnalyticsSource
 

template/app/src/commonMain/kotlin/kotli/app/datasource/cache/AppCacheSource.kt → template/app/src/commonMain/kotlin/kotli/app/data/source/cache/AppCacheSource.kt

@@ -1,4 +1,4 @@
-package kotli.app.datasource.cache
+package kotli.app.data.source.cache
 
 import shared.data.source.cache.InMemoryCacheSource
 

template/app/src/commonMain/kotlin/kotli/app/datasource/config/AppConfigSource.kt → template/app/src/commonMain/kotlin/kotli/app/data/source/config/AppConfigSource.kt

@@ -1,4 +1,4 @@
-package kotli.app.datasource.config
+package kotli.app.data.source.config
 
 import shared.data.source.config.DelegateConfigSource
 

template/app/src/commonMain/kotlin/kotli/app/datasource/database/sqldelight/AppSqlDelightSource.kt → template/app/src/commonMain/kotlin/kotli/app/data/source/database/sqldelight/AppSqlDelightSource.kt

@@ -1,6 +1,7 @@
-package kotli.app.datasource.database.sqldelight
+package kotli.app.data.source.database.sqldelight
 
 import app.cash.sqldelight.db.SqlDriver
+import kotli.app.data.source.database.sqldelight.AppDatabase
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.first

template/app/src/commonMain/kotlin/kotli/app/datasource/keyvalue/AppKeyValueSource.kt → template/app/src/commonMain/kotlin/kotli/app/data/source/keyvalue/AppKeyValueSource.kt

@@ -1,4 +1,4 @@
-package kotli.app.datasource.keyvalue
+package kotli.app.data.source.keyvalue
 
 import shared.data.source.keyvalue.SettingsKeyValueSource
 import shared.data.serialization.SerializationStrategy

template/app/src/commonMain/kotlin/kotli/app/datasource/paging/AppPagingSource.kt → template/app/src/commonMain/kotlin/kotli/app/data/source/paging/AppPagingSource.kt

@@ -1,4 +1,4 @@
-package kotli.app.datasource.paging
+package kotli.app.data.source.paging
 
 import app.cash.paging.Pager
 import app.cash.paging.PagingSource