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

Attempt at fixing enum type lookups (anything not implicitly in scope of mixin such as built-in types)

This commit is contained in:
Tristan B. Velloza Kildaire 2023-01-06 16:38:34 +02:00
parent 2f5710fafb
commit b10c7d928d
2 changed files with 91 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
source/libpb/deserialization.d
View File

@ -3,105 +3,108 @@ module libpb.deserialization;
import std.json; import std.json;
import std.traits : FieldTypeTuple, FieldNameTuple; import std.traits : FieldTypeTuple, FieldNameTuple;
public RecordType fromJSON(RecordType)(JSONValue jsonIn) template T(RecordType)
{ {
RecordType record; public RecordType fromJSON(JSONValue jsonIn)
// Alias as to only expand later when used in compile-time
alias structTypes = FieldTypeTuple!(RecordType);
alias structNames = FieldNameTuple!(RecordType);
alias structValues = record.tupleof;
static foreach(cnt; 0..structTypes.length)
{ {
debug(dbg) RecordType record;
{
pragma(msg, structTypes[cnt]);
pragma(msg, structNames[cnt]);
// pragma(msg, structValues[cnt]);
}
static if(__traits(isSame, mixin(structTypes[cnt]), byte)) // Alias as to only expand later when used in compile-time
{ alias structTypes = FieldTypeTuple!(RecordType);
mixin("record."~structNames[cnt]) = cast(byte)jsonIn[structNames[cnt]].integer(); alias structNames = FieldNameTuple!(RecordType);
} alias structValues = record.tupleof;
else static if(__traits(isSame, mixin(structTypes[cnt]), ubyte))
{
mixin("record."~structNames[cnt]) = cast(ubyte)jsonIn[structNames[cnt]].uinteger();
}
else static if(__traits(isSame, mixin(structTypes[cnt]), short))
{
mixin("record."~structNames[cnt]) = cast(short)jsonIn[structNames[cnt]].integer();
}
else static if(__traits(isSame, mixin(structTypes[cnt]), ushort))
{
mixin("record."~structNames[cnt]) = cast(ushort)jsonIn[structNames[cnt]].uinteger();
}
else static if(__traits(isSame, mixin(structTypes[cnt]), int))
{
mixin("record."~structNames[cnt]) = cast(int)jsonIn[structNames[cnt]].integer();
}
else static if(__traits(isSame, mixin(structTypes[cnt]), uint))
{
mixin("record."~structNames[cnt]) = cast(uint)jsonIn[structNames[cnt]].uinteger();
}
else static if(__traits(isSame, mixin(structTypes[cnt]), ulong))
{
mixin("record."~structNames[cnt]) = cast(ulong)jsonIn[structNames[cnt]].uinteger();
}
else static if(__traits(isSame, mixin(structTypes[cnt]), long))
{
mixin("record."~structNames[cnt]) = cast(long)jsonIn[structNames[cnt]].integer();
}
else static if(__traits(isSame, mixin(structTypes[cnt]), string))
{
mixin("record."~structNames[cnt]) = jsonIn[structNames[cnt]].str();
static foreach(cnt; 0..structTypes.length)
{
debug(dbg) debug(dbg)
{ {
pragma(msg,"record."~structNames[cnt]); pragma(msg, structTypes[cnt]);
pragma(msg, structNames[cnt]);
// pragma(msg, structValues[cnt]);
} }
}
else static if(__traits(isSame, mixin(structTypes[cnt]), JSONValue))
{
mixin("record."~structNames[cnt]) = jsonIn[structNames[cnt]];
debug(dbg) static if(__traits(isSame, mixin(structTypes[cnt]), byte))
{ {
pragma(msg,"record."~structNames[cnt]); mixin("record."~structNames[cnt]) = cast(byte)jsonIn[structNames[cnt]].integer();
} }
} else static if(__traits(isSame, mixin(structTypes[cnt]), ubyte))
else static if(__traits(isSame, mixin(structTypes[cnt]), bool)) {
{ mixin("record."~structNames[cnt]) = cast(ubyte)jsonIn[structNames[cnt]].uinteger();
mixin("record."~structNames[cnt]) = jsonIn[structNames[cnt]].boolean(); }
else static if(__traits(isSame, mixin(structTypes[cnt]), short))
{
mixin("record."~structNames[cnt]) = cast(short)jsonIn[structNames[cnt]].integer();
}
else static if(__traits(isSame, mixin(structTypes[cnt]), ushort))
{
mixin("record."~structNames[cnt]) = cast(ushort)jsonIn[structNames[cnt]].uinteger();
}
else static if(__traits(isSame, mixin(structTypes[cnt]), int))
{
mixin("record."~structNames[cnt]) = cast(int)jsonIn[structNames[cnt]].integer();
}
else static if(__traits(isSame, mixin(structTypes[cnt]), uint))
{
mixin("record."~structNames[cnt]) = cast(uint)jsonIn[structNames[cnt]].uinteger();
}
else static if(__traits(isSame, mixin(structTypes[cnt]), ulong))
{
mixin("record."~structNames[cnt]) = cast(ulong)jsonIn[structNames[cnt]].uinteger();
}
else static if(__traits(isSame, mixin(structTypes[cnt]), long))
{
mixin("record."~structNames[cnt]) = cast(long)jsonIn[structNames[cnt]].integer();
}
else static if(__traits(isSame, mixin(structTypes[cnt]), string))
{
mixin("record."~structNames[cnt]) = jsonIn[structNames[cnt]].str();
debug(dbg) debug(dbg)
{ {
pragma(msg,"record."~structNames[cnt]); pragma(msg,"record."~structNames[cnt]);
}
} }
} else static if(__traits(isSame, mixin(structTypes[cnt]), JSONValue))
//FIXME: Not sure how to get array support going, very new to meta programming {
else static if(__traits(isSame, mixin(structTypes[cnt]), mixin(structTypes[cnt])[])) mixin("record."~structNames[cnt]) = jsonIn[structNames[cnt]];
{
mixin("record."~structNames[cnt]) = jsonIn[structNames[cnt]].boolean();
debug(dbg) debug(dbg)
{
pragma(msg,"record."~structNames[cnt]);
}
}
else static if(__traits(isSame, mixin(structTypes[cnt]), bool))
{ {
pragma(msg,"record."~structNames[cnt]); mixin("record."~structNames[cnt]) = jsonIn[structNames[cnt]].boolean();
}
} debug(dbg)
else {
{ pragma(msg,"record."~structNames[cnt]);
// throw new }
//TODO: Throw error }
debug(dbg) //FIXME: Not sure how to get array support going, very new to meta programming
{ else static if(__traits(isSame, mixin(structTypes[cnt]), mixin(structTypes[cnt])[]))
pragma(msg, "Unknown type for de-serialization"); {
mixin("record."~structNames[cnt]) = jsonIn[structNames[cnt]].boolean();
debug(dbg)
{
pragma(msg,"record."~structNames[cnt]);
}
}
else
{
// throw new
//TODO: Throw error
debug(dbg)
{
pragma(msg, "Unknown type for de-serialization");
}
} }
} }
return record;
} }
return record;
} }
unittest unittest
@ -128,7 +131,7 @@ unittest
} }
`); `);
Person person = fromJSON!(Person)(json); Person person = T!(Person).fromJSON(json);
debug(dbg) debug(dbg)
{ {

10
source/libpb/driver.d
View File

@ -158,7 +158,7 @@ public class PocketBase
} }
} }
recordsOut ~= fromJSON!(RecordType)(returnedItem); recordsOut ~= T!(RecordType).fromJSON(returnedItem);
} }
return recordsOut; return recordsOut;
@ -268,7 +268,7 @@ public class PocketBase
responseJSON["passwordConfirm"] = ""; responseJSON["passwordConfirm"] = "";
} }
recordOut = fromJSON!(RecordType)(responseJSON); recordOut = T!(RecordType).fromJSON(responseJSON);
return recordOut; return recordOut;
} }
@ -349,7 +349,7 @@ public class PocketBase
} }
recordOut = fromJSON!(RecordType)(recordResponse); recordOut = T!(RecordType).fromJSON(recordResponse);
// Store the token // Store the token
token = responseJSON["token"].str(); token = responseJSON["token"].str();
@ -448,7 +448,7 @@ public class PocketBase
} }
} }
recordOut = fromJSON!(RecordType)(responseJSON); recordOut = T!(RecordType).fromJSON(responseJSON);
return recordOut; return recordOut;
} }
@ -553,7 +553,7 @@ public class PocketBase
} }
} }
recordOut = fromJSON!(RecordType)(responseJSON); recordOut = T!(RecordType).fromJSON(responseJSON);
return recordOut; return recordOut;
} }