json2: support encoding of optional struct fields (#16521)

vlib/x/json2/json2_test.v

@@ -15,33 +15,29 @@ pub mut:
 	title  JobTitle
 }
 
-struct EmployeeOp {
+struct OptionalStruct {
 pub mut:
-	name      ?string = none
+	name      string
 	last_name ?string = none
-	age       ?int
-	salary    f32
-	title     JobTitle
+	age       ?int    = none
+	salary    ?f32    = none
 }
 
-fn (e Employee) to_json() string {
-	mut mp := map[string]json.Any{}
-	mp['name'] = json.Any(e.name)
-	mp['age'] = json.Any(e.age)
-	mp['salary'] = json.Any(e.salary)
-	mp['title'] = json.Any(int(e.title))
-	/*
-	$for field in Employee.fields {
-		d := e.$(field.name)
-
-		$if field.typ is JobTitle {
-			mp[field.name] = json.encode<int>(d)
-		} $else {
-			mp[field.name] = d
-		}
+fn test_simple_optional() {
+	x := OptionalStruct{
+		name: 'Peter'
 	}
-	*/
-	return mp.str()
+	s := json.encode[OptionalStruct](x)
+	assert s == '{"name":"Peter"}'
+	// y := json.decode<EmployeeOp>(s) or {
+	// 	println(err)
+	// 	assert false
+	// 	return
+	// }
+	// assert y.name == 'Peter'
+	// assert y.age == 28
+	// assert y.salary == 95000.5
+	// assert y.title == .worker
 }
 
 // ! BUGFIX
@@ -99,8 +95,13 @@ mut:
 	val T
 }
 
+struct MultTypeTestOptional[T] {
+mut:
+	val ?T
+}
+
 // NOTE - This can substitute a lot of others tests
-fn test_bool_decode() {
+fn test_mult_decode() {
 	assert json.decode[MultTypeTest[bool]]('{"val": ""}')!.val == false
 	assert json.decode[MultTypeTest[bool]]('{"val": "0"}')!.val == false
 	assert json.decode[MultTypeTest[bool]]('{"val": "1"}')!.val == true
@@ -124,4 +125,98 @@ fn test_bool_decode() {
 	assert json.decode[MultTypeTest[int]]('{"val": "false"}')!.val == 0
 	assert json.decode[MultTypeTest[int]]('{"val": true}')!.val == 1
 	assert json.decode[MultTypeTest[int]]('{"val": false}')!.val == 0
+
+	assert json.decode[MultTypeTest[string]]('{"val": ""}')!.val == ''
+	assert json.decode[MultTypeTest[string]]('{"val": "0"}')!.val == '0'
+	assert json.decode[MultTypeTest[string]]('{"val": "1"}')!.val == '1'
+	assert json.decode[MultTypeTest[string]]('{"val": "2"}')!.val == '2'
+	assert json.decode[MultTypeTest[string]]('{"val": 0}')!.val == '0'
+	assert json.decode[MultTypeTest[string]]('{"val": 1}')!.val == '1'
+	assert json.decode[MultTypeTest[string]]('{"val": 2}')!.val == '2'
+	assert json.decode[MultTypeTest[string]]('{"val": "true"}')!.val == 'true'
+	assert json.decode[MultTypeTest[string]]('{"val": "false"}')!.val == 'false'
+	assert json.decode[MultTypeTest[string]]('{"val": true}')!.val == 'true'
+	assert json.decode[MultTypeTest[string]]('{"val": false}')!.val == 'false'
+
+	// assert json.decode[MultTypeTestOptional[string]]('{"val": ""}')! == MultTypeTestOptional[string]{val: ""}
+	/*
+	assert json.decode[MultTypeTestOptional[string]]('{"val": "0"}')!.val == "0"
+	assert json.decode[MultTypeTestOptional[string]]('{"val": "1"}')!.val == "1"
+	assert json.decode[MultTypeTestOptional[string]]('{"val": "2"}')!.val == "2"
+	assert json.decode[MultTypeTestOptional[string]]('{"val": 0}')!.val == "0"
+	assert json.decode[MultTypeTestOptional[string]]('{"val": 1}')!.val == "1"
+	assert json.decode[MultTypeTestOptional[string]]('{"val": 2}')!.val == "2"
+	assert json.decode[MultTypeTestOptional[string]]('{"val": "true"}')!.val == "true"
+	assert json.decode[MultTypeTestOptional[string]]('{"val": "false"}')!.val == "false"
+	assert json.decode[MultTypeTestOptional[string]]('{"val": true}')!.val == "true"
+	assert json.decode[MultTypeTestOptional[string]]('{"val": false}')!.val == "false"
+	*/
+}
+
+fn test_mult_encode() {
+	assert json.encode(MultTypeTest[[]string]{}) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]string]{ val: [] }) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]string]{ val: ['0'] }) == '{"val":["0"]}'
+	assert json.encode(MultTypeTest[[]string]{ val: ['1'] }) == '{"val":["1"]}'
+
+	assert json.encode(MultTypeTest[bool]{}) == '{"val":false}'
+	assert json.encode(MultTypeTest[bool]{ val: false }) == '{"val":false}'
+	assert json.encode(MultTypeTest[bool]{ val: true }) == '{"val":true}'
+
+	assert json.encode(MultTypeTestOptional[bool]{ val: none }) == '{}'
+	assert json.encode(MultTypeTestOptional[bool]{}) == '{"val":false}'
+	assert json.encode(MultTypeTestOptional[bool]{ val: false }) == '{"val":false}'
+	assert json.encode(MultTypeTestOptional[bool]{ val: true }) == '{"val":true}'
+
+	assert json.encode(MultTypeTest[int]{}) == '{"val":0}'
+	assert json.encode(MultTypeTest[int]{ val: 0 }) == '{"val":0}'
+	assert json.encode(MultTypeTest[int]{ val: 1 }) == '{"val":1}'
+
+	assert json.encode(MultTypeTestOptional[int]{ val: none }) == '{}'
+	assert json.encode(MultTypeTestOptional[int]{}) == '{"val":0}'
+	assert json.encode(MultTypeTestOptional[int]{ val: 0 }) == '{"val":0}'
+	assert json.encode(MultTypeTestOptional[int]{ val: 1 }) == '{"val":1}'
+
+	assert json.encode(MultTypeTest[[]int]{}) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]int]{ val: [] }) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]int]{ val: [0] }) == '{"val":[0]}'
+	assert json.encode(MultTypeTest[[]int]{ val: [1] }) == '{"val":[1]}'
+	assert json.encode(MultTypeTest[[]int]{ val: [0, 1, 0, 2, 3, 2, 5, 1] }) == '{"val":[0,1,0,2,3,2,5,1]}'
+
+	assert json.encode(MultTypeTestOptional[[]int]{ val: none }) == '{}'
+	assert json.encode(MultTypeTestOptional[[]int]{}) == '{"val":[]}'
+	assert json.encode(MultTypeTestOptional[[]int]{ val: [] }) == '{"val":[]}'
+	assert json.encode(MultTypeTestOptional[[]int]{ val: [0] }) == '{"val":[0]}'
+	assert json.encode(MultTypeTestOptional[[]int]{ val: [1] }) == '{"val":[1]}'
+	assert json.encode(MultTypeTestOptional[[]int]{ val: [0, 1, 0, 2, 3, 2, 5, 1] }) == '{"val":[0,1,0,2,3,2,5,1]}'
+
+	assert json.encode(MultTypeTest[[]byte]{}) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]byte]{ val: [] }) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]byte]{ val: [byte(0)] }) == '{"val":[0]}'
+	assert json.encode(MultTypeTest[[]byte]{ val: [byte(1)] }) == '{"val":[1]}'
+	assert json.encode(MultTypeTest[[]byte]{ val: [byte(0), 1, 0, 2, 3, 2, 5, 1] }) == '{"val":[0,1,0,2,3,2,5,1]}'
+
+	assert json.encode(MultTypeTest[[]i64]{}) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]i64]{ val: [] }) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]i64]{ val: [i64(0)] }) == '{"val":[0]}'
+	assert json.encode(MultTypeTest[[]i64]{ val: [i64(1)] }) == '{"val":[1]}'
+	assert json.encode(MultTypeTest[[]i64]{ val: [i64(0), 1, 0, 2, 3, 2, 5, 1] }) == '{"val":[0,1,0,2,3,2,5,1]}'
+
+	assert json.encode(MultTypeTest[[]u64]{}) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]u64]{ val: [] }) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]u64]{ val: [u64(0)] }) == '{"val":[0]}'
+	assert json.encode(MultTypeTest[[]u64]{ val: [u64(1)] }) == '{"val":[1]}'
+	assert json.encode(MultTypeTest[[]u64]{ val: [u64(0), 1, 0, 2, 3, 2, 5, 1] }) == '{"val":[0,1,0,2,3,2,5,1]}'
+
+	assert json.encode(MultTypeTest[[]f64]{}) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]f64]{ val: [] }) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]f64]{ val: [f64(0)] }) == '{"val":[0.0]}'
+	assert json.encode(MultTypeTest[[]f64]{ val: [f64(1)] }) == '{"val":[1.0]}'
+	assert json.encode(MultTypeTest[[]f64]{ val: [f64(0), 1, 0, 2, 3, 2, 5, 1] }) == '{"val":[0.0,1.0,0.0,2.0,3.0,2.0,5.0,1.0]}'
+
+	assert json.encode(MultTypeTest[[]bool]{}) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]bool]{ val: [] }) == '{"val":[]}'
+	assert json.encode(MultTypeTest[[]bool]{ val: [true] }) == '{"val":[true]}'
+	assert json.encode(MultTypeTest[[]bool]{ val: [false] }) == '{"val":[false]}'
+	assert json.encode(MultTypeTest[[]bool]{ val: [false, true, false] }) == '{"val":[false,true,false]}'
 }