Internal Changes

PiperOrigin-RevId: 957797112

Author: l46kok

BUILD.bazel

@@ -95,6 +95,14 @@ java_library(
     ],
 )
 
+java_library(
+    name = "java_jline",
+    exports = [
+        "@maven//:org_jline_jline_reader",
+        "@maven//:org_jline_jline_terminal",
+    ],
+)
+
 default_java_toolchain(
     name = "repository_default_toolchain",
     configuration = DEFAULT_TOOLCHAIN_CONFIGURATION,

MODULE.bazel

@@ -95,6 +95,8 @@ maven.install(
         "info.picocli:picocli:4.7.7",
         "org.antlr:antlr4-runtime:4.13.2",
         "org.freemarker:freemarker:2.3.34",
+        "org.jline:jline-reader:3.26.1",
+        "org.jline:jline-terminal:3.26.1",
         "org.jspecify:jspecify:1.0.0",
         "org.threeten:threeten-extra:1.8.0",
         "org.yaml:snakeyaml:2.5",

verifier/BUILD.bazel

@@ -41,6 +41,13 @@ java_library(
     exports = ["//verifier/src/main/java/dev/cel/verifier:verifier_factory"],
 )
 
+java_library(
+    name = "numeric_bounds",
+    compatible_with = [],
+    visibility = [":verifier_internal"],
+    exports = ["//verifier/src/main/java/dev/cel/verifier:numeric_bounds"],
+)
+
 java_library(
     name = "type_system",
     compatible_with = [],
@@ -54,3 +61,10 @@ java_library(
     visibility = [":verifier_internal"],
     exports = ["//verifier/src/main/java/dev/cel/verifier:z3_impl"],
 )
+
+java_library(
+    name = "canonicalization_optimizer",
+    compatible_with = [],
+    visibility = [":verifier_internal"],
+    exports = ["//verifier/src/main/java/dev/cel/verifier:canonicalization_optimizer"],
+)

verifier/README.md

@@ -433,3 +433,7 @@ What this means for verification:
     default unless you have a specific need and bounded inputs.
 
 ---
+
+## Tools & CLI
+
+For command-line verification and interactive execution, see the [CLI Tool documentation](tools/README.md).

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

@@ -35,6 +35,12 @@ java_library(
     deps = [
         ":verifier",
         ":z3_impl",
+        "//bundle:cel",
+        "//checker:checker_builder",
+        "//compiler",
+        "//compiler:compiler_builder",
+        "//parser:parser_builder",
+        "//runtime",
     ],
 )
 
@@ -91,20 +97,57 @@ java_library(
     ],
 )
 
+java_library(
+    name = "numeric_bounds",
+    srcs = ["CelNumericBounds.java"],
+    compatible_with = [],
+    tags = [
+    ],
+    deps = [
+        "//:auto_value",
+        "//common/annotations",
+        "@maven//:com_google_guava_guava",
+    ],
+)
+
 java_library(
     name = "type_system",
     srcs = ["CelZ3TypeSystem.java"],
     compatible_with = [],
     tags = [
     ],
     deps = [
+        ":numeric_bounds",
         "//common/internal:proto_time_utils",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",
         "@maven//:tools_aqua_z3_turnkey",
     ],
 )
 
+java_library(
+    name = "canonicalization_optimizer",
+    srcs = ["CanonicalizationOptimizer.java"],
+    tags = [
+    ],
+    deps = [
+        "//:auto_value",
+        "//bundle:cel",
+        "//common:cel_ast",
+        "//common:mutable_ast",
+        "//common:mutable_source",
+        "//common:operator",
+        "//common/ast",
+        "//common/ast:mutable_expr",
+        "//common/navigation:common",
+        "//common/navigation:mutable_navigation",
+        "//common/values:cel_byte_string",
+        "//optimizer:ast_optimizer",
+        "//optimizer:mutable_ast",
+        "@maven//:com_google_guava_guava",
+    ],
+)
+
 java_library(
     name = "z3_impl",
     srcs = [
@@ -121,9 +164,12 @@ java_library(
     tags = [
     ],
     deps = [
+        ":canonicalization_optimizer",
+        ":numeric_bounds",
         ":type_system",
         ":verifier",
         "//:auto_value",
+        "//bundle:cel",
         "//common:cel_ast",
         "//common:compiler_common",
         "//common:operator",
@@ -132,6 +178,9 @@ java_library(
         "//common/types",
         "//common/types:cel_types",
         "//common/types:type_providers",
+        "//optimizer",
+        "//optimizer:optimization_exception",
+        "//optimizer:optimizer_builder",
         "//verifier/axioms",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",