chore: copy changes to work on clangd

Author: Bilb

CMakeLists.txt

@@ -47,7 +47,7 @@ if(MSVC)
 endif()
 
 add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC})
-target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC} "include/" "node_modules/node-addon-api" "../../node_modules/node-addon-api" "node_modules/node-api-headers/include" "../../node_modules/node-api-headers/include")
+target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_JS_INC} "include/" "${CMAKE_CURRENT_SOURCE_DIR}/node_modules/node-addon-api" "${CMAKE_CURRENT_SOURCE_DIR}/node_modules" "${CMAKE_CURRENT_SOURCE_DIR}/node_modules/node-api-headers/include")
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
 target_link_libraries(${PROJECT_NAME} PRIVATE ${CMAKE_JS_LIB} ${LIBSESSION_STATIC_BUNDLE_LIBS})

include/meta/meta_base_wrapper.hpp

@@ -3,7 +3,6 @@
 #include <napi.h>
 
 #include <optional>
-#include <span>
 #include <vector>
 
 #include "../base_config.hpp"

include/pro/pro.hpp

@@ -4,17 +4,11 @@
 #include <oxenc/base64.h>
 #include <oxenc/hex.h>
 
-#include <algorithm>
-#include <span>
 #include <vector>
 
 #include "../meta/meta_base_wrapper.hpp"
 #include "../utilities.hpp"
-#include "oxen/log.hpp"
-#include "pro/types.hpp"
-#include "session/attachments.hpp"
-#include "session/config/user_profile.hpp"
-#include "session/random.hpp"
+#include "meta/meta_base_wrapper.hpp"
 #include "session/session_protocol.hpp"
 
 namespace session::nodeapi {

include/pro/types.hpp

@@ -4,17 +4,9 @@
 #include <oxenc/base64.h>
 #include <oxenc/hex.h>
 
-#include <algorithm>
-#include <span>
-#include <vector>
-
-#include "../utilities.hpp"
-#include "oxen/log.hpp"
-#include "pro/pro.hpp"
-#include "session/attachments.hpp"
-#include "session/config/user_profile.hpp"
-#include "session/multi_encrypt.hpp"
-#include "session/random.hpp"
+#include "session/config/pro.hpp"
+#include "session/session_protocol.hpp"
+#include "utilities.hpp"
 
 namespace session::nodeapi {
 

include/utilities.hpp

@@ -303,7 +303,7 @@ auto wrapResult(const Napi::Env& env, Call&& call) {
             if constexpr (std::is_base_of_v<Napi::Value, Result>)
                 return res;
             else
-                return toJs(env, std::move(res));
+                return toJs<Result>(env, std::move(res));
         }
     } catch (const std::exception& e) {
         throw Napi::Error::New(env, e.what());