cel-expr · copybara-service · Jul 15, 2026
diff --git a/checker/internal/BUILD b/checker/internal/BUILD
@@ -65,12 +65,12 @@ cc_library(
     srcs = ["type_check_env.cc"],
     hdrs = ["type_check_env.h"],
     deps = [
-        ":descriptor_pool_type_introspector",
         ":proto_type_mask",
         ":proto_type_mask_registry",
         "//common:constant",
         "//common:container",
         "//common:decl",
+        "//common:descriptor_pool_type_introspector",
         "//common:type",
         "//internal:status_macros",
         "@com_google_absl//absl/base:core_headers",
@@ -275,39 +275,6 @@ cc_test(
     ],
 )
 
-cc_library(
-    name = "descriptor_pool_type_introspector",
-    srcs = ["descriptor_pool_type_introspector.cc"],
-    hdrs = ["descriptor_pool_type_introspector.h"],
-    deps = [
-        "//common:type",
-        "@com_google_absl//absl/base:core_headers",
-        "@com_google_absl//absl/base:nullability",
-        "@com_google_absl//absl/container:flat_hash_map",
-        "@com_google_absl//absl/log:absl_check",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings:string_view",
-        "@com_google_absl//absl/synchronization",
-        "@com_google_absl//absl/types:optional",
-        "@com_google_absl//absl/types:span",
-        "@com_google_protobuf//:protobuf",
-    ],
-)
-
-cc_test(
-    name = "descriptor_pool_type_introspector_test",
-    srcs = ["descriptor_pool_type_introspector_test.cc"],
-    deps = [
-        ":descriptor_pool_type_introspector",
-        "//common:type",
-        "//internal:testing",
-        "//internal:testing_descriptor_pool",
-        "@com_google_absl//absl/status:status_matchers",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/types:optional",
-    ],
-)
-
 cc_library(
     name = "field_path",
     srcs = ["field_path.cc"],

diff --git a/checker/internal/type_check_env.h b/checker/internal/type_check_env.h
@@ -30,12 +30,12 @@
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
-#include "checker/internal/descriptor_pool_type_introspector.h"
 #include "checker/internal/proto_type_mask.h"
 #include "checker/internal/proto_type_mask_registry.h"
 #include "common/constant.h"
 #include "common/container.h"
 #include "common/decl.h"
+#include "common/descriptor_pool_type_introspector.h"
 #include "common/type.h"
 #include "common/type_introspector.h"
 #include "internal/status_macros.h"

diff --git a/common/BUILD b/common/BUILD
@@ -52,12 +52,14 @@ cc_library(
     hdrs = ["type_spec_resolver.h"],
     deps = [
         ":ast",
+        ":descriptor_pool_type_introspector",
         ":type",
         ":type_kind",
         "//internal:status_macros",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/strings",
+        "@com_google_absl//absl/types:optional",
         "@com_google_protobuf//:protobuf",
     ],
 )
@@ -79,6 +81,39 @@ cc_test(
     ],
 )
 
+cc_library(
+    name = "descriptor_pool_type_introspector",
+    srcs = ["descriptor_pool_type_introspector.cc"],
+    hdrs = ["descriptor_pool_type_introspector.h"],
+    deps = [
+        ":type",
+        "@com_google_absl//absl/base:core_headers",
+        "@com_google_absl//absl/base:nullability",
+        "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/log:absl_check",
+        "@com_google_absl//absl/status:statusor",
+        "@com_google_absl//absl/strings:string_view",
+        "@com_google_absl//absl/synchronization",
+        "@com_google_absl//absl/types:optional",
+        "@com_google_absl//absl/types:span",
+        "@com_google_protobuf//:protobuf",
+    ],
+)
+
+cc_test(
+    name = "descriptor_pool_type_introspector_test",
+    srcs = ["descriptor_pool_type_introspector_test.cc"],
+    deps = [
+        ":descriptor_pool_type_introspector",
+        ":type",
+        "//internal:testing",
+        "//internal:testing_descriptor_pool",
+        "@com_google_absl//absl/status:status_matchers",
+        "@com_google_absl//absl/status:statusor",
+        "@com_google_absl//absl/types:optional",
+    ],
+)
+
 cc_library(
     name = "signature",
     srcs = ["signature.cc"],

diff --git a/...rnal/descriptor_pool_type_introspector.cc → common/descriptor_pool_type_introspector.cc b/...rnal/descriptor_pool_type_introspector.cc → common/descriptor_pool_type_introspector.cc
@@ -12,9 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "checker/internal/descriptor_pool_type_introspector.h"
+#include "common/descriptor_pool_type_introspector.h"
 
 #include <memory>
+#include <optional>
 #include <utility>
 #include <vector>
 
@@ -24,13 +25,12 @@
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "absl/synchronization/mutex.h"
-#include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "common/type.h"
 #include "common/type_introspector.h"
 #include "google/protobuf/descriptor.h"
 
-namespace cel::checker_internal {
+namespace cel {
 namespace {
 
 // Standard implementation for field lookups.
@@ -242,4 +242,4 @@ DescriptorPoolTypeIntrospector::CreateFieldTable(
   return result;
 }
 
-}  // namespace cel::checker_internal
+}  // namespace cel
diff --git a/...ernal/descriptor_pool_type_introspector.h → common/descriptor_pool_type_introspector.h b/...ernal/descriptor_pool_type_introspector.h → common/descriptor_pool_type_introspector.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef THIRD_PARTY_CEL_CPP_CHECKER_INTERNAL_DESCRIPTOR_POOL_TYPE_INTROSPECTOR_H_
-#define THIRD_PARTY_CEL_CPP_CHECKER_INTERNAL_DESCRIPTOR_POOL_TYPE_INTROSPECTOR_H_
+#ifndef THIRD_PARTY_CEL_CPP_COMMON_DESCRIPTOR_POOL_TYPE_INTROSPECTOR_H_
+#define THIRD_PARTY_CEL_CPP_COMMON_DESCRIPTOR_POOL_TYPE_INTROSPECTOR_H_
 
 #include <memory>
 #include <vector>
@@ -30,14 +30,15 @@
 #include "common/type_introspector.h"
 #include "google/protobuf/descriptor.h"
 
-namespace cel::checker_internal {
+namespace cel {
 
 // Implementation of `TypeIntrospector` that uses a `google::protobuf::DescriptorPool`.
 //
 // This is used by the type checker to resolve protobuf types and their fields
 // and apply any options like using JSON names.
 //
-// Neither copyable nor movable. Should be managed by a TypeCheckEnv.
+// Neither copyable nor movable. Should be managed by a TypeCheckEnv or a
+// runtime Environment.
 class DescriptorPoolTypeIntrospector : public TypeIntrospector {
  public:
   struct Field {
@@ -100,6 +101,6 @@ class DescriptorPoolTypeIntrospector : public TypeIntrospector {
   const google::protobuf::DescriptorPool* absl_nonnull descriptor_pool_;
 };
 
-}  // namespace cel::checker_internal
+}  // namespace cel
 
-#endif  // THIRD_PARTY_CEL_CPP_CHECKER_INTERNAL_DESCRIPTOR_POOL_TYPE_INTROSPECTOR_H_
+#endif  // THIRD_PARTY_CEL_CPP_COMMON_DESCRIPTOR_POOL_TYPE_INTROSPECTOR_H_
diff --git a/...descriptor_pool_type_introspector_test.cc → ...descriptor_pool_type_introspector_test.cc b/...descriptor_pool_type_introspector_test.cc → ...descriptor_pool_type_introspector_test.cc
@@ -12,19 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "checker/internal/descriptor_pool_type_introspector.h"
+#include "common/descriptor_pool_type_introspector.h"
 
+#include <optional>
 #include <vector>
 
 #include "absl/status/status_matchers.h"
 #include "absl/status/statusor.h"
-#include "absl/types/optional.h"
 #include "common/type.h"
 #include "common/type_introspector.h"
 #include "internal/testing.h"
 #include "internal/testing_descriptor_pool.h"
 
-namespace cel::checker_internal {
+namespace cel {
 namespace {
 
 using ::absl_testing::IsOkAndHolds;
@@ -172,4 +172,4 @@ TEST(DescriptorPoolTypeIntrospectorTest, ListFieldsForStructTypeNotFound) {
 }
 
 }  // namespace
-}  // namespace cel::checker_internal
+}  // namespace cel
diff --git a/common/signature.cc b/common/signature.cc
@@ -634,7 +634,7 @@ absl::StatusOr<TypeSpec> ParseTypeSpec(std::string_view signature) {
 absl::StatusOr<Type> ParseType(std::string_view signature, google::protobuf::Arena* arena,
                                const google::protobuf::DescriptorPool& pool) {
   CEL_ASSIGN_OR_RETURN(auto type_spec, ParseTypeSpec(signature));
-  return cel::ConvertTypeSpecToType(type_spec, arena, pool);
+  return cel::ConvertTypeSpecToType(type_spec, pool, arena);
 }
 
 }  // namespace cel
diff --git a/common/signature_test.cc b/common/signature_test.cc
@@ -85,7 +85,7 @@ TEST_P(TypeSignatureTest, TypeSignature) {
     EXPECT_THAT(signature, IsOkAndHolds(param.expected_signature));
 
     absl::StatusOr<Type> type = ConvertTypeSpecToType(
-        param.type, GetTestArena(), *GetTestingDescriptorPool());
+        param.type, *GetTestingDescriptorPool(), GetTestArena());
     ASSERT_THAT(type, ::absl_testing::IsOk());
     EXPECT_THAT(MakeTypeSignature(*type),
                 IsOkAndHolds(param.expected_signature));
@@ -285,9 +285,10 @@ TEST_P(TypeSignatureTest, ParseTypeCheck) {
     auto parsed = ParseType(param.expected_signature, GetTestArena(),
                             *GetTestingDescriptorPool());
     ASSERT_THAT(parsed, ::absl_testing::IsOk());
-    ASSERT_OK_AND_ASSIGN(auto expected_type,
-                         ConvertTypeSpecToType(param.type, GetTestArena(),
-                                               *GetTestingDescriptorPool()));
+    ASSERT_OK_AND_ASSIGN(
+        auto expected_type,
+        ConvertTypeSpecToType(param.type, *GetTestingDescriptorPool(),
+                              GetTestArena()));
     VerifyTypesEqual(*parsed, expected_type);
   }
 }

diff --git a/common/type.cc b/common/type.cc
@@ -606,6 +606,11 @@ absl::optional<MessageTypeField> StructTypeField::AsMessage() const {
   return std::nullopt;
 }
 
+MessageTypeField StructTypeField::GetMessage() const {
+  ABSL_DCHECK(IsMessage());
+  return absl::get<MessageTypeField>(variant_);
+}
+
 StructTypeField::operator MessageTypeField() const {
   ABSL_DCHECK(IsMessage());
   return absl::get<MessageTypeField>(variant_);

diff --git a/common/type.h b/common/type.h
@@ -1140,6 +1140,7 @@ class StructTypeField final {
   }
 
   absl::optional<MessageTypeField> AsMessage() const;
+  MessageTypeField GetMessage() const;
 
   explicit operator MessageTypeField() const;
-Original file line number
+Diff line change
@@ Expand Up / @@ -1140,6 +1140,7 @@ class StructTypeField final { @@
       }
       absl::optional<MessageTypeField> AsMessage() const;
+      MessageTypeField GetMessage() const;
       explicit operator MessageTypeField() const;
@@ Expand Down @@