Prepare release PART 1

elmslie-android/src/main/kotlin/money/vivid/elmslie/android/renderer/ElmRenderer.kt

@@ -20,7 +20,7 @@ internal class ElmRenderer<Effect : Any, State : Any>(
 ) {
 
     private val logger = ElmslieConfig.logger
-    private val ioDispatcher: CoroutineDispatcher = ElmslieConfig.ioDispatchers
+    private val elmDispatcher: CoroutineDispatcher = ElmslieConfig.elmDispatcher
     private val canRender
         get() = lifecycle.currentState.isAtLeast(STARTED)
 
@@ -52,7 +52,7 @@ internal class ElmRenderer<Effect : Any, State : Any>(
                             error = it,
                         )
                     }
-                    .flowOn(ioDispatcher)
+                    .flowOn(elmDispatcher)
                     .collect { (state, listItems) ->
                         catchStateErrors {
                             if (canRender) {

elmslie-core/api/elmslie-core.api

@@ -4,12 +4,12 @@ public final class money/vivid/elmslie/core/ElmScopeKt {
 
 public final class money/vivid/elmslie/core/config/ElmslieConfig {
 	public static final field INSTANCE Lmoney/vivid/elmslie/core/config/ElmslieConfig;
+	public final fun elmDispatcher (Lkotlin/jvm/functions/Function0;)V
+	public final fun getElmDispatcher ()Lkotlinx/coroutines/CoroutineDispatcher;
 	public final fun getGlobalStoreListeners ()Ljava/util/Set;
-	public final fun getIoDispatchers ()Lkotlinx/coroutines/CoroutineDispatcher;
 	public final fun getLogger ()Lmoney/vivid/elmslie/core/logger/ElmslieLogger;
 	public final fun getShouldStopOnProcessDeath ()Z
 	public final fun globalStoreListeners (Lkotlin/jvm/functions/Function0;)V
-	public final fun ioDispatchers (Lkotlin/jvm/functions/Function0;)V
 	public final fun logger (Lkotlin/jvm/functions/Function1;)V
 	public final fun shouldStopOnProcessDeath (Lkotlin/jvm/functions/Function0;)V
 }
@@ -176,8 +176,8 @@ public class money/vivid/elmslie/core/store/dsl/ResultBuilder {
 
 public final class money/vivid/elmslie/core/switcher/Switcher {
 	public fun <init> ()V
-	public final fun cancel (J)Lkotlinx/coroutines/flow/Flow;
-	public static synthetic fun cancel$default (Lmoney/vivid/elmslie/core/switcher/Switcher;JILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
+	public final fun cancel (JLkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public static synthetic fun cancel$default (Lmoney/vivid/elmslie/core/switcher/Switcher;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
 	public final fun switch (JLkotlin/jvm/functions/Function0;)Lkotlinx/coroutines/flow/Flow;
 	public static synthetic fun switch$default (Lmoney/vivid/elmslie/core/switcher/Switcher;JLkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lkotlinx/coroutines/flow/Flow;
 }

elmslie-core/src/commonMain/kotlin/money/vivid/elmslie/core/ElmScope.kt

@@ -10,7 +10,7 @@ import money.vivid.elmslie.core.config.ElmslieConfig
 fun ElmScope(name: String): CoroutineScope =
     CoroutineScope(
         context =
-            ElmslieConfig.ioDispatchers +
+            ElmslieConfig.elmDispatcher +
                 SupervisorJob() +
                 CoroutineName(name) +
                 CoroutineExceptionHandler { _, throwable ->

elmslie-core/src/commonMain/kotlin/money/vivid/elmslie/core/config/ElmslieConfig.kt

@@ -6,7 +6,7 @@ import money.vivid.elmslie.core.logger.ElmslieLogConfiguration
 import money.vivid.elmslie.core.logger.ElmslieLogger
 import money.vivid.elmslie.core.logger.strategy.IgnoreLog
 import money.vivid.elmslie.core.store.StoreListener
-import money.vivid.elmslie.core.utils.IoDispatcher
+import money.vivid.elmslie.core.utils.ElmDispatcher
 import kotlin.concurrent.Volatile
 
 object ElmslieConfig {
@@ -16,7 +16,7 @@ object ElmslieConfig {
         private set
 
     @Volatile
-    var ioDispatchers: CoroutineDispatcher = IoDispatcher
+    var elmDispatcher: CoroutineDispatcher = ElmDispatcher
         private set
 
     @Volatile
@@ -45,10 +45,10 @@ object ElmslieConfig {
 
     /**
      * Configures CoroutineDispatcher for performing operations in background. Default is
-     * [Dispatchers.IO]
+     * [Dispatchers.Default]
      */
-    fun ioDispatchers(builder: () -> CoroutineDispatcher) {
-        ioDispatchers = builder()
+    fun elmDispatcher(builder: () -> CoroutineDispatcher) {
+        elmDispatcher = builder()
     }
 
     fun shouldStopOnProcessDeath(builder: () -> Boolean) {

elmslie-core/src/commonMain/kotlin/money/vivid/elmslie/core/store/Actor.kt

@@ -2,11 +2,11 @@ package money.vivid.elmslie.core.store
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
-import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
+import money.vivid.elmslie.core.config.ElmslieConfig
 import money.vivid.elmslie.core.switcher.Switcher
 import kotlin.reflect.KClass
 
@@ -16,16 +16,16 @@ abstract class Actor<Command : Any, Event : Any> {
     private val mutex = Mutex()
 
     /**
-     * Executes a command. This method is performed on the [Dispatchers.IO]
-     * [kotlinx.coroutines.Dispatchers.IO] which is set by ElmslieConfig.ioDispatchers()
+     * Executes a command. This method is performed on the [Dispatchers.Default]
+     * [kotlinx.coroutines.Dispatchers.Default] which is set by ElmslieConfig.elmDispatcher()
      */
     abstract fun execute(command: Command): Flow<Event>
 
     fun <T : Any> Flow<T>.mapEvents(
         eventMapper: (T) -> Event? = { null },
         errorMapper: (error: Throwable) -> Event? = { null },
     ) = mapNotNull { eventMapper(it) }
-        .catch { errorMapper(it)?.let { event -> emit(event) } ?: throw it }
+        .catch { it.logErrorEvent(errorMapper)?.let { event -> emit(event) } ?: throw it }
 
     protected fun <T : Any, Command : Any> Flow<T>.asSwitchFlow(command: Command, delayMillis: Long = 0): Flow<T> {
         return flow {
@@ -41,6 +41,12 @@ abstract class Actor<Command : Any, Event : Any> {
     }
 
     protected fun <T : Any> cancelSwitchFlow(command: KClass<out Any>): Flow<T> {
-        return switchers[command]?.cancel() ?: emptyFlow()
+        return flow { switchers[command]?.cancel() }
+    }
+
+    private fun Throwable.logErrorEvent(errorMapper: (Throwable) -> Event?): Event? {
+        return errorMapper(this).also {
+            ElmslieConfig.logger.nonfatal(error = this)
+        }
     }
 }

elmslie-core/src/commonMain/kotlin/money/vivid/elmslie/core/store/ElmStore.kt

@@ -31,7 +31,7 @@ class ElmStore<Event : Any, State : Any, Effect : Any, Command : Any>(
 ) : Store<Event, Effect, State> {
 
     private val logger = ElmslieConfig.logger
-    private val eventDispatcher = ElmslieConfig.ioDispatchers.limitedParallelism(parallelism = 1)
+    private val eventDispatcher = ElmslieConfig.elmDispatcher.limitedParallelism(parallelism = 1)
 
     private val effectsFlow = MutableSharedFlow<Effect>()
 

elmslie-core/src/commonMain/kotlin/money/vivid/elmslie/core/store/Store.kt

@@ -19,7 +19,7 @@ interface Store<Event : Any, Effect: Any, State: Any> {
      * Note that there will be no emission if a state isn't changed (it's [equals] method returned
      * `true`.
      *
-     * By default, [State] is collected in [Dispatchers.IO].
+     * By default, [State] is collected in [Dispatchers.Default].
      */
     val states: StateFlow<State>
 
@@ -29,7 +29,7 @@ interface Store<Event : Any, Effect: Any, State: Any> {
      * In order to implement cache of [Effect], consider extending [Store] with appropriate
      * behavior.
      *
-     * By default, [Effect] is collected in [Dispatchers.IO].
+     * By default, [Effect] is collected in [Dispatchers.Default].
      */
     val effects: Flow<Effect>
 

elmslie-core/src/commonMain/kotlin/money/vivid/elmslie/core/switcher/Switcher.kt

@@ -60,9 +60,9 @@ class Switcher {
         }
     }
 
-    fun <Event : Any> cancel(
+    suspend fun cancel(
         delayMillis: Long = 0,
-    ): Flow<Event> = flow {
+    ) {
         delay(delayMillis)
         lock.withLock {
             currentChannel?.close()

elmslie-core/src/commonMain/kotlin/money/vivid/elmslie/core/utils/DispatcherProvider.kt

@@ -2,4 +2,4 @@ package money.vivid.elmslie.core.utils
 
 import kotlinx.coroutines.CoroutineDispatcher
 
-internal expect val IoDispatcher: CoroutineDispatcher
+internal expect val ElmDispatcher: CoroutineDispatcher

elmslie-core/src/commonTest/kotlin/money/vivid/elmslie/core/store/EffectCachingElmStoreTest.kt

@@ -26,7 +26,7 @@ class EffectCachingElmStoreTest {
     @BeforeTest
     fun beforeEach() {
         val testDispatcher = StandardTestDispatcher()
-        ElmslieConfig.ioDispatchers { testDispatcher }
+        ElmslieConfig.elmDispatcher { testDispatcher }
         Dispatchers.setMain(testDispatcher)
     }
 

elmslie-core/src/commonTest/kotlin/money/vivid/elmslie/core/store/ElmStoreTest.kt

@@ -32,7 +32,7 @@ class ElmStoreTest {
     @BeforeTest
     fun beforeEach() {
         val testDispatcher = StandardTestDispatcher()
-        ElmslieConfig.ioDispatchers { testDispatcher }
+        ElmslieConfig.elmDispatcher { testDispatcher }
         Dispatchers.setMain(testDispatcher)
     }
 

elmslie-core/src/commonWebMain/kotlin/money/vivid/elmslie/core/utils/DispatcherProvider.kt

@@ -3,4 +3,4 @@ package money.vivid.elmslie.core.utils
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 
-internal actual val IoDispatcher: CoroutineDispatcher = Dispatchers.Default
+internal actual val ElmDispatcher: CoroutineDispatcher = Dispatchers.Default

elmslie-core/src/jvmMain/kotlin/money/vivid/elmslie/core/utils/DispatcherProvider.kt

@@ -3,4 +3,4 @@ package money.vivid.elmslie.core.utils
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 
-internal actual val IoDispatcher: CoroutineDispatcher = Dispatchers.IO
+internal actual val ElmDispatcher: CoroutineDispatcher = Dispatchers.Default

elmslie-core/src/nativeMain/kotlin/money/vivid/elmslie/core/utils/DispatcherProvider.kt

@@ -4,4 +4,4 @@ import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
 
-internal actual val IoDispatcher: CoroutineDispatcher = Dispatchers.IO
+internal actual val ElmDispatcher: CoroutineDispatcher = Dispatchers.Default

samples/kotlin-calculator/src/test/kotlin/money/vivid/elmslie/samples/calculator/StoreTest.kt

@@ -21,7 +21,7 @@ internal class StoreTest {
     @BeforeTest
     fun beforeEach() {
         val testDispatcher = StandardTestDispatcher()
-        ElmslieConfig.ioDispatchers { testDispatcher }
+        ElmslieConfig.elmDispatcher { testDispatcher }
         Dispatchers.setMain(testDispatcher)
     }