Skip to content

Commit

Permalink
fixes for generics
Browse files Browse the repository at this point in the history
  • Loading branch information
InsanusMokrassar committed Feb 12, 2025
1 parent 99783f2 commit 5c28255
Show file tree
Hide file tree
Showing 9 changed files with 122 additions and 120 deletions.
25 changes: 25 additions & 0 deletions ksp/generator/src/main/kotlin/KClassWorkarounds.kt
Original file line number Diff line number Diff line change
@@ -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()
}
}
1 change: 1 addition & 0 deletions ksp/variations/generator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ repositories {
}

dependencies {
implementation libs.kt.stdlib
api project(":micro_utils.ksp.generator")
api project(":micro_utils.ksp.variations")
api libs.kotlin.poet
Expand Down
112 changes: 22 additions & 90 deletions ksp/variations/generator/src/main/kotlin/Processor.kt
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
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
Expand All @@ -8,8 +9,11 @@ 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.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
Expand Down Expand Up @@ -128,27 +132,33 @@ class Processor(
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(
variation.argName,
if (variation.varargTypes.isEmpty()) {
ClassName.bestGuess(variation.type)
actualName,
if (genericTypes.isEmpty()) {
type
} else {
ClassName.bestGuess(variation.type).parameterizedBy(
*variation.varargTypes.map { it.asTypeName() }.toTypedArray()
type.parameterizedBy(
*genericTypes.toTypedArray()
)
}
)
.apply {
val defaultValueString = if (it.modifiers.contains(KModifier.VARARG)) {
"""
*${variation.argName}.map { it.${variation.conversion} }.toTypedArray()
""".trimIndent()
} else {
"${variation.argName}.${variation.conversion}"
}
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 {
Expand All @@ -174,84 +184,6 @@ class Processor(
)
}
}
// if (accumulatedGenerations.isEmpty()) {
// variations.forEach { variation ->
// val defaults = mutableMapOf<String, String>()
// accumulatedGenerations.add(
// FunSpec.builder(ksFunctionDeclaration.simpleName.asString()).apply {
// modifiers.addAll(ksFunctionDeclaration.modifiers.mapNotNull { it.toKModifier() })
// ksFunctionDeclaration.extensionReceiver ?.let {
// receiver(it.toTypeName())
// }
// ksFunctionDeclaration.parameters.forEach {
// parameters.add(
// (if (it == parameter) {
// ParameterSpec
// .builder(
// variation.argName,
// if (variation.varargTypes.isEmpty()) {
// ClassName.bestGuess(variation.type)
// } else {
// ClassName.bestGuess(variation.type).parameterizedBy(
// *variation.varargTypes.map { it.asTypeName() }.toTypedArray()
// )
// }
// )
// } else {
// ParameterSpec
// .builder(
// it.name ?.asString() ?: return@forEach,
// 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()
// .apply {
// val name = it.name ?.asString() ?: "this"
// val defaultValueString = if (it.isVararg) {
// """
// *$name.map { it.${variation.conversion} }.toTypedArray()
// """.trimIndent()
// } else {
// "$name.${variation.conversion}"
// }
// defaults[this.name] = defaultValueString
// }
// )
// }
// val parameters = ksFunctionDeclaration.parameters.joinToString(", ") {
// val itName = it.name ?.asString() ?: "this"
// """
// $itName = ${defaults[itName] ?: itName}
// """.trimIndent()
// }
// addCode(
// """
// return ${ksFunctionDeclaration.simpleName.asString()}(
// $parameters
// )
// """.trimIndent()
// )
// }.build() to defaults.toMap()
// )
// }
// } else {
// val reusingGenerations = accumulatedGenerations.toList()
// reusingGenerations
// }
}
accumulatedGenerations.forEach {
addFunction(it.first)
Expand Down
1 change: 1 addition & 0 deletions ksp/variations/generator/test/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ kotlin {
sourceSets {
commonMain {
dependencies {
implementation libs.kt.stdlib
api project(":micro_utils.ksp.variations")
}
}
Expand Down
37 changes: 28 additions & 9 deletions ksp/variations/generator/test/src/commonMain/kotlin/SampleFun.kt
Original file line number Diff line number Diff line change
@@ -1,32 +1,51 @@
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 Sample(
data class SimpleType(
val value: String
)

data class GenericType<T>(
val value: T
)

@GenerateVariations
fun sample(
@GenerationVariant(
"example",
"Sample",
"value"
SimpleType::class,
"value",
)
@GenerationVariant(
GenericType::class,
"value.toString()",
genericTypes = arrayOf(Int::class)
)
example: String = "12"
) = println(example)

@GenerateVariations
suspend fun Sample.sample2(
fun sampleVararg(
@GenerationVariant(
SimpleType::class,
"value",
)
vararg example: String = arrayOf("12")
) = println(example.joinToString())

@GenerateVariations
suspend fun SimpleType.sample2(
@GenerationVariant(
Int::class,
"toString()",
"arg12",
"kotlin.Int",
"toString()"
)
arg1: String = "1",
@GenerationVariant(
String::class,
"toInt()",
"arg22",
"kotlin.String",
"toInt()"
)
arg2: Int = 2,
arg3: Boolean = false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,47 +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 Sample.sample2(arg12: Int): Unit = sample2(
arg1 = arg12.toString()
public suspend fun SimpleType.sample2(arg12: Int): Unit = sample2(
arg1 = with(arg12) {toString()}
)

public suspend fun Sample.sample2(arg12: Int, arg2: Int): Unit = sample2(
arg1 = arg12.toString(), arg2 = arg2
public suspend fun SimpleType.sample2(arg12: Int, arg2: Int): Unit = sample2(
arg1 = with(arg12) {toString()}, arg2 = arg2
)

public suspend fun Sample.sample2(arg12: Int, arg3: Boolean): Unit = sample2(
arg1 = arg12.toString(), arg3 = arg3
public suspend fun SimpleType.sample2(arg12: Int, arg3: Boolean): Unit = sample2(
arg1 = with(arg12) {toString()}, arg3 = arg3
)

public suspend fun Sample.sample2(
public suspend fun SimpleType.sample2(
arg12: Int,
arg2: Int,
arg3: Boolean,
): Unit = sample2(
arg1 = arg12.toString(), arg2 = arg2, arg3 = arg3
arg1 = with(arg12) {toString()}, arg2 = arg2, arg3 = arg3
)

public suspend fun Sample.sample2(arg22: String): Unit = sample2(
arg2 = arg22.toInt()
public suspend fun SimpleType.sample2(arg22: String): Unit = sample2(
arg2 = with(arg22) {toInt()}
)

public suspend fun Sample.sample2(arg1: String, arg22: String): Unit = sample2(
arg1 = arg1, arg2 = arg22.toInt()
public suspend fun SimpleType.sample2(arg1: String, arg22: String): Unit = sample2(
arg1 = arg1, arg2 = with(arg22) {toInt()}
)

public suspend fun Sample.sample2(arg22: String, arg3: Boolean): Unit = sample2(
arg2 = arg22.toInt(), arg3 = arg3
public suspend fun SimpleType.sample2(arg22: String, arg3: Boolean): Unit = sample2(
arg2 = with(arg22) {toInt()}, arg3 = arg3
)

public suspend fun Sample.sample2(
public suspend fun SimpleType.sample2(
arg1: String,
arg22: String,
arg3: Boolean,
): Unit = sample2(
arg1 = arg1, arg2 = arg22.toInt(), arg3 = arg3
arg1 = arg1, arg2 = with(arg22) {toInt()}, arg3 = arg3
)
Original file line number Diff line number Diff line change
@@ -1,8 +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: Sample): Unit = sample(
example = example.value
public fun sample(example: SimpleType): Unit = sample(
example = with(example) {value}
)

public fun sample(example: GenericType<Int>): Unit = sample(
example = with(example) {value.toString()}
)
Original file line number Diff line number Diff line change
@@ -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()}
)
11 changes: 8 additions & 3 deletions ksp/variations/src/commonMain/kotlin/GenerationVariant.kt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@ 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 argName: String,
val type: String,
val type: KClass<*>,
val conversion: String,
vararg val varargTypes: KClass<*>
val argName: String = "",
vararg val genericTypes: KClass<*>
)

0 comments on commit 5c28255

Please sign in to comment.