mirror of
				https://github.com/InsanusMokrassar/MicroUtils.git
				synced 2025-10-30 03:30:19 +00:00 
			
		
		
		
	Compare commits
	
		
			321 Commits
		
	
	
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 3437f4c712 | |||
| 618f2dcd79 | |||
| 6df8ad3095 | |||
| eda6221288 | |||
| a9859f6a0d | |||
| 0db88bac25 | |||
| daa3d9c0dd | |||
| b343b33594 | |||
| 46e435a448 | |||
| 7fe62b4ffa | |||
| 9c94348a15 | |||
| bac256e93e | |||
| 49f59aa129 | |||
| 800dab5be0 | |||
| b9977527b2 | |||
| c216dba69d | |||
| d4148d52e3 | |||
| 2006a8cdd0 | |||
| feb52ecbd1 | |||
| 42909c3b7a | |||
| 706a787163 | |||
| 1bc14bded6 | |||
| f00cb81db1 | |||
| 2fbd14956d | |||
| 24657b43be | |||
| 659d3b6fa5 | |||
| 339483c8a3 | |||
| 51ec46bbd7 | |||
| 8a059cc26d | |||
| ddb8e1efb4 | |||
| 3bf2ed5168 | |||
| e70d34d91a | |||
| 7a650f5c2f | |||
| fc6f5ae2ee | |||
| 3b7dde3cb1 | |||
| 0a5cfaba18 | |||
| ea527b5e91 | |||
| 85f11439e8 | |||
| 98c7b48625 | |||
| 8b007bb3af | |||
| 89e2d88d1c | |||
| 260399e965 | |||
| de72843b8e | |||
| b589142d9f | |||
| f479c85869 | |||
| 26992c039a | |||
| ef50e1a24f | |||
| 2f201670d2 | |||
| 90c80573a0 | |||
| 059519cdca | |||
| 55647e2e2f | |||
| 1802be68ef | |||
| aa79496a36 | |||
| 4bfa4c32aa | |||
| d8ca29eab1 | |||
| f7a9f2e13d | |||
| af286d3d53 | |||
| 9a20e8155e | |||
| b81af7e1c8 | |||
| 74563bbac9 | |||
| 07ad79f0b3 | |||
| 5c28255e06 | |||
| 99783f281d | |||
| a5008c3d15 | |||
| f807f2beeb | |||
| db34b25ef2 | |||
| 96daf11fd4 | |||
| f7e98dfd2d | |||
| 61277e92bd | |||
| 32ef9f399f | |||
| 54e6ca5dc3 | |||
| a8e226786d | |||
| ce717a4c9f | |||
| fd41bf0ae7 | |||
| b2b68bf29f | |||
| b87c29c354 | |||
| 24977822c9 | |||
| 647daa8627 | |||
| a372efacb1 | |||
| f40d33db2a | |||
| a5eb0fbd24 | |||
| 307c8030af | |||
| a9016465fa | |||
| 358b70eb5f | |||
| 6fcbb80a71 | |||
|  | 643f6c420b | ||
| ac68b0b941 | |||
| d62f67bd88 | |||
| 8718c5e310 | |||
| e8273ab80c | |||
| 2718605987 | |||
| d99538d80b | |||
| ce7a1e4e21 | |||
| 921734763d | |||
| 18c608f569 | |||
| b915f6ece2 | |||
| 24347b422c | |||
| e5f4ae647f | |||
| 72202b8a21 | |||
| dbc14d41de | |||
| 1dca5ea00d | |||
| f03d1d788c | |||
| fcac6f9fa8 | |||
| ca0cd433c9 | |||
| 39589fdbd0 | |||
| 605fc3cff9 | |||
| 12cd6f48f8 | |||
| 1f57478d10 | |||
| 7ef4c5d282 | |||
| f09d92be32 | |||
| 6245b36bdb | |||
| 54cc353bcc | |||
| b7abba099c | |||
| c5dbd10335 | |||
| a44e3e953d | |||
| ee2521cb01 | |||
| 4625dfb857 | |||
| b9a2653066 | |||
| fcaa327660 | |||
| 496117d517 | |||
| 8ce7d37b72 | |||
| 25391609b9 | |||
| f0b7b9c5e5 | |||
| 301cdaa2c2 | |||
| fce7ec8912 | |||
| 24bd403549 | |||
| 46c89c48a9 | |||
| bad9a53fdb | |||
| 0bce7bd60a | |||
| 2f70a1cfb4 | |||
| bfb6e738ee | |||
| c7ad9aae07 | |||
| fecd719239 | |||
| 18d6ac31b5 | |||
| d8dbebfc7e | |||
| 16463d0eb9 | |||
| 837cac644d | |||
| e83e0a8535 | |||
| 2e309c31a6 | |||
| 625db02651 | |||
| e3144c08c1 | |||
| 40e25970ad | |||
| 4ccb8a8d11 | |||
| 26d1c3d9ef | |||
| cc8fe7b001 | |||
| 4601eab864 | |||
| 1ee9c88ffd | |||
| 7feac213f6 | |||
| c75a9c0f61 | |||
| afd0c9784f | |||
| f1ddbea06e | |||
| 42bf3cd4e3 | |||
| 27f5549f56 | |||
| b0569f8421 | |||
| 8d86f29325 | |||
| aeca32498a | |||
| e8232664f3 | |||
| efa869f91a | |||
| dbff3d7cf1 | |||
| 9e70f73684 | |||
| 9f2f0de0c4 | |||
| bf293a8f8f | |||
| 5fbc1a132f | |||
| 36093b9741 | |||
| 8713fb04c5 | |||
| ea82a59f31 | |||
| 18f67cd4f2 | |||
| 120e7228c7 | |||
| 892fa90c37 | |||
| 491dac5bf0 | |||
| 2ab06fbafd | |||
| e68735d061 | |||
| 9ba4d98c30 | |||
| 19bbfd4916 | |||
| d94cd7ea94 | |||
| 0dd8f41eb0 | |||
| f1ab5ab51f | |||
| a8056f3120 | |||
| 09c0cdebb5 | |||
| 629d7c7a82 | |||
| a0dd1aec3d | |||
| 17d6377902 | |||
| ad401105a1 | |||
| 4913e99c2e | |||
| 16b97029cf | |||
| 481130c9bb | |||
| 698ed6718d | |||
| d164813bb4 | |||
| 52157ee0e7 | |||
| 877b62fe5d | |||
| d823a02971 | |||
| e950056e3b | |||
| 70014ba233 | |||
| 4425f24a20 | |||
| 410964a44b | |||
| 30389e8536 | |||
| 5314833041 | |||
| 40f7cf7678 | |||
| 83a0b07062 | |||
| 1b4900d691 | |||
| f9795d53a0 | |||
| 2b9bb4f141 | |||
| 9196e4c367 | |||
| 374a5a1a37 | |||
| 827cf32c1b | |||
| 98ad6dbeb2 | |||
| 63c8f642ec | |||
| 3bfe64f797 | |||
| ec98029467 | |||
| ab58478686 | |||
| 90247667d1 | |||
| e661185534 | |||
| d73e4e8e1f | |||
| a6905e73cb | |||
| 93b054d55e | |||
| 5db4c5c717 | |||
| 5e04521929 | |||
| 30440b4ed1 | |||
| 09bb90604d | |||
| 4d55ec6f36 | |||
| f373524f34 | |||
| 0398a7bebd | |||
| fa8a5bcd97 | |||
| 758a92410b | |||
| 77f56c5dda | |||
| 72f2fe3cc3 | |||
| 7e0e520f03 | |||
| 92c4784e42 | |||
| a634229dc0 | |||
| de3f36ef2a | |||
| c623a265ee | |||
| e75125f6df | |||
| 4901a8844c | |||
| a1854b68d8 | |||
| aee4a6243b | |||
| 4c0cb73d69 | |||
| c6eab182f6 | |||
| 3e3fbd97eb | |||
| feb695caa7 | |||
| 1bd46d9651 | |||
| 32eabb6b36 | |||
| 9bfe6dc6d8 | |||
| 3f366aeea4 | |||
| 4338fd46f2 | |||
| 36974f5b49 | |||
| d48f767408 | |||
| bd2558e852 | |||
| 9f7c963cd5 | |||
| 2db0eadbfe | |||
| 580c7b8842 | |||
| 88fba347ea | |||
| c8c5255e62 | |||
| 01a1a2760a | |||
| 6d34df8d48 | |||
| b124ea65e1 | |||
| f3214347a9 | |||
| 6b8724b59f | |||
| ac3e378edf | |||
| 5d31fd1c91 | |||
| 046fe1ec08 | |||
| 721873c843 | |||
| f6ffbfc10a | |||
| 4e91649e0a | |||
| 4f7f8abec4 | |||
| 6370562dbc | |||
| 94e2e67522 | |||
| 1d8330015d | |||
| e5017b0258 | |||
| cd412ca31b | |||
| d2b6473095 | |||
| ab42507275 | |||
| dcef844e20 | |||
| 3244708c1b | |||
| 73ac1f1741 | |||
| f104e9f352 | |||
| 393c9a7d06 | |||
| ea497ea488 | |||
|  | 5add89cad0 | ||
| 2db447d2ef | |||
| 31c83813e6 | |||
| 27483a282d | |||
| 48b816aa22 | |||
| 0065f94f52 | |||
| ccc0002eb2 | |||
| 15a2eee141 | |||
| b9faac71e5 | |||
| 0a4465de33 | |||
| f9dfd09628 | |||
| 8638d7afce | |||
| 8311793a43 | |||
| 0d552cfcd2 | |||
| 4b0f20dbd1 | |||
| cf531c949d | |||
| ba5c5f17d5 | |||
| 35825ad9b7 | |||
| b1eb26a89e | |||
| c9d04b6698 | |||
| 496133e014 | |||
| f2857ee2be | |||
| 22541f2d5e | |||
| e235c52b6c | |||
| e89b8c72dd | |||
| a374e53a3a | |||
| afb066c4ee | |||
| f05761d4a5 | |||
| 76adc9ea33 | |||
| 99dd291413 | |||
| f904eb27e1 | |||
| eeb8214812 | |||
| f7215b039e | |||
| c07fe5a0f9 | |||
| 0d28cb6e20 | |||
| a1a17bfd1f | |||
| f386f09592 | |||
| a47e17fe6e | |||
| 01dc3b63ff | |||
| 2d97e0699e | |||
| 75f514d99b | |||
| 9a687cfc1c | |||
| 14edf8b6b7 | |||
| 23aa2d8917 | 
							
								
								
									
										7
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.github/workflows/build.yml
									
									
									
									
										vendored
									
									
								
							| @@ -17,8 +17,9 @@ jobs: | ||||
|           mv gradle.properties.tmp gradle.properties | ||||
|       - name: Build | ||||
|         run: ./gradlew build | ||||
|       - name: Publish | ||||
|       - name: Publish to InmoNexus | ||||
|         continue-on-error: true | ||||
|         run: ./gradlew publishAllPublicationsToGiteaRepository | ||||
|         run: ./gradlew publishAllPublicationsToInmoNexusRepository | ||||
|         env: | ||||
|           GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} | ||||
|           INMONEXUS_USER: ${{ secrets.INMONEXUS_USER }} | ||||
|           INMONEXUS_PASSWORD: ${{ secrets.INMONEXUS_PASSWORD }} | ||||
|   | ||||
							
								
								
									
										7
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							| @@ -1,4 +1,5 @@ | ||||
| .idea | ||||
| .kotlin | ||||
| out/* | ||||
| *.iml | ||||
| target | ||||
| @@ -14,3 +15,9 @@ local.properties | ||||
| kotlin-js-store | ||||
|  | ||||
| publishing.sh | ||||
|  | ||||
| local.* | ||||
| local/ | ||||
| **/*.local.* | ||||
|  | ||||
| .kotlin/ | ||||
|   | ||||
							
								
								
									
										483
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										483
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,488 @@ | ||||
| # Changelog | ||||
|  | ||||
| ## 0.25.1 | ||||
|  | ||||
| * `Coroutines`: | ||||
|   * Add `SortedMapLikeBinaryTreeNode` | ||||
| * `Pagination`: | ||||
|   * `Compose`: | ||||
|     * One more rework of `InfinityPagedComponent` and `PagedComponent` | ||||
|  | ||||
| ## 0.25.0 | ||||
|  | ||||
| * `Repos`: | ||||
|   * `Cache`: | ||||
|     * All cache repos now do not have `open` vals - to avoid collisions in runtime | ||||
|  | ||||
| ## 0.24.9 | ||||
|  | ||||
| * `Pagination`: | ||||
|   * Make alternative constructor parameter `size` of `PaginationResult` with default value | ||||
|   * Add `Pagination.previousPage` extension | ||||
|   * `Compose`: | ||||
|     * Rework of `InfinityPagedComponentContext` | ||||
|     * Rework of `PagedComponent` | ||||
|  | ||||
| ## 0.24.8 | ||||
|  | ||||
| * `Versions`: | ||||
|   * `Ktor`: `3.1.0` -> `3.1.1` | ||||
|   * `KSP`: `2.1.10-1.0.30` -> `2.1.10-1.0.31` | ||||
| * `Common`: | ||||
|   * `Compose`: | ||||
|     * Add component `LoadableComponent` | ||||
| * `Coroutines`: | ||||
|   * Add `SortedBinaryTreeNode` | ||||
| * `Pagination`: | ||||
|   * `Compose`: | ||||
|     * Add components `PagedComponent` and `InfinityPagedComponent` | ||||
|  | ||||
| ## 0.24.7 | ||||
|  | ||||
| * `Versions`: | ||||
|   * `SQLite`: `3.49.0.0` -> `3.49.1.0` | ||||
| * `Common`: | ||||
|   * Add `retryOnFailure` utility for simple retries code writing | ||||
| * `Repos`: | ||||
|   * `Cache`: | ||||
|     * Fix of `FullKeyValueCacheRepo` fields usage | ||||
|   * `Exposed`: | ||||
|     * `AbstractExposedKeyValuesRepo` will produce `onValueRemoved` event on `set` if some data has been removed | ||||
|  | ||||
| ## 0.24.6 | ||||
|  | ||||
| * `Versions`: | ||||
|   * `KSLog`: `1.4.0` -> `1.4.1` | ||||
|   * `Exposed`: `0.58.0` -> `0.59.0` | ||||
|   * `SQLite`: `3.48.0.0` -> `3.49.0.0` | ||||
|   * `AndroidFragment`: `1.8.5` -> `1.8.6` | ||||
| * `Coroutines`: | ||||
|   * Safely functions has been replaced with `Logging` variations (resolve of [#541](https://github.com/InsanusMokrassar/MicroUtils/issues/541)) | ||||
| * `KSP`: | ||||
|   * `Variations`: | ||||
|     * Module has been created | ||||
|  | ||||
| ## 0.24.5 | ||||
|  | ||||
| * `Versions`: | ||||
|   * `Kotlin`: `2.1.0` -> `2.1.10` | ||||
|   * `SQLite`: `3.47.2.0` -> `3.48.0.0` | ||||
|   * `Koin`: `4.0.1` -> `4.0.2` | ||||
|   * `Android RecyclerView`: `1.3.2` -> `1.4.0` | ||||
|  | ||||
| ## 0.24.4 | ||||
|  | ||||
| * `Repos`: | ||||
|   * `Exposed`: | ||||
|     * Improve `CommonExposedRepo.selectByIds` | ||||
| * `FSM`: | ||||
|   * Fixes and improvements | ||||
|  | ||||
| ## 0.24.3 | ||||
|  | ||||
| * `Ksp`: | ||||
|   * `Sealed`: | ||||
|     * Fixes in processing of `GenerateSealedTypesWorkaround` annotations | ||||
|  | ||||
| ## 0.24.2 | ||||
|  | ||||
| * `Versions`: | ||||
|   * `Exposed`: `0.57.0` -> `0.58.0` | ||||
| * `Ksp`: | ||||
|   * `Sealed`: | ||||
|     * Add annotation `GenerateSealedTypesWorkaround` which allow to generate `subtypes` lists | ||||
|  | ||||
| ## 0.24.1 | ||||
|  | ||||
| * `Versions`: | ||||
|   * `Serialization`: `1.7.3` -> `1.8.0` | ||||
|   * `SQLite`: `3.47.1.0` -> `3.47.2.0` | ||||
|   * `Koin`: `4.0.0` -> `3.10.2` | ||||
|   * `OKio`: `3.9.1` -> `3.10.2` | ||||
|  | ||||
| ## 0.24.0 | ||||
|  | ||||
| * `Versions`: | ||||
|   * `Coroutines`: `1.9.0` -> `1.10.1` | ||||
|   * `KSLog`: `1.3.6` -> `1.4.0` | ||||
|   * `Compose`: `1.7.1` -> `1.7.3` | ||||
|   * `Ktor`: `3.0.2` -> `3.0.3` | ||||
| * `Common`: | ||||
|   * Rename `Progress` to more common `Percentage`. `Progress` now is typealias | ||||
|   * Fix of `Progress.compareTo` extension | ||||
|  | ||||
| ## 0.23.2 | ||||
|  | ||||
| * `Versions`: | ||||
|   * `Kotlin`: `2.0.21` -> `2.1.0` | ||||
|   * `Exposed`: `0.56.0` -> `0.57.0` | ||||
|   * `Xerial SQLite`: `3.47.0.0` -> `3.47.1.0` | ||||
|   * `Ktor`: `3.0.1` -> `3.0.2` | ||||
| * `Coroutines`: | ||||
|   * Small refactor in `AccumulatorFlow` to use `runCatching` instead of `runCatchingSafely` | ||||
|  | ||||
| ## 0.23.1 | ||||
|  | ||||
| * `Versions`: | ||||
|   * `Compose`: `1.7.0` -> `1.7.1` | ||||
|   * `Exposed`: `0.55.0` -> `0.56.0` | ||||
|   * `Xerial SQLite`: `3.46.1.3` -> `3.47.0.0` | ||||
|   * `Android CoreKTX`: `1.13.1` -> `1.15.0` | ||||
|   * `Android Fragment`: `1.8.4` -> `1.8.5` | ||||
| * `Coroutines`: | ||||
|   * `Compose`: | ||||
|     * Add `StyleSheetsAggregator` | ||||
|  | ||||
| ## 0.23.0 | ||||
|  | ||||
| **THIS UPDATE MAY CONTAINS SOME BREAKING CHANGES (INCLUDING BREAKING CHANGES IN BYTECODE LAYER) RELATED TO UPDATE OF | ||||
| KTOR DEPENDENCY** | ||||
|  | ||||
| **THIS UPDATE CONTAINS CHANGES ACCORDING TO MIGRATION [GUIDE FROM KTOR](https://ktor.io/docs/migrating-3.html)** | ||||
|  | ||||
| * `Versions`: | ||||
|   * `Ktor`: `2.3.12` -> `3.0.1` | ||||
| * `Ktor`: | ||||
|   * `Common`: | ||||
|     * Extension `Input.downloadToTempFile` has changed its receiver to `Source`. Its API can be broken | ||||
|   * `Client`: | ||||
|     * Extension `HttpClient.tempUpload` has changed type of `onUpload` argument from `OnUploadCallback` to `ProgressListener` | ||||
|     * All extensions `HttpClient.uniUpload` have changed type of `onUpload` argument from `OnUploadCallback` to `ProgressListener` | ||||
|   * `Server`: | ||||
|     * Remove redundant `ApplicationCall.respond` extension due to its presence in the ktor library | ||||
|  | ||||
| ## 0.22.9 | ||||
|  | ||||
| * `Repos`: | ||||
|   * `Cache`: | ||||
|     * Add direct caching repos | ||||
|  | ||||
| ## 0.22.8 | ||||
|  | ||||
| * `Common`: | ||||
|   * Add `List.breakAsPairs` extension | ||||
|   * Add `Sequence.padWith`/`Sequence.padStart`/`Sequence.padEnd` and `List.padWith`/`List.padStart`/`List.padEnd` extensions | ||||
|  | ||||
| ## 0.22.7 | ||||
|  | ||||
| * `Versions`: | ||||
|   * `Kotlin`: `2.0.20` -> `2.0.21` | ||||
|   * `Compose`: `1.7.0-rc01` -> `1.7.0` | ||||
| * `KSP`: | ||||
|   * `Sealed`: | ||||
|     * Change package of `GenerateSealedWorkaround`. Migration: replace `dev.inmo.microutils.kps.sealed.GenerateSealedWorkaround` -> `dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround` | ||||
|  | ||||
| ## 0.22.6 | ||||
|  | ||||
| * `KSP`: | ||||
|   * `Generator`: | ||||
|     * Add extension `KSClassDeclaration.buildSubFileName` | ||||
|     * Add extension `KSClassDeclaration.companion` | ||||
|     * Add extension `KSClassDeclaration.resolveSubclasses` | ||||
|   * `Sealed`: | ||||
|     * Improvements | ||||
|  | ||||
| ## 0.22.5 | ||||
|  | ||||
| * `Versions`: | ||||
|   * `Compose`: `1.7.0-beta02` -> `1.7.0-rc01` | ||||
|   * `SQLite`: `3.46.1.2` -> `3.46.1.3` | ||||
|   * `AndroidXFragment`: `1.8.3` -> `1.8.4` | ||||
| * `Common`: | ||||
|   * Add extension `withReplacedAt`/`withReplaced` ([#489](https://github.com/InsanusMokrassar/MicroUtils/issues/489)) | ||||
| * `Coroutines`: | ||||
|   * Add extension `Flow.debouncedBy` | ||||
| * `Ktor`: | ||||
|   * `Server`: | ||||
|     * Add `KtorApplicationConfigurator.Routing.Static` as solution for [#488](https://github.com/InsanusMokrassar/MicroUtils/issues/488) | ||||
|  | ||||
| ## 0.22.4 | ||||
|  | ||||
| * `Versions`: | ||||
|   * `Exposed`: `0.54.0` -> `0.55.0` | ||||
|   * `SQLite`: `3.46.1.0` -> `3.46.1.2` | ||||
|  | ||||
| ## 0.22.3 | ||||
|  | ||||
| * `Versions`: | ||||
|   * `Serialization`: `1.7.2` -> `1.7.3` | ||||
|   * `Coroutines`: `1.8.1` -> `1.9.0` | ||||
|   * `Compose`: `1.7.0-alpha03` -> `1.7.0-beta02` | ||||
|   * `Koin`: `3.5.6` -> `4.0.0` | ||||
|   * `Okio`: `3.9.0` -> `3.9.1` | ||||
|   * `AndroidFragment`: `1.8.2` -> `1.8.3` | ||||
|   * `androidx.compose.material3:material3` has been replaced with `org.jetbrains.compose.material3:material3` | ||||
| * `Common`: | ||||
|   * `JS`: | ||||
|     * Add several useful extensions | ||||
|   * `Compose`: | ||||
|     * `JS`: | ||||
|       * Add several useful extensions | ||||
|  | ||||
| ## 0.22.2 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Exposed`: `0.53.0` -> `0.54.0` | ||||
|     * `SQLite`: `3.46.0.1` -> `3.46.1.0` | ||||
|  | ||||
| ## 0.22.1 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Kotlin`: `2.0.10` -> `2.0.20` | ||||
|     * `Serialization`: `1.7.1` -> `1.7.2` | ||||
|     * `KSLog`: `1.3.5` -> `1.3.6` | ||||
|     * `Compose`: `1.7.0-alpha02` -> `1.7.0-alpha03` | ||||
|     * `Ktor`: `2.3.11` -> `2.3.12` | ||||
|  | ||||
| ## 0.22.0 | ||||
|  | ||||
| **THIS UPDATE CONTAINS BREAKING CHANGES ACCORDING TO UPDATE UP TO KOTLIN 2.0** | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Kotlin`: `1.9.23` -> `2.0.10` | ||||
|     * `Serialization`: `1.6.3` -> `1.7.1` | ||||
|     * `KSLog`: `1.3.4` -> `1.3.5` | ||||
|     * `Compose`: `1.6.2` -> `1.7.0-alpha02` | ||||
|     * `Exposed`: `0.50.1` -> `0.53.0` | ||||
|     * `AndroidAppCompat`: `1.6.1` -> `1.7.0` | ||||
|     * `AndroidFragment`: `1.7.1` -> `1.8.2` | ||||
|  | ||||
| ## 0.21.6 | ||||
|  | ||||
| * `KSP`: | ||||
|     * `Sealed`: | ||||
|         * Fixes in generation | ||||
|  | ||||
| ## 0.21.5 | ||||
|  | ||||
| * `KSP`: | ||||
|     * Add utility functions `KSClassDeclaration.findSubClasses` | ||||
|     * `Sealed`: | ||||
|         * Improve generation | ||||
|  | ||||
| ## 0.21.4 | ||||
|  | ||||
| * `Common`: | ||||
|     * `Compose`: | ||||
|         * Add support of mingw, linux, arm64 targets | ||||
| * `Coroutines`: | ||||
|     * `Compose`: | ||||
|         * Add support of mingw, linux, arm64 targets | ||||
| * `Koin`: | ||||
|     * Add support of mingw, linux, arm64 targets | ||||
| * `KSP`: | ||||
|     * `ClassCasts`: | ||||
|         * Add support of mingw, linux, arm64 targets | ||||
|     * `Sealed`: | ||||
|         * Add support of mingw, linux, arm64 targets | ||||
|  | ||||
| ## 0.21.3 | ||||
|  | ||||
| * `Colors`: | ||||
|     * Added as a module. It should be used by default in case you wish all the API currently realized for `HEXAColor` | ||||
| * `Coroutines`: | ||||
|     * Fix of [#374](https://github.com/InsanusMokrassar/MicroUtils/issues/374): | ||||
|         * Add vararg variants of `awaitFirst` | ||||
|         * Add `joinFirst` | ||||
|  | ||||
| ## 0.21.2 | ||||
|  | ||||
| * `KSP`: | ||||
|     * `ClassCasts`: | ||||
|         * Module has been initialized | ||||
|  | ||||
| ## 0.21.1 | ||||
|  | ||||
| * `KSP`: | ||||
|     * Module has been initialized | ||||
|     * `Generator`: | ||||
|         * Module has been initialized | ||||
|     * `Sealed`: | ||||
|         * Module has been initialized | ||||
|  | ||||
| ## 0.21.0 | ||||
|  | ||||
| **THIS UPDATE CONTAINS BREAKING CHANGES IN `safely*`-ORIENTED FUNCTIONS** | ||||
|  | ||||
| * `Coroutines`: | ||||
|     * **All `safely` functions lost their `supervisorScope` in favor to wrapping `runCatching`** | ||||
|         * `runCatchingSafely` is the main handling function of all `safely` functions | ||||
|         * `launchSafely*` and `asyncSafely*` blocks lost `CoroutineScope` as their receiver | ||||
|  | ||||
| ## 0.20.52 | ||||
|  | ||||
| * `Coroutines`: | ||||
|     * Small rework of weak jobs: add `WeakScope` factory, rename old weal extensions and add kdocs | ||||
|  | ||||
| ## 0.20.51 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Android Fragment`: `1.7.0` -> `1.7.1` | ||||
| * `Pagination`: | ||||
|     * Add `Pagination.nextPageIfTrue` and `Pagination.thisPageIftrue` extensions to get the page according to condition | ||||
|     pass status | ||||
|     * Add `PaginationResult.nextPageIfNotEmptyOrLastPage` and `PaginationResult.thisPageIfNotEmptyOrLastPage` | ||||
|     * Change all `doForAll` and `getAll` extensions fo pagination to work basing on `nextPageIfNotEmptyOrLastPage` and | ||||
|     `thisPageIfNotEmptyOrLastPage` | ||||
|  | ||||
| ## 0.20.50 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Coroutines`: `1.8.0` -> `1.8.1` | ||||
|     * `KSLog`: `1.3.3` -> `1.3.4` | ||||
|     * `Exposed`: `0.50.0` -> `0.50.1` | ||||
|     * `Ktor`: `2.3.10` -> `2.3.11` | ||||
| * A lot of inline functions became common functions due to inline with only noinline callbacks in arguments leads to | ||||
| low performance | ||||
| * `Coroutines`: | ||||
|     * `SmartMutex`, `SmartSemaphore` and `SmartRWLocker` as their user changed their state flow to `SpecialMutableStateFlow` | ||||
|  | ||||
| ## 0.20.49 | ||||
|  | ||||
| * `Repos`: | ||||
|     * `Common`: | ||||
|         * All `Repo`s get `diff` extensions | ||||
|         * `KeyValueRepo` and `KeyValuesRepo` get `applyDiff` extension | ||||
|         * Add new extensions `on*` flows for crud repos | ||||
|  | ||||
| ## 0.20.48 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Android Core KTX`: `1.13.0` -> `1.13.1` | ||||
|     * `AndroidX Fragment`: `1.6.2` -> `1.7.0` | ||||
|  | ||||
| ## 0.20.47 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Exposed`: `0.49.0` -> `0.50.0` | ||||
|  | ||||
| ## 0.20.46 | ||||
|  | ||||
| * `Common`: | ||||
|     * Now this repo depends on `klock` | ||||
|     * Add new object-serializer `DateTimeSerializer` for `klock` serializer | ||||
|  | ||||
| ## 0.20.45 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Android Core KTX`: `1.12.0` -> `1.13.0` | ||||
|  | ||||
| ## 0.20.44 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Compose`: `1.6.1` -> `1.6.2` | ||||
|     * `Koin`: `3.5.4` -> `3.5.6` | ||||
|  | ||||
| ## 0.20.43 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Ktor`: `2.3.9` -> `2.3.10` | ||||
|     * `Koin`: `3.5.3` -> `3.5.4` | ||||
|  | ||||
| ## 0.20.42 | ||||
|  | ||||
| * `Repos`: | ||||
|     * `Generator`: | ||||
|         * Improvements | ||||
|  | ||||
| ## 0.20.41 | ||||
|  | ||||
| * `Repos`: | ||||
|     * `Exposed`: | ||||
|         * `AbstractExposedKeyValueRepo`, `ExposedKeyValueRepo`, `AbstractExposedKeyValuesRepo`, `ExposedKeyValuesRepo` got opportunity to setup some part of their flows | ||||
|  | ||||
| ## 0.20.40 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `KSLog`: `1.3.2` -> `1.3.3` | ||||
|     * `Exposed`: `0.48.0` -> `0.49.0` | ||||
|     * `UUID`: `0.8.2` -> `0.8.4` | ||||
|  | ||||
| ## 0.20.39 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Kotlin`: `1.9.22` -> `1.9.23` | ||||
|     * `Korlibs`: `5.3.2` -> `5.4.0` | ||||
|     * `Okio`: `3.8.0` -> `3.9.0` | ||||
|     * `Compose`: `1.6.0` -> `1.6.1` | ||||
|     * `ComposeMaterial3`: `1.2.0` -> `1.2.1` | ||||
|  | ||||
| ## 0.20.38 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Ktor`: `2.3.8` -> `2.3.9` | ||||
|  | ||||
| ## 0.20.37 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Compose`: `1.5.12` -> `1.6.0` | ||||
|     * `Exposed`: `0.47.0` -> `0.48.0` | ||||
|  | ||||
| ## 0.20.36 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Serialization`: `1.6.2` -> `1.6.3` | ||||
|     * `Korlibs`: `5.3.1` -> `5.3.2` | ||||
| * `Repos`: | ||||
|     * `Cache`: | ||||
|         * Improve work and functionality of `actualizeAll` and subsequent functions | ||||
|         * All internal repos `invalidate`/`actualizeAll` now use common `actualizeAll` functions | ||||
|  | ||||
| ## 0.20.35 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Coroutines`: `1.7.3` -> `1.8.0` | ||||
|     * `Material3`: `1.1.2` -> `1.2.0` | ||||
|  | ||||
| ## 0.20.34 | ||||
|  | ||||
| * `Repos`: | ||||
|     * `Common`: | ||||
|         * Improve default `set` realization of `KeyValuesRepo` | ||||
|  | ||||
| ## 0.20.33 | ||||
|  | ||||
| * `Colors` | ||||
|     * `Common`: | ||||
|         * Add opportunity to use `HEXAColor` with `ahex` colors | ||||
|  | ||||
| ## 0.20.32 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Okio`: `3.7.0` -> `3.8.0` | ||||
| * `Resources`: | ||||
|     * Make `StringResource` serializable | ||||
|     * Add several variants of builder usages | ||||
|  | ||||
| ## 0.20.31 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Ktor`: `2.3.7` -> `2.3.8` | ||||
|  | ||||
| ## 0.20.30 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Exposed`: `0.46.0` -> `0.47.0` | ||||
|  | ||||
| ## 0.20.29 | ||||
|  | ||||
| * `Versions`: | ||||
|     * `Kotlin`: `1.9.21` -> `1.9.22` | ||||
|     * `Compose`: `1.5.11` -> `1.5.12` | ||||
|     * `Korlibs`: `5.3.0` -> `5.3.1` | ||||
|  | ||||
| ## 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`: | ||||
|   | ||||
| @@ -4,7 +4,7 @@ plugins { | ||||
|     id "com.android.library" | ||||
| } | ||||
|  | ||||
| apply from: "$mppAndroidProjectPresetPath" | ||||
| apply from: "$mppAndroidProject" | ||||
|  | ||||
| kotlin { | ||||
|     sourceSets { | ||||
|   | ||||
| @@ -4,7 +4,7 @@ plugins { | ||||
|     id "com.android.library" | ||||
| } | ||||
|  | ||||
| apply from: "$mppAndroidProjectPresetPath" | ||||
| apply from: "$mppAndroidProject" | ||||
|  | ||||
| kotlin { | ||||
|     sourceSets { | ||||
|   | ||||
| @@ -3,9 +3,10 @@ plugins { | ||||
|     id "org.jetbrains.kotlin.plugin.serialization" | ||||
|     id "com.android.library" | ||||
|     alias(libs.plugins.jb.compose) | ||||
|     alias(libs.plugins.kt.jb.compose) | ||||
| } | ||||
|  | ||||
| apply from: "$mppProjectWithSerializationAndComposePresetPath" | ||||
| apply from: "$mppProjectWithSerializationAndCompose" | ||||
|  | ||||
| kotlin { | ||||
|     sourceSets { | ||||
|   | ||||
| @@ -7,9 +7,6 @@ import androidx.compose.foundation.gestures.* | ||||
| import androidx.compose.foundation.layout.* | ||||
| import androidx.compose.foundation.text.KeyboardActions | ||||
| import androidx.compose.foundation.text.KeyboardOptions | ||||
| import androidx.compose.material.ContentAlpha | ||||
| import androidx.compose.material.IconButton | ||||
| import androidx.compose.material.ProvideTextStyle | ||||
| import androidx.compose.material.icons.Icons | ||||
| import androidx.compose.material.icons.filled.KeyboardArrowDown | ||||
| import androidx.compose.material.icons.filled.KeyboardArrowUp | ||||
| @@ -75,7 +72,7 @@ fun NumberPicker( | ||||
|     } | ||||
|     val coercedAnimatedOffset = animatedOffset.value % halvedNumbersColumnHeightPx | ||||
|     val animatedStateValue = animatedStateValue(animatedOffset.value) | ||||
|     val disabledArrowsColor = arrowsColor.copy(alpha = ContentAlpha.disabled) | ||||
|     val disabledArrowsColor = arrowsColor.copy(alpha = 0f) | ||||
|  | ||||
|     val inputFieldShown = if (allowUseManualInput) { | ||||
|         remember { mutableStateOf(false) } | ||||
|   | ||||
| @@ -5,7 +5,6 @@ import androidx.compose.animation.core.exponentialDecay | ||||
| import androidx.compose.foundation.gestures.* | ||||
| import androidx.compose.foundation.layout.* | ||||
| import androidx.compose.foundation.rememberScrollState | ||||
| import androidx.compose.material.ContentAlpha | ||||
| import androidx.compose.material.icons.Icons | ||||
| import androidx.compose.material.icons.filled.KeyboardArrowDown | ||||
| import androidx.compose.material.icons.filled.KeyboardArrowUp | ||||
| @@ -62,9 +61,7 @@ fun <T> SetPicker( | ||||
|         (index - ceil(animatedOffset.value / halvedNumbersColumnHeightPx).toInt()) | ||||
|     } | ||||
|     val coercedAnimatedOffset = animatedOffset.value % halvedNumbersColumnHeightPx | ||||
|     val boxOffset = (indexAnimatedOffset * halvedNumbersColumnHeightPx) - coercedAnimatedOffset | ||||
|     val disabledArrowsColor = arrowsColor.copy(alpha = ContentAlpha.disabled) | ||||
|     val scrollState = rememberScrollState() | ||||
|     val disabledArrowsColor = arrowsColor.copy(alpha = 0f) | ||||
|  | ||||
|     Column( | ||||
|         modifier = modifier | ||||
|   | ||||
| @@ -4,7 +4,7 @@ plugins { | ||||
|     id "com.android.library" | ||||
| } | ||||
|  | ||||
| apply from: "$mppAndroidProjectPresetPath" | ||||
| apply from: "$mppAndroidProject" | ||||
|  | ||||
| kotlin { | ||||
|     sourceSets { | ||||
|   | ||||
| @@ -3,15 +3,16 @@ plugins { | ||||
|     id "org.jetbrains.kotlin.plugin.serialization" | ||||
|     id "com.android.library" | ||||
|     alias(libs.plugins.jb.compose) | ||||
|     alias(libs.plugins.kt.jb.compose) | ||||
| } | ||||
|  | ||||
| apply from: "$mppProjectWithSerializationAndComposePresetPath" | ||||
| apply from: "$mppProjectWithSerializationAndCompose" | ||||
|  | ||||
| kotlin { | ||||
|     sourceSets { | ||||
|         androidMain { | ||||
|             dependencies { | ||||
|                 api libs.android.compose.material3 | ||||
|                 api libs.jb.compose.material3 | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -29,15 +29,6 @@ allprojects { | ||||
|         maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" } | ||||
|         maven { url "https://nexus.inmo.dev/repository/maven-releases/" } | ||||
|     } | ||||
|  | ||||
|     // temporal crutch until legacy tests will be stabled or legacy target will be removed | ||||
|     if (it != rootProject.findProject("docs")) { | ||||
|         tasks.whenTaskAdded { task -> | ||||
|             if(task.name == "jsLegacyBrowserTest" || task.name == "jsLegacyNodeTest") { | ||||
|                 task.enabled = false | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| apply from: "./extensions.gradle" | ||||
|   | ||||
							
								
								
									
										17
									
								
								colors/build.gradle
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								colors/build.gradle
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,17 @@ | ||||
| plugins { | ||||
|     id "org.jetbrains.kotlin.multiplatform" | ||||
|     id "org.jetbrains.kotlin.plugin.serialization" | ||||
|     id "com.android.library" | ||||
| } | ||||
|  | ||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||
|  | ||||
| kotlin { | ||||
|     sourceSets { | ||||
|         commonMain { | ||||
|             dependencies { | ||||
|                 api project(":micro_utils.colors.common") | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -4,4 +4,4 @@ plugins { | ||||
|     id "com.android.library" | ||||
| } | ||||
|  | ||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" | ||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||
|   | ||||
| @@ -12,16 +12,30 @@ import kotlin.math.floor | ||||
|  * * Red (0.5 capacity): `0xff000088u` | ||||
|  * | ||||
|  * Anyway it is recommended to use | ||||
|  * | ||||
|  * @param hexaUInt rgba [UInt] in format `0xFFEEBBAA` where FF - red, EE - green, BB - blue` and AA - alpha | ||||
|  */ | ||||
| @Serializable | ||||
| @JvmInline | ||||
| value class HEXAColor ( | ||||
|     val uint: UInt | ||||
|     val hexaUInt: UInt | ||||
| ) : Comparable<HEXAColor> { | ||||
|     /** | ||||
|      * @returns [hexaUInt] as a string with format `#FFEEBBAA` where FF - red, EE - green, BB - blue and AA - alpha | ||||
|      */ | ||||
|     val hexa: String | ||||
|         get() = "#${uint.toString(16).padStart(8, '0')}" | ||||
|         get() = "#${hexaUInt.toString(16).padStart(8, '0')}" | ||||
|  | ||||
|     /** | ||||
|      * @returns [hexaUInt] as a string with format `#FFEEBB` where FF - red, EE - green and BB - blue | ||||
|      */ | ||||
|     val hex: String | ||||
|         get() = hexa.take(7) | ||||
|     /** | ||||
|      * @returns [hexaUInt] as a string with format `#AAFFEEBB` where AA - alpha, FF - red, EE - green and BB - blue | ||||
|      */ | ||||
|     val ahex: String | ||||
|         get() = "#${a.toString(16).padStart(2, '2')}${hex.drop(1)}" | ||||
|     val rgba: String | ||||
|         get() = "rgba($r,$g,$b,${aOfOne.toString().take(5)})" | ||||
|     val rgb: String | ||||
| @@ -30,21 +44,25 @@ value class HEXAColor ( | ||||
|         get() = "#${r.shortPart()}${g.shortPart()}${b.shortPart()}" | ||||
|     val shortHexa: String | ||||
|         get() = "$shortHex${a.shortPart()}" | ||||
|     val rgbUInt: UInt | ||||
|         get() = (hexaUInt / 256u) | ||||
|     val rgbInt: Int | ||||
|         get() = (uint shr 2).toInt() | ||||
|         get() = rgbUInt.toInt() | ||||
|     val ahexUInt | ||||
|         get() = (a * 0x1000000).toUInt() + rgbUInt | ||||
|  | ||||
|     val r: Int | ||||
|         get() = ((uint and 0xff000000u) / 0x1000000u).toInt() | ||||
|         get() = ((hexaUInt and 0xff000000u) / 0x1000000u).toInt() | ||||
|     val g: Int | ||||
|         get() = ((uint and 0x00ff0000u) / 0x10000u).toInt() | ||||
|         get() = ((hexaUInt and 0x00ff0000u) / 0x10000u).toInt() | ||||
|     val b: Int | ||||
|         get() = ((uint and 0x0000ff00u) / 0x100u).toInt() | ||||
|         get() = ((hexaUInt and 0x0000ff00u) / 0x100u).toInt() | ||||
|     val a: Int | ||||
|         get() = ((uint and 0x000000ffu)).toInt() | ||||
|         get() = ((hexaUInt and 0x000000ffu)).toInt() | ||||
|     val aOfOne: Float | ||||
|         get() = a.toFloat() / (0xff) | ||||
|     init { | ||||
|         require(uint in 0u ..0xffffffffu) | ||||
|         require(hexaUInt in 0u ..0xffffffffu) | ||||
|     } | ||||
|  | ||||
|     constructor(r: Int, g: Int, b: Int, a: Int) : this( | ||||
| @@ -64,7 +82,7 @@ value class HEXAColor ( | ||||
|         return hexa | ||||
|     } | ||||
|  | ||||
|     override fun compareTo(other: HEXAColor): Int = (uint - other.uint).coerceIn(Int.MIN_VALUE.toUInt(), Int.MAX_VALUE.toLong().toUInt()).toInt() | ||||
|     override fun compareTo(other: HEXAColor): Int = (hexaUInt - other.hexaUInt).coerceIn(Int.MIN_VALUE.toUInt(), Int.MAX_VALUE.toLong().toUInt()).toInt() | ||||
|  | ||||
|     fun copy( | ||||
|         r: Int = this.r, | ||||
| @@ -121,6 +139,21 @@ value class HEXAColor ( | ||||
|             else -> color | ||||
|         }.lowercase().toUInt(16).let(::HEXAColor) | ||||
|  | ||||
|         /** | ||||
|          * Creates [HEXAColor] from [uint] presume it is in format `0xFFEEBBAA` where FF - red, EE - green, BB - blue` and AA - alpha | ||||
|          */ | ||||
|         fun fromHexa(uint: UInt) = HEXAColor(uint) | ||||
|  | ||||
|         /** | ||||
|          * Creates [HEXAColor] from [uint] presume it is in format `0xAAFFEEBB` where AA - alpha, FF - red, EE - green and BB - blue` | ||||
|          */ | ||||
|         fun fromAhex(uint: UInt) = HEXAColor( | ||||
|             a = ((uint and 0xff000000u) / 0x1000000u).toInt(), | ||||
|             r = ((uint and 0x00ff0000u) / 0x10000u).toInt(), | ||||
|             g = ((uint and 0x0000ff00u) / 0x100u).toInt(), | ||||
|             b = ((uint and 0x000000ffu)).toInt() | ||||
|         ) | ||||
|  | ||||
|         /** | ||||
|          * Parsing color from [color] | ||||
|          * | ||||
|   | ||||
| @@ -13,6 +13,9 @@ class HexColorTests { | ||||
|         val shortHexa: String, | ||||
|         val hex: String, | ||||
|         val hexa: String, | ||||
|         val ahex: String, | ||||
|         val ahexUInt: UInt, | ||||
|         val rgbUInt: UInt, | ||||
|         val rgb: String, | ||||
|         val rgba: String, | ||||
|         val r: Int, | ||||
| @@ -24,11 +27,14 @@ class HexColorTests { | ||||
|     val testColors: List<TestColor> | ||||
|         get() = listOf( | ||||
|             TestColor( | ||||
|                 color = HEXAColor(uint = 0xff0000ffu), | ||||
|                 color = HEXAColor(hexaUInt = 0xff0000ffu), | ||||
|                 shortHex = "#f00", | ||||
|                 shortHexa = "#f00f", | ||||
|                 hex = "#ff0000", | ||||
|                 hexa = "#ff0000ff", | ||||
|                 ahex = "#ffff0000", | ||||
|                 ahexUInt = 0xffff0000u, | ||||
|                 rgbUInt = 0xff0000u, | ||||
|                 rgb = "rgb(255,0,0)", | ||||
|                 rgba = "rgba(255,0,0,1.0)", | ||||
|                 r = 0xff, | ||||
| @@ -38,11 +44,14 @@ class HexColorTests { | ||||
|                 "rgba(255,0,0,1)", | ||||
|             ), | ||||
|             TestColor( | ||||
|                 color = HEXAColor(uint = 0x00ff00ffu), | ||||
|                 color = HEXAColor(hexaUInt = 0x00ff00ffu), | ||||
|                 shortHex = "#0f0", | ||||
|                 shortHexa = "#0f0f", | ||||
|                 hex = "#00ff00", | ||||
|                 hexa = "#00ff00ff", | ||||
|                 ahex = "#ff00ff00", | ||||
|                 ahexUInt = 0xff00ff00u, | ||||
|                 rgbUInt = 0x00ff00u, | ||||
|                 rgb = "rgb(0,255,0)", | ||||
|                 rgba = "rgba(0,255,0,1.0)", | ||||
|                 r = 0x00, | ||||
| @@ -57,6 +66,9 @@ class HexColorTests { | ||||
|                 shortHexa = "#00ff", | ||||
|                 hex = "#0000ff", | ||||
|                 hexa = "#0000ffff", | ||||
|                 ahex = "#ff0000ff", | ||||
|                 ahexUInt = 0xff0000ffu, | ||||
|                 rgbUInt = 0x0000ffu, | ||||
|                 rgb = "rgb(0,0,255)", | ||||
|                 rgba = "rgba(0,0,255,1.0)", | ||||
|                 r = 0x00, | ||||
| @@ -71,6 +83,9 @@ class HexColorTests { | ||||
|                 shortHexa = "#f008", | ||||
|                 hex = "#ff0000", | ||||
|                 hexa = "#ff000088", | ||||
|                 ahex = "#88ff0000", | ||||
|                 ahexUInt = 0x88ff0000u, | ||||
|                 rgbUInt = 0xff0000u, | ||||
|                 rgb = "rgb(255,0,0)", | ||||
|                 rgba = "rgba(255,0,0,0.533)", | ||||
|                 r = 0xff, | ||||
| @@ -84,6 +99,9 @@ class HexColorTests { | ||||
|                 shortHexa = "#0f08", | ||||
|                 hex = "#00ff00", | ||||
|                 hexa = "#00ff0088", | ||||
|                 ahex = "#8800ff00", | ||||
|                 ahexUInt = 0x8800ff00u, | ||||
|                 rgbUInt = 0x00ff00u, | ||||
|                 rgb = "rgb(0,255,0)", | ||||
|                 rgba = "rgba(0,255,0,0.533)", | ||||
|                 r = 0x00, | ||||
| @@ -97,6 +115,9 @@ class HexColorTests { | ||||
|                 shortHexa = "#00f8", | ||||
|                 hex = "#0000ff", | ||||
|                 hexa = "#0000ff88", | ||||
|                 ahex = "#880000ff", | ||||
|                 ahexUInt = 0x880000ffu, | ||||
|                 rgbUInt = 0x0000ffu, | ||||
|                 rgb = "rgb(0,0,255)", | ||||
|                 rgba = "rgba(0,0,255,0.533)", | ||||
|                 r = 0x00, | ||||
| @@ -110,6 +131,9 @@ class HexColorTests { | ||||
|                 shortHexa = "#f002", | ||||
|                 hex = "#ff0000", | ||||
|                 hexa = "#ff000022", | ||||
|                 ahex = "#22ff0000", | ||||
|                 ahexUInt = 0x22ff0000u, | ||||
|                 rgbUInt = 0xff0000u, | ||||
|                 rgb = "rgb(255,0,0)", | ||||
|                 rgba = "rgba(255,0,0,0.133)", | ||||
|                 r = 0xff, | ||||
| @@ -123,6 +147,9 @@ class HexColorTests { | ||||
|                 shortHexa = "#0f02", | ||||
|                 hex = "#00ff00", | ||||
|                 hexa = "#00ff0022", | ||||
|                 ahex = "#2200ff00", | ||||
|                 ahexUInt = 0x2200ff00u, | ||||
|                 rgbUInt = 0x00ff00u, | ||||
|                 rgb = "rgb(0,255,0)", | ||||
|                 rgba = "rgba(0,255,0,0.133)", | ||||
|                 r = 0x00, | ||||
| @@ -136,6 +163,9 @@ class HexColorTests { | ||||
|                 shortHexa = "#00f2", | ||||
|                 hex = "#0000ff", | ||||
|                 hexa = "#0000ff22", | ||||
|                 ahex = "#220000ff", | ||||
|                 ahexUInt = 0x220000ffu, | ||||
|                 rgbUInt = 0x0000ffu, | ||||
|                 rgb = "rgb(0,0,255)", | ||||
|                 rgba = "rgba(0,0,255,0.133)", | ||||
|                 r = 0x00, | ||||
| @@ -150,6 +180,9 @@ class HexColorTests { | ||||
|         testColors.forEach { | ||||
|             assertEquals(it.hex, it.color.hex) | ||||
|             assertEquals(it.hexa, it.color.hexa) | ||||
|             assertEquals(it.ahex, it.color.ahex) | ||||
|             assertEquals(it.rgbUInt, it.color.rgbUInt) | ||||
|             assertEquals(it.ahexUInt, it.color.ahexUInt) | ||||
|             assertEquals(it.shortHex, it.color.shortHex) | ||||
|             assertEquals(it.shortHexa, it.color.shortHexa) | ||||
|             assertEquals(it.rgb, it.color.rgb) | ||||
| @@ -158,6 +191,7 @@ class HexColorTests { | ||||
|             assertEquals(it.g, it.color.g) | ||||
|             assertEquals(it.b, it.color.b) | ||||
|             assertEquals(it.a, it.color.a) | ||||
|             assertEquals(it.color, HEXAColor.fromAhex(it.ahexUInt)) | ||||
|         } | ||||
|     } | ||||
|  | ||||
| @@ -167,7 +201,7 @@ class HexColorTests { | ||||
|             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, ) | ||||
|             assertTrue(it.color.hexaUInt.toInt() - HEXAColor.parseStringColor(it.rgba).hexaUInt.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)) | ||||
|         } | ||||
|   | ||||
							
								
								
									
										298
									
								
								colors/src/commonMain/kotlin/StandardColors.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										298
									
								
								colors/src/commonMain/kotlin/StandardColors.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,298 @@ | ||||
| package dev.inmo.micro_utils.colors | ||||
|  | ||||
| import dev.inmo.micro_utils.colors.common.HEXAColor | ||||
|  | ||||
| val HEXAColor.Companion.aliceblue | ||||
|     get() = HEXAColor(0xF0F8FFFFu) | ||||
| val HEXAColor.Companion.antiquewhite | ||||
|     get() = HEXAColor(0xFAEBD7FFu) | ||||
| val HEXAColor.Companion.aqua | ||||
|     get() = HEXAColor(0x00FFFFFFu) | ||||
| val HEXAColor.Companion.aquamarine | ||||
|     get() = HEXAColor(0x7FFFD4FFu) | ||||
| val HEXAColor.Companion.azure | ||||
|     get() = HEXAColor(0xF0FFFFFFu) | ||||
| val HEXAColor.Companion.beige | ||||
|     get() = HEXAColor(0xF5F5DCFFu) | ||||
| val HEXAColor.Companion.bisque | ||||
|     get() = HEXAColor(0xFFE4C4FFu) | ||||
| val HEXAColor.Companion.black | ||||
|     get() = HEXAColor(0x000000FFu) | ||||
| val HEXAColor.Companion.blanchedalmond | ||||
|     get() = HEXAColor(0xFFEBCDFFu) | ||||
| val HEXAColor.Companion.blue | ||||
|     get() = HEXAColor(0x0000FFFFu) | ||||
| val HEXAColor.Companion.blueviolet | ||||
|     get() = HEXAColor(0x8A2BE2FFu) | ||||
| val HEXAColor.Companion.brown | ||||
|     get() = HEXAColor(0xA52A2AFFu) | ||||
| val HEXAColor.Companion.burlywood | ||||
|     get() = HEXAColor(0xDEB887FFu) | ||||
| val HEXAColor.Companion.cadetblue | ||||
|     get() = HEXAColor(0x5F9EA0FFu) | ||||
| val HEXAColor.Companion.chartreuse | ||||
|     get() = HEXAColor(0x7FFF00FFu) | ||||
| val HEXAColor.Companion.chocolate | ||||
|     get() = HEXAColor(0xD2691EFFu) | ||||
| val HEXAColor.Companion.coral | ||||
|     get() = HEXAColor(0xFF7F50FFu) | ||||
| val HEXAColor.Companion.cornflowerblue | ||||
|     get() = HEXAColor(0x6495EDFFu) | ||||
| val HEXAColor.Companion.cornsilk | ||||
|     get() = HEXAColor(0xFFF8DCFFu) | ||||
| val HEXAColor.Companion.crimson | ||||
|     get() = HEXAColor(0xDC143CFFu) | ||||
| val HEXAColor.Companion.cyan | ||||
|     get() = HEXAColor(0x00FFFFFFu) | ||||
| val HEXAColor.Companion.darkblue | ||||
|     get() = HEXAColor(0x00008BFFu) | ||||
| val HEXAColor.Companion.darkcyan | ||||
|     get() = HEXAColor(0x008B8BFFu) | ||||
| val HEXAColor.Companion.darkgoldenrod | ||||
|     get() = HEXAColor(0xB8860BFFu) | ||||
| val HEXAColor.Companion.darkgray | ||||
|     get() = HEXAColor(0xA9A9A9FFu) | ||||
| val HEXAColor.Companion.darkgreen | ||||
|     get() = HEXAColor(0x006400FFu) | ||||
| val HEXAColor.Companion.darkgrey | ||||
|     get() = HEXAColor(0xA9A9A9FFu) | ||||
| val HEXAColor.Companion.darkkhaki | ||||
|     get() = HEXAColor(0xBDB76BFFu) | ||||
| val HEXAColor.Companion.darkmagenta | ||||
|     get() = HEXAColor(0x8B008BFFu) | ||||
| val HEXAColor.Companion.darkolivegreen | ||||
|     get() = HEXAColor(0x556B2FFFu) | ||||
| val HEXAColor.Companion.darkorange | ||||
|     get() = HEXAColor(0xFF8C00FFu) | ||||
| val HEXAColor.Companion.darkorchid | ||||
|     get() = HEXAColor(0x9932CCFFu) | ||||
| val HEXAColor.Companion.darkred | ||||
|     get() = HEXAColor(0x8B0000FFu) | ||||
| val HEXAColor.Companion.darksalmon | ||||
|     get() = HEXAColor(0xE9967AFFu) | ||||
| val HEXAColor.Companion.darkseagreen | ||||
|     get() = HEXAColor(0x8FBC8FFFu) | ||||
| val HEXAColor.Companion.darkslateblue | ||||
|     get() = HEXAColor(0x483D8BFFu) | ||||
| val HEXAColor.Companion.darkslategray | ||||
|     get() = HEXAColor(0x2F4F4FFFu) | ||||
| val HEXAColor.Companion.darkslategrey | ||||
|     get() = HEXAColor(0x2F4F4FFFu) | ||||
| val HEXAColor.Companion.darkturquoise | ||||
|     get() = HEXAColor(0x00CED1FFu) | ||||
| val HEXAColor.Companion.darkviolet | ||||
|     get() = HEXAColor(0x9400D3FFu) | ||||
| val HEXAColor.Companion.deeppink | ||||
|     get() = HEXAColor(0xFF1493FFu) | ||||
| val HEXAColor.Companion.deepskyblue | ||||
|     get() = HEXAColor(0x00BFFFFFu) | ||||
| val HEXAColor.Companion.dimgray | ||||
|     get() = HEXAColor(0x696969FFu) | ||||
| val HEXAColor.Companion.dimgrey | ||||
|     get() = HEXAColor(0x696969FFu) | ||||
| val HEXAColor.Companion.dodgerblue | ||||
|     get() = HEXAColor(0x1E90FFFFu) | ||||
| val HEXAColor.Companion.firebrick | ||||
|     get() = HEXAColor(0xB22222FFu) | ||||
| val HEXAColor.Companion.floralwhite | ||||
|     get() = HEXAColor(0xFFFAF0FFu) | ||||
| val HEXAColor.Companion.forestgreen | ||||
|     get() = HEXAColor(0x228B22FFu) | ||||
| val HEXAColor.Companion.fuchsia | ||||
|     get() = HEXAColor(0xFF00FFFFu) | ||||
| val HEXAColor.Companion.gainsboro | ||||
|     get() = HEXAColor(0xDCDCDCFFu) | ||||
| val HEXAColor.Companion.ghostwhite | ||||
|     get() = HEXAColor(0xF8F8FFFFu) | ||||
| val HEXAColor.Companion.gold | ||||
|     get() = HEXAColor(0xFFD700FFu) | ||||
| val HEXAColor.Companion.goldenrod | ||||
|     get() = HEXAColor(0xDAA520FFu) | ||||
| val HEXAColor.Companion.gray | ||||
|     get() = HEXAColor(0x808080FFu) | ||||
| val HEXAColor.Companion.green | ||||
|     get() = HEXAColor(0x008000FFu) | ||||
| val HEXAColor.Companion.greenyellow | ||||
|     get() = HEXAColor(0xADFF2FFFu) | ||||
| val HEXAColor.Companion.grey | ||||
|     get() = HEXAColor(0x808080FFu) | ||||
| val HEXAColor.Companion.honeydew | ||||
|     get() = HEXAColor(0xF0FFF0FFu) | ||||
| val HEXAColor.Companion.hotpink | ||||
|     get() = HEXAColor(0xFF69B4FFu) | ||||
| val HEXAColor.Companion.indianred | ||||
|     get() = HEXAColor(0xCD5C5CFFu) | ||||
| val HEXAColor.Companion.indigo | ||||
|     get() = HEXAColor(0x4B0082FFu) | ||||
| val HEXAColor.Companion.ivory | ||||
|     get() = HEXAColor(0xFFFFF0FFu) | ||||
| val HEXAColor.Companion.khaki | ||||
|     get() = HEXAColor(0xF0E68CFFu) | ||||
| val HEXAColor.Companion.lavender | ||||
|     get() = HEXAColor(0xE6E6FAFFu) | ||||
| val HEXAColor.Companion.lavenderblush | ||||
|     get() = HEXAColor(0xFFF0F5FFu) | ||||
| val HEXAColor.Companion.lawngreen | ||||
|     get() = HEXAColor(0x7CFC00FFu) | ||||
| val HEXAColor.Companion.lemonchiffon | ||||
|     get() = HEXAColor(0xFFFACDFFu) | ||||
| val HEXAColor.Companion.lightblue | ||||
|     get() = HEXAColor(0xADD8E6FFu) | ||||
| val HEXAColor.Companion.lightcoral | ||||
|     get() = HEXAColor(0xF08080FFu) | ||||
| val HEXAColor.Companion.lightcyan | ||||
|     get() = HEXAColor(0xE0FFFFFFu) | ||||
| val HEXAColor.Companion.lightgoldenrodyellow | ||||
|     get() = HEXAColor(0xFAFAD2FFu) | ||||
| val HEXAColor.Companion.lightgray | ||||
|     get() = HEXAColor(0xD3D3D3FFu) | ||||
| val HEXAColor.Companion.lightgreen | ||||
|     get() = HEXAColor(0x90EE90FFu) | ||||
| val HEXAColor.Companion.lightgrey | ||||
|     get() = HEXAColor(0xD3D3D3FFu) | ||||
| val HEXAColor.Companion.lightpink | ||||
|     get() = HEXAColor(0xFFB6C1FFu) | ||||
| val HEXAColor.Companion.lightsalmon | ||||
|     get() = HEXAColor(0xFFA07AFFu) | ||||
| val HEXAColor.Companion.lightseagreen | ||||
|     get() = HEXAColor(0x20B2AAFFu) | ||||
| val HEXAColor.Companion.lightskyblue | ||||
|     get() = HEXAColor(0x87CEFAFFu) | ||||
| val HEXAColor.Companion.lightslategray | ||||
|     get() = HEXAColor(0x778899FFu) | ||||
| val HEXAColor.Companion.lightslategrey | ||||
|     get() = HEXAColor(0x778899FFu) | ||||
| val HEXAColor.Companion.lightsteelblue | ||||
|     get() = HEXAColor(0xB0C4DEFFu) | ||||
| val HEXAColor.Companion.lightyellow | ||||
|     get() = HEXAColor(0xFFFFE0FFu) | ||||
| val HEXAColor.Companion.lime | ||||
|     get() = HEXAColor(0x00FF00FFu) | ||||
| val HEXAColor.Companion.limegreen | ||||
|     get() = HEXAColor(0x32CD32FFu) | ||||
| val HEXAColor.Companion.linen | ||||
|     get() = HEXAColor(0xFAF0E6FFu) | ||||
| val HEXAColor.Companion.magenta | ||||
|     get() = HEXAColor(0xFF00FFFFu) | ||||
| val HEXAColor.Companion.maroon | ||||
|     get() = HEXAColor(0x800000FFu) | ||||
| val HEXAColor.Companion.mediumaquamarine | ||||
|     get() = HEXAColor(0x66CDAAFFu) | ||||
| val HEXAColor.Companion.mediumblue | ||||
|     get() = HEXAColor(0x0000CDFFu) | ||||
| val HEXAColor.Companion.mediumorchid | ||||
|     get() = HEXAColor(0xBA55D3FFu) | ||||
| val HEXAColor.Companion.mediumpurple | ||||
|     get() = HEXAColor(0x9370DBFFu) | ||||
| val HEXAColor.Companion.mediumseagreen | ||||
|     get() = HEXAColor(0x3CB371FFu) | ||||
| val HEXAColor.Companion.mediumslateblue | ||||
|     get() = HEXAColor(0x7B68EEFFu) | ||||
| val HEXAColor.Companion.mediumspringgreen | ||||
|     get() = HEXAColor(0x00FA9AFFu) | ||||
| val HEXAColor.Companion.mediumturquoise | ||||
|     get() = HEXAColor(0x48D1CCFFu) | ||||
| val HEXAColor.Companion.mediumvioletred | ||||
|     get() = HEXAColor(0xC71585FFu) | ||||
| val HEXAColor.Companion.midnightblue | ||||
|     get() = HEXAColor(0x191970FFu) | ||||
| val HEXAColor.Companion.mintcream | ||||
|     get() = HEXAColor(0xF5FFFAFFu) | ||||
| val HEXAColor.Companion.mistyrose | ||||
|     get() = HEXAColor(0xFFE4E1FFu) | ||||
| val HEXAColor.Companion.moccasin | ||||
|     get() = HEXAColor(0xFFE4B5FFu) | ||||
| val HEXAColor.Companion.navajowhite | ||||
|     get() = HEXAColor(0xFFDEADFFu) | ||||
| val HEXAColor.Companion.navy | ||||
|     get() = HEXAColor(0x000080FFu) | ||||
| val HEXAColor.Companion.oldlace | ||||
|     get() = HEXAColor(0xFDF5E6FFu) | ||||
| val HEXAColor.Companion.olive | ||||
|     get() = HEXAColor(0x808000FFu) | ||||
| val HEXAColor.Companion.olivedrab | ||||
|     get() = HEXAColor(0x6B8E23FFu) | ||||
| val HEXAColor.Companion.orange | ||||
|     get() = HEXAColor(0xFFA500FFu) | ||||
| val HEXAColor.Companion.orangered | ||||
|     get() = HEXAColor(0xFF4500FFu) | ||||
| val HEXAColor.Companion.orchid | ||||
|     get() = HEXAColor(0xDA70D6FFu) | ||||
| val HEXAColor.Companion.palegoldenrod | ||||
|     get() = HEXAColor(0xEEE8AAFFu) | ||||
| val HEXAColor.Companion.palegreen | ||||
|     get() = HEXAColor(0x98FB98FFu) | ||||
| val HEXAColor.Companion.paleturquoise | ||||
|     get() = HEXAColor(0xAFEEEEFFu) | ||||
| val HEXAColor.Companion.palevioletred | ||||
|     get() = HEXAColor(0xDB7093FFu) | ||||
| val HEXAColor.Companion.papayawhip | ||||
|     get() = HEXAColor(0xFFEFD5FFu) | ||||
| val HEXAColor.Companion.peachpuff | ||||
|     get() = HEXAColor(0xFFDAB9FFu) | ||||
| val HEXAColor.Companion.peru | ||||
|     get() = HEXAColor(0xCD853FFFu) | ||||
| val HEXAColor.Companion.pink | ||||
|     get() = HEXAColor(0xFFC0CBFFu) | ||||
| val HEXAColor.Companion.plum | ||||
|     get() = HEXAColor(0xDDA0DDFFu) | ||||
| val HEXAColor.Companion.powderblue | ||||
|     get() = HEXAColor(0xB0E0E6FFu) | ||||
| val HEXAColor.Companion.purple | ||||
|     get() = HEXAColor(0x800080FFu) | ||||
| val HEXAColor.Companion.red | ||||
|     get() = HEXAColor(0xFF0000FFu) | ||||
| val HEXAColor.Companion.rosybrown | ||||
|     get() = HEXAColor(0xBC8F8FFFu) | ||||
| val HEXAColor.Companion.royalblue | ||||
|     get() = HEXAColor(0x4169E1FFu) | ||||
| val HEXAColor.Companion.saddlebrown | ||||
|     get() = HEXAColor(0x8B4513FFu) | ||||
| val HEXAColor.Companion.salmon | ||||
|     get() = HEXAColor(0xFA8072FFu) | ||||
| val HEXAColor.Companion.sandybrown | ||||
|     get() = HEXAColor(0xF4A460FFu) | ||||
| val HEXAColor.Companion.seagreen | ||||
|     get() = HEXAColor(0x2E8B57FFu) | ||||
| val HEXAColor.Companion.seashell | ||||
|     get() = HEXAColor(0xFFF5EEFFu) | ||||
| val HEXAColor.Companion.sienna | ||||
|     get() = HEXAColor(0xA0522DFFu) | ||||
| val HEXAColor.Companion.silver | ||||
|     get() = HEXAColor(0xC0C0C0FFu) | ||||
| val HEXAColor.Companion.skyblue | ||||
|     get() = HEXAColor(0x87CEEBFFu) | ||||
| val HEXAColor.Companion.slateblue | ||||
|     get() = HEXAColor(0x6A5ACDFFu) | ||||
| val HEXAColor.Companion.slategray | ||||
|     get() = HEXAColor(0x708090FFu) | ||||
| val HEXAColor.Companion.slategrey | ||||
|     get() = HEXAColor(0x708090FFu) | ||||
| val HEXAColor.Companion.snow | ||||
|     get() = HEXAColor(0xFFFAFAFFu) | ||||
| val HEXAColor.Companion.springgreen | ||||
|     get() = HEXAColor(0x00FF7FFFu) | ||||
| val HEXAColor.Companion.steelblue | ||||
|     get() = HEXAColor(0x4682B4FFu) | ||||
| val HEXAColor.Companion.tan | ||||
|     get() = HEXAColor(0xD2B48CFFu) | ||||
| val HEXAColor.Companion.teal | ||||
|     get() = HEXAColor(0x008080FFu) | ||||
| val HEXAColor.Companion.thistle | ||||
|     get() = HEXAColor(0xD8BFD8FFu) | ||||
| val HEXAColor.Companion.tomato | ||||
|     get() = HEXAColor(0xFF6347FFu) | ||||
| val HEXAColor.Companion.turquoise | ||||
|     get() = HEXAColor(0x40E0D0FFu) | ||||
| val HEXAColor.Companion.violet | ||||
|     get() = HEXAColor(0xEE82EEFFu) | ||||
| val HEXAColor.Companion.wheat | ||||
|     get() = HEXAColor(0xF5DEB3FFu) | ||||
| val HEXAColor.Companion.white | ||||
|     get() = HEXAColor(0xFFFFFFFFu) | ||||
| val HEXAColor.Companion.whitesmoke | ||||
|     get() = HEXAColor(0xF5F5F5FFu) | ||||
| val HEXAColor.Companion.yellow | ||||
|     get() = HEXAColor(0xFFFF00FFu) | ||||
| val HEXAColor.Companion.yellowgreen | ||||
|     get() = HEXAColor(0x9ACD32FFu) | ||||
| @@ -4,10 +4,15 @@ plugins { | ||||
|     id "com.android.library" | ||||
| } | ||||
|  | ||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" | ||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||
|  | ||||
| kotlin { | ||||
|     sourceSets { | ||||
|         commonMain { | ||||
|             dependencies { | ||||
|                 api libs.klock | ||||
|             } | ||||
|         } | ||||
|         jvmMain { | ||||
|             dependencies { | ||||
|                 api project(":micro_utils.coroutines") | ||||
| @@ -15,23 +20,11 @@ kotlin { | ||||
|         } | ||||
|         androidMain { | ||||
|             dependencies { | ||||
|                 api project(":micro_utils.coroutines") | ||||
|                 api libs.android.fragment | ||||
|             } | ||||
|             dependsOn jvmMain | ||||
|         } | ||||
|  | ||||
|         linuxX64Main { | ||||
|             dependencies { | ||||
|                 api libs.okio | ||||
|             } | ||||
|         } | ||||
|         mingwX64Main { | ||||
|             dependencies { | ||||
|                 api libs.okio | ||||
|             } | ||||
|         } | ||||
|         linuxArm64Main { | ||||
|         nativeMain { | ||||
|             dependencies { | ||||
|                 api libs.okio | ||||
|             } | ||||
|   | ||||
| @@ -3,15 +3,17 @@ plugins { | ||||
|     id "org.jetbrains.kotlin.plugin.serialization" | ||||
|     id "com.android.library" | ||||
|     alias(libs.plugins.jb.compose) | ||||
|     alias(libs.plugins.kt.jb.compose) | ||||
| } | ||||
|  | ||||
| apply from: "$mppProjectWithSerializationAndComposePresetPath" | ||||
| apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||
|  | ||||
| kotlin { | ||||
|     sourceSets { | ||||
|         commonMain { | ||||
|             dependencies { | ||||
|                 api project(":micro_utils.common") | ||||
|                 api libs.kt.coroutines | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -0,0 +1,74 @@ | ||||
| package dev.inmo.micro_utils.common.compose | ||||
|  | ||||
| import androidx.compose.runtime.* | ||||
| import dev.inmo.micro_utils.common.Optional | ||||
| import dev.inmo.micro_utils.common.dataOrThrow | ||||
| import dev.inmo.micro_utils.common.optional | ||||
|  | ||||
| class LoadableComponentContext<T> internal constructor( | ||||
|     presetOptional: Optional<T>, | ||||
| ) { | ||||
|     internal val iterationState: MutableState<Int> = mutableStateOf(0) | ||||
|  | ||||
|     internal var dataOptional: Optional<T> = if (presetOptional.dataPresented) presetOptional else Optional.absent() | ||||
|         private set | ||||
|     internal val dataState: MutableState<Optional<T>> = mutableStateOf(dataOptional) | ||||
|  | ||||
|     fun reload() { | ||||
|         iterationState.value++ | ||||
|     } | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Showing data with ability to reload data | ||||
|  * | ||||
|  * [block] will be shown when [loader] will complete loading. If you want to reload data, just call | ||||
|  * [LoadableComponentContext.reload] | ||||
|  */ | ||||
| @Composable | ||||
| fun <T> LoadableComponent( | ||||
|     preload: Optional<T>, | ||||
|     loader: suspend LoadableComponentContext<T>.() -> T, | ||||
|     block: @Composable LoadableComponentContext<T>.(T) -> Unit | ||||
| ) { | ||||
|     val context = remember { LoadableComponentContext(preload) } | ||||
|  | ||||
|     LaunchedEffect(context.iterationState.value) { | ||||
|         context.dataState.value = loader(context).optional | ||||
|     } | ||||
|  | ||||
|     context.dataState.let { | ||||
|         if (it.value.dataPresented) { | ||||
|             context.block(it.value.dataOrThrow(IllegalStateException("Data must be presented, but optional has been changed by some way"))) | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Showing data with ability to reload data | ||||
|  * | ||||
|  * [block] will be shown when [loader] will complete loading. If you want to reload data, just call | ||||
|  * [LoadableComponentContext.reload] | ||||
|  */ | ||||
| @Composable | ||||
| fun <T> LoadableComponent( | ||||
|     preload: T, | ||||
|     loader: suspend LoadableComponentContext<T>.() -> T, | ||||
|     block: @Composable LoadableComponentContext<T>.(T) -> Unit | ||||
| ) { | ||||
|     LoadableComponent(preload.optional, loader, block) | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Showing data with ability to reload data | ||||
|  * | ||||
|  * [block] will be shown when [loader] will complete loading. If you want to reload data, just call | ||||
|  * [LoadableComponentContext.reload] | ||||
|  */ | ||||
| @Composable | ||||
| fun <T> LoadableComponent( | ||||
|     loader: suspend LoadableComponentContext<T>.() -> T, | ||||
|     block: @Composable LoadableComponentContext<T>.(T) -> Unit | ||||
| ) { | ||||
|     LoadableComponent(Optional.absent(), loader, block) | ||||
| } | ||||
| @@ -0,0 +1,19 @@ | ||||
| package dev.inmo.micro_utils.common.compose | ||||
|  | ||||
| import org.jetbrains.compose.web.dom.AttrBuilderContext | ||||
| import org.w3c.dom.Element | ||||
|  | ||||
| operator fun <T : Element> AttrBuilderContext<T>?.plus( | ||||
|     other: AttrBuilderContext<T>? | ||||
| ) = when (this) { | ||||
|     null -> other ?: {} | ||||
|     else -> when (other) { | ||||
|         null -> this ?: {} | ||||
|         else -> { | ||||
|             { | ||||
|                 invoke(this) | ||||
|                 other(this) | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,22 @@ | ||||
| package dev.inmo.micro_utils.common.compose | ||||
|  | ||||
| import androidx.compose.runtime.Composable | ||||
| import androidx.compose.runtime.DisposableEffect | ||||
| import androidx.compose.runtime.DisposableEffectResult | ||||
| import androidx.compose.runtime.DisposableEffectScope | ||||
| import org.jetbrains.compose.web.attributes.AttrsScope | ||||
| import org.jetbrains.compose.web.dom.ElementScope | ||||
| import org.w3c.dom.Element | ||||
|  | ||||
| /** | ||||
|  * This function must be called in the context of your tag content. It works like default [AttrsScope.ref], | ||||
|  * but able to be used several times. Uses [DisposableEffect] under the hood | ||||
|  */ | ||||
| @Composable | ||||
| fun <T : Element> ElementScope<T>.ref( | ||||
|     block: DisposableEffectScope.(T) -> DisposableEffectResult | ||||
| ) { | ||||
|     DisposableEffect(0) { | ||||
|         block(scopeElement) | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,11 @@ | ||||
| package dev.inmo.micro_utils.common.compose | ||||
|  | ||||
| import org.jetbrains.compose.web.dom.AttrBuilderContext | ||||
|  | ||||
| fun tagClasses(vararg classnames: String): AttrBuilderContext<*> = { | ||||
|     classes(*classnames) | ||||
| } | ||||
|  | ||||
| fun tagId(id: String): AttrBuilderContext<*> = { | ||||
|     id(id) | ||||
| } | ||||
							
								
								
									
										42
									
								
								common/compose/src/jvmTest/kotlin/LoadableComponentTests.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										42
									
								
								common/compose/src/jvmTest/kotlin/LoadableComponentTests.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,42 @@ | ||||
| import androidx.compose.runtime.remember | ||||
| import androidx.compose.ui.test.ExperimentalTestApi | ||||
| import androidx.compose.ui.test.runComposeUiTest | ||||
| import dev.inmo.micro_utils.common.compose.LoadableComponent | ||||
| import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow | ||||
| import kotlinx.coroutines.flow.MutableSharedFlow | ||||
| import kotlinx.coroutines.flow.filter | ||||
| import kotlinx.coroutines.flow.first | ||||
| import kotlinx.coroutines.flow.firstOrNull | ||||
| import org.jetbrains.annotations.TestOnly | ||||
| import kotlin.test.Test | ||||
| import kotlin.test.assertTrue | ||||
|  | ||||
| class LoadableComponentTests { | ||||
|     @OptIn(ExperimentalTestApi::class) | ||||
|     @Test | ||||
|     @TestOnly | ||||
|     fun testSimpleLoad() = runComposeUiTest { | ||||
|         val loadingFlow = SpecialMutableStateFlow<Int>(0) | ||||
|         val loadedFlow = SpecialMutableStateFlow<Int>(0) | ||||
|         setContent { | ||||
|             LoadableComponent<Int>({ | ||||
|                 loadingFlow.filter { it == 1 }.first() | ||||
|             }) { | ||||
|                 assert(dataState.value.data == 1) | ||||
|                 remember { | ||||
|                     loadedFlow.value = 2 | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         waitForIdle() | ||||
|  | ||||
|         assertTrue(loadedFlow.value == 0) | ||||
|  | ||||
|         loadingFlow.value = 1 | ||||
|  | ||||
|         waitForIdle() | ||||
|  | ||||
|         assertTrue(loadedFlow.value == 2) | ||||
|     } | ||||
| } | ||||
| @@ -1 +0,0 @@ | ||||
| <manifest/> | ||||
| @@ -0,0 +1,13 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| fun <T> List<T>.breakAsPairs(): List<Pair<T, T>> { | ||||
|     val result = mutableListOf<Pair<T, T>>() | ||||
|  | ||||
|     for (i in 0 until size - 1) { | ||||
|         val first = get(i) | ||||
|         val second = get(i + 1) | ||||
|         result.add(first to second) | ||||
|     } | ||||
|  | ||||
|     return result | ||||
| } | ||||
| @@ -0,0 +1,6 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| /** | ||||
|  * Creates simple [Comparator] which will use [compareTo] of [T] for both objects | ||||
|  */ | ||||
| fun <T : Comparable<C>, C : T> T.createComparator() = Comparator<C> { o1, o2 -> o1.compareTo(o2) } | ||||
| @@ -0,0 +1,25 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| import korlibs.time.DateTime | ||||
| import kotlinx.serialization.KSerializer | ||||
| import kotlinx.serialization.Serializer | ||||
| import kotlinx.serialization.builtins.serializer | ||||
| import kotlinx.serialization.descriptors.SerialDescriptor | ||||
| import kotlinx.serialization.encoding.Decoder | ||||
| import kotlinx.serialization.encoding.Encoder | ||||
|  | ||||
| /** | ||||
|  * Serializes [DateTime] as its raw [DateTime.unixMillis] and deserializes in the same way | ||||
|  */ | ||||
| object DateTimeSerializer : KSerializer<DateTime> { | ||||
|     override val descriptor: SerialDescriptor | ||||
|         get() = Double.serializer().descriptor | ||||
|  | ||||
|     override fun deserialize(decoder: Decoder): DateTime { | ||||
|         return DateTime(decoder.decodeDouble()) | ||||
|     } | ||||
|  | ||||
|     override fun serialize(encoder: Encoder, value: DateTime) { | ||||
|         encoder.encodeDouble(value.unixMillis) | ||||
|     } | ||||
| } | ||||
| @@ -8,7 +8,7 @@ private inline fun <T> getObject( | ||||
|     additional: MutableList<T>, | ||||
|     iterator: Iterator<T> | ||||
| ): T? = when { | ||||
|     additional.isNotEmpty() -> additional.removeFirst() | ||||
|     additional.isNotEmpty() -> additional.removeAt(0) | ||||
|     iterator.hasNext() -> iterator.next() | ||||
|     else -> null | ||||
| } | ||||
|   | ||||
| @@ -0,0 +1,32 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| inline fun <T> Sequence<T>.padWith(size: Int, inserter: (Sequence<T>) -> Sequence<T>): Sequence<T> { | ||||
|     var result = this | ||||
|     while (result.count() < size) { | ||||
|         result = inserter(result) | ||||
|     } | ||||
|     return result | ||||
| } | ||||
|  | ||||
| inline fun <T> Sequence<T>.padEnd(size: Int, padBlock: (Int) -> T): Sequence<T> = padWith(size) { it + padBlock(it.count()) } | ||||
|  | ||||
| inline fun <T> Sequence<T>.padEnd(size: Int, o: T) = padEnd(size) { o } | ||||
|  | ||||
| inline fun <T> List<T>.padWith(size: Int, inserter: (List<T>) -> List<T>): List<T> { | ||||
|     var result = this | ||||
|     while (result.size < size) { | ||||
|         result = inserter(result) | ||||
|     } | ||||
|     return result | ||||
| } | ||||
| inline fun <T> List<T>.padEnd(size: Int, padBlock: (Int) -> T): List<T> = asSequence().padEnd(size, padBlock).toList() | ||||
|  | ||||
| inline fun <T> List<T>.padEnd(size: Int, o: T): List<T> = asSequence().padEnd(size, o).toList() | ||||
|  | ||||
| inline fun <T> Sequence<T>.padStart(size: Int, padBlock: (Int) -> T): Sequence<T> = padWith(size) { sequenceOf(padBlock(it.count())) + it } | ||||
|  | ||||
| inline fun <T> Sequence<T>.padStart(size: Int, o: T) = padStart(size) { o } | ||||
|  | ||||
| inline fun <T> List<T>.padStart(size: Int, padBlock: (Int) -> T): List<T> = asSequence().padStart(size, padBlock).toList() | ||||
|  | ||||
| inline fun <T> List<T>.padStart(size: Int, o: T): List<T> = asSequence().padStart(size, o).toList() | ||||
| @@ -0,0 +1,76 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| import kotlinx.serialization.Serializable | ||||
| import kotlin.jvm.JvmInline | ||||
|  | ||||
| /** | ||||
|  * Contains [of1] as main value, where 100% of percentage is when of1 == 1 | ||||
|  * | ||||
|  * @see invoke | ||||
|  * @see partOfTotal | ||||
|  * @see of100 | ||||
|  */ | ||||
| @Serializable | ||||
| @JvmInline | ||||
| value class Percentage private constructor( | ||||
|     /** | ||||
|      * Value of percentage. When it equals to 1, means 100% | ||||
|      */ | ||||
|     val of1: Double | ||||
| ) { | ||||
|     /** | ||||
|      * Same as [of1], but float (using [Double.toFloat]) | ||||
|      */ | ||||
|     val of1Float | ||||
|         get() = of1.toFloat() | ||||
|  | ||||
|     /** | ||||
|      * Represent this percentage as common percentage where 100% is 100% | ||||
|      */ | ||||
|     val of100 | ||||
|         get() = of1 * 100 | ||||
|  | ||||
|     /** | ||||
|      * Same as [of100], but float (using [Double.toFloat]) | ||||
|      */ | ||||
|     val of100Float | ||||
|         get() = of100.toFloat() | ||||
|  | ||||
|     /** | ||||
|      * Same as [of100], but int (using [Double.toInt]) | ||||
|      */ | ||||
|     val of100Int | ||||
|         get() = of100.toInt() | ||||
|  | ||||
|     companion object { | ||||
|         val rangeOfValues = 0.0 .. 1.0 | ||||
|  | ||||
|         val START = Percentage(rangeOfValues.start) | ||||
|         val COMPLETED = Percentage(rangeOfValues.endInclusive) | ||||
|  | ||||
|         operator fun invoke(of1: Double) = Percentage(of1.coerceIn(rangeOfValues)) | ||||
|         operator fun invoke(part: Number, total: Number) = Percentage( | ||||
|             part.toDouble() / total.toDouble() | ||||
|         ) | ||||
|         fun of1(of1: Double) = Percentage(of1 = of1) | ||||
|         fun of100(of100: Double) = Percentage(of1 = of100 / 100) | ||||
|         fun partOfTotal(part: Number, total: Number) = Percentage(part = part, total = total) | ||||
|     } | ||||
| } | ||||
|  | ||||
| typealias Progress = Percentage | ||||
|  | ||||
| /** | ||||
|  * Will return [this] [Progress] if [Percentage.of1] in `0 .. 1` range | ||||
|  */ | ||||
| fun Progress.ensureStrictOrNull(): Progress? = if (of1 in Percentage.rangeOfValues) this else null | ||||
| /** | ||||
|  * Will return [this] [Progress] if [Percentage.of1] in `0 .. 1` range. Otherwise, will throw error | ||||
|  * [IllegalArgumentException] due to [require] failure | ||||
|  */ | ||||
| fun Progress.ensureStrictOrThrow(): Progress { | ||||
|     require(of1 in Percentage.rangeOfValues) { | ||||
|         "For strict checks value of percentage must be in ${Percentage.rangeOfValues}, but actual value is $of1" | ||||
|     } | ||||
|     return this | ||||
| } | ||||
| @@ -0,0 +1,80 @@ | ||||
| @file:Suppress( | ||||
|   "RemoveRedundantCallsOfConversionMethods", | ||||
|   "RedundantVisibilityModifier", | ||||
| ) | ||||
|  | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| import kotlin.Byte | ||||
| import kotlin.Double | ||||
| import kotlin.Float | ||||
| import kotlin.Int | ||||
| import kotlin.Long | ||||
| import kotlin.Short | ||||
| import kotlin.Suppress | ||||
|  | ||||
| public operator fun Percentage.plus(other: Percentage): Percentage = Percentage(of1 + other.of1) | ||||
|  | ||||
| public operator fun Percentage.minus(other: Percentage): Percentage = Percentage(of1 - other.of1) | ||||
|  | ||||
| public operator fun Percentage.plus(i: Byte): Percentage = Percentage((of1 + i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.minus(i: Byte): Percentage = Percentage((of1 - i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.times(i: Byte): Percentage = Percentage((of1 * i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.div(i: Byte): Percentage = Percentage((of1 / i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.rem(i: Byte): Percentage = Percentage((of1 % i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.plus(i: Short): Percentage = Percentage((of1 + i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.minus(i: Short): Percentage = Percentage((of1 - i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.times(i: Short): Percentage = Percentage((of1 * i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.div(i: Short): Percentage = Percentage((of1 / i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.rem(i: Short): Percentage = Percentage((of1 % i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.plus(i: Int): Percentage = Percentage((of1 + i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.minus(i: Int): Percentage = Percentage((of1 - i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.times(i: Int): Percentage = Percentage((of1 * i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.div(i: Int): Percentage = Percentage((of1 / i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.rem(i: Int): Percentage = Percentage((of1 % i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.plus(i: Long): Percentage = Percentage((of1 + i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.minus(i: Long): Percentage = Percentage((of1 - i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.times(i: Long): Percentage = Percentage((of1 * i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.div(i: Long): Percentage = Percentage((of1 / i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.rem(i: Long): Percentage = Percentage((of1 % i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.plus(i: Float): Percentage = Percentage((of1 + i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.minus(i: Float): Percentage = Percentage((of1 - i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.times(i: Float): Percentage = Percentage((of1 * i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.div(i: Float): Percentage = Percentage((of1 / i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.rem(i: Float): Percentage = Percentage((of1 % i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.plus(i: Double): Percentage = Percentage((of1 + i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.minus(i: Double): Percentage = Percentage((of1 - i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.times(i: Double): Percentage = Percentage((of1 * i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.div(i: Double): Percentage = Percentage((of1 / i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.rem(i: Double): Percentage = Percentage((of1 % i).toDouble()) | ||||
|  | ||||
| public operator fun Percentage.compareTo(other: Percentage): Int = (of1.compareTo(other.of1)) | ||||
| @@ -1,37 +0,0 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| import kotlinx.serialization.Serializable | ||||
| import kotlin.jvm.JvmInline | ||||
|  | ||||
| @Serializable | ||||
| @JvmInline | ||||
| value class Progress private constructor( | ||||
|     val of1: Double | ||||
| ) { | ||||
|     val of1Float | ||||
|         get() = of1.toFloat() | ||||
|     val of100 | ||||
|         get() = of1 * 100 | ||||
|     val of100Float | ||||
|         get() = of100.toFloat() | ||||
|     val of100Int | ||||
|         get() = of100.toInt() | ||||
|  | ||||
|     init { | ||||
|         require(of1 in rangeOfValues) { | ||||
|             "Progress main value should be in $rangeOfValues, but incoming value is $of1" | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     companion object { | ||||
|         val rangeOfValues = 0.0 .. 1.0 | ||||
|  | ||||
|         val START = Progress(rangeOfValues.start) | ||||
|         val COMPLETED = Progress(rangeOfValues.endInclusive) | ||||
|  | ||||
|         operator fun invoke(of1: Double) = Progress(of1.coerceIn(rangeOfValues)) | ||||
|         operator fun invoke(part: Number, total: Number) = Progress( | ||||
|             part.toDouble() / total.toDouble() | ||||
|         ) | ||||
|     } | ||||
| } | ||||
| @@ -1,80 +0,0 @@ | ||||
| @file:Suppress( | ||||
|   "RemoveRedundantCallsOfConversionMethods", | ||||
|   "RedundantVisibilityModifier", | ||||
| ) | ||||
|  | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| import kotlin.Byte | ||||
| import kotlin.Double | ||||
| import kotlin.Float | ||||
| import kotlin.Int | ||||
| import kotlin.Long | ||||
| import kotlin.Short | ||||
| import kotlin.Suppress | ||||
|  | ||||
| public operator fun Progress.plus(other: Progress): Progress = Progress(of1 + other.of1) | ||||
|  | ||||
| public operator fun Progress.minus(other: Progress): Progress = Progress(of1 - other.of1) | ||||
|  | ||||
| public operator fun Progress.plus(i: Byte): Progress = Progress((of1 + i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.minus(i: Byte): Progress = Progress((of1 - i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.times(i: Byte): Progress = Progress((of1 * i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.div(i: Byte): Progress = Progress((of1 / i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.rem(i: Byte): Progress = Progress((of1 % i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.plus(i: Short): Progress = Progress((of1 + i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.minus(i: Short): Progress = Progress((of1 - i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.times(i: Short): Progress = Progress((of1 * i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.div(i: Short): Progress = Progress((of1 / i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.rem(i: Short): Progress = Progress((of1 % i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.plus(i: Int): Progress = Progress((of1 + i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.minus(i: Int): Progress = Progress((of1 - i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.times(i: Int): Progress = Progress((of1 * i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.div(i: Int): Progress = Progress((of1 / i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.rem(i: Int): Progress = Progress((of1 % i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.plus(i: Long): Progress = Progress((of1 + i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.minus(i: Long): Progress = Progress((of1 - i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.times(i: Long): Progress = Progress((of1 * i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.div(i: Long): Progress = Progress((of1 / i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.rem(i: Long): Progress = Progress((of1 % i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.plus(i: Float): Progress = Progress((of1 + i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.minus(i: Float): Progress = Progress((of1 - i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.times(i: Float): Progress = Progress((of1 * i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.div(i: Float): Progress = Progress((of1 / i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.rem(i: Float): Progress = Progress((of1 % i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.plus(i: Double): Progress = Progress((of1 + i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.minus(i: Double): Progress = Progress((of1 - i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.times(i: Double): Progress = Progress((of1 * i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.div(i: Double): Progress = Progress((of1 / i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.rem(i: Double): Progress = Progress((of1 % i).toDouble()) | ||||
|  | ||||
| public operator fun Progress.compareTo(other: Progress): Int = (of1 - other.of1).toInt() | ||||
| @@ -0,0 +1,26 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| /** | ||||
|  * Will try to execute [action] and, if any exception will happen, execution will be retried. | ||||
|  * This process will happen at most [count] times. There is no any limits on [count] value, but [action] will run at | ||||
|  * least once and [retryOnFailure] will return its result if it is successful | ||||
|  */ | ||||
| inline fun <T> retryOnFailure(count: Int, action: () -> T): T { | ||||
|     var triesCount = 0 | ||||
|     while (true) { | ||||
|         val result = runCatching { | ||||
|             action() | ||||
|         }.onFailure { | ||||
|             triesCount++ | ||||
|  | ||||
|             if (triesCount >= count) { | ||||
|                 throw it | ||||
|             } else { | ||||
|                 null | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         if (result.isSuccess) return result.getOrThrow() | ||||
|     } | ||||
|     error("Unreachable code: retry must throw latest exception if error happen or success value if not") | ||||
| } | ||||
| @@ -0,0 +1,5 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| fun <T> Iterable<T>.withReplacedAt(i: Int, block: (T) -> T): List<T> = take(i) + block(elementAt(i)) + drop(i + 1) | ||||
| fun <T> Iterable<T>.withReplaced(t: T, block: (T) -> T): List<T> = withReplacedAt(indexOf(t), block) | ||||
|  | ||||
| @@ -0,0 +1,29 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| import kotlin.test.Test | ||||
| import kotlin.test.assertEquals | ||||
|  | ||||
| class PercentageTests { | ||||
|     @Test | ||||
|     fun testCompareTo() { | ||||
|         val step = 0.01 | ||||
|  | ||||
|         var i = Percentage.START.of1 | ||||
|         while (i <= Percentage.COMPLETED.of1) { | ||||
|             val percentageI = Percentage(i) | ||||
|  | ||||
|             var j = Percentage.START.of1 | ||||
|             while (j <= Percentage.COMPLETED.of1) { | ||||
|                 val percentageJ = Percentage(j) | ||||
|  | ||||
|                 assertEquals(percentageI.of1.compareTo(percentageJ.of1), percentageI.compareTo(percentageJ)) | ||||
|                 assertEquals(percentageI.of1 > percentageJ.of1, percentageI > percentageJ) | ||||
|                 assertEquals(percentageI.of1 < percentageJ.of1, percentageI < percentageJ) | ||||
|  | ||||
|                 j += step | ||||
|             } | ||||
|  | ||||
|             i += step | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,21 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| import kotlin.test.Test | ||||
| import kotlin.test.assertEquals | ||||
|  | ||||
| class WithReplacedTest { | ||||
|     @Test | ||||
|     fun testReplaced() { | ||||
|         val data = 0 until 10 | ||||
|         val testData = Int.MAX_VALUE | ||||
|  | ||||
|         for (i in 0 until data.last) { | ||||
|             val withReplaced = data.withReplacedAt(i) { | ||||
|                 testData | ||||
|             } | ||||
|             val dataAsMutableList = data.toMutableList() | ||||
|             dataAsMutableList[i] = testData | ||||
|             assertEquals(withReplaced, dataAsMutableList.toList()) | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,13 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| import kotlinx.browser.window | ||||
|  | ||||
| fun copyToClipboard(text: String): Boolean { | ||||
|     return runCatching { | ||||
|         window.navigator.clipboard.writeText( | ||||
|             text | ||||
|         ) | ||||
|     }.onFailure { | ||||
|         it.printStackTrace() | ||||
|     }.isSuccess | ||||
| } | ||||
| @@ -0,0 +1,29 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| import kotlinx.browser.window | ||||
| import org.w3c.files.Blob | ||||
| import org.w3c.files.BlobPropertyBag | ||||
| import kotlin.js.json | ||||
|  | ||||
| external class ClipboardItem(data: dynamic) | ||||
|  | ||||
| inline fun Blob.convertToClipboardItem(): ClipboardItem { | ||||
|     val itemData: dynamic = json(this.type to this) | ||||
|     return ClipboardItem(itemData) | ||||
| } | ||||
|  | ||||
| suspend fun copyImageURLToClipboard(imageUrl: String): Boolean { | ||||
|     return runCatching { | ||||
|         val response = window.fetch(imageUrl).await() | ||||
|         val blob = response.blob().await() | ||||
|         val data = arrayOf( | ||||
|             Blob( | ||||
|                 arrayOf(blob), | ||||
|                 BlobPropertyBag("image/png") | ||||
|             ).convertToClipboardItem() | ||||
|         ).asDynamic() | ||||
|         window.navigator.clipboard.write(data) | ||||
|     }.onFailure { | ||||
|         it.printStackTrace() | ||||
|     }.isSuccess | ||||
| } | ||||
| @@ -1,36 +0,0 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| import okio.FileSystem | ||||
| import okio.Path | ||||
| import okio.use | ||||
|  | ||||
| actual typealias MPPFile = Path | ||||
|  | ||||
| /** | ||||
|  * @suppress | ||||
|  */ | ||||
| actual val MPPFile.filename: FileName | ||||
|     get() = FileName(toString()) | ||||
| /** | ||||
|  * @suppress | ||||
|  */ | ||||
| actual val MPPFile.filesize: Long | ||||
|     get() = FileSystem.SYSTEM.openReadOnly(this).use { | ||||
|         it.size() | ||||
|     } | ||||
| /** | ||||
|  * @suppress | ||||
|  */ | ||||
| actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator | ||||
|     get() = { | ||||
|         FileSystem.SYSTEM.read(this) { | ||||
|             readByteArray() | ||||
|         } | ||||
|     } | ||||
| /** | ||||
|  * @suppress | ||||
|  */ | ||||
| actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator | ||||
|     get() = { | ||||
|         bytesAllocatorSync() | ||||
|     } | ||||
| @@ -1,25 +0,0 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| import kotlinx.cinterop.* | ||||
| import platform.posix.snprintf | ||||
| import platform.posix.sprintf | ||||
|  | ||||
| @OptIn(ExperimentalForeignApi::class) | ||||
| actual fun Float.fixed(signs: Int): Float { | ||||
|     return memScoped { | ||||
|         val buff = allocArray<ByteVar>(Float.SIZE_BYTES * 2) | ||||
|  | ||||
|         sprintf(buff, "%.${signs}f", this@fixed) | ||||
|         buff.toKString().toFloat() | ||||
|     } | ||||
| } | ||||
|  | ||||
| @OptIn(ExperimentalForeignApi::class) | ||||
| actual fun Double.fixed(signs: Int): Double { | ||||
|     return memScoped { | ||||
|         val buff = allocArray<ByteVar>(Double.SIZE_BYTES * 2) | ||||
|  | ||||
|         sprintf(buff, "%.${signs}f", this@fixed) | ||||
|         buff.toKString().toDouble() | ||||
|     } | ||||
| } | ||||
| @@ -1,36 +0,0 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| import okio.FileSystem | ||||
| import okio.Path | ||||
| import okio.use | ||||
|  | ||||
| actual typealias MPPFile = Path | ||||
|  | ||||
| /** | ||||
|  * @suppress | ||||
|  */ | ||||
| actual val MPPFile.filename: FileName | ||||
|     get() = FileName(toString()) | ||||
| /** | ||||
|  * @suppress | ||||
|  */ | ||||
| actual val MPPFile.filesize: Long | ||||
|     get() = FileSystem.SYSTEM.openReadOnly(this).use { | ||||
|         it.size() | ||||
|     } | ||||
| /** | ||||
|  * @suppress | ||||
|  */ | ||||
| actual val MPPFile.bytesAllocatorSync: ByteArrayAllocator | ||||
|     get() = { | ||||
|         FileSystem.SYSTEM.read(this) { | ||||
|             readByteArray() | ||||
|         } | ||||
|     } | ||||
| /** | ||||
|  * @suppress | ||||
|  */ | ||||
| actual val MPPFile.bytesAllocator: SuspendByteArrayAllocator | ||||
|     get() = { | ||||
|         bytesAllocatorSync() | ||||
|     } | ||||
| @@ -1,25 +0,0 @@ | ||||
| package dev.inmo.micro_utils.common | ||||
|  | ||||
| import kotlinx.cinterop.* | ||||
| import platform.posix.snprintf | ||||
| import platform.posix.sprintf | ||||
|  | ||||
| @OptIn(ExperimentalForeignApi::class) | ||||
| actual fun Float.fixed(signs: Int): Float { | ||||
|     return memScoped { | ||||
|         val buff = allocArray<ByteVar>(Float.SIZE_BYTES * 2) | ||||
|  | ||||
|         sprintf(buff, "%.${signs}f", this@fixed) | ||||
|         buff.toKString().toFloat() | ||||
|     } | ||||
| } | ||||
|  | ||||
| @OptIn(ExperimentalForeignApi::class) | ||||
| actual fun Double.fixed(signs: Int): Double { | ||||
|     return memScoped { | ||||
|         val buff = allocArray<ByteVar>(Double.SIZE_BYTES * 2) | ||||
|  | ||||
|         sprintf(buff, "%.${signs}f", this@fixed) | ||||
|         buff.toKString().toDouble() | ||||
|     } | ||||
| } | ||||
| @@ -4,13 +4,14 @@ plugins { | ||||
|     id "com.android.library" | ||||
| } | ||||
|  | ||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" | ||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||
|  | ||||
| kotlin { | ||||
|     sourceSets { | ||||
|         commonMain { | ||||
|             dependencies { | ||||
|                 api libs.kt.coroutines | ||||
|                 api libs.kslog | ||||
|             } | ||||
|         } | ||||
|         jsMain { | ||||
| @@ -22,7 +23,6 @@ kotlin { | ||||
|             dependencies { | ||||
|                 api libs.kt.coroutines.android | ||||
|             } | ||||
|             dependsOn(jvmMain) | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -3,9 +3,10 @@ plugins { | ||||
|     id "org.jetbrains.kotlin.plugin.serialization" | ||||
|     id "com.android.library" | ||||
|     alias(libs.plugins.jb.compose) | ||||
|     alias(libs.plugins.kt.jb.compose) | ||||
| } | ||||
|  | ||||
| apply from: "$mppProjectWithSerializationAndComposePresetPath" | ||||
| apply from: "$mppComposeJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||
|  | ||||
| kotlin { | ||||
|     sourceSets { | ||||
|   | ||||
| @@ -1 +0,0 @@ | ||||
| <manifest/> | ||||
| @@ -1,46 +0,0 @@ | ||||
| package dev.inmo.micro_utils.coroutines.compose | ||||
|  | ||||
| import androidx.compose.runtime.MutableState | ||||
| import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow | ||||
| import kotlinx.coroutines.CoroutineScope | ||||
| import kotlinx.coroutines.Dispatchers | ||||
|  | ||||
| /** | ||||
|  * This type works like [MutableState], [kotlinx.coroutines.flow.StateFlow] and [kotlinx.coroutines.flow.MutableSharedFlow]. | ||||
|  * Based on [SpecialMutableStateFlow] | ||||
|  */ | ||||
| @Deprecated("Will be removed soon") | ||||
| class FlowState<T>( | ||||
|     initial: T, | ||||
|     internalScope: CoroutineScope = CoroutineScope(Dispatchers.Default) | ||||
| ) : MutableState<T>, | ||||
|     SpecialMutableStateFlow<T>(initial, internalScope) { | ||||
|     private var internalValue: T = initial | ||||
|     override var value: T | ||||
|         get() = internalValue | ||||
|         set(value) { | ||||
|             internalValue = value | ||||
|             tryEmit(value) | ||||
|         } | ||||
|  | ||||
|     override fun onChangeWithoutSync(value: T) { | ||||
|         internalValue = value | ||||
|         super.onChangeWithoutSync(value) | ||||
|     } | ||||
|  | ||||
|     override fun component1(): T = value | ||||
|  | ||||
|     override fun component2(): (T) -> Unit = { tryEmit(it) } | ||||
|  | ||||
|     override fun tryEmit(value: T): Boolean { | ||||
|         internalValue = value | ||||
|         return super.tryEmit(value) | ||||
|     } | ||||
|  | ||||
|     override suspend fun emit(value: T) { | ||||
|         internalValue = value | ||||
|         super.emit(value) | ||||
|     } | ||||
| } | ||||
|  | ||||
| //fun <T> MutableState<T>.asFlowState(scope: CoroutineScope = CoroutineScope(Dispatchers.Main)) = FlowState(this, scope) | ||||
| @@ -0,0 +1,66 @@ | ||||
| package dev.inmo.micro_utils.coroutines.compose | ||||
|  | ||||
| import androidx.compose.runtime.Composable | ||||
| import androidx.compose.runtime.collectAsState | ||||
| import androidx.compose.runtime.remember | ||||
| import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow | ||||
| import kotlinx.coroutines.flow.StateFlow | ||||
| import kotlinx.coroutines.flow.asStateFlow | ||||
| import kotlinx.coroutines.flow.debounce | ||||
| import org.jetbrains.compose.web.css.CSSRulesHolder | ||||
| import org.jetbrains.compose.web.css.Style | ||||
| import org.jetbrains.compose.web.css.StyleSheet | ||||
|  | ||||
| /** | ||||
|  * Aggregator of Compose CSS StyleSheet. Allowing to add [StyleSheet] in it and draw it in one place without requiring | ||||
|  * to add `Style(stylesheet)` on every compose function call | ||||
|  */ | ||||
| object StyleSheetsAggregator { | ||||
|     private val _stylesFlow = SpecialMutableStateFlow<Set<CSSRulesHolder>>(emptySet()) | ||||
|     val stylesFlow: StateFlow<Set<CSSRulesHolder>> = _stylesFlow.asStateFlow() | ||||
|  | ||||
|     @Composable | ||||
|     fun draw() { | ||||
|         _stylesFlow.debounce(13L).collectAsState(emptySet()).value.forEach { | ||||
|             Style(it) | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Adding [styleSheet] into the [Set] of included stylesheets. If you called [enableStyleSheetsAggregator], | ||||
|      * new styles will be enabled in the document | ||||
|      */ | ||||
|     fun addStyleSheet(styleSheet: CSSRulesHolder) { | ||||
|         _stylesFlow.value += styleSheet | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Removed [styleSheet] into the [Set] of included stylesheets | ||||
|      */ | ||||
|     fun removeStyleSheet(styleSheet: CSSRulesHolder) { | ||||
|         _stylesFlow.value -= styleSheet | ||||
|     } | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Drawing [StyleSheetsAggregator] in place. You may pass [Set] of [CSSRulesHolder]/[StyleSheet]s as preset of styles | ||||
|  */ | ||||
| @Composable | ||||
| fun enableStyleSheetsAggregator( | ||||
|     stylesPreset: Set<CSSRulesHolder> = emptySet(), | ||||
| ) { | ||||
|     remember { | ||||
|         stylesPreset.forEach { | ||||
|             StyleSheetsAggregator.addStyleSheet(it) | ||||
|         } | ||||
|     } | ||||
|     StyleSheetsAggregator.draw() | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Will include [this] [CSSRulesHolder]/[StyleSheet] in the [StyleSheetsAggregator] using its | ||||
|  * [StyleSheetsAggregator.addStyleSheet] | ||||
|  */ | ||||
| fun CSSRulesHolder.includeInStyleSheetsAggregator() { | ||||
|     StyleSheetsAggregator.addStyleSheet(this) | ||||
| } | ||||
							
								
								
									
										24
									
								
								coroutines/compose/src/jvmTest/kotlin/FlowStateTests.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								coroutines/compose/src/jvmTest/kotlin/FlowStateTests.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,24 @@ | ||||
| import androidx.compose.material.Button | ||||
| import androidx.compose.material.Text | ||||
| import androidx.compose.runtime.collectAsState | ||||
| import androidx.compose.ui.test.* | ||||
| import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow | ||||
| import org.jetbrains.annotations.TestOnly | ||||
| import kotlin.test.Test | ||||
|  | ||||
| class FlowStateTests { | ||||
|     @OptIn(ExperimentalTestApi::class) | ||||
|     @Test | ||||
|     @TestOnly | ||||
|     fun simpleTest() = runComposeUiTest { | ||||
|         val flowState = SpecialMutableStateFlow(0) | ||||
|         setContent { | ||||
|             Button({ flowState.value++ }) { Text("Click") } | ||||
|             Text(flowState.collectAsState().value.toString()) | ||||
|         } | ||||
|  | ||||
|         onNodeWithText(0.toString()).assertExists() | ||||
|         onNodeWithText("Click").performClick() | ||||
|         onNodeWithText(1.toString()).assertExists() | ||||
|     } | ||||
| } | ||||
| @@ -68,9 +68,9 @@ class AccumulatorFlow<T>( | ||||
|     override suspend fun collectSafely(collector: FlowCollector<T>) { | ||||
|         val channel = Channel<T>(Channel.UNLIMITED, BufferOverflow.SUSPEND) | ||||
|         steps.send(SubscribeAccumulatorFlowStep(channel)) | ||||
|         val result = runCatchingSafely { | ||||
|         val result = runCatching { | ||||
|             for (data in channel) { | ||||
|                 val emitResult = runCatchingSafely { | ||||
|                 val emitResult = runCatching { | ||||
|                     collector.emit(data) | ||||
|                 } | ||||
|                 if (emitResult.isSuccess || emitResult.exceptionOrNull() is CancellationException) { | ||||
|   | ||||
| @@ -3,6 +3,12 @@ package dev.inmo.micro_utils.coroutines | ||||
| import kotlinx.coroutines.* | ||||
| import kotlin.coroutines.* | ||||
|  | ||||
| /** | ||||
|  * Trying to [Deferred.await] on all [this] [Deferred]s. The first [Deferred] completed its work will interrupt all | ||||
|  * others awaits and, if [cancelOnResult] passed as true (**by default**), will also cancel all the others [Deferred]s | ||||
|  * | ||||
|  * @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it | ||||
|  */ | ||||
| suspend fun <T> Iterable<Deferred<T>>.awaitFirstWithDeferred( | ||||
|     scope: CoroutineScope, | ||||
|     cancelOnResult: Boolean = true | ||||
| @@ -24,10 +30,45 @@ suspend fun <T> Iterable<Deferred<T>>.awaitFirstWithDeferred( | ||||
|     } | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Trying to [Deferred.await] on all [this] [Deferred]s. The first [Deferred] completed its work will interrupt all | ||||
|  * others awaits and, if [cancelOnResult] passed as true (**by default**), will also cancel all the others [Deferred]s | ||||
|  * | ||||
|  * @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it | ||||
|  */ | ||||
| suspend fun <T> Iterable<Deferred<T>>.awaitFirst( | ||||
|     scope: CoroutineScope, | ||||
|     cancelOnResult: Boolean = true | ||||
| ): T = awaitFirstWithDeferred(scope, cancelOnResult).second | ||||
|  | ||||
| /** | ||||
|  * Trying to [Deferred.await] on all [this] [Deferred]s. The first [Deferred] completed its work will interrupt all | ||||
|  * others awaits and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Deferred]s | ||||
|  * | ||||
|  * Creates [CoroutineScope] using [coroutineContext] for internal purposes | ||||
|  */ | ||||
| suspend fun <T> Iterable<Deferred<T>>.awaitFirst( | ||||
|     cancelOthers: Boolean = true | ||||
| ): T = awaitFirst(CoroutineScope(coroutineContext), cancelOthers) | ||||
|  | ||||
| /** | ||||
|  * Trying to [Deferred.await] on all [deferreds]. The first [Deferred] completed its work will interrupt all | ||||
|  * others awaits and, if [cancelOnResult] passed as true (**by default**), will also cancel all the others [deferreds] | ||||
|  * | ||||
|  * @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it | ||||
|  */ | ||||
| suspend fun <T> awaitFirst( | ||||
|     vararg deferreds: Deferred<T>, | ||||
|     scope: CoroutineScope, | ||||
|     cancelOnResult: Boolean = true | ||||
| ): T = deferreds.toList().awaitFirstWithDeferred(scope, cancelOnResult).second | ||||
| /** | ||||
|  * Trying to [Deferred.await] on all [deferreds]. The first [Deferred] completed its work will interrupt all | ||||
|  * others awaits and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [deferreds] | ||||
|  * | ||||
|  * Creates [CoroutineScope] using [coroutineContext] for internal purposes | ||||
|  */ | ||||
| suspend fun <T> awaitFirst( | ||||
|     vararg deferreds: Deferred<T>, | ||||
|     cancelOthers: Boolean = true | ||||
| ): T = awaitFirst(*deferreds, scope = CoroutineScope(coroutineContext), cancelOnResult = cancelOthers) | ||||
|   | ||||
| @@ -0,0 +1,44 @@ | ||||
| package dev.inmo.micro_utils.coroutines | ||||
|  | ||||
| import kotlin.coroutines.CoroutineContext | ||||
| import kotlin.coroutines.coroutineContext | ||||
|  | ||||
| typealias ExceptionHandler<T> = suspend (Throwable) -> T | ||||
|  | ||||
| /** | ||||
|  * This instance will be used in all calls of [safely] where exception handler has not been passed | ||||
|  */ | ||||
| var defaultSafelyExceptionHandler: ExceptionHandler<Nothing> = { throw it } | ||||
|  | ||||
| /** | ||||
|  * This instance will be used in all calls of [safelyWithoutExceptions] as an exception handler for [safely] call | ||||
|  */ | ||||
| var defaultSafelyWithoutExceptionHandler: ExceptionHandler<Unit> = { | ||||
|     try { | ||||
|         defaultSafelyExceptionHandler(it) | ||||
|     } catch (e: Throwable) { | ||||
|         // do nothing | ||||
|     } | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * This key can (and will) be used to get [ContextSafelyExceptionHandler] from [coroutineContext] of suspend functions | ||||
|  * and in [ContextSafelyExceptionHandler] for defining of its [CoroutineContext.Element.key] | ||||
|  * | ||||
|  * @see safelyWithContextExceptionHandler | ||||
|  * @see ContextSafelyExceptionHandler | ||||
|  */ | ||||
| object ContextSafelyExceptionHandlerKey : CoroutineContext.Key<ContextSafelyExceptionHandler> | ||||
|  | ||||
| /** | ||||
|  * [ExceptionHandler] wrapper which was created to make possible to use [handler] across all coroutines calls | ||||
|  * | ||||
|  * @see safelyWithContextExceptionHandler | ||||
|  * @see ContextSafelyExceptionHandlerKey | ||||
|  */ | ||||
| class ContextSafelyExceptionHandler( | ||||
|     val handler: ExceptionHandler<Unit> | ||||
| ) : CoroutineContext.Element { | ||||
|     override val key: CoroutineContext.Key<*> | ||||
|         get() = ContextSafelyExceptionHandlerKey | ||||
| } | ||||
| @@ -16,8 +16,8 @@ class DoWithFirstBuilder<T>( | ||||
|     operator fun plus(block: suspend CoroutineScope.() -> T) { | ||||
|         deferreds.add(scope.async(start = CoroutineStart.LAZY, block = block)) | ||||
|     } | ||||
|     inline fun add(noinline block: suspend CoroutineScope.() -> T) = plus(block) | ||||
|     inline fun include(noinline block: suspend CoroutineScope.() -> T) = plus(block) | ||||
|     fun add(block: suspend CoroutineScope.() -> T) = plus(block) | ||||
|     fun include(block: suspend CoroutineScope.() -> T) = plus(block) | ||||
|  | ||||
|     fun build() = deferreds.toList() | ||||
| } | ||||
|   | ||||
| @@ -0,0 +1,40 @@ | ||||
| package dev.inmo.micro_utils.coroutines | ||||
|  | ||||
| import kotlinx.coroutines.Job | ||||
| import kotlinx.coroutines.async | ||||
| import kotlinx.coroutines.delay | ||||
| import kotlinx.coroutines.flow.* | ||||
| import kotlinx.coroutines.sync.Mutex | ||||
| import kotlinx.coroutines.sync.withLock | ||||
| import kotlin.jvm.JvmInline | ||||
| import kotlin.time.Duration | ||||
|  | ||||
| @JvmInline | ||||
| private value class DebouncedByData<T>( | ||||
|     val millisToData: Pair<Long, T> | ||||
| ) | ||||
|  | ||||
| fun <T> Flow<T>.debouncedBy(timeout: (T) -> Long, markerFactory: (T) -> Any?): Flow<T> = channelFlow { | ||||
|     val jobs = mutableMapOf<Any?, Job>() | ||||
|     val mutex = Mutex() | ||||
|     subscribe(this) { | ||||
|         mutex.withLock { | ||||
|             val marker = markerFactory(it) | ||||
|             lateinit var job: Job | ||||
|             job = async { | ||||
|                 delay(timeout(it)) | ||||
|                 mutex.withLock { | ||||
|                     if (jobs[marker] === job) { | ||||
|                         this@channelFlow.send(it) | ||||
|                         jobs.remove(marker) | ||||
|                     } | ||||
|                 } | ||||
|             } | ||||
|             jobs[marker] ?.cancel() | ||||
|             jobs[marker] = job | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| fun <T> Flow<T>.debouncedBy(timeout: Long, markerFactory: (T) -> Any?): Flow<T> = debouncedBy({ timeout }, markerFactory) | ||||
| fun <T> Flow<T>.debouncedBy(timeout: Duration, markerFactory: (T) -> Any?): Flow<T> = debouncedBy({ timeout.inWholeMilliseconds }, markerFactory) | ||||
| @@ -2,6 +2,7 @@ | ||||
|  | ||||
| package dev.inmo.micro_utils.coroutines | ||||
|  | ||||
| import dev.inmo.kslog.common.KSLog | ||||
| import kotlinx.coroutines.CoroutineScope | ||||
| import kotlinx.coroutines.flow.* | ||||
| import kotlinx.coroutines.sync.Mutex | ||||
| @@ -16,6 +17,45 @@ inline fun <T> Flow<T>.subscribe(scope: CoroutineScope, noinline block: suspend | ||||
|  * Use [subscribe], but all [block]s will be called inside of [safely] function. | ||||
|  * Use [onException] to set up your reaction for [Throwable]s | ||||
|  */ | ||||
| inline fun <T> Flow<T>.subscribeLogging( | ||||
|     scope: CoroutineScope, | ||||
|     noinline errorMessageBuilder: T.(Throwable) -> Any = { "Something web wrong" }, | ||||
|     logger: KSLog = KSLog, | ||||
|     noinline block: suspend (T) -> Unit | ||||
| ) = subscribe(scope) { | ||||
|     it.runCatchingLogging( | ||||
|         errorMessageBuilder, | ||||
|         logger | ||||
|     ) { | ||||
|         block(it) | ||||
|     }.getOrThrow() | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Use [subscribeSafelyWithoutExceptions], but all exceptions will be passed to [defaultSafelyExceptionHandler] | ||||
|  */ | ||||
| inline fun <T> Flow<T>.subscribeLoggingDropExceptions( | ||||
|     scope: CoroutineScope, | ||||
|     noinline errorMessageBuilder: T.(Throwable) -> Any = { "Something web wrong" }, | ||||
|     logger: KSLog = KSLog, | ||||
|     noinline block: suspend (T) -> Unit | ||||
| ) = subscribe(scope) { | ||||
|     it.runCatchingLogging( | ||||
|         errorMessageBuilder, | ||||
|         logger | ||||
|     ) { | ||||
|         block(it) | ||||
|     } | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Use [subscribe], but all [block]s will be called inside of [safely] function. | ||||
|  * Use [onException] to set up your reaction for [Throwable]s | ||||
|  */ | ||||
| @Deprecated( | ||||
|     "Will be removed soon due to replacement by subscribeLogging", | ||||
|     ReplaceWith("this.subscribeLogging(scope = scope, block = block)") | ||||
| ) | ||||
| inline fun <T> Flow<T>.subscribeSafely( | ||||
|     scope: CoroutineScope, | ||||
|     noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, | ||||
| @@ -29,6 +69,10 @@ inline fun <T> Flow<T>.subscribeSafely( | ||||
| /** | ||||
|  * Use [subscribeSafelyWithoutExceptions], but all exceptions will be passed to [defaultSafelyExceptionHandler] | ||||
|  */ | ||||
| @Deprecated( | ||||
|     "Will be removed soon due to replacement by subscribeLoggingDropExceptions", | ||||
|     ReplaceWith("this.subscribeLoggingDropExceptions(scope = scope, block = block)") | ||||
| ) | ||||
| inline fun <T> Flow<T>.subscribeSafelyWithoutExceptions( | ||||
|     scope: CoroutineScope, | ||||
|     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||
| @@ -42,6 +86,10 @@ inline fun <T> Flow<T>.subscribeSafelyWithoutExceptions( | ||||
| /** | ||||
|  * Use [subscribeSafelyWithoutExceptions], but all exceptions inside of [safely] will be skipped | ||||
|  */ | ||||
| @Deprecated( | ||||
|     "Will be removed soon due to replacement by subscribeLoggingDropExceptions", | ||||
|     ReplaceWith("this.subscribeLoggingDropExceptions(scope = scope, block = block)") | ||||
| ) | ||||
| inline fun <T> Flow<T>.subscribeSafelySkippingExceptions( | ||||
|     scope: CoroutineScope, | ||||
|     noinline block: suspend (T) -> Unit | ||||
|   | ||||
| @@ -15,7 +15,7 @@ private class SubscribeAsyncReceiver<T>( | ||||
|         get() = dataChannel | ||||
|  | ||||
|     init { | ||||
|         scope.launchSafelyWithoutExceptions { | ||||
|         scope.launchLoggingDropExceptions { | ||||
|             for (data in dataChannel) { | ||||
|                 output(data) | ||||
|             } | ||||
| @@ -85,32 +85,32 @@ fun <T, M> Flow<T>.subscribeAsync( | ||||
|     return job | ||||
| } | ||||
|  | ||||
| inline fun <T, M> Flow<T>.subscribeSafelyAsync( | ||||
| fun <T, M> Flow<T>.subscribeSafelyAsync( | ||||
|     scope: CoroutineScope, | ||||
|     noinline markerFactory: suspend (T) -> M, | ||||
|     noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, | ||||
|     noinline block: suspend (T) -> Unit | ||||
|     markerFactory: suspend (T) -> M, | ||||
|     onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, | ||||
|     block: suspend (T) -> Unit | ||||
| ) = subscribeAsync(scope, markerFactory) { | ||||
|     safely(onException) { | ||||
|         block(it) | ||||
|     } | ||||
| } | ||||
|  | ||||
| inline fun <T, M> Flow<T>.subscribeSafelyWithoutExceptionsAsync( | ||||
| fun <T, M> Flow<T>.subscribeSafelyWithoutExceptionsAsync( | ||||
|     scope: CoroutineScope, | ||||
|     noinline markerFactory: suspend (T) -> M, | ||||
|     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||
|     noinline block: suspend (T) -> Unit | ||||
|     markerFactory: suspend (T) -> M, | ||||
|     onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||
|     block: suspend (T) -> Unit | ||||
| ) = subscribeAsync(scope, markerFactory) { | ||||
|     safelyWithoutExceptions(onException) { | ||||
|         block(it) | ||||
|     } | ||||
| } | ||||
|  | ||||
| inline fun <T, M> Flow<T>.subscribeSafelySkippingExceptionsAsync( | ||||
| fun <T, M> Flow<T>.subscribeSafelySkippingExceptionsAsync( | ||||
|     scope: CoroutineScope, | ||||
|     noinline markerFactory: suspend (T) -> M, | ||||
|     noinline block: suspend (T) -> Unit | ||||
|     markerFactory: suspend (T) -> M, | ||||
|     block: suspend (T) -> Unit | ||||
| ) = subscribeAsync(scope, markerFactory) { | ||||
|     safelyWithoutExceptions({ /* do nothing */}) { | ||||
|         block(it) | ||||
|   | ||||
| @@ -4,46 +4,74 @@ import kotlinx.coroutines.* | ||||
| import kotlin.coroutines.CoroutineContext | ||||
| import kotlin.coroutines.coroutineContext | ||||
|  | ||||
| typealias ExceptionHandler<T> = suspend (Throwable) -> T | ||||
|  | ||||
| /** | ||||
|  * This instance will be used in all calls of [safely] where exception handler has not been passed | ||||
|  */ | ||||
| var defaultSafelyExceptionHandler: ExceptionHandler<Nothing> = { throw it } | ||||
|  | ||||
| /** | ||||
|  * This instance will be used in all calls of [safelyWithoutExceptions] as an exception handler for [safely] call | ||||
|  */ | ||||
| var defaultSafelyWithoutExceptionHandler: ExceptionHandler<Unit> = { | ||||
|     try { | ||||
|         defaultSafelyExceptionHandler(it) | ||||
|     } catch (e: Throwable) { | ||||
|          // do nothing | ||||
|     } | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * This key can (and will) be used to get [ContextSafelyExceptionHandler] from [coroutineContext] of suspend functions | ||||
|  * and in [ContextSafelyExceptionHandler] for defining of its [CoroutineContext.Element.key] | ||||
|  * Launching [block] in [runCatching]. In case of failure, it will: | ||||
|  * | ||||
|  * @see safelyWithContextExceptionHandler | ||||
|  * @see ContextSafelyExceptionHandler | ||||
|  * * Try to get [ContextSafelyExceptionHandler] from current [coroutineContext] and call its | ||||
|  * [ContextSafelyExceptionHandler.handler] invoke. **Thrown exception from its handler | ||||
|  * will pass out of [runCatchingSafely]** | ||||
|  * * Execute [onException] inside of new [runCatching] and return its result. Throws exception | ||||
|  * will be caught by [runCatching] and wrapped in [Result] | ||||
|  * | ||||
|  * @return [Result] with result of [block] if no exceptions or [Result] from [onException] execution | ||||
|  */ | ||||
| object ContextSafelyExceptionHandlerKey : CoroutineContext.Key<ContextSafelyExceptionHandler> | ||||
| @Deprecated( | ||||
|     "This function become redundant since coroutines correctly handling throwing exceptions", | ||||
|     replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { onException(it) }") | ||||
| ) | ||||
| suspend inline fun <T> runCatchingSafely( | ||||
|     onException: ExceptionHandler<T>, | ||||
|     block: suspend () -> T | ||||
| ): Result<T> { | ||||
|     return runCatching { | ||||
|         block() | ||||
|     }.onFailure { | ||||
|         coroutineContext[ContextSafelyExceptionHandlerKey] ?.handler ?.invoke(it) | ||||
|         return runCatching { | ||||
|             onException(it) | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| @Deprecated( | ||||
|     "This function become redundant since coroutines correctly handling throwing exceptions", | ||||
|     replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { onException(it) }") | ||||
| ) | ||||
| suspend inline fun <T, R> R.runCatchingSafely( | ||||
|     onException: ExceptionHandler<T>, | ||||
|     block: suspend R.() -> T | ||||
| ): Result<T> = runCatchingSafely<T>(onException) { | ||||
|     block() | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * [ExceptionHandler] wrapper which was created to make possible to use [handler] across all coroutines calls | ||||
|  * | ||||
|  * @see safelyWithContextExceptionHandler | ||||
|  * @see ContextSafelyExceptionHandlerKey | ||||
|  * Launching [runCatchingSafely] with [defaultSafelyExceptionHandler] as `onException` parameter | ||||
|  */ | ||||
| class ContextSafelyExceptionHandler( | ||||
|     val handler: ExceptionHandler<Unit> | ||||
| ) : CoroutineContext.Element { | ||||
|     override val key: CoroutineContext.Key<*> | ||||
|         get() = ContextSafelyExceptionHandlerKey | ||||
| @Deprecated( | ||||
|     "This function become redundant since coroutines correctly handling throwing exceptions", | ||||
|     replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { defaultSafelyExceptionHandler(it) }") | ||||
| ) | ||||
| suspend inline fun <T> runCatchingSafely( | ||||
|     block: suspend () -> T | ||||
| ): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block) | ||||
|  | ||||
| @Deprecated( | ||||
|     "This function become redundant since coroutines correctly handling throwing exceptions", | ||||
|     replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { defaultSafelyExceptionHandler(it) }") | ||||
| ) | ||||
| suspend inline fun <T, R> R.runCatchingSafely( | ||||
|     block: suspend R.() -> T | ||||
| ): Result<T> = runCatchingSafely<T> { | ||||
|     block() | ||||
| } | ||||
|  | ||||
| //suspend inline fun <T, R> T.runCatchingSafely( | ||||
| //    onException: ExceptionHandler<R>, | ||||
| //    block: suspend T.() -> R | ||||
| //): Result<R> = runCatchingSafely(onException) { | ||||
| //    block() | ||||
| //} | ||||
|  | ||||
| /** | ||||
|  * @return [ContextSafelyExceptionHandler] from [coroutineContext] by key [ContextSafelyExceptionHandlerKey] if | ||||
|  * exists | ||||
| @@ -51,7 +79,7 @@ class ContextSafelyExceptionHandler( | ||||
|  * @see ContextSafelyExceptionHandler | ||||
|  * @see ContextSafelyExceptionHandlerKey | ||||
|  */ | ||||
| suspend inline fun contextSafelyExceptionHandler() = coroutineContext[ContextSafelyExceptionHandlerKey] | ||||
| suspend fun contextSafelyExceptionHandler() = coroutineContext[ContextSafelyExceptionHandlerKey] | ||||
|  | ||||
| /** | ||||
|  * This method will set new [coroutineContext] with [ContextSafelyExceptionHandler]. In case if [coroutineContext] | ||||
| @@ -61,10 +89,13 @@ suspend inline fun contextSafelyExceptionHandler() = coroutineContext[ContextSaf | ||||
|  * After all, will be called [withContext] method with created [ContextSafelyExceptionHandler] and block which will call | ||||
|  * [safely] method with [safelyExceptionHandler] as onException parameter and [block] as execution block | ||||
|  */ | ||||
| @Deprecated( | ||||
|     "This function become redundant since coroutines correctly handling throwing exceptions", | ||||
| ) | ||||
| suspend fun <T> safelyWithContextExceptionHandler( | ||||
|     contextExceptionHandler: ExceptionHandler<Unit>, | ||||
|     safelyExceptionHandler: ExceptionHandler<T> = defaultSafelyExceptionHandler, | ||||
|     block: suspend CoroutineScope.() -> T | ||||
|     block: suspend () -> T | ||||
| ): T { | ||||
|     val contextSafelyExceptionHandler = contextSafelyExceptionHandler() ?.handler ?.let { oldHandler -> | ||||
|         ContextSafelyExceptionHandler { | ||||
| @@ -78,57 +109,47 @@ suspend fun <T> safelyWithContextExceptionHandler( | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * It will run [block] inside of [supervisorScope] to avoid problems with catching of exceptions | ||||
|  * Calls [runCatchingSafely] and getting the result via [Result.getOrThrow] | ||||
|  * | ||||
|  * Priorities of [ExceptionHandler]s: | ||||
|  * | ||||
|  * * [onException] In case if custom (will be used anyway if not [defaultSafelyExceptionHandler]) | ||||
|  * * [CoroutineContext.get] with [SafelyExceptionHandlerKey] as key | ||||
|  * * [defaultSafelyExceptionHandler] | ||||
|  * | ||||
|  * Remember, that [ExceptionHandler] from [CoroutineContext.get] will be used anyway if it is available. After it will | ||||
|  * be called [onException] | ||||
|  * | ||||
|  * @param [onException] Will be called when happen exception inside of [block]. By default will throw exception - this | ||||
|  * exception will be available for catching | ||||
|  * | ||||
|  * @see defaultSafelyExceptionHandler | ||||
|  * @see safelyWithoutExceptions | ||||
|  * @see safelyWithContextExceptionHandler | ||||
|  * @see runCatchingSafely | ||||
|  */ | ||||
| @Deprecated( | ||||
|     "This function become redundant since coroutines correctly handling throwing exceptions", | ||||
|     replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { onException(it) }.getOrThrow()") | ||||
| ) | ||||
| suspend inline fun <T> safely( | ||||
|     noinline onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, | ||||
|     noinline block: suspend CoroutineScope.() -> T | ||||
| ): T { | ||||
|     return try { | ||||
|         supervisorScope(block) | ||||
|     } catch (e: Throwable) { | ||||
|         coroutineContext[ContextSafelyExceptionHandlerKey] ?.handler ?.invoke(e) | ||||
|         onException(e) | ||||
|     } | ||||
| } | ||||
|     onException: ExceptionHandler<T>, | ||||
|     block: suspend () -> T | ||||
| ): T = runCatchingSafely(onException, block).getOrThrow() | ||||
|  | ||||
| suspend inline fun <T> runCatchingSafely( | ||||
|     noinline onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, | ||||
|     noinline block: suspend CoroutineScope.() -> T | ||||
| ): Result<T> = runCatching { | ||||
|     safely(onException, block) | ||||
| } | ||||
| /** | ||||
|  * Calls [safely] with passing of [defaultSafelyExceptionHandler] as `onException` | ||||
|  * | ||||
|  * @see runCatchingSafely | ||||
|  */ | ||||
| @Deprecated( | ||||
|     "This function become redundant since coroutines correctly handling throwing exceptions", | ||||
|     replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { defaultSafelyExceptionHandler(it) }.getOrThrow()") | ||||
| ) | ||||
| suspend inline fun <T> safely( | ||||
|     block: suspend () -> T | ||||
| ): T = safely(defaultSafelyExceptionHandler, block) | ||||
| @Deprecated( | ||||
|     "This function become redundant since coroutines correctly handling throwing exceptions", | ||||
|     replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { defaultSafelyExceptionHandler(it) }.getOrThrow()") | ||||
| ) | ||||
| suspend inline fun <T, R> R.safely( | ||||
|     block: suspend R.() -> T | ||||
| ): T = safely<T> { block() } | ||||
|  | ||||
| suspend inline fun <T, R> T.runCatchingSafely( | ||||
|     noinline onException: ExceptionHandler<R> = defaultSafelyExceptionHandler, | ||||
|     noinline block: suspend T.() -> R | ||||
| ): Result<R> = runCatching { | ||||
|     safely(onException) { block() } | ||||
| } | ||||
|  | ||||
| suspend inline fun <T> safelyWithResult( | ||||
|     noinline block: suspend CoroutineScope.() -> T | ||||
| @Deprecated("Renamed", ReplaceWith("runCatchingSafely(block)", "dev.inmo.micro_utils.coroutines.runCatchingSafely")) | ||||
| suspend fun <T> safelyWithResult( | ||||
|     block: suspend () -> T | ||||
| ): Result<T> = runCatchingSafely(defaultSafelyExceptionHandler, block) | ||||
|  | ||||
| suspend inline fun <T, R> T.safelyWithResult( | ||||
|     noinline block: suspend T.() -> R | ||||
| ): Result<R> = runCatchingSafely(defaultSafelyExceptionHandler, block) | ||||
| @Deprecated("Renamed", ReplaceWith("this.runCatchingSafely(block)", "dev.inmo.micro_utils.coroutines.runCatchingSafely")) | ||||
| suspend fun <T, R> R.safelyWithResult( | ||||
|     block: suspend R.() -> T | ||||
| ): Result<T> = safelyWithResult<T> { block() } | ||||
|  | ||||
| /** | ||||
|  * Use this handler in cases you wish to include handling of exceptions by [defaultSafelyWithoutExceptionHandler] and | ||||
| @@ -147,21 +168,31 @@ val defaultSafelyWithoutExceptionHandlerWithNull: ExceptionHandler<Nothing?> = { | ||||
|  * Shortcut for [safely] with exception handler, that as expected must return null in case of impossible creating of | ||||
|  * result from exception (instead of throwing it, by default always returns null) | ||||
|  */ | ||||
| suspend inline fun <T> safelyWithoutExceptions( | ||||
|     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||
|     noinline block: suspend CoroutineScope.() -> T | ||||
| ): T? = safely(onException, block) | ||||
| @Deprecated( | ||||
|     "This function become redundant since coroutines correctly handling throwing exceptions", | ||||
|     replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { onException(it) }.getOrNull()") | ||||
| ) | ||||
| suspend fun <T> safelyWithoutExceptions( | ||||
|     onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, | ||||
|     block: suspend () -> T | ||||
| ): T? = runCatchingSafely(onException, block).getOrNull() | ||||
|  | ||||
| suspend inline fun <T> runCatchingSafelyWithoutExceptions( | ||||
|     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||
|     noinline block: suspend CoroutineScope.() -> T | ||||
| ): Result<T?> = runCatching { | ||||
|     safelyWithoutExceptions(onException, block) | ||||
| @Deprecated( | ||||
|     "This function become redundant since coroutines correctly handling throwing exceptions", | ||||
|     replaceWith = ReplaceWith("runCatching(block).replaceIfFailure { onException(it) }.getOrNull()") | ||||
| ) | ||||
| suspend fun <T> runCatchingSafelyWithoutExceptions( | ||||
|     onException: ExceptionHandler<T?> = defaultSafelyExceptionHandler, | ||||
|     block: suspend () -> T | ||||
| ): Result<T?> = runCatchingSafely(onException, block).let { | ||||
|     if (it.isFailure) return Result.success<T?>(null) | ||||
|  | ||||
|     it | ||||
| } | ||||
|  | ||||
| inline fun CoroutineScope( | ||||
| fun CoroutineScopeWithDefaultFallback( | ||||
|     context: CoroutineContext, | ||||
|     noinline defaultExceptionsHandler: ExceptionHandler<Unit> | ||||
|     defaultExceptionsHandler: ExceptionHandler<Unit> | ||||
| ) = CoroutineScope( | ||||
|     context + ContextSafelyExceptionHandler(defaultExceptionsHandler) | ||||
| ) | ||||
|   | ||||
| @@ -0,0 +1,64 @@ | ||||
| package dev.inmo.micro_utils.coroutines | ||||
|  | ||||
| import kotlinx.coroutines.* | ||||
| import kotlin.coroutines.* | ||||
|  | ||||
| /** | ||||
|  * Trying to [Job.join] on all [this] [Job]s. The first [Job] completed its work will interrupt all others joins | ||||
|  * and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Job]s | ||||
|  * | ||||
|  * @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it | ||||
|  */ | ||||
| suspend fun Iterable<Job>.joinFirst( | ||||
|     scope: CoroutineScope, | ||||
|     cancelOthers: Boolean = true | ||||
| ): Job { | ||||
|     val resultDeferred = CompletableDeferred<Job>() | ||||
|     val scope = scope.LinkedSupervisorScope() | ||||
|     forEach { | ||||
|         scope.launch { | ||||
|             it.join() | ||||
|             resultDeferred.complete(it) | ||||
|             scope.cancel() | ||||
|         } | ||||
|     } | ||||
|     return resultDeferred.await().also { | ||||
|         if (cancelOthers) { | ||||
|             forEach { | ||||
|                 runCatchingSafely { it.cancel() } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| } | ||||
| /** | ||||
|  * Trying to [Job.join] on all [this] [Job]s. The first [Job] completed its work will interrupt all others joins | ||||
|  * and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Job]s | ||||
|  * | ||||
|  * Creates [CoroutineScope] using [coroutineContext] for internal purposes | ||||
|  */ | ||||
| suspend fun Iterable<Job>.joinFirst( | ||||
|     cancelOthers: Boolean = true | ||||
| ): Job = joinFirst(CoroutineScope(coroutineContext), cancelOthers) | ||||
|  | ||||
| /** | ||||
|  * Trying to [Job.join] on all [jobs]. The first [Job] completed its work will interrupt all others joins | ||||
|  * and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Job]s | ||||
|  * | ||||
|  * @param scope Will be used to create [CoroutineScope.LinkedSupervisorScope] and launch joining of all [Job]s in it | ||||
|  */ | ||||
| suspend fun joinFirst( | ||||
|     vararg jobs: Job, | ||||
|     scope: CoroutineScope, | ||||
|     cancelOthers: Boolean = true | ||||
| ): Job = jobs.toList().joinFirst(scope, cancelOthers) | ||||
|  | ||||
| /** | ||||
|  * Trying to [Job.join] on all [jobs]. The first [Job] completed its work will interrupt all others joins | ||||
|  * and, if [cancelOthers] passed as true (**by default**), will also cancel all the others [Job]s | ||||
|  * | ||||
|  * Creates [CoroutineScope] using [coroutineContext] for internal purposes | ||||
|  */ | ||||
| suspend fun joinFirst( | ||||
|     vararg jobs: Job, | ||||
|     cancelOthers: Boolean = true | ||||
| ): Job = joinFirst(*jobs, scope = CoroutineScope(coroutineContext), cancelOthers = cancelOthers) | ||||
| @@ -0,0 +1,55 @@ | ||||
| package dev.inmo.micro_utils.coroutines | ||||
|  | ||||
| import dev.inmo.kslog.common.KSLog | ||||
| import dev.inmo.kslog.common.e | ||||
| import kotlinx.coroutines.* | ||||
| import kotlin.coroutines.CoroutineContext | ||||
| import kotlin.coroutines.EmptyCoroutineContext | ||||
|  | ||||
| fun CoroutineScope.launchLogging( | ||||
|     errorMessageBuilder: CoroutineScope.(Throwable) -> Any = { "Something web wrong" }, | ||||
|     logger: KSLog = KSLog, | ||||
|     context: CoroutineContext = EmptyCoroutineContext, | ||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||
|     block: suspend CoroutineScope.() -> Unit | ||||
| ) = launch(context, start) { | ||||
|     runCatching { block() }.onFailure { | ||||
|         logger.e(it) { errorMessageBuilder(it) } | ||||
|     }.getOrThrow() | ||||
| } | ||||
|  | ||||
| fun CoroutineScope.launchLoggingDropExceptions( | ||||
|     errorMessageBuilder: CoroutineScope.(Throwable) -> Any = { "Something web wrong" }, | ||||
|     logger: KSLog = KSLog, | ||||
|     context: CoroutineContext = EmptyCoroutineContext, | ||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||
|     block: suspend CoroutineScope.() -> Unit | ||||
| ) = launch(context, start) { | ||||
|     runCatching { block() }.onFailure { | ||||
|         logger.e(it) { errorMessageBuilder(it) } | ||||
|     } // just dropping exception | ||||
| } | ||||
|  | ||||
| fun <T> CoroutineScope.asyncLogging( | ||||
|     errorMessageBuilder: CoroutineScope.(Throwable) -> Any = { "Something web wrong" }, | ||||
|     logger: KSLog = KSLog, | ||||
|     context: CoroutineContext = EmptyCoroutineContext, | ||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||
|     block: suspend CoroutineScope.() -> T | ||||
| ) = async(context, start) { | ||||
|     runCatching { block() }.onFailure { | ||||
|         logger.e(it) { errorMessageBuilder(it) } | ||||
|     }.getOrThrow() | ||||
| } | ||||
|  | ||||
| fun <T> CoroutineScope.asyncLoggingDropExceptions( | ||||
|     errorMessageBuilder: CoroutineScope.(Throwable) -> Any = { "Something web wrong" }, | ||||
|     logger: KSLog = KSLog, | ||||
|     context: CoroutineContext = EmptyCoroutineContext, | ||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||
|     block: suspend CoroutineScope.() -> T | ||||
| ) = async(context, start) { | ||||
|     runCatching { block() }.onFailure { | ||||
|         logger.e(it) { errorMessageBuilder(it) } | ||||
|     } | ||||
| } | ||||
| @@ -4,38 +4,62 @@ import kotlinx.coroutines.* | ||||
| import kotlin.coroutines.CoroutineContext | ||||
| import kotlin.coroutines.EmptyCoroutineContext | ||||
|  | ||||
| inline fun CoroutineScope.launchSafely( | ||||
| @Deprecated( | ||||
|     "This method will be removed soon. Use launchLogging instead", | ||||
|     ReplaceWith("this.launchLogging(context = context, start = start, block = block)") | ||||
| ) | ||||
| fun CoroutineScope.launchSafely( | ||||
|     context: CoroutineContext = EmptyCoroutineContext, | ||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||
|     noinline onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, | ||||
|     noinline block: suspend CoroutineScope.() -> Unit | ||||
|     onException: ExceptionHandler<Unit> = defaultSafelyExceptionHandler, | ||||
|     block: suspend CoroutineScope.() -> Unit | ||||
| ) = launch(context, start) { | ||||
|     safely(onException, block) | ||||
|     runCatchingSafely(onException) { | ||||
|         block() | ||||
|     } | ||||
| } | ||||
|  | ||||
| inline fun CoroutineScope.launchSafelyWithoutExceptions( | ||||
| @Deprecated( | ||||
|     "This method will be removed soon. Use launchLoggingDropExceptions instead", | ||||
|     ReplaceWith("this.launchLoggingDropExceptions(context = context, start = start, block = block)") | ||||
| ) | ||||
| fun CoroutineScope.launchSafelyWithoutExceptions( | ||||
|     context: CoroutineContext = EmptyCoroutineContext, | ||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||
|     noinline onException: ExceptionHandler<Unit?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||
|     noinline block: suspend CoroutineScope.() -> Unit | ||||
|     onException: ExceptionHandler<Unit?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||
|     block: suspend CoroutineScope.() -> Unit | ||||
| ) = launch(context, start) { | ||||
|     safelyWithoutExceptions(onException, block) | ||||
|     runCatchingSafelyWithoutExceptions(onException) { | ||||
|         block() | ||||
|     } | ||||
| } | ||||
|  | ||||
| inline fun <T> CoroutineScope.asyncSafely( | ||||
| @Deprecated( | ||||
|     "This method will be removed soon. Use asyncLogging instead", | ||||
|     ReplaceWith("this.asyncLogging(context = context, start = start, block = block)") | ||||
| ) | ||||
| fun <T> CoroutineScope.asyncSafely( | ||||
|     context: CoroutineContext = EmptyCoroutineContext, | ||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||
|     noinline onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, | ||||
|     noinline block: suspend CoroutineScope.() -> T | ||||
|     onException: ExceptionHandler<T> = defaultSafelyExceptionHandler, | ||||
|     block: suspend CoroutineScope.() -> T | ||||
| ) = async(context, start) { | ||||
|     safely(onException, block) | ||||
|     runCatchingSafely(onException) { | ||||
|         block() | ||||
|     } | ||||
| } | ||||
|  | ||||
| inline fun <T> CoroutineScope.asyncSafelyWithoutExceptions( | ||||
| @Deprecated( | ||||
|     "This method will be removed soon. Use asyncLoggingDropExceptions instead", | ||||
|     ReplaceWith("this.asyncLoggingDropExceptions(context = context, start = start, block = block)") | ||||
| ) | ||||
| fun <T> CoroutineScope.asyncSafelyWithoutExceptions( | ||||
|     context: CoroutineContext = EmptyCoroutineContext, | ||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||
|     noinline onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||
|     noinline block: suspend CoroutineScope.() -> T | ||||
|     onException: ExceptionHandler<T?> = defaultSafelyWithoutExceptionHandlerWithNull, | ||||
|     block: suspend CoroutineScope.() -> T | ||||
| ) = async(context, start) { | ||||
|     safelyWithoutExceptions(onException, block) | ||||
|     runCatchingSafelyWithoutExceptions(onException) { | ||||
|         block() | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -0,0 +1,3 @@ | ||||
| package dev.inmo.micro_utils.coroutines | ||||
|  | ||||
| inline fun <T> Result<T>.replaceIfFailure(onException: (Throwable) -> T) = if (isSuccess) { this } else { runCatching { onException(exceptionOrNull()!!) } } | ||||
| @@ -0,0 +1,12 @@ | ||||
| package dev.inmo.micro_utils.coroutines | ||||
|  | ||||
| import dev.inmo.kslog.common.KSLog | ||||
| import dev.inmo.kslog.common.e | ||||
|  | ||||
| inline fun <T, R> R.runCatchingLogging( | ||||
|     noinline errorMessageBuilder: R.(Throwable) -> Any = { "Something web wrong" }, | ||||
|     logger: KSLog = KSLog, | ||||
|     block: R.() -> T | ||||
| ) = runCatching(block).onFailure { | ||||
|     logger.e(it) { errorMessageBuilder(it) } | ||||
| } | ||||
| @@ -44,7 +44,7 @@ sealed interface SmartMutex { | ||||
|      * @param locked Preset state of [isLocked] and its internal [_lockStateFlow] | ||||
|      */ | ||||
|     class Mutable(locked: Boolean = false) : SmartMutex { | ||||
|         private val _lockStateFlow = MutableStateFlow<Boolean>(locked) | ||||
|         private val _lockStateFlow = SpecialMutableStateFlow<Boolean>(locked) | ||||
|         override val lockStateFlow: StateFlow<Boolean> = _lockStateFlow.asStateFlow() | ||||
|  | ||||
|         private val internalChangesMutex = Mutex() | ||||
|   | ||||
| @@ -13,7 +13,7 @@ import kotlin.contracts.contract | ||||
|  * * [unlockWrite] will just unlock [writeMutex] | ||||
|  */ | ||||
| class SmartRWLocker(private val readPermits: Int = Int.MAX_VALUE, writeIsLocked: Boolean = false) { | ||||
|     private val _readSemaphore = SmartSemaphore.Mutable(permits = readPermits, acquiredPermits = 0) | ||||
|     private val _readSemaphore = SmartSemaphore.Mutable(permits = readPermits, acquiredPermits = if (writeIsLocked) readPermits else 0) | ||||
|     private val _writeMutex = SmartMutex.Mutable(locked = writeIsLocked) | ||||
|  | ||||
|     val readSemaphore: SmartSemaphore.Immutable = _readSemaphore.immutable() | ||||
|   | ||||
| @@ -45,7 +45,7 @@ sealed interface SmartSemaphore { | ||||
|      * @param locked Preset state of [freePermits] and its internal [_freePermitsStateFlow] | ||||
|      */ | ||||
|     class Mutable(private val permits: Int, acquiredPermits: Int = 0) : SmartSemaphore { | ||||
|         private val _freePermitsStateFlow = MutableStateFlow<Int>(permits - acquiredPermits) | ||||
|         private val _freePermitsStateFlow = SpecialMutableStateFlow<Int>(permits - acquiredPermits) | ||||
|         override val permitsStateFlow: StateFlow<Int> = _freePermitsStateFlow.asStateFlow() | ||||
|  | ||||
|         private val internalChangesMutex = Mutex(false) | ||||
|   | ||||
| @@ -11,76 +11,60 @@ import kotlinx.coroutines.flow.MutableStateFlow | ||||
| import kotlinx.coroutines.flow.StateFlow | ||||
| import kotlinx.coroutines.internal.SynchronizedObject | ||||
| import kotlinx.coroutines.internal.synchronized | ||||
| import kotlin.coroutines.CoroutineContext | ||||
|  | ||||
| /** | ||||
|  * Works like [StateFlow], but guarantee that latest value update will always be delivered to | ||||
|  * each active subscriber | ||||
|  */ | ||||
| open class SpecialMutableStateFlow<T>( | ||||
|     initialValue: T, | ||||
|     internalScope: CoroutineScope = CoroutineScope(Dispatchers.Default) | ||||
|     initialValue: T | ||||
| ) : MutableStateFlow<T>, FlowCollector<T>, MutableSharedFlow<T> { | ||||
|     @OptIn(InternalCoroutinesApi::class) | ||||
|     private val syncObject = SynchronizedObject() | ||||
|     protected val internalSharedFlow: MutableSharedFlow<T> = MutableSharedFlow( | ||||
|         replay = 0, | ||||
|         extraBufferCapacity = 2, | ||||
|         onBufferOverflow = BufferOverflow.DROP_OLDEST | ||||
|     ) | ||||
|     protected val publicSharedFlow: MutableSharedFlow<T> = MutableSharedFlow( | ||||
|     protected val sharingFlow: MutableSharedFlow<T> = MutableSharedFlow( | ||||
|         replay = 1, | ||||
|         extraBufferCapacity = 1, | ||||
|         onBufferOverflow = BufferOverflow.DROP_OLDEST | ||||
|     ) | ||||
|  | ||||
|     protected var _value: T = initialValue | ||||
|     override var value: T | ||||
|         get() = _value | ||||
|     @OptIn(InternalCoroutinesApi::class) | ||||
|     override var value: T = initialValue | ||||
|         set(value) { | ||||
|             doOnChangeAction(value) | ||||
|             synchronized(syncObject) { | ||||
|                 if (field != value) { | ||||
|                     field = value | ||||
|                     sharingFlow.tryEmit(value) | ||||
|                 } | ||||
|             } | ||||
|     protected val job = internalSharedFlow.subscribe(internalScope) { | ||||
|         doOnChangeAction(it) | ||||
|         } | ||||
|  | ||||
|     override val replayCache: List<T> | ||||
|         get() = publicSharedFlow.replayCache | ||||
|         get() = sharingFlow.replayCache | ||||
|     override val subscriptionCount: StateFlow<Int> | ||||
|         get() = publicSharedFlow.subscriptionCount | ||||
|         get() = sharingFlow.subscriptionCount | ||||
|  | ||||
|     init { | ||||
|         sharingFlow.tryEmit(initialValue) | ||||
|     } | ||||
|  | ||||
|     @OptIn(InternalCoroutinesApi::class) | ||||
|     override fun compareAndSet(expect: T, update: T): Boolean { | ||||
|         return synchronized(syncObject) { | ||||
|             if (expect == _value && update != _value) { | ||||
|                 doOnChangeAction(update) | ||||
|             } | ||||
|             expect == _value | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     protected open fun onChangeWithoutSync(value: T) { | ||||
|         _value = value | ||||
|         publicSharedFlow.tryEmit(value) | ||||
|     } | ||||
|     @OptIn(InternalCoroutinesApi::class) | ||||
|     protected open fun doOnChangeAction(value: T) { | ||||
|         synchronized(syncObject) { | ||||
|             if (_value != value) { | ||||
|                 onChangeWithoutSync(value) | ||||
|             } | ||||
|         if (expect == value) { | ||||
|             value = update | ||||
|         } | ||||
|         return expect == value | ||||
|     } | ||||
|  | ||||
|     @ExperimentalCoroutinesApi | ||||
|     override fun resetReplayCache() = publicSharedFlow.resetReplayCache() | ||||
|     override fun resetReplayCache() = sharingFlow.resetReplayCache() | ||||
|  | ||||
|     override fun tryEmit(value: T): Boolean { | ||||
|         return internalSharedFlow.tryEmit(value) | ||||
|         return compareAndSet(this.value, value) | ||||
|     } | ||||
|  | ||||
|     override suspend fun emit(value: T) { | ||||
|         internalSharedFlow.emit(value) | ||||
|         compareAndSet(this.value, value) | ||||
|     } | ||||
|  | ||||
|     override suspend fun collect(collector: FlowCollector<T>) = publicSharedFlow.collect(collector) | ||||
|     override suspend fun collect(collector: FlowCollector<T>) = sharingFlow.collect(collector) | ||||
| } | ||||
|   | ||||
| @@ -10,8 +10,12 @@ fun CoroutineScope.LinkedSupervisorJob( | ||||
|     additionalContext: CoroutineContext? = null | ||||
| ) = coroutineContext.LinkedSupervisorJob(additionalContext) | ||||
|  | ||||
| fun CoroutineScope.LinkedSupervisorScope( | ||||
|  | ||||
| fun CoroutineContext.LinkedSupervisorScope( | ||||
|     additionalContext: CoroutineContext? = null | ||||
| ) = CoroutineScope( | ||||
|     coroutineContext + LinkedSupervisorJob(additionalContext) | ||||
|     this + LinkedSupervisorJob(additionalContext) | ||||
| ) | ||||
| fun CoroutineScope.LinkedSupervisorScope( | ||||
|     additionalContext: CoroutineContext? = null | ||||
| ) = coroutineContext.LinkedSupervisorScope(additionalContext) | ||||
|   | ||||
| @@ -4,28 +4,71 @@ import kotlinx.coroutines.* | ||||
| import kotlin.coroutines.CoroutineContext | ||||
| import kotlin.coroutines.EmptyCoroutineContext | ||||
|  | ||||
| private fun CoroutineScope.createWeakSubScope() = CoroutineScope(coroutineContext.minusKey(Job)).also { newScope -> | ||||
|     coroutineContext.job.invokeOnCompletion { newScope.cancel() } | ||||
| /** | ||||
|  * Created [CoroutineScope] which will [launch] listening of [context] job completing and drop itself. Current weak | ||||
|  * scope **will not** be attached to [context] directly. So, this [CoroutineScope] will not prevent parent one from | ||||
|  * cancelling if it is launched with [supervisorScope] or [coroutineScope], but still will follow closing status | ||||
|  * of parent [Job] | ||||
|  */ | ||||
| fun WeakScope( | ||||
|     context: CoroutineContext | ||||
| ) = CoroutineScope(context.minusKey(Job) + Job()).also { newScope -> | ||||
|     newScope.launch { | ||||
|         context.job.join() | ||||
|         newScope.cancel() | ||||
|     } | ||||
| } | ||||
|  | ||||
| fun CoroutineScope.weakLaunch( | ||||
| /** | ||||
|  * Created [CoroutineScope] which will [launch] listening of [scope] [CoroutineContext] job completing and drop itself. Current weak | ||||
|  * scope **will not** be attached to [scope] [CoroutineContext] directly. So, this [CoroutineScope] will not prevent parent one from | ||||
|  * cancelling if it is launched with [supervisorScope] or [coroutineScope], but still will follow closing status | ||||
|  * of parent [Job] | ||||
|  */ | ||||
| fun WeakScope( | ||||
|     scope: CoroutineScope | ||||
| ) = WeakScope(scope.coroutineContext) | ||||
|  | ||||
| /** | ||||
|  * [this] [CoroutineScope] will be used as base for [WeakScope]. Other parameters ([context], [start], [block]) | ||||
|  * will be used to [launch] [Job] | ||||
|  */ | ||||
| fun CoroutineScope.launchWeak( | ||||
|     context: CoroutineContext = EmptyCoroutineContext, | ||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||
|     block: suspend CoroutineScope.() -> Unit | ||||
| ): Job { | ||||
|     val scope = createWeakSubScope() | ||||
|     val scope = WeakScope(this) | ||||
|     val job = scope.launch(context, start, block) | ||||
|     job.invokeOnCompletion { scope.cancel() } | ||||
|     return job | ||||
| } | ||||
|  | ||||
| fun <T> CoroutineScope.weakAsync( | ||||
| /** | ||||
|  * [this] [CoroutineScope] will be used as base for [WeakScope]. Other parameters ([context], [start], [block]) | ||||
|  * will be used to create [async] [Deferred] | ||||
|  */ | ||||
| fun <T> CoroutineScope.asyncWeak( | ||||
|     context: CoroutineContext = EmptyCoroutineContext, | ||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||
|     block: suspend CoroutineScope.() -> T | ||||
| ): Deferred<T> { | ||||
|     val scope = createWeakSubScope() | ||||
|     val scope = WeakScope(this) | ||||
|     val deferred = scope.async(context, start, block) | ||||
|     deferred.invokeOnCompletion { scope.cancel() } | ||||
|     return deferred | ||||
| } | ||||
|  | ||||
| @Deprecated("Renamed", ReplaceWith("launchWeak(context, start, block)", "dev.inmo.micro_utils.coroutines.launchWeak")) | ||||
| fun CoroutineScope.weakLaunch( | ||||
|     context: CoroutineContext = EmptyCoroutineContext, | ||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||
|     block: suspend CoroutineScope.() -> Unit | ||||
| ): Job = launchWeak(context, start, block) | ||||
|  | ||||
| @Deprecated("Renamed", ReplaceWith("asyncWeak(context, start, block)", "dev.inmo.micro_utils.coroutines.asyncWeak")) | ||||
| fun <T> CoroutineScope.weakAsync( | ||||
|     context: CoroutineContext = EmptyCoroutineContext, | ||||
|     start: CoroutineStart = CoroutineStart.DEFAULT, | ||||
|     block: suspend CoroutineScope.() -> T | ||||
| ): Deferred<T> = asyncWeak(context, start, block) | ||||
|   | ||||
| @@ -0,0 +1,318 @@ | ||||
| package dev.inmo.micro_utils.coroutines.collections | ||||
|  | ||||
| import dev.inmo.micro_utils.coroutines.SmartRWLocker | ||||
| import dev.inmo.micro_utils.coroutines.withReadAcquire | ||||
| import dev.inmo.micro_utils.coroutines.withWriteLock | ||||
| import kotlinx.coroutines.job | ||||
| import kotlinx.serialization.Serializable | ||||
| import kotlin.coroutines.coroutineContext | ||||
|  | ||||
| /** | ||||
|  * Creates simple [Comparator] which will use [compareTo] of [T] for both objects | ||||
|  */ | ||||
| private fun <T : Comparable<C>, C : T> T.createComparator() = Comparator<C> { o1, o2 -> o1.compareTo(o2) } | ||||
|  | ||||
| @Serializable | ||||
| class SortedBinaryTreeNode<T>( | ||||
|     val data: T, | ||||
|     internal val comparator: Comparator<T>, | ||||
| ) : Iterable<SortedBinaryTreeNode<T>> { | ||||
|     internal var leftNode: SortedBinaryTreeNode<T>? = null | ||||
|     internal var rightNode: SortedBinaryTreeNode<T>? = null | ||||
|     internal val locker: SmartRWLocker by lazy { | ||||
|         SmartRWLocker() | ||||
|     } | ||||
|  | ||||
|     suspend fun getLeftNode() = locker.withReadAcquire { | ||||
|         leftNode | ||||
|     } | ||||
|  | ||||
|     suspend fun getRightNode() = locker.withReadAcquire { | ||||
|         rightNode | ||||
|     } | ||||
|  | ||||
|     suspend fun getLeft() = getLeftNode() ?.data | ||||
|  | ||||
|     suspend fun getRight() = getRightNode() ?.data | ||||
|  | ||||
|     override fun equals(other: Any?): Boolean { | ||||
|         return other === this || (other is SortedBinaryTreeNode<*> && other.data == data && other.rightNode == rightNode && other.leftNode == leftNode) | ||||
|     } | ||||
|  | ||||
|     override fun hashCode(): Int { | ||||
|         return data.hashCode() * 31 + rightNode.hashCode() + leftNode.hashCode() | ||||
|     } | ||||
|  | ||||
|     suspend fun size(): Int { | ||||
|         return locker.withReadAcquire { | ||||
|             1 + (leftNode ?.size() ?: 0) + (rightNode ?.size() ?: 0) | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * This [Iterator] will run from less to greater values of nodes starting the | ||||
|      * [dev.inmo.micro_utils.coroutines.collections.SortedBinaryTreeNode]-receiver. Due to non-suspending | ||||
|      * nature of [iterator] builder, this [Iterator] **DO NOT** guarantee consistent content due to iterations. It | ||||
|      * means, that tree can be changed during to iteration process | ||||
|      */ | ||||
|     override fun iterator(): Iterator<SortedBinaryTreeNode<T>> = iterator { | ||||
|         leftNode ?.let { | ||||
|             it.iterator().forEach { yield(it) } | ||||
|         } | ||||
|         yield(this@SortedBinaryTreeNode) | ||||
|         rightNode ?.let { | ||||
|             it.iterator().forEach { yield(it) } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     override fun toString(): String { | ||||
|         return "$data($leftNode;$rightNode)" | ||||
|     } | ||||
|  | ||||
|     companion object { | ||||
|         operator fun <T : Comparable<T>> invoke( | ||||
|             data: T, | ||||
|         ) = SortedBinaryTreeNode( | ||||
|             data, | ||||
|             data.createComparator() | ||||
|         ) | ||||
|     } | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Will add subnode in tree if there are no any node with [newData] | ||||
|  * | ||||
|  * * If [newData] is greater than [SortedBinaryTreeNode.data] of currently checking node, | ||||
|  * will be used [SortedBinaryTreeNode.rightNode] | ||||
|  * * If [newData] is equal to [SortedBinaryTreeNode.data] of currently | ||||
|  * checking node - will be returned currently checking node | ||||
|  * * If [newData] is less than [SortedBinaryTreeNode.data] of currently | ||||
|  * checking node - will be used [SortedBinaryTreeNode.leftNode] | ||||
|  * | ||||
|  * This process will continue until function will not find place to put [SortedBinaryTreeNode] with data or | ||||
|  * [SortedBinaryTreeNode] with [SortedBinaryTreeNode.data] same as [newData] will be found | ||||
|  */ | ||||
| private suspend fun <T> SortedBinaryTreeNode<T>.upsertSubNode( | ||||
|     subNode: SortedBinaryTreeNode<T>, | ||||
|     skipLockers: Set<SmartRWLocker> = emptySet() | ||||
| ): SortedBinaryTreeNode<T> { | ||||
|     var currentlyChecking = this | ||||
|     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||
|     try { | ||||
|         while (coroutineContext.job.isActive) { | ||||
|             if (currentlyChecking.locker !in lockedLockers && currentlyChecking.locker !in skipLockers) { | ||||
|                 currentlyChecking.locker.lockWrite() | ||||
|                 lockedLockers.add(currentlyChecking.locker) | ||||
|             } | ||||
|             val left = currentlyChecking.leftNode | ||||
|             val right = currentlyChecking.rightNode | ||||
|             val comparingResult = currentlyChecking.comparator.compare(subNode.data, currentlyChecking.data) | ||||
|             val isGreater = comparingResult > 0 | ||||
|             when { | ||||
|                 comparingResult == 0 -> return currentlyChecking | ||||
|                 isGreater && right == null -> { | ||||
|                     currentlyChecking.rightNode = subNode | ||||
|                     return subNode | ||||
|                 } | ||||
|                 isGreater && right != null -> { | ||||
|                     currentlyChecking = right | ||||
|                 } | ||||
|                 left == null -> { | ||||
|                     currentlyChecking.leftNode = subNode | ||||
|                     return subNode | ||||
|                 } | ||||
|                 else -> { | ||||
|                     currentlyChecking = left | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } finally { | ||||
|         lockedLockers.forEach { | ||||
|             runCatching { it.unlockWrite() } | ||||
|         } | ||||
|     } | ||||
|     error("Unable to add node") | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Will add subnode in tree if there are no any node with [newData] | ||||
|  * | ||||
|  * * If [newData] is greater than [SortedBinaryTreeNode.data] of currently checking node, | ||||
|  * will be used [SortedBinaryTreeNode.rightNode] | ||||
|  * * If [newData] is equal to [SortedBinaryTreeNode.data] of currently | ||||
|  * checking node - will be returned currently checking node | ||||
|  * * If [newData] is less than [SortedBinaryTreeNode.data] of currently | ||||
|  * checking node - will be used [SortedBinaryTreeNode.leftNode] | ||||
|  * | ||||
|  * This process will continue until function will not find place to put [SortedBinaryTreeNode] with data or | ||||
|  * [SortedBinaryTreeNode] with [SortedBinaryTreeNode.data] same as [newData] will be found | ||||
|  */ | ||||
| suspend fun <T> SortedBinaryTreeNode<T>.addSubNode(newData: T): SortedBinaryTreeNode<T> { | ||||
|     return upsertSubNode( | ||||
|         SortedBinaryTreeNode(newData, comparator) | ||||
|     ) | ||||
| } | ||||
|  | ||||
| suspend fun <T> SortedBinaryTreeNode<T>.findParentNode(data: T): SortedBinaryTreeNode<T>? { | ||||
|     var currentParent: SortedBinaryTreeNode<T>? = null | ||||
|     var currentlyChecking: SortedBinaryTreeNode<T>? = this | ||||
|     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||
|     try { | ||||
|         while (coroutineContext.job.isActive) { | ||||
|             if (currentlyChecking == null) { | ||||
|                 return null | ||||
|             } | ||||
|             if (currentlyChecking.locker !in lockedLockers) { | ||||
|                 currentlyChecking.locker.acquireRead() | ||||
|                 lockedLockers.add(currentlyChecking.locker) | ||||
|             } | ||||
|             val comparingResult = currentlyChecking.comparator.compare(data, currentlyChecking.data) | ||||
|             when { | ||||
|                 comparingResult > 0 -> { | ||||
|                     currentParent = currentlyChecking | ||||
|                     currentlyChecking = currentlyChecking.rightNode | ||||
|                     continue | ||||
|                 } | ||||
|                 comparingResult < 0 -> { | ||||
|                     currentParent = currentlyChecking | ||||
|                     currentlyChecking = currentlyChecking.leftNode | ||||
|                     continue | ||||
|                 } | ||||
|                 else -> return currentParent | ||||
|             } | ||||
|         } | ||||
|     } finally { | ||||
|         lockedLockers.forEach { | ||||
|             runCatching { it.releaseRead() } | ||||
|         } | ||||
|     } | ||||
|     error("Unable to find node") | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Will remove (detach) node from tree starting with [this] [SortedBinaryTreeNode] | ||||
|  * | ||||
|  * @return If data were found, [Pair] where [Pair.first] is the parent node where from [Pair.second] has been detached; | ||||
|  *         null otherwise | ||||
|  */ | ||||
| suspend fun <T> SortedBinaryTreeNode<T>.removeSubNode(data: T): Pair<SortedBinaryTreeNode<T>, SortedBinaryTreeNode<T>>? { | ||||
|     val onFoundToRemoveCallback: suspend SortedBinaryTreeNode<T>.(left: SortedBinaryTreeNode<T>?, right: SortedBinaryTreeNode<T>?) -> Unit = { left, right -> | ||||
|         left ?.also { leftNode -> upsertSubNode(leftNode, setOf(locker)) } | ||||
|         right ?.also { rightNode -> upsertSubNode(rightNode, setOf(locker)) } | ||||
|     } | ||||
|     while (coroutineContext.job.isActive) { | ||||
|         val foundParentNode = findParentNode(data) ?: return null | ||||
|         foundParentNode.locker.withWriteLock { | ||||
|             val left = foundParentNode.leftNode | ||||
|             val right = foundParentNode.rightNode | ||||
|             when { | ||||
|                 left != null && left.comparator.compare(data, left.data) == 0 -> { | ||||
|                     foundParentNode.leftNode = null | ||||
|                     foundParentNode.onFoundToRemoveCallback(left.leftNode, left.rightNode) | ||||
|                     return foundParentNode to left | ||||
|                 } | ||||
|                 right != null && right.comparator.compare(data, right.data) == 0 -> { | ||||
|                     foundParentNode.rightNode = null | ||||
|                     foundParentNode.onFoundToRemoveCallback(right.leftNode, right.rightNode) | ||||
|                     return foundParentNode to right | ||||
|                 } | ||||
|                 else -> { | ||||
|                     return@withWriteLock // data has been changed, new search required | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|     error("Unable to remove node") | ||||
| } | ||||
| suspend fun <T> SortedBinaryTreeNode<T>.findNode(data: T): SortedBinaryTreeNode<T>? { | ||||
|     var currentlyChecking: SortedBinaryTreeNode<T>? = this | ||||
|     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||
|     try { | ||||
|         while (coroutineContext.job.isActive) { | ||||
|             if (currentlyChecking == null) { | ||||
|                 return null | ||||
|             } | ||||
|             if (currentlyChecking.locker !in lockedLockers) { | ||||
|                 currentlyChecking.locker.acquireRead() | ||||
|                 lockedLockers.add(currentlyChecking.locker) | ||||
|             } | ||||
|             val comparingResult = currentlyChecking.comparator.compare(data, currentlyChecking.data) | ||||
|             when { | ||||
|                 comparingResult > 0 -> { | ||||
|                     currentlyChecking = currentlyChecking.rightNode | ||||
|                     continue | ||||
|                 } | ||||
|                 comparingResult < 0 -> { | ||||
|                     currentlyChecking = currentlyChecking.leftNode | ||||
|                     continue | ||||
|                 } | ||||
|                 else -> return currentlyChecking | ||||
|             } | ||||
|         } | ||||
|     } finally { | ||||
|         lockedLockers.forEach { | ||||
|             runCatching { it.releaseRead() } | ||||
|         } | ||||
|     } | ||||
|     error("Unable to find node") | ||||
| } | ||||
| suspend fun <T> SortedBinaryTreeNode<T>.contains(data: T): Boolean = findNode(data) != null | ||||
|  | ||||
| suspend fun <T> SortedBinaryTreeNode<T>.findNodesInRange(from: T, to: T, fromInclusiveMode: Boolean, toInclusiveMode: Boolean): Set<SortedBinaryTreeNode<T>> { | ||||
|     val results = mutableSetOf<SortedBinaryTreeNode<T>>() | ||||
|     val leftToCheck = mutableSetOf(this) | ||||
|     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||
|     val fromComparingFun: (SortedBinaryTreeNode<T>) -> Boolean = if (fromInclusiveMode) { | ||||
|         { it.comparator.compare(from, it.data) <= 0 } | ||||
|     } else { | ||||
|         { it.comparator.compare(from, it.data) < 0 } | ||||
|     } | ||||
|     val toComparingFun: (SortedBinaryTreeNode<T>) -> Boolean = if (toInclusiveMode) { | ||||
|         { it.comparator.compare(to, it.data) >= 0 } | ||||
|     } else { | ||||
|         { it.comparator.compare(to, it.data) > 0 } | ||||
|     } | ||||
|     try { | ||||
|         while (coroutineContext.job.isActive && leftToCheck.isNotEmpty()) { | ||||
|             val currentlyChecking = leftToCheck.first() | ||||
|             leftToCheck.remove(currentlyChecking) | ||||
|             if (currentlyChecking in results) { | ||||
|                 continue | ||||
|             } | ||||
|             currentlyChecking.locker.acquireRead() | ||||
|             lockedLockers.add(currentlyChecking.locker) | ||||
|             if (fromComparingFun(currentlyChecking) && toComparingFun(currentlyChecking)) { | ||||
|                 results.add(currentlyChecking) | ||||
|                 currentlyChecking.leftNode ?.let { leftToCheck.add(it) } | ||||
|                 currentlyChecking.rightNode ?.let { leftToCheck.add(it) } | ||||
|                 continue | ||||
|             } | ||||
|             when { | ||||
|                 currentlyChecking.comparator.compare(to, currentlyChecking.data) < 0 -> currentlyChecking.leftNode ?.let { leftToCheck.add(it) } | ||||
|                 currentlyChecking.comparator.compare(from, currentlyChecking.data) > 0 -> currentlyChecking.rightNode ?.let { leftToCheck.add(it) } | ||||
|             } | ||||
|         } | ||||
|         return results.toSet() | ||||
|     } finally { | ||||
|         lockedLockers.forEach { | ||||
|             runCatching { it.releaseRead() } | ||||
|         } | ||||
|     } | ||||
|     error("Unable to find nodes range") | ||||
| } | ||||
| suspend fun <T> SortedBinaryTreeNode<T>.findNodesInRange(from: T, to: T): Set<SortedBinaryTreeNode<T>> = findNodesInRange( | ||||
|     from = from, | ||||
|     to = to, | ||||
|     fromInclusiveMode = true, | ||||
|     toInclusiveMode = true | ||||
| ) | ||||
| suspend fun <T> SortedBinaryTreeNode<T>.findNodesInRangeExcluding(from: T, to: T): Set<SortedBinaryTreeNode<T>> = findNodesInRange( | ||||
|     from = from, | ||||
|     to = to, | ||||
|     fromInclusiveMode = false, | ||||
|     toInclusiveMode = false | ||||
| ) | ||||
| suspend fun <T : Comparable<T>> SortedBinaryTreeNode<T>.findNodesInRange(range: ClosedRange<T>): Set<SortedBinaryTreeNode<T>> = findNodesInRange( | ||||
|     from = range.start, | ||||
|     to = range.endInclusive, | ||||
| ) | ||||
| @@ -0,0 +1,401 @@ | ||||
| package dev.inmo.micro_utils.coroutines.collections | ||||
|  | ||||
| import dev.inmo.micro_utils.coroutines.SmartRWLocker | ||||
| import dev.inmo.micro_utils.coroutines.withReadAcquire | ||||
| import dev.inmo.micro_utils.coroutines.withWriteLock | ||||
| import kotlinx.coroutines.job | ||||
| import kotlinx.serialization.Serializable | ||||
| import kotlin.coroutines.coroutineContext | ||||
|  | ||||
| /** | ||||
|  * Creates simple [Comparator] which will use [compareTo] of [T] for both objects | ||||
|  */ | ||||
| private fun <T : Comparable<C>, C : T> T.createComparator() = Comparator<C> { o1, o2 -> o1.compareTo(o2) } | ||||
|  | ||||
| @Serializable | ||||
| class SortedMapLikeBinaryTreeNode<K, V>( | ||||
|     val key: K, | ||||
|     val value: V, | ||||
|     internal val comparator: Comparator<K>, | ||||
| ) : Iterable<SortedMapLikeBinaryTreeNode<K, V>> { | ||||
|     internal var leftNode: SortedMapLikeBinaryTreeNode<K, V>? = null | ||||
|     internal var rightNode: SortedMapLikeBinaryTreeNode<K, V>? = null | ||||
|     internal val locker: SmartRWLocker by lazy { | ||||
|         SmartRWLocker() | ||||
|     } | ||||
|  | ||||
|     suspend fun getLeftNode() = locker.withReadAcquire { | ||||
|         leftNode | ||||
|     } | ||||
|  | ||||
|     suspend fun getRightNode() = locker.withReadAcquire { | ||||
|         rightNode | ||||
|     } | ||||
|  | ||||
|     suspend fun getLeftKey() = getLeftNode() ?.key | ||||
|     suspend fun getLeftValue() = getLeftNode() ?.value | ||||
|  | ||||
|     suspend fun getRightKey() = getRightNode() ?.value | ||||
|     suspend fun getRightValue() = getRightNode() ?.value | ||||
|  | ||||
|     override fun equals(other: Any?): Boolean { | ||||
|         return other === this || (other is SortedMapLikeBinaryTreeNode<*, *> && other.key == key && other.rightNode == rightNode && other.leftNode == leftNode) | ||||
|     } | ||||
|  | ||||
|     override fun hashCode(): Int { | ||||
|         return key.hashCode() * 31 + rightNode.hashCode() + leftNode.hashCode() | ||||
|     } | ||||
|  | ||||
|     suspend fun size(): Int { | ||||
|         return locker.withReadAcquire { | ||||
|             1 + (leftNode ?.size() ?: 0) + (rightNode ?.size() ?: 0) | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * This [Iterator] will run from less to greater values of nodes starting the | ||||
|      * [dev.inmo.micro_utils.coroutines.collections.SortedMapLikeBinaryTreeNode]-receiver. Due to non-suspending | ||||
|      * nature of [iterator] builder, this [Iterator] **DO NOT** guarantee consistent content due to iterations. It | ||||
|      * means, that tree can be changed during to iteration process | ||||
|      */ | ||||
|     override fun iterator(): Iterator<SortedMapLikeBinaryTreeNode<K, V>> = iterator { | ||||
|         leftNode ?.let { | ||||
|             it.iterator().forEach { yield(it) } | ||||
|         } | ||||
|         yield(this@SortedMapLikeBinaryTreeNode) | ||||
|         rightNode ?.let { | ||||
|             it.iterator().forEach { yield(it) } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     override fun toString(): String { | ||||
|         return "$key($leftNode;$rightNode)" | ||||
|     } | ||||
|  | ||||
|     companion object { | ||||
|         operator fun <K : Comparable<K>, V> invoke( | ||||
|             key: K, | ||||
|             value: V | ||||
|         ) = SortedMapLikeBinaryTreeNode( | ||||
|             key, | ||||
|             value, | ||||
|             key.createComparator() | ||||
|         ) | ||||
|     } | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Will add subnode in tree if there are no any node with [newData] | ||||
|  * | ||||
|  * * If [newData] is greater than [SortedMapLikeBinaryTreeNode.key] of currently checking node, | ||||
|  * will be used [SortedMapLikeBinaryTreeNode.rightNode] | ||||
|  * * If [newData] is equal to [SortedMapLikeBinaryTreeNode.key] of currently | ||||
|  * checking node - will be returned currently checking node | ||||
|  * * If [newData] is less than [SortedMapLikeBinaryTreeNode.key] of currently | ||||
|  * checking node - will be used [SortedMapLikeBinaryTreeNode.leftNode] | ||||
|  * | ||||
|  * This process will continue until function will not find place to put [SortedMapLikeBinaryTreeNode] with data or | ||||
|  * [SortedMapLikeBinaryTreeNode] with [SortedMapLikeBinaryTreeNode.key] same as [newData] will be found | ||||
|  * | ||||
|  * @param replaceMode Will replace only value if node already exists | ||||
|  */ | ||||
| private suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.upsertSubNode( | ||||
|     subNode: SortedMapLikeBinaryTreeNode<K, V>, | ||||
|     skipLockers: Set<SmartRWLocker> = emptySet(), | ||||
|     replaceMode: Boolean | ||||
| ): SortedMapLikeBinaryTreeNode<K, V> { | ||||
|     var currentlyChecking = this | ||||
|     var latestParent: SortedMapLikeBinaryTreeNode<K, V>? = null | ||||
|     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||
|     try { | ||||
|         while (coroutineContext.job.isActive) { | ||||
|             if (currentlyChecking.locker !in lockedLockers && currentlyChecking.locker !in skipLockers) { | ||||
|                 currentlyChecking.locker.lockWrite() | ||||
|                 lockedLockers.add(currentlyChecking.locker) | ||||
|             } | ||||
|             val left = currentlyChecking.leftNode | ||||
|             val right = currentlyChecking.rightNode | ||||
|             val comparingResult = currentlyChecking.comparator.compare(subNode.key, currentlyChecking.key) | ||||
|             val isGreater = comparingResult > 0 | ||||
|             when { | ||||
|                 comparingResult == 0 -> { | ||||
|                     val resultNode = if (replaceMode) { | ||||
|                         subNode | ||||
|                     } else { | ||||
|                         val newNode = SortedMapLikeBinaryTreeNode( | ||||
|                             subNode.key, | ||||
|                             subNode.value, | ||||
|                             currentlyChecking.comparator, | ||||
|                         ) | ||||
|                         newNode.leftNode = currentlyChecking.leftNode | ||||
|                         newNode.rightNode = currentlyChecking.rightNode | ||||
|                         newNode | ||||
|                     } | ||||
|  | ||||
|                     latestParent ?.let { | ||||
|                         when { | ||||
|                             it.leftNode === currentlyChecking -> it.leftNode = resultNode | ||||
|                             it.rightNode === currentlyChecking -> it.rightNode = resultNode | ||||
|                         } | ||||
|                     } | ||||
|  | ||||
|                     return resultNode | ||||
|                 } | ||||
|                 isGreater && right == null -> { | ||||
|                     currentlyChecking.rightNode = subNode | ||||
|                     return subNode | ||||
|                 } | ||||
|                 isGreater && right != null -> { | ||||
|                     latestParent = currentlyChecking | ||||
|                     currentlyChecking = right | ||||
|                 } | ||||
|                 left == null -> { | ||||
|                     currentlyChecking.leftNode = subNode | ||||
|                     return subNode | ||||
|                 } | ||||
|                 else -> { | ||||
|                     latestParent = currentlyChecking | ||||
|                     currentlyChecking = left | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } finally { | ||||
|         lockedLockers.forEach { | ||||
|             runCatching { it.unlockWrite() } | ||||
|         } | ||||
|     } | ||||
|     error("Unable to add node") | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Will add subnode in tree if there are no any node with [key] | ||||
|  * | ||||
|  * * If [key] is greater than [SortedMapLikeBinaryTreeNode.key] of currently checking node, | ||||
|  * will be used [SortedMapLikeBinaryTreeNode.rightNode] | ||||
|  * * If [key] is equal to [SortedMapLikeBinaryTreeNode.key] of currently | ||||
|  * checking node - will be returned currently checking node | ||||
|  * * If [key] is less than [SortedMapLikeBinaryTreeNode.key] of currently | ||||
|  * checking node - will be used [SortedMapLikeBinaryTreeNode.leftNode] | ||||
|  * | ||||
|  * This process will continue until function will not find place to put [SortedMapLikeBinaryTreeNode] with data or | ||||
|  * [SortedMapLikeBinaryTreeNode] with [SortedMapLikeBinaryTreeNode.key] same as [key] will be found | ||||
|  */ | ||||
| suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.upsertSubNode( | ||||
|     key: K, | ||||
|     value: V | ||||
| ): SortedMapLikeBinaryTreeNode<K, V> { | ||||
|     return upsertSubNode( | ||||
|         SortedMapLikeBinaryTreeNode(key, value, comparator), | ||||
|         replaceMode = false | ||||
|     ) | ||||
| } | ||||
|  | ||||
| suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.findParentNode(data: K): SortedMapLikeBinaryTreeNode<K, V>? { | ||||
|     var currentParent: SortedMapLikeBinaryTreeNode<K, V>? = null | ||||
|     var currentlyChecking: SortedMapLikeBinaryTreeNode<K, V>? = this | ||||
|     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||
|     try { | ||||
|         while (coroutineContext.job.isActive) { | ||||
|             if (currentlyChecking == null) { | ||||
|                 return null | ||||
|             } | ||||
|             if (currentlyChecking.locker !in lockedLockers) { | ||||
|                 currentlyChecking.locker.acquireRead() | ||||
|                 lockedLockers.add(currentlyChecking.locker) | ||||
|             } | ||||
|             val comparingResult = currentlyChecking.comparator.compare(data, currentlyChecking.key) | ||||
|             when { | ||||
|                 comparingResult > 0 -> { | ||||
|                     currentParent = currentlyChecking | ||||
|                     currentlyChecking = currentlyChecking.rightNode | ||||
|                     continue | ||||
|                 } | ||||
|                 comparingResult < 0 -> { | ||||
|                     currentParent = currentlyChecking | ||||
|                     currentlyChecking = currentlyChecking.leftNode | ||||
|                     continue | ||||
|                 } | ||||
|                 else -> return currentParent | ||||
|             } | ||||
|         } | ||||
|     } finally { | ||||
|         lockedLockers.forEach { | ||||
|             runCatching { it.releaseRead() } | ||||
|         } | ||||
|     } | ||||
|     error("Unable to find node") | ||||
| } | ||||
|  | ||||
| /** | ||||
|  * Will remove (detach) node from tree starting with [this] [SortedMapLikeBinaryTreeNode] | ||||
|  * | ||||
|  * @return If data were found, [Pair] where [Pair.first] is the parent node where from [Pair.second] has been detached; | ||||
|  *         null otherwise | ||||
|  */ | ||||
| suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.removeSubNode(data: K): Pair<SortedMapLikeBinaryTreeNode<K, V>, SortedMapLikeBinaryTreeNode<K, V>>? { | ||||
|     val onFoundToRemoveCallback: suspend SortedMapLikeBinaryTreeNode<K, V>.(left: SortedMapLikeBinaryTreeNode<K, V>?, right: SortedMapLikeBinaryTreeNode<K, V>?) -> Unit = { left, right -> | ||||
|         left ?.also { leftNode -> upsertSubNode(leftNode, setOf(locker), replaceMode = true) } | ||||
|         right ?.also { rightNode -> upsertSubNode(rightNode, setOf(locker), replaceMode = true) } | ||||
|     } | ||||
|     while (coroutineContext.job.isActive) { | ||||
|         val foundParentNode = findParentNode(data) ?: return null | ||||
|         foundParentNode.locker.withWriteLock { | ||||
|             val left = foundParentNode.leftNode | ||||
|             val right = foundParentNode.rightNode | ||||
|             when { | ||||
|                 left != null && left.comparator.compare(data, left.key) == 0 -> { | ||||
|                     foundParentNode.leftNode = null | ||||
|                     foundParentNode.onFoundToRemoveCallback(left.leftNode, left.rightNode) | ||||
|                     return foundParentNode to left | ||||
|                 } | ||||
|                 right != null && right.comparator.compare(data, right.key) == 0 -> { | ||||
|                     foundParentNode.rightNode = null | ||||
|                     foundParentNode.onFoundToRemoveCallback(right.leftNode, right.rightNode) | ||||
|                     return foundParentNode to right | ||||
|                 } | ||||
|                 else -> { | ||||
|                     return@withWriteLock // data has been changed, new search required | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|     error("Unable to remove node") | ||||
| } | ||||
| suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.findNode(key: K): SortedMapLikeBinaryTreeNode<K, V>? { | ||||
|     var currentlyChecking: SortedMapLikeBinaryTreeNode<K, V>? = this | ||||
|     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||
|     try { | ||||
|         while (coroutineContext.job.isActive) { | ||||
|             if (currentlyChecking == null) { | ||||
|                 return null | ||||
|             } | ||||
|             if (currentlyChecking.locker !in lockedLockers) { | ||||
|                 currentlyChecking.locker.acquireRead() | ||||
|                 lockedLockers.add(currentlyChecking.locker) | ||||
|             } | ||||
|             val comparingResult = currentlyChecking.comparator.compare(key, currentlyChecking.key) | ||||
|             when { | ||||
|                 comparingResult > 0 -> { | ||||
|                     currentlyChecking = currentlyChecking.rightNode | ||||
|                     continue | ||||
|                 } | ||||
|                 comparingResult < 0 -> { | ||||
|                     currentlyChecking = currentlyChecking.leftNode | ||||
|                     continue | ||||
|                 } | ||||
|                 else -> return currentlyChecking | ||||
|             } | ||||
|         } | ||||
|     } finally { | ||||
|         lockedLockers.forEach { | ||||
|             runCatching { it.releaseRead() } | ||||
|         } | ||||
|     } | ||||
|     error("Unable to find node") | ||||
| } | ||||
| suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.contains(data: K): Boolean = findNode(data) != null | ||||
|  | ||||
| suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.findNodesInRange(from: K, to: K, fromInclusiveMode: Boolean, toInclusiveMode: Boolean): Set<SortedMapLikeBinaryTreeNode<K, V>> { | ||||
|     val results = mutableSetOf<SortedMapLikeBinaryTreeNode<K, V>>() | ||||
|     val leftToCheck = mutableSetOf(this) | ||||
|     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||
|     val fromComparingFun: (SortedMapLikeBinaryTreeNode<K, V>) -> Boolean = if (fromInclusiveMode) { | ||||
|         { it.comparator.compare(from, it.key) <= 0 } | ||||
|     } else { | ||||
|         { it.comparator.compare(from, it.key) < 0 } | ||||
|     } | ||||
|     val toComparingFun: (SortedMapLikeBinaryTreeNode<K, V>) -> Boolean = if (toInclusiveMode) { | ||||
|         { it.comparator.compare(to, it.key) >= 0 } | ||||
|     } else { | ||||
|         { it.comparator.compare(to, it.key) > 0 } | ||||
|     } | ||||
|     try { | ||||
|         while (coroutineContext.job.isActive && leftToCheck.isNotEmpty()) { | ||||
|             val currentlyChecking = leftToCheck.first() | ||||
|             leftToCheck.remove(currentlyChecking) | ||||
|             if (currentlyChecking in results) { | ||||
|                 continue | ||||
|             } | ||||
|             currentlyChecking.locker.acquireRead() | ||||
|             lockedLockers.add(currentlyChecking.locker) | ||||
|             if (fromComparingFun(currentlyChecking) && toComparingFun(currentlyChecking)) { | ||||
|                 results.add(currentlyChecking) | ||||
|                 currentlyChecking.leftNode ?.let { leftToCheck.add(it) } | ||||
|                 currentlyChecking.rightNode ?.let { leftToCheck.add(it) } | ||||
|                 continue | ||||
|             } | ||||
|             when { | ||||
|                 currentlyChecking.comparator.compare(to, currentlyChecking.key) < 0 -> currentlyChecking.leftNode ?.let { leftToCheck.add(it) } | ||||
|                 currentlyChecking.comparator.compare(from, currentlyChecking.key) > 0 -> currentlyChecking.rightNode ?.let { leftToCheck.add(it) } | ||||
|             } | ||||
|         } | ||||
|         return results.toSet() | ||||
|     } finally { | ||||
|         lockedLockers.forEach { | ||||
|             runCatching { it.releaseRead() } | ||||
|         } | ||||
|     } | ||||
|     error("Unable to find nodes range") | ||||
| } | ||||
| suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.deepEquals(other: SortedMapLikeBinaryTreeNode<K, V>): Boolean { | ||||
|     val leftToCheck = mutableSetOf(this) | ||||
|     val othersToCheck = mutableSetOf(other) | ||||
|     val lockedLockers = mutableSetOf<SmartRWLocker>() | ||||
|     try { | ||||
|         while (leftToCheck.isNotEmpty() && othersToCheck.isNotEmpty()) { | ||||
|             val thisToCheck = leftToCheck.first() | ||||
|             leftToCheck.remove(thisToCheck) | ||||
|  | ||||
|             val otherToCheck = othersToCheck.first() | ||||
|             othersToCheck.remove(otherToCheck) | ||||
|  | ||||
|             if (thisToCheck.locker !in lockedLockers) { | ||||
|                 thisToCheck.locker.acquireRead() | ||||
|                 lockedLockers.add(thisToCheck.locker) | ||||
|             } | ||||
|             if (otherToCheck.locker !in lockedLockers) { | ||||
|                 otherToCheck.locker.acquireRead() | ||||
|                 lockedLockers.add(otherToCheck.locker) | ||||
|             } | ||||
|  | ||||
|             if (thisToCheck.key != otherToCheck.key || thisToCheck.value != otherToCheck.value) { | ||||
|                 return false | ||||
|             } | ||||
|  | ||||
|             if ((thisToCheck.leftNode == null).xor(otherToCheck.leftNode == null)) { | ||||
|                 return false | ||||
|             } | ||||
|             if ((thisToCheck.rightNode == null).xor(otherToCheck.rightNode == null)) { | ||||
|                 return false | ||||
|             } | ||||
|  | ||||
|             thisToCheck.leftNode?.let { leftToCheck.add(it) } | ||||
|             thisToCheck.rightNode?.let { leftToCheck.add(it) } | ||||
|  | ||||
|             otherToCheck.leftNode?.let { othersToCheck.add(it) } | ||||
|             otherToCheck.rightNode?.let { othersToCheck.add(it) } | ||||
|         } | ||||
|     } finally { | ||||
|         lockedLockers.forEach { | ||||
|             runCatching { it.releaseRead() } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     return leftToCheck.isEmpty() && othersToCheck.isEmpty() | ||||
| } | ||||
| suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.findNodesInRange(from: K, to: K): Set<SortedMapLikeBinaryTreeNode<K, V>> = findNodesInRange( | ||||
|     from = from, | ||||
|     to = to, | ||||
|     fromInclusiveMode = true, | ||||
|     toInclusiveMode = true | ||||
| ) | ||||
| suspend fun <K, V> SortedMapLikeBinaryTreeNode<K, V>.findNodesInRangeExcluding(from: K, to: K): Set<SortedMapLikeBinaryTreeNode<K, V>> = findNodesInRange( | ||||
|     from = from, | ||||
|     to = to, | ||||
|     fromInclusiveMode = false, | ||||
|     toInclusiveMode = false | ||||
| ) | ||||
| suspend fun <K : Comparable<K>, V> SortedMapLikeBinaryTreeNode<K, V>.findNodesInRange(range: ClosedRange<K>): Set<SortedMapLikeBinaryTreeNode<K, V>> = findNodesInRange( | ||||
|     from = range.start, | ||||
|     to = range.endInclusive, | ||||
| ) | ||||
							
								
								
									
										42
									
								
								coroutines/src/commonTest/kotlin/DebouncedByTests.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										42
									
								
								coroutines/src/commonTest/kotlin/DebouncedByTests.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,42 @@ | ||||
| import dev.inmo.micro_utils.coroutines.debouncedBy | ||||
| import kotlinx.coroutines.flow.asFlow | ||||
| import kotlinx.coroutines.test.runTest | ||||
| import kotlin.test.Test | ||||
| import kotlin.test.assertEquals | ||||
| import kotlin.test.assertTrue | ||||
|  | ||||
| class DebouncedByTests { | ||||
|     @Test | ||||
|     fun testThatParallelDebouncingWorksCorrectly() = runTest { | ||||
|         val dataToMarkerFactories = listOf( | ||||
|             1 to 0, | ||||
|             2 to 1, | ||||
|             3 to 2, | ||||
|             4 to 0, | ||||
|             5 to 1, | ||||
|             6 to 2, | ||||
|             7 to 0, | ||||
|             8 to 1, | ||||
|             9 to 2, | ||||
|         ) | ||||
|  | ||||
|         val collected = mutableListOf<Int>() | ||||
|  | ||||
|         dataToMarkerFactories.asFlow().debouncedBy(10L) { | ||||
|             it.second | ||||
|         }.collect { | ||||
|             when (it.second) { | ||||
|                 0 -> assertEquals(7, it.first) | ||||
|                 1 -> assertEquals(8, it.first) | ||||
|                 2 -> assertEquals(9, it.first) | ||||
|                 else -> error("wtf") | ||||
|             } | ||||
|             collected.add(it.first) | ||||
|         } | ||||
|  | ||||
|         val expectedList = listOf(7, 8, 9) | ||||
|         assertEquals(expectedList, collected) | ||||
|         assertTrue { collected.containsAll(expectedList) } | ||||
|         assertTrue { expectedList.containsAll(collected) } | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,33 @@ | ||||
| import dev.inmo.micro_utils.coroutines.SpecialMutableStateFlow | ||||
| import dev.inmo.micro_utils.coroutines.asDeferred | ||||
| import dev.inmo.micro_utils.coroutines.subscribe | ||||
| import kotlinx.coroutines.Job | ||||
| import kotlinx.coroutines.flow.first | ||||
| import kotlinx.coroutines.test.runTest | ||||
| import kotlin.test.Test | ||||
| import kotlin.test.assertEquals | ||||
| import kotlin.test.assertTrue | ||||
|  | ||||
| class SpecialMutableStateFlowTests { | ||||
|     @Test | ||||
|     fun simpleTest() = runTest { | ||||
|         val specialMutableStateFlow = SpecialMutableStateFlow(0) | ||||
|         specialMutableStateFlow.value = 1 | ||||
|         specialMutableStateFlow.first { it == 1 } | ||||
|         assertEquals(1, specialMutableStateFlow.value) | ||||
|     } | ||||
|     @Test | ||||
|     fun specialTest() = runTest { | ||||
|         val specialMutableStateFlow = SpecialMutableStateFlow(0) | ||||
|         lateinit var subscriberJob: Job | ||||
|         subscriberJob = specialMutableStateFlow.subscribe(this) { | ||||
|             when (it) { | ||||
|                 1 -> specialMutableStateFlow.value = 2 | ||||
|                 2 -> subscriberJob.cancel() | ||||
|             } | ||||
|         } | ||||
|         specialMutableStateFlow.value = 1 | ||||
|         subscriberJob.join() | ||||
|         assertEquals(2, specialMutableStateFlow.value) | ||||
|     } | ||||
| } | ||||
							
								
								
									
										64
									
								
								coroutines/src/commonTest/kotlin/WeakJobTests.kt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										64
									
								
								coroutines/src/commonTest/kotlin/WeakJobTests.kt
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,64 @@ | ||||
| import dev.inmo.micro_utils.coroutines.asyncWeak | ||||
| import dev.inmo.micro_utils.coroutines.launchWeak | ||||
| import kotlinx.coroutines.* | ||||
| import kotlinx.coroutines.test.runTest | ||||
| import kotlin.test.Test | ||||
| import kotlin.test.assertTrue | ||||
|  | ||||
| class WeakJobTests { | ||||
|     @Test | ||||
|     fun testWeakJob() = runTest { | ||||
|         var commonJobDone = false | ||||
|         var weakJobStarted = false | ||||
|         try { | ||||
|             coroutineScope { | ||||
|                 launch { | ||||
|                     delay(1000) | ||||
|                     commonJobDone = true | ||||
|                 } | ||||
|                 asyncWeak { | ||||
|                     weakJobStarted = true | ||||
|                     delay(100500L) | ||||
|                     error("This must never happen") | ||||
|                 } | ||||
|             }.await() | ||||
|         } catch (error: Throwable) { | ||||
|             assertTrue(error is CancellationException) | ||||
|             assertTrue(commonJobDone) | ||||
|             assertTrue(weakJobStarted) | ||||
|             return@runTest | ||||
|         } | ||||
|         error("Cancellation exception has not been thrown") | ||||
|     } | ||||
|     @Test | ||||
|     fun testThatWeakJobsWorksCorrectly() = runTest { | ||||
|         val scope = CoroutineScope(Dispatchers.Default) | ||||
|         lateinit var weakLaunchJob: Job | ||||
|         lateinit var weakAsyncJob: Job | ||||
|         val completeDeferred = Job() | ||||
|         coroutineScope { | ||||
|             weakLaunchJob = launchWeak { | ||||
|                 while (isActive) { | ||||
|                     delay(100L) | ||||
|                 } | ||||
|             } | ||||
|             weakAsyncJob = asyncWeak { | ||||
|                 while (isActive) { | ||||
|                     delay(100L) | ||||
|                 } | ||||
|             } | ||||
|  | ||||
|             coroutineContext.job.invokeOnCompletion { | ||||
|                 scope.launch { | ||||
|                     delay(1000L) | ||||
|                     completeDeferred.complete() | ||||
|                 } | ||||
|             } | ||||
|             launch { delay(1000L); cancel() } | ||||
|         } | ||||
|         completeDeferred.join() | ||||
|  | ||||
|         assertTrue(!weakLaunchJob.isActive) | ||||
|         assertTrue(!weakAsyncJob.isActive) | ||||
|     } | ||||
| } | ||||
| @@ -1,25 +1,20 @@ | ||||
| package dev.inmo.micro_utils.coroutines | ||||
|  | ||||
| import kotlinx.coroutines.* | ||||
| import kotlinx.coroutines.test.runTest | ||||
| import kotlin.test.Test | ||||
|  | ||||
| class HandleSafelyCoroutineContextTest { | ||||
|     @Test | ||||
|     fun testHandleSafelyCoroutineContext() { | ||||
|         val scope = CoroutineScope(Dispatchers.Default) | ||||
|     fun testHandleSafelyCoroutineContext() = runTest { | ||||
|         val scope = this | ||||
|         var contextHandlerHappen = false | ||||
|         var localHandlerHappen = false | ||||
|         var defaultHandlerHappen = false | ||||
|         defaultSafelyExceptionHandler = { | ||||
|             defaultHandlerHappen = true | ||||
|             throw it | ||||
|         } | ||||
|         val contextHandler: ExceptionHandler<Unit> = { | ||||
|             contextHandlerHappen = true | ||||
|         } | ||||
|         val checkJob = scope.launch { | ||||
|             safelyWithContextExceptionHandler(contextHandler) { | ||||
|                 safely( | ||||
|             runCatchingLogging ({ | ||||
|                 contextHandlerHappen = true | ||||
|             }) { | ||||
|                 runCatchingLogging ( | ||||
|                     { | ||||
|                         localHandlerHappen = true | ||||
|                     } | ||||
| @@ -29,10 +24,8 @@ class HandleSafelyCoroutineContextTest { | ||||
|                 println(coroutineContext) | ||||
|                 error("That must happen too:)") | ||||
|             } | ||||
|         } | ||||
|         launchSynchronously { checkJob.join() } | ||||
|         }.join() | ||||
|         assert(contextHandlerHappen) | ||||
|         assert(localHandlerHappen) | ||||
|         assert(defaultHandlerHappen) | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,176 @@ | ||||
| package dev.inmo.micro_utils.coroutines | ||||
|  | ||||
| import dev.inmo.micro_utils.coroutines.collections.SortedBinaryTreeNode | ||||
| import dev.inmo.micro_utils.coroutines.collections.addSubNode | ||||
| import dev.inmo.micro_utils.coroutines.collections.findNode | ||||
| import dev.inmo.micro_utils.coroutines.collections.findNodesInRange | ||||
| import dev.inmo.micro_utils.coroutines.collections.findParentNode | ||||
| import dev.inmo.micro_utils.coroutines.collections.removeSubNode | ||||
| import kotlinx.coroutines.test.runTest | ||||
| import kotlin.test.Test | ||||
| import kotlin.test.assertEquals | ||||
| import kotlin.test.assertTrue | ||||
| import kotlin.time.Duration.Companion.seconds | ||||
|  | ||||
| class SortedBinaryTreeNodeTests { | ||||
|     @Test | ||||
|     fun insertOnZeroLevelWorks() = runTest { | ||||
|         val zeroNode = SortedBinaryTreeNode(0) | ||||
|         zeroNode.addSubNode(1) | ||||
|         zeroNode.addSubNode(-1) | ||||
|  | ||||
|         assertEquals(0, zeroNode.data) | ||||
|         assertEquals(1, zeroNode.getRightNode() ?.data) | ||||
|         assertEquals(-1, zeroNode.getLeftNode() ?.data) | ||||
|     } | ||||
|     @Test | ||||
|     fun searchOnZeroLevelWorks() = runTest { | ||||
|         val zeroNode = SortedBinaryTreeNode(0) | ||||
|         val oneNode = zeroNode.addSubNode(1) | ||||
|         val minusOneNode = zeroNode.addSubNode(-1) | ||||
|  | ||||
|         val assertingNodesToSearchQuery = mapOf( | ||||
|             setOf(oneNode) to (1 .. 1), | ||||
|             setOf(zeroNode, oneNode) to (0 .. 1), | ||||
|             setOf(minusOneNode, zeroNode, oneNode) to (-1 .. 1), | ||||
|             setOf(minusOneNode, zeroNode) to (-1 .. 0), | ||||
|             setOf(minusOneNode) to (-1 .. -1), | ||||
|             setOf(zeroNode) to (0 .. 0), | ||||
|         ) | ||||
|  | ||||
|         assertingNodesToSearchQuery.forEach { | ||||
|             val foundData = zeroNode.findNodesInRange(it.value) | ||||
|             assertTrue(foundData.containsAll(it.key)) | ||||
|             assertTrue(it.key.containsAll(foundData)) | ||||
|         } | ||||
|     } | ||||
|     @Test | ||||
|     fun deepReInsertOnWorks() = runTest(timeout = 300.seconds) { | ||||
|         val zeroNode = SortedBinaryTreeNode(0) | ||||
|         val rangeRadius = 500 | ||||
|         val nodes = mutableMapOf<Int, SortedBinaryTreeNode<Int>>() | ||||
|         for (i in -rangeRadius .. rangeRadius) { | ||||
|             nodes[i] = zeroNode.addSubNode(i) | ||||
|         } | ||||
|  | ||||
|         for (i in -rangeRadius .. rangeRadius) { | ||||
|             val expectedNode = nodes.getValue(i) | ||||
|             val foundNode = zeroNode.findNode(i) | ||||
|  | ||||
|             assertTrue(expectedNode === foundNode) | ||||
|  | ||||
|             if (expectedNode === zeroNode) continue | ||||
|  | ||||
|             val parentNode = zeroNode.findParentNode(i) | ||||
|             assertTrue( | ||||
|                 parentNode ?.getLeftNode() === expectedNode || parentNode ?.getRightNode() === expectedNode, | ||||
|                 "It is expected, that parent node with data ${parentNode ?.data} will be parent of ${expectedNode.data}, but its left subnode is ${parentNode ?.getLeftNode() ?.data} and right one is ${parentNode ?.getRightNode() ?.data}" | ||||
|             ) | ||||
|         } | ||||
|  | ||||
|         val sourceTreeSize = zeroNode.size() | ||||
|         assertTrue(sourceTreeSize == nodes.size) | ||||
|         assertTrue(sourceTreeSize == (rangeRadius * 2 + 1)) | ||||
|  | ||||
|         for (i in -rangeRadius .. rangeRadius) { | ||||
|             val expectedNode = nodes.getValue(i) | ||||
|             val parentNode = zeroNode.findParentNode(i) | ||||
|  | ||||
|             if (parentNode == null && i == zeroNode.data && expectedNode === zeroNode) continue | ||||
|  | ||||
|             assertTrue(parentNode != null, "It is expected, that parent node of ${expectedNode.data} will not be null") | ||||
|  | ||||
|             assertTrue( | ||||
|                 parentNode.getLeftNode() === expectedNode || parentNode.getRightNode() === expectedNode, | ||||
|                 "It is expected, that parent node with data ${parentNode ?.data} will be parent of ${expectedNode.data}, but its left subnode is ${parentNode ?.getLeftNode() ?.data} and right one is ${parentNode ?.getRightNode() ?.data}" | ||||
|             ) | ||||
|  | ||||
|             val removeResult = zeroNode.removeSubNode(i) | ||||
|             assertTrue(removeResult ?.first === parentNode) | ||||
|             assertTrue(removeResult.second === expectedNode) | ||||
|  | ||||
|             nodes[i] = zeroNode.addSubNode(i) | ||||
|             assertTrue(nodes[i] != null) | ||||
|             assertTrue(nodes[i] != expectedNode) | ||||
|             assertTrue(nodes[i] ?.data == i) | ||||
|         } | ||||
|  | ||||
|         assertTrue(sourceTreeSize == zeroNode.size()) | ||||
|  | ||||
|         for (i in -rangeRadius .. rangeRadius) { | ||||
|             val expectedNode = nodes.getValue(i) | ||||
|             val foundNode = zeroNode.findNode(i) | ||||
|  | ||||
|             assertTrue(expectedNode === foundNode) | ||||
|  | ||||
|             if (expectedNode === zeroNode) continue | ||||
|  | ||||
|             val parentNode = zeroNode.findParentNode(i) | ||||
|             assertTrue( | ||||
|                 parentNode ?.getLeftNode() === expectedNode || parentNode ?.getRightNode() === expectedNode, | ||||
|                 "It is expected, that parent node with data ${parentNode ?.data} will be parent of ${expectedNode.data}, but its left subnode is ${parentNode ?.getLeftNode() ?.data} and right one is ${parentNode ?.getRightNode() ?.data}" | ||||
|             ) | ||||
|         } | ||||
|  | ||||
|         var previousData = -rangeRadius - 1 | ||||
|         for (node in zeroNode) { | ||||
|             assertTrue(nodes[node.data] === node) | ||||
|             assertTrue(previousData == node.data - 1) | ||||
|             previousData = node.data | ||||
|         } | ||||
|  | ||||
|         assertTrue(sourceTreeSize == zeroNode.size()) | ||||
|     } | ||||
|     @Test | ||||
|     fun deepInsertOnWorks() = runTest(timeout = 240.seconds) { | ||||
|         val zeroNode = SortedBinaryTreeNode(0) | ||||
|         val rangeRadius = 500 | ||||
|         val nodes = mutableMapOf<Int, SortedBinaryTreeNode<Int>>() | ||||
|         for (i in -rangeRadius .. rangeRadius) { | ||||
|             nodes[i] = zeroNode.addSubNode(i) | ||||
|         } | ||||
|  | ||||
|         for (i in -rangeRadius .. rangeRadius) { | ||||
|             val expectedNode = nodes.getValue(i) | ||||
|             val foundNode = zeroNode.findNode(i) | ||||
|  | ||||
|             assertTrue(expectedNode === foundNode) | ||||
|  | ||||
|             if (expectedNode === zeroNode) continue | ||||
|  | ||||
|             val parentNode = zeroNode.findParentNode(i) | ||||
|             assertTrue( | ||||
|                 parentNode ?.getLeftNode() === expectedNode || parentNode ?.getRightNode() === expectedNode, | ||||
|                 "It is expected, that parent node with data ${parentNode ?.data} will be parent of ${expectedNode.data}, but its left subnode is ${parentNode ?.getLeftNode() ?.data} and right one is ${parentNode ?.getRightNode() ?.data}" | ||||
|             ) | ||||
|         } | ||||
|  | ||||
|         val sourceTreeSize = zeroNode.size() | ||||
|  | ||||
|         var previousData = -rangeRadius - 1 | ||||
|         for (node in zeroNode) { | ||||
|             assertTrue(nodes[node.data] === node) | ||||
|             assertTrue(previousData == node.data - 1) | ||||
|             previousData = node.data | ||||
|         } | ||||
|  | ||||
|         assertTrue(sourceTreeSize == zeroNode.size()) | ||||
|     } | ||||
|     @Test | ||||
|     fun deepInsertIteratorWorking() = runTest { | ||||
|         val zeroNode = SortedBinaryTreeNode(0) | ||||
|         val rangeRadius = 500 | ||||
|         val nodes = mutableMapOf<Int, SortedBinaryTreeNode<Int>>() | ||||
|         for (i in -rangeRadius .. rangeRadius) { | ||||
|             nodes[i] = zeroNode.addSubNode(i) | ||||
|         } | ||||
|  | ||||
|         var previousData = -rangeRadius - 1 | ||||
|         for (node in zeroNode) { | ||||
|             assertTrue(nodes[node.data] === node) | ||||
|             assertTrue(previousData == node.data - 1) | ||||
|             previousData = node.data | ||||
|         } | ||||
|         assertTrue(previousData == rangeRadius) | ||||
|     } | ||||
| } | ||||
| @@ -0,0 +1,118 @@ | ||||
| package dev.inmo.micro_utils.coroutines | ||||
|  | ||||
| import dev.inmo.micro_utils.coroutines.collections.* | ||||
| import kotlinx.coroutines.test.runTest | ||||
| import kotlin.test.Test | ||||
| import kotlin.test.assertEquals | ||||
| import kotlin.test.assertTrue | ||||
| import kotlin.time.Duration.Companion.seconds | ||||
|  | ||||
| class SortedMapLikeBinaryTreeNodeTests { | ||||
|     @Test | ||||
|     fun insertOnZeroLevelWorks() = runTest { | ||||
|         val zeroNode = SortedMapLikeBinaryTreeNode(0, 0) | ||||
|         zeroNode.upsertSubNode(1, 1) | ||||
|         zeroNode.upsertSubNode(-1, -1) | ||||
|  | ||||
|         assertEquals(0, zeroNode.key) | ||||
|         assertEquals(1, zeroNode.getRightNode() ?.key) | ||||
|         assertEquals(-1, zeroNode.getLeftNode() ?.key) | ||||
|  | ||||
|         assertEquals(0, zeroNode.findNode(0) ?.value) | ||||
|         assertEquals(1, zeroNode.findNode(1) ?.value) | ||||
|         assertEquals(-1, zeroNode.findNode(-1) ?.value) | ||||
|     } | ||||
|     @Test | ||||
|     fun searchOnZeroLevelWorks() = runTest { | ||||
|         val zeroNode = SortedMapLikeBinaryTreeNode(0, 0) | ||||
|         val oneNode = zeroNode.upsertSubNode(1, 1) | ||||
|         val minusOneNode = zeroNode.upsertSubNode(-1, -1) | ||||
|  | ||||
|         val assertingNodesToSearchQuery = mapOf( | ||||
|             setOf(oneNode) to (1 .. 1), | ||||
|             setOf(zeroNode, oneNode) to (0 .. 1), | ||||
|             setOf(minusOneNode, zeroNode, oneNode) to (-1 .. 1), | ||||
|             setOf(minusOneNode, zeroNode) to (-1 .. 0), | ||||
|             setOf(minusOneNode) to (-1 .. -1), | ||||
|             setOf(zeroNode) to (0 .. 0), | ||||
|         ) | ||||
|  | ||||
|         assertingNodesToSearchQuery.forEach { | ||||
|             val foundData = zeroNode.findNodesInRange(it.value) | ||||
|             assertTrue(foundData.containsAll(it.key)) | ||||
|             assertTrue(it.key.containsAll(foundData)) | ||||
|         } | ||||
|     } | ||||
|     @Test | ||||
|     fun deepReInsertOnWorks() = runTest(timeout = 300.seconds) { | ||||
|         var zeroNode = SortedMapLikeBinaryTreeNode(0, 0) | ||||
|         val rangeRadius = 500 | ||||
|         val nodes = mutableMapOf<Int, SortedMapLikeBinaryTreeNode<Int, Int>>() | ||||
|         for (i in -rangeRadius .. rangeRadius) { | ||||
|             nodes[i] = zeroNode.upsertSubNode(i, i) | ||||
|             if (i == zeroNode.key) { | ||||
|                 zeroNode = nodes.getValue(i) | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         for (i in -rangeRadius .. rangeRadius) { | ||||
|             val expectedNode = nodes.getValue(i) | ||||
|             val foundNode = zeroNode.findNode(i) | ||||
|  | ||||
|             assertEquals(expectedNode, foundNode) | ||||
|  | ||||
|             if (expectedNode === zeroNode) continue | ||||
|  | ||||
|             val parentNode = zeroNode.findParentNode(i) | ||||
|             assertTrue( | ||||
|                 parentNode ?.getLeftNode() === expectedNode || parentNode ?.getRightNode() === expectedNode, | ||||
|                 "It is expected, that parent node with data ${parentNode ?.key} will be parent of ${expectedNode.key}, but its left subnode is ${parentNode ?.getLeftNode() ?.key} and right one is ${parentNode ?.getRightNode() ?.key}" | ||||
|             ) | ||||
|             assertTrue( | ||||
|                 foundNode != null && expectedNode.deepEquals(foundNode) | ||||
|             ) | ||||
|  | ||||
|             zeroNode.upsertSubNode(i, -i) | ||||
|             val foundModifiedNode = zeroNode.findNode(i) | ||||
|             assertEquals(foundNode ?.value, foundModifiedNode ?.value ?.times(-1)) | ||||
|         } | ||||
|     } | ||||
|     @Test | ||||
|     fun deepInsertOnWorks() = runTest(timeout = 240.seconds) { | ||||
|         val zeroNode = SortedMapLikeBinaryTreeNode(0, 0) | ||||
|         val rangeRadius = 500 | ||||
|         val nodes = mutableMapOf<Int, SortedMapLikeBinaryTreeNode<Int, Int>>() | ||||
|         for (i in -rangeRadius .. rangeRadius) { | ||||
|             if (zeroNode.key != i) { | ||||
|                 nodes[i] = zeroNode.upsertSubNode(i, i) | ||||
|             } | ||||
|         } | ||||
|         nodes[zeroNode.key] = zeroNode | ||||
|  | ||||
|         for (i in -rangeRadius .. rangeRadius) { | ||||
|             val expectedNode = nodes.getValue(i) | ||||
|             val foundNode = zeroNode.findNode(i) | ||||
|  | ||||
|             assertTrue(expectedNode === foundNode) | ||||
|  | ||||
|             if (expectedNode === zeroNode) continue | ||||
|  | ||||
|             val parentNode = zeroNode.findParentNode(i) | ||||
|             assertTrue( | ||||
|                 parentNode ?.getLeftNode() === expectedNode || parentNode ?.getRightNode() === expectedNode, | ||||
|                 "It is expected, that parent node with data ${parentNode ?.key} will be parent of ${expectedNode.key}, but its left subnode is ${parentNode ?.getLeftNode() ?.key} and right one is ${parentNode ?.getRightNode() ?.key}" | ||||
|             ) | ||||
|         } | ||||
|  | ||||
|         val sourceTreeSize = zeroNode.size() | ||||
|  | ||||
|         var previousData = -rangeRadius - 1 | ||||
|         for (node in zeroNode) { | ||||
|             assertTrue(nodes[node.key] === node) | ||||
|             assertTrue(previousData == node.key - 1) | ||||
|             previousData = node.key | ||||
|         } | ||||
|  | ||||
|         assertTrue(sourceTreeSize == zeroNode.size()) | ||||
|     } | ||||
| } | ||||
| @@ -1,40 +0,0 @@ | ||||
| package dev.inmo.micro_utils.coroutines | ||||
|  | ||||
| import kotlinx.coroutines.* | ||||
| import org.junit.Test | ||||
|  | ||||
| class WeakJob { | ||||
|     @Test | ||||
|     fun `test that weak jobs works correctly`() { | ||||
|         val scope = CoroutineScope(Dispatchers.Default) | ||||
|         lateinit var weakLaunchJob: Job | ||||
|         lateinit var weakAsyncJob: Job | ||||
|         scope.launchSynchronously { | ||||
|             val completeDeferred = Job() | ||||
|             coroutineScope { | ||||
|                 weakLaunchJob = weakLaunch { | ||||
|                     while (isActive) { | ||||
|                         delay(100L) | ||||
|                     } | ||||
|                 } | ||||
|                 weakAsyncJob = weakAsync { | ||||
|                     while (isActive) { | ||||
|                         delay(100L) | ||||
|                     } | ||||
|                 } | ||||
|  | ||||
|                 coroutineContext.job.invokeOnCompletion { | ||||
|                     scope.launch { | ||||
|                         delay(1000L) | ||||
|                         completeDeferred.complete() | ||||
|                     } | ||||
|                 } | ||||
|                 launch { delay(1000L); cancel() } | ||||
|             } | ||||
|             completeDeferred.join() | ||||
|         } | ||||
|  | ||||
|         assert(!weakLaunchJob.isActive) | ||||
|         assert(!weakAsyncJob.isActive) | ||||
|     } | ||||
| } | ||||
| @@ -4,7 +4,7 @@ plugins { | ||||
|     id "com.android.library" | ||||
| } | ||||
|  | ||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" | ||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||
|  | ||||
| kotlin { | ||||
|     sourceSets { | ||||
|   | ||||
| @@ -130,4 +130,4 @@ tasks.dokkaHtml { | ||||
|     } | ||||
| } | ||||
|  | ||||
| apply from: "$defaultAndroidSettingsPresetPath" | ||||
| apply from: "$defaultAndroidSettings" | ||||
|   | ||||
| @@ -1,6 +1,14 @@ | ||||
| allprojects { | ||||
|     ext { | ||||
|         projectByName = { name -> | ||||
| File templatesFolder = new File("$rootProject.projectDir.absolutePath${File.separatorChar}gradle${File.separatorChar}templates") | ||||
|  | ||||
| Map properties = new HashMap<String, String>() | ||||
|  | ||||
| if (templatesFolder.exists() && templatesFolder.isDirectory()) { | ||||
|     templatesFolder.listFiles().each { | ||||
|         properties[it.name - ".gradle"] = it.absolutePath | ||||
|     } | ||||
| } | ||||
|  | ||||
| properties["projectByName"] = { name -> | ||||
|     for (subproject in rootProject.subprojects) { | ||||
|         if (subproject.name == name) { | ||||
|             return subproject | ||||
| @@ -9,34 +17,16 @@ allprojects { | ||||
|     return null | ||||
| } | ||||
|  | ||||
|         internalProject = { name -> | ||||
| //            if (releaseMode) { | ||||
| //                "$group:$name:$version" | ||||
| //            } else { | ||||
| //                projectByName("$name") | ||||
| //            } | ||||
| properties["internalProject"] = { name -> | ||||
|     projectByName("$name") | ||||
| } | ||||
|  | ||||
| allprojects { | ||||
|     ext { | ||||
|         releaseMode = (project.hasProperty('RELEASE_MODE') && project.property('RELEASE_MODE') == "true") || System.getenv('RELEASE_MODE') == "true" | ||||
| //        String compilerPluginVersionFromProperties = (String) project.properties["compose.kotlinCompilerPluginVersion"] | ||||
| //        String compilerPluginVersionFromLibrariesVersions = libs.versions.compose.kotlin.get() | ||||
| //        composePluginKotlinVersion = compilerPluginVersionFromProperties | ||||
| //        if (compilerPluginVersionFromProperties == null) { | ||||
| //            composePluginKotlinVersion = compilerPluginVersionFromLibrariesVersions | ||||
| //        } | ||||
|  | ||||
|         mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsAndroidProject.gradle" | ||||
|         mppProjectWithSerializationAndComposePresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerializationAndCompose.gradle" | ||||
|         mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle" | ||||
|         mppJvmJsLinuxMingwProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwProject.gradle" | ||||
|         mppJvmJsLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsLinuxMingwLinuxArm64Project.gradle" | ||||
|         mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJvmJsAndroidLinuxMingwLinuxArm64Project.gradle" | ||||
|         mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle" | ||||
|  | ||||
|         defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle" | ||||
|  | ||||
|         publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle" | ||||
|         publishJvmOnlyPath = "${rootProject.projectDir.absolutePath}/jvm.publish.gradle" | ||||
|         properties.forEach { k, v -> | ||||
|             it[k] = v | ||||
|         } | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -4,7 +4,7 @@ plugins { | ||||
|     id "com.android.library" | ||||
| } | ||||
|  | ||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" | ||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||
|  | ||||
| kotlin { | ||||
|     sourceSets { | ||||
| @@ -12,6 +12,7 @@ kotlin { | ||||
|             dependencies { | ||||
|                 api project(":micro_utils.common") | ||||
|                 api project(":micro_utils.coroutines") | ||||
|                 api libs.kslog | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|   | ||||
| @@ -1,7 +1,8 @@ | ||||
| package dev.inmo.micro_utils.fsm.common | ||||
|  | ||||
| import dev.inmo.kslog.common.TagLogger | ||||
| import dev.inmo.kslog.common.e | ||||
| import dev.inmo.micro_utils.common.Optional | ||||
| import dev.inmo.micro_utils.common.onPresented | ||||
| import dev.inmo.micro_utils.coroutines.* | ||||
| import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler | ||||
| import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler | ||||
| @@ -69,6 +70,7 @@ open class DefaultStatesMachine <T: State>( | ||||
|     protected val handlers: List<CheckableHandlerHolder<in T, T>>, | ||||
|     protected val onStateHandlingErrorHandler: StateHandlingErrorHandler<T> = defaultStateHandlingErrorHandler() | ||||
| ) : StatesMachine<T> { | ||||
|     protected val logger = TagLogger(this::class.simpleName!!) | ||||
|     /** | ||||
|      * Will call [launchStateHandling] for state handling | ||||
|      */ | ||||
| @@ -97,7 +99,13 @@ open class DefaultStatesMachine <T: State>( | ||||
|         statesJobsMutex.withLock { | ||||
|             statesJobs[actualState] ?.cancel() | ||||
|             statesJobs[actualState] = scope.launch { | ||||
|                 runCatching { | ||||
|                     performUpdate(actualState) | ||||
|                 }.onFailure { | ||||
|                     logger.e(it) { | ||||
|                         "Unable to perform update of state from $actualState" | ||||
|                     } | ||||
|                 }.getOrThrow() | ||||
|             }.also { job -> | ||||
|                 job.invokeOnCompletion { _ -> | ||||
|                     scope.launch { | ||||
| @@ -118,15 +126,19 @@ open class DefaultStatesMachine <T: State>( | ||||
|      * [launchStateHandling] will returns some [State] then [statesManager] [StatesManager.update] will be used, otherwise | ||||
|      * [StatesManager.endChain]. | ||||
|      */ | ||||
|     override fun start(scope: CoroutineScope): Job = scope.launchSafelyWithoutExceptions { | ||||
|         (statesManager.getActiveStates().asFlow() + statesManager.onStartChain).subscribeSafelyWithoutExceptions(this) { | ||||
|             launch { performStateUpdate(Optional.absent(), it, scope.LinkedSupervisorScope()) } | ||||
|     override fun start(scope: CoroutineScope): Job { | ||||
|         val supervisorScope = scope.LinkedSupervisorScope() | ||||
|         supervisorScope.launchLoggingDropExceptions { | ||||
|             (statesManager.getActiveStates().asFlow() + statesManager.onStartChain).subscribeSafelyWithoutExceptions( | ||||
|                 supervisorScope | ||||
|             ) { | ||||
|                 supervisorScope.launch { performStateUpdate(Optional.absent(), it, supervisorScope) } | ||||
|             } | ||||
|         statesManager.onChainStateUpdated.subscribeSafelyWithoutExceptions(this) { | ||||
|             launch { performStateUpdate(Optional.presented(it.first), it.second, scope.LinkedSupervisorScope()) } | ||||
|             statesManager.onChainStateUpdated.subscribeSafelyWithoutExceptions(supervisorScope) { | ||||
|                 supervisorScope.launch { performStateUpdate(Optional.presented(it.first), it.second, supervisorScope) } | ||||
|             } | ||||
|         statesManager.onEndChain.subscribeSafelyWithoutExceptions(this) { removedState -> | ||||
|             launch { | ||||
|             statesManager.onEndChain.subscribeSafelyWithoutExceptions(supervisorScope) { removedState -> | ||||
|                 supervisorScope.launch { | ||||
|                     statesJobsMutex.withLock { | ||||
|                         val stateInMap = statesJobs.keys.firstOrNull { stateInMap -> stateInMap == removedState } | ||||
|                         if (stateInMap === removedState) { | ||||
| @@ -137,6 +149,9 @@ open class DefaultStatesMachine <T: State>( | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         return supervisorScope.coroutineContext.job | ||||
|     } | ||||
|  | ||||
|     /** | ||||
|      * Just calls [StatesManager.startChain] of [statesManager] | ||||
|      */ | ||||
|   | ||||
| @@ -9,7 +9,12 @@ interface StatesManager<T : State> { | ||||
|  | ||||
|  | ||||
|     /** | ||||
|      * Must set current set using [State.context] | ||||
|      * It is expected, that [new] state will be saved in manager. | ||||
|      * | ||||
|      * If [new] context will not be equal to [old] one, it must do some check of availability for replacement | ||||
|      * of potentially exists state on [new] context. If this state can't be replaced, it will throw [IllegalStateException] | ||||
|      * | ||||
|      * @throws IllegalStateException - in case when [new] [State] can't be set | ||||
|      */ | ||||
|     suspend fun update(old: T, new: T) | ||||
|  | ||||
|   | ||||
| @@ -1,5 +1,6 @@ | ||||
| package dev.inmo.micro_utils.fsm.common | ||||
|  | ||||
| import dev.inmo.kslog.common.e | ||||
| import dev.inmo.micro_utils.common.* | ||||
| import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler | ||||
| import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler | ||||
| @@ -44,7 +45,13 @@ open class DefaultUpdatableStatesMachine<T : State>( | ||||
|             val job = previousState.mapOnPresented { | ||||
|                 statesJobs.remove(it) | ||||
|             } ?.takeIf { it.isActive } ?: scope.launch { | ||||
|                 runCatching { | ||||
|                     performUpdate(actualState) | ||||
|                 }.onFailure { | ||||
|                     logger.e(it) { | ||||
|                         "Unable to perform update of state up to $actualState" | ||||
|                     } | ||||
|                 }.getOrThrow() | ||||
|             }.also { job -> | ||||
|                 job.invokeOnCompletion { _ -> | ||||
|                     scope.launch { | ||||
|   | ||||
| @@ -1,10 +1,11 @@ | ||||
| package dev.inmo.micro_utils.fsm.common.managers | ||||
|  | ||||
| import dev.inmo.micro_utils.coroutines.SmartRWLocker | ||||
| import dev.inmo.micro_utils.coroutines.withReadAcquire | ||||
| import dev.inmo.micro_utils.coroutines.withWriteLock | ||||
| import dev.inmo.micro_utils.fsm.common.State | ||||
| import dev.inmo.micro_utils.fsm.common.StatesManager | ||||
| import kotlinx.coroutines.flow.* | ||||
| import kotlinx.coroutines.sync.Mutex | ||||
| import kotlinx.coroutines.sync.withLock | ||||
|  | ||||
| /** | ||||
|  * Implement this repo if you want to use some custom repo for [DefaultStatesManager] | ||||
| @@ -19,6 +20,14 @@ interface DefaultStatesManagerRepo<T : State> { | ||||
|      * NOT be removed | ||||
|      */ | ||||
|     suspend fun removeState(state: T) | ||||
|  | ||||
|     /** | ||||
|      * Semantically, calls [removeState] and then [set] | ||||
|      */ | ||||
|     suspend fun removeAndSet(toRemove: T, toSet: T) { | ||||
|         removeState(toRemove) | ||||
|         set(toSet) | ||||
|     } | ||||
|     /** | ||||
|      * @return Current list of available and saved states | ||||
|      */ | ||||
| @@ -58,7 +67,7 @@ open class DefaultStatesManager<T : State>( | ||||
|     protected val _onEndChain = MutableSharedFlow<T>(0) | ||||
|     override val onEndChain: Flow<T> = _onEndChain.asSharedFlow() | ||||
|  | ||||
|     protected val mapMutex = Mutex() | ||||
|     protected val internalLocker = SmartRWLocker() | ||||
|  | ||||
|     constructor( | ||||
|         repo: DefaultStatesManagerRepo<T>, | ||||
| @@ -68,28 +77,30 @@ open class DefaultStatesManager<T : State>( | ||||
|         onUpdateContextsConflictResolver = onContextsConflictResolver | ||||
|     ) | ||||
|  | ||||
|     override suspend fun update(old: T, new: T) = mapMutex.withLock { | ||||
|     override suspend fun update(old: T, new: T) = internalLocker.withWriteLock { | ||||
|         val stateByOldContext: T? = repo.getContextState(old.context) | ||||
|         when { | ||||
|             stateByOldContext != old -> return@withLock | ||||
|             stateByOldContext == null || old.context == new.context -> { | ||||
|                 repo.removeState(old) | ||||
|                 repo.set(new) | ||||
|             stateByOldContext != old -> return@withWriteLock | ||||
|             old.context == new.context -> { | ||||
|                 repo.removeAndSet(old, new) | ||||
|                 _onChainStateUpdated.emit(old to new) | ||||
|             } | ||||
|             else -> { | ||||
|             old.context != new.context -> { | ||||
|                 val stateOnNewOneContext = repo.getContextState(new.context) | ||||
|                 if (stateOnNewOneContext == null || onUpdateContextsConflictResolver(old, new, stateOnNewOneContext)) { | ||||
|                     stateOnNewOneContext ?.let { endChainWithoutLock(it) } | ||||
|                     repo.removeState(old) | ||||
|                     repo.set(new) | ||||
|                     repo.removeAndSet(old, new) | ||||
|                     _onChainStateUpdated.emit(old to new) | ||||
|                 } else { | ||||
|                     error( | ||||
|                         "Unable to update state from $old to $new due to false answer from $onUpdateContextsConflictResolver and state on old context $stateOnNewOneContext" | ||||
|                     ) | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     override suspend fun startChain(state: T) = mapMutex.withLock { | ||||
|     override suspend fun startChain(state: T) = internalLocker.withWriteLock { | ||||
|         val stateOnContext = repo.getContextState(state.context) | ||||
|         if (stateOnContext == null || onStartContextsConflictResolver(stateOnContext, state)) { | ||||
|             stateOnContext ?.let { | ||||
| @@ -108,11 +119,13 @@ open class DefaultStatesManager<T : State>( | ||||
|     } | ||||
|  | ||||
|     override suspend fun endChain(state: T) { | ||||
|         mapMutex.withLock { | ||||
|         internalLocker.withWriteLock { | ||||
|             endChainWithoutLock(state) | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     override suspend fun getActiveStates(): List<T> = repo.getStates() | ||||
|     override suspend fun getActiveStates(): List<T> = internalLocker.withReadAcquire { | ||||
|         repo.getStates() | ||||
|     } | ||||
|  | ||||
| } | ||||
|   | ||||
| @@ -4,7 +4,7 @@ plugins { | ||||
|     id "com.android.library" | ||||
| } | ||||
|  | ||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64ProjectPresetPath" | ||||
| apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project" | ||||
|  | ||||
| kotlin { | ||||
|     sourceSets { | ||||
|   | ||||
| @@ -1,25 +1,59 @@ | ||||
| package dev.inmo.micro_utils.fsm.repos.common | ||||
|  | ||||
| import dev.inmo.kslog.common.TagLogger | ||||
| import dev.inmo.kslog.common.i | ||||
| import dev.inmo.micro_utils.coroutines.SmartRWLocker | ||||
| import dev.inmo.micro_utils.coroutines.withReadAcquire | ||||
| import dev.inmo.micro_utils.coroutines.withWriteLock | ||||
| import dev.inmo.micro_utils.fsm.common.State | ||||
| import dev.inmo.micro_utils.fsm.common.managers.DefaultStatesManagerRepo | ||||
| import dev.inmo.micro_utils.repos.* | ||||
| import dev.inmo.micro_utils.repos.pagination.getAll | ||||
| import dev.inmo.micro_utils.repos.unset | ||||
|  | ||||
| class KeyValueBasedDefaultStatesManagerRepo<T : State>( | ||||
|     private val keyValueRepo: KeyValueRepo<Any, T> | ||||
| ) : DefaultStatesManagerRepo<T> { | ||||
|     private val locker = SmartRWLocker() | ||||
|     private val logger = TagLogger("KeyValueBasedDefaultStatesManagerRepo") | ||||
|     override suspend fun set(state: T) { | ||||
|         locker.withWriteLock { | ||||
|             keyValueRepo.set(state.context, state) | ||||
|             logger.i { "Set ${state.context} value to $state" } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     override suspend fun removeState(state: T) { | ||||
|         locker.withWriteLock { | ||||
|             if (keyValueRepo.get(state.context) == state) { | ||||
|                 keyValueRepo.unset(state.context) | ||||
|                 logger.i { "Unset $state" } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     override suspend fun getStates(): List<T> = keyValueRepo.getAll { keys(it) }.map { it.second } | ||||
|     override suspend fun getContextState(context: Any): T? = keyValueRepo.get(context) | ||||
|  | ||||
|     override suspend fun contains(context: Any): Boolean = keyValueRepo.contains(context) | ||||
|     override suspend fun removeAndSet(toRemove: T, toSet: T) { | ||||
|         locker.withWriteLock { | ||||
|             when { | ||||
|                 toRemove.context == toSet.context -> { | ||||
|                     keyValueRepo.set(toSet.context, toSet) | ||||
|                 } | ||||
|                 else -> { | ||||
|                     keyValueRepo.set(toSet.context, toSet) | ||||
|                     keyValueRepo.unset(toRemove) | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     override suspend fun getStates(): List<T> = locker.withReadAcquire { | ||||
|         keyValueRepo.getAll { keys(it) }.map { it.second } | ||||
|     } | ||||
|     override suspend fun getContextState(context: Any): T? = locker.withReadAcquire { | ||||
|         keyValueRepo.get(context) | ||||
|     } | ||||
|  | ||||
|     override suspend fun contains(context: Any): Boolean = locker.withReadAcquire { | ||||
|         keyValueRepo.contains(context) | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -18,13 +18,13 @@ if (new File(projectDir, "secret.gradle").exists()) { | ||||
|     githubRelease { | ||||
|         token "${project.property('GITHUB_RELEASE_TOKEN')}" | ||||
|  | ||||
|         owner "InsanusMokrassar" | ||||
|         repo "MicroUtils" | ||||
|         owner = "InsanusMokrassar" | ||||
|         repo = "MicroUtils" | ||||
|  | ||||
|         tagName "v${project.version}" | ||||
|         releaseName "${project.version}" | ||||
|         targetCommitish "${project.version}" | ||||
|         tagName = "v${project.version}" | ||||
|         releaseName = "${project.version}" | ||||
|         targetCommitish = "${project.version}" | ||||
|  | ||||
|         body getCurrentVersionChangelog() | ||||
|         body = getCurrentVersionChangelog() | ||||
|     } | ||||
| } | ||||
|   | ||||
| @@ -15,5 +15,5 @@ crypto_js_version=4.1.1 | ||||
| # Project data | ||||
|  | ||||
| group=dev.inmo | ||||
| version=0.20.26 | ||||
| android_code_version=232 | ||||
| version=0.25.1 | ||||
| android_code_version=291 | ||||
|   | ||||
| @@ -1,45 +1,46 @@ | ||||
| [versions] | ||||
|  | ||||
| kt = "1.9.21" | ||||
| kt-serialization = "1.6.2" | ||||
| kt-coroutines = "1.7.3" | ||||
| kt = "2.1.10" | ||||
| kt-serialization = "1.8.0" | ||||
| kt-coroutines = "1.10.1" | ||||
|  | ||||
| kslog = "1.3.1" | ||||
| kslog = "1.4.1" | ||||
|  | ||||
| jb-compose = "1.5.11" | ||||
| jb-exposed = "0.46.0" | ||||
| jb-dokka = "1.9.10" | ||||
| jb-compose = "1.7.3" | ||||
| jb-exposed = "0.59.0" | ||||
| jb-dokka = "2.0.0" | ||||
|  | ||||
| korlibs = "5.3.0" | ||||
| uuid = "0.8.2" | ||||
| sqlite = "3.49.1.0" | ||||
|  | ||||
| ktor = "2.3.7" | ||||
| korlibs = "5.4.0" | ||||
| uuid = "0.8.4" | ||||
|  | ||||
| gh-release = "2.4.1" | ||||
| ktor = "3.1.1" | ||||
|  | ||||
| koin = "3.5.3" | ||||
| gh-release = "2.5.2" | ||||
|  | ||||
| okio = "3.7.0" | ||||
| koin = "4.0.2" | ||||
|  | ||||
| ksp = "1.9.21-1.0.16" | ||||
| kotlin-poet = "1.15.3" | ||||
| okio = "3.10.2" | ||||
|  | ||||
| versions = "0.50.0" | ||||
| ksp = "2.1.10-1.0.31" | ||||
| kotlin-poet = "1.18.1" | ||||
|  | ||||
| android-gradle = "8.2.1" | ||||
| versions = "0.51.0" | ||||
|  | ||||
| android-gradle = "8.7.+" | ||||
| dexcount = "4.0.0" | ||||
|  | ||||
| android-coreKtx = "1.12.0" | ||||
| android-recyclerView = "1.3.2" | ||||
| android-appCompat = "1.6.1" | ||||
| android-fragment = "1.6.2" | ||||
| android-espresso = "3.5.1" | ||||
| android-test = "1.1.5" | ||||
| android-compose-material3 = "1.1.2" | ||||
| android-coreKtx = "1.15.0" | ||||
| android-recyclerView = "1.4.0" | ||||
| android-appCompat = "1.7.0" | ||||
| android-fragment = "1.8.6" | ||||
| android-espresso = "3.6.1" | ||||
| android-test = "1.2.1" | ||||
|  | ||||
| android-props-minSdk = "21" | ||||
| android-props-compileSdk = "34" | ||||
| android-props-buildTools = "34.0.0" | ||||
| android-props-compileSdk = "35" | ||||
| android-props-buildTools = "35.0.0" | ||||
|  | ||||
| [libraries] | ||||
|  | ||||
| @@ -52,6 +53,7 @@ kt-serialization-cbor = { module = "org.jetbrains.kotlinx:kotlinx-serialization- | ||||
| kt-coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kt-coroutines" } | ||||
| kt-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kt-coroutines" } | ||||
| kt-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kt-coroutines" } | ||||
| kt-coroutines-debug = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-debug", version.ref = "kt-coroutines" } | ||||
|  | ||||
|  | ||||
| ktor-io = { module = "io.ktor:ktor-io", version.ref = "ktor" } | ||||
| @@ -79,12 +81,14 @@ koin = { module = "io.insert-koin:koin-core", version.ref = "koin" } | ||||
|  | ||||
|  | ||||
| jb-exposed = { module = "org.jetbrains.exposed:exposed-core", version.ref = "jb-exposed" } | ||||
| jb-exposed-jdbc = { module = "org.jetbrains.exposed:exposed-jdbc", version.ref = "jb-exposed" } | ||||
| sqlite = { module = "org.xerial:sqlite-jdbc", version.ref = "sqlite" } | ||||
|  | ||||
| jb-compose-material3 = { module = "org.jetbrains.compose.material3:material3", version.ref = "jb-compose" } | ||||
|  | ||||
| android-coreKtx = { module = "androidx.core:core-ktx", version.ref = "android-coreKtx" } | ||||
| android-recyclerView = { module = "androidx.recyclerview:recyclerview", version.ref = "android-recyclerView" } | ||||
| android-appCompat-resources = { module = "androidx.appcompat:appcompat-resources", version.ref = "android-appCompat" } | ||||
| android-compose-material3 = { module = "androidx.compose.material3:material3", version.ref = "android-compose-material3" } | ||||
| android-fragment = { module = "androidx.fragment:fragment", version.ref = "android-fragment" } | ||||
| android-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "android-espresso" } | ||||
| android-test-junit = { module = "androidx.test.ext:junit", version.ref = "android-test" } | ||||
| @@ -113,5 +117,6 @@ buildscript-android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gra | ||||
| [plugins] | ||||
|  | ||||
| jb-compose = { id = "org.jetbrains.compose", version.ref = "jb-compose" } | ||||
| kt-jb-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kt" } | ||||
|  | ||||
| versions = { id = "com.github.ben-manes.versions", version.ref = "versions" } | ||||
|   | ||||
| @@ -6,6 +6,7 @@ android { | ||||
| 
 | ||||
|     defaultConfig { | ||||
|         minSdkVersion libs.versions.android.props.minSdk.get().toInteger() | ||||
|         compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger() | ||||
|         targetSdkVersion libs.versions.android.props.compileSdk.get().toInteger() | ||||
|         versionCode "${android_code_version}".toInteger() | ||||
|         versionName "$version" | ||||
| @@ -1,7 +1,7 @@ | ||||
| project.version = "$version" | ||||
| project.group = "$group" | ||||
| 
 | ||||
| apply from: "$publishGradlePath" | ||||
| apply from: "$publish" | ||||
| 
 | ||||
| kotlin { | ||||
|     androidTarget { | ||||
| @@ -29,7 +29,7 @@ kotlin { | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| apply from: "$defaultAndroidSettingsPresetPath" | ||||
| apply from: "$defaultAndroidSettings" | ||||
| 
 | ||||
| java { | ||||
|     sourceCompatibility = JavaVersion.VERSION_17 | ||||
| @@ -0,0 +1,108 @@ | ||||
| project.version = "$version" | ||||
| project.group = "$group" | ||||
|  | ||||
| apply from: "$publish" | ||||
|  | ||||
| kotlin { | ||||
|     jvm { | ||||
|         compilations.main { | ||||
|             kotlinOptions { | ||||
|                 jvmTarget = "17" | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|     js (IR) { | ||||
|         browser { | ||||
|             testTask { | ||||
|                 useMocha { | ||||
|                     timeout = "240000" | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|         nodejs { | ||||
|             testTask { | ||||
|                 useMocha { | ||||
|                     timeout = "240000" | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|     androidTarget { | ||||
|         publishAllLibraryVariants() | ||||
|         compilations.all { | ||||
|             kotlinOptions { | ||||
|                 jvmTarget = "17" | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|     linuxX64() | ||||
|     mingwX64() | ||||
|     linuxArm64() | ||||
|  | ||||
|     sourceSets { | ||||
|         commonMain { | ||||
|             dependencies { | ||||
|                 implementation kotlin('stdlib') | ||||
|                 implementation compose.runtime | ||||
|                 api libs.kt.serialization | ||||
|             } | ||||
|         } | ||||
|         commonTest { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-common') | ||||
|                 implementation kotlin('test-annotations-common') | ||||
|                 implementation libs.kt.coroutines.test | ||||
|             } | ||||
|         } | ||||
|  | ||||
|         androidUnitTest { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-junit') | ||||
|                 implementation libs.android.test.junit | ||||
|                 implementation libs.android.espresso | ||||
|                 implementation compose.uiTest | ||||
|             } | ||||
|         } | ||||
|         androidInstrumentedTest { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-junit') | ||||
|                 implementation libs.android.test.junit | ||||
|                 implementation libs.android.espresso | ||||
|             } | ||||
|         } | ||||
|         jvmMain { | ||||
|             dependencies { | ||||
|                 implementation compose.desktop.currentOs | ||||
|             } | ||||
|         } | ||||
|         jvmTest { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-junit') | ||||
|                 implementation compose.uiTest | ||||
|             } | ||||
|         } | ||||
|         jsMain { | ||||
|             dependencies { | ||||
|                 implementation compose.web.core | ||||
|             } | ||||
|         } | ||||
|         jsTest { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-js') | ||||
|             } | ||||
|         } | ||||
|         nativeMain.dependsOn commonMain | ||||
|         linuxX64Main.dependsOn nativeMain | ||||
|         mingwX64Main.dependsOn nativeMain | ||||
|         linuxArm64Main.dependsOn nativeMain | ||||
|  | ||||
|         androidMain.dependsOn jvmMain | ||||
|     } | ||||
| } | ||||
|  | ||||
| apply from: "$defaultAndroidSettings" | ||||
|  | ||||
| java { | ||||
|     sourceCompatibility = JavaVersion.VERSION_17 | ||||
|     targetCompatibility = JavaVersion.VERSION_17 | ||||
| } | ||||
| @@ -1,7 +1,7 @@ | ||||
| project.version = "$version" | ||||
| project.group = "$group" | ||||
| 
 | ||||
| apply from: "$publishGradlePath" | ||||
| apply from: "$publish" | ||||
| 
 | ||||
| kotlin { | ||||
|     jvm { | ||||
| @@ -1,7 +1,7 @@ | ||||
| project.version = "$version" | ||||
| project.group = "$group" | ||||
| 
 | ||||
| apply from: "$publishGradlePath" | ||||
| apply from: "$publish" | ||||
| 
 | ||||
| kotlin { | ||||
|     jvm { | ||||
| @@ -12,8 +12,20 @@ kotlin { | ||||
|         } | ||||
|     } | ||||
|     js (IR) { | ||||
|         browser() | ||||
|         nodejs() | ||||
|         browser { | ||||
|             testTask { | ||||
|                 useMocha { | ||||
|                     timeout = "240000" | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|         nodejs { | ||||
|             testTask { | ||||
|                 useMocha { | ||||
|                     timeout = "240000" | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|     androidTarget { | ||||
|         publishAllLibraryVariants() | ||||
| @@ -25,6 +37,7 @@ kotlin { | ||||
|     } | ||||
|     linuxX64() | ||||
|     mingwX64() | ||||
|     linuxArm64() | ||||
| 
 | ||||
|     sourceSets { | ||||
|         commonMain { | ||||
| @@ -35,11 +48,19 @@ kotlin { | ||||
|         } | ||||
|         commonTest { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-common') | ||||
|                 implementation kotlin('test') | ||||
|                 implementation kotlin('test-annotations-common') | ||||
|                 implementation libs.kt.coroutines.test | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|         androidUnitTest { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-junit') | ||||
|                 implementation libs.android.test.junit | ||||
|                 implementation libs.android.espresso | ||||
|             } | ||||
|         } | ||||
|         jvmTest { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-junit') | ||||
| @@ -48,32 +69,18 @@ kotlin { | ||||
|         jsTest { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-js') | ||||
|                 implementation kotlin('test-junit') | ||||
|             } | ||||
|         } | ||||
|         androidUnitTest { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-junit') | ||||
|                 implementation libs.android.test.junit | ||||
|                 implementation libs.android.espresso | ||||
|             } | ||||
|         } | ||||
|         mingwX64Test { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-junit') | ||||
|             } | ||||
|         } | ||||
|         linuxX64Test { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-junit') | ||||
|             } | ||||
|         } | ||||
|         nativeMain.dependsOn commonMain | ||||
|         linuxX64Main.dependsOn nativeMain | ||||
|         mingwX64Main.dependsOn nativeMain | ||||
|         linuxArm64Main.dependsOn nativeMain | ||||
| 
 | ||||
|         androidMain.dependsOn jvmMain | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| apply from: "$defaultAndroidSettingsPresetPath" | ||||
| apply from: "$defaultAndroidSettings" | ||||
| 
 | ||||
| java { | ||||
|     sourceCompatibility = JavaVersion.VERSION_17 | ||||
| @@ -1,7 +1,7 @@ | ||||
| project.version = "$version" | ||||
| project.group = "$group" | ||||
| 
 | ||||
| apply from: "$publishGradlePath" | ||||
| apply from: "$publish" | ||||
| 
 | ||||
| kotlin { | ||||
|     jvm { | ||||
| @@ -12,8 +12,20 @@ kotlin { | ||||
|         } | ||||
|     } | ||||
|     js (IR) { | ||||
|         browser() | ||||
|         nodejs() | ||||
|         browser { | ||||
|             testTask { | ||||
|                 useMocha { | ||||
|                     timeout = "240000" | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|         nodejs { | ||||
|             testTask { | ||||
|                 useMocha { | ||||
|                     timeout = "240000" | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|     linuxX64() | ||||
|     mingwX64() | ||||
| @@ -41,20 +53,13 @@ kotlin { | ||||
|         jsTest { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-js') | ||||
|                 implementation kotlin('test-junit') | ||||
|             } | ||||
|         } | ||||
|         mingwX64Test { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-junit') | ||||
|             } | ||||
|         } | ||||
|         linuxX64Test { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-junit') | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|         nativeMain.dependsOn commonMain | ||||
|         linuxX64Main.dependsOn nativeMain | ||||
|         mingwX64Main.dependsOn nativeMain | ||||
| 
 | ||||
|         androidMain.dependsOn jvmMain | ||||
|     } | ||||
| } | ||||
| @@ -1,7 +1,7 @@ | ||||
| project.version = "$version" | ||||
| project.group = "$group" | ||||
| 
 | ||||
| apply from: "$publishGradlePath" | ||||
| apply from: "$publish" | ||||
| 
 | ||||
| kotlin { | ||||
|     jvm { | ||||
| @@ -12,8 +12,20 @@ kotlin { | ||||
|         } | ||||
|     } | ||||
|     js (IR) { | ||||
|         browser() | ||||
|         nodejs() | ||||
|         browser { | ||||
|             testTask { | ||||
|                 useMocha { | ||||
|                     timeout = "240000" | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|         nodejs { | ||||
|             testTask { | ||||
|                 useMocha { | ||||
|                     timeout = "240000" | ||||
|                 } | ||||
|             } | ||||
|         } | ||||
|     } | ||||
|     androidTarget { | ||||
|         publishAllLibraryVariants() | ||||
| @@ -28,8 +40,8 @@ kotlin { | ||||
|         commonMain { | ||||
|             dependencies { | ||||
|                 implementation kotlin('stdlib') | ||||
|                 api libs.kt.serialization | ||||
|                 implementation compose.runtime | ||||
|                 api libs.kt.serialization | ||||
|             } | ||||
|         } | ||||
|         commonTest { | ||||
| @@ -47,6 +59,7 @@ kotlin { | ||||
|         jvmTest { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-junit') | ||||
|                 implementation compose.uiTest | ||||
|             } | ||||
|         } | ||||
|         jsMain { | ||||
| @@ -57,7 +70,6 @@ kotlin { | ||||
|         jsTest { | ||||
|             dependencies { | ||||
|                 implementation kotlin('test-js') | ||||
|                 implementation kotlin('test-junit') | ||||
|             } | ||||
|         } | ||||
|         androidUnitTest { | ||||
| @@ -65,14 +77,13 @@ kotlin { | ||||
|                 implementation kotlin('test-junit') | ||||
|                 implementation libs.android.test.junit | ||||
|                 implementation libs.android.espresso | ||||
|                 implementation compose.uiTest | ||||
|             } | ||||
|         } | ||||
|     } | ||||
| } | ||||
| 
 | ||||
|         androidMain.dependsOn jvmMain | ||||
|     } | ||||
| } | ||||
| 
 | ||||
| apply from: "$defaultAndroidSettingsPresetPath" | ||||
| apply from: "$defaultAndroidSettings" | ||||
| 
 | ||||
| java { | ||||
|     sourceCompatibility = JavaVersion.VERSION_17 | ||||
| @@ -1,3 +1,7 @@ | ||||
| if (ext.getProperties()["do_publish"] == false) { | ||||
|     return | ||||
| } | ||||
| 
 | ||||
| apply plugin: 'maven-publish' | ||||
| 
 | ||||
| task javadocsJar(type: Jar) { | ||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user