Merge branch 'development' into 6-openrpc-code-generator

lib/data/paramsparser/params_export_import.v

@@ -192,7 +192,7 @@ fn (p Params) export_helper(args_ ExportArgs) ![]ParamExportItem {
 }
 
 fn val_is_empty(val string) bool {
-	return val == '' || val == '[]'
+	return val == '' || val == '[]' || val == '0000-00-00 00:00:00'
 }
 
 @[params]

lib/data/paramsparser/params_export_test.v

@@ -290,4 +290,4 @@ fn test_export_text() {
 	}
 	paramsout := params.export()
 	assert paramsout.trim_space() == "text:'This content contains the character \\' in it'"
-}
+}

lib/data/paramsparser/params_reflection.v

@@ -1,6 +1,7 @@
 module paramsparser
 
 import time
+import freeflowuniverse.herolib.data.ourtime
 import v.reflection
 // import freeflowuniverse.herolib.data.encoderhero
 // TODO: support more field types
@@ -17,11 +18,16 @@ pub fn (params Params) decode_struct[T](_ T) !T {
 		$if field.is_enum {
 			t.$(field.name) = params.get_int(field.name) or { 0 }
 		} $else {
-			if field.name[0].is_capital() {
-				// embed := params.decode_struct(t.$(field.name))!
-				t.$(field.name) = params.decode_struct(t.$(field.name))!
-			} else {
-				t.$(field.name) = params.decode_value(t.$(field.name), field.name)!
+			// super annoying didn't find other way, then to ignore options
+			$if field.is_option {
+			} $else {
+				if field.name[0].is_capital() {
+					// embed := params.decode_struct(t.$(field.name))!
+					t.$(field.name) = params.decode_struct(t.$(field.name))!
+					// panic("to implement")
+				} else {
+					t.$(field.name) = params.decode_value(t.$(field.name), field.name)!
+				}
 			}
 		}
 	}
@@ -30,11 +36,7 @@ pub fn (params Params) decode_struct[T](_ T) !T {
 
 pub fn (params Params) decode_value[T](_ T, key string) !T {
 	// $if T is $option {
-	// 	// unwrap and encode optionals
-	// 	workaround := t
-	// 	if workaround != none {
-	// 		encode(t, args)!
-	// 	}
+	// 	return error("is option")
 	// }
 	// value := params.get(field.name)!
 
@@ -65,6 +67,13 @@ pub fn (params Params) decode_value[T](_ T, key string) !T {
 			return time.Time{}
 		}
 		return time.parse(time_str)!
+	} $else $if T is ourtime.OurTime {
+		time_str := params.get(key)!
+		// todo: 'handle other null times'
+		if time_str == '0000-00-00 00:00:00' {
+			return ourtime.new('0000-00-00 00:00:00')!
+		}
+		return ourtime.new(time_str)!
 	} $else $if T is $struct {
 		child_params := params.get_params(key)!
 		child := child_params.decode_struct(T{})!
@@ -99,7 +108,7 @@ pub fn encode[T](t T, args EncodeArgs) !Params {
 			key = field_attrs['alias']
 		}
 		$if val is string || val is int || val is bool || val is i64 || val is u32
-			|| val is time.Time {
+			|| val is time.Time || val is ourtime.OurTime {
 			params.set(key, '${val}')
 		} $else $if field.is_enum {
 			params.set(key, '${int(val)}')

lib/data/paramsparser/params_reflection_test.v

@@ -33,7 +33,6 @@ const test_child = TestChild{
 
 const test_struct = TestStruct{
 	name:     'test'
-	nick:     'test_nick'
 	birthday: time.new(
 		day:   12
 		month: 12
@@ -104,6 +103,8 @@ fn test_decode() {
 	decoded_child := test_child_params.decode[TestChild]()!
 	assert decoded_child == test_child
 
+	// IMPORTANT OPTIONALS ARE NOT SUPPORTED AND WILL NOT BE ENCODED FOR NOW (unless we find ways how to deal with attributes to not encode skipped elements)
+
 	// test recursive decode struct with child
 	decoded := test_params.decode[TestStruct]()!
 	assert decoded == test_struct