Implement codegen for CelLiteDescriptor

WORKSPACE

@@ -242,11 +242,11 @@ http_archive(
 )
 
 # cel-spec api/expr canonical protos
-CEL_SPEC_VERSION = "0.20.0"
+CEL_SPEC_VERSION = "0.23.1"
 
 http_archive(
     name = "cel_spec",
-    sha256 = "9f4acb83116f68af8a6b6acf700561a22a1bd8a9ad2f49bf642b7f9b8f285043",
+    sha256 = "8bafa44e610eb281df8b1268a42b5e2d7b76d60d0b3c817835cfcfd14cc2bc9c",
     strip_prefix = "cel-spec-" + CEL_SPEC_VERSION,
     urls = [
         "https://github.com/google/cel-spec/archive/" +

bundle/src/test/java/dev/cel/bundle/BUILD.bazel

@@ -59,6 +59,7 @@ java_library(
         "@maven//:com_google_truth_extensions_truth_proto_extension",
         "@maven//:junit_junit",
         "@maven//:org_jspecify_jspecify",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

codelab/src/main/codelab/BUILD.bazel

@@ -39,5 +39,6 @@ java_library(
         "@maven//:com_google_guava_guava",  # unuseddeps: keep
         "@maven//:com_google_protobuf_protobuf_java",  # unuseddeps: keep
         "@maven//:com_google_protobuf_protobuf_java_util",  # unuseddeps: keep
+        "@maven_android//:com_google_protobuf_protobuf_javalite",  # unuseddeps: keep
     ],
 )

codelab/src/main/codelab/solutions/BUILD.bazel

@@ -40,5 +40,6 @@ java_library(
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )

common/internal/BUILD.bazel

@@ -97,3 +97,8 @@ cel_android_library(
     name = "internal_android",
     exports = ["//common/src/main/java/dev/cel/common/internal:internal_android"],
 )
+
+java_library(
+    name = "proto_java_qualified_names",
+    exports = ["//common/src/main/java/dev/cel/common/internal:proto_java_qualified_names"],
+)

common/src/main/java/dev/cel/common/BUILD.bazel

@@ -208,6 +208,7 @@ java_library(
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

common/src/main/java/dev/cel/common/ast/BUILD.bazel

@@ -53,6 +53,7 @@ java_library(
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -114,7 +115,7 @@ java_library(
         ":ast",
         "//common/annotations",
         "@maven//:com_google_guava_guava",
-        "@maven//:com_google_protobuf_protobuf_java",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -138,7 +139,6 @@ cel_android_library(
         "//:auto_value",
         "//common/annotations",
         "@maven//:com_google_errorprone_error_prone_annotations",
-        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
         "@maven_android//:com_google_guava_guava",
         "@maven_android//:com_google_protobuf_protobuf_javalite",

common/src/main/java/dev/cel/common/internal/BUILD.bazel

@@ -47,6 +47,7 @@ java_library(
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_antlr_antlr4_runtime",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -61,7 +62,6 @@ cel_android_library(
         "//common/ast:ast_android",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
-        "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_antlr_antlr4_runtime",
         "@maven_android//:com_google_guava_guava",
         "@maven_android//:com_google_protobuf_protobuf_javalite",
@@ -140,6 +140,7 @@ java_library(
         ":proto_java_qualified_names",
         "//common/annotations",
         "@maven//:com_google_protobuf_protobuf_java",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -152,7 +153,7 @@ java_library(
         ":reflection_util",
         "//common/annotations",
         "@maven//:com_google_guava_guava",
-        "@maven//:com_google_protobuf_protobuf_java",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -174,6 +175,7 @@ java_library(
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -191,6 +193,7 @@ java_library(
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -207,6 +210,7 @@ java_library(
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:org_jspecify_jspecify",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -245,7 +249,6 @@ java_library(
         "//common/annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
-        "@maven//:org_jspecify_jspecify",
     ],
 )
 
@@ -309,6 +312,7 @@ java_library(
     tags = [
     ],
     deps = [
+        "//common/annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
     ],

common/src/main/java/dev/cel/common/internal/ProtoJavaQualifiedNames.java

@@ -24,10 +24,16 @@
 import com.google.protobuf.Descriptors.FileDescriptor;
 import com.google.protobuf.Descriptors.GenericDescriptor;
 import com.google.protobuf.Descriptors.ServiceDescriptor;
+import dev.cel.common.annotations.Internal;
 import java.util.ArrayDeque;
 
-/** Helper class for constructing a fully qualified Java class name from a protobuf descriptor. */
-final class ProtoJavaQualifiedNames {
+/**
+ * Helper class for constructing a fully qualified Java class name from a protobuf descriptor. * *
+ *
+ * <p>CEL Library Internals. Do Not Use.
+ */
+@Internal
+public final class ProtoJavaQualifiedNames {
   // Controls how many times we should recursively inspect a nested message for building fully
   // qualified java class name before aborting.
   private static final int SAFE_RECURSE_LIMIT = 50;

common/src/main/java/dev/cel/common/values/BUILD.bazel

@@ -121,6 +121,7 @@ java_library(
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_protobuf_protobuf_java_util",
         "@maven//:org_jspecify_jspecify",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

common/src/test/java/dev/cel/common/BUILD.bazel

@@ -39,6 +39,7 @@ java_library(
         "@maven//:com_google_truth_extensions_truth_proto_extension",
         "@maven//:junit_junit",
         "@maven//:org_antlr_antlr4_runtime",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

common/src/test/java/dev/cel/common/ast/BUILD.bazel

@@ -38,6 +38,7 @@ java_library(
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:junit_junit",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

common/src/test/java/dev/cel/common/internal/BUILD.bazel

@@ -40,6 +40,7 @@ java_library(
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:junit_junit",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

common/src/test/java/dev/cel/common/values/BUILD.bazel

@@ -33,6 +33,7 @@ java_library(
         "@maven//:com_google_protobuf_protobuf_java_util",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:junit_junit",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

compiler/src/test/java/dev/cel/compiler/tools/BUILD.bazel

@@ -67,6 +67,7 @@ java_library(
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
         "@maven//:junit_junit",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

extensions/src/main/java/dev/cel/extensions/BUILD.bazel

@@ -110,7 +110,7 @@ java_library(
         "//runtime:function_binding",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
-        "@maven//:com_google_protobuf_protobuf_java",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 
@@ -132,6 +132,7 @@ java_library(
         "//runtime:function_binding",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

extensions/src/test/java/dev/cel/extensions/BUILD.bazel

@@ -33,6 +33,7 @@ java_library(
         "@maven//:com_google_protobuf_protobuf_java_util",
         "@maven//:com_google_testparameterinjector_test_parameter_injector",
         "@maven//:junit_junit",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
     ],
 )
 

java_lite_proto_cel_library.bzl

@@ -0,0 +1,45 @@
+# 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.
+
+"""Starlark rule for generating descriptors that is compatible with Protolite Messages."""
+
+load("//:java_lite_proto_cel_library_impl.bzl", "java_lite_proto_cel_library_impl")
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+
+def java_lite_proto_cel_library(
+        name,
+        java_descriptor_class_name,
+        proto_src,
+        debug = False):
+    """Generates a CelLiteDescriptor
+
+    Args:
+       name: name of this target.
+       java_descriptor_class_name: Name of the generated descriptor java class.
+       proto_src: Name of the proto_library target.
+       debug: (optional) If true, prints additional information during codegen for debugging purposes.
+    """
+    java_proto_library_dep = name + "_java_lite_proto_dep"
+    java_lite_proto_library(
+        name = java_proto_library_dep,
+        deps = [proto_src],
+    )
+
+    java_lite_proto_cel_library_impl(
+        name,
+        java_descriptor_class_name,
+        proto_src,
+        java_proto_library_dep,
+        debug,
+    )

java_lite_proto_cel_library_impl.bzl

@@ -0,0 +1,110 @@
+# 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.
+
+"""
+Starlark rule for generating descriptors that is compatible with Protolite Messages.
+This is an implementation detail. Clients should use 'java_lite_proto_cel_library' instead.
+"""
+
+load("@rules_java//java:defs.bzl", "java_library")
+load("@rules_proto//proto:defs.bzl", "proto_descriptor_set")
+load("//publish:cel_version.bzl", "CEL_VERSION")
+load("@com_google_protobuf//bazel:java_lite_proto_library.bzl", "java_lite_proto_library")
+
+def java_lite_proto_cel_library_impl(
+        name,
+        java_descriptor_class_name,
+        proto_src,
+        java_proto_library_dep,
+        debug = False):
+    """Generates a CelLiteDescriptor
+
+    Args:
+       name: name of this target.
+       java_descriptor_class_name: Name of the generated descriptor java class.
+       proto_src: Name of the proto_library target.
+       java_proto_library_dep: (optional) Uses the provided java_lite_proto_library or java_proto_library to generate the lite descriptors. If none is provided, java_lite_proto_library is used by default behind the scenes. Most use cases should not need to provide this.
+       debug: (optional) If true, prints additional information during codegen for debugging purposes.
+    """
+    if not name:
+        fail("You must provide a name.")
+
+    if not java_descriptor_class_name:
+        fail("You must provide a descriptor_class_prefix.")
+
+    if not proto_src:
+        fail("You must provide a proto_library dependency.")
+
+    _generate_cel_lite_descriptor_class(
+        name,
+        java_descriptor_class_name,
+        proto_src,
+        debug,
+    )
+
+    if not java_proto_library_dep:
+        java_proto_library_dep = name + "_java_lite_proto_dep"
+        java_lite_proto_library(
+            name = java_proto_library_dep,
+            deps = [proto_src],
+        )
+
+    descriptor_codegen_deps = [
+        "//protobuf:cel_lite_descriptor",
+        java_proto_library_dep,
+    ]
+
+    java_library(
+        name = name,
+        srcs = [":" + name + "_cel_lite_descriptor"],
+        deps = descriptor_codegen_deps,
+    )
+
+def _generate_cel_lite_descriptor_class(
+        name,
+        descriptor_class_name,
+        proto_src,
+        debug):
+    outfile = "%s.java" % descriptor_class_name
+
+    transitive_descriptor_set_name = "%s_transitive_descriptor_set" % name
+    proto_descriptor_set(
+        name = transitive_descriptor_set_name,
+        deps = [proto_src],
+    )
+
+    direct_descriptor_set_name = proto_src
+
+    debug_flag = "--debug" if debug else ""
+
+    cmd = (
+        "$(location //protobuf:cel_lite_descriptor_generator) " +
+        "--descriptor $(location %s) " % direct_descriptor_set_name +
+        "--transitive_descriptor_set $(location %s) " % transitive_descriptor_set_name +
+        "--descriptor_class_name %s " % descriptor_class_name +
+        "--out $(location %s) " % outfile +
+        "--version %s " % CEL_VERSION +
+        debug_flag
+    )
+
+    native.genrule(
+        name = name + "_cel_lite_descriptor",
+        srcs = [
+            transitive_descriptor_set_name,
+            direct_descriptor_set_name,
+        ],
+        cmd = cmd,
+        outs = [outfile],
+        tools = ["//protobuf:cel_lite_descriptor_generator"],
+    )