mirror of
				https://github.com/InsanusMokrassar/MicroUtils.git
				synced 2025-10-31 12:10:29 +00:00 
			
		
		
		
	Compare commits
	
		
			41 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| a47e17fe6e | |||
| 01dc3b63ff | |||
| 2d97e0699e | |||
| 75f514d99b | |||
| 9a687cfc1c | |||
| 14edf8b6b7 | |||
| 23aa2d8917 | |||
| 7651388b5c | |||
| 805ab32b24 | |||
| cc623b1097 | |||
| 1420416b3e | |||
| 9a0b67f938 | |||
| 303e1e6281 | |||
| ff59b0cc9c | |||
| be5d2ee715 | |||
| 8dd2e3f6f9 | |||
| 2eedd196d2 | |||
| 759a3f2784 | |||
| 386fa830c3 | |||
| c382423d77 | |||
| bb466ce66c | |||
| 72cd3dd8a1 | |||
|  | 595cedaaf1 | ||
| eeaceb6cf5 | |||
| 1bd671685b | |||
| 48d3fe41f2 | |||
| 7ab21871cd | |||
| 65d01b1fb3 | |||
| 6230accb68 | |||
| c6ed821934 | |||
| 10e03bb951 | |||
| aa4f392948 | |||
| f51b59ec02 | |||
| 8c76834ae4 | |||
| 4a454f3d67 | |||
| 151aa1863d | |||
| 3bf6896296 | |||
| 0d01561476 | |||
| f6ded92251 | |||
| d01b735cc6 | |||
| 6c12001080 | 
							
								
								
									
										59
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										59
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,64 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## 0.20.28 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Kotlin`: `1.9.22` -> `1.9.21` (downgrade) | ||||||
|  |     * `Compose`: `1.6.0-dev13691` -> `1.5.11` (downgrade) | ||||||
|  |  | ||||||
|  | ## 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 | ||||||
|  |  | ||||||
|  | **Since this version depdendencies of klock and krypto replaced with `com.soywiz.korge:korlibs-time` and `com.soywiz.korge:korlibs-crypto`** | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Klock` (since now `KorlibsTime`): `4.0.10` -> `5.3.0` | ||||||
|  |     * `Krypto` (since now `KorlibsCrypto`): `4.0.10` -> `5.3.0` | ||||||
|  | * `Serialization`: | ||||||
|  |     * `Mapper`: | ||||||
|  |         * `Mapper` pass decoder into callback of deserialization strategy | ||||||
|  |         * `Mapper` pass encoder into callback of serialization strategy | ||||||
|  |  | ||||||
|  | ## 0.20.23 | ||||||
|  |  | ||||||
|  | * `Versions`: | ||||||
|  |     * `Koin`: `3.5.0` -> `3.5.3` | ||||||
|  |     * `Okio`: `3.6.0` -> `3.7.0` | ||||||
|  | * `LanguageCodes`: | ||||||
|  |     * Fixes in intermediate language codes (like `Chinese.Hans`) | ||||||
|  |     * Rename `IetfLanguageCode` to `IetfLang` | ||||||
|  |         * Rename all subsequent functions (including serializer) | ||||||
|  |     * New lazy properties `knownLanguageCodesMap`, `knownLanguageCodesMapByLowerCasedKeys` and several others | ||||||
|  |  | ||||||
|  | ## 0.20.22 | ||||||
|  |  | ||||||
|  | * `Common`: | ||||||
|  |     * Add opportunity to create own `Diff` with base constructor | ||||||
|  |  | ||||||
|  | ## 0.20.21 | ||||||
|  |  | ||||||
|  | * `Resources`: | ||||||
|  |     * Inited | ||||||
|  |  | ||||||
| ## 0.20.20 | ## 0.20.20 | ||||||
|  |  | ||||||
| * `Repos`: | * `Repos`: | ||||||
|   | |||||||
							
								
								
									
										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)) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -27,7 +27,7 @@ private inline fun <T> getObject( | |||||||
|  * @see calculateDiff |  * @see calculateDiff | ||||||
|  */ |  */ | ||||||
| @Serializable | @Serializable | ||||||
| data class Diff<T> internal constructor( | data class Diff<T> @Warning(warning) constructor( | ||||||
|     val removed: List<@Serializable(IndexedValueSerializer::class) IndexedValue<T>>, |     val removed: List<@Serializable(IndexedValueSerializer::class) IndexedValue<T>>, | ||||||
|     /** |     /** | ||||||
|      * Old-New values pairs |      * Old-New values pairs | ||||||
| @@ -36,6 +36,10 @@ data class Diff<T> internal constructor( | |||||||
|     val added: List<@Serializable(IndexedValueSerializer::class) IndexedValue<T>> |     val added: List<@Serializable(IndexedValueSerializer::class) IndexedValue<T>> | ||||||
| ) { | ) { | ||||||
|     fun isEmpty(): Boolean = removed.isEmpty() && replaced.isEmpty() && added.isEmpty() |     fun isEmpty(): Boolean = removed.isEmpty() && replaced.isEmpty() && added.isEmpty() | ||||||
|  |  | ||||||
|  |     companion object { | ||||||
|  |         private const val warning = "This feature can be changed without any warranties. Use with caution and only in case you know what you are doing" | ||||||
|  |     } | ||||||
| } | } | ||||||
|  |  | ||||||
| fun <T> emptyDiff(): Diff<T> = Diff(emptyList(), emptyList(), emptyList()) | fun <T> emptyDiff(): Diff<T> = Diff(emptyList(), emptyList(), emptyList()) | ||||||
|   | |||||||
| @@ -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.20 | version=0.20.28 | ||||||
| android_code_version=226 | android_code_version=234 | ||||||
|   | |||||||
| @@ -7,26 +7,26 @@ kt-coroutines = "1.7.3" | |||||||
| kslog = "1.3.1" | kslog = "1.3.1" | ||||||
|  |  | ||||||
| jb-compose = "1.5.11" | jb-compose = "1.5.11" | ||||||
| jb-exposed = "0.45.0" | jb-exposed = "0.46.0" | ||||||
| jb-dokka = "1.9.10" | jb-dokka = "1.9.10" | ||||||
|  |  | ||||||
| korlibs = "4.0.10" | korlibs = "5.3.0" | ||||||
| uuid = "0.8.2" | 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.0" | koin = "3.5.3" | ||||||
|  |  | ||||||
| okio = "3.6.0" | okio = "3.7.0" | ||||||
|  |  | ||||||
| ksp = "1.9.21-1.0.15" | 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" | ||||||
| @@ -72,8 +72,8 @@ ktor-server-content-negotiation = { module = "io.ktor:ktor-server-content-negoti | |||||||
|  |  | ||||||
| kslog = { module = "dev.inmo:kslog", version.ref = "kslog" } | kslog = { module = "dev.inmo:kslog", version.ref = "kslog" } | ||||||
|  |  | ||||||
| klock = { module = "com.soywiz.korlibs.klock:klock", version.ref = "korlibs" } | klock = { module = "com.soywiz.korge:korlibs-time", version.ref = "korlibs" } | ||||||
| krypto = { module = "com.soywiz.korlibs.krypto:krypto", version.ref = "korlibs" } | krypto = { module = "com.soywiz.korge:korlibs-crypto", version.ref = "korlibs" } | ||||||
| uuid = { module = "com.benasher44:uuid", version.ref = "uuid" } | uuid = { module = "com.benasher44:uuid", version.ref = "uuid" } | ||||||
| koin = { module = "io.insert-koin:koin-core", version.ref = "koin" } | koin = { module = "io.insert-koin:koin-core", version.ref = "koin" } | ||||||
|  |  | ||||||
|   | |||||||
							
								
								
									
										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.4-bin.zip | distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip | ||||||
| zipStoreBase=GRADLE_USER_HOME | zipStoreBase=GRADLE_USER_HOME | ||||||
| zipStorePath=wrapper/dists | zipStorePath=wrapper/dists | ||||||
|   | |||||||
| @@ -12,9 +12,12 @@ private val json = Json { | |||||||
|     ignoreUnknownKeys = true |     ignoreUnknownKeys = true | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| private const val baseClassName = "IetfLanguageCode" | private const val baseClassName = "IetfLang" | ||||||
|  | private const val oldBaseClassName = "IetfLanguageCode" | ||||||
| private const val unknownBaseClassName = "Unknown$baseClassName" | private const val unknownBaseClassName = "Unknown$baseClassName" | ||||||
| private const val baseClassSerializerName = "IetfLanguageCodeSerializer" | private const val oldUnknownBaseClassName = "Unknown$oldBaseClassName" | ||||||
|  | private const val baseClassSerializerName = "${baseClassName}Serializer" | ||||||
|  | private const val oldBaseClassSerializerName = "IetfLanguageCodeSerializer" | ||||||
| private const val baseClassSerializerAnnotationName = "@Serializable(${baseClassSerializerName}::class)" | private const val baseClassSerializerAnnotationName = "@Serializable(${baseClassSerializerName}::class)" | ||||||
| 
 | 
 | ||||||
| @Serializable | @Serializable | ||||||
| @@ -78,14 +81,12 @@ private fun printLanguageCodeAndTags( | |||||||
|     indents: String = "    " |     indents: String = "    " | ||||||
| ): String = if (tag.subtags.isEmpty()) { | ): String = if (tag.subtags.isEmpty()) { | ||||||
| """${indents}${baseClassSerializerAnnotationName} | """${indents}${baseClassSerializerAnnotationName} | ||||||
| ${indents}object ${tag.title} : ${parent ?.title ?: baseClassName}() { override val code: String = "${tag.tag}"; override val withoutDialect: String get() = ${parent ?.title ?.let { "$it.code" } ?: "code"} }""" | ${indents}object ${tag.title} : ${parent ?.title ?: baseClassName}() { override val code: String = "${tag.tag}"${parent ?.let { parent -> "; override val parentLang: ${parent.title} get() = ${parent.title};" } ?: ""} }""" | ||||||
| } else { | } else { | ||||||
| """ | """ | ||||||
| ${indents}${baseClassSerializerAnnotationName} | ${indents}${baseClassSerializerAnnotationName} | ||||||
| ${indents}sealed class ${tag.title} : ${parent ?.title ?: baseClassName}() { | ${indents}sealed class ${tag.title} : ${parent ?.title ?: baseClassName}() { | ||||||
| ${indents}    override val code: String = "${tag.tag}" | ${indents}    override val code: String = "${tag.tag}"${parent ?.let { parent -> "\n${indents}    override val parentLang: ${parent.title} get() = ${parent.title};" } ?: ""} | ||||||
| ${indents}    override val withoutDialect: String |  | ||||||
| ${indents}        get() = code |  | ||||||
| 
 | 
 | ||||||
| ${tag.subtags.joinToString("\n") { printLanguageCodeAndTags(it, tag, "${indents}    ") }} | ${tag.subtags.joinToString("\n") { printLanguageCodeAndTags(it, tag, "${indents}    ") }} | ||||||
| 
 | 
 | ||||||
| @@ -95,7 +96,7 @@ ${indents}} | |||||||
| """ | """ | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| fun buildKtFileContent(tags: List<Tag>): String = """ | fun buildKtFileContent(tags: List<Tag>, prePackage: String): String = """ | ||||||
| import kotlinx.serialization.Serializable | import kotlinx.serialization.Serializable | ||||||
| 
 | 
 | ||||||
| /** | /** | ||||||
| @@ -106,20 +107,27 @@ import kotlinx.serialization.Serializable | |||||||
| ${baseClassSerializerAnnotationName} | ${baseClassSerializerAnnotationName} | ||||||
| sealed class $baseClassName { | sealed class $baseClassName { | ||||||
|     abstract val code: String |     abstract val code: String | ||||||
|     abstract val withoutDialect: String |     open val parentLang: $baseClassName? | ||||||
|  |         get() = null | ||||||
|  |     open val withoutDialect: String | ||||||
|  |         get() = parentLang ?.code ?: code | ||||||
| 
 | 
 | ||||||
| ${tags.joinToString("\n") { printLanguageCodeAndTags(it, indents = "    ") } } | ${tags.joinToString("\n") { printLanguageCodeAndTags(it, indents = "    ") } } | ||||||
| 
 | 
 | ||||||
|     $baseClassSerializerAnnotationName |     $baseClassSerializerAnnotationName | ||||||
|     data class $unknownBaseClassName (override val code: String) : $baseClassName() { |     data class $unknownBaseClassName (override val code: String) : $baseClassName() { | ||||||
|         override val withoutDialect: String = code.takeWhile { it != '-' } |         override val parentLang = code.dropLastWhile { it != '-' }.removeSuffix("-").takeIf { it.length > 0 } ?.let(::$unknownBaseClassName) | ||||||
|     } |     } | ||||||
|  |     @Deprecated("Renamed", ReplaceWith("$baseClassName.$unknownBaseClassName", "${if (prePackage.isNotEmpty()) "$prePackage." else ""}$baseClassName.$unknownBaseClassName")) | ||||||
|  |     val $oldUnknownBaseClassName = $unknownBaseClassName | ||||||
| 
 | 
 | ||||||
|     override fun toString() = code |     override fun toString() = code | ||||||
| } | } | ||||||
|  | @Deprecated("Renamed", ReplaceWith("$baseClassName", "${if (prePackage.isNotEmpty()) "$prePackage." else ""}$baseClassName")) | ||||||
|  | typealias $oldBaseClassName = $baseClassName | ||||||
| """.trimIndent() | """.trimIndent() | ||||||
| 
 | 
 | ||||||
| fun createStringConverterCode(tags: List<Tag>): String { | fun createStringConverterCode(tags: List<Tag>, prePackage: String): String { | ||||||
|     fun createDeserializeVariantForTag( |     fun createDeserializeVariantForTag( | ||||||
|         tag: Tag, |         tag: Tag, | ||||||
|         pretitle: String = baseClassName, |         pretitle: String = baseClassName, | ||||||
| @@ -128,19 +136,70 @@ fun createStringConverterCode(tags: List<Tag>): String { | |||||||
|         val currentTitle = "$pretitle.${tag.title}" |         val currentTitle = "$pretitle.${tag.title}" | ||||||
|         return """${indents}$currentTitle.code -> $currentTitle${if (tag.subtags.isNotEmpty()) tag.subtags.joinToString("\n", "\n") { createDeserializeVariantForTag(it, currentTitle, indents) } else ""}""" |         return """${indents}$currentTitle.code -> $currentTitle${if (tag.subtags.isNotEmpty()) tag.subtags.joinToString("\n", "\n") { createDeserializeVariantForTag(it, currentTitle, indents) } else ""}""" | ||||||
|     } |     } | ||||||
|  |     fun createInheritorVariantForTag( | ||||||
|  |         tag: Tag, | ||||||
|  |         pretitle: String = baseClassName, | ||||||
|  |         indents: String = "        " | ||||||
|  |     ): String { | ||||||
|  |         val currentTitle = "$pretitle.${tag.title}" | ||||||
|  |         val subtags = if (tag.subtags.isNotEmpty()) { | ||||||
|  |             tag.subtags.joinToString(",\n", ",\n") { createInheritorVariantForTag(it, currentTitle, "$indents    ") } | ||||||
|  |         } else { | ||||||
|  |             "" | ||||||
|  |         } | ||||||
|  |         return "${indents}$currentTitle$subtags" | ||||||
|  |     } | ||||||
|  |     fun createInheritorVariantForMapForTag( | ||||||
|  |         tag: Tag, | ||||||
|  |         pretitle: String = baseClassName, | ||||||
|  |         indents: String = "        ", | ||||||
|  |         codeSuffix: String = "" | ||||||
|  |     ): String { | ||||||
|  |         val currentTitle = "$pretitle.${tag.title}" | ||||||
|  |         val subtags = if (tag.subtags.isNotEmpty()) { | ||||||
|  |             tag.subtags.joinToString(",\n", ",\n") { createInheritorVariantForMapForTag(it, currentTitle, "$indents    ", codeSuffix) } | ||||||
|  |         } else { | ||||||
|  |             "" | ||||||
|  |         } | ||||||
|  |         return "${indents}$currentTitle.code${codeSuffix} to $currentTitle$subtags" | ||||||
|  |     } | ||||||
| 
 | 
 | ||||||
|     return """fun String.as$baseClassName(): $baseClassName { |     return """val knownLanguageCodesMap: Map<String, $baseClassName> by lazy { | ||||||
|     return when (this) { |     mapOf( | ||||||
| ${tags.joinToString("\n") { createDeserializeVariantForTag(it) }} | ${tags.joinToString(",\n") { createInheritorVariantForMapForTag(it, indents = "        ") }} | ||||||
|         else -> $baseClassName.${unknownBaseClassName}(this) |     ) | ||||||
| } | } | ||||||
|  | val knownLanguageCodesMapByLowerCasedKeys: Map<String, $baseClassName> by lazy { | ||||||
|  |     mapOf( | ||||||
|  | ${tags.joinToString(",\n") { createInheritorVariantForMapForTag(it, indents = "        ", codeSuffix = ".lowercase()") }} | ||||||
|  |     ) | ||||||
| } | } | ||||||
|  | val knownLanguageCodes: List<$baseClassName> by lazy { | ||||||
|  |     knownLanguageCodesMap.values.toList() | ||||||
|  | } | ||||||
|  | 
 | ||||||
|  | fun String.as$baseClassName(): $baseClassName { | ||||||
|  |     return knownLanguageCodesMap[this] ?: $baseClassName.${unknownBaseClassName}(this) | ||||||
|  | } | ||||||
|  | fun String.as${baseClassName}CaseInsensitive(): $baseClassName { | ||||||
|  |     return knownLanguageCodesMapByLowerCasedKeys[this.lowercase()] ?: $baseClassName.${unknownBaseClassName}(this) | ||||||
|  | } | ||||||
|  | @Deprecated("Renamed", ReplaceWith("this.as$baseClassName()", "${if (prePackage.isNotEmpty()) "$prePackage." else ""}as$baseClassName")) | ||||||
|  | fun String.as$oldBaseClassName(): $baseClassName = as$baseClassName() | ||||||
|  | 
 | ||||||
| fun convertTo$baseClassName(code: String) = code.as$baseClassName() | fun convertTo$baseClassName(code: String) = code.as$baseClassName() | ||||||
|  | fun convertTo${baseClassName}CaseInsensitive(code: String) = code.as${baseClassName}CaseInsensitive() | ||||||
|  | @Deprecated("Renamed", ReplaceWith("convertTo$baseClassName(code)", "${if (prePackage.isNotEmpty()) "$prePackage." else ""}convertTo$baseClassName")) | ||||||
|  | fun convertTo$oldBaseClassName(code: String) = convertTo$baseClassName(code) | ||||||
|  | 
 | ||||||
| fun $baseClassName(code: String) = code.as$baseClassName() | fun $baseClassName(code: String) = code.as$baseClassName() | ||||||
|  | fun ${baseClassName}CaseInsensitive(code: String) = code.as${baseClassName}CaseInsensitive() | ||||||
|  | @Deprecated("Renamed", ReplaceWith("$baseClassName(code)", "${if (prePackage.isNotEmpty()) "$prePackage." else ""}$baseClassName")) | ||||||
|  | fun $oldBaseClassName(code: String) = $baseClassName(code) | ||||||
| """ | """ | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| fun createSerializerCode(tags: List<Tag>): String { | fun createSerializerCode(tags: List<Tag>, prePackage: String): String { | ||||||
|     return """import kotlinx.serialization.KSerializer |     return """import kotlinx.serialization.KSerializer | ||||||
| import kotlinx.serialization.builtins.serializer | import kotlinx.serialization.builtins.serializer | ||||||
| import kotlinx.serialization.encoding.Decoder | import kotlinx.serialization.encoding.Decoder | ||||||
| @@ -153,16 +212,20 @@ object $baseClassSerializerName : KSerializer<$baseClassName> { | |||||||
|         return $baseClassName(decoder.decodeString()) |         return $baseClassName(decoder.decodeString()) | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     override fun serialize(encoder: Encoder, value: IetfLanguageCode) { |     override fun serialize(encoder: Encoder, value: $baseClassName) { | ||||||
|         encoder.encodeString(value.code) |         encoder.encodeString(value.code) | ||||||
|     } |     } | ||||||
| } | } | ||||||
|  | @Deprecated("Renamed", ReplaceWith("$baseClassSerializerName", "${if (prePackage.isNotEmpty()) "$prePackage." else ""}$baseClassSerializerName")) | ||||||
|  | typealias $oldBaseClassSerializerName = $baseClassSerializerName | ||||||
| """ | """ | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| suspend fun main(vararg args: String) { | suspend fun main(vararg args: String) { | ||||||
|     val outputFolder = args.firstOrNull() ?.let { File(it) } |     val outputFolder = args.firstOrNull() ?.let { File(it) } | ||||||
|     outputFolder ?.mkdirs() |     outputFolder ?.mkdirs() | ||||||
|  |     val targetPackage = args.getOrNull(1) | ||||||
|  |     val targetPackagePrefix = targetPackage ?.let { "package $it\n\n" } ?: "" | ||||||
|     val ietfLanguageCodesLink = "https://datahub.io/core/language-codes/r/language-codes.json" |     val ietfLanguageCodesLink = "https://datahub.io/core/language-codes/r/language-codes.json" | ||||||
|     val ietfLanguageCodesAdditionalTagsLink = "https://datahub.io/core/language-codes/r/ietf-language-tags.json" |     val ietfLanguageCodesAdditionalTagsLink = "https://datahub.io/core/language-codes/r/ietf-language-tags.json" | ||||||
| 
 | 
 | ||||||
| @@ -203,18 +266,18 @@ suspend fun main(vararg args: String) { | |||||||
|     File(outputFolder, "LanguageCodes.kt").apply { |     File(outputFolder, "LanguageCodes.kt").apply { | ||||||
|         delete() |         delete() | ||||||
|         createNewFile() |         createNewFile() | ||||||
|         writeText(buildKtFileContent(tags)) |         writeText(targetPackagePrefix + buildKtFileContent(tags, targetPackage ?: "")) | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     File(outputFolder, "StringToLanguageCodes.kt").apply { |     File(outputFolder, "StringToLanguageCodes.kt").apply { | ||||||
|         delete() |         delete() | ||||||
|         createNewFile() |         createNewFile() | ||||||
|         writeText(createStringConverterCode(tags)) |         writeText(targetPackagePrefix + createStringConverterCode(tags, targetPackage ?: "")) | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     File(outputFolder, "$baseClassSerializerName.kt").apply { |     File(outputFolder, "$baseClassSerializerName.kt").apply { | ||||||
|         delete() |         delete() | ||||||
|         createNewFile() |         createNewFile() | ||||||
|         writeText(createSerializerCode(tags)) |         writeText(targetPackagePrefix + createSerializerCode(tags, targetPackage ?: "")) | ||||||
|     } |     } | ||||||
| } | } | ||||||
| @@ -0,0 +1,20 @@ | |||||||
|  | package dev.inmo.micro_utils.language_codes | ||||||
|  |  | ||||||
|  | import kotlinx.serialization.KSerializer | ||||||
|  | import kotlinx.serialization.builtins.serializer | ||||||
|  | import kotlinx.serialization.encoding.Decoder | ||||||
|  | import kotlinx.serialization.encoding.Encoder | ||||||
|  |  | ||||||
|  | object IetfLangSerializer : KSerializer<IetfLang> { | ||||||
|  |     override val descriptor = String.serializer().descriptor | ||||||
|  |  | ||||||
|  |     override fun deserialize(decoder: Decoder): IetfLang { | ||||||
|  |         return IetfLang(decoder.decodeString()) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     override fun serialize(encoder: Encoder, value: IetfLang) { | ||||||
|  |         encoder.encodeString(value.code) | ||||||
|  |     } | ||||||
|  | } | ||||||
|  | @Deprecated("Renamed", ReplaceWith("IetfLangSerializer", "dev.inmo.micro_utils.language_codes.IetfLangSerializer")) | ||||||
|  | typealias IetfLanguageCodeSerializer = IetfLangSerializer | ||||||
| @@ -1,18 +0,0 @@ | |||||||
| package dev.inmo.micro_utils.language_codes |  | ||||||
|  |  | ||||||
| import kotlinx.serialization.KSerializer |  | ||||||
| import kotlinx.serialization.builtins.serializer |  | ||||||
| import kotlinx.serialization.encoding.Decoder |  | ||||||
| import kotlinx.serialization.encoding.Encoder |  | ||||||
|  |  | ||||||
| object IetfLanguageCodeSerializer : KSerializer<IetfLanguageCode> { |  | ||||||
|     override val descriptor = String.serializer().descriptor |  | ||||||
|  |  | ||||||
|     override fun deserialize(decoder: Decoder): IetfLanguageCode { |  | ||||||
|         return IetfLanguageCode(decoder.decodeString()) |  | ||||||
|     } |  | ||||||
|  |  | ||||||
|     override fun serialize(encoder: Encoder, value: IetfLanguageCode) { |  | ||||||
|         encoder.encodeString(value.code) |  | ||||||
|     } |  | ||||||
| } |  | ||||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							| @@ -0,0 +1,16 @@ | |||||||
|  | package dev.inmo.micro_utils.language_codes | ||||||
|  |  | ||||||
|  | import kotlin.test.Test | ||||||
|  | import kotlin.test.assertEquals | ||||||
|  |  | ||||||
|  | class UnknownIetfLanguageTests { | ||||||
|  |     @Test | ||||||
|  |     fun commonTestOfParentCode() { | ||||||
|  |         knownLanguageCodes.forEach { | ||||||
|  |             val language = IetfLang.UnknownIetfLang(it.code) | ||||||
|  |             assertEquals(it.code, language.code) | ||||||
|  |             assertEquals(it.withoutDialect, language.withoutDialect) | ||||||
|  |             assertEquals(it.parentLang ?.code, language.parentLang ?.code) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -2,7 +2,9 @@ package dev.inmo.micro_utils.language_codes | |||||||
|  |  | ||||||
| import java.util.Locale | import java.util.Locale | ||||||
|  |  | ||||||
| fun IetfLanguageCode.toJavaLocale(): Locale = Locale.forLanguageTag(code) | fun IetfLang.toJavaLocale(): Locale = Locale.forLanguageTag(code) | ||||||
| fun IetfLanguageCode?.toJavaLocaleOrDefault(): Locale = this ?.toJavaLocale() ?: Locale.getDefault() | fun IetfLang?.toJavaLocaleOrDefault(): Locale = this?.toJavaLocale() ?: Locale.getDefault() | ||||||
|  |  | ||||||
| fun Locale.toIetfLanguageCode(): IetfLanguageCode = IetfLanguageCode(toLanguageTag()) | fun Locale.toIetfLang(): IetfLang = IetfLang(toLanguageTag()) | ||||||
|  | @Deprecated("Renamed", ReplaceWith("this.toIetfLang()", "dev.inmo.micro_utils.language_codes.toIetfLang")) | ||||||
|  | fun Locale.toIetfLanguageCode(): IetfLang = toIetfLang() | ||||||
|   | |||||||
| @@ -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) { | ||||||
|   | |||||||
							
								
								
									
										21
									
								
								resources/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										21
									
								
								resources/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,21 @@ | |||||||
|  | plugins { | ||||||
|  |     id "org.jetbrains.kotlin.multiplatform" | ||||||
|  |     id "org.jetbrains.kotlin.plugin.serialization" | ||||||
|  |     id "com.android.library" | ||||||
|  | } | ||||||
|  |  | ||||||
|  | apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" | ||||||
|  |  | ||||||
|  | kotlin { | ||||||
|  |     sourceSets { | ||||||
|  |         commonMain { | ||||||
|  |             dependencies { | ||||||
|  |                 api project(":micro_utils.language_codes") | ||||||
|  |             } | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         androidMain { | ||||||
|  |             dependsOn(jvmMain) | ||||||
|  |         } | ||||||
|  |     } | ||||||
|  | } | ||||||
| @@ -0,0 +1,20 @@ | |||||||
|  | package dev.inmo.micro_utils.strings | ||||||
|  |  | ||||||
|  | import android.content.Context | ||||||
|  | import android.content.res.Configuration | ||||||
|  | import android.content.res.Resources | ||||||
|  | import android.os.Build | ||||||
|  |  | ||||||
|  | fun StringResource.translation(configuration: Configuration): String = translation( | ||||||
|  |     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { | ||||||
|  |         configuration.locales[0] | ||||||
|  |     } else { | ||||||
|  |         configuration.locale | ||||||
|  |     } | ||||||
|  | ) | ||||||
|  | fun StringResource.translation(resources: Resources): String = translation(resources.configuration) | ||||||
|  | fun StringResource.translation(context: Context): String = translation(context.resources) | ||||||
|  |  | ||||||
|  | fun Configuration.translation(resource: StringResource): String = resource.translation(this) | ||||||
|  | fun Resources.translation(resource: StringResource): String = configuration.translation(resource) | ||||||
|  | fun Context.translation(resource: StringResource): String = resources.translation(resource) | ||||||
							
								
								
									
										59
									
								
								resources/src/commonMain/kotlin/StringResource.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										59
									
								
								resources/src/commonMain/kotlin/StringResource.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,59 @@ | |||||||
|  | package dev.inmo.micro_utils.strings | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.language_codes.IetfLang | ||||||
|  |  | ||||||
|  | /** | ||||||
|  |  * Use this class as a type of your strings object fields. For example: | ||||||
|  |  * | ||||||
|  |  * ```kotlin | ||||||
|  |  * object Strings { | ||||||
|  |  *     val someResource: StringResource | ||||||
|  |  * } | ||||||
|  |  * ``` | ||||||
|  |  * | ||||||
|  |  * Use [buildStringResource] for useful creation of string resource | ||||||
|  |  * | ||||||
|  |  * @see buildStringResource | ||||||
|  |  */ | ||||||
|  | class StringResource( | ||||||
|  |     val default: String, | ||||||
|  |     val map: Map<IetfLang, Lazy<String>> | ||||||
|  | ) { | ||||||
|  |     class Builder( | ||||||
|  |         var default: String | ||||||
|  |     ) { | ||||||
|  |         private val map = mutableMapOf<IetfLang, Lazy<String>>() | ||||||
|  |  | ||||||
|  |         infix fun IetfLang.variant(value: Lazy<String>) { | ||||||
|  |             map[this] = value | ||||||
|  |         } | ||||||
|  |  | ||||||
|  |         infix fun IetfLang.variant(value: () -> String) = this variant lazy(value) | ||||||
|  |         infix fun IetfLang.variant(value: String) = this variant lazyOf(value) | ||||||
|  |  | ||||||
|  |  | ||||||
|  |         infix fun String.variant(value: Lazy<String>) = IetfLang(this) variant value | ||||||
|  |         infix fun String.variant(value: () -> String) = IetfLang(this) variant lazy(value) | ||||||
|  |         infix fun String.variant(value: String) = this variant lazyOf(value) | ||||||
|  |  | ||||||
|  |         fun build() = StringResource(default, map.toMap()) | ||||||
|  |     } | ||||||
|  |  | ||||||
|  |     fun translation(languageCode: IetfLang?): String { | ||||||
|  |         if (languageCode == null) { | ||||||
|  |             return default | ||||||
|  |         } | ||||||
|  |         map[languageCode] ?.let { return it.value } | ||||||
|  |  | ||||||
|  |         return languageCode.parentLang ?.let { | ||||||
|  |             map[it] ?.value | ||||||
|  |         } ?: default | ||||||
|  |     } | ||||||
|  | } | ||||||
|  |  | ||||||
|  | inline fun buildStringResource( | ||||||
|  |     default: String, | ||||||
|  |     builder: StringResource.Builder.() -> Unit | ||||||
|  | ): StringResource { | ||||||
|  |     return StringResource.Builder(default).apply(builder).build() | ||||||
|  | } | ||||||
							
								
								
									
										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) | ||||||
							
								
								
									
										10
									
								
								resources/src/jvmMain/kotlin/StringResourceLocaleGetter.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								resources/src/jvmMain/kotlin/StringResourceLocaleGetter.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,10 @@ | |||||||
|  | package dev.inmo.micro_utils.strings | ||||||
|  |  | ||||||
|  | import dev.inmo.micro_utils.language_codes.toIetfLang | ||||||
|  | import java.util.Locale | ||||||
|  |  | ||||||
|  | fun StringResource.translation(locale: Locale = Locale.getDefault()): String { | ||||||
|  |     return translation(locale.toIetfLang()) | ||||||
|  | } | ||||||
|  |  | ||||||
|  | fun Locale.translation(resource: StringResource): String = resource.translation(this) | ||||||
| @@ -16,11 +16,16 @@ import kotlinx.serialization.encoding.Encoder | |||||||
|  */ |  */ | ||||||
| open class MapperDeserializationStrategy<I, O>( | open class MapperDeserializationStrategy<I, O>( | ||||||
|     private val base: DeserializationStrategy<I>, |     private val base: DeserializationStrategy<I>, | ||||||
|     private val deserialize: (I) -> O |     private val deserialize: (Decoder, I) -> O | ||||||
| ) : DeserializationStrategy<O> { | ) : DeserializationStrategy<O> { | ||||||
|     override val descriptor: SerialDescriptor = base.descriptor |     override val descriptor: SerialDescriptor = base.descriptor | ||||||
|  |  | ||||||
|  |     constructor( | ||||||
|  |         base: DeserializationStrategy<I>, | ||||||
|  |         deserialize: (I) -> O | ||||||
|  |     ) : this(base, { _, i -> deserialize(i) }) | ||||||
|  |  | ||||||
|     override fun deserialize(decoder: Decoder): O { |     override fun deserialize(decoder: Decoder): O { | ||||||
|         return deserialize(base.deserialize(decoder)) |         return deserialize(decoder, base.deserialize(decoder)) | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,9 +1,7 @@ | |||||||
| package dev.inmo.micro_utils.serialization.mapper | package dev.inmo.micro_utils.serialization.mapper | ||||||
|  |  | ||||||
| import kotlinx.serialization.KSerializer |  | ||||||
| import kotlinx.serialization.SerializationStrategy | import kotlinx.serialization.SerializationStrategy | ||||||
| import kotlinx.serialization.descriptors.SerialDescriptor | import kotlinx.serialization.descriptors.SerialDescriptor | ||||||
| import kotlinx.serialization.encoding.Decoder |  | ||||||
| import kotlinx.serialization.encoding.Encoder | import kotlinx.serialization.encoding.Encoder | ||||||
|  |  | ||||||
| /** | /** | ||||||
| @@ -11,15 +9,20 @@ import kotlinx.serialization.encoding.Encoder | |||||||
|  * serialization |  * serialization | ||||||
|  * |  * | ||||||
|  * @param base Serializer for [I] |  * @param base Serializer for [I] | ||||||
|  * @param serialize Will be used in [serialize] method to convert incoming [O] to [I] and serialize with [base] |  * @param internalSerialize Will be used in [internalSerialize] method to convert incoming [O] to [I] and serialize with [base] | ||||||
|  */ |  */ | ||||||
| open class MapperSerializationStrategy<I, O>( | open class MapperSerializationStrategy<I, O>( | ||||||
|     private val base: SerializationStrategy<I>, |     private val base: SerializationStrategy<I>, | ||||||
|     private val serialize: (O) -> I |     private val internalSerialize: (Encoder, O) -> I | ||||||
| ) : SerializationStrategy<O> { | ) : SerializationStrategy<O> { | ||||||
|     override val descriptor: SerialDescriptor = base.descriptor |     override val descriptor: SerialDescriptor = base.descriptor | ||||||
|  |  | ||||||
|  |     constructor( | ||||||
|  |         base: SerializationStrategy<I>, | ||||||
|  |         serialize: (O) -> I | ||||||
|  |     ) : this(base, { _, o -> serialize(o) }) | ||||||
|  |  | ||||||
|     override fun serialize(encoder: Encoder, value: O) { |     override fun serialize(encoder: Encoder, value: O) { | ||||||
|         base.serialize(encoder, serialize(value)) |         base.serialize(encoder, internalSerialize(encoder, value)) | ||||||
|     } |     } | ||||||
| } | } | ||||||
|   | |||||||
| @@ -1,6 +1,8 @@ | |||||||
| package dev.inmo.micro_utils.serialization.mapper | package dev.inmo.micro_utils.serialization.mapper | ||||||
|  |  | ||||||
|  | import kotlinx.serialization.DeserializationStrategy | ||||||
| import kotlinx.serialization.KSerializer | import kotlinx.serialization.KSerializer | ||||||
|  | import kotlinx.serialization.SerializationStrategy | ||||||
| import kotlinx.serialization.descriptors.SerialDescriptor | import kotlinx.serialization.descriptors.SerialDescriptor | ||||||
| import kotlinx.serialization.encoding.Decoder | import kotlinx.serialization.encoding.Decoder | ||||||
| import kotlinx.serialization.encoding.Encoder | import kotlinx.serialization.encoding.Encoder | ||||||
| @@ -15,16 +17,28 @@ import kotlinx.serialization.encoding.Encoder | |||||||
|  */ |  */ | ||||||
| open class MapperSerializer<I, O>( | open class MapperSerializer<I, O>( | ||||||
|     private val base: KSerializer<I>, |     private val base: KSerializer<I>, | ||||||
|     private val serialize: (O) -> I, |     private val serialize: (Encoder, O) -> I, | ||||||
|     private val deserialize: (I) -> O |     private val deserialize: (Decoder, I) -> O | ||||||
| ) : KSerializer<O> { | ) : KSerializer<O>, | ||||||
|  |     DeserializationStrategy<O> by MapperDeserializationStrategy<I, O>(base, deserialize), | ||||||
|  |     SerializationStrategy<O> by MapperSerializationStrategy<I, O>(base, serialize) { | ||||||
|     override val descriptor: SerialDescriptor = base.descriptor |     override val descriptor: SerialDescriptor = base.descriptor | ||||||
|  |  | ||||||
|     override fun deserialize(decoder: Decoder): O { |     constructor( | ||||||
|         return deserialize(base.deserialize(decoder)) |         base: KSerializer<I>, | ||||||
|     } |         serialize: (O) -> I, | ||||||
|  |         deserialize: (I) -> O | ||||||
|  |     ) : this(base, { _, o -> serialize(o) }, { _, i -> deserialize(i) }) | ||||||
|  |  | ||||||
|     override fun serialize(encoder: Encoder, value: O) { |     constructor( | ||||||
|         base.serialize(encoder, serialize(value)) |         base: KSerializer<I>, | ||||||
|     } |         serialize: (Encoder, O) -> I, | ||||||
|  |         deserialize: (I) -> O | ||||||
|  |     ) : this(base, serialize, { _, i -> deserialize(i) }) | ||||||
|  |  | ||||||
|  |     constructor( | ||||||
|  |         base: KSerializer<I>, | ||||||
|  |         serialize: (O) -> I, | ||||||
|  |         deserialize: (Decoder, I) -> O | ||||||
|  |     ) : this(base, { _, o -> serialize(o) }, deserialize) | ||||||
| } | } | ||||||
|   | |||||||
| @@ -42,6 +42,9 @@ String[] includes = [ | |||||||
|     ":serialization:mapper", |     ":serialization:mapper", | ||||||
|     ":startup:plugin", |     ":startup:plugin", | ||||||
|     ":startup:launcher", |     ":startup:launcher", | ||||||
|  |     ":colors:common", | ||||||
|  |  | ||||||
|  |     ":resources", | ||||||
|  |  | ||||||
|     ":fsm:common", |     ":fsm:common", | ||||||
|     ":fsm:repos:common", |     ":fsm:repos:common", | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user