refactor proto-struct: better io

commit_hash:68558bf9d88bf5924af42c69b3b21811aa2dd3a5

Author: ArkadyRudenko

.mapping.json

@@ -2589,6 +2589,7 @@
   "libraries/grpc-reflection/src/grpc-reflection/reflection_service_component.cpp":"taxi/uservices/userver/libraries/grpc-reflection/src/grpc-reflection/reflection_service_component.cpp",
   "libraries/proto-structs/codegen-tests/proto/enums/names.proto":"taxi/uservices/userver/libraries/proto-structs/codegen-tests/proto/enums/names.proto",
   "libraries/proto-structs/codegen-tests/proto/maps/basic.proto":"taxi/uservices/userver/libraries/proto-structs/codegen-tests/proto/maps/basic.proto",
+  "libraries/proto-structs/codegen-tests/proto/not_recommended_field_names/basic.proto":"taxi/uservices/userver/libraries/proto-structs/codegen-tests/proto/not_recommended_field_names/basic.proto",
   "libraries/proto-structs/codegen-tests/proto/oneof/basic.proto":"taxi/uservices/userver/libraries/proto-structs/codegen-tests/proto/oneof/basic.proto",
   "libraries/proto-structs/codegen-tests/proto/oneof/proto2.proto":"taxi/uservices/userver/libraries/proto-structs/codegen-tests/proto/oneof/proto2.proto",
   "libraries/proto-structs/codegen-tests/proto/simple/cycles.proto":"taxi/uservices/userver/libraries/proto-structs/codegen-tests/proto/simple/cycles.proto",
@@ -2598,6 +2599,7 @@
   "libraries/proto-structs/codegen-tests/src/cycles_test.cpp":"taxi/uservices/userver/libraries/proto-structs/codegen-tests/src/cycles_test.cpp",
   "libraries/proto-structs/codegen-tests/src/enums/names_test.cpp":"taxi/uservices/userver/libraries/proto-structs/codegen-tests/src/enums/names_test.cpp",
   "libraries/proto-structs/codegen-tests/src/maps/basic_test.cpp":"taxi/uservices/userver/libraries/proto-structs/codegen-tests/src/maps/basic_test.cpp",
+  "libraries/proto-structs/codegen-tests/src/not_recommended_field_names/basic_test.cpp":"taxi/uservices/userver/libraries/proto-structs/codegen-tests/src/not_recommended_field_names/basic_test.cpp",
   "libraries/proto-structs/codegen-tests/src/oneof/basic_test.cpp":"taxi/uservices/userver/libraries/proto-structs/codegen-tests/src/oneof/basic_test.cpp",
   "libraries/proto-structs/codegen-tests/src/oneof/proto2_test.cpp":"taxi/uservices/userver/libraries/proto-structs/codegen-tests/src/oneof/proto2_test.cpp",
   "libraries/proto-structs/codegen-tests/src/simple_test.cpp":"taxi/uservices/userver/libraries/proto-structs/codegen-tests/src/simple_test.cpp",
@@ -4276,6 +4278,7 @@
   "scripts/proto_structs/models/vanilla.py":"taxi/uservices/userver/scripts/proto_structs/models/vanilla.py",
   "scripts/proto_structs/templates/forward_declarations.inc.jinja":"taxi/uservices/userver/scripts/proto_structs/templates/forward_declarations.inc.jinja",
   "scripts/proto_structs/templates/io.inc.jinja":"taxi/uservices/userver/scripts/proto_structs/templates/io.inc.jinja",
+  "scripts/proto_structs/templates/io_forward_declarations.inc.jinja":"taxi/uservices/userver/scripts/proto_structs/templates/io_forward_declarations.inc.jinja",
   "scripts/proto_structs/templates/structs.usrv.cpp.jinja":"taxi/uservices/userver/scripts/proto_structs/templates/structs.usrv.cpp.jinja",
   "scripts/proto_structs/templates/structs.usrv.hpp.jinja":"taxi/uservices/userver/scripts/proto_structs/templates/structs.usrv.hpp.jinja",
   "scripts/proto_structs/templates/types.inc.jinja":"taxi/uservices/userver/scripts/proto_structs/templates/types.inc.jinja",

libraries/proto-structs/codegen-tests/proto/not_recommended_field_names/basic.proto

@@ -0,0 +1,24 @@
+syntax = "proto3";
+
+package not_recommended_field_names;
+
+option go_package = "a.yandex-team.ru/taxi/uservices/userver/libraries/proto-structs/codegen-tests/proto/not_recommended_field_names;not_recommended_field_names";
+
+message Basic {
+    int32 protected = 1;
+    int32 final = 2;
+    int32 void__ = 3;
+    int32 float = 4;
+    int32 typeid = 5;
+    int32 new = 6;
+    int32 double = 7;
+    // Not generated by a plugin.
+    int32 major = 8;
+    int32 minor = 9;
+}
+
+message Upper {
+    int32 XYandexUid = 1;
+    int32 Float = 2;
+    int32 New = 3;
+}

libraries/proto-structs/codegen-tests/proto/oneof/proto2.proto

@@ -49,6 +49,5 @@ message Proto2 {
 
     optional Group.MessageInGroup message_from_group = 10;
     repeated Group.EnumInGroup enum_from_group = 11;
-    repeated float Float = 12;
-    optional bool New = 13;
+    optional bool opt_bool = 12;
 }

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

@@ -43,19 +43,6 @@ message SimpleStruct {
     string digit1u = 8;
 }
 
-message NotRecommendedFieldNames {
-    string protected = 1;
-    string final = 2;
-    string void__ = 3;
-    string XYandexUid = 4;
-    int32 float = 5;
-    int32 typeid = 6;
-    int32 new = 7;
-    int32 double = 8;
-    string major = 9;
-    string minor = 10;
-}
-
 message SecondStruct {
     string str = 1;
 

libraries/proto-structs/codegen-tests/src/maps/basic_test.cpp

@@ -2,8 +2,11 @@
 
 #include <gtest/gtest.h>
 
+#include <maps/basic.pb.h>
 #include <maps/basic.structs.usrv.pb.hpp>
 
+#include <userver/proto-structs/convert.hpp>
+
 USERVER_NAMESPACE_BEGIN
 
 TEST(MapsBasic, FundamentalTypes) {
@@ -12,6 +15,39 @@ TEST(MapsBasic, FundamentalTypes) {
     static_assert(std::is_same_v<decltype(Struct::string_string), proto_structs::HashMap<std::string, std::string>>);
     static_assert(std::is_same_v<decltype(Struct::int_int), proto_structs::HashMap<std::int64_t, std::int64_t>>);
     static_assert(std::is_same_v<decltype(Struct::int_string), proto_structs::HashMap<std::int64_t, std::string>>);
+
+    Struct s{};
+    s.int_int = {{1, 2}, {3, 4}};
+    s.int_string = {{1, "2"}, {3, "4"}};
+    s.string_int = {{"1", 2}, {"3", 4}};
+    s.string_string = {{"1", "2"}, {"3", "4"}};
+
+    Struct::ProtobufMessage vanilla{};
+    proto_structs::StructToMessage(std::move(s), vanilla);
+    {
+        auto map = vanilla.int_int();
+        ASSERT_EQ(map.size(), 2u);
+        ASSERT_EQ(map.at(1), 2);
+        ASSERT_EQ(map.at(3), 4);
+    }
+    {
+        auto map = vanilla.int_string();
+        ASSERT_EQ(map.size(), 2u);
+        ASSERT_EQ(map.at(1), "2");
+        ASSERT_EQ(map.at(3), "4");
+    }
+    {
+        auto map = vanilla.string_int();
+        ASSERT_EQ(map.size(), 2u);
+        ASSERT_EQ(map.at("1"), 2);
+        ASSERT_EQ(map.at("3"), 4);
+    }
+    {
+        auto map = vanilla.string_string();
+        ASSERT_EQ(map.size(), 2u);
+        ASSERT_EQ(map.at("1"), "2");
+        ASSERT_EQ(map.at("3"), "4");
+    }
 }
 
 USERVER_NAMESPACE_END

libraries/proto-structs/codegen-tests/src/not_recommended_field_names/basic_test.cpp

@@ -0,0 +1,51 @@
+#include <gtest/gtest.h>
+
+#include <not_recommended_field_names/basic.pb.h>
+#include <not_recommended_field_names/basic.structs.usrv.pb.hpp>
+
+#include <userver/proto-structs/convert.hpp>
+
+USERVER_NAMESPACE_BEGIN
+
+TEST(NotRecommendedFieldNameBasic, Basic) {
+    using Struct = not_recommended_field_names::structs::Basic;
+    Struct s{};
+
+    s.protected_ = 0;
+    s.final_ = 1;
+    s.void__ = 2;
+    s.float_ = 3;
+    s.typeid_ = 4;
+    s.new_ = 5;
+    s.double_ = 6;
+
+    Struct::ProtobufMessage vanilla{};
+    proto_structs::StructToMessage(std::move(s), vanilla);
+
+    ASSERT_EQ(vanilla.protected_(), 0);
+    ASSERT_EQ(vanilla.final(), 1);
+    ASSERT_EQ(vanilla.void__(), 2);
+    ASSERT_EQ(vanilla.float_(), 3);
+    ASSERT_EQ(vanilla.typeid_(), 4);
+    ASSERT_EQ(vanilla.new_(), 5);
+    ASSERT_EQ(vanilla.double_(), 6);
+    // Not generated by a plagin.
+    ASSERT_EQ(vanilla.minor(), 0);
+    ASSERT_EQ(vanilla.major(), 0);
+}
+
+TEST(NotRecommendedFieldNameBasic, Upper) {
+    using Struct = not_recommended_field_names::structs::Upper;
+    Struct s{};
+    s.XYandexUid = 1;
+    s.Float = 2;
+    s.New = 3;
+
+    Struct::ProtobufMessage vanilla{};
+    proto_structs::StructToMessage(std::move(s), vanilla);
+    ASSERT_EQ(vanilla.xyandexuid(), 1);
+    ASSERT_EQ(vanilla.float_(), 2);
+    ASSERT_EQ(vanilla.new_(), 3);
+}
+
+USERVER_NAMESPACE_END

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

@@ -2,9 +2,10 @@
 
 #include <gtest/gtest.h>
 
+#include <userver/proto-structs/convert.hpp>
+
 #include <simple/file1.pb.h>
 #include <simple/file1.structs.usrv.pb.hpp>
-#include <userver/proto-structs/convert.hpp>
 
 namespace ss = simple::structs;
 
@@ -17,19 +18,31 @@ TEST(SingleFile, SimpleStruct) {
     message.some_text = std::optional<std::string>("foo");
     message.is_condition = true;
     message.some_bytes = {"foo", "bar"};
+    message.something.set_bar("bar_val");
+    message.inner_enum = ss::SimpleStruct::InnerEnum2::FOO_VAL;
 
-    ss::SimpleStruct::ProtobufMessage s;
+    ss::SimpleStruct::ProtobufMessage vanilla;
 
-    ::proto_structs::StructToMessage(std::move(message), s);
+    ::proto_structs::StructToMessage(std::move(message), vanilla);
 
-    [[maybe_unused]] ss::SimpleStruct to;
-    ::proto_structs::MessageToStruct(s, to);
+    EXPECT_EQ(vanilla.some_integer(), 5);
+    EXPECT_EQ(vanilla.some_text(), "foo");
+    EXPECT_EQ(vanilla.is_condition(), true);
+    EXPECT_EQ(vanilla.some_bytes().Get(0), "foo");
+    EXPECT_EQ(vanilla.some_bytes().Get(1), "bar");
+    EXPECT_EQ(vanilla.bar(), "bar_val");
+    EXPECT_EQ(vanilla.inner_enum(), ss::SimpleStruct::ProtobufMessage::FOO_VAL);
+
+    ss::SimpleStruct to;
+    ::proto_structs::MessageToStruct(vanilla, to);
 
-    ASSERT_EQ(to.some_text, std::optional<std::string>("foo"));
     ASSERT_EQ(to.some_integer, 5);
+    ASSERT_EQ(to.some_text, std::optional<std::string>("foo"));
     ASSERT_TRUE(to.is_condition);
     std::vector<std::string> exp = {"foo", "bar"};
     ASSERT_EQ(to.some_bytes, exp);
+    ASSERT_EQ(to.something.bar(), "bar_val");
+    ASSERT_THROW([[maybe_unused]] auto foo = to.something.foo(), proto_structs::OneofAccessError);
 }
 
 TEST(SingleFile, NestedStruct) {

libraries/proto-structs/include/userver/proto-structs/impl/bundles/structs_cpp.hpp

@@ -9,5 +9,11 @@
 #include <userver/proto-structs/io/std/string_conv.hpp>
 #include <userver/proto-structs/io/std/vector_conv.hpp>
 
-// RM
-#include <userver/proto-structs/io/supported_types_conv.hpp>
+#include <userver/proto-structs/io/std/int32_t_conv.hpp>
+#include <userver/proto-structs/io/std/int64_t_conv.hpp>
+#include <userver/proto-structs/io/std/size_t_conv.hpp>
+#include <userver/proto-structs/io/std/uint32_t_conv.hpp>
+#include <userver/proto-structs/io/std/uint64_t_conv.hpp>
+
+// For keyword types.
+#include <userver/proto-structs/io/std/scalar_conv.hpp>

libraries/proto-structs/include/userver/proto-structs/impl/bundles/structs_hpp.hpp

@@ -8,4 +8,5 @@
 #include <utility>
 #include <vector>
 
+#include <userver/proto-structs/impl/oneof_codegen.hpp>
 #include <userver/proto-structs/io/fwd.hpp>

scripts/proto_structs/descriptors/node_parsers.py

@@ -19,6 +19,7 @@
 from proto_structs.descriptors import option_parsers
 from proto_structs.descriptors import type_mapping
 from proto_structs.models import gen_node
+from proto_structs.models import io
 from proto_structs.models import names
 from proto_structs.models import options
 from proto_structs.models import sort_dependencies
@@ -142,6 +143,42 @@ def parse_message(
 _SYNTHETIC_ONEOF_NAME_REGEX = re.compile(r'X*_\w*')
 
 
+def _io_kind_read(field: descriptor.FieldDescriptor) -> io.ReadVanillaFieldKind:
+    if typing.cast(int, field.label) == descriptor.FieldDescriptor.LABEL_OPTIONAL:
+        if typing.cast(bool, field.has_presence):
+            return io.ReadVanillaFieldKind.OPTIONAL
+
+    return io.ReadVanillaFieldKind.OTHER
+
+
+def _io_kind_write(field: descriptor.FieldDescriptor) -> io.WriteVanillaFieldKind:
+    type_kind: int = field.type
+    label = typing.cast(int, field.label)
+
+    # Check repeated firstly. Also handle a repeated map entry.
+    if label == descriptor.FieldDescriptor.LABEL_REPEATED:
+        return io.WriteVanillaFieldKind.VECTOR_MAP_MESSAGE
+
+    if type_kind == descriptor.FieldDescriptor.TYPE_STRING or type_kind == descriptor.FieldDescriptor.TYPE_BYTES:
+        return io.WriteVanillaFieldKind.STRING
+
+    if type_mapping.BUILTIN_TYPES.get(type_kind) is not None or type_kind == descriptor.FieldDescriptor.TYPE_ENUM:
+        return io.WriteVanillaFieldKind.OTHER
+
+    if type_kind == descriptor.FieldDescriptor.TYPE_MESSAGE or type_kind == descriptor.FieldDescriptor.TYPE_GROUP:
+        return io.WriteVanillaFieldKind.VECTOR_MAP_MESSAGE
+
+    raise Exception('unreachable')
+
+
+def _io_kind_by_field(field: descriptor.FieldDescriptor) -> io.IoKind:
+    return io.IoKind(read=_io_kind_read(field), write=_io_kind_write(field))
+
+
+def _io_kind_oneof() -> io.IoKind:
+    return io.IoKind(read=io.ReadVanillaFieldKind.ONEOF, write=io.WriteVanillaFieldKind.ONEOF)
+
+
 def _apply_options_to_field(
     field: descriptor.FieldDescriptor, struct_field: gen_node.StructField, *, plugin_options: options.PluginOptions
 ) -> gen_node.StructField:
@@ -223,6 +260,7 @@ def parse_field(
         field_type=parsed_type,
         number=typing.cast(int, field.number),
         oneof_fields=None,
+        io_kinds=_io_kind_by_field(field),
     )
     return _apply_options_to_field(field, result_field, plugin_options=plugin_options)
 
@@ -279,6 +317,7 @@ def parse_oneof(
         field_type=type_reference,
         number=None,
         oneof_fields=fields,
+        io_kinds=_io_kind_oneof(),
     )