feat: decode_to_json

Author: enghitalo

decode.v

@@ -19,6 +19,107 @@ pub fn new_decoder() Decoder {
 	return Decoder{}
 }
 
+pub fn decode_to_json[T](src []u8) !string {
+	mut d := new_decoder()
+
+	json := d.decode_to_json[T](src) or { return error('error decoding to JSON: ${err}') }
+
+	return json
+}
+
+pub fn (mut d Decoder) decode_to_json[T](src []u8) !string {
+	d.buffer = src
+	d.next()!
+
+	mut result := ''
+
+	data := d.buffer
+
+	match d.bd {
+		mp_array_16, mp_array_32, mp_fix_array_min...mp_fix_array_max {
+			array_len := d.read_array_len(data) or { return error('error reading array length') }
+
+			mut d_for_array := new_decoder()
+
+			result += '['
+
+			for i in 0 .. array_len {
+				if i > 0 {
+					result += ','
+				}
+
+				element_json := d_for_array.decode_to_json[T](data[1..]) or {
+					return error('error converting array element to JSON ${err}')
+				}
+
+				result += element_json
+			}
+
+			result += ']'
+		}
+		mp_map_16, mp_map_32, mp_fix_map_min...mp_fix_map_max {
+			map_len := d.read_map_len(src) or { return error('error reading map length') }
+
+			result += '{'
+
+			for i in 0 .. map_len {
+				if i > 0 {
+					result += ','
+				}
+
+				key := d.decode_to_json[string](src) or {
+					return error('error converting map key to JSON: ${err}')
+				}
+
+				value_json := d.decode_to_json[T](src) or {
+					return error('error converting map value to JSON')
+				}
+
+				result += '${key}:${value_json}'
+			}
+
+			result += '}'
+		}
+		mp_nil {
+			result += 'null'
+		}
+		mp_true, mp_false {
+			mut bool_val := false
+			d.decode_bool(mut bool_val) or { return error('error decoding boolean: ${err}') }
+			result += bool_val.str()
+		}
+		mp_f32, mp_f64 {
+			mut float_val := 0.0
+			d.decode_float(mut float_val) or { return error('error decoding float: ${err}') }
+			result += float_val.str()
+		}
+		mp_u8, mp_u16, mp_u32, mp_u64, mp_i8, mp_i16, mp_i32, mp_i64 {
+			mut int_val := 0
+			d.decode_integer(mut int_val) or { return error('error decoding integer: ${err}') }
+			result += int_val.str()
+		}
+		mp_str_8, mp_str_16, mp_str_32, mp_fix_str_min...mp_fix_str_max {
+			mut str_val := ''
+			d.decode_string(mut str_val) or { return error('error decoding string: ${err}') }
+			result += '"${str_val}"'
+		}
+		mp_bin_8, mp_bin_16, mp_bin_32 {
+			bin_len := d.read_bin_len(src) or { return error('error reading binary length') }
+			for i in 0 .. bin_len {
+				result += src[d.pos + i].str()
+			}
+
+			d.pos += bin_len
+		}
+		mp_ext_8, mp_ext_16, mp_ext_32 {}
+		mp_fix_ext_1, mp_fix_ext_2, mp_fix_ext_4, mp_fix_ext_8, mp_fix_ext_16 {}
+		else {
+			return error('unsupported descriptor byte for conversion to JSON')
+		}
+	}
+	return result
+}
+
 pub fn decode[T](src []u8) !T {
 	mut val := T{}
 

decode_to_json_test.v

@@ -0,0 +1,38 @@
+module main
+
+import msgpack
+import encoding.hex
+
+fn test_decode_to_json_array_test() {
+	src := msgpack.encode([1, 2])
+	result := msgpack.decode_to_json[[]int](src) or { panic('error decoding to JSON ${err}') }
+	assert result == '[1,2]'
+}
+
+fn test_decode_to_json_map() {
+	src := msgpack.encode({
+		'key1': 1
+		'key2': 2
+	})
+	result := msgpack.decode_to_json[map[string]int](src) or {
+		panic('error decoding to JSON: ${err}')
+	}
+	assert result == '{"key1":1,"key2":2}'
+}
+
+fn test_to_json_array() {
+	src := msgpack.encode([1, 2])
+	mut d := msgpack.new_decoder()
+	result := d.decode_to_json[[]u64](src) or { panic('error converting to JSON: ${err}') }
+	assert result == '[1,2]'
+}
+
+fn test_to_json_map() {
+	src := msgpack.encode({
+		'key1': 1
+		'key2': 2
+	})
+	mut d := msgpack.new_decoder()
+	result := d.decode_to_json[map[string]int](src) or { panic('error converting to JSON') }
+	assert result == '{"key1":1,"key2":2}'
+}

encode.v

@@ -19,6 +19,12 @@ pub fn encode[T](data T) []u8 {
 	return encoder.encode(data)
 }
 
+pub fn encode_to_json[T](data T) string {
+	mut encoder := new_encoder()
+	encoded := encoder.encode(data)
+	return decode_to_json[T](encoded) or { '' }
+}
+
 pub fn (e &Encoder) str() string {
 	return e.buffer.hex()
 }

examples/bench_msgpack_json_vs_json2.v

@@ -32,7 +32,7 @@ fn main() {
 			println('error: ${p}')
 		}
 	}
-	b.measure('json.decode')
+	b.measure('json.decode\n')
 
 	// encoding measurements:
 	p := json.decode(Person, s)!
@@ -51,21 +51,28 @@ fn main() {
 			println('json.encode error: ${es}')
 		}
 	}
-	b.measure('json.encode')
+	b.measure('json.encode\n')
 
 	for _ in 0 .. max_iterations {
-		es := msgpack.encode[Person](p)
-		if p.age != 99 {
+		es := msgpack.encode_to_json[Person](p)
+		if es[0] != `{` {
 			println('error: ${es}')
 		}
 	}
-	b.measure('msgpack.encode')
+	b.measure('msgpack.encode_to_json')
 
-	encoded := msgpack.encode[Person](p)
-	dump(encoded#[0..10])
 	for _ in 0 .. max_iterations {
-		// TODO: investigate why decoder.decode does not return a result at all :-|
-		msgpack.decode[Person](encoded)!
+		es := msgpack.encode[Person](p)
+		if p.age != 99 {
+			println('error: ${es}')
+		}
 	}
-	b.measure('msgpack.decode')
+	b.measure('msgpack.encode\n')
+
+	// Not working for now - waiting for #20027 be solved
+	// encoded := msgpack.encode[Person](p)
+	// for _ in 0 .. max_iterations {
+	// 	msgpack.decode[Person](encoded)!
+	// }
+	// b.measure('msgpack.decode')
 }