Merge branch 'dev'

GaspardKirira · GaspardKirira · commit f4bc90b94a9d · 2026-02-07T13:56:24.000+03:00
diff --git a/include/vix/json/json.hpp b/include/vix/json/json.hpp
@@ -119,20 +119,27 @@ namespace vix::json
   inline Json arr() { return Json::array(); }
 
   /**
-   * @brief JSON string literal helpers from nlohmann.
+   * @brief JSON string literal helpers.
    *
    * Enables:
    * @code
+   * #define VIX_JSON_ENABLE_LITERALS 1
    * using namespace vix::json::literals;
    * Json j = R"({"a": 1, "b": 2})"_json;
    * @endcode
+   *
+   * Note:
+   * Disabled by default because it relies on parsing (can throw).
    */
-#if defined(NLOHMANN_JSON_VERSION_MAJOR)
-#if (NLOHMANN_JSON_VERSION_MAJOR > 3) || \
-    (NLOHMANN_JSON_VERSION_MAJOR == 3 && NLOHMANN_JSON_VERSION_MINOR >= 10)
-  namespace literals = nlohmann::literals::json_literals;
-#endif
+  namespace literals
+  {
+#if defined(VIX_JSON_ENABLE_LITERALS) && (VIX_JSON_ENABLE_LITERALS == 1)
+    inline Json operator"" _json(const char *s, std::size_t n)
+    {
+      return Json::parse(std::string_view{s, n});
+    }
 #endif
+  } // namespace literals
 
 } // namespace vix::json
 
diff --git a/include/vix/json/loads.hpp b/include/vix/json/loads.hpp
@@ -146,7 +146,7 @@ namespace vix::json
     try
     {
       Json j = Json::parse(s);
-      return j;
+      return std::optional<Json>{std::move(j)};
     }
     catch (...)
     {

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ namespace vix::json`
`146`	`146`	`try`
`147`	`147`	`{`
`148`	`148`	`Json j = Json::parse(s);`
`149`		`- return j;`
	`149`	`+ return std::optional<Json>{std::move(j)};`
`150`	`150`	`}`
`151`	`151`	`catch (...)`
`152`	`152`	`{`