Fixes

flock-community · Dec 17, 2024 · 8565dd9 · 8565dd9
1 parent 82c84da
commit 8565dd9
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 24 deletions.
diff --git a/src/compiler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/parse/Node.kt b/src/compiler/core/src/commonMain/kotlin/community/flock/wirespec/compiler/core/parse/Node.kt
@@ -48,7 +48,6 @@ sealed interface Reference : Value<String> {
 
     data class Primitive(
         val type: Type,
-        val origin: String? = null,
         override val isIterable: Boolean = false,
         override val isDictionary: Boolean = false
     ) : Reference {

diff --git a/...erter/avro/src/commonMain/kotlin/community/flock/wirespec/converter/avro/AvroConverter.kt b/...erter/avro/src/commonMain/kotlin/community/flock/wirespec/converter/avro/AvroConverter.kt
@@ -16,11 +16,11 @@ object AvroConverter {
     fun AvroModel.TypeList.isNullable() = contains(nullType)
     fun AvroModel.SimpleType.toPrimitive() = when (this.value) {
         "boolean" -> Reference.Primitive.Type.Boolean
-        "int" -> Reference.Primitive.Type.Integer
-        "long" -> Reference.Primitive.Type.Integer
-        "float" -> Reference.Primitive.Type.Number
-        "double" -> Reference.Primitive.Type.Number
-        "bytes" -> Reference.Primitive.Type.String
+        "int" -> Reference.Primitive.Type.Integer(Reference.Primitive.Type.Precision.P32)
+        "long" -> Reference.Primitive.Type.Integer(Reference.Primitive.Type.Precision.P64)
+        "float" -> Reference.Primitive.Type.Number(Reference.Primitive.Type.Precision.P32)
+        "double" -> Reference.Primitive.Type.Number(Reference.Primitive.Type.Precision.P64)
+        "bytes" -> Reference.Primitive.Type.Bytes
         "string" -> Reference.Primitive.Type.String
         else -> TODO("primitive not mapped ${this.value}")
     }
@@ -34,7 +34,6 @@ object AvroConverter {
 
             "boolean", "int", "long", "float", "double", "bytes", "string" -> Reference.Primitive(
                 type = toPrimitive(),
-                origin = value,
                 isIterable = isIterable,
                 isDictionary = false
             )

diff --git a/...nverter/avro/src/commonMain/kotlin/community/flock/wirespec/converter/avro/AvroEmitter.kt b/...nverter/avro/src/commonMain/kotlin/community/flock/wirespec/converter/avro/AvroEmitter.kt
@@ -28,14 +28,19 @@ object AvroEmitter {
 
     fun Reference.emit(ast:AST, hasEmitted: MutableList<String>): AvroModel.Type = when (val ref = this) {
         is Reference.Primitive -> {
-            val origin = ref.origin?.let { AvroModel.SimpleType(it) }
-            val type = when(ref.type){
-                Reference.Primitive.Type.String-> AvroModel.SimpleType("string")
-                Reference.Primitive.Type.Integer -> AvroModel.SimpleType("int")
-                Reference.Primitive.Type.Number -> AvroModel.SimpleType("float")
-                Reference.Primitive.Type.Boolean -> AvroModel.SimpleType("boolean")
+            when(val type = ref.type){
+                is Reference.Primitive.Type.String-> AvroModel.SimpleType("string")
+                is Reference.Primitive.Type.Integer -> when(type.precision){
+                    Reference.Primitive.Type.Precision.P32 -> AvroModel.SimpleType("int")
+                    Reference.Primitive.Type.Precision.P64 -> AvroModel.SimpleType("long")
+                }
+                is Reference.Primitive.Type.Number -> when(type.precision){
+                    Reference.Primitive.Type.Precision.P32 -> AvroModel.SimpleType("float")
+                    Reference.Primitive.Type.Precision.P64 -> AvroModel.SimpleType("double")
+                }
+                is Reference.Primitive.Type.Boolean -> AvroModel.SimpleType("boolean")
+                is Reference.Primitive.Type.Bytes -> AvroModel.SimpleType("bytes")
             }
-            origin ?: type
         }
         is Reference.Custom -> {
             when (val def = ast.findType(ref.value)) {

diff --git a/...ter/openapi/src/commonMain/kotlin/community/flock/wirespec/openapi/v2/OpenApiV2Emitter.kt b/...ter/openapi/src/commonMain/kotlin/community/flock/wirespec/openapi/v2/OpenApiV2Emitter.kt
@@ -41,7 +41,7 @@ object OpenApiV2Emitter: Emitter(noLogger) {
 
     override fun emit(type: Type, ast: AST) = notYetImplemented()
 
-    override fun emit(enum: Enum) = notYetImplemented()
+    override fun emit(enum: Enum, ast: AST) = notYetImplemented()
 
     override fun emit(refined: Refined) = notYetImplemented()
 

diff --git a/...rter/openapi/src/commonMain/kotlin/community/flock/wirespec/openapi/v2/OpenApiV2Parser.kt b/...rter/openapi/src/commonMain/kotlin/community/flock/wirespec/openapi/v2/OpenApiV2Parser.kt
@@ -395,7 +395,7 @@ object OpenApiV2Parser {
         schema.enum != null -> Reference.Custom(name, false, schema.additionalProperties != null)
         else -> when (val type = schema.type) {
             OpenapiType.STRING, OpenapiType.INTEGER, OpenapiType.NUMBER, OpenapiType.BOOLEAN ->
-                Reference.Primitive(type.toPrimitive(schema.format), null, false, schema.additionalProperties != null)
+                Reference.Primitive(type.toPrimitive(schema.format), false, schema.additionalProperties != null)
 
             null, OpenapiType.OBJECT ->
                 when {
@@ -518,7 +518,7 @@ object OpenApiV2Parser {
                     ?.let {
                         Endpoint.Segment.Param(
                             FieldIdentifier(param),
-                            Reference.Primitive(it, null, false)
+                            Reference.Primitive(it, false)
                         )
                     }
                     ?: error(" Declared path parameter $param needs to be defined as a path parameter in path or operation level")

diff --git a/...ter/openapi/src/commonMain/kotlin/community/flock/wirespec/openapi/v3/OpenApiV3Emitter.kt b/...ter/openapi/src/commonMain/kotlin/community/flock/wirespec/openapi/v3/OpenApiV3Emitter.kt
@@ -51,7 +51,7 @@ object OpenApiV3Emitter : Emitter(noLogger) {
 
     override fun emit(type: Type, ast: AST) = notYetImplemented()
 
-    override fun emit(enum: Enum) = notYetImplemented()
+    override fun emit(enum: Enum, ast: AST) = notYetImplemented()
 
     override fun emit(refined: Refined) = notYetImplemented()
 

diff --git a/...rter/openapi/src/commonMain/kotlin/community/flock/wirespec/openapi/v3/OpenApiV3Parser.kt b/...rter/openapi/src/commonMain/kotlin/community/flock/wirespec/openapi/v3/OpenApiV3Parser.kt
@@ -503,7 +503,6 @@ object OpenApiV3Parser {
         else -> when (val type = schema.type) {
             OpenapiType.STRING, OpenapiType.NUMBER, OpenapiType.INTEGER, OpenapiType.BOOLEAN -> Reference.Primitive(
                 type.toPrimitive(schema.format),
-                null,
                 false,
                 schema.additionalProperties != null
             )

diff --git a/...src/jvmMain/kotlin/community/flock/wirespec/integration/avro/java/emit/AvroJavaEmitter.kt b/...src/jvmMain/kotlin/community/flock/wirespec/integration/avro/java/emit/AvroJavaEmitter.kt
@@ -94,8 +94,8 @@ class AvroJavaEmitter(packageName: String, logger: Logger) : JavaEmitter(package
                         else -> "record.put(${index}, ${field.reference.emit()}.Avro.to(data.${emit(field.identifier)}()));"
                     }
 
-                    is Reference.Primitive -> when {
-                        reference.origin == "bytes" -> "record.put(${index}, java.nio.ByteBuffer.wrap(data.${emit(field.identifier)}().getBytes()));"
+                    is Reference.Primitive -> when(reference.type) {
+                        is Reference.Primitive.Type.Bytes -> "record.put(${index}, java.nio.ByteBuffer.wrap(data.${emit(field.identifier)}().getBytes()));"
                         else -> "record.put(${index}, data.${emit(field.identifier)}()${if (field.isNullable) ".orElse(null)" else ""});"
                     }
 
@@ -117,7 +117,7 @@ class AvroJavaEmitter(packageName: String, logger: Logger) : JavaEmitter(package
 
                     is Reference.Primitive -> when {
                         field.isNullable -> "(${field.emitType()}) java.util.Optional.ofNullable((${field.reference.emitType()}) record.get(${index}))"
-                        reference.origin == "bytes" -> "(${field.emitType()}) new String(((java.nio.ByteBuffer) record.get(${index})).array())"
+                        reference.type == Reference.Primitive.Type.Bytes -> "(${field.emitType()}) new String(((java.nio.ByteBuffer) record.get(${index})).array())"
                         reference.type == Reference.Primitive.Type.String -> "(${field.emitType()}) record.get(${index}).toString()"
                         else -> "(${field.emitType()}) record.get(${index})"
                     }

diff --git a/...jvmMain/kotlin/community/flock/wirespec/integration/avro/kotlin/emit/AvroKotlinEmitter.kt b/...jvmMain/kotlin/community/flock/wirespec/integration/avro/kotlin/emit/AvroKotlinEmitter.kt
@@ -96,7 +96,7 @@ class AvroKotlinEmitter(val packageName: String, logger: Logger) : KotlinEmitter
                     }
 
                     is Reference.Primitive -> when {
-                        reference.origin == "bytes" -> "record.put(${index}, java.nio.ByteBuffer.wrap(model.${emit(field.identifier)}.toByteArray()));"
+                        reference.type == Reference.Primitive.Type.Bytes -> "record.put(${index}, java.nio.ByteBuffer.wrap(model.${emit(field.identifier)}.toByteArray()));"
                         else -> "record.put(${index}, model.${emit(field.identifier)});"
                     }
 
@@ -116,7 +116,7 @@ class AvroKotlinEmitter(val packageName: String, logger: Logger) : KotlinEmitter
                     }
 
                     is Reference.Primitive -> when {
-                        reference.origin == "bytes" -> "String((record.get(${index}) as java.nio.ByteBuffer).array())"
+                        reference.type == Reference.Primitive.Type.Bytes -> "String((record.get(${index}) as java.nio.ByteBuffer).array())"
                         reference.type == Reference.Primitive.Type.String -> "record.get(${index}).toString() as ${field.emitType()}"
                         else -> "record.get(${index}) as ${field.emitType()}"
                     }