Reference internal classes full qualified (#208)

flock-community · May 16, 2024 · cbb77a9 · cbb77a9
1 parent c3ef1d5
commit cbb77a9
Show file tree

Hide file tree

Showing 9 changed files with 268 additions and 14 deletions.
diff --git a/...ler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/JavaEmitter.kt b/...ler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/JavaEmitter.kt
@@ -274,7 +274,8 @@ class JavaEmitter(
 
     override fun Reference.Generics.emit(): String = references
         .takeIf { it.isNotEmpty() }
-        ?.joinToString(", ", "<", ">") { it.emitWrap() }
+        ?.map { it.emitWrap() }
+        ?.joinToString(", ", "<", ">") { it }
         .orEmpty()
 
     override fun Reference.emit(): String = when (this) {
@@ -288,7 +289,7 @@ class JavaEmitter(
         .let { if (isOptional) "java.util.Optional<$it>" else it }
 
     override fun Reference.Custom.emit(): String = """
-        |${name.sanitizeSymbol()}${generics.emit()}
+        |${if (name in internalClasses && !isInternal) "${packageName}." else ""}${name.sanitizeSymbol()}${generics.emit()}
     """.trimMargin()
 
 

diff --git a/...r/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/KotlinEmitter.kt b/...r/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/KotlinEmitter.kt
@@ -234,7 +234,7 @@ class KotlinEmitter(
         "Wirespec.${name}${generics.emit()}"
 
     override fun Reference.Custom.emit(): String = """
-        |${name.sanitizeSymbol()}${generics.emit()}
+        |${if (name in internalClasses && !isInternal) "${packageName}." else ""}${name.sanitizeSymbol()}${generics.emit()}
     """.trimMargin()
 
     override fun Reference.Language.emit(): String = """

diff --git a/...re/src/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/TypeScriptEmitter.kt b/...re/src/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/TypeScriptEmitter.kt
@@ -197,7 +197,7 @@ class TypeScriptEmitter(logger: Logger = noLogger) : DefinitionModelEmitter, Emi
     private fun Identifier.sanitizeSymbol() = value.sanitizeSymbol()
 
     private fun String.sanitizeSymbol() = asSequence()
-        .filter { it.isLetterOrDigit() || listOf('_').contains(it) }
+        .filter { it.isLetterOrDigit() || it in listOf('_') }
         .joinToString("")
 
     private fun Field.Reference.toField(identifier: String, isNullable: Boolean) = Field(

diff --git a/.../core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/common/Emitter.kt b/.../core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/common/Emitter.kt
@@ -49,5 +49,8 @@ abstract class Emitter(
         fun AST.hasEndpoints() = any { it is Endpoint }
         fun String.isInt() = toIntOrNull() != null
         fun String.isStatusCode() = toIntOrNull()?.let { it in 0..599 } ?: false
+        val internalClasses = setOf(
+            "Request", "Response"
+        )
     }
 }
diff --git a/...c/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/transformer/ClassModel.kt b/...c/commonMain/kotlin/community/flock/wirespec/compiler/core/emit/transformer/ClassModel.kt
@@ -147,12 +147,14 @@ sealed interface Reference {
     val isNullable: Boolean
     val isIterable: Boolean
     val isOptional: Boolean
+    val isInternal: Boolean
 
     data class Language(
         val primitive: Primitive,
         override val isNullable: Boolean = false,
         override val isIterable: Boolean = false,
         override val isOptional: Boolean = false,
+        override val isInternal: Boolean = false,
         val generics: Generics = Generics()
     ) : Reference {
         enum class Primitive { Any, Unit, String, Integer, Long, Double, Number, Boolean, Map, List }
@@ -163,6 +165,7 @@ sealed interface Reference {
         override val isNullable: Boolean = false,
         override val isIterable: Boolean = false,
         override val isOptional: Boolean = false,
+        override val isInternal: Boolean = false,
         val generics: Generics = Generics()
     ) : Reference
 
@@ -171,6 +174,7 @@ sealed interface Reference {
         override val isNullable: Boolean = false,
         override val isIterable: Boolean = false,
         override val isOptional: Boolean = false,
+        override val isInternal: Boolean = false,
         val generics: Generics = Generics()
     ) : Reference
 

diff --git a/...n/kotlin/community/flock/wirespec/compiler/core/emit/transformer/ClassModelTransformer.kt b/...n/kotlin/community/flock/wirespec/compiler/core/emit/transformer/ClassModelTransformer.kt
@@ -273,6 +273,7 @@ object ClassModelTransformer : Transformer {
                     supers = listOf(
                         Reference.Custom(
                             name = className("Request"),
+                            isInternal = true,
                             generics = Reference.Generics(
                                 listOf(
                                     it.content?.reference?.transform(it.content.isNullable, false)
@@ -289,7 +290,10 @@ object ClassModelTransformer : Transformer {
                     EndpointClass.RequestMapper.RequestCondition(
                         content = it.content?.transform(),
                         isIterable = it.content?.reference?.isIterable ?: false,
-                        responseReference = Reference.Custom(className("Request", it.content.name()))
+                        responseReference = Reference.Custom(
+                            name = className("Request", it.content.name()),
+                            isInternal = true
+                        )
                     )
                 }
             ),
@@ -301,7 +305,8 @@ object ClassModelTransformer : Transformer {
                         content = it.content?.transform(),
                         isIterable = it.content?.reference?.isIterable ?: false,
                         responseReference = Reference.Custom(
-                            name = className("Response", it.status, it.content.name())
+                            name = className("Response", it.status, it.content.name()),
+                            isInternal = true
                         )
                     )
                 }
@@ -313,6 +318,7 @@ object ClassModelTransformer : Transformer {
                     EndpointClass.ResponseInterface(
                         name = Reference.Custom(
                             name = className("Response", it),
+                            isInternal = true,
                             generics = Reference.Generics(
                                 listOf(
                                     Reference.Custom("T")
@@ -321,6 +327,7 @@ object ClassModelTransformer : Transformer {
                         ),
                         `super` = Reference.Custom(
                             name = "Response",
+                            isInternal = true,
                             generics = Reference.Generics(
                                 listOf(
                                     Reference.Custom("T")
@@ -336,6 +343,7 @@ object ClassModelTransformer : Transformer {
                     EndpointClass.ResponseInterface(
                         name = Reference.Custom(
                             name = className("Response", it),
+                            isInternal = true,
                             generics = Reference.Generics(
                                 listOf(
                                     Reference.Custom("T")
@@ -344,6 +352,7 @@ object ClassModelTransformer : Transformer {
                         ),
                         `super` = Reference.Custom(
                             name = className("Response", it.groupStatus()),
+                            isInternal = true,
                             generics = Reference.Generics(
                                 listOf(
                                     Reference.Custom("T")
@@ -487,6 +496,7 @@ object ClassModelTransformer : Transformer {
                             )
                         ),
                         isNullable = false,
+                        isInternal = true
                     ),
                     statusCode = it.status,
                     content = it.content?.transform(),

diff --git a/.../core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/parse/TokenProvider.kt b/.../core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/parse/TokenProvider.kt
@@ -9,7 +9,6 @@ import community.flock.wirespec.compiler.core.exceptions.WirespecException.Compi
 import community.flock.wirespec.compiler.core.tokenize.Token
 import community.flock.wirespec.compiler.core.tokenize.Tokens
 import community.flock.wirespec.compiler.core.tokenize.removeWhiteSpace
-import community.flock.wirespec.compiler.core.tokenize.types.CustomType
 import community.flock.wirespec.compiler.core.tokenize.types.WirespecDefinition
 import community.flock.wirespec.compiler.utils.Logger
 
@@ -31,7 +30,7 @@ class TokenProvider(private val logger: Logger, list: NonEmptyList<Token>) {
         }
 
     fun Token.shouldBeDefined(): Either<WirespecException, Unit> = either {
-        if (!definitionNames.contains(value)) {
+        if (value !in definitionNames) {
             raise(ParserException.DefinitionNotExistsException(value, coordinates))
         }
     }