mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

json2: fix encoding of nested maps like map[string]map[string]int (#17924)

Browse Source
This commit is contained in:
Hitalo Souza 2023-04-10 12:57:02 -03:00 committed by GitHub
parent 4e498b4303
commit 4d4d76d65b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
vlib/x/json2/encode_struct_test.v
View File

@ -265,11 +265,11 @@ fn test_maps() {
'1': 1 '1': 1
} }
}) == '{"val":{"1":1}}' }) == '{"val":{"1":1}}'
// assert json.encode(StructType[map[string]map[string]int]{ assert json.encode(StructType[map[string]map[string]int]{
// val: { val: {
// 'a': { 'a': {
// '1': 1 '1': 1
// } }
// } }
// }) == '{"val":{"a":{"1":1}}}' }) == '{"val":{"a":{"1":1}}}'
} }

40
vlib/x/json2/encoder.v
View File

@ -124,6 +124,26 @@ fn (e &Encoder) encode_any(val Any, level int, mut wr io.Writer) ! {
} }
} }
fn (e &Encoder) encode_map[T](value T, level int, mut wr io.Writer) ! {
wr.write(json2.curly_open)!
mut idx := 0
for k, v in value {
e.encode_newline(level, mut wr)!
e.encode_string(k.str(), mut wr)!
wr.write(json2.colon_bytes)!
if e.newline != 0 {
wr.write(json2.space_bytes)!
}
e.encode_value_with_level(v, level + 1, mut wr)!
if idx < value.len - 1 {
wr.write(json2.comma_bytes)!
}
idx++
}
e.encode_newline(level, mut wr)!
wr.write(json2.curly_close)!
}
fn (e &Encoder) encode_value_with_level[T](val T, level int, mut wr io.Writer) ! { fn (e &Encoder) encode_value_with_level[T](val T, level int, mut wr io.Writer) ! {
$if T is string { $if T is string {
e.encode_string(val, mut wr)! e.encode_string(val, mut wr)!
@ -133,7 +153,7 @@ fn (e &Encoder) encode_value_with_level[T](val T, level int, mut wr io.Writer) !
// weird quirk but val is destructured immediately to Any // weird quirk but val is destructured immediately to Any
e.encode_any(val, level, mut wr)! e.encode_any(val, level, mut wr)!
} $else $if T is $map { } $else $if T is $map {
// FIXME - `e.encode_struct` can not encode `map[string]map[string]int` type e.encode_map(val, level, mut wr)!
} $else $if T is []Any { } $else $if T is []Any {
e.encode_any(val, level, mut wr)! e.encode_any(val, level, mut wr)!
} $else $if T is Encodable { } $else $if T is Encodable {
@ -261,23 +281,7 @@ fn (e &Encoder) encode_struct[U](val U, level int, mut wr io.Writer) ! {
} $else $if field.typ is $struct { } $else $if field.typ is $struct {
e.encode_struct(value, level + 1, mut wr)! e.encode_struct(value, level + 1, mut wr)!
} $else $if field.is_map { } $else $if field.is_map {
wr.write(json2.curly_open)! e.encode_map(value, level + 1, mut wr)!
mut idx := 0
for k, v in value {
e.encode_newline(level, mut wr)!
e.encode_string(k.str(), mut wr)!
wr.write(json2.colon_bytes)!
if e.newline != 0 {
wr.write(json2.space_bytes)!
}
e.encode_value_with_level(v, level + 1, mut wr)!
if idx < value.len - 1 {
wr.write(json2.comma_bytes)!
}
idx++
}
e.encode_newline(level, mut wr)!
wr.write(json2.curly_close)!
} $else $if field.is_enum { } $else $if field.is_enum {
// TODO - replace for `field.typ is $enum` // TODO - replace for `field.typ is $enum`
wr.write(int(val.$(field.name)).str().bytes())! wr.write(int(val.$(field.name)).str().bytes())!