feat userver/proto-structs: add support for Value/ListValue/Struct to codegen

Relates: <https://nda.ya.ru/t/XA9jYhs_7TE6Tr>
commit_hash:1b788a008cb39140217a2a3b5983a4263275c6f6

Author: pananton

libraries/proto-structs/codegen-tests/proto/simple/base/base.proto

@@ -7,11 +7,12 @@ option go_package = "a.yandex-team.ru/taxi/uservices/userver/libraries/proto-str
 import "simple/subdirectory/subdirectory.proto";
 import "simple/subdirectory/separate_enum.proto";
 
-import "google/protobuf/timestamp.proto";
+import "google/protobuf/any.proto";
 import "google/protobuf/duration.proto";
+import "google/protobuf/struct.proto";
+import "google/protobuf/timestamp.proto";
 import "google/type/date.proto";
 import "google/type/timeofday.proto";
-import "google/protobuf/any.proto";
 
 message SimpleStruct {
     int32 some_integer = 1;
@@ -75,4 +76,7 @@ message WellKnownUsrv {
   google.type.Date f3 = 3;          // proto_structs::Date
   google.type.TimeOfDay f4 = 4;     // proto_structs::TimeOfDay
   google.protobuf.Any f5 = 5;       // proto_structs::Any
+  google.protobuf.Value f6 = 6;     // formats::json::Value
+  google.protobuf.ListValue f7 = 7; // formats::json::Array
+  google.protobuf.Struct f8 = 8;    // formats::json::Object
 }

libraries/proto-structs/codegen-tests/src/simple/simple_test.cpp

@@ -1,15 +1,18 @@
 #include <type_traits>
+#include <unordered_map>
+#include <vector>
 
 #include <gtest/gtest.h>
 
+#include <userver/formats/json/value_builder.hpp>
+#include <userver/formats/parse/common_containers.hpp>
+#include <userver/formats/serialize/common_containers.hpp>
 #include <userver/proto-structs/convert.hpp>
 #include <userver/proto-structs/type_mapping.hpp>
 
 #include <simple/base/base.pb.h>
 #include <simple/base/base.structs.usrv.pb.hpp>
 
-#include <google/protobuf/any.h>
-
 namespace ss = simple::base::structs;
 
 USERVER_NAMESPACE_BEGIN
@@ -124,6 +127,11 @@ TEST(Oneof, WellKnownTypes) {
     const std::chrono::hours hours{20};
     const std::chrono::minutes minutes{10};
     const std::string string_value{"swag"};
+    const formats::json::Value json_bool = formats::json::ValueBuilder{true}.ExtractValue();
+    const formats::json::Array json_array{formats::json::ValueBuilder{std::vector<double>{-1.5, 1.5}}.ExtractValue()};
+    const formats::json::Object json_object{
+        formats::json::ValueBuilder(std::unordered_map<std::string, std::string>{{"a", "1"}, {"b", "2"}}).ExtractValue()
+    };
 
     ss::WellKnownUsrv message;
 
@@ -136,9 +144,12 @@ TEST(Oneof, WellKnownTypes) {
     proto_structs::traits::CompatibleMessageType<ss::ForAny> for_any;
     for_any.set_f1(string_value);
 
-    EXPECT_TRUE(pbuf_any.PackFrom(for_any));
+    ASSERT_TRUE(pbuf_any.PackFrom(for_any));
 
     message.f5 = proto_structs::Any{pbuf_any};
+    message.f6 = json_bool;
+    message.f7 = json_array;
+    message.f8 = json_object;
 
     const auto vanilla = proto_structs::StructToMessage(std::move(message));
 
@@ -168,6 +179,10 @@ TEST(Oneof, WellKnownTypes) {
 
     const auto parsed_any = parsed.f5.Unpack<ss::ForAny>();
     ASSERT_EQ(parsed_any.f1, string_value);
+
+    ASSERT_EQ(parsed.f6, json_bool);
+    ASSERT_EQ(parsed.f7, json_array);
+    ASSERT_EQ(parsed.f8, json_object);
 }
 
 USERVER_NAMESPACE_END

scripts/proto_structs/models/type_ref_consts.py

@@ -47,6 +47,9 @@
     'google.type.Date': type_ref.UserverLibraryType(full_cpp_name_wo_userver='proto_structs::Date'),
     'google.type.TimeOfDay': type_ref.UserverLibraryType(full_cpp_name_wo_userver='proto_structs::TimeOfDay'),
     'google.protobuf.Any': type_ref.UserverLibraryType(full_cpp_name_wo_userver='proto_structs::Any'),
+    'google.protobuf.Value': type_ref.UserverLibraryType(full_cpp_name_wo_userver='formats::json::Value'),
+    'google.protobuf.ListValue': type_ref.UserverLibraryType(full_cpp_name_wo_userver='formats::json::Array'),
+    'google.protobuf.Struct': type_ref.UserverLibraryType(full_cpp_name_wo_userver='formats::json::Object'),
 }