fill changelog

This reverts commit fce47897d5.

.gitignore

@@ -1,4 +1,5 @@
 .idea
+.vscode
 .kotlin
 out/*
 *.iml
@@ -9,6 +10,7 @@ settings.xml
 .gradle/
 build/
 out/
+bin/
 
 secret.gradle
 local.properties

CHANGELOG.md

@@ -1,5 +1,107 @@
 # Changelog
 
+## 0.26.7
+
+* `Versions`:
+  * `Kotlin`: `2.2.20` -> `2.2.21`
+  * `Compose`: `1.8.2` -> `1.9.2`
+  * `KSP`: `2.2.20-2.0.3` -> `2.3.1`
+* `Coroutines`:
+  * Fix `SmartSemaphore.waitRelease` to wait for the exact number of permits
+  * Improve `SmartKeyRWLocker` tests
+* `KSP`:
+  * `Sealed`/`ClassCasts`/`Variations`:
+    * Add workaround for `NoSuchElementException` to improve processors stability on new `KSP`
+* `Koin`:
+  * `Generator`:
+    * Handle missing annotation values safely (`NoSuchElementException` workaround)
+* `Android`:
+  * `Pickers`:
+    * Add dependency `androidx.compose.material:material-icons-extended`
+
+## 0.26.6
+
+* `Versions`:
+    * `Ktor`: `3.3.0` -> `3.3.1`
+    * `Okio`: `3.16.0` -> `3.16.2`
+
+## 0.26.5
+
+* `Versions`:
+    * `Kotlin`: `2.2.10` -> `2.2.20`
+    * `KSLog`: `1.5.0` -> `1.5.1`
+    * `Ktor`: `3.2.3` -> `3.3.0`
+    * `KotlinX Browser`: `0.3` -> `0.5.0`
+    * `Koin`: `4.1.0` -> `4.1.1`
+
+## 0.26.4
+
+* `Common`:
+  * Add expect/actual `MPPFilePathSeparator`
+  * Fix `FileName` realization to take care about system file path separator
+
+## 0.26.3
+
+* `Versions`:
+  * `Kotlin`: `2.2.0` -> `2.2.10`
+  * `KSP`: `2.2.0-2.0.2` -> `2.2.10-2.0.2`
+  * `Android CoreKTX`: `1.16.0` -> `1.17.0`
+  * `Android Fragment`: `1.8.8` -> `1.8.9`
+
+## 0.26.2
+
+* `Versions`:
+  * `Ktor`: `3.2.2` -> `3.2.3`
+  * `Okio`: `3.15.0` -> `3.16.0`
+* `Coroutines`:
+  * Rename `SpecialMutableStateFlow` to `MutableRedeliverStateFlow`
+
+## 0.26.1
+
+* `Versions`:
+  * `Compose`: `1.8.1` -> `1.8.2`
+  * `Ktor`: `3.2.1` -> `3.2.2`
+* `Coroutines`:
+  * Add opportunity to pass logger in subscribe async
+
+## 0.26.0
+
+**WARNING!!! SINCE THIS VERSION IF YOU WANT TO USE SOME OF KSP MODULES, SET `ksp.useKSP2=false` IN YOUR `gradle.properties`** (see [gh issue 2491](https://github.com/google/ksp/issues/2491))
+
+* `Versions`:
+  * `Kotlin`: `2.1.21` -> `2.2.0`
+  * `Serialization`: `1.8.1` -> `1.9.0`
+  * `KSLog`: `1.4.2` -> `1.5.0`
+  * `Ktor`: `3.1.3` -> `3.2.1`
+  * `Koin`: `4.0.4` -> `4.1.0`
+  * `Okio`: `3.12.0` -> `3.15.0`
+  * `KSP`: `2.1.20-1.0.31` -> `2.2.0-2.0.2`
+  * `kotlin-poet`: `1.18.1` -> `2.2.0`
+
+## 0.25.8
+
+* `Pagination`:
+  * `Compose`:
+    * New function `rememberInfinityPagedComponentContext` to create `InfinityPagedComponentContext`
+    * New variants of `InfinityPagedComponent` component
+
+## 0.25.7
+
+* `Versions`:
+  * `Compose`: `1.8.0` -> `1.8.1`
+  * `Xerial SQLite`: `3.49.1.0` -> `3.50.1.0`
+  * `Okio`: `3.11.0` -> `3.12.0`
+  * `Android AppCompat`: `1.7.0` -> `1.7.1`
+  * `Android Fragment`: `1.8.6` -> `1.8.8`
+
+## 0.25.6
+
+* `Versions`:
+  * `Kotlin`: `2.1.20` -> `2.1.21`
+  * `KSLog`: `1.4.1` -> `1.4.2`
+  * `Compose`: `1.7.3` -> `1.8.0`
+  * `Okio`: `3.10.2` -> `3.11.0`
+
 ## 0.25.5
 
 * `Versions`:

android/pickers/build.gradle

@@ -13,6 +13,7 @@ kotlin {
         androidMain {
             dependencies {
                 api project(":micro_utils.android.smalltextfield")
+                api libs.jb.compose.icons
             }
         }
     }

build.gradle

@@ -19,15 +19,30 @@ buildscript {
 
 plugins {
     alias(libs.plugins.versions)
+    alias(libs.plugins.nmcp.aggregation)
+}
+
+
+if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+    nmcpAggregation {
+        centralPortal {
+            username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+            password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+            validationTimeout = Duration.ofHours(4)
+            publishingType = System.getenv('PUBLISHING_TYPE') != "" ? System.getenv('PUBLISHING_TYPE') : "USER_MANAGED"
+        }
+
+        publishAllProjectsProbablyBreakingProjectIsolation()
+    }
 }
 
 allprojects {
     repositories {
-        mavenLocal()
         mavenCentral()
         google()
         maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
         maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
+        mavenLocal()
     }
 }
 

common/compose/src/jvmTest/kotlin/LoadableComponentTests.kt

@@ -2,11 +2,9 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.test.ExperimentalTestApi
 import androidx.compose.ui.test.runComposeUiTest
 import dev.inmo.micro_utils.common.compose.LoadableComponent
-import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow
+import dev.inmo.micro_utils.coroutines.MutableRedeliverStateFlow
-import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.flow.firstOrNull
 import org.jetbrains.annotations.TestOnly
 import kotlin.test.Test
 import kotlin.test.assertTrue
@@ -16,8 +14,8 @@ class LoadableComponentTests {
     @Test
     @TestOnly
     fun testSimpleLoad() = runComposeUiTest {
-        val loadingFlow = SpecialMutableStateFlow<Int>(0)
+        val loadingFlow = MutableRedeliverStateFlow<Int>(0)
-        val loadedFlow = SpecialMutableStateFlow<Int>(0)
+        val loadedFlow = MutableRedeliverStateFlow<Int>(0)
         setContent {
             LoadableComponent<Int>({
                 loadingFlow.filter { it == 1 }.first()

common/src/commonMain/kotlin/dev/inmo/micro_utils/common/MPPFile.kt

@@ -7,7 +7,7 @@ import kotlin.jvm.JvmInline
 @JvmInline
 value class FileName(val string: String) {
     val name: String
-        get() = withoutSlashAtTheEnd.takeLastWhile { it != '/' }
+        get() = withoutSlashAtTheEnd.takeLastWhile { it != MPPFilePathSeparator }
     val extension: String
         get() = name.takeLastWhile { it != '.' }
     val nameWithoutExtension: String
@@ -18,7 +18,7 @@ value class FileName(val string: String) {
             } ?: filename
         }
     val withoutSlashAtTheEnd: String
-        get() = string.dropLastWhile { it == '/' }
+        get() = string.dropLastWhile { it == MPPFilePathSeparator }
     override fun toString(): String = string
 }
 
@@ -26,6 +26,7 @@ value class FileName(val string: String) {
 expect class MPPFile
 
 expect val MPPFile.filename: FileName
+expect val MPPFilePathSeparator: Char
 expect val MPPFile.filesize: Long
 expect val MPPFile.bytesAllocatorSync: ByteArrayAllocator
 expect val MPPFile.bytesAllocator: SuspendByteArrayAllocator

common/src/jsMain/kotlin/dev/inmo/micro_utils/common/JSMPPFile.kt

@@ -35,6 +35,10 @@ private suspend fun MPPFile.dirtyReadBytes(): ByteArray = readBytesPromise().awa
  */
 actual val MPPFile.filename: FileName
     get() = FileName(name)
+
+actual val MPPFilePathSeparator: Char
+    get() = '/'
+
 /**
  * @suppress
  */

common/src/jvmMain/kotlin/dev/inmo/micro_utils/common/JVMMPPFile.kt

@@ -14,6 +14,10 @@ actual typealias MPPFile = File
  */
 actual val MPPFile.filename: FileName
     get() = FileName(name)
+
+actual val MPPFilePathSeparator: Char
+    get() = File.separatorChar
+
 /**
  * @suppress
  */

common/src/nativeMain/kotlin/ActualMPPFile.kt

@@ -11,6 +11,10 @@ actual typealias MPPFile = Path
  */
 actual val MPPFile.filename: FileName
     get() = FileName(toString())
+
+
+actual val MPPFilePathSeparator: Char = Path.DIRECTORY_SEPARATOR.first()
+
 /**
  * @suppress
  */

common/src/wasmJsMain/kotlin/dev/inmo/micro_utils/common/JSMPPFile.kt

@@ -37,6 +37,10 @@ private suspend fun MPPFile.dirtyReadBytes(): ByteArray = readBytesPromise().awa
  */
 actual val MPPFile.filename: FileName
     get() = FileName(name)
+
+actual val MPPFilePathSeparator: Char
+    get() = '/'
+
 /**
  * @suppress
  */

coroutines/compose/src/jsMain/kotlin/dev/inmo/micro_utils/coroutines/compose/StyleSheetsAggregator.kt

@@ -3,7 +3,7 @@ package dev.inmo.micro_utils.coroutines.compose
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.remember
-import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow
+import dev.inmo.micro_utils.coroutines.MutableRedeliverStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.debounce
@@ -16,7 +16,7 @@ import org.jetbrains.compose.web.css.StyleSheet
  * to add `Style(stylesheet)` on every compose function call
  */
 object StyleSheetsAggregator {
-    private val _stylesFlow = SpecialMutableStateFlow<Set<CSSRulesHolder>>(emptySet())
+    private val _stylesFlow = MutableRedeliverStateFlow<Set<CSSRulesHolder>>(emptySet())
     val stylesFlow: StateFlow<Set<CSSRulesHolder>> = _stylesFlow.asStateFlow()
 
     @Composable

coroutines/compose/src/jvmTest/kotlin/FlowStateTests.kt

@@ -2,7 +2,7 @@ import androidx.compose.material.Button
 import androidx.compose.material.Text
 import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.test.*
-import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow
+import dev.inmo.micro_utils.coroutines.MutableRedeliverStateFlow
 import org.jetbrains.annotations.TestOnly
 import kotlin.test.Test
 
@@ -11,7 +11,7 @@ class FlowStateTests {
     @Test
     @TestOnly
     fun simpleTest() = runComposeUiTest {
-        val flowState = SpecialMutableStateFlow(0)
+        val flowState = MutableRedeliverStateFlow(0)
         setContent {
             Button({ flowState.value++ }) { Text("Click") }
             Text(flowState.collectAsState().value.toString())

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/ActorAsync.kt

@@ -1,5 +1,6 @@
 package dev.inmo.micro_utils.coroutines
 
+import dev.inmo.kslog.common.KSLog
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.consumeAsFlow
@@ -7,13 +8,15 @@ import kotlinx.coroutines.flow.consumeAsFlow
 fun <T> CoroutineScope.actorAsync(
     channelCapacity: Int = Channel.UNLIMITED,
     markerFactory: suspend (T) -> Any? = { null },
+    logger: KSLog = KSLog,
     block: suspend (T) -> Unit
 ): Channel<T> {
     val channel = Channel<T>(channelCapacity)
-    channel.consumeAsFlow().subscribeAsync(this, markerFactory, block)
+    channel.consumeAsFlow().subscribeAsync(this, markerFactory, logger, block)
     return channel
 }
 
+@Deprecated("Use standard actosAsync instead", ReplaceWith("actorAsync(channelCapacity, markerFactory, block = block)", "dev.inmo.micro_utils.coroutines.actorAsync"))
 inline fun <T> CoroutineScope.safeActorAsync(
     channelCapacity: Int = Channel.UNLIMITED,
     noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler,

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/FlowSubscriptionAsync.kt

@@ -1,5 +1,6 @@
 package dev.inmo.micro_utils.coroutines
 
+import dev.inmo.kslog.common.KSLog
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.*
 import kotlinx.coroutines.flow.*
@@ -8,6 +9,7 @@ import kotlinx.coroutines.sync.withLock
 
 private class SubscribeAsyncReceiver<T>(
     val scope: CoroutineScope,
+    val logger: KSLog,
     output: suspend SubscribeAsyncReceiver<T>.(T) -> Unit
 ) {
     private val dataChannel: Channel<T> = Channel(Channel.UNLIMITED)
@@ -15,7 +17,7 @@ private class SubscribeAsyncReceiver<T>(
         get() = dataChannel
 
     init {
-        scope.launchLoggingDropExceptions {
+        scope.launchLoggingDropExceptions(logger = logger) {
             for (data in dataChannel) {
                 output(data)
             }
@@ -33,13 +35,16 @@ private data class AsyncSubscriptionCommandData<T, M>(
     val scope: CoroutineScope,
     val markerFactory: suspend (T) -> M,
     val block: suspend (T) -> Unit,
+    val logger: KSLog,
     val onEmpty: suspend (M) -> Unit
 ) : AsyncSubscriptionCommand<T, M> {
     override suspend fun invoke(markersMap: MutableMap<M, SubscribeAsyncReceiver<T>>) {
         val marker = markerFactory(data)
         markersMap.getOrPut(marker) {
-            SubscribeAsyncReceiver(scope.LinkedSupervisorScope()) {
+            SubscribeAsyncReceiver(scope.LinkedSupervisorScope(), logger) {
-                safelyWithoutExceptions { block(it) }
+                runCatchingLogging(logger = logger) {
+                    block(it)
+                }
                 if (isEmpty()) {
                     onEmpty(marker)
                 }
@@ -63,6 +68,7 @@ private data class AsyncSubscriptionCommandClearReceiver<T, M>(
 fun <T, M> Flow<T>.subscribeAsync(
     scope: CoroutineScope,
     markerFactory: suspend (T) -> M,
+    logger:  KSLog = KSLog,
     block: suspend (T) -> Unit
 ): Job {
     val subscope = scope.LinkedSupervisorScope()
@@ -71,8 +77,14 @@ fun <T, M> Flow<T>.subscribeAsync(
         it.invoke(markersMap)
     }
 
-    val job = subscribeLoggingDropExceptions(subscope) { data ->
+    val job = subscribeLoggingDropExceptions(subscope, logger = logger) { data ->
-        val dataCommand = AsyncSubscriptionCommandData(data, subscope, markerFactory, block) { marker ->
+        val dataCommand = AsyncSubscriptionCommandData(
+            data = data,
+            scope = subscope,
+            markerFactory = markerFactory,
+            block = block,
+            logger = logger
+        ) { marker ->
             actor.send(
                 AsyncSubscriptionCommandClearReceiver(marker)
             )
@@ -85,17 +97,20 @@ fun <T, M> Flow<T>.subscribeAsync(
     return job
 }
 
+@Deprecated("Renamed", ReplaceWith("subscribeLoggingDropExceptionsAsync(scope, markerFactory, block = block)", "dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptionsAsync"))
 fun <T, M> Flow<T>.subscribeSafelyAsync(
     scope: CoroutineScope,
     markerFactory: suspend (T) -> M,
     onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler,
+    logger:  KSLog = KSLog,
     block: suspend (T) -> Unit
-) = subscribeAsync(scope, markerFactory) {
+) = subscribeAsync(scope, markerFactory, logger) {
     safely(onException) {
         block(it)
     }
 }
 
+@Deprecated("Renamed", ReplaceWith("subscribeLoggingDropExceptionsAsync(scope, markerFactory, block = block)", "dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptionsAsync"))
 fun <T, M> Flow<T>.subscribeSafelyWithoutExceptionsAsync(
     scope: CoroutineScope,
     markerFactory: suspend (T) -> M,
@@ -107,11 +122,22 @@ fun <T, M> Flow<T>.subscribeSafelyWithoutExceptionsAsync(
     }
 }
 
+fun <T, M> Flow<T>.subscribeLoggingDropExceptionsAsync(
+    scope: CoroutineScope,
+    markerFactory: suspend (T) -> M,
+    logger:  KSLog = KSLog,
+    block: suspend (T) -> Unit
+) = subscribeAsync(scope, markerFactory, logger) {
+    block(it)
+}
+
+@Deprecated("Renamed", ReplaceWith("subscribeLoggingDropExceptionsAsync(scope, markerFactory, logger, block = block)", "dev.inmo.micro_utils.coroutines.subscribeLoggingDropExceptionsAsync"))
 fun <T, M> Flow<T>.subscribeSafelySkippingExceptionsAsync(
     scope: CoroutineScope,
     markerFactory: suspend (T) -> M,
+    logger:  KSLog = KSLog,
     block: suspend (T) -> Unit
-) = subscribeAsync(scope, markerFactory) {
+) = subscribeAsync(scope, markerFactory, logger) {
     safelyWithoutExceptions({ /* do nothing */}) {
         block(it)
     }

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/MutableRedeliverStateFlow.kt

@@ -1,7 +1,5 @@
 package dev.inmo.micro_utils.coroutines
 
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.InternalCoroutinesApi
 import kotlinx.coroutines.channels.BufferOverflow
@@ -11,13 +9,12 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.internal.SynchronizedObject
 import kotlinx.coroutines.internal.synchronized
-import kotlin.coroutines.CoroutineContext
 
 /**
  * Works like [StateFlow], but guarantee that latest value update will always be delivered to
  * each active subscriber
  */
-open class SpecialMutableStateFlow<T>(
+open class MutableRedeliverStateFlow<T>(
     initialValue: T
 ) : MutableStateFlow<T>, FlowCollector<T>, MutableSharedFlow<T> {
     @OptIn(InternalCoroutinesApi::class)
@@ -68,3 +65,6 @@ open class SpecialMutableStateFlow<T>(
 
     override suspend fun collect(collector: FlowCollector<T>) = sharingFlow.collect(collector)
 }
+
+@Deprecated("Renamed to MutableRedeliverStateFlow", ReplaceWith("MutableRedeliverStateFlow<T>"))
+typealias SpecialMutableStateFlow<T> = MutableRedeliverStateFlow<T>

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/SmartMutex.kt

@@ -1,7 +1,6 @@
 package dev.inmo.micro_utils.coroutines
 
 import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
@@ -44,7 +43,7 @@ sealed interface SmartMutex {
      * @param locked Preset state of [isLocked] and its internal [_lockStateFlow]
      */
     class Mutable(locked: Boolean = false) : SmartMutex {
-        private val _lockStateFlow = SpecialMutableStateFlow<Boolean>(locked)
+        private val _lockStateFlow = MutableRedeliverStateFlow<Boolean>(locked)
         override val lockStateFlow: StateFlow<Boolean> = _lockStateFlow.asStateFlow()
 
         private val internalChangesMutex = Mutex()

coroutines/src/commonMain/kotlin/dev/inmo/micro_utils/coroutines/SmartSemaphore.kt

@@ -1,7 +1,6 @@
 package dev.inmo.micro_utils.coroutines
 
 import kotlinx.coroutines.currentCoroutineContext
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.first
@@ -47,7 +46,7 @@ sealed interface SmartSemaphore {
      */
     class Mutable(permits: Int, acquiredPermits: Int = 0) : SmartSemaphore {
         override val maxPermits: Int = permits
-        private val _freePermitsStateFlow = SpecialMutableStateFlow<Int>(permits - acquiredPermits)
+        private val _freePermitsStateFlow = MutableRedeliverStateFlow<Int>(permits - acquiredPermits)
         override val permitsStateFlow: StateFlow<Int> = _freePermitsStateFlow.asStateFlow()
 
         private val internalChangesMutex = Mutex(false)
@@ -73,7 +72,7 @@ sealed interface SmartSemaphore {
                         acquiredPermits != checkedPermits
                     }
                     if (shouldContinue) {
-                        waitRelease()
+                        waitRelease(checkedPermits - acquiredPermits)
                     }
                 } while (shouldContinue && currentCoroutineContext().isActive)
             } catch (e: Throwable) {

coroutines/src/commonTest/kotlin/SmartKeyRWLockerTests.kt

@@ -4,6 +4,7 @@ import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 import kotlinx.coroutines.test.runTest
+import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFails
@@ -13,184 +14,517 @@ import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
 class SmartKeyRWLockerTests {
-    @Test
+    private lateinit var locker: SmartKeyRWLocker<String>
-    fun writeLockKeyFailedOnGlobalWriteLockTest() = runTest {
-        val locker = SmartKeyRWLocker<String>()
-        val testKey = "test"
-        locker.lockWrite()
 
-        assertTrue { locker.isWriteLocked() }
+    @BeforeTest
-
+    fun setup() {
-        assertFails {
+        locker = SmartKeyRWLocker()
-            realWithTimeout(1.seconds) {
-                locker.lockWrite(testKey)
-            }
-        }
-        assertFalse { locker.isWriteLocked(testKey) }
-
-        locker.unlockWrite()
-        assertFalse { locker.isWriteLocked() }
-
-        realWithTimeout(1.seconds) {
-            locker.lockWrite(testKey)
-        }
-        assertTrue { locker.isWriteLocked(testKey) }
-        assertTrue { locker.unlockWrite(testKey) }
-        assertFalse { locker.isWriteLocked(testKey) }
     }
+
+    // ==================== Global Read Tests ====================
+
     @Test
-    fun writeLockKeyFailedOnGlobalReadLockTest() = runTest {
+    fun testGlobalReadAllowsMultipleConcurrentReads() = runTest {
-        val locker = SmartKeyRWLocker<String>()
+        val results = mutableListOf<Boolean>()
-        val testKey = "test"
+
         locker.acquireRead()
 
-        assertEquals(Int.MAX_VALUE - 1, locker.readSemaphore().freePermits)
+        val jobs = List(5) {
-
+            launch {
-        assertFails {
+                locker.acquireRead()
-            realWithTimeout(1.seconds) {
+                delay(100.milliseconds)
-                locker.lockWrite(testKey)
+                results.add(true)
+                locker.releaseRead()
             }
         }
-        assertFalse { locker.isWriteLocked(testKey) }
+
+        jobs.joinAll()
+        locker.releaseRead()
+
+        assertEquals(5, results.size)
+    }
+
+    @Test
+    fun testGlobalReadBlocksGlobalWrite() = runTest {
+        locker.acquireRead()
+
+        var writeAcquired = false
+        val writeJob = launch {
+            locker.lockWrite()
+            writeAcquired = true
+            locker.unlockWrite()
+        }
+
+        delay(200.milliseconds)
+        assertFalse(writeAcquired, "Write should be blocked by global read")
 
         locker.releaseRead()
-        assertEquals(Int.MAX_VALUE, locker.readSemaphore().freePermits)
+        writeJob.join()
 
-        realWithTimeout(1.seconds) {
+        assertTrue(writeAcquired, "Write should succeed after read released")
-            locker.lockWrite(testKey)
-        }
-        assertTrue { locker.isWriteLocked(testKey) }
-        assertTrue { locker.unlockWrite(testKey) }
-        assertFalse { locker.isWriteLocked(testKey) }
     }
+
     @Test
-    fun readLockFailedOnWriteLockKeyTest() = runTest {
+    fun testGlobalReadBlocksAllKeyWrites() = runTest {
-        val locker = SmartKeyRWLocker<String>()
+        locker.acquireRead()
-        val testKey = "test"
-        locker.lockWrite(testKey)
 
-        assertTrue { locker.isWriteLocked(testKey) }
+        val writeFlags = mutableMapOf<String, Boolean>()
+        val keys = listOf("key1", "key2", "key3")
 
-        assertFails {
+        val jobs = keys.map { key ->
-            realWithTimeout(1.seconds) {
+            launch {
+                locker.lockWrite(key)
+                writeFlags[key] = true
+                locker.unlockWrite(key)
+            }
+        }
+
+        delay(200.milliseconds)
+        assertTrue(writeFlags.isEmpty(), "No writes should succeed while global read active")
+
+        locker.releaseRead()
+        jobs.joinAll()
+
+        assertEquals(keys.size, writeFlags.size, "All writes should succeed after global read released")
+    }
+
+    // ==================== Global Write Tests ====================
+
+    @Test
+    fun testGlobalWriteBlocksAllOperations() = runTest {
+        locker.lockWrite()
+
+        var globalReadAcquired = false
+        var keyReadAcquired = false
+        var keyWriteAcquired = false
+
+        val jobs = listOf(
+            launch {
                 locker.acquireRead()
+                globalReadAcquired = true
+                locker.releaseRead()
+            },
+            launch {
+                locker.acquireRead("key1")
+                keyReadAcquired = true
+                locker.releaseRead("key1")
+            },
+            launch {
+                locker.lockWrite("key2")
+                keyWriteAcquired = true
+                locker.unlockWrite("key2")
             }
-        }
+        )
-        assertEquals(locker.readSemaphore().maxPermits - 1, locker.readSemaphore().freePermits)
 
-        locker.unlockWrite(testKey)
+        delay(200.milliseconds)
-        assertFalse { locker.isWriteLocked(testKey) }
+        assertFalse(globalReadAcquired, "Global read should be blocked")
+        assertFalse(keyReadAcquired, "Key read should be blocked")
+        assertFalse(keyWriteAcquired, "Key write should be blocked")
 
-        realWithTimeout(1.seconds) {
+        locker.unlockWrite()
-            locker.acquireRead()
+        jobs.joinAll()
-        }
+
-        assertEquals(locker.readSemaphore().maxPermits - 1, locker.readSemaphore().freePermits)
+        assertTrue(globalReadAcquired)
-        assertTrue { locker.releaseRead() }
+        assertTrue(keyReadAcquired)
-        assertEquals(locker.readSemaphore().maxPermits, locker.readSemaphore().freePermits)
+        assertTrue(keyWriteAcquired)
     }
+
     @Test
-    fun writeLockFailedOnWriteLockKeyTest() = runTest {
+    fun testGlobalWriteIsExclusive() = runTest {
-        val locker = SmartKeyRWLocker<String>()
+        locker.lockWrite()
-        val testKey = "test"
-        locker.lockWrite(testKey)
 
-        assertTrue { locker.isWriteLocked(testKey) }
+        var secondWriteAcquired = false
-
+        val job = launch {
-        assertFails {
-            realWithTimeout(1.seconds) {
-                locker.lockWrite()
-            }
-        }
-        assertFalse(locker.isWriteLocked())
-
-        locker.unlockWrite(testKey)
-        assertFalse { locker.isWriteLocked(testKey) }
-
-        realWithTimeout(1.seconds) {
             locker.lockWrite()
+            secondWriteAcquired = true
+            locker.unlockWrite()
         }
-        assertTrue(locker.isWriteLocked())
+
-        assertTrue { locker.unlockWrite() }
+        delay(200.milliseconds)
-        assertFalse(locker.isWriteLocked())
+        assertFalse(secondWriteAcquired, "Second global write should be blocked")
+
+        locker.unlockWrite()
+        job.join()
+
+        assertTrue(secondWriteAcquired)
     }
+
+    // ==================== Key Read Tests ====================
+
     @Test
-    fun readsBlockingGlobalWrite() = runTest {
+    fun testKeyReadAllowsMultipleConcurrentReadsForSameKey() = runTest {
-        val locker = SmartKeyRWLocker<String>()
+        val key = "testKey"
+        val results = mutableListOf<Boolean>()
 
-        val testKeys = (0 until 100).map { "test$it" }
+        locker.acquireRead(key)
 
-        for (i in testKeys.indices) {
+        val jobs = List(5) {
-            val it = testKeys[i]
+            launch {
-            locker.acquireRead(it)
+                locker.acquireRead(key)
-            val previous = testKeys.take(i)
+                delay(50.milliseconds)
-            val next = testKeys.drop(i + 1)
+                results.add(true)
-
+                locker.releaseRead(key)
-            previous.forEach {
-                assertTrue { locker.readSemaphoreOrNull(it) ?.freePermits == Int.MAX_VALUE - 1 }
-            }
-            next.forEach {
-                assertTrue { locker.readSemaphoreOrNull(it) ?.freePermits == null }
             }
         }
 
-        for (i in testKeys.indices) {
+        jobs.joinAll()
-            val it = testKeys[i]
+        locker.releaseRead(key)
-            assertFails {
+
-                realWithTimeout(13.milliseconds) { locker.lockWrite() }
+        assertEquals(5, results.size)
+    }
+
+    @Test
+    fun testKeyReadAllowsReadsForDifferentKeys() = runTest {
+        val results = mutableMapOf<String, Boolean>()
+
+        locker.acquireRead("key1")
+
+        val jobs = listOf("key2", "key3", "key4").map { key ->
+            launch {
+                locker.acquireRead(key)
+                delay(50.milliseconds)
+                results[key] = true
+                locker.releaseRead(key)
             }
-            val readPermitsBeforeLock = locker.readSemaphore().freePermits
+        }
-            realWithTimeout(1.seconds) { locker.acquireRead() }
+
+        jobs.joinAll()
+        locker.releaseRead("key1")
+
+        assertEquals(3, results.size)
+    }
+
+    @Test
+    fun testKeyReadBlocksWriteForSameKey() = runTest {
+        val key = "testKey"
+        locker.acquireRead(key)
+
+        var writeAcquired = false
+        val job = launch {
+            locker.lockWrite(key)
+            writeAcquired = true
+            locker.unlockWrite(key)
+        }
+
+        delay(200.milliseconds)
+        assertFalse(writeAcquired, "Write for same key should be blocked")
+
+        locker.releaseRead(key)
+        job.join()
+
+        assertTrue(writeAcquired)
+    }
+
+    @Test
+    fun testKeyReadBlocksGlobalWrite() = runTest {
+        locker.acquireRead("key1")
+
+        var globalWriteAcquired = false
+        val job = launch {
+            locker.lockWrite()
+            globalWriteAcquired = true
+            locker.unlockWrite()
+        }
+
+        delay(200.milliseconds)
+        assertFalse(globalWriteAcquired, "Global write should be blocked by key read")
+
+        locker.releaseRead("key1")
+        job.join()
+
+        assertTrue(globalWriteAcquired)
+    }
+
+    @Test
+    fun testKeyReadAllowsWriteForDifferentKey() = runTest {
+        locker.acquireRead("key1")
+
+        var writeAcquired = false
+        val job = launch {
+            locker.lockWrite("key2")
+            writeAcquired = true
+            locker.unlockWrite("key2")
+        }
+
+        job.join()
+        assertTrue(writeAcquired, "Write for different key should succeed")
+
+        locker.releaseRead("key1")
+    }
+
+    // ==================== Key Write Tests ====================
+
+    @Test
+    fun testKeyWriteBlocksReadForSameKey() = runTest {
+        val key = "testKey"
+        locker.lockWrite(key)
+
+        var readAcquired = false
+        val job = launch {
+            locker.acquireRead(key)
+            readAcquired = true
+            locker.releaseRead(key)
+        }
+
+        delay(200.milliseconds)
+        assertFalse(readAcquired, "Read for same key should be blocked")
+
+        locker.unlockWrite(key)
+        job.join()
+
+        assertTrue(readAcquired)
+    }
+
+    @Test
+    fun testKeyWriteBlocksGlobalRead() = runTest {
+        locker.lockWrite("key1")
+
+        var globalReadAcquired = false
+        val job = launch {
+            locker.acquireRead()
+            globalReadAcquired = true
             locker.releaseRead()
-            assertEquals(readPermitsBeforeLock, locker.readSemaphore().freePermits)
-
-            locker.releaseRead(it)
         }
 
-        assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE }
+        delay(200.milliseconds)
-        realWithTimeout(1.seconds) { locker.lockWrite() }
+        assertFalse(globalReadAcquired, "Global read should be blocked by key write")
-        assertFails {
+
-            realWithTimeout(13.milliseconds) { locker.acquireRead() }
+        locker.unlockWrite("key1")
-        }
+        job.join()
-        assertTrue { locker.unlockWrite() }
+
-        assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE }
+        assertTrue(globalReadAcquired)
     }
+
     @Test
-    fun writesBlockingGlobalWrite() = runTest {
+    fun testKeyWriteIsExclusiveForSameKey() = runTest {
-        val locker = SmartKeyRWLocker<String>()
+        val key = "testKey"
+        locker.lockWrite(key)
 
-        val testKeys = (0 until 100).map { "test$it" }
+        var secondWriteAcquired = false
+        val job = launch {
+            locker.lockWrite(key)
+            secondWriteAcquired = true
+            locker.unlockWrite(key)
+        }
 
-        for (i in testKeys.indices) {
+        delay(200.milliseconds)
-            val it = testKeys[i]
+        assertFalse(secondWriteAcquired, "Second write for same key should be blocked")
-            locker.lockWrite(it)
-            val previous = testKeys.take(i)
-            val next = testKeys.drop(i + 1)
 
-            previous.forEach {
+        locker.unlockWrite(key)
-                assertTrue { locker.writeMutexOrNull(it) ?.isLocked == true }
+        job.join()
+
+        assertTrue(secondWriteAcquired)
+    }
+
+    @Test
+    fun testKeyWriteAllowsOperationsOnDifferentKeys() = runTest {
+        locker.lockWrite("key1")
+
+        val results = mutableMapOf<String, Boolean>()
+
+        val jobs = listOf(
+            launch {
+                locker.acquireRead("key2")
+                results["read-key2"] = true
+                locker.releaseRead("key2")
+            },
+            launch {
+                locker.lockWrite("key3")
+                results["write-key3"] = true
+                locker.unlockWrite("key3")
             }
-            next.forEach {
+        )
-                assertTrue { locker.writeMutexOrNull(it) ?.isLocked != true }
+
+        jobs.joinAll()
+        assertEquals(2, results.size, "Operations on different keys should succeed")
+
+        locker.unlockWrite("key1")
+    }
+
+    // ==================== Complex Scenarios ====================
+
+    @Test
+    fun testMultipleReadersThenWriter() = runTest {
+        val key = "testKey"
+        val readCount = 5
+        val readers = mutableListOf<Job>()
+
+        repeat(readCount) {
+            readers.add(launch {
+                locker.acquireRead(key)
+                delay(100.milliseconds)
+                locker.releaseRead(key)
+            })
+        }
+
+        delay(50.milliseconds) // Let readers acquire
+
+        var writerExecuted = false
+        val writer = launch {
+            locker.lockWrite(key)
+            writerExecuted = true
+            locker.unlockWrite(key)
+        }
+
+        delay(50.milliseconds)
+        assertFalse(writerExecuted, "Writer should wait for all readers")
+
+        readers.joinAll()
+        writer.join()
+
+        assertTrue(writerExecuted, "Writer should execute after all readers done")
+    }
+
+    @Test
+    fun testWriterThenMultipleReaders() = runTest {
+        val key = "testKey"
+
+        locker.lockWrite(key)
+
+        val readerFlags = mutableListOf<Boolean>()
+        val readers = List(5) {
+            launch {
+                locker.acquireRead(key)
+                readerFlags.add(true)
+                locker.releaseRead(key)
             }
         }
 
-        for (i in testKeys.indices) {
+        delay(200.milliseconds)
-            val it = testKeys[i]
+        assertTrue(readerFlags.isEmpty(), "Readers should be blocked by writer")
-            assertFails { realWithTimeout(13.milliseconds) { locker.lockWrite() } }
 
-            val readPermitsBeforeLock = locker.readSemaphore().freePermits
+        locker.unlockWrite(key)
-            assertFails { realWithTimeout(13.milliseconds) { locker.acquireRead() } }
+        readers.joinAll()
-            assertEquals(readPermitsBeforeLock, locker.readSemaphore().freePermits)
 
-            locker.unlockWrite(it)
+        assertEquals(5, readerFlags.size, "All readers should succeed after writer")
+    }
+
+    @Test
+    fun testCascadingLocksWithDifferentKeys() = runTest {
+        val executed = mutableMapOf<String, Boolean>()
+
+        launch {
+            locker.lockWrite("key1")
+            executed["write-key1-start"] = true
+            delay(100.milliseconds)
+            locker.unlockWrite("key1")
+            executed["write-key1-end"] = true
         }
 
-        assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE }
+        delay(50.milliseconds)
-        realWithTimeout(1.seconds) { locker.lockWrite() }
+
-        assertFails {
+        launch {
-            realWithTimeout(13.milliseconds) { locker.acquireRead() }
+            locker.acquireRead("key2")
+            executed["read-key2"] = true
+            delay(100.milliseconds)
+            locker.releaseRead("key2")
         }
-        assertTrue { locker.unlockWrite() }
+
-        assertTrue { locker.readSemaphore().freePermits == Int.MAX_VALUE }
+        delay(200.milliseconds)
+
+        assertTrue(executed["write-key1-start"] == true)
+        assertTrue(executed["read-key2"] == true)
+        assertTrue(executed["write-key1-end"] == true)
+    }
+
+    @Test
+    fun testReleaseWithoutAcquireReturnsFalse() = runTest {
+        assertFalse(locker.releaseRead(), "Release without acquire should return false")
+        assertFalse(locker.releaseRead("key1"), "Release without acquire should return false")
+    }
+
+    @Test
+    fun testUnlockWithoutLockReturnsFalse() = runTest {
+        assertFalse(locker.unlockWrite(), "Unlock without lock should return false")
+        assertFalse(locker.unlockWrite("key1"), "Unlock without lock should return false")
+    }
+
+    @Test
+    fun testProperReleaseReturnsTrue() = runTest {
+        locker.acquireRead()
+        assertTrue(locker.releaseRead(), "Release after acquire should return true")
+
+        locker.acquireRead("key1")
+        assertTrue(locker.releaseRead("key1"), "Release after acquire should return true")
+    }
+
+    @Test
+    fun testProperUnlockReturnsTrue() = runTest {
+        locker.lockWrite()
+        assertTrue(locker.unlockWrite(), "Unlock after lock should return true")
+
+        locker.lockWrite("key1")
+        assertTrue(locker.unlockWrite("key1"), "Unlock after lock should return true")
+    }
+
+    // ==================== Stress Tests ====================
+
+    @Test
+    fun stressTestWithMixedOperations() = runTest(timeout = 10.seconds) {
+        val operations = 100
+        val keys = listOf("key1", "key2", "key3", "key4", "key5")
+        val jobs = mutableListOf<Job>()
+
+        repeat(operations) { i ->
+            val key = keys[i % keys.size]
+
+            when (i % 4) {
+                0 -> jobs.add(launch {
+                    locker.acquireRead(key)
+                    delay(10.milliseconds)
+                    locker.releaseRead(key)
+                })
+                1 -> jobs.add(launch {
+                    locker.lockWrite(key)
+                    delay(10.milliseconds)
+                    locker.unlockWrite(key)
+                })
+                2 -> jobs.add(launch {
+                    locker.acquireRead()
+                    delay(10.milliseconds)
+                    locker.releaseRead()
+                })
+                3 -> jobs.add(launch {
+                    locker.lockWrite()
+                    delay(10.milliseconds)
+                    locker.unlockWrite()
+                })
+            }
+        }
+
+        jobs.joinAll()
+        // If we reach here without deadlock or exceptions, test passes
+    }
+
+    @Test
+    fun testFairnessReadersDontStarveWriters() = runTest(timeout = 5.seconds) {
+        val key = "testKey"
+        var writerExecuted = false
+
+        // Start continuous readers
+        val readers = List(10) {
+            launch {
+                repeat(5) {
+                    locker.acquireRead(key)
+                    delay(50.milliseconds)
+                    locker.releaseRead(key)
+                    delay(10.milliseconds)
+                }
+            }
+        }
+
+        delay(100.milliseconds)
+
+        // Try to acquire write lock
+        val writer = launch {
+            locker.lockWrite(key)
+            writerExecuted = true
+            locker.unlockWrite(key)
+        }
+
+        readers.joinAll()
+        writer.join()
+
+        assertTrue(writerExecuted, "Writer should eventually execute")
     }
 }

coroutines/src/commonTest/kotlin/SpecialMutableStateFlowTests.kt

@@ -1,33 +1,31 @@
-import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow
+import dev.inmo.micro_utils.coroutines.MutableRedeliverStateFlow
-import dev.inmo.micro_utils.coroutines.asDeferred
 import dev.inmo.micro_utils.coroutines.subscribe
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
-import kotlin.test.assertTrue
 
 class SpecialMutableStateFlowTests {
     @Test
     fun simpleTest() = runTest {
-        val specialMutableStateFlow = SpecialMutableStateFlow(0)
+        val mutableRedeliverStateFlow = MutableRedeliverStateFlow(0)
-        specialMutableStateFlow.value = 1
+        mutableRedeliverStateFlow.value = 1
-        specialMutableStateFlow.first { it == 1 }
+        mutableRedeliverStateFlow.first { it == 1 }
-        assertEquals(1, specialMutableStateFlow.value)
+        assertEquals(1, mutableRedeliverStateFlow.value)
     }
     @Test
     fun specialTest() = runTest {
-        val specialMutableStateFlow = SpecialMutableStateFlow(0)
+        val mutableRedeliverStateFlow = MutableRedeliverStateFlow(0)
         lateinit var subscriberJob: Job
-        subscriberJob = specialMutableStateFlow.subscribe(this) {
+        subscriberJob = mutableRedeliverStateFlow.subscribe(this) {
             when (it) {
-                1 -> specialMutableStateFlow.value = 2
+                1 -> mutableRedeliverStateFlow.value = 2
                 2 -> subscriberJob.cancel()
             }
         }
-        specialMutableStateFlow.value = 1
+        mutableRedeliverStateFlow.value = 1
         subscriberJob.join()
-        assertEquals(2, specialMutableStateFlow.value)
+        assertEquals(2, mutableRedeliverStateFlow.value)
     }
 }

extensions.gradle

@@ -30,3 +30,13 @@ allprojects {
         }
     }
 }
+
+tasks.register("getPublishableModules") {
+    doLast {
+        rootProject.subprojects.each { project ->
+            if (project.plugins.hasPlugin('maven-publish')) {
+                println(":${project.name}")
+            }
+        }
+    }
+}

github_release.gradle

@@ -11,12 +11,20 @@ private String getCurrentVersionChangelog() {
     return changelogDataOS.toString().trim()
 }
 
-if (new File(projectDir, "secret.gradle").exists()) {
+
-    apply from: './secret.gradle'
+def githubTokenVariableName = "GITHUB_RELEASE_TOKEN"
+def githubTokenVariableFromEnv = System.getenv(githubTokenVariableName)
+
+def secretFile = new File(projectDir, "secret.gradle")
+if (secretFile.exists() || project.hasProperty(githubTokenVariableName) || (githubTokenVariableFromEnv != "" && githubTokenVariableFromEnv != null)) {
+    if (secretFile.exists()) {
+        apply from: './secret.gradle'
+    }
     apply plugin: "com.github.breadmoirai.github-release"
+    def githubReleaseToken = project.hasProperty(githubTokenVariableName) ? project.property(githubTokenVariableName).toString() : githubTokenVariableFromEnv
 
     githubRelease {
-        token "${project.property('GITHUB_RELEASE_TOKEN')}"
+        token githubReleaseToken
 
         owner = "InsanusMokrassar"
         repo = "MicroUtils"

gradle.properties

@@ -8,6 +8,9 @@ android.useAndroidX=true
 android.enableJetifier=true
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g
 
+## https://github.com/google/ksp/issues/2491
+#ksp.useKSP2=false
+
 # JS NPM
 
 crypto_js_version=4.1.1
@@ -15,5 +18,5 @@ crypto_js_version=4.1.1
 # Project data
 
 group=dev.inmo
-version=0.25.5
+version=0.26.7
-android_code_version=295
+android_code_version=306

gradle/libs.versions.toml

@@ -1,44 +1,48 @@
 [versions]
 
-kt = "2.1.20"
+kt = "2.2.21"
-kt-serialization = "1.8.1"
+kt-serialization = "1.9.0"
 kt-coroutines = "1.10.2"
 
-kotlinx-browser = "0.3"
+kotlinx-browser = "0.5.0"
 
-kslog = "1.4.1"
+kslog = "1.5.1"
 
-jb-compose = "1.7.3"
+jb-compose = "1.9.2"
+jb-compose-material3 = "1.9.0"
+jb-compose-icons = "1.7.8"
 jb-exposed = "0.61.0"
-jb-dokka = "2.0.0"
+jb-dokka = "2.1.0"
 
-sqlite = "3.49.1.0"
+# 3.51.0.0 contains bug, checking with ./gradlew :micro_utils.repos.exposed:jvmTest
+sqlite = "3.50.1.0"
 
 korlibs = "5.4.0"
 uuid = "0.8.4"
 
-ktor = "3.1.2"
+ktor = "3.3.1"
 
 gh-release = "2.5.2"
 
-koin = "4.0.4"
+koin = "4.1.1"
 
-okio = "3.10.2"
+okio = "3.16.2"
 
-ksp = "2.1.20-1.0.31"
+ksp = "2.3.1"
-kotlin-poet = "1.18.1"
+kotlin-poet = "2.2.0"
 
-versions = "0.51.0"
+versions = "0.52.0"
+nmcp = "1.2.0"
 
-android-gradle = "8.7.+"
+android-gradle = "8.10.+"
 dexcount = "4.0.0"
 
-android-coreKtx = "1.16.0"
+android-coreKtx = "1.17.0"
 android-recyclerView = "1.4.0"
-android-appCompat = "1.7.0"
+android-appCompat = "1.7.1"
-android-fragment = "1.8.6"
+android-fragment = "1.8.9"
-android-espresso = "3.6.1"
+android-espresso = "3.7.0"
-android-test = "1.2.1"
+android-test = "1.3.0"
 
 android-props-minSdk = "21"
 android-props-compileSdk = "36"
@@ -87,7 +91,8 @@ jb-exposed = { module = "org.jetbrains.exposed:exposed-core", version.ref = "jb-
 jb-exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "jb-exposed" }
 sqlite = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" }
 
-jb-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "jb-compose" }
+jb-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "jb-compose-material3" }
+jb-compose-icons = { module = "androidx.compose.material:material-icons-extended", version.ref = "jb-compose-icons" }
 
 android-coreKtx = { module = "androidx.core:core-ktx", version.ref = "android-coreKtx" }
 android-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "android-recyclerView" }
@@ -123,3 +128,4 @@ jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" }
 kt-jb-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kt" }
 
 versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
+nmcp-aggregation = { id = "com.gradleup.nmcp.aggregation", version.ref = "nmcp" }

gradle/templates/publish.gradle

@@ -1,7 +1,3 @@
-if (ext.getProperties()["do_publish"] == false) {
-    return
-}
-
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
@@ -23,72 +19,64 @@ publishing {
             }
 
             developers {
+                developer {
+                    id = "InsanusMokrassar"
+                    name = "Aleksei Ovsiannikov"
+                    email = "ovsyannikov.alexey95@gmail.com"
+                }
 
-                    developer {
+                developer {
-                        id = "InsanusMokrassar"
+                    id = "000Sanya"
-                        name = "Aleksei Ovsiannikov"
+                    name = "Syrov Aleksandr"
-                        email = "ovsyannikov.alexey95@gmail.com"
+                    email = "000sanya.000sanya@gmail.com"
-                    }
+                }
-
-
-                    developer {
-                        id = "000Sanya"
-                        name = "Syrov Aleksandr"
-                        email = "000sanya.000sanya@gmail.com"
-                    }
-
             }
 
             licenses {
-
+                license {
-                    license {
+                    name = "Apache Software License 2.0"
-                        name = "Apache Software License 2.0"
+                    url = "https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"
-                        url = "https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"
+                }
-                    }
-
             }
         }
-        repositories {
+    }
-            if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+    repositories {
-                maven {
+        if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
-                    name = "GithubPackages"
+            maven {
-                    url = uri("https://maven.pkg.github.com/InsanusMokrassar/MicroUtils")
+                name = "GithubPackages"
-
+                url = uri("https://maven.pkg.github.com/InsanusMokrassar/MicroUtils")
-                    credentials {
+        
-                        username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+                credentials {
-                        password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                    username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
-                    }
+                    password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
-
                 }
             }
-            if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
+        }
-                maven {
+        if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
-                    name = "InmoNexus"
+            maven {
-                    url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+                name = "InmoNexus"
-
+                url = uri("https://nexus.inmo.dev/repository/maven-releases/")
-                    credentials {
+        
-                        username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+                credentials {
-                        password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
+                    username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
-                    }
+                    password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
-
                 }
             }
-            if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+        }
-                maven {
+        if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                    name = "sonatype"
+            maven {
-                    url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+                name = "sonatype"
-
+                url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
-                    credentials {
+        
-                        username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+                credentials {
-                        password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                    }
+                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-
                 }
             }
         }
     }
 }
-
+    
 if (project.hasProperty("signing.gnupg.keyName")) {
     apply plugin: 'signing'
 

gradle/templates/publish.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}}}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"},"includeCentralSonatypeUploadingScript":false}}

gradle/templates/publish_jvm.gradle

@@ -1,5 +1,6 @@
 apply plugin: 'maven-publish'
 
+
 task javadocJar(type: Jar) {
     from javadoc
     archiveClassifier = 'javadoc'
@@ -55,42 +56,39 @@ publishing {
                     
                 }
             }
-            repositories {
+        }
-                if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
+    }
-                    maven {
+    repositories {
-                        name = "GithubPackages"
+        if ((project.hasProperty('GITHUBPACKAGES_USER') || System.getenv('GITHUBPACKAGES_USER') != null) && (project.hasProperty('GITHUBPACKAGES_PASSWORD') || System.getenv('GITHUBPACKAGES_PASSWORD') != null)) {
-                        url = uri("https://maven.pkg.github.com/InsanusMokrassar/MicroUtils")
+            maven {
-                
+                name = "GithubPackages"
-                        credentials {
+                url = uri("https://maven.pkg.github.com/InsanusMokrassar/MicroUtils")
-                            username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
+        
-                            password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
+                credentials {
-                        }
+                    username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
-                
+                    password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
-                    }
                 }
-                if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
+            }
-                    maven {
+        }
-                        name = "InmoNexus"
+        if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
-                        url = uri("https://nexus.inmo.dev/repository/maven-releases/")
+            maven {
-                
+                name = "InmoNexus"
-                        credentials {
+                url = uri("https://nexus.inmo.dev/repository/maven-releases/")
-                            username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
+        
-                            password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
+                credentials {
-                        }
+                    username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
-                
+                    password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
-                    }
                 }
-                if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
+            }
-                    maven {
+        }
-                        name = "sonatype"
+        if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
-                        url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+            maven {
-                
+                name = "sonatype"
-                        credentials {
+                url = uri("https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/")
-                            username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
+        
-                            password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
+                credentials {
-                        }
+                    username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
-                
+                    password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
-                    }
                 }
             }
         }
@@ -99,13 +97,13 @@ publishing {
 
 if (project.hasProperty("signing.gnupg.keyName")) {
     apply plugin: 'signing'
-    
+
     signing {
         useGpgCmd()
-    
+
         sign publishing.publications
     }
-    
+
     task signAll {
         tasks.withType(Sign).forEach {
             dependsOn(it)

gradle/templates/publish_jvm.kpsb

@@ -1 +1 @@
-{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://oss.sonatype.org/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"}},"type":"JVM"}
+{"licenses":[{"id":"Apache-2.0","title":"Apache Software License 2.0","url":"https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"}],"mavenConfig":{"name":"${project.name}","description":"It is set of projects with micro tools for avoiding of routines coding","url":"https://github.com/InsanusMokrassar/MicroUtils/","vcsUrl":"https://github.com/InsanusMokrassar/MicroUtils.git","developers":[{"id":"InsanusMokrassar","name":"Aleksei Ovsiannikov","eMail":"ovsyannikov.alexey95@gmail.com"},{"id":"000Sanya","name":"Syrov Aleksandr","eMail":"000sanya.000sanya@gmail.com"}],"repositories":[{"name":"GithubPackages","url":"https://maven.pkg.github.com/InsanusMokrassar/MicroUtils"},{"name":"InmoNexus","url":"https://nexus.inmo.dev/repository/maven-releases/"},{"name":"sonatype","url":"https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/"}],"gpgSigning":{"type":"dev.inmo.kmppscriptbuilder.core.models.GpgSigning.Optional"},"includeCentralSonatypeUploadingScript":false},"type":"JVM"}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

koin/generator/build.gradle

@@ -10,6 +10,7 @@ repositories {
 
 dependencies {
     api project(":micro_utils.koin")
+    api project(":micro_utils.ksp.generator")
     api libs.kotlin.poet
     api libs.ksp
 }

koin/generator/src/main/kotlin/Processor.kt

@@ -26,6 +26,8 @@ import com.squareup.kotlinpoet.asTypeName
 import com.squareup.kotlinpoet.ksp.toClassName
 import com.squareup.kotlinpoet.ksp.toTypeName
 import com.squareup.kotlinpoet.ksp.writeTo
+import dev.inmo.micro_ksp.generator.safeClassName
+import dev.inmo.micro_ksp.generator.withNoSuchElementWorkaround
 import dev.inmo.micro_utils.koin.annotations.GenerateGenericKoinDefinition
 import dev.inmo.micro_utils.koin.annotations.GenerateKoinDefinition
 import org.koin.core.Koin
@@ -237,19 +239,16 @@ class Processor(
                     """.trimIndent()
                 )
                 ksFile.getAnnotationsByType(GenerateKoinDefinition::class).forEach {
-                    val type = runCatching {
+                    val type = safeClassName { it.type }
-                        it.type.asTypeName()
-                    }.getOrElse { e ->
-                        if (e is KSTypeNotPresentException) {
-                            e.ksType.toClassName()
-                        } else {
-                            throw e
-                        }
-                    }
                     val targetType = runCatching {
-                        type.parameterizedBy(*(it.typeArgs.takeIf { it.isNotEmpty() } ?.map { it.asTypeName() } ?.toTypedArray() ?: return@runCatching type))
+                        type.parameterizedBy(
+                            *withNoSuchElementWorkaround(emptyArray()) {
+                                it.typeArgs.takeIf { it.isNotEmpty() } ?.map { it.asTypeName() } ?.toTypedArray() ?: return@runCatching type
+                            }
+                        )
                     }.getOrElse { e ->
                         when (e) {
+                            is IllegalArgumentException if (e.message ?.contains("no type argument") == true) -> return@getOrElse type
                             is KSTypeNotPresentException -> e.ksType.toClassName()
                         }
                         if (e is KSTypesNotPresentException) {
@@ -258,14 +257,32 @@ class Processor(
                             throw e
                         }
                     }.copy(
-                        nullable = it.nullable
+                        nullable = withNoSuchElementWorkaround(true) { it.nullable }
                     )
 
-                    addCodeForType(targetType, it.name, it.nullable, it.generateSingle, it.generateFactory)
+                    addCodeForType(
+                        targetType,
+                        it.name,
+                        withNoSuchElementWorkaround(true) {
+                            it.nullable
+                        },
+                        withNoSuchElementWorkaround(true) {
+                            it.generateSingle
+                        },
+                        withNoSuchElementWorkaround(true) {
+                            it.generateFactory
+                        }
+                    )
                 }
                 ksFile.getAnnotationsByType(GenerateGenericKoinDefinition::class).forEach {
                     val targetType = TypeVariableName("T", Any::class)
-                    addCodeForType(targetType, it.name, it.nullable, it.generateSingle, it.generateFactory)
+                    addCodeForType(
+                        targetType = targetType,
+                        name = it.name,
+                        nullable = withNoSuchElementWorkaround(true) { it.nullable },
+                        generateSingle = withNoSuchElementWorkaround(true) { it.generateSingle },
+                        generateFactory = withNoSuchElementWorkaround(true) { it.generateFactory }
+                    )
                 }
             }.build().let {
                 File(

koin/generator/test/src/commonMain/kotlin/GeneratedDefinitionsTest.kt

@@ -5,7 +5,6 @@ package dev.inmo.micro_utils.koin.generator.test
 
 import kotlin.Any
 import kotlin.Boolean
-import kotlin.Deprecated
 import kotlin.String
 import org.koin.core.Koin
 import org.koin.core.definition.Definition
@@ -30,95 +29,59 @@ public val Koin.sampleInfo: Test<String>
 /**
  * @return Definition by key "sampleInfo" with [parameters]
  */
-public inline fun Scope.sampleInfo(noinline parameters: ParametersDefinition): Test<String> =
+public inline fun Scope.sampleInfo(noinline parameters: ParametersDefinition): Test<String> = get(named("sampleInfo"), parameters)
-    get(named("sampleInfo"), parameters)
 
 /**
  * @return Definition by key "sampleInfo" with [parameters]
  */
-public inline fun Koin.sampleInfo(noinline parameters: ParametersDefinition): Test<String> =
+public inline fun Koin.sampleInfo(noinline parameters: ParametersDefinition): Test<String> = get(named("sampleInfo"), parameters)
-    get(named("sampleInfo"), parameters)
 
 /**
  * Will register [definition] with [org.koin.core.module.Module.single] and key "sampleInfo"
  */
-@Deprecated(
+public fun Module.singleSampleInfo(createdAtStart: Boolean = false, definition: Definition<Test<String>>): KoinDefinition<Test<String>> = single(named("sampleInfo"), createdAtStart = createdAtStart, definition = definition)
-  "This definition is old style and should not be used anymore. Use singleSampleInfo instead",
-  ReplaceWith("singleSampleInfo"),
-)
-public fun Module.sampleInfoSingle(createdAtStart: Boolean = false,
-    definition: Definition<Test<String>>): KoinDefinition<Test<String>> =
-    single(named("sampleInfo"), createdAtStart = createdAtStart, definition = definition)
-
-/**
- * Will register [definition] with [org.koin.core.module.Module.single] and key "sampleInfo"
- */
-public fun Module.singleSampleInfo(createdAtStart: Boolean = false,
-    definition: Definition<Test<String>>): KoinDefinition<Test<String>> =
-    single(named("sampleInfo"), createdAtStart = createdAtStart, definition = definition)
 
 /**
  * Will register [definition] with [org.koin.core.module.Module.factory] and key "sampleInfo"
  */
-@Deprecated(
+public fun Module.factorySampleInfo(definition: Definition<Test<String>>): KoinDefinition<Test<String>> = factory(named("sampleInfo"), definition = definition)
-  "This definition is old style and should not be used anymore. Use factorySampleInfo instead",
-  ReplaceWith("factorySampleInfo"),
-)
-public fun Module.sampleInfoFactory(definition: Definition<Test<String>>):
-    KoinDefinition<Test<String>> = factory(named("sampleInfo"), definition = definition)
-
-/**
- * Will register [definition] with [org.koin.core.module.Module.factory] and key "sampleInfo"
- */
-public fun Module.factorySampleInfo(definition: Definition<Test<String>>):
-    KoinDefinition<Test<String>> = factory(named("sampleInfo"), definition = definition)
 
 /**
  * @return Definition by key "test" with [parameters]
  */
-public inline fun <reified T : Any> Scope.test(noinline parameters: ParametersDefinition? = null): T
+public inline fun <reified T : Any> Scope.test(noinline parameters: ParametersDefinition? = null): T = get(named("test"), parameters)
-    = get(named("test"), parameters)
 
 /**
  * @return Definition by key "test" with [parameters]
  */
-public inline fun <reified T : Any> Koin.test(noinline parameters: ParametersDefinition? = null): T
+public inline fun <reified T : Any> Koin.test(noinline parameters: ParametersDefinition? = null): T = get(named("test"), parameters)
-    = get(named("test"), parameters)
 
 /**
  * Will register [definition] with [org.koin.core.module.Module.single] and key "test"
  */
-public inline fun <reified T : Any> Module.singleTest(createdAtStart: Boolean = false, noinline
+public inline fun <reified T : Any> Module.singleTest(createdAtStart: Boolean = false, noinline definition: Definition<T>): KoinDefinition<T> = single(named("test"), createdAtStart = createdAtStart, definition = definition)
-    definition: Definition<T>): KoinDefinition<T> = single(named("test"), createdAtStart =
-    createdAtStart, definition = definition)
 
 /**
  * Will register [definition] with [org.koin.core.module.Module.factory] and key "test"
  */
-public inline fun <reified T : Any> Module.factoryTest(noinline definition: Definition<T>):
+public inline fun <reified T : Any> Module.factoryTest(noinline definition: Definition<T>): KoinDefinition<T> = factory(named("test"), definition = definition)
-    KoinDefinition<T> = factory(named("test"), definition = definition)
 
 /**
  * @return Definition by key "testNullable" with [parameters]
  */
-public inline fun <reified T : Any> Scope.testNullable(noinline parameters: ParametersDefinition? =
+public inline fun <reified T : Any> Scope.testNullable(noinline parameters: ParametersDefinition? = null): T? = getOrNull(named("testNullable"), parameters)
-    null): T? = getOrNull(named("testNullable"), parameters)
 
 /**
  * @return Definition by key "testNullable" with [parameters]
  */
-public inline fun <reified T : Any> Koin.testNullable(noinline parameters: ParametersDefinition? =
+public inline fun <reified T : Any> Koin.testNullable(noinline parameters: ParametersDefinition? = null): T? = getOrNull(named("testNullable"), parameters)
-    null): T? = getOrNull(named("testNullable"), parameters)
 
 /**
  * Will register [definition] with [org.koin.core.module.Module.single] and key "testNullable"
  */
-public inline fun <reified T : Any> Module.singleTestNullable(createdAtStart: Boolean = false,
+public inline fun <reified T : Any> Module.singleTestNullable(createdAtStart: Boolean = false, noinline definition: Definition<T>): KoinDefinition<T> = single(named("testNullable"), createdAtStart = createdAtStart, definition = definition)
-    noinline definition: Definition<T>): KoinDefinition<T> = single(named("testNullable"),
-    createdAtStart = createdAtStart, definition = definition)
 
 /**
  * Will register [definition] with [org.koin.core.module.Module.factory] and key "testNullable"
  */
-public inline fun <reified T : Any> Module.factoryTestNullable(noinline definition: Definition<T>):
+public inline fun <reified T : Any> Module.factoryTestNullable(noinline definition: Definition<T>): KoinDefinition<T> = factory(named("testNullable"), definition = definition)
-    KoinDefinition<T> = factory(named("testNullable"), definition = definition)

ksp/classcasts/generator/src/main/kotlin/Processor.kt

@@ -10,6 +10,7 @@ import com.google.devtools.ksp.processing.SymbolProcessor
 import com.google.devtools.ksp.symbol.*
 import com.squareup.kotlinpoet.*
 import com.squareup.kotlinpoet.ksp.toClassName
+import dev.inmo.micro_ksp.generator.withNoSuchElementWorkaround
 import dev.inmo.micro_ksp.generator.writeFile
 import dev.inmo.micro_utils.ksp.classcasts.ClassCastsExcluded
 import dev.inmo.micro_utils.ksp.classcasts.ClassCastsIncluded
@@ -25,7 +26,11 @@ class Processor(
     ) {
         val rootAnnotation = ksClassDeclaration.getAnnotationsByType(ClassCastsIncluded::class).first()
         val (includeRegex: Regex?, excludeRegex: Regex?) = rootAnnotation.let {
-            it.typesRegex.takeIf { it.isNotEmpty() } ?.let(::Regex) to it.excludeRegex.takeIf { it.isNotEmpty() } ?.let(::Regex)
+            withNoSuchElementWorkaround("") {
+                it.typesRegex
+            }.takeIf { it.isNotEmpty() } ?.let(::Regex) to withNoSuchElementWorkaround("") {
+                it.excludeRegex
+            }.takeIf { it.isNotEmpty() } ?.let(::Regex)
         }
         val classesSubtypes = mutableMapOf<KSClassDeclaration, MutableSet<KSClassDeclaration>>()
 
@@ -49,7 +54,9 @@ class Processor(
                 when {
                     potentialSubtype === ksClassDeclaration -> {}
                     potentialSubtype.isAnnotationPresent(ClassCastsExcluded::class) -> return@forEach
-                    potentialSubtype !is KSClassDeclaration || !potentialSubtype.checkSupertypeLevel(rootAnnotation.levelsToInclude.takeIf { it >= 0 }) -> return@forEach
+                    potentialSubtype !is KSClassDeclaration || !potentialSubtype.checkSupertypeLevel(
+                        withNoSuchElementWorkaround(-1) { rootAnnotation.levelsToInclude }.takeIf { it >= 0 }
+                    ) -> return@forEach
                     excludeRegex ?.matches(simpleName) == true -> return@forEach
                     includeRegex ?.matches(simpleName) == false -> {}
                     else -> classesSubtypes.getOrPut(ksClassDeclaration) { mutableSetOf() }.add(potentialSubtype)
@@ -96,7 +103,9 @@ class Processor(
     @OptIn(KspExperimental::class)
     override fun process(resolver: Resolver): List<KSAnnotated> {
         (resolver.getSymbolsWithAnnotation(ClassCastsIncluded::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
-            val prefix = it.getAnnotationsByType(ClassCastsIncluded::class).first().outputFilePrefix
+            val prefix = withNoSuchElementWorkaround("") {
+                it.getAnnotationsByType(ClassCastsIncluded::class).first().outputFilePrefix
+            }
             it.writeFile(prefix = prefix, suffix = "ClassCasts") {
                 FileSpec.builder(
                     it.packageName.asString(),

ksp/generator/src/main/kotlin/KClassTypeName.kt

@@ -0,0 +1,23 @@
+package dev.inmo.micro_ksp.generator
+
+import com.google.devtools.ksp.KSTypeNotPresentException
+import com.google.devtools.ksp.KspExperimental
+import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.asTypeName
+import kotlin.reflect.KClass
+
+@Suppress("NOTHING_TO_INLINE")
+@OptIn(KspExperimental::class)
+inline fun safeClassName(classnameGetter: () -> KClass<*>) = runCatching {
+    classnameGetter().asTypeName()
+}.getOrElse { e ->
+    if (e is KSTypeNotPresentException) {
+        ClassName(
+            e.ksType.declaration.packageName.asString(),
+            e.ksType.declaration.qualifiedName ?.asString() ?.replaceFirst(e.ksType.declaration.packageName.asString(), "")
+                ?: e.ksType.declaration.simpleName.asString()
+        )
+    } else {
+        throw e
+    }
+}

ksp/generator/src/main/kotlin/NoSuchElementWorkaround.kt

@@ -0,0 +1,12 @@
+package dev.inmo.micro_ksp.generator
+
+inline fun <T> withNoSuchElementWorkaround(
+    default: T,
+    block: () -> T
+): T = runCatching(block).getOrElse {
+    if (it is NoSuchElementException) {
+        default
+    } else {
+        throw it
+    }
+}

ksp/sealed/generator/src/main/kotlin/Processor.kt

@@ -12,6 +12,7 @@ import com.squareup.kotlinpoet.ksp.toClassName
 import dev.inmo.micro_ksp.generator.buildSubFileName
 import dev.inmo.micro_ksp.generator.companion
 import dev.inmo.micro_ksp.generator.findSubClasses
+import dev.inmo.micro_ksp.generator.withNoSuchElementWorkaround
 import dev.inmo.micro_ksp.generator.writeFile
 import dev.inmo.micro_utils.ksp.sealed.GenerateSealedTypesWorkaround
 import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround
@@ -113,7 +114,7 @@ class Processor(
         val annotation = ksClassDeclaration.getGenerateSealedTypesWorkaroundAnnotation
         val subClasses = ksClassDeclaration.resolveSubclasses(
             searchIn = resolver.getAllFiles(),
-            allowNonSealed = annotation ?.includeNonSealedSubTypes ?: false
+            allowNonSealed = withNoSuchElementWorkaround(null) { annotation ?.includeNonSealedSubTypes } ?: false
         ).distinct()
         val subClassesNames = subClasses.filter {
             it.getAnnotationsByType(GenerateSealedTypesWorkaround.Exclude::class).count() == 0
@@ -164,7 +165,15 @@ class Processor(
     @OptIn(KspExperimental::class)
     override fun process(resolver: Resolver): List<KSAnnotated> {
         (resolver.getSymbolsWithAnnotation(GenerateSealedWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
-            val prefix = (it.getGenerateSealedWorkaroundAnnotation) ?.prefix ?.takeIf {
+            val prefix = runCatching {
+                (it.getGenerateSealedWorkaroundAnnotation) ?.prefix
+            }.getOrElse {
+                if (it is NoSuchElementException) {
+                    ""
+                } else {
+                    throw it
+                }
+            } ?.takeIf {
                 it.isNotEmpty()
             } ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "")
             it.writeFile(prefix = prefix, suffix = "SealedWorkaround") {
@@ -184,7 +193,9 @@ class Processor(
             }
         }
         (resolver.getSymbolsWithAnnotation(GenerateSealedTypesWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
-            val prefix = (it.getGenerateSealedTypesWorkaroundAnnotation) ?.prefix ?.takeIf {
+            val prefix = withNoSuchElementWorkaround("") {
+                (it.getGenerateSealedTypesWorkaroundAnnotation)?.prefix
+            } ?.takeIf {
                 it.isNotEmpty()
             } ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "")
             it.writeFile(prefix = prefix, suffix = "SealedTypesWorkaround") {

ksp/variations/generator/src/main/kotlin/Processor.kt

@@ -16,6 +16,7 @@ import com.squareup.kotlinpoet.ksp.toTypeName
 import dev.inmo.micro_ksp.generator.convertToClassName
 import dev.inmo.micro_ksp.generator.convertToClassNames
 import dev.inmo.micro_ksp.generator.findSubClasses
+import dev.inmo.micro_ksp.generator.withNoSuchElementWorkaround
 import dev.inmo.micro_ksp.generator.writeFile
 import dev.inmo.micro_utils.ksp.variations.GenerateVariations
 import dev.inmo.micro_utils.ksp.variations.GenerationVariant
@@ -218,7 +219,9 @@ class Processor(
     @OptIn(KspExperimental::class)
     override fun process(resolver: Resolver): List<KSAnnotated> {
         (resolver.getSymbolsWithAnnotation(GenerateVariations::class.qualifiedName!!)).filterIsInstance<KSFunctionDeclaration>().forEach {
-            val prefix = (it.getAnnotationsByType(GenerateVariations::class)).firstOrNull() ?.prefix ?.takeIf {
+            val prefix = withNoSuchElementWorkaround("") {
+                (it.getAnnotationsByType(GenerateVariations::class)).firstOrNull() ?.prefix
+            } ?.takeIf {
                 it.isNotEmpty()
             } ?: it.simpleName.asString().replaceFirst(it.simpleName.asString(), "")
             it.writeFile(prefix = prefix, suffix = "GeneratedVariation") {

pagination/compose/src/commonMain/kotlin/InfinityPagedComponent.kt

@@ -1,9 +1,8 @@
 package dev.inmo.micro_utils.pagination.compose
 
 import androidx.compose.runtime.*
-import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow
+import dev.inmo.micro_utils.coroutines.MutableRedeliverStateFlow
 import dev.inmo.micro_utils.coroutines.launchLoggingDropExceptions
-import dev.inmo.micro_utils.coroutines.runCatchingLogging
 import dev.inmo.micro_utils.pagination.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -27,8 +26,8 @@ class InfinityPagedComponentContext<T> internal constructor(
     private val loader: suspend InfinityPagedComponentContext<T>.(Pagination) -> PaginationResult<T>
 ) {
     internal val startPage = SimplePagination(page, size)
-    internal val latestLoadedPage = SpecialMutableStateFlow<PaginationResult<T>?>(null)
+    internal val latestLoadedPage = MutableRedeliverStateFlow<PaginationResult<T>?>(null)
-    internal val dataState = SpecialMutableStateFlow<List<T>?>(null)
+    internal val dataState = MutableRedeliverStateFlow<List<T>?>(null)
     internal var loadingJob: Job? = null
     internal val loadingMutex = Mutex()
 
@@ -65,6 +64,60 @@ class InfinityPagedComponentContext<T> internal constructor(
     }
 }
 
+/**
+ * Creates and remembers an [InfinityPagedComponentContext] for managing infinite pagination in a Compose UI.
+ * This function is used to create a persistent pagination context that survives recompositions.
+ *
+ * @param size Number of items to load per page.
+ * @param page Initial page number to start pagination from (defaults to 0).
+ * @param scope [CoroutineScope] to launch pagination operations in. If not provided, a new scope will be created
+ * using [rememberCoroutineScope].
+ * @param loader Suspended function that loads paginated data. Receives the current pagination context and
+ * pagination parameters, and returns a [PaginationResult] containing the loaded data.
+ * @return An [InfinityPagedComponentContext] instance that manages the pagination state and operations.
+ */
+@Composable
+fun <T> rememberInfinityPagedComponentContext(
+    size: Int,
+    page: Int = 0,
+    scope: CoroutineScope = rememberCoroutineScope(),
+    doReloadInInit: Boolean = true,
+    loader: suspend InfinityPagedComponentContext<T>.(Pagination) -> PaginationResult<T>
+): InfinityPagedComponentContext<T> {
+    val context = remember {
+        InfinityPagedComponentContext(
+            page = page,
+            size = size,
+            scope = scope,
+            loader = loader
+        )
+    }
+
+    LaunchedEffect(context) {
+        if (doReloadInInit) {
+            context.reload()
+        }
+    }
+
+    return context
+}
+
+/**
+ * Composable function for managing an infinitely paged component.
+ *
+ * @param T The type of the paginated data.
+ * @param block Composable function that renders the UI with the loaded data. When data is in loading state, block will
+ * receive null as `it` parameter
+ */
+@Composable
+fun <T> InfinityPagedComponent(
+    context: InfinityPagedComponentContext<T>,
+    block: @Composable InfinityPagedComponentContext<T>.(List<T>?) -> Unit
+) {
+    val dataState = context.dataState.collectAsState()
+    context.block(dataState.value)
+}
+
 /**
  * Composable function for managing an infinitely paged component.
  *
@@ -76,7 +129,7 @@ class InfinityPagedComponentContext<T> internal constructor(
  * receive null as `it` parameter
  */
 @Composable
-internal fun <T> InfinityPagedComponent(
+fun <T> InfinityPagedComponent(
     page: Int,
     size: Int,
     loader: suspend InfinityPagedComponentContext<T>.(Pagination) -> PaginationResult<T>,
@@ -84,13 +137,8 @@ internal fun <T> InfinityPagedComponent(
     block: @Composable InfinityPagedComponentContext<T>.(List<T>?) -> Unit
 ) {
     val scope = predefinedScope ?: rememberCoroutineScope()
-    val context = remember { InfinityPagedComponentContext<T>(page, size, scope, loader) }
+    val context = rememberInfinityPagedComponentContext(page = page, size = size, scope = scope, loader = loader)
-    remember {
+    InfinityPagedComponent(context, block)
-        context.reload()
-    }
-
-    val dataState = context.dataState.collectAsState()
-    context.block(dataState.value)
 }
 
 /**

pagination/compose/src/commonMain/kotlin/PagedComponent.kt

@@ -1,7 +1,7 @@
 package dev.inmo.micro_utils.pagination.compose
 
 import androidx.compose.runtime.*
-import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow
+import dev.inmo.micro_utils.coroutines.MutableRedeliverStateFlow
 import dev.inmo.micro_utils.coroutines.launchLoggingDropExceptions
 import dev.inmo.micro_utils.pagination.*
 import kotlinx.coroutines.CoroutineScope
@@ -28,8 +28,8 @@ class PagedComponentContext<T> internal constructor(
     private val loader: suspend PagedComponentContext<T>.(Pagination) -> PaginationResult<T>
 ) {
     internal val startPage = SimplePagination(initialPage, size)
-    internal val latestLoadedPage = SpecialMutableStateFlow<PaginationResult<T>?>(null)
+    internal val latestLoadedPage = MutableRedeliverStateFlow<PaginationResult<T>?>(null)
-    internal val dataState = SpecialMutableStateFlow<PaginationResult<T>?>(null)
+    internal val dataState = MutableRedeliverStateFlow<PaginationResult<T>?>(null)
     internal var loadingJob: Job? = null
     internal val loadingMutex = Mutex()
 

repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/ExposedTableInitialization.kt

@@ -1,10 +1,81 @@
 package dev.inmo.micro_utils.repos.exposed
 
 import org.jetbrains.exposed.sql.*
+import org.jetbrains.exposed.sql.SchemaUtils.addMissingColumnsStatements
+import org.jetbrains.exposed.sql.SchemaUtils.checkMappingConsistence
+import org.jetbrains.exposed.sql.SchemaUtils.createStatements
+import org.jetbrains.exposed.sql.transactions.TransactionManager
 import org.jetbrains.exposed.sql.transactions.transaction
 
+/**
+ * Code in this function mostly duplicates Exposed [SchemaUtils.createMissingTablesAndColumns]. It made due to deprecation
+ * status of the last one and potential lost of it in future updates.
+ *
+ * Code doing:
+ *
+ * * Creating missed tables
+ * * Altering missed tables (where possible)
+ * * Calculate problems with [checkMappingConsistence] and add them in execution too
+ *
+ * All changes made in [transaction] with [database] as its `db` argument
+ */
+fun initTablesInTransaction(vararg tables: Table, database: Database, inBatch: Boolean = false, withLogs: Boolean = true) {
+    transaction(database) {
+        fun <R> logTimeSpent(message: String, withLogs: Boolean, block: () -> R): R {
+            return if (withLogs) {
+                val start = System.currentTimeMillis()
+                val answer = block()
+                exposedLogger.info(message + " took " + (System.currentTimeMillis() - start) + "ms")
+                answer
+            } else {
+                block()
+            }
+        }
+        fun Transaction.execStatements(inBatch: Boolean, statements: List<String>) {
+            if (inBatch) {
+                execInBatch(statements)
+            } else {
+                for (statement in statements) {
+                    exec(statement)
+                }
+            }
+        }
+        with(TransactionManager.current()) {
+            db.dialect.resetCaches()
+            val createStatements = logTimeSpent("Preparing create tables statements", withLogs) {
+                createStatements(*tables)
+            }
+            logTimeSpent("Executing create tables statements", withLogs) {
+                execStatements(inBatch, createStatements)
+                commit()
+            }
+
+            val alterStatements = logTimeSpent("Preparing alter table statements", withLogs) {
+                addMissingColumnsStatements(tables = tables, withLogs)
+            }
+            logTimeSpent("Executing alter table statements", withLogs) {
+                execStatements(inBatch, alterStatements)
+                commit()
+            }
+            val executedStatements = createStatements + alterStatements
+            logTimeSpent("Checking mapping consistence", withLogs) {
+                val modifyTablesStatements = checkMappingConsistence(
+                    tables = tables,
+                    withLogs
+                ).filter { it !in executedStatements }
+                execStatements(inBatch, modifyTablesStatements)
+                commit()
+            }
+            db.dialect.resetCaches()
+        }
+    }
+}
+
+fun Table.initTable(database: Database, inBatch: Boolean, withLogs: Boolean) {
+    initTablesInTransaction(this, database = database, inBatch = inBatch, withLogs = withLogs)
+}
 fun Table.initTable(database: Database) {
-    transaction(database) { SchemaUtils.createMissingTablesAndColumns(this@initTable) }
+    initTable(database = database, inBatch = false, withLogs = true)
 }
 
 fun <T> T.initTable() where T: ExposedRepo, T: Table = initTable(database)