mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
builtin, cgen: support FieldData.unaliased_typ, use it for generalising x.json2 (able to encode type aliased struct fields) (#16469)
This commit is contained in:
Hitalo Souza
@ -1,4 +1,4 @@
|
||||
import x.json2
|
||||
import x.json2 as json
|
||||
import time
|
||||
|
||||
enum JobTitle {
|
||||
@ -15,12 +15,21 @@ pub mut:
|
||||
title JobTitle
|
||||
}
|
||||
|
||||
struct EmployeeOp {
|
||||
pub mut:
|
||||
name ?string = none
|
||||
last_name ?string = none
|
||||
age ?int
|
||||
salary f32
|
||||
title JobTitle
|
||||
}
|
||||
|
||||
fn (e Employee) to_json() string {
|
||||
mut mp := map[string]json2.Any{}
|
||||
mp['name'] = json2.Any(e.name)
|
||||
mp['age'] = json2.Any(e.age)
|
||||
mp['salary'] = json2.Any(e.salary)
|
||||
mp['title'] = json2.Any(int(e.title))
|
||||
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)
|
||||
@ -35,34 +44,38 @@ fn (e Employee) to_json() string {
|
||||
return mp.str()
|
||||
}
|
||||
|
||||
fn (mut e Employee) from_json(any json2.Any) {
|
||||
fn (mut e Employee) from_json(any json.Any) {
|
||||
mp := any.as_map()
|
||||
e.name = mp['name'] or { json2.Any('') }.str()
|
||||
e.age = mp['age'] or { json2.Any(0) }.int()
|
||||
e.salary = mp['salary'] or { json2.Any(0) }.f32()
|
||||
e.title = unsafe { JobTitle(mp['title'] or { json2.Any(0) }.int()) }
|
||||
e.name = mp['name'] or { json.Any('') }.str()
|
||||
e.age = mp['age'] or { json.Any(0) }.int()
|
||||
e.salary = mp['salary'] or { json.Any(0) }.f32()
|
||||
e.title = unsafe { JobTitle(mp['title'] or { json.Any(0) }.int()) }
|
||||
}
|
||||
|
||||
fn test_simple() {
|
||||
x := Employee{'Peter', 28, 95000.5, .worker}
|
||||
s := json2.encode<Employee>(x)
|
||||
assert s == '{"name":"Peter","age":28,"salary":95000.5,"title":2}'
|
||||
y := json2.decode<Employee>(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
|
||||
// fn test_simplegg() {
|
||||
// // x := EmployeeOp{'Peter', 28, 95000.5, .worker}
|
||||
// x := EmployeeOp{
|
||||
// name: 'vshfvhsd'
|
||||
// }
|
||||
// s := json.encode<EmployeeOp>(x)
|
||||
// assert s == '{"name":"vshfvhsd","age":0,"salary":0.0,"title":0.0}'
|
||||
// // 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
|
||||
// }
|
||||
|
||||
fn test_fast_raw_decode() {
|
||||
s := '{"name":"Peter","age":28,"salary":95000.5,"title":2}'
|
||||
o := json2.fast_raw_decode(s) or {
|
||||
o := json.fast_raw_decode(s) or {
|
||||
assert false
|
||||
json2.Any(json2.null)
|
||||
json.Any(json.null)
|
||||
}
|
||||
str := o.str()
|
||||
assert str == '{"name":"Peter","age":"28","salary":"95000.5","title":"2"}'
|
||||
@ -76,7 +89,7 @@ fn test_character_unescape() {
|
||||
"quotes": "\"quotes\"",
|
||||
"slash":"\/dev\/null"
|
||||
}'
|
||||
mut obj := json2.raw_decode(message) or {
|
||||
mut obj := json.raw_decode(message) or {
|
||||
println(err)
|
||||
assert false
|
||||
return
|
||||
@ -89,7 +102,7 @@ fn test_character_unescape() {
|
||||
assert lines['slash'] or { 0 }.str() == '/dev/null'
|
||||
}
|
||||
|
||||
fn (mut u User2) from_json(an json2.Any) {
|
||||
fn (mut u User2) from_json(an json.Any) {
|
||||
mp := an.as_map()
|
||||
mut js_field_name := ''
|
||||
$for field in User.fields {
|
||||
@ -109,13 +122,12 @@ fn (mut u User2) from_json(an json2.Any) {
|
||||
}
|
||||
|
||||
struct User2 {
|
||||
mut:
|
||||
pub mut:
|
||||
age int
|
||||
nums []int
|
||||
reg_date time.Time
|
||||
}
|
||||
|
||||
// User struct needs to be `pub mut` for now in order to access and manipulate values
|
||||
struct User {
|
||||
pub mut:
|
||||
age int
|
||||
@ -126,7 +138,7 @@ pub mut:
|
||||
pets string [json: 'pet_animals'; raw]
|
||||
}
|
||||
|
||||
fn (mut u User) from_json(an json2.Any) {
|
||||
fn (mut u User) from_json(an json.Any) {
|
||||
mp := an.as_map()
|
||||
mut js_field_name := ''
|
||||
$for field in User.fields {
|
||||
@ -153,72 +165,23 @@ fn (mut u User) from_json(an json2.Any) {
|
||||
fn (u User) to_json() string {
|
||||
// TODO: derive from field
|
||||
mut mp := {
|
||||
'age': json2.Any(u.age)
|
||||
'age': json.Any(u.age)
|
||||
}
|
||||
mp['nums'] = u.nums.map(json2.Any(it))
|
||||
mp['lastName'] = json2.Any(u.last_name)
|
||||
mp['IsRegistered'] = json2.Any(u.is_registered)
|
||||
mp['type'] = json2.Any(u.typ)
|
||||
mp['pet_animals'] = json2.Any(u.pets)
|
||||
mp['nums'] = u.nums.map(json.Any(it))
|
||||
mp['lastName'] = json.Any(u.last_name)
|
||||
mp['IsRegistered'] = json.Any(u.is_registered)
|
||||
mp['type'] = json.Any(u.typ)
|
||||
mp['pet_animals'] = json.Any(u.pets)
|
||||
return mp.str()
|
||||
}
|
||||
|
||||
fn test_parse_user() {
|
||||
s := '{"age": 10, "nums": [1,2,3], "type": 1, "lastName": "Johnson", "IsRegistered": true, "pet_animals": {"name": "Bob", "animal": "Dog"}}'
|
||||
u2 := json2.decode<User2>(s)!
|
||||
u := json2.decode<User>(s)!
|
||||
assert u.age == 10
|
||||
assert u.last_name == 'Johnson'
|
||||
assert u.is_registered == true
|
||||
assert u.nums.len == 3
|
||||
assert u.nums[0] == 1
|
||||
assert u.nums[1] == 2
|
||||
assert u.nums[2] == 3
|
||||
assert u.typ == 1
|
||||
assert u.pets == '{"name":"Bob","animal":"Dog"}'
|
||||
}
|
||||
|
||||
// fn test_encode_decode_time() {
|
||||
// user := User2{
|
||||
// age: 25
|
||||
// reg_date: time.new_time(year: 2020, month: 12, day: 22, hour: 7, minute: 23)
|
||||
// }
|
||||
// s := json2.encode(user)
|
||||
// // println(s) //{"age":25,"nums":[],"reg_date":{"year":2020,"month":12,"day":22,"hour":7,"minute":23,"second":0,"microsecond":0,"unix":1608621780,"is_local":false}}
|
||||
// assert s.contains('"reg_date":1608621780')
|
||||
// user2 := json2.decode<User2>(s)!
|
||||
// assert user2.reg_date.str() == '2020-12-22 07:23:00'
|
||||
// // println(user2)
|
||||
// // println(user2.reg_date)
|
||||
// }
|
||||
|
||||
fn (mut u User) foo() string {
|
||||
return json2.encode(u)
|
||||
}
|
||||
|
||||
fn test_encode_user() {
|
||||
mut usr := User{
|
||||
age: 10
|
||||
nums: [1, 2, 3]
|
||||
last_name: 'Johnson'
|
||||
is_registered: true
|
||||
typ: 0
|
||||
pets: 'foo'
|
||||
}
|
||||
expected := '{"age":10,"nums":[1,2,3],"lastName":"Johnson","IsRegistered":true,"type":0,"pet_animals":"foo"}'
|
||||
out := json2.encode<User>(usr)
|
||||
assert out == expected
|
||||
// Test json.encode on mutable pointers
|
||||
assert usr.foo() == expected
|
||||
}
|
||||
|
||||
struct Color {
|
||||
pub mut:
|
||||
space string
|
||||
point string [raw]
|
||||
}
|
||||
|
||||
fn (mut c Color) from_json(an json2.Any) {
|
||||
fn (mut c Color) from_json(an json.Any) {
|
||||
mp := an.as_map()
|
||||
$for field in Color.fields {
|
||||
match field.name {
|
||||
@ -228,180 +191,3 @@ fn (mut c Color) from_json(an json2.Any) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn test_raw_json_field() {
|
||||
color := json2.decode<Color>('{"space": "YCbCr", "point": {"Y": 123}}') or {
|
||||
assert false
|
||||
Color{}
|
||||
}
|
||||
assert color.point == '{"Y":123}'
|
||||
assert color.space == 'YCbCr'
|
||||
}
|
||||
|
||||
/*
|
||||
struct City {
|
||||
name string
|
||||
}
|
||||
|
||||
struct Country {
|
||||
cities []City
|
||||
name string
|
||||
}
|
||||
fn test_struct_in_struct() {
|
||||
country := json2.decode<Country>('{ "name": "UK", "cities": [{"name":"London"}, {"name":"Manchester"}]}') or {
|
||||
assert false
|
||||
exit(1)
|
||||
}
|
||||
assert country.name == 'UK'
|
||||
assert country.cities.len == 2
|
||||
assert country.cities[0].name == 'London'
|
||||
assert country.cities[1].name == 'Manchester'
|
||||
println(country.cities)
|
||||
}
|
||||
*/
|
||||
fn test_encode_map() {
|
||||
expected := '{"one":1,"two":2,"three":3,"four":4}'
|
||||
numbers := {
|
||||
'one': json2.Any(1)
|
||||
'two': json2.Any(2)
|
||||
'three': json2.Any(3)
|
||||
'four': json2.Any(4)
|
||||
}
|
||||
out := numbers.str()
|
||||
assert out == expected
|
||||
}
|
||||
|
||||
/*
|
||||
fn test_parse_map() {
|
||||
expected := {
|
||||
'one': 1
|
||||
'two': 2
|
||||
'three': 3
|
||||
'four': 4
|
||||
}
|
||||
out := json.decode<map[string]int>('{"one":1,"two":2,"three":3,"four":4}') or {
|
||||
assert false
|
||||
r := {
|
||||
'': 0
|
||||
}
|
||||
r
|
||||
}
|
||||
println(out)
|
||||
assert out == expected
|
||||
}
|
||||
|
||||
struct Data {
|
||||
countries []Country
|
||||
users map[string]User
|
||||
extra map[string]map[string]int
|
||||
}
|
||||
|
||||
fn test_nested_type() {
|
||||
data_expected := '{"countries":[{"cities":[{"name":"London"},{"name":"Manchester"}],"name":"UK"},{"cities":[{"name":"Donlon"},{"name":"Termanches"}],"name":"KU"}],"users":{"Foo":{"age":10,"nums":[1,2,3],"lastName":"Johnson","IsRegistered":true,"type":0,"pet_animals":"little foo"},"Boo":{"age":20,"nums":[5,3,1],"lastName":"Smith","IsRegistered":false,"type":4,"pet_animals":"little boo"}},"extra":{"2":{"n1":2,"n2":4,"n3":8,"n4":16},"3":{"n1":3,"n2":9,"n3":27,"n4":81}}}'
|
||||
|
||||
data := Data{
|
||||
countries: [
|
||||
Country{
|
||||
name: 'UK'
|
||||
cities: [City{'London'},
|
||||
City{'Manchester'},
|
||||
]
|
||||
},
|
||||
Country{
|
||||
name: 'KU'
|
||||
cities: [City{'Donlon'},
|
||||
City{'Termanches'},
|
||||
]
|
||||
},
|
||||
]
|
||||
users: {
|
||||
'Foo': User{
|
||||
age: 10
|
||||
nums: [1, 2, 3]
|
||||
last_name: 'Johnson'
|
||||
is_registered: true
|
||||
typ: 0
|
||||
pets: 'little foo'
|
||||
},
|
||||
'Boo': User{
|
||||
age: 20
|
||||
nums: [5, 3, 1]
|
||||
last_name: 'Smith'
|
||||
is_registered: false
|
||||
typ: 4
|
||||
pets: 'little boo'
|
||||
}
|
||||
},
|
||||
extra: {
|
||||
'2': {
|
||||
'n1': 2
|
||||
'n2': 4
|
||||
'n3': 8
|
||||
'n4': 16
|
||||
},
|
||||
'3': {
|
||||
'n1': 3
|
||||
'n2': 9
|
||||
'n3': 27
|
||||
'n4': 81
|
||||
},
|
||||
}
|
||||
}
|
||||
out := json.encode(data)
|
||||
println(out)
|
||||
assert out == data_expected
|
||||
|
||||
data2 := json.decode(Data, data_expected) or {
|
||||
assert false
|
||||
Data{}
|
||||
}
|
||||
assert data2.countries.len == data.countries.len
|
||||
for i in 0..1 {
|
||||
assert data2.countries[i].name == data.countries[i].name
|
||||
assert data2.countries[i].cities.len == data.countries[i].cities.len
|
||||
for j in 0..1 {
|
||||
assert data2.countries[i].cities[j].name == data.countries[i].cities[j].name
|
||||
}
|
||||
}
|
||||
|
||||
for key, user in data.users {
|
||||
assert data2.users[key].age == user.age
|
||||
assert data2.users[key].nums == user.nums
|
||||
assert data2.users[key].last_name == user.last_name
|
||||
assert data2.users[key].is_registered == user.is_registered
|
||||
assert data2.users[key].typ == user.typ
|
||||
// assert data2.users[key].pets == user.pets // TODO FIX
|
||||
}
|
||||
|
||||
for k, v in data.extra {
|
||||
for k2, v2 in v {
|
||||
assert data2.extra[k][k2] == v2
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn test_errors() {
|
||||
invalid_array := fn () {
|
||||
data := '{"countries":[{"cities":[{"name":"London"},{"name":"Manchester"}],"name":"UK"},{"cities":{"name":"Donlon"},"name":"KU"}],"users":{"Foo":{"age":10,"nums":[1,2,3],"lastName":"Johnson","IsRegistered":true,"type":0,"pet_animals":"little foo"},"Boo":{"age":20,"nums":[5,3,1],"lastName":"Smith","IsRegistered":false,"type":4,"pet_animals":"little boo"}},"extra":{"2":{"n1":2,"n2":4,"n3":8,"n4":16},"3":{"n1":3,"n2":9,"n3":27,"n4":81}}}'
|
||||
|
||||
json.decode(Data, data) or {
|
||||
println(err)
|
||||
assert err.starts_with('Json element is not an array:')
|
||||
return
|
||||
}
|
||||
assert false
|
||||
}
|
||||
invalid_object := fn() {
|
||||
data := '{"countries":[{"cities":[{"name":"London"},{"name":"Manchester"}],"name":"UK"},{"cities":[{"name":"Donlon"},{"name":"Termanches"}],"name":"KU"}],"users":[{"age":10,"nums":[1,2,3],"lastName":"Johnson","IsRegistered":true,"type":0,"pet_animals":"little foo"},{"age":20,"nums":[5,3,1],"lastName":"Smith","IsRegistered":false,"type":4,"pet_animals":"little boo"}],"extra":{"2":{"n1":2,"n2":4,"n3":8,"n4":16},"3":{"n1":3,"n2":9,"n3":27,"n4":81}}}'
|
||||
|
||||
json.decode(Data, data) or {
|
||||
println(err)
|
||||
assert err.starts_with('Json element is not an object:')
|
||||
return
|
||||
}
|
||||
assert false
|
||||
}
|
||||
invalid_array()
|
||||
invalid_object()
|
||||
}
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user