mirror of
https://github.com/InsanusMokrassar/MicroUtils.git
synced 2026-04-07 10:02:51 +00:00
Compare commits
16 Commits
0.24.4
...
f7a9f2e13d
| Author | SHA1 | Date | |
|---|---|---|---|
| f7a9f2e13d | |||
| af286d3d53 | |||
| 9a20e8155e | |||
| b81af7e1c8 | |||
| 74563bbac9 | |||
| 07ad79f0b3 | |||
| 5c28255e06 | |||
| 99783f281d | |||
| a5008c3d15 | |||
| f807f2beeb | |||
| db34b25ef2 | |||
| 96daf11fd4 | |||
| f7e98dfd2d | |||
| 61277e92bd | |||
| 32ef9f399f | |||
| 54e6ca5dc3 |
19
CHANGELOG.md
19
CHANGELOG.md
@@ -1,5 +1,24 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## 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`
|
||||||
|
* `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
|
## 0.24.4
|
||||||
|
|
||||||
* `Repos`:
|
* `Repos`:
|
||||||
|
|||||||
@@ -15,5 +15,5 @@ crypto_js_version=4.1.1
|
|||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
group=dev.inmo
|
group=dev.inmo
|
||||||
version=0.24.4
|
version=0.24.6
|
||||||
android_code_version=283
|
android_code_version=286
|
||||||
|
|||||||
@@ -1,43 +1,42 @@
|
|||||||
[versions]
|
[versions]
|
||||||
|
|
||||||
kt = "2.1.0"
|
kt = "2.1.10"
|
||||||
kt-serialization = "1.8.0"
|
kt-serialization = "1.8.0"
|
||||||
kt-coroutines = "1.10.1"
|
kt-coroutines = "1.10.1"
|
||||||
|
|
||||||
kslog = "1.4.0"
|
kslog = "1.4.1"
|
||||||
|
|
||||||
jb-compose = "1.7.3"
|
jb-compose = "1.7.3"
|
||||||
jb-exposed = "0.58.0"
|
jb-exposed = "0.59.0"
|
||||||
jb-dokka = "2.0.0"
|
jb-dokka = "2.0.0"
|
||||||
|
|
||||||
sqlite = "3.47.2.0"
|
sqlite = "3.49.0.0"
|
||||||
|
|
||||||
korlibs = "5.4.0"
|
korlibs = "5.4.0"
|
||||||
uuid = "0.8.4"
|
uuid = "0.8.4"
|
||||||
|
|
||||||
ktor = "3.0.3"
|
ktor = "3.1.0"
|
||||||
|
|
||||||
gh-release = "2.5.2"
|
gh-release = "2.5.2"
|
||||||
|
|
||||||
koin = "4.0.1"
|
koin = "4.0.2"
|
||||||
|
|
||||||
okio = "3.10.2"
|
okio = "3.10.2"
|
||||||
|
|
||||||
ksp = "2.1.0-1.0.29"
|
ksp = "2.1.10-1.0.29"
|
||||||
kotlin-poet = "1.18.1"
|
kotlin-poet = "1.18.1"
|
||||||
|
|
||||||
versions = "0.51.0"
|
versions = "0.51.0"
|
||||||
|
|
||||||
android-gradle = "8.2.2"
|
android-gradle = "8.7.+"
|
||||||
dexcount = "4.0.0"
|
dexcount = "4.0.0"
|
||||||
|
|
||||||
android-coreKtx = "1.15.0"
|
android-coreKtx = "1.15.0"
|
||||||
android-recyclerView = "1.3.2"
|
android-recyclerView = "1.4.0"
|
||||||
android-appCompat = "1.7.0"
|
android-appCompat = "1.7.0"
|
||||||
android-fragment = "1.8.5"
|
android-fragment = "1.8.6"
|
||||||
android-espresso = "3.6.1"
|
android-espresso = "3.6.1"
|
||||||
android-test = "1.2.1"
|
android-test = "1.2.1"
|
||||||
android-compose-material3 = "1.3.0"
|
|
||||||
|
|
||||||
android-props-minSdk = "21"
|
android-props-minSdk = "21"
|
||||||
android-props-compileSdk = "35"
|
android-props-compileSdk = "35"
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
|
if (ext.getProperties()["do_publish"] == false) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
apply plugin: 'maven-publish'
|
apply plugin: 'maven-publish'
|
||||||
|
|
||||||
task javadocsJar(type: Jar) {
|
task javadocsJar(type: Jar) {
|
||||||
@@ -19,29 +23,29 @@ publishing {
|
|||||||
}
|
}
|
||||||
|
|
||||||
developers {
|
developers {
|
||||||
|
|
||||||
developer {
|
developer {
|
||||||
id = "InsanusMokrassar"
|
id = "InsanusMokrassar"
|
||||||
name = "Aleksei Ovsiannikov"
|
name = "Aleksei Ovsiannikov"
|
||||||
email = "ovsyannikov.alexey95@gmail.com"
|
email = "ovsyannikov.alexey95@gmail.com"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
developer {
|
developer {
|
||||||
id = "000Sanya"
|
id = "000Sanya"
|
||||||
name = "Syrov Aleksandr"
|
name = "Syrov Aleksandr"
|
||||||
email = "000sanya.000sanya@gmail.com"
|
email = "000sanya.000sanya@gmail.com"
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
licenses {
|
licenses {
|
||||||
|
|
||||||
license {
|
license {
|
||||||
name = "Apache Software License 2.0"
|
name = "Apache Software License 2.0"
|
||||||
url = "https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"
|
url = "https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
repositories {
|
repositories {
|
||||||
@@ -49,51 +53,51 @@ publishing {
|
|||||||
maven {
|
maven {
|
||||||
name = "GithubPackages"
|
name = "GithubPackages"
|
||||||
url = uri("https://maven.pkg.github.com/InsanusMokrassar/MicroUtils")
|
url = uri("https://maven.pkg.github.com/InsanusMokrassar/MicroUtils")
|
||||||
|
|
||||||
credentials {
|
credentials {
|
||||||
username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
|
username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
|
||||||
password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
|
password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
|
if ((project.hasProperty('INMONEXUS_USER') || System.getenv('INMONEXUS_USER') != null) && (project.hasProperty('INMONEXUS_PASSWORD') || System.getenv('INMONEXUS_PASSWORD') != null)) {
|
||||||
maven {
|
maven {
|
||||||
name = "InmoNexus"
|
name = "InmoNexus"
|
||||||
url = uri("https://nexus.inmo.dev/repository/maven-releases/")
|
url = uri("https://nexus.inmo.dev/repository/maven-releases/")
|
||||||
|
|
||||||
credentials {
|
credentials {
|
||||||
username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
|
username = project.hasProperty('INMONEXUS_USER') ? project.property('INMONEXUS_USER') : System.getenv('INMONEXUS_USER')
|
||||||
password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
|
password = project.hasProperty('INMONEXUS_PASSWORD') ? project.property('INMONEXUS_PASSWORD') : System.getenv('INMONEXUS_PASSWORD')
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
|
||||||
maven {
|
maven {
|
||||||
name = "sonatype"
|
name = "sonatype"
|
||||||
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
|
url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
|
||||||
|
|
||||||
credentials {
|
credentials {
|
||||||
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
|
||||||
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (project.hasProperty("signing.gnupg.keyName")) {
|
if (project.hasProperty("signing.gnupg.keyName")) {
|
||||||
apply plugin: 'signing'
|
apply plugin: 'signing'
|
||||||
|
|
||||||
signing {
|
signing {
|
||||||
useGpgCmd()
|
useGpgCmd()
|
||||||
|
|
||||||
sign publishing.publications
|
sign publishing.publications
|
||||||
}
|
}
|
||||||
|
|
||||||
task signAll {
|
task signAll {
|
||||||
tasks.withType(Sign).forEach {
|
tasks.withType(Sign).forEach {
|
||||||
dependsOn(it)
|
dependsOn(it)
|
||||||
|
|||||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@@ -1,5 +1,5 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ plugins {
|
|||||||
id "com.google.devtools.ksp"
|
id "com.google.devtools.ksp"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ext.do_publish = false
|
||||||
|
|
||||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,28 +1,38 @@
|
|||||||
package dev.inmo.micro_ksp.generator
|
package dev.inmo.micro_ksp.generator
|
||||||
|
|
||||||
import com.google.devtools.ksp.symbol.KSClassDeclaration
|
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.KSFile
|
||||||
|
import com.google.devtools.ksp.symbol.KSFunctionDeclaration
|
||||||
import com.squareup.kotlinpoet.FileSpec
|
import com.squareup.kotlinpoet.FileSpec
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
fun KSClassDeclaration.writeFile(
|
fun KSDeclaration.writeFile(
|
||||||
prefix: String = "",
|
prefix: String = "",
|
||||||
suffix: String = "",
|
suffix: String = "",
|
||||||
relatedPath: String = "",
|
relatedPath: String = "",
|
||||||
force: Boolean = false,
|
force: Boolean = false,
|
||||||
|
forceUppercase: Boolean = true,
|
||||||
fileSpecBuilder: () -> FileSpec
|
fileSpecBuilder: () -> FileSpec
|
||||||
) {
|
) {
|
||||||
val containingFile = containingFile!!
|
val containingFile = containingFile!!
|
||||||
|
val simpleName = if (forceUppercase) {
|
||||||
|
val rawSimpleName = simpleName.asString()
|
||||||
|
rawSimpleName.replaceFirst(rawSimpleName.first().toString(), rawSimpleName.first().uppercase())
|
||||||
|
} else {
|
||||||
|
simpleName.asString()
|
||||||
|
}
|
||||||
File(
|
File(
|
||||||
File(
|
File(
|
||||||
File(containingFile.filePath).parent,
|
File(containingFile.filePath).parent,
|
||||||
relatedPath
|
relatedPath
|
||||||
),
|
),
|
||||||
"$prefix${simpleName.asString()}$suffix.kt"
|
"$prefix${simpleName}$suffix.kt"
|
||||||
).takeIf { force || !it.exists() } ?.apply {
|
).takeIf { force || !it.exists() } ?.apply {
|
||||||
parentFile.mkdirs()
|
parentFile.mkdirs()
|
||||||
|
val fileSpec = fileSpecBuilder()
|
||||||
writer().use { writer ->
|
writer().use { writer ->
|
||||||
fileSpecBuilder().writeTo(writer)
|
fileSpec.writeTo(writer)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -42,8 +52,9 @@ fun KSFile.writeFile(
|
|||||||
"$prefix${fileName.dropLastWhile { it != '.' }.removeSuffix(".")}$suffix.kt"
|
"$prefix${fileName.dropLastWhile { it != '.' }.removeSuffix(".")}$suffix.kt"
|
||||||
).takeIf { force || !it.exists() } ?.apply {
|
).takeIf { force || !it.exists() } ?.apply {
|
||||||
parentFile.mkdirs()
|
parentFile.mkdirs()
|
||||||
|
val fileSpec = fileSpecBuilder()
|
||||||
writer().use { writer ->
|
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()
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -5,6 +5,8 @@ plugins {
|
|||||||
id "com.google.devtools.ksp"
|
id "com.google.devtools.ksp"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ext.do_publish = false
|
||||||
|
|
||||||
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
apply from: "$mppJvmJsAndroidLinuxMingwLinuxArm64Project"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
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
|
||||||
|
}
|
||||||
243
ksp/variations/generator/src/main/kotlin/Processor.kt
Normal file
243
ksp/variations/generator/src/main/kotlin/Processor.kt
Normal file
@@ -0,0 +1,243 @@
|
|||||||
|
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)
|
||||||
|
}
|
||||||
|
it.annotations.forEach {
|
||||||
|
if (it.shortName.asString() == GenerationVariant::class.simpleName) return@forEach
|
||||||
|
|
||||||
|
addAnnotation(it.toAnnotationSpec(omitDefaultValues = false))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.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 {
|
||||||
|
if (it.shortName.asString() == GenerateVariations::class.simpleName) return@forEach
|
||||||
|
|
||||||
|
addAnnotation(it.toAnnotationSpec(omitDefaultValues = false))
|
||||||
|
}
|
||||||
|
ksFunctionDeclaration.extensionReceiver ?.let {
|
||||||
|
receiver(it.toTypeName())
|
||||||
|
}
|
||||||
|
ksFunctionDeclaration.returnType ?.let {
|
||||||
|
returns(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)
|
||||||
|
}
|
||||||
|
returns(accumulatedGeneration.returnType)
|
||||||
|
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().apply {
|
||||||
|
defaults[it.name] = it.name
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.apply {
|
||||||
|
it.annotations.forEach {
|
||||||
|
addAnnotation(it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.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().let { it.replaceFirst(it.first().toString(), it.first().uppercase()) }}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
|
||||||
30
ksp/variations/generator/test/build.gradle
Normal file
30
ksp/variations/generator/test/build.gradle
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
plugins {
|
||||||
|
id "org.jetbrains.kotlin.multiplatform"
|
||||||
|
id "org.jetbrains.kotlin.plugin.serialization"
|
||||||
|
id "com.android.library"
|
||||||
|
id "com.google.devtools.ksp"
|
||||||
|
}
|
||||||
|
|
||||||
|
ext.do_publish = false
|
||||||
|
|
||||||
|
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,61 @@
|
|||||||
|
// 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
|
||||||
|
)
|
||||||
|
|
||||||
|
public suspend fun SimpleType.sample2(arg12: Int, arg22: String): Unit = sample2(
|
||||||
|
arg12 = arg12, arg2 = with(arg22) {toInt()}
|
||||||
|
)
|
||||||
|
|
||||||
|
public suspend fun SimpleType.sample2(
|
||||||
|
arg12: Int,
|
||||||
|
arg22: String,
|
||||||
|
arg3: Boolean,
|
||||||
|
): Unit = sample2(
|
||||||
|
arg12 = arg12, arg2 = with(arg22) {toInt()}, arg3 = arg3
|
||||||
|
)
|
||||||
@@ -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,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<*>
|
||||||
|
)
|
||||||
@@ -2,19 +2,19 @@ package dev.inmo.micro_utils.pagination
|
|||||||
|
|
||||||
import org.jetbrains.exposed.sql.*
|
import org.jetbrains.exposed.sql.*
|
||||||
|
|
||||||
fun Query.paginate(with: Pagination, orderBy: Pair<Expression<*>, SortOrder>? = null) = limit(
|
fun Query.paginate(with: Pagination, orderBy: Pair<Expression<*>, SortOrder>? = null) =
|
||||||
with.size,
|
limit(with.size)
|
||||||
with.firstIndex.toLong()
|
.offset(with.firstIndex.toLong())
|
||||||
).let {
|
.let {
|
||||||
if (orderBy != null) {
|
if (orderBy != null) {
|
||||||
it.orderBy(
|
it.orderBy(
|
||||||
orderBy.first,
|
orderBy.first,
|
||||||
orderBy.second
|
orderBy.second
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
it
|
it
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
fun Query.paginate(with: Pagination, orderBy: Expression<*>?, reversed: Boolean = false) = paginate(
|
fun Query.paginate(with: Pagination, orderBy: Expression<*>?, reversed: Boolean = false) = paginate(
|
||||||
with,
|
with,
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ abstract class AbstractExposedWriteCRUDRepo<ObjectType, IdType, InputValueType>(
|
|||||||
override suspend fun deleteById(ids: List<IdType>) {
|
override suspend fun deleteById(ids: List<IdType>) {
|
||||||
onBeforeDelete(ids)
|
onBeforeDelete(ids)
|
||||||
transaction(db = database) {
|
transaction(db = database) {
|
||||||
val deleted = deleteWhere(null, null) { selectByIds(it, ids) }
|
val deleted = deleteWhere { selectByIds(it, ids) }
|
||||||
if (deleted == ids.size) {
|
if (deleted == ids.size) {
|
||||||
ids
|
ids
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -62,6 +62,10 @@ String[] includes = [
|
|||||||
":ksp:classcasts:generator",
|
":ksp:classcasts:generator",
|
||||||
":ksp:classcasts:generator:test",
|
":ksp:classcasts:generator:test",
|
||||||
|
|
||||||
|
":ksp:variations",
|
||||||
|
":ksp:variations:generator",
|
||||||
|
":ksp:variations:generator:test",
|
||||||
|
|
||||||
":dokka"
|
":dokka"
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user