JsonUtils: remove Optional specializations, use constexpr if, add IReference

Author: DHowett

src/cascadia/TerminalApp/JsonUtilsNew.h

@@ -20,9 +20,15 @@ Author(s):
 
 namespace winrt
 {
-    // If we don't use winrt, nobody will include the ConversionTrait for winrt::guid.
-    // If nobody includes it, this forward declaration will suffice.
+    // If we don't use winrt, nobody will include the ConversionTraits for winrt stuff.
+    // If nobody includes it, these forward declarations will suffice.
     struct guid;
+    struct hstring;
+    namespace Windows::Foundation
+    {
+        template<typename T>
+        struct IReference;
+    }
 }
 
 namespace TerminalApp::JsonUtils
@@ -45,12 +51,21 @@ namespace TerminalApp::JsonUtils
         struct DeduceOptional
         {
             using Type = typename std::decay<T>::type;
+            static constexpr bool IsOptional = false;
         };
 
         template<typename TOpt>
         struct DeduceOptional<std::optional<TOpt>>
         {
             using Type = typename std::decay<TOpt>::type;
+            static constexpr bool IsOptional = true;
+        };
+
+        template<typename TOpt>
+        struct DeduceOptional<::winrt::Windows::Foundation::IReference<TOpt>>
+        {
+            using Type = typename std::decay<TOpt>::type;
+            static constexpr bool IsOptional = true;
         };
     }
 
@@ -105,7 +120,9 @@ namespace TerminalApp::JsonUtils
     template<typename T>
     struct ConversionTrait
     {
-        // FromJson, CanConvert are not defined so as to cause a compile error (which forces a specialization)
+        // Forward-declare these so the linker can pick up specializations from elsewhere!
+        T FromJson(const Json::Value&);
+        bool CanConvert(const Json::Value& json);
     };
 
     template<>
@@ -136,6 +153,18 @@ namespace TerminalApp::JsonUtils
         }
     };
 
+#ifdef WINRT_BASE_H
+    template<>
+    struct ConversionTrait<winrt::hstring> : public ConversionTrait<std::wstring>
+    {
+        // Leverage the wstring converter's validation
+        winrt::hstring FromJson(const Json::Value& json)
+        {
+            return winrt::hstring{ til::u8u16(Detail::GetStringView(json)) };
+        }
+    };
+#endif
+
     template<>
     struct ConversionTrait<bool>
     {
@@ -248,7 +277,7 @@ namespace TerminalApp::JsonUtils
             }
 
             const auto string{ Detail::GetStringView(json) };
-            return (string.length() == 7 || string.length() == 3) && string.front() == '#';
+            return (string.length() == 7 || string.length() == 4) && string.front() == '#';
         }
     };
 
@@ -334,6 +363,18 @@ namespace TerminalApp::JsonUtils
     template<typename T, typename Converter>
     bool GetValue(const Json::Value& json, T& target, Converter&& conv)
     {
+        if constexpr (Detail::DeduceOptional<T>::IsOptional)
+        {
+            // FOR OPTION TYPES
+            // - If the json object is set to `null`, then
+            //   we'll instead set the target back to the empty optional.
+            if (json.isNull())
+            {
+                target = T{}; // zero-construct an empty optional
+                return true;
+            }
+        }
+
         if (json)
         {
             if (!conv.CanConvert(json))
@@ -347,36 +388,6 @@ namespace TerminalApp::JsonUtils
         return false;
     }
 
-    // Method Description:
-    // - Overload on GetValue that will populate a std::optional with a value converted from json
-    //    - If the json value doesn't exist we'll leave the target object unmodified.
-    //    - If the json object is set to `null`, then
-    //      we'll instead set the target back to nullopt.
-    // Arguments:
-    // - json: the json object to convert
-    // - target: the value to populate with the converted result
-    // Return Value:
-    // - a boolean indicating whether the optional was changed
-    //
-    // GetValue, type-deduced for optional, manual converter
-    template<typename TOpt, typename Converter>
-    bool GetValue(const Json::Value& json, std::optional<TOpt>& target, Converter&& conv)
-    {
-        if (json.isNull())
-        {
-            target = std::nullopt;
-            return true; // null is valid for optionals
-        }
-
-        std::decay_t<TOpt> local{};
-        if (GetValue(json, local, std::forward<Converter>(conv)))
-        {
-            target = std::move(local);
-            return true;
-        }
-        return false;
-    }
-
     // GetValue, forced return type, manual converter
     template<typename T, typename Converter>
     std::decay_t<T> GetValue(const Json::Value& json, Converter&& conv)