fix issues with nullable types #10

fridewald · lpil · commit 4b2511d34abb · 2025-04-27T09:52:57.000+01:00
* wrap nullable types in Option
* use correct decoder function
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## v1.1.3 - tba
 
 - Fixed typo in helper function
+- Fixed issues with nullable types
 
 ## v1.1.2 - 2025-01-08
 
diff --git a/birdie_snapshots/codegen_discriminator_as_elements_test.accepted b/birdie_snapshots/codegen_discriminator_as_elements_test.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_discriminator_as_elements_test
 file: ./test/json_typedef_test.gleam
 test_name: codegen_discriminator_as_elements_test
@@ -58,7 +58,7 @@ import gleam/option
 pub type DataElement {
   DataElementDown(
     depth: Float,
-    note: String,
+    note: option.Option(String),
   )
   DataElementUp(
     height: Int,
@@ -80,7 +80,7 @@ pub fn data_decoder() -> decode.Decoder(List(DataElement)) {
     DataElementDown(depth:, note:)
   })
   |> decode.field("depth", decode.float)
-  |> decode.field("note", decode.nullable(decode.string))
+  |> decode.field("note", decode.optional(decode.string))
       _ -> decode.fail("DataElement")
     }
   }))
diff --git a/birdie_snapshots/codegen_discriminator_nullable_as_elements_test.accepted b/birdie_snapshots/codegen_discriminator_nullable_as_elements_test.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_discriminator_nullable_as_elements_test
 file: ./test/json_typedef_test.gleam
 test_name: codegen_discriminator_nullable_as_elements_test
@@ -58,7 +58,7 @@ import gleam/option
 pub type DataElement {
   DataElementDown(
     depth: Float,
-    note: String,
+    note: option.Option(String),
   )
   DataElementUp(
     height: Int,
@@ -80,7 +80,7 @@ pub fn data_decoder() -> decode.Decoder(List(option.Option(DataElement))) {
     DataElementDown(depth:, note:)
   })
   |> decode.field("depth", decode.float)
-  |> decode.field("note", decode.nullable(decode.string))
+  |> decode.field("note", decode.optional(decode.string))
       _ -> decode.fail("DataElement")
     }
   }))
diff --git a/birdie_snapshots/codegen_discriminator_nullable_test.accepted b/birdie_snapshots/codegen_discriminator_nullable_test.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_discriminator_nullable_test
 file: ./test/json_typedef_test.gleam
 test_name: codegen_discriminator_nullable_test
@@ -54,7 +54,7 @@ import gleam/option
 pub type Data {
   DataDown(
     depth: Float,
-    note: String,
+    note: option.Option(String),
   )
   DataUp(
     height: Int,
@@ -76,7 +76,7 @@ pub fn data_decoder() -> decode.Decoder(option.Option(Data)) {
     DataDown(depth:, note:)
   })
   |> decode.field("depth", decode.float)
-  |> decode.field("note", decode.nullable(decode.string))
+  |> decode.field("note", decode.optional(decode.string))
       _ -> decode.fail("Data")
     }
   })
diff --git a/birdie_snapshots/codegen_discriminator_test.accepted b/birdie_snapshots/codegen_discriminator_test.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_discriminator_test
 file: ./test/json_typedef_test.gleam
 test_name: codegen_discriminator_test
@@ -54,7 +54,7 @@ import gleam/option
 pub type Data {
   DataDown(
     depth: Float,
-    note: String,
+    note: option.Option(String),
   )
   DataUp(
     height: Int,
@@ -76,7 +76,7 @@ pub fn data_decoder() -> decode.Decoder(Data) {
     DataDown(depth:, note:)
   })
   |> decode.field("depth", decode.float)
-  |> decode.field("note", decode.nullable(decode.string))
+  |> decode.field("note", decode.optional(decode.string))
       _ -> decode.fail("Data")
     }
   })
diff --git a/birdie_snapshots/codegen_element_enum_directions_nullable_test.accepted b/birdie_snapshots/codegen_element_enum_directions_nullable_test.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_element_enum_directions_nullable_test
 file: ./test/json_typedef_test.gleam
 test_name: codegen_element_enum_directions_nullable_test
@@ -31,7 +31,7 @@ pub type DataElement {
 }
 
 pub fn data_decoder() -> decode.Decoder(List(option.Option(DataElement))) {
-  decode.list(decode.nullable(decode.then(decode.string, fn(s) {
+  decode.list(decode.optional(decode.then(decode.string, fn(s) {
     case s {
       "UP" -> decode.into(Up)
       "DOWN" -> decode.into(Down)
diff --git a/birdie_snapshots/codegen_properties_mixed_test.accepted b/birdie_snapshots/codegen_properties_mixed_test.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_properties_mixed_test
 file: ./test/json_typedef_test.gleam
 test_name: codegen_properties_mixed_test
@@ -76,7 +76,7 @@ fn helper__optional_property(
   key: String,
   value: option.Option(a),
   to_json: fn(a) -> json.Json,
-) -> List(#(String, json.Json)), {
+) -> List(#(String, json.Json)) {
   case value {
     option.Some(value) -> [#(key, to_json(value)), ..object]
     option.None -> object
diff --git a/birdie_snapshots/codegen_properties_nullable_in_elements_test.accepted b/birdie_snapshots/codegen_properties_nullable_in_elements_test.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_properties_nullable_in_elements_test
 file: ./test/json_typedef_test.gleam
 test_name: codegen_properties_nullable_in_elements_test
@@ -39,7 +39,7 @@ pub type DataElement {
 }
 
 pub fn data_decoder() -> decode.Decoder(List(option.Option(DataElement))) {
-  decode.list(decode.nullable(decode.into({
+  decode.list(decode.optional(decode.into({
     use count <- decode.parameter
     DataElement(count:)
   })
diff --git a/birdie_snapshots/codegen_properties_nullable_in_type_test.accepted b/birdie_snapshots/codegen_properties_nullable_in_type_test.accepted
@@ -0,0 +1,54 @@
+---
+version: 1.2.5
+title: codegen_properties_nullable_in_type_test
+file: ./test/json_typedef_test.gleam
+test_name: codegen_properties_nullable_in_type_test
+---
+RootSchema(
+  [],
+  Properties(
+    False,
+    [],
+    PropertiesSchema(
+      [
+        #("key", Type(True, [], String)),
+        #(
+          "amount",
+          Type(False, [], Uint8),
+        ),
+      ],
+      [],
+      False,
+    ),
+  ),
+)
+
+-----------------------------------------------------------
+
+import decode
+import gleam/json
+import gleam/option
+
+pub type Data {
+  Data(
+    amount: Int,
+    key: option.Option(String),
+  )
+}
+
+pub fn data_decoder() -> decode.Decoder(Data) {
+  decode.into({
+    use amount <- decode.parameter
+    use key <- decode.parameter
+    Data(amount:, key:)
+  })
+  |> decode.field("amount", decode.int)
+  |> decode.field("key", decode.optional(decode.string))
+}
+
+pub fn data_to_json(data: Data) -> json.Json {
+  json.object([
+    #("key", json.nullable(data.key, json.string)),
+    #("amount", json.int(data.amount)),
+  ])
+}
diff --git a/birdie_snapshots/codegen_properties_nullable_test.accepted b/birdie_snapshots/codegen_properties_nullable_test.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_properties_nullable_test
 file: ./test/json_typedef_test.gleam
 test_name: codegen_properties_nullable_test
@@ -40,7 +40,7 @@ pub type Data {
 }
 
 pub fn data_decoder() -> decode.Decoder(option.Option(Data)) {
-  decode.nullable(decode.into({
+  decode.optional(decode.into({
     use amount <- decode.parameter
     use key <- decode.parameter
     Data(amount:, key:)
diff --git a/birdie_snapshots/codegen_properties_optional_test.accepted b/birdie_snapshots/codegen_properties_optional_test.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_properties_optional_test
 file: ./test/json_typedef_test.gleam
 test_name: codegen_properties_optional_test
@@ -61,7 +61,7 @@ fn helper__optional_property(
   key: String,
   value: option.Option(a),
   to_json: fn(a) -> json.Json,
-) -> List(#(String, json.Json)), {
+) -> List(#(String, json.Json)) {
   case value {
     option.Some(value) -> [#(key, to_json(value)), ..object]
     option.None -> object
diff --git a/birdie_snapshots/codegen_root_name_test.accepted b/birdie_snapshots/codegen_root_name_test.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_root_name_test
 file: ./test/json_typedef_test.gleam
 test_name: codegen_root_name_test
@@ -31,7 +31,7 @@ pub type DirectionElement {
 }
 
 pub fn direction_decoder() -> decode.Decoder(List(option.Option(DirectionElement))) {
-  decode.list(decode.nullable(decode.then(decode.string, fn(s) {
+  decode.list(decode.optional(decode.then(decode.string, fn(s) {
     case s {
       "UP" -> decode.into(Up)
       "DOWN" -> decode.into(Down)
diff --git a/birdie_snapshots/codegen_type_elements_float_nullable.accepted b/birdie_snapshots/codegen_type_elements_float_nullable.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_type_elements_float_nullable
 file: ./test/json_typedef_test.gleam
 test_name: codegen_type_elements_float_nullable_test
@@ -20,7 +20,7 @@ import gleam/json
 import gleam/option
 
 pub fn data_decoder() -> decode.Decoder(option.Option(List(Float))) {
-  decode.nullable(decode.list(decode.float))
+  decode.optional(decode.list(decode.float))
 }
 
 pub fn data_to_json(data: option.Option(List(Float))) -> json.Json {
diff --git a/birdie_snapshots/codegen_type_elements_string_nullable.accepted b/birdie_snapshots/codegen_type_elements_string_nullable.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_type_elements_string_nullable
 file: ./test/json_typedef_test.gleam
 test_name: codegen_type_elements_string_nullable_test
@@ -20,7 +20,7 @@ import gleam/json
 import gleam/option
 
 pub fn data_decoder() -> decode.Decoder(option.Option(List(String))) {
-  decode.nullable(decode.list(decode.string))
+  decode.optional(decode.list(decode.string))
 }
 
 pub fn data_to_json(data: option.Option(List(String))) -> json.Json {
diff --git a/birdie_snapshots/codegen_type_nullable_boolean.accepted b/birdie_snapshots/codegen_type_nullable_boolean.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_type_nullable_boolean
 file: ./test/json_typedef_test.gleam
 test_name: codegen_type_nullable_boolean_test
@@ -13,7 +13,7 @@ import gleam/json
 import gleam/option
 
 pub fn data_decoder() -> decode.Decoder(option.Option(Bool)) {
-  decode.nullable(decode.bool)
+  decode.optional(decode.bool)
 }
 
 pub fn data_to_json(data: option.Option(Bool)) -> json.Json {
diff --git a/birdie_snapshots/codegen_type_nullable_float32.accepted b/birdie_snapshots/codegen_type_nullable_float32.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_type_nullable_float32
 file: ./test/json_typedef_test.gleam
 test_name: codegen_type_nullable_float32_test
@@ -13,7 +13,7 @@ import gleam/json
 import gleam/option
 
 pub fn data_decoder() -> decode.Decoder(option.Option(Float)) {
-  decode.nullable(decode.float)
+  decode.optional(decode.float)
 }
 
 pub fn data_to_json(data: option.Option(Float)) -> json.Json {
diff --git a/birdie_snapshots/codegen_type_nullable_float64.accepted b/birdie_snapshots/codegen_type_nullable_float64.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_type_nullable_float64
 file: ./test/json_typedef_test.gleam
 test_name: codegen_type_nullable_float64_test
@@ -13,7 +13,7 @@ import gleam/json
 import gleam/option
 
 pub fn data_decoder() -> decode.Decoder(option.Option(Float)) {
-  decode.nullable(decode.float)
+  decode.optional(decode.float)
 }
 
 pub fn data_to_json(data: option.Option(Float)) -> json.Json {
diff --git a/birdie_snapshots/codegen_type_nullable_int16.accepted b/birdie_snapshots/codegen_type_nullable_int16.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_type_nullable_int16
 file: ./test/json_typedef_test.gleam
 test_name: codegen_type_nullable_int16_test
@@ -13,7 +13,7 @@ import gleam/json
 import gleam/option
 
 pub fn data_decoder() -> decode.Decoder(option.Option(Int)) {
-  decode.nullable(decode.int)
+  decode.optional(decode.int)
 }
 
 pub fn data_to_json(data: option.Option(Int)) -> json.Json {
diff --git a/birdie_snapshots/codegen_type_nullable_int32.accepted b/birdie_snapshots/codegen_type_nullable_int32.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_type_nullable_int32
 file: ./test/json_typedef_test.gleam
 test_name: codegen_type_nullable_int32_test
@@ -13,7 +13,7 @@ import gleam/json
 import gleam/option
 
 pub fn data_decoder() -> decode.Decoder(option.Option(Int)) {
-  decode.nullable(decode.int)
+  decode.optional(decode.int)
 }
 
 pub fn data_to_json(data: option.Option(Int)) -> json.Json {
diff --git a/birdie_snapshots/codegen_type_nullable_int8.accepted b/birdie_snapshots/codegen_type_nullable_int8.accepted
@@ -1,5 +1,5 @@
 ---
-version: 1.2.1
+version: 1.2.5
 title: codegen_type_nullable_int8
 file: ./test/json_typedef_test.gleam
 test_name: codegen_type_nullable_int8_test
@@ -13,7 +13,7 @@ import gleam/json
 import gleam/option
 
 pub fn data_decoder() -> decode.Decoder(option.Option(Int)) {
-  decode.nullable(decode.int)
+  decode.optional(decode.int)
 }
 
 pub fn data_to_json(data: option.Option(Int)) -> json.Json {
diff --git a/birdie_snapshots/codegen_type_nullable_string.accepted b/birdie_snapshots/codegen_type_nullable_string.accepted
diff --git a/birdie_snapshots/codegen_type_nullable_timestamp.accepted b/birdie_snapshots/codegen_type_nullable_timestamp.accepted
diff --git a/birdie_snapshots/codegen_type_nullable_uint16.accepted b/birdie_snapshots/codegen_type_nullable_uint16.accepted
diff --git a/birdie_snapshots/codegen_type_nullable_uint32.accepted b/birdie_snapshots/codegen_type_nullable_uint32.accepted
diff --git a/birdie_snapshots/codegen_type_nullable_uint8.accepted b/birdie_snapshots/codegen_type_nullable_uint8.accepted
diff --git a/birdie_snapshots/codegen_type_values_float_nullable.accepted b/birdie_snapshots/codegen_type_values_float_nullable.accepted
diff --git a/src/json_typedef.gleam b/src/json_typedef.gleam
diff --git a/test/json_typedef_test.gleam b/test/json_typedef_test.gleam
