Skip to content

Support UUID and other stringlike types as keys #435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
treapster wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support UUID and other stringlike types as keys #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/write.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ sizeguess(::Null) = 4
sizeguess(::Omit) = 0
sizeguess(_) = 512

const StringLike = Union{Enum, AbstractChar, VersionNumber, Cstring, Cwstring, UUID, Dates.TimeType, Type, Logging.LogLevel}

StructUtils.lower(::JSONStyle, ::Missing) = nothing
StructUtils.lower(::JSONStyle, x::Symbol) = String(x)
StructUtils.lower(::JSONStyle, x::Union{Enum, AbstractChar, VersionNumber, Cstring, Cwstring, UUID, Dates.TimeType, Type, Logging.LogLevel}) = string(x)
StructUtils.lower(::JSONStyle, x::StringLike) = string(x)
StructUtils.lower(::JSONStyle, x::Regex) = x.pattern
StructUtils.lower(::JSONStyle, x::AbstractArray{<:Any,0}) = x[1]
StructUtils.lower(::JSONStyle, x::AbstractArray{<:Any, N}) where {N} = (view(x, ntuple(_ -> :, N - 1)..., j) for j in axes(x, N))
Expand Down Expand Up @@ -250,9 +252,8 @@ end

StructUtils.lowerkey(::JSONStyle, s::AbstractString) = s
StructUtils.lowerkey(::JSONStyle, sym::Symbol) = String(sym)
StructUtils.lowerkey(::JSONStyle, n::Union{Integer, Union{Float16, Float32, Float64}}) = string(n)
StructUtils.lowerkey(::JSONStyle, s::Union{StringLike, Real}) = string(s)
StructUtils.lowerkey(::JSONStyle, x) = throw(ArgumentError("No key representation for $(typeof(x)). Define StructUtils.lowerkey(::JSON.JSONStyle, ::$(typeof(x)))"))

"""
JSON.json(x) -> String
JSON.json(io, x)
Expand Down
14 changes: 14 additions & 0 deletions test/json.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ end
dropped::Union{Nothing, JSON.Omit}
end

@enum JsonFruit Apple Orange

@testset "JSON.json" begin

@testset "Basics" begin
Expand Down Expand Up @@ -261,6 +263,18 @@ end
@test JSON.json((a=1, b=nothing); omit_null=false) == "{\"a\":1,\"b\":null}"
@test JSON.json((a=1, b=[]); omit_empty=true) == "{\"a\":1}"
@test JSON.json((a=1, b=[]); omit_empty=false) == "{\"a\":1,\"b\":[]}"
@testset "All string-like types as keys" begin
date = Dates.DateTime(1970)
@test JSON.json([
UUID(0) => "uuid",
'c' => "char",
v"0.0.1" => "ver",
Apple => "Enum 1",
Orange => "Enum 2",
date => "date"
]) == """{"00000000-0000-0000-0000-000000000000":"uuid","c":"char","0.0.1":"ver","Apple":"Enum 1","Orange":"Enum 2","1970-01-01T00:00:00":"date"}"""
end

@testset "Sentinel overrides" begin
@test JSON.json(JSON.Null()) == "null"
@test_throws ArgumentError JSON.json(JSON.Omit())
Expand Down
Loading