feat: ser/deser u8string as json string, not array

Guekka · Aug 19, 2023 · 49efc6d · 49efc6d
1 parent 71fcdad
commit 49efc6d
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 0 deletions.
diff --git a/include/btu/common/json.hpp b/include/btu/common/json.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <btu/common/string.hpp>
 #include <nlohmann/json.hpp>
 
 #include <optional>
@@ -37,6 +38,18 @@ struct variant_switch<0>
 };
 } // namespace detail
 
+namespace std {
+inline void to_json(nlohmann::json &j, const u8string &str)
+{
+    j = ::btu::common::as_ascii(str);
+}
+
+inline void from_json(const nlohmann::json &j, u8string &str)
+{
+    str = ::btu::common::as_utf8(j.get<std::string>());
+}
+} // namespace std
+
 namespace nlohmann {
 
 template<typename T>

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -8,6 +8,7 @@ set(SOURCE_FILES
     "${SOURCE_DIR}/utils.hpp"
     "${SOURCE_DIR}/common/filesystem.cpp"
     "${SOURCE_DIR}/common/functional.cpp"
+    "${SOURCE_DIR}/common/json.cpp"
     "${SOURCE_DIR}/common/metaprogramming.cpp"
     "${SOURCE_DIR}/common/string.cpp"
     "${SOURCE_DIR}/bsa/archive.cpp"

diff --git a/tests/common/json.cpp b/tests/common/json.cpp
@@ -0,0 +1,21 @@
+#include <btu/common/json.hpp>
+#include <btu/common/string.hpp>
+#include <catch.hpp>
+
+TEST_CASE("std::u8string is converted to json as a string", "[src]")
+{
+    SECTION("To json")
+    {
+        const auto str  = u8"👍 👍 👍";
+        const auto json = nlohmann::json(str);
+        REQUIRE(json.is_string());
+        REQUIRE(json.get<std::string>() == btu::common::as_ascii(str));
+    }
+
+    SECTION("From json")
+    {
+        const auto json = R"("👍 👍 👍")"_json;
+        REQUIRE(json.is_string());
+        REQUIRE(json.get<std::u8string>() == u8"👍 👍 👍");
+    }
+}