I47 fix CSV deserialization of Union{Nulltype,AnyType} (#52)

Co-authored-by: Stas Gryumov <[email protected]>
bhftbootcamp · May 23, 2024 · 4508992 · 4508992 · gryumov · May 23, 2024
1 parent 7f36b84
commit 4508992
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 The latest version of this file can be found at the master branch of the [Serde.jl](https://bhftbootcamp.github.io/Serde.jl) repository.
 
+## 3.0.4 (21/05/2024)
+- Supports deserialization of Union{Nulltype,AnyType} type
+
 ## 3.0.0 (22/03/2024)
 
 ### Added

diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "Serde"
 uuid = "db9b398d-9517-45f8-9a95-92af99003e0e"
-version = "3.0.3"
+version = "3.0.4"
 
 [deps]
 CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"

diff --git a/src/De/Deser.jl b/src/De/Deser.jl
@@ -524,8 +524,7 @@ function deser(
     for (type, name) in zip(_field_types(D), fieldnames(D))
         key = custom_name(D, Val(name))
         val = get(data, K(key), default_value(D, Val(name)))
-        val = isnothing(val) ? nulltype(type) : val
-        val = isempty(D, val) ? nulltype(type) : val
+        val = isnothing(val) || ismissing(val) || isempty(D, val) ? nulltype(type) : val
         push!(vals, eldeser(D, type, key, val))
     end
 
@@ -538,8 +537,7 @@ function deser(::CustomType, ::Type{D}, data::N)::D where {D<:Any,N<:NamedTuple}
     for (type, name) in zip(_field_types(D), fieldnames(D))
         key = custom_name(D, Val(name))
         val = get(data, key, default_value(D, Val(name)))
-        val = isnothing(val) ? nulltype(type) : val
-        val = isempty(D, val) ? nulltype(type) : val
+        val = isnothing(val) || ismissing(val) || isempty(D, val) ? nulltype(type) : val
         push!(vals, eldeser(D, type, key, val))
     end
 

diff --git a/test/deser.jl b/test/deser.jl
@@ -664,4 +664,22 @@ using Test, Dates
             exp_str,
         )
     end
+
+    @testset "Case №38: Deserialization with missing field with Union{Nulltype,AnyType}" begin
+        struct WithNothing
+            y::Int64
+            x::Union{String,Nothing}
+        end
+
+        @test Serde.deser(WithNothing, Dict("y" => 1, "x" => nothing)) == WithNothing(1, nothing)
+        @test Serde.deser(WithNothing, Dict("y" => 2, "x" => missing)) == WithNothing(2, nothing)
+
+        struct WithMissing
+            y::Int64
+            x::Union{String,Missing}
+        end
+
+        @test Serde.deser(WithMissing, Dict("y" => 3, "x" => nothing)) == WithMissing(3, missing)
+        @test Serde.deser(WithMissing, Dict("y" => 4, "x" => missing)) == WithMissing(4, missing)
+    end
 end