Skip to content

de-duplicate nullable/non-nullable SerialDescriptors after extraction #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 17, 2023
Merged

de-duplicate nullable/non-nullable SerialDescriptors after extraction #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
193b47f
de-duplicate nullable/non-nullable SerialDescriptors after extraction
aSemy Sep 16, 2023
c193ba6
Merge branch 'main' into fix/de-dupe-nullable-descriptors
aSemy Sep 16, 2023
25013fe
simplify test example
aSemy Sep 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions ...gen-core/src/commonMain/kotlin/dev/adamko/kxstsgen/core/SerializerDescriptorsExtractor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@ package dev.adamko.kxstsgen.core

import dev.adamko.kxstsgen.core.util.MutableMapWithDefaultPut
import kotlinx.serialization.KSerializer
import kotlinx.serialization.descriptors.PolymorphicKind
import kotlinx.serialization.descriptors.PrimitiveKind
import kotlinx.serialization.descriptors.SerialDescriptor
import kotlinx.serialization.descriptors.SerialKind
import kotlinx.serialization.descriptors.StructureKind
import kotlinx.serialization.descriptors.elementDescriptors
import kotlinx.serialization.descriptors.*


/**
Expand All @@ -26,6 +21,8 @@ fun interface SerializerDescriptorsExtractor {
serializer: KSerializer<*>
): Set<SerialDescriptor> {
return extractDescriptors(serializer.descriptor)
.distinctBy { it.nullable }
.toSet()
}


Expand Down
61 changes: 44 additions & 17 deletions ...core/src/commonTest/kotlin/dev/adamko/kxstsgen/core/SerializerDescriptorsExtractorTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import io.kotest.core.spec.style.FunSpec
import io.kotest.matchers.collections.shouldContainExactlyInAnyOrder
import kotlinx.serialization.Serializable
import kotlinx.serialization.builtins.serializer
import kotlinx.serialization.descriptors.SerialDescriptor

class SerializerDescriptorsExtractorTest : FunSpec({

Expand All @@ -18,14 +19,7 @@ class SerializerDescriptorsExtractorTest : FunSpec({

val actual = SerializerDescriptorsExtractor.Default(Example1.Parent.serializer())

withClue(
"""
expected: ${expected.map { it.serialName }.sorted().joinToString()}
actual: ${actual.map { it.serialName }.sorted().joinToString()}
""".trimIndent()
) {
actual shouldContainExactlyInAnyOrder expected
}
actual shouldContainDescriptors expected
}

test("Example2: given parent class, expect subclass property descriptor extracted") {
Expand All @@ -38,17 +32,36 @@ class SerializerDescriptorsExtractorTest : FunSpec({

val actual = SerializerDescriptorsExtractor.Default(Example2.Parent.serializer())

withClue(
"""
expected: ${expected.map { it.serialName }.sorted().joinToString()}
actual: ${actual.map { it.serialName }.sorted().joinToString()}
""".trimIndent()
) {
actual shouldContainExactlyInAnyOrder expected
}
actual shouldContainDescriptors expected
}

})
test("Example3: expect nullable/non-nullable SerialDescriptors be de-duplicated") {

val expected = listOf(
Example3.SomeType.serializer().descriptor,
Example3.TypeHolder.serializer().descriptor,
String.serializer().descriptor,
)

val actual = SerializerDescriptorsExtractor.Default(Example3.TypeHolder.serializer())

actual shouldContainDescriptors expected
}
}) {
companion object {
private infix fun Collection<SerialDescriptor>.shouldContainDescriptors(expected: Collection<SerialDescriptor>) {
val actual = this
withClue(
"""
expected: ${expected.map { it.serialName }.sorted().joinToString()}
actual: ${actual.map { it.serialName }.sorted().joinToString()}
""".trimIndent()
) {
actual shouldContainExactlyInAnyOrder expected
}
}
}
}


@Suppress("unused")
Expand Down Expand Up @@ -78,3 +91,17 @@ private object Example2 {
@Serializable
class SubClass1(val n: Nested) : SealedSub()
}


@Suppress("unused")
private object Example3 {

@Serializable
class SomeType(val a: String)

@Serializable
class TypeHolder(
val required: SomeType,
val optional: SomeType?,
)
}