Merge pull request #137 from NuiCpp/feat/replace-traits-dependency

Feat/replace traits dependency

Author: 5cript

.github/workflows/macos_13.yml renamed to .github/workflows/macos.yml

@@ -1,4 +1,4 @@
-name: MacOS 13
+name: MacOS
 
 on:
   push:
@@ -15,7 +15,7 @@ jobs:
     # The CMake configure and build commands are platform agnostic and should work equally well on Windows or Mac.
     # You can convert this to a matrix build if you need cross-platform coverage.
     # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-    runs-on: macos-13
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v3
@@ -27,7 +27,7 @@ jobs:
           node-version: "20"
 
       - name: Install Brew Dependencies
-        run: brew install cmake llvm@16 boost git openssl@3 cryptopp curl ninja make
+        run: brew install llvm@19 boost cryptopp make nlohmann-json curl
 
       - name: Tool Version Dump
         run: |
@@ -37,13 +37,16 @@ jobs:
             brew list --versions boost
 
       - name: Configure CMake
-        run: cmake -B ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} -G"Ninja" -DNUI_ENABLE_TESTS=on -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DNUI_BUILD_EXAMPLES=on -DCMAKE_CXX_EXTENSIONS=on -DCMAKE_CXX_COMPILER=/usr/local/opt/llvm@16/bin/clang++ -DCMAKE_C_COMPILER=/usr/local/opt/llvm@16/bin/clang -DNUI_NPM=npm -DNUI_NODE=node -DCMAKE_CXX_STANDARD=20
+        run: |
+          export PATH="/opt/homebrew/opt/llvm@19/bin:$PATH"
+          cmake -B ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} -G"Ninja" -DNUI_ENABLE_TESTS=on -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DNUI_BUILD_EXAMPLES=on -DCMAKE_CXX_EXTENSIONS=on -DCMAKE_CXX_COMPILER=/opt/homebrew/opt/llvm@19/bin/clang++ -DCMAKE_C_COMPILER=/opt/homebrew/opt/llvm@19/bin/clang -DCMAKE_OSX_SYSROOT=$(xcrun --sdk macosx --show-sdk-path) -DCMAKE_EXE_LINKER_FLAGS="-L/opt/homebrew/opt/llvm@19/lib/c++ -L/opt/homebrew/opt/llvm@19/lib/unwind -lunwind" -DNUI_NPM=npm -DNUI_NODE=node -DCMAKE_CXX_STANDARD=20
         env:
-          LDFLAGS: "-L/usr/local/opt/llvm@16/lib"
-          CPPFLAGS: "-I/usr/local/opt/llvm@16/include -I/opt/homebrew/include"
+          CPPFLAGS: "-I/opt/homebrew/opt/llvm@19/include"
 
       - name: Build
-        run: cmake --build ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} --config ${{env.BUILD_TYPE}}
+        run:  |
+          export PATH="/opt/homebrew/opt/llvm@19/bin:$PATH"
+          cmake --build ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}} --config ${{env.BUILD_TYPE}}
 
       - name: Test
         working-directory: ${{github.workspace}}/build/clang_${{env.BUILD_TYPE}}

CMakeLists.txt

@@ -14,13 +14,10 @@ include(${CMAKE_CURRENT_LIST_DIR}/cmake/dependencies/interval_tree.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/cmake/dependencies/fmt.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/cmake/dependencies/describe.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/cmake/dependencies/mp11.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/cmake/dependencies/nui_traits.cmake)
 if (EMSCRIPTEN)
-    include(${CMAKE_CURRENT_LIST_DIR}/cmake/dependencies/libcpppre.cmake)
     include(${CMAKE_CURRENT_LIST_DIR}/cmake/frontend/emscripten.cmake)
 else()
-    if (${NUI_ENABLE_TESTS})
-        include(${CMAKE_CURRENT_LIST_DIR}/cmake/dependencies/libcpppre.cmake)
-    endif()
     add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/tools/bin2hpp)
     add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/tools/parcel_adapter)
     add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/tools/patch_dotenv)

README.md

@@ -52,3 +52,4 @@ Nui uses the following dependencies:
 - nlohmann/json https://github.com/nlohmann/json - [MIT LICENSE](https://github.com/nlohmann/json/blob/develop/LICENSE.MIT)
 - portable-file-dialogs https://github.com/samhocevar/portable-file-dialogs - [WTFPL LICENSE](https://github.com/samhocevar/portable-file-dialogs/blob/main/COPYING)
 - 5cript/roar https://github.com/5cript/roar - [BSL-1.0 LICENSE](https://github.com/5cript/roar/blob/master/LICENSE)
+- Nui/traits https://github.com/NuiCpp/traits - [CC0-1.0 LICENSE](https://github.com/NuiCpp/traits/blob/main/LICENSE)

cmake/backend/emscripten.cmake

@@ -22,7 +22,7 @@ function(nui_add_emscripten_target)
 
     cmake_parse_arguments(
         NUI_ADD_EMSCRIPTEN_TARGET_ARGS
-        "DISABLE_BIN2HPP;DISABLE_PARCEL_ADAPTER;ENABLE_TAILWIND;ENABLE_DOTENV"
+        "DISABLE_BIN2HPP;DISABLE_PARCEL_ADAPTER;ENABLE_TAILWIND;ENABLE_DOTENV;CONFIGURE_ALWAYS"
         "TARGET;PREJS;SOURCE_DIR;BIN2HPP_ENCODING"
         "CMAKE_OPTIONS"
         ${ARGN}
@@ -125,22 +125,33 @@ function(nui_add_emscripten_target)
 
     message(STATUS "C++ standard of frontend subproject: ${TARGET_CXX_STANDARD}")
 
+    set(CONFIGURE_COMMAND_PART
+        ${EMCMAKE} cmake
+            "-DCMAKE_CXX_STANDARD=${TARGET_CXX_STANDARD}"
+            ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_CMAKE_OPTIONS}
+            "-DNUI_NPM=${NUI_NPM}"
+            "-DNUI_NODE=${NUI_NODE}"
+            "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
+            -DNUI_INLINE_EXTRACTOR_TARGET_FILE=$<TARGET_FILE:inline-parser>
+            -DNUI_INLINE_INJECTOR_TARGET_FILE=$<TARGET_FILE:inline-injector>
+            -DNUI_MODULE_BUILD_DIR=${CMAKE_BINARY_DIR}/module_${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}
+            "${SOURCE_DIR}"
+    )
+    if(NUI_ADD_EMSCRIPTEN_TARGET_ARGS_CONFIGURE_ALWAYS)
+        set(CONFIGURE_COMMAND ${CONFIGURE_COMMAND_PART})
+    else()
+        set(CONFIGURE_COMMAND
+            ${EMCMAKE} cmake -E md5sum "${CMAKE_BINARY_DIR}/module_${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}/CMakeCache.txt" ||
+            ${CONFIGURE_COMMAND_PART}
+        )
+    endif()
+
     include(ExternalProject)
     ExternalProject_Add(
         "${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}-emscripten"
         SOURCE_DIR "${SOURCE_DIR}"
         # emscripten cmake with passed down Release/Debug build type
-        CONFIGURE_COMMAND
-            ${EMCMAKE} cmake
-                "-DCMAKE_CXX_STANDARD=${TARGET_CXX_STANDARD}"
-                ${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_CMAKE_OPTIONS}
-                "-DNUI_NPM=${NUI_NPM}"
-                "-DNUI_NODE=${NUI_NODE}"
-                "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
-                -DNUI_INLINE_EXTRACTOR_TARGET_FILE=$<TARGET_FILE:inline-parser>
-                -DNUI_INLINE_INJECTOR_TARGET_FILE=$<TARGET_FILE:inline-injector>
-                -DNUI_MODULE_BUILD_DIR=${CMAKE_BINARY_DIR}/module_${NUI_ADD_EMSCRIPTEN_TARGET_ARGS_TARGET}
-                "${SOURCE_DIR}"
+        CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
         # copy over package.json and fill parcel options that do not exist on it
         ${BUILD_COMMAND}
         # patch .env file if needed

cmake/dependencies/libcpppre.cmake

@@ -0,0 +1,14 @@
+option(NUI_FETCH_TRAITS "Fetch nui traits" ON)
+set(NUI_TRAITS_GIT_REPOSITORY "https://github.com/NuiCpp/traits.git" CACHE STRING "nui traits git repository")
+set(NUI_TRAITS_GIT_TAG "9a9de09ac0eaab4f9e0869a2f4004a5e3e6915ca" CACHE STRING "nui traits git tag")
+
+if(NUI_FETCH_TRAITS)
+    include(FetchContent)
+    FetchContent_Declare(
+        traits-library
+        GIT_REPOSITORY ${NUI_TRAITS_GIT_REPOSITORY}
+        GIT_TAG        ${NUI_TRAITS_GIT_TAG}
+    )
+
+    FetchContent_MakeAvailable(traits-library)
+endif()

cmake/dependencies/nui_traits.cmake

@@ -10,5 +10,6 @@ if(NUI_FETCH_PORTABLE_FILE_DIALOG)
         GIT_TAG        ${NUI_PORTABLE_FILE_DIALOG_TAG}
     )
 
+    set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
     FetchContent_MakeAvailable(portable_file_dialogs)
 endif()

cmake/dependencies/portable_file_dialog.cmake

@@ -2,9 +2,10 @@
 
 #include <nui/window.hpp>
 #include <nui/data_structures/selectables_registry.hpp>
-#include <nui/utility/meta/function_traits.hpp>
 #include <nui/utility/meta/pick_first.hpp>
 #include <nui/shared/on_destroy.hpp>
+
+#include <traits/functions.hpp>
 #include <nlohmann/json.hpp>
 #include <fmt/format.h>
 
@@ -69,8 +70,8 @@ namespace Nui
         template <typename FunctionT>
         struct FunctionWrapper
             : public FunctionWrapperImpl2<
-                  FunctionReturnType_t<std::decay_t<FunctionT>>,
-                  FunctionArgumentTypes_t<std::decay_t<FunctionT>>>
+                  typename Traits::FunctionTraits<std::decay_t<FunctionT>>::ReturnType,
+                  typename Traits::FunctionTraits<std::decay_t<FunctionT>>::ArgsTuple>
         {};
     }
 

nui/include/nui/backend/rpc_hub.hpp

@@ -2,9 +2,9 @@
 
 #include <nui/frontend/val.hpp>
 
+#include <traits/functions.hpp>
 #include <nui/frontend/api/console.hpp>
 #include <nui/frontend/utility/functions.hpp>
-#include <nui/utility/meta/function_traits.hpp>
 #include <nui/frontend/utility/val_conversion.hpp>
 #include <nui/shared/on_destroy.hpp>
 
@@ -39,7 +39,7 @@ namespace Nui
             template <typename FunctionT>
             constexpr static auto wrapFunction(FunctionT&& func)
             {
-                return [func = std::move(func)](Nui::val const& args) mutable {
+                return [func = std::forward<FunctionT>(func)](Nui::val const& args) mutable {
                     func(args);
                 };
             }
@@ -51,7 +51,7 @@ namespace Nui
             template <typename FunctionT>
             constexpr static auto wrapFunction(FunctionT&& func)
             {
-                return [func = std::move(func)](Nui::val const& arg) mutable {
+                return [func = std::forward<FunctionT>(func)](Nui::val const& arg) mutable {
                     func(extractMember<ArgType>(arg));
                 };
             }
@@ -63,7 +63,7 @@ namespace Nui
             template <typename FunctionT>
             constexpr static auto wrapFunction(FunctionT&& func)
             {
-                return [func = std::move(func)](Nui::val const& args) mutable {
+                return [func = std::forward<FunctionT>(func)](Nui::val const& args) mutable {
                     func(extractMember<ArgsTypes>(args[Is])...);
                 };
             }
@@ -81,8 +81,8 @@ namespace Nui
         template <typename FunctionT>
         struct FunctionWrapper
             : public FunctionWrapperImpl2<
-                  FunctionReturnType_t<std::decay_t<FunctionT>>,
-                  FunctionArgumentTypes_t<std::decay_t<FunctionT>>>
+                  typename Traits::FunctionTraits<std::decay_t<FunctionT>>::ReturnType,
+                  typename Traits::FunctionTraits<std::decay_t<FunctionT>>::ArgsTuple>
         {};
     }
 
@@ -103,8 +103,7 @@ namespace Nui
                 }
                 if (backChannel_.empty())
                     return callable_(convertToVal(args)...);
-                else
-                    return callable_(convertToVal(backChannel_), convertToVal(args)...);
+                return callable_(convertToVal(backChannel_), convertToVal(args)...);
             }
             auto operator()(Nui::val val) const
             {
@@ -116,8 +115,7 @@ namespace Nui
                 }
                 if (backChannel_.empty())
                     return callable_(val);
-                else
-                    return callable_(convertToVal(backChannel_), val);
+                return callable_(convertToVal(backChannel_), val);
             }
 
             bool isValid() const
@@ -130,7 +128,7 @@ namespace Nui
                 return isValid();
             }
 
-            RemoteCallable(std::string name)
+            explicit RemoteCallable(std::string name)
                 : name_{std::move(name)}
                 , backChannel_{}
                 , callable_{Nui::val::undefined()}
@@ -236,9 +234,9 @@ namespace Nui
             Nui::val::global("nui_rpc")["frontend"].set(
                 tempIdString,
                 Nui::bind(
-                    [func = Detail::FunctionWrapper<FunctionT>::wrapFunction(std::forward<FunctionT>(func)),
+                    [funcInner = Detail::FunctionWrapper<FunctionT>::wrapFunction(std::forward<FunctionT>(func)),
                      tempIdString](Nui::val param) mutable {
-                        func(param);
+                        funcInner(param);
                         Nui::val::global("nui_rpc")["frontend"].delete_(tempIdString);
                     },
                     std::placeholders::_1));
@@ -263,9 +261,9 @@ namespace Nui
             Nui::val::global("nui_rpc")["frontend"].set(
                 name.c_str(),
                 Nui::bind(
-                    [func = Detail::FunctionWrapper<FunctionT>::wrapFunction(std::forward<FunctionT>(func))](
+                    [funcInner = Detail::FunctionWrapper<FunctionT>::wrapFunction(std::forward<FunctionT>(func))](
                         Nui::val param) mutable {
-                        func(param);
+                        funcInner(param);
                     },
                     std::placeholders::_1));
         }
@@ -291,19 +289,19 @@ namespace Nui
             AutoUnregister()
                 : OnDestroy{[]() {}}
             {}
-            AutoUnregister(std::string name)
+            explicit AutoUnregister(std::string name)
                 : OnDestroy{[name = std::move(name)]() {
                     unregisterFunction(name);
                 }}
             {}
             ~AutoUnregister() = default;
 
             AutoUnregister(AutoUnregister const&) = delete;
-            AutoUnregister(AutoUnregister&& other)
+            AutoUnregister(AutoUnregister&& other) noexcept
                 : OnDestroy{std::move(other)}
             {}
             AutoUnregister& operator=(AutoUnregister const&) = delete;
-            AutoUnregister& operator=(AutoUnregister&& other)
+            AutoUnregister& operator=(AutoUnregister&& other) noexcept
             {
                 OnDestroy::operator=(std::move(other));
                 return *this;

nui/include/nui/frontend/rpc_client.hpp

@@ -10,12 +10,12 @@
 #include <emscripten/bind.h>
 #include <emscripten/val.h>
 
+#include <traits/functions.hpp>
+
 #include <boost/preprocessor/repetition/repeat.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>
 #include <boost/preprocessor/stringize.hpp>
 
-#include <pre/type_traits/function_traits.hpp>
-
 #ifndef JS_BIND_MAX_ARITY
 /**
  * \brief JS_BIND_MAX_ARITY Defines how many arguments the javascript
@@ -98,9 +98,8 @@ namespace Nui
     emscripten::val bind(F&& f, Args&&... args)
     {
         using emscripten::val;
-        using pre::type_traits::function_traits;
 
-        using result_type = typename function_traits<std::decay_t<F>>::result_type;
+        using result_type = typename Traits::FunctionTraits<std::decay_t<F>>::ReturnType;
         auto bind_result = std::bind(std::forward<decltype(f)>(f), JS_BIND_DETAIL_FWD(args)...);
 
         using callback_t =