From 69694494ce0a2b55da903a6bd274e0b5bc0d7cff Mon Sep 17 00:00:00 2001
From: iwubcode <iwubcode@users.noreply.github.com>
Date: Wed, 20 Mar 2024 17:27:02 -0500
Subject: [PATCH 1/2] Common: update 'ReadNumericOrDefault' to
 'ReadNumericFromJson' and have it return an optional, this provides the
 caller with more flexibility

---
 Source/Core/Common/JsonUtil.cpp | 6 +++---
 Source/Core/Common/JsonUtil.h   | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Source/Core/Common/JsonUtil.cpp b/Source/Core/Common/JsonUtil.cpp
index d16f37f4f3..9ba23b6e1e 100644
--- a/Source/Core/Common/JsonUtil.cpp
+++ b/Source/Core/Common/JsonUtil.cpp
@@ -14,7 +14,7 @@ picojson::object ToJsonObject(const Common::Vec3& vec)
 
 void FromJson(const picojson::object& obj, Common::Vec3& vec)
 {
-  vec.x = ReadNumericOrDefault<float>(obj, "x");
-  vec.y = ReadNumericOrDefault<float>(obj, "y");
-  vec.z = ReadNumericOrDefault<float>(obj, "z");
+  vec.x = ReadNumericFromJson<float>(obj, "x").value_or(0.0f);
+  vec.y = ReadNumericFromJson<float>(obj, "y").value_or(0.0f);
+  vec.z = ReadNumericFromJson<float>(obj, "z").value_or(0.0f);
 }
diff --git a/Source/Core/Common/JsonUtil.h b/Source/Core/Common/JsonUtil.h
index cee52432ff..b508970099 100644
--- a/Source/Core/Common/JsonUtil.h
+++ b/Source/Core/Common/JsonUtil.h
@@ -3,6 +3,7 @@
 
 #pragma once
 
+#include <optional>
 #include <string>
 
 #include <picojson.h>
@@ -29,14 +30,13 @@ picojson::array ToJsonArray(const Range& data)
 }
 
 template <typename Type>
-Type ReadNumericOrDefault(const picojson::object& obj, const std::string& key,
-                          Type default_value = Type{})
+std::optional<Type> ReadNumericFromJson(const picojson::object& obj, const std::string& key)
 {
   const auto it = obj.find(key);
   if (it == obj.end())
-    return default_value;
+    return std::nullopt;
   if (!it->second.is<double>())
-    return default_value;
+    return std::nullopt;
   return MathUtil::SaturatingCast<Type>(it->second.get<double>());
 }
 

From 146504d6357513fded0eaf4edc77e0c2a1ee1640 Mon Sep 17 00:00:00 2001
From: iwubcode <iwubcode@users.noreply.github.com>
Date: Tue, 19 Mar 2024 22:33:48 -0500
Subject: [PATCH 2/2] Common: add json utility functions 'ReadStringFromJson'
 and 'ReadBoolFromJson' to match 'ReadNumericFromJson' functionality for other
 data types, similarly support other data types for 'ToJsonArray'

---
 Source/Core/Common/JsonUtil.cpp | 20 ++++++++++++++++++++
 Source/Core/Common/JsonUtil.h   | 16 +++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/Source/Core/Common/JsonUtil.cpp b/Source/Core/Common/JsonUtil.cpp
index 9ba23b6e1e..3e842c5c18 100644
--- a/Source/Core/Common/JsonUtil.cpp
+++ b/Source/Core/Common/JsonUtil.cpp
@@ -18,3 +18,23 @@ void FromJson(const picojson::object& obj, Common::Vec3& vec)
   vec.y = ReadNumericFromJson<float>(obj, "y").value_or(0.0f);
   vec.z = ReadNumericFromJson<float>(obj, "z").value_or(0.0f);
 }
+
+std::optional<std::string> ReadStringFromJson(const picojson::object& obj, const std::string& key)
+{
+  const auto it = obj.find(key);
+  if (it == obj.end())
+    return std::nullopt;
+  if (!it->second.is<std::string>())
+    return std::nullopt;
+  return it->second.to_str();
+}
+
+std::optional<bool> ReadBoolFromJson(const picojson::object& obj, const std::string& key)
+{
+  const auto it = obj.find(key);
+  if (it == obj.end())
+    return std::nullopt;
+  if (!it->second.is<bool>())
+    return std::nullopt;
+  return it->second.get<bool>();
+}
diff --git a/Source/Core/Common/JsonUtil.h b/Source/Core/Common/JsonUtil.h
index b508970099..eec836d507 100644
--- a/Source/Core/Common/JsonUtil.h
+++ b/Source/Core/Common/JsonUtil.h
@@ -5,6 +5,7 @@
 
 #include <optional>
 #include <string>
+#include <type_traits>
 
 #include <picojson.h>
 
@@ -18,12 +19,21 @@
 template <typename Range>
 picojson::array ToJsonArray(const Range& data)
 {
+  using RangeUnderlyingType = typename Range::value_type;
   picojson::array result;
   result.reserve(std::size(data));
 
   for (const auto& value : data)
   {
-    result.emplace_back(static_cast<double>(value));
+    if constexpr (std::is_integral_v<RangeUnderlyingType> ||
+                  std::is_floating_point_v<RangeUnderlyingType>)
+    {
+      result.emplace_back(static_cast<double>(value));
+    }
+    else
+    {
+      result.emplace_back(value);
+    }
   }
 
   return result;
@@ -40,5 +50,9 @@ std::optional<Type> ReadNumericFromJson(const picojson::object& obj, const std::
   return MathUtil::SaturatingCast<Type>(it->second.get<double>());
 }
 
+std::optional<std::string> ReadStringFromJson(const picojson::object& obj, const std::string& key);
+
+std::optional<bool> ReadBoolFromJson(const picojson::object& obj, const std::string& key);
+
 picojson::object ToJsonObject(const Common::Vec3& vec);
 void FromJson(const picojson::object& obj, Common::Vec3& vec);