refactor: replace nlohmann_json with glaze

Author: shad0wshayd3

src/REX/REX/JSON.cpp

@@ -3,7 +3,7 @@
 #include "REX/REX/LOG.h"
 
 #ifdef COMMONLIB_OPTION_JSON
-#	include <nlohmann/json.hpp>
+#	include <glaze/glaze.hpp>
 
 namespace REX::JSON
 {
@@ -16,12 +16,8 @@ namespace REX::JSON
 			T&     a_value,
 			T&     a_valueDefault)
 		{
-			const auto& json = *static_cast<nlohmann::json*>(a_data);
-			if (a_path[0] == '/') {
-				a_value = json.value<T>(nlohmann::json::json_pointer(a_path.data()), a_valueDefault);
-			} else {
-				a_value = json.value<T>(a_path, a_valueDefault);
-			}
+			const auto& json = *static_cast<glz::json_t*>(a_data);
+			a_value = glz::get<T>(json, a_path).value_or(a_valueDefault);
 		}
 
 		template void SettingLoad<bool>(void*, path_t, bool&, bool&);
@@ -41,12 +37,8 @@ namespace REX::JSON
 			path_t a_path,
 			T&     a_value)
 		{
-			auto& json = *static_cast<nlohmann::json*>(a_data);
-			if (a_path[0] == '/') {
-				json[nlohmann::json::json_pointer(a_path.data())] = a_value;
-			} else {
-				json[a_path] = a_value;
-			}
+			const auto& json = *static_cast<glz::json_t*>(a_data);
+			glz::set(json, a_path, a_value);
 		}
 
 		template void SettingSave<bool>(void*, path_t, bool&);
@@ -64,44 +56,48 @@ namespace REX::JSON
 	void SettingStore::Load()
 	{
 		if (std::filesystem::exists(m_fileBase)) {
-			std::ifstream file{ m_fileBase.data() };
-			try {
-				auto result = nlohmann::json::parse(file);
+			glz::json_t result;
+			std::string buffer;
+			const auto  error = glz::read_file_json(result, m_fileBase, buffer);
+			if (error) {
+				REX::ERROR("{}"sv, glz::format_error(error, buffer));
+			} else {
 				for (auto setting : m_settings) {
 					setting->Load(&result, true);
 				}
-			} catch (const std::exception& e) {
-				REX::ERROR("{}", e.what());
 			}
 		}
 
 		if (std::filesystem::exists(m_fileUser)) {
-			std::ifstream file{ m_fileUser.data() };
-			try {
-				auto result = nlohmann::json::parse(file);
+			glz::json_t result;
+			std::string buffer;
+			const auto  error = glz::read_file_json(result, m_fileUser, buffer);
+			if (error) {
+				REX::ERROR("{}"sv, glz::format_error(error, buffer));
+			} else {
 				for (auto setting : m_settings) {
-					setting->Load(&result, false);
+					setting->Load(&result, true);
 				}
-			} catch (const std::exception& e) {
-				REX::ERROR("{}", e.what());
 			}
 		}
 	}
 
 	void SettingStore::Save()
 	{
-		nlohmann::json output{};
+		glz::json_t output;
 		if (std::filesystem::exists(m_fileBase)) {
-			std::ifstream file{ m_fileBase.data() };
-			output = nlohmann::json::parse(file);
+			std::string buffer;
+			const auto error = glz::read_file_json(output, m_fileBase, buffer);
+			if (error) {
+				REX::ERROR("{}"sv, glz::format_error(error, buffer));
+			}
 		}
 
 		for (auto& setting : m_settings) {
 			setting->Save(&output);
 		}
 
-		std::ofstream file{ m_fileBase.data(), std::ios::trunc };
-		file << std::setw(4) << output;
+		glz::write_file_json(output, m_fileBase, std::string{});
 	}
 }
 #endif

xmake.lua

@@ -40,7 +40,7 @@ add_requires("spdlog", { configs = { header_only = false, wchar = true, std_form
 
 -- add config packages
 if has_config("commonlib_ini") then add_requires("simpleini") end
-if has_config("commonlib_json") then add_requires("nlohmann_json") end
+if has_config("commonlib_json") then add_requires("glaze a418e9c25083cd772308f68760cc5e38d81ffb45") end
 if has_config("commonlib_toml") then add_requires("toml11") end
 if has_config("commonlib_xbyak") then add_requires("xbyak") end
 
@@ -53,7 +53,7 @@ target("commonlib-shared", function()
 
     -- add config packages
     if has_config("commonlib_ini") then add_packages("simpleini", { public = true }) end
-    if has_config("commonlib_json") then add_packages("nlohmann_json", { public = true }) end
+    if has_config("commonlib_json") then add_packages("glaze", { public = true }) end
     if has_config("commonlib_toml") then add_packages("toml11", { public = true }) end
     if has_config("commonlib_xbyak") then add_packages("xbyak", { public = true }) end