Add ComprehensionsV2CompilerLibrary and BindingsCompilerLibrary

checker/standard_library.cc

@@ -842,17 +842,6 @@ absl::Status AddEnumConstants(TypeCheckerBuilder& builder) {
   return absl::OkStatus();
 }
 
-absl::Status AddComprehensionsV2Functions(TypeCheckerBuilder& builder) {
-  FunctionDecl map_insert;
-  map_insert.set_name("@cel.mapInsert");
-  CEL_RETURN_IF_ERROR(map_insert.AddOverload(
-      MakeOverloadDecl("@mapInsert_map_key_value", MapOfAB(), MapOfAB(),
-                       TypeParamA(), TypeParamB())));
-  CEL_RETURN_IF_ERROR(map_insert.AddOverload(
-      MakeOverloadDecl("@mapInsert_map_map", MapOfAB(), MapOfAB(), MapOfAB())));
-  return builder.AddFunction(map_insert);
-}
-
 absl::Status AddStandardLibraryDecls(TypeCheckerBuilder& builder) {
   CEL_RETURN_IF_ERROR(AddLogicalOps(builder));
   CEL_RETURN_IF_ERROR(AddArithmeticOps(builder));
@@ -865,7 +854,6 @@ absl::Status AddStandardLibraryDecls(TypeCheckerBuilder& builder) {
   CEL_RETURN_IF_ERROR(AddTimeFunctions(builder));
   CEL_RETURN_IF_ERROR(AddTypeConstantVariables(builder));
   CEL_RETURN_IF_ERROR(AddEnumConstants(builder));
-  CEL_RETURN_IF_ERROR(AddComprehensionsV2Functions(builder));
   return absl::OkStatus();
 }
 

extensions/BUILD

@@ -207,10 +207,13 @@ cc_library(
     hdrs = ["bindings_ext.h"],
     deps = [
         "//common:ast",
+        "//compiler",
+        "//internal:status_macros",
         "//parser:macro",
         "//parser:macro_expr_factory",
         "//parser:macro_registry",
         "//parser:options",
+        "//parser:parser_interface",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:statusor",
         "@com_google_absl//absl/types:optional",
@@ -572,52 +575,20 @@ cc_library(
     ],
 )
 
-cc_test(
-    name = "comprehensions_v2_functions_test",
-    srcs = ["comprehensions_v2_functions_test.cc"],
-    deps = [
-        ":bindings_ext",
-        ":comprehensions_v2_functions",
-        ":comprehensions_v2_macros",
-        ":strings",
-        "//common:source",
-        "//common:value",
-        "//common:value_testing",
-        "//extensions/protobuf:runtime_adapter",
-        "//internal:status_macros",
-        "//internal:testing",
-        "//internal:testing_descriptor_pool",
-        "//parser",
-        "//parser:macro_registry",
-        "//parser:options",
-        "//parser:standard_macros",
-        "//runtime",
-        "//runtime:activation",
-        "//runtime:optional_types",
-        "//runtime:reference_resolver",
-        "//runtime:runtime_options",
-        "//runtime:standard_runtime_builder_factory",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:status_matchers",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings:string_view",
-        "@com_google_cel_spec//proto/cel/expr:syntax_cc_proto",
-        "@com_google_protobuf//:protobuf",
-    ],
-)
-
 cc_library(
     name = "comprehensions_v2_macros",
     srcs = ["comprehensions_v2_macros.cc"],
     hdrs = ["comprehensions_v2_macros.h"],
     deps = [
         "//common:expr",
         "//common:operators",
+        "//compiler",
         "//internal:status_macros",
         "//parser:macro",
         "//parser:macro_expr_factory",
         "//parser:macro_registry",
         "//parser:options",
+        "//parser:parser_interface",
         "@com_google_absl//absl/base:no_destructor",
         "@com_google_absl//absl/log:absl_check",
         "@com_google_absl//absl/status",
@@ -627,18 +598,53 @@ cc_library(
     ],
 )
 
-cc_test(
-    name = "comprehensions_v2_macros_test",
-    srcs = ["comprehensions_v2_macros_test.cc"],
+cc_library(
+    name = "comprehensions_v2",
+    srcs = ["comprehensions_v2.cc"],
+    hdrs = ["comprehensions_v2.h"],
     deps = [
+        ":comprehensions_v2_functions",
         ":comprehensions_v2_macros",
-        "//common:source",
-        "//internal:testing",
-        "//parser",
+        "//checker:type_checker_builder",
+        "//checker/internal:builtins_arena",
+        "//common:decl",
+        "//common:type",
+        "//compiler",
+        "//internal:status_macros",
         "//parser:macro_registry",
         "//parser:options",
+        "//parser:parser_interface",
+        "@com_google_absl//absl/base:no_destructor",
+        "@com_google_absl//absl/status",
+    ],
+)
+
+cc_test(
+    name = "comprehensions_v2_test",
+    srcs = ["comprehensions_v2_test.cc"],
+    deps = [
+        ":bindings_ext",
+        ":comprehensions_v2",
+        ":comprehensions_v2_functions",
+        ":strings",
+        "//checker:standard_library",
+        "//checker:validation_result",
+        "//common:value",
+        "//common:value_testing",
+        "//compiler:compiler_factory",
+        "//compiler:optional",
+        "//internal:status_macros",
+        "//internal:testing",
+        "//internal:testing_descriptor_pool",
+        "//runtime",
+        "//runtime:activation",
+        "//runtime:optional_types",
+        "//runtime:runtime_options",
+        "//runtime:standard_runtime_builder_factory",
         "@com_google_absl//absl/status",
         "@com_google_absl//absl/status:status_matchers",
+        "@com_google_absl//absl/status:statusor",
+        "@com_google_protobuf//:protobuf",
     ],
 )
 

extensions/bindings_ext.cc

@@ -17,12 +17,16 @@
 #include <utility>
 #include <vector>
 
+#include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/types/optional.h"
 #include "absl/types/span.h"
 #include "common/ast.h"
+#include "compiler/compiler.h"
+#include "internal/status_macros.h"
 #include "parser/macro.h"
 #include "parser/macro_expr_factory.h"
+#include "parser/parser_interface.h"
 
 namespace cel::extensions {
 
@@ -36,6 +40,13 @@ bool IsTargetNamespace(const Expr& target) {
   return target.has_ident_expr() && target.ident_expr().name() == kCelNamespace;
 }
 
+inline absl::Status ConfigureParser(ParserBuilder& parser_builder) {
+  for (const Macro& macro : bindings_macros()) {
+    CEL_RETURN_IF_ERROR(parser_builder.AddMacro(macro));
+  }
+  return absl::OkStatus();
+}
+
 }  // namespace
 
 std::vector<Macro> bindings_macros() {
@@ -59,4 +70,8 @@ std::vector<Macro> bindings_macros() {
   return {*cel_bind};
 }
 
+CompilerLibrary BindingsCompilerLibrary() {
+  return CompilerLibrary("cel.lib.ext.bindings", &ConfigureParser);
+}
+
 }  // namespace cel::extensions

extensions/bindings_ext.h

@@ -18,6 +18,7 @@
 #include <vector>
 
 #include "absl/status/status.h"
+#include "compiler/compiler.h"
 #include "parser/macro.h"
 #include "parser/macro_registry.h"
 #include "parser/options.h"
@@ -33,6 +34,9 @@ inline absl::Status RegisterBindingsMacros(MacroRegistry& registry,
   return registry.RegisterMacros(bindings_macros());
 }
 
+// Declarations for the bindings extension library.
+CompilerLibrary BindingsCompilerLibrary();
+
 }  // namespace cel::extensions
 
 #endif  // THIRD_PARTY_CEL_CPP_EXTENSIONS_BINDINGS_EXT_H_

extensions/comprehensions_v2.cc

@@ -0,0 +1,68 @@
+// Copyright 2025 Google LLC
+//
+// 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
+//
+//     https://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.
+
+#include "extensions/comprehensions_v2.h"
+
+#include "absl/base/no_destructor.h"
+#include "absl/status/status.h"
+#include "checker/internal/builtins_arena.h"
+#include "checker/type_checker_builder.h"
+#include "common/decl.h"
+#include "common/type.h"
+#include "compiler/compiler.h"
+#include "extensions/comprehensions_v2_macros.h"
+#include "internal/status_macros.h"
+#include "parser/parser_interface.h"
+
+using ::cel::checker_internal::BuiltinsArena;
+
+namespace cel::extensions {
+
+namespace {
+
+// Arbitrary type parameter name A.
+TypeParamType TypeParamA() { return TypeParamType("A"); }
+
+// Arbitrary type parameter name B.
+TypeParamType TypeParamB() { return TypeParamType("B"); }
+
+Type MapOfAB() {
+  static absl::NoDestructor<Type> kInstance(
+      MapType(BuiltinsArena(), TypeParamA(), TypeParamB()));
+  return *kInstance;
+}
+
+absl::Status AddComprehensionsV2Functions(TypeCheckerBuilder& builder) {
+  FunctionDecl map_insert;
+  map_insert.set_name("cel.@mapInsert");
+  CEL_RETURN_IF_ERROR(map_insert.AddOverload(
+      MakeOverloadDecl("@mapInsert_map_key_value", MapOfAB(), MapOfAB(),
+                       TypeParamA(), TypeParamB())));
+  CEL_RETURN_IF_ERROR(map_insert.AddOverload(
+      MakeOverloadDecl("@mapInsert_map_map", MapOfAB(), MapOfAB(), MapOfAB())));
+  return builder.AddFunction(map_insert);
+}
+
+absl::Status ConfigureParser(ParserBuilder& parser_builder) {
+  return RegisterComprehensionsV2Macros(parser_builder);
+}
+
+}  // namespace
+
+CompilerLibrary ComprehensionsV2CompilerLibrary() {
+  return CompilerLibrary("cel.lib.ext.comprev2", &ConfigureParser,
+                         &AddComprehensionsV2Functions);
+}
+
+}  // namespace cel::extensions

extensions/comprehensions_v2.h

@@ -0,0 +1,35 @@
+// Copyright 2025 Google LLC
+//
+// 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
+//
+//     https://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.
+
+#ifndef THIRD_PARTY_CEL_CPP_EXTENSIONS_COMPREHENSIONS_V2_H_
+#define THIRD_PARTY_CEL_CPP_EXTENSIONS_COMPREHENSIONS_V2_H_
+
+#include "absl/status/status.h"
+#include "compiler/compiler.h"
+#include "extensions/comprehensions_v2_functions.h"  // IWYU pragma: export
+#include "parser/macro_registry.h"
+#include "parser/options.h"
+
+namespace cel::extensions {
+
+// Registers the macros defined by the comprehension v2 extension.
+absl::Status RegisterComprehensionsV2Macros(MacroRegistry& registry,
+                                            const ParserOptions& options);
+
+// Declarations for the comprehensions v2 extension library.
+CompilerLibrary ComprehensionsV2CompilerLibrary();
+
+}  // namespace cel::extensions
+
+#endif  // THIRD_PARTY_CEL_CPP_EXTENSIONS_COMPREHENSIONS_V2_H_