Apply change from s-ludwig

vibe-d · Oct 31, 2017 · a0b7297 · a0b7297
1 parent 4f6ba1d
commit a0b7297
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/data/vibe/data/json.d b/data/vibe/data/json.d
@@ -1707,7 +1707,7 @@ unittest { // issue #1660 - deserialize AA whose key type is string-based enum
 struct JsonSerializer {
 	template isJsonBasicType(T) { enum isJsonBasicType = std.traits.isNumeric!T || isBoolean!T || is(T == string) || is(T == typeof(null)) || isJsonSerializable!T; }
 
-	template isSupportedValueType(T) { enum isSupportedValueType = isJsonBasicType!T || is(T == Json); }
+	template isSupportedValueType(T) { enum isSupportedValueType = isJsonBasicType!T || is(T == Json) || is (T == JSONValue); }
 
 	private {
 		Json m_current;
@@ -1735,7 +1735,9 @@ struct JsonSerializer {
 	void writeValue(Traits, T)(in T value)
 		if (!is(T == Json))
 	{
-		static if (isJsonSerializable!T) {
+		static if (is(T == JSONValue)) {
+			m_current = Json.fromJSONValue(value);
+		} else static if (isJsonSerializable!T) {
 			static if (!__traits(compiles, () @safe { return value.toJson(); } ()))
 				pragma(msg, "Non-@safe toJson/fromJson methods are deprecated - annotate "~T.stringof~".toJson() with @safe.");
 			m_current = () @trusted { return value.toJson(); } ();
@@ -1780,6 +1782,7 @@ struct JsonSerializer {
 	T readValue(Traits, T)()
 	@safe {
 		static if (is(T == Json)) return m_current;
+		else static if (is(T == JSONValue)) return m_current.toJSONValue;
 		else static if (isJsonSerializable!T) {
 			static if (!__traits(compiles, () @safe { return T.fromJson(m_current); } ()))
 				pragma(msg, "Non-@safe toJson/fromJson methods are deprecated - annotate "~T.stringof~".fromJson() with @safe.");
@@ -1817,7 +1820,7 @@ struct JsonStringSerializer(R, bool pretty = false)
 
 	template isJsonBasicType(T) { enum isJsonBasicType = std.traits.isNumeric!T || isBoolean!T || is(T == string) || is(T == typeof(null)) || isJsonSerializable!T; }
 
-	template isSupportedValueType(T) { enum isSupportedValueType = isJsonBasicType!T || is(T == Json); }
+	template isSupportedValueType(T) { enum isSupportedValueType = isJsonBasicType!T || is(T == Json) || is(T == JSONValue); }
 
 	this(R range)
 	{
@@ -1866,7 +1869,7 @@ struct JsonStringSerializer(R, bool pretty = false)
 				m_range.put('"');
 			}
 			else static if (is(T == Json)) m_range.writeJsonString(value);
-			else static if (is(T == JSONValue)) m_range.writeJsonString(Json.fromJSONValue(value));
+			else static if (is(T == JSONValue)) m_range.writeJsonString(() @trusted { return Json.fromJSONValue(value); } ());
 			else static if (isJsonSerializable!T) {
 				static if (!__traits(compiles, () @safe { return value.toJson(); } ()))
 					pragma(msg, "Non-@safe toJson/fromJson methods are deprecated - annotate "~T.stringof~".toJson() with @safe.");
@@ -2536,8 +2539,8 @@ private auto trustedRange(R)(R range)
 	assert(b.foos[0].foos.length == 0);
 }
 
-@system unittest { // Json <-> std.json.JSONValue
-	auto a = parseJsonString(`{
+@safe unittest { // Json <-> std.json.JSONValue
+	auto astr = `{
 		"null": null,
 		"string": "Hello",
 		"integer": 123456,
@@ -2547,8 +2550,17 @@ private auto trustedRange(R)(R range)
 		"array": [1, 2, "string"],
 		"true": true,
 		"false": false
-	}`);
+	}`;
+	auto a = parseJsonString(astr);
+
+	// test JSONValue -> Json conversion
 	assert(Json.fromJSONValue(a.toJSONValue) == a);
+
+	// test Json -> JSONValue conversion
 	auto v = a.toJSONValue;
 	assert(deserializeJson!JSONValue(serializeToJson(v)) == v);
+
+	// test JSON strint <-> JSONValue serialization
+	assert(deserializeJson!JSONValue(astr) == v);
+	assert(parseJsonString(serializeToJsonString(v)) == a);
 }