From 28cbaf66b8d86ebcd7377bfdbd59c3d76a8d6057 Mon Sep 17 00:00:00 2001
From: Hitalo Souza <63821277+enghitalo@users.noreply.github.com>
Date: Sun, 15 Jan 2023 07:30:33 -0300
Subject: [PATCH] json2: refactoring and fixes (#16893)

---
 database.db                       | Bin 0 -> 8192 bytes
 vlib/x/json2/encode_struct_test.v |  12 ++++++++++
 vlib/x/json2/encoder.v            |  36 ++++++++++--------------------
 vweb.sql                          |   0
 4 files changed, 24 insertions(+), 24 deletions(-)
 create mode 100644 database.db
 create mode 100644 vweb.sql

diff --git a/database.db b/database.db
new file mode 100644
index 0000000000000000000000000000000000000000..1e532fd0bad7cd04b634aa53f59c932c5adbca12
GIT binary patch
literal 8192
zcmeI%u}Z{15C-7cn7dpfYZEMNru0Ar@db>s$Z@A=+`_AFM-t^QqUibnK7~(ZeVw(P
zwVjiboTaVBKkSg1pQQP^uovf(d93;R{_##C@6!euLkG-6lxZj0T^SwHZqaAE|5X|7
z&bHR|En{Cv4+;VhfB*y_009U<00Izz00bZafnR|elWpd?dD)9{)znd*Zre_dN>_Nt
zzBrsX4s8^8JIt%Vqf_sWUAe<S0(*Dqb$WiNB-YhTVi%p2qm!bX^4Lw6pACoYzj@!j
zk^Qot_QSs0g)S%vKmY;|fB*y_009U<00Izz00jQ8z@V@9^LZnU^m-{-l0mu()_#Iy
I6_{o44fU`zr~m)}

literal 0
HcmV?d00001

diff --git a/vlib/x/json2/encode_struct_test.v b/vlib/x/json2/encode_struct_test.v
index 47b6df8f0f..23d315d4d1 100644
--- a/vlib/x/json2/encode_struct_test.v
+++ b/vlib/x/json2/encode_struct_test.v
@@ -91,6 +91,18 @@ fn test_option_types() {
 	assert json.encode(StructTypeOption[time.Time]{}) == '{}'
 	assert json.encode(StructTypeOption[time.Time]{ val: time.Time{} }) == '{"val":"0000-00-00T00:00:00.000Z"}'
 	assert json.encode(StructTypeOption[time.Time]{ val: fixed_time }) == '{"val":"2022-03-11T13:54:25.000Z"}'
+
+	assert json.encode(StructTypeOption[StructType[int]]{
+		val: StructType[int]{
+			val: 1
+		}
+	}) == '{"val":{"val":1}}'
+
+	assert json.encode(StructTypeOption[Enumerates]{}) == '{}'
+	// assert json.encode(StructTypeOption[Enumerates]{ val: Enumerates.a }) == '{"val":0}'
+	// assert json.encode(StructTypeOption[Enumerates]{ val: Enumerates.d }) == '{"val":3}'
+	// assert json.encode(StructTypeOption[Enumerates]{ val: Enumerates.e }) == '{"val":99}'
+	// assert json.encode(StructTypeOption[Enumerates]{ val: Enumerates.f }) == '{"val":100}'
 }
 
 fn test_array() {
diff --git a/vlib/x/json2/encoder.v b/vlib/x/json2/encoder.v
index e10521332f..e250a6dcd0 100644
--- a/vlib/x/json2/encoder.v
+++ b/vlib/x/json2/encoder.v
@@ -149,8 +149,7 @@ fn (e &Encoder) encode_struct[U](val U, level int, mut wr io.Writer) ! {
 	mut i := 0
 	mut fields_len := 0
 	$for field in U.fields {
-		value := val.$(field.name)
-		if value.str() != 'Option(error: none)' {
+		if val.$(field.name).str() != 'Option(error: none)' {
 			fields_len++
 		}
 	}
@@ -181,35 +180,24 @@ fn (e &Encoder) encode_struct[U](val U, level int, mut wr io.Writer) ! {
 				}
 
 				$if field.typ is ?string {
-					option_value := val.$(field.name) as ?string
-					e.encode_string(option_value, mut wr)!
-				} $else $if field.typ is ?bool {
-					option_value := val.$(field.name) as ?bool
-					wr.write(Any(option_value).str().bytes())!
-				} $else $if field.typ is ?f32 {
-					option_value := val.$(field.name) as ?f32
-					wr.write(Any(option_value).str().bytes())!
-				} $else $if field.typ is ?f64 {
-					option_value := val.$(field.name) as ?f64
-					wr.write(Any(option_value).str().bytes())!
-				} $else $if field.typ is ?i8 {
-					option_value := val.$(field.name) as ?i8
-					wr.write(Any(option_value).str().bytes())!
-				} $else $if field.typ is ?i16 {
-					option_value := val.$(field.name) as ?i16
-					wr.write(Any(option_value).str().bytes())!
-				} $else $if field.typ is ?int {
-					option_value := val.$(field.name) as ?int
-					wr.write(Any(option_value).int().str().bytes())!
+					e.encode_string(val.$(field.name) ?.str()#[8..-2], mut wr)!
+				} $else $if field.typ is ?bool || field.typ is ?f32 || field.typ is ?f64
+					|| field.typ is ?i8 || field.typ is ?i16 || field.typ is ?int
+					|| field.typ is ?i64 || field.typ is ?u8 || field.typ is ?u16
+					|| field.typ is ?u32 || field.typ is ?u64 {
+					wr.write(val.$(field.name) ?.str()#[7..-1].bytes())!
 				} $else $if field.typ is ?time.Time {
 					option_value := val.$(field.name) as ?time.Time
 					parsed_time := option_value as time.Time
 					e.encode_string(parsed_time.format_rfc3339(), mut wr)!
 				} $else $if field.is_array {
 					e.encode_array(value, level + 1, mut wr)!
+				} $else $if field.is_struct {
+					e.encode_struct(value, level + 1, mut wr)!
 				} $else $if field.is_enum {
-					option_value := val.$(field.name) as ?int
-					wr.write(Any(option_value).int().str().bytes())!
+					// FIXME - checker and cast error
+					// wr.write(int(val.$(field.name)?).str().bytes())!
+					return error('type ${typeof(val).name} cannot be encoded yet')
 				} $else $if field.is_alias {
 					match field.unaliased_typ {
 						typeof[string]().idx {
diff --git a/vweb.sql b/vweb.sql
new file mode 100644
index 0000000000..e69de29bb2