mirror of
https://github.com/InsanusMokrassar/MicroUtils.git
synced 2025-09-18 14:59:24 +00:00
Compare commits
13 Commits
Author | SHA1 | Date | |
---|---|---|---|
75f514d99b | |||
9a687cfc1c | |||
14edf8b6b7 | |||
23aa2d8917 | |||
7651388b5c | |||
805ab32b24 | |||
cc623b1097 | |||
1420416b3e | |||
9a0b67f938 | |||
303e1e6281 | |||
ff59b0cc9c | |||
be5d2ee715 | |||
8dd2e3f6f9 |
20
CHANGELOG.md
20
CHANGELOG.md
@@ -1,5 +1,25 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 0.20.27
|
||||||
|
|
||||||
|
* `Versions`:
|
||||||
|
* `Kotlin`: `1.9.21` -> `1.9.22`
|
||||||
|
* `Compose`: `1.5.11` -> `1.6.0-dev13691`
|
||||||
|
|
||||||
|
## 0.20.26
|
||||||
|
|
||||||
|
* `Versions`:
|
||||||
|
* `Exposed`: `0.45.0` -> `0.46.0`. **This update brinds new api deprecations in exposed**
|
||||||
|
* `Resources`:
|
||||||
|
* Add opportunity to get default translation by passing `null` as `IetfLang` argument
|
||||||
|
* Add several useful extensions to get translations in `JS` target
|
||||||
|
|
||||||
|
## 0.20.25
|
||||||
|
|
||||||
|
* `Colors`:
|
||||||
|
* `Common`:
|
||||||
|
* Module inited
|
||||||
|
|
||||||
## 0.20.24
|
## 0.20.24
|
||||||
|
|
||||||
**Since this version depdendencies of klock and krypto replaced with `com.soywiz.korge:korlibs-time` and `com.soywiz.korge:korlibs-crypto`**
|
**Since this version depdendencies of klock and krypto replaced with `com.soywiz.korge:korlibs-time` and `com.soywiz.korge:korlibs-crypto`**
|
||||||
|
7
colors/common/build.gradle
Normal file
7
colors/common/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: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath"
|
141
colors/common/src/commonMain/kotlin/HEXAColor.kt
Normal file
141
colors/common/src/commonMain/kotlin/HEXAColor.kt
Normal file
@@ -0,0 +1,141 @@
|
|||||||
|
package dev.inmo.micro_utils.colors.common
|
||||||
|
|
||||||
|
import kotlinx.serialization.Serializable
|
||||||
|
import kotlin.jvm.JvmInline
|
||||||
|
import kotlin.math.floor
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Wrapper for RGBA colors. Receiving [UInt] in main constructor. Each part in main constructor
|
||||||
|
* configured with `0x00 - 0xff` range. Examples:
|
||||||
|
*
|
||||||
|
* * Red: `0xff0000ffu`
|
||||||
|
* * Red (0.5 capacity): `0xff000088u`
|
||||||
|
*
|
||||||
|
* Anyway it is recommended to use
|
||||||
|
*/
|
||||||
|
@Serializable
|
||||||
|
@JvmInline
|
||||||
|
value class HEXAColor (
|
||||||
|
val uint: UInt
|
||||||
|
) : Comparable<HEXAColor> {
|
||||||
|
val hexa: String
|
||||||
|
get() = "#${uint.toString(16).padStart(8, '0')}"
|
||||||
|
val hex: String
|
||||||
|
get() = hexa.take(7)
|
||||||
|
val rgba: String
|
||||||
|
get() = "rgba($r,$g,$b,${aOfOne.toString().take(5)})"
|
||||||
|
val rgb: String
|
||||||
|
get() = "rgb($r,$g,$b)"
|
||||||
|
val shortHex: String
|
||||||
|
get() = "#${r.shortPart()}${g.shortPart()}${b.shortPart()}"
|
||||||
|
val shortHexa: String
|
||||||
|
get() = "$shortHex${a.shortPart()}"
|
||||||
|
val rgbInt: Int
|
||||||
|
get() = (uint shr 2).toInt()
|
||||||
|
|
||||||
|
val r: Int
|
||||||
|
get() = ((uint and 0xff000000u) / 0x1000000u).toInt()
|
||||||
|
val g: Int
|
||||||
|
get() = ((uint and 0x00ff0000u) / 0x10000u).toInt()
|
||||||
|
val b: Int
|
||||||
|
get() = ((uint and 0x0000ff00u) / 0x100u).toInt()
|
||||||
|
val a: Int
|
||||||
|
get() = ((uint and 0x000000ffu)).toInt()
|
||||||
|
val aOfOne: Float
|
||||||
|
get() = a.toFloat() / (0xff)
|
||||||
|
init {
|
||||||
|
require(uint in 0u ..0xffffffffu)
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(r: Int, g: Int, b: Int, a: Int) : this(
|
||||||
|
((r * 0x1000000).toLong() + g * 0x10000 + b * 0x100 + a).toUInt()
|
||||||
|
) {
|
||||||
|
require(r in 0 ..0xff)
|
||||||
|
require(g in 0 ..0xff)
|
||||||
|
require(b in 0 ..0xff)
|
||||||
|
require(a in 0 ..0xff)
|
||||||
|
}
|
||||||
|
|
||||||
|
constructor(r: Int, g: Int, b: Int, aOfOne: Float = 1f) : this(
|
||||||
|
r = r, g = g, b = b, a = (aOfOne * 0xff).toInt()
|
||||||
|
)
|
||||||
|
|
||||||
|
override fun toString(): String {
|
||||||
|
return hexa
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun compareTo(other: HEXAColor): Int = (uint - other.uint).coerceIn(Int.MIN_VALUE.toUInt(), Int.MAX_VALUE.toLong().toUInt()).toInt()
|
||||||
|
|
||||||
|
fun copy(
|
||||||
|
r: Int = this.r,
|
||||||
|
g: Int = this.g,
|
||||||
|
b: Int = this.b,
|
||||||
|
aOfOne: Float = this.aOfOne
|
||||||
|
) = HEXAColor(r = r, g = g, b = b, aOfOne = aOfOne)
|
||||||
|
fun copy(
|
||||||
|
r: Int = this.r,
|
||||||
|
g: Int = this.g,
|
||||||
|
b: Int = this.b,
|
||||||
|
a: Int
|
||||||
|
) = HEXAColor(r = r, g = g, b = b, a = a)
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
/**
|
||||||
|
* Parsing color from [color]
|
||||||
|
*
|
||||||
|
* Supported formats samples (on Red color based):
|
||||||
|
*
|
||||||
|
* * `#f00`
|
||||||
|
* * `#f00f`
|
||||||
|
* * `#ff0000`
|
||||||
|
* * `#ff0000ff`
|
||||||
|
* * `rgb(255, 0, 0)`
|
||||||
|
* * `rgba(255, 0, 0, 1)`
|
||||||
|
*/
|
||||||
|
fun parseStringColor(color: String): HEXAColor = when {
|
||||||
|
color.startsWith("#") -> color.removePrefix("#").let { color ->
|
||||||
|
when (color.length) {
|
||||||
|
3 -> color.map { "$it$it" }.joinToString(separator = "", postfix = "ff")
|
||||||
|
4 -> color.take(3).map { "$it$it" }.joinToString(separator = "", postfix = color.takeLast(1).let { "${it}0" })
|
||||||
|
6 -> "${color}ff"
|
||||||
|
8 -> color
|
||||||
|
else -> error("Malfurmed color string: $color. It is expected that color started with # will contains 3, 6 or 8 valuable parts")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
color.startsWith("rgb(") -> color
|
||||||
|
.removePrefix("rgb(")
|
||||||
|
.removeSuffix(")")
|
||||||
|
.replace(Regex("\\s"), "")
|
||||||
|
.split(",")
|
||||||
|
.joinToString("", postfix = "ff") {
|
||||||
|
it.toInt().toString(16).padStart(2, '0')
|
||||||
|
}
|
||||||
|
color.startsWith("rgba(") -> color
|
||||||
|
.removePrefix("rgba(")
|
||||||
|
.removeSuffix(")")
|
||||||
|
.replace(Regex("\\s"), "")
|
||||||
|
.split(",").let {
|
||||||
|
it.take(3).map { it.toInt().toString(16).padStart(2, '0') } + (it.last().toFloat() * 0xff).toInt().toString(16).padStart(2, '0')
|
||||||
|
}
|
||||||
|
.joinToString("")
|
||||||
|
else -> color
|
||||||
|
}.lowercase().toUInt(16).let(::HEXAColor)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parsing color from [color]
|
||||||
|
*
|
||||||
|
* Supported formats samples (on Red color based):
|
||||||
|
*
|
||||||
|
* * `#f00`
|
||||||
|
* * `#ff0000`
|
||||||
|
* * `#ff0000ff`
|
||||||
|
* * `rgb(255, 0, 0)`
|
||||||
|
* * `rgba(255, 0, 0, 1)`
|
||||||
|
*/
|
||||||
|
operator fun invoke(color: String) = parseStringColor(color)
|
||||||
|
|
||||||
|
private fun Int.shortPart(): String {
|
||||||
|
return (floor(toFloat() / 16)).toInt().toString(16)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
175
colors/common/src/commonTest/kotlin/HexColorTests.kt
Normal file
175
colors/common/src/commonTest/kotlin/HexColorTests.kt
Normal file
@@ -0,0 +1,175 @@
|
|||||||
|
package dev.inmo.micro_utils.colors.common
|
||||||
|
|
||||||
|
import kotlin.math.floor
|
||||||
|
import kotlin.test.Test
|
||||||
|
import kotlin.test.assertEquals
|
||||||
|
import kotlin.test.assertTrue
|
||||||
|
|
||||||
|
class HexColorTests {
|
||||||
|
val alphaRgbaPrecision = 5
|
||||||
|
class TestColor(
|
||||||
|
val color: HEXAColor,
|
||||||
|
val shortHex: String,
|
||||||
|
val shortHexa: String,
|
||||||
|
val hex: String,
|
||||||
|
val hexa: String,
|
||||||
|
val rgb: String,
|
||||||
|
val rgba: String,
|
||||||
|
val r: Int,
|
||||||
|
val g: Int,
|
||||||
|
val b: Int,
|
||||||
|
val a: Int,
|
||||||
|
vararg val additionalRGBAVariants: String
|
||||||
|
)
|
||||||
|
val testColors: List<TestColor>
|
||||||
|
get() = listOf(
|
||||||
|
TestColor(
|
||||||
|
color = HEXAColor(uint = 0xff0000ffu),
|
||||||
|
shortHex = "#f00",
|
||||||
|
shortHexa = "#f00f",
|
||||||
|
hex = "#ff0000",
|
||||||
|
hexa = "#ff0000ff",
|
||||||
|
rgb = "rgb(255,0,0)",
|
||||||
|
rgba = "rgba(255,0,0,1.0)",
|
||||||
|
r = 0xff,
|
||||||
|
g = 0x00,
|
||||||
|
b = 0x00,
|
||||||
|
a = 0xff,
|
||||||
|
"rgba(255,0,0,1)",
|
||||||
|
),
|
||||||
|
TestColor(
|
||||||
|
color = HEXAColor(uint = 0x00ff00ffu),
|
||||||
|
shortHex = "#0f0",
|
||||||
|
shortHexa = "#0f0f",
|
||||||
|
hex = "#00ff00",
|
||||||
|
hexa = "#00ff00ff",
|
||||||
|
rgb = "rgb(0,255,0)",
|
||||||
|
rgba = "rgba(0,255,0,1.0)",
|
||||||
|
r = 0x00,
|
||||||
|
g = 0xff,
|
||||||
|
b = 0x00,
|
||||||
|
a = 0xff,
|
||||||
|
"rgba(0,255,0,1)"
|
||||||
|
),
|
||||||
|
TestColor(
|
||||||
|
color = HEXAColor(0x0000ffffu),
|
||||||
|
shortHex = "#00f",
|
||||||
|
shortHexa = "#00ff",
|
||||||
|
hex = "#0000ff",
|
||||||
|
hexa = "#0000ffff",
|
||||||
|
rgb = "rgb(0,0,255)",
|
||||||
|
rgba = "rgba(0,0,255,1.0)",
|
||||||
|
r = 0x00,
|
||||||
|
g = 0x00,
|
||||||
|
b = 0xff,
|
||||||
|
a = 0xff,
|
||||||
|
"rgba(0,0,255,1)"
|
||||||
|
),
|
||||||
|
TestColor(
|
||||||
|
color = HEXAColor(0xff000088u),
|
||||||
|
shortHex = "#f00",
|
||||||
|
shortHexa = "#f008",
|
||||||
|
hex = "#ff0000",
|
||||||
|
hexa = "#ff000088",
|
||||||
|
rgb = "rgb(255,0,0)",
|
||||||
|
rgba = "rgba(255,0,0,0.533)",
|
||||||
|
r = 0xff,
|
||||||
|
g = 0x00,
|
||||||
|
b = 0x00,
|
||||||
|
a = 0x88,
|
||||||
|
),
|
||||||
|
TestColor(
|
||||||
|
color = HEXAColor(0x00ff0088u),
|
||||||
|
shortHex = "#0f0",
|
||||||
|
shortHexa = "#0f08",
|
||||||
|
hex = "#00ff00",
|
||||||
|
hexa = "#00ff0088",
|
||||||
|
rgb = "rgb(0,255,0)",
|
||||||
|
rgba = "rgba(0,255,0,0.533)",
|
||||||
|
r = 0x00,
|
||||||
|
g = 0xff,
|
||||||
|
b = 0x00,
|
||||||
|
a = 0x88,
|
||||||
|
),
|
||||||
|
TestColor(
|
||||||
|
color = HEXAColor(0x0000ff88u),
|
||||||
|
shortHex = "#00f",
|
||||||
|
shortHexa = "#00f8",
|
||||||
|
hex = "#0000ff",
|
||||||
|
hexa = "#0000ff88",
|
||||||
|
rgb = "rgb(0,0,255)",
|
||||||
|
rgba = "rgba(0,0,255,0.533)",
|
||||||
|
r = 0x00,
|
||||||
|
g = 0x00,
|
||||||
|
b = 0xff,
|
||||||
|
a = 0x88,
|
||||||
|
),
|
||||||
|
TestColor(
|
||||||
|
color = HEXAColor(0xff000022u),
|
||||||
|
shortHex = "#f00",
|
||||||
|
shortHexa = "#f002",
|
||||||
|
hex = "#ff0000",
|
||||||
|
hexa = "#ff000022",
|
||||||
|
rgb = "rgb(255,0,0)",
|
||||||
|
rgba = "rgba(255,0,0,0.133)",
|
||||||
|
r = 0xff,
|
||||||
|
g = 0x00,
|
||||||
|
b = 0x00,
|
||||||
|
a = 0x22,
|
||||||
|
),
|
||||||
|
TestColor(
|
||||||
|
color = HEXAColor(0x00ff0022u),
|
||||||
|
shortHex = "#0f0",
|
||||||
|
shortHexa = "#0f02",
|
||||||
|
hex = "#00ff00",
|
||||||
|
hexa = "#00ff0022",
|
||||||
|
rgb = "rgb(0,255,0)",
|
||||||
|
rgba = "rgba(0,255,0,0.133)",
|
||||||
|
r = 0x00,
|
||||||
|
g = 0xff,
|
||||||
|
b = 0x00,
|
||||||
|
a = 0x22,
|
||||||
|
),
|
||||||
|
TestColor(
|
||||||
|
color = HEXAColor(0x0000ff22u),
|
||||||
|
shortHex = "#00f",
|
||||||
|
shortHexa = "#00f2",
|
||||||
|
hex = "#0000ff",
|
||||||
|
hexa = "#0000ff22",
|
||||||
|
rgb = "rgb(0,0,255)",
|
||||||
|
rgba = "rgba(0,0,255,0.133)",
|
||||||
|
r = 0x00,
|
||||||
|
g = 0x00,
|
||||||
|
b = 0xff,
|
||||||
|
a = 0x22,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun baseTest() {
|
||||||
|
testColors.forEach {
|
||||||
|
assertEquals(it.hex, it.color.hex)
|
||||||
|
assertEquals(it.hexa, it.color.hexa)
|
||||||
|
assertEquals(it.shortHex, it.color.shortHex)
|
||||||
|
assertEquals(it.shortHexa, it.color.shortHexa)
|
||||||
|
assertEquals(it.rgb, it.color.rgb)
|
||||||
|
assertTrue(it.rgba == it.color.rgba || it.color.rgba in it.additionalRGBAVariants)
|
||||||
|
assertEquals(it.r, it.color.r)
|
||||||
|
assertEquals(it.g, it.color.g)
|
||||||
|
assertEquals(it.b, it.color.b)
|
||||||
|
assertEquals(it.a, it.color.a)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testHexParseColor() {
|
||||||
|
testColors.forEach {
|
||||||
|
assertEquals(it.color.copy(aOfOne = 1f), HEXAColor.parseStringColor(it.hex))
|
||||||
|
assertEquals(it.color, HEXAColor.parseStringColor(it.hexa))
|
||||||
|
assertEquals(it.color.copy(aOfOne = 1f), HEXAColor.parseStringColor(it.rgb))
|
||||||
|
assertTrue(it.color.uint.toInt() - HEXAColor.parseStringColor(it.rgba).uint.toInt() in -0x1 .. 0x1, )
|
||||||
|
assertEquals(it.color.copy(aOfOne = 1f), HEXAColor.parseStringColor(it.shortHex))
|
||||||
|
assertEquals(it.color.copy(a = floor(it.color.a.toFloat() / 16).toInt() * 0x10), HEXAColor.parseStringColor(it.shortHexa))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@@ -18,13 +18,13 @@ if (new File(projectDir, "secret.gradle").exists()) {
|
|||||||
githubRelease {
|
githubRelease {
|
||||||
token "${project.property('GITHUB_RELEASE_TOKEN')}"
|
token "${project.property('GITHUB_RELEASE_TOKEN')}"
|
||||||
|
|
||||||
owner "InsanusMokrassar"
|
owner = "InsanusMokrassar"
|
||||||
repo "MicroUtils"
|
repo = "MicroUtils"
|
||||||
|
|
||||||
tagName "v${project.version}"
|
tagName = "v${project.version}"
|
||||||
releaseName "${project.version}"
|
releaseName = "${project.version}"
|
||||||
targetCommitish "${project.version}"
|
targetCommitish = "${project.version}"
|
||||||
|
|
||||||
body getCurrentVersionChangelog()
|
body = getCurrentVersionChangelog()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -15,5 +15,5 @@ crypto_js_version=4.1.1
|
|||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=0.20.24
|
version=0.20.27
|
||||||
android_code_version=230
|
android_code_version=233
|
||||||
|
@@ -1,13 +1,13 @@
|
|||||||
[versions]
|
[versions]
|
||||||
|
|
||||||
kt = "1.9.21"
|
kt = "1.9.22"
|
||||||
kt-serialization = "1.6.2"
|
kt-serialization = "1.6.2"
|
||||||
kt-coroutines = "1.7.3"
|
kt-coroutines = "1.7.3"
|
||||||
|
|
||||||
kslog = "1.3.1"
|
kslog = "1.3.1"
|
||||||
|
|
||||||
jb-compose = "1.5.11"
|
jb-compose = "1.6.0-dev1369"
|
||||||
jb-exposed = "0.45.0"
|
jb-exposed = "0.46.0"
|
||||||
jb-dokka = "1.9.10"
|
jb-dokka = "1.9.10"
|
||||||
|
|
||||||
korlibs = "5.3.0"
|
korlibs = "5.3.0"
|
||||||
@@ -15,18 +15,18 @@ uuid = "0.8.2"
|
|||||||
|
|
||||||
ktor = "2.3.7"
|
ktor = "2.3.7"
|
||||||
|
|
||||||
gh-release = "2.4.1"
|
gh-release = "2.5.2"
|
||||||
|
|
||||||
koin = "3.5.3"
|
koin = "3.5.3"
|
||||||
|
|
||||||
okio = "3.7.0"
|
okio = "3.7.0"
|
||||||
|
|
||||||
ksp = "1.9.21-1.0.16"
|
ksp = "1.9.22-1.0.16"
|
||||||
kotlin-poet = "1.15.3"
|
kotlin-poet = "1.15.3"
|
||||||
|
|
||||||
versions = "0.50.0"
|
versions = "0.50.0"
|
||||||
|
|
||||||
android-gradle = "8.2.0"
|
android-gradle = "8.2.1"
|
||||||
dexcount = "4.0.0"
|
dexcount = "4.0.0"
|
||||||
|
|
||||||
android-coreKtx = "1.12.0"
|
android-coreKtx = "1.12.0"
|
||||||
|
@@ -35,14 +35,14 @@ abstract class AbstractExposedReadCRUDRepo<ObjectType, IdType>(
|
|||||||
}
|
}
|
||||||
override suspend fun getById(id: IdType): ObjectType? {
|
override suspend fun getById(id: IdType): ObjectType? {
|
||||||
return transaction(db = database) {
|
return transaction(db = database) {
|
||||||
select {
|
selectAll().where {
|
||||||
selectById(id)
|
selectById(id)
|
||||||
}.limit(1).firstOrNull() ?.asObject
|
}.limit(1).firstOrNull() ?.asObject
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun contains(id: IdType): Boolean = transaction(db = database) {
|
override suspend fun contains(id: IdType): Boolean = transaction(db = database) {
|
||||||
select { selectById(id) }.limit(1).any()
|
selectAll().where { selectById(id) }.limit(1).any()
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun getAll(): Map<IdType, ObjectType> = transaction(database) {
|
override suspend fun getAll(): Map<IdType, ObjectType> = transaction(database) {
|
||||||
|
@@ -101,7 +101,7 @@ abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>(
|
|||||||
}.let {
|
}.let {
|
||||||
if (it > 0) {
|
if (it > 0) {
|
||||||
transaction(db = database) {
|
transaction(db = database) {
|
||||||
select {
|
selectAll().where {
|
||||||
selectById(this, id)
|
selectById(this, id)
|
||||||
}.limit(1).firstOrNull() ?.asObject
|
}.limit(1).firstOrNull() ?.asObject
|
||||||
}
|
}
|
||||||
@@ -142,7 +142,7 @@ abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>(
|
|||||||
ids
|
ids
|
||||||
} else {
|
} else {
|
||||||
ids.filter {
|
ids.filter {
|
||||||
select { selectById(it) }.limit(1).none()
|
selectAll().where { selectById(it) }.limit(1).none()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}.forEach {
|
}.forEach {
|
||||||
|
@@ -65,7 +65,7 @@ abstract class AbstractExposedKeyValueRepo<Key, Value>(
|
|||||||
override suspend fun unsetWithValues(toUnset: List<Value>) {
|
override suspend fun unsetWithValues(toUnset: List<Value>) {
|
||||||
transaction(database) {
|
transaction(database) {
|
||||||
toUnset.flatMap {
|
toUnset.flatMap {
|
||||||
val keys = select { selectByValue(it) }.mapNotNull { it.asKey }
|
val keys = selectAll().where { selectByValue(it) }.mapNotNull { it.asKey }
|
||||||
deleteWhere { selectByIds(it, keys) }
|
deleteWhere { selectByIds(it, keys) }
|
||||||
keys
|
keys
|
||||||
}
|
}
|
||||||
|
@@ -24,11 +24,11 @@ abstract class AbstractExposedReadKeyValueRepo<Key, Value>(
|
|||||||
abstract val selectByValue: ISqlExpressionBuilder.(Value) -> Op<Boolean>
|
abstract val selectByValue: ISqlExpressionBuilder.(Value) -> Op<Boolean>
|
||||||
|
|
||||||
override suspend fun get(k: Key): Value? = transaction(database) {
|
override suspend fun get(k: Key): Value? = transaction(database) {
|
||||||
select { selectById(k) }.limit(1).firstOrNull() ?.asObject
|
selectAll().where { selectById(k) }.limit(1).firstOrNull() ?.asObject
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun contains(key: Key): Boolean = transaction(database) {
|
override suspend fun contains(key: Key): Boolean = transaction(database) {
|
||||||
select { selectById(key) }.limit(1).any()
|
selectAll().where { selectById(key) }.limit(1).any()
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun getAll(): Map<Key, Value> = transaction(database) { selectAll().associate { it.asKey to it.asObject } }
|
override suspend fun getAll(): Map<Key, Value> = transaction(database) { selectAll().associate { it.asKey to it.asObject } }
|
||||||
@@ -46,7 +46,7 @@ abstract class AbstractExposedReadKeyValueRepo<Key, Value>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun keys(v: Value, pagination: Pagination, reversed: Boolean): PaginationResult<Key> = transaction(database) {
|
override suspend fun keys(v: Value, pagination: Pagination, reversed: Boolean): PaginationResult<Key> = transaction(database) {
|
||||||
select { selectByValue(v) }.selectPaginated(
|
selectAll().where { selectByValue(v) }.selectPaginated(
|
||||||
pagination,
|
pagination,
|
||||||
keyColumn,
|
keyColumn,
|
||||||
reversed
|
reversed
|
||||||
|
@@ -65,7 +65,7 @@ open class ExposedKeyValueRepo<Key, Value>(
|
|||||||
override suspend fun unsetWithValues(toUnset: List<Value>) {
|
override suspend fun unsetWithValues(toUnset: List<Value>) {
|
||||||
transaction(database) {
|
transaction(database) {
|
||||||
toUnset.flatMap {
|
toUnset.flatMap {
|
||||||
val keys = select { valueColumn.eq(it) }.mapNotNull { it[keyColumn] }
|
val keys = selectAll().where { valueColumn.eq(it) }.mapNotNull { it[keyColumn] }
|
||||||
deleteWhere { keyColumn.inList(keys) }
|
deleteWhere { keyColumn.inList(keys) }
|
||||||
keys
|
keys
|
||||||
}
|
}
|
||||||
|
@@ -29,7 +29,7 @@ abstract class AbstractExposedKeyValuesRepo<Key, Value>(
|
|||||||
transaction(database) {
|
transaction(database) {
|
||||||
toAdd.keys.flatMap { k ->
|
toAdd.keys.flatMap { k ->
|
||||||
toAdd[k] ?.mapNotNull { v ->
|
toAdd[k] ?.mapNotNull { v ->
|
||||||
if (select { selectById(k).and(selectByValue(v)) }.limit(1).any()) {
|
if (selectAll().where { selectById(k).and(selectByValue(v)) }.limit(1).any()) {
|
||||||
return@mapNotNull null
|
return@mapNotNull null
|
||||||
}
|
}
|
||||||
val insertResult = insert {
|
val insertResult = insert {
|
||||||
|
@@ -19,7 +19,7 @@ abstract class AbstractExposedReadKeyValuesRepo<Key, Value>(
|
|||||||
get() = asKey
|
get() = asKey
|
||||||
abstract val selectByValue: ISqlExpressionBuilder.(Value) -> Op<Boolean>
|
abstract val selectByValue: ISqlExpressionBuilder.(Value) -> Op<Boolean>
|
||||||
|
|
||||||
override suspend fun count(k: Key): Long = transaction(database) { select { selectById(k) }.count() }
|
override suspend fun count(k: Key): Long = transaction(database) { selectAll().where { selectById(k) }.count() }
|
||||||
|
|
||||||
override suspend fun count(): Long = transaction(database) { selectAll().count() }
|
override suspend fun count(): Long = transaction(database) { selectAll().count() }
|
||||||
|
|
||||||
@@ -28,7 +28,7 @@ abstract class AbstractExposedReadKeyValuesRepo<Key, Value>(
|
|||||||
pagination: Pagination,
|
pagination: Pagination,
|
||||||
reversed: Boolean
|
reversed: Boolean
|
||||||
): PaginationResult<Value> = transaction(database) {
|
): PaginationResult<Value> = transaction(database) {
|
||||||
select { selectById(k) }.selectPaginated(
|
selectAll().where { selectById(k) }.selectPaginated(
|
||||||
pagination,
|
pagination,
|
||||||
keyColumn,
|
keyColumn,
|
||||||
reversed
|
reversed
|
||||||
@@ -55,7 +55,7 @@ abstract class AbstractExposedReadKeyValuesRepo<Key, Value>(
|
|||||||
pagination: Pagination,
|
pagination: Pagination,
|
||||||
reversed: Boolean
|
reversed: Boolean
|
||||||
): PaginationResult<Key> = transaction(database) {
|
): PaginationResult<Key> = transaction(database) {
|
||||||
select { selectByValue(v) }.selectPaginated(
|
selectAll().where { selectByValue(v) }.selectPaginated(
|
||||||
pagination,
|
pagination,
|
||||||
keyColumn,
|
keyColumn,
|
||||||
reversed
|
reversed
|
||||||
@@ -65,11 +65,11 @@ abstract class AbstractExposedReadKeyValuesRepo<Key, Value>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun contains(k: Key): Boolean = transaction(database) {
|
override suspend fun contains(k: Key): Boolean = transaction(database) {
|
||||||
select { selectById(k) }.limit(1).any()
|
selectAll().where { selectById(k) }.limit(1).any()
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun contains(k: Key, v: Value): Boolean = transaction(database) {
|
override suspend fun contains(k: Key, v: Value): Boolean = transaction(database) {
|
||||||
select { selectById(k).and(selectByValue(v)) }.limit(1).any()
|
selectAll().where { selectById(k).and(selectByValue(v)) }.limit(1).any()
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun getAll(reverseLists: Boolean): Map<Key, List<Value>> = transaction(database) {
|
override suspend fun getAll(reverseLists: Boolean): Map<Key, List<Value>> = transaction(database) {
|
||||||
@@ -85,9 +85,9 @@ abstract class AbstractExposedReadKeyValuesRepo<Key, Value>(
|
|||||||
|
|
||||||
override suspend fun getAll(k: Key, reverseLists: Boolean): List<Value> = transaction(database) {
|
override suspend fun getAll(k: Key, reverseLists: Boolean): List<Value> = transaction(database) {
|
||||||
val query = if (reverseLists) {
|
val query = if (reverseLists) {
|
||||||
select { selectById(k) }.orderBy(keyColumn, SortOrder.DESC)
|
selectAll().where { selectById(k) }.orderBy(keyColumn, SortOrder.DESC)
|
||||||
} else {
|
} else {
|
||||||
select { selectById(k) }
|
selectAll().where { selectById(k) }
|
||||||
}
|
}
|
||||||
query.map {
|
query.map {
|
||||||
it.asObject
|
it.asObject
|
||||||
|
@@ -34,7 +34,7 @@ open class ExposedKeyValuesRepo<Key, Value>(
|
|||||||
transaction(database) {
|
transaction(database) {
|
||||||
toAdd.keys.flatMap { k ->
|
toAdd.keys.flatMap { k ->
|
||||||
toAdd[k] ?.mapNotNull { v ->
|
toAdd[k] ?.mapNotNull { v ->
|
||||||
if (select { keyColumn.eq(k).and(valueColumn.eq(v)) }.limit(1).count() > 0) {
|
if (selectAll().where { keyColumn.eq(k).and(valueColumn.eq(v)) }.limit(1).count() > 0) {
|
||||||
return@mapNotNull null
|
return@mapNotNull null
|
||||||
}
|
}
|
||||||
val insertResult = insert {
|
val insertResult = insert {
|
||||||
@@ -69,7 +69,7 @@ open class ExposedKeyValuesRepo<Key, Value>(
|
|||||||
|
|
||||||
override suspend fun removeWithValue(v: Value) {
|
override suspend fun removeWithValue(v: Value) {
|
||||||
transaction(database) {
|
transaction(database) {
|
||||||
val keys = select { selectByValue(v) }.map { it.asKey }
|
val keys = selectAll().where { selectByValue(v) }.map { it.asKey }
|
||||||
deleteWhere { SqlExpressionBuilder.selectByValue(v) }
|
deleteWhere { SqlExpressionBuilder.selectByValue(v) }
|
||||||
keys
|
keys
|
||||||
}.forEach {
|
}.forEach {
|
||||||
@@ -85,7 +85,7 @@ open class ExposedKeyValuesRepo<Key, Value>(
|
|||||||
|
|
||||||
override suspend fun clearWithValue(v: Value) {
|
override suspend fun clearWithValue(v: Value) {
|
||||||
transaction(database) {
|
transaction(database) {
|
||||||
val toClear = select { selectByValue(v) }
|
val toClear = selectAll().where { selectByValue(v) }
|
||||||
.asSequence()
|
.asSequence()
|
||||||
.map { it.asKey to it.asObject }
|
.map { it.asKey to it.asObject }
|
||||||
.groupBy { it.first }
|
.groupBy { it.first }
|
||||||
|
@@ -26,7 +26,7 @@ class ExposedStandardVersionsRepoProxy(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun getTableVersion(tableName: String): Int? = transaction(database) {
|
override suspend fun getTableVersion(tableName: String): Int? = transaction(database) {
|
||||||
select { tableNameColumn.eq(tableName) }.limit(1).firstOrNull() ?.getOrNull(tableVersionColumn)
|
selectAll().where { tableNameColumn.eq(tableName) }.limit(1).firstOrNull() ?.getOrNull(tableVersionColumn)
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun updateTableVersion(tableName: String, version: Int) {
|
override suspend fun updateTableVersion(tableName: String, version: Int) {
|
||||||
|
@@ -39,7 +39,10 @@ class StringResource(
|
|||||||
fun build() = StringResource(default, map.toMap())
|
fun build() = StringResource(default, map.toMap())
|
||||||
}
|
}
|
||||||
|
|
||||||
fun translation(languageCode: IetfLang): String {
|
fun translation(languageCode: IetfLang?): String {
|
||||||
|
if (languageCode == null) {
|
||||||
|
return default
|
||||||
|
}
|
||||||
map[languageCode] ?.let { return it.value }
|
map[languageCode] ?.let { return it.value }
|
||||||
|
|
||||||
return languageCode.parentLang ?.let {
|
return languageCode.parentLang ?.let {
|
||||||
|
11
resources/src/jsMain/kotlin/StringResourceExtensions.kt
Normal file
11
resources/src/jsMain/kotlin/StringResourceExtensions.kt
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
package dev.inmo.micro_utils.strings
|
||||||
|
|
||||||
|
import dev.inmo.micro_utils.language_codes.IetfLang
|
||||||
|
import kotlinx.browser.window
|
||||||
|
import org.w3c.dom.NavigatorLanguage
|
||||||
|
|
||||||
|
fun StringResource.translation(language: NavigatorLanguage) = translation(
|
||||||
|
language.language.unsafeCast<String?>() ?.let { IetfLang(it) }
|
||||||
|
)
|
||||||
|
|
||||||
|
fun StringResource.translation() = translation(window.navigator)
|
@@ -42,6 +42,7 @@ String[] includes = [
|
|||||||
":serialization:mapper",
|
":serialization:mapper",
|
||||||
":startup:plugin",
|
":startup:plugin",
|
||||||
":startup:launcher",
|
":startup:launcher",
|
||||||
|
":colors:common",
|
||||||
|
|
||||||
":resources",
|
":resources",
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user