InsanusMokrassar/MicroUtils
1
0
Fork 0
mirror of https://github.com/InsanusMokrassar/MicroUtils.git synced 2024-11-22 16:23:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #420 from InsanusMokrassar/0.20.42

Browse Source 
0.20.42
This commit is contained in:
InsanusMokrassar 2024-04-05 15:09:27 +06:00 committed by GitHub
commit 5d31fd1c91
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 71 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,5 +1,11 @@
# Changelog # Changelog
## 0.20.42
* `Repos`:
* `Generator`:
* Improvements
## 0.20.41 ## 0.20.41
* `Repos`: * `Repos`:

4
gradle.properties
View File

@ -15,5 +15,5 @@ crypto_js_version=4.1.1
# Project data # Project data
group=dev.inmo group=dev.inmo
version=0.20.41 version=0.20.42
android_code_version=247 android_code_version=248

89
repos/generator/src/main/kotlin/Processor.kt
View File

@ -1,8 +1,6 @@
package dev.inmo.micro_utils.repos.generator package dev.inmo.micro_utils.repos.generator
import com.google.devtools.ksp.KspExperimental import com.google.devtools.ksp.*
import com.google.devtools.ksp.getAnnotationsByType
import com.google.devtools.ksp.isAnnotationPresent
import com.google.devtools.ksp.processing.CodeGenerator import com.google.devtools.ksp.processing.CodeGenerator
import com.google.devtools.ksp.processing.Resolver import com.google.devtools.ksp.processing.Resolver
import com.google.devtools.ksp.processing.SymbolProcessor import com.google.devtools.ksp.processing.SymbolProcessor
@ -36,6 +34,7 @@ import kotlinx.serialization.Serializable
import java.io.File import java.io.File
import kotlin.reflect.KProperty1 import kotlin.reflect.KProperty1
import kotlin.reflect.full.memberProperties import kotlin.reflect.full.memberProperties
import kotlin.reflect.jvm.jvmName
private fun KSClassifierReference.quilifiedName(): String = "${qualifier ?.let { "${it.quilifiedName()}." } ?: ""}${referencedName()}" private fun KSClassifierReference.quilifiedName(): String = "${qualifier ?.let { "${it.quilifiedName()}." } ?: ""}${referencedName()}"
@ -75,16 +74,29 @@ class Processor(
ORIGINAL FILE: ${ksFile.fileName} ORIGINAL FILE: ${ksFile.fileName}
""".trimIndent() """.trimIndent()
) )
val newName = "New${ksClassDeclaration.simpleName.getShortName()}" val newName = "New${ksClassDeclaration.simpleName.getShortName()}"
val registeredName = "Registered${ksClassDeclaration.simpleName.getShortName()}" val registeredName = "Registered${ksClassDeclaration.simpleName.getShortName()}"
val allKSClassProperties = ksClassDeclaration.getAllProperties() val allKSClassProperties = ksClassDeclaration.getAllProperties()
val excludedKSClassProperties = allKSClassProperties.filter { val excludedKSClassProperties = allKSClassProperties.filter { property ->
it.isAnnotationPresent(GenerateCRUDModelExcludeOverride::class) property.isAnnotationPresent(GenerateCRUDModelExcludeOverride::class) || (property.findOverridee() ?.isAnnotationPresent(GenerateCRUDModelExcludeOverride::class) == true)
} }
val excludedKSClassPropertiesNames = excludedKSClassProperties.map { it.simpleName.asString() } val excludedKSClassPropertiesNames = excludedKSClassProperties.map { it.simpleName.asString() }
val ksClassProperties = allKSClassProperties.filter { val ksClassProperties = allKSClassProperties.filter {
it !in excludedKSClassProperties it !in excludedKSClassProperties
}.groupBy { it.simpleName.asString() }.map {
var current = it.value.first()
var currentType = current.type.resolve()
it.value.forEach {
val type = it.type.resolve()
if (currentType.isAssignableFrom(type) && !type.isAssignableFrom(currentType)) {
current = it
currentType = type
}
}
current
} }
val ksClassPropertiesNames = ksClassProperties.map { it.simpleName.asString() } val ksClassPropertiesNames = ksClassProperties.map { it.simpleName.asString() }
val newNewType = TypeSpec.classBuilder(newName).apply { val newNewType = TypeSpec.classBuilder(newName).apply {
@ -99,17 +111,20 @@ class Processor(
} }
primaryConstructor( primaryConstructor(
FunSpec.constructorBuilder().apply { FunSpec.constructorBuilder().apply {
val withoutDefaults = mutableListOf<Pair<ParameterSpec.Builder, PropertySpec.Builder>>()
ksClassProperties.forEach { ksClassProperties.forEach {
addParameter( val property = PropertySpec.builder(it.simpleName.getShortName(), it.type.toTypeName(), KModifier.OVERRIDE).apply {
ParameterSpec.builder(it.simpleName.getShortName(), it.typeName).apply { initializer(it.simpleName.getShortName())
annotations += it.annotations.map { it.toAnnotationSpec() } }
}.build() ParameterSpec.builder(it.simpleName.getShortName(), it.type.toTypeName()).apply {
) withoutDefaults.add(this to property)
typeBuilder.addProperty( annotations += it.annotations.map { it.toAnnotationSpec() }
PropertySpec.builder(it.simpleName.getShortName(), it.typeName, KModifier.OVERRIDE).apply { }
initializer(it.simpleName.getShortName()) }
}.build()
) withoutDefaults.forEach {
addParameter(it.first.build())
addProperty(it.second.build())
} }
}.build() }.build()
) )
@ -125,14 +140,25 @@ class Processor(
(it.arguments.first().value as List<KSType>).map { it.declaration as KSClassDeclaration } (it.arguments.first().value as List<KSType>).map { it.declaration as KSClassDeclaration }
}.toList() }.toList()
val registeredTypesProperties: List<KSPropertyDeclaration> = registeredSupertypes.flatMap { registeredType -> val registeredTypesProperties: List<KSPropertyDeclaration> = registeredSupertypes.flatMap { registeredType ->
registeredType.getAllProperties() registeredType.getAllProperties()
}.filter { }.filter {
it.simpleName.asString() !in excludedKSClassPropertiesNames && it.getAnnotationsByType(GenerateCRUDModelExcludeOverride::class).none() it.simpleName.asString() !in excludedKSClassPropertiesNames && !it.isAnnotationPresent(GenerateCRUDModelExcludeOverride::class)
} }
val allProperties: List<KSPropertyDeclaration> = ksClassProperties.toList() + registeredTypesProperties val allProperties: List<KSPropertyDeclaration> = registeredTypesProperties + ksClassProperties.toList()
val propertiesToOverrideInRegistered = allProperties.distinctBy { it.simpleName.asString() }.sortedBy { property -> val propertiesToOverrideInRegistered = allProperties.groupBy { it.simpleName.asString() }.map {
var current = it.value.first()
var currentType = current.type.resolve()
it.value.forEach {
val type = it.type.resolve()
if (currentType.isAssignableFrom(type) && !type.isAssignableFrom(currentType)) {
current = it
currentType = type
}
}
current
}.sortedBy { property ->
val name = property.simpleName.asString() val name = property.simpleName.asString()
ksClassPropertiesNames.indexOf(name).takeIf { it > -1 } ?.let { ksClassPropertiesNames.indexOf(name).takeIf { it > -1 } ?.let {
@ -156,17 +182,20 @@ class Processor(
addModifiers(KModifier.DATA) addModifiers(KModifier.DATA)
primaryConstructor( primaryConstructor(
FunSpec.constructorBuilder().apply { FunSpec.constructorBuilder().apply {
val withoutDefaults = mutableListOf<Pair<ParameterSpec.Builder, PropertySpec.Builder>>()
propertiesToOverrideInRegistered.forEach { propertiesToOverrideInRegistered.forEach {
addParameter( val property = PropertySpec.builder(it.simpleName.getShortName(), it.type.toTypeName(), KModifier.OVERRIDE).apply {
ParameterSpec.builder(it.simpleName.getShortName(), it.typeName).apply { initializer(it.simpleName.getShortName())
annotations += it.annotations.map { it.toAnnotationSpec() } }
}.build() ParameterSpec.builder(it.simpleName.getShortName(), it.type.toTypeName()).apply {
) withoutDefaults.add(this to property)
typeBuilder.addProperty( annotations += it.annotations.map { it.toAnnotationSpec() }
PropertySpec.builder(it.simpleName.getShortName(), it.typeName, KModifier.OVERRIDE).apply { }
initializer(it.simpleName.getShortName()) }
}.build()
) withoutDefaults.forEach {
addParameter(it.first.build())
addProperty(it.second.build())
} }
}.build() }.build()
) )
@ -191,7 +220,7 @@ class Processor(
FunSpec.builder("asRegistered").apply { FunSpec.builder("asRegistered").apply {
receiver(ksClassDeclaration.toClassName()) receiver(ksClassDeclaration.toClassName())
(registeredTypesProperties.filter { it.simpleName.asString() !in ksClassPropertiesNames }).forEach { (registeredTypesProperties.filter { it.simpleName.asString() !in ksClassPropertiesNames }).forEach {
addParameter(it.simpleName.asString(), it.typeName) addParameter(it.simpleName.asString(), it.type.toTypeName())
} }
addCode( addCode(
CodeBlock.of( CodeBlock.of(

2
repos/generator/test/src/commonMain/kotlin/GeneratedModelsTest.kt
View File

@ -14,6 +14,7 @@ public data class NewTest(
override val property1: String, override val property1: String,
override val property2: Int, override val property2: Int,
@Serializable @Serializable
@SerialName(`value` = "custom_parent_name")
override val parent: ParentTypeId?, override val parent: ParentTypeId?,
) : Test ) : Test
@ -24,6 +25,7 @@ public data class RegisteredTest(
override val property1: String, override val property1: String,
override val property2: Int, override val property2: Int,
@Serializable @Serializable
@SerialName(`value` = "custom_parent_name")
override val parent: ParentTypeId?, override val parent: ParentTypeId?,
) : Test, IRegisteredTest ) : Test, IRegisteredTest

2
repos/generator/test/src/commonMain/kotlin/Test.kt
View File

@ -2,6 +2,7 @@ package dev.inmo.micro_utils.repos.generator.test
import dev.inmo.micro_utils.repos.annotations.GenerateCRUDModel import dev.inmo.micro_utils.repos.annotations.GenerateCRUDModel
import dev.inmo.micro_utils.repos.annotations.GenerateCRUDModelExcludeOverride import dev.inmo.micro_utils.repos.annotations.GenerateCRUDModelExcludeOverride
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlin.jvm.JvmInline import kotlin.jvm.JvmInline
@ -18,6 +19,7 @@ sealed interface Test {
val property1: String val property1: String
val property2: Int val property2: Int
@Serializable @Serializable
@SerialName("custom_parent_name")
val parent: ParentTypeId? val parent: ParentTypeId?
@GenerateCRUDModelExcludeOverride @GenerateCRUDModelExcludeOverride