mirror of
https://github.com/InsanusMokrassar/MicroUtils.git
synced 2025-09-17 22:39:25 +00:00
Compare commits
140 Commits
Author | SHA1 | Date | |
---|---|---|---|
aa79496a36 | |||
4bfa4c32aa | |||
d8ca29eab1 | |||
f7a9f2e13d | |||
af286d3d53 | |||
9a20e8155e | |||
b81af7e1c8 | |||
74563bbac9 | |||
07ad79f0b3 | |||
5c28255e06 | |||
99783f281d | |||
a5008c3d15 | |||
f807f2beeb | |||
db34b25ef2 | |||
96daf11fd4 | |||
f7e98dfd2d | |||
61277e92bd | |||
32ef9f399f | |||
54e6ca5dc3 | |||
a8e226786d | |||
ce717a4c9f | |||
fd41bf0ae7 | |||
b2b68bf29f | |||
b87c29c354 | |||
24977822c9 | |||
647daa8627 | |||
a372efacb1 | |||
f40d33db2a | |||
a5eb0fbd24 | |||
307c8030af | |||
a9016465fa | |||
358b70eb5f | |||
6fcbb80a71 | |||
|
643f6c420b | ||
ac68b0b941 | |||
d62f67bd88 | |||
8718c5e310 | |||
e8273ab80c | |||
2718605987 | |||
d99538d80b | |||
ce7a1e4e21 | |||
921734763d | |||
18c608f569 | |||
b915f6ece2 | |||
24347b422c | |||
e5f4ae647f | |||
72202b8a21 | |||
dbc14d41de | |||
1dca5ea00d | |||
f03d1d788c | |||
fcac6f9fa8 | |||
ca0cd433c9 | |||
39589fdbd0 | |||
605fc3cff9 | |||
12cd6f48f8 | |||
1f57478d10 | |||
7ef4c5d282 | |||
f09d92be32 | |||
6245b36bdb | |||
54cc353bcc | |||
b7abba099c | |||
c5dbd10335 | |||
a44e3e953d | |||
ee2521cb01 | |||
4625dfb857 | |||
b9a2653066 | |||
fcaa327660 | |||
496117d517 | |||
8ce7d37b72 | |||
25391609b9 | |||
f0b7b9c5e5 | |||
301cdaa2c2 | |||
fce7ec8912 | |||
24bd403549 | |||
46c89c48a9 | |||
bad9a53fdb | |||
0bce7bd60a | |||
2f70a1cfb4 | |||
bfb6e738ee | |||
c7ad9aae07 | |||
fecd719239 | |||
18d6ac31b5 | |||
d8dbebfc7e | |||
16463d0eb9 | |||
837cac644d | |||
e83e0a8535 | |||
2e309c31a6 | |||
625db02651 | |||
e3144c08c1 | |||
40e25970ad | |||
4ccb8a8d11 | |||
26d1c3d9ef | |||
cc8fe7b001 | |||
4601eab864 | |||
1ee9c88ffd | |||
7feac213f6 | |||
c75a9c0f61 | |||
afd0c9784f | |||
f1ddbea06e | |||
42bf3cd4e3 | |||
27f5549f56 | |||
b0569f8421 | |||
8d86f29325 | |||
aeca32498a | |||
e8232664f3 | |||
efa869f91a | |||
dbff3d7cf1 | |||
9e70f73684 | |||
9f2f0de0c4 | |||
bf293a8f8f | |||
5fbc1a132f | |||
36093b9741 | |||
8713fb04c5 | |||
ea82a59f31 | |||
18f67cd4f2 | |||
120e7228c7 | |||
892fa90c37 | |||
491dac5bf0 | |||
2ab06fbafd | |||
e68735d061 | |||
9ba4d98c30 | |||
19bbfd4916 | |||
d94cd7ea94 | |||
0dd8f41eb0 | |||
f1ab5ab51f | |||
a8056f3120 | |||
09c0cdebb5 | |||
629d7c7a82 | |||
a0dd1aec3d | |||
17d6377902 | |||
ad401105a1 | |||
4913e99c2e | |||
16b97029cf | |||
481130c9bb | |||
698ed6718d | |||
d164813bb4 | |||
52157ee0e7 | |||
877b62fe5d | |||
d823a02971 | |||
70014ba233 |
7
.github/workflows/build.yml
vendored
7
.github/workflows/build.yml
vendored
@@ -17,8 +17,9 @@ jobs:
|
||||
mv gradle.properties.tmp gradle.properties
|
||||
- name: Build
|
||||
run: ./gradlew build
|
||||
- name: Publish
|
||||
- name: Publish to InmoNexus
|
||||
continue-on-error: true
|
||||
run: ./gradlew publishAllPublicationsToGiteaRepository
|
||||
run: ./gradlew publishAllPublicationsToInmoNexusRepository
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
INMONEXUS_USER: ${{ secrets.INMONEXUS_USER }}
|
||||
INMONEXUS_PASSWORD: ${{ secrets.INMONEXUS_PASSWORD }}
|
||||
|
2
.gitignore
vendored
2
.gitignore
vendored
@@ -1,4 +1,5 @@
|
||||
.idea
|
||||
.kotlin
|
||||
out/*
|
||||
*.iml
|
||||
target
|
||||
@@ -17,5 +18,6 @@ publishing.sh
|
||||
|
||||
local.*
|
||||
local/
|
||||
**/*.local.*
|
||||
|
||||
.kotlin/
|
||||
|
211
CHANGELOG.md
211
CHANGELOG.md
@@ -1,5 +1,216 @@
|
||||
# Changelog
|
||||
|
||||
## 0.24.6
|
||||
|
||||
* `Versions`:
|
||||
* `KSLog`: `1.4.0` -> `1.4.1`
|
||||
* `Exposed`: `0.58.0` -> `0.59.0`
|
||||
* `SQLite`: `3.48.0.0` -> `3.49.0.0`
|
||||
* `AndroidFragment`: `1.8.5` -> `1.8.6`
|
||||
* `Coroutines`:
|
||||
* Safely functions has been replaced with `Logging` variations (resolve of [#541](https://github.com/InsanusMokrassar/MicroUtils/issues/541))
|
||||
* `KSP`:
|
||||
* `Variations`:
|
||||
* Module has been created
|
||||
|
||||
## 0.24.5
|
||||
|
||||
* `Versions`:
|
||||
* `Kotlin`: `2.1.0` -> `2.1.10`
|
||||
* `SQLite`: `3.47.2.0` -> `3.48.0.0`
|
||||
* `Koin`: `4.0.1` -> `4.0.2`
|
||||
* `Android RecyclerView`: `1.3.2` -> `1.4.0`
|
||||
|
||||
## 0.24.4
|
||||
|
||||
* `Repos`:
|
||||
* `Exposed`:
|
||||
* Improve `CommonExposedRepo.selectByIds`
|
||||
* `FSM`:
|
||||
* Fixes and improvements
|
||||
|
||||
## 0.24.3
|
||||
|
||||
* `Ksp`:
|
||||
* `Sealed`:
|
||||
* Fixes in processing of `GenerateSealedTypesWorkaround` annotations
|
||||
|
||||
## 0.24.2
|
||||
|
||||
* `Versions`:
|
||||
* `Exposed`: `0.57.0` -> `0.58.0`
|
||||
* `Ksp`:
|
||||
* `Sealed`:
|
||||
* Add annotation `GenerateSealedTypesWorkaround` which allow to generate `subtypes` lists
|
||||
|
||||
## 0.24.1
|
||||
|
||||
* `Versions`:
|
||||
* `Serialization`: `1.7.3` -> `1.8.0`
|
||||
* `SQLite`: `3.47.1.0` -> `3.47.2.0`
|
||||
* `Koin`: `4.0.0` -> `3.10.2`
|
||||
* `OKio`: `3.9.1` -> `3.10.2`
|
||||
|
||||
## 0.24.0
|
||||
|
||||
* `Versions`:
|
||||
* `Coroutines`: `1.9.0` -> `1.10.1`
|
||||
* `KSLog`: `1.3.6` -> `1.4.0`
|
||||
* `Compose`: `1.7.1` -> `1.7.3`
|
||||
* `Ktor`: `3.0.2` -> `3.0.3`
|
||||
* `Common`:
|
||||
* Rename `Progress` to more common `Percentage`. `Progress` now is typealias
|
||||
* Fix of `Progress.compareTo` extension
|
||||
|
||||
## 0.23.2
|
||||
|
||||
* `Versions`:
|
||||
* `Kotlin`: `2.0.21` -> `2.1.0`
|
||||
* `Exposed`: `0.56.0` -> `0.57.0`
|
||||
* `Xerial SQLite`: `3.47.0.0` -> `3.47.1.0`
|
||||
* `Ktor`: `3.0.1` -> `3.0.2`
|
||||
* `Coroutines`:
|
||||
* Small refactor in `AccumulatorFlow` to use `runCatching` instead of `runCatchingSafely`
|
||||
|
||||
## 0.23.1
|
||||
|
||||
* `Versions`:
|
||||
* `Compose`: `1.7.0` -> `1.7.1`
|
||||
* `Exposed`: `0.55.0` -> `0.56.0`
|
||||
* `Xerial SQLite`: `3.46.1.3` -> `3.47.0.0`
|
||||
* `Android CoreKTX`: `1.13.1` -> `1.15.0`
|
||||
* `Android Fragment`: `1.8.4` -> `1.8.5`
|
||||
* `Coroutines`:
|
||||
* `Compose`:
|
||||
* Add `StyleSheetsAggregator`
|
||||
|
||||
## 0.23.0
|
||||
|
||||
**THIS UPDATE MAY CONTAINS SOME BREAKING CHANGES (INCLUDING BREAKING CHANGES IN BYTECODE LAYER) RELATED TO UPDATE OF
|
||||
KTOR DEPENDENCY**
|
||||
|
||||
**THIS UPDATE CONTAINS CHANGES ACCORDING TO MIGRATION [GUIDE FROM KTOR](https://ktor.io/docs/migrating-3.html)**
|
||||
|
||||
* `Versions`:
|
||||
* `Ktor`: `2.3.12` -> `3.0.1`
|
||||
* `Ktor`:
|
||||
* `Common`:
|
||||
* Extension `Input.downloadToTempFile` has changed its receiver to `Source`. Its API can be broken
|
||||
* `Client`:
|
||||
* Extension `HttpClient.tempUpload` has changed type of `onUpload` argument from `OnUploadCallback` to `ProgressListener`
|
||||
* All extensions `HttpClient.uniUpload` have changed type of `onUpload` argument from `OnUploadCallback` to `ProgressListener`
|
||||
* `Server`:
|
||||
* Remove redundant `ApplicationCall.respond` extension due to its presence in the ktor library
|
||||
|
||||
## 0.22.9
|
||||
|
||||
* `Repos`:
|
||||
* `Cache`:
|
||||
* Add direct caching repos
|
||||
|
||||
## 0.22.8
|
||||
|
||||
* `Common`:
|
||||
* Add `List.breakAsPairs` extension
|
||||
* Add `Sequence.padWith`/`Sequence.padStart`/`Sequence.padEnd` and `List.padWith`/`List.padStart`/`List.padEnd` extensions
|
||||
|
||||
## 0.22.7
|
||||
|
||||
* `Versions`:
|
||||
* `Kotlin`: `2.0.20` -> `2.0.21`
|
||||
* `Compose`: `1.7.0-rc01` -> `1.7.0`
|
||||
* `KSP`:
|
||||
* `Sealed`:
|
||||
* Change package of `GenerateSealedWorkaround`. Migration: replace `dev.inmo.microutils.kps.sealed.GenerateSealedWorkaround` -> `dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround`
|
||||
|
||||
## 0.22.6
|
||||
|
||||
* `KSP`:
|
||||
* `Generator`:
|
||||
* Add extension `KSClassDeclaration.buildSubFileName`
|
||||
* Add extension `KSClassDeclaration.companion`
|
||||
* Add extension `KSClassDeclaration.resolveSubclasses`
|
||||
* `Sealed`:
|
||||
* Improvements
|
||||
|
||||
## 0.22.5
|
||||
|
||||
* `Versions`:
|
||||
* `Compose`: `1.7.0-beta02` -> `1.7.0-rc01`
|
||||
* `SQLite`: `3.46.1.2` -> `3.46.1.3`
|
||||
* `AndroidXFragment`: `1.8.3` -> `1.8.4`
|
||||
* `Common`:
|
||||
* Add extension `withReplacedAt`/`withReplaced` ([#489](https://github.com/InsanusMokrassar/MicroUtils/issues/489))
|
||||
* `Coroutines`:
|
||||
* Add extension `Flow.debouncedBy`
|
||||
* `Ktor`:
|
||||
* `Server`:
|
||||
* Add `KtorApplicationConfigurator.Routing.Static` as solution for [#488](https://github.com/InsanusMokrassar/MicroUtils/issues/488)
|
||||
|
||||
## 0.22.4
|
||||
|
||||
* `Versions`:
|
||||
* `Exposed`: `0.54.0` -> `0.55.0`
|
||||
* `SQLite`: `3.46.1.0` -> `3.46.1.2`
|
||||
|
||||
## 0.22.3
|
||||
|
||||
* `Versions`:
|
||||
* `Serialization`: `1.7.2` -> `1.7.3`
|
||||
* `Coroutines`: `1.8.1` -> `1.9.0`
|
||||
* `Compose`: `1.7.0-alpha03` -> `1.7.0-beta02`
|
||||
* `Koin`: `3.5.6` -> `4.0.0`
|
||||
* `Okio`: `3.9.0` -> `3.9.1`
|
||||
* `AndroidFragment`: `1.8.2` -> `1.8.3`
|
||||
* `androidx.compose.material3:material3` has been replaced with `org.jetbrains.compose.material3:material3`
|
||||
* `Common`:
|
||||
* `JS`:
|
||||
* Add several useful extensions
|
||||
* `Compose`:
|
||||
* `JS`:
|
||||
* Add several useful extensions
|
||||
|
||||
## 0.22.2
|
||||
|
||||
* `Versions`:
|
||||
* `Exposed`: `0.53.0` -> `0.54.0`
|
||||
* `SQLite`: `3.46.0.1` -> `3.46.1.0`
|
||||
|
||||
## 0.22.1
|
||||
|
||||
* `Versions`:
|
||||
* `Kotlin`: `2.0.10` -> `2.0.20`
|
||||
* `Serialization`: `1.7.1` -> `1.7.2`
|
||||
* `KSLog`: `1.3.5` -> `1.3.6`
|
||||
* `Compose`: `1.7.0-alpha02` -> `1.7.0-alpha03`
|
||||
* `Ktor`: `2.3.11` -> `2.3.12`
|
||||
|
||||
## 0.22.0
|
||||
|
||||
**THIS UPDATE CONTAINS BREAKING CHANGES ACCORDING TO UPDATE UP TO KOTLIN 2.0**
|
||||
|
||||
* `Versions`:
|
||||
* `Kotlin`: `1.9.23` -> `2.0.10`
|
||||
* `Serialization`: `1.6.3` -> `1.7.1`
|
||||
* `KSLog`: `1.3.4` -> `1.3.5`
|
||||
* `Compose`: `1.6.2` -> `1.7.0-alpha02`
|
||||
* `Exposed`: `0.50.1` -> `0.53.0`
|
||||
* `AndroidAppCompat`: `1.6.1` -> `1.7.0`
|
||||
* `AndroidFragment`: `1.7.1` -> `1.8.2`
|
||||
|
||||
## 0.21.6
|
||||
|
||||
* `KSP`:
|
||||
* `Sealed`:
|
||||
* Fixes in generation
|
||||
|
||||
## 0.21.5
|
||||
|
||||
* `KSP`:
|
||||
* Add utility functions `KSClassDeclaration.findSubClasses`
|
||||
* `Sealed`:
|
||||
* Improve generation
|
||||
|
||||
## 0.21.4
|
||||
|
||||
* `Common`:
|
||||
|
@@ -4,7 +4,7 @@ plugins {
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppAndroidProjectPresetPath"
|
||||
apply from: "$mppAndroidProject"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
|
@@ -4,7 +4,7 @@ plugins {
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppAndroidProjectPresetPath"
|
||||
apply from: "$mppAndroidProject"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
|
@@ -3,9 +3,10 @@ plugins {
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
id "com.android.library"
|
||||
alias(libs.plugins.jb.compose)
|
||||
alias(libs.plugins.kt.jb.compose)
|
||||
}
|
||||
|
||||
apply from: "$mppProjectWithSerializationAndComposePresetPath"
|
||||
apply from: "$mppProjectWithSerializationAndCompose"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
|
@@ -4,7 +4,7 @@ plugins {
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppAndroidProjectPresetPath"
|
||||
apply from: "$mppAndroidProject"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
|
@@ -3,15 +3,16 @@ plugins {
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
id "com.android.library"
|
||||
alias(libs.plugins.jb.compose)
|
||||
alias(libs.plugins.kt.jb.compose)
|
||||
}
|
||||
|
||||
apply from: "$mppProjectWithSerializationAndComposePresetPath"
|
||||
apply from: "$mppProjectWithSerializationAndCompose"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
androidMain {
|
||||
dependencies {
|
||||
api libs.android.compose.material3
|
||||
api libs.jb.compose.material3
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -29,15 +29,6 @@ allprojects {
|
||||
maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
|
||||
maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
|
||||
}
|
||||
|
||||
// temporal crutch until legacy tests will be stabled or legacy target will be removed
|
||||
if (it != rootProject.findProject("docs")) {
|
||||
tasks.whenTaskAdded { task ->
|
||||
if(task.name == "jsLegacyBrowserTest" || task.name == "jsLegacyNodeTest") {
|
||||
task.enabled = false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
apply from: "./extensions.gradle"
|
||||
|
@@ -4,7 +4,7 @@ plugins {
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
|
@@ -4,4 +4,4 @@ plugins {
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
@@ -4,7 +4,7 @@ plugins {
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
|
@@ -3,9 +3,10 @@ plugins {
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
id "com.android.library"
|
||||
alias(libs.plugins.jb.compose)
|
||||
alias(libs.plugins.kt.jb.compose)
|
||||
}
|
||||
|
||||
apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
|
@@ -0,0 +1,19 @@
|
||||
package dev.inmo.micro_utils.common.compose
|
||||
|
||||
import org.jetbrains.compose.web.dom.AttrBuilderContext
|
||||
import org.w3c.dom.Element
|
||||
|
||||
operator fun <T : Element> AttrBuilderContext<T>?.plus(
|
||||
other: AttrBuilderContext<T>?
|
||||
) = when (this) {
|
||||
null -> other ?: {}
|
||||
else -> when (other) {
|
||||
null -> this ?: {}
|
||||
else -> {
|
||||
{
|
||||
invoke(this)
|
||||
other(this)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@@ -0,0 +1,22 @@
|
||||
package dev.inmo.micro_utils.common.compose
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.DisposableEffect
|
||||
import androidx.compose.runtime.DisposableEffectResult
|
||||
import androidx.compose.runtime.DisposableEffectScope
|
||||
import org.jetbrains.compose.web.attributes.AttrsScope
|
||||
import org.jetbrains.compose.web.dom.ElementScope
|
||||
import org.w3c.dom.Element
|
||||
|
||||
/**
|
||||
* This function must be called in the context of your tag content. It works like default [AttrsScope.ref],
|
||||
* but able to be used several times. Uses [DisposableEffect] under the hood
|
||||
*/
|
||||
@Composable
|
||||
fun <T : Element> ElementScope<T>.ref(
|
||||
block: DisposableEffectScope.(T) -> DisposableEffectResult
|
||||
) {
|
||||
DisposableEffect(0) {
|
||||
block(scopeElement)
|
||||
}
|
||||
}
|
@@ -0,0 +1,11 @@
|
||||
package dev.inmo.micro_utils.common.compose
|
||||
|
||||
import org.jetbrains.compose.web.dom.AttrBuilderContext
|
||||
|
||||
fun tagClasses(vararg classnames: String): AttrBuilderContext<*> = {
|
||||
classes(*classnames)
|
||||
}
|
||||
|
||||
fun tagId(id: String): AttrBuilderContext<*> = {
|
||||
id(id)
|
||||
}
|
@@ -0,0 +1,13 @@
|
||||
package dev.inmo.micro_utils.common
|
||||
|
||||
fun <T> List<T>.breakAsPairs(): List<Pair<T, T>> {
|
||||
val result = mutableListOf<Pair<T, T>>()
|
||||
|
||||
for (i in 0 until size - 1) {
|
||||
val first = get(i)
|
||||
val second = get(i + 1)
|
||||
result.add(first to second)
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
@@ -8,7 +8,7 @@ private inline fun <T> getObject(
|
||||
additional: MutableList<T>,
|
||||
iterator: Iterator<T>
|
||||
): T? = when {
|
||||
additional.isNotEmpty() -> additional.removeFirst()
|
||||
additional.isNotEmpty() -> additional.removeAt(0)
|
||||
iterator.hasNext() -> iterator.next()
|
||||
else -> null
|
||||
}
|
||||
|
@@ -0,0 +1,32 @@
|
||||
package dev.inmo.micro_utils.common
|
||||
|
||||
inline fun <T> Sequence<T>.padWith(size: Int, inserter: (Sequence<T>) -> Sequence<T>): Sequence<T> {
|
||||
var result = this
|
||||
while (result.count() < size) {
|
||||
result = inserter(result)
|
||||
}
|
||||
return result
|
||||
}
|
||||
|
||||
inline fun <T> Sequence<T>.padEnd(size: Int, padBlock: (Int) -> T): Sequence<T> = padWith(size) { it + padBlock(it.count()) }
|
||||
|
||||
inline fun <T> Sequence<T>.padEnd(size: Int, o: T) = padEnd(size) { o }
|
||||
|
||||
inline fun <T> List<T>.padWith(size: Int, inserter: (List<T>) -> List<T>): List<T> {
|
||||
var result = this
|
||||
while (result.size < size) {
|
||||
result = inserter(result)
|
||||
}
|
||||
return result
|
||||
}
|
||||
inline fun <T> List<T>.padEnd(size: Int, padBlock: (Int) -> T): List<T> = asSequence().padEnd(size, padBlock).toList()
|
||||
|
||||
inline fun <T> List<T>.padEnd(size: Int, o: T): List<T> = asSequence().padEnd(size, o).toList()
|
||||
|
||||
inline fun <T> Sequence<T>.padStart(size: Int, padBlock: (Int) -> T): Sequence<T> = padWith(size) { sequenceOf(padBlock(it.count())) + it }
|
||||
|
||||
inline fun <T> Sequence<T>.padStart(size: Int, o: T) = padStart(size) { o }
|
||||
|
||||
inline fun <T> List<T>.padStart(size: Int, padBlock: (Int) -> T): List<T> = asSequence().padStart(size, padBlock).toList()
|
||||
|
||||
inline fun <T> List<T>.padStart(size: Int, o: T): List<T> = asSequence().padStart(size, o).toList()
|
@@ -0,0 +1,76 @@
|
||||
package dev.inmo.micro_utils.common
|
||||
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlin.jvm.JvmInline
|
||||
|
||||
/**
|
||||
* Contains [of1] as main value, where 100% of percentage is when of1 == 1
|
||||
*
|
||||
* @see invoke
|
||||
* @see partOfTotal
|
||||
* @see of100
|
||||
*/
|
||||
@Serializable
|
||||
@JvmInline
|
||||
value class Percentage private constructor(
|
||||
/**
|
||||
* Value of percentage. When it equals to 1, means 100%
|
||||
*/
|
||||
val of1: Double
|
||||
) {
|
||||
/**
|
||||
* Same as [of1], but float (using [Double.toFloat])
|
||||
*/
|
||||
val of1Float
|
||||
get() = of1.toFloat()
|
||||
|
||||
/**
|
||||
* Represent this percentage as common percentage where 100% is 100%
|
||||
*/
|
||||
val of100
|
||||
get() = of1 * 100
|
||||
|
||||
/**
|
||||
* Same as [of100], but float (using [Double.toFloat])
|
||||
*/
|
||||
val of100Float
|
||||
get() = of100.toFloat()
|
||||
|
||||
/**
|
||||
* Same as [of100], but int (using [Double.toInt])
|
||||
*/
|
||||
val of100Int
|
||||
get() = of100.toInt()
|
||||
|
||||
companion object {
|
||||
val rangeOfValues = 0.0 .. 1.0
|
||||
|
||||
val START = Percentage(rangeOfValues.start)
|
||||
val COMPLETED = Percentage(rangeOfValues.endInclusive)
|
||||
|
||||
operator fun invoke(of1: Double) = Percentage(of1.coerceIn(rangeOfValues))
|
||||
operator fun invoke(part: Number, total: Number) = Percentage(
|
||||
part.toDouble() / total.toDouble()
|
||||
)
|
||||
fun of1(of1: Double) = Percentage(of1 = of1)
|
||||
fun of100(of100: Double) = Percentage(of1 = of100 / 100)
|
||||
fun partOfTotal(part: Number, total: Number) = Percentage(part = part, total = total)
|
||||
}
|
||||
}
|
||||
|
||||
typealias Progress = Percentage
|
||||
|
||||
/**
|
||||
* Will return [this] [Progress] if [Percentage.of1] in `0 .. 1` range
|
||||
*/
|
||||
fun Progress.ensureStrictOrNull(): Progress? = if (of1 in Percentage.rangeOfValues) this else null
|
||||
/**
|
||||
* Will return [this] [Progress] if [Percentage.of1] in `0 .. 1` range. Otherwise, will throw error
|
||||
* [IllegalArgumentException] due to [require] failure
|
||||
*/
|
||||
fun Progress.ensureStrictOrThrow(): Progress {
|
||||
require(of1 in Percentage.rangeOfValues) {
|
||||
"For strict checks value of percentage must be in ${Percentage.rangeOfValues}, but actual value is $of1"
|
||||
}
|
||||
return this
|
||||
}
|
@@ -0,0 +1,80 @@
|
||||
@file:Suppress(
|
||||
"RemoveRedundantCallsOfConversionMethods",
|
||||
"RedundantVisibilityModifier",
|
||||
)
|
||||
|
||||
package dev.inmo.micro_utils.common
|
||||
|
||||
import kotlin.Byte
|
||||
import kotlin.Double
|
||||
import kotlin.Float
|
||||
import kotlin.Int
|
||||
import kotlin.Long
|
||||
import kotlin.Short
|
||||
import kotlin.Suppress
|
||||
|
||||
public operator fun Percentage.plus(other: Percentage): Percentage = Percentage(of1 + other.of1)
|
||||
|
||||
public operator fun Percentage.minus(other: Percentage): Percentage = Percentage(of1 - other.of1)
|
||||
|
||||
public operator fun Percentage.plus(i: Byte): Percentage = Percentage((of1 + i).toDouble())
|
||||
|
||||
public operator fun Percentage.minus(i: Byte): Percentage = Percentage((of1 - i).toDouble())
|
||||
|
||||
public operator fun Percentage.times(i: Byte): Percentage = Percentage((of1 * i).toDouble())
|
||||
|
||||
public operator fun Percentage.div(i: Byte): Percentage = Percentage((of1 / i).toDouble())
|
||||
|
||||
public operator fun Percentage.rem(i: Byte): Percentage = Percentage((of1 % i).toDouble())
|
||||
|
||||
public operator fun Percentage.plus(i: Short): Percentage = Percentage((of1 + i).toDouble())
|
||||
|
||||
public operator fun Percentage.minus(i: Short): Percentage = Percentage((of1 - i).toDouble())
|
||||
|
||||
public operator fun Percentage.times(i: Short): Percentage = Percentage((of1 * i).toDouble())
|
||||
|
||||
public operator fun Percentage.div(i: Short): Percentage = Percentage((of1 / i).toDouble())
|
||||
|
||||
public operator fun Percentage.rem(i: Short): Percentage = Percentage((of1 % i).toDouble())
|
||||
|
||||
public operator fun Percentage.plus(i: Int): Percentage = Percentage((of1 + i).toDouble())
|
||||
|
||||
public operator fun Percentage.minus(i: Int): Percentage = Percentage((of1 - i).toDouble())
|
||||
|
||||
public operator fun Percentage.times(i: Int): Percentage = Percentage((of1 * i).toDouble())
|
||||
|
||||
public operator fun Percentage.div(i: Int): Percentage = Percentage((of1 / i).toDouble())
|
||||
|
||||
public operator fun Percentage.rem(i: Int): Percentage = Percentage((of1 % i).toDouble())
|
||||
|
||||
public operator fun Percentage.plus(i: Long): Percentage = Percentage((of1 + i).toDouble())
|
||||
|
||||
public operator fun Percentage.minus(i: Long): Percentage = Percentage((of1 - i).toDouble())
|
||||
|
||||
public operator fun Percentage.times(i: Long): Percentage = Percentage((of1 * i).toDouble())
|
||||
|
||||
public operator fun Percentage.div(i: Long): Percentage = Percentage((of1 / i).toDouble())
|
||||
|
||||
public operator fun Percentage.rem(i: Long): Percentage = Percentage((of1 % i).toDouble())
|
||||
|
||||
public operator fun Percentage.plus(i: Float): Percentage = Percentage((of1 + i).toDouble())
|
||||
|
||||
public operator fun Percentage.minus(i: Float): Percentage = Percentage((of1 - i).toDouble())
|
||||
|
||||
public operator fun Percentage.times(i: Float): Percentage = Percentage((of1 * i).toDouble())
|
||||
|
||||
public operator fun Percentage.div(i: Float): Percentage = Percentage((of1 / i).toDouble())
|
||||
|
||||
public operator fun Percentage.rem(i: Float): Percentage = Percentage((of1 % i).toDouble())
|
||||
|
||||
public operator fun Percentage.plus(i: Double): Percentage = Percentage((of1 + i).toDouble())
|
||||
|
||||
public operator fun Percentage.minus(i: Double): Percentage = Percentage((of1 - i).toDouble())
|
||||
|
||||
public operator fun Percentage.times(i: Double): Percentage = Percentage((of1 * i).toDouble())
|
||||
|
||||
public operator fun Percentage.div(i: Double): Percentage = Percentage((of1 / i).toDouble())
|
||||
|
||||
public operator fun Percentage.rem(i: Double): Percentage = Percentage((of1 % i).toDouble())
|
||||
|
||||
public operator fun Percentage.compareTo(other: Percentage): Int = (of1.compareTo(other.of1))
|
@@ -1,37 +0,0 @@
|
||||
package dev.inmo.micro_utils.common
|
||||
|
||||
import kotlinx.serialization.Serializable
|
||||
import kotlin.jvm.JvmInline
|
||||
|
||||
@Serializable
|
||||
@JvmInline
|
||||
value class Progress private constructor(
|
||||
val of1: Double
|
||||
) {
|
||||
val of1Float
|
||||
get() = of1.toFloat()
|
||||
val of100
|
||||
get() = of1 * 100
|
||||
val of100Float
|
||||
get() = of100.toFloat()
|
||||
val of100Int
|
||||
get() = of100.toInt()
|
||||
|
||||
init {
|
||||
require(of1 in rangeOfValues) {
|
||||
"Progress main value should be in $rangeOfValues, but incoming value is $of1"
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
val rangeOfValues = 0.0 .. 1.0
|
||||
|
||||
val START = Progress(rangeOfValues.start)
|
||||
val COMPLETED = Progress(rangeOfValues.endInclusive)
|
||||
|
||||
operator fun invoke(of1: Double) = Progress(of1.coerceIn(rangeOfValues))
|
||||
operator fun invoke(part: Number, total: Number) = Progress(
|
||||
part.toDouble() / total.toDouble()
|
||||
)
|
||||
}
|
||||
}
|
@@ -1,80 +0,0 @@
|
||||
@file:Suppress(
|
||||
"RemoveRedundantCallsOfConversionMethods",
|
||||
"RedundantVisibilityModifier",
|
||||
)
|
||||
|
||||
package dev.inmo.micro_utils.common
|
||||
|
||||
import kotlin.Byte
|
||||
import kotlin.Double
|
||||
import kotlin.Float
|
||||
import kotlin.Int
|
||||
import kotlin.Long
|
||||
import kotlin.Short
|
||||
import kotlin.Suppress
|
||||
|
||||
public operator fun Progress.plus(other: Progress): Progress = Progress(of1 + other.of1)
|
||||
|
||||
public operator fun Progress.minus(other: Progress): Progress = Progress(of1 - other.of1)
|
||||
|
||||
public operator fun Progress.plus(i: Byte): Progress = Progress((of1 + i).toDouble())
|
||||
|
||||
public operator fun Progress.minus(i: Byte): Progress = Progress((of1 - i).toDouble())
|
||||
|
||||
public operator fun Progress.times(i: Byte): Progress = Progress((of1 * i).toDouble())
|
||||
|
||||
public operator fun Progress.div(i: Byte): Progress = Progress((of1 / i).toDouble())
|
||||
|
||||
public operator fun Progress.rem(i: Byte): Progress = Progress((of1 % i).toDouble())
|
||||
|
||||
public operator fun Progress.plus(i: Short): Progress = Progress((of1 + i).toDouble())
|
||||
|
||||
public operator fun Progress.minus(i: Short): Progress = Progress((of1 - i).toDouble())
|
||||
|
||||
public operator fun Progress.times(i: Short): Progress = Progress((of1 * i).toDouble())
|
||||
|
||||
public operator fun Progress.div(i: Short): Progress = Progress((of1 / i).toDouble())
|
||||
|
||||
public operator fun Progress.rem(i: Short): Progress = Progress((of1 % i).toDouble())
|
||||
|
||||
public operator fun Progress.plus(i: Int): Progress = Progress((of1 + i).toDouble())
|
||||
|
||||
public operator fun Progress.minus(i: Int): Progress = Progress((of1 - i).toDouble())
|
||||
|
||||
public operator fun Progress.times(i: Int): Progress = Progress((of1 * i).toDouble())
|
||||
|
||||
public operator fun Progress.div(i: Int): Progress = Progress((of1 / i).toDouble())
|
||||
|
||||
public operator fun Progress.rem(i: Int): Progress = Progress((of1 % i).toDouble())
|
||||
|
||||
public operator fun Progress.plus(i: Long): Progress = Progress((of1 + i).toDouble())
|
||||
|
||||
public operator fun Progress.minus(i: Long): Progress = Progress((of1 - i).toDouble())
|
||||
|
||||
public operator fun Progress.times(i: Long): Progress = Progress((of1 * i).toDouble())
|
||||
|
||||
public operator fun Progress.div(i: Long): Progress = Progress((of1 / i).toDouble())
|
||||
|
||||
public operator fun Progress.rem(i: Long): Progress = Progress((of1 % i).toDouble())
|
||||
|
||||
public operator fun Progress.plus(i: Float): Progress = Progress((of1 + i).toDouble())
|
||||
|
||||
public operator fun Progress.minus(i: Float): Progress = Progress((of1 - i).toDouble())
|
||||
|
||||
public operator fun Progress.times(i: Float): Progress = Progress((of1 * i).toDouble())
|
||||
|
||||
public operator fun Progress.div(i: Float): Progress = Progress((of1 / i).toDouble())
|
||||
|
||||
public operator fun Progress.rem(i: Float): Progress = Progress((of1 % i).toDouble())
|
||||
|
||||
public operator fun Progress.plus(i: Double): Progress = Progress((of1 + i).toDouble())
|
||||
|
||||
public operator fun Progress.minus(i: Double): Progress = Progress((of1 - i).toDouble())
|
||||
|
||||
public operator fun Progress.times(i: Double): Progress = Progress((of1 * i).toDouble())
|
||||
|
||||
public operator fun Progress.div(i: Double): Progress = Progress((of1 / i).toDouble())
|
||||
|
||||
public operator fun Progress.rem(i: Double): Progress = Progress((of1 % i).toDouble())
|
||||
|
||||
public operator fun Progress.compareTo(other: Progress): Int = (of1 - other.of1).toInt()
|
@@ -0,0 +1,5 @@
|
||||
package dev.inmo.micro_utils.common
|
||||
|
||||
fun <T> Iterable<T>.withReplacedAt(i: Int, block: (T) -> T): List<T> = take(i) + block(elementAt(i)) + drop(i + 1)
|
||||
fun <T> Iterable<T>.withReplaced(t: T, block: (T) -> T): List<T> = withReplacedAt(indexOf(t), block)
|
||||
|
@@ -0,0 +1,29 @@
|
||||
package dev.inmo.micro_utils.common
|
||||
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
class PercentageTests {
|
||||
@Test
|
||||
fun testCompareTo() {
|
||||
val step = 0.01
|
||||
|
||||
var i = Percentage.START.of1
|
||||
while (i <= Percentage.COMPLETED.of1) {
|
||||
val percentageI = Percentage(i)
|
||||
|
||||
var j = Percentage.START.of1
|
||||
while (j <= Percentage.COMPLETED.of1) {
|
||||
val percentageJ = Percentage(j)
|
||||
|
||||
assertEquals(percentageI.of1.compareTo(percentageJ.of1), percentageI.compareTo(percentageJ))
|
||||
assertEquals(percentageI.of1 > percentageJ.of1, percentageI > percentageJ)
|
||||
assertEquals(percentageI.of1 < percentageJ.of1, percentageI < percentageJ)
|
||||
|
||||
j += step
|
||||
}
|
||||
|
||||
i += step
|
||||
}
|
||||
}
|
||||
}
|
@@ -0,0 +1,21 @@
|
||||
package dev.inmo.micro_utils.common
|
||||
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
|
||||
class WithReplacedTest {
|
||||
@Test
|
||||
fun testReplaced() {
|
||||
val data = 0 until 10
|
||||
val testData = Int.MAX_VALUE
|
||||
|
||||
for (i in 0 until data.last) {
|
||||
val withReplaced = data.withReplacedAt(i) {
|
||||
testData
|
||||
}
|
||||
val dataAsMutableList = data.toMutableList()
|
||||
dataAsMutableList[i] = testData
|
||||
assertEquals(withReplaced, dataAsMutableList.toList())
|
||||
}
|
||||
}
|
||||
}
|
@@ -0,0 +1,13 @@
|
||||
package dev.inmo.micro_utils.common
|
||||
|
||||
import kotlinx.browser.window
|
||||
|
||||
fun copyToClipboard(text: String): Boolean {
|
||||
return runCatching {
|
||||
window.navigator.clipboard.writeText(
|
||||
text
|
||||
)
|
||||
}.onFailure {
|
||||
it.printStackTrace()
|
||||
}.isSuccess
|
||||
}
|
@@ -0,0 +1,29 @@
|
||||
package dev.inmo.micro_utils.common
|
||||
|
||||
import kotlinx.browser.window
|
||||
import org.w3c.files.Blob
|
||||
import org.w3c.files.BlobPropertyBag
|
||||
import kotlin.js.json
|
||||
|
||||
external class ClipboardItem(data: dynamic)
|
||||
|
||||
inline fun Blob.convertToClipboardItem(): ClipboardItem {
|
||||
val itemData: dynamic = json(this.type to this)
|
||||
return ClipboardItem(itemData)
|
||||
}
|
||||
|
||||
suspend fun copyImageURLToClipboard(imageUrl: String): Boolean {
|
||||
return runCatching {
|
||||
val response = window.fetch(imageUrl).await()
|
||||
val blob = response.blob().await()
|
||||
val data = arrayOf(
|
||||
Blob(
|
||||
arrayOf(blob),
|
||||
BlobPropertyBag("image/png")
|
||||
).convertToClipboardItem()
|
||||
).asDynamic()
|
||||
window.navigator.clipboard.write(data)
|
||||
}.onFailure {
|
||||
it.printStackTrace()
|
||||
}.isSuccess
|
||||
}
|
@@ -4,13 +4,14 @@ plugins {
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
commonMain {
|
||||
dependencies {
|
||||
api libs.kt.coroutines
|
||||
api libs.kslog
|
||||
}
|
||||
}
|
||||
jsMain {
|
||||
|
@@ -3,9 +3,10 @@ plugins {
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
id "com.android.library"
|
||||
alias(libs.plugins.jb.compose)
|
||||
alias(libs.plugins.kt.jb.compose)
|
||||
}
|
||||
|
||||
apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
|
@@ -0,0 +1,66 @@
|
||||
package dev.inmo.micro_utils.coroutines.compose
|
||||
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.collectAsState
|
||||
import androidx.compose.runtime.remember
|
||||
import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.flow.asStateFlow
|
||||
import kotlinx.coroutines.flow.debounce
|
||||
import org.jetbrains.compose.web.css.CSSRulesHolder
|
||||
import org.jetbrains.compose.web.css.Style
|
||||
import org.jetbrains.compose.web.css.StyleSheet
|
||||
|
||||
/**
|
||||
* Aggregator of Compose CSS StyleSheet. Allowing to add [StyleSheet] in it and draw it in one place without requiring
|
||||
* to add `Style(stylesheet)` on every compose function call
|
||||
*/
|
||||
object StyleSheetsAggregator {
|
||||
private val _stylesFlow = SpecialMutableStateFlow<Set<CSSRulesHolder>>(emptySet())
|
||||
val stylesFlow: StateFlow<Set<CSSRulesHolder>> = _stylesFlow.asStateFlow()
|
||||
|
||||
@Composable
|
||||
fun draw() {
|
||||
_stylesFlow.debounce(13L).collectAsState(emptySet()).value.forEach {
|
||||
Style(it)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Adding [styleSheet] into the [Set] of included stylesheets. If you called [enableStyleSheetsAggregator],
|
||||
* new styles will be enabled in the document
|
||||
*/
|
||||
fun addStyleSheet(styleSheet: CSSRulesHolder) {
|
||||
_stylesFlow.value += styleSheet
|
||||
}
|
||||
|
||||
/**
|
||||
* Removed [styleSheet] into the [Set] of included stylesheets
|
||||
*/
|
||||
fun removeStyleSheet(styleSheet: CSSRulesHolder) {
|
||||
_stylesFlow.value -= styleSheet
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Drawing [StyleSheetsAggregator] in place. You may pass [Set] of [CSSRulesHolder]/[StyleSheet]s as preset of styles
|
||||
*/
|
||||
@Composable
|
||||
fun enableStyleSheetsAggregator(
|
||||
stylesPreset: Set<CSSRulesHolder> = emptySet(),
|
||||
) {
|
||||
remember {
|
||||
stylesPreset.forEach {
|
||||
StyleSheetsAggregator.addStyleSheet(it)
|
||||
}
|
||||
}
|
||||
StyleSheetsAggregator.draw()
|
||||
}
|
||||
|
||||
/**
|
||||
* Will include [this] [CSSRulesHolder]/[StyleSheet] in the [StyleSheetsAggregator] using its
|
||||
* [StyleSheetsAggregator.addStyleSheet]
|
||||
*/
|
||||
fun CSSRulesHolder.includeInStyleSheetsAggregator() {
|
||||
StyleSheetsAggregator.addStyleSheet(this)
|
||||
}
|
@@ -68,9 +68,9 @@ class AccumulatorFlow<T>(
|
||||
override suspend fun collectSafely(collector: FlowCollector<T>) {
|
||||
val channel = Channel<T>(Channel.UNLIMITED, BufferOverflow.SUSPEND)
|
||||
steps.send(SubscribeAccumulatorFlowStep(channel))
|
||||
val result = runCatchingSafely {
|
||||
val result = runCatching {
|
||||
for (data in channel) {
|
||||
val emitResult = runCatchingSafely {
|
||||
val emitResult = runCatching {
|
||||
collector.emit(data)
|
||||
}
|
||||
if (emitResult.isSuccess || emitResult.exceptionOrNull() is CancellationException) {
|
||||
|
@@ -41,4 +41,4 @@ class ContextSafelyExceptionHandler(
|
||||
) : CoroutineContext.Element {
|
||||
override val key: CoroutineContext.Key<*>
|
||||
get() = ContextSafelyExceptionHandlerKey
|
||||
}
|
||||
}
|
||||
|
@@ -0,0 +1,40 @@
|
||||
package dev.inmo.micro_utils.coroutines
|
||||
|
||||
import kotlinx.coroutines.Job
|
||||
import kotlinx.coroutines.async
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.flow.*
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
import kotlin.jvm.JvmInline
|
||||
import kotlin.time.Duration
|
||||
|
||||
@JvmInline
|
||||
private value class DebouncedByData<T>(
|
||||
val millisToData: Pair<Long, T>
|
||||
)
|
||||
|
||||
fun <T> Flow<T>.debouncedBy(timeout: (T) -> Long, markerFactory: (T) -> Any?): Flow<T> = channelFlow {
|
||||
val jobs = mutableMapOf<Any?, Job>()
|
||||
val mutex = Mutex()
|
||||
subscribe(this) {
|
||||
mutex.withLock {
|
||||
val marker = markerFactory(it)
|
||||
lateinit var job: Job
|
||||
job = async {
|
||||
delay(timeout(it))
|
||||
mutex.withLock {
|
||||
if (jobs[marker] === job) {
|
||||
this@channelFlow.send(it)
|
||||
jobs.remove(marker)
|
||||
}
|
||||
}
|
||||
}
|
||||
jobs[marker] ?.cancel()
|
||||
jobs[marker] = job
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun <T> Flow<T>.debouncedBy(timeout: Long, markerFactory: (T) -> Any?): Flow<T> = debouncedBy({ timeout }, markerFactory)
|
||||
fun <T> Flow<T>.debouncedBy(timeout: Duration, markerFactory: (T) -> Any?): Flow<T> = debouncedBy({ timeout.inWholeMilliseconds }, markerFactory)
|
@@ -2,6 +2,7 @@
|
||||
|
||||
package dev.inmo.micro_utils.coroutines
|
||||
|
||||
import dev.inmo.kslog.common.KSLog
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.flow.*
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
@@ -16,6 +17,45 @@ inline fun <T> Flow<T>.subscribe(scope: CoroutineScope, noinline block: suspend
|
||||
* Use [subscribe], but all [block]s will be called inside of [safely] function.
|
||||
* Use [onException] to set up your reaction for [Throwable]s
|
||||
*/
|
||||
inline fun <T> Flow<T>.subscribeLogging(
|
||||
scope: CoroutineScope,
|
||||
noinline errorMessageBuilder: T.(Throwable) -> Any = { "Something web wrong" },
|
||||
logger: KSLog = KSLog,
|
||||
noinline block: suspend (T) -> Unit
|
||||
) = subscribe(scope) {
|
||||
it.runCatchingLogging(
|
||||
errorMessageBuilder,
|
||||
logger
|
||||
) {
|
||||
block(it)
|
||||
}.getOrThrow()
|
||||
}
|
||||
|
||||
/**
|
||||
* Use [subscribeSafelyWithoutExceptions], but all exceptions will be passed to [defaultSafelyExceptionHandler]
|
||||
*/
|
||||
inline fun <T> Flow<T>.subscribeLoggingDropExceptions(
|
||||
scope: CoroutineScope,
|
||||
noinline errorMessageBuilder: T.(Throwable) -> Any = { "Something web wrong" },
|
||||
logger: KSLog = KSLog,
|
||||
noinline block: suspend (T) -> Unit
|
||||
) = subscribe(scope) {
|
||||
it.runCatchingLogging(
|
||||
errorMessageBuilder,
|
||||
logger
|
||||
) {
|
||||
block(it)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Use [subscribe], but all [block]s will be called inside of [safely] function.
|
||||
* Use [onException] to set up your reaction for [Throwable]s
|
||||
*/
|
||||
@Deprecated(
|
||||
"Will be removed soon due to replacement by subscribeLogging",
|
||||
ReplaceWith("this.subscribeLogging(scope = scope, block = block)")
|
||||
)
|
||||
inline fun <T> Flow<T>.subscribeSafely(
|
||||
scope: CoroutineScope,
|
||||
noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler,
|
||||
@@ -29,6 +69,10 @@ inline fun <T> Flow<T>.subscribeSafely(
|
||||
/**
|
||||
* Use [subscribeSafelyWithoutExceptions], but all exceptions will be passed to [defaultSafelyExceptionHandler]
|
||||
*/
|
||||
@Deprecated(
|
||||
"Will be removed soon due to replacement by subscribeLoggingDropExceptions",
|
||||
ReplaceWith("this.subscribeLoggingDropExceptions(scope = scope, block = block)")
|
||||
)
|
||||
inline fun <T> Flow<T>.subscribeSafelyWithoutExceptions(
|
||||
scope: CoroutineScope,
|
||||
noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull,
|
||||
@@ -42,6 +86,10 @@ inline fun <T> Flow<T>.subscribeSafelyWithoutExceptions(
|
||||
/**
|
||||
* Use [subscribeSafelyWithoutExceptions], but all exceptions inside of [safely] will be skipped
|
||||
*/
|
||||
@Deprecated(
|
||||
"Will be removed soon due to replacement by subscribeLoggingDropExceptions",
|
||||
ReplaceWith("this.subscribeLoggingDropExceptions(scope = scope, block = block)")
|
||||
)
|
||||
inline fun <T> Flow<T>.subscribeSafelySkippingExceptions(
|
||||
scope: CoroutineScope,
|
||||
noinline block: suspend (T) -> Unit
|
||||
|
@@ -15,7 +15,7 @@ private class SubscribeAsyncReceiver<T>(
|
||||
get() = dataChannel
|
||||
|
||||
init {
|
||||
scope.launchSafelyWithoutExceptions {
|
||||
scope.launchLoggingDropExceptions {
|
||||
for (data in dataChannel) {
|
||||
output(data)
|
||||
}
|
||||
|
@@ -15,6 +15,10 @@ import kotlin.coroutines.coroutineContext
|
||||
*
|
||||
* @return [Result] with result of [block] if no exceptions or [Result] from [onException] execution
|
||||
*/
|
||||
@Deprecated(
|
||||
"This function become redundant since coroutines correctly handling throwing exceptions",
|
||||
replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { onException(it) }")
|
||||
)
|
||||
suspend inline fun <T> runCatchingSafely(
|
||||
onException: ExceptionHandler<T>,
|
||||
block: suspend () -> T
|
||||
@@ -29,6 +33,10 @@ suspend inline fun <T> runCatchingSafely(
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated(
|
||||
"This function become redundant since coroutines correctly handling throwing exceptions",
|
||||
replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { onException(it) }")
|
||||
)
|
||||
suspend inline fun <T, R> R.runCatchingSafely(
|
||||
onException: ExceptionHandler<T>,
|
||||
block: suspend R.() -> T
|
||||
@@ -39,10 +47,18 @@ suspend inline fun <T, R> R.runCatchingSafely(
|
||||
/**
|
||||
* Launching [runCatchingSafely] with [defaultSafelyExceptionHandler] as `onException` parameter
|
||||
*/
|
||||
@Deprecated(
|
||||
"This function become redundant since coroutines correctly handling throwing exceptions",
|
||||
replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { defaultSafelyExceptionHandler(it) }")
|
||||
)
|
||||
suspend inline fun <T> runCatchingSafely(
|
||||
block: suspend () -> T
|
||||
): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block)
|
||||
|
||||
@Deprecated(
|
||||
"This function become redundant since coroutines correctly handling throwing exceptions",
|
||||
replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { defaultSafelyExceptionHandler(it) }")
|
||||
)
|
||||
suspend inline fun <T, R> R.runCatchingSafely(
|
||||
block: suspend R.() -> T
|
||||
): Result<T> = runCatchingSafely<T> {
|
||||
@@ -73,6 +89,9 @@ suspend fun contextSafelyExceptionHandler() = coroutineContext[ContextSafelyExce
|
||||
* After all, will be called [withContext] method with created [ContextSafelyExceptionHandler] and block which will call
|
||||
* [safely] method with [safelyExceptionHandler] as onException parameter and [block] as execution block
|
||||
*/
|
||||
@Deprecated(
|
||||
"This function become redundant since coroutines correctly handling throwing exceptions",
|
||||
)
|
||||
suspend fun <T> safelyWithContextExceptionHandler(
|
||||
contextExceptionHandler: ExceptionHandler<Unit>,
|
||||
safelyExceptionHandler: ExceptionHandler<T> = defaultSafelyExceptionHandler,
|
||||
@@ -94,6 +113,10 @@ suspend fun <T> safelyWithContextExceptionHandler(
|
||||
*
|
||||
* @see runCatchingSafely
|
||||
*/
|
||||
@Deprecated(
|
||||
"This function become redundant since coroutines correctly handling throwing exceptions",
|
||||
replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { onException(it) }.getOrThrow()")
|
||||
)
|
||||
suspend inline fun <T> safely(
|
||||
onException: ExceptionHandler<T>,
|
||||
block: suspend () -> T
|
||||
@@ -104,9 +127,17 @@ suspend inline fun <T> safely(
|
||||
*
|
||||
* @see runCatchingSafely
|
||||
*/
|
||||
@Deprecated(
|
||||
"This function become redundant since coroutines correctly handling throwing exceptions",
|
||||
replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { defaultSafelyExceptionHandler(it) }.getOrThrow()")
|
||||
)
|
||||
suspend inline fun <T> safely(
|
||||
block: suspend () -> T
|
||||
): T = safely(defaultSafelyExceptionHandler, block)
|
||||
@Deprecated(
|
||||
"This function become redundant since coroutines correctly handling throwing exceptions",
|
||||
replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { defaultSafelyExceptionHandler(it) }.getOrThrow()")
|
||||
)
|
||||
suspend inline fun <T, R> R.safely(
|
||||
block: suspend R.() -> T
|
||||
): T = safely<T> { block() }
|
||||
@@ -137,11 +168,19 @@ val defaultSafelyWithoutExceptionHandlerWithNull: ExceptionHandler<Nothing?> = {
|
||||
* Shortcut for [safely] with exception handler, that as expected must return null in case of impossible creating of
|
||||
* result from exception (instead of throwing it, by default always returns null)
|
||||
*/
|
||||
@Deprecated(
|
||||
"This function become redundant since coroutines correctly handling throwing exceptions",
|
||||
replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { onException(it) }.getOrNull()")
|
||||
)
|
||||
suspend fun <T> safelyWithoutExceptions(
|
||||
onException: ExceptionHandler<T> = defaultSafelyExceptionHandler,
|
||||
block: suspend () -> T
|
||||
): T? = runCatchingSafely(onException, block).getOrNull()
|
||||
|
||||
@Deprecated(
|
||||
"This function become redundant since coroutines correctly handling throwing exceptions",
|
||||
replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { onException(it) }.getOrNull()")
|
||||
)
|
||||
suspend fun <T> runCatchingSafelyWithoutExceptions(
|
||||
onException: ExceptionHandler<T?> = defaultSafelyExceptionHandler,
|
||||
block: suspend () -> T
|
||||
|
@@ -0,0 +1,55 @@
|
||||
package dev.inmo.micro_utils.coroutines
|
||||
|
||||
import dev.inmo.kslog.common.KSLog
|
||||
import dev.inmo.kslog.common.e
|
||||
import kotlinx.coroutines.*
|
||||
import kotlin.coroutines.CoroutineContext
|
||||
import kotlin.coroutines.EmptyCoroutineContext
|
||||
|
||||
fun CoroutineScope.launchLogging(
|
||||
errorMessageBuilder: CoroutineScope.(Throwable) -> Any = { "Something web wrong" },
|
||||
logger: KSLog = KSLog,
|
||||
context: CoroutineContext = EmptyCoroutineContext,
|
||||
start: CoroutineStart = CoroutineStart.DEFAULT,
|
||||
block: suspend CoroutineScope.() -> Unit
|
||||
) = launch(context, start) {
|
||||
runCatching { block() }.onFailure {
|
||||
logger.e(it) { errorMessageBuilder(it) }
|
||||
}.getOrThrow()
|
||||
}
|
||||
|
||||
fun CoroutineScope.launchLoggingDropExceptions(
|
||||
errorMessageBuilder: CoroutineScope.(Throwable) -> Any = { "Something web wrong" },
|
||||
logger: KSLog = KSLog,
|
||||
context: CoroutineContext = EmptyCoroutineContext,
|
||||
start: CoroutineStart = CoroutineStart.DEFAULT,
|
||||
block: suspend CoroutineScope.() -> Unit
|
||||
) = launch(context, start) {
|
||||
runCatching { block() }.onFailure {
|
||||
logger.e(it) { errorMessageBuilder(it) }
|
||||
} // just dropping exception
|
||||
}
|
||||
|
||||
fun <T> CoroutineScope.asyncLogging(
|
||||
errorMessageBuilder: CoroutineScope.(Throwable) -> Any = { "Something web wrong" },
|
||||
logger: KSLog = KSLog,
|
||||
context: CoroutineContext = EmptyCoroutineContext,
|
||||
start: CoroutineStart = CoroutineStart.DEFAULT,
|
||||
block: suspend CoroutineScope.() -> T
|
||||
) = async(context, start) {
|
||||
runCatching { block() }.onFailure {
|
||||
logger.e(it) { errorMessageBuilder(it) }
|
||||
}.getOrThrow()
|
||||
}
|
||||
|
||||
fun <T> CoroutineScope.asyncLoggingDropExceptions(
|
||||
errorMessageBuilder: CoroutineScope.(Throwable) -> Any = { "Something web wrong" },
|
||||
logger: KSLog = KSLog,
|
||||
context: CoroutineContext = EmptyCoroutineContext,
|
||||
start: CoroutineStart = CoroutineStart.DEFAULT,
|
||||
block: suspend CoroutineScope.() -> T
|
||||
) = async(context, start) {
|
||||
runCatching { block() }.onFailure {
|
||||
logger.e(it) { errorMessageBuilder(it) }
|
||||
}
|
||||
}
|
@@ -4,6 +4,10 @@ import kotlinx.coroutines.*
|
||||
import kotlin.coroutines.CoroutineContext
|
||||
import kotlin.coroutines.EmptyCoroutineContext
|
||||
|
||||
@Deprecated(
|
||||
"This method will be removed soon. Use launchLogging instead",
|
||||
ReplaceWith("this.launchLogging(context = context, start = start, block = block)")
|
||||
)
|
||||
fun CoroutineScope.launchSafely(
|
||||
context: CoroutineContext = EmptyCoroutineContext,
|
||||
start: CoroutineStart = CoroutineStart.DEFAULT,
|
||||
@@ -15,6 +19,10 @@ fun CoroutineScope.launchSafely(
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated(
|
||||
"This method will be removed soon. Use launchLoggingDropExceptions instead",
|
||||
ReplaceWith("this.launchLoggingDropExceptions(context = context, start = start, block = block)")
|
||||
)
|
||||
fun CoroutineScope.launchSafelyWithoutExceptions(
|
||||
context: CoroutineContext = EmptyCoroutineContext,
|
||||
start: CoroutineStart = CoroutineStart.DEFAULT,
|
||||
@@ -26,6 +34,10 @@ fun CoroutineScope.launchSafelyWithoutExceptions(
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated(
|
||||
"This method will be removed soon. Use asyncLogging instead",
|
||||
ReplaceWith("this.asyncLogging(context = context, start = start, block = block)")
|
||||
)
|
||||
fun <T> CoroutineScope.asyncSafely(
|
||||
context: CoroutineContext = EmptyCoroutineContext,
|
||||
start: CoroutineStart = CoroutineStart.DEFAULT,
|
||||
@@ -37,6 +49,10 @@ fun <T> CoroutineScope.asyncSafely(
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated(
|
||||
"This method will be removed soon. Use asyncLoggingDropExceptions instead",
|
||||
ReplaceWith("this.asyncLoggingDropExceptions(context = context, start = start, block = block)")
|
||||
)
|
||||
fun <T> CoroutineScope.asyncSafelyWithoutExceptions(
|
||||
context: CoroutineContext = EmptyCoroutineContext,
|
||||
start: CoroutineStart = CoroutineStart.DEFAULT,
|
||||
|
@@ -0,0 +1,3 @@
|
||||
package dev.inmo.micro_utils.coroutines
|
||||
|
||||
inline fun <T> Result<T>.replaceIfFailure(onException: (Throwable) -> T) = if (isSuccess) { this } else { runCatching { onException(exceptionOrNull()!!) } }
|
@@ -0,0 +1,12 @@
|
||||
package dev.inmo.micro_utils.coroutines
|
||||
|
||||
import dev.inmo.kslog.common.KSLog
|
||||
import dev.inmo.kslog.common.e
|
||||
|
||||
inline fun <T, R> R.runCatchingLogging(
|
||||
noinline errorMessageBuilder: R.(Throwable) -> Any = { "Something web wrong" },
|
||||
logger: KSLog = KSLog,
|
||||
block: R.() -> T
|
||||
) = runCatching(block).onFailure {
|
||||
logger.e(it) { errorMessageBuilder(it) }
|
||||
}
|
@@ -13,7 +13,7 @@ import kotlin.contracts.contract
|
||||
* * [unlockWrite] will just unlock [writeMutex]
|
||||
*/
|
||||
class SmartRWLocker(private val readPermits: Int = Int.MAX_VALUE, writeIsLocked: Boolean = false) {
|
||||
private val _readSemaphore = SmartSemaphore.Mutable(permits = readPermits, acquiredPermits = 0)
|
||||
private val _readSemaphore = SmartSemaphore.Mutable(permits = readPermits, acquiredPermits = if (writeIsLocked) readPermits else 0)
|
||||
private val _writeMutex = SmartMutex.Mutable(locked = writeIsLocked)
|
||||
|
||||
val readSemaphore: SmartSemaphore.Immutable = _readSemaphore.immutable()
|
||||
|
42
coroutines/src/commonTest/kotlin/DebouncedByTests.kt
Normal file
42
coroutines/src/commonTest/kotlin/DebouncedByTests.kt
Normal file
@@ -0,0 +1,42 @@
|
||||
import dev.inmo.micro_utils.coroutines.debouncedBy
|
||||
import kotlinx.coroutines.flow.asFlow
|
||||
import kotlinx.coroutines.test.runTest
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertTrue
|
||||
|
||||
class DebouncedByTests {
|
||||
@Test
|
||||
fun testThatParallelDebouncingWorksCorrectly() = runTest {
|
||||
val dataToMarkerFactories = listOf(
|
||||
1 to 0,
|
||||
2 to 1,
|
||||
3 to 2,
|
||||
4 to 0,
|
||||
5 to 1,
|
||||
6 to 2,
|
||||
7 to 0,
|
||||
8 to 1,
|
||||
9 to 2,
|
||||
)
|
||||
|
||||
val collected = mutableListOf<Int>()
|
||||
|
||||
dataToMarkerFactories.asFlow().debouncedBy(10L) {
|
||||
it.second
|
||||
}.collect {
|
||||
when (it.second) {
|
||||
0 -> assertEquals(7, it.first)
|
||||
1 -> assertEquals(8, it.first)
|
||||
2 -> assertEquals(9, it.first)
|
||||
else -> error("wtf")
|
||||
}
|
||||
collected.add(it.first)
|
||||
}
|
||||
|
||||
val expectedList = listOf(7, 8, 9)
|
||||
assertEquals(expectedList, collected)
|
||||
assertTrue { collected.containsAll(expectedList) }
|
||||
assertTrue { expectedList.containsAll(collected) }
|
||||
}
|
||||
}
|
@@ -4,7 +4,7 @@ plugins {
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
|
@@ -130,4 +130,4 @@ tasks.dokkaHtml {
|
||||
}
|
||||
}
|
||||
|
||||
apply from: "$defaultAndroidSettingsPresetPath"
|
||||
apply from: "$defaultAndroidSettings"
|
||||
|
@@ -1,43 +1,32 @@
|
||||
allprojects {
|
||||
ext {
|
||||
projectByName = { name ->
|
||||
for (subproject in rootProject.subprojects) {
|
||||
if (subproject.name == name) {
|
||||
return subproject
|
||||
}
|
||||
}
|
||||
return null
|
||||
}
|
||||
File templatesFolder = new File("$rootProject.projectDir.absolutePath${File.separatorChar}gradle${File.separatorChar}templates")
|
||||
|
||||
internalProject = { name ->
|
||||
// if (releaseMode) {
|
||||
// "$group:$name:$version"
|
||||
// } else {
|
||||
// projectByName("$name")
|
||||
// }
|
||||
projectByName("$name")
|
||||
}
|
||||
Map properties = new HashMap<String, String>()
|
||||
|
||||
releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true"
|
||||
// String compilerPluginVersionFromProperties = (String) project.properties["compose.kotlinCompilerPluginVersion"]
|
||||
// String compilerPluginVersionFromLibrariesVersions = libs.versions.compose.kotlin.get()
|
||||
// composePluginKotlinVersion = compilerPluginVersionFromProperties
|
||||
// if (compilerPluginVersionFromProperties == null) {
|
||||
// composePluginKotlinVersion = compilerPluginVersionFromLibrariesVersions
|
||||
// }
|
||||
|
||||
mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsAndroidProject.gradle"
|
||||
mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle"
|
||||
mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
|
||||
mppJvmJsLinuxMingwProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwProject.gradle"
|
||||
mppJvmJsLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwLinuxArm64Project.gradle"
|
||||
mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle"
|
||||
mppComposeJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project.gradle"
|
||||
mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle"
|
||||
|
||||
defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"
|
||||
|
||||
publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
|
||||
publishJvmOnlyPath = "${rootProject.projectDir.absolutePath}/jvm.publish.gradle"
|
||||
if (templatesFolder.exists() && templatesFolder.isDirectory()) {
|
||||
templatesFolder.listFiles().each {
|
||||
properties[it.name - ".gradle"] = it.absolutePath
|
||||
}
|
||||
}
|
||||
|
||||
properties["projectByName"] = { name ->
|
||||
for (subproject in rootProject.subprojects) {
|
||||
if (subproject.name == name) {
|
||||
return subproject
|
||||
}
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
properties["internalProject"] = { name ->
|
||||
projectByName("$name")
|
||||
}
|
||||
|
||||
allprojects {
|
||||
ext {
|
||||
releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true"
|
||||
|
||||
properties.forEach { k, v ->
|
||||
it[k] = v
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -4,7 +4,7 @@ plugins {
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
@@ -12,6 +12,7 @@ kotlin {
|
||||
dependencies {
|
||||
api project(":micro_utils.common")
|
||||
api project(":micro_utils.coroutines")
|
||||
api libs.kslog
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -1,5 +1,7 @@
|
||||
package dev.inmo.micro_utils.fsm.common
|
||||
|
||||
import dev.inmo.kslog.common.TagLogger
|
||||
import dev.inmo.kslog.common.e
|
||||
import dev.inmo.micro_utils.common.Optional
|
||||
import dev.inmo.micro_utils.coroutines.*
|
||||
import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler
|
||||
@@ -68,6 +70,7 @@ open class DefaultStatesMachine <T: State>(
|
||||
protected val handlers: List<CheckableHandlerHolder<in T, T>>,
|
||||
protected val onStateHandlingErrorHandler: StateHandlingErrorHandler<T> = defaultStateHandlingErrorHandler()
|
||||
) : StatesMachine<T> {
|
||||
protected val logger = TagLogger(this::class.simpleName!!)
|
||||
/**
|
||||
* Will call [launchStateHandling] for state handling
|
||||
*/
|
||||
@@ -96,7 +99,13 @@ open class DefaultStatesMachine <T: State>(
|
||||
statesJobsMutex.withLock {
|
||||
statesJobs[actualState] ?.cancel()
|
||||
statesJobs[actualState] = scope.launch {
|
||||
performUpdate(actualState)
|
||||
runCatching {
|
||||
performUpdate(actualState)
|
||||
}.onFailure {
|
||||
logger.e(it) {
|
||||
"Unable to perform update of state from $actualState"
|
||||
}
|
||||
}.getOrThrow()
|
||||
}.also { job ->
|
||||
job.invokeOnCompletion { _ ->
|
||||
scope.launch {
|
||||
@@ -119,8 +128,10 @@ open class DefaultStatesMachine <T: State>(
|
||||
*/
|
||||
override fun start(scope: CoroutineScope): Job {
|
||||
val supervisorScope = scope.LinkedSupervisorScope()
|
||||
supervisorScope.launchSafelyWithoutExceptions {
|
||||
(statesManager.getActiveStates().asFlow() + statesManager.onStartChain).subscribeSafelyWithoutExceptions(supervisorScope) {
|
||||
supervisorScope.launchLoggingDropExceptions {
|
||||
(statesManager.getActiveStates().asFlow() + statesManager.onStartChain).subscribeSafelyWithoutExceptions(
|
||||
supervisorScope
|
||||
) {
|
||||
supervisorScope.launch { performStateUpdate(Optional.absent(), it, supervisorScope) }
|
||||
}
|
||||
statesManager.onChainStateUpdated.subscribeSafelyWithoutExceptions(supervisorScope) {
|
||||
@@ -131,7 +142,7 @@ open class DefaultStatesMachine <T: State>(
|
||||
statesJobsMutex.withLock {
|
||||
val stateInMap = statesJobs.keys.firstOrNull { stateInMap -> stateInMap == removedState }
|
||||
if (stateInMap === removedState) {
|
||||
statesJobs[stateInMap] ?.cancel()
|
||||
statesJobs[stateInMap]?.cancel()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -9,7 +9,12 @@ interface StatesManager<T : State> {
|
||||
|
||||
|
||||
/**
|
||||
* Must set current set using [State.context]
|
||||
* It is expected, that [new] state will be saved in manager.
|
||||
*
|
||||
* If [new] context will not be equal to [old] one, it must do some check of availability for replacement
|
||||
* of potentially exists state on [new] context. If this state can't be replaced, it will throw [IllegalStateException]
|
||||
*
|
||||
* @throws IllegalStateException - in case when [new] [State] can't be set
|
||||
*/
|
||||
suspend fun update(old: T, new: T)
|
||||
|
||||
|
@@ -1,5 +1,6 @@
|
||||
package dev.inmo.micro_utils.fsm.common
|
||||
|
||||
import dev.inmo.kslog.common.e
|
||||
import dev.inmo.micro_utils.common.*
|
||||
import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler
|
||||
import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler
|
||||
@@ -44,7 +45,13 @@ open class DefaultUpdatableStatesMachine<T : State>(
|
||||
val job = previousState.mapOnPresented {
|
||||
statesJobs.remove(it)
|
||||
} ?.takeIf { it.isActive } ?: scope.launch {
|
||||
performUpdate(actualState)
|
||||
runCatching {
|
||||
performUpdate(actualState)
|
||||
}.onFailure {
|
||||
logger.e(it) {
|
||||
"Unable to perform update of state up to $actualState"
|
||||
}
|
||||
}.getOrThrow()
|
||||
}.also { job ->
|
||||
job.invokeOnCompletion { _ ->
|
||||
scope.launch {
|
||||
|
@@ -1,10 +1,11 @@
|
||||
package dev.inmo.micro_utils.fsm.common.managers
|
||||
|
||||
import dev.inmo.micro_utils.coroutines.SmartRWLocker
|
||||
import dev.inmo.micro_utils.coroutines.withReadAcquire
|
||||
import dev.inmo.micro_utils.coroutines.withWriteLock
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
import dev.inmo.micro_utils.fsm.common.StatesManager
|
||||
import kotlinx.coroutines.flow.*
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
|
||||
/**
|
||||
* Implement this repo if you want to use some custom repo for [DefaultStatesManager]
|
||||
@@ -19,6 +20,14 @@ interface DefaultStatesManagerRepo<T : State> {
|
||||
* NOT be removed
|
||||
*/
|
||||
suspend fun removeState(state: T)
|
||||
|
||||
/**
|
||||
* Semantically, calls [removeState] and then [set]
|
||||
*/
|
||||
suspend fun removeAndSet(toRemove: T, toSet: T) {
|
||||
removeState(toRemove)
|
||||
set(toSet)
|
||||
}
|
||||
/**
|
||||
* @return Current list of available and saved states
|
||||
*/
|
||||
@@ -58,7 +67,7 @@ open class DefaultStatesManager<T : State>(
|
||||
protected val _onEndChain = MutableSharedFlow<T>(0)
|
||||
override val onEndChain: Flow<T> = _onEndChain.asSharedFlow()
|
||||
|
||||
protected val mapMutex = Mutex()
|
||||
protected val internalLocker = SmartRWLocker()
|
||||
|
||||
constructor(
|
||||
repo: DefaultStatesManagerRepo<T>,
|
||||
@@ -68,28 +77,30 @@ open class DefaultStatesManager<T : State>(
|
||||
onUpdateContextsConflictResolver = onContextsConflictResolver
|
||||
)
|
||||
|
||||
override suspend fun update(old: T, new: T) = mapMutex.withLock {
|
||||
override suspend fun update(old: T, new: T) = internalLocker.withWriteLock {
|
||||
val stateByOldContext: T? = repo.getContextState(old.context)
|
||||
when {
|
||||
stateByOldContext != old -> return@withLock
|
||||
stateByOldContext == null || old.context == new.context -> {
|
||||
repo.removeState(old)
|
||||
repo.set(new)
|
||||
stateByOldContext != old -> return@withWriteLock
|
||||
old.context == new.context -> {
|
||||
repo.removeAndSet(old, new)
|
||||
_onChainStateUpdated.emit(old to new)
|
||||
}
|
||||
else -> {
|
||||
old.context != new.context -> {
|
||||
val stateOnNewOneContext = repo.getContextState(new.context)
|
||||
if (stateOnNewOneContext == null || onUpdateContextsConflictResolver(old, new, stateOnNewOneContext)) {
|
||||
stateOnNewOneContext ?.let { endChainWithoutLock(it) }
|
||||
repo.removeState(old)
|
||||
repo.set(new)
|
||||
repo.removeAndSet(old, new)
|
||||
_onChainStateUpdated.emit(old to new)
|
||||
} else {
|
||||
error(
|
||||
"Unable to update state from $old to $new due to false answer from $onUpdateContextsConflictResolver and state on old context $stateOnNewOneContext"
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun startChain(state: T) = mapMutex.withLock {
|
||||
override suspend fun startChain(state: T) = internalLocker.withWriteLock {
|
||||
val stateOnContext = repo.getContextState(state.context)
|
||||
if (stateOnContext == null || onStartContextsConflictResolver(stateOnContext, state)) {
|
||||
stateOnContext ?.let {
|
||||
@@ -108,11 +119,13 @@ open class DefaultStatesManager<T : State>(
|
||||
}
|
||||
|
||||
override suspend fun endChain(state: T) {
|
||||
mapMutex.withLock {
|
||||
internalLocker.withWriteLock {
|
||||
endChainWithoutLock(state)
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getActiveStates(): List<T> = repo.getStates()
|
||||
override suspend fun getActiveStates(): List<T> = internalLocker.withReadAcquire {
|
||||
repo.getStates()
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -4,7 +4,7 @@ plugins {
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
|
@@ -1,25 +1,59 @@
|
||||
package dev.inmo.micro_utils.fsm.repos.common
|
||||
|
||||
import dev.inmo.kslog.common.TagLogger
|
||||
import dev.inmo.kslog.common.i
|
||||
import dev.inmo.micro_utils.coroutines.SmartRWLocker
|
||||
import dev.inmo.micro_utils.coroutines.withReadAcquire
|
||||
import dev.inmo.micro_utils.coroutines.withWriteLock
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
import dev.inmo.micro_utils.fsm.common.managers.DefaultStatesManagerRepo
|
||||
import dev.inmo.micro_utils.repos.*
|
||||
import dev.inmo.micro_utils.repos.pagination.getAll
|
||||
import dev.inmo.micro_utils.repos.unset
|
||||
|
||||
class KeyValueBasedDefaultStatesManagerRepo<T : State>(
|
||||
private val keyValueRepo: KeyValueRepo<Any, T>
|
||||
) : DefaultStatesManagerRepo<T> {
|
||||
private val locker = SmartRWLocker()
|
||||
private val logger = TagLogger("KeyValueBasedDefaultStatesManagerRepo")
|
||||
override suspend fun set(state: T) {
|
||||
keyValueRepo.set(state.context, state)
|
||||
}
|
||||
|
||||
override suspend fun removeState(state: T) {
|
||||
if (keyValueRepo.get(state.context) == state) {
|
||||
keyValueRepo.unset(state.context)
|
||||
locker.withWriteLock {
|
||||
keyValueRepo.set(state.context, state)
|
||||
logger.i { "Set ${state.context} value to $state" }
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getStates(): List<T> = keyValueRepo.getAll { keys(it) }.map { it.second }
|
||||
override suspend fun getContextState(context: Any): T? = keyValueRepo.get(context)
|
||||
override suspend fun removeState(state: T) {
|
||||
locker.withWriteLock {
|
||||
if (keyValueRepo.get(state.context) == state) {
|
||||
keyValueRepo.unset(state.context)
|
||||
logger.i { "Unset $state" }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun contains(context: Any): Boolean = keyValueRepo.contains(context)
|
||||
override suspend fun removeAndSet(toRemove: T, toSet: T) {
|
||||
locker.withWriteLock {
|
||||
when {
|
||||
toRemove.context == toSet.context -> {
|
||||
keyValueRepo.set(toSet.context, toSet)
|
||||
}
|
||||
else -> {
|
||||
keyValueRepo.set(toSet.context, toSet)
|
||||
keyValueRepo.unset(toRemove)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getStates(): List<T> = locker.withReadAcquire {
|
||||
keyValueRepo.getAll { keys(it) }.map { it.second }
|
||||
}
|
||||
override suspend fun getContextState(context: Any): T? = locker.withReadAcquire {
|
||||
keyValueRepo.get(context)
|
||||
}
|
||||
|
||||
override suspend fun contains(context: Any): Boolean = locker.withReadAcquire {
|
||||
keyValueRepo.contains(context)
|
||||
}
|
||||
}
|
||||
|
@@ -15,5 +15,5 @@ crypto_js_version=4.1.1
|
||||
# Project data
|
||||
|
||||
group=dev.inmo
|
||||
version=0.21.4
|
||||
android_code_version=263
|
||||
version=0.24.6
|
||||
android_code_version=286
|
||||
|
@@ -1,45 +1,46 @@
|
||||
[versions]
|
||||
|
||||
kt = "1.9.23"
|
||||
kt-serialization = "1.6.3"
|
||||
kt-coroutines = "1.8.1"
|
||||
kt = "2.1.10"
|
||||
kt-serialization = "1.8.0"
|
||||
kt-coroutines = "1.10.1"
|
||||
|
||||
kslog = "1.3.4"
|
||||
kslog = "1.4.1"
|
||||
|
||||
jb-compose = "1.6.2"
|
||||
jb-exposed = "0.50.1"
|
||||
jb-dokka = "1.9.20"
|
||||
jb-compose = "1.7.3"
|
||||
jb-exposed = "0.59.0"
|
||||
jb-dokka = "2.0.0"
|
||||
|
||||
sqlite = "3.49.0.0"
|
||||
|
||||
korlibs = "5.4.0"
|
||||
uuid = "0.8.4"
|
||||
|
||||
ktor = "2.3.11"
|
||||
ktor = "3.1.0"
|
||||
|
||||
gh-release = "2.5.2"
|
||||
|
||||
koin = "3.5.6"
|
||||
koin = "4.0.2"
|
||||
|
||||
okio = "3.9.0"
|
||||
okio = "3.10.2"
|
||||
|
||||
ksp = "1.9.23-1.0.20"
|
||||
kotlin-poet = "1.16.0"
|
||||
ksp = "2.1.10-1.0.29"
|
||||
kotlin-poet = "1.18.1"
|
||||
|
||||
versions = "0.51.0"
|
||||
|
||||
android-gradle = "8.2.0"
|
||||
android-gradle = "8.7.+"
|
||||
dexcount = "4.0.0"
|
||||
|
||||
android-coreKtx = "1.13.1"
|
||||
android-recyclerView = "1.3.2"
|
||||
android-appCompat = "1.6.1"
|
||||
android-fragment = "1.7.1"
|
||||
android-espresso = "3.5.1"
|
||||
android-test = "1.1.5"
|
||||
android-compose-material3 = "1.2.1"
|
||||
android-coreKtx = "1.15.0"
|
||||
android-recyclerView = "1.4.0"
|
||||
android-appCompat = "1.7.0"
|
||||
android-fragment = "1.8.6"
|
||||
android-espresso = "3.6.1"
|
||||
android-test = "1.2.1"
|
||||
|
||||
android-props-minSdk = "21"
|
||||
android-props-compileSdk = "34"
|
||||
android-props-buildTools = "34.0.0"
|
||||
android-props-compileSdk = "35"
|
||||
android-props-buildTools = "35.0.0"
|
||||
|
||||
[libraries]
|
||||
|
||||
@@ -52,6 +53,7 @@ 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" }
|
||||
kt-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "kt-coroutines" }
|
||||
|
||||
|
||||
ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" }
|
||||
@@ -79,12 +81,14 @@ koin = { module = "io.insert-koin:koin-core", version.ref = "koin" }
|
||||
|
||||
|
||||
jb-exposed = { module = "org.jetbrains.exposed:exposed-core", version.ref = "jb-exposed" }
|
||||
jb-exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "jb-exposed" }
|
||||
sqlite = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" }
|
||||
|
||||
jb-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "jb-compose" }
|
||||
|
||||
android-coreKtx = { module = "androidx.core:core-ktx", version.ref = "android-coreKtx" }
|
||||
android-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "android-recyclerView" }
|
||||
android-appCompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "android-appCompat" }
|
||||
android-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "android-compose-material3" }
|
||||
android-fragment = { module = "androidx.fragment:fragment", version.ref = "android-fragment" }
|
||||
android-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "android-espresso" }
|
||||
android-test-junit = { module = "androidx.test.ext:junit", version.ref = "android-test" }
|
||||
@@ -113,5 +117,6 @@ buildscript-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gra
|
||||
[plugins]
|
||||
|
||||
jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" }
|
||||
kt-jb-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kt" }
|
||||
|
||||
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
|
||||
|
@@ -6,6 +6,7 @@ android {
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion libs.versions.android.props.minSdk.get().toInteger()
|
||||
compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
|
||||
targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
|
||||
versionCode "${android_code_version}".toInteger()
|
||||
versionName "$version"
|
@@ -1,7 +1,7 @@
|
||||
project.version = "$version"
|
||||
project.group = "$group"
|
||||
|
||||
apply from: "$publishGradlePath"
|
||||
apply from: "$publish"
|
||||
|
||||
kotlin {
|
||||
androidTarget {
|
||||
@@ -29,7 +29,7 @@ kotlin {
|
||||
}
|
||||
}
|
||||
|
||||
apply from: "$defaultAndroidSettingsPresetPath"
|
||||
apply from: "$defaultAndroidSettings"
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
@@ -1,7 +1,7 @@
|
||||
project.version = "$version"
|
||||
project.group = "$group"
|
||||
|
||||
apply from: "$publishGradlePath"
|
||||
apply from: "$publish"
|
||||
|
||||
kotlin {
|
||||
jvm {
|
||||
@@ -12,8 +12,20 @@ kotlin {
|
||||
}
|
||||
}
|
||||
js (IR) {
|
||||
browser()
|
||||
nodejs()
|
||||
browser {
|
||||
testTask {
|
||||
useMocha {
|
||||
timeout = "60000"
|
||||
}
|
||||
}
|
||||
}
|
||||
nodejs {
|
||||
testTask {
|
||||
useMocha {
|
||||
timeout = "60000"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
androidTarget {
|
||||
publishAllLibraryVariants()
|
||||
@@ -77,7 +89,6 @@ kotlin {
|
||||
jsTest {
|
||||
dependencies {
|
||||
implementation kotlin('test-js')
|
||||
implementation kotlin('test-junit')
|
||||
}
|
||||
}
|
||||
nativeMain.dependsOn commonMain
|
||||
@@ -89,7 +100,7 @@ kotlin {
|
||||
}
|
||||
}
|
||||
|
||||
apply from: "$defaultAndroidSettingsPresetPath"
|
||||
apply from: "$defaultAndroidSettings"
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
@@ -1,7 +1,7 @@
|
||||
project.version = "$version"
|
||||
project.group = "$group"
|
||||
|
||||
apply from: "$publishGradlePath"
|
||||
apply from: "$publish"
|
||||
|
||||
kotlin {
|
||||
jvm {
|
@@ -1,7 +1,7 @@
|
||||
project.version = "$version"
|
||||
project.group = "$group"
|
||||
|
||||
apply from: "$publishGradlePath"
|
||||
apply from: "$publish"
|
||||
|
||||
kotlin {
|
||||
jvm {
|
||||
@@ -12,8 +12,20 @@ kotlin {
|
||||
}
|
||||
}
|
||||
js (IR) {
|
||||
browser()
|
||||
nodejs()
|
||||
browser {
|
||||
testTask {
|
||||
useMocha {
|
||||
timeout = "60000"
|
||||
}
|
||||
}
|
||||
}
|
||||
nodejs {
|
||||
testTask {
|
||||
useMocha {
|
||||
timeout = "60000"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
androidTarget {
|
||||
publishAllLibraryVariants()
|
||||
@@ -36,7 +48,7 @@ kotlin {
|
||||
}
|
||||
commonTest {
|
||||
dependencies {
|
||||
implementation kotlin('test-common')
|
||||
implementation kotlin('test')
|
||||
implementation kotlin('test-annotations-common')
|
||||
implementation libs.kt.coroutines.test
|
||||
}
|
||||
@@ -57,7 +69,6 @@ kotlin {
|
||||
jsTest {
|
||||
dependencies {
|
||||
implementation kotlin('test-js')
|
||||
implementation kotlin('test-junit')
|
||||
}
|
||||
}
|
||||
nativeMain.dependsOn commonMain
|
||||
@@ -69,7 +80,7 @@ kotlin {
|
||||
}
|
||||
}
|
||||
|
||||
apply from: "$defaultAndroidSettingsPresetPath"
|
||||
apply from: "$defaultAndroidSettings"
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
@@ -1,7 +1,7 @@
|
||||
project.version = "$version"
|
||||
project.group = "$group"
|
||||
|
||||
apply from: "$publishGradlePath"
|
||||
apply from: "$publish"
|
||||
|
||||
kotlin {
|
||||
jvm {
|
||||
@@ -12,8 +12,20 @@ kotlin {
|
||||
}
|
||||
}
|
||||
js (IR) {
|
||||
browser()
|
||||
nodejs()
|
||||
browser {
|
||||
testTask {
|
||||
useMocha {
|
||||
timeout = "60000"
|
||||
}
|
||||
}
|
||||
}
|
||||
nodejs {
|
||||
testTask {
|
||||
useMocha {
|
||||
timeout = "60000"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
linuxX64()
|
||||
mingwX64()
|
||||
@@ -41,17 +53,6 @@ kotlin {
|
||||
jsTest {
|
||||
dependencies {
|
||||
implementation kotlin('test-js')
|
||||
implementation kotlin('test-junit')
|
||||
}
|
||||
}
|
||||
mingwX64Test {
|
||||
dependencies {
|
||||
implementation kotlin('test-junit')
|
||||
}
|
||||
}
|
||||
linuxX64Test {
|
||||
dependencies {
|
||||
implementation kotlin('test-junit')
|
||||
}
|
||||
}
|
||||
|
@@ -1,7 +1,7 @@
|
||||
project.version = "$version"
|
||||
project.group = "$group"
|
||||
|
||||
apply from: "$publishGradlePath"
|
||||
apply from: "$publish"
|
||||
|
||||
kotlin {
|
||||
jvm {
|
||||
@@ -12,8 +12,20 @@ kotlin {
|
||||
}
|
||||
}
|
||||
js (IR) {
|
||||
browser()
|
||||
nodejs()
|
||||
browser {
|
||||
testTask {
|
||||
useMocha {
|
||||
timeout = "60000"
|
||||
}
|
||||
}
|
||||
}
|
||||
nodejs {
|
||||
testTask {
|
||||
useMocha {
|
||||
timeout = "60000"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
androidTarget {
|
||||
publishAllLibraryVariants()
|
||||
@@ -58,7 +70,6 @@ kotlin {
|
||||
jsTest {
|
||||
dependencies {
|
||||
implementation kotlin('test-js')
|
||||
implementation kotlin('test-junit')
|
||||
}
|
||||
}
|
||||
androidUnitTest {
|
||||
@@ -69,17 +80,10 @@ kotlin {
|
||||
implementation compose.uiTest
|
||||
}
|
||||
}
|
||||
androidInstrumentedTest {
|
||||
dependencies {
|
||||
implementation kotlin('test-junit')
|
||||
implementation libs.android.test.junit
|
||||
implementation libs.android.espresso
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
apply from: "$defaultAndroidSettingsPresetPath"
|
||||
apply from: "$defaultAndroidSettings"
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
@@ -1,3 +1,7 @@
|
||||
if (ext.getProperties()["do_publish"] == false) {
|
||||
return
|
||||
}
|
||||
|
||||
apply plugin: 'maven-publish'
|
||||
|
||||
task javadocsJar(type: Jar) {
|
||||
@@ -19,29 +23,29 @@ publishing {
|
||||
}
|
||||
|
||||
developers {
|
||||
|
||||
|
||||
developer {
|
||||
id = "InsanusMokrassar"
|
||||
name = "Aleksei Ovsiannikov"
|
||||
email = "ovsyannikov.alexey95@gmail.com"
|
||||
}
|
||||
|
||||
|
||||
|
||||
developer {
|
||||
id = "000Sanya"
|
||||
name = "Syrov Aleksandr"
|
||||
email = "000sanya.000sanya@gmail.com"
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
licenses {
|
||||
|
||||
|
||||
license {
|
||||
name = "Apache Software License 2.0"
|
||||
url = "https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
@@ -49,51 +53,51 @@ publishing {
|
||||
maven {
|
||||
name = "GithubPackages"
|
||||
url = uri("https://maven.pkg.github.com/InsanusMokrassar/MicroUtils")
|
||||
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
|
||||
password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "InmoNexus"
|
||||
url = uri("https://nexus.inmo.dev/repository/maven-releases/")
|
||||
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
|
||||
password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
|
||||
|
||||
|
||||
credentials {
|
||||
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
||||
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (project.hasProperty("signing.gnupg.keyName")) {
|
||||
apply plugin: 'signing'
|
||||
|
||||
|
||||
signing {
|
||||
useGpgCmd()
|
||||
|
||||
|
||||
sign publishing.publications
|
||||
}
|
||||
|
||||
|
||||
task signAll {
|
||||
tasks.withType(Sign).forEach {
|
||||
dependsOn(it)
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
@@ -4,7 +4,7 @@ plugins {
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
|
@@ -2,7 +2,7 @@ plugins {
|
||||
id "org.jetbrains.kotlin.jvm"
|
||||
}
|
||||
|
||||
apply from: "$publishJvmOnlyPath"
|
||||
apply from: "$publish_jvm"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
|
@@ -5,7 +5,7 @@ plugins {
|
||||
id "com.google.devtools.ksp"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
|
||||
kotlin {
|
||||
|
@@ -4,4 +4,4 @@ plugins {
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
@@ -2,7 +2,7 @@ plugins {
|
||||
id "org.jetbrains.kotlin.jvm"
|
||||
}
|
||||
|
||||
apply from: "$publishJvmOnlyPath"
|
||||
apply from: "$publish_jvm"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
|
@@ -5,7 +5,9 @@ plugins {
|
||||
id "com.google.devtools.ksp"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
ext.do_publish = false
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
|
||||
kotlin {
|
||||
|
@@ -2,7 +2,7 @@ plugins {
|
||||
id "org.jetbrains.kotlin.jvm"
|
||||
}
|
||||
|
||||
apply from: "$publishJvmOnlyPath"
|
||||
apply from: "$publish_jvm"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
|
@@ -1,28 +1,38 @@
|
||||
package dev.inmo.micro_ksp.generator
|
||||
|
||||
import com.google.devtools.ksp.symbol.KSClassDeclaration
|
||||
import com.google.devtools.ksp.symbol.KSDeclaration
|
||||
import com.google.devtools.ksp.symbol.KSFile
|
||||
import com.google.devtools.ksp.symbol.KSFunctionDeclaration
|
||||
import com.squareup.kotlinpoet.FileSpec
|
||||
import java.io.File
|
||||
|
||||
fun KSClassDeclaration.writeFile(
|
||||
fun KSDeclaration.writeFile(
|
||||
prefix: String = "",
|
||||
suffix: String = "",
|
||||
relatedPath: String = "",
|
||||
force: Boolean = false,
|
||||
forceUppercase: Boolean = true,
|
||||
fileSpecBuilder: () -> FileSpec
|
||||
) {
|
||||
val containingFile = containingFile!!
|
||||
val simpleName = if (forceUppercase) {
|
||||
val rawSimpleName = simpleName.asString()
|
||||
rawSimpleName.replaceFirst(rawSimpleName.first().toString(), rawSimpleName.first().uppercase())
|
||||
} else {
|
||||
simpleName.asString()
|
||||
}
|
||||
File(
|
||||
File(
|
||||
File(containingFile.filePath).parent,
|
||||
relatedPath
|
||||
),
|
||||
"$prefix${simpleName.asString()}$suffix.kt"
|
||||
"$prefix${simpleName}$suffix.kt"
|
||||
).takeIf { force || !it.exists() } ?.apply {
|
||||
parentFile.mkdirs()
|
||||
val fileSpec = fileSpecBuilder()
|
||||
writer().use { writer ->
|
||||
fileSpecBuilder().writeTo(writer)
|
||||
fileSpec.writeTo(writer)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -42,8 +52,9 @@ fun KSFile.writeFile(
|
||||
"$prefix${fileName.dropLastWhile { it != '.' }.removeSuffix(".")}$suffix.kt"
|
||||
).takeIf { force || !it.exists() } ?.apply {
|
||||
parentFile.mkdirs()
|
||||
val fileSpec = fileSpecBuilder()
|
||||
writer().use { writer ->
|
||||
fileSpecBuilder().writeTo(writer)
|
||||
fileSpec.writeTo(writer)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
25
ksp/generator/src/main/kotlin/KClassWorkarounds.kt
Normal file
25
ksp/generator/src/main/kotlin/KClassWorkarounds.kt
Normal file
@@ -0,0 +1,25 @@
|
||||
package dev.inmo.micro_ksp.generator
|
||||
|
||||
import com.google.devtools.ksp.KSTypeNotPresentException
|
||||
import com.google.devtools.ksp.KSTypesNotPresentException
|
||||
import com.google.devtools.ksp.KspExperimental
|
||||
import com.google.devtools.ksp.symbol.KSType
|
||||
import com.squareup.kotlinpoet.asClassName
|
||||
import com.squareup.kotlinpoet.ksp.toClassName
|
||||
import kotlin.reflect.KClass
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
inline fun convertToClassName(getter: () -> KClass<*>) = try {
|
||||
getter().asClassName()
|
||||
} catch (e: KSTypeNotPresentException) {
|
||||
e.ksType.toClassName()
|
||||
}
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
inline fun convertToClassNames(getter: () -> List<KClass<*>>) = try {
|
||||
getter().map { it.asClassName() }
|
||||
} catch (e: KSTypesNotPresentException) {
|
||||
e.ksTypes.map {
|
||||
it.toClassName()
|
||||
}
|
||||
}
|
@@ -0,0 +1,13 @@
|
||||
package dev.inmo.micro_ksp.generator
|
||||
|
||||
import com.google.devtools.ksp.symbol.KSClassDeclaration
|
||||
|
||||
val KSClassDeclaration.buildSubFileName: String
|
||||
get() {
|
||||
val parentDeclarationCaptured = parentDeclaration
|
||||
val simpleNameString = simpleName.asString()
|
||||
return when (parentDeclarationCaptured) {
|
||||
is KSClassDeclaration -> parentDeclarationCaptured.buildSubFileName
|
||||
else -> ""
|
||||
} + simpleNameString
|
||||
}
|
@@ -0,0 +1,8 @@
|
||||
package dev.inmo.micro_ksp.generator
|
||||
|
||||
import com.google.devtools.ksp.symbol.KSClassDeclaration
|
||||
|
||||
val KSClassDeclaration.companion
|
||||
get() = declarations.firstNotNullOfOrNull {
|
||||
(it as? KSClassDeclaration)?.takeIf { it.isCompanionObject }
|
||||
}
|
11
ksp/generator/src/main/kotlin/ResolveSubclasses.kt
Normal file
11
ksp/generator/src/main/kotlin/ResolveSubclasses.kt
Normal file
@@ -0,0 +1,11 @@
|
||||
package dev.inmo.micro_ksp.generator
|
||||
|
||||
import com.google.devtools.ksp.symbol.KSClassDeclaration
|
||||
|
||||
fun KSClassDeclaration.resolveSubclasses(): List<KSClassDeclaration> {
|
||||
return (getSealedSubclasses().flatMap {
|
||||
it.resolveSubclasses()
|
||||
}.ifEmpty {
|
||||
sequenceOf(this)
|
||||
}).toList()
|
||||
}
|
30
ksp/generator/src/main/kotlin/WalkOnKSFiles.kt
Normal file
30
ksp/generator/src/main/kotlin/WalkOnKSFiles.kt
Normal file
@@ -0,0 +1,30 @@
|
||||
package dev.inmo.micro_ksp.generator
|
||||
|
||||
import com.google.devtools.ksp.getAllSuperTypes
|
||||
import com.google.devtools.ksp.symbol.KSAnnotated
|
||||
import com.google.devtools.ksp.symbol.KSClassDeclaration
|
||||
import com.google.devtools.ksp.symbol.KSDeclarationContainer
|
||||
import com.google.devtools.ksp.symbol.KSFile
|
||||
|
||||
fun KSClassDeclaration.findSubClasses(subSymbol: KSAnnotated): Sequence<KSClassDeclaration> {
|
||||
return when (subSymbol) {
|
||||
is KSClassDeclaration -> if (subSymbol.getAllSuperTypes().map { it.declaration }.contains(this)) {
|
||||
sequenceOf(subSymbol)
|
||||
} else {
|
||||
sequenceOf()
|
||||
}
|
||||
else -> sequenceOf()
|
||||
} + if (subSymbol is KSDeclarationContainer) {
|
||||
subSymbol.declarations.flatMap {
|
||||
findSubClasses(it)
|
||||
}
|
||||
} else {
|
||||
sequenceOf()
|
||||
}
|
||||
}
|
||||
|
||||
fun KSClassDeclaration.findSubClasses(files: Sequence<KSAnnotated>): Sequence<KSClassDeclaration> {
|
||||
return files.flatMap {
|
||||
findSubClasses(it)
|
||||
}
|
||||
}
|
@@ -4,4 +4,4 @@ plugins {
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
@@ -2,7 +2,7 @@ plugins {
|
||||
id "org.jetbrains.kotlin.jvm"
|
||||
}
|
||||
|
||||
apply from: "$publishJvmOnlyPath"
|
||||
apply from: "$publish_jvm"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
|
@@ -0,0 +1,17 @@
|
||||
package dev.inmo.micro_utils.ksp.sealed.generator
|
||||
|
||||
import com.google.devtools.ksp.KspExperimental
|
||||
import com.google.devtools.ksp.getAnnotationsByType
|
||||
import com.google.devtools.ksp.symbol.KSClassDeclaration
|
||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedTypesWorkaround
|
||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround
|
||||
import dev.inmo.microutils.kps.sealed.GenerateSealedWorkaround as OldGenerateSealedWorkaround
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
val KSClassDeclaration.getGenerateSealedWorkaroundAnnotation
|
||||
get() = (getAnnotationsByType(GenerateSealedWorkaround::class).firstOrNull() ?: getAnnotationsByType(OldGenerateSealedWorkaround::class).firstOrNull())
|
||||
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
val KSClassDeclaration.getGenerateSealedTypesWorkaroundAnnotation
|
||||
get() = getAnnotationsByType(GenerateSealedTypesWorkaround::class).firstOrNull()
|
@@ -6,28 +6,42 @@ import com.google.devtools.ksp.processing.CodeGenerator
|
||||
import com.google.devtools.ksp.processing.Resolver
|
||||
import com.google.devtools.ksp.processing.SymbolProcessor
|
||||
import com.google.devtools.ksp.symbol.*
|
||||
import com.squareup.kotlinpoet.AnnotationSpec
|
||||
import com.squareup.kotlinpoet.ClassName
|
||||
import com.squareup.kotlinpoet.CodeBlock
|
||||
import com.squareup.kotlinpoet.FileSpec
|
||||
import com.squareup.kotlinpoet.FunSpec
|
||||
import com.squareup.kotlinpoet.KModifier
|
||||
import com.squareup.kotlinpoet.*
|
||||
import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
|
||||
import com.squareup.kotlinpoet.PropertySpec
|
||||
import com.squareup.kotlinpoet.asTypeName
|
||||
import com.squareup.kotlinpoet.ksp.toClassName
|
||||
import dev.inmo.micro_ksp.generator.buildSubFileName
|
||||
import dev.inmo.micro_ksp.generator.companion
|
||||
import dev.inmo.micro_ksp.generator.findSubClasses
|
||||
import dev.inmo.micro_ksp.generator.writeFile
|
||||
import dev.inmo.microutils.kps.sealed.GenerateSealedWorkaround
|
||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedTypesWorkaround
|
||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround
|
||||
import java.io.File
|
||||
import kotlin.reflect.KClass
|
||||
|
||||
class Processor(
|
||||
private val codeGenerator: CodeGenerator
|
||||
) : SymbolProcessor {
|
||||
private fun KSClassDeclaration.resolveSubclasses(): List<KSClassDeclaration> {
|
||||
return (getSealedSubclasses().flatMap {
|
||||
it.resolveSubclasses()
|
||||
}.ifEmpty {
|
||||
sequenceOf(this)
|
||||
}).toList()
|
||||
private fun KSClassDeclaration.findSealedConnection(potentialSealedParent: KSClassDeclaration): Boolean {
|
||||
val targetClassname = potentialSealedParent.qualifiedName ?.asString()
|
||||
return superTypes.any {
|
||||
val itAsDeclaration = it.resolve().declaration as? KSClassDeclaration ?: return@any false
|
||||
targetClassname == (itAsDeclaration.qualifiedName ?.asString()) || (itAsDeclaration.getSealedSubclasses().any() && itAsDeclaration.findSealedConnection(potentialSealedParent))
|
||||
}
|
||||
}
|
||||
|
||||
private fun KSClassDeclaration.resolveSubclasses(
|
||||
searchIn: Sequence<KSAnnotated>,
|
||||
allowNonSealed: Boolean
|
||||
): Sequence<KSClassDeclaration> {
|
||||
return findSubClasses(searchIn).let {
|
||||
if (allowNonSealed) {
|
||||
it
|
||||
} else {
|
||||
it.filter {
|
||||
it.findSealedConnection(this)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
@@ -35,7 +49,11 @@ class Processor(
|
||||
ksClassDeclaration: KSClassDeclaration,
|
||||
resolver: Resolver
|
||||
) {
|
||||
val subClasses = ksClassDeclaration.resolveSubclasses().distinct()
|
||||
val annotation = ksClassDeclaration.getGenerateSealedWorkaroundAnnotation
|
||||
val subClasses = ksClassDeclaration.resolveSubclasses(
|
||||
searchIn = resolver.getAllFiles(),
|
||||
allowNonSealed = annotation ?.includeNonSealedSubTypes ?: false
|
||||
).distinct()
|
||||
val subClassesNames = subClasses.filter {
|
||||
when (it.classKind) {
|
||||
ClassKind.ENUM_ENTRY,
|
||||
@@ -51,7 +69,7 @@ class Processor(
|
||||
(it.getAnnotationsByType(GenerateSealedWorkaround.Order::class).firstOrNull()) ?.order ?: 0
|
||||
}.map {
|
||||
it.toClassName()
|
||||
}
|
||||
}.toList()
|
||||
val className = ksClassDeclaration.toClassName()
|
||||
val setType = Set::class.asTypeName().parameterizedBy(
|
||||
ksClassDeclaration.toClassName()
|
||||
@@ -73,7 +91,10 @@ class Processor(
|
||||
)
|
||||
addFunction(
|
||||
FunSpec.builder("values").apply {
|
||||
receiver(ClassName(className.packageName, *className.simpleNames.toTypedArray(), "Companion"))
|
||||
val companion = ksClassDeclaration.takeIf { it.isCompanionObject } ?.toClassName()
|
||||
?: ksClassDeclaration.companion ?.toClassName()
|
||||
?: ClassName(className.packageName, *className.simpleNames.toTypedArray(), "Companion")
|
||||
receiver(companion)
|
||||
returns(setType)
|
||||
addCode(
|
||||
CodeBlock.of(
|
||||
@@ -84,10 +105,68 @@ class Processor(
|
||||
)
|
||||
}
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
private fun FileSpec.Builder.generateSealedTypesWorkaround(
|
||||
ksClassDeclaration: KSClassDeclaration,
|
||||
resolver: Resolver
|
||||
) {
|
||||
val annotation = ksClassDeclaration.getGenerateSealedTypesWorkaroundAnnotation
|
||||
val subClasses = ksClassDeclaration.resolveSubclasses(
|
||||
searchIn = resolver.getAllFiles(),
|
||||
allowNonSealed = annotation ?.includeNonSealedSubTypes ?: false
|
||||
).distinct()
|
||||
val subClassesNames = subClasses.filter {
|
||||
it.getAnnotationsByType(GenerateSealedTypesWorkaround.Exclude::class).count() == 0
|
||||
}.sortedBy {
|
||||
(it.getAnnotationsByType(GenerateSealedTypesWorkaround.Order::class).firstOrNull()) ?.order ?: 0
|
||||
}.map {
|
||||
it.toClassName()
|
||||
}.toList()
|
||||
val className = ksClassDeclaration.toClassName()
|
||||
val setType = Set::class.asTypeName().parameterizedBy(
|
||||
KClass::class.asTypeName().parameterizedBy(
|
||||
TypeVariableName(
|
||||
"out ${ksClassDeclaration.asStarProjectedType().toClassName().simpleNames.joinToString(".")}",
|
||||
)
|
||||
)
|
||||
)
|
||||
addProperty(
|
||||
PropertySpec.builder(
|
||||
"subtypes",
|
||||
setType
|
||||
).apply {
|
||||
modifiers.add(
|
||||
KModifier.PRIVATE
|
||||
)
|
||||
initializer(
|
||||
CodeBlock.of(
|
||||
"""setOf(${subClassesNames.joinToString(",\n") { it.simpleNames.joinToString(".") + "::class" }})"""
|
||||
)
|
||||
)
|
||||
}.build()
|
||||
)
|
||||
addFunction(
|
||||
FunSpec.builder("subtypes").apply {
|
||||
val companion = ksClassDeclaration.takeIf { it.isCompanionObject } ?.toClassName()
|
||||
?: ksClassDeclaration.companion ?.toClassName()
|
||||
?: ClassName(className.packageName, *className.simpleNames.toTypedArray(), "Companion")
|
||||
receiver(companion)
|
||||
returns(setType)
|
||||
addCode(
|
||||
CodeBlock.of(
|
||||
"""return subtypes"""
|
||||
)
|
||||
)
|
||||
}.build()
|
||||
)
|
||||
}
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
override fun process(resolver: Resolver): List<KSAnnotated> {
|
||||
(resolver.getSymbolsWithAnnotation(GenerateSealedWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
|
||||
val prefix = it.getAnnotationsByType(GenerateSealedWorkaround::class).first().prefix
|
||||
val prefix = (it.getGenerateSealedWorkaroundAnnotation) ?.prefix ?.takeIf {
|
||||
it.isNotEmpty()
|
||||
} ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "")
|
||||
it.writeFile(prefix = prefix, suffix = "SealedWorkaround") {
|
||||
FileSpec.builder(
|
||||
it.packageName.asString(),
|
||||
@@ -104,6 +183,26 @@ class Processor(
|
||||
}.build()
|
||||
}
|
||||
}
|
||||
(resolver.getSymbolsWithAnnotation(GenerateSealedTypesWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
|
||||
val prefix = (it.getGenerateSealedTypesWorkaroundAnnotation) ?.prefix ?.takeIf {
|
||||
it.isNotEmpty()
|
||||
} ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "")
|
||||
it.writeFile(prefix = prefix, suffix = "SealedTypesWorkaround") {
|
||||
FileSpec.builder(
|
||||
it.packageName.asString(),
|
||||
"${it.simpleName.getShortName()}SealedTypesWorkaround"
|
||||
).apply {
|
||||
addFileComment(
|
||||
"""
|
||||
THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||
TO REGENERATE IT JUST DELETE FILE
|
||||
ORIGINAL FILE: ${it.containingFile ?.fileName}
|
||||
""".trimIndent()
|
||||
)
|
||||
generateSealedTypesWorkaround(it, resolver)
|
||||
}.build()
|
||||
}
|
||||
}
|
||||
|
||||
return emptyList()
|
||||
}
|
||||
|
@@ -5,7 +5,9 @@ plugins {
|
||||
id "com.google.devtools.ksp"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
||||
ext.do_publish = false
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
|
||||
kotlin {
|
||||
|
@@ -1,14 +1,19 @@
|
||||
package dev.inmo.micro_utils.ksp.sealed.generator.test
|
||||
|
||||
import dev.inmo.microutils.kps.sealed.GenerateSealedWorkaround
|
||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedTypesWorkaround
|
||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround
|
||||
|
||||
@GenerateSealedWorkaround
|
||||
@GenerateSealedTypesWorkaround
|
||||
sealed interface Test {
|
||||
@GenerateSealedWorkaround.Order(2)
|
||||
@GenerateSealedTypesWorkaround.Exclude
|
||||
object A : Test
|
||||
@GenerateSealedWorkaround.Exclude
|
||||
@GenerateSealedTypesWorkaround.Order(2)
|
||||
object B : Test
|
||||
@GenerateSealedWorkaround.Order(0)
|
||||
@GenerateSealedTypesWorkaround.Order(0)
|
||||
object C : Test
|
||||
|
||||
// Required for successful sealed workaround generation
|
||||
|
@@ -0,0 +1,12 @@
|
||||
// THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||
// TO REGENERATE IT JUST DELETE FILE
|
||||
// ORIGINAL FILE: Test.kt
|
||||
package dev.inmo.micro_utils.ksp.`sealed`.generator.test
|
||||
|
||||
import kotlin.collections.Set
|
||||
import kotlin.reflect.KClass
|
||||
|
||||
private val subtypes: Set<KClass<out Test>> = setOf(Test.C::class,
|
||||
Test.B::class)
|
||||
|
||||
public fun Test.Companion.subtypes(): Set<KClass<out Test>> = subtypes
|
40
ksp/sealed/generator/test/src/jvmTest/kotlin/TestTests.kt
Normal file
40
ksp/sealed/generator/test/src/jvmTest/kotlin/TestTests.kt
Normal file
@@ -0,0 +1,40 @@
|
||||
import dev.inmo.micro_utils.ksp.sealed.generator.test.subtypes
|
||||
import dev.inmo.micro_utils.ksp.sealed.generator.test.values
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertTrue
|
||||
|
||||
class TestTests {
|
||||
@Test
|
||||
fun testThatAfterCompilationTestWorkaroundsHaveCorrectValues() {
|
||||
val correctValues = arrayOf(
|
||||
dev.inmo.micro_utils.ksp.sealed.generator.test.Test.C,
|
||||
dev.inmo.micro_utils.ksp.sealed.generator.test.Test.A,
|
||||
)
|
||||
val correctSubtypes = arrayOf(
|
||||
dev.inmo.micro_utils.ksp.sealed.generator.test.Test.C::class,
|
||||
dev.inmo.micro_utils.ksp.sealed.generator.test.Test.B::class,
|
||||
)
|
||||
|
||||
assertEquals(
|
||||
correctValues.size, dev.inmo.micro_utils.ksp.sealed.generator.test.Test.values().size
|
||||
)
|
||||
correctValues.forEachIndexed { index, value ->
|
||||
assertTrue(
|
||||
value === dev.inmo.micro_utils.ksp.sealed.generator.test.Test.values().elementAt(index)
|
||||
)
|
||||
}
|
||||
|
||||
assertEquals(
|
||||
correctSubtypes.size, dev.inmo.micro_utils.ksp.sealed.generator.test.Test.subtypes().size
|
||||
)
|
||||
correctSubtypes.forEachIndexed { index, value ->
|
||||
assertTrue(
|
||||
value.qualifiedName != null
|
||||
)
|
||||
assertTrue(
|
||||
value.qualifiedName === dev.inmo.micro_utils.ksp.sealed.generator.test.Test.subtypes().elementAt(index).qualifiedName
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
@@ -0,0 +1,15 @@
|
||||
package dev.inmo.micro_utils.ksp.sealed
|
||||
|
||||
@Retention(AnnotationRetention.BINARY)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
annotation class GenerateSealedTypesWorkaround(
|
||||
val prefix: String = "",
|
||||
val includeNonSealedSubTypes: Boolean = false,
|
||||
) {
|
||||
@Retention(AnnotationRetention.BINARY)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
annotation class Order(val order: Int)
|
||||
@Retention(AnnotationRetention.BINARY)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
annotation class Exclude
|
||||
}
|
@@ -1,9 +1,10 @@
|
||||
package dev.inmo.microutils.kps.sealed
|
||||
package dev.inmo.micro_utils.ksp.sealed
|
||||
|
||||
@Retention(AnnotationRetention.BINARY)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
annotation class GenerateSealedWorkaround(
|
||||
val prefix: String = ""
|
||||
val prefix: String = "",
|
||||
val includeNonSealedSubTypes: Boolean = false,
|
||||
) {
|
||||
@Retention(AnnotationRetention.BINARY)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
|
@@ -0,0 +1,6 @@
|
||||
package dev.inmo.microutils.kps.sealed
|
||||
|
||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround
|
||||
|
||||
@Deprecated("Replaced", ReplaceWith("GenerateSealedWorkaround", "dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround"))
|
||||
typealias GenerateSealedWorkaround = GenerateSealedWorkaround
|
7
ksp/variations/build.gradle
Normal file
7
ksp/variations/build.gradle
Normal file
@@ -0,0 +1,7 @@
|
||||
plugins {
|
||||
id "org.jetbrains.kotlin.multiplatform"
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
22
ksp/variations/generator/build.gradle
Normal file
22
ksp/variations/generator/build.gradle
Normal file
@@ -0,0 +1,22 @@
|
||||
plugins {
|
||||
id "org.jetbrains.kotlin.jvm"
|
||||
}
|
||||
|
||||
apply from: "$publish_jvm"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation libs.kt.stdlib
|
||||
api project(":micro_utils.ksp.generator")
|
||||
api project(":micro_utils.ksp.variations")
|
||||
api libs.kotlin.poet
|
||||
api libs.ksp
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
243
ksp/variations/generator/src/main/kotlin/Processor.kt
Normal file
243
ksp/variations/generator/src/main/kotlin/Processor.kt
Normal file
@@ -0,0 +1,243 @@
|
||||
package dev.inmo.micro_utils.ksp.variations.generator
|
||||
|
||||
import com.google.devtools.ksp.KSTypeNotPresentException
|
||||
import com.google.devtools.ksp.KspExperimental
|
||||
import com.google.devtools.ksp.getAnnotationsByType
|
||||
import com.google.devtools.ksp.processing.CodeGenerator
|
||||
import com.google.devtools.ksp.processing.Resolver
|
||||
import com.google.devtools.ksp.processing.SymbolProcessor
|
||||
import com.google.devtools.ksp.symbol.*
|
||||
import com.squareup.kotlinpoet.*
|
||||
import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
|
||||
import com.squareup.kotlinpoet.ksp.toAnnotationSpec
|
||||
import com.squareup.kotlinpoet.ksp.toClassName
|
||||
import com.squareup.kotlinpoet.ksp.toKModifier
|
||||
import com.squareup.kotlinpoet.ksp.toTypeName
|
||||
import dev.inmo.micro_ksp.generator.convertToClassName
|
||||
import dev.inmo.micro_ksp.generator.convertToClassNames
|
||||
import dev.inmo.micro_ksp.generator.findSubClasses
|
||||
import dev.inmo.micro_ksp.generator.writeFile
|
||||
import dev.inmo.micro_utils.ksp.variations.GenerateVariations
|
||||
import dev.inmo.micro_utils.ksp.variations.GenerationVariant
|
||||
import kotlin.math.pow
|
||||
|
||||
class Processor(
|
||||
private val codeGenerator: CodeGenerator
|
||||
) : SymbolProcessor {
|
||||
private fun KSClassDeclaration.findSealedConnection(potentialSealedParent: KSClassDeclaration): Boolean {
|
||||
val targetClassname = potentialSealedParent.qualifiedName ?.asString()
|
||||
return superTypes.any {
|
||||
val itAsDeclaration = it.resolve().declaration as? KSClassDeclaration ?: return@any false
|
||||
targetClassname == (itAsDeclaration.qualifiedName ?.asString()) || (itAsDeclaration.getSealedSubclasses().any() && itAsDeclaration.findSealedConnection(potentialSealedParent))
|
||||
}
|
||||
}
|
||||
|
||||
private fun KSClassDeclaration.resolveSubclasses(
|
||||
searchIn: Sequence<KSAnnotated>,
|
||||
allowNonSealed: Boolean
|
||||
): Sequence<KSClassDeclaration> {
|
||||
return findSubClasses(searchIn).let {
|
||||
if (allowNonSealed) {
|
||||
it
|
||||
} else {
|
||||
it.filter {
|
||||
it.findSealedConnection(this)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
private fun FileSpec.Builder.generateVariations(
|
||||
ksFunctionDeclaration: KSFunctionDeclaration,
|
||||
resolver: Resolver
|
||||
) {
|
||||
val annotation = ksFunctionDeclaration.getAnnotationsByType(GenerateVariations::class).first()
|
||||
val variations: List<Pair<List<GenerationVariant>, KSValueParameter>> = ksFunctionDeclaration.parameters.mapNotNull {
|
||||
val variationAnnotations = it.getAnnotationsByType(GenerationVariant::class).toList()
|
||||
variationAnnotations to it
|
||||
}
|
||||
val accumulatedGenerations = mutableSetOf<Pair<FunSpec, Map<String, String>>>()
|
||||
val baseFunctionParameters = ksFunctionDeclaration.parameters.mapNotNull {
|
||||
ParameterSpec
|
||||
.builder(
|
||||
it.name ?.asString() ?: return@mapNotNull null,
|
||||
it.type.toTypeName(),
|
||||
)
|
||||
.apply {
|
||||
if (it.isCrossInline) {
|
||||
addModifiers(KModifier.CROSSINLINE)
|
||||
}
|
||||
if (it.isVal) {
|
||||
addModifiers(KModifier.VALUE)
|
||||
}
|
||||
if (it.isNoInline) {
|
||||
addModifiers(KModifier.NOINLINE)
|
||||
}
|
||||
if (it.isVararg) {
|
||||
addModifiers(KModifier.VARARG)
|
||||
}
|
||||
it.annotations.forEach {
|
||||
if (it.shortName.asString() == GenerationVariant::class.simpleName) return@forEach
|
||||
|
||||
addAnnotation(it.toAnnotationSpec(omitDefaultValues = false))
|
||||
}
|
||||
}
|
||||
.build() to it.hasDefault
|
||||
}
|
||||
val baseFunctionFunSpecs = mutableListOf<Pair<FunSpec, Map<String, String>>>()
|
||||
let {
|
||||
var defaultParametersIndicator = 0u
|
||||
val maxIndicator = baseFunctionParameters.filter { it.second }.foldIndexed(0u) { index, acc, _ ->
|
||||
2.0.pow(index).toUInt() + acc
|
||||
}
|
||||
while (defaultParametersIndicator <= maxIndicator) {
|
||||
var currentDefaultParameterIndex = 0u
|
||||
val baseFunctionDefaults = mutableMapOf<String, String>()
|
||||
val funSpec = FunSpec.builder(ksFunctionDeclaration.simpleName.asString()).apply {
|
||||
modifiers.addAll(ksFunctionDeclaration.modifiers.mapNotNull { it.toKModifier() })
|
||||
ksFunctionDeclaration.annotations.forEach {
|
||||
if (it.shortName.asString() == GenerateVariations::class.simpleName) return@forEach
|
||||
|
||||
addAnnotation(it.toAnnotationSpec(omitDefaultValues = false))
|
||||
}
|
||||
ksFunctionDeclaration.extensionReceiver ?.let {
|
||||
receiver(it.toTypeName())
|
||||
}
|
||||
ksFunctionDeclaration.returnType ?.let {
|
||||
returns(it.toTypeName())
|
||||
}
|
||||
}
|
||||
baseFunctionParameters.forEach { (parameter, hasDefault) ->
|
||||
if (hasDefault) {
|
||||
val shouldBeIncluded = (2.0.pow(currentDefaultParameterIndex.toInt()).toUInt()).and(defaultParametersIndicator) > 0u
|
||||
currentDefaultParameterIndex++
|
||||
|
||||
if (!shouldBeIncluded) {
|
||||
return@forEach
|
||||
}
|
||||
}
|
||||
funSpec.addParameter(parameter)
|
||||
val name = parameter.name
|
||||
val defaultValueString = if (parameter.modifiers.contains(KModifier.VARARG)) {
|
||||
"*$name"
|
||||
} else {
|
||||
"$name"
|
||||
}
|
||||
baseFunctionDefaults[parameter.name] = defaultValueString
|
||||
}
|
||||
baseFunctionFunSpecs.add(
|
||||
funSpec.build() to baseFunctionDefaults.toMap()
|
||||
)
|
||||
defaultParametersIndicator++
|
||||
}
|
||||
}
|
||||
variations.forEach { (variations, parameter) ->
|
||||
(baseFunctionFunSpecs + accumulatedGenerations).forEach { (accumulatedGeneration, baseDefaults) ->
|
||||
if ((parameter.name ?.asString() ?: "this") !in baseDefaults.keys) {
|
||||
return@forEach
|
||||
}
|
||||
variations.forEach { variation ->
|
||||
val defaults = mutableMapOf<String, String>()
|
||||
accumulatedGenerations.add(
|
||||
FunSpec.builder(accumulatedGeneration.name).apply {
|
||||
modifiers.addAll(accumulatedGeneration.modifiers)
|
||||
accumulatedGeneration.annotations.forEach {
|
||||
addAnnotation(it)
|
||||
}
|
||||
accumulatedGeneration.receiverType ?.let {
|
||||
receiver(it)
|
||||
}
|
||||
returns(accumulatedGeneration.returnType)
|
||||
accumulatedGeneration.parameters.forEach {
|
||||
val actualName = if (variation.argName.isEmpty()) it.name else variation.argName
|
||||
parameters.add(
|
||||
(if (it.name == (parameter.name ?.asString() ?: "this")) {
|
||||
val type = convertToClassName { variation.type }
|
||||
val genericTypes = convertToClassNames { variation.genericTypes.toList() }
|
||||
ParameterSpec
|
||||
.builder(
|
||||
actualName,
|
||||
if (genericTypes.isEmpty()) {
|
||||
type
|
||||
} else {
|
||||
type.parameterizedBy(
|
||||
*genericTypes.toTypedArray()
|
||||
)
|
||||
}
|
||||
)
|
||||
.apply {
|
||||
addModifiers(it.modifiers)
|
||||
val defaultValueString = """
|
||||
with(${actualName}) {${
|
||||
if (it.modifiers.contains(KModifier.VARARG)) {
|
||||
"map { it.${variation.conversion} }.toTypedArray()"
|
||||
} else {
|
||||
"${variation.conversion}"
|
||||
}
|
||||
}}
|
||||
""".trimIndent()
|
||||
defaults[it.name] = defaultValueString
|
||||
}
|
||||
} else {
|
||||
it.toBuilder().apply {
|
||||
defaults[it.name] = it.name
|
||||
}
|
||||
})
|
||||
.apply {
|
||||
it.annotations.forEach {
|
||||
addAnnotation(it)
|
||||
}
|
||||
}
|
||||
.build()
|
||||
)
|
||||
}
|
||||
val parameters = accumulatedGeneration.parameters.joinToString(", ") {
|
||||
val itName = it.name
|
||||
"""
|
||||
$itName = ${defaults[itName] ?: baseDefaults[itName] ?: itName}
|
||||
""".trimIndent()
|
||||
}
|
||||
addCode(
|
||||
"""
|
||||
return ${ksFunctionDeclaration.simpleName.asString()}(
|
||||
$parameters
|
||||
)
|
||||
""".trimIndent()
|
||||
)
|
||||
}.build() to defaults.toMap()
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
accumulatedGenerations.forEach {
|
||||
addFunction(it.first)
|
||||
}
|
||||
}
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
override fun process(resolver: Resolver): List<KSAnnotated> {
|
||||
(resolver.getSymbolsWithAnnotation(GenerateVariations::class.qualifiedName!!)).filterIsInstance<KSFunctionDeclaration>().forEach {
|
||||
val prefix = (it.getAnnotationsByType(GenerateVariations::class)).firstOrNull() ?.prefix ?.takeIf {
|
||||
it.isNotEmpty()
|
||||
} ?: it.simpleName.asString().replaceFirst(it.simpleName.asString(), "")
|
||||
it.writeFile(prefix = prefix, suffix = "GeneratedVariation") {
|
||||
FileSpec.builder(
|
||||
it.packageName.asString(),
|
||||
"${it.simpleName.getShortName().let { it.replaceFirst(it.first().toString(), it.first().uppercase()) }}GeneratedVariation"
|
||||
).apply {
|
||||
addFileComment(
|
||||
"""
|
||||
THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||
TO REGENERATE IT JUST DELETE FILE
|
||||
ORIGINAL FILE: ${it.containingFile ?.fileName}
|
||||
""".trimIndent()
|
||||
)
|
||||
generateVariations(it, resolver)
|
||||
}.build()
|
||||
}
|
||||
}
|
||||
|
||||
return emptyList()
|
||||
}
|
||||
}
|
11
ksp/variations/generator/src/main/kotlin/Provider.kt
Normal file
11
ksp/variations/generator/src/main/kotlin/Provider.kt
Normal file
@@ -0,0 +1,11 @@
|
||||
package dev.inmo.micro_utils.ksp.variations.generator
|
||||
|
||||
import com.google.devtools.ksp.processing.SymbolProcessor
|
||||
import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
|
||||
import com.google.devtools.ksp.processing.SymbolProcessorProvider
|
||||
|
||||
class Provider : SymbolProcessorProvider {
|
||||
override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor = Processor(
|
||||
environment.codeGenerator
|
||||
)
|
||||
}
|
@@ -0,0 +1 @@
|
||||
dev.inmo.micro_utils.ksp.variations.generator.Provider
|
30
ksp/variations/generator/test/build.gradle
Normal file
30
ksp/variations/generator/test/build.gradle
Normal file
@@ -0,0 +1,30 @@
|
||||
plugins {
|
||||
id "org.jetbrains.kotlin.multiplatform"
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
id "com.android.library"
|
||||
id "com.google.devtools.ksp"
|
||||
}
|
||||
|
||||
ext.do_publish = false
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
commonMain {
|
||||
dependencies {
|
||||
implementation libs.kt.stdlib
|
||||
api project(":micro_utils.ksp.variations")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
dependencies {
|
||||
add("kspCommonMainMetadata", project(":micro_utils.ksp.variations.generator"))
|
||||
}
|
||||
|
||||
ksp {
|
||||
}
|
@@ -0,0 +1,61 @@
|
||||
// THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||
// TO REGENERATE IT JUST DELETE FILE
|
||||
// ORIGINAL FILE: SampleFun.kt
|
||||
package dev.inmo.micro_utils.ksp.variations.generator.test
|
||||
|
||||
import kotlin.Boolean
|
||||
import kotlin.Int
|
||||
import kotlin.String
|
||||
import kotlin.Unit
|
||||
|
||||
public suspend fun SimpleType.sample2(arg12: Int): Unit = sample2(
|
||||
arg1 = with(arg12) {toString()}
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(arg12: Int, arg2: Int): Unit = sample2(
|
||||
arg1 = with(arg12) {toString()}, arg2 = arg2
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(arg12: Int, arg3: Boolean): Unit = sample2(
|
||||
arg1 = with(arg12) {toString()}, arg3 = arg3
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(
|
||||
arg12: Int,
|
||||
arg2: Int,
|
||||
arg3: Boolean,
|
||||
): Unit = sample2(
|
||||
arg1 = with(arg12) {toString()}, arg2 = arg2, arg3 = arg3
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(arg22: String): Unit = sample2(
|
||||
arg2 = with(arg22) {toInt()}
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(arg1: String, arg22: String): Unit = sample2(
|
||||
arg1 = arg1, arg2 = with(arg22) {toInt()}
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(arg22: String, arg3: Boolean): Unit = sample2(
|
||||
arg2 = with(arg22) {toInt()}, arg3 = arg3
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(
|
||||
arg1: String,
|
||||
arg22: String,
|
||||
arg3: Boolean,
|
||||
): Unit = sample2(
|
||||
arg1 = arg1, arg2 = with(arg22) {toInt()}, arg3 = arg3
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(arg12: Int, arg22: String): Unit = sample2(
|
||||
arg12 = arg12, arg2 = with(arg22) {toInt()}
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(
|
||||
arg12: Int,
|
||||
arg22: String,
|
||||
arg3: Boolean,
|
||||
): Unit = sample2(
|
||||
arg12 = arg12, arg2 = with(arg22) {toInt()}, arg3 = arg3
|
||||
)
|
@@ -0,0 +1,52 @@
|
||||
package dev.inmo.micro_utils.ksp.variations.generator.test
|
||||
|
||||
import dev.inmo.micro_utils.ksp.variations.GenerateVariations
|
||||
import dev.inmo.micro_utils.ksp.variations.GenerationVariant
|
||||
|
||||
data class SimpleType(
|
||||
val value: String
|
||||
)
|
||||
|
||||
data class GenericType<T>(
|
||||
val value: T
|
||||
)
|
||||
|
||||
@GenerateVariations
|
||||
fun sample(
|
||||
@GenerationVariant(
|
||||
SimpleType::class,
|
||||
"value",
|
||||
)
|
||||
@GenerationVariant(
|
||||
GenericType::class,
|
||||
"value.toString()",
|
||||
genericTypes = arrayOf(Int::class)
|
||||
)
|
||||
example: String = "12"
|
||||
) = println(example)
|
||||
|
||||
@GenerateVariations
|
||||
fun sampleVararg(
|
||||
@GenerationVariant(
|
||||
SimpleType::class,
|
||||
"value",
|
||||
)
|
||||
vararg example: String = arrayOf("12")
|
||||
) = println(example.joinToString())
|
||||
|
||||
@GenerateVariations
|
||||
suspend fun SimpleType.sample2(
|
||||
@GenerationVariant(
|
||||
Int::class,
|
||||
"toString()",
|
||||
"arg12",
|
||||
)
|
||||
arg1: String = "1",
|
||||
@GenerationVariant(
|
||||
String::class,
|
||||
"toInt()",
|
||||
"arg22",
|
||||
)
|
||||
arg2: Int = 2,
|
||||
arg3: Boolean = false
|
||||
) = println(arg1)
|
@@ -0,0 +1,15 @@
|
||||
// THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||
// TO REGENERATE IT JUST DELETE FILE
|
||||
// ORIGINAL FILE: SampleFun.kt
|
||||
package dev.inmo.micro_utils.ksp.variations.generator.test
|
||||
|
||||
import kotlin.Int
|
||||
import kotlin.Unit
|
||||
|
||||
public fun sample(example: SimpleType): Unit = sample(
|
||||
example = with(example) {value}
|
||||
)
|
||||
|
||||
public fun sample(example: GenericType<Int>): Unit = sample(
|
||||
example = with(example) {value.toString()}
|
||||
)
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user