Fix deepmerge, add Dict conversion and empty support

Author: oschulz

src/dictmerge.jl

@@ -6,10 +6,14 @@ function deepmerge!(d::AbstractDict, others::AbstractDict...)
         for (k, v) in other
             if haskey(d, k)
                 v_curr = d[k]
-                if isa(v_curr, AbstractDict)
-                    deepmerge!(v_curr, v)
-                else
+                if isnothing(v_curr) || isnothing(v)
                     d[k] = v
+                else
+                    if isa(v_curr, AbstractDict)
+                        deepmerge!(v_curr, v)
+                    else
+                        d[k] = v
+                    end
                 end
             else
                 d[k] = v
@@ -23,8 +27,8 @@ end
 function deepmerge(d::AbstractDict, others::AbstractDict...)
     K = Base.promoteK(keytype(d), others...)
     V = Base.promoteV(valtype(d), others...)
-    result = Dict{K,V}(d)
-    deepmerge!(result, others...)
+    result = empty(d, K, V)
+    deepmerge!(result, d, others...)
 end
 
 

src/propdict.jl

@@ -70,6 +70,9 @@ _dict(p::PropDict) = getfield(p, :_internal_dict)
 
 Base.parent(p::PropDict) = _dict(p)
 
+Dict(p::PropDict) = _dict(p)
+Dict{Union{Symbol,Int},Any}(p::PropDict) = _dict(p)
+
 
 function Functors.functor(::Type{<:PropDict}, p)
     content, f_rec = Functors.functor(Dict, _dict(p))
@@ -165,6 +168,7 @@ end
     end
 end
 
+Base.empty(::PropDict, ::Type{Union{Symbol,Int}}, ::Type{Any}) = PropDict()
 
 Base.length(p::PropDict) = length(_dict(p))
 
@@ -193,14 +197,9 @@ Base.iterate(p::PropDict) = iterate(_dict(p))
 Base.iterate(p::PropDict, i) = iterate(_dict(p), i)
 
 
-function Base.merge!(p::PropDict, others::PropDict...)
-    PropDict(deepmerge!(_dict(p), map(_dict, (others))...))
-    p
-end
-
+Base.merge!(p::PropDict, others::PropDict...) = deepmerge!(p, others...)
 
-Base.merge(p::PropDict, others::PropDict...) =
-    PropDict(deepmerge(_dict(p), map(_dict, (others))...))
+Base.merge(p::PropDict, others::PropDict...) = deepmerge(p, others...)
 
 
 const integer_expr = r"^[+-]?[0-9]+$"

test/test_propdict.jl

@@ -3,6 +3,8 @@
 using PropDicts
 using Test
 
+using PropDicts: deepmerge, deepmerge!
+
 using Functors
 
 @testset "propdict" begin
@@ -12,6 +14,14 @@ using Functors
     pa = PropDict(da)
     @test parent(pa) === PropDicts._dict(pa)
 
+    @test @inferred(Dict(pa)) === parent(pa)
+    @test @inferred(Dict{Union{Symbol,Int},Any}(pa)) === parent(pa)
+    @test @inferred(convert(Dict, pa)) === parent(pa)
+    @test @inferred(convert(Dict{Union{Symbol,Int},Any}, pa)) === parent(pa)
+
+    @test @inferred(empty(pa)) isa PropDict
+    @test @inferred(isempty(empty(pa)))
+
     @test convert(Dict, pa) === PropDicts._dict(pa)
     @test convert(Dict{Union{Symbol,Int}}, pa) === PropDicts._dict(pa)
     @test convert(Dict{Union{Symbol,Int},Any}, pa) === PropDicts._dict(pa)
@@ -36,6 +46,12 @@ using Functors
     @test pc.bar == PropDict(:baz => raw"$somevar")
     @test pc[44] == "abc"
 
+    px = PropDict("foo" => 11, "bar" => PropDict("baz" => PropDict("a" => 7, "b" => 9)), "44" => "abc")
+    py = PropDict("bar" => PropDict("baz" => nothing, "baz2" => 5))
+    pz = @inferred(merge!(px, py))
+    @test pz === px
+    @test pz == Dict(:foo => 11, :bar => Dict(:baz => nothing, :baz2 => 5), 44 => "abc")
+
     @test PropDicts.contains_vars(raw"fo\\$o") == true
     @test PropDicts.substitute_vars(raw"foo $bar ${baz} y", ignore_missing = true) == raw"foo $bar ${baz} y"
     PropDicts.substitute_vars(raw"foo $bar baz", Dict("bar" => "xyz"))
@@ -61,7 +77,5 @@ using Functors
     @test pd.c isa PropDicts.MissingProperty
     @test pd.c.d isa PropDicts.MissingProperty
     @test get(pd.c, :d, 5) == 5
-    @test pd.c isa PropDicts.MissingProperty
-
-    
+    @test pd.c isa PropDicts.MissingProperty    
 end