mirror of
https://github.com/InsanusMokrassar/MicroUtils.git
synced 2026-04-07 10:02:51 +00:00
Compare commits
27 Commits
v0.24.1
...
74563bbac9
| Author | SHA1 | Date | |
|---|---|---|---|
| 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 |
40
CHANGELOG.md
40
CHANGELOG.md
@@ -1,5 +1,45 @@
|
||||
# Changelog
|
||||
|
||||
## 0.24.6
|
||||
|
||||
## 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`:
|
||||
|
||||
@@ -12,6 +12,7 @@ kotlin {
|
||||
dependencies {
|
||||
api project(":micro_utils.common")
|
||||
api project(":micro_utils.coroutines")
|
||||
api libs.kslog
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package dev.inmo.micro_utils.fsm.common
|
||||
|
||||
import dev.inmo.kslog.common.TagLogger
|
||||
import dev.inmo.kslog.common.e
|
||||
import dev.inmo.micro_utils.common.Optional
|
||||
import dev.inmo.micro_utils.coroutines.*
|
||||
import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler
|
||||
@@ -68,6 +70,7 @@ open class DefaultStatesMachine <T: State>(
|
||||
protected val handlers: List<CheckableHandlerHolder<in T, T>>,
|
||||
protected val onStateHandlingErrorHandler: StateHandlingErrorHandler<T> = defaultStateHandlingErrorHandler()
|
||||
) : StatesMachine<T> {
|
||||
protected val logger = TagLogger(this::class.simpleName!!)
|
||||
/**
|
||||
* Will call [launchStateHandling] for state handling
|
||||
*/
|
||||
@@ -96,7 +99,13 @@ open class DefaultStatesMachine <T: State>(
|
||||
statesJobsMutex.withLock {
|
||||
statesJobs[actualState] ?.cancel()
|
||||
statesJobs[actualState] = scope.launch {
|
||||
performUpdate(actualState)
|
||||
runCatching {
|
||||
performUpdate(actualState)
|
||||
}.onFailure {
|
||||
logger.e(it) {
|
||||
"Unable to perform update of state from $actualState"
|
||||
}
|
||||
}.getOrThrow()
|
||||
}.also { job ->
|
||||
job.invokeOnCompletion { _ ->
|
||||
scope.launch {
|
||||
|
||||
@@ -9,7 +9,12 @@ interface StatesManager<T : State> {
|
||||
|
||||
|
||||
/**
|
||||
* Must set current set using [State.context]
|
||||
* It is expected, that [new] state will be saved in manager.
|
||||
*
|
||||
* If [new] context will not be equal to [old] one, it must do some check of availability for replacement
|
||||
* of potentially exists state on [new] context. If this state can't be replaced, it will throw [IllegalStateException]
|
||||
*
|
||||
* @throws IllegalStateException - in case when [new] [State] can't be set
|
||||
*/
|
||||
suspend fun update(old: T, new: T)
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package dev.inmo.micro_utils.fsm.common
|
||||
|
||||
import dev.inmo.kslog.common.e
|
||||
import dev.inmo.micro_utils.common.*
|
||||
import dev.inmo.micro_utils.fsm.common.utils.StateHandlingErrorHandler
|
||||
import dev.inmo.micro_utils.fsm.common.utils.defaultStateHandlingErrorHandler
|
||||
@@ -44,7 +45,13 @@ open class DefaultUpdatableStatesMachine<T : State>(
|
||||
val job = previousState.mapOnPresented {
|
||||
statesJobs.remove(it)
|
||||
} ?.takeIf { it.isActive } ?: scope.launch {
|
||||
performUpdate(actualState)
|
||||
runCatching {
|
||||
performUpdate(actualState)
|
||||
}.onFailure {
|
||||
logger.e(it) {
|
||||
"Unable to perform update of state up to $actualState"
|
||||
}
|
||||
}.getOrThrow()
|
||||
}.also { job ->
|
||||
job.invokeOnCompletion { _ ->
|
||||
scope.launch {
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
package dev.inmo.micro_utils.fsm.common.managers
|
||||
|
||||
import dev.inmo.micro_utils.coroutines.SmartRWLocker
|
||||
import dev.inmo.micro_utils.coroutines.withReadAcquire
|
||||
import dev.inmo.micro_utils.coroutines.withWriteLock
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
import dev.inmo.micro_utils.fsm.common.StatesManager
|
||||
import kotlinx.coroutines.flow.*
|
||||
import kotlinx.coroutines.sync.Mutex
|
||||
import kotlinx.coroutines.sync.withLock
|
||||
|
||||
/**
|
||||
* Implement this repo if you want to use some custom repo for [DefaultStatesManager]
|
||||
@@ -19,6 +20,14 @@ interface DefaultStatesManagerRepo<T : State> {
|
||||
* NOT be removed
|
||||
*/
|
||||
suspend fun removeState(state: T)
|
||||
|
||||
/**
|
||||
* Semantically, calls [removeState] and then [set]
|
||||
*/
|
||||
suspend fun removeAndSet(toRemove: T, toSet: T) {
|
||||
removeState(toRemove)
|
||||
set(toSet)
|
||||
}
|
||||
/**
|
||||
* @return Current list of available and saved states
|
||||
*/
|
||||
@@ -58,7 +67,7 @@ open class DefaultStatesManager<T : State>(
|
||||
protected val _onEndChain = MutableSharedFlow<T>(0)
|
||||
override val onEndChain: Flow<T> = _onEndChain.asSharedFlow()
|
||||
|
||||
protected val mapMutex = Mutex()
|
||||
protected val internalLocker = SmartRWLocker()
|
||||
|
||||
constructor(
|
||||
repo: DefaultStatesManagerRepo<T>,
|
||||
@@ -68,28 +77,30 @@ open class DefaultStatesManager<T : State>(
|
||||
onUpdateContextsConflictResolver = onContextsConflictResolver
|
||||
)
|
||||
|
||||
override suspend fun update(old: T, new: T) = mapMutex.withLock {
|
||||
override suspend fun update(old: T, new: T) = internalLocker.withWriteLock {
|
||||
val stateByOldContext: T? = repo.getContextState(old.context)
|
||||
when {
|
||||
stateByOldContext != old -> return@withLock
|
||||
stateByOldContext == null || old.context == new.context -> {
|
||||
repo.removeState(old)
|
||||
repo.set(new)
|
||||
stateByOldContext != old -> return@withWriteLock
|
||||
old.context == new.context -> {
|
||||
repo.removeAndSet(old, new)
|
||||
_onChainStateUpdated.emit(old to new)
|
||||
}
|
||||
else -> {
|
||||
old.context != new.context -> {
|
||||
val stateOnNewOneContext = repo.getContextState(new.context)
|
||||
if (stateOnNewOneContext == null || onUpdateContextsConflictResolver(old, new, stateOnNewOneContext)) {
|
||||
stateOnNewOneContext ?.let { endChainWithoutLock(it) }
|
||||
repo.removeState(old)
|
||||
repo.set(new)
|
||||
repo.removeAndSet(old, new)
|
||||
_onChainStateUpdated.emit(old to new)
|
||||
} else {
|
||||
error(
|
||||
"Unable to update state from $old to $new due to false answer from $onUpdateContextsConflictResolver and state on old context $stateOnNewOneContext"
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun startChain(state: T) = mapMutex.withLock {
|
||||
override suspend fun startChain(state: T) = internalLocker.withWriteLock {
|
||||
val stateOnContext = repo.getContextState(state.context)
|
||||
if (stateOnContext == null || onStartContextsConflictResolver(stateOnContext, state)) {
|
||||
stateOnContext ?.let {
|
||||
@@ -108,11 +119,13 @@ open class DefaultStatesManager<T : State>(
|
||||
}
|
||||
|
||||
override suspend fun endChain(state: T) {
|
||||
mapMutex.withLock {
|
||||
internalLocker.withWriteLock {
|
||||
endChainWithoutLock(state)
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getActiveStates(): List<T> = repo.getStates()
|
||||
override suspend fun getActiveStates(): List<T> = internalLocker.withReadAcquire {
|
||||
repo.getStates()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,25 +1,59 @@
|
||||
package dev.inmo.micro_utils.fsm.repos.common
|
||||
|
||||
import dev.inmo.kslog.common.TagLogger
|
||||
import dev.inmo.kslog.common.i
|
||||
import dev.inmo.micro_utils.coroutines.SmartRWLocker
|
||||
import dev.inmo.micro_utils.coroutines.withReadAcquire
|
||||
import dev.inmo.micro_utils.coroutines.withWriteLock
|
||||
import dev.inmo.micro_utils.fsm.common.State
|
||||
import dev.inmo.micro_utils.fsm.common.managers.DefaultStatesManagerRepo
|
||||
import dev.inmo.micro_utils.repos.*
|
||||
import dev.inmo.micro_utils.repos.pagination.getAll
|
||||
import dev.inmo.micro_utils.repos.unset
|
||||
|
||||
class KeyValueBasedDefaultStatesManagerRepo<T : State>(
|
||||
private val keyValueRepo: KeyValueRepo<Any, T>
|
||||
) : DefaultStatesManagerRepo<T> {
|
||||
private val locker = SmartRWLocker()
|
||||
private val logger = TagLogger("KeyValueBasedDefaultStatesManagerRepo")
|
||||
override suspend fun set(state: T) {
|
||||
keyValueRepo.set(state.context, state)
|
||||
}
|
||||
|
||||
override suspend fun removeState(state: T) {
|
||||
if (keyValueRepo.get(state.context) == state) {
|
||||
keyValueRepo.unset(state.context)
|
||||
locker.withWriteLock {
|
||||
keyValueRepo.set(state.context, state)
|
||||
logger.i { "Set ${state.context} value to $state" }
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getStates(): List<T> = keyValueRepo.getAll { keys(it) }.map { it.second }
|
||||
override suspend fun getContextState(context: Any): T? = keyValueRepo.get(context)
|
||||
override suspend fun removeState(state: T) {
|
||||
locker.withWriteLock {
|
||||
if (keyValueRepo.get(state.context) == state) {
|
||||
keyValueRepo.unset(state.context)
|
||||
logger.i { "Unset $state" }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun contains(context: Any): Boolean = keyValueRepo.contains(context)
|
||||
override suspend fun removeAndSet(toRemove: T, toSet: T) {
|
||||
locker.withWriteLock {
|
||||
when {
|
||||
toRemove.context == toSet.context -> {
|
||||
keyValueRepo.set(toSet.context, toSet)
|
||||
}
|
||||
else -> {
|
||||
keyValueRepo.set(toSet.context, toSet)
|
||||
keyValueRepo.unset(toRemove)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override suspend fun getStates(): List<T> = locker.withReadAcquire {
|
||||
keyValueRepo.getAll { keys(it) }.map { it.second }
|
||||
}
|
||||
override suspend fun getContextState(context: Any): T? = locker.withReadAcquire {
|
||||
keyValueRepo.get(context)
|
||||
}
|
||||
|
||||
override suspend fun contains(context: Any): Boolean = locker.withReadAcquire {
|
||||
keyValueRepo.contains(context)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,5 +15,5 @@ crypto_js_version=4.1.1
|
||||
# Project data
|
||||
|
||||
group=dev.inmo
|
||||
version=0.24.0
|
||||
android_code_version=279
|
||||
version=0.24.6
|
||||
android_code_version=286
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
[versions]
|
||||
|
||||
kt = "2.1.0"
|
||||
kt-serialization = "1.7.3"
|
||||
kt = "2.1.10"
|
||||
kt-serialization = "1.8.0"
|
||||
kt-coroutines = "1.10.1"
|
||||
|
||||
kslog = "1.4.0"
|
||||
|
||||
jb-compose = "1.7.3"
|
||||
jb-exposed = "0.57.0"
|
||||
jb-exposed = "0.58.0"
|
||||
jb-dokka = "2.0.0"
|
||||
|
||||
sqlite = "3.47.1.0"
|
||||
sqlite = "3.48.0.0"
|
||||
|
||||
korlibs = "5.4.0"
|
||||
uuid = "0.8.4"
|
||||
@@ -19,11 +19,11 @@ ktor = "3.0.3"
|
||||
|
||||
gh-release = "2.5.2"
|
||||
|
||||
koin = "4.0.0"
|
||||
koin = "4.0.2"
|
||||
|
||||
okio = "3.9.1"
|
||||
okio = "3.10.2"
|
||||
|
||||
ksp = "2.1.0-1.0.29"
|
||||
ksp = "2.1.10-1.0.29"
|
||||
kotlin-poet = "1.18.1"
|
||||
|
||||
versions = "0.51.0"
|
||||
@@ -32,7 +32,7 @@ android-gradle = "8.2.2"
|
||||
dexcount = "4.0.0"
|
||||
|
||||
android-coreKtx = "1.15.0"
|
||||
android-recyclerView = "1.3.2"
|
||||
android-recyclerView = "1.4.0"
|
||||
android-appCompat = "1.7.0"
|
||||
android-fragment = "1.8.5"
|
||||
android-espresso = "3.6.1"
|
||||
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package dev.inmo.micro_ksp.generator
|
||||
|
||||
import com.google.devtools.ksp.symbol.KSClassDeclaration
|
||||
import com.google.devtools.ksp.symbol.KSDeclaration
|
||||
import com.google.devtools.ksp.symbol.KSFile
|
||||
import com.google.devtools.ksp.symbol.KSFunctionDeclaration
|
||||
import com.squareup.kotlinpoet.FileSpec
|
||||
import java.io.File
|
||||
|
||||
fun KSClassDeclaration.writeFile(
|
||||
fun KSDeclaration.writeFile(
|
||||
prefix: String = "",
|
||||
suffix: String = "",
|
||||
relatedPath: String = "",
|
||||
@@ -21,8 +23,9 @@ fun KSClassDeclaration.writeFile(
|
||||
"$prefix${simpleName.asString()}$suffix.kt"
|
||||
).takeIf { force || !it.exists() } ?.apply {
|
||||
parentFile.mkdirs()
|
||||
val fileSpec = fileSpecBuilder()
|
||||
writer().use { writer ->
|
||||
fileSpecBuilder().writeTo(writer)
|
||||
fileSpec.writeTo(writer)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -42,8 +45,9 @@ fun KSFile.writeFile(
|
||||
"$prefix${fileName.dropLastWhile { it != '.' }.removeSuffix(".")}$suffix.kt"
|
||||
).takeIf { force || !it.exists() } ?.apply {
|
||||
parentFile.mkdirs()
|
||||
val fileSpec = fileSpecBuilder()
|
||||
writer().use { writer ->
|
||||
fileSpecBuilder().writeTo(writer)
|
||||
fileSpec.writeTo(writer)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
25
ksp/generator/src/main/kotlin/KClassWorkarounds.kt
Normal file
25
ksp/generator/src/main/kotlin/KClassWorkarounds.kt
Normal file
@@ -0,0 +1,25 @@
|
||||
package dev.inmo.micro_ksp.generator
|
||||
|
||||
import com.google.devtools.ksp.KSTypeNotPresentException
|
||||
import com.google.devtools.ksp.KSTypesNotPresentException
|
||||
import com.google.devtools.ksp.KspExperimental
|
||||
import com.google.devtools.ksp.symbol.KSType
|
||||
import com.squareup.kotlinpoet.asClassName
|
||||
import com.squareup.kotlinpoet.ksp.toClassName
|
||||
import kotlin.reflect.KClass
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
inline fun convertToClassName(getter: () -> KClass<*>) = try {
|
||||
getter().asClassName()
|
||||
} catch (e: KSTypeNotPresentException) {
|
||||
e.ksType.toClassName()
|
||||
}
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
inline fun convertToClassNames(getter: () -> List<KClass<*>>) = try {
|
||||
getter().map { it.asClassName() }
|
||||
} catch (e: KSTypesNotPresentException) {
|
||||
e.ksTypes.map {
|
||||
it.toClassName()
|
||||
}
|
||||
}
|
||||
@@ -3,9 +3,15 @@ package dev.inmo.micro_utils.ksp.sealed.generator
|
||||
import com.google.devtools.ksp.KspExperimental
|
||||
import com.google.devtools.ksp.getAnnotationsByType
|
||||
import com.google.devtools.ksp.symbol.KSClassDeclaration
|
||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedTypesWorkaround
|
||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround
|
||||
import dev.inmo.microutils.kps.sealed.GenerateSealedWorkaround as OldGenerateSealedWorkaround
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
val KSClassDeclaration.getGenerateSealedWorkaroundAnnotation
|
||||
get() = (getAnnotationsByType(GenerateSealedWorkaround::class).firstOrNull() ?: getAnnotationsByType(OldGenerateSealedWorkaround::class).firstOrNull())
|
||||
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
val KSClassDeclaration.getGenerateSealedTypesWorkaroundAnnotation
|
||||
get() = getAnnotationsByType(GenerateSealedTypesWorkaround::class).firstOrNull()
|
||||
|
||||
@@ -6,21 +6,17 @@ import com.google.devtools.ksp.processing.CodeGenerator
|
||||
import com.google.devtools.ksp.processing.Resolver
|
||||
import com.google.devtools.ksp.processing.SymbolProcessor
|
||||
import com.google.devtools.ksp.symbol.*
|
||||
import com.squareup.kotlinpoet.ClassName
|
||||
import com.squareup.kotlinpoet.CodeBlock
|
||||
import com.squareup.kotlinpoet.FileSpec
|
||||
import com.squareup.kotlinpoet.FunSpec
|
||||
import com.squareup.kotlinpoet.KModifier
|
||||
import com.squareup.kotlinpoet.*
|
||||
import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
|
||||
import com.squareup.kotlinpoet.PropertySpec
|
||||
import com.squareup.kotlinpoet.asTypeName
|
||||
import com.squareup.kotlinpoet.ksp.toClassName
|
||||
import dev.inmo.micro_ksp.generator.buildSubFileName
|
||||
import dev.inmo.micro_ksp.generator.companion
|
||||
import dev.inmo.micro_ksp.generator.findSubClasses
|
||||
import dev.inmo.micro_ksp.generator.writeFile
|
||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedTypesWorkaround
|
||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround
|
||||
import java.io.File
|
||||
import kotlin.reflect.KClass
|
||||
|
||||
class Processor(
|
||||
private val codeGenerator: CodeGenerator
|
||||
@@ -109,6 +105,62 @@ class Processor(
|
||||
)
|
||||
}
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
private fun FileSpec.Builder.generateSealedTypesWorkaround(
|
||||
ksClassDeclaration: KSClassDeclaration,
|
||||
resolver: Resolver
|
||||
) {
|
||||
val annotation = ksClassDeclaration.getGenerateSealedTypesWorkaroundAnnotation
|
||||
val subClasses = ksClassDeclaration.resolveSubclasses(
|
||||
searchIn = resolver.getAllFiles(),
|
||||
allowNonSealed = annotation ?.includeNonSealedSubTypes ?: false
|
||||
).distinct()
|
||||
val subClassesNames = subClasses.filter {
|
||||
it.getAnnotationsByType(GenerateSealedTypesWorkaround.Exclude::class).count() == 0
|
||||
}.sortedBy {
|
||||
(it.getAnnotationsByType(GenerateSealedTypesWorkaround.Order::class).firstOrNull()) ?.order ?: 0
|
||||
}.map {
|
||||
it.toClassName()
|
||||
}.toList()
|
||||
val className = ksClassDeclaration.toClassName()
|
||||
val setType = Set::class.asTypeName().parameterizedBy(
|
||||
KClass::class.asTypeName().parameterizedBy(
|
||||
TypeVariableName(
|
||||
"out ${ksClassDeclaration.asStarProjectedType().toClassName().simpleNames.joinToString(".")}",
|
||||
)
|
||||
)
|
||||
)
|
||||
addProperty(
|
||||
PropertySpec.builder(
|
||||
"subtypes",
|
||||
setType
|
||||
).apply {
|
||||
modifiers.add(
|
||||
KModifier.PRIVATE
|
||||
)
|
||||
initializer(
|
||||
CodeBlock.of(
|
||||
"""setOf(${subClassesNames.joinToString(",\n") { it.simpleNames.joinToString(".") + "::class" }})"""
|
||||
)
|
||||
)
|
||||
}.build()
|
||||
)
|
||||
addFunction(
|
||||
FunSpec.builder("subtypes").apply {
|
||||
val companion = ksClassDeclaration.takeIf { it.isCompanionObject } ?.toClassName()
|
||||
?: ksClassDeclaration.companion ?.toClassName()
|
||||
?: ClassName(className.packageName, *className.simpleNames.toTypedArray(), "Companion")
|
||||
receiver(companion)
|
||||
returns(setType)
|
||||
addCode(
|
||||
CodeBlock.of(
|
||||
"""return subtypes"""
|
||||
)
|
||||
)
|
||||
}.build()
|
||||
)
|
||||
}
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
override fun process(resolver: Resolver): List<KSAnnotated> {
|
||||
(resolver.getSymbolsWithAnnotation(GenerateSealedWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
|
||||
@@ -131,6 +183,26 @@ class Processor(
|
||||
}.build()
|
||||
}
|
||||
}
|
||||
(resolver.getSymbolsWithAnnotation(GenerateSealedTypesWorkaround::class.qualifiedName!!)).filterIsInstance<KSClassDeclaration>().forEach {
|
||||
val prefix = (it.getGenerateSealedTypesWorkaroundAnnotation) ?.prefix ?.takeIf {
|
||||
it.isNotEmpty()
|
||||
} ?: it.buildSubFileName.replaceFirst(it.simpleName.asString(), "")
|
||||
it.writeFile(prefix = prefix, suffix = "SealedTypesWorkaround") {
|
||||
FileSpec.builder(
|
||||
it.packageName.asString(),
|
||||
"${it.simpleName.getShortName()}SealedTypesWorkaround"
|
||||
).apply {
|
||||
addFileComment(
|
||||
"""
|
||||
THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||
TO REGENERATE IT JUST DELETE FILE
|
||||
ORIGINAL FILE: ${it.containingFile ?.fileName}
|
||||
""".trimIndent()
|
||||
)
|
||||
generateSealedTypesWorkaround(it, resolver)
|
||||
}.build()
|
||||
}
|
||||
}
|
||||
|
||||
return emptyList()
|
||||
}
|
||||
|
||||
@@ -1,14 +1,19 @@
|
||||
package dev.inmo.micro_utils.ksp.sealed.generator.test
|
||||
|
||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedTypesWorkaround
|
||||
import dev.inmo.micro_utils.ksp.sealed.GenerateSealedWorkaround
|
||||
|
||||
@GenerateSealedWorkaround
|
||||
@GenerateSealedTypesWorkaround
|
||||
sealed interface Test {
|
||||
@GenerateSealedWorkaround.Order(2)
|
||||
@GenerateSealedTypesWorkaround.Exclude
|
||||
object A : Test
|
||||
@GenerateSealedWorkaround.Exclude
|
||||
@GenerateSealedTypesWorkaround.Order(2)
|
||||
object B : Test
|
||||
@GenerateSealedWorkaround.Order(0)
|
||||
@GenerateSealedTypesWorkaround.Order(0)
|
||||
object C : Test
|
||||
|
||||
// Required for successful sealed workaround generation
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
// THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||
// TO REGENERATE IT JUST DELETE FILE
|
||||
// ORIGINAL FILE: Test.kt
|
||||
package dev.inmo.micro_utils.ksp.`sealed`.generator.test
|
||||
|
||||
import kotlin.collections.Set
|
||||
import kotlin.reflect.KClass
|
||||
|
||||
private val subtypes: Set<KClass<out Test>> = setOf(Test.C::class,
|
||||
Test.B::class)
|
||||
|
||||
public fun Test.Companion.subtypes(): Set<KClass<out Test>> = subtypes
|
||||
40
ksp/sealed/generator/test/src/jvmTest/kotlin/TestTests.kt
Normal file
40
ksp/sealed/generator/test/src/jvmTest/kotlin/TestTests.kt
Normal file
@@ -0,0 +1,40 @@
|
||||
import dev.inmo.micro_utils.ksp.sealed.generator.test.subtypes
|
||||
import dev.inmo.micro_utils.ksp.sealed.generator.test.values
|
||||
import kotlin.test.Test
|
||||
import kotlin.test.assertEquals
|
||||
import kotlin.test.assertTrue
|
||||
|
||||
class TestTests {
|
||||
@Test
|
||||
fun testThatAfterCompilationTestWorkaroundsHaveCorrectValues() {
|
||||
val correctValues = arrayOf(
|
||||
dev.inmo.micro_utils.ksp.sealed.generator.test.Test.C,
|
||||
dev.inmo.micro_utils.ksp.sealed.generator.test.Test.A,
|
||||
)
|
||||
val correctSubtypes = arrayOf(
|
||||
dev.inmo.micro_utils.ksp.sealed.generator.test.Test.C::class,
|
||||
dev.inmo.micro_utils.ksp.sealed.generator.test.Test.B::class,
|
||||
)
|
||||
|
||||
assertEquals(
|
||||
correctValues.size, dev.inmo.micro_utils.ksp.sealed.generator.test.Test.values().size
|
||||
)
|
||||
correctValues.forEachIndexed { index, value ->
|
||||
assertTrue(
|
||||
value === dev.inmo.micro_utils.ksp.sealed.generator.test.Test.values().elementAt(index)
|
||||
)
|
||||
}
|
||||
|
||||
assertEquals(
|
||||
correctSubtypes.size, dev.inmo.micro_utils.ksp.sealed.generator.test.Test.subtypes().size
|
||||
)
|
||||
correctSubtypes.forEachIndexed { index, value ->
|
||||
assertTrue(
|
||||
value.qualifiedName != null
|
||||
)
|
||||
assertTrue(
|
||||
value.qualifiedName === dev.inmo.micro_utils.ksp.sealed.generator.test.Test.subtypes().elementAt(index).qualifiedName
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package dev.inmo.micro_utils.ksp.sealed
|
||||
|
||||
@Retention(AnnotationRetention.BINARY)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
annotation class GenerateSealedTypesWorkaround(
|
||||
val prefix: String = "",
|
||||
val includeNonSealedSubTypes: Boolean = false,
|
||||
) {
|
||||
@Retention(AnnotationRetention.BINARY)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
annotation class Order(val order: Int)
|
||||
@Retention(AnnotationRetention.BINARY)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
annotation class Exclude
|
||||
}
|
||||
@@ -4,7 +4,7 @@ package dev.inmo.micro_utils.ksp.sealed
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
annotation class GenerateSealedWorkaround(
|
||||
val prefix: String = "",
|
||||
val includeNonSealedSubTypes: Boolean = false
|
||||
val includeNonSealedSubTypes: Boolean = false,
|
||||
) {
|
||||
@Retention(AnnotationRetention.BINARY)
|
||||
@Target(AnnotationTarget.CLASS)
|
||||
|
||||
7
ksp/variations/build.gradle
Normal file
7
ksp/variations/build.gradle
Normal file
@@ -0,0 +1,7 @@
|
||||
plugins {
|
||||
id "org.jetbrains.kotlin.multiplatform"
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
id "com.android.library"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
22
ksp/variations/generator/build.gradle
Normal file
22
ksp/variations/generator/build.gradle
Normal file
@@ -0,0 +1,22 @@
|
||||
plugins {
|
||||
id "org.jetbrains.kotlin.jvm"
|
||||
}
|
||||
|
||||
apply from: "$publish_jvm"
|
||||
|
||||
repositories {
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation libs.kt.stdlib
|
||||
api project(":micro_utils.ksp.generator")
|
||||
api project(":micro_utils.ksp.variations")
|
||||
api libs.kotlin.poet
|
||||
api libs.ksp
|
||||
}
|
||||
|
||||
java {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
225
ksp/variations/generator/src/main/kotlin/Processor.kt
Normal file
225
ksp/variations/generator/src/main/kotlin/Processor.kt
Normal file
@@ -0,0 +1,225 @@
|
||||
package dev.inmo.micro_utils.ksp.variations.generator
|
||||
|
||||
import com.google.devtools.ksp.KSTypeNotPresentException
|
||||
import com.google.devtools.ksp.KspExperimental
|
||||
import com.google.devtools.ksp.getAnnotationsByType
|
||||
import com.google.devtools.ksp.processing.CodeGenerator
|
||||
import com.google.devtools.ksp.processing.Resolver
|
||||
import com.google.devtools.ksp.processing.SymbolProcessor
|
||||
import com.google.devtools.ksp.symbol.*
|
||||
import com.squareup.kotlinpoet.*
|
||||
import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
|
||||
import com.squareup.kotlinpoet.ksp.toAnnotationSpec
|
||||
import com.squareup.kotlinpoet.ksp.toClassName
|
||||
import com.squareup.kotlinpoet.ksp.toKModifier
|
||||
import com.squareup.kotlinpoet.ksp.toTypeName
|
||||
import dev.inmo.micro_ksp.generator.convertToClassName
|
||||
import dev.inmo.micro_ksp.generator.convertToClassNames
|
||||
import dev.inmo.micro_ksp.generator.findSubClasses
|
||||
import dev.inmo.micro_ksp.generator.writeFile
|
||||
import dev.inmo.micro_utils.ksp.variations.GenerateVariations
|
||||
import dev.inmo.micro_utils.ksp.variations.GenerationVariant
|
||||
import kotlin.math.pow
|
||||
|
||||
class Processor(
|
||||
private val codeGenerator: CodeGenerator
|
||||
) : SymbolProcessor {
|
||||
private fun KSClassDeclaration.findSealedConnection(potentialSealedParent: KSClassDeclaration): Boolean {
|
||||
val targetClassname = potentialSealedParent.qualifiedName ?.asString()
|
||||
return superTypes.any {
|
||||
val itAsDeclaration = it.resolve().declaration as? KSClassDeclaration ?: return@any false
|
||||
targetClassname == (itAsDeclaration.qualifiedName ?.asString()) || (itAsDeclaration.getSealedSubclasses().any() && itAsDeclaration.findSealedConnection(potentialSealedParent))
|
||||
}
|
||||
}
|
||||
|
||||
private fun KSClassDeclaration.resolveSubclasses(
|
||||
searchIn: Sequence<KSAnnotated>,
|
||||
allowNonSealed: Boolean
|
||||
): Sequence<KSClassDeclaration> {
|
||||
return findSubClasses(searchIn).let {
|
||||
if (allowNonSealed) {
|
||||
it
|
||||
} else {
|
||||
it.filter {
|
||||
it.findSealedConnection(this)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
private fun FileSpec.Builder.generateVariations(
|
||||
ksFunctionDeclaration: KSFunctionDeclaration,
|
||||
resolver: Resolver
|
||||
) {
|
||||
val annotation = ksFunctionDeclaration.getAnnotationsByType(GenerateVariations::class).first()
|
||||
val variations: List<Pair<List<GenerationVariant>, KSValueParameter>> = ksFunctionDeclaration.parameters.mapNotNull {
|
||||
val variationAnnotations = it.getAnnotationsByType(GenerationVariant::class).toList()
|
||||
variationAnnotations to it
|
||||
}
|
||||
val accumulatedGenerations = mutableSetOf<Pair<FunSpec, Map<String, String>>>()
|
||||
val baseFunctionParameters = ksFunctionDeclaration.parameters.mapNotNull {
|
||||
ParameterSpec
|
||||
.builder(
|
||||
it.name ?.asString() ?: return@mapNotNull null,
|
||||
it.type.toTypeName(),
|
||||
)
|
||||
.apply {
|
||||
if (it.isCrossInline) {
|
||||
addModifiers(KModifier.CROSSINLINE)
|
||||
}
|
||||
if (it.isVal) {
|
||||
addModifiers(KModifier.VALUE)
|
||||
}
|
||||
if (it.isNoInline) {
|
||||
addModifiers(KModifier.NOINLINE)
|
||||
}
|
||||
if (it.isVararg) {
|
||||
addModifiers(KModifier.VARARG)
|
||||
}
|
||||
}
|
||||
.build() to it.hasDefault
|
||||
}
|
||||
val baseFunctionFunSpecs = mutableListOf<Pair<FunSpec, Map<String, String>>>()
|
||||
let {
|
||||
var defaultParametersIndicator = 0u
|
||||
val maxIndicator = baseFunctionParameters.filter { it.second }.foldIndexed(0u) { index, acc, _ ->
|
||||
2.0.pow(index).toUInt() + acc
|
||||
}
|
||||
while (defaultParametersIndicator <= maxIndicator) {
|
||||
var currentDefaultParameterIndex = 0u
|
||||
val baseFunctionDefaults = mutableMapOf<String, String>()
|
||||
val funSpec = FunSpec.builder(ksFunctionDeclaration.simpleName.asString()).apply {
|
||||
modifiers.addAll(ksFunctionDeclaration.modifiers.mapNotNull { it.toKModifier() })
|
||||
ksFunctionDeclaration.annotations.forEach {
|
||||
addAnnotation(it.toAnnotationSpec(omitDefaultValues = false))
|
||||
}
|
||||
ksFunctionDeclaration.extensionReceiver ?.let {
|
||||
receiver(it.toTypeName())
|
||||
}
|
||||
}
|
||||
baseFunctionParameters.forEach { (parameter, hasDefault) ->
|
||||
if (hasDefault) {
|
||||
val shouldBeIncluded = (2.0.pow(currentDefaultParameterIndex.toInt()).toUInt()).and(defaultParametersIndicator) > 0u
|
||||
currentDefaultParameterIndex++
|
||||
|
||||
if (!shouldBeIncluded) {
|
||||
return@forEach
|
||||
}
|
||||
}
|
||||
funSpec.addParameter(parameter)
|
||||
val name = parameter.name
|
||||
val defaultValueString = if (parameter.modifiers.contains(KModifier.VARARG)) {
|
||||
"*$name"
|
||||
} else {
|
||||
"$name"
|
||||
}
|
||||
baseFunctionDefaults[parameter.name] = defaultValueString
|
||||
}
|
||||
baseFunctionFunSpecs.add(
|
||||
funSpec.build() to baseFunctionDefaults.toMap()
|
||||
)
|
||||
defaultParametersIndicator++
|
||||
}
|
||||
}
|
||||
variations.forEach { (variations, parameter) ->
|
||||
(baseFunctionFunSpecs + accumulatedGenerations).forEach { (accumulatedGeneration, baseDefaults) ->
|
||||
if ((parameter.name ?.asString() ?: "this") !in baseDefaults.keys) {
|
||||
return@forEach
|
||||
}
|
||||
variations.forEach { variation ->
|
||||
val defaults = mutableMapOf<String, String>()
|
||||
accumulatedGenerations.add(
|
||||
FunSpec.builder(accumulatedGeneration.name).apply {
|
||||
modifiers.addAll(accumulatedGeneration.modifiers)
|
||||
accumulatedGeneration.annotations.forEach {
|
||||
addAnnotation(it)
|
||||
}
|
||||
accumulatedGeneration.receiverType ?.let {
|
||||
receiver(it)
|
||||
}
|
||||
accumulatedGeneration.parameters.forEach {
|
||||
val actualName = if (variation.argName.isEmpty()) it.name else variation.argName
|
||||
parameters.add(
|
||||
(if (it.name == (parameter.name ?.asString() ?: "this")) {
|
||||
val type = convertToClassName { variation.type }
|
||||
val genericTypes = convertToClassNames { variation.genericTypes.toList() }
|
||||
ParameterSpec
|
||||
.builder(
|
||||
actualName,
|
||||
if (genericTypes.isEmpty()) {
|
||||
type
|
||||
} else {
|
||||
type.parameterizedBy(
|
||||
*genericTypes.toTypedArray()
|
||||
)
|
||||
}
|
||||
)
|
||||
.apply {
|
||||
addModifiers(it.modifiers)
|
||||
val defaultValueString = """
|
||||
with(${actualName}) {${
|
||||
if (it.modifiers.contains(KModifier.VARARG)) {
|
||||
"map { it.${variation.conversion} }.toTypedArray()"
|
||||
} else {
|
||||
"${variation.conversion}"
|
||||
}
|
||||
}}
|
||||
""".trimIndent()
|
||||
defaults[it.name] = defaultValueString
|
||||
}
|
||||
} else {
|
||||
it.toBuilder()
|
||||
})
|
||||
.build()
|
||||
)
|
||||
}
|
||||
val parameters = accumulatedGeneration.parameters.joinToString(", ") {
|
||||
val itName = it.name
|
||||
"""
|
||||
$itName = ${defaults[itName] ?: baseDefaults[itName] ?: itName}
|
||||
""".trimIndent()
|
||||
}
|
||||
addCode(
|
||||
"""
|
||||
return ${ksFunctionDeclaration.simpleName.asString()}(
|
||||
$parameters
|
||||
)
|
||||
""".trimIndent()
|
||||
)
|
||||
}.build() to defaults.toMap()
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
accumulatedGenerations.forEach {
|
||||
addFunction(it.first)
|
||||
}
|
||||
}
|
||||
|
||||
@OptIn(KspExperimental::class)
|
||||
override fun process(resolver: Resolver): List<KSAnnotated> {
|
||||
(resolver.getSymbolsWithAnnotation(GenerateVariations::class.qualifiedName!!)).filterIsInstance<KSFunctionDeclaration>().forEach {
|
||||
val prefix = (it.getAnnotationsByType(GenerateVariations::class)).firstOrNull() ?.prefix ?.takeIf {
|
||||
it.isNotEmpty()
|
||||
} ?: it.simpleName.asString().replaceFirst(it.simpleName.asString(), "")
|
||||
it.writeFile(prefix = prefix, suffix = "GeneratedVariation") {
|
||||
FileSpec.builder(
|
||||
it.packageName.asString(),
|
||||
"${it.simpleName.getShortName()}GeneratedVariation"
|
||||
).apply {
|
||||
addFileComment(
|
||||
"""
|
||||
THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||
TO REGENERATE IT JUST DELETE FILE
|
||||
ORIGINAL FILE: ${it.containingFile ?.fileName}
|
||||
""".trimIndent()
|
||||
)
|
||||
generateVariations(it, resolver)
|
||||
}.build()
|
||||
}
|
||||
}
|
||||
|
||||
return emptyList()
|
||||
}
|
||||
}
|
||||
11
ksp/variations/generator/src/main/kotlin/Provider.kt
Normal file
11
ksp/variations/generator/src/main/kotlin/Provider.kt
Normal file
@@ -0,0 +1,11 @@
|
||||
package dev.inmo.micro_utils.ksp.variations.generator
|
||||
|
||||
import com.google.devtools.ksp.processing.SymbolProcessor
|
||||
import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
|
||||
import com.google.devtools.ksp.processing.SymbolProcessorProvider
|
||||
|
||||
class Provider : SymbolProcessorProvider {
|
||||
override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor = Processor(
|
||||
environment.codeGenerator
|
||||
)
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
dev.inmo.micro_utils.ksp.variations.generator.Provider
|
||||
28
ksp/variations/generator/test/build.gradle
Normal file
28
ksp/variations/generator/test/build.gradle
Normal file
@@ -0,0 +1,28 @@
|
||||
plugins {
|
||||
id "org.jetbrains.kotlin.multiplatform"
|
||||
id "org.jetbrains.kotlin.plugin.serialization"
|
||||
id "com.android.library"
|
||||
id "com.google.devtools.ksp"
|
||||
}
|
||||
|
||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||
|
||||
|
||||
kotlin {
|
||||
sourceSets {
|
||||
commonMain {
|
||||
dependencies {
|
||||
implementation libs.kt.stdlib
|
||||
api project(":micro_utils.ksp.variations")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
dependencies {
|
||||
add("kspCommonMainMetadata", project(":micro_utils.ksp.variations.generator"))
|
||||
}
|
||||
|
||||
ksp {
|
||||
}
|
||||
@@ -0,0 +1,52 @@
|
||||
package dev.inmo.micro_utils.ksp.variations.generator.test
|
||||
|
||||
import dev.inmo.micro_utils.ksp.variations.GenerateVariations
|
||||
import dev.inmo.micro_utils.ksp.variations.GenerationVariant
|
||||
|
||||
data class SimpleType(
|
||||
val value: String
|
||||
)
|
||||
|
||||
data class GenericType<T>(
|
||||
val value: T
|
||||
)
|
||||
|
||||
@GenerateVariations
|
||||
fun sample(
|
||||
@GenerationVariant(
|
||||
SimpleType::class,
|
||||
"value",
|
||||
)
|
||||
@GenerationVariant(
|
||||
GenericType::class,
|
||||
"value.toString()",
|
||||
genericTypes = arrayOf(Int::class)
|
||||
)
|
||||
example: String = "12"
|
||||
) = println(example)
|
||||
|
||||
@GenerateVariations
|
||||
fun sampleVararg(
|
||||
@GenerationVariant(
|
||||
SimpleType::class,
|
||||
"value",
|
||||
)
|
||||
vararg example: String = arrayOf("12")
|
||||
) = println(example.joinToString())
|
||||
|
||||
@GenerateVariations
|
||||
suspend fun SimpleType.sample2(
|
||||
@GenerationVariant(
|
||||
Int::class,
|
||||
"toString()",
|
||||
"arg12",
|
||||
)
|
||||
arg1: String = "1",
|
||||
@GenerationVariant(
|
||||
String::class,
|
||||
"toInt()",
|
||||
"arg22",
|
||||
)
|
||||
arg2: Int = 2,
|
||||
arg3: Boolean = false
|
||||
) = println(arg1)
|
||||
@@ -0,0 +1,49 @@
|
||||
// THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||
// TO REGENERATE IT JUST DELETE FILE
|
||||
// ORIGINAL FILE: SampleFun.kt
|
||||
package dev.inmo.micro_utils.ksp.variations.generator.test
|
||||
|
||||
import kotlin.Boolean
|
||||
import kotlin.Int
|
||||
import kotlin.String
|
||||
import kotlin.Unit
|
||||
|
||||
public suspend fun SimpleType.sample2(arg12: Int): Unit = sample2(
|
||||
arg1 = with(arg12) {toString()}
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(arg12: Int, arg2: Int): Unit = sample2(
|
||||
arg1 = with(arg12) {toString()}, arg2 = arg2
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(arg12: Int, arg3: Boolean): Unit = sample2(
|
||||
arg1 = with(arg12) {toString()}, arg3 = arg3
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(
|
||||
arg12: Int,
|
||||
arg2: Int,
|
||||
arg3: Boolean,
|
||||
): Unit = sample2(
|
||||
arg1 = with(arg12) {toString()}, arg2 = arg2, arg3 = arg3
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(arg22: String): Unit = sample2(
|
||||
arg2 = with(arg22) {toInt()}
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(arg1: String, arg22: String): Unit = sample2(
|
||||
arg1 = arg1, arg2 = with(arg22) {toInt()}
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(arg22: String, arg3: Boolean): Unit = sample2(
|
||||
arg2 = with(arg22) {toInt()}, arg3 = arg3
|
||||
)
|
||||
|
||||
public suspend fun SimpleType.sample2(
|
||||
arg1: String,
|
||||
arg22: String,
|
||||
arg3: Boolean,
|
||||
): Unit = sample2(
|
||||
arg1 = arg1, arg2 = with(arg22) {toInt()}, arg3 = arg3
|
||||
)
|
||||
@@ -0,0 +1,15 @@
|
||||
// THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||
// TO REGENERATE IT JUST DELETE FILE
|
||||
// ORIGINAL FILE: SampleFun.kt
|
||||
package dev.inmo.micro_utils.ksp.variations.generator.test
|
||||
|
||||
import kotlin.Int
|
||||
import kotlin.Unit
|
||||
|
||||
public fun sample(example: SimpleType): Unit = sample(
|
||||
example = with(example) {value}
|
||||
)
|
||||
|
||||
public fun sample(example: GenericType<Int>): Unit = sample(
|
||||
example = with(example) {value.toString()}
|
||||
)
|
||||
@@ -0,0 +1,10 @@
|
||||
// THIS CODE HAVE BEEN GENERATED AUTOMATICALLY
|
||||
// TO REGENERATE IT JUST DELETE FILE
|
||||
// ORIGINAL FILE: SampleFun.kt
|
||||
package dev.inmo.micro_utils.ksp.variations.generator.test
|
||||
|
||||
import kotlin.Unit
|
||||
|
||||
public fun sampleVararg(vararg example: SimpleType): Unit = sampleVararg(
|
||||
example = with(example) {map { it.value }.toTypedArray()}
|
||||
)
|
||||
@@ -0,0 +1,7 @@
|
||||
package dev.inmo.micro_utils.ksp.variations
|
||||
|
||||
@Retention(AnnotationRetention.BINARY)
|
||||
@Target(AnnotationTarget.FUNCTION)
|
||||
annotation class GenerateVariations(
|
||||
val prefix: String = ""
|
||||
)
|
||||
18
ksp/variations/src/commonMain/kotlin/GenerationVariant.kt
Normal file
18
ksp/variations/src/commonMain/kotlin/GenerationVariant.kt
Normal file
@@ -0,0 +1,18 @@
|
||||
package dev.inmo.micro_utils.ksp.variations
|
||||
|
||||
import kotlin.reflect.KClass
|
||||
|
||||
/**
|
||||
* @param argName New argument name. Default - empty - means "use default arg name"
|
||||
* @param type Qualified class name, like "dev.inmo.micro_utils.ksp.variants.GenerationVariant"
|
||||
* @param conversion Conversion string with `this`
|
||||
*/
|
||||
@Retention(AnnotationRetention.BINARY)
|
||||
@Repeatable
|
||||
@Target(AnnotationTarget.TYPE_PARAMETER, AnnotationTarget.VALUE_PARAMETER)
|
||||
annotation class GenerationVariant(
|
||||
val type: KClass<*>,
|
||||
val conversion: String,
|
||||
val argName: String = "",
|
||||
vararg val genericTypes: KClass<*>
|
||||
)
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
|
||||
"extends": [
|
||||
"config:base"
|
||||
"config:recommended"
|
||||
]
|
||||
}
|
||||
|
||||
@@ -8,8 +8,16 @@ interface CommonExposedRepo<IdType, ObjectType> : ExposedRepo {
|
||||
val selectById: ISqlExpressionBuilder.(IdType) -> Op<Boolean>
|
||||
val selectByIds: ISqlExpressionBuilder.(List<IdType>) -> Op<Boolean>
|
||||
get() = {
|
||||
it.foldRight<IdType, Op<Boolean>?>(null) { id, acc ->
|
||||
acc ?.or(selectById(id)) ?: selectById(id)
|
||||
} ?: Op.FALSE
|
||||
if (it.isEmpty()) {
|
||||
Op.FALSE
|
||||
} else {
|
||||
var op = it.firstOrNull() ?.let { selectById(it) } ?: Op.FALSE
|
||||
var i = 1
|
||||
while (i < it.size) {
|
||||
op = op.or(selectById(it[i]))
|
||||
i++
|
||||
}
|
||||
op
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -62,6 +62,10 @@ String[] includes = [
|
||||
":ksp:classcasts:generator",
|
||||
":ksp:classcasts:generator:test",
|
||||
|
||||
":ksp:variations",
|
||||
":ksp:variations:generator",
|
||||
":ksp:variations:generator:test",
|
||||
|
||||
":dokka"
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user