Update cel-cpp to v0.11.0 (#86)

This is a bit complicated because cel-cpp v0.11.0 breaks `WORKSPACE`
support a little bit, but thankfully the API we're using has remained
relatively stable. Patches have been rebased, I'm pretty confident that
I'll need to loop around to the MSVC patch to make sure it still works
but the field access patch seems to be working first-try so
knock-on-wood. The CMakeLists will need to be audited because I'm sure
there's now stuff in it that should be removed, but let's focus on
getting a working build first. We can focus on making the CMakeLists as
accurate as possible when we're closer to being able to upstream it.

Although cel-cpp now compiles with bzlmod, it has yet to be added to the
BCR, so we might not be able to use it with bzlmod ourselves yet. (I'll
be sure to double-check this, but I want to keep this PR clean.) Another
follow-up item would be to use the `strings.format` implementation
provided by cel-cpp v0.11.0, but it will probably be according to the
new spec, so that is pending on a `protovalidate` release with the
updated tests.

Draft until we're passing in CI. I anticipate problems across platforms.

Author: jchadwick-buf

.bazelignore

@@ -1,3 +1 @@
-.build*
-cmake-build-*
 .cache

CMakeLists.txt

@@ -4,6 +4,10 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 project(protovalidate-cc)
 
+if(MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
+endif()
+
 option(PROTOVALIDATE_CC_ENABLE_VENDORING "Fall back to vendored libraries when possible" ON)
 
 if(NOT CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)

REPO.bazel

@@ -0,0 +1,18 @@
+# Copyright 2023-2025 Buf Technologies, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+ignore_directories([
+    ".build*",
+    "cmake-build-*",
+])

WORKSPACE

@@ -34,11 +34,9 @@ rules_buf_dependencies()
 
 rules_buf_toolchains(version = "v1.19.0")
 
-load("@com_google_cel_cpp//bazel:deps.bzl", "base_deps", "parser_deps")
+load("@com_google_cel_cpp//bazel:deps.bzl", "cel_cpp_deps")
 
-base_deps()
-
-parser_deps()
+cel_cpp_deps()
 
 load("@com_google_googleapis//:repository_rules.bzl", "switched_rules_by_language")
 
@@ -51,8 +49,14 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
 
-load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies", "rules_proto_toolchains")
+load("@rules_proto//proto:repositories.bzl", "rules_proto_dependencies")
 
 rules_proto_dependencies()
 
+load("@rules_proto//proto:toolchains.bzl", "rules_proto_toolchains")
+
 rules_proto_toolchains()
+
+load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies")
+
+go_rules_dependencies()

bazel/deps.bzl

@@ -61,10 +61,10 @@ _dependencies = {
         name="protobuf",
     ),
     "rules_proto": dict(
-        sha256="dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
-        strip_prefix="rules_proto-5.3.0-21.7",
+        sha256="14a225870ab4e91869652cfd69ef2028277fc1dc4910d65d353b62d6e0ae21f4",
+        strip_prefix="rules_proto-7.1.0",
         urls=[
-            "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz",
+            "https://github.com/bazelbuild/rules_proto/releases/download/7.1.0/rules_proto-7.1.0.tar.gz",
         ],
     ),
     "rules_buf": dict(
@@ -74,12 +74,35 @@ _dependencies = {
             "https://github.com/bufbuild/rules_buf/archive/refs/tags/v0.1.1.zip",
         ],
     ),
+    # cel-cpp v0.11.0 doesn't build correctly in WORKSPACE mode, this is a quick
+    # workaround.
+    "antlr4-cpp-runtime": dict(
+        build_file_content="""
+package(default_visibility = ["//visibility:public"])
+cc_library(
+    name = "antlr4-cpp-runtime",
+    srcs = glob(["runtime/Cpp/runtime/src/**/*.cpp"]),
+    hdrs = glob(["runtime/Cpp/runtime/src/**/*.h"]),
+    defines = ["ANTLR4CPP_USING_ABSEIL"],
+    includes = ["runtime/Cpp/runtime/src"],
+    deps = [
+        "@com_google_absl//absl/base",
+        "@com_google_absl//absl/base:core_headers",
+        "@com_google_absl//absl/container:flat_hash_map",
+        "@com_google_absl//absl/container:flat_hash_set",
+        "@com_google_absl//absl/synchronization",
+    ],
+)
+        """,
+        sha256="42d1268524a9c972f5ca1ad1633372ea02a812ff66c1e992925edea5e5cf9c81",
+        strip_prefix="antlr4-4.13.2",
+        urls=["https://github.com/antlr/antlr4/archive/refs/tags/4.13.2.zip"],
+    ),
     "com_google_cel_cpp": shared_dep(
         name="cel_cpp",
         patches=[
             "@com_github_bufbuild_protovalidate_cc//deps:patches/cel_cpp/0001-Allow-message-field-access-using-index-operator.patch",
             "@com_github_bufbuild_protovalidate_cc//deps:patches/cel_cpp/0002-Add-missing-include-for-absl-StrCat.patch",
-            "@com_github_bufbuild_protovalidate_cc//deps:patches/cel_cpp/0003-Remove-unnecessary-dependency-on-cel_proto_wrap_util.patch",
         ],
         patch_args=["-p1"],
     ),

buf/validate/internal/cel_constraint_rules.cc

@@ -96,8 +96,8 @@ absl::Status CelConstraintRules::Add(
   if (!pexpr_or.ok()) {
     return pexpr_or.status();
   }
-  cel::v1alpha1::ParsedExpr pexpr = std::move(pexpr_or).value();
-  auto expr_or = builder.CreateExpression(pexpr.mutable_expr(), pexpr.mutable_source_info());
+  ::cel::expr::ParsedExpr pexpr = std::move(pexpr_or).value();
+  auto expr_or = builder.CreateExpression(&pexpr.expr(), &pexpr.source_info());
   if (!expr_or.ok()) {
     return expr_or.status();
   }

buf/validate/internal/extra_func.cc

@@ -139,7 +139,7 @@ cel::CelValue endsWith(
 }
 
 bool IsHostname(std::string_view toValidate) {
-  if (toValidate.length() > 253) {
+  if (toValidate.empty() || toValidate.length() > 253) {
     return false;
   }
   toValidate = absl::StripSuffix(toValidate, ".");

buf/validate/validator_test.cc

@@ -45,7 +45,7 @@ TEST(ValidatorTest, ParseAndEval) {
   std::string input = "1 + 2";
   auto pexpr_or = cel::parser::Parse(input);
   EXPECT_TRUE(pexpr_or.ok());
-  cel::v1alpha1::ParsedExpr pexpr = std::move(pexpr_or).value();
+  ::cel::expr::ParsedExpr pexpr = std::move(pexpr_or).value();
   cel::runtime::Activation activation;
 
   cel::runtime::InterpreterOptions options;

cmake/Deps.cmake

@@ -84,17 +84,6 @@ if(CEL_CPP_ENABLE_TESTS)
             endif()
         endif()
     endif()
-
-    # Fetch CEL spec repository (needed for test protos)
-    # When building in a hermetic environment, use the
-    # FETCHCONTENT_SOURCE_DIR_CEL_SPEC option to avoid the external fetch.
-    # https://cmake.org/cmake/help/latest/module/FetchContent.html#variable:FETCHCONTENT_SOURCE_DIR_%3CuppercaseName%3E
-    FetchContent_Declare(
-        cel_spec
-        GIT_REPOSITORY https://github.com/google/cel-spec.git
-        GIT_TAG f027a86d2e5bf18f796be0c4373f637a61041cde
-    )
-    FetchContent_MakeAvailable(cel_spec)
 endif()
 
 # Abseil
@@ -268,6 +257,17 @@ FetchContent_Declare(
 )
 FetchContent_MakeAvailable(googleapis)
 
+# Fetch CEL spec repository
+# When building in a hermetic environment, use the
+# FETCHCONTENT_SOURCE_DIR_CEL_SPEC option to avoid the external fetch.
+# https://cmake.org/cmake/help/latest/module/FetchContent.html#variable:FETCHCONTENT_SOURCE_DIR_%3CuppercaseName%3E
+FetchContent_Declare(
+    cel_spec
+    GIT_REPOSITORY https://github.com/google/cel-spec.git
+    GIT_TAG f027a86d2e5bf18f796be0c4373f637a61041cde
+)
+FetchContent_MakeAvailable(cel_spec)
+
 # Cel-cpp; Note that cel-cpp has no CMake build and is not packaged anywhere,
 # so it is always vendored. When building in a hermetic environment, use the
 # FETCHCONTENT_SOURCE_DIR_CEL_CPP option to avoid the external fetch.
@@ -277,8 +277,7 @@ SharedDeps_GetSourceValue(PROTOVALIDATE_CC_CEL_CPP_SHA256 "cel_cpp" "sha256" "${
 set(CEL_CPP_PATCHES
     ${CMAKE_CURRENT_SOURCE_DIR}/deps/patches/cel_cpp/0001-Allow-message-field-access-using-index-operator.patch
     ${CMAKE_CURRENT_SOURCE_DIR}/deps/patches/cel_cpp/0002-Add-missing-include-for-absl-StrCat.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/deps/patches/cel_cpp/0003-Remove-unnecessary-dependency-on-cel_proto_wrap_util.patch
-    ${CMAKE_CURRENT_SOURCE_DIR}/deps/patches/cel_cpp/0004-Fix-build-on-Windows-MSVC.patch
+    ${CMAKE_CURRENT_SOURCE_DIR}/deps/patches/cel_cpp/0003-Fix-build-on-Windows-MSVC.patch
 )
 MakePatchCommand(CEL_CPP_PATCH_COMMAND "${CEL_CPP_PATCHES}")
 message(STATUS "protovalidate-cc: Fetching cel-cpp")

cmake/cel-cpp/CMakeLists.txt

@@ -67,6 +67,72 @@ protobuf_generate(
 )
 add_library(cel_cpp::googleapis_proto ALIAS cel_googleapis_proto)
 
+# Generate C++ code for cel spec protos
+set(CEL_SPEC_PROTO_GEN_DIR ${CMAKE_CURRENT_BINARY_DIR}/gen/proto_cc_cel_spec)
+file(MAKE_DIRECTORY ${CEL_SPEC_PROTO_GEN_DIR}/proto)
+set(CEL_SPEC_PROTO
+    test/v1/proto2/test_all_types.proto
+    test/v1/proto3/test_all_types.proto
+    cel/expr/checked.proto
+    cel/expr/eval.proto
+    cel/expr/explain.proto
+    cel/expr/syntax.proto
+    cel/expr/value.proto
+)
+set(CEL_SPEC_PROTO_DIR ${cel_spec_SOURCE_DIR}/proto)
+list(TRANSFORM CEL_SPEC_PROTO PREPEND ${CEL_SPEC_PROTO_DIR}/)
+add_library(cel_cpp_spec_proto OBJECT ${CEL_SPEC_PROTO})
+target_include_directories(cel_cpp_spec_proto
+    PUBLIC ${CEL_SPEC_PROTO_GEN_DIR}/proto
+)
+target_link_libraries(cel_cpp_spec_proto PUBLIC protobuf::libprotobuf cel_cpp::googleapis_proto)
+protobuf_generate(
+    TARGET cel_cpp_spec_proto
+    LANGUAGE cpp
+    PROTOC_OUT_DIR ${CEL_SPEC_PROTO_GEN_DIR}/proto
+    IMPORT_DIRS ${CEL_SPEC_PROTO_DIR}
+                ${PROTOBUF_IMPORT_PATH}
+                ${CEL_CPP_GOOGLEAPIS_PROTO_DIR}
+    DEPENDENCIES cel_cpp::googleapis_proto
+)
+add_library(cel_cpp::spec_proto ALIAS cel_cpp_spec_proto)
+
+# Generate empty descriptor set
+set(CEL_CPP_EMPTY_DESCRIPTOR_SET_PATH ${CMAKE_CURRENT_BINARY_DIR}/empty_descriptor_set.pb)
+set(CEL_CPP_EMPTY_DESCRIPTOR_SET_PROTO google/protobuf/empty.proto)
+list(TRANSFORM CEL_CPP_EMPTY_DESCRIPTOR_SET_PROTO PREPEND ${PROTOBUF_IMPORT_PATH}/)
+add_custom_command(
+    OUTPUT ${CEL_CPP_EMPTY_DESCRIPTOR_SET_PATH}
+    COMMAND ${PROTOC_EXECUTABLE}
+            --include_imports
+            --descriptor_set_out=${CEL_CPP_EMPTY_DESCRIPTOR_SET_PATH}
+            -I${PROTOBUF_IMPORT_PATH}
+            ${CEL_CPP_EMPTY_DESCRIPTOR_SET_PROTO}
+    DEPENDS ${CEL_CPP_EMPTY_DESCRIPTOR_SET_PROTO}
+    COMMENT "Generating empty descriptor set"
+    VERBATIM
+)
+set(CEL_CPP_EMPTY_DESCRIPTOR_SET_GEN_DIR ${CMAKE_CURRENT_BINARY_DIR}/gen/empty_descriptor_set)
+file(MAKE_DIRECTORY ${CEL_CPP_EMPTY_DESCRIPTOR_SET_GEN_DIR}/internal)
+set(CEL_CPP_EMPTY_DESCRIPTOR_SET_EMBED_PATH ${CEL_CPP_EMPTY_DESCRIPTOR_SET_GEN_DIR}/internal/empty_descriptor_set_embed.inc)
+add_custom_command(
+    OUTPUT ${CEL_CPP_EMPTY_DESCRIPTOR_SET_EMBED_PATH}
+    COMMAND $<TARGET_FILE:cel_cpp::embed>
+            --in=${CEL_CPP_EMPTY_DESCRIPTOR_SET_PATH}
+            --out=${CEL_CPP_EMPTY_DESCRIPTOR_SET_EMBED_PATH}
+    DEPENDS ${CEL_CPP_EMPTY_DESCRIPTOR_SET_PATH}
+            cel_cpp::embed
+    COMMENT "Embedding empty descriptor set"
+    VERBATIM
+)
+add_custom_target(cel_cpp_empty_descriptor_set_gen DEPENDS ${CEL_CPP_EMPTY_DESCRIPTOR_SET_EMBED_PATH})
+add_library(cel_cpp_empty_descriptor_set INTERFACE)
+add_dependencies(cel_cpp_empty_descriptor_set cel_cpp_empty_descriptor_set_gen)
+target_include_directories(cel_cpp_empty_descriptor_set INTERFACE
+    $<BUILD_INTERFACE:${CEL_CPP_EMPTY_DESCRIPTOR_SET_GEN_DIR}>
+)
+add_library(cel_cpp::empty_descriptor_set ALIAS cel_cpp_empty_descriptor_set)
+
 # Generate embedded descriptor set
 set(CEL_CPP_MINIMAL_DESCRIPTOR_SET_PATH ${CMAKE_CURRENT_BINARY_DIR}/minimal_descriptor_set.pb)
 set(CEL_CPP_MINIMAL_DESCRIPTOR_SET_PROTO
@@ -117,6 +183,7 @@ file(GLOB CEL_CPP_CORE_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
     checker/*.cc
     checker/internal/*.cc
     common/*.cc
+    common/ast/*.cc
     common/internal/*.cc
     common/types/*.cc
     common/values/*.cc
@@ -159,6 +226,7 @@ list(REMOVE_ITEM CEL_CPP_CORE_SOURCES ${CEL_CPP_TESTING_SOURCES})
 set(CEL_CPP_TEST_SOURCES ${CEL_CPP_CORE_SOURCES})
 list(FILTER CEL_CPP_TEST_SOURCES INCLUDE REGEX ".*_test\\.cc$")
 list(FILTER CEL_CPP_CORE_SOURCES EXCLUDE REGEX ".*_test\\.cc$")
+list(FILTER CEL_CPP_CORE_SOURCES EXCLUDE REGEX ".*_benchmarks\\.cc$")
 
 # Remove some tests that don't seem to work right.
 list(REMOVE_ITEM CEL_CPP_TEST_SOURCES
@@ -208,8 +276,10 @@ list(REMOVE_ITEM CEL_CPP_TEST_SOURCES
 add_library(cel_cpp STATIC ${CEL_CPP_CORE_SOURCES} ${CEL_CPP_MINIMAL_DESCRIPTOR_SET_EMBED_PATH})
 target_link_libraries(cel_cpp PUBLIC
     cel_cpp::parser
+    cel_cpp::empty_descriptor_set
     cel_cpp::minimal_descriptor_set
     cel_cpp::googleapis_proto
+    cel_cpp::spec_proto
     absl::base
     protobuf::libprotobuf
     re2::re2
@@ -224,37 +294,6 @@ add_library(cel_cpp::cel_cpp ALIAS cel_cpp)
 if(CEL_CPP_ENABLE_TESTS)
     enable_testing()
 
-    # Generate C++ code for cel spec protos
-    set(CEL_SPEC_PROTO_GEN_DIR ${CMAKE_CURRENT_BINARY_DIR}/gen/proto_cc_cel_spec)
-    file(MAKE_DIRECTORY ${CEL_SPEC_PROTO_GEN_DIR}/proto)
-    set(CEL_SPEC_PROTO
-        test/v1/proto2/test_all_types.proto
-        test/v1/proto3/test_all_types.proto
-        cel/expr/checked.proto
-        cel/expr/eval.proto
-        cel/expr/explain.proto
-        cel/expr/syntax.proto
-        cel/expr/value.proto
-    )
-    set(CEL_SPEC_PROTO_DIR ${cel_spec_SOURCE_DIR}/proto)
-    list(TRANSFORM CEL_SPEC_PROTO PREPEND ${CEL_SPEC_PROTO_DIR}/)
-    add_library(cel_cpp_spec_proto OBJECT ${CEL_SPEC_PROTO})
-    target_include_directories(cel_cpp_spec_proto
-        PUBLIC ${CEL_SPEC_PROTO_GEN_DIR}
-        PRIVATE ${CEL_SPEC_PROTO_GEN_DIR}/proto
-    )
-    target_link_libraries(cel_cpp_spec_proto PUBLIC protobuf::libprotobuf cel_cpp::googleapis_proto)
-    protobuf_generate(
-        TARGET cel_cpp_spec_proto
-        LANGUAGE cpp
-        PROTOC_OUT_DIR ${CEL_SPEC_PROTO_GEN_DIR}/proto
-        IMPORT_DIRS ${CEL_SPEC_PROTO_DIR}
-                    ${PROTOBUF_IMPORT_PATH}
-                    ${CEL_CPP_GOOGLEAPIS_PROTO_DIR}
-        DEPENDENCIES cel_cpp::googleapis_proto
-    )
-    add_library(cel_cpp::spec_proto ALIAS cel_cpp_spec_proto)
-
     # Generate C++ code for cel-cpp test protos
     set(CEL_CPP_TEST_PROTO_GEN_DIR ${CMAKE_CURRENT_BINARY_DIR}/gen/proto_cc_cel_cpp_test)
     file(MAKE_DIRECTORY ${CEL_CPP_TEST_PROTO_GEN_DIR})