Merge pull request #31 from GoNZooo/r.add-bigint-serializer-in-kotlin

fix(kt): fix BigInt serialization for structs
GoNZooo · Oct 27, 2022 · faeb152 · faeb152
2 parents 722f185 + 025604e
commit faeb152
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.2.3
+
+### Fixes
+
+- Fix bug where structures were not serializable in Kotlin if they had `{I,U}64`
+  fields.
+
 ## 2.2.2
 
 ### Fixes

diff --git a/gotyno-hs.cabal b/gotyno-hs.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           gotyno-hs
-version:        2.2.2
+version:        2.2.3
 synopsis:       A type definition compiler supporting multiple output languages.
 description:    Compiles type definitions into F#, TypeScript and Python, with validators, decoders and encoders.
 category:       Compiler

diff --git a/package.yaml b/package.yaml
@@ -1,5 +1,5 @@
 name:    gotyno-hs
-version: 2.2.2
+version: 2.2.3
 synopsis: A type definition compiler supporting multiple output languages.
 description: Compiles type definitions into F#, TypeScript and Python, with validators, decoders and encoders.
 license: BSD2

diff --git a/src/CodeGeneration/Kotlin.hs b/src/CodeGeneration/Kotlin.hs
@@ -64,7 +64,8 @@ modulePrelude =
       "import com.fasterxml.jackson.databind.deser.std.*\n",
       "import java.text.ParseException\n",
       "import java.math.BigInteger\n",
-      "import kotlinx.serialization.Serializable"
+      "import kotlinx.serialization.Serializable\n",
+      "import org.gotynoDeclarations.BigIntegerSerializer"
     ]
 
 outputDefinition :: TypeDefinition -> Maybe Text
@@ -74,7 +75,6 @@ outputDefinition (TypeDefinition name (Struct (GenericStruct typeVariables field
   pure $ outputGenericStruct name typeVariables fields
 outputDefinition (TypeDefinition name (Union typeTag unionType)) =
   pure $ outputUnion name typeTag unionType
--- @TODO: use the type here to set the type of the enumeration
 outputDefinition (TypeDefinition name (Enumeration type' enumerationValues)) =
   pure $ outputEnumeration type' name enumerationValues
 outputDefinition (TypeDefinition name (UntaggedUnion unionCases)) =
@@ -332,6 +332,9 @@ outputField (StructField fieldName fieldType) =
     [ "@get:JsonProperty(\"",
       unFieldName fieldName,
       "\")\n",
+      if isBigIntType fieldType
+        then "    @Serializable(with = BigIntegerSerializer::class)\n"
+        else "",
       "    val ",
       unFieldName fieldName,
       ": ",
@@ -483,6 +486,17 @@ fieldTypeName
   (DefinitionReferenceType (DeclarationReference _moduleName' (DefinitionName definitionName))) =
     definitionName
 
+isBigIntType :: FieldType -> Bool
+isBigIntType (ComplexType (SliceType fieldType)) = isBigIntType fieldType
+isBigIntType (ComplexType (ArrayType _size fieldType)) = isBigIntType fieldType
+isBigIntType (ComplexType (OptionalType fieldType)) = isBigIntType fieldType
+isBigIntType (ComplexType (PointerType fieldType)) = isBigIntType fieldType
+isBigIntType (BasicType U64) = True
+isBigIntType (BasicType U128) = True
+isBigIntType (BasicType I64) = True
+isBigIntType (BasicType I128) = True
+isBigIntType _ = False
+
 joinTypeVariables :: [TypeVariable] -> Text
 joinTypeVariables = fmap unTypeVariable >>> Text.intercalate ", "
 

diff --git a/test/reference-output/basic.kt b/test/reference-output/basic.kt
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.deser.std.*
 import java.text.ParseException
 import java.math.BigInteger
 import kotlinx.serialization.Serializable
+import org.gotynoDeclarations.BigIntegerSerializer
 
 class Basic {
 @Serializable
@@ -20,6 +21,7 @@ data class Recruiter(
     @get:JsonProperty("recruiter")
     val recruiter: Recruiter?,
     @get:JsonProperty("created")
+    @Serializable(with = BigIntegerSerializer::class)
     val created: BigInteger,
     @get:JsonProperty("type")
     val type: String = "Recruiter"

diff --git a/test/reference-output/basicEnumeration.kt b/test/reference-output/basicEnumeration.kt
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.deser.std.*
 import java.text.ParseException
 import java.math.BigInteger
 import kotlinx.serialization.Serializable
+import org.gotynoDeclarations.BigIntegerSerializer
 
 class BasicEnumeration {
 enum class StringValues(val data: String) : java.io.Serializable {

diff --git a/test/reference-output/basicImport.kt b/test/reference-output/basicImport.kt
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.deser.std.*
 import java.text.ParseException
 import java.math.BigInteger
 import kotlinx.serialization.Serializable
+import org.gotynoDeclarations.BigIntegerSerializer
 
 import org.gotynoOutput.BasicStruct
 

diff --git a/test/reference-output/basicOptional.kt b/test/reference-output/basicOptional.kt
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.deser.std.*
 import java.text.ParseException
 import java.math.BigInteger
 import kotlinx.serialization.Serializable
+import org.gotynoDeclarations.BigIntegerSerializer
 
 class BasicOptional {
 @Serializable

diff --git a/test/reference-output/basicStruct.kt b/test/reference-output/basicStruct.kt
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.deser.std.*
 import java.text.ParseException
 import java.math.BigInteger
 import kotlinx.serialization.Serializable
+import org.gotynoDeclarations.BigIntegerSerializer
 
 class BasicStruct {
 @Serializable

diff --git a/test/reference-output/basicUnion.kt b/test/reference-output/basicUnion.kt
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.deser.std.*
 import java.text.ParseException
 import java.math.BigInteger
 import kotlinx.serialization.Serializable
+import org.gotynoDeclarations.BigIntegerSerializer
 
 class BasicUnion {
 @Serializable

diff --git a/test/reference-output/genericStruct.kt b/test/reference-output/genericStruct.kt
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.deser.std.*
 import java.text.ParseException
 import java.math.BigInteger
 import kotlinx.serialization.Serializable
+import org.gotynoDeclarations.BigIntegerSerializer
 
 class GenericStruct {
 @Serializable

diff --git a/test/reference-output/genericUnion.kt b/test/reference-output/genericUnion.kt
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.deser.std.*
 import java.text.ParseException
 import java.math.BigInteger
 import kotlinx.serialization.Serializable
+import org.gotynoDeclarations.BigIntegerSerializer
 
 class GenericUnion {
 @Serializable

diff --git a/test/reference-output/generics.kt b/test/reference-output/generics.kt
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.deser.std.*
 import java.text.ParseException
 import java.math.BigInteger
 import kotlinx.serialization.Serializable
+import org.gotynoDeclarations.BigIntegerSerializer
 
 import org.gotynoOutput.Basic
 import org.gotynoOutput.HasGeneric

diff --git a/test/reference-output/github.kt b/test/reference-output/github.kt
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.deser.std.*
 import java.text.ParseException
 import java.math.BigInteger
 import kotlinx.serialization.Serializable
+import org.gotynoDeclarations.BigIntegerSerializer
 
 class Github {
 @Serializable

diff --git a/test/reference-output/hasGeneric.kt b/test/reference-output/hasGeneric.kt
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.deser.std.*
 import java.text.ParseException
 import java.math.BigInteger
 import kotlinx.serialization.Serializable
+import org.gotynoDeclarations.BigIntegerSerializer
 
 import org.gotynoDeclarations.*
 

diff --git a/test/reference-output/importExample.kt b/test/reference-output/importExample.kt
@@ -9,6 +9,7 @@ import com.fasterxml.jackson.databind.deser.std.*
 import java.text.ParseException
 import java.math.BigInteger
 import kotlinx.serialization.Serializable
+import org.gotynoDeclarations.BigIntegerSerializer
 
 import org.gotynoOutput.Basic