Split CelOptionalLibrary into CelOptionalCompilerLibrary and CelOptionalRuntimeLibrary to allow its usage in Lite runtime.

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

@@ -39,6 +39,7 @@ java_library(
         "//extensions:lists_runtime_library",
         "//extensions:math_runtime_library",
         "//extensions:optional_library",
+        "//extensions:optional_runtime_library",
         "//extensions:sets_runtime_library",
         "//extensions:strings_runtime_library",
         "//optimizer",
@@ -273,11 +274,7 @@ _TESTS_TO_SKIP_PLANNER_SELECT_OPT = _TESTS_TO_SKIP_PLANNER + [
     "optionals",
 ]
 
-_TESTS_TO_SKIP_LITE_SELECT_OPT = _TESTS_TO_SKIP_PLANNER + [
-    # Optionals are not supported in CelLiteRuntime.
-    "optionals",
-    "block_ext/basic/optional_list,optional_map,optional_map_chained,optional_message",
-
+_TESTS_TO_SKIP_LITE_BASE = _TESTS_TO_SKIP_PLANNER + [
     # Proto2 extensions are not supported in CelLiteRuntime.
     "proto2_ext",
     "proto2/extensions_has",
@@ -291,6 +288,7 @@ _TESTS_TO_SKIP_LITE_SELECT_OPT = _TESTS_TO_SKIP_PLANNER + [
 
     # TODO: Message creation with prepopulated fields is not yet supported in
     # CelLiteRuntime.
+    "block_ext/basic/optional_message",
     "comparisons/eq_wrapper/eq_bool,eq_bytes,eq_double,eq_float,eq_int32,eq_int64,eq_string,eq_uint32,eq_uint64",
     "comparisons/eq_wrapper/eq_proto2,eq_proto3,eq_proto2_missing_fields_neq,eq_proto3_missing_fields_neq,eq_proto_nan_equal",
     "comparisons/eq_wrapper/eq_proto2_any_unpack_equal,eq_proto2_any_unpack_not_equal,eq_proto2_any_unpack_bytewise_fallback_not_equal,eq_proto2_any_unpack_bytewise_fallback_equal,eq_proto3_any_unpack_equal,eq_proto3_any_unpack_not_equal,eq_proto3_any_unpack_bytewise_fallback_not_equal,eq_proto3_any_unpack_bytewise_fallback_equal",
@@ -317,6 +315,7 @@ _TESTS_TO_SKIP_LITE_SELECT_OPT = _TESTS_TO_SKIP_PLANNER + [
     "dynamic/complex",
     "enums/legacy_proto2/assign_standalone_name,assign_standalone_int,assign_standalone_int_too_big,assign_standalone_int_too_neg,assign_repeated_enum,list_enum_as_list_int,enum_as_int",
     "enums/legacy_proto3/assign_standalone_name,assign_standalone_int,assign_standalone_int_big,assign_standalone_int_neg,assign_standalone_int_too_big,assign_standalone_int_too_neg,assign_repeated_enum,list_enum_as_list_int,enum_as_int",
+    "optionals/optionals/struct_map_optindex_field,struct_map_optindex_field_nested,struct_list_optindex_field,struct_optindex_value,optional_struct_optindex_value,optional_struct_optindex_index_value",
     "parse/nest/message_literal",
     "parse/repeat/message_literal",
     "parse/whitespace",
@@ -337,7 +336,13 @@ _TESTS_TO_SKIP_LITE_SELECT_OPT = _TESTS_TO_SKIP_PLANNER + [
     "wrappers",
 ]
 
-_TESTS_TO_SKIP_LITE = _TESTS_TO_SKIP_LITE_SELECT_OPT + [
+_TESTS_TO_SKIP_LITE_SELECT_OPT = _TESTS_TO_SKIP_LITE_BASE + [
+    # TODO: Optional field selection on proto messages is not yet supported by
+    # SelectOptimizer.
+    "optionals",
+]
+
+_TESTS_TO_SKIP_LITE = _TESTS_TO_SKIP_LITE_BASE + [
     # Custom proto2 default values on unset fields require SelectOptimization in CelLiteRuntime.
     "proto2/empty_field/scalar_with_default",
 ]

conformance/src/test/java/dev/cel/conformance/ConformanceTest.java

@@ -60,6 +60,7 @@
 import dev.cel.extensions.CelListsRuntimeLibrary;
 import dev.cel.extensions.CelMathRuntimeLibrary;
 import dev.cel.extensions.CelOptionalLibrary;
+import dev.cel.extensions.CelOptionalRuntimeLibrary;
 import dev.cel.extensions.CelSetsRuntimeLibrary;
 import dev.cel.extensions.CelStringRuntimeLibrary;
 import dev.cel.optimizer.CelOptimizerFactory;
@@ -126,6 +127,7 @@ public final class ConformanceTest extends Statement {
           CelEncoderRuntimeLibrary.encoders(),
           CelListsRuntimeLibrary.lists(),
           CelMathRuntimeLibrary.math(),
+          CelOptionalRuntimeLibrary.optional(),
           CelSetsRuntimeLibrary.sets(),
           CelStringRuntimeLibrary.strings());
 

extensions/BUILD.bazel

@@ -65,6 +65,23 @@ java_library(
     exports = ["//extensions/src/main/java/dev/cel/extensions:optional_library"],
 )
 
+java_library(
+    name = "optional_compiler_library",
+    visibility = ["//:internal"],
+    exports = ["//extensions/src/main/java/dev/cel/extensions:optional_compiler_library"],
+)
+
+java_library(
+    name = "optional_runtime_library",
+    visibility = ["//:internal"],
+    exports = ["//extensions/src/main/java/dev/cel/extensions:optional_runtime_library"],
+)
+
+cel_android_library(
+    name = "optional_runtime_library_android",
+    exports = ["//extensions/src/main/java/dev/cel/extensions:optional_runtime_library_android"],
+)
+
 java_library(
     name = "sets",
     exports = ["//extensions/src/main/java/dev/cel/extensions:sets"],

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

@@ -307,27 +307,87 @@ java_library(
     tags = [
     ],
     deps = [
+        ":extension_library",
+        ":optional_compiler_library",
+        ":optional_runtime_library",
+        "//checker:checker_builder",
+        "//common:cel_function_decl",
+        "//common:cel_var_decl",
+        "//common:options",
+        "//compiler:compiler_builder",
+        "//parser:macro",
+        "//parser:parser_builder",
+        "//runtime",
+        "//runtime:runtime_equality",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven//:com_google_guava_guava",
+    ],
+)
+
+java_library(
+    name = "optional_compiler_library",
+    srcs = ["CelOptionalCompilerLibrary.java"],
+    tags = [
+    ],
+    deps = [
+        ":extension_library",
         "//checker:checker_builder",
+        "//common:cel_function_decl",
+        "//common:cel_issue",
+        "//common:cel_overload_decl",
+        "//common:cel_var_decl",
         "//common:compiler_common",
         "//common:operator",
-        "//common:options",
         "//common/ast",
         "//common/types",
-        "//common/values",
-        "//common/values:cel_byte_string",
-        "//common/values:cel_value",
         "//compiler:compiler_builder",
-        "//extensions:extension_library",
         "//parser:macro",
         "//parser:parser_builder",
-        "//runtime",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven//:com_google_guava_guava",
+    ],
+)
+
+java_library(
+    name = "optional_runtime_library",
+    srcs = ["CelOptionalRuntimeLibrary.java"],
+    tags = [
+    ],
+    deps = [
+        "//common:operator",
+        "//common:options",
+        "//common/values",
+        "//common/values:cel_byte_string",
+        "//common/values:cel_value",
         "//runtime:function_binding",
+        "//runtime:lite_runtime",
         "//runtime:runtime_equality",
+        "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:com_google_protobuf_protobuf_java",
     ],
 )
 
+cel_android_library(
+    name = "optional_runtime_library_android",
+    srcs = ["CelOptionalRuntimeLibrary.java"],
+    tags = [
+    ],
+    deps = [
+        "//common:operator_android",
+        "//common:options",
+        "//common/values:cel_byte_string",
+        "//common/values:cel_value_android",
+        "//common/values:values_android",
+        "//runtime:function_binding_android",
+        "//runtime:lite_runtime_android",
+        "//runtime:runtime_equality_android",
+        "@maven//:com_google_errorprone_error_prone_annotations",
+        "@maven_android//:com_google_guava_guava",
+        "@maven_android//:com_google_protobuf_protobuf_javalite",
+    ],
+)
+
 java_library(
     name = "sets",
     srcs = ["CelSetsExtensions.java"],

extensions/src/main/java/dev/cel/extensions/CelExtensions.java

@@ -58,6 +58,30 @@ public static CelOptionalLibrary optional(int version) {
     return CelOptionalLibrary.library().version(version);
   }
 
+  /**
+   * Implementation of optional values.
+   *
+   * <p>Refer to README.md for available functions.
+   *
+   * <p>This will include only the specific functions denoted by {@link
+   * CelOptionalLibrary.Function}.
+   */
+  public static CelOptionalLibrary optional(CelOptionalLibrary.Function... functions) {
+    return optional(ImmutableSet.copyOf(functions));
+  }
+
+  /**
+   * Implementation of optional values.
+   *
+   * <p>Refer to README.md for available functions.
+   *
+   * <p>This will include only the specific functions denoted by {@link
+   * CelOptionalLibrary.Function}.
+   */
+  public static CelOptionalLibrary optional(Set<CelOptionalLibrary.Function> functions) {
+    return new CelOptionalLibrary(functions);
+  }
+
   /**
    * Extended functions for string manipulation.
    *