Merge pull request #27 from GoNZooo/r.add-type-to-kotlin-enums

feat: use enum type for kotlin enums
GoNZooo · Oct 11, 2022 · 5cea7d7 · 5cea7d7
2 parents 0b70ba9 + efa1580
commit 5cea7d7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
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.0.0
+version:        2.1.0
 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.0.0
+version: 2.1.0
 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
@@ -75,8 +75,8 @@ outputDefinition (TypeDefinition name (Struct (GenericStruct typeVariables field
 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 name enumerationValues
+outputDefinition (TypeDefinition name (Enumeration type' enumerationValues)) =
+  pure $ outputEnumeration type' name enumerationValues
 outputDefinition (TypeDefinition name (UntaggedUnion unionCases)) =
   pure $ outputUntaggedUnion name unionCases
 outputDefinition (TypeDefinition name (EmbeddedUnion typeTag constructors)) =
@@ -149,8 +149,8 @@ outputUntaggedUnion unionName cases =
           "}"
         ]
 
-outputEnumeration :: DefinitionName -> [EnumerationValue] -> Text
-outputEnumeration name values' =
+outputEnumeration :: BasicTypeValue -> DefinitionName -> [EnumerationValue] -> Text
+outputEnumeration basicType name values' =
   let valuesOutput =
         values'
           & fmap
@@ -171,7 +171,13 @@ outputEnumeration name values' =
       outputLiteralValue (LiteralFloat f) = tshow f
       outputLiteralValue (LiteralBoolean b) = bool "false" "true" b
    in mconcat
-        [ mconcat ["enum class ", nameOf name, "(val data: Any) : java.io.Serializable {\n"],
+        [ mconcat
+            [ "enum class ",
+              nameOf name,
+              "(val data: ",
+              outputFieldType $ BasicType basicType,
+              ") : java.io.Serializable {\n"
+            ],
           valuesOutput,
           ";\n",
           "\n",

diff --git a/test/reference-output/basic.kt b/test/reference-output/basic.kt
@@ -65,7 +65,7 @@ data class SearchesParameters(
     val filters: ArrayList<GetSearchesFilter>
 ) : java.io.Serializable
 
-enum class StillSize(val data: Any) : java.io.Serializable {
+enum class StillSize(val data: String) : java.io.Serializable {
     @JsonProperty("w92") W92("w92"),
     @JsonProperty("w185") W185("w185"),
     @JsonProperty("w300") W300("w300"),