Merge pull request #14 from quinnj/jq/get

Fix issue w/ string key on object get

Author: quinnj

src/JSON3.jl

@@ -46,41 +46,81 @@ end
     return x, (i + 1, tapeidx)
 end
 
+function Base.get(obj::Object, key::Symbol)
+    for (k, v) in obj
+        k == key && return v
+    end
+    throw(KeyError(key))
+end
+
 function Base.get(obj::Object, key)
+    k2 = Base.string(key)
+    for (k, v) in obj
+        String(k) == k2 && return v
+    end
+    throw(KeyError(key))
+end
+
+function Base.get(obj::Object, ::Type{T}, key::Symbol)::T where {T}
     for (k, v) in obj
         k == key && return v
     end
     throw(KeyError(key))
 end
 
 function Base.get(obj::Object, ::Type{T}, key)::T where {T}
+    k2 = Base.string(key)
     for (k, v) in obj
-        k == key && return v
+        String(k) == k2 && return v
     end
     throw(KeyError(key))
 end
 
+function Base.get(obj::Object, key::Symbol, default)
+    for (k, v) in obj
+        k == key && return v
+    end
+    return default
+end
+
 function Base.get(obj::Object, key, default)
+    k2 = Base.string(key)
+    for (k, v) in obj
+        String(k) == k2 && return v
+    end
+    return default
+end
+
+function Base.get(obj::Object, ::Type{T}, key::Symbol, default::T)::T where {T}
     for (k, v) in obj
         k == key && return v
     end
     return default
 end
 
 function Base.get(obj::Object, ::Type{T}, key, default::T)::T where {T}
+    k2 = Base.string(key)
     for (k, v) in obj
-        k == key && return v
+        String(k) == k2 && return v
     end
     return default
 end
 
-function Base.get(default::Base.Callable, obj::Object, key)
+function Base.get(default::Base.Callable, obj::Object, key::Symbol)
     for (k, v) in obj
         k == key && return v
     end
     return default()
 end
 
+function Base.get(default::Base.Callable, obj::Object, key)
+    k2 = Base.string(key)
+    for (k, v) in obj
+        String(k) == k2 && return v
+    end
+    return default()
+end
+
 Base.propertynames(obj::Object) = collect(keys(obj))
 
 Base.getproperty(obj::Object, prop::Symbol) = get(obj, prop)

test/runtests.jl

@@ -567,4 +567,8 @@ d = Dict(uuid1() => i for i in 1:3)
 t = JSON3.write(d)
 @test JSON3.read(t, Dict{UUID, Int}) == d
 
+# get issue
+obj = JSON3.read("{\"hey\":1}")
+@test get(obj, :hey) == get(obj, "hey") == get(obj, "hey", "") == get(()->"", obj, "hey")
+
 end # @testset "JSON3"