mirror of
https://github.com/InsanusMokrassar/MicroUtils.git
synced 2025-09-17 14:29:24 +00:00
Compare commits
138 Commits
Author | SHA1 | Date | |
---|---|---|---|
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 | |||
e950056e3b | |||
70014ba233 | |||
4425f24a20 | |||
410964a44b | |||
30389e8536 | |||
5314833041 | |||
40f7cf7678 | |||
83a0b07062 | |||
1b4900d691 | |||
f9795d53a0 | |||
2b9bb4f141 | |||
9196e4c367 | |||
374a5a1a37 | |||
827cf32c1b | |||
98ad6dbeb2 | |||
63c8f642ec | |||
3bfe64f797 | |||
ec98029467 | |||
ab58478686 | |||
90247667d1 | |||
e661185534 | |||
d73e4e8e1f | |||
a6905e73cb | |||
93b054d55e | |||
5db4c5c717 | |||
5e04521929 | |||
30440b4ed1 | |||
09bb90604d | |||
4d55ec6f36 | |||
f373524f34 | |||
0398a7bebd | |||
fa8a5bcd97 | |||
758a92410b | |||
77f56c5dda | |||
72f2fe3cc3 | |||
7e0e520f03 | |||
92c4784e42 | |||
a634229dc0 | |||
de3f36ef2a |
7
.github/workflows/build.yml
vendored
7
.github/workflows/build.yml
vendored
@@ -17,8 +17,9 @@ jobs:
|
|||||||
mv gradle.properties.tmp gradle.properties
|
mv gradle.properties.tmp gradle.properties
|
||||||
- name: Build
|
- name: Build
|
||||||
run: ./gradlew build
|
run: ./gradlew build
|
||||||
- name: Publish
|
- name: Publish to InmoNexus
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
run: ./gradlew publishAllPublicationsToGiteaRepository
|
run: ./gradlew publishAllPublicationsToInmoNexusRepository
|
||||||
env:
|
env:
|
||||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
INMONEXUS_USER: ${{ secrets.INMONEXUS_USER }}
|
||||||
|
INMONEXUS_PASSWORD: ${{ secrets.INMONEXUS_PASSWORD }}
|
||||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@@ -1,4 +1,5 @@
|
|||||||
.idea
|
.idea
|
||||||
|
.kotlin
|
||||||
out/*
|
out/*
|
||||||
*.iml
|
*.iml
|
||||||
target
|
target
|
||||||
@@ -17,3 +18,6 @@ publishing.sh
|
|||||||
|
|
||||||
local.*
|
local.*
|
||||||
local/
|
local/
|
||||||
|
**/*.local.*
|
||||||
|
|
||||||
|
.kotlin/
|
||||||
|
214
CHANGELOG.md
214
CHANGELOG.md
@@ -1,5 +1,219 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 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`:
|
||||||
|
* `Compose`:
|
||||||
|
* Add support of mingw, linux, arm64 targets
|
||||||
|
* `Coroutines`:
|
||||||
|
* `Compose`:
|
||||||
|
* Add support of mingw, linux, arm64 targets
|
||||||
|
* `Koin`:
|
||||||
|
* Add support of mingw, linux, arm64 targets
|
||||||
|
* `KSP`:
|
||||||
|
* `ClassCasts`:
|
||||||
|
* Add support of mingw, linux, arm64 targets
|
||||||
|
* `Sealed`:
|
||||||
|
* Add support of mingw, linux, arm64 targets
|
||||||
|
|
||||||
|
## 0.21.3
|
||||||
|
|
||||||
|
* `Colors`:
|
||||||
|
* Added as a module. It should be used by default in case you wish all the API currently realized for `HEXAColor`
|
||||||
|
* `Coroutines`:
|
||||||
|
* Fix of [#374](https://github.com/InsanusMokrassar/MicroUtils/issues/374):
|
||||||
|
* Add vararg variants of `awaitFirst`
|
||||||
|
* Add `joinFirst`
|
||||||
|
|
||||||
|
## 0.21.2
|
||||||
|
|
||||||
|
* `KSP`:
|
||||||
|
* `ClassCasts`:
|
||||||
|
* Module has been initialized
|
||||||
|
|
||||||
|
## 0.21.1
|
||||||
|
|
||||||
|
* `KSP`:
|
||||||
|
* Module has been initialized
|
||||||
|
* `Generator`:
|
||||||
|
* Module has been initialized
|
||||||
|
* `Sealed`:
|
||||||
|
* Module has been initialized
|
||||||
|
|
||||||
|
## 0.21.0
|
||||||
|
|
||||||
|
**THIS UPDATE CONTAINS BREAKING CHANGES IN `safely*`-ORIENTED FUNCTIONS**
|
||||||
|
|
||||||
|
* `Coroutines`:
|
||||||
|
* **All `safely` functions lost their `supervisorScope` in favor to wrapping `runCatching`**
|
||||||
|
* `runCatchingSafely` is the main handling function of all `safely` functions
|
||||||
|
* `launchSafely*` and `asyncSafely*` blocks lost `CoroutineScope` as their receiver
|
||||||
|
|
||||||
|
## 0.20.52
|
||||||
|
|
||||||
|
* `Coroutines`:
|
||||||
|
* Small rework of weak jobs: add `WeakScope` factory, rename old weal extensions and add kdocs
|
||||||
|
|
||||||
|
## 0.20.51
|
||||||
|
|
||||||
|
* `Versions`:
|
||||||
|
* `Android Fragment`: `1.7.0` -> `1.7.1`
|
||||||
|
* `Pagination`:
|
||||||
|
* Add `Pagination.nextPageIfTrue` and `Pagination.thisPageIftrue` extensions to get the page according to condition
|
||||||
|
pass status
|
||||||
|
* Add `PaginationResult.nextPageIfNotEmptyOrLastPage` and `PaginationResult.thisPageIfNotEmptyOrLastPage`
|
||||||
|
* Change all `doForAll` and `getAll` extensions fo pagination to work basing on `nextPageIfNotEmptyOrLastPage` and
|
||||||
|
`thisPageIfNotEmptyOrLastPage`
|
||||||
|
|
||||||
## 0.20.50
|
## 0.20.50
|
||||||
|
|
||||||
* `Versions`:
|
* `Versions`:
|
||||||
|
@@ -4,7 +4,7 @@ plugins {
|
|||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppAndroidProjectPresetPath"
|
apply from: "$mppAndroidProject"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
@@ -4,7 +4,7 @@ plugins {
|
|||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppAndroidProjectPresetPath"
|
apply from: "$mppAndroidProject"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
@@ -3,9 +3,10 @@ plugins {
|
|||||||
id "org.jetbrains.kotlin.plugin.serialization"
|
id "org.jetbrains.kotlin.plugin.serialization"
|
||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
alias(libs.plugins.jb.compose)
|
alias(libs.plugins.jb.compose)
|
||||||
|
alias(libs.plugins.kt.jb.compose)
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppProjectWithSerializationAndComposePresetPath"
|
apply from: "$mppProjectWithSerializationAndCompose"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
@@ -4,7 +4,7 @@ plugins {
|
|||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppAndroidProjectPresetPath"
|
apply from: "$mppAndroidProject"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
@@ -3,15 +3,16 @@ plugins {
|
|||||||
id "org.jetbrains.kotlin.plugin.serialization"
|
id "org.jetbrains.kotlin.plugin.serialization"
|
||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
alias(libs.plugins.jb.compose)
|
alias(libs.plugins.jb.compose)
|
||||||
|
alias(libs.plugins.kt.jb.compose)
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppProjectWithSerializationAndComposePresetPath"
|
apply from: "$mppProjectWithSerializationAndCompose"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
sourceSets {
|
||||||
androidMain {
|
androidMain {
|
||||||
dependencies {
|
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://maven.pkg.jetbrains.space/public/p/compose/dev" }
|
||||||
maven { url "https://nexus.inmo.dev/repository/maven-releases/" }
|
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"
|
apply from: "./extensions.gradle"
|
||||||
|
17
colors/build.gradle
Normal file
17
colors/build.gradle
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
plugins {
|
||||||
|
id "org.jetbrains.kotlin.multiplatform"
|
||||||
|
id "org.jetbrains.kotlin.plugin.serialization"
|
||||||
|
id "com.android.library"
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
|
kotlin {
|
||||||
|
sourceSets {
|
||||||
|
commonMain {
|
||||||
|
dependencies {
|
||||||
|
api project(":micro_utils.colors.common")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -4,4 +4,4 @@ plugins {
|
|||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
298
colors/src/commonMain/kotlin/StandardColors.kt
Normal file
298
colors/src/commonMain/kotlin/StandardColors.kt
Normal file
@@ -0,0 +1,298 @@
|
|||||||
|
package dev.inmo.micro_utils.colors
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.colors.common.HEXAColor
|
||||||
|
|
||||||
|
val HEXAColor.Companion.aliceblue
|
||||||
|
get() = HEXAColor(0xF0F8FFFFu)
|
||||||
|
val HEXAColor.Companion.antiquewhite
|
||||||
|
get() = HEXAColor(0xFAEBD7FFu)
|
||||||
|
val HEXAColor.Companion.aqua
|
||||||
|
get() = HEXAColor(0x00FFFFFFu)
|
||||||
|
val HEXAColor.Companion.aquamarine
|
||||||
|
get() = HEXAColor(0x7FFFD4FFu)
|
||||||
|
val HEXAColor.Companion.azure
|
||||||
|
get() = HEXAColor(0xF0FFFFFFu)
|
||||||
|
val HEXAColor.Companion.beige
|
||||||
|
get() = HEXAColor(0xF5F5DCFFu)
|
||||||
|
val HEXAColor.Companion.bisque
|
||||||
|
get() = HEXAColor(0xFFE4C4FFu)
|
||||||
|
val HEXAColor.Companion.black
|
||||||
|
get() = HEXAColor(0x000000FFu)
|
||||||
|
val HEXAColor.Companion.blanchedalmond
|
||||||
|
get() = HEXAColor(0xFFEBCDFFu)
|
||||||
|
val HEXAColor.Companion.blue
|
||||||
|
get() = HEXAColor(0x0000FFFFu)
|
||||||
|
val HEXAColor.Companion.blueviolet
|
||||||
|
get() = HEXAColor(0x8A2BE2FFu)
|
||||||
|
val HEXAColor.Companion.brown
|
||||||
|
get() = HEXAColor(0xA52A2AFFu)
|
||||||
|
val HEXAColor.Companion.burlywood
|
||||||
|
get() = HEXAColor(0xDEB887FFu)
|
||||||
|
val HEXAColor.Companion.cadetblue
|
||||||
|
get() = HEXAColor(0x5F9EA0FFu)
|
||||||
|
val HEXAColor.Companion.chartreuse
|
||||||
|
get() = HEXAColor(0x7FFF00FFu)
|
||||||
|
val HEXAColor.Companion.chocolate
|
||||||
|
get() = HEXAColor(0xD2691EFFu)
|
||||||
|
val HEXAColor.Companion.coral
|
||||||
|
get() = HEXAColor(0xFF7F50FFu)
|
||||||
|
val HEXAColor.Companion.cornflowerblue
|
||||||
|
get() = HEXAColor(0x6495EDFFu)
|
||||||
|
val HEXAColor.Companion.cornsilk
|
||||||
|
get() = HEXAColor(0xFFF8DCFFu)
|
||||||
|
val HEXAColor.Companion.crimson
|
||||||
|
get() = HEXAColor(0xDC143CFFu)
|
||||||
|
val HEXAColor.Companion.cyan
|
||||||
|
get() = HEXAColor(0x00FFFFFFu)
|
||||||
|
val HEXAColor.Companion.darkblue
|
||||||
|
get() = HEXAColor(0x00008BFFu)
|
||||||
|
val HEXAColor.Companion.darkcyan
|
||||||
|
get() = HEXAColor(0x008B8BFFu)
|
||||||
|
val HEXAColor.Companion.darkgoldenrod
|
||||||
|
get() = HEXAColor(0xB8860BFFu)
|
||||||
|
val HEXAColor.Companion.darkgray
|
||||||
|
get() = HEXAColor(0xA9A9A9FFu)
|
||||||
|
val HEXAColor.Companion.darkgreen
|
||||||
|
get() = HEXAColor(0x006400FFu)
|
||||||
|
val HEXAColor.Companion.darkgrey
|
||||||
|
get() = HEXAColor(0xA9A9A9FFu)
|
||||||
|
val HEXAColor.Companion.darkkhaki
|
||||||
|
get() = HEXAColor(0xBDB76BFFu)
|
||||||
|
val HEXAColor.Companion.darkmagenta
|
||||||
|
get() = HEXAColor(0x8B008BFFu)
|
||||||
|
val HEXAColor.Companion.darkolivegreen
|
||||||
|
get() = HEXAColor(0x556B2FFFu)
|
||||||
|
val HEXAColor.Companion.darkorange
|
||||||
|
get() = HEXAColor(0xFF8C00FFu)
|
||||||
|
val HEXAColor.Companion.darkorchid
|
||||||
|
get() = HEXAColor(0x9932CCFFu)
|
||||||
|
val HEXAColor.Companion.darkred
|
||||||
|
get() = HEXAColor(0x8B0000FFu)
|
||||||
|
val HEXAColor.Companion.darksalmon
|
||||||
|
get() = HEXAColor(0xE9967AFFu)
|
||||||
|
val HEXAColor.Companion.darkseagreen
|
||||||
|
get() = HEXAColor(0x8FBC8FFFu)
|
||||||
|
val HEXAColor.Companion.darkslateblue
|
||||||
|
get() = HEXAColor(0x483D8BFFu)
|
||||||
|
val HEXAColor.Companion.darkslategray
|
||||||
|
get() = HEXAColor(0x2F4F4FFFu)
|
||||||
|
val HEXAColor.Companion.darkslategrey
|
||||||
|
get() = HEXAColor(0x2F4F4FFFu)
|
||||||
|
val HEXAColor.Companion.darkturquoise
|
||||||
|
get() = HEXAColor(0x00CED1FFu)
|
||||||
|
val HEXAColor.Companion.darkviolet
|
||||||
|
get() = HEXAColor(0x9400D3FFu)
|
||||||
|
val HEXAColor.Companion.deeppink
|
||||||
|
get() = HEXAColor(0xFF1493FFu)
|
||||||
|
val HEXAColor.Companion.deepskyblue
|
||||||
|
get() = HEXAColor(0x00BFFFFFu)
|
||||||
|
val HEXAColor.Companion.dimgray
|
||||||
|
get() = HEXAColor(0x696969FFu)
|
||||||
|
val HEXAColor.Companion.dimgrey
|
||||||
|
get() = HEXAColor(0x696969FFu)
|
||||||
|
val HEXAColor.Companion.dodgerblue
|
||||||
|
get() = HEXAColor(0x1E90FFFFu)
|
||||||
|
val HEXAColor.Companion.firebrick
|
||||||
|
get() = HEXAColor(0xB22222FFu)
|
||||||
|
val HEXAColor.Companion.floralwhite
|
||||||
|
get() = HEXAColor(0xFFFAF0FFu)
|
||||||
|
val HEXAColor.Companion.forestgreen
|
||||||
|
get() = HEXAColor(0x228B22FFu)
|
||||||
|
val HEXAColor.Companion.fuchsia
|
||||||
|
get() = HEXAColor(0xFF00FFFFu)
|
||||||
|
val HEXAColor.Companion.gainsboro
|
||||||
|
get() = HEXAColor(0xDCDCDCFFu)
|
||||||
|
val HEXAColor.Companion.ghostwhite
|
||||||
|
get() = HEXAColor(0xF8F8FFFFu)
|
||||||
|
val HEXAColor.Companion.gold
|
||||||
|
get() = HEXAColor(0xFFD700FFu)
|
||||||
|
val HEXAColor.Companion.goldenrod
|
||||||
|
get() = HEXAColor(0xDAA520FFu)
|
||||||
|
val HEXAColor.Companion.gray
|
||||||
|
get() = HEXAColor(0x808080FFu)
|
||||||
|
val HEXAColor.Companion.green
|
||||||
|
get() = HEXAColor(0x008000FFu)
|
||||||
|
val HEXAColor.Companion.greenyellow
|
||||||
|
get() = HEXAColor(0xADFF2FFFu)
|
||||||
|
val HEXAColor.Companion.grey
|
||||||
|
get() = HEXAColor(0x808080FFu)
|
||||||
|
val HEXAColor.Companion.honeydew
|
||||||
|
get() = HEXAColor(0xF0FFF0FFu)
|
||||||
|
val HEXAColor.Companion.hotpink
|
||||||
|
get() = HEXAColor(0xFF69B4FFu)
|
||||||
|
val HEXAColor.Companion.indianred
|
||||||
|
get() = HEXAColor(0xCD5C5CFFu)
|
||||||
|
val HEXAColor.Companion.indigo
|
||||||
|
get() = HEXAColor(0x4B0082FFu)
|
||||||
|
val HEXAColor.Companion.ivory
|
||||||
|
get() = HEXAColor(0xFFFFF0FFu)
|
||||||
|
val HEXAColor.Companion.khaki
|
||||||
|
get() = HEXAColor(0xF0E68CFFu)
|
||||||
|
val HEXAColor.Companion.lavender
|
||||||
|
get() = HEXAColor(0xE6E6FAFFu)
|
||||||
|
val HEXAColor.Companion.lavenderblush
|
||||||
|
get() = HEXAColor(0xFFF0F5FFu)
|
||||||
|
val HEXAColor.Companion.lawngreen
|
||||||
|
get() = HEXAColor(0x7CFC00FFu)
|
||||||
|
val HEXAColor.Companion.lemonchiffon
|
||||||
|
get() = HEXAColor(0xFFFACDFFu)
|
||||||
|
val HEXAColor.Companion.lightblue
|
||||||
|
get() = HEXAColor(0xADD8E6FFu)
|
||||||
|
val HEXAColor.Companion.lightcoral
|
||||||
|
get() = HEXAColor(0xF08080FFu)
|
||||||
|
val HEXAColor.Companion.lightcyan
|
||||||
|
get() = HEXAColor(0xE0FFFFFFu)
|
||||||
|
val HEXAColor.Companion.lightgoldenrodyellow
|
||||||
|
get() = HEXAColor(0xFAFAD2FFu)
|
||||||
|
val HEXAColor.Companion.lightgray
|
||||||
|
get() = HEXAColor(0xD3D3D3FFu)
|
||||||
|
val HEXAColor.Companion.lightgreen
|
||||||
|
get() = HEXAColor(0x90EE90FFu)
|
||||||
|
val HEXAColor.Companion.lightgrey
|
||||||
|
get() = HEXAColor(0xD3D3D3FFu)
|
||||||
|
val HEXAColor.Companion.lightpink
|
||||||
|
get() = HEXAColor(0xFFB6C1FFu)
|
||||||
|
val HEXAColor.Companion.lightsalmon
|
||||||
|
get() = HEXAColor(0xFFA07AFFu)
|
||||||
|
val HEXAColor.Companion.lightseagreen
|
||||||
|
get() = HEXAColor(0x20B2AAFFu)
|
||||||
|
val HEXAColor.Companion.lightskyblue
|
||||||
|
get() = HEXAColor(0x87CEFAFFu)
|
||||||
|
val HEXAColor.Companion.lightslategray
|
||||||
|
get() = HEXAColor(0x778899FFu)
|
||||||
|
val HEXAColor.Companion.lightslategrey
|
||||||
|
get() = HEXAColor(0x778899FFu)
|
||||||
|
val HEXAColor.Companion.lightsteelblue
|
||||||
|
get() = HEXAColor(0xB0C4DEFFu)
|
||||||
|
val HEXAColor.Companion.lightyellow
|
||||||
|
get() = HEXAColor(0xFFFFE0FFu)
|
||||||
|
val HEXAColor.Companion.lime
|
||||||
|
get() = HEXAColor(0x00FF00FFu)
|
||||||
|
val HEXAColor.Companion.limegreen
|
||||||
|
get() = HEXAColor(0x32CD32FFu)
|
||||||
|
val HEXAColor.Companion.linen
|
||||||
|
get() = HEXAColor(0xFAF0E6FFu)
|
||||||
|
val HEXAColor.Companion.magenta
|
||||||
|
get() = HEXAColor(0xFF00FFFFu)
|
||||||
|
val HEXAColor.Companion.maroon
|
||||||
|
get() = HEXAColor(0x800000FFu)
|
||||||
|
val HEXAColor.Companion.mediumaquamarine
|
||||||
|
get() = HEXAColor(0x66CDAAFFu)
|
||||||
|
val HEXAColor.Companion.mediumblue
|
||||||
|
get() = HEXAColor(0x0000CDFFu)
|
||||||
|
val HEXAColor.Companion.mediumorchid
|
||||||
|
get() = HEXAColor(0xBA55D3FFu)
|
||||||
|
val HEXAColor.Companion.mediumpurple
|
||||||
|
get() = HEXAColor(0x9370DBFFu)
|
||||||
|
val HEXAColor.Companion.mediumseagreen
|
||||||
|
get() = HEXAColor(0x3CB371FFu)
|
||||||
|
val HEXAColor.Companion.mediumslateblue
|
||||||
|
get() = HEXAColor(0x7B68EEFFu)
|
||||||
|
val HEXAColor.Companion.mediumspringgreen
|
||||||
|
get() = HEXAColor(0x00FA9AFFu)
|
||||||
|
val HEXAColor.Companion.mediumturquoise
|
||||||
|
get() = HEXAColor(0x48D1CCFFu)
|
||||||
|
val HEXAColor.Companion.mediumvioletred
|
||||||
|
get() = HEXAColor(0xC71585FFu)
|
||||||
|
val HEXAColor.Companion.midnightblue
|
||||||
|
get() = HEXAColor(0x191970FFu)
|
||||||
|
val HEXAColor.Companion.mintcream
|
||||||
|
get() = HEXAColor(0xF5FFFAFFu)
|
||||||
|
val HEXAColor.Companion.mistyrose
|
||||||
|
get() = HEXAColor(0xFFE4E1FFu)
|
||||||
|
val HEXAColor.Companion.moccasin
|
||||||
|
get() = HEXAColor(0xFFE4B5FFu)
|
||||||
|
val HEXAColor.Companion.navajowhite
|
||||||
|
get() = HEXAColor(0xFFDEADFFu)
|
||||||
|
val HEXAColor.Companion.navy
|
||||||
|
get() = HEXAColor(0x000080FFu)
|
||||||
|
val HEXAColor.Companion.oldlace
|
||||||
|
get() = HEXAColor(0xFDF5E6FFu)
|
||||||
|
val HEXAColor.Companion.olive
|
||||||
|
get() = HEXAColor(0x808000FFu)
|
||||||
|
val HEXAColor.Companion.olivedrab
|
||||||
|
get() = HEXAColor(0x6B8E23FFu)
|
||||||
|
val HEXAColor.Companion.orange
|
||||||
|
get() = HEXAColor(0xFFA500FFu)
|
||||||
|
val HEXAColor.Companion.orangered
|
||||||
|
get() = HEXAColor(0xFF4500FFu)
|
||||||
|
val HEXAColor.Companion.orchid
|
||||||
|
get() = HEXAColor(0xDA70D6FFu)
|
||||||
|
val HEXAColor.Companion.palegoldenrod
|
||||||
|
get() = HEXAColor(0xEEE8AAFFu)
|
||||||
|
val HEXAColor.Companion.palegreen
|
||||||
|
get() = HEXAColor(0x98FB98FFu)
|
||||||
|
val HEXAColor.Companion.paleturquoise
|
||||||
|
get() = HEXAColor(0xAFEEEEFFu)
|
||||||
|
val HEXAColor.Companion.palevioletred
|
||||||
|
get() = HEXAColor(0xDB7093FFu)
|
||||||
|
val HEXAColor.Companion.papayawhip
|
||||||
|
get() = HEXAColor(0xFFEFD5FFu)
|
||||||
|
val HEXAColor.Companion.peachpuff
|
||||||
|
get() = HEXAColor(0xFFDAB9FFu)
|
||||||
|
val HEXAColor.Companion.peru
|
||||||
|
get() = HEXAColor(0xCD853FFFu)
|
||||||
|
val HEXAColor.Companion.pink
|
||||||
|
get() = HEXAColor(0xFFC0CBFFu)
|
||||||
|
val HEXAColor.Companion.plum
|
||||||
|
get() = HEXAColor(0xDDA0DDFFu)
|
||||||
|
val HEXAColor.Companion.powderblue
|
||||||
|
get() = HEXAColor(0xB0E0E6FFu)
|
||||||
|
val HEXAColor.Companion.purple
|
||||||
|
get() = HEXAColor(0x800080FFu)
|
||||||
|
val HEXAColor.Companion.red
|
||||||
|
get() = HEXAColor(0xFF0000FFu)
|
||||||
|
val HEXAColor.Companion.rosybrown
|
||||||
|
get() = HEXAColor(0xBC8F8FFFu)
|
||||||
|
val HEXAColor.Companion.royalblue
|
||||||
|
get() = HEXAColor(0x4169E1FFu)
|
||||||
|
val HEXAColor.Companion.saddlebrown
|
||||||
|
get() = HEXAColor(0x8B4513FFu)
|
||||||
|
val HEXAColor.Companion.salmon
|
||||||
|
get() = HEXAColor(0xFA8072FFu)
|
||||||
|
val HEXAColor.Companion.sandybrown
|
||||||
|
get() = HEXAColor(0xF4A460FFu)
|
||||||
|
val HEXAColor.Companion.seagreen
|
||||||
|
get() = HEXAColor(0x2E8B57FFu)
|
||||||
|
val HEXAColor.Companion.seashell
|
||||||
|
get() = HEXAColor(0xFFF5EEFFu)
|
||||||
|
val HEXAColor.Companion.sienna
|
||||||
|
get() = HEXAColor(0xA0522DFFu)
|
||||||
|
val HEXAColor.Companion.silver
|
||||||
|
get() = HEXAColor(0xC0C0C0FFu)
|
||||||
|
val HEXAColor.Companion.skyblue
|
||||||
|
get() = HEXAColor(0x87CEEBFFu)
|
||||||
|
val HEXAColor.Companion.slateblue
|
||||||
|
get() = HEXAColor(0x6A5ACDFFu)
|
||||||
|
val HEXAColor.Companion.slategray
|
||||||
|
get() = HEXAColor(0x708090FFu)
|
||||||
|
val HEXAColor.Companion.slategrey
|
||||||
|
get() = HEXAColor(0x708090FFu)
|
||||||
|
val HEXAColor.Companion.snow
|
||||||
|
get() = HEXAColor(0xFFFAFAFFu)
|
||||||
|
val HEXAColor.Companion.springgreen
|
||||||
|
get() = HEXAColor(0x00FF7FFFu)
|
||||||
|
val HEXAColor.Companion.steelblue
|
||||||
|
get() = HEXAColor(0x4682B4FFu)
|
||||||
|
val HEXAColor.Companion.tan
|
||||||
|
get() = HEXAColor(0xD2B48CFFu)
|
||||||
|
val HEXAColor.Companion.teal
|
||||||
|
get() = HEXAColor(0x008080FFu)
|
||||||
|
val HEXAColor.Companion.thistle
|
||||||
|
get() = HEXAColor(0xD8BFD8FFu)
|
||||||
|
val HEXAColor.Companion.tomato
|
||||||
|
get() = HEXAColor(0xFF6347FFu)
|
||||||
|
val HEXAColor.Companion.turquoise
|
||||||
|
get() = HEXAColor(0x40E0D0FFu)
|
||||||
|
val HEXAColor.Companion.violet
|
||||||
|
get() = HEXAColor(0xEE82EEFFu)
|
||||||
|
val HEXAColor.Companion.wheat
|
||||||
|
get() = HEXAColor(0xF5DEB3FFu)
|
||||||
|
val HEXAColor.Companion.white
|
||||||
|
get() = HEXAColor(0xFFFFFFFFu)
|
||||||
|
val HEXAColor.Companion.whitesmoke
|
||||||
|
get() = HEXAColor(0xF5F5F5FFu)
|
||||||
|
val HEXAColor.Companion.yellow
|
||||||
|
get() = HEXAColor(0xFFFF00FFu)
|
||||||
|
val HEXAColor.Companion.yellowgreen
|
||||||
|
get() = HEXAColor(0x9ACD32FFu)
|
@@ -4,7 +4,7 @@ plugins {
|
|||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
@@ -3,9 +3,10 @@ plugins {
|
|||||||
id "org.jetbrains.kotlin.plugin.serialization"
|
id "org.jetbrains.kotlin.plugin.serialization"
|
||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
alias(libs.plugins.jb.compose)
|
alias(libs.plugins.jb.compose)
|
||||||
|
alias(libs.plugins.kt.jb.compose)
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppProjectWithSerializationAndComposePresetPath"
|
apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
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>,
|
additional: MutableList<T>,
|
||||||
iterator: Iterator<T>
|
iterator: Iterator<T>
|
||||||
): T? = when {
|
): T? = when {
|
||||||
additional.isNotEmpty() -> additional.removeFirst()
|
additional.isNotEmpty() -> additional.removeAt(0)
|
||||||
iterator.hasNext() -> iterator.next()
|
iterator.hasNext() -> iterator.next()
|
||||||
else -> null
|
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,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,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,7 +4,7 @@ plugins {
|
|||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
@@ -3,9 +3,10 @@ plugins {
|
|||||||
id "org.jetbrains.kotlin.plugin.serialization"
|
id "org.jetbrains.kotlin.plugin.serialization"
|
||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
alias(libs.plugins.jb.compose)
|
alias(libs.plugins.jb.compose)
|
||||||
|
alias(libs.plugins.kt.jb.compose)
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppProjectWithSerializationAndComposePresetPath"
|
apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
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>) {
|
override suspend fun collectSafely(collector: FlowCollector<T>) {
|
||||||
val channel = Channel<T>(Channel.UNLIMITED, BufferOverflow.SUSPEND)
|
val channel = Channel<T>(Channel.UNLIMITED, BufferOverflow.SUSPEND)
|
||||||
steps.send(SubscribeAccumulatorFlowStep(channel))
|
steps.send(SubscribeAccumulatorFlowStep(channel))
|
||||||
val result = runCatchingSafely {
|
val result = runCatching {
|
||||||
for (data in channel) {
|
for (data in channel) {
|
||||||
val emitResult = runCatchingSafely {
|
val emitResult = runCatching {
|
||||||
collector.emit(data)
|
collector.emit(data)
|
||||||
}
|
}
|
||||||
if (emitResult.isSuccess || emitResult.exceptionOrNull() is CancellationException) {
|
if (emitResult.isSuccess || emitResult.exceptionOrNull() is CancellationException) {
|
||||||
|
@@ -3,6 +3,12 @@ package dev.inmo.micro_utils.coroutines
|
|||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.*
|
||||||
import kotlin.coroutines.*
|
import kotlin.coroutines.*
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trying to [Deferred.await] on all [this] [Deferred]s. The first [Deferred] completed its work will interrupt all
|
||||||
|
* others awaits and, if [cancelOnResult] passed as true (**by default**), will also cancel all the others [Deferred]s
|
||||||
|
*
|
||||||
|
* @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it
|
||||||
|
*/
|
||||||
suspend fun <T> Iterable<Deferred<T>>.awaitFirstWithDeferred(
|
suspend fun <T> Iterable<Deferred<T>>.awaitFirstWithDeferred(
|
||||||
scope: CoroutineScope,
|
scope: CoroutineScope,
|
||||||
cancelOnResult: Boolean = true
|
cancelOnResult: Boolean = true
|
||||||
@@ -24,10 +30,45 @@ suspend fun <T> Iterable<Deferred<T>>.awaitFirstWithDeferred(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trying to [Deferred.await] on all [this] [Deferred]s. The first [Deferred] completed its work will interrupt all
|
||||||
|
* others awaits and, if [cancelOnResult] passed as true (**by default**), will also cancel all the others [Deferred]s
|
||||||
|
*
|
||||||
|
* @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it
|
||||||
|
*/
|
||||||
suspend fun <T> Iterable<Deferred<T>>.awaitFirst(
|
suspend fun <T> Iterable<Deferred<T>>.awaitFirst(
|
||||||
scope: CoroutineScope,
|
scope: CoroutineScope,
|
||||||
cancelOnResult: Boolean = true
|
cancelOnResult: Boolean = true
|
||||||
): T = awaitFirstWithDeferred(scope, cancelOnResult).second
|
): T = awaitFirstWithDeferred(scope, cancelOnResult).second
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trying to [Deferred.await] on all [this] [Deferred]s. The first [Deferred] completed its work will interrupt all
|
||||||
|
* others awaits and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Deferred]s
|
||||||
|
*
|
||||||
|
* Creates [CoroutineScope] using [coroutineContext] for internal purposes
|
||||||
|
*/
|
||||||
suspend fun <T> Iterable<Deferred<T>>.awaitFirst(
|
suspend fun <T> Iterable<Deferred<T>>.awaitFirst(
|
||||||
cancelOthers: Boolean = true
|
cancelOthers: Boolean = true
|
||||||
): T = awaitFirst(CoroutineScope(coroutineContext), cancelOthers)
|
): T = awaitFirst(CoroutineScope(coroutineContext), cancelOthers)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trying to [Deferred.await] on all [deferreds]. The first [Deferred] completed its work will interrupt all
|
||||||
|
* others awaits and, if [cancelOnResult] passed as true (**by default**), will also cancel all the others [deferreds]
|
||||||
|
*
|
||||||
|
* @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it
|
||||||
|
*/
|
||||||
|
suspend fun <T> awaitFirst(
|
||||||
|
vararg deferreds: Deferred<T>,
|
||||||
|
scope: CoroutineScope,
|
||||||
|
cancelOnResult: Boolean = true
|
||||||
|
): T = deferreds.toList().awaitFirstWithDeferred(scope, cancelOnResult).second
|
||||||
|
/**
|
||||||
|
* Trying to [Deferred.await] on all [deferreds]. The first [Deferred] completed its work will interrupt all
|
||||||
|
* others awaits and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [deferreds]
|
||||||
|
*
|
||||||
|
* Creates [CoroutineScope] using [coroutineContext] for internal purposes
|
||||||
|
*/
|
||||||
|
suspend fun <T> awaitFirst(
|
||||||
|
vararg deferreds: Deferred<T>,
|
||||||
|
cancelOthers: Boolean = true
|
||||||
|
): T = awaitFirst(*deferreds, scope = CoroutineScope(coroutineContext), cancelOnResult = cancelOthers)
|
||||||
|
@@ -0,0 +1,44 @@
|
|||||||
|
package dev.inmo.micro_utils.coroutines
|
||||||
|
|
||||||
|
import kotlin.coroutines.CoroutineContext
|
||||||
|
import kotlin.coroutines.coroutineContext
|
||||||
|
|
||||||
|
typealias ExceptionHandler<T> = suspend (Throwable) -> T
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This instance will be used in all calls of [safely] where exception handler has not been passed
|
||||||
|
*/
|
||||||
|
var defaultSafelyExceptionHandler: ExceptionHandler<Nothing> = { throw it }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This instance will be used in all calls of [safelyWithoutExceptions] as an exception handler for [safely] call
|
||||||
|
*/
|
||||||
|
var defaultSafelyWithoutExceptionHandler: ExceptionHandler<Unit> = {
|
||||||
|
try {
|
||||||
|
defaultSafelyExceptionHandler(it)
|
||||||
|
} catch (e: Throwable) {
|
||||||
|
// do nothing
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This key can (and will) be used to get [ContextSafelyExceptionHandler] from [coroutineContext] of suspend functions
|
||||||
|
* and in [ContextSafelyExceptionHandler] for defining of its [CoroutineContext.Element.key]
|
||||||
|
*
|
||||||
|
* @see safelyWithContextExceptionHandler
|
||||||
|
* @see ContextSafelyExceptionHandler
|
||||||
|
*/
|
||||||
|
object ContextSafelyExceptionHandlerKey : CoroutineContext.Key<ContextSafelyExceptionHandler>
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [ExceptionHandler] wrapper which was created to make possible to use [handler] across all coroutines calls
|
||||||
|
*
|
||||||
|
* @see safelyWithContextExceptionHandler
|
||||||
|
* @see ContextSafelyExceptionHandlerKey
|
||||||
|
*/
|
||||||
|
class ContextSafelyExceptionHandler(
|
||||||
|
val handler: ExceptionHandler<Unit>
|
||||||
|
) : 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)
|
@@ -4,46 +4,58 @@ import kotlinx.coroutines.*
|
|||||||
import kotlin.coroutines.CoroutineContext
|
import kotlin.coroutines.CoroutineContext
|
||||||
import kotlin.coroutines.coroutineContext
|
import kotlin.coroutines.coroutineContext
|
||||||
|
|
||||||
typealias ExceptionHandler<T> = suspend (Throwable) -> T
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This instance will be used in all calls of [safely] where exception handler has not been passed
|
* Launching [block] in [runCatching]. In case of failure, it will:
|
||||||
|
*
|
||||||
|
* * Try to get [ContextSafelyExceptionHandler] from current [coroutineContext] and call its
|
||||||
|
* [ContextSafelyExceptionHandler.handler] invoke. **Thrown exception from its handler
|
||||||
|
* will pass out of [runCatchingSafely]**
|
||||||
|
* * Execute [onException] inside of new [runCatching] and return its result. Throws exception
|
||||||
|
* will be caught by [runCatching] and wrapped in [Result]
|
||||||
|
*
|
||||||
|
* @return [Result] with result of [block] if no exceptions or [Result] from [onException] execution
|
||||||
*/
|
*/
|
||||||
var defaultSafelyExceptionHandler: ExceptionHandler<Nothing> = { throw it }
|
suspend inline fun <T> runCatchingSafely(
|
||||||
|
onException: ExceptionHandler<T>,
|
||||||
/**
|
block: suspend () -> T
|
||||||
* This instance will be used in all calls of [safelyWithoutExceptions] as an exception handler for [safely] call
|
): Result<T> {
|
||||||
*/
|
return runCatching {
|
||||||
var defaultSafelyWithoutExceptionHandler: ExceptionHandler<Unit> = {
|
block()
|
||||||
try {
|
}.onFailure {
|
||||||
defaultSafelyExceptionHandler(it)
|
coroutineContext[ContextSafelyExceptionHandlerKey] ?.handler ?.invoke(it)
|
||||||
} catch (e: Throwable) {
|
return runCatching {
|
||||||
// do nothing
|
onException(it)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
suspend inline fun <T, R> R.runCatchingSafely(
|
||||||
* This key can (and will) be used to get [ContextSafelyExceptionHandler] from [coroutineContext] of suspend functions
|
onException: ExceptionHandler<T>,
|
||||||
* and in [ContextSafelyExceptionHandler] for defining of its [CoroutineContext.Element.key]
|
block: suspend R.() -> T
|
||||||
*
|
): Result<T> = runCatchingSafely<T>(onException) {
|
||||||
* @see safelyWithContextExceptionHandler
|
block()
|
||||||
* @see ContextSafelyExceptionHandler
|
}
|
||||||
*/
|
|
||||||
object ContextSafelyExceptionHandlerKey : CoroutineContext.Key<ContextSafelyExceptionHandler>
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [ExceptionHandler] wrapper which was created to make possible to use [handler] across all coroutines calls
|
* Launching [runCatchingSafely] with [defaultSafelyExceptionHandler] as `onException` parameter
|
||||||
*
|
|
||||||
* @see safelyWithContextExceptionHandler
|
|
||||||
* @see ContextSafelyExceptionHandlerKey
|
|
||||||
*/
|
*/
|
||||||
class ContextSafelyExceptionHandler(
|
suspend inline fun <T> runCatchingSafely(
|
||||||
val handler: ExceptionHandler<Unit>
|
block: suspend () -> T
|
||||||
) : CoroutineContext.Element {
|
): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block)
|
||||||
override val key: CoroutineContext.Key<*>
|
|
||||||
get() = ContextSafelyExceptionHandlerKey
|
suspend inline fun <T, R> R.runCatchingSafely(
|
||||||
|
block: suspend R.() -> T
|
||||||
|
): Result<T> = runCatchingSafely<T> {
|
||||||
|
block()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//suspend inline fun <T, R> T.runCatchingSafely(
|
||||||
|
// onException: ExceptionHandler<R>,
|
||||||
|
// block: suspend T.() -> R
|
||||||
|
//): Result<R> = runCatchingSafely(onException) {
|
||||||
|
// block()
|
||||||
|
//}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return [ContextSafelyExceptionHandler] from [coroutineContext] by key [ContextSafelyExceptionHandlerKey] if
|
* @return [ContextSafelyExceptionHandler] from [coroutineContext] by key [ContextSafelyExceptionHandlerKey] if
|
||||||
* exists
|
* exists
|
||||||
@@ -64,7 +76,7 @@ suspend fun contextSafelyExceptionHandler() = coroutineContext[ContextSafelyExce
|
|||||||
suspend fun <T> safelyWithContextExceptionHandler(
|
suspend fun <T> safelyWithContextExceptionHandler(
|
||||||
contextExceptionHandler: ExceptionHandler<Unit>,
|
contextExceptionHandler: ExceptionHandler<Unit>,
|
||||||
safelyExceptionHandler: ExceptionHandler<T> = defaultSafelyExceptionHandler,
|
safelyExceptionHandler: ExceptionHandler<T> = defaultSafelyExceptionHandler,
|
||||||
block: suspend CoroutineScope.() -> T
|
block: suspend () -> T
|
||||||
): T {
|
): T {
|
||||||
val contextSafelyExceptionHandler = contextSafelyExceptionHandler() ?.handler ?.let { oldHandler ->
|
val contextSafelyExceptionHandler = contextSafelyExceptionHandler() ?.handler ?.let { oldHandler ->
|
||||||
ContextSafelyExceptionHandler {
|
ContextSafelyExceptionHandler {
|
||||||
@@ -78,57 +90,35 @@ suspend fun <T> safelyWithContextExceptionHandler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* It will run [block] inside of [supervisorScope] to avoid problems with catching of exceptions
|
* Calls [runCatchingSafely] and getting the result via [Result.getOrThrow]
|
||||||
*
|
*
|
||||||
* Priorities of [ExceptionHandler]s:
|
* @see runCatchingSafely
|
||||||
*
|
|
||||||
* * [onException] In case if custom (will be used anyway if not [defaultSafelyExceptionHandler])
|
|
||||||
* * [CoroutineContext.get] with [SafelyExceptionHandlerKey] as key
|
|
||||||
* * [defaultSafelyExceptionHandler]
|
|
||||||
*
|
|
||||||
* Remember, that [ExceptionHandler] from [CoroutineContext.get] will be used anyway if it is available. After it will
|
|
||||||
* be called [onException]
|
|
||||||
*
|
|
||||||
* @param [onException] Will be called when happen exception inside of [block]. By default will throw exception - this
|
|
||||||
* exception will be available for catching
|
|
||||||
*
|
|
||||||
* @see defaultSafelyExceptionHandler
|
|
||||||
* @see safelyWithoutExceptions
|
|
||||||
* @see safelyWithContextExceptionHandler
|
|
||||||
*/
|
*/
|
||||||
suspend fun <T> safely(
|
suspend inline fun <T> safely(
|
||||||
onException: ExceptionHandler<T> = defaultSafelyExceptionHandler,
|
onException: ExceptionHandler<T>,
|
||||||
block: suspend CoroutineScope.() -> T
|
block: suspend () -> T
|
||||||
): T {
|
): T = runCatchingSafely(onException, block).getOrThrow()
|
||||||
return try {
|
|
||||||
supervisorScope(block)
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
coroutineContext[ContextSafelyExceptionHandlerKey] ?.handler ?.invoke(e)
|
|
||||||
onException(e)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun <T> runCatchingSafely(
|
/**
|
||||||
onException: ExceptionHandler<T> = defaultSafelyExceptionHandler,
|
* Calls [safely] with passing of [defaultSafelyExceptionHandler] as `onException`
|
||||||
block: suspend CoroutineScope.() -> T
|
*
|
||||||
): Result<T> = runCatching {
|
* @see runCatchingSafely
|
||||||
safely(onException, block)
|
*/
|
||||||
}
|
suspend inline fun <T> safely(
|
||||||
|
block: suspend () -> T
|
||||||
suspend fun <T, R> T.runCatchingSafely(
|
): T = safely(defaultSafelyExceptionHandler, block)
|
||||||
onException: ExceptionHandler<R> = defaultSafelyExceptionHandler,
|
suspend inline fun <T, R> R.safely(
|
||||||
block: suspend T.() -> R
|
block: suspend R.() -> T
|
||||||
): Result<R> = runCatching {
|
): T = safely<T> { block() }
|
||||||
safely(onException) { block() }
|
|
||||||
}
|
|
||||||
|
|
||||||
|
@Deprecated("Renamed", ReplaceWith("runCatchingSafely(block)", "dev.inmo.micro_utils.coroutines.runCatchingSafely"))
|
||||||
suspend fun <T> safelyWithResult(
|
suspend fun <T> safelyWithResult(
|
||||||
block: suspend CoroutineScope.() -> T
|
block: suspend () -> T
|
||||||
): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block)
|
): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block)
|
||||||
|
@Deprecated("Renamed", ReplaceWith("this.runCatchingSafely(block)", "dev.inmo.micro_utils.coroutines.runCatchingSafely"))
|
||||||
suspend fun <T, R> T.safelyWithResult(
|
suspend fun <T, R> R.safelyWithResult(
|
||||||
block: suspend T.() -> R
|
block: suspend R.() -> T
|
||||||
): Result<R> = runCatchingSafely(defaultSafelyExceptionHandler, block)
|
): Result<T> = safelyWithResult<T> { block() }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use this handler in cases you wish to include handling of exceptions by [defaultSafelyWithoutExceptionHandler] and
|
* Use this handler in cases you wish to include handling of exceptions by [defaultSafelyWithoutExceptionHandler] and
|
||||||
@@ -148,18 +138,20 @@ val defaultSafelyWithoutExceptionHandlerWithNull: ExceptionHandler<Nothing?> = {
|
|||||||
* result from exception (instead of throwing it, by default always returns null)
|
* result from exception (instead of throwing it, by default always returns null)
|
||||||
*/
|
*/
|
||||||
suspend fun <T> safelyWithoutExceptions(
|
suspend fun <T> safelyWithoutExceptions(
|
||||||
onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull,
|
onException: ExceptionHandler<T> = defaultSafelyExceptionHandler,
|
||||||
block: suspend CoroutineScope.() -> T
|
block: suspend () -> T
|
||||||
): T? = safely(onException, block)
|
): T? = runCatchingSafely(onException, block).getOrNull()
|
||||||
|
|
||||||
suspend fun <T> runCatchingSafelyWithoutExceptions(
|
suspend fun <T> runCatchingSafelyWithoutExceptions(
|
||||||
onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull,
|
onException: ExceptionHandler<T?> = defaultSafelyExceptionHandler,
|
||||||
block: suspend CoroutineScope.() -> T
|
block: suspend () -> T
|
||||||
): Result<T?> = runCatching {
|
): Result<T?> = runCatchingSafely(onException, block).let {
|
||||||
safelyWithoutExceptions(onException, block)
|
if (it.isFailure) return Result.success<T?>(null)
|
||||||
|
|
||||||
|
it
|
||||||
}
|
}
|
||||||
|
|
||||||
fun CoroutineScope(
|
fun CoroutineScopeWithDefaultFallback(
|
||||||
context: CoroutineContext,
|
context: CoroutineContext,
|
||||||
defaultExceptionsHandler: ExceptionHandler<Unit>
|
defaultExceptionsHandler: ExceptionHandler<Unit>
|
||||||
) = CoroutineScope(
|
) = CoroutineScope(
|
||||||
|
@@ -0,0 +1,64 @@
|
|||||||
|
package dev.inmo.micro_utils.coroutines
|
||||||
|
|
||||||
|
import kotlinx.coroutines.*
|
||||||
|
import kotlin.coroutines.*
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trying to [Job.join] on all [this] [Job]s. The first [Job] completed its work will interrupt all others joins
|
||||||
|
* and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Job]s
|
||||||
|
*
|
||||||
|
* @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it
|
||||||
|
*/
|
||||||
|
suspend fun Iterable<Job>.joinFirst(
|
||||||
|
scope: CoroutineScope,
|
||||||
|
cancelOthers: Boolean = true
|
||||||
|
): Job {
|
||||||
|
val resultDeferred = CompletableDeferred<Job>()
|
||||||
|
val scope = scope.LinkedSupervisorScope()
|
||||||
|
forEach {
|
||||||
|
scope.launch {
|
||||||
|
it.join()
|
||||||
|
resultDeferred.complete(it)
|
||||||
|
scope.cancel()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return resultDeferred.await().also {
|
||||||
|
if (cancelOthers) {
|
||||||
|
forEach {
|
||||||
|
runCatchingSafely { it.cancel() }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/**
|
||||||
|
* Trying to [Job.join] on all [this] [Job]s. The first [Job] completed its work will interrupt all others joins
|
||||||
|
* and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Job]s
|
||||||
|
*
|
||||||
|
* Creates [CoroutineScope] using [coroutineContext] for internal purposes
|
||||||
|
*/
|
||||||
|
suspend fun Iterable<Job>.joinFirst(
|
||||||
|
cancelOthers: Boolean = true
|
||||||
|
): Job = joinFirst(CoroutineScope(coroutineContext), cancelOthers)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trying to [Job.join] on all [jobs]. The first [Job] completed its work will interrupt all others joins
|
||||||
|
* and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Job]s
|
||||||
|
*
|
||||||
|
* @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it
|
||||||
|
*/
|
||||||
|
suspend fun joinFirst(
|
||||||
|
vararg jobs: Job,
|
||||||
|
scope: CoroutineScope,
|
||||||
|
cancelOthers: Boolean = true
|
||||||
|
): Job = jobs.toList().joinFirst(scope, cancelOthers)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Trying to [Job.join] on all [jobs]. The first [Job] completed its work will interrupt all others joins
|
||||||
|
* and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Job]s
|
||||||
|
*
|
||||||
|
* Creates [CoroutineScope] using [coroutineContext] for internal purposes
|
||||||
|
*/
|
||||||
|
suspend fun joinFirst(
|
||||||
|
vararg jobs: Job,
|
||||||
|
cancelOthers: Boolean = true
|
||||||
|
): Job = joinFirst(*jobs, scope = CoroutineScope(coroutineContext), cancelOthers = cancelOthers)
|
@@ -10,7 +10,9 @@ fun CoroutineScope.launchSafely(
|
|||||||
onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler,
|
onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler,
|
||||||
block: suspend CoroutineScope.() -> Unit
|
block: suspend CoroutineScope.() -> Unit
|
||||||
) = launch(context, start) {
|
) = launch(context, start) {
|
||||||
safely(onException, block)
|
runCatchingSafely(onException) {
|
||||||
|
block()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun CoroutineScope.launchSafelyWithoutExceptions(
|
fun CoroutineScope.launchSafelyWithoutExceptions(
|
||||||
@@ -19,7 +21,9 @@ fun CoroutineScope.launchSafelyWithoutExceptions(
|
|||||||
onException: ExceptionHandler<Unit?> = defaultSafelyWithoutExceptionHandlerWithNull,
|
onException: ExceptionHandler<Unit?> = defaultSafelyWithoutExceptionHandlerWithNull,
|
||||||
block: suspend CoroutineScope.() -> Unit
|
block: suspend CoroutineScope.() -> Unit
|
||||||
) = launch(context, start) {
|
) = launch(context, start) {
|
||||||
safelyWithoutExceptions(onException, block)
|
runCatchingSafelyWithoutExceptions(onException) {
|
||||||
|
block()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun <T> CoroutineScope.asyncSafely(
|
fun <T> CoroutineScope.asyncSafely(
|
||||||
@@ -28,7 +32,9 @@ fun <T> CoroutineScope.asyncSafely(
|
|||||||
onException: ExceptionHandler<T> = defaultSafelyExceptionHandler,
|
onException: ExceptionHandler<T> = defaultSafelyExceptionHandler,
|
||||||
block: suspend CoroutineScope.() -> T
|
block: suspend CoroutineScope.() -> T
|
||||||
) = async(context, start) {
|
) = async(context, start) {
|
||||||
safely(onException, block)
|
runCatchingSafely(onException) {
|
||||||
|
block()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun <T> CoroutineScope.asyncSafelyWithoutExceptions(
|
fun <T> CoroutineScope.asyncSafelyWithoutExceptions(
|
||||||
@@ -37,5 +43,7 @@ fun <T> CoroutineScope.asyncSafelyWithoutExceptions(
|
|||||||
onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull,
|
onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull,
|
||||||
block: suspend CoroutineScope.() -> T
|
block: suspend CoroutineScope.() -> T
|
||||||
) = async(context, start) {
|
) = async(context, start) {
|
||||||
safelyWithoutExceptions(onException, block)
|
runCatchingSafelyWithoutExceptions(onException) {
|
||||||
|
block()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -13,7 +13,7 @@ import kotlin.contracts.contract
|
|||||||
* * [unlockWrite] will just unlock [writeMutex]
|
* * [unlockWrite] will just unlock [writeMutex]
|
||||||
*/
|
*/
|
||||||
class SmartRWLocker(private val readPermits: Int = Int.MAX_VALUE, writeIsLocked: Boolean = false) {
|
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)
|
private val _writeMutex = SmartMutex.Mutable(locked = writeIsLocked)
|
||||||
|
|
||||||
val readSemaphore: SmartSemaphore.Immutable = _readSemaphore.immutable()
|
val readSemaphore: SmartSemaphore.Immutable = _readSemaphore.immutable()
|
||||||
|
@@ -10,8 +10,12 @@ fun CoroutineScope.LinkedSupervisorJob(
|
|||||||
additionalContext: CoroutineContext? = null
|
additionalContext: CoroutineContext? = null
|
||||||
) = coroutineContext.LinkedSupervisorJob(additionalContext)
|
) = coroutineContext.LinkedSupervisorJob(additionalContext)
|
||||||
|
|
||||||
fun CoroutineScope.LinkedSupervisorScope(
|
|
||||||
|
fun CoroutineContext.LinkedSupervisorScope(
|
||||||
additionalContext: CoroutineContext? = null
|
additionalContext: CoroutineContext? = null
|
||||||
) = CoroutineScope(
|
) = CoroutineScope(
|
||||||
coroutineContext + LinkedSupervisorJob(additionalContext)
|
this + LinkedSupervisorJob(additionalContext)
|
||||||
)
|
)
|
||||||
|
fun CoroutineScope.LinkedSupervisorScope(
|
||||||
|
additionalContext: CoroutineContext? = null
|
||||||
|
) = coroutineContext.LinkedSupervisorScope(additionalContext)
|
||||||
|
@@ -4,28 +4,71 @@ import kotlinx.coroutines.*
|
|||||||
import kotlin.coroutines.CoroutineContext
|
import kotlin.coroutines.CoroutineContext
|
||||||
import kotlin.coroutines.EmptyCoroutineContext
|
import kotlin.coroutines.EmptyCoroutineContext
|
||||||
|
|
||||||
private fun CoroutineScope.createWeakSubScope() = CoroutineScope(coroutineContext.minusKey(Job)).also { newScope ->
|
/**
|
||||||
coroutineContext.job.invokeOnCompletion { newScope.cancel() }
|
* Created [CoroutineScope] which will [launch] listening of [context] job completing and drop itself. Current weak
|
||||||
|
* scope **will not** be attached to [context] directly. So, this [CoroutineScope] will not prevent parent one from
|
||||||
|
* cancelling if it is launched with [supervisorScope] or [coroutineScope], but still will follow closing status
|
||||||
|
* of parent [Job]
|
||||||
|
*/
|
||||||
|
fun WeakScope(
|
||||||
|
context: CoroutineContext
|
||||||
|
) = CoroutineScope(context.minusKey(Job) + Job()).also { newScope ->
|
||||||
|
newScope.launch {
|
||||||
|
context.job.join()
|
||||||
|
newScope.cancel()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun CoroutineScope.weakLaunch(
|
/**
|
||||||
|
* Created [CoroutineScope] which will [launch] listening of [scope] [CoroutineContext] job completing and drop itself. Current weak
|
||||||
|
* scope **will not** be attached to [scope] [CoroutineContext] directly. So, this [CoroutineScope] will not prevent parent one from
|
||||||
|
* cancelling if it is launched with [supervisorScope] or [coroutineScope], but still will follow closing status
|
||||||
|
* of parent [Job]
|
||||||
|
*/
|
||||||
|
fun WeakScope(
|
||||||
|
scope: CoroutineScope
|
||||||
|
) = WeakScope(scope.coroutineContext)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* [this] [CoroutineScope] will be used as base for [WeakScope]. Other parameters ([context], [start], [block])
|
||||||
|
* will be used to [launch] [Job]
|
||||||
|
*/
|
||||||
|
fun CoroutineScope.launchWeak(
|
||||||
context: CoroutineContext = EmptyCoroutineContext,
|
context: CoroutineContext = EmptyCoroutineContext,
|
||||||
start: CoroutineStart = CoroutineStart.DEFAULT,
|
start: CoroutineStart = CoroutineStart.DEFAULT,
|
||||||
block: suspend CoroutineScope.() -> Unit
|
block: suspend CoroutineScope.() -> Unit
|
||||||
): Job {
|
): Job {
|
||||||
val scope = createWeakSubScope()
|
val scope = WeakScope(this)
|
||||||
val job = scope.launch(context, start, block)
|
val job = scope.launch(context, start, block)
|
||||||
job.invokeOnCompletion { scope.cancel() }
|
job.invokeOnCompletion { scope.cancel() }
|
||||||
return job
|
return job
|
||||||
}
|
}
|
||||||
|
|
||||||
fun <T> CoroutineScope.weakAsync(
|
/**
|
||||||
|
* [this] [CoroutineScope] will be used as base for [WeakScope]. Other parameters ([context], [start], [block])
|
||||||
|
* will be used to create [async] [Deferred]
|
||||||
|
*/
|
||||||
|
fun <T> CoroutineScope.asyncWeak(
|
||||||
context: CoroutineContext = EmptyCoroutineContext,
|
context: CoroutineContext = EmptyCoroutineContext,
|
||||||
start: CoroutineStart = CoroutineStart.DEFAULT,
|
start: CoroutineStart = CoroutineStart.DEFAULT,
|
||||||
block: suspend CoroutineScope.() -> T
|
block: suspend CoroutineScope.() -> T
|
||||||
): Deferred<T> {
|
): Deferred<T> {
|
||||||
val scope = createWeakSubScope()
|
val scope = WeakScope(this)
|
||||||
val deferred = scope.async(context, start, block)
|
val deferred = scope.async(context, start, block)
|
||||||
deferred.invokeOnCompletion { scope.cancel() }
|
deferred.invokeOnCompletion { scope.cancel() }
|
||||||
return deferred
|
return deferred
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated("Renamed", ReplaceWith("launchWeak(context, start, block)", "dev.inmo.micro_utils.coroutines.launchWeak"))
|
||||||
|
fun CoroutineScope.weakLaunch(
|
||||||
|
context: CoroutineContext = EmptyCoroutineContext,
|
||||||
|
start: CoroutineStart = CoroutineStart.DEFAULT,
|
||||||
|
block: suspend CoroutineScope.() -> Unit
|
||||||
|
): Job = launchWeak(context, start, block)
|
||||||
|
|
||||||
|
@Deprecated("Renamed", ReplaceWith("asyncWeak(context, start, block)", "dev.inmo.micro_utils.coroutines.asyncWeak"))
|
||||||
|
fun <T> CoroutineScope.weakAsync(
|
||||||
|
context: CoroutineContext = EmptyCoroutineContext,
|
||||||
|
start: CoroutineStart = CoroutineStart.DEFAULT,
|
||||||
|
block: suspend CoroutineScope.() -> T
|
||||||
|
): Deferred<T> = asyncWeak(context, start, block)
|
||||||
|
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) }
|
||||||
|
}
|
||||||
|
}
|
64
coroutines/src/commonTest/kotlin/WeakJobTests.kt
Normal file
64
coroutines/src/commonTest/kotlin/WeakJobTests.kt
Normal file
@@ -0,0 +1,64 @@
|
|||||||
|
import dev.inmo.micro_utils.coroutines.asyncWeak
|
||||||
|
import dev.inmo.micro_utils.coroutines.launchWeak
|
||||||
|
import kotlinx.coroutines.*
|
||||||
|
import kotlinx.coroutines.test.runTest
|
||||||
|
import kotlin.test.Test
|
||||||
|
import kotlin.test.assertTrue
|
||||||
|
|
||||||
|
class WeakJobTests {
|
||||||
|
@Test
|
||||||
|
fun testWeakJob() = runTest {
|
||||||
|
var commonJobDone = false
|
||||||
|
var weakJobStarted = false
|
||||||
|
try {
|
||||||
|
coroutineScope {
|
||||||
|
launch {
|
||||||
|
delay(1000)
|
||||||
|
commonJobDone = true
|
||||||
|
}
|
||||||
|
asyncWeak {
|
||||||
|
weakJobStarted = true
|
||||||
|
delay(100500L)
|
||||||
|
error("This must never happen")
|
||||||
|
}
|
||||||
|
}.await()
|
||||||
|
} catch (error: Throwable) {
|
||||||
|
assertTrue(error is CancellationException)
|
||||||
|
assertTrue(commonJobDone)
|
||||||
|
assertTrue(weakJobStarted)
|
||||||
|
return@runTest
|
||||||
|
}
|
||||||
|
error("Cancellation exception has not been thrown")
|
||||||
|
}
|
||||||
|
@Test
|
||||||
|
fun testThatWeakJobsWorksCorrectly() = runTest {
|
||||||
|
val scope = CoroutineScope(Dispatchers.Default)
|
||||||
|
lateinit var weakLaunchJob: Job
|
||||||
|
lateinit var weakAsyncJob: Job
|
||||||
|
val completeDeferred = Job()
|
||||||
|
coroutineScope {
|
||||||
|
weakLaunchJob = launchWeak {
|
||||||
|
while (isActive) {
|
||||||
|
delay(100L)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
weakAsyncJob = asyncWeak {
|
||||||
|
while (isActive) {
|
||||||
|
delay(100L)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
coroutineContext.job.invokeOnCompletion {
|
||||||
|
scope.launch {
|
||||||
|
delay(1000L)
|
||||||
|
completeDeferred.complete()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
launch { delay(1000L); cancel() }
|
||||||
|
}
|
||||||
|
completeDeferred.join()
|
||||||
|
|
||||||
|
assertTrue(!weakLaunchJob.isActive)
|
||||||
|
assertTrue(!weakAsyncJob.isActive)
|
||||||
|
}
|
||||||
|
}
|
@@ -1,40 +0,0 @@
|
|||||||
package dev.inmo.micro_utils.coroutines
|
|
||||||
|
|
||||||
import kotlinx.coroutines.*
|
|
||||||
import org.junit.Test
|
|
||||||
|
|
||||||
class WeakJob {
|
|
||||||
@Test
|
|
||||||
fun `test that weak jobs works correctly`() {
|
|
||||||
val scope = CoroutineScope(Dispatchers.Default)
|
|
||||||
lateinit var weakLaunchJob: Job
|
|
||||||
lateinit var weakAsyncJob: Job
|
|
||||||
scope.launchSynchronously {
|
|
||||||
val completeDeferred = Job()
|
|
||||||
coroutineScope {
|
|
||||||
weakLaunchJob = weakLaunch {
|
|
||||||
while (isActive) {
|
|
||||||
delay(100L)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
weakAsyncJob = weakAsync {
|
|
||||||
while (isActive) {
|
|
||||||
delay(100L)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
coroutineContext.job.invokeOnCompletion {
|
|
||||||
scope.launch {
|
|
||||||
delay(1000L)
|
|
||||||
completeDeferred.complete()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
launch { delay(1000L); cancel() }
|
|
||||||
}
|
|
||||||
completeDeferred.join()
|
|
||||||
}
|
|
||||||
|
|
||||||
assert(!weakLaunchJob.isActive)
|
|
||||||
assert(!weakAsyncJob.isActive)
|
|
||||||
}
|
|
||||||
}
|
|
@@ -4,7 +4,7 @@ plugins {
|
|||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
@@ -130,4 +130,4 @@ tasks.dokkaHtml {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$defaultAndroidSettingsPresetPath"
|
apply from: "$defaultAndroidSettings"
|
||||||
|
@@ -1,42 +1,32 @@
|
|||||||
allprojects {
|
File templatesFolder = new File("$rootProject.projectDir.absolutePath${File.separatorChar}gradle${File.separatorChar}templates")
|
||||||
ext {
|
|
||||||
projectByName = { name ->
|
|
||||||
for (subproject in rootProject.subprojects) {
|
|
||||||
if (subproject.name == name) {
|
|
||||||
return subproject
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
internalProject = { name ->
|
Map properties = new HashMap<String, String>()
|
||||||
// if (releaseMode) {
|
|
||||||
// "$group:$name:$version"
|
|
||||||
// } else {
|
|
||||||
// projectByName("$name")
|
|
||||||
// }
|
|
||||||
projectByName("$name")
|
|
||||||
}
|
|
||||||
|
|
||||||
releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true"
|
if (templatesFolder.exists() && templatesFolder.isDirectory()) {
|
||||||
// String compilerPluginVersionFromProperties = (String) project.properties["compose.kotlinCompilerPluginVersion"]
|
templatesFolder.listFiles().each {
|
||||||
// String compilerPluginVersionFromLibrariesVersions = libs.versions.compose.kotlin.get()
|
properties[it.name - ".gradle"] = it.absolutePath
|
||||||
// composePluginKotlinVersion = compilerPluginVersionFromProperties
|
}
|
||||||
// if (compilerPluginVersionFromProperties == null) {
|
}
|
||||||
// composePluginKotlinVersion = compilerPluginVersionFromLibrariesVersions
|
|
||||||
// }
|
properties["projectByName"] = { name ->
|
||||||
|
for (subproject in rootProject.subprojects) {
|
||||||
mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsAndroidProject.gradle"
|
if (subproject.name == name) {
|
||||||
mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle"
|
return subproject
|
||||||
mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle"
|
}
|
||||||
mppJvmJsLinuxMingwProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwProject.gradle"
|
}
|
||||||
mppJvmJsLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwLinuxArm64Project.gradle"
|
return null
|
||||||
mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle"
|
}
|
||||||
mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle"
|
|
||||||
|
properties["internalProject"] = { name ->
|
||||||
defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"
|
projectByName("$name")
|
||||||
|
}
|
||||||
publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
|
|
||||||
publishJvmOnlyPath = "${rootProject.projectDir.absolutePath}/jvm.publish.gradle"
|
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"
|
id "com.android.library"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
@@ -1,7 +1,6 @@
|
|||||||
package dev.inmo.micro_utils.fsm.common
|
package dev.inmo.micro_utils.fsm.common
|
||||||
|
|
||||||
import dev.inmo.micro_utils.common.Optional
|
import dev.inmo.micro_utils.common.Optional
|
||||||
import dev.inmo.micro_utils.common.onPresented
|
|
||||||
import dev.inmo.micro_utils.coroutines.*
|
import dev.inmo.micro_utils.coroutines.*
|
||||||
import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler
|
import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler
|
||||||
import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler
|
import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler
|
||||||
@@ -118,23 +117,28 @@ open class DefaultStatesMachine <T: State>(
|
|||||||
* [launchStateHandling] will returns some [State] then [statesManager] [StatesManager.update] will be used, otherwise
|
* [launchStateHandling] will returns some [State] then [statesManager] [StatesManager.update] will be used, otherwise
|
||||||
* [StatesManager.endChain].
|
* [StatesManager.endChain].
|
||||||
*/
|
*/
|
||||||
override fun start(scope: CoroutineScope): Job = scope.launchSafelyWithoutExceptions {
|
override fun start(scope: CoroutineScope): Job {
|
||||||
(statesManager.getActiveStates().asFlow() + statesManager.onStartChain).subscribeSafelyWithoutExceptions(this) {
|
val supervisorScope = scope.LinkedSupervisorScope()
|
||||||
launch { performStateUpdate(Optional.absent(), it, scope.LinkedSupervisorScope()) }
|
supervisorScope.launchSafelyWithoutExceptions {
|
||||||
}
|
(statesManager.getActiveStates().asFlow() + statesManager.onStartChain).subscribeSafelyWithoutExceptions(supervisorScope) {
|
||||||
statesManager.onChainStateUpdated.subscribeSafelyWithoutExceptions(this) {
|
supervisorScope.launch { performStateUpdate(Optional.absent(), it, supervisorScope) }
|
||||||
launch { performStateUpdate(Optional.presented(it.first), it.second, scope.LinkedSupervisorScope()) }
|
}
|
||||||
}
|
statesManager.onChainStateUpdated.subscribeSafelyWithoutExceptions(supervisorScope) {
|
||||||
statesManager.onEndChain.subscribeSafelyWithoutExceptions(this) { removedState ->
|
supervisorScope.launch { performStateUpdate(Optional.presented(it.first), it.second, supervisorScope) }
|
||||||
launch {
|
}
|
||||||
statesJobsMutex.withLock {
|
statesManager.onEndChain.subscribeSafelyWithoutExceptions(supervisorScope) { removedState ->
|
||||||
val stateInMap = statesJobs.keys.firstOrNull { stateInMap -> stateInMap == removedState }
|
supervisorScope.launch {
|
||||||
if (stateInMap === removedState) {
|
statesJobsMutex.withLock {
|
||||||
statesJobs[stateInMap] ?.cancel()
|
val stateInMap = statesJobs.keys.firstOrNull { stateInMap -> stateInMap == removedState }
|
||||||
|
if (stateInMap === removedState) {
|
||||||
|
statesJobs[stateInMap] ?.cancel()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return supervisorScope.coroutineContext.job
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@@ -4,7 +4,7 @@ plugins {
|
|||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
@@ -15,5 +15,5 @@ crypto_js_version=4.1.1
|
|||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=0.20.50
|
version=0.23.2
|
||||||
android_code_version=256
|
android_code_version=278
|
||||||
|
@@ -1,45 +1,47 @@
|
|||||||
[versions]
|
[versions]
|
||||||
|
|
||||||
kt = "1.9.23"
|
kt = "2.1.0"
|
||||||
kt-serialization = "1.6.3"
|
kt-serialization = "1.7.3"
|
||||||
kt-coroutines = "1.8.1"
|
kt-coroutines = "1.9.0"
|
||||||
|
|
||||||
kslog = "1.3.4"
|
kslog = "1.3.6"
|
||||||
|
|
||||||
jb-compose = "1.6.2"
|
jb-compose = "1.7.1"
|
||||||
jb-exposed = "0.50.1"
|
jb-exposed = "0.57.0"
|
||||||
jb-dokka = "1.9.20"
|
jb-dokka = "1.9.20"
|
||||||
|
|
||||||
|
sqlite = "3.47.1.0"
|
||||||
|
|
||||||
korlibs = "5.4.0"
|
korlibs = "5.4.0"
|
||||||
uuid = "0.8.4"
|
uuid = "0.8.4"
|
||||||
|
|
||||||
ktor = "2.3.11"
|
ktor = "3.0.2"
|
||||||
|
|
||||||
gh-release = "2.5.2"
|
gh-release = "2.5.2"
|
||||||
|
|
||||||
koin = "3.5.6"
|
koin = "4.0.0"
|
||||||
|
|
||||||
okio = "3.9.0"
|
okio = "3.9.1"
|
||||||
|
|
||||||
ksp = "1.9.23-1.0.20"
|
ksp = "2.1.0-1.0.29"
|
||||||
kotlin-poet = "1.16.0"
|
kotlin-poet = "1.18.1"
|
||||||
|
|
||||||
versions = "0.51.0"
|
versions = "0.51.0"
|
||||||
|
|
||||||
android-gradle = "8.3.2"
|
android-gradle = "8.2.2"
|
||||||
dexcount = "4.0.0"
|
dexcount = "4.0.0"
|
||||||
|
|
||||||
android-coreKtx = "1.13.1"
|
android-coreKtx = "1.15.0"
|
||||||
android-recyclerView = "1.3.2"
|
android-recyclerView = "1.3.2"
|
||||||
android-appCompat = "1.6.1"
|
android-appCompat = "1.7.0"
|
||||||
android-fragment = "1.7.0"
|
android-fragment = "1.8.5"
|
||||||
android-espresso = "3.5.1"
|
android-espresso = "3.6.1"
|
||||||
android-test = "1.1.5"
|
android-test = "1.2.1"
|
||||||
android-compose-material3 = "1.2.1"
|
android-compose-material3 = "1.3.0"
|
||||||
|
|
||||||
android-props-minSdk = "21"
|
android-props-minSdk = "21"
|
||||||
android-props-compileSdk = "34"
|
android-props-compileSdk = "35"
|
||||||
android-props-buildTools = "34.0.0"
|
android-props-buildTools = "35.0.0"
|
||||||
|
|
||||||
[libraries]
|
[libraries]
|
||||||
|
|
||||||
@@ -52,6 +54,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 = { 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-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-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" }
|
ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" }
|
||||||
@@ -79,12 +82,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 = { 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-coreKtx = { module = "androidx.core:core-ktx", version.ref = "android-coreKtx" }
|
||||||
android-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "android-recyclerView" }
|
android-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "android-recyclerView" }
|
||||||
android-appCompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "android-appCompat" }
|
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-fragment = { module = "androidx.fragment:fragment", version.ref = "android-fragment" }
|
||||||
android-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "android-espresso" }
|
android-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "android-espresso" }
|
||||||
android-test-junit = { module = "androidx.test.ext:junit", version.ref = "android-test" }
|
android-test-junit = { module = "androidx.test.ext:junit", version.ref = "android-test" }
|
||||||
@@ -113,5 +118,6 @@ buildscript-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gra
|
|||||||
[plugins]
|
[plugins]
|
||||||
|
|
||||||
jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" }
|
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" }
|
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }
|
||||||
|
@@ -6,6 +6,7 @@ android {
|
|||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdkVersion libs.versions.android.props.minSdk.get().toInteger()
|
minSdkVersion libs.versions.android.props.minSdk.get().toInteger()
|
||||||
|
compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
|
||||||
targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
|
targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
|
||||||
versionCode "${android_code_version}".toInteger()
|
versionCode "${android_code_version}".toInteger()
|
||||||
versionName "$version"
|
versionName "$version"
|
@@ -1,7 +1,7 @@
|
|||||||
project.version = "$version"
|
project.version = "$version"
|
||||||
project.group = "$group"
|
project.group = "$group"
|
||||||
|
|
||||||
apply from: "$publishGradlePath"
|
apply from: "$publish"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
androidTarget {
|
androidTarget {
|
||||||
@@ -29,7 +29,7 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$defaultAndroidSettingsPresetPath"
|
apply from: "$defaultAndroidSettings"
|
||||||
|
|
||||||
java {
|
java {
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
sourceCompatibility = JavaVersion.VERSION_17
|
@@ -1,7 +1,7 @@
|
|||||||
project.version = "$version"
|
project.version = "$version"
|
||||||
project.group = "$group"
|
project.group = "$group"
|
||||||
|
|
||||||
apply from: "$publishGradlePath"
|
apply from: "$publish"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvm {
|
jvm {
|
||||||
@@ -12,8 +12,20 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
js (IR) {
|
js (IR) {
|
||||||
browser()
|
browser {
|
||||||
nodejs()
|
testTask {
|
||||||
|
useMocha {
|
||||||
|
timeout = "60000"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
nodejs {
|
||||||
|
testTask {
|
||||||
|
useMocha {
|
||||||
|
timeout = "60000"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
androidTarget {
|
androidTarget {
|
||||||
publishAllLibraryVariants()
|
publishAllLibraryVariants()
|
||||||
@@ -25,11 +37,13 @@ kotlin {
|
|||||||
}
|
}
|
||||||
linuxX64()
|
linuxX64()
|
||||||
mingwX64()
|
mingwX64()
|
||||||
|
linuxArm64()
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
commonMain {
|
commonMain {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation kotlin('stdlib')
|
implementation kotlin('stdlib')
|
||||||
|
implementation compose.runtime
|
||||||
api libs.kt.serialization
|
api libs.kt.serialization
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -40,40 +54,53 @@ kotlin {
|
|||||||
implementation libs.kt.coroutines.test
|
implementation libs.kt.coroutines.test
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
jvmTest {
|
|
||||||
dependencies {
|
|
||||||
implementation kotlin('test-junit')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
jsTest {
|
|
||||||
dependencies {
|
|
||||||
implementation kotlin('test-js')
|
|
||||||
implementation kotlin('test-junit')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
androidUnitTest {
|
androidUnitTest {
|
||||||
|
dependencies {
|
||||||
|
implementation kotlin('test-junit')
|
||||||
|
implementation libs.android.test.junit
|
||||||
|
implementation libs.android.espresso
|
||||||
|
implementation compose.uiTest
|
||||||
|
}
|
||||||
|
}
|
||||||
|
androidInstrumentedTest {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation kotlin('test-junit')
|
implementation kotlin('test-junit')
|
||||||
implementation libs.android.test.junit
|
implementation libs.android.test.junit
|
||||||
implementation libs.android.espresso
|
implementation libs.android.espresso
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mingwX64Test {
|
jvmMain {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation kotlin('test-junit')
|
implementation compose.desktop.currentOs
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
linuxX64Test {
|
jvmTest {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation kotlin('test-junit')
|
implementation kotlin('test-junit')
|
||||||
|
implementation compose.uiTest
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
jsMain {
|
||||||
|
dependencies {
|
||||||
|
implementation compose.web.core
|
||||||
|
}
|
||||||
|
}
|
||||||
|
jsTest {
|
||||||
|
dependencies {
|
||||||
|
implementation kotlin('test-js')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
nativeMain.dependsOn commonMain
|
||||||
|
linuxX64Main.dependsOn nativeMain
|
||||||
|
mingwX64Main.dependsOn nativeMain
|
||||||
|
linuxArm64Main.dependsOn nativeMain
|
||||||
|
|
||||||
androidMain.dependsOn jvmMain
|
androidMain.dependsOn jvmMain
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$defaultAndroidSettingsPresetPath"
|
apply from: "$defaultAndroidSettings"
|
||||||
|
|
||||||
java {
|
java {
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
sourceCompatibility = JavaVersion.VERSION_17
|
@@ -1,7 +1,7 @@
|
|||||||
project.version = "$version"
|
project.version = "$version"
|
||||||
project.group = "$group"
|
project.group = "$group"
|
||||||
|
|
||||||
apply from: "$publishGradlePath"
|
apply from: "$publish"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvm {
|
jvm {
|
@@ -1,7 +1,7 @@
|
|||||||
project.version = "$version"
|
project.version = "$version"
|
||||||
project.group = "$group"
|
project.group = "$group"
|
||||||
|
|
||||||
apply from: "$publishGradlePath"
|
apply from: "$publish"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvm {
|
jvm {
|
||||||
@@ -12,8 +12,20 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
js (IR) {
|
js (IR) {
|
||||||
browser()
|
browser {
|
||||||
nodejs()
|
testTask {
|
||||||
|
useMocha {
|
||||||
|
timeout = "60000"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
nodejs {
|
||||||
|
testTask {
|
||||||
|
useMocha {
|
||||||
|
timeout = "60000"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
androidTarget {
|
androidTarget {
|
||||||
publishAllLibraryVariants()
|
publishAllLibraryVariants()
|
||||||
@@ -36,7 +48,7 @@ kotlin {
|
|||||||
}
|
}
|
||||||
commonTest {
|
commonTest {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation kotlin('test-common')
|
implementation kotlin('test')
|
||||||
implementation kotlin('test-annotations-common')
|
implementation kotlin('test-annotations-common')
|
||||||
implementation libs.kt.coroutines.test
|
implementation libs.kt.coroutines.test
|
||||||
}
|
}
|
||||||
@@ -57,7 +69,6 @@ kotlin {
|
|||||||
jsTest {
|
jsTest {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation kotlin('test-js')
|
implementation kotlin('test-js')
|
||||||
implementation kotlin('test-junit')
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
nativeMain.dependsOn commonMain
|
nativeMain.dependsOn commonMain
|
||||||
@@ -69,7 +80,7 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$defaultAndroidSettingsPresetPath"
|
apply from: "$defaultAndroidSettings"
|
||||||
|
|
||||||
java {
|
java {
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
sourceCompatibility = JavaVersion.VERSION_17
|
@@ -1,7 +1,7 @@
|
|||||||
project.version = "$version"
|
project.version = "$version"
|
||||||
project.group = "$group"
|
project.group = "$group"
|
||||||
|
|
||||||
apply from: "$publishGradlePath"
|
apply from: "$publish"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvm {
|
jvm {
|
||||||
@@ -12,8 +12,20 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
js (IR) {
|
js (IR) {
|
||||||
browser()
|
browser {
|
||||||
nodejs()
|
testTask {
|
||||||
|
useMocha {
|
||||||
|
timeout = "60000"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
nodejs {
|
||||||
|
testTask {
|
||||||
|
useMocha {
|
||||||
|
timeout = "60000"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
linuxX64()
|
linuxX64()
|
||||||
mingwX64()
|
mingwX64()
|
||||||
@@ -41,17 +53,6 @@ kotlin {
|
|||||||
jsTest {
|
jsTest {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation kotlin('test-js')
|
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.version = "$version"
|
||||||
project.group = "$group"
|
project.group = "$group"
|
||||||
|
|
||||||
apply from: "$publishGradlePath"
|
apply from: "$publish"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
jvm {
|
jvm {
|
||||||
@@ -12,8 +12,20 @@ kotlin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
js (IR) {
|
js (IR) {
|
||||||
browser()
|
browser {
|
||||||
nodejs()
|
testTask {
|
||||||
|
useMocha {
|
||||||
|
timeout = "60000"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
nodejs {
|
||||||
|
testTask {
|
||||||
|
useMocha {
|
||||||
|
timeout = "60000"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
androidTarget {
|
androidTarget {
|
||||||
publishAllLibraryVariants()
|
publishAllLibraryVariants()
|
||||||
@@ -58,7 +70,6 @@ kotlin {
|
|||||||
jsTest {
|
jsTest {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation kotlin('test-js')
|
implementation kotlin('test-js')
|
||||||
implementation kotlin('test-junit')
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
androidUnitTest {
|
androidUnitTest {
|
||||||
@@ -69,17 +80,10 @@ kotlin {
|
|||||||
implementation compose.uiTest
|
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 {
|
java {
|
||||||
sourceCompatibility = JavaVersion.VERSION_17
|
sourceCompatibility = JavaVersion.VERSION_17
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
@@ -4,7 +4,7 @@ plugins {
|
|||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppProjectWithSerializationPresetPath"
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
@@ -2,7 +2,7 @@ plugins {
|
|||||||
id "org.jetbrains.kotlin.jvm"
|
id "org.jetbrains.kotlin.jvm"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$publishJvmOnlyPath"
|
apply from: "$publish_jvm"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
mavenCentral()
|
mavenCentral()
|
||||||
|
@@ -5,7 +5,7 @@ plugins {
|
|||||||
id "com.google.devtools.ksp"
|
id "com.google.devtools.ksp"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppProjectWithSerializationPresetPath"
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
|
7
ksp/classcasts/build.gradle
Normal file
7
ksp/classcasts/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"
|
21
ksp/classcasts/generator/build.gradle
Normal file
21
ksp/classcasts/generator/build.gradle
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
plugins {
|
||||||
|
id "org.jetbrains.kotlin.jvm"
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: "$publish_jvm"
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
api project(":micro_utils.ksp.generator")
|
||||||
|
api project(":micro_utils.ksp.classcasts")
|
||||||
|
api libs.kotlin.poet
|
||||||
|
api libs.ksp
|
||||||
|
}
|
||||||
|
|
||||||
|
java {
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
|
}
|
90
ksp/classcasts/generator/src/main/kotlin/ClassCastsFiller.kt
Normal file
90
ksp/classcasts/generator/src/main/kotlin/ClassCastsFiller.kt
Normal file
@@ -0,0 +1,90 @@
|
|||||||
|
package dev.inmo.micro_utils.ksp.classcasts.generator
|
||||||
|
|
||||||
|
import com.google.devtools.ksp.symbol.ClassKind
|
||||||
|
import com.google.devtools.ksp.symbol.KSClassDeclaration
|
||||||
|
import com.squareup.kotlinpoet.*
|
||||||
|
import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
|
||||||
|
import com.squareup.kotlinpoet.ksp.toClassName
|
||||||
|
import com.squareup.kotlinpoet.ksp.toTypeName
|
||||||
|
|
||||||
|
|
||||||
|
private fun FileSpec.Builder.addTopLevelImport(className: ClassName) {
|
||||||
|
className.topLevelClassName().let {
|
||||||
|
addImport(it.packageName, it.simpleNames)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun FileSpec.Builder.createTypeDefinition(ksClassDeclaration: KSClassDeclaration): TypeName {
|
||||||
|
val className = ksClassDeclaration.toClassName()
|
||||||
|
return if (ksClassDeclaration.typeParameters.isNotEmpty()) {
|
||||||
|
className.parameterizedBy(
|
||||||
|
ksClassDeclaration.typeParameters.map {
|
||||||
|
it.bounds.first().resolve().also {
|
||||||
|
val typeClassName = it.toClassName()
|
||||||
|
addTopLevelImport(typeClassName)
|
||||||
|
}.toTypeName()
|
||||||
|
}
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
className
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun FileSpec.Builder.fill(
|
||||||
|
sourceKSClassDeclaration: KSClassDeclaration,
|
||||||
|
subtypes: Set<KSClassDeclaration>
|
||||||
|
) {
|
||||||
|
subtypes.forEach { targetClassDeclaration ->
|
||||||
|
val sourceClassName = sourceKSClassDeclaration.toClassName()
|
||||||
|
val targetClassClassName = targetClassDeclaration.toClassName()
|
||||||
|
val targetClassTypeDefinition = createTypeDefinition(targetClassDeclaration)
|
||||||
|
val simpleName = targetClassDeclaration.simpleName.asString()
|
||||||
|
val withFirstLowerCase = simpleName.replaceFirstChar { it.lowercase() }
|
||||||
|
val castedOrNullName = "${withFirstLowerCase}OrNull"
|
||||||
|
|
||||||
|
addTopLevelImport(targetClassClassName)
|
||||||
|
addFunction(
|
||||||
|
FunSpec.builder(castedOrNullName).apply {
|
||||||
|
receiver(sourceClassName)
|
||||||
|
addCode(
|
||||||
|
"return this as? %L",
|
||||||
|
targetClassTypeDefinition
|
||||||
|
)
|
||||||
|
returns(targetClassTypeDefinition.copy(nullable = true))
|
||||||
|
addModifiers(KModifier.INLINE)
|
||||||
|
}.build()
|
||||||
|
)
|
||||||
|
addFunction(
|
||||||
|
FunSpec.builder("${withFirstLowerCase}OrThrow").apply {
|
||||||
|
receiver(sourceClassName)
|
||||||
|
addCode(
|
||||||
|
"return this as %L",
|
||||||
|
targetClassTypeDefinition
|
||||||
|
)
|
||||||
|
returns(targetClassTypeDefinition)
|
||||||
|
addModifiers(KModifier.INLINE)
|
||||||
|
}.build()
|
||||||
|
)
|
||||||
|
addFunction(
|
||||||
|
FunSpec.builder("if$simpleName").apply {
|
||||||
|
val genericType = TypeVariableName("T", null)
|
||||||
|
addTypeVariable(genericType)
|
||||||
|
receiver(sourceClassName)
|
||||||
|
addParameter(
|
||||||
|
"block",
|
||||||
|
LambdaTypeName.get(
|
||||||
|
null,
|
||||||
|
targetClassTypeDefinition,
|
||||||
|
returnType = genericType
|
||||||
|
)
|
||||||
|
)
|
||||||
|
addCode(
|
||||||
|
"return ${castedOrNullName}() ?.let(block)",
|
||||||
|
targetClassTypeDefinition
|
||||||
|
)
|
||||||
|
returns(genericType.copy(nullable = true))
|
||||||
|
addModifiers(KModifier.INLINE)
|
||||||
|
}.build()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
119
ksp/classcasts/generator/src/main/kotlin/Processor.kt
Normal file
119
ksp/classcasts/generator/src/main/kotlin/Processor.kt
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
package dev.inmo.micro_utils.ksp.classcasts.generator
|
||||||
|
|
||||||
|
import com.google.devtools.ksp.KspExperimental
|
||||||
|
import com.google.devtools.ksp.getAllSuperTypes
|
||||||
|
import com.google.devtools.ksp.getAnnotationsByType
|
||||||
|
import com.google.devtools.ksp.isAnnotationPresent
|
||||||
|
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.ksp.toClassName
|
||||||
|
import dev.inmo.micro_ksp.generator.writeFile
|
||||||
|
import dev.inmo.micro_utils.ksp.classcasts.ClassCastsExcluded
|
||||||
|
import dev.inmo.micro_utils.ksp.classcasts.ClassCastsIncluded
|
||||||
|
import java.io.File
|
||||||
|
|
||||||
|
class Processor(
|
||||||
|
private val codeGenerator: CodeGenerator
|
||||||
|
) : SymbolProcessor {
|
||||||
|
@OptIn(KspExperimental::class)
|
||||||
|
private fun FileSpec.Builder.generateClassCasts(
|
||||||
|
ksClassDeclaration: KSClassDeclaration,
|
||||||
|
resolver: Resolver
|
||||||
|
) {
|
||||||
|
val rootAnnotation = ksClassDeclaration.getAnnotationsByType(ClassCastsIncluded::class).first()
|
||||||
|
val (includeRegex: Regex?, excludeRegex: Regex?) = rootAnnotation.let {
|
||||||
|
it.typesRegex.takeIf { it.isNotEmpty() } ?.let(::Regex) to it.excludeRegex.takeIf { it.isNotEmpty() } ?.let(::Regex)
|
||||||
|
}
|
||||||
|
val classesSubtypes = mutableMapOf<KSClassDeclaration, MutableSet<KSClassDeclaration>>()
|
||||||
|
|
||||||
|
fun KSClassDeclaration.checkSupertypeLevel(levelsAllowed: Int?): Boolean {
|
||||||
|
val supertypes by lazy {
|
||||||
|
superTypes.map { it.resolve().declaration }
|
||||||
|
}
|
||||||
|
return when {
|
||||||
|
levelsAllowed == null -> true
|
||||||
|
levelsAllowed <= 0 -> false
|
||||||
|
supertypes.any { it == ksClassDeclaration } -> true
|
||||||
|
else -> supertypes.any {
|
||||||
|
(it as? KSClassDeclaration) ?.checkSupertypeLevel(levelsAllowed - 1) == true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun handleDeclaration(ksDeclarationContainer: KSDeclarationContainer) {
|
||||||
|
ksDeclarationContainer.declarations.forEach { potentialSubtype ->
|
||||||
|
val simpleName = potentialSubtype.simpleName.getShortName()
|
||||||
|
when {
|
||||||
|
potentialSubtype === ksClassDeclaration -> {}
|
||||||
|
potentialSubtype.isAnnotationPresent(ClassCastsExcluded::class) -> return@forEach
|
||||||
|
potentialSubtype !is KSClassDeclaration || !potentialSubtype.checkSupertypeLevel(rootAnnotation.levelsToInclude.takeIf { it >= 0 }) -> return@forEach
|
||||||
|
excludeRegex ?.matches(simpleName) == true -> return@forEach
|
||||||
|
includeRegex ?.matches(simpleName) == false -> {}
|
||||||
|
else -> classesSubtypes.getOrPut(ksClassDeclaration) { mutableSetOf() }.add(potentialSubtype)
|
||||||
|
}
|
||||||
|
handleDeclaration(potentialSubtype as? KSDeclarationContainer ?: return@forEach)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
resolver.getAllFiles().forEach {
|
||||||
|
handleDeclaration(it)
|
||||||
|
}
|
||||||
|
fun fillWithSealeds(current: KSClassDeclaration) {
|
||||||
|
current.getSealedSubclasses().forEach {
|
||||||
|
val simpleName = it.simpleName.getShortName()
|
||||||
|
if (
|
||||||
|
includeRegex ?.matches(simpleName) == false
|
||||||
|
|| excludeRegex ?.matches(simpleName) == true
|
||||||
|
|| it.isAnnotationPresent(ClassCastsExcluded::class)
|
||||||
|
) {
|
||||||
|
return@forEach
|
||||||
|
}
|
||||||
|
classesSubtypes.getOrPut(ksClassDeclaration) { mutableSetOf() }.add(it)
|
||||||
|
fillWithSealeds(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fillWithSealeds(ksClassDeclaration)
|
||||||
|
|
||||||
|
addAnnotation(
|
||||||
|
AnnotationSpec.builder(Suppress::class).apply {
|
||||||
|
addMember("\"unused\"")
|
||||||
|
addMember("\"RemoveRedundantQualifierName\"")
|
||||||
|
addMember("\"RedundantVisibilityModifier\"")
|
||||||
|
addMember("\"NOTHING_TO_INLINE\"")
|
||||||
|
addMember("\"UNCHECKED_CAST\"")
|
||||||
|
addMember("\"OPT_IN_USAGE\"")
|
||||||
|
useSiteTarget(AnnotationSpec.UseSiteTarget.FILE)
|
||||||
|
}.build()
|
||||||
|
)
|
||||||
|
fill(
|
||||||
|
ksClassDeclaration,
|
||||||
|
classesSubtypes.values.flatten().toSet()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@OptIn(KspExperimental::class)
|
||||||
|
override fun process(resolver: Resolver): List<KSAnnotated> {
|
||||||
|
(resolver.getSymbolsWithAnnotation(ClassCastsIncluded::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
|
||||||
|
val prefix = it.getAnnotationsByType(ClassCastsIncluded::class).first().outputFilePrefix
|
||||||
|
it.writeFile(prefix = prefix, suffix = "ClassCasts") {
|
||||||
|
FileSpec.builder(
|
||||||
|
it.packageName.asString(),
|
||||||
|
"${it.simpleName.getShortName()}ClassCasts"
|
||||||
|
).apply {
|
||||||
|
addFileComment(
|
||||||
|
"""
|
||||||
|
THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||||
|
TO REGENERATE IT JUST DELETE FILE
|
||||||
|
ORIGINAL FILE: ${it.containingFile ?.fileName}
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
generateClassCasts(it, resolver)
|
||||||
|
}.build()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return emptyList()
|
||||||
|
}
|
||||||
|
}
|
11
ksp/classcasts/generator/src/main/kotlin/Provider.kt
Normal file
11
ksp/classcasts/generator/src/main/kotlin/Provider.kt
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
package dev.inmo.micro_utils.ksp.classcasts.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.classcasts.generator.Provider
|
27
ksp/classcasts/generator/test/build.gradle
Normal file
27
ksp/classcasts/generator/test/build.gradle
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
plugins {
|
||||||
|
id "org.jetbrains.kotlin.multiplatform"
|
||||||
|
id "org.jetbrains.kotlin.plugin.serialization"
|
||||||
|
id "com.android.library"
|
||||||
|
id "com.google.devtools.ksp"
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
|
|
||||||
|
kotlin {
|
||||||
|
sourceSets {
|
||||||
|
commonMain {
|
||||||
|
dependencies {
|
||||||
|
api project(":micro_utils.ksp.classcasts")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
add("kspCommonMainMetadata", project(":micro_utils.ksp.classcasts.generator"))
|
||||||
|
}
|
||||||
|
|
||||||
|
ksp {
|
||||||
|
}
|
15
ksp/classcasts/generator/test/src/commonMain/kotlin/Test.kt
Normal file
15
ksp/classcasts/generator/test/src/commonMain/kotlin/Test.kt
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
package dev.inmo.micro_utils.ksp.classcasts.generator.test
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.ksp.classcasts.ClassCastsExcluded
|
||||||
|
import dev.inmo.micro_utils.ksp.classcasts.ClassCastsIncluded
|
||||||
|
|
||||||
|
@ClassCastsIncluded(levelsToInclude = 1)
|
||||||
|
sealed interface Test {
|
||||||
|
object A : Test
|
||||||
|
@ClassCastsExcluded
|
||||||
|
object B : Test // Will not be included in class casts due to annotation ClassCastsExcluded
|
||||||
|
object C : Test
|
||||||
|
interface D : Test {
|
||||||
|
object DD : D // Will not be included in class casts due to levelsToInclude
|
||||||
|
}
|
||||||
|
}
|
@@ -0,0 +1,40 @@
|
|||||||
|
// THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||||
|
// TO REGENERATE IT JUST DELETE FILE
|
||||||
|
// ORIGINAL FILE: Test.kt
|
||||||
|
@file:Suppress(
|
||||||
|
"unused",
|
||||||
|
"RemoveRedundantQualifierName",
|
||||||
|
"RedundantVisibilityModifier",
|
||||||
|
"NOTHING_TO_INLINE",
|
||||||
|
"UNCHECKED_CAST",
|
||||||
|
"OPT_IN_USAGE",
|
||||||
|
)
|
||||||
|
|
||||||
|
package dev.inmo.micro_utils.ksp.classcasts.generator.test
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.ksp.classcasts.generator.test.Test
|
||||||
|
import kotlin.Suppress
|
||||||
|
|
||||||
|
public inline fun Test.aOrNull(): Test.A? = this as?
|
||||||
|
dev.inmo.micro_utils.ksp.classcasts.generator.test.Test.A
|
||||||
|
|
||||||
|
public inline fun Test.aOrThrow(): Test.A = this as
|
||||||
|
dev.inmo.micro_utils.ksp.classcasts.generator.test.Test.A
|
||||||
|
|
||||||
|
public inline fun <T> Test.ifA(block: (Test.A) -> T): T? = aOrNull() ?.let(block)
|
||||||
|
|
||||||
|
public inline fun Test.cOrNull(): Test.C? = this as?
|
||||||
|
dev.inmo.micro_utils.ksp.classcasts.generator.test.Test.C
|
||||||
|
|
||||||
|
public inline fun Test.cOrThrow(): Test.C = this as
|
||||||
|
dev.inmo.micro_utils.ksp.classcasts.generator.test.Test.C
|
||||||
|
|
||||||
|
public inline fun <T> Test.ifC(block: (Test.C) -> T): T? = cOrNull() ?.let(block)
|
||||||
|
|
||||||
|
public inline fun Test.dOrNull(): Test.D? = this as?
|
||||||
|
dev.inmo.micro_utils.ksp.classcasts.generator.test.Test.D
|
||||||
|
|
||||||
|
public inline fun Test.dOrThrow(): Test.D = this as
|
||||||
|
dev.inmo.micro_utils.ksp.classcasts.generator.test.Test.D
|
||||||
|
|
||||||
|
public inline fun <T> Test.ifD(block: (Test.D) -> T): T? = dOrNull() ?.let(block)
|
@@ -0,0 +1,5 @@
|
|||||||
|
package dev.inmo.micro_utils.ksp.classcasts
|
||||||
|
|
||||||
|
@Target(AnnotationTarget.CLASS)
|
||||||
|
@Retention(AnnotationRetention.SOURCE)
|
||||||
|
annotation class ClassCastsExcluded
|
10
ksp/classcasts/src/commonMain/kotlin/ClassCastsIncluded.kt
Normal file
10
ksp/classcasts/src/commonMain/kotlin/ClassCastsIncluded.kt
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
package dev.inmo.micro_utils.ksp.classcasts
|
||||||
|
|
||||||
|
@Target(AnnotationTarget.CLASS)
|
||||||
|
@Retention(AnnotationRetention.SOURCE)
|
||||||
|
annotation class ClassCastsIncluded(
|
||||||
|
val typesRegex: String = "",
|
||||||
|
val excludeRegex: String = "",
|
||||||
|
val outputFilePrefix: String = "",
|
||||||
|
val levelsToInclude: Int = -1
|
||||||
|
)
|
20
ksp/generator/build.gradle
Normal file
20
ksp/generator/build.gradle
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
plugins {
|
||||||
|
id "org.jetbrains.kotlin.jvm"
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: "$publish_jvm"
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
api project(":micro_utils.common")
|
||||||
|
api libs.kotlin.poet
|
||||||
|
api libs.ksp
|
||||||
|
}
|
||||||
|
|
||||||
|
java {
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
|
}
|
49
ksp/generator/src/main/kotlin/FilesWorkaround.kt
Normal file
49
ksp/generator/src/main/kotlin/FilesWorkaround.kt
Normal file
@@ -0,0 +1,49 @@
|
|||||||
|
package dev.inmo.micro_ksp.generator
|
||||||
|
|
||||||
|
import com.google.devtools.ksp.symbol.KSClassDeclaration
|
||||||
|
import com.google.devtools.ksp.symbol.KSFile
|
||||||
|
import com.squareup.kotlinpoet.FileSpec
|
||||||
|
import java.io.File
|
||||||
|
|
||||||
|
fun KSClassDeclaration.writeFile(
|
||||||
|
prefix: String = "",
|
||||||
|
suffix: String = "",
|
||||||
|
relatedPath: String = "",
|
||||||
|
force: Boolean = false,
|
||||||
|
fileSpecBuilder: () -> FileSpec
|
||||||
|
) {
|
||||||
|
val containingFile = containingFile!!
|
||||||
|
File(
|
||||||
|
File(
|
||||||
|
File(containingFile.filePath).parent,
|
||||||
|
relatedPath
|
||||||
|
),
|
||||||
|
"$prefix${simpleName.asString()}$suffix.kt"
|
||||||
|
).takeIf { force || !it.exists() } ?.apply {
|
||||||
|
parentFile.mkdirs()
|
||||||
|
writer().use { writer ->
|
||||||
|
fileSpecBuilder().writeTo(writer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun KSFile.writeFile(
|
||||||
|
prefix: String = "",
|
||||||
|
suffix: String = "",
|
||||||
|
relatedPath: String = "",
|
||||||
|
force: Boolean = false,
|
||||||
|
fileSpecBuilder: () -> FileSpec
|
||||||
|
) {
|
||||||
|
File(
|
||||||
|
File(
|
||||||
|
File(filePath).parent,
|
||||||
|
relatedPath
|
||||||
|
),
|
||||||
|
"$prefix${fileName.dropLastWhile { it != '.' }.removeSuffix(".")}$suffix.kt"
|
||||||
|
).takeIf { force || !it.exists() } ?.apply {
|
||||||
|
parentFile.mkdirs()
|
||||||
|
writer().use { writer ->
|
||||||
|
fileSpecBuilder().writeTo(writer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -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)
|
||||||
|
}
|
||||||
|
}
|
7
ksp/sealed/build.gradle
Normal file
7
ksp/sealed/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"
|
21
ksp/sealed/generator/build.gradle
Normal file
21
ksp/sealed/generator/build.gradle
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
plugins {
|
||||||
|
id "org.jetbrains.kotlin.jvm"
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: "$publish_jvm"
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
mavenCentral()
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
api project(":micro_utils.ksp.generator")
|
||||||
|
api project(":micro_utils.ksp.sealed")
|
||||||
|
api libs.kotlin.poet
|
||||||
|
api libs.ksp
|
||||||
|
}
|
||||||
|
|
||||||
|
java {
|
||||||
|
sourceCompatibility = JavaVersion.VERSION_17
|
||||||
|
targetCompatibility = JavaVersion.VERSION_17
|
||||||
|
}
|
@@ -0,0 +1,11 @@
|
|||||||
|
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.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())
|
137
ksp/sealed/generator/src/main/kotlin/Processor.kt
Normal file
137
ksp/sealed/generator/src/main/kotlin/Processor.kt
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
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.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.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.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.micro_utils.ksp.sealed.GenerateSealedWorkaround
|
||||||
|
import java.io.File
|
||||||
|
|
||||||
|
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.generateSealedWorkaround(
|
||||||
|
ksClassDeclaration: KSClassDeclaration,
|
||||||
|
resolver: Resolver
|
||||||
|
) {
|
||||||
|
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,
|
||||||
|
ClassKind.OBJECT -> true
|
||||||
|
ClassKind.INTERFACE,
|
||||||
|
ClassKind.CLASS,
|
||||||
|
ClassKind.ENUM_CLASS,
|
||||||
|
ClassKind.ANNOTATION_CLASS -> false
|
||||||
|
}
|
||||||
|
}.filter {
|
||||||
|
it.getAnnotationsByType(GenerateSealedWorkaround.Exclude::class).count() == 0
|
||||||
|
}.sortedBy {
|
||||||
|
(it.getAnnotationsByType(GenerateSealedWorkaround.Order::class).firstOrNull()) ?.order ?: 0
|
||||||
|
}.map {
|
||||||
|
it.toClassName()
|
||||||
|
}.toList()
|
||||||
|
val className = ksClassDeclaration.toClassName()
|
||||||
|
val setType = Set::class.asTypeName().parameterizedBy(
|
||||||
|
ksClassDeclaration.toClassName()
|
||||||
|
)
|
||||||
|
addProperty(
|
||||||
|
PropertySpec.builder(
|
||||||
|
"values",
|
||||||
|
setType
|
||||||
|
).apply {
|
||||||
|
modifiers.add(
|
||||||
|
KModifier.PRIVATE
|
||||||
|
)
|
||||||
|
initializer(
|
||||||
|
CodeBlock.of(
|
||||||
|
"""setOf(${subClassesNames.joinToString(",\n") {it.simpleNames.joinToString(".")}})"""
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}.build()
|
||||||
|
)
|
||||||
|
addFunction(
|
||||||
|
FunSpec.builder("values").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 values"""
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}.build()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@OptIn(KspExperimental::class)
|
||||||
|
override fun process(resolver: Resolver): List<KSAnnotated> {
|
||||||
|
(resolver.getSymbolsWithAnnotation(GenerateSealedWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
|
||||||
|
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(),
|
||||||
|
"${it.simpleName.getShortName()}SealedWorkaround"
|
||||||
|
).apply {
|
||||||
|
addFileComment(
|
||||||
|
"""
|
||||||
|
THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||||
|
TO REGENERATE IT JUST DELETE FILE
|
||||||
|
ORIGINAL FILE: ${it.containingFile ?.fileName}
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
generateSealedWorkaround(it, resolver)
|
||||||
|
}.build()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return emptyList()
|
||||||
|
}
|
||||||
|
}
|
11
ksp/sealed/generator/src/main/kotlin/Provider.kt
Normal file
11
ksp/sealed/generator/src/main/kotlin/Provider.kt
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
package dev.inmo.micro_utils.ksp.sealed.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.sealed.generator.Provider
|
27
ksp/sealed/generator/test/build.gradle
Normal file
27
ksp/sealed/generator/test/build.gradle
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
plugins {
|
||||||
|
id "org.jetbrains.kotlin.multiplatform"
|
||||||
|
id "org.jetbrains.kotlin.plugin.serialization"
|
||||||
|
id "com.android.library"
|
||||||
|
id "com.google.devtools.ksp"
|
||||||
|
}
|
||||||
|
|
||||||
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
|
|
||||||
|
kotlin {
|
||||||
|
sourceSets {
|
||||||
|
commonMain {
|
||||||
|
dependencies {
|
||||||
|
api project(":micro_utils.ksp.sealed")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
add("kspCommonMainMetadata", project(":micro_utils.ksp.sealed.generator"))
|
||||||
|
}
|
||||||
|
|
||||||
|
ksp {
|
||||||
|
}
|
16
ksp/sealed/generator/test/src/commonMain/kotlin/Test.kt
Normal file
16
ksp/sealed/generator/test/src/commonMain/kotlin/Test.kt
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
package dev.inmo.micro_utils.ksp.sealed.generator.test
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround
|
||||||
|
|
||||||
|
@GenerateSealedWorkaround
|
||||||
|
sealed interface Test {
|
||||||
|
@GenerateSealedWorkaround.Order(2)
|
||||||
|
object A : Test
|
||||||
|
@GenerateSealedWorkaround.Exclude
|
||||||
|
object B : Test
|
||||||
|
@GenerateSealedWorkaround.Order(0)
|
||||||
|
object C : Test
|
||||||
|
|
||||||
|
// Required for successful sealed workaround generation
|
||||||
|
companion object
|
||||||
|
}
|
@@ -0,0 +1,11 @@
|
|||||||
|
// 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
|
||||||
|
|
||||||
|
private val values: Set<Test> = setOf(Test.C,
|
||||||
|
Test.A)
|
||||||
|
|
||||||
|
public fun Test.Companion.values(): Set<Test> = values
|
15
ksp/sealed/src/commonMain/kotlin/GenerateSealedWorkaround.kt
Normal file
15
ksp/sealed/src/commonMain/kotlin/GenerateSealedWorkaround.kt
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
package dev.inmo.micro_utils.ksp.sealed
|
||||||
|
|
||||||
|
@Retention(AnnotationRetention.BINARY)
|
||||||
|
@Target(AnnotationTarget.CLASS)
|
||||||
|
annotation class GenerateSealedWorkaround(
|
||||||
|
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
|
||||||
|
}
|
@@ -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
|
@@ -4,7 +4,7 @@ plugins {
|
|||||||
id "com.android.library"
|
id "com.android.library"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
@@ -3,9 +3,10 @@ package dev.inmo.micro_utils.ktor.client
|
|||||||
import dev.inmo.micro_utils.common.MPPFile
|
import dev.inmo.micro_utils.common.MPPFile
|
||||||
import dev.inmo.micro_utils.ktor.common.*
|
import dev.inmo.micro_utils.ktor.common.*
|
||||||
import io.ktor.client.HttpClient
|
import io.ktor.client.HttpClient
|
||||||
|
import io.ktor.client.content.*
|
||||||
|
|
||||||
expect suspend fun HttpClient.tempUpload(
|
expect suspend fun HttpClient.tempUpload(
|
||||||
fullTempUploadDraftPath: String,
|
fullTempUploadDraftPath: String,
|
||||||
file: MPPFile,
|
file: MPPFile,
|
||||||
onUpload: OnUploadCallback = { _, _ -> }
|
onUpload: ProgressListener = ProgressListener { _, _ -> }
|
||||||
): TemporalFileId
|
): TemporalFileId
|
||||||
|
@@ -4,8 +4,8 @@ import dev.inmo.micro_utils.common.FileName
|
|||||||
import dev.inmo.micro_utils.common.MPPFile
|
import dev.inmo.micro_utils.common.MPPFile
|
||||||
import dev.inmo.micro_utils.ktor.common.LambdaInputProvider
|
import dev.inmo.micro_utils.ktor.common.LambdaInputProvider
|
||||||
import io.ktor.client.HttpClient
|
import io.ktor.client.HttpClient
|
||||||
|
import io.ktor.client.content.*
|
||||||
import io.ktor.http.Headers
|
import io.ktor.http.Headers
|
||||||
import io.ktor.utils.io.core.Input
|
|
||||||
import kotlinx.serialization.DeserializationStrategy
|
import kotlinx.serialization.DeserializationStrategy
|
||||||
import kotlinx.serialization.StringFormat
|
import kotlinx.serialization.StringFormat
|
||||||
import kotlinx.serialization.json.Json
|
import kotlinx.serialization.json.Json
|
||||||
@@ -31,7 +31,7 @@ expect suspend fun <T> HttpClient.uniUpload(
|
|||||||
resultDeserializer: DeserializationStrategy<T>,
|
resultDeserializer: DeserializationStrategy<T>,
|
||||||
headers: Headers = Headers.Empty,
|
headers: Headers = Headers.Empty,
|
||||||
stringFormat: StringFormat = Json,
|
stringFormat: StringFormat = Json,
|
||||||
onUpload: OnUploadCallback = { _, _ -> }
|
onUpload: ProgressListener = ProgressListener { _, _ -> }
|
||||||
): T?
|
): T?
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -46,7 +46,7 @@ suspend fun <T> HttpClient.uniUpload(
|
|||||||
additionalData: Map<String, Any> = emptyMap(),
|
additionalData: Map<String, Any> = emptyMap(),
|
||||||
headers: Headers = Headers.Empty,
|
headers: Headers = Headers.Empty,
|
||||||
stringFormat: StringFormat = Json,
|
stringFormat: StringFormat = Json,
|
||||||
onUpload: OnUploadCallback = { _, _ -> }
|
onUpload: ProgressListener = ProgressListener { _, _ -> }
|
||||||
): T? = uniUpload(
|
): T? = uniUpload(
|
||||||
url,
|
url,
|
||||||
additionalData + ("bytes" to file),
|
additionalData + ("bytes" to file),
|
||||||
@@ -68,7 +68,7 @@ suspend fun <T> HttpClient.uniUpload(
|
|||||||
additionalData: Map<String, Any> = emptyMap(),
|
additionalData: Map<String, Any> = emptyMap(),
|
||||||
headers: Headers = Headers.Empty,
|
headers: Headers = Headers.Empty,
|
||||||
stringFormat: StringFormat = Json,
|
stringFormat: StringFormat = Json,
|
||||||
onUpload: OnUploadCallback = { _, _ -> }
|
onUpload: ProgressListener = ProgressListener { _, _ -> }
|
||||||
): T? = uniUpload(
|
): T? = uniUpload(
|
||||||
url,
|
url,
|
||||||
additionalData + ("bytes" to info),
|
additionalData + ("bytes" to info),
|
||||||
@@ -93,7 +93,7 @@ suspend fun <T> HttpClient.uniUpload(
|
|||||||
additionalData: Map<String, Any> = emptyMap(),
|
additionalData: Map<String, Any> = emptyMap(),
|
||||||
headers: Headers = Headers.Empty,
|
headers: Headers = Headers.Empty,
|
||||||
stringFormat: StringFormat = Json,
|
stringFormat: StringFormat = Json,
|
||||||
onUpload: OnUploadCallback = { _, _ -> }
|
onUpload: ProgressListener = ProgressListener { _, _ -> }
|
||||||
): T? = uniUpload(
|
): T? = uniUpload(
|
||||||
url,
|
url,
|
||||||
UniUploadFileInfo(fileName, mimeType, inputAllocator),
|
UniUploadFileInfo(fileName, mimeType, inputAllocator),
|
||||||
|
@@ -5,16 +5,15 @@ import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob
|
|||||||
import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
|
import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
|
||||||
import dev.inmo.micro_utils.ktor.common.TemporalFileId
|
import dev.inmo.micro_utils.ktor.common.TemporalFileId
|
||||||
import io.ktor.client.HttpClient
|
import io.ktor.client.HttpClient
|
||||||
|
import io.ktor.client.content.*
|
||||||
import kotlinx.coroutines.*
|
import kotlinx.coroutines.*
|
||||||
import org.w3c.dom.mediasource.ENDED
|
|
||||||
import org.w3c.dom.mediasource.ReadyState
|
|
||||||
import org.w3c.xhr.*
|
import org.w3c.xhr.*
|
||||||
import org.w3c.xhr.XMLHttpRequest.Companion.DONE
|
import org.w3c.xhr.XMLHttpRequest.Companion.DONE
|
||||||
|
|
||||||
suspend fun tempUpload(
|
suspend fun tempUpload(
|
||||||
fullTempUploadDraftPath: String,
|
fullTempUploadDraftPath: String,
|
||||||
file: MPPFile,
|
file: MPPFile,
|
||||||
onUpload: OnUploadCallback
|
onUpload: ProgressListener
|
||||||
): TemporalFileId {
|
): TemporalFileId {
|
||||||
val formData = FormData()
|
val formData = FormData()
|
||||||
val answer = CompletableDeferred<TemporalFileId>(currentCoroutineContext().job)
|
val answer = CompletableDeferred<TemporalFileId>(currentCoroutineContext().job)
|
||||||
@@ -28,7 +27,7 @@ suspend fun tempUpload(
|
|||||||
val request = XMLHttpRequest()
|
val request = XMLHttpRequest()
|
||||||
request.responseType = XMLHttpRequestResponseType.TEXT
|
request.responseType = XMLHttpRequestResponseType.TEXT
|
||||||
request.upload.onprogress = {
|
request.upload.onprogress = {
|
||||||
subscope.launchSafelyWithoutExceptions { onUpload(it.loaded.toLong(), it.total.toLong()) }
|
subscope.launchSafelyWithoutExceptions { onUpload.onProgress(it.loaded.toLong(), it.total.toLong()) }
|
||||||
}
|
}
|
||||||
request.onload = {
|
request.onload = {
|
||||||
if (request.status == 200.toShort()) {
|
if (request.status == 200.toShort()) {
|
||||||
@@ -60,5 +59,5 @@ suspend fun tempUpload(
|
|||||||
actual suspend fun HttpClient.tempUpload(
|
actual suspend fun HttpClient.tempUpload(
|
||||||
fullTempUploadDraftPath: String,
|
fullTempUploadDraftPath: String,
|
||||||
file: MPPFile,
|
file: MPPFile,
|
||||||
onUpload: OnUploadCallback
|
onUpload: ProgressListener
|
||||||
): TemporalFileId = dev.inmo.micro_utils.ktor.client.tempUpload(fullTempUploadDraftPath, file, onUpload)
|
): TemporalFileId = dev.inmo.micro_utils.ktor.client.tempUpload(fullTempUploadDraftPath, file, onUpload)
|
||||||
|
@@ -1,10 +1,10 @@
|
|||||||
package dev.inmo.micro_utils.ktor.client
|
package dev.inmo.micro_utils.ktor.client
|
||||||
|
|
||||||
import dev.inmo.micro_utils.common.MPPFile
|
import dev.inmo.micro_utils.common.MPPFile
|
||||||
import dev.inmo.micro_utils.common.Progress
|
|
||||||
import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob
|
import dev.inmo.micro_utils.coroutines.LinkedSupervisorJob
|
||||||
import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
|
import dev.inmo.micro_utils.coroutines.launchSafelyWithoutExceptions
|
||||||
import io.ktor.client.HttpClient
|
import io.ktor.client.HttpClient
|
||||||
|
import io.ktor.client.content.*
|
||||||
import io.ktor.http.Headers
|
import io.ktor.http.Headers
|
||||||
import io.ktor.utils.io.core.readBytes
|
import io.ktor.utils.io.core.readBytes
|
||||||
import kotlinx.coroutines.CompletableDeferred
|
import kotlinx.coroutines.CompletableDeferred
|
||||||
@@ -36,7 +36,7 @@ actual suspend fun <T> HttpClient.uniUpload(
|
|||||||
resultDeserializer: DeserializationStrategy<T>,
|
resultDeserializer: DeserializationStrategy<T>,
|
||||||
headers: Headers,
|
headers: Headers,
|
||||||
stringFormat: StringFormat,
|
stringFormat: StringFormat,
|
||||||
onUpload: OnUploadCallback
|
onUpload: ProgressListener
|
||||||
): T? {
|
): T? {
|
||||||
val formData = FormData()
|
val formData = FormData()
|
||||||
val answer = CompletableDeferred<T?>(currentCoroutineContext().job)
|
val answer = CompletableDeferred<T?>(currentCoroutineContext().job)
|
||||||
@@ -66,7 +66,7 @@ actual suspend fun <T> HttpClient.uniUpload(
|
|||||||
}
|
}
|
||||||
request.responseType = XMLHttpRequestResponseType.TEXT
|
request.responseType = XMLHttpRequestResponseType.TEXT
|
||||||
request.upload.onprogress = {
|
request.upload.onprogress = {
|
||||||
subscope.launchSafelyWithoutExceptions { onUpload(it.loaded.toLong(), it.total.toLong()) }
|
subscope.launchSafelyWithoutExceptions { onUpload.onProgress(it.loaded.toLong(), it.total.toLong()) }
|
||||||
}
|
}
|
||||||
request.onload = {
|
request.onload = {
|
||||||
if (request.status == 200.toShort()) {
|
if (request.status == 200.toShort()) {
|
||||||
|
@@ -4,6 +4,7 @@ import dev.inmo.micro_utils.common.MPPFile
|
|||||||
import dev.inmo.micro_utils.common.filename
|
import dev.inmo.micro_utils.common.filename
|
||||||
import dev.inmo.micro_utils.ktor.common.TemporalFileId
|
import dev.inmo.micro_utils.ktor.common.TemporalFileId
|
||||||
import io.ktor.client.HttpClient
|
import io.ktor.client.HttpClient
|
||||||
|
import io.ktor.client.content.*
|
||||||
import io.ktor.client.plugins.onUpload
|
import io.ktor.client.plugins.onUpload
|
||||||
import io.ktor.client.request.forms.formData
|
import io.ktor.client.request.forms.formData
|
||||||
import io.ktor.client.request.forms.submitFormWithBinaryData
|
import io.ktor.client.request.forms.submitFormWithBinaryData
|
||||||
@@ -18,7 +19,7 @@ internal val MPPFile.mimeType: String
|
|||||||
actual suspend fun HttpClient.tempUpload(
|
actual suspend fun HttpClient.tempUpload(
|
||||||
fullTempUploadDraftPath: String,
|
fullTempUploadDraftPath: String,
|
||||||
file: MPPFile,
|
file: MPPFile,
|
||||||
onUpload: OnUploadCallback
|
onUpload: ProgressListener
|
||||||
): TemporalFileId {
|
): TemporalFileId {
|
||||||
val inputProvider = file.inputProvider()
|
val inputProvider = file.inputProvider()
|
||||||
val fileId = submitFormWithBinaryData(
|
val fileId = submitFormWithBinaryData(
|
||||||
|
@@ -1,8 +1,7 @@
|
|||||||
package dev.inmo.micro_utils.ktor.client
|
package dev.inmo.micro_utils.ktor.client
|
||||||
|
|
||||||
import dev.inmo.micro_utils.common.Progress
|
|
||||||
import io.ktor.client.HttpClient
|
import io.ktor.client.HttpClient
|
||||||
import io.ktor.client.engine.mergeHeaders
|
import io.ktor.client.content.*
|
||||||
import io.ktor.client.plugins.onUpload
|
import io.ktor.client.plugins.onUpload
|
||||||
import io.ktor.client.request.HttpRequestBuilder
|
import io.ktor.client.request.HttpRequestBuilder
|
||||||
import io.ktor.client.request.forms.InputProvider
|
import io.ktor.client.request.forms.InputProvider
|
||||||
@@ -20,7 +19,6 @@ import kotlinx.serialization.DeserializationStrategy
|
|||||||
import kotlinx.serialization.InternalSerializationApi
|
import kotlinx.serialization.InternalSerializationApi
|
||||||
import kotlinx.serialization.SerializationStrategy
|
import kotlinx.serialization.SerializationStrategy
|
||||||
import kotlinx.serialization.StringFormat
|
import kotlinx.serialization.StringFormat
|
||||||
import kotlinx.serialization.encodeToString
|
|
||||||
import kotlinx.serialization.serializer
|
import kotlinx.serialization.serializer
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
@@ -39,7 +37,7 @@ actual suspend fun <T> HttpClient.uniUpload(
|
|||||||
resultDeserializer: DeserializationStrategy<T>,
|
resultDeserializer: DeserializationStrategy<T>,
|
||||||
headers: Headers,
|
headers: Headers,
|
||||||
stringFormat: StringFormat,
|
stringFormat: StringFormat,
|
||||||
onUpload: OnUploadCallback
|
onUpload: ProgressListener
|
||||||
): T? {
|
): T? {
|
||||||
val withBinary = data.values.any { it is File || it is UniUploadFileInfo }
|
val withBinary = data.values.any { it is File || it is UniUploadFileInfo }
|
||||||
|
|
||||||
@@ -76,7 +74,7 @@ actual suspend fun <T> HttpClient.uniUpload(
|
|||||||
appendAll(headers)
|
appendAll(headers)
|
||||||
}
|
}
|
||||||
onUpload { bytesSentTotal, contentLength ->
|
onUpload { bytesSentTotal, contentLength ->
|
||||||
onUpload(bytesSentTotal, contentLength)
|
onUpload.onProgress(bytesSentTotal, contentLength)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -5,6 +5,7 @@ import dev.inmo.micro_utils.common.filename
|
|||||||
import dev.inmo.micro_utils.ktor.common.TemporalFileId
|
import dev.inmo.micro_utils.ktor.common.TemporalFileId
|
||||||
import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny
|
import dev.inmo.micro_utils.mime_types.getMimeTypeOrAny
|
||||||
import io.ktor.client.HttpClient
|
import io.ktor.client.HttpClient
|
||||||
|
import io.ktor.client.content.*
|
||||||
import io.ktor.client.plugins.onUpload
|
import io.ktor.client.plugins.onUpload
|
||||||
import io.ktor.client.request.forms.formData
|
import io.ktor.client.request.forms.formData
|
||||||
import io.ktor.client.request.forms.submitFormWithBinaryData
|
import io.ktor.client.request.forms.submitFormWithBinaryData
|
||||||
@@ -18,7 +19,7 @@ internal val MPPFile.mimeType: String
|
|||||||
actual suspend fun HttpClient.tempUpload(
|
actual suspend fun HttpClient.tempUpload(
|
||||||
fullTempUploadDraftPath: String,
|
fullTempUploadDraftPath: String,
|
||||||
file: MPPFile,
|
file: MPPFile,
|
||||||
onUpload: OnUploadCallback
|
onUpload: ProgressListener
|
||||||
): TemporalFileId {
|
): TemporalFileId {
|
||||||
val inputProvider = file.inputProvider()
|
val inputProvider = file.inputProvider()
|
||||||
val fileId = submitFormWithBinaryData(
|
val fileId = submitFormWithBinaryData(
|
||||||
|
@@ -1,9 +1,8 @@
|
|||||||
package dev.inmo.micro_utils.ktor.client
|
package dev.inmo.micro_utils.ktor.client
|
||||||
|
|
||||||
import dev.inmo.micro_utils.common.MPPFile
|
import dev.inmo.micro_utils.common.MPPFile
|
||||||
import dev.inmo.micro_utils.common.Progress
|
|
||||||
import io.ktor.client.HttpClient
|
import io.ktor.client.HttpClient
|
||||||
import io.ktor.client.engine.mergeHeaders
|
import io.ktor.client.content.*
|
||||||
import io.ktor.client.plugins.onUpload
|
import io.ktor.client.plugins.onUpload
|
||||||
import io.ktor.client.request.HttpRequestBuilder
|
import io.ktor.client.request.HttpRequestBuilder
|
||||||
import io.ktor.client.request.forms.InputProvider
|
import io.ktor.client.request.forms.InputProvider
|
||||||
@@ -21,7 +20,6 @@ import kotlinx.serialization.DeserializationStrategy
|
|||||||
import kotlinx.serialization.InternalSerializationApi
|
import kotlinx.serialization.InternalSerializationApi
|
||||||
import kotlinx.serialization.SerializationStrategy
|
import kotlinx.serialization.SerializationStrategy
|
||||||
import kotlinx.serialization.StringFormat
|
import kotlinx.serialization.StringFormat
|
||||||
import kotlinx.serialization.encodeToString
|
|
||||||
import kotlinx.serialization.serializer
|
import kotlinx.serialization.serializer
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -39,7 +37,7 @@ actual suspend fun <T> HttpClient.uniUpload(
|
|||||||
resultDeserializer: DeserializationStrategy<T>,
|
resultDeserializer: DeserializationStrategy<T>,
|
||||||
headers: Headers,
|
headers: Headers,
|
||||||
stringFormat: StringFormat,
|
stringFormat: StringFormat,
|
||||||
onUpload: OnUploadCallback
|
onUpload: ProgressListener
|
||||||
): T? {
|
): T? {
|
||||||
val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo }
|
val withBinary = data.values.any { it is MPPFile || it is UniUploadFileInfo }
|
||||||
|
|
||||||
@@ -75,9 +73,7 @@ actual suspend fun <T> HttpClient.uniUpload(
|
|||||||
headers {
|
headers {
|
||||||
appendAll(headers)
|
appendAll(headers)
|
||||||
}
|
}
|
||||||
onUpload { bytesSentTotal, contentLength ->
|
onUpload(onUpload)
|
||||||
onUpload(bytesSentTotal, contentLength)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val response = if (withBinary) {
|
val response = if (withBinary) {
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user