add decorators

Author: AMOSOMNUM

.gitignore

@@ -1,5 +1,6 @@
 #generated
 json_deserialise*.h
+decorator.*.h
 macros.*.h
 type_deduction.*.h
 basic_types.*.hpp

CMakeLists.txt

@@ -1,39 +1,40 @@
 cmake_minimum_required(VERSION 3.14)
 
-if (NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 17)
+if(NOT CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 17)
     set(CMAKE_CXX_STANDARD 17)
 endif()
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Boost)
 if(NOT Boost_FOUND)
-    message(WARNING "Can't find Boot Library, please add boost_preprocesser/include in the current dir ${CMAKE_CURRENT_LIST_DIR} to your include_path.")
+    message(WARNING "Can't find Boot Library, please add boost_preprocessor/include in the current dir ${CMAKE_CURRENT_LIST_DIR} to your include_path.")
+    add_subdirectory(boost_preprocessor)
 endif()
-include_directories(${CMAKE_CURRENT_LIST_DIR}/boost_preprocesser/include)
+include_directories(${CMAKE_CURRENT_LIST_DIR}/boost_preprocessor/include)
 
 message("Currently only Qt supported.")
-option(JSON_DESERIALISE_DEFAULT_JSON_LIBRARY "" OFF)
-option(JSON_DESERIALISE_JSON_LIBRARIES "" OFF)
+option(JSON_DESERIALISE_DEFAULT_JSON_LIBRARY "Default Json Library" OFF)
+option(JSON_DESERIALISE_JSON_LIBRARIES "All libs that Need to be generated." OFF)
 
-if (NOT JSON_DESERIALISE_JSON_LIBRARIES)
-    if (NOT JSON_DESERIALISE_DEFAULT_JSON_LIBRARY)
-        set(JSON_DESERIALISE_DEFAULT_JSON_LIBRARY "Qt")
+if(NOT JSON_DESERIALISE_JSON_LIBRARIES)
+    if(NOT JSON_DESERIALISE_DEFAULT_JSON_LIBRARY)
+        set(JSON_DESERIALISE_JSON_LIBRARIES "Qt")
+    else(NOT JSON_DESERIALISE_JSON_LIBRARIES)
+        set(JSON_DESERIALISE_JSON_LIBRARIES ${JSON_DESERIALISE_DEFAULT_JSON_LIBRARY})
     endif()
-    set(JSON_DESERIALISE_JSON_LIBRARIES ${JSON_DESERIALISE_DEFAULT_JSON_LIBRARY})
-elseif (NOT JSON_DESERIALISE_DEFAULT_JSON_LIBRARY)
-    list(GET JSON_DESERIALISE_JSON_LIBRARIES 0 JSON_DESERIALISE_DEFAULT_JSON_LIBRARY)
 endif()
 
 foreach(LIB_ID ${JSON_DESERIALISE_JSON_LIBRARIES})
     string(TOLOWER ${LIB_ID} lib)
-    if (${LIB_ID} STREQUAL ${JSON_DESERIALISE_DEFAULT_JSON_LIBRARY})
+    if(${LIB_ID} STREQUAL ${JSON_DESERIALISE_DEFAULT_JSON_LIBRARY})
         set(JSON_DESERIALISER_DEFAULT_MODE ON)
         configure_file(${CMAKE_CURRENT_LIST_DIR}/json_deserialise.h.in ${CMAKE_CURRENT_LIST_DIR}/json_deserialise.h)
     endif()
-    string(APPEND LIB_ID "Adaptation")
+    string(APPEND LIB_ID "JsonLib")
     configure_file(${CMAKE_CURRENT_LIST_DIR}/type_deduction.h.in ${CMAKE_CURRENT_LIST_DIR}/type_deduction.${lib}.h)
     configure_file(${CMAKE_CURRENT_LIST_DIR}/basic_types.hpp.in ${CMAKE_CURRENT_LIST_DIR}/basic_types.${lib}.hpp)
     configure_file(${CMAKE_CURRENT_LIST_DIR}/macros.h.in ${CMAKE_CURRENT_LIST_DIR}/macros.${lib}.h)
+    configure_file(${CMAKE_CURRENT_LIST_DIR}/decorator.h.in ${CMAKE_CURRENT_LIST_DIR}/decorator.${lib}.h)
     configure_file(${CMAKE_CURRENT_LIST_DIR}/json_deserialise.h.in ${CMAKE_CURRENT_LIST_DIR}/json_deserialise.${lib}.h)
     unset(JSON_DESERIALISER_DEFAULT_MODE)
 endforeach()

README.md

@@ -4,7 +4,8 @@ Serialise and Deserialise json from various types and data structures, performin
 Currently only support Qt Json Library and will support nlohmann soon.
 
 Headers only!  
-So You just need to add subdirectory and setup include path in cmake and include the autogen file "json_deserialise.h".
+So You just need to add subdirectory and setup include path in cmake, then include autogen files "json_deserialise.*lib_name*.h", and "json_deserialise.h" for the default one(You should set this by setting *JSON_DESERIALISE_DEFAULT_JSON_LIBRARY* in cmake).  
+Depending boost preprocessor library, please also add *boost_preprocessor/include* to your include path if your project does not config Boost.
 
 ## Basic Types
 
@@ -55,9 +56,9 @@ Supose you have a json like below:
 QJsonObject json;
 TypeA a;
 TypeB b;
-declare_deserialiser("A", a, a_holder);
-declare_deserialiser("B", b, b_holder);
-declare_top_object_deserialiser(deserialiser, a_holder, b_holder);
+Field a("A", obj.a);
+Field b("B", obj.b);
+ObjectDeserialiser deserialiser(a, b);
 // From File
 deserialiser.deserialise_file(FILENAME);
 // From String
@@ -84,10 +85,10 @@ struct Simple {
 };
 
 QJsonObject json;
-Sample obj;
-declare_deserialiser("A", obj.a, a_holder);
-declare_deserialiser("B", obj.b, b_holder);
-declare_top_object_deserialiser(deserialiser, a_holder, b_holder);
+Simple obj;
+Field a("A", obj.a);
+Field b("B", obj.b);
+ObjectDeserialiser deserialiser(a, b);
 deserialiser.deserialise(json); // And two other methods.
 std::cout << deserialiser.serialise(); // And two other methods.
 ```
@@ -107,13 +108,12 @@ declare_object(Sample,
 // Somewhere
 Sample s;
 QJsonObject json;
-declare_top_deserialiser(s, deserialiser);
-deserialiser.assign(json); // json only
-json = deserialiser.to_json().toObject(); // json only
+Deserialiser holder(s);
+holder.from_json(json);
+holder.from_file(FILENAME);
+json = holder.to_json().toObject();
 //Also
-declare_top_object_deserialiser(s, serialiser);
-json = s.deserialise_to_json(); // And two other methods.
-s.deserialise_file(FILENAME); // And two other methods.
+json = Serialise(s).toObject();
 ```
 
 ### 3. For Enum
@@ -168,6 +168,5 @@ enum class Type : int {
 } sample;
 declare_as_trivial(Type, int);
 
-declare_deserialiser("Enum", sample, holder);
-qDebug() << holder.to_json();
+qDebug() << Serialise(sample);
 ```

adaptor.qt.h

@@ -12,18 +12,18 @@
 #include <cstring>
 
 namespace JsonDeserialise {
-struct QtAdaptation {
+struct QtJsonLib {
 
     // Essential alias
 
     template <typename Any>
-    using Deserialisable = QtAdaptation_::Deserialisable<Any>;
+    using Deserialisable = QtJsonLibPrivate::Deserialisable<Any>;
 
     template <typename Any>
     using DeserialisableType = typename Deserialisable<Any>::Type;
 
     template <auto member_offset>
-    using Customised = QtAdaptation_::Customised<member_offset>;
+    using Customised = QtJsonLibPrivate::Customised<member_offset>;
 
     // Basic Types
 

basic_types.hpp.in

@@ -10,9 +10,9 @@
 #include <set>
 #include <vector>
 
-namespace JsonDeserialise::@LIB_ID@_ {
+namespace JsonDeserialise::@LIB_ID@Private {
 
-    using Impl = Deserialiser<@LIB_ID@>;
+    using Impl = Implementation<@LIB_ID@>;
 
     template <typename T>
     using StringConvertor = typename @LIB_ID@::template StringConvertor<T>;
@@ -233,6 +233,6 @@ namespace JsonDeserialise::@LIB_ID@_ {
                   typename ConstexprIncArray<RegisteredStyleInfo<member_ptr>::argc>::Type>
     struct RegisteredStyle;
 
-} // namespace JsonDeserialise::@LIB_ID@_
+} // namespace JsonDeserialise::@LIB_ID@Private
 
 #endif // JSON_DESERIALISER_@LIB_ID@_TYPE_BASIC_

decorator.h.in

@@ -0,0 +1,113 @@
+#ifndef JSON_DESERIALISER_@LIB_ID@_DECORATOR
+#define JSON_DESERIALISER_@LIB_ID@_DECORATOR
+
+#include "adaptor.@[email protected]"
+#include "json_deserialise.hpp"
+
+#cmakedefine JSON_DESERIALISER_DEFAULT_MODE
+#ifdef JSON_DESERIALISER_DEFAULT_MODE
+inline
+#endif
+#undef JSON_DESERIALISER_DEFAULT_MODE
+    namespace JsonDeserialiseDecoratorFor@LIB_ID@ {
+
+using Impl = JsonDeserialise::Implementation<JsonDeserialise::@LIB_ID@>;
+
+template <typename T>
+inline decltype(auto) Serialise(const T& source) {
+    return Impl::DeserialisableType<T>(source).to_json();
+}
+
+template <typename T>
+struct Deserialiser : public Impl::DeserialisableType<T> {
+    Deserialiser(T& source) : Impl::DeserialisableType<T>(source) {}
+
+    template <typename String>
+    inline void from_json_string(String&& str) {
+        Impl::JsonDeserialiser(*this)->deserialise(std::forward<String>(str));
+    }
+
+    template <typename String>
+    inline void from_file(String&& filepath) {
+        Impl::JsonDeserialiser(*this)->deserialise_file(std::forward<String>(filepath));
+    }
+};
+
+template <typename T>
+struct Serialiser {
+    using Base = Impl::DeserialisableType<T>;
+    const Base base;
+    Serialiser(const T& source) : base(source) {}
+
+    inline decltype(auto) to_json() const {
+        return base.to_json();
+    }
+};
+
+template <typename T, bool = std::is_base_of_v<T, Impl::DeserialisableBase>>
+struct Field : protected Impl::DeserialisableType<T> {
+    using Base = Impl::DeserialisableType<T>;
+    template <typename String>
+    Field(String&& key, T& source, bool optional = false)
+        : Base(std::forward<String>(key), source, optional) {}
+};
+
+template <typename T>
+struct Field<T, true> : protected T {
+    using Base = T;
+    template <typename... Args>
+    Field(Args&&... args) : Base(std::forward<Args>(args)...) {}
+};
+
+template <typename U, typename V, typename... Args>
+struct ObjectDeserialiser
+    : public Impl::JsonDeserialiser<typename Field<U>::Base, typename Field<V>::Base,
+                                    typename Field<Args>::Base...> {
+    using Base = typename Impl::JsonDeserialiser<typename Field<U>::Base, typename Field<V>::Base,
+                                                 typename Field<Args>::Base...>;
+
+    ObjectDeserialiser(Field<U>& arg1, Field<V>& arg2, Field<Args>&... args)
+        : Base(arg1, arg2, args...) {}
+};
+
+template <typename T, bool = std::is_base_of_v<T, Impl::DeserialisableBase>>
+struct ConstField : protected Impl::DeserialisableType<T> {
+    using Base = Impl::DeserialisableType<T>;
+    template <typename String>
+    ConstField(String&& key, const T& source) : Base(std::forward<String>(key), source) {}
+};
+
+template <typename T>
+struct ConstField<T, true> : protected T {
+    using Base = T;
+    template <typename... Args>
+    ConstField(Args&&... args) : Base(std::forward<Args>(args)...) {}
+};
+
+template <typename U, typename V, typename... Args>
+struct ObjectSerialiser {
+    using Base =
+        typename Impl::JsonDeserialiser<typename ConstField<U>::Base, typename ConstField<V>::Base,
+                                        typename ConstField<Args>::Base...>;
+    const Base base;
+
+    ObjectSerialiser(ConstField<U>& arg1, ConstField<V>& arg2, ConstField<Args>&... args)
+        : Base(arg1, arg2, args...) {}
+
+    template <typename String>
+    inline decltype(auto) to_file(String&& filepath, bool compress = false) const {
+        base.serialise_to_file(std::forward<String>(filepath), compress);
+    }
+
+    inline decltype(auto) to_string(bool compress = false) const {
+        base.serialise(compress);
+    }
+
+    inline decltype(auto) to_json() const {
+        base.serialise_to_json();
+    }
+};
+
+} // namespace JsonDeserialiseDecoratorFor@LIB_ID@
+
+#endif

json_deserialise.h.in

@@ -1,2 +1,3 @@
 #include "macros.@[email protected]"
 #include "types.@[email protected]"
+#include "decorator.@[email protected]"