Add missing aliases to the wrapper types

PiperOrigin-RevId: 533215268

Author: jcking

Diff for: base/type.cc

@@ -101,6 +101,8 @@ absl::Span<const absl::string_view> Type::aliases() const {
       return static_cast<const ListType*>(this)->aliases();
     case Kind::kMap:
       return static_cast<const MapType*>(this)->aliases();
+    case Kind::kWrapper:
+      return static_cast<const WrapperType*>(this)->aliases();
     default:
       // Everything else does not support aliases.
       return absl::Span<const absl::string_view>();

Diff for: base/types/wrapper_type.cc

@@ -15,6 +15,8 @@
 #include "base/types/wrapper_type.h"
 
 #include "absl/base/optimization.h"
+#include "absl/strings/string_view.h"
+#include "absl/types/span.h"
 
 namespace cel {
 
@@ -46,6 +48,20 @@ absl::string_view WrapperType::name() const {
   }
 }
 
+absl::Span<const absl::string_view> WrapperType::aliases() const {
+  switch (base_internal::Metadata::GetInlineVariant<Kind>(*this)) {
+    case Kind::kDouble:
+      return static_cast<const DoubleWrapperType*>(this)->aliases();
+    case Kind::kInt:
+      return static_cast<const IntWrapperType*>(this)->aliases();
+    case Kind::kUint:
+      return static_cast<const UintWrapperType*>(this)->aliases();
+    default:
+      // The other wrappers do not have aliases.
+      return absl::Span<const absl::string_view>();
+  }
+}
+
 const Handle<Type>& WrapperType::wrapped() const {
   switch (base_internal::Metadata::GetInlineVariant<Kind>(*this)) {
     case Kind::kBool:
@@ -66,4 +82,22 @@ const Handle<Type>& WrapperType::wrapped() const {
   }
 }
 
+absl::Span<const absl::string_view> DoubleWrapperType::aliases() const {
+  static constexpr absl::string_view kAliases[] = {
+      "google.protobuf.FloatValue"};
+  return absl::MakeConstSpan(kAliases);
+}
+
+absl::Span<const absl::string_view> IntWrapperType::aliases() const {
+  static constexpr absl::string_view kAliases[] = {
+      "google.protobuf.Int32Value"};
+  return absl::MakeConstSpan(kAliases);
+}
+
+absl::Span<const absl::string_view> UintWrapperType::aliases() const {
+  static constexpr absl::string_view kAliases[] = {
+      "google.protobuf.UInt32Value"};
+  return absl::MakeConstSpan(kAliases);
+}
+
 }  // namespace cel

Diff for: base/types/wrapper_type.h

@@ -22,6 +22,7 @@
 #include "absl/base/attributes.h"
 #include "absl/log/absl_check.h"
 #include "absl/strings/string_view.h"
+#include "absl/types/span.h"
 #include "base/internal/data.h"
 #include "base/kind.h"
 #include "base/type.h"
@@ -69,13 +70,17 @@ class WrapperType : public Type, base_internal::InlineData {
   const Handle<Type>& wrapped() const;
 
  private:
+  friend class Type;
   friend class BoolWrapperType;
   friend class BytesWrapperType;
   friend class DoubleWrapperType;
   friend class IntWrapperType;
   friend class StringWrapperType;
   friend class UintWrapperType;
 
+  // See Type::aliases().
+  absl::Span<const absl::string_view> aliases() const;
+
   using Base::Base;
 };
 
@@ -189,6 +194,7 @@ class DoubleWrapperType final : public WrapperType {
   const Handle<DoubleType>& wrapped() const { return DoubleType::Get(); }
 
  private:
+  friend class WrapperType;
   friend class TypeFactory;
   template <size_t Size, size_t Align>
   friend struct base_internal::AnyData;
@@ -202,6 +208,9 @@ class DoubleWrapperType final : public WrapperType {
        << base_internal::kInlineVariantShift);
 
   constexpr DoubleWrapperType() : WrapperType(kMetadata) {}
+
+  // See Type::aliases().
+  absl::Span<const absl::string_view> aliases() const;
 };
 
 class IntWrapperType final : public WrapperType {
@@ -226,6 +235,7 @@ class IntWrapperType final : public WrapperType {
   const Handle<IntType>& wrapped() const { return IntType::Get(); }
 
  private:
+  friend class WrapperType;
   friend class TypeFactory;
   template <size_t Size, size_t Align>
   friend struct base_internal::AnyData;
@@ -239,6 +249,9 @@ class IntWrapperType final : public WrapperType {
        << base_internal::kInlineVariantShift);
 
   constexpr IntWrapperType() : WrapperType(kMetadata) {}
+
+  // See Type::aliases().
+  absl::Span<const absl::string_view> aliases() const;
 };
 
 class StringWrapperType final : public WrapperType {
@@ -300,6 +313,7 @@ class UintWrapperType final : public WrapperType {
   const Handle<UintType>& wrapped() const { return UintType::Get(); }
 
  private:
+  friend class WrapperType;
   friend class TypeFactory;
   template <size_t Size, size_t Align>
   friend struct base_internal::AnyData;
@@ -313,6 +327,9 @@ class UintWrapperType final : public WrapperType {
        << base_internal::kInlineVariantShift);
 
   constexpr UintWrapperType() : WrapperType(kMetadata) {}
+
+  // See Type::aliases().
+  absl::Span<const absl::string_view> aliases() const;
 };
 
 extern template class Handle<WrapperType>;