mirror of https://github.com/Hax-io/libpb
Compare commits
11 Commits
Author | SHA1 | Date |
---|---|---|
Tristan B. Velloza Kildaire | e78b201aea | |
Tristan B. Velloza Kildaire | aa77afccac | |
Tristan B. Velloza Kildaire | da22ae1c61 | |
Tristan B. Velloza Kildaire | 4fc4242c1e | |
Tristan B. Velloza Kildaire | c89d6bd8b6 | |
Tristan B. Velloza Kildaire | 707a1b9373 | |
Tristan B. Velloza Kildaire | 3d9b9a4976 | |
Tristan B. Velloza Kildaire | b10c7d928d | |
Tristan B. Velloza Kildaire | 2f5710fafb | |
Tristan B. Velloza Kildaire | d89b7159dd | |
Tristan B. Velloza Kildaire | 5c0dcfe15b |
|
@ -14,3 +14,5 @@ libpb-test-*
|
|||
*.o
|
||||
*.obj
|
||||
*.lst
|
||||
liblibpb.a
|
||||
dub.selections.json
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 6.4 KiB |
Binary file not shown.
9
dub.json
9
dub.json
|
@ -3,9 +3,14 @@
|
|||
"Tristan B. Velloza Kildaire"
|
||||
],
|
||||
"copyright": "Copyright © 2022, Tristan B. Velloza Kildaire",
|
||||
"dependencies": {
|
||||
"jstruct": ">=0.1.2"
|
||||
},
|
||||
"description": "PocketBase wrapper with serializer/deserializer support",
|
||||
"libs": [
|
||||
"curl"
|
||||
],
|
||||
"license": "LGPL v3.0",
|
||||
"name": "libpb",
|
||||
"targetType" : "library",
|
||||
"libs":["curl"]
|
||||
"targetType": "library"
|
||||
}
|
||||
|
|
14
dummy.json
14
dummy.json
|
@ -46,7 +46,7 @@
|
|||
"schema": [
|
||||
{
|
||||
"id": "psy7unkl",
|
||||
"name": "bruh",
|
||||
"name": "name",
|
||||
"type": "text",
|
||||
"system": false,
|
||||
"required": false,
|
||||
|
@ -56,6 +56,18 @@
|
|||
"max": null,
|
||||
"pattern": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "jroziygp",
|
||||
"name": "age",
|
||||
"type": "number",
|
||||
"system": false,
|
||||
"required": false,
|
||||
"unique": false,
|
||||
"options": {
|
||||
"min": null,
|
||||
"max": null
|
||||
}
|
||||
}
|
||||
],
|
||||
"listRule": "",
|
||||
|
|
|
@ -1,144 +0,0 @@
|
|||
module libpb.deserialization;
|
||||
|
||||
import std.json;
|
||||
import std.traits : FieldTypeTuple, FieldNameTuple;
|
||||
|
||||
public RecordType fromJSON(RecordType)(JSONValue jsonIn)
|
||||
{
|
||||
RecordType record;
|
||||
|
||||
// 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)
|
||||
{
|
||||
pragma(msg, structTypes[cnt]);
|
||||
pragma(msg, structNames[cnt]);
|
||||
// pragma(msg, structValues[cnt]);
|
||||
}
|
||||
|
||||
static if(__traits(isSame, mixin(structTypes[cnt]), byte))
|
||||
{
|
||||
mixin("record."~structNames[cnt]) = cast(byte)jsonIn[structNames[cnt]].integer();
|
||||
}
|
||||
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();
|
||||
|
||||
debug(dbg)
|
||||
{
|
||||
pragma(msg,"record."~structNames[cnt]);
|
||||
}
|
||||
}
|
||||
else static if(__traits(isSame, mixin(structTypes[cnt]), JSONValue))
|
||||
{
|
||||
mixin("record."~structNames[cnt]) = jsonIn[structNames[cnt]];
|
||||
|
||||
debug(dbg)
|
||||
{
|
||||
pragma(msg,"record."~structNames[cnt]);
|
||||
}
|
||||
}
|
||||
else static if(__traits(isSame, mixin(structTypes[cnt]), bool))
|
||||
{
|
||||
mixin("record."~structNames[cnt]) = jsonIn[structNames[cnt]].boolean();
|
||||
|
||||
debug(dbg)
|
||||
{
|
||||
pragma(msg,"record."~structNames[cnt]);
|
||||
}
|
||||
}
|
||||
//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]].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;
|
||||
}
|
||||
|
||||
unittest
|
||||
{
|
||||
import std.string : cmp;
|
||||
import std.stdio : writeln;
|
||||
|
||||
struct Person
|
||||
{
|
||||
public string firstname, lastname;
|
||||
public int age;
|
||||
public bool isMale;
|
||||
public JSONValue obj;
|
||||
public int[] list;
|
||||
}
|
||||
|
||||
JSONValue json = parseJSON(`{
|
||||
"firstname" : "Tristan",
|
||||
"lastname": "Kildaire",
|
||||
"age": 23,
|
||||
"obj" : {"bruh":1},
|
||||
"isMale": true,
|
||||
"list": [1,2,3]
|
||||
}
|
||||
`);
|
||||
|
||||
Person person = fromJSON!(Person)(json);
|
||||
|
||||
debug(dbg)
|
||||
{
|
||||
writeln(person);
|
||||
}
|
||||
|
||||
assert(cmp(person.firstname, "Tristan") == 0);
|
||||
assert(cmp(person.lastname, "Kildaire") == 0);
|
||||
assert(person.age == 23);
|
||||
assert(person.isMale == true);
|
||||
assert(person.obj["bruh"].integer() == 1);
|
||||
//TODO: list test case
|
||||
}
|
|
@ -6,8 +6,7 @@ import std.net.curl;
|
|||
import std.conv : to;
|
||||
import std.string : cmp;
|
||||
import libpb.exceptions;
|
||||
import libpb.serialization;
|
||||
import libpb.deserialization;
|
||||
import jstruct : fromJSON, SerializationError, serializeRecord;
|
||||
|
||||
|
||||
private mixin template AuthTokenHeader(alias http, PocketBase pbInstance)
|
||||
|
@ -188,6 +187,10 @@ public class PocketBase
|
|||
{
|
||||
throw new PocketBaseParsingException();
|
||||
}
|
||||
catch(SerializationError e)
|
||||
{
|
||||
throw new RemoteFieldMissing();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -301,6 +304,10 @@ public class PocketBase
|
|||
{
|
||||
throw new PocketBaseParsingException();
|
||||
}
|
||||
catch(SerializationError e)
|
||||
{
|
||||
throw new RemoteFieldMissing();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -348,7 +355,6 @@ public class PocketBase
|
|||
recordResponse["email"] = "";
|
||||
}
|
||||
|
||||
|
||||
recordOut = fromJSON!(RecordType)(recordResponse);
|
||||
|
||||
// Store the token
|
||||
|
@ -377,6 +383,10 @@ public class PocketBase
|
|||
{
|
||||
throw new PocketBaseParsingException();
|
||||
}
|
||||
catch(SerializationError e)
|
||||
{
|
||||
throw new RemoteFieldMissing();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -472,6 +482,10 @@ public class PocketBase
|
|||
{
|
||||
throw new PocketBaseParsingException();
|
||||
}
|
||||
catch(SerializationError e)
|
||||
{
|
||||
throw new RemoteFieldMissing();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -585,6 +599,10 @@ public class PocketBase
|
|||
{
|
||||
throw new PocketBaseParsingException();
|
||||
}
|
||||
catch(SerializationError e)
|
||||
{
|
||||
throw new RemoteFieldMissing();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -61,3 +61,12 @@ public final class PocketBaseParsingException : PBException
|
|||
{
|
||||
|
||||
}
|
||||
|
||||
|
||||
public final class RemoteFieldMissing : PBException
|
||||
{
|
||||
this()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
|
@ -1,4 +1,4 @@
|
|||
module libpb;
|
||||
|
||||
public import libpb.exceptions;
|
||||
public import libpb.driver;
|
||||
public import libpb.driver;
|
|
@ -1,109 +0,0 @@
|
|||
module libpb.serialization;
|
||||
|
||||
import std.json;
|
||||
import std.conv : to;
|
||||
import std.traits : FieldTypeTuple, FieldNameTuple;
|
||||
|
||||
public JSONValue serializeRecord(RecordType)(RecordType record)
|
||||
{
|
||||
// Final JSON to submit
|
||||
JSONValue builtJSON;
|
||||
|
||||
// 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)
|
||||
{
|
||||
pragma(msg, structTypes[cnt]);
|
||||
pragma(msg, structNames[cnt]);
|
||||
// pragma(msg, structValues[cnt]);
|
||||
}
|
||||
|
||||
|
||||
static if(__traits(isSame, mixin(structTypes[cnt]), int))
|
||||
{
|
||||
builtJSON[structNames[cnt]] = structValues[cnt];
|
||||
}
|
||||
else static if(__traits(isSame, mixin(structTypes[cnt]), uint))
|
||||
{
|
||||
builtJSON[structNames[cnt]] = structValues[cnt];
|
||||
}
|
||||
else static if(__traits(isSame, mixin(structTypes[cnt]), ulong))
|
||||
{
|
||||
builtJSON[structNames[cnt]] = structValues[cnt];
|
||||
}
|
||||
else static if(__traits(isSame, mixin(structTypes[cnt]), long))
|
||||
{
|
||||
builtJSON[structNames[cnt]] = structValues[cnt];
|
||||
}
|
||||
else static if(__traits(isSame, mixin(structTypes[cnt]), string))
|
||||
{
|
||||
builtJSON[structNames[cnt]] = structValues[cnt];
|
||||
}
|
||||
else static if(__traits(isSame, mixin(structTypes[cnt]), JSONValue))
|
||||
{
|
||||
builtJSON[structNames[cnt]] = structValues[cnt];
|
||||
}
|
||||
else static if(__traits(isSame, mixin(structTypes[cnt]), bool))
|
||||
{
|
||||
builtJSON[structNames[cnt]] = structValues[cnt];
|
||||
}
|
||||
else
|
||||
{
|
||||
debug(dbg)
|
||||
{
|
||||
pragma(msg, "Yaa");
|
||||
}
|
||||
builtJSON[structNames[cnt]] = to!(string)(structValues[cnt]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return builtJSON;
|
||||
}
|
||||
|
||||
// Test serialization of a struct to JSON
|
||||
private enum EnumType
|
||||
{
|
||||
DOG,
|
||||
CAT
|
||||
}
|
||||
unittest
|
||||
{
|
||||
import std.algorithm.searching : canFind;
|
||||
import std.string : cmp;
|
||||
import std.stdio : writeln;
|
||||
|
||||
struct Person
|
||||
{
|
||||
public string firstname, lastname;
|
||||
public int age;
|
||||
public string[] list;
|
||||
public JSONValue extraJSON;
|
||||
public EnumType eType;
|
||||
}
|
||||
|
||||
Person p1;
|
||||
p1.firstname = "Tristan";
|
||||
p1.lastname = "Kildaire";
|
||||
p1.age = 23;
|
||||
p1.list = ["1", "2", "3"];
|
||||
p1.extraJSON = parseJSON(`{"item":1, "items":[1,2,3]}`);
|
||||
p1.eType = EnumType.CAT;
|
||||
|
||||
JSONValue serialized = serializeRecord(p1);
|
||||
|
||||
string[] keys = serialized.object().keys();
|
||||
assert(canFind(keys, "firstname") && cmp(serialized["firstname"].str(), "Tristan") == 0);
|
||||
assert(canFind(keys, "lastname") && cmp(serialized["lastname"].str(), "Kildaire") == 0);
|
||||
assert(canFind(keys, "age") && serialized["age"].integer() == 23);
|
||||
|
||||
debug(dbg)
|
||||
{
|
||||
writeln(serialized.toPrettyString());
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue