From 2a4cb8c5f9f6c25160a0f70d7cc69bbc9b62684e Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Fri, 12 Nov 2021 13:19:15 +0600
Subject: [PATCH] improvements in FSM

---
 CHANGELOG.md                                           |  3 +++
 .../dev/inmo/micro_utils/fsm/common/StatesMachine.kt   |  6 +++---
 .../dev/inmo/micro_utils/fsm/common/dsl/FSMBuilder.kt  | 10 +++++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd074b70bd8..92b7a675688 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@
 * `Versions`:
     * `Klock`: `2.4.7` -> `2.4.8`
     * `Serialization`: `1.3.0` -> `1.3.1`
+* `FSM`:
+    * Now it is possible to pass any `CheckableHandlerHolder` in `FSMBuilder`
+    * Now `StatesMachine` works with `CheckableHandlerHolder` instead of `CustomizableHandlerHolder`
 
 ## 0.8.1
 
diff --git a/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/StatesMachine.kt b/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/StatesMachine.kt
index f31e641a3b0..d470ff12d5c 100644
--- a/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/StatesMachine.kt
+++ b/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/StatesMachine.kt
@@ -12,7 +12,7 @@ import kotlinx.coroutines.*
 interface StatesMachine<T : State> : StatesHandler<T, T> {
     suspend fun launchStateHandling(
         state: T,
-        handlers: List<CustomizableHandlerHolder<in T, T>>
+        handlers: List<CheckableHandlerHolder<in T, T>>
     ): T? {
         return handlers.firstOrNull { it.checkHandleable(state) } ?.run {
             handleState(state)
@@ -35,7 +35,7 @@ interface StatesMachine<T : State> : StatesHandler<T, T> {
          */
         operator fun <T: State> invoke(
             statesManager: StatesManager<T>,
-            handlers: List<CustomizableHandlerHolder<in T, T>>
+            handlers: List<CheckableHandlerHolder<in T, T>>
         ) = DefaultStatesMachine(statesManager, handlers)
     }
 }
@@ -46,7 +46,7 @@ interface StatesMachine<T : State> : StatesHandler<T, T> {
  */
 class DefaultStatesMachine <T: State>(
     private val statesManager: StatesManager<T>,
-    private val handlers: List<CustomizableHandlerHolder<in T, T>>
+    private val handlers: List<CheckableHandlerHolder<in T, T>>
 ) : StatesMachine<T> {
     /**
      * Will call [launchStateHandling] for state handling
diff --git a/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/dsl/FSMBuilder.kt b/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/dsl/FSMBuilder.kt
index 5713883f3f5..76786ecac6f 100644
--- a/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/dsl/FSMBuilder.kt
+++ b/fsm/common/src/commonMain/kotlin/dev/inmo/micro_utils/fsm/common/dsl/FSMBuilder.kt
@@ -9,14 +9,18 @@ class FSMBuilder<T : State>(
     var statesManager: StatesManager<T> = DefaultStatesManager(InMemoryDefaultStatesManagerRepo()),
     var defaultStateHandler: StatesHandler<T, T>? = StatesHandler { null }
 ) {
-    private var states = mutableListOf<CustomizableHandlerHolder<T, T>>()
+    private var states = mutableListOf<CheckableHandlerHolder<T, T>>()
+
+    fun add(handler: CheckableHandlerHolder<T, T>) {
+        states.add(handler)
+    }
 
     fun <I : T> add(kClass: KClass<I>, handler: StatesHandler<I, T>) {
-        states.add(CheckableHandlerHolder(kClass, false, handler))
+        add(CheckableHandlerHolder(kClass, false, handler))
     }
 
     fun <I : T> add(filter: suspend (state: State) -> Boolean, handler: StatesHandler<I, T>) {
-        states.add(handler.holder(filter))
+        add(handler.holder(filter))
     }
 
     fun <I : T> addStrict(kClass: KClass<I>, handler: StatesHandler<I, T>) {