map tests #2 #3

Author: aSemy

docs/knit/example/example-map-complex-01.kt

@@ -0,0 +1,24 @@
+// This file was automatically generated from maps.md by Knit tool. Do not edit.
+@file:Suppress("PackageDirectoryMismatch", "unused")
+package example.exampleMapComplex01
+
+import kotlinx.serialization.*
+import dev.adamko.kxstsgen.*
+
+@Serializable
+data class Colour(
+  val r: UByte,
+  val g: UByte,
+  val b: UByte,
+  val a: UByte,
+)
+
+@Serializable
+data class CanvasProperties(
+  val colourNames: Map<Colour, String>
+)
+
+fun main() {
+  val tsGenerator = KxsTsGenerator()
+  println(tsGenerator.generate(CanvasProperties.serializer().descriptor))
+}

docs/knit/example/example-map-primitive-02.kt

@@ -0,0 +1,16 @@
+// This file was automatically generated from maps.md by Knit tool. Do not edit.
+@file:Suppress("PackageDirectoryMismatch", "unused")
+package example.exampleMapPrimitive02
+
+import kotlinx.serialization.*
+import dev.adamko.kxstsgen.*
+
+@Serializable
+data class Config(
+  val properties: Map<String?, String?>
+)
+
+fun main() {
+  val tsGenerator = KxsTsGenerator()
+  println(tsGenerator.generate(Config.serializer().descriptor))
+}

docs/knit/test/MapsTests.kt

@@ -15,4 +15,35 @@ class MapsTests {
       "}"
     )
   }
+
+  @Test
+  fun testExampleMapPrimitive02() {
+    captureOutput("ExampleMapPrimitive02") {
+      example.exampleMapPrimitive02.main()
+    }.verifyOutputLines(
+      "interface Config {",
+      "  properties: { [key: string | null]: string | null };",
+      "}"
+    )
+  }
+
+  @Test
+  fun testExampleMapComplex01() {
+    captureOutput("ExampleMapComplex01") {
+      example.exampleMapComplex01.main()
+    }.verifyOutputLines(
+      "type UByte = number;",
+      "",
+      "interface Colour {",
+      "  r: UByte;",
+      "  g: UByte;",
+      "  b: UByte;",
+      "  a: UByte;",
+      "}",
+      "",
+      "interface CanvasProperties {",
+      "  colourNames: { [key: Colour]: string };",
+      "}"
+    )
+  }
 }

docs/maps.md

@@ -5,8 +5,7 @@ import kotlinx.serialization.*
 import dev.adamko.kxstsgen.*
 -->
 
-### Primitive lists
-
+### Primitive maps
 
 ```kotlin
 @Serializable
@@ -29,3 +28,68 @@ interface Config {
 ```
 
 <!--- TEST -->
+
+### Nullable keys and values
+
+```kotlin
+@Serializable
+data class Config(
+  val properties: Map<String?, String?>
+)
+
+fun main() {
+  val tsGenerator = KxsTsGenerator()
+  println(tsGenerator.generate(Config.serializer().descriptor))
+}
+```
+
+> You can get the full code [here](./knit/example/example-map-primitive-02.kt).
+
+```typescript
+interface Config {
+  properties: { [key: string | null]: string | null };
+}
+```
+
+<!--- TEST -->
+
+### Maps with complex keys
+
+```kotlin
+@Serializable
+data class Colour(
+  val r: UByte,
+  val g: UByte,
+  val b: UByte,
+  val a: UByte,
+)
+
+@Serializable
+data class CanvasProperties(
+  val colourNames: Map<Colour, String>
+)
+
+fun main() {
+  val tsGenerator = KxsTsGenerator()
+  println(tsGenerator.generate(CanvasProperties.serializer().descriptor))
+}
+```
+
+> You can get the full code [here](./knit/example/example-map-complex-01.kt).
+
+```typescript
+type UByte = number;
+
+interface Colour {
+  r: UByte;
+  g: UByte;
+  b: UByte;
+  a: UByte;
+}
+
+interface CanvasProperties {
+  colourNames: { [key: Colour]: string };
+}
+```
+
+<!--- TEST -->

modules/kxs-ts-gen-core/src/commonMain/kotlin/dev.adamko.kxstsgen/KxsTsSourceCodeGenerator.kt

@@ -103,8 +103,6 @@ class KxsTsSourceCodeGenerator(
     }
   }
 
-//  private fun generateTypeReference(typeRefs: Collection<TsTyping>) =
-//    generateTypeReference(*typeRefs.toTypedArray())
 
   /**
    * A type-reference, be it for the field of an interface, a type alias, or a generic type