Haxio/jstruct
Haxio
/
jstruct
mirror of https://github.com/Hax-io/jstruct
1
0
Fork 0
Code Issues Packages Releases Activity

Serializer 

- There was no need to mix these in as they are symbols already, it would have made sense if they were strings
- Added support for array detection

Unit tests

- Added serialization check for the serialized array
This commit is contained in:
Tristan B. Velloza Kildaire 2023-06-23 08:27:39 +02:00
parent 169a0bb48f
commit 023e7b7e8d
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
source/jstruct/serializer.d
View File

@ -3,6 +3,7 @@ module jstruct.serializer;
import std.json; import std.json;
import std.conv : to; import std.conv : to;
import std.traits : FieldTypeTuple, FieldNameTuple; import std.traits : FieldTypeTuple, FieldNameTuple;
import std.traits : isArray;
public JSONValue serializeRecord(RecordType)(RecordType record) public JSONValue serializeRecord(RecordType)(RecordType record)
{ {
@ -23,35 +24,42 @@ public JSONValue serializeRecord(RecordType)(RecordType record)
// pragma(msg, structValues[cnt]); // pragma(msg, structValues[cnt]);
} }
import std.traits : isArray;
static if(__traits(isSame, mixin(structTypes[cnt]), int))
static if(__traits(isSame, structTypes[cnt], int))
{ {
builtJSON[structNames[cnt]] = structValues[cnt]; builtJSON[structNames[cnt]] = structValues[cnt];
} }
else static if(__traits(isSame, mixin(structTypes[cnt]), uint)) else static if(__traits(isSame, structTypes[cnt], uint))
{ {
builtJSON[structNames[cnt]] = structValues[cnt]; builtJSON[structNames[cnt]] = structValues[cnt];
} }
else static if(__traits(isSame, mixin(structTypes[cnt]), ulong)) else static if(__traits(isSame, structTypes[cnt], ulong))
{ {
builtJSON[structNames[cnt]] = structValues[cnt]; builtJSON[structNames[cnt]] = structValues[cnt];
} }
else static if(__traits(isSame, mixin(structTypes[cnt]), long)) else static if(__traits(isSame, structTypes[cnt], long))
{ {
builtJSON[structNames[cnt]] = structValues[cnt]; builtJSON[structNames[cnt]] = structValues[cnt];
} }
else static if(__traits(isSame, mixin(structTypes[cnt]), string)) else static if(__traits(isSame, structTypes[cnt], string))
{ {
builtJSON[structNames[cnt]] = structValues[cnt]; builtJSON[structNames[cnt]] = structValues[cnt];
} }
else static if(__traits(isSame, mixin(structTypes[cnt]), JSONValue)) else static if(__traits(isSame, structTypes[cnt], JSONValue))
{ {
builtJSON[structNames[cnt]] = structValues[cnt]; builtJSON[structNames[cnt]] = structValues[cnt];
} }
else static if(__traits(isSame, mixin(structTypes[cnt]), bool)) else static if(__traits(isSame, structTypes[cnt], bool))
{ {
builtJSON[structNames[cnt]] = structValues[cnt]; builtJSON[structNames[cnt]] = structValues[cnt];
} }
else static if(isArray!(structTypes[cnt]))
{
builtJSON[structNames[cnt]] = structValues[cnt];
// pragma(msg, "WAIT", "d"~mixin(structTypes[cnt]));
}
else else
{ {
debug(dbg) debug(dbg)
@ -102,6 +110,14 @@ unittest
assert(canFind(keys, "lastname") && cmp(serialized["lastname"].str(), "Kildaire") == 0); assert(canFind(keys, "lastname") && cmp(serialized["lastname"].str(), "Kildaire") == 0);
assert(canFind(keys, "age") && serialized["age"].integer() == 23); assert(canFind(keys, "age") && serialized["age"].integer() == 23);
assert(canFind(keys, "list"));
JSONValue[] elems = serialized["list"].array();
for(ulong i = 0; i < elems.length; i++)
{
string curElem = elems[i].str();
assert(curElem == p1.list[i]);
}
debug(dbg) debug(dbg)
{ {
writeln(serialized.toPrettyString()); writeln(serialized.toPrettyString());