Skip to content

Support explicit JsType annotations field or class #102

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

Draft
rocketraman wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Support explicit JsType annotations field or class #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 15 additions & 2 deletions ...-toolkit-ksp/src/main/kotlin/de/voize/reaktnativetoolkit/ksp/processor/typescriptUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import io.outfoxx.typescriptpoet.FileSpec
import io.outfoxx.typescriptpoet.NameAllocator
import io.outfoxx.typescriptpoet.SymbolSpec
import io.outfoxx.typescriptpoet.TypeName
import io.outfoxx.typescriptpoet.TypeName.Companion.implicit
import java.io.OutputStreamWriter
import java.nio.charset.StandardCharsets
import java.util.UUID
Expand Down Expand Up @@ -122,6 +123,10 @@ internal fun getTypescriptTypeName(
"kotlin.String" -> TypeName.STRING
"kotlin.Unit" -> TypeName.VOID
else -> null
} ?: when (val jsTypeIdentifier = (annotations ?: ksType.annotations).getJSTypeAnnotationOrNull()?.getJSTypeIdentifier()) {
null -> null
// explicitly provided type via annotation
else -> implicit(jsTypeIdentifier)
} ?: when (ksType.declaration.qualifiedName?.asString()) {
"kotlin.Array", "kotlin.collections.List", "kotlin.collections.Set" -> TypeName.arrayType(
resolveTypeArgument(0)
Expand Down Expand Up @@ -170,7 +175,11 @@ internal fun getTypescriptTypeName(
}
}
ClassKind.CLASS -> {
if (Modifier.DATA in declaration.modifiers) {
// use JsType set on class
val jsTypeAnnotation = declaration.annotations.getJSTypeAnnotationOrNull()
if (jsTypeAnnotation != null) {
implicit(jsTypeAnnotation.getJSTypeIdentifier())
} else if (Modifier.DATA in declaration.modifiers) {
// data class
val rawTypeName = getTypeName(declaration.getTypescriptNameWithNamespace(), externalTypeMapping)
if (sealedSuperclass != null) {
Expand All @@ -195,7 +204,11 @@ internal fun getTypescriptTypeName(
ClassKind.ENUM_ENTRY -> error("Enum entries are not supported")
ClassKind.OBJECT -> {
val rawTypeName = getTypeName(declaration.getTypescriptNameWithNamespace(), externalTypeMapping)
if (sealedSuperclass != null) {
// use JsType set on object
val jsTypeAnnotation = declaration.annotations.getJSTypeAnnotationOrNull()
if (jsTypeAnnotation != null) {
implicit(jsTypeAnnotation.getJSTypeIdentifier())
} else if (sealedSuperclass != null) {
rawTypeName.withoutSealedClassDiscriminator(sealedSuperclass)
} else {
rawTypeName
Expand Down
2 changes: 1 addition & 1 deletion ...akt-native-toolkit/src/commonMain/kotlin/de/voize/reaktnativetoolkit/annotation/JSType.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package de.voize.reaktnativetoolkit.annotation

@Retention(AnnotationRetention.SOURCE)
@Target(AnnotationTarget.TYPE)
@Target(AnnotationTarget.TYPE, AnnotationTarget.CLASS)
annotation class JSType(val identifier: String)
Loading