Expand retention stripping API, and improve test coverage

PiperOrigin-RevId: 520526112

Author: mkruskal-google

src/google/protobuf/compiler/BUILD.bazel

@@ -333,6 +333,20 @@ cc_library(
     ],
 )
 
+
+cc_test(
+    name = "retention_unittest",
+    srcs = ["retention_unittest.cc"],
+    deps = [
+        ":importer",
+        ":retention",
+        "//src/google/protobuf/io",
+        "@com_google_googletest//:gtest",
+        "@com_google_googletest//:gtest_main",
+        "@com_google_absl//absl/log:die_if_null",
+    ],
+)
+
 ################################################################################
 # Generates protoc release artifacts.
 ################################################################################

src/google/protobuf/compiler/retention.cc

@@ -210,6 +210,43 @@ FileDescriptorProto StripSourceRetentionOptions(const FileDescriptor& file,
   return file_proto;
 }
 
+DescriptorProto StripSourceRetentionOptions(const Descriptor& message) {
+  DescriptorProto message_proto;
+  message.CopyTo(&message_proto);
+  ConvertToDynamicMessageAndStripOptions(message_proto,
+                                         *message.file()->pool());
+  return message_proto;
+}
+
+DescriptorProto::ExtensionRange StripSourceRetentionOptions(
+    const Descriptor& message, const Descriptor::ExtensionRange& range) {
+  DescriptorProto::ExtensionRange range_proto;
+  range.CopyTo(&range_proto);
+  ConvertToDynamicMessageAndStripOptions(range_proto, *message.file()->pool());
+  return range_proto;
+}
+
+EnumDescriptorProto StripSourceRetentionOptions(const EnumDescriptor& enm) {
+  EnumDescriptorProto enm_proto;
+  enm.CopyTo(&enm_proto);
+  ConvertToDynamicMessageAndStripOptions(enm_proto, *enm.file()->pool());
+  return enm_proto;
+}
+
+FieldDescriptorProto StripSourceRetentionOptions(const FieldDescriptor& field) {
+  FieldDescriptorProto field_proto;
+  field.CopyTo(&field_proto);
+  ConvertToDynamicMessageAndStripOptions(field_proto, *field.file()->pool());
+  return field_proto;
+}
+
+OneofDescriptorProto StripSourceRetentionOptions(const OneofDescriptor& oneof) {
+  OneofDescriptorProto oneof_proto;
+  oneof.CopyTo(&oneof_proto);
+  ConvertToDynamicMessageAndStripOptions(oneof_proto, *oneof.file()->pool());
+  return oneof_proto;
+}
+
 EnumOptions StripLocalSourceRetentionOptions(const EnumDescriptor& descriptor) {
   return StripLocalOptions(descriptor);
 }
@@ -232,6 +269,14 @@ MessageOptions StripLocalSourceRetentionOptions(const Descriptor& descriptor) {
   return StripLocalOptions(descriptor);
 }
 
+ExtensionRangeOptions StripLocalSourceRetentionOptions(
+    const Descriptor& descriptor, const Descriptor::ExtensionRange& range) {
+  if (range.options_ == nullptr) return ExtensionRangeOptions{};
+  ExtensionRangeOptions options = *range.options_;
+  ConvertToDynamicMessageAndStripOptions(options, GetPool(descriptor));
+  return options;
+}
+
 MethodOptions StripLocalSourceRetentionOptions(
     const MethodDescriptor& descriptor) {
   return StripLocalOptions(descriptor);

src/google/protobuf/compiler/retention.h

@@ -47,6 +47,16 @@ namespace compiler {
 // corresponding to source-retention options.
 PROTOC_EXPORT FileDescriptorProto StripSourceRetentionOptions(
     const FileDescriptor& file, bool include_source_code_info = false);
+PROTOC_EXPORT DescriptorProto
+StripSourceRetentionOptions(const Descriptor& message);
+PROTOC_EXPORT DescriptorProto::ExtensionRange StripSourceRetentionOptions(
+    const Descriptor& message, const Descriptor::ExtensionRange& range);
+PROTOC_EXPORT EnumDescriptorProto
+StripSourceRetentionOptions(const EnumDescriptor& enm);
+PROTOC_EXPORT FieldDescriptorProto
+StripSourceRetentionOptions(const FieldDescriptor& field);
+PROTOC_EXPORT OneofDescriptorProto
+StripSourceRetentionOptions(const OneofDescriptor& oneof);
 
 // The following functions take a descriptor and strip all source-retention
 // options from just the local entity (e.g. message, enum, field). Most code
@@ -63,6 +73,8 @@ PROTOC_EXPORT FileOptions
 StripLocalSourceRetentionOptions(const FileDescriptor& descriptor);
 PROTOC_EXPORT MessageOptions
 StripLocalSourceRetentionOptions(const Descriptor& descriptor);
+PROTOC_EXPORT ExtensionRangeOptions StripLocalSourceRetentionOptions(
+    const Descriptor& descriptor, const Descriptor::ExtensionRange& range);
 PROTOC_EXPORT MethodOptions
 StripLocalSourceRetentionOptions(const MethodDescriptor& descriptor);
 PROTOC_EXPORT OneofOptions