Add singleton support (#191)

* Add singleton support * add back commented test * bump JSON3 and StructTypes version * bump structtypes version
quinnj · Sep 6, 2022 · 3d542d3 · quinnj · Feb 16, 2023 · Wynand
1 parent 3c6e0b0
commit 3d542d3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "JSON3"
 uuid = "0f8b85d8-7281-11e9-16c2-39a750bddbf1"
 authors = ["Jacob Quinn <quinn.jacobd@gmail.com>"]
-version = "1.9.6"
+version = "1.10.0"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
@@ -12,7 +12,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
 Parsers = "0.3, 1, 2"
-StructTypes = "1.5"
+StructTypes = "1.10"
 julia = "1.6"
 
 [extras]

diff --git a/src/structs.jl b/src/structs.jl
@@ -1,4 +1,4 @@
-import StructTypes: StructType, CustomStruct, DictType, ArrayType, StringType, NumberType, BoolType, NullType, NoStructType, Struct, OrderedStruct, Mutable, construct, AbstractType, subtypes, subtypekey
+import StructTypes: StructType, CustomStruct, DictType, ArrayType, StringType, NumberType, BoolType, NullType, NoStructType, SingletonType, Struct, OrderedStruct, Mutable, construct, AbstractType, subtypes, subtypekey
 
 struct RawType <: StructType end
 

diff --git a/src/write.jl b/src/write.jl
@@ -86,6 +86,7 @@ write(::NumberType, buf, pos, len, ::Type{T}; kw...) where {T} = write(StringTyp
 write(::NullType, buf, pos, len, ::Type{T}; kw...) where {T} = write(StringType(), buf, pos, len, Base.string(T))
 write(::BoolType, buf, pos, len, ::Type{T}; kw...) where {T} = write(StringType(), buf, pos, len, Base.string(T))
 write(::AbstractType, buf, pos, len, ::Type{T}; kw...) where {T} = write(StringType(), buf, pos, len, Base.string(T))
+write(::SingletonType, buf, pos, len, ::Type{T}; kw...) where {T} = write(StringType(), buf, pos, len, Base.string(T))
 write(::NoStructType, buf, pos, len, ::Type{T}; kw...) where {T} = write(StringType(), buf, pos, len, Base.string(T))
 
 write(::NoStructType, buf, pos, len, ::T; kw...) where {T} = throw(ArgumentError("$T doesn't have a defined `StructTypes.StructType`"))
@@ -191,6 +192,8 @@ function write(::BoolType, buf, pos, len, x::Bool; kw...)
     return buf, pos, len
 end
 
+write(::SingletonType, buf, pos, len, x; kw...) = write(StringType(), buf, pos, len, x; kw...)
+
 # adapted from base/intfuncs.jl
 function write(::NumberType, buf, pos, len, y::Integer; kw...)
     x, neg = Base.split_sign(y)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -38,6 +38,8 @@ struct D
     c::String
 end
 
+struct ParametricSingleton{T} end
+
 abstract type Vehicle end
 
 struct Car <: Vehicle
@@ -436,9 +438,10 @@ obj2 = JSON3.read("""
 @test_throws ArgumentError JSON3.read!("{\"a\": 1, a", A(1, 2, 3, 4))
 @test_throws ArgumentError JSON3.read!("}", A(1, 2, 3, 4))
 
-@test_throws ArgumentError JSON3.read("{}", C)
-@test_throws ArgumentError JSON3.write(C())
+@test JSON3.write(C()) == "\"C()\""
+@test JSON3.write(ParametricSingleton{Int64}()) == "\"ParametricSingleton{Int64}()\""
 
+@test_throws MethodError JSON3.read("{}", C)
 StructTypes.StructType(::Type{C}) = StructTypes.Struct()
 
 @test JSON3.read("{}", C) == C()