Fix

- Ensure animal is right

README.md

@@ -7,7 +7,7 @@ jstruct
 
 ----
 
-[![D](https://github.com/Hax-io/jstruct/actions/workflows/d.yml/badge.svg)](https://github.com/Hax-io/jstruct/actions/workflows/d.yml)
+[![D](https://github.com/Hax-io/jstruct/actions/workflows/d.yml/badge.svg)](https://github.com/Hax-io/jstruct/actions/workflows/d.yml) ![DUB](https://img.shields.io/dub/v/jstruct?color=%23c10000ff%20&style=flat-square) ![DUB](https://img.shields.io/dub/dt/jstruct?style=flat-square) ![DUB](https://img.shields.io/dub/l/jstruct?style=flat-square)
 
 ## Usage
 
@@ -22,6 +22,17 @@ struct Person
     public int age;
     public string[] list;
     public JSONValue extraJSON;
+    public EnumType eType;
+}
+```
+
+Our enum is defined as:
+
+```d
+enum EnumType
+{
+	DOG,
+	CAT
 }
 ```
 
@@ -34,6 +45,7 @@ p1.lastname = "Kildaire";
 p1.age = 23;
 p1.list = ["1", "2", "3"];
 p1.extraJSON = parseJSON(`{"item":1, "items":[1,2,3]}`);
+p1.eType = EnumType.CAT;
 ```
 
 Now, we make a call to `serializeRecord` as follows:
@@ -47,6 +59,7 @@ This returns the following JSON:
 ```json
 {
     "age": 23,
+    "eType": "CAT",
     "extraJSON": {
         "item": 1,
         "items": [
@@ -57,7 +70,11 @@ This returns the following JSON:
     },
     "firstname": "Tristan",
     "lastname": "Kildaire",
-    "list": "[\"1\", \"2\", \"3\"]"
+    "list": [
+        "1",
+        "2",
+        "3"
+    ]
 }
 ```
 
@@ -72,6 +89,12 @@ struct Person
     public int age;
     public bool isMale;
     public JSONValue obj;
+    public int[] list;
+    public bool[] list2;
+    public float[] list3;
+    public double[] list4;
+    public string[] list5;
+    public EnumType animal;
 }
 ```
 
@@ -84,6 +107,12 @@ Now, let's say we were given the following JSON:
     "age": 23,
     "obj" : {"bruh":1},
     "isMale": true,
+    "list": [1,2,3],
+    "list2": [true, false],
+    "list3": [1.5, 1.4],
+    "list4": [1.5, 1.4],
+    "list5": ["baba", "booey"],
+    "animal": "CAT"
 }
 ```
 
@@ -97,7 +126,12 @@ JSONValue json = parseJSON(`{
 "age": 23,
 "obj" : {"bruh":1},
 "isMale": true,
-"list": [1,2,3]
+"list": [1,2,3],
+"list2": [true, false],
+"list3": [1.5, 1.4],
+"list4": [1.5, 1.4],
+"list5": ["baba", "booey"],
+"animal": "CAT"
 }
 `);
 
@@ -114,7 +148,7 @@ writeln(person):
 Which will output:
 
 ```
-Person("Tristan", "Kildaire", 23, true, {"bruh":1})
+Person("Tristan", "Kildaire", 23, true, {"bruh":1}, [1, 2, 3], [true, false], [1.5, 1.4], [1.5, 1.4], ["baba", "booey"], CAT)
 ```
 
 ## Installing
@@ -130,10 +164,3 @@ And then in your D program import as follows:
 ```d
 import jstruct;
 ```
-
-## Help wanted
-
-There are some outstanding issues I want to be able to fix/have implemented, namely:
-
-- [ ] Support for array serialization/deserialization - see issue #1
-- [ ] Support for custom types serialization/deserialization (think `enums` for example) - see issue #2

source/jstruct/deserializer.d

@@ -1,8 +1,12 @@
+/** 
+ * Deserialization utilities
+ */
 module jstruct.deserializer;
 
 import std.json;
-import jstruct.exceptions : SerializationError;
-import std.traits : FieldTypeTuple, FieldNameTuple, isArray;
+import jstruct.exceptions : DeserializationError;
+import std.traits : FieldTypeTuple, FieldNameTuple, isArray, ForeachType, EnumMembers, fullyQualifiedName;;
+import std.conv : to;
 
 /** 
  * Deserializes the provided JSON into a struct of type RecordType
@@ -100,13 +104,8 @@ public RecordType fromJSON(RecordType)(JSONValue jsonIn)
 					pragma(msg,"record."~structNames[cnt]);
 				}
 			}
-			//FIXME: Not sure how to get array support going, very new to meta programming
-			// FIXME: Add component type checking
 			else static if(isArray!(structTypes[cnt]))
 			{
-				import std.traits : ForeachType;
-				import std.conv : to;
-
 				alias recordArrayComponent = mixin("record."~structNames[cnt]);
 
 				JSONValue[] jsonArray = jsonIn[structNames[cnt]].array();
@@ -147,6 +146,25 @@ public RecordType fromJSON(RecordType)(JSONValue jsonIn)
 					{
 						mixin("record."~structNames[cnt])~= cast(ulong)jsonVal.uinteger();
 					}
+					else static if(__traits(isSame, ForeachType!(structTypes[cnt]), bool))
+					{
+						mixin("record."~structNames[cnt])~= jsonVal.boolean();
+					}
+					else static if(__traits(isSame, ForeachType!(structTypes[cnt]), float))
+					{
+						mixin("record."~structNames[cnt])~= cast(float)jsonVal.floating();
+					}
+					else static if(__traits(isSame, ForeachType!(structTypes[cnt]), double))
+					{
+						mixin("record."~structNames[cnt])~= cast(double)jsonVal.floating();
+					}
+					else static if(__traits(isSame, ForeachType!(structTypes[cnt]), string))
+					{
+						mixin("record."~structNames[cnt])~= jsonVal.str();
+					}
+					
+
+
 				}
 
 
@@ -157,6 +175,32 @@ public RecordType fromJSON(RecordType)(JSONValue jsonIn)
 					pragma(msg,"record."~structNames[cnt]);
 				}
 			}
+			else static if(is(structTypes[cnt] == enum))
+			{
+				string enumChoice = jsonIn[structNames[cnt]].str();
+
+				alias members = EnumMembers!(structTypes[cnt]);
+
+				version(dbg)
+				{
+					import std.stdio : writeln;
+				}
+				
+				static foreach(member; members)
+				{
+					version(dbg)
+					{
+						writeln(member);
+						writeln(fullyQualifiedName!(member));
+						writeln(__traits(identifier, member));
+					}
+					
+					if(__traits(identifier, member) == enumChoice)
+					{
+						mixin("record."~structNames[cnt]) = member;
+					}
+				}
+			}
 			else
 			{
 				// throw new
@@ -164,22 +208,33 @@ public RecordType fromJSON(RecordType)(JSONValue jsonIn)
 				debug(dbg)
 				{
 					pragma(msg, "Unknown type for de-serialization");
+
+					pragma(msg, is(structTypes[cnt] == enum));
+
+
 				}
 			}
 		}
 		catch(JSONException e)
 		{
-			throw new SerializationError();
+			throw new DeserializationError();
 		}
 	}
 
 	return record;
 }
 
+/**
+ * Example deserialization of JSON
+ * to our `Person` struct
+ */
 unittest
 {
-	import std.string : cmp;
-	import std.stdio : writeln;
+	enum EnumType
+	{
+		DOG,
+		CAT
+	}
 	
 	struct Person
 	{
@@ -188,6 +243,11 @@ unittest
 		public bool isMale;
 		public JSONValue obj;
 		public int[] list;
+		public bool[] list2;
+		public float[] list3;
+		public double[] list4;
+		public string[] list5;
+		public EnumType animal;
 	}
 	
 	JSONValue json = parseJSON(`{
@@ -196,7 +256,12 @@ unittest
 "age": 23,
 "obj" : {"bruh":1},
 "isMale": true,
-"list": [1,2,3]
+"list": [1,2,3],
+"list2": [true, false],
+"list3": [1.5, 1.4],
+"list4": [1.5, 1.4],
+"list5": ["baba", "booey"],
+"animal": "CAT"
 }
 `);
 
@@ -204,7 +269,7 @@ unittest
 
 	debug(dbg)
 	{
-		writeln(person);	
+		writeln("Deserialized as: ", person);	
 	}
 
 	assert(cmp(person.firstname, "Tristan") == 0);
@@ -213,13 +278,29 @@ unittest
 	assert(person.isMale == true);
 	assert(person.obj["bruh"].integer() == 1);
 	assert(person.list == [1,2,3]);
+	assert(person.list2 == [true, false]);
+	assert(person.list3 == [1.5F, 1.4F]);
+	assert(person.list4 == [1.5, 1.4]);
+	assert(person.list5 == ["baba", "booey"]);
+	assert(person.animal == EnumType.CAT);
+
 }
 
-unittest
+version(unittest)
 {
 	import std.string : cmp;
 	import std.stdio : writeln;
-	
+}
+
+/**
+ * Another example deserialization of JSON
+ * to our `Person` struct but here there
+ * is a problem with deserialization as
+ * there is a missing field `isMale`
+ * in the provided JSON
+ */
+unittest
+{
 	struct Person
 	{
 		public string firstname, lastname;
@@ -227,6 +308,7 @@ unittest
 		public bool isMale;
 		public JSONValue obj;
 		public int[] list;
+		
 	}
 	
 	JSONValue json = parseJSON(`{
@@ -243,9 +325,47 @@ unittest
 		Person person = fromJSON!(Person)(json);
 		assert(false);
 	}
-	catch(SerializationError)
+	catch(DeserializationError)
 	{
 		assert(true);
 	}
 	
+}
+
+
+unittest
+{
+	enum EnumType
+	{
+		DOG,
+		CAT
+	}
+
+	struct Person
+	{
+		public string firstname, lastname;
+
+		
+		public EnumType animal;
+		
+	}
+	
+	JSONValue json = parseJSON(`{
+"firstname" : "Tristan",
+"lastname": "Kildaire",
+"animal" : "CAT"
+}
+`);
+
+	try
+	{
+		Person person = fromJSON!(Person)(json);
+		writeln(person);
+		assert(true);
+	}
+	catch(DeserializationError)
+	{
+		assert(false);
+	}
+	
 }

source/jstruct/exceptions.d

@@ -1,5 +1,11 @@
+/**
+ * Exception types
+ */
 module jstruct.exceptions;
 
+/** 
+ * General exception type
+ */
 public abstract class JStructException : Exception
 {
     this(string msg)
@@ -8,6 +14,9 @@ public abstract class JStructException : Exception
     }
 }
 
+/** 
+ * Error on serialization
+ */
 public final class SerializationError : JStructException
 {
 	this()
@@ -15,3 +24,14 @@ public final class SerializationError : JStructException
 		super("Error serializing");
 	}
 }
+
+/** 
+ * Error on deserialization
+ */
+public final class DeserializationError : JStructException
+{
+	this()
+	{
+		super("Error deserializing");
+	}
+}

source/jstruct/package.d

@@ -1,5 +1,19 @@
+/**
+ * Struct JSON serializer/deserializer
+ */
 module jstruct;
 
+/**
+ * Serialization utilities
+ */
 public import jstruct.serializer;
+
+/**
+ * Deserialization utilities
+ */
 public import jstruct.deserializer;
+
+/**
+ * Exception types
+ */
 public import jstruct.exceptions;

source/jstruct/serializer.d

@@ -1,3 +1,6 @@
+/**
+ * Serialization utilities
+ */
 module jstruct.serializer;
 
 import std.json;
@@ -31,9 +34,6 @@ public JSONValue serializeRecord(RecordType)(RecordType record)
 			// pragma(msg, structValues[cnt]);
 		}
 
-		import std.traits : isArray;
-
-
 		static if(__traits(isSame, structTypes[cnt], int))
 		{
 			builtJSON[structNames[cnt]] = structValues[cnt];
@@ -65,7 +65,6 @@ public JSONValue serializeRecord(RecordType)(RecordType record)
 		else static if(isArray!(structTypes[cnt]))
 		{
 			builtJSON[structNames[cnt]] = structValues[cnt];
-			// pragma(msg, "WAIT", "d"~mixin(structTypes[cnt]));
 		}
 		else
 		{
@@ -82,17 +81,27 @@ public JSONValue serializeRecord(RecordType)(RecordType record)
 }
 
 // Test serialization of a struct to JSON
-private enum EnumType
-{
-	DOG,
-	CAT
-}
-unittest
+
+
+version(unittest)
 {
 	import std.algorithm.searching : canFind;
 	import std.string : cmp;
 	import std.stdio : writeln;
-	
+}
+
+/**
+ * Example serialization of our struct
+ * `Person` to JSON
+ */
+unittest
+{
+	enum EnumType
+	{
+		DOG,
+		CAT
+	}
+
 	struct Person
 	{
 		public string firstname, lastname;