CHANGELOG.md

@@ -1,20 +1,5 @@
 # Changelog
 
-## 0.11.0
-
-* `Versions`
-    * `UUID`: `0.4.0` -> `0.4.1`
-* `Ktor`
-  * `Client`:
-    * New extension fun `HttpResponse#throwOnUnsuccess`
-    * All old functions, classes and extensions has been rewritten with new ktor-way with types info and keeping `ContentNegotiation` in mind
-  * `Server`:
-      * All old functions, classes and extensions has been rewritten with new ktor-way with types info and keeping `ContentNegotiation` in mind
-* `Repos`
-  * `Ktor`:
-    * Fully rewritten work with all declared repositories
-    * All old functions, classes and extensions has been rewritten with new ktor-way with types info and keeping `ContentNegotiation` in mind
-
 ## 0.10.8
 
 * `Common`

gradle.properties

@@ -14,5 +14,5 @@ crypto_js_version=4.1.1
 # Project data
 
 group=dev.inmo
-version=0.11.0
-android_code_version=124
+version=0.10.8
+android_code_version=123

gradle/libs.versions.toml

@@ -9,7 +9,7 @@ jb-exposed = "0.38.2"
 jb-dokka = "1.6.21"
 
 klock = "2.7.0"
-uuid = "0.4.1"
+uuid = "0.4.0"
 
 ktor = "2.0.2"
 
@@ -37,24 +37,17 @@ kt-serialization-cbor = { module = "org.jetbrains.kotlinx:kotlinx-serialization-
 
 kt-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kt-coroutines" }
 kt-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kt-coroutines" }
-kt-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kt-coroutines" }
 
 
 ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" }
-ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }
 ktor-client = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
-ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
 ktor-client-java = { module = "io.ktor:ktor-client-java", version.ref = "ktor" }
-ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktor" }
-ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }
-ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" }
 ktor-server = { module = "io.ktor:ktor-server", version.ref = "ktor" }
 ktor-server-cio = { module = "io.ktor:ktor-server-cio", version.ref = "ktor" }
 ktor-server-host-common = { module = "io.ktor:ktor-server-host-common", version.ref = "ktor" }
 ktor-websockets = { module = "io.ktor:ktor-websockets", version.ref = "ktor" }
 ktor-server-websockets = { module = "io.ktor:ktor-server-websockets", version.ref = "ktor" }
 ktor-server-statusPages = { module = "io.ktor:ktor-server-status-pages", version.ref = "ktor" }
-ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negotiation", version.ref = "ktor" }
 
 
 klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "klock" }

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/HttpStatusCodeAsThrowable.kt

@@ -1,15 +0,0 @@
-package dev.inmo.micro_utils.ktor.client
-
-import io.ktor.client.plugins.ClientRequestException
-import io.ktor.client.statement.HttpResponse
-import io.ktor.http.isSuccess
-
-inline fun HttpResponse.throwOnUnsuccess(
-    unsuccessMessage: () -> String
-) {
-    if (status.isSuccess()) {
-        return
-    }
-
-    throw ClientRequestException(this, unsuccessMessage())
-}

ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/ktor/client/NewFlowsWebsockets.kt

@@ -1,55 +0,0 @@
-package dev.inmo.micro_utils.ktor.client
-
-import dev.inmo.micro_utils.coroutines.runCatchingSafely
-import dev.inmo.micro_utils.coroutines.safely
-import dev.inmo.micro_utils.ktor.common.*
-import io.ktor.client.HttpClient
-import io.ktor.client.plugins.pluginOrNull
-import io.ktor.client.plugins.websocket.*
-import io.ktor.client.request.HttpRequestBuilder
-import io.ktor.websocket.Frame
-import io.ktor.websocket.readBytes
-import io.ktor.websocket.serialization.sendSerializedBase
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.channelFlow
-import kotlinx.coroutines.isActive
-import kotlinx.serialization.DeserializationStrategy
-
-/**
- * @param checkReconnection This lambda will be called when it is required to reconnect to websocket to establish
- * connection. Must return true in case if must be reconnected. By default always reconnecting
- */
-inline fun <reified T> HttpClient.createStandardWebsocketFlow(
-    url: String,
-    noinline checkReconnection: suspend (Throwable?) -> Boolean = { true },
-    noinline requestBuilder: HttpRequestBuilder.() -> Unit = {}
-): Flow<T> {
-    pluginOrNull(WebSockets) ?: error("Plugin $WebSockets must be installed for using createStandardWebsocketFlow")
-
-    val correctedUrl = url.asCorrectWebSocketUrl
-
-    return channelFlow {
-        do {
-            val reconnect = runCatchingSafely {
-                ws(correctedUrl, requestBuilder) {
-                    for (received in incoming) {
-                        sendSerialized(received.data)
-                    }
-                }
-                checkReconnection(null)
-            }.getOrElse { e ->
-                checkReconnection(e).also {
-                    if (!it) {
-                        close(e)
-                    }
-                }
-            }
-        } while (reconnect && isActive)
-
-        if (isActive) {
-            safely {
-                close()
-            }
-        }
-    }
-}

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/ApplicationCallRespondWithTypeInfo.kt

@@ -1,15 +0,0 @@
-package dev.inmo.micro_utils.ktor.server
-
-import io.ktor.server.application.ApplicationCall
-import io.ktor.server.response.responseType
-import io.ktor.util.InternalAPI
-import io.ktor.util.reflect.TypeInfo
-
-@InternalAPI
-suspend fun <T : Any> ApplicationCall.respond(
-    message: T,
-    typeInfo: TypeInfo
-) {
-    response.responseType = typeInfo
-    response.pipeline.execute(this, message as Any)
-}

ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/ktor/server/NewFlowsWebsocket.kt

@@ -1,30 +0,0 @@
-package dev.inmo.micro_utils.ktor.server
-
-import dev.inmo.micro_utils.coroutines.safely
-import dev.inmo.micro_utils.ktor.common.*
-import io.ktor.http.URLProtocol
-import io.ktor.server.application.install
-import io.ktor.server.application.pluginOrNull
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.application
-import io.ktor.server.websocket.*
-import io.ktor.websocket.send
-import kotlinx.coroutines.flow.Flow
-import kotlinx.serialization.SerializationStrategy
-
-inline fun <reified T : Any> Route.includeWebsocketHandling(
-    suburl: String,
-    flow: Flow<T>,
-    protocol: URLProtocol? = null
-) {
-    application.apply {
-        pluginOrNull(WebSockets) ?: install(WebSockets)
-    }
-    webSocket(suburl, protocol ?.name) {
-        safely {
-            flow.collect {
-                sendSerialized(it)
-            }
-        }
-    }
-}

repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/KeyValueCacheRepo.kt

@@ -4,6 +4,8 @@ import dev.inmo.micro_utils.repos.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 
 open class ReadKeyValueCacheRepo<Key,Value>(
     protected val parentRepo: ReadKeyValueRepo<Key, Value>,

repos/cache/src/commonMain/kotlin/dev/inmo/micro_utils/repos/cache/KeyValuesCacheRepo.kt

@@ -8,6 +8,8 @@ import dev.inmo.micro_utils.repos.*
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 
 open class ReadKeyValuesCacheRepo<Key,Value>(
     protected val parentRepo: ReadKeyValuesRepo<Key, Value>,

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/OneToManyKeyValueRepo.kt

@@ -1,10 +1,11 @@
 package dev.inmo.micro_utils.repos
 
 import dev.inmo.micro_utils.pagination.*
+import dev.inmo.micro_utils.pagination.utils.doForAllWithCurrentPaging
 import dev.inmo.micro_utils.pagination.utils.getAllWithNextPaging
 import kotlinx.coroutines.flow.Flow
 
-interface ReadKeyValuesRepo<Key, Value> : Repo {
+interface ReadOneToManyKeyValueRepo<Key, Value> : Repo {
     suspend fun get(k: Key, pagination: Pagination, reversed: Boolean = false): PaginationResult<Value>
     suspend fun keys(pagination: Pagination, reversed: Boolean = false): PaginationResult<Key>
     suspend fun keys(v: Value, pagination: Pagination, reversed: Boolean = false): PaginationResult<Key>
@@ -35,9 +36,9 @@ interface ReadKeyValuesRepo<Key, Value> : Repo {
         }
     }
 }
-typealias ReadOneToManyKeyValueRepo<Key,Value> = ReadKeyValuesRepo<Key, Value>
+typealias ReadKeyValuesRepo<Key,Value> = ReadOneToManyKeyValueRepo<Key, Value>
 
-interface WriteKeyValuesRepo<Key, Value> : Repo {
+interface WriteOneToManyKeyValueRepo<Key, Value> : Repo {
     val onNewValue: Flow<Pair<Key, Value>>
     val onValueRemoved: Flow<Pair<Key, Value>>
     val onDataCleared: Flow<Key>
@@ -54,41 +55,41 @@ interface WriteKeyValuesRepo<Key, Value> : Repo {
         add(toSet)
     }
 }
-typealias WriteOneToManyKeyValueRepo<Key,Value> = WriteKeyValuesRepo<Key, Value>
+typealias WriteKeyValuesRepo<Key,Value> = WriteOneToManyKeyValueRepo<Key, Value>
 
-suspend inline fun <Key, Value, REPO : WriteKeyValuesRepo<Key, Value>> REPO.add(
+suspend inline fun <Key, Value, REPO : WriteOneToManyKeyValueRepo<Key, Value>> REPO.add(
     keysAndValues: List<Pair<Key, List<Value>>>
 ) = add(keysAndValues.toMap())
 
-suspend inline fun <Key, Value, REPO : WriteKeyValuesRepo<Key, Value>> REPO.add(
+suspend inline fun <Key, Value, REPO : WriteOneToManyKeyValueRepo<Key, Value>> REPO.add(
     vararg keysAndValues: Pair<Key, List<Value>>
 ) = add(keysAndValues.toMap())
 
-suspend inline fun <Key, Value> WriteKeyValuesRepo<Key, Value>.add(
+suspend inline fun <Key, Value> WriteOneToManyKeyValueRepo<Key, Value>.add(
     k: Key, v: List<Value>
 ) = add(mapOf(k to v))
 
-suspend inline fun <Key, Value> WriteKeyValuesRepo<Key, Value>.add(
+suspend inline fun <Key, Value> WriteOneToManyKeyValueRepo<Key, Value>.add(
     k: Key, vararg v: Value
 ) = add(k, v.toList())
 
-suspend inline fun <Key, Value, REPO : WriteKeyValuesRepo<Key, Value>> REPO.set(
+suspend inline fun <Key, Value, REPO : WriteOneToManyKeyValueRepo<Key, Value>> REPO.set(
     keysAndValues: List<Pair<Key, List<Value>>>
 ) = set(keysAndValues.toMap())
 
-suspend inline fun <Key, Value, REPO : WriteKeyValuesRepo<Key, Value>> REPO.set(
+suspend inline fun <Key, Value, REPO : WriteOneToManyKeyValueRepo<Key, Value>> REPO.set(
     vararg keysAndValues: Pair<Key, List<Value>>
 ) = set(keysAndValues.toMap())
 
-suspend inline fun <Key, Value> WriteKeyValuesRepo<Key, Value>.set(
+suspend inline fun <Key, Value> WriteOneToManyKeyValueRepo<Key, Value>.set(
     k: Key, v: List<Value>
 ) = set(mapOf(k to v))
 
-suspend inline fun <Key, Value> WriteKeyValuesRepo<Key, Value>.set(
+suspend inline fun <Key, Value> WriteOneToManyKeyValueRepo<Key, Value>.set(
     k: Key, vararg v: Value
 ) = set(k, v.toList())
 
-interface KeyValuesRepo<Key, Value> : ReadKeyValuesRepo<Key, Value>, WriteKeyValuesRepo<Key, Value> {
+interface OneToManyKeyValueRepo<Key, Value> : ReadOneToManyKeyValueRepo<Key, Value>, WriteOneToManyKeyValueRepo<Key, Value> {
     override suspend fun clearWithValue(v: Value) {
         doWithPagination {
             val keysResult = keys(v, it)
@@ -101,29 +102,22 @@ interface KeyValuesRepo<Key, Value> : ReadKeyValuesRepo<Key, Value>, WriteKeyVal
         }
     }
 }
-typealias OneToManyKeyValueRepo<Key,Value> = KeyValuesRepo<Key, Value>
+typealias KeyValuesRepo<Key,Value> = OneToManyKeyValueRepo<Key, Value>
 
-class DelegateBasedKeyValuesRepo<Key, Value>(
-    readDelegate: ReadKeyValuesRepo<Key, Value>,
-    writeDelegate: WriteKeyValuesRepo<Key, Value>
-) : KeyValuesRepo<Key, Value>,
-    ReadKeyValuesRepo<Key, Value> by readDelegate,
-    WriteKeyValuesRepo<Key, Value> by writeDelegate
-
-suspend inline fun <Key, Value> WriteKeyValuesRepo<Key, Value>.remove(
+suspend inline fun <Key, Value> WriteOneToManyKeyValueRepo<Key, Value>.remove(
     keysAndValues: List<Pair<Key, List<Value>>>
 ) = remove(keysAndValues.toMap())
 
-suspend inline fun <Key, Value> WriteKeyValuesRepo<Key, Value>.remove(
+suspend inline fun <Key, Value> WriteOneToManyKeyValueRepo<Key, Value>.remove(
     vararg keysAndValues: Pair<Key, List<Value>>
 ) = remove(keysAndValues.toMap())
 
-suspend inline fun <Key, Value> WriteKeyValuesRepo<Key, Value>.remove(
+suspend inline fun <Key, Value> WriteOneToManyKeyValueRepo<Key, Value>.remove(
     k: Key,
     v: List<Value>
 ) = remove(mapOf(k to v))
 
-suspend inline fun <Key, Value> WriteKeyValuesRepo<Key, Value>.remove(
+suspend inline fun <Key, Value> WriteOneToManyKeyValueRepo<Key, Value>.remove(
     k: Key,
     vararg v: Value
 ) = remove(k, v.toList())

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/StandartCRUDRepo.kt

@@ -4,13 +4,13 @@ import dev.inmo.micro_utils.pagination.Pagination
 import dev.inmo.micro_utils.pagination.PaginationResult
 import kotlinx.coroutines.flow.Flow
 
-interface ReadCRUDRepo<ObjectType, IdType> : Repo {
+interface ReadStandardCRUDRepo<ObjectType, IdType> : Repo {
     suspend fun getByPagination(pagination: Pagination): PaginationResult<ObjectType>
     suspend fun getById(id: IdType): ObjectType?
     suspend fun contains(id: IdType): Boolean
     suspend fun count(): Long
 }
-typealias ReadStandardCRUDRepo<ObjectType, IdType> = ReadCRUDRepo<ObjectType, IdType>
+typealias ReadCRUDRepo<ObjectType, IdType> = ReadStandardCRUDRepo<ObjectType, IdType>
 
 typealias UpdatedValuePair<IdType, ValueType> = Pair<IdType, ValueType>
 val <IdType> UpdatedValuePair<IdType, *>.id
@@ -18,7 +18,7 @@ val <IdType> UpdatedValuePair<IdType, *>.id
 val <ValueType> UpdatedValuePair<*, ValueType>.value
     get() = second
 
-interface WriteCRUDRepo<ObjectType, IdType, InputValueType> : Repo {
+interface WriteStandardCRUDRepo<ObjectType, IdType, InputValueType> : Repo {
     val newObjectsFlow: Flow<ObjectType>
     val updatedObjectsFlow: Flow<ObjectType>
     val deletedObjectsIdsFlow: Flow<IdType>
@@ -28,25 +28,18 @@ interface WriteCRUDRepo<ObjectType, IdType, InputValueType> : Repo {
     suspend fun update(values: List<UpdatedValuePair<IdType, InputValueType>>): List<ObjectType>
     suspend fun deleteById(ids: List<IdType>)
 }
-typealias WriteStandardCRUDRepo<ObjectType, IdType, InputValueType> = WriteCRUDRepo<ObjectType, IdType, InputValueType>
+typealias WriteCRUDRepo<ObjectType, IdType, InputValueType> = WriteStandardCRUDRepo<ObjectType, IdType, InputValueType>
 
-suspend fun <ObjectType, IdType, InputValueType> WriteCRUDRepo<ObjectType, IdType, InputValueType>.create(
+suspend fun <ObjectType, IdType, InputValueType> WriteStandardCRUDRepo<ObjectType, IdType, InputValueType>.create(
     vararg values: InputValueType
 ): List<ObjectType> = create(values.toList())
-suspend fun <ObjectType, IdType, InputValueType> WriteCRUDRepo<ObjectType, IdType, InputValueType>.update(
+suspend fun <ObjectType, IdType, InputValueType> WriteStandardCRUDRepo<ObjectType, IdType, InputValueType>.update(
     vararg values: UpdatedValuePair<IdType, InputValueType>
 ): List<ObjectType> = update(values.toList())
-suspend fun <ObjectType, IdType, InputValueType> WriteCRUDRepo<ObjectType, IdType, InputValueType>.deleteById(
+suspend fun <ObjectType, IdType, InputValueType> WriteStandardCRUDRepo<ObjectType, IdType, InputValueType>.deleteById(
     vararg ids: IdType
 ) = deleteById(ids.toList())
 
-interface CRUDRepo<ObjectType, IdType, InputValueType> : ReadCRUDRepo<ObjectType, IdType>,
-    WriteCRUDRepo<ObjectType, IdType, InputValueType>
-typealias StandardCRUDRepo<ObjectType, IdType, InputValueType> = CRUDRepo<ObjectType, IdType, InputValueType>
-
-class DelegateBasedCRUDRepo<ObjectType, IdType, InputValueType>(
-    readDelegate: ReadCRUDRepo<ObjectType, IdType>,
-    writeDelegate: WriteCRUDRepo<ObjectType, IdType, InputValueType>
-) : CRUDRepo<ObjectType, IdType, InputValueType>,
-    ReadCRUDRepo<ObjectType, IdType> by readDelegate,
-    WriteCRUDRepo<ObjectType, IdType, InputValueType> by writeDelegate
+interface StandardCRUDRepo<ObjectType, IdType, InputValueType> : ReadStandardCRUDRepo<ObjectType, IdType>,
+    WriteStandardCRUDRepo<ObjectType, IdType, InputValueType>
+typealias CRUDRepo<ObjectType, IdType, InputValueType> = StandardCRUDRepo<ObjectType, IdType, InputValueType>

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/StandartKeyValueRepo.kt

@@ -4,7 +4,7 @@ import dev.inmo.micro_utils.pagination.*
 import dev.inmo.micro_utils.pagination.utils.doAllWithCurrentPaging
 import kotlinx.coroutines.flow.Flow
 
-interface ReadKeyValueRepo<Key, Value> : Repo {
+interface ReadStandardKeyValueRepo<Key, Value> : Repo {
     suspend fun get(k: Key): Value?
     suspend fun values(pagination: Pagination, reversed: Boolean = false): PaginationResult<Value>
     suspend fun keys(pagination: Pagination, reversed: Boolean = false): PaginationResult<Key>
@@ -12,9 +12,9 @@ interface ReadKeyValueRepo<Key, Value> : Repo {
     suspend fun contains(key: Key): Boolean
     suspend fun count(): Long
 }
-typealias ReadStandardKeyValueRepo<Key,Value> = ReadKeyValueRepo<Key, Value>
+typealias ReadKeyValueRepo<Key,Value> = ReadStandardKeyValueRepo<Key, Value>
 
-interface WriteKeyValueRepo<Key, Value> : Repo {
+interface WriteStandardKeyValueRepo<Key, Value> : Repo {
     val onNewValue: Flow<Pair<Key, Value>>
     val onValueRemoved: Flow<Key>
 
@@ -22,25 +22,25 @@ interface WriteKeyValueRepo<Key, Value> : Repo {
     suspend fun unset(toUnset: List<Key>)
     suspend fun unsetWithValues(toUnset: List<Value>)
 }
-typealias WriteStandardKeyValueRepo<Key,Value> = WriteKeyValueRepo<Key, Value>
+typealias WriteKeyValueRepo<Key,Value> = WriteStandardKeyValueRepo<Key, Value>
 
-suspend inline fun <Key, Value> WriteKeyValueRepo<Key, Value>.set(
+suspend inline fun <Key, Value> WriteStandardKeyValueRepo<Key, Value>.set(
     vararg toSet: Pair<Key, Value>
 ) = set(toSet.toMap())
 
-suspend inline fun <Key, Value> WriteKeyValueRepo<Key, Value>.set(
+suspend inline fun <Key, Value> WriteStandardKeyValueRepo<Key, Value>.set(
     k: Key, v: Value
 ) = set(k to v)
 
-suspend inline fun <Key, Value> WriteKeyValueRepo<Key, Value>.unset(
+suspend inline fun <Key, Value> WriteStandardKeyValueRepo<Key, Value>.unset(
     vararg k: Key
 ) = unset(k.toList())
 
-suspend inline fun <Key, Value> WriteKeyValueRepo<Key, Value>.unsetWithValues(
+suspend inline fun <Key, Value> WriteStandardKeyValueRepo<Key, Value>.unsetWithValues(
     vararg v: Value
 ) = unsetWithValues(v.toList())
 
-interface KeyValueRepo<Key, Value> : ReadKeyValueRepo<Key, Value>, WriteKeyValueRepo<Key, Value> {
+interface StandardKeyValueRepo<Key, Value> : ReadStandardKeyValueRepo<Key, Value>, WriteStandardKeyValueRepo<Key, Value> {
     override suspend fun unsetWithValues(toUnset: List<Value>) = toUnset.forEach { v ->
         doAllWithCurrentPaging {
             keys(v, it).also {
@@ -49,11 +49,4 @@ interface KeyValueRepo<Key, Value> : ReadKeyValueRepo<Key, Value>, WriteKeyValue
         }
     }
 }
-typealias StandardKeyValueRepo<Key,Value> = KeyValueRepo<Key, Value>
-
-class DelegateBasedKeyValueRepo<Key, Value>(
-    readDelegate: ReadKeyValueRepo<Key, Value>,
-    writeDelegate: WriteKeyValueRepo<Key, Value>
-) : KeyValueRepo<Key, Value>,
-    ReadKeyValueRepo<Key, Value> by readDelegate,
-    WriteKeyValueRepo<Key, Value> by writeDelegate
+typealias KeyValueRepo<Key,Value> = StandardKeyValueRepo<Key, Value>

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/mappers/KeyValueMappers.kt

@@ -6,12 +6,10 @@ import dev.inmo.micro_utils.repos.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
-@Deprecated("Renamed", ReplaceWith("MapperReadKeyValueRepo", "dev.inmo.micro_utils.repos.mappers.MapperReadKeyValueRepo"))
-typealias MapperReadStandardKeyValueRepo<FromKey, FromValue, ToKey, ToValue> = MapperReadKeyValueRepo<FromKey, FromValue, ToKey, ToValue>
-open class MapperReadKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
-    private val to: ReadKeyValueRepo<ToKey, ToValue>,
+open class MapperReadStandardKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
+    private val to: ReadStandardKeyValueRepo<ToKey, ToValue>,
     mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
-) : ReadKeyValueRepo<FromKey, FromValue>, MapperRepo<FromKey, FromValue, ToKey, ToValue> by mapper {
+) : ReadStandardKeyValueRepo<FromKey, FromValue>, MapperRepo<FromKey, FromValue, ToKey, ToValue> by mapper {
     override suspend fun get(k: FromKey): FromValue? = to.get(
         k.toOutKey()
     ) ?.toInnerValue()
@@ -71,26 +69,24 @@ open class MapperReadKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
 }
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun <FromKey, FromValue, ToKey, ToValue> ReadKeyValueRepo<ToKey, ToValue>.withMapper(
+inline fun <FromKey, FromValue, ToKey, ToValue> ReadStandardKeyValueRepo<ToKey, ToValue>.withMapper(
     mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
-): ReadKeyValueRepo<FromKey, FromValue> = MapperReadKeyValueRepo(this, mapper)
+): ReadStandardKeyValueRepo<FromKey, FromValue> = MapperReadStandardKeyValueRepo(this, mapper)
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue> ReadKeyValueRepo<ToKey, ToValue>.withMapper(
+inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue> ReadStandardKeyValueRepo<ToKey, ToValue>.withMapper(
     crossinline keyFromToTo: suspend FromKey.() -> ToKey = { this as ToKey },
     crossinline valueFromToTo: suspend FromValue.() -> ToValue = { this as ToValue },
     crossinline keyToToFrom: suspend ToKey.() -> FromKey = { this as FromKey },
     crossinline valueToToFrom: suspend ToValue.() -> FromValue = { this as FromValue },
-): ReadKeyValueRepo<FromKey, FromValue> = withMapper(
+): ReadStandardKeyValueRepo<FromKey, FromValue> = withMapper(
     mapper(keyFromToTo, valueFromToTo, keyToToFrom, valueToToFrom)
 )
 
-@Deprecated("Renamed", ReplaceWith("MapperWriteKeyValueRepo", "dev.inmo.micro_utils.repos.mappers.MapperWriteKeyValueRepo"))
-typealias MapperWriteStandardKeyValueRepo<FromKey, FromValue, ToKey, ToValue> = MapperWriteKeyValueRepo<FromKey, FromValue, ToKey, ToValue>
-open class MapperWriteKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
-    private val to: WriteKeyValueRepo<ToKey, ToValue>,
+open class MapperWriteStandardKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
+    private val to: WriteStandardKeyValueRepo<ToKey, ToValue>,
     mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
-) : WriteKeyValueRepo<FromKey, FromValue>, MapperRepo<FromKey, FromValue, ToKey, ToValue> by mapper {
+) : WriteStandardKeyValueRepo<FromKey, FromValue>, MapperRepo<FromKey, FromValue, ToKey, ToValue> by mapper {
     override val onNewValue: Flow<Pair<FromKey, FromValue>> = to.onNewValue.map { (k, v) ->
         k.toInnerKey() to v.toInnerValue()
     }
@@ -116,42 +112,40 @@ open class MapperWriteKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
 }
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun <FromKey, FromValue, ToKey, ToValue> WriteKeyValueRepo<ToKey, ToValue>.withMapper(
+inline fun <FromKey, FromValue, ToKey, ToValue> WriteStandardKeyValueRepo<ToKey, ToValue>.withMapper(
     mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
-): WriteKeyValueRepo<FromKey, FromValue> = MapperWriteKeyValueRepo(this, mapper)
+): WriteStandardKeyValueRepo<FromKey, FromValue> = MapperWriteStandardKeyValueRepo(this, mapper)
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue> WriteKeyValueRepo<ToKey, ToValue>.withMapper(
+inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue> WriteStandardKeyValueRepo<ToKey, ToValue>.withMapper(
     crossinline keyFromToTo: suspend FromKey.() -> ToKey = { this as ToKey },
     crossinline valueFromToTo: suspend FromValue.() -> ToValue = { this as ToValue },
     crossinline keyToToFrom: suspend ToKey.() -> FromKey = { this as FromKey },
     crossinline valueToToFrom: suspend ToValue.() -> FromValue = { this as FromValue },
-): WriteKeyValueRepo<FromKey, FromValue> = withMapper(
+): WriteStandardKeyValueRepo<FromKey, FromValue> = withMapper(
     mapper(keyFromToTo, valueFromToTo, keyToToFrom, valueToToFrom)
 )
 
-@Deprecated("Renamed", ReplaceWith("MapperKeyValueRepo", "dev.inmo.micro_utils.repos.mappers.MapperKeyValueRepo"))
-typealias MapperStandardKeyValueRepo<FromKey, FromValue, ToKey, ToValue> = MapperKeyValueRepo<FromKey, FromValue, ToKey, ToValue>
 @Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
-open class MapperKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
-    private val to: KeyValueRepo<ToKey, ToValue>,
+open class MapperStandardKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
+    private val to: StandardKeyValueRepo<ToKey, ToValue>,
     private val mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
-) : KeyValueRepo<FromKey, FromValue>,
+) : StandardKeyValueRepo<FromKey, FromValue>,
     MapperRepo<FromKey, FromValue, ToKey, ToValue> by mapper,
-    ReadKeyValueRepo<FromKey, FromValue> by MapperReadKeyValueRepo(to, mapper),
-    WriteKeyValueRepo<FromKey, FromValue> by MapperWriteKeyValueRepo(to, mapper)
+    ReadStandardKeyValueRepo<FromKey, FromValue> by MapperReadStandardKeyValueRepo(to, mapper),
+    WriteStandardKeyValueRepo<FromKey, FromValue> by MapperWriteStandardKeyValueRepo(to, mapper)
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun <FromKey, FromValue, ToKey, ToValue> KeyValueRepo<ToKey, ToValue>.withMapper(
+inline fun <FromKey, FromValue, ToKey, ToValue> StandardKeyValueRepo<ToKey, ToValue>.withMapper(
     mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
-): KeyValueRepo<FromKey, FromValue> = MapperKeyValueRepo(this, mapper)
+): StandardKeyValueRepo<FromKey, FromValue> = MapperStandardKeyValueRepo(this, mapper)
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue> KeyValueRepo<ToKey, ToValue>.withMapper(
+inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue> StandardKeyValueRepo<ToKey, ToValue>.withMapper(
     crossinline keyFromToTo: suspend FromKey.() -> ToKey = { this as ToKey },
     crossinline valueFromToTo: suspend FromValue.() -> ToValue = { this as ToValue },
     crossinline keyToToFrom: suspend ToKey.() -> FromKey = { this as FromKey },
     crossinline valueToToFrom: suspend ToValue.() -> FromValue = { this as FromValue },
-): KeyValueRepo<FromKey, FromValue> = withMapper(
+): StandardKeyValueRepo<FromKey, FromValue> = withMapper(
     mapper(keyFromToTo, valueFromToTo, keyToToFrom, valueToToFrom)
 )

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/mappers/OneToManyKeyValueMappers.kt

@@ -6,12 +6,10 @@ import dev.inmo.micro_utils.repos.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
-@Deprecated("Renamed", ReplaceWith("MapperReadKeyValuesRepo", "dev.inmo.micro_utils.repos.mappers.MapperReadKeyValuesRepo"))
-typealias MapperReadOneToManyKeyValueRepo<FromKey, FromValue, ToKey, ToValue> = MapperReadKeyValuesRepo<FromKey, FromValue, ToKey, ToValue>
-open class MapperReadKeyValuesRepo<FromKey, FromValue, ToKey, ToValue>(
-    private val to: ReadKeyValuesRepo<ToKey, ToValue>,
+open class MapperReadOneToManyKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
+    private val to: ReadOneToManyKeyValueRepo<ToKey, ToValue>,
     mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
-) : ReadKeyValuesRepo<FromKey, FromValue>, MapperRepo<FromKey, FromValue, ToKey, ToValue> by mapper {
+) : ReadOneToManyKeyValueRepo<FromKey, FromValue>, MapperRepo<FromKey, FromValue, ToKey, ToValue> by mapper {
     override suspend fun get(
         k: FromKey,
         pagination: Pagination,
@@ -69,26 +67,24 @@ open class MapperReadKeyValuesRepo<FromKey, FromValue, ToKey, ToValue>(
 }
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun <FromKey, FromValue, ToKey, ToValue> ReadKeyValuesRepo<ToKey, ToValue>.withMapper(
+inline fun <FromKey, FromValue, ToKey, ToValue> ReadOneToManyKeyValueRepo<ToKey, ToValue>.withMapper(
     mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
-): ReadKeyValuesRepo<FromKey, FromValue> = MapperReadKeyValuesRepo(this, mapper)
+): ReadOneToManyKeyValueRepo<FromKey, FromValue> = MapperReadOneToManyKeyValueRepo(this, mapper)
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue> ReadKeyValuesRepo<ToKey, ToValue>.withMapper(
+inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue> ReadOneToManyKeyValueRepo<ToKey, ToValue>.withMapper(
     crossinline keyFromToTo: suspend FromKey.() -> ToKey = { this as ToKey },
     crossinline valueFromToTo: suspend FromValue.() -> ToValue = { this as ToValue },
     crossinline keyToToFrom: suspend ToKey.() -> FromKey = { this as FromKey },
     crossinline valueToToFrom: suspend ToValue.() -> FromValue = { this as FromValue },
-): ReadKeyValuesRepo<FromKey, FromValue> = withMapper(
+): ReadOneToManyKeyValueRepo<FromKey, FromValue> = withMapper(
     mapper(keyFromToTo, valueFromToTo, keyToToFrom, valueToToFrom)
 )
 
-@Deprecated("Renamed", ReplaceWith("MapperWriteKeyValuesRepo", "dev.inmo.micro_utils.repos.mappers.MapperWriteKeyValuesRepo"))
-typealias MapperWriteOneToManyKeyValueRepo<FromKey, FromValue, ToKey, ToValue> = MapperWriteKeyValuesRepo<FromKey, FromValue, ToKey, ToValue>
-open class MapperWriteKeyValuesRepo<FromKey, FromValue, ToKey, ToValue>(
-    private val to: WriteKeyValuesRepo<ToKey, ToValue>,
+open class MapperWriteOneToManyKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
+    private val to: WriteOneToManyKeyValueRepo<ToKey, ToValue>,
     mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
-) : WriteKeyValuesRepo<FromKey, FromValue>, MapperRepo<FromKey, FromValue, ToKey, ToValue> by mapper {
+) : WriteOneToManyKeyValueRepo<FromKey, FromValue>, MapperRepo<FromKey, FromValue, ToKey, ToValue> by mapper {
     override val onNewValue: Flow<Pair<FromKey, FromValue>> = to.onNewValue.map { (k, v) ->
         k.toInnerKey() to v.toInnerValue()
     }
@@ -122,42 +118,40 @@ open class MapperWriteKeyValuesRepo<FromKey, FromValue, ToKey, ToValue>(
 }
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun <FromKey, FromValue, ToKey, ToValue> WriteKeyValuesRepo<ToKey, ToValue>.withMapper(
+inline fun <FromKey, FromValue, ToKey, ToValue> WriteOneToManyKeyValueRepo<ToKey, ToValue>.withMapper(
     mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
-): WriteKeyValuesRepo<FromKey, FromValue> = MapperWriteKeyValuesRepo(this, mapper)
+): WriteOneToManyKeyValueRepo<FromKey, FromValue> = MapperWriteOneToManyKeyValueRepo(this, mapper)
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue> WriteKeyValuesRepo<ToKey, ToValue>.withMapper(
+inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue> WriteOneToManyKeyValueRepo<ToKey, ToValue>.withMapper(
     crossinline keyFromToTo: suspend FromKey.() -> ToKey = { this as ToKey },
     crossinline valueFromToTo: suspend FromValue.() -> ToValue = { this as ToValue },
     crossinline keyToToFrom: suspend ToKey.() -> FromKey = { this as FromKey },
     crossinline valueToToFrom: suspend ToValue.() -> FromValue = { this as FromValue },
-): WriteKeyValuesRepo<FromKey, FromValue> = withMapper(
+): WriteOneToManyKeyValueRepo<FromKey, FromValue> = withMapper(
     mapper(keyFromToTo, valueFromToTo, keyToToFrom, valueToToFrom)
 )
 
-@Deprecated("Renamed", ReplaceWith("MapperKeyValuesRepo", "dev.inmo.micro_utils.repos.mappers.MapperKeyValuesRepo"))
-typealias MapperOneToManyKeyValueRepo<FromKey, FromValue, ToKey, ToValue> = MapperKeyValuesRepo<FromKey, FromValue, ToKey, ToValue>
 @Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
-open class MapperKeyValuesRepo<FromKey, FromValue, ToKey, ToValue>(
-    private val to: KeyValuesRepo<ToKey, ToValue>,
+open class MapperOneToManyKeyValueRepo<FromKey, FromValue, ToKey, ToValue>(
+    private val to: OneToManyKeyValueRepo<ToKey, ToValue>,
     mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
-) : KeyValuesRepo<FromKey, FromValue>,
+) : OneToManyKeyValueRepo<FromKey, FromValue>,
     MapperRepo<FromKey, FromValue, ToKey, ToValue> by mapper,
-    ReadKeyValuesRepo<FromKey, FromValue> by MapperReadKeyValuesRepo(to, mapper),
-    WriteKeyValuesRepo<FromKey, FromValue> by MapperWriteKeyValuesRepo(to, mapper)
+    ReadOneToManyKeyValueRepo<FromKey, FromValue> by MapperReadOneToManyKeyValueRepo(to, mapper),
+    WriteOneToManyKeyValueRepo<FromKey, FromValue> by MapperWriteOneToManyKeyValueRepo(to, mapper)
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun <FromKey, FromValue, ToKey, ToValue> KeyValuesRepo<ToKey, ToValue>.withMapper(
+inline fun <FromKey, FromValue, ToKey, ToValue> OneToManyKeyValueRepo<ToKey, ToValue>.withMapper(
     mapper: MapperRepo<FromKey, FromValue, ToKey, ToValue>
-): KeyValuesRepo<FromKey, FromValue> = MapperKeyValuesRepo(this, mapper)
+): OneToManyKeyValueRepo<FromKey, FromValue> = MapperOneToManyKeyValueRepo(this, mapper)
 
 @Suppress("NOTHING_TO_INLINE")
-inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue> KeyValuesRepo<ToKey, ToValue>.withMapper(
+inline fun <reified FromKey, reified FromValue, reified ToKey, reified ToValue> OneToManyKeyValueRepo<ToKey, ToValue>.withMapper(
     crossinline keyFromToTo: suspend FromKey.() -> ToKey = { this as ToKey },
     crossinline valueFromToTo: suspend FromValue.() -> ToValue = { this as ToValue },
     crossinline keyToToFrom: suspend ToKey.() -> FromKey = { this as FromKey },
     crossinline valueToToFrom: suspend ToValue.() -> FromValue = { this as FromValue },
-): KeyValuesRepo<FromKey, FromValue> = withMapper(
+): OneToManyKeyValueRepo<FromKey, FromValue> = withMapper(
     mapper(keyFromToTo, valueFromToTo, keyToToFrom, valueToToFrom)
 )

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/pagination/CRUDPaginationExtensions.kt

@@ -1,10 +1,11 @@
 package dev.inmo.micro_utils.repos.pagination
 
 import dev.inmo.micro_utils.pagination.*
+import dev.inmo.micro_utils.pagination.utils.doForAllWithNextPaging
 import dev.inmo.micro_utils.pagination.utils.getAllWithNextPaging
-import dev.inmo.micro_utils.repos.ReadCRUDRepo
+import dev.inmo.micro_utils.repos.ReadStandardCRUDRepo
 
-suspend inline fun <T, ID, REPO : ReadCRUDRepo<T, ID>> REPO.getAll(
+suspend inline fun <T, ID, REPO : ReadStandardCRUDRepo<T, ID>> REPO.getAll(
     @Suppress("REDUNDANT_INLINE_SUSPEND_FUNCTION_TYPE")
     crossinline methodCaller: suspend REPO.(Pagination) -> PaginationResult<T>
 ): List<T> = getAllWithNextPaging {

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/pagination/KeyValuePaginationExtensions.kt

@@ -2,9 +2,9 @@ package dev.inmo.micro_utils.repos.pagination
 
 import dev.inmo.micro_utils.pagination.*
 import dev.inmo.micro_utils.pagination.utils.getAllWithNextPaging
-import dev.inmo.micro_utils.repos.ReadKeyValueRepo
+import dev.inmo.micro_utils.repos.ReadStandardKeyValueRepo
 
-suspend inline fun <Key, Value, REPO : ReadKeyValueRepo<Key, Value>> REPO.getAll(
+suspend inline fun <Key, Value, REPO : ReadStandardKeyValueRepo<Key, Value>> REPO.getAll(
     @Suppress("REDUNDANT_INLINE_SUSPEND_FUNCTION_TYPE")
     crossinline methodCaller: suspend REPO.(Pagination) -> PaginationResult<Key>
 ): List<Pair<Key, Value>> = getAllWithNextPaging {

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/pagination/OneToManyPaginationExtensions.kt

@@ -2,9 +2,9 @@ package dev.inmo.micro_utils.repos.pagination
 
 import dev.inmo.micro_utils.pagination.*
 import dev.inmo.micro_utils.pagination.utils.getAllWithNextPaging
-import dev.inmo.micro_utils.repos.ReadKeyValuesRepo
+import dev.inmo.micro_utils.repos.ReadOneToManyKeyValueRepo
 
-suspend inline fun <Key, Value, REPO : ReadKeyValuesRepo<Key, Value>> REPO.getAll(
+suspend inline fun <Key, Value, REPO : ReadOneToManyKeyValueRepo<Key, Value>> REPO.getAll(
     @Suppress("REDUNDANT_INLINE_SUSPEND_FUNCTION_TYPE")
     crossinline methodCaller: suspend REPO.(Pagination) -> PaginationResult<Key>
 ): List<Pair<Key, List<Value>>> = getAllWithNextPaging {

repos/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/versions/KeyValueBasedVersionsRepoProxy.kt

@@ -1,10 +1,10 @@
 package dev.inmo.micro_utils.repos.versions
 
-import dev.inmo.micro_utils.repos.KeyValueRepo
+import dev.inmo.micro_utils.repos.StandardKeyValueRepo
 import dev.inmo.micro_utils.repos.set
 
 class KeyValueBasedVersionsRepoProxy<T>(
-    private val keyValueStore: KeyValueRepo<String, Int>,
+    private val keyValueStore: StandardKeyValueRepo<String, Int>,
     override val database: T
 ) : StandardVersionsRepoProxy<T> {
     override suspend fun getTableVersion(tableName: String): Int? = keyValueStore.get(tableName)

repos/common/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/FileStandardKeyValueRepo.kt

@@ -13,12 +13,9 @@ import java.nio.file.StandardWatchEventKinds.*
 private inline val String.isAbsolute
     get() = startsWith(File.separator)
 
-@Deprecated("Renamed", ReplaceWith("FileReadKeyValueRepo", "dev.inmo.micro_utils.repos.FileReadKeyValueRepo"))
-typealias FileReadStandardKeyValueRepo = FileReadKeyValueRepo
-
-class FileReadKeyValueRepo(
+class FileReadStandardKeyValueRepo(
     private val folder: File
-) : ReadKeyValueRepo<String, File> {
+) : ReadStandardKeyValueRepo<String, File> {
     init {
         folder.mkdirs()
     }
@@ -82,17 +79,14 @@ class FileReadKeyValueRepo(
     override suspend fun count(): Long = folder.list() ?.size ?.toLong() ?: 0L
 }
 
-@Deprecated("Renamed", ReplaceWith("FileWriteKeyValueRepo", "dev.inmo.micro_utils.repos.FileWriteKeyValueRepo"))
-typealias FileWriteStandardKeyValueRepo = FileWriteKeyValueRepo
-
 /**
  * Files watching will not correctly works on Android with version of API lower than API 26
  */
 @Warning("Files watching will not correctly works on Android Platform with version of API lower than API 26")
-class FileWriteKeyValueRepo(
+class FileWriteStandardKeyValueRepo(
     private val folder: File,
     filesChangedProcessingScope: CoroutineScope? = null
-) : WriteKeyValueRepo<String, File> {
+) : WriteStandardKeyValueRepo<String, File> {
     private val _onNewValue = MutableSharedFlow<Pair<String, File>>()
     override val onNewValue: Flow<Pair<String, File>> = _onNewValue.asSharedFlow()
     private val _onValueRemoved = MutableSharedFlow<String>()
@@ -180,15 +174,12 @@ class FileWriteKeyValueRepo(
     }
 }
 
-@Deprecated("Renamed", ReplaceWith("FileKeyValueRepo", "dev.inmo.micro_utils.repos.FileKeyValueRepo"))
-typealias FileStandardKeyValueRepo = FileKeyValueRepo
-
 @Warning("Files watching will not correctly works on Android Platform with version of API lower than API 26")
 @Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
-class FileKeyValueRepo(
+class FileStandardKeyValueRepo(
     folder: File,
     filesChangedProcessingScope: CoroutineScope? = null
-) : KeyValueRepo<String, File>,
-    WriteKeyValueRepo<String, File> by FileWriteKeyValueRepo(folder, filesChangedProcessingScope),
-    ReadKeyValueRepo<String, File> by FileReadKeyValueRepo(folder) {
+) : StandardKeyValueRepo<String, File>,
+    WriteStandardKeyValueRepo<String, File> by FileWriteStandardKeyValueRepo(folder, filesChangedProcessingScope),
+    ReadStandardKeyValueRepo<String, File> by FileReadStandardKeyValueRepo(folder) {
 }

repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/crud/AbstractAndroidCRUDRepo.kt

@@ -12,7 +12,7 @@ val <T> T.asId: String
 
 abstract class AbstractAndroidCRUDRepo<ObjectType, IdType>(
     protected val helper: StandardSQLHelper
-) : ReadCRUDRepo<ObjectType, IdType> {
+) : ReadStandardCRUDRepo<ObjectType, IdType> {
     protected abstract val tableName: String
     protected abstract val idColumnName: String
     protected abstract suspend fun Cursor.toObject(): ObjectType
@@ -64,4 +64,4 @@ abstract class AbstractAndroidCRUDRepo<ObjectType, IdType>(
             }
         }
     }
-}
+}

repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/crud/AbstractMutableAndroidCRUDRepo.kt

@@ -9,9 +9,9 @@ abstract class AbstractMutableAndroidCRUDRepo<ObjectType, IdType, InputValueType
     helper: StandardSQLHelper,
     replyInFlows: Int = 0,
     extraBufferCapacityInFlows: Int = 64
-) : WriteCRUDRepo<ObjectType, IdType, InputValueType>,
+) : WriteStandardCRUDRepo<ObjectType, IdType, InputValueType>,
     AbstractAndroidCRUDRepo<ObjectType, IdType>(helper),
-    CRUDRepo<ObjectType, IdType, InputValueType> {
+    StandardCRUDRepo<ObjectType, IdType, InputValueType> {
     protected val newObjectsChannel = MutableSharedFlow<ObjectType>(replyInFlows, extraBufferCapacityInFlows)
     protected val updateObjectsChannel = MutableSharedFlow<ObjectType>(replyInFlows, extraBufferCapacityInFlows)
     protected val deleteObjectsIdsChannel = MutableSharedFlow<IdType>(replyInFlows, extraBufferCapacityInFlows)

repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/keyvalue/KeyValueStore.kt

@@ -7,7 +7,7 @@ import dev.inmo.micro_utils.pagination.Pagination
 import dev.inmo.micro_utils.pagination.PaginationResult
 import dev.inmo.micro_utils.pagination.utils.paginate
 import dev.inmo.micro_utils.pagination.utils.reverse
-import dev.inmo.micro_utils.repos.KeyValueRepo
+import dev.inmo.micro_utils.repos.StandardKeyValueRepo
 import kotlinx.coroutines.flow.*
 
 private val cache = HashMap<String, KeyValueStore<*>>()
@@ -15,7 +15,7 @@ private val cache = HashMap<String, KeyValueStore<*>>()
 fun <T : Any> Context.keyValueStore(
     name: String = "default",
     cacheValues: Boolean = false
-): KeyValueRepo<String, T> {
+): StandardKeyValueRepo<String, T> {
     @Suppress("UNCHECKED_CAST")
     return cache.getOrPut(name) {
         KeyValueStore<T>(this, name, cacheValues)
@@ -26,7 +26,7 @@ class KeyValueStore<T : Any> internal constructor (
     c: Context,
     preferencesName: String,
     useCache: Boolean = false
-) : SharedPreferences.OnSharedPreferenceChangeListener, KeyValueRepo<String, T> {
+) : SharedPreferences.OnSharedPreferenceChangeListener, StandardKeyValueRepo<String, T> {
     private val sharedPreferences = c.getSharedPreferences(preferencesName, Context.MODE_PRIVATE)
 
     private val cachedData = if (useCache) {

repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/onetomany/OneToManyAndroidRepo.kt

@@ -9,6 +9,7 @@ import dev.inmo.micro_utils.repos.*
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import kotlinx.coroutines.runBlocking
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.json.Json
 
@@ -25,7 +26,7 @@ class OneToManyAndroidRepo<Key, Value>(
     private val keyFromString: String.() -> Key,
     private val valueFromString: String.() -> Value,
     private val helper: SQLiteOpenHelper
-) : KeyValuesRepo<Key, Value> {
+) : OneToManyKeyValueRepo<Key, Value> {
     private val _onNewValue: MutableSharedFlow<Pair<Key, Value>> = MutableSharedFlow()
     override val onNewValue: Flow<Pair<Key, Value>> = _onNewValue.asSharedFlow()
     private val _onValueRemoved: MutableSharedFlow<Pair<Key, Value>> = MutableSharedFlow()

repos/common/src/main/kotlin/dev/inmo/micro_utils/repos/versions/AndroidSharedPreferencesStandardVersionsRepoProxy.kt

@@ -4,11 +4,13 @@ package dev.inmo.micro_utils.repos.versions
 
 import android.content.Context
 import android.database.sqlite.SQLiteOpenHelper
+import androidx.core.content.contentValuesOf
 import dev.inmo.micro_utils.repos.*
 import dev.inmo.micro_utils.repos.keyvalue.keyValueStore
+import kotlinx.coroutines.runBlocking
 
 /**
- * Will create [VersionsRepo] based on [T], but versions will be stored in [KeyValueRepo]
+ * Will create [VersionsRepo] based on [T], but versions will be stored in [StandardKeyValueRepo]
  *
  * @receiver Will be used to create [KeyValueBasedVersionsRepoProxy] via [keyValueStore] and pass it to [StandardVersionsRepo]
  *
@@ -24,9 +26,9 @@ inline fun <T> Context.versionsKeyValueRepo(
     )
 )
 /**
- * Will create [VersionsRepo] based on [SQLiteOpenHelper], but versions will be stored in [KeyValueRepo]
+ * Will create [VersionsRepo] based on [SQLiteOpenHelper], but versions will be stored in [StandardKeyValueRepo]
  *
- * @receiver Will be used to create [KeyValueRepo] via [keyValueStore] and pass it to [StandardVersionsRepo]
+ * @receiver Will be used to create [StandardKeyValueRepo] via [keyValueStore] and pass it to [StandardVersionsRepo]
  *
  * @see [keyValueStore]
  */
@@ -35,9 +37,9 @@ inline fun Context.versionsKeyValueRepoForSQL(
 ) = versionsKeyValueRepo(database)
 
 /**
- * Will create [VersionsRepo] based on [SQLiteOpenHelper], but versions will be stored in [KeyValueRepo]
+ * Will create [VersionsRepo] based on [SQLiteOpenHelper], but versions will be stored in [StandardKeyValueRepo]
  *
- * @param context Will be used to create [KeyValueRepo] via [keyValueStore] and pass it to [StandardVersionsRepo]
+ * @param context Will be used to create [StandardKeyValueRepo] via [keyValueStore] and pass it to [StandardVersionsRepo]
  *
  * @see [keyValueStore]
  */

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

@@ -1,6 +1,6 @@
 package dev.inmo.micro_utils.repos.exposed
 
-import dev.inmo.micro_utils.repos.CRUDRepo
+import dev.inmo.micro_utils.repos.StandardCRUDRepo
 
 abstract class AbstractExposedCRUDRepo<ObjectType, IdType, InputValueType>(
     flowsChannelsSize: Int = 0,
@@ -11,4 +11,4 @@ abstract class AbstractExposedCRUDRepo<ObjectType, IdType, InputValueType>(
         tableName
     ),
     ExposedCRUDRepo<ObjectType, IdType>,
-    CRUDRepo<ObjectType, IdType, InputValueType>
+    StandardCRUDRepo<ObjectType, IdType, InputValueType>

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

@@ -1,14 +1,14 @@
 package dev.inmo.micro_utils.repos.exposed
 
 import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.ReadCRUDRepo
+import dev.inmo.micro_utils.repos.ReadStandardCRUDRepo
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.transactions.transaction
 
 abstract class AbstractExposedReadCRUDRepo<ObjectType, IdType>(
     tableName: String
 ) :
-    ReadCRUDRepo<ObjectType, IdType>,
+    ReadStandardCRUDRepo<ObjectType, IdType>,
     ExposedCRUDRepo<ObjectType, IdType>,
     Table(tableName)
 {

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

@@ -1,7 +1,7 @@
 package dev.inmo.micro_utils.repos.exposed
 
 import dev.inmo.micro_utils.repos.UpdatedValuePair
-import dev.inmo.micro_utils.repos.WriteCRUDRepo
+import dev.inmo.micro_utils.repos.WriteStandardCRUDRepo
 import kotlinx.coroutines.flow.*
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.statements.InsertStatement
@@ -15,7 +15,7 @@ abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>(
 ) :
     AbstractExposedReadCRUDRepo<ObjectType, IdType>(tableName),
     ExposedCRUDRepo<ObjectType, IdType>,
-    WriteCRUDRepo<ObjectType, IdType, InputValueType>
+    WriteStandardCRUDRepo<ObjectType, IdType, InputValueType>
 {
     protected val _newObjectsFlow = MutableSharedFlow<ObjectType>(replyCacheInFlows, flowsChannelsSize)
     protected val _updatedObjectsFlow = MutableSharedFlow<ObjectType>(replyCacheInFlows, flowsChannelsSize)

repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedKeyValueRepo.kt

@@ -1,7 +1,9 @@
 package dev.inmo.micro_utils.repos.exposed.keyvalue
 
-import dev.inmo.micro_utils.repos.KeyValueRepo
+import dev.inmo.micro_utils.repos.StandardKeyValueRepo
 import dev.inmo.micro_utils.repos.exposed.ColumnAllocator
+import dev.inmo.micro_utils.repos.exposed.initTable
+import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.*
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.transactions.transaction
@@ -11,7 +13,7 @@ open class ExposedKeyValueRepo<Key, Value>(
     keyColumnAllocator: ColumnAllocator<Key>,
     valueColumnAllocator: ColumnAllocator<Value>,
     tableName: String? = null
-) : KeyValueRepo<Key, Value>, ExposedReadKeyValueRepo<Key, Value>(
+) : StandardKeyValueRepo<Key, Value>, ExposedReadKeyValueRepo<Key, Value>(
     database,
     keyColumnAllocator,
     valueColumnAllocator,

repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/keyvalue/ExposedReadKeyValueRepo.kt

@@ -1,7 +1,7 @@
 package dev.inmo.micro_utils.repos.exposed.keyvalue
 
 import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.ReadKeyValueRepo
+import dev.inmo.micro_utils.repos.ReadStandardKeyValueRepo
 import dev.inmo.micro_utils.repos.exposed.*
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.transactions.transaction
@@ -11,7 +11,7 @@ open class ExposedReadKeyValueRepo<Key, Value>(
     keyColumnAllocator: ColumnAllocator<Key>,
     valueColumnAllocator: ColumnAllocator<Value>,
     tableName: String? = null
-) : ReadKeyValueRepo<Key, Value>, ExposedRepo, Table(tableName ?: "") {
+) : ReadStandardKeyValueRepo<Key, Value>, ExposedRepo, Table(tableName ?: "") {
     val keyColumn: Column<Key> = keyColumnAllocator()
     val valueColumn: Column<Value> = valueColumnAllocator()
     override val primaryKey: PrimaryKey = PrimaryKey(keyColumn, valueColumn)

repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedOneToManyKeyValueRepo.kt

@@ -1,18 +1,18 @@
 package dev.inmo.micro_utils.repos.exposed.onetomany
 
-import dev.inmo.micro_utils.repos.KeyValuesRepo
+import dev.inmo.micro_utils.repos.OneToManyKeyValueRepo
 import dev.inmo.micro_utils.repos.exposed.ColumnAllocator
 import kotlinx.coroutines.flow.*
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.transactions.transaction
 
-typealias ExposedOneToManyKeyValueRepo1<Key, Value> = ExposedKeyValuesRepo<Key, Value>
-open class ExposedKeyValuesRepo<Key, Value>(
+typealias ExposedKeyValuesRepo<Key, Value> = ExposedOneToManyKeyValueRepo<Key, Value>
+open class ExposedOneToManyKeyValueRepo<Key, Value>(
     database: Database,
     keyColumnAllocator: ColumnAllocator<Key>,
     valueColumnAllocator: ColumnAllocator<Value>,
     tableName: String? = null
-) : KeyValuesRepo<Key, Value>, ExposedReadKeyValuesRepo<Key, Value>(
+) : OneToManyKeyValueRepo<Key, Value>, ExposedReadOneToManyKeyValueRepo<Key, Value>(
     database,
     keyColumnAllocator,
     valueColumnAllocator,

repos/exposed/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/exposed/onetomany/ExposedReadOneToManyKeyValueRepo.kt

@@ -1,19 +1,20 @@
 package dev.inmo.micro_utils.repos.exposed.onetomany
 
 import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.ReadKeyValuesRepo
+import dev.inmo.micro_utils.repos.ReadOneToManyKeyValueRepo
 import dev.inmo.micro_utils.repos.exposed.*
+import dev.inmo.micro_utils.repos.exposed.keyvalue.ExposedReadKeyValueRepo
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.transactions.transaction
 
-typealias ExposedReadOneToManyKeyValueRepo<Key, Value> = ExposedReadKeyValuesRepo<Key, Value>
+typealias ExposedReadKeyValuesRepo<Key, Value> = ExposedReadOneToManyKeyValueRepo<Key, Value>
 
-open class ExposedReadKeyValuesRepo<Key, Value>(
+open class ExposedReadOneToManyKeyValueRepo<Key, Value>(
     override val database: Database,
     keyColumnAllocator: ColumnAllocator<Key>,
     valueColumnAllocator: ColumnAllocator<Value>,
     tableName: String? = null
-) : ReadKeyValuesRepo<Key, Value>, ExposedRepo, Table(tableName ?: "") {
+) : ReadOneToManyKeyValueRepo<Key, Value>, ExposedRepo, Table(tableName ?: "") {
     val keyColumn: Column<Key> = keyColumnAllocator()
     val valueColumn: Column<Value> = valueColumnAllocator()
 

repos/inmemory/src/commonMain/kotlin/dev/inmo/micro_utils/repos/MapCRUDRepo.kt

@@ -5,7 +5,7 @@ import kotlinx.coroutines.flow.*
 
 class ReadMapCRUDRepo<ObjectType, IdType>(
     private val map: Map<IdType, ObjectType> = emptyMap()
-) : ReadCRUDRepo<ObjectType, IdType> {
+) : ReadStandardCRUDRepo<ObjectType, IdType> {
     override suspend fun getByPagination(pagination: Pagination): PaginationResult<ObjectType> {
         return map.keys.drop(pagination.firstIndex).take(pagination.size).mapNotNull {
             map[it]
@@ -24,7 +24,7 @@ class ReadMapCRUDRepo<ObjectType, IdType>(
 
 abstract class WriteMapCRUDRepo<ObjectType, IdType, InputValueType>(
     protected val map: MutableMap<IdType, ObjectType> = mutableMapOf()
-) : WriteCRUDRepo<ObjectType, IdType, InputValueType> {
+) : WriteStandardCRUDRepo<ObjectType, IdType, InputValueType> {
     protected val _newObjectsFlow: MutableSharedFlow<ObjectType> = MutableSharedFlow()
     override val newObjectsFlow: Flow<ObjectType> = _newObjectsFlow.asSharedFlow()
     protected val _updatedObjectsFlow: MutableSharedFlow<ObjectType> = MutableSharedFlow()
@@ -68,30 +68,25 @@ abstract class WriteMapCRUDRepo<ObjectType, IdType, InputValueType>(
 
 abstract class MapCRUDRepo<ObjectType, IdType, InputValueType>(
     map: MutableMap<IdType, ObjectType>
-) : CRUDRepo<ObjectType, IdType, InputValueType>,
-    ReadCRUDRepo<ObjectType, IdType> by ReadMapCRUDRepo(map),
+) : StandardCRUDRepo<ObjectType, IdType, InputValueType>,
+    ReadStandardCRUDRepo<ObjectType, IdType> by ReadMapCRUDRepo(map),
     WriteMapCRUDRepo<ObjectType, IdType, InputValueType>(map)
 
 fun <ObjectType, IdType, InputValueType> MapCRUDRepo(
     map: MutableMap<IdType, ObjectType>,
-    updateCallback: suspend MutableMap<IdType, ObjectType>.(newValue: InputValueType, id: IdType, old: ObjectType) -> ObjectType,
-    createCallback: suspend MutableMap<IdType, ObjectType>.(newValue: InputValueType) -> Pair<IdType, ObjectType>
+    updateCallback: suspend (newValue: InputValueType, id: IdType, old: ObjectType) -> ObjectType,
+    createCallback: suspend (newValue: InputValueType) -> Pair<IdType, ObjectType>
 ) = object : MapCRUDRepo<ObjectType, IdType, InputValueType>(map) {
     override suspend fun updateObject(
         newValue: InputValueType,
         id: IdType,
         old: ObjectType
-    ): ObjectType = map.updateCallback(newValue, id, old)
+    ): ObjectType = updateCallback(newValue, id, old)
 
-    override suspend fun createObject(newValue: InputValueType): Pair<IdType, ObjectType> = map.createCallback(newValue)
+    override suspend fun createObject(newValue: InputValueType): Pair<IdType, ObjectType> = createCallback(newValue)
 }
 
-fun <ObjectType, IdType, InputValueType> MapCRUDRepo(
-    updateCallback: suspend MutableMap<IdType, ObjectType>.(newValue: InputValueType, id: IdType, old: ObjectType) -> ObjectType,
-    createCallback: suspend MutableMap<IdType, ObjectType>.(newValue: InputValueType) -> Pair<IdType, ObjectType>
-) = MapCRUDRepo(mutableMapOf(), updateCallback, createCallback)
-
 fun <ObjectType, IdType, InputValueType> MutableMap<IdType, ObjectType>.asCrudRepo(
-    updateCallback: suspend MutableMap<IdType, ObjectType>.(newValue: InputValueType, id: IdType, old: ObjectType) -> ObjectType,
-    createCallback: suspend MutableMap<IdType, ObjectType>.(newValue: InputValueType) -> Pair<IdType, ObjectType>
+    updateCallback: suspend (newValue: InputValueType, id: IdType, old: ObjectType) -> ObjectType,
+    createCallback: suspend (newValue: InputValueType) -> Pair<IdType, ObjectType>
 ) = MapCRUDRepo(this, updateCallback, createCallback)

repos/inmemory/src/commonMain/kotlin/dev/inmo/micro_utils/repos/MapKeyValueRepo.kt

@@ -9,7 +9,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow
 
 class ReadMapKeyValueRepo<Key, Value>(
     protected val map: Map<Key, Value> = emptyMap()
-) : ReadKeyValueRepo<Key, Value> {
+) : ReadStandardKeyValueRepo<Key, Value> {
     override suspend fun get(k: Key): Value? = map[k]
 
     override suspend fun values(
@@ -58,7 +58,7 @@ class ReadMapKeyValueRepo<Key, Value>(
 
 class WriteMapKeyValueRepo<Key, Value>(
     private val map: MutableMap<Key, Value> = mutableMapOf()
-) : WriteKeyValueRepo<Key, Value> {
+) : WriteStandardKeyValueRepo<Key, Value> {
     private val _onNewValue: MutableSharedFlow<Pair<Key, Value>> = MutableSharedFlow()
     override val onNewValue: Flow<Pair<Key, Value>>
         get() = _onNewValue
@@ -78,19 +78,19 @@ class WriteMapKeyValueRepo<Key, Value>(
     }
 
     override suspend fun unsetWithValues(toUnset: List<Value>) {
-        map.mapNotNull { (k, v) ->
-            k.takeIf { v in toUnset }
-        }.forEach {
-            map.remove(it)
-            _onValueRemoved.emit(it)
+        map.forEach {
+            if (it.value in toUnset) {
+                map.remove(it.key)
+                _onValueRemoved.emit(it.key)
+            }
         }
     }
 }
 
 class MapKeyValueRepo<Key, Value>(
     private val map: MutableMap<Key, Value> = mutableMapOf()
-) : KeyValueRepo<Key, Value>,
-    ReadKeyValueRepo<Key, Value> by ReadMapKeyValueRepo(map),
-    WriteKeyValueRepo<Key, Value> by WriteMapKeyValueRepo(map)
+) : StandardKeyValueRepo<Key, Value>,
+    ReadStandardKeyValueRepo<Key, Value> by ReadMapKeyValueRepo(map),
+    WriteStandardKeyValueRepo<Key, Value> by WriteMapKeyValueRepo(map)
 
-fun <K, V> MutableMap<K, V>.asKeyValueRepo(): KeyValueRepo<K, V> = MapKeyValueRepo(this)
+fun <K, V> MutableMap<K, V>.asKeyValueRepo(): StandardKeyValueRepo<K, V> = MapKeyValueRepo(this)

repos/inmemory/src/commonMain/kotlin/dev/inmo/micro_utils/repos/MapOneToManyKeyValueRepo.kt

@@ -5,11 +5,9 @@ import dev.inmo.micro_utils.pagination.utils.paginate
 import dev.inmo.micro_utils.pagination.utils.reverse
 import kotlinx.coroutines.flow.*
 
-@Deprecated("Renamed", ReplaceWith("MapReadKeyValuesRepo", "dev.inmo.micro_utils.repos.MapReadKeyValuesRepo"))
-typealias MapReadOneToManyKeyValueRepo<Key, Value> = MapReadKeyValuesRepo<Key, Value>
-class MapReadKeyValuesRepo<Key, Value>(
+class MapReadOneToManyKeyValueRepo<Key, Value>(
     private val map: Map<Key, List<Value>> = emptyMap()
-) : ReadKeyValuesRepo<Key, Value> {
+) : ReadOneToManyKeyValueRepo<Key, Value> {
     override suspend fun get(k: Key, pagination: Pagination, reversed: Boolean): PaginationResult<Value> {
         val list = map[k] ?: return emptyPaginationResult()
 
@@ -55,11 +53,9 @@ class MapReadKeyValuesRepo<Key, Value>(
     override suspend fun count(): Long = map.size.toLong()
 }
 
-@Deprecated("Renamed", ReplaceWith("MapWriteKeyValuesRepo", "dev.inmo.micro_utils.repos.MapWriteKeyValuesRepo"))
-typealias MapWriteOneToManyKeyValueRepo<Key, Value> = MapWriteKeyValuesRepo<Key, Value>
-class MapWriteKeyValuesRepo<Key, Value>(
+class MapWriteOneToManyKeyValueRepo<Key, Value>(
     private val map: MutableMap<Key, MutableList<Value>> = mutableMapOf()
-) : WriteKeyValuesRepo<Key, Value> {
+) : WriteOneToManyKeyValueRepo<Key, Value> {
     private val _onNewValue: MutableSharedFlow<Pair<Key, Value>> = MutableSharedFlow()
     override val onNewValue: Flow<Pair<Key, Value>> = _onNewValue.asSharedFlow()
     private val _onValueRemoved: MutableSharedFlow<Pair<Key, Value>> = MutableSharedFlow()
@@ -84,10 +80,6 @@ class MapWriteKeyValuesRepo<Key, Value>(
                     _onValueRemoved.emit(k to v)
                 }
             }
-            if (map[k] ?.isEmpty() == true) {
-                map.remove(k)
-                _onDataCleared.emit(k)
-            }
         }
     }
 
@@ -102,17 +94,12 @@ class MapWriteKeyValuesRepo<Key, Value>(
     }
 }
 
-@Deprecated("Renamed", ReplaceWith("MapKeyValuesRepo", "dev.inmo.micro_utils.repos.MapKeyValuesRepo"))
-typealias MapOneToManyKeyValueRepo1<Key, Value> = MapKeyValuesRepo<Key, Value>
-class MapKeyValuesRepo<Key, Value>(
+class MapOneToManyKeyValueRepo<Key, Value>(
     private val map: MutableMap<Key, MutableList<Value>> = mutableMapOf()
-) : KeyValuesRepo<Key, Value>,
-    ReadKeyValuesRepo<Key, Value> by MapReadKeyValuesRepo(map),
-    WriteKeyValuesRepo<Key, Value> by MapWriteKeyValuesRepo(map)
+) : OneToManyKeyValueRepo<Key, Value>,
+    ReadOneToManyKeyValueRepo<Key, Value> by MapReadOneToManyKeyValueRepo(map),
+    WriteOneToManyKeyValueRepo<Key, Value> by MapWriteOneToManyKeyValueRepo(map)
 
-fun <K, V> MutableMap<K, List<V>>.asKeyValuesRepo(): KeyValuesRepo<K, V> = MapKeyValuesRepo(
+fun <K, V> MutableMap<K, List<V>>.asOneToManyKeyValueRepo(): OneToManyKeyValueRepo<K, V> = MapOneToManyKeyValueRepo(
     map { (k, v) -> k to v.toMutableList() }.toMap().toMutableMap()
 )
-
-@Deprecated("Renamed", ReplaceWith("asKeyValuesRepo", "dev.inmo.micro_utils.repos.asKeyValuesRepo"))
-fun <K, V> MutableMap<K, List<V>>.asOneToManyKeyValueRepo(): KeyValuesRepo<K, V> = asKeyValuesRepo()

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorCRUDRepoClient.kt

@@ -1,121 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.crud
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.*
-import io.ktor.client.HttpClient
-import io.ktor.http.ContentType
-import io.ktor.util.reflect.TypeInfo
-import io.ktor.util.reflect.typeInfo
-import kotlinx.serialization.*
-
-class KtorCRUDRepoClient<ObjectType, IdType, InputValue> (
-    readDelegate: ReadCRUDRepo<ObjectType, IdType>,
-    writeDelegate: WriteCRUDRepo<ObjectType, IdType, InputValue>
-) : CRUDRepo<ObjectType, IdType, InputValue> by DelegateBasedCRUDRepo(
-    readDelegate,
-    writeDelegate
-) {
-    companion object {
-        inline operator fun <reified ObjectType, reified IdType, reified InputValue> invoke(
-            baseUrl: String,
-            httpClient: HttpClient,
-            objectTypeInfo: TypeInfo,
-            contentType: ContentType,
-            noinline idSerializer: suspend (IdType) -> String
-        ) = KtorCRUDRepoClient(
-            KtorReadCRUDRepoClient(
-                baseUrl,
-                httpClient,
-                objectTypeInfo,
-                contentType,
-                idSerializer
-            ),
-            KtorWriteCrudRepoClient<ObjectType, IdType, InputValue>(
-                baseUrl,
-                httpClient,
-                contentType
-            )
-        )
-
-        inline operator fun <reified ObjectType, reified IdType, reified InputValue> invoke(
-            baseUrl: String,
-            subpart: String,
-            httpClient: HttpClient,
-            objectTypeInfo: TypeInfo,
-            contentType: ContentType,
-            noinline idSerializer: suspend (IdType) -> String
-        ) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(
-            buildStandardUrl(baseUrl, subpart),
-            httpClient,
-            objectTypeInfo,
-            contentType,
-            idSerializer
-        )
-    }
-}
-
-
-inline fun <reified ObjectType, reified IdType, reified InputValue> KtorCRUDRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    noinline idSerializer: suspend (IdType) -> String
-) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(
-    baseUrl,
-    httpClient,
-    typeInfo<ObjectType>(),
-    contentType,
-    idSerializer
-)
-
-inline fun <reified ObjectType, reified IdType, reified InputValue> KtorCRUDRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: StringFormat,
-    contentType: ContentType,
-) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(baseUrl, httpClient, contentType) {
-    serialFormat.encodeToString(idsSerializer, it)
-}
-
-inline fun <reified ObjectType, reified IdType, reified InputValue> KtorCRUDRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: BinaryFormat,
-    contentType: ContentType,
-) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(baseUrl, httpClient, contentType) {
-    serialFormat.encodeHex(idsSerializer, it)
-}
-
-
-inline fun <reified ObjectType, reified IdType, reified InputValue> KtorCRUDRepoClient(
-    baseUrl: String,
-    subpart: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    noinline idSerializer: suspend (IdType) -> String
-) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(
-    buildStandardUrl(baseUrl, subpart),
-    httpClient,
-    contentType,
-    idSerializer
-)
-
-inline fun <reified ObjectType, reified IdType, reified InputValue> KtorCRUDRepoClient(
-    baseUrl: String,
-    subpart: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: StringFormat,
-    contentType: ContentType,
-) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(buildStandardUrl(baseUrl, subpart), httpClient, idsSerializer, serialFormat, contentType)
-
-inline fun <reified ObjectType, reified IdType, reified InputValue> KtorCRUDRepoClient(
-    baseUrl: String,
-    subpart: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: BinaryFormat,
-    contentType: ContentType,
-) = KtorCRUDRepoClient<ObjectType, IdType, InputValue>(buildStandardUrl(baseUrl, subpart), httpClient, idsSerializer, serialFormat, contentType)

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorReadCRUDRepoClient.kt

@@ -1,95 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.crud
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.ReadCRUDRepo
-import dev.inmo.micro_utils.repos.ktor.common.countRouting
-import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import dev.inmo.micro_utils.repos.ktor.common.idParameterName
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.request.get
-import io.ktor.http.*
-import io.ktor.util.reflect.TypeInfo
-import io.ktor.util.reflect.typeInfo
-import kotlinx.serialization.*
-
-class KtorReadCRUDRepoClient<ObjectType, IdType> (
-    private val baseUrl: String,
-    private val httpClient: HttpClient,
-    private val objectType: TypeInfo,
-    private val contentType: ContentType,
-    private val idSerializer: suspend (IdType) -> String
-) : ReadCRUDRepo<ObjectType, IdType> {
-    override suspend fun getByPagination(pagination: Pagination): PaginationResult<ObjectType> = httpClient.get(
-        buildStandardUrl(baseUrl, getByPaginationRouting, pagination.asUrlQueryParts)
-    ) {
-        contentType(contentType)
-    }.body()
-
-    override suspend fun getById(id: IdType): ObjectType? = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            getByIdRouting,
-            mapOf(
-                idParameterName to idSerializer(id)
-            )
-        )
-    ) {
-        contentType(contentType)
-    }.takeIf { it.status != HttpStatusCode.NoContent } ?.body<ObjectType>(objectType)
-
-    override suspend fun contains(id: IdType): Boolean = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            containsRouting,
-            mapOf(
-                idParameterName to idSerializer(id)
-            )
-        )
-    ) {
-        contentType(contentType)
-    }.body()
-
-    override suspend fun count(): Long = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            countRouting
-        )
-    ) {
-        contentType(contentType)
-    }.body()
-}
-
-inline fun <reified ObjectType, IdType> KtorReadCRUDRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    noinline idSerializer: suspend (IdType) -> String
-) = KtorReadCRUDRepoClient<ObjectType, IdType>(
-    baseUrl,
-    httpClient,
-    typeInfo<ObjectType>(),
-    contentType,
-    idSerializer
-)
-
-inline fun <reified ObjectType, IdType> KtorReadCRUDRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: StringFormat,
-    contentType: ContentType,
-) = KtorReadCRUDRepoClient<ObjectType, IdType>(baseUrl, httpClient, contentType) {
-    serialFormat.encodeToString(idsSerializer, it)
-}
-
-inline fun <reified ObjectType, IdType> KtorReadCRUDRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: BinaryFormat,
-    contentType: ContentType,
-) = KtorReadCRUDRepoClient<ObjectType, IdType>(baseUrl, httpClient, contentType) {
-    serialFormat.encodeHex(idsSerializer, it)
-}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorReadStandardCrudRepo.kt

@@ -3,22 +3,19 @@ package dev.inmo.micro_utils.repos.ktor.client.crud
 import dev.inmo.micro_utils.ktor.client.*
 import dev.inmo.micro_utils.ktor.common.*
 import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.ReadCRUDRepo
-import dev.inmo.micro_utils.repos.ktor.common.countRouting
+import dev.inmo.micro_utils.repos.ReadStandardCRUDRepo
 import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import dev.inmo.micro_utils.repos.ktor.common.idParameterName
 import io.ktor.client.HttpClient
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer
 
-@Deprecated("Use KtorReadCRUDRepoClient instead")
 class KtorReadStandardCrudRepo<ObjectType, IdType> (
     private val baseUrl: String,
     private val unifiedRequester: UnifiedRequester,
     private val objectsSerializer: KSerializer<ObjectType>,
     private val objectsSerializerNullable: KSerializer<ObjectType?>,
     private val idsSerializer: KSerializer<IdType>
-) : ReadCRUDRepo<ObjectType, IdType> {
+) : ReadStandardCRUDRepo<ObjectType, IdType> {
     private val paginationResultSerializer = PaginationResult.serializer(objectsSerializer)
 
     constructor(
@@ -41,7 +38,9 @@ class KtorReadStandardCrudRepo<ObjectType, IdType> (
         buildStandardUrl(
             baseUrl,
             getByIdRouting,
-            idParameterName to unifiedRequester.encodeUrlQueryValue(idsSerializer, id)
+            mapOf(
+                "id" to unifiedRequester.encodeUrlQueryValue(idsSerializer, id)
+            )
         ),
         objectsSerializerNullable
     )
@@ -50,7 +49,9 @@ class KtorReadStandardCrudRepo<ObjectType, IdType> (
         buildStandardUrl(
             baseUrl,
             containsRouting,
-            idParameterName to unifiedRequester.encodeUrlQueryValue(idsSerializer, id)
+            mapOf(
+                "id" to unifiedRequester.encodeUrlQueryValue(idsSerializer, id)
+            )
         ),
         Boolean.serializer()
     )

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorStandardCrudRepo.kt

@@ -7,7 +7,6 @@ import dev.inmo.micro_utils.repos.*
 import io.ktor.client.HttpClient
 import kotlinx.serialization.KSerializer
 
-@Deprecated("Use KtorCRUDRepoClient instead")
 class KtorStandardCrudRepo<ObjectType, IdType, InputValue> (
     baseUrl: String,
     baseSubpart: String,
@@ -16,15 +15,15 @@ class KtorStandardCrudRepo<ObjectType, IdType, InputValue> (
     objectsNullableSerializer: KSerializer<ObjectType?>,
     inputsSerializer: KSerializer<InputValue>,
     idsSerializer: KSerializer<IdType>
-) : CRUDRepo<ObjectType, IdType, InputValue>,
-    ReadCRUDRepo<ObjectType, IdType> by KtorReadStandardCrudRepo(
+) : StandardCRUDRepo<ObjectType, IdType, InputValue>,
+    ReadStandardCRUDRepo<ObjectType, IdType> by KtorReadStandardCrudRepo(
         "$baseUrl/$baseSubpart",
         unifiedRequester,
         objectsSerializer,
         objectsNullableSerializer,
         idsSerializer
     ),
-    WriteCRUDRepo<ObjectType, IdType, InputValue> by KtorWriteStandardCrudRepo(
+    WriteStandardCRUDRepo<ObjectType, IdType, InputValue> by KtorWriteStandardCrudRepo(
         "$baseUrl/$baseSubpart",
         unifiedRequester,
         objectsSerializer,

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorWriteCrudRepoClient.kt

@@ -1,85 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.crud
-
-import dev.inmo.micro_utils.ktor.client.*
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.UpdatedValuePair
-import dev.inmo.micro_utils.repos.WriteCRUDRepo
-import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.request.*
-import io.ktor.client.statement.HttpResponse
-import io.ktor.http.ContentType
-import io.ktor.http.contentType
-import kotlinx.coroutines.flow.Flow
-
-class KtorWriteCrudRepoClient<ObjectType, IdType, InputValue> (
-    private val baseUrl: String,
-    private val httpClient: HttpClient,
-    override val newObjectsFlow: Flow<ObjectType>,
-    override val updatedObjectsFlow: Flow<ObjectType>,
-    override val deletedObjectsIdsFlow: Flow<IdType>,
-    private val createSetup: suspend HttpRequestBuilder.(List<InputValue>) -> Unit,
-    private val updateSetup: suspend HttpRequestBuilder.(List<UpdatedValuePair<IdType, InputValue>>) -> Unit,
-    private val deleteByIdSetup: suspend HttpRequestBuilder.(List<IdType>) -> Unit,
-    private val createBodyGetter: suspend HttpResponse.() -> List<ObjectType>,
-    private val updateBodyGetter: suspend HttpResponse.() -> List<ObjectType>
-) : WriteCRUDRepo<ObjectType, IdType, InputValue> {
-    override suspend fun create(values: List<InputValue>): List<ObjectType> = httpClient.post(
-        buildStandardUrl(baseUrl, createRouting)
-    ) {
-        createSetup(values)
-    }.createBodyGetter()
-
-    override suspend fun update(
-        values: List<UpdatedValuePair<IdType, InputValue>>
-    ): List<ObjectType> = httpClient.post(
-        buildStandardUrl(baseUrl, updateRouting)
-    ) {
-        updateSetup(values)
-    }.updateBodyGetter()
-
-    override suspend fun update(id: IdType, value: InputValue): ObjectType? = update(listOf(id to value)).firstOrNull()
-
-    override suspend fun deleteById(ids: List<IdType>) {
-        httpClient.post(
-            buildStandardUrl(baseUrl, deleteByIdRouting)
-        ) {
-            deleteByIdSetup(ids)
-        }.throwOnUnsuccess { "Unable to delete $ids" }
-    }
-
-    companion object {
-        inline operator fun <reified ObjectType, reified IdType, reified InputValue> invoke(
-            baseUrl: String,
-            httpClient: HttpClient,
-            contentType: ContentType
-        ) = KtorWriteCrudRepoClient<ObjectType, IdType, InputValue>(
-            baseUrl,
-            httpClient,
-            httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, newObjectsFlowRouting),
-            ),
-            httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, updatedObjectsFlowRouting),
-            ),
-            httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, deletedObjectsIdsFlowRouting),
-            ),
-            {
-                contentType(contentType)
-                setBody(it)
-            },
-            {
-                contentType(contentType)
-                setBody(it)
-            },
-            {
-                contentType(contentType)
-                setBody(it)
-            },
-            { body() },
-            { body() }
-        )
-    }
-}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/crud/KtorWriteStandardCrudRepo.kt

@@ -3,14 +3,13 @@ package dev.inmo.micro_utils.repos.ktor.client.crud
 import dev.inmo.micro_utils.ktor.client.*
 import dev.inmo.micro_utils.ktor.common.*
 import dev.inmo.micro_utils.repos.UpdatedValuePair
-import dev.inmo.micro_utils.repos.WriteCRUDRepo
+import dev.inmo.micro_utils.repos.WriteStandardCRUDRepo
 import dev.inmo.micro_utils.repos.ktor.common.crud.*
 import io.ktor.client.HttpClient
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*
 
-@Deprecated("Use KtorWriteCRUDRepoClient instead")
 class KtorWriteStandardCrudRepo<ObjectType, IdType, InputValue> (
     private val baseUrl: String,
     private val unifiedRequester: UnifiedRequester,
@@ -18,7 +17,7 @@ class KtorWriteStandardCrudRepo<ObjectType, IdType, InputValue> (
     private val objectsNullableSerializer: KSerializer<ObjectType?>,
     private val inputsSerializer: KSerializer<InputValue>,
     private val idsSerializer: KSerializer<IdType>
-) : WriteCRUDRepo<ObjectType, IdType, InputValue> {
+) : WriteStandardCRUDRepo<ObjectType, IdType, InputValue> {
     private val listObjectsSerializer = ListSerializer(objectsSerializer)
     private val listInputSerializer = ListSerializer(inputsSerializer)
     private val listIdsSerializer = ListSerializer(idsSerializer)

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key/value/KtorKeyValueRepoClient.kt

@@ -1,85 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.key.value
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.*
-import io.ktor.client.HttpClient
-import io.ktor.http.ContentType
-import io.ktor.http.encodeURLQueryComponent
-import kotlinx.serialization.*
-
-class KtorKeyValueRepoClient<Key, Value> (
-    readDelegate: ReadKeyValueRepo<Key, Value>,
-    writeDelegate: WriteKeyValueRepo<Key, Value>
-) : KeyValueRepo<Key, Value> by DelegateBasedKeyValueRepo(
-    readDelegate,
-    writeDelegate
-) {
-    companion object {
-        inline operator fun <reified Key, reified Value> invoke(
-            baseUrl: String,
-            httpClient: HttpClient,
-            contentType: ContentType,
-            noinline idSerializer: suspend (Key) -> String,
-            noinline valueSerializer: suspend (Value) -> String
-        ) = KtorKeyValueRepoClient(
-            KtorReadKeyValueRepoClient(
-                baseUrl, httpClient, contentType, idSerializer, valueSerializer
-            ),
-            KtorWriteKeyValueRepoClient(
-                baseUrl,
-                httpClient,
-                contentType
-            )
-        )
-        inline operator fun <reified Key, reified Value> invoke(
-            baseUrl: String,
-            subpart: String,
-            httpClient: HttpClient,
-            contentType: ContentType,
-            noinline idSerializer: suspend (Key) -> String,
-            noinline valueSerializer: suspend (Value) -> String
-        ) = KtorKeyValueRepoClient(
-            buildStandardUrl(baseUrl, subpart),
-            httpClient,
-            contentType,
-            idSerializer,
-            valueSerializer
-        )
-    }
-}
-
-inline fun <reified Key, reified Value> KtorKeyValueRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    idSerializer: SerializationStrategy<Key>,
-    valueSerializer: SerializationStrategy<Value>,
-    serialFormat: StringFormat,
-) = KtorKeyValueRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    {
-        serialFormat.encodeToString(idSerializer, it).encodeURLQueryComponent()
-    }
-) {
-    serialFormat.encodeToString(valueSerializer, it).encodeURLQueryComponent()
-}
-
-inline fun <reified Key, reified Value> KtorKeyValueRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    idSerializer: SerializationStrategy<Key>,
-    valueSerializer: SerializationStrategy<Value>,
-    serialFormat: BinaryFormat,
-) = KtorKeyValueRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    {
-        serialFormat.encodeHex(idSerializer, it)
-    }
-) {
-    serialFormat.encodeHex(valueSerializer, it)
-}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key/value/KtorReadKeyValueRepoClient.kt

@@ -1,144 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.key.value
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.ReadKeyValueRepo
-import dev.inmo.micro_utils.repos.ktor.common.*
-import dev.inmo.micro_utils.repos.ktor.common.containsRoute
-import dev.inmo.micro_utils.repos.ktor.common.keyParameterName
-import dev.inmo.micro_utils.repos.ktor.common.key_value.*
-import dev.inmo.micro_utils.repos.ktor.common.reversedParameterName
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.request.get
-import io.ktor.http.*
-import io.ktor.util.reflect.TypeInfo
-import io.ktor.util.reflect.typeInfo
-import kotlinx.serialization.*
-
-class KtorReadKeyValueRepoClient<Key, Value>(
-    private val baseUrl: String,
-    private val httpClient: HttpClient,
-    private val contentType: ContentType,
-    private val objectType: TypeInfo,
-    private val paginationResultObjectsTypeInfo: TypeInfo,
-    private val paginationResultIdsTypeInfo: TypeInfo,
-    private val idSerializer: suspend (Key) -> String,
-    private val valueSerializer: suspend (Value) -> String
-) : ReadKeyValueRepo<Key, Value> {
-    override suspend fun get(k: Key): Value? = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            getRoute,
-            mapOf(
-                keyParameterName to idSerializer(k)
-            )
-        )
-    ) {
-        contentType(contentType)
-    }.takeIf { it.status != HttpStatusCode.NoContent } ?.body<Value>(objectType)
-
-    override suspend fun contains(key: Key): Boolean = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            containsRoute,
-            keyParameterName to idSerializer(key)
-        )
-    ) {
-        contentType(contentType)
-    }.body()
-
-    override suspend fun values(
-        pagination: Pagination,
-        reversed: Boolean
-    ): PaginationResult<Value> = httpClient.get(
-        buildStandardUrl(baseUrl, valuesRoute, pagination.asUrlQueryParts + (reversedParameterName to reversed.toString()))
-    ) {
-        contentType(contentType)
-    }.body(paginationResultObjectsTypeInfo)
-
-    override suspend fun keys(
-        pagination: Pagination,
-        reversed: Boolean
-    ): PaginationResult<Key> = httpClient.get(
-        buildStandardUrl(baseUrl, keysRoute, pagination.asUrlQueryParts + (reversedParameterName to reversed.toString()))
-    ) {
-        contentType(contentType)
-    }.body(paginationResultIdsTypeInfo)
-
-    override suspend fun keys(
-        v: Value,
-        pagination: Pagination,
-        reversed: Boolean
-    ): PaginationResult<Key> = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            keysRoute,
-            pagination.asUrlQueryParts + (reversedParameterName to reversed.toString()) + (valueParameterName to valueSerializer(v))
-        )
-    ) {
-        contentType(contentType)
-    }.body(paginationResultIdsTypeInfo)
-
-    override suspend fun count(): Long = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            dev.inmo.micro_utils.repos.ktor.common.countRoute
-        )
-    ) {
-        contentType(contentType)
-    }.body()
-}
-
-inline fun <reified Key, reified Value> KtorReadKeyValueRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    noinline idSerializer: suspend (Key) -> String,
-    noinline valueSerializer: suspend (Value) -> String
-) = KtorReadKeyValueRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    typeInfo<Value>(),
-    typeInfo<PaginationResult<Value>>(),
-    typeInfo<PaginationResult<Key>>(),
-    idSerializer,
-    valueSerializer
-)
-
-inline fun <reified Key, reified Value> KtorReadKeyValueRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<Key>,
-    valueSerializer: KSerializer<Value>,
-    serialFormat: StringFormat,
-    contentType: ContentType,
-) = KtorReadKeyValueRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    {
-        serialFormat.encodeToString(idsSerializer, it).encodeURLQueryComponent()
-    }
-) {
-    serialFormat.encodeToString(valueSerializer, it).encodeURLQueryComponent()
-}
-
-inline fun <reified Key, reified Value> KtorReadKeyValueRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<Key>,
-    valuesSerializer: KSerializer<Value>,
-    serialFormat: BinaryFormat,
-    contentType: ContentType,
-) = KtorReadKeyValueRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    {
-        serialFormat.encodeHex(idsSerializer, it)
-    }
-) {
-    serialFormat.encodeHex(valuesSerializer, it)
-}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key/value/KtorWriteKeyValueRepoClient.kt

@@ -1,79 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.key.value
-
-import dev.inmo.micro_utils.ktor.client.createStandardWebsocketFlow
-import dev.inmo.micro_utils.ktor.client.throwOnUnsuccess
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.WriteKeyValueRepo
-import dev.inmo.micro_utils.repos.ktor.common.key_value.*
-import io.ktor.client.HttpClient
-import io.ktor.client.request.post
-import io.ktor.http.*
-import io.ktor.util.InternalAPI
-import io.ktor.util.reflect.TypeInfo
-import io.ktor.util.reflect.typeInfo
-import kotlinx.coroutines.flow.Flow
-
-class KtorWriteKeyValueRepoClient<Key, Value>(
-    private val baseUrl: String,
-    private val httpClient: HttpClient,
-    private val contentType: ContentType,
-    override val onNewValue: Flow<Pair<Key, Value>>,
-    override val onValueRemoved: Flow<Key>,
-    private val idsListTypeInfo: TypeInfo,
-    private val objectsListTypeInfo: TypeInfo,
-    private val idsToObjectsMapTypeInfo: TypeInfo
-) : WriteKeyValueRepo<Key, Value> {
-    @OptIn(InternalAPI::class)
-    override suspend fun unsetWithValues(toUnset: List<Value>) {
-        httpClient.post(
-            buildStandardUrl(baseUrl, unsetWithValuesRoute)
-        ) {
-            body = toUnset
-            bodyType = objectsListTypeInfo
-            contentType(contentType)
-        }.throwOnUnsuccess { "Unable to unset data with values $toUnset" }
-    }
-
-    @OptIn(InternalAPI::class)
-    override suspend fun unset(toUnset: List<Key>) {
-        httpClient.post(
-            buildStandardUrl(baseUrl, unsetRoute)
-        ) {
-            body = toUnset
-            bodyType = idsListTypeInfo
-            contentType(contentType)
-        }.throwOnUnsuccess { "Unable to unset $toUnset" }
-    }
-
-    @OptIn(InternalAPI::class)
-    override suspend fun set(toSet: Map<Key, Value>) {
-        httpClient.post(
-            buildStandardUrl(baseUrl, setRoute)
-        ) {
-            body = toSet
-            bodyType = idsToObjectsMapTypeInfo
-            contentType(contentType)
-        }.throwOnUnsuccess { "Unable to set $toSet" }
-    }
-
-    companion object {
-        inline operator fun <reified Key, reified Value> invoke(
-            baseUrl: String,
-            httpClient: HttpClient,
-            contentType: ContentType
-        ) = KtorWriteKeyValueRepoClient<Key, Value>(
-            baseUrl,
-            httpClient,
-            contentType,
-            httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onNewValueRoute),
-            ),
-            httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onValueRemovedRoute),
-            ),
-            typeInfo<List<Key>>(),
-            typeInfo<List<Value>>(),
-            typeInfo<Map<Key, Value>>()
-        )
-    }
-}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key/values/KtorKeyValuesRepoClient.kt

@@ -1,89 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.key.values
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.*
-import io.ktor.client.HttpClient
-import io.ktor.http.ContentType
-import io.ktor.http.encodeURLQueryComponent
-import kotlinx.serialization.*
-
-class KtorKeyValuesRepoClient<Key, Value> (
-    readDelegate: ReadKeyValuesRepo<Key, Value>,
-    writeDelegate: WriteKeyValuesRepo<Key, Value>
-) : KeyValuesRepo<Key, Value> by DelegateBasedKeyValuesRepo(
-    readDelegate,
-    writeDelegate
-) {
-    companion object {
-        inline operator fun <reified Key : Any, reified Value : Any> invoke(
-            baseUrl: String,
-            httpClient: HttpClient,
-            contentType: ContentType,
-            noinline keySerializer: suspend (Key) -> String,
-            noinline valueSerializer: suspend (Value) -> String
-        ) = KtorKeyValuesRepoClient(
-            KtorReadKeyValuesRepoClient(
-                baseUrl,
-                httpClient,
-                contentType,
-                keySerializer,
-                valueSerializer
-            ),
-            KtorWriteKeyValuesRepoClient(
-                baseUrl,
-                httpClient,
-                contentType
-            )
-        )
-        inline operator fun <reified Key : Any, reified Value : Any> invoke(
-            baseUrl: String,
-            subpart: String,
-            httpClient: HttpClient,
-            contentType: ContentType,
-            noinline keySerializer: suspend (Key) -> String,
-            noinline valueSerializer: suspend (Value) -> String
-        ) = KtorKeyValuesRepoClient(
-            buildStandardUrl(baseUrl, subpart),
-            httpClient,
-            contentType,
-            keySerializer,
-            valueSerializer
-        )
-    }
-}
-
-inline fun <reified Key : Any, reified Value : Any> KtorKeyValuesRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    keySerializer: SerializationStrategy<Key>,
-    valueSerializer: SerializationStrategy<Value>,
-    serialFormat: StringFormat,
-) = KtorKeyValuesRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    {
-        serialFormat.encodeToString(keySerializer, it).encodeURLQueryComponent()
-    }
-) {
-    serialFormat.encodeToString(valueSerializer, it).encodeURLQueryComponent()
-}
-
-inline fun <reified Key : Any, reified Value : Any> KtorKeyValuesRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    keySerializer: SerializationStrategy<Key>,
-    valueSerializer: SerializationStrategy<Value>,
-    serialFormat: BinaryFormat,
-) = KtorKeyValuesRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    {
-        serialFormat.encodeHex(keySerializer, it)
-    }
-) {
-    serialFormat.encodeHex(valueSerializer, it)
-}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key/values/KtorReadKeyValuesRepoClient.kt

@@ -1,158 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.key.values
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.ReadKeyValuesRepo
-import dev.inmo.micro_utils.repos.ktor.common.*
-import dev.inmo.micro_utils.repos.ktor.common.one_to_many.*
-import dev.inmo.micro_utils.repos.ktor.common.reversedParameterName
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.request.get
-import io.ktor.http.*
-import io.ktor.util.reflect.TypeInfo
-import io.ktor.util.reflect.typeInfo
-import kotlinx.serialization.*
-
-class KtorReadKeyValuesRepoClient<Key, Value>(
-    private val baseUrl: String,
-    private val httpClient: HttpClient,
-    private val contentType: ContentType,
-    private val paginationResultValuesTypeInfo: TypeInfo,
-    private val paginationResultKeysTypeInfo: TypeInfo,
-    private val keySerializer: suspend (Key) -> String,
-    private val valueSerializer: suspend (Value) -> String
-) : ReadKeyValuesRepo<Key, Value> {
-    override suspend fun get(
-        k: Key,
-        pagination: Pagination,
-        reversed: Boolean
-    ): PaginationResult<Value> = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            getRoute,
-            pagination.asUrlQueryParts + (reversedParameterName to reversed.toString()) + (keyParameterName to keySerializer(k))
-        )
-    ) {
-        contentType(contentType)
-    }.body(paginationResultValuesTypeInfo)
-
-    override suspend fun keys(
-        pagination: Pagination,
-        reversed: Boolean
-    ): PaginationResult<Key> = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            keysRoute,
-            pagination.asUrlQueryParts + (reversedParameterName to reversed.toString())
-        )
-    ) {
-        contentType(contentType)
-    }.body(paginationResultKeysTypeInfo)
-
-    override suspend fun keys(
-        v: Value,
-        pagination: Pagination,
-        reversed: Boolean
-    ): PaginationResult<Key> = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            keysRoute,
-            pagination.asUrlQueryParts + (reversedParameterName to reversed.toString()) + (valueParameterName to valueSerializer(v))
-        )
-    ) {
-        contentType(contentType)
-    }.body(paginationResultKeysTypeInfo)
-
-    override suspend fun contains(k: Key): Boolean = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            containsRoute,
-            keyParameterName to keySerializer(k)
-        )
-    ) {
-        contentType(contentType)
-    }.body()
-
-    override suspend fun contains(k: Key, v: Value): Boolean = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            containsRoute,
-            keyParameterName to keySerializer(k),
-            valueParameterName to valueSerializer(v)
-        )
-    ) {
-        contentType(contentType)
-    }.body()
-
-    override suspend fun count(): Long = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            countRouting
-        )
-    ) {
-        contentType(contentType)
-    }.body()
-
-    override suspend fun count(k: Key): Long = httpClient.get(
-        buildStandardUrl(
-            baseUrl,
-            countRouting,
-            keyParameterName to keySerializer(k),
-        )
-    ) {
-        contentType(contentType)
-    }.body()
-}
-
-inline fun <reified Key, reified Value> KtorReadKeyValuesRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    contentType: ContentType,
-    noinline keySerializer: suspend (Key) -> String,
-    noinline valueSerializer: suspend (Value) -> String
-) = KtorReadKeyValuesRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    typeInfo<PaginationResult<Value>>(),
-    typeInfo<PaginationResult<Key>>(),
-    keySerializer,
-    valueSerializer
-)
-
-inline fun <reified Key, reified Value> KtorReadKeyValuesRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<Key>,
-    valueSerializer: KSerializer<Value>,
-    serialFormat: StringFormat,
-    contentType: ContentType,
-) = KtorReadKeyValuesRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    {
-        serialFormat.encodeToString(idsSerializer, it).encodeURLQueryComponent()
-    }
-) {
-    serialFormat.encodeToString(valueSerializer, it).encodeURLQueryComponent()
-}
-
-inline fun <reified Key, reified Value> KtorReadKeyValuesRepoClient(
-    baseUrl: String,
-    httpClient: HttpClient,
-    idsSerializer: KSerializer<Key>,
-    valuesSerializer: KSerializer<Value>,
-    serialFormat: BinaryFormat,
-    contentType: ContentType,
-) = KtorReadKeyValuesRepoClient<Key, Value>(
-    baseUrl,
-    httpClient,
-    contentType,
-    {
-        serialFormat.encodeHex(idsSerializer, it)
-    }
-) {
-    serialFormat.encodeHex(valuesSerializer, it)
-}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key/values/KtorWriteKeyValuesRepoClient.kt

@@ -1,106 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.client.key.values
-
-import dev.inmo.micro_utils.ktor.client.createStandardWebsocketFlow
-import dev.inmo.micro_utils.ktor.client.throwOnUnsuccess
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.WriteKeyValuesRepo
-import dev.inmo.micro_utils.repos.ktor.common.one_to_many.*
-import io.ktor.client.HttpClient
-import io.ktor.client.request.post
-import io.ktor.http.*
-import io.ktor.util.InternalAPI
-import io.ktor.util.reflect.TypeInfo
-import io.ktor.util.reflect.typeInfo
-import kotlinx.coroutines.flow.Flow
-
-class KtorWriteKeyValuesRepoClient<Key : Any, Value : Any>(
-    private val baseUrl: String,
-    private val httpClient: HttpClient,
-    private val contentType: ContentType,
-    override val onNewValue: Flow<Pair<Key, Value>>,
-    override val onValueRemoved: Flow<Pair<Key, Value>>,
-    override val onDataCleared: Flow<Key>,
-    private val keyTypeInfo: TypeInfo,
-    private val valueTypeInfo: TypeInfo,
-    private val keyToValuesMapTypeInfo: TypeInfo
-) : WriteKeyValuesRepo<Key, Value> {
-
-    @OptIn(InternalAPI::class)
-    override suspend fun add(toAdd: Map<Key, List<Value>>) {
-        httpClient.post(
-            buildStandardUrl(baseUrl, addRoute)
-        ) {
-            body = toAdd
-            bodyType = keyToValuesMapTypeInfo
-            contentType(contentType)
-        }.throwOnUnsuccess { "Unable to add $toAdd" }
-    }
-
-    @OptIn(InternalAPI::class)
-    override suspend fun remove(toRemove: Map<Key, List<Value>>) {
-        httpClient.post(
-            buildStandardUrl(baseUrl, removeRoute)
-        ) {
-            body = toRemove
-            bodyType = keyToValuesMapTypeInfo
-            contentType(contentType)
-        }.throwOnUnsuccess { "Unable to remove $toRemove" }
-    }
-
-    @OptIn(InternalAPI::class)
-    override suspend fun clear(k: Key) {
-        httpClient.post(
-            buildStandardUrl(baseUrl, clearRoute)
-        ) {
-            body = k
-            bodyType = keyTypeInfo
-            contentType(contentType)
-        }.throwOnUnsuccess { "Unable to clear data with key $k" }
-    }
-
-    @OptIn(InternalAPI::class)
-    override suspend fun clearWithValue(v: Value) {
-        httpClient.post(
-            buildStandardUrl(baseUrl, clearWithValueRoute)
-        ) {
-            body = v
-            bodyType = valueTypeInfo
-            contentType(contentType)
-        }.throwOnUnsuccess { "Unable to clear data with value $v" }
-    }
-
-    @OptIn(InternalAPI::class)
-    override suspend fun set(toSet: Map<Key, List<Value>>) {
-        httpClient.post(
-            buildStandardUrl(baseUrl, setRoute)
-        ) {
-            body = toSet
-            bodyType = keyToValuesMapTypeInfo
-            contentType(contentType)
-        }.throwOnUnsuccess { "Unable to set data $toSet" }
-    }
-
-    companion object {
-        inline operator fun <reified Key : Any, reified Value : Any> invoke(
-            baseUrl: String,
-            httpClient: HttpClient,
-            contentType: ContentType
-        ) = KtorWriteKeyValuesRepoClient<Key, Value>(
-            baseUrl,
-            httpClient,
-            contentType,
-            httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onNewValueRoute),
-            ),
-            httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onValueRemovedRoute),
-            ),
-            httpClient.createStandardWebsocketFlow(
-                buildStandardUrl(baseUrl, onDataClearedRoute),
-            ),
-            typeInfo<Key>(),
-            typeInfo<Value>(),
-            typeInfo<Map<Key, List<Value>>>()
-        )
-    }
-}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key_value/KtorReadStandardKeyValueRepo.kt

@@ -3,25 +3,20 @@ package dev.inmo.micro_utils.repos.ktor.client.key_value
 import dev.inmo.micro_utils.ktor.client.*
 import dev.inmo.micro_utils.ktor.common.*
 import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.ReadKeyValueRepo
-import dev.inmo.micro_utils.repos.ktor.common.*
-import dev.inmo.micro_utils.repos.ktor.common.containsRoute
-import dev.inmo.micro_utils.repos.ktor.common.countRoute
+import dev.inmo.micro_utils.repos.ReadStandardKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.key_value.*
-import dev.inmo.micro_utils.repos.ktor.common.key_value.keyParameterName
-import dev.inmo.micro_utils.repos.ktor.common.key_value.reversedParameterName
+import dev.inmo.micro_utils.repos.ktor.common.valueParameterName
 import io.ktor.client.HttpClient
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 
-@Deprecated("Replaced with KtorReadKeyValueRepoClient")
 class KtorReadStandardKeyValueRepo<Key, Value> (
     private val baseUrl: String,
     private val unifiedRequester: UnifiedRequester,
     private val keySerializer: KSerializer<Key>,
     private val valueSerializer: KSerializer<Value>,
     private val valueNullableSerializer: KSerializer<Value?>
-) : ReadKeyValueRepo<Key, Value> {
+) : ReadStandardKeyValueRepo<Key, Value> {
     constructor(
         baseUrl: String,
         client: HttpClient,

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key_value/KtorStandartKeyValueRepo.kt

@@ -7,7 +7,6 @@ import dev.inmo.micro_utils.repos.*
 import io.ktor.client.HttpClient
 import kotlinx.serialization.*
 
-@Deprecated("Replaced with KtorKeyValueRepoClient")
 @Suppress("DELEGATED_MEMBER_HIDES_SUPERTYPE_OVERRIDE")
 class KtorStandartKeyValueRepo<K, V> (
     baseUrl: String,
@@ -16,15 +15,15 @@ class KtorStandartKeyValueRepo<K, V> (
     keySerializer: KSerializer<K>,
     valueSerializer: KSerializer<V>,
     valueNullableSerializer: KSerializer<V?>
-) : KeyValueRepo<K, V>,
-    ReadKeyValueRepo<K, V> by KtorReadStandardKeyValueRepo(
+) : StandardKeyValueRepo<K, V>,
+    ReadStandardKeyValueRepo<K, V> by KtorReadStandardKeyValueRepo(
         "$baseUrl/$baseSubpart",
         unifiedRequester,
         keySerializer,
         valueSerializer,
         valueNullableSerializer
     ),
-    WriteKeyValueRepo<K, V> by KtorWriteStandardKeyValueRepo(
+    WriteStandardKeyValueRepo<K, V> by KtorWriteStandardKeyValueRepo(
         "$baseUrl/$baseSubpart",
         unifiedRequester,
         keySerializer,
@@ -39,4 +38,4 @@ class KtorStandartKeyValueRepo<K, V> (
         valueNullableSerializer: KSerializer<V?>,
         serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
     ) : this(baseUrl, baseSubpart, UnifiedRequester(client, serialFormat), keySerializer, valueSerializer, valueNullableSerializer)
-}
+}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/key_value/KtorWriteStandardKeyValueRepo.kt

@@ -2,20 +2,19 @@ package dev.inmo.micro_utils.repos.ktor.client.key_value
 
 import dev.inmo.micro_utils.ktor.client.*
 import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.WriteKeyValueRepo
+import dev.inmo.micro_utils.repos.WriteStandardKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.key_value.*
 import io.ktor.client.HttpClient
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*
 
-@Deprecated("Replaced with KtorWriteKeyValueRepoClient")
 class KtorWriteStandardKeyValueRepo<K, V> (
     private var baseUrl: String,
     private var unifiedRequester: UnifiedRequester,
     private var keySerializer: KSerializer<K>,
     private var valueSerializer: KSerializer<V>,
-) : WriteKeyValueRepo<K, V> {
+) : WriteStandardKeyValueRepo<K, V> {
     private val keyValueMapSerializer = MapSerializer(keySerializer, valueSerializer)
     private val keysListSerializer = ListSerializer(keySerializer)
     private val valuesListSerializer = ListSerializer(valueSerializer)

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/one_to_many/KtorOneToManyKeyValueRepo.kt

@@ -7,21 +7,20 @@ import dev.inmo.micro_utils.repos.*
 import io.ktor.client.HttpClient
 import kotlinx.serialization.KSerializer
 
-@Deprecated("Should be replaced with KtorKeyValuesRepoClient")
 class KtorOneToManyKeyValueRepo<Key, Value>(
     baseUrl: String,
     baseSubpart: String,
     unifiedRequester: UnifiedRequester,
     keySerializer: KSerializer<Key>,
     valueSerializer: KSerializer<Value>,
-) : KeyValuesRepo<Key, Value>,
-    ReadKeyValuesRepo<Key, Value> by KtorReadOneToManyKeyValueRepo<Key, Value> (
+) : OneToManyKeyValueRepo<Key, Value>,
+    ReadOneToManyKeyValueRepo<Key, Value> by KtorReadOneToManyKeyValueRepo<Key, Value> (
         "$baseUrl/$baseSubpart",
         unifiedRequester,
         keySerializer,
         valueSerializer,
     ),
-    WriteKeyValuesRepo<Key, Value> by KtorWriteOneToManyKeyValueRepo<Key, Value> (
+    WriteOneToManyKeyValueRepo<Key, Value> by KtorWriteOneToManyKeyValueRepo<Key, Value> (
         "$baseUrl/$baseSubpart",
         unifiedRequester,
         keySerializer,
@@ -35,4 +34,4 @@ class KtorOneToManyKeyValueRepo<Key, Value>(
         valueSerializer: KSerializer<Value>,
         serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat
     ) : this (baseUrl, baseSubpart, UnifiedRequester(client, serialFormat), keySerializer, valueSerializer)
-}
+}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/one_to_many/KtorReadOneToManyKeyValueRepo.kt

@@ -3,7 +3,7 @@ package dev.inmo.micro_utils.repos.ktor.client.one_to_many
 import dev.inmo.micro_utils.ktor.client.*
 import dev.inmo.micro_utils.ktor.common.*
 import dev.inmo.micro_utils.pagination.*
-import dev.inmo.micro_utils.repos.ReadKeyValuesRepo
+import dev.inmo.micro_utils.repos.ReadOneToManyKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.keyParameterName
 import dev.inmo.micro_utils.repos.ktor.common.one_to_many.*
 import dev.inmo.micro_utils.repos.ktor.common.reversedParameterName
@@ -12,13 +12,12 @@ import io.ktor.client.HttpClient
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer
 
-@Deprecated("Should be replaced with KtorReadKeyValuesRepoClient")
 class KtorReadOneToManyKeyValueRepo<Key, Value> (
     private val baseUrl: String,
     private val unifiedRequester: UnifiedRequester,
     private val keySerializer: KSerializer<Key>,
     private val valueSerializer: KSerializer<Value>
-) : ReadKeyValuesRepo<Key, Value> {
+) : ReadOneToManyKeyValueRepo<Key, Value> {
     private val paginationValueResultSerializer = PaginationResult.serializer(valueSerializer)
     private val paginationKeyResultSerializer = PaginationResult.serializer(keySerializer)
 
@@ -105,4 +104,4 @@ class KtorReadOneToManyKeyValueRepo<Key, Value> (
         Long.serializer()
     )
 
-}
+}

repos/ktor/client/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/client/one_to_many/KtorWriteOneToManyKeyValueRepo.kt

@@ -2,20 +2,19 @@ package dev.inmo.micro_utils.repos.ktor.client.one_to_many
 
 import dev.inmo.micro_utils.ktor.client.*
 import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.WriteKeyValuesRepo
+import dev.inmo.micro_utils.repos.WriteOneToManyKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.one_to_many.*
 import io.ktor.client.HttpClient
 import kotlinx.coroutines.flow.Flow
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*
 
-@Deprecated("Should be replaced with KtorWriteKeyValuesRepoClient")
 class KtorWriteOneToManyKeyValueRepo<Key, Value> (
     private val baseUrl: String,
     private val unifiedRequester: UnifiedRequester,
     private val keySerializer: KSerializer<Key>,
     private val valueSerializer: KSerializer<Value>
-) : WriteKeyValuesRepo<Key, Value> {
+) : WriteOneToManyKeyValueRepo<Key, Value> {
     private val keyValueSerializer = PairSerializer(keySerializer, valueSerializer)
     private val keyValueMapSerializer = MapSerializer(keySerializer, ListSerializer(valueSerializer))
 

repos/ktor/common/build.gradle

@@ -13,22 +13,5 @@ kotlin {
                 api internalProject("micro_utils.repos.common")
             }
         }
-        jvmTest {
-            dependencies {
-                implementation internalProject("micro_utils.repos.common")
-                implementation internalProject("micro_utils.repos.ktor.client")
-                implementation internalProject("micro_utils.repos.ktor.server")
-                implementation internalProject("micro_utils.repos.inmemory")
-                implementation libs.kt.coroutines.test
-
-                implementation libs.ktor.server.cio
-                implementation libs.ktor.client.cio
-                implementation libs.ktor.server.content.negotiation
-                implementation libs.ktor.serialization.kotlinx.json
-                implementation libs.ktor.client.content.negotiation
-                implementation libs.ktor.client.logging
-                implementation libs.ktor.client.websockets
-            }
-        }
     }
 }

repos/ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/common/ContainsRoute.kt

@@ -1,3 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.common
-
-const val containsRoute = "contains"

repos/ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/common/CountRoute.kt

@@ -1,3 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.common
-
-const val countRoute = "count"

repos/ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/common/CountRouting.kt

@@ -1,3 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.common
-
-const val countRouting = "count"

repos/ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/common/ParametersNames.kt

@@ -1,6 +1,5 @@
 package dev.inmo.micro_utils.repos.ktor.common
 
-const val idParameterName = "id"
 const val keyParameterName = "key"
 const val valueParameterName = "value"
-const val reversedParameterName = "reversed"
+const val reversedParameterName = "reversed"

repos/ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/common/crud/CrudReadRoutes.kt

@@ -3,3 +3,4 @@ package dev.inmo.micro_utils.repos.ktor.common.crud
 const val getByPaginationRouting = "getByPagination"
 const val getByIdRouting = "getById"
 const val containsRouting = "contains"
+const val countRouting = "count"

repos/ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/common/key_value/KeyValueRoutes.kt

@@ -3,11 +3,11 @@ package dev.inmo.micro_utils.repos.ktor.common.key_value
 const val getRoute = "get"
 const val valuesRoute = "values"
 const val keysRoute = "keys"
-const val containsRoute = dev.inmo.micro_utils.repos.ktor.common.containsRoute
-const val countRoute = dev.inmo.micro_utils.repos.ktor.common.countRoute
+const val containsRoute = "contains"
+const val countRoute = "count"
 
 const val onNewValueRoute = "onNewValue"
 const val onValueRemovedRoute = "onValueRemoved"
 const val setRoute = "set"
 const val unsetRoute = "unset"
-const val unsetWithValuesRoute = "unsetWithValues"
+const val unsetWithValuesRoute = "unsetWithValues"

repos/ktor/common/src/commonMain/kotlin/dev/inmo/micro_utils/repos/ktor/common/one_to_many/OneToManyRoutes.kt

@@ -5,7 +5,7 @@ const val keysRoute = "keys"
 const val containsByKeyRoute = "containsByKey"
 const val containsByKeyValueRoute = "containsByKeyValue"
 const val countByKeyRoute = "countByKey"
-const val countRoute = dev.inmo.micro_utils.repos.ktor.common.countRoute
+const val countRoute = "count"
 
 const val onNewValueRoute = "onNewValue"
 const val onValueRemovedRoute = "onValueRemoved"

repos/ktor/common/src/jvmTest/kotlin/CRUDTests.kt

@@ -1,89 +0,0 @@
-import dev.inmo.micro_utils.repos.*
-import dev.inmo.micro_utils.repos.ktor.client.crud.KtorCRUDRepoClient
-import dev.inmo.micro_utils.repos.ktor.server.crud.configureCRUDRepoRoutes
-import io.ktor.client.HttpClient
-import io.ktor.client.plugins.logging.Logging
-import io.ktor.http.ContentType
-import io.ktor.serialization.kotlinx.KotlinxWebsocketSerializationConverter
-import io.ktor.serialization.kotlinx.json.json
-import io.ktor.server.application.install
-import io.ktor.server.cio.CIO
-import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.server.routing.routing
-import io.ktor.server.websocket.WebSockets
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runTest
-import kotlinx.serialization.json.Json
-import kotlin.test.Test
-import kotlin.test.assertEquals
-
-class CRUDTests {
-    @OptIn(ExperimentalCoroutinesApi::class)
-    @Test
-    fun testCRUDFunctions() {
-        runTest {
-            val map = mutableMapOf<Int, ComplexData>()
-            val repo = MapCRUDRepo<ComplexData, Int, SimpleData>(
-                map,
-                { newValue, id, oldValue ->
-                    oldValue.copy(title = newValue.title)
-                }
-            ) {
-                size to ComplexData(size, title = it.title)
-            }
-            val server = io.ktor.server.engine.embeddedServer(
-                CIO,
-                23456,
-                "127.0.0.1"
-            ) {
-                install(ContentNegotiation) {
-                    json()
-                }
-                install(WebSockets) {
-                    contentConverter = KotlinxWebsocketSerializationConverter(Json)
-                }
-                routing {
-                    configureCRUDRepoRoutes(
-                        repo
-                    ) {
-                        it.toInt()
-                    }
-                }
-            }.start(false)
-            val client = HttpClient {
-                install(io.ktor.client.plugins.contentnegotiation.ContentNegotiation) {
-                    json()
-                }
-                install(Logging)
-                install(io.ktor.client.plugins.websocket.WebSockets) {
-                    contentConverter = KotlinxWebsocketSerializationConverter(Json)
-                }
-            }
-            val crudClient = KtorCRUDRepoClient<ComplexData, Int, SimpleData>(
-                "http://127.0.0.1:23456",
-                client,
-                ContentType.Application.Json
-            ) {
-                it.toString()
-            }
-
-            val created = crudClient.create(SimpleData("Example")).single()
-            assertEquals(map.size, 1)
-            assertEquals(map.size.toLong(), crudClient.count())
-            assertEquals(1, crudClient.count())
-            assertEquals(map.getValue(map.keys.first()), created)
-
-            val updated = crudClient.update(created.id, SimpleData("Example2"))
-            assertEquals(map.size, 1)
-            assertEquals(map.size.toLong(), crudClient.count())
-            assertEquals(1, crudClient.count())
-            assertEquals(map.getValue(map.keys.first()), updated)
-
-            crudClient.deleteById(created.id)
-            assertEquals(map.size, 0)
-            assertEquals(map.size.toLong(), crudClient.count())
-            assertEquals(0, crudClient.count())
-            server.stop()
-        }
-    }
-}

repos/ktor/common/src/jvmTest/kotlin/ComplexData.kt

@@ -1,10 +0,0 @@
-import com.benasher44.uuid.uuid4
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class ComplexData(
-    val id: Int,
-    val simple: SimpleData = SimpleData(),
-    val simples: List<SimpleData> = (0 until 100).map { SimpleData(("$it")) },
-    val title: String = uuid4().toString()
-)

repos/ktor/common/src/jvmTest/kotlin/KVTests.kt

@@ -1,139 +0,0 @@
-import dev.inmo.micro_utils.pagination.firstPageWithOneElementPagination
-import dev.inmo.micro_utils.pagination.utils.getAllWithNextPaging
-import dev.inmo.micro_utils.repos.*
-import dev.inmo.micro_utils.repos.ktor.client.key.value.KtorKeyValueRepoClient
-import dev.inmo.micro_utils.repos.ktor.server.key.value.configureKeyValueRepoRoutes
-import io.ktor.client.HttpClient
-import io.ktor.client.plugins.logging.Logging
-import io.ktor.http.ContentType
-import io.ktor.serialization.kotlinx.KotlinxWebsocketSerializationConverter
-import io.ktor.serialization.kotlinx.json.json
-import io.ktor.server.application.install
-import io.ktor.server.cio.CIO
-import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.server.routing.routing
-import io.ktor.server.websocket.WebSockets
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runTest
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.json.Json
-import kotlin.test.*
-
-class KVTests {
-    @OptIn(ExperimentalCoroutinesApi::class)
-    @Test
-    fun testKVFunctions() {
-        runTest {
-            val map = mutableMapOf<Int, ComplexData>()
-            val repo = MapKeyValueRepo<Int, ComplexData>(map)
-            val server = io.ktor.server.engine.embeddedServer(
-                CIO,
-                23456,
-                "127.0.0.1"
-            ) {
-                install(ContentNegotiation) {
-                    json()
-                }
-                install(WebSockets) {
-                    contentConverter = KotlinxWebsocketSerializationConverter(Json)
-                }
-                routing {
-                    configureKeyValueRepoRoutes(
-                        repo,
-                        Int.serializer(),
-                        ComplexData.serializer(),
-                        Json {}
-                    )
-                }
-            }.start(false)
-            val client = HttpClient {
-                install(io.ktor.client.plugins.contentnegotiation.ContentNegotiation) {
-                    json()
-                }
-                install(Logging)
-                install(io.ktor.client.plugins.websocket.WebSockets) {
-                    contentConverter = KotlinxWebsocketSerializationConverter(Json)
-                }
-            }
-            val crudClient = KtorKeyValueRepoClient<Int, ComplexData>(
-                "http://127.0.0.1:23456",
-                client,
-                ContentType.Application.Json,
-                Int.serializer(),
-                ComplexData.serializer(),
-                Json
-            )
-
-            val dataInOneKey = ComplexData(1, title = "Example1")
-            val dataInMultipleKeys = ComplexData(2, title = "Example2")
-            val repeatCount = 3
-
-            val dataList = listOf(
-                1 to dataInOneKey
-            ) + (0 until repeatCount).map {
-                (it + 2) to dataInMultipleKeys
-            }
-
-            dataList.forEachIndexed { i, (id, data) ->
-                crudClient.set(id, data)
-                assertEquals(map.size, i + 1)
-                assertEquals(map.size.toLong(), crudClient.count())
-                assertEquals(i + 1L, crudClient.count())
-                dataList.take(i + 1).forEach { (id, data) ->
-                    assertEquals(data, map[id])
-                    assertEquals(data, crudClient.get(id))
-                    assertEquals(map[id], crudClient.get(id))
-                }
-            }
-
-            dataList.forEach { (id, data) ->
-                assertTrue(crudClient.contains(id))
-                assertEquals(data, crudClient.get(id))
-            }
-
-            assertEquals(
-                dataList.mapNotNull { if (it.second == dataInMultipleKeys) it.first else null },
-                getAllWithNextPaging(firstPageWithOneElementPagination) {
-                    crudClient.keys(dataInMultipleKeys, it)
-                }
-            )
-
-            assertEquals(
-                dataList.mapNotNull { if (it.second == dataInOneKey) it.first else null },
-                getAllWithNextPaging(firstPageWithOneElementPagination) {
-                    crudClient.keys(dataInOneKey, it)
-                }
-            )
-
-            assertEquals(
-                dataList.map { it.first },
-                getAllWithNextPaging(firstPageWithOneElementPagination) {
-                    crudClient.keys(it)
-                }
-            )
-
-            assertEquals(
-                dataList.map { it.second },
-                getAllWithNextPaging(firstPageWithOneElementPagination) {
-                    crudClient.values(it)
-                }
-            )
-
-            assertEquals(dataList.size.toLong(), crudClient.count())
-
-            crudClient.unsetWithValues(dataInMultipleKeys)
-            assertEquals(
-                dataList.filter { it.second == dataInOneKey }.size.toLong(),
-                crudClient.count()
-            )
-
-            crudClient.unset(dataList.first { it.second == dataInOneKey }.first)
-            assertEquals(
-                0,
-                crudClient.count()
-            )
-
-            server.stop()
-        }
-    }
-}

repos/ktor/common/src/jvmTest/kotlin/KVsTests.kt

@@ -1,140 +0,0 @@
-import dev.inmo.micro_utils.pagination.firstPageWithOneElementPagination
-import dev.inmo.micro_utils.pagination.utils.getAllWithNextPaging
-import dev.inmo.micro_utils.repos.*
-import dev.inmo.micro_utils.repos.ktor.client.key.values.KtorKeyValuesRepoClient
-import dev.inmo.micro_utils.repos.ktor.server.key.values.configureKeyValuesRepoRoutes
-import io.ktor.client.HttpClient
-import io.ktor.client.plugins.logging.Logging
-import io.ktor.http.ContentType
-import io.ktor.serialization.kotlinx.KotlinxWebsocketSerializationConverter
-import io.ktor.serialization.kotlinx.json.json
-import io.ktor.server.application.install
-import io.ktor.server.cio.CIO
-import io.ktor.server.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.server.routing.routing
-import io.ktor.server.websocket.WebSockets
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.test.runTest
-import kotlinx.serialization.builtins.serializer
-import kotlinx.serialization.json.Json
-import kotlin.test.*
-
-class KVsTests {
-    @OptIn(ExperimentalCoroutinesApi::class)
-    @Test
-    fun testKVsFunctions() {
-        runTest {
-            val map = mutableMapOf<Int, MutableList<ComplexData>>()
-            val repo = MapKeyValuesRepo(map)
-            val server = io.ktor.server.engine.embeddedServer(
-                CIO,
-                23456,
-                "127.0.0.1"
-            ) {
-                install(ContentNegotiation) {
-                    json()
-                }
-                install(WebSockets) {
-                    contentConverter = KotlinxWebsocketSerializationConverter(Json)
-                }
-                routing {
-                    configureKeyValuesRepoRoutes(
-                        repo,
-                        Int.serializer(),
-                        ComplexData.serializer(),
-                        Json {}
-                    )
-                }
-            }.start(false)
-            val client = HttpClient {
-                install(io.ktor.client.plugins.contentnegotiation.ContentNegotiation) {
-                    json()
-                }
-                install(Logging)
-                install(io.ktor.client.plugins.websocket.WebSockets) {
-                    contentConverter = KotlinxWebsocketSerializationConverter(Json)
-                }
-            }
-            val crudClient = KtorKeyValuesRepoClient(
-                "http://127.0.0.1:23456",
-                client,
-                ContentType.Application.Json,
-                Int.serializer(),
-                ComplexData.serializer(),
-                Json
-            )
-
-            val dataInOneKey = ComplexData(1, title = "Example1")
-            val dataInMultipleKeys = ComplexData(2, title = "Example2")
-            val repeatCount = 3
-
-            val dataList = listOf(
-                1 to listOf(dataInOneKey)
-            ) + (0 until repeatCount).map {
-                (it + 2) to listOf(dataInMultipleKeys)
-            }
-
-            dataList.forEachIndexed { i, (id, data) ->
-                crudClient.set(id, data)
-                assertEquals(i + 1, map.size)
-                assertEquals(map.size.toLong(), crudClient.count())
-                assertEquals(i + 1L, crudClient.count())
-                dataList.take(i + 1).forEach { (id, data) ->
-                    assertContentEquals(data, map[id])
-                    assertContentEquals(data, crudClient.getAll(id))
-                    assertContentEquals(map[id], crudClient.getAll(id))
-                }
-            }
-
-            dataList.forEach { (key, data) ->
-                assertTrue(crudClient.contains(key))
-                assertContentEquals(data, crudClient.getAll(key))
-            }
-
-            assertEquals(
-                dataList.mapNotNull { if (it.second.contains(dataInMultipleKeys)) it.first else null },
-                getAllWithNextPaging(firstPageWithOneElementPagination) {
-                    crudClient.keys(dataInMultipleKeys, it)
-                }
-            )
-
-            assertEquals(
-                dataList.mapNotNull { if (it.second.contains(dataInOneKey)) it.first else null },
-                getAllWithNextPaging(firstPageWithOneElementPagination) {
-                    crudClient.keys(dataInOneKey, it)
-                }
-            )
-
-            assertEquals(
-                dataList.map { it.first },
-                getAllWithNextPaging(firstPageWithOneElementPagination) {
-                    crudClient.keys(it)
-                }
-            )
-
-            assertEquals(
-                dataList.map { it.first },
-                getAllWithNextPaging(firstPageWithOneElementPagination) {
-                    crudClient.keys(it)
-                }
-            )
-
-            assertEquals(dataList.size.toLong(), crudClient.count())
-
-            crudClient.remove(dataList.filter { it.second.contains(dataInMultipleKeys) })
-            println(map)
-            assertEquals(
-                dataList.filter { it.second.contains(dataInOneKey) }.size.toLong(),
-                crudClient.count()
-            )
-
-            crudClient.remove(dataList.filter { it.second.contains(dataInOneKey) })
-            assertEquals(
-                0,
-                crudClient.count()
-            )
-
-            server.stop()
-        }
-    }
-}

repos/ktor/common/src/jvmTest/kotlin/SimpleData.kt

@@ -1,7 +0,0 @@
-import com.benasher44.uuid.uuid4
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class SimpleData(
-    val title: String = uuid4().toString()
-)

repos/ktor/crud.yml

@@ -1,187 +0,0 @@
-swagger: "2.0"
-info:
-  description: "This is a template for the CRUD repositories from [microutils](https://github.com/InsanusMokrassar/MicroUtils/tree/master/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud)"
-  version: "0.11.0"
-  title: "CRUD Repo"
-  contact:
-    email: "ovsyannikov.alexey95@gmail.com"
-tags:
-  - name: "Read"
-    description: "Operations with `get` request in most cases"
-  - name: "Write"
-    description: "Operations with `post` request in most cases"
-
-parameters:
-  IdInQuery:
-    in: "query"
-    name: "id"
-    allOf:
-      - $ref: "#/definitions/Key"
-  IdsInBody:
-    in: "body"
-    name: "body"
-    type: array
-    items:
-      $ref: "#/definitions/Key"
-  NewValuesInBody:
-    in: "body"
-    name: "body"
-    type: array
-    allOf:
-      - $ref: "#/definitions/NewValues"
-  NewValuesWithIdsInBody:
-    in: "body"
-    name: "body"
-    type: array
-    items:
-      allOf:
-        - $ref: "#/definitions/Pair"
-        - properties:
-            first:
-              $ref: "#/definitions/Key"
-            second:
-              $ref: "#/definitions/NewValue"
-  PaginationInQueryPage:
-    in: "query"
-    type: integer
-    name: "ppage"
-    description: "Page of pagination"
-    required: false
-  PaginationInQuerySize:
-    in: "query"
-    type: integer
-    name: "psize"
-    description: "Size of each page in pagination"
-    required: false
-
-
-definitions:
-  Key:
-    type: integer
-    description: "REWRITE THIS TYPE AS KEY IN SWAGGER FILE"
-  Value:
-    type: integer
-    description: "REWRITE THIS TYPE AS VALUE IN SWAGGER FILE"
-  Values:
-    type: array
-    items:
-      $ref: "#/definitions/Value"
-  NewValue:
-    type: integer
-    description: "REWRITE THIS TYPE AS NEW VALUE IN SWAGGER FILE"
-  Pair:
-    type: object
-    description: "Pair of objects"
-    properties:
-      first:
-      second:
-  NewValues:
-    type: array
-    items:
-      $ref: "#/definitions/NewValue"
-  PaginationResult:
-    type: object
-    properties:
-      page:
-        type: integer
-        description: "Page of pagination"
-      pagesNumber:
-        type: integer
-        description: "Count of pages with the size from this pagination"
-      size:
-        type: integer
-        description: "Size of each page in pagination"
-      results:
-        type: array
-        description: "Array of all elements on that page. Size of pagination and size of array can be different and it can be interpreted like current page is the last one"
-        items:
-          type: object
-
-paths:
-  /getByPagination:
-    get:
-      tags:
-        - "Read"
-      parameters:
-        - $ref: "#/parameters/PaginationInQueryPage"
-        - $ref: "#/parameters/PaginationInQuerySize"
-      responses:
-        "200":
-          description: "Pagination with elements"
-          schema:
-            allOf:
-              - $ref: "#/definitions/PaginationResult"
-              - properties:
-                  results:
-                    items:
-                      $ref: "#/definitions/Value"
-  /getById:
-    get:
-      tags:
-        - "Read"
-      parameters:
-        - $ref: "#/parameters/IdInQuery"
-          required: true
-      responses:
-        "200":
-          description: "Result object"
-          schema:
-            $ref: "#/definitions/Value"
-        "204":
-          description: "No value by id"
-  /contains:
-    get:
-      tags:
-        - "Read"
-      parameters:
-        - $ref: "#/parameters/IdInQuery"
-          required: true
-      responses:
-        "200":
-          description: "Object with id availability in repo"
-          schema:
-            type: boolean
-  /count:
-    get:
-      tags:
-        - "Read"
-      responses:
-        "200":
-          description: "Amount of objects in repo"
-          schema:
-            type: integer
-
-
-  /create:
-    post:
-      tags:
-        - "Write"
-      parameters:
-        - $ref: "#/parameters/NewValuesInBody"
-      responses:
-        "200":
-          description: "Objects has been created and saved"
-          schema:
-            $ref: "#/definitions/Values"
-  /update:
-    post:
-      tags:
-        - "Write"
-      parameters:
-        - $ref: "#/parameters/NewValuesWithIdsInBody"
-      responses:
-        "200":
-          description: "Objects has been updated"
-          schema:
-            $ref: "#/definitions/Values"
-  /deleteById:
-    post:
-      tags:
-        - "Write"
-      parameters:
-        - $ref: "#/parameters/IdsInBody"
-      responses:
-        "200":
-          description: "Objects has been updated"
-          schema:
-            $ref: "#/definitions/Values"

repos/ktor/kv.yml

@@ -1,196 +0,0 @@
-swagger: "2.0"
-info:
-  description: "This is a template for the KeyValue repositories from [microutils](https://github.com/InsanusMokrassar/MicroUtils/tree/master/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key/value)"
-  version: "0.11.0"
-  title: "KeyValue Repo"
-  contact:
-    email: "ovsyannikov.alexey95@gmail.com"
-tags:
-  - name: "Read"
-    description: "Operations with `get` request in most cases"
-  - name: "Write"
-    description: "Operations with `post` request in most cases"
-
-parameters:
-  KeyInQuery:
-    in: "query"
-    name: "key"
-    allOf:
-      - $ref: "#/definitions/Key"
-  KeysInBody:
-    in: "body"
-    name: "body"
-    type: array
-    items:
-      $ref: "#/definitions/Key"
-  ValuesInBody:
-    in: "body"
-    name: "body"
-    type: array
-    items:
-      $ref: "#/definitions/Value"
-  PaginationInQueryPage:
-    in: "query"
-    type: integer
-    name: "ppage"
-    description: "Page of pagination"
-    required: false
-  PaginationInQuerySize:
-    in: "query"
-    type: integer
-    name: "psize"
-    description: "Size of each page in pagination"
-    required: false
-  ReversedInQuery:
-    in: "query"
-    type: boolean
-    name: "reversed"
-    description: "If passed, will tell to reverse the result pages"
-    required: false
-  ValueInQuery:
-    in: "query"
-    name: "value"
-    allOf:
-      - $ref: "#/definitions/Value"
-  MapInBody:
-    in: "body"
-    name: "body"
-    allOf:
-      - $ref: "#/definitions/Map"
-
-
-definitions:
-  Key:
-    type: integer
-    description: "REWRITE THIS TYPE AS KEY IN SWAGGER FILE"
-  Value:
-    type: integer
-    description: "REWRITE THIS TYPE AS VALUE IN SWAGGER FILE"
-  Map:
-    type: object
-    description: "Map of objects"
-  PaginationResult:
-    type: object
-    properties:
-      page:
-        type: integer
-        description: "Page of pagination"
-      pagesNumber:
-        type: integer
-        description: "Count of pages with the size from this pagination"
-      size:
-        type: integer
-        description: "Size of each page in pagination"
-      results:
-        type: array
-        description: "Array of all elements on that page. Size of pagination and size of array can be different and it can be interpreted like current page is the last one"
-        items:
-          type: object
-
-paths:
-  /get:
-    get:
-      tags:
-        - "Read"
-      parameters:
-        - $ref: "#/parameters/KeyInQuery"
-          required: true
-      responses:
-        "200":
-          description: "Element by key"
-          schema:
-            $ref: "#/definitions/Value"
-        "204":
-          description: "No value by id"
-  /values:
-    get:
-      tags:
-        - "Read"
-      parameters:
-        - $ref: "#/parameters/PaginationInQueryPage"
-        - $ref: "#/parameters/PaginationInQuerySize"
-        - $ref: "#/parameters/ReversedInQuery"
-      responses:
-        "200":
-          description: "Pagination with elements"
-          schema:
-            allOf:
-              - $ref: "#/definitions/PaginationResult"
-              - properties:
-                  results:
-                    items:
-                      $ref: "#/definitions/Value"
-  /keys:
-    get:
-      tags:
-        - "Read"
-      parameters:
-        - $ref: "#/parameters/PaginationInQueryPage"
-        - $ref: "#/parameters/PaginationInQuerySize"
-        - $ref: "#/parameters/ReversedInQuery"
-        - $ref: "#/parameters/ValueInQuery"
-          required: false
-      responses:
-        "200":
-          description: "Pagination with elements"
-          schema:
-            allOf:
-              - $ref: "#/definitions/PaginationResult"
-              - properties:
-                  results:
-                    items:
-                      $ref: "#/definitions/Key"
-  /contains:
-    get:
-      tags:
-        - "Read"
-      parameters:
-        - $ref: "#/parameters/KeyInQuery"
-          required: true
-      responses:
-        "200":
-          description: "Object with id availability in repo"
-          schema:
-            type: boolean
-  /count:
-    get:
-      tags:
-        - "Read"
-      responses:
-        "200":
-          description: "Amount of objects in repo"
-          schema:
-            type: integer
-
-
-  /set:
-    post:
-      tags:
-        - "Write"
-      parameters:
-        - allOf:
-            - $ref: "#/parameters/MapInBody"
-            - additionalProperties:
-                $ref: "#/definitions/Value"
-              description: "Map with new elements to set. Use keys as a keys of this map"
-      responses:
-        "200":
-          description: "Will return 200 if everything has been completed ok"
-  /unset:
-    post:
-      tags:
-        - "Write"
-      parameters:
-        - $ref: "#/parameters/KeysInBody"
-      responses:
-        "200":
-          description: "Objects with keys from body has been unset"
-  /unsetWithValues:
-    post:
-      tags:
-        - "Write"
-      parameters:
-        - $ref: "#/parameters/ValuesInBody"
-      responses:
-        "200":
-          description: "Objects with values from body has been unset"

repos/ktor/kvs.yml

@@ -1,222 +0,0 @@
-swagger: "2.0"
-info:
-  description: "This is a template for the KeyValues repositories from [microutils](https://github.com/InsanusMokrassar/MicroUtils/tree/master/repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key/values)"
-  version: "0.11.0"
-  title: "KeyValues Repo"
-  contact:
-    email: "ovsyannikov.alexey95@gmail.com"
-tags:
-  - name: "Read"
-    description: "Operations with `get` request in most cases"
-  - name: "Write"
-    description: "Operations with `post` request in most cases"
-
-parameters:
-  KeyInQuery:
-    in: "query"
-    name: "key"
-    allOf:
-      - $ref: "#/definitions/Key"
-  KeyInBody:
-    in: "body"
-    name: "body"
-    allOf:
-      - $ref: "#/definitions/Key"
-  KeysInBody:
-    in: "body"
-    name: "body"
-    type: array
-    items:
-      $ref: "#/definitions/Key"
-  ValuesInBody:
-    in: "body"
-    name: "body"
-    type: array
-    items:
-      $ref: "#/definitions/Value"
-  PaginationInQueryPage:
-    in: "query"
-    type: integer
-    name: "ppage"
-    description: "Page of pagination"
-    required: false
-  PaginationInQuerySize:
-    in: "query"
-    type: integer
-    name: "psize"
-    description: "Size of each page in pagination"
-    required: false
-  ReversedInQuery:
-    in: "query"
-    type: boolean
-    name: "reversed"
-    description: "If passed, will tell to reverse the result pages"
-    required: false
-  ValueInQuery:
-    in: "query"
-    name: "value"
-    allOf:
-      - $ref: "#/definitions/Value"
-  ValueInBody:
-    in: "body"
-    name: "body"
-    allOf:
-      - $ref: "#/definitions/Value"
-  MapInBody:
-    in: "body"
-    name: "body"
-    allOf:
-      - $ref: "#/definitions/Map"
-
-
-definitions:
-  Key:
-    type: integer
-    description: "REWRITE THIS TYPE AS KEY IN SWAGGER FILE"
-  Value:
-    type: integer
-    description: "REWRITE THIS TYPE AS VALUE IN SWAGGER FILE"
-  Map:
-    type: object
-    description: "Map of objects"
-  PaginationResult:
-    type: object
-    properties:
-      page:
-        type: integer
-        description: "Page of pagination"
-      pagesNumber:
-        type: integer
-        description: "Count of pages with the size from this pagination"
-      size:
-        type: integer
-        description: "Size of each page in pagination"
-      results:
-        type: array
-        description: "Array of all elements on that page. Size of pagination and size of array can be different and it can be interpreted like current page is the last one"
-        items:
-          type: object
-
-paths:
-  /get:
-    get:
-      tags:
-        - "Read"
-      parameters:
-        - $ref: "#/parameters/KeyInQuery"
-          required: true
-        - $ref: "#/parameters/PaginationInQueryPage"
-        - $ref: "#/parameters/PaginationInQuerySize"
-        - $ref: "#/parameters/ReversedInQuery"
-      responses:
-        "200":
-          description: "Elements by query"
-          schema:
-            allOf:
-              - $ref: "#/definitions/PaginationResult"
-              - properties:
-                  results:
-                    items:
-                      $ref: "#/definitions/Value"
-  /keys:
-    get:
-      tags:
-        - "Read"
-      parameters:
-        - $ref: "#/parameters/PaginationInQueryPage"
-        - $ref: "#/parameters/PaginationInQuerySize"
-        - $ref: "#/parameters/ReversedInQuery"
-        - $ref: "#/parameters/ValueInQuery"
-          required: false
-      responses:
-        "200":
-          description: "Pagination with elements"
-          schema:
-            allOf:
-              - $ref: "#/definitions/PaginationResult"
-              - properties:
-                  results:
-                    items:
-                      $ref: "#/definitions/Key"
-  /contains:
-    get:
-      tags:
-        - "Read"
-      parameters:
-        - $ref: "#/parameters/KeyInQuery"
-          required: true
-        - $ref: "#/parameters/ValueInQuery"
-          required: false
-      responses:
-        "200":
-          description: "Object with key and optionally availability in repo"
-          schema:
-            type: boolean
-  /count:
-    get:
-      tags:
-        - "Read"
-      responses:
-        "200":
-          description: "Amount of objects in repo"
-          schema:
-            type: integer
-
-
-  /add:
-    post:
-      tags:
-        - "Write"
-      parameters:
-        - allOf:
-            - $ref: "#/parameters/MapInBody"
-            - additionalProperties:
-                $ref: "#/definitions/Value"
-              description: "Map with new elements to add. Use keys as a keys of this map. That values will be added to the end of current data by their keys"
-      responses:
-        "200":
-          description: "Will return 200 if everything has been completed ok"
-  /set:
-    post:
-      tags:
-        - "Write"
-      parameters:
-        - allOf:
-            - $ref: "#/parameters/MapInBody"
-            - additionalProperties:
-                $ref: "#/definitions/Value"
-              description: "Map with new elements to set. Use keys as a keys of this map. That values will overwrite all exists data by their keys"
-      responses:
-        "200":
-          description: "Will return 200 if everything has been completed ok"
-  /remove:
-    post:
-      tags:
-        - "Write"
-      parameters:
-        - allOf:
-            - $ref: "#/parameters/MapInBody"
-            - additionalProperties:
-                $ref: "#/definitions/Value"
-              description: "Map with data to remove. Removing will be processed by each value for its key"
-      responses:
-        "200":
-          description: "Objects with keys and values from body has been unset"
-  /clear:
-    post:
-      tags:
-        - "Write"
-      parameters:
-        - $ref: "#/parameters/KeyInBody"
-      responses:
-        "200":
-          description: "Data with corresponding key has been removed"
-  /clearWithValues:
-    post:
-      tags:
-        - "Write"
-      parameters:
-        - $ref: "#/parameters/ValueInBody"
-      responses:
-        "200":
-          description: "Will remove value from all keys data"

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorCRUDRepoRoutes.kt

@@ -1,30 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.crud
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.CRUDRepo
-import io.ktor.server.routing.Route
-import kotlinx.serialization.*
-
-inline fun <reified ObjectType : Any, reified IdType : Any, reified InputValue : Any> Route.configureCRUDRepoRoutes(
-    originalRepo: CRUDRepo<ObjectType, IdType, InputValue>,
-    noinline idDeserializer: suspend (String) -> IdType
-) {
-    configureReadCRUDRepoRoutes(originalRepo, idDeserializer)
-    configureWriteCRUDRepoRoutes(originalRepo)
-}
-
-inline fun <reified ObjectType : Any, reified IdType : Any, reified InputValue : Any> Route.configureCRUDRepoRoutes(
-    originalRepo: CRUDRepo<ObjectType, IdType, InputValue>,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: StringFormat
-) = configureCRUDRepoRoutes(originalRepo) {
-    serialFormat.decodeFromString(idsSerializer, it)
-}
-
-inline fun <reified ObjectType : Any, reified IdType : Any, reified InputValue : Any> Route.configureCRUDRepoRoutes(
-    originalRepo: CRUDRepo<ObjectType, IdType, InputValue>,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: BinaryFormat
-) = configureCRUDRepoRoutes(originalRepo) {
-    serialFormat.decodeHex(idsSerializer, it)
-}

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorReadCRUDRepoRoutes.kt

@@ -1,72 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.crud
-
-import dev.inmo.micro_utils.ktor.common.decodeHex
-import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.pagination.extractPagination
-import dev.inmo.micro_utils.repos.ReadCRUDRepo
-import dev.inmo.micro_utils.repos.ktor.common.countRouting
-import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import dev.inmo.micro_utils.repos.ktor.common.idParameterName
-import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.get
-import kotlinx.serialization.*
-
-inline fun <reified ObjectType, reified IdType> Route.configureReadCRUDRepoRoutes(
-    originalRepo: ReadCRUDRepo<ObjectType, IdType>,
-    noinline idDeserializer: suspend (String) -> IdType
-) {
-    get(getByPaginationRouting) {
-        val pagination = call.request.queryParameters.extractPagination
-
-        call.respond(originalRepo.getByPagination(pagination))
-    }
-
-    get(getByIdRouting) {
-        val id = idDeserializer(
-            call.getQueryParameterOrSendError(idParameterName) ?: return@get
-        )
-
-        val result = originalRepo.getById(id)
-
-        if (result == null) {
-            call.respond(HttpStatusCode.NoContent)
-        } else {
-            call.respond(result)
-        }
-    }
-
-    get(containsRouting) {
-        val id = idDeserializer(
-            call.getQueryParameterOrSendError(idParameterName) ?: return@get
-        )
-
-        call.respond(
-            originalRepo.contains(id)
-        )
-    }
-
-    get(countRouting) {
-        call.respond(
-            originalRepo.count()
-        )
-    }
-}
-
-inline fun <reified ObjectType, reified IdType> Route.configureReadCRUDRepoRoutes(
-    originalRepo: ReadCRUDRepo<ObjectType, IdType>,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: StringFormat
-) = configureReadCRUDRepoRoutes(originalRepo) {
-    serialFormat.decodeFromString(idsSerializer, it)
-}
-
-inline fun <reified ObjectType, reified IdType> Route.configureReadCRUDRepoRoutes(
-    originalRepo: ReadCRUDRepo<ObjectType, IdType>,
-    idsSerializer: KSerializer<IdType>,
-    serialFormat: BinaryFormat
-) = configureReadCRUDRepoRoutes(originalRepo) {
-    serialFormat.decodeHex(idsSerializer, it)
-}

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorReadStandardCrudRepo.kt

@@ -5,8 +5,7 @@ import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.server.*
 import dev.inmo.micro_utils.pagination.PaginationResult
 import dev.inmo.micro_utils.pagination.extractPagination
-import dev.inmo.micro_utils.repos.ReadCRUDRepo
-import dev.inmo.micro_utils.repos.ktor.common.countRouting
+import dev.inmo.micro_utils.repos.ReadStandardCRUDRepo
 import dev.inmo.micro_utils.repos.ktor.common.crud.*
 import io.ktor.http.ContentType
 import io.ktor.server.application.call
@@ -15,8 +14,8 @@ import io.ktor.server.routing.get
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer
 
-fun <ObjectType, IdType> Route.configureReadCRUDRepoRoutes(
-    originalRepo: ReadCRUDRepo<ObjectType, IdType>,
+fun <ObjectType, IdType> Route.configureReadStandardCrudRepoRoutes(
+    originalRepo: ReadStandardCRUDRepo<ObjectType, IdType>,
     objectsSerializer: KSerializer<ObjectType>,
     objectsNullableSerializer: KSerializer<ObjectType?>,
     idsSerializer: KSerializer<IdType>,
@@ -73,11 +72,11 @@ fun <ObjectType, IdType> Route.configureReadCRUDRepoRoutes(
     }
 }
 
-inline fun <ObjectType, IdType> Route.configureReadCRUDRepoRoutes(
-    originalRepo: ReadCRUDRepo<ObjectType, IdType>,
+inline fun <ObjectType, IdType> Route.configureReadStandardCrudRepoRoutes(
+    originalRepo: ReadStandardCRUDRepo<ObjectType, IdType>,
     objectsSerializer: KSerializer<ObjectType>,
     objectsNullableSerializer: KSerializer<ObjectType?>,
     idsSerializer: KSerializer<IdType>,
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,
     serialFormatContentType: ContentType = standardKtorSerialFormatContentType
-) = configureReadCRUDRepoRoutes(originalRepo, objectsSerializer, objectsNullableSerializer, idsSerializer, UnifiedRouter(serialFormat, serialFormatContentType))
+) = configureReadStandardCrudRepoRoutes(originalRepo, objectsSerializer, objectsNullableSerializer, idsSerializer, UnifiedRouter(serialFormat, serialFormatContentType))

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorStandardCrudRepo.kt

@@ -4,15 +4,15 @@ import dev.inmo.micro_utils.ktor.common.StandardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.server.UnifiedRouter
 import dev.inmo.micro_utils.ktor.server.standardKtorSerialFormatContentType
-import dev.inmo.micro_utils.repos.CRUDRepo
+import dev.inmo.micro_utils.repos.StandardCRUDRepo
 import io.ktor.http.ContentType
 import io.ktor.server.routing.Route
 import io.ktor.server.routing.route
 import kotlinx.serialization.KSerializer
 
-fun <ObjectType, IdType, InputValue> Route.configureCRUDRepoRoutes(
+fun <ObjectType, IdType, InputValue> Route.configureStandardCrudRepoRoutes(
     baseSubpart: String,
-    originalRepo: CRUDRepo<ObjectType, IdType, InputValue>,
+    originalRepo: StandardCRUDRepo<ObjectType, IdType, InputValue>,
     objectsSerializer: KSerializer<ObjectType>,
     objectsNullableSerializer: KSerializer<ObjectType?>,
     inputsSerializer: KSerializer<InputValue>,
@@ -20,20 +20,20 @@ fun <ObjectType, IdType, InputValue> Route.configureCRUDRepoRoutes(
     unifiedRouter: UnifiedRouter
 ) {
     route(baseSubpart) {
-        configureReadCRUDRepoRoutes(originalRepo, objectsSerializer, objectsNullableSerializer, idsSerializer, unifiedRouter)
-        configureWriteCRUDRepoRoutes(originalRepo, objectsSerializer, objectsNullableSerializer, inputsSerializer, idsSerializer, unifiedRouter)
+        configureReadStandardCrudRepoRoutes(originalRepo, objectsSerializer, objectsNullableSerializer, idsSerializer, unifiedRouter)
+        configureWriteStandardCrudRepoRoutes(originalRepo, objectsSerializer, objectsNullableSerializer, inputsSerializer, idsSerializer, unifiedRouter)
     }
 }
 
-fun <ObjectType, IdType, InputValue> Route.configureCRUDRepoRoutes(
+fun <ObjectType, IdType, InputValue> Route.configureStandardCrudRepoRoutes(
     baseSubpart: String,
-    originalRepo: CRUDRepo<ObjectType, IdType, InputValue>,
+    originalRepo: StandardCRUDRepo<ObjectType, IdType, InputValue>,
     objectsSerializer: KSerializer<ObjectType>,
     objectsNullableSerializer: KSerializer<ObjectType?>,
     inputsSerializer: KSerializer<InputValue>,
     idsSerializer: KSerializer<IdType>,
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,
     serialFormatContentType: ContentType = standardKtorSerialFormatContentType
-) = configureCRUDRepoRoutes(
+) = configureStandardCrudRepoRoutes(
     baseSubpart, originalRepo, objectsSerializer, objectsNullableSerializer, inputsSerializer, idsSerializer, UnifiedRouter(serialFormat, serialFormatContentType)
 )

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorWriteCRUDRepoRoutes.kt

@@ -1,41 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.crud
-
-import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.repos.WriteCRUDRepo
-import dev.inmo.micro_utils.repos.ktor.common.crud.*
-import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
-import io.ktor.server.request.receive
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.post
-
-inline fun <reified ObjectType : Any, reified IdType : Any, reified InputValue : Any> Route.configureWriteCRUDRepoRoutes(
-    originalRepo: WriteCRUDRepo<ObjectType, IdType, InputValue>
-) {
-    includeWebsocketHandling(
-        newObjectsFlowRouting,
-        originalRepo.newObjectsFlow,
-    )
-    includeWebsocketHandling(
-        updatedObjectsFlowRouting,
-        originalRepo.updatedObjectsFlow
-    )
-    includeWebsocketHandling(
-        deletedObjectsIdsFlowRouting,
-        originalRepo.deletedObjectsIdsFlow
-    )
-
-    post(createRouting) {
-        call.respond(originalRepo.create(call.receive()))
-    }
-
-    post(updateRouting) {
-        call.respond(originalRepo.update(call.receive()))
-    }
-
-    post(deleteByIdRouting) {
-        originalRepo.deleteById(call.receive())
-        call.respond(HttpStatusCode.OK)
-    }
-}

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/crud/KtorWriteStandardCrudRepo.kt

@@ -3,7 +3,7 @@ package dev.inmo.micro_utils.repos.ktor.server.crud
 import dev.inmo.micro_utils.ktor.common.StandardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.repos.WriteCRUDRepo
+import dev.inmo.micro_utils.repos.WriteStandardCRUDRepo
 import dev.inmo.micro_utils.repos.ktor.common.crud.*
 import io.ktor.http.ContentType
 import io.ktor.server.routing.Route
@@ -11,8 +11,8 @@ import io.ktor.server.routing.post
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*
 
-fun <ObjectType, IdType, InputValue> Route.configureWriteCRUDRepoRoutes(
-    originalRepo: WriteCRUDRepo<ObjectType, IdType, InputValue>,
+fun <ObjectType, IdType, InputValue> Route.configureWriteStandardCrudRepoRoutes(
+    originalRepo: WriteStandardCRUDRepo<ObjectType, IdType, InputValue>,
     objectsSerializer: KSerializer<ObjectType>,
     objectsNullableSerializer: KSerializer<ObjectType?>,
     inputsSerializer: KSerializer<InputValue>,
@@ -94,14 +94,14 @@ fun <ObjectType, IdType, InputValue> Route.configureWriteCRUDRepoRoutes(
     }
 }
 
-fun <ObjectType, IdType, InputValue> Route.configureWriteCRUDRepoRoutes(
-    originalRepo: WriteCRUDRepo<ObjectType, IdType, InputValue>,
+fun <ObjectType, IdType, InputValue> Route.configureWriteStandardCrudRepoRoutes(
+    originalRepo: WriteStandardCRUDRepo<ObjectType, IdType, InputValue>,
     objectsSerializer: KSerializer<ObjectType>,
     objectsNullableSerializer: KSerializer<ObjectType?>,
     inputsSerializer: KSerializer<InputValue>,
     idsSerializer: KSerializer<IdType>,
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,
     serialFormatContentType: ContentType = standardKtorSerialFormatContentType
-) = configureWriteCRUDRepoRoutes(
+) = configureWriteStandardCrudRepoRoutes(
     originalRepo, objectsSerializer, objectsNullableSerializer, inputsSerializer, idsSerializer, UnifiedRouter(serialFormat, serialFormatContentType)
 )

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key/value/KtorKeyValueRepoRoutes.kt

@@ -1,47 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.key.value
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.KeyValueRepo
-import io.ktor.http.*
-import io.ktor.server.routing.Route
-import kotlinx.serialization.*
-
-inline fun <reified Key : Any, reified Value : Any> Route.configureKeyValueRepoRoutes (
-    originalRepo: KeyValueRepo<Key, Value>,
-    noinline idDeserializer: suspend (String) -> Key,
-    noinline valueDeserializer: suspend (String) -> Value
-) {
-    configureReadKeyValueRepoRoutes(originalRepo, idDeserializer, valueDeserializer)
-    configureWriteKeyValueRepoRoutes(originalRepo)
-}
-
-inline fun <reified Key : Any, reified Value : Any> Route.configureKeyValueRepoRoutes(
-    originalRepo: KeyValueRepo<Key, Value>,
-    idsSerializer: DeserializationStrategy<Key>,
-    valueSerializer: DeserializationStrategy<Value>,
-    serialFormat: StringFormat
-) = configureKeyValueRepoRoutes(
-    originalRepo,
-    {
-        serialFormat.decodeFromString(idsSerializer, it.decodeURLQueryComponent())
-    },
-    {
-        serialFormat.decodeFromString(valueSerializer, it.decodeURLQueryComponent())
-    }
-)
-
-inline fun <reified Key : Any, reified Value : Any> Route.configureKeyValueRepoRoutes(
-    originalRepo: KeyValueRepo<Key, Value>,
-    idsSerializer: DeserializationStrategy<Key>,
-    valueSerializer: DeserializationStrategy<Value>,
-    serialFormat: BinaryFormat
-) = configureKeyValueRepoRoutes(
-    originalRepo,
-    {
-        serialFormat.decodeHex(idsSerializer, it)
-    },
-    {
-        serialFormat.decodeHex(valueSerializer, it)
-    }
-)
-

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key/value/KtorReadKeyValueRepoRoutes.kt

@@ -1,107 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.key.value
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.pagination.PaginationResult
-import dev.inmo.micro_utils.pagination.extractPagination
-import dev.inmo.micro_utils.repos.ReadKeyValueRepo
-import dev.inmo.micro_utils.repos.ktor.common.*
-import dev.inmo.micro_utils.repos.ktor.common.containsRoute
-import dev.inmo.micro_utils.repos.ktor.common.countRoute
-import dev.inmo.micro_utils.repos.ktor.common.keyParameterName
-import dev.inmo.micro_utils.repos.ktor.common.key_value.*
-import dev.inmo.micro_utils.repos.ktor.common.reversedParameterName
-import io.ktor.http.*
-import io.ktor.server.application.call
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.get
-import io.ktor.util.InternalAPI
-import io.ktor.util.reflect.typeInfo
-import kotlinx.serialization.*
-
-@OptIn(InternalAPI::class)
-inline fun <reified Key, reified Value> Route.configureReadKeyValueRepoRoutes (
-    originalRepo: ReadKeyValueRepo<Key, Value>,
-    noinline idDeserializer: suspend (String) -> Key,
-    noinline valueDeserializer: suspend (String) -> Value
-) {
-    val paginationWithValuesTypeInfo = typeInfo<PaginationResult<Value>>()
-    val paginationWithKeysTypeInfo = typeInfo<PaginationResult<Key>>()
-
-    get(getRoute) {
-        val key = idDeserializer(
-            call.getQueryParameterOrSendError(keyParameterName) ?: return@get
-        )
-
-        originalRepo.get(key) ?.let {
-            call.respond(it)
-        } ?: call.respond(HttpStatusCode.NoContent)
-    }
-
-    get(valuesRoute) {
-        val pagination = call.request.queryParameters.extractPagination
-        val reversed = call.getQueryParameter(reversedParameterName) ?.toBoolean() ?: false
-
-        call.respond(
-            originalRepo.values(pagination, reversed),
-            paginationWithValuesTypeInfo
-        )
-    }
-
-    get(keysRoute) {
-        val pagination = call.request.queryParameters.extractPagination
-        val reversed = call.getQueryParameterOrSendError(reversedParameterName) ?.toBoolean() ?: false
-        val value = call.getQueryParameter(valueParameterName) ?.let {
-            valueDeserializer(it)
-        }
-
-        call.respond(
-            value ?.let { originalRepo.keys(value, pagination, reversed) } ?: originalRepo.keys(pagination, reversed),
-            paginationWithKeysTypeInfo
-        )
-    }
-
-    get(containsRoute) {
-        val key = idDeserializer(
-            call.getQueryParameterOrSendError(keyParameterName) ?: return@get
-        )
-
-        call.respond(originalRepo.contains(key))
-    }
-
-    get(countRoute) {
-        call.respond(originalRepo.count())
-    }
-}
-
-inline fun <reified Key, reified Value> Route.configureReadKeyValueRepoRoutes(
-    originalRepo: ReadKeyValueRepo<Key, Value>,
-    idsSerializer: DeserializationStrategy<Key>,
-    valueSerializer: DeserializationStrategy<Value>,
-    serialFormat: StringFormat
-) = configureReadKeyValueRepoRoutes(
-    originalRepo,
-    {
-        serialFormat.decodeFromString(idsSerializer, it.decodeURLQueryComponent())
-    },
-    {
-        serialFormat.decodeFromString(valueSerializer, it.decodeURLQueryComponent())
-    }
-)
-
-inline fun <reified Key, reified Value> Route.configureReadKeyValueRepoRoutes(
-    originalRepo: ReadKeyValueRepo<Key, Value>,
-    idsSerializer: DeserializationStrategy<Key>,
-    valueSerializer: DeserializationStrategy<Value>,
-    serialFormat: BinaryFormat
-) = configureReadKeyValueRepoRoutes(
-    originalRepo,
-    {
-        serialFormat.decodeHex(idsSerializer, it)
-    },
-    {
-        serialFormat.decodeHex(valueSerializer, it)
-    }
-)
-

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key/value/KtorWriteKeyValueRepoRoutes.kt

@@ -1,45 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.key.value
-
-import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.repos.WriteKeyValueRepo
-import dev.inmo.micro_utils.repos.ktor.common.key_value.*
-import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
-import io.ktor.server.request.receive
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.post
-import io.ktor.util.reflect.typeInfo
-
-inline fun <reified Key : Any, reified Value : Any> Route.configureWriteKeyValueRepoRoutes (
-    originalRepo: WriteKeyValueRepo<Key, Value>
-) {
-    includeWebsocketHandling(
-        onNewValueRoute,
-        originalRepo.onNewValue
-    )
-
-    includeWebsocketHandling(
-        onValueRemovedRoute,
-        originalRepo.onValueRemoved
-    )
-
-    val mapType = typeInfo<Map<Key, Value>>()
-    val listKeysType = typeInfo<List<Key>>()
-    val listValuesType = typeInfo<List<Value>>()
-
-    post(setRoute) {
-        originalRepo.set(call.receive(mapType))
-        call.respond(HttpStatusCode.OK)
-    }
-
-    post(unsetRoute) {
-        originalRepo.unset(call.receive(listKeysType))
-        call.respond(HttpStatusCode.OK)
-    }
-
-    post(unsetWithValuesRoute) {
-        originalRepo.unsetWithValues(call.receive(listValuesType))
-        call.respond(HttpStatusCode.OK)
-    }
-}

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key/values/KtorKeyValuesRepoRoutes.kt

@@ -1,47 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.key.values
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.repos.*
-import io.ktor.http.*
-import io.ktor.server.routing.Route
-import kotlinx.serialization.*
-
-inline fun <reified Key : Any, reified Value : Any> Route.configureKeyValuesRepoRoutes (
-    originalRepo: KeyValuesRepo<Key, Value>,
-    noinline keyDeserializer: suspend (String) -> Key,
-    noinline valueDeserializer: suspend (String) -> Value
-) {
-    configureReadKeyValuesRepoRoutes(originalRepo, keyDeserializer, valueDeserializer)
-    configureWriteKeyValuesRepoRoutes(originalRepo)
-}
-
-inline fun <reified Key : Any, reified Value : Any> Route.configureKeyValuesRepoRoutes(
-    originalRepo: KeyValuesRepo<Key, Value>,
-    keySerializer: DeserializationStrategy<Key>,
-    valueSerializer: DeserializationStrategy<Value>,
-    serialFormat: StringFormat
-) = configureKeyValuesRepoRoutes(
-    originalRepo,
-    {
-        serialFormat.decodeFromString(keySerializer, it.decodeURLQueryComponent())
-    },
-    {
-        serialFormat.decodeFromString(valueSerializer, it.decodeURLQueryComponent())
-    }
-)
-
-inline fun <reified Key : Any, reified Value : Any> Route.configureKeyValuesRepoRoutes(
-    originalRepo: KeyValuesRepo<Key, Value>,
-    keySerializer: DeserializationStrategy<Key>,
-    valueSerializer: DeserializationStrategy<Value>,
-    serialFormat: BinaryFormat
-) = configureKeyValuesRepoRoutes(
-    originalRepo,
-    {
-        serialFormat.decodeHex(keySerializer, it)
-    },
-    {
-        serialFormat.decodeHex(valueSerializer, it)
-    }
-)
-

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key/values/KtorReadKeyValuesRepoRoutes.kt

@@ -1,108 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.key.values
-
-import dev.inmo.micro_utils.ktor.common.*
-import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.pagination.PaginationResult
-import dev.inmo.micro_utils.pagination.extractPagination
-import dev.inmo.micro_utils.repos.ReadKeyValuesRepo
-import dev.inmo.micro_utils.repos.ktor.common.*
-import dev.inmo.micro_utils.repos.ktor.common.containsRoute
-import dev.inmo.micro_utils.repos.ktor.common.countRoute
-import dev.inmo.micro_utils.repos.ktor.common.one_to_many.*
-import io.ktor.http.*
-import io.ktor.server.application.call
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.get
-import io.ktor.util.InternalAPI
-import io.ktor.util.reflect.typeInfo
-import kotlinx.serialization.*
-
-@OptIn(InternalAPI::class)
-inline fun <reified Key, reified Value> Route.configureReadKeyValuesRepoRoutes (
-    originalRepo: ReadKeyValuesRepo<Key, Value>,
-    noinline keyDeserializer: suspend (String) -> Key,
-    noinline valueDeserializer: suspend (String) -> Value
-) {
-    val paginationWithValuesTypeInfo = typeInfo<PaginationResult<Value>>()
-    val paginationWithKeysTypeInfo = typeInfo<PaginationResult<Key>>()
-
-    get(getRoute) {
-        val key = keyDeserializer(
-            call.getQueryParameterOrSendError(keyParameterName) ?: return@get
-        )
-        val pagination = call.request.queryParameters.extractPagination
-        val reversed = call.getQueryParameter(reversedParameterName) ?.toBoolean() ?: false
-
-        call.respond(
-            originalRepo.get(key, pagination, reversed),
-            paginationWithValuesTypeInfo
-        )
-    }
-
-    get(keysRoute) {
-        val pagination = call.request.queryParameters.extractPagination
-        val reversed = call.getQueryParameterOrSendError(reversedParameterName) ?.toBoolean() ?: false
-        val value = call.getQueryParameter(valueParameterName) ?.let {
-            valueDeserializer(it)
-        }
-
-        call.respond(
-            value ?.let { originalRepo.keys(value, pagination, reversed) } ?: originalRepo.keys(pagination, reversed),
-            paginationWithKeysTypeInfo
-        )
-    }
-
-    get(containsRoute) {
-        val key = keyDeserializer(
-            call.getQueryParameterOrSendError(keyParameterName) ?: return@get
-        )
-        val value = call.getQueryParameter(valueParameterName) ?.let {
-            valueDeserializer(it)
-        }
-
-        call.respond(
-            value ?.let { originalRepo.contains(key, value) } ?: originalRepo.contains(key)
-        )
-    }
-
-    get(countRoute) {
-        val id = call.getQueryParameter(keyParameterName) ?.let {
-            keyDeserializer(it)
-        }
-        call.respond(
-            id ?.let { originalRepo.count(it) } ?: originalRepo.count()
-        )
-    }
-}
-
-inline fun <reified Key, reified Value> Route.configureReadKeyValuesRepoRoutes(
-    originalRepo: ReadKeyValuesRepo<Key, Value>,
-    keySerializer: DeserializationStrategy<Key>,
-    valueSerializer: DeserializationStrategy<Value>,
-    serialFormat: StringFormat
-) = configureReadKeyValuesRepoRoutes(
-    originalRepo,
-    {
-        serialFormat.decodeFromString(keySerializer, it.decodeURLQueryComponent())
-    },
-    {
-        serialFormat.decodeFromString(valueSerializer, it.decodeURLQueryComponent())
-    }
-)
-
-inline fun <reified Key, reified Value> Route.configureReadKeyValuesRepoRoutes(
-    originalRepo: ReadKeyValuesRepo<Key, Value>,
-    keySerializer: DeserializationStrategy<Key>,
-    valueSerializer: DeserializationStrategy<Value>,
-    serialFormat: BinaryFormat
-) = configureReadKeyValuesRepoRoutes(
-    originalRepo,
-    {
-        serialFormat.decodeHex(keySerializer, it)
-    },
-    {
-        serialFormat.decodeHex(valueSerializer, it)
-    }
-)
-

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key/values/KtorWriteKeyValuesRepoRoutes.kt

@@ -1,58 +0,0 @@
-package dev.inmo.micro_utils.repos.ktor.server.key.values
-
-import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.repos.WriteKeyValuesRepo
-import dev.inmo.micro_utils.repos.ktor.common.one_to_many.*
-import io.ktor.http.HttpStatusCode
-import io.ktor.server.application.call
-import io.ktor.server.request.receive
-import io.ktor.server.response.respond
-import io.ktor.server.routing.Route
-import io.ktor.server.routing.post
-import io.ktor.util.reflect.typeInfo
-
-inline fun <reified Key : Any, reified Value : Any> Route.configureWriteKeyValuesRepoRoutes (
-    originalRepo: WriteKeyValuesRepo<Key, Value>
-) {
-    includeWebsocketHandling(
-        onNewValueRoute,
-        originalRepo.onNewValue
-    )
-
-    includeWebsocketHandling(
-        onValueRemovedRoute,
-        originalRepo.onValueRemoved
-    )
-
-    includeWebsocketHandling(
-        onDataClearedRoute,
-        originalRepo.onDataCleared
-    )
-
-    val mapType = typeInfo<Map<Key, List<Value>>>()
-
-    post(addRoute) {
-        originalRepo.add(call.receive(mapType))
-        call.respond(HttpStatusCode.OK)
-    }
-
-    post(setRoute) {
-        originalRepo.set(call.receive(mapType))
-        call.respond(HttpStatusCode.OK)
-    }
-
-    post(removeRoute) {
-        originalRepo.remove(call.receive(mapType))
-        call.respond(HttpStatusCode.OK)
-    }
-
-    post(clearRoute) {
-        originalRepo.clear(call.receive())
-        call.respond(HttpStatusCode.OK)
-    }
-
-    post(clearWithValueRoute) {
-        originalRepo.clearWithValue(call.receive())
-        call.respond(HttpStatusCode.OK)
-    }
-}

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/KtorStandartKeyValueRepo.kt

@@ -4,15 +4,15 @@ import dev.inmo.micro_utils.ktor.common.StandardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.server.UnifiedRouter
 import dev.inmo.micro_utils.ktor.server.standardKtorSerialFormatContentType
-import dev.inmo.micro_utils.repos.KeyValueRepo
+import dev.inmo.micro_utils.repos.StandardKeyValueRepo
 import io.ktor.http.ContentType
 import io.ktor.server.routing.Route
 import io.ktor.server.routing.route
 import kotlinx.serialization.KSerializer
 
-fun <K, V> Route.configureKeyValueRepoRoutes(
+fun <K, V> Route.configureStandardKeyValueRepoRoutes(
     baseSubpart: String,
-    originalRepo: KeyValueRepo<K, V>,
+    originalRepo: StandardKeyValueRepo<K, V>,
     keySerializer: KSerializer<K>,
     valueSerializer: KSerializer<V>,
     valueNullableSerializer: KSerializer<V?>,
@@ -26,7 +26,7 @@ fun <K, V> Route.configureKeyValueRepoRoutes(
             valueNullableSerializer,
             unifiedRouter
         )
-        configureWriteKeyValueRepoRoutes(
+        configureWriteStandardKeyValueRepoRoutes(
             originalRepo,
             keySerializer,
             valueSerializer,
@@ -37,10 +37,10 @@ fun <K, V> Route.configureKeyValueRepoRoutes(
 
 fun <K, V> Route.configureStandartKeyValueRepoRoutes(
     baseSubpart: String,
-    originalRepo: KeyValueRepo<K, V>,
+    originalRepo: StandardKeyValueRepo<K, V>,
     keySerializer: KSerializer<K>,
     valueSerializer: KSerializer<V>,
     valueNullableSerializer: KSerializer<V?>,
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,
     serialFormatContentType: ContentType = standardKtorSerialFormatContentType
-) = configureKeyValueRepoRoutes(baseSubpart, originalRepo, keySerializer, valueSerializer, valueNullableSerializer, UnifiedRouter(serialFormat, serialFormatContentType))
+) = configureStandardKeyValueRepoRoutes(baseSubpart, originalRepo, keySerializer, valueSerializer, valueNullableSerializer, UnifiedRouter(serialFormat, serialFormatContentType))

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/KtorStandartReadKeyValueRepo.kt

@@ -5,13 +5,9 @@ import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.server.*
 import dev.inmo.micro_utils.pagination.PaginationResult
 import dev.inmo.micro_utils.pagination.extractPagination
-import dev.inmo.micro_utils.repos.ReadKeyValueRepo
-import dev.inmo.micro_utils.repos.ktor.common.*
-import dev.inmo.micro_utils.repos.ktor.common.containsRoute
-import dev.inmo.micro_utils.repos.ktor.common.countRoute
+import dev.inmo.micro_utils.repos.ReadStandardKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.key_value.*
-import dev.inmo.micro_utils.repos.ktor.common.key_value.keyParameterName
-import dev.inmo.micro_utils.repos.ktor.common.key_value.reversedParameterName
+import dev.inmo.micro_utils.repos.ktor.common.valueParameterName
 import io.ktor.http.ContentType
 import io.ktor.server.application.call
 import io.ktor.server.routing.Route
@@ -20,7 +16,7 @@ import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer
 
 fun <K, V> Route.configureReadStandartKeyValueRepoRoutes (
-    originalRepo: ReadKeyValueRepo<K, V>,
+    originalRepo: ReadStandardKeyValueRepo<K, V>,
     keySerializer: KSerializer<K>,
     valueSerializer: KSerializer<V>,
     valueNullableSerializer: KSerializer<V?>,
@@ -96,7 +92,7 @@ fun <K, V> Route.configureReadStandartKeyValueRepoRoutes (
 }
 
 inline fun <K, V> Route.configureReadStandartKeyValueRepoRoutes (
-    originalRepo: ReadKeyValueRepo<K, V>,
+    originalRepo: ReadStandardKeyValueRepo<K, V>,
     keySerializer: KSerializer<K>,
     valueSerializer: KSerializer<V>,
     valueNullableSerializer: KSerializer<V?>,

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/key_value/KtorStandartWriteKeyValueRepo.kt

@@ -3,7 +3,7 @@ package dev.inmo.micro_utils.repos.ktor.server.key_value
 import dev.inmo.micro_utils.ktor.common.StandardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.repos.WriteKeyValueRepo
+import dev.inmo.micro_utils.repos.WriteStandardKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.key_value.*
 import io.ktor.http.ContentType
 import io.ktor.server.routing.Route
@@ -11,8 +11,8 @@ import io.ktor.server.routing.post
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*
 
-fun <K, V> Route.configureWriteKeyValueRepoRoutes (
-    originalRepo: WriteKeyValueRepo<K, V>,
+fun <K, V> Route.configureWriteStandardKeyValueRepoRoutes (
+    originalRepo: WriteStandardKeyValueRepo<K, V>,
     keySerializer: KSerializer<K>,
     valueSerializer: KSerializer<V>,
     unifiedRouter: UnifiedRouter
@@ -62,9 +62,9 @@ fun <K, V> Route.configureWriteKeyValueRepoRoutes (
 }
 
 fun <K, V> Route.configureWriteStandartKeyValueRepoRoutes (
-    originalRepo: WriteKeyValueRepo<K, V>,
+    originalRepo: WriteStandardKeyValueRepo<K, V>,
     keySerializer: KSerializer<K>,
     valueSerializer: KSerializer<V>,
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,
     serialFormatContentType: ContentType = standardKtorSerialFormatContentType
-) = configureWriteKeyValueRepoRoutes(originalRepo, keySerializer, valueSerializer, UnifiedRouter(serialFormat, serialFormatContentType))
+) = configureWriteStandardKeyValueRepoRoutes(originalRepo, keySerializer, valueSerializer, UnifiedRouter(serialFormat, serialFormatContentType))

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/one_to_many/ConfigureOneToManyKeyValueRepoRoutes.kt

@@ -4,7 +4,7 @@ import dev.inmo.micro_utils.ktor.common.StandardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.server.UnifiedRouter
 import dev.inmo.micro_utils.ktor.server.standardKtorSerialFormatContentType
-import dev.inmo.micro_utils.repos.KeyValuesRepo
+import dev.inmo.micro_utils.repos.OneToManyKeyValueRepo
 import io.ktor.http.ContentType
 import io.ktor.server.routing.Route
 import io.ktor.server.routing.route
@@ -12,7 +12,7 @@ import kotlinx.serialization.KSerializer
 
 fun <Key, Value> Route.configureOneToManyKeyValueRepoRoutes(
     baseSubpart: String,
-    originalRepo: KeyValuesRepo<Key, Value>,
+    originalRepo: OneToManyKeyValueRepo<Key, Value>,
     keySerializer: KSerializer<Key>,
     valueSerializer: KSerializer<Value>,
     unifiedRouter: UnifiedRouter
@@ -25,7 +25,7 @@ fun <Key, Value> Route.configureOneToManyKeyValueRepoRoutes(
 
 fun <Key, Value> Route.configureOneToManyKeyValueRepoRoutes(
     baseSubpart: String,
-    originalRepo: KeyValuesRepo<Key, Value>,
+    originalRepo: OneToManyKeyValueRepo<Key, Value>,
     keySerializer: KSerializer<Key>,
     valueSerializer: KSerializer<Value>,
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/one_to_many/ConfigureOneToManyReadKeyValueRepoRoutes.kt

@@ -5,7 +5,7 @@ import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.server.*
 import dev.inmo.micro_utils.pagination.PaginationResult
 import dev.inmo.micro_utils.pagination.extractPagination
-import dev.inmo.micro_utils.repos.ReadKeyValuesRepo
+import dev.inmo.micro_utils.repos.ReadOneToManyKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.keyParameterName
 import dev.inmo.micro_utils.repos.ktor.common.one_to_many.*
 import dev.inmo.micro_utils.repos.ktor.common.valueParameterName
@@ -18,7 +18,7 @@ import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer
 
 fun <Key, Value> Route.configureOneToManyReadKeyValueRepoRoutes(
-    originalRepo: ReadKeyValuesRepo<Key, Value>,
+    originalRepo: ReadOneToManyKeyValueRepo<Key, Value>,
     keySerializer: KSerializer<Key>,
     valueSerializer: KSerializer<Value>,
     unifiedRouter: UnifiedRouter
@@ -121,7 +121,7 @@ fun <Key, Value> Route.configureOneToManyReadKeyValueRepoRoutes(
 }
 
 inline fun <Key, Value> Route.configureOneToManyReadKeyValueRepoRoutes(
-    originalRepo: ReadKeyValuesRepo<Key, Value>,
+    originalRepo: ReadOneToManyKeyValueRepo<Key, Value>,
     keySerializer: KSerializer<Key>,
     valueSerializer: KSerializer<Value>,
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,

repos/ktor/server/src/jvmMain/kotlin/dev/inmo/micro_utils/repos/ktor/server/one_to_many/ConfigureOneToManyWriteKeyValueRepoRoutes.kt

@@ -3,7 +3,7 @@ package dev.inmo.micro_utils.repos.ktor.server.one_to_many
 import dev.inmo.micro_utils.ktor.common.StandardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.common.standardKtorSerialFormat
 import dev.inmo.micro_utils.ktor.server.*
-import dev.inmo.micro_utils.repos.WriteKeyValuesRepo
+import dev.inmo.micro_utils.repos.WriteOneToManyKeyValueRepo
 import dev.inmo.micro_utils.repos.ktor.common.one_to_many.*
 import io.ktor.http.ContentType
 import io.ktor.server.routing.Route
@@ -12,7 +12,7 @@ import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.*
 
 fun <Key, Value> Route.configureOneToManyWriteKeyValueRepoRoutes(
-    originalRepo: WriteKeyValuesRepo<Key, Value>,
+    originalRepo: WriteOneToManyKeyValueRepo<Key, Value>,
     keySerializer: KSerializer<Key>,
     valueSerializer: KSerializer<Value>,
     unifiedRouter: UnifiedRouter
@@ -95,7 +95,7 @@ fun <Key, Value> Route.configureOneToManyWriteKeyValueRepoRoutes(
 }
 
 fun <Key, Value> Route.configureOneToManyWriteKeyValueRepoRoutes(
-    originalRepo: WriteKeyValuesRepo<Key, Value>,
+    originalRepo: WriteOneToManyKeyValueRepo<Key, Value>,
     keySerializer: KSerializer<Key>,
     valueSerializer: KSerializer<Value>,
     serialFormat: StandardKtorSerialFormat = standardKtorSerialFormat,