Add abbreviation support to type-checker

PiperOrigin-RevId: 786429931

Author: l46kok

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

@@ -28,6 +28,7 @@ java_library(
         "//common:cel_ast",
         "//common:cel_source",
         "//common:compiler_common",
+        "//common:container",
         "//common:options",
         "//common/internal:env_visitor",
         "//common/internal:file_descriptor_converter",

bundle/src/main/java/dev/cel/bundle/CelBuilder.java

@@ -24,6 +24,7 @@
 import com.google.protobuf.Message;
 import dev.cel.checker.ProtoTypeMask;
 import dev.cel.checker.TypeProvider;
+import dev.cel.common.CelContainer;
 import dev.cel.common.CelFunctionDecl;
 import dev.cel.common.CelOptions;
 import dev.cel.common.CelVarDecl;
@@ -81,12 +82,19 @@ public interface CelBuilder {
   CelBuilder addMacros(Iterable<CelMacro> macros);
 
   /**
-   * Set the {@code container} name to use as the namespace for resolving CEL expression variables
-   * and functions.
+   * @deprecated Use {@link #setContainer(CelContainer)} instead.
    */
   @CanIgnoreReturnValue
+  @Deprecated
   CelBuilder setContainer(String container);
 
+  /**
+   * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
+   * functions.
+   */
+  @CanIgnoreReturnValue
+  CelBuilder setContainer(CelContainer container);
+
   /** Add a variable declaration with a given {@code name} and {@link Type}. */
   @CanIgnoreReturnValue
   CelBuilder addVar(String name, Type type);

bundle/src/main/java/dev/cel/bundle/CelImpl.java

@@ -31,6 +31,7 @@
 import dev.cel.checker.ProtoTypeMask;
 import dev.cel.checker.TypeProvider;
 import dev.cel.common.CelAbstractSyntaxTree;
+import dev.cel.common.CelContainer;
 import dev.cel.common.CelFunctionDecl;
 import dev.cel.common.CelOptions;
 import dev.cel.common.CelSource;
@@ -194,6 +195,12 @@ public CelBuilder setContainer(String container) {
       return this;
     }
 
+    @Override
+    public CelBuilder setContainer(CelContainer container) {
+      compilerBuilder.setContainer(container);
+      return this;
+    }
+
     @Override
     public CelBuilder addVar(String name, Type type) {
       compilerBuilder.addVar(name, type);

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

@@ -76,6 +76,7 @@ java_library(
         "//common:cel_descriptors",
         "//common:cel_source",
         "//common:compiler_common",
+        "//common:container",
         "//common:options",
         "//common:source_location",
         "//common/annotations",
@@ -104,6 +105,7 @@ java_library(
         ":standard_decl",
         "//common:cel_ast",
         "//common:compiler_common",
+        "//common:container",
         "//common:options",
         "//common/types:type_providers",
         "@cel_spec//proto/cel/expr:checked_java_proto",
@@ -175,6 +177,7 @@ java_library(
         "//:auto_value",
         "//common:cel_ast",
         "//common:compiler_common",
+        "//common:container",
         "//common:options",
         "//common:proto_ast",
         "//common/annotations",

checker/src/main/java/dev/cel/checker/CelCheckerBuilder.java

@@ -21,6 +21,7 @@
 import com.google.protobuf.DescriptorProtos.FileDescriptorSet;
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FileDescriptor;
+import dev.cel.common.CelContainer;
 import dev.cel.common.CelFunctionDecl;
 import dev.cel.common.CelOptions;
 import dev.cel.common.CelVarDecl;
@@ -35,12 +36,19 @@ public interface CelCheckerBuilder {
   CelCheckerBuilder setOptions(CelOptions options);
 
   /**
-   * Set the {@code container} name to use as the namespace for resolving CEL expression variables
-   * and functions.
+   * @deprecated Use {@link #setContainer(CelContainer)} instead.
    */
   @CanIgnoreReturnValue
+  @Deprecated
   CelCheckerBuilder setContainer(String container);
 
+  /**
+   * Set the {@link CelContainer} to use as the namespace for resolving CEL expression variables and
+   * functions.
+   */
+  @CanIgnoreReturnValue
+  CelCheckerBuilder setContainer(CelContainer container);
+
   /** Add variable and function {@code declarations} to the CEL environment. */
   @CanIgnoreReturnValue
   CelCheckerBuilder addDeclarations(Decl... declarations);

checker/src/main/java/dev/cel/checker/CelCheckerLegacyImpl.java

@@ -31,6 +31,7 @@
 import com.google.protobuf.Descriptors.Descriptor;
 import com.google.protobuf.Descriptors.FileDescriptor;
 import dev.cel.common.CelAbstractSyntaxTree;
+import dev.cel.common.CelContainer;
 import dev.cel.common.CelDescriptorUtil;
 import dev.cel.common.CelFunctionDecl;
 import dev.cel.common.CelIssue;
@@ -67,7 +68,7 @@
 public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {
 
   private final CelOptions celOptions;
-  private final String container;
+  private final CelContainer container;
   private final ImmutableSet<CelIdentDecl> identDeclarations;
   private final ImmutableSet<CelFunctionDecl> functionDeclarations;
   private final Optional<CelType> expectedResultType;
@@ -80,9 +81,12 @@ public final class CelCheckerLegacyImpl implements CelChecker, EnvVisitable {
 
   private final CelStandardDeclarations overriddenStandardDeclarations;
 
-  // Builder is mutable by design. APIs must make defensive copies in and out of this class.
+  // This does not affect the type-checking behavior in any manner.
   @SuppressWarnings("Immutable")
-  private final Builder checkerBuilder;
+  private final ImmutableSet<CelCheckerLibrary> checkerLibraries;
+
+  private final ImmutableSet<FileDescriptor> fileDescriptors;
+  private final ImmutableSet<ProtoTypeMask> protoTypeMasks;
 
   @Override
   public CelValidationResult check(CelAbstractSyntaxTree ast) {
@@ -108,7 +112,23 @@ public CelTypeProvider getTypeProvider() {
 
   @Override
   public CelCheckerBuilder toCheckerBuilder() {
-    return new Builder(checkerBuilder);
+    CelCheckerBuilder builder =
+        new Builder()
+            .addIdentDeclarations(identDeclarations)
+            .setOptions(celOptions)
+            .setTypeProvider(celTypeProvider)
+            .setContainer(container)
+            .setStandardEnvironmentEnabled(standardEnvironmentEnabled)
+            .addFunctionDeclarations(functionDeclarations)
+            .addLibraries(checkerLibraries)
+            .addFileTypes(fileDescriptors)
+            .addProtoTypeMasks(protoTypeMasks);
+
+    if (expectedResultType.isPresent()) {
+      builder.setResultType(expectedResultType.get());
+    }
+
+    return builder;
   }
 
   @Override
@@ -163,8 +183,9 @@ public static final class Builder implements CelCheckerBuilder {
     private final ImmutableSet.Builder<Descriptor> messageTypes;
     private final ImmutableSet.Builder<FileDescriptor> fileTypes;
     private final ImmutableSet.Builder<CelCheckerLibrary> celCheckerLibraries;
+    private CelContainer container;
     private CelOptions celOptions;
-    private String container;
+    private String deprecatedContainerString;
     private CelType expectedResultType;
     private TypeProvider customTypeProvider;
     private CelTypeProvider celTypeProvider;
@@ -179,6 +200,13 @@ public CelCheckerBuilder setOptions(CelOptions celOptions) {
 
     @Override
     public CelCheckerBuilder setContainer(String container) {
+      checkNotNull(container);
+      this.deprecatedContainerString = container;
+      return this;
+    }
+
+    @Override
+    public CelCheckerBuilder setContainer(CelContainer container) {
       checkNotNull(container);
       this.container = container;
       return this;
@@ -348,6 +376,12 @@ public CelCheckerBuilder addLibraries(Iterable<? extends CelCheckerLibrary> libr
       return this;
     }
 
+    @CanIgnoreReturnValue
+    Builder addIdentDeclarations(ImmutableSet<CelIdentDecl> identDeclarations) {
+      this.identDeclarations.addAll(identDeclarations);
+      return this;
+    }
+
     // The following getters exist for asserting immutability for collections held by this builder,
     // and shouldn't be exposed to the public.
     @VisibleForTesting
@@ -388,8 +422,22 @@ public CelCheckerLegacyImpl build() {
             "setStandardEnvironmentEnabled must be set to false to override standard"
                 + " declarations.");
       }
+
+      if (!deprecatedContainerString.isEmpty() && !container.name().isEmpty()) {
+        throw new IllegalArgumentException(
+            "Both container and celContainer cannot be set. Container: "
+                + deprecatedContainerString
+                + ",celContainer: "
+                + container);
+      }
+      if (!deprecatedContainerString.isEmpty()) {
+        // Compatibility only. Will be removed.
+        container = CelContainer.ofName(deprecatedContainerString);
+      }
+
       // Add libraries, such as extensions
-      celCheckerLibraries.build().forEach(celLibrary -> celLibrary.setCheckerOptions(this));
+      ImmutableSet<CelCheckerLibrary> checkerLibraries = celCheckerLibraries.build();
+      checkerLibraries.forEach(celLibrary -> celLibrary.setCheckerOptions(this));
 
       // Configure the type provider.
       ImmutableSet<FileDescriptor> fileTypeSet = fileTypes.build();
@@ -447,7 +495,9 @@ public CelCheckerLegacyImpl build() {
           messageTypeProvider,
           standardEnvironmentEnabled,
           standardDeclarations,
-          this);
+          checkerLibraries,
+          fileTypeSet,
+          protoTypeMaskSet);
     }
 
     private Builder() {
@@ -458,45 +508,24 @@ private Builder() {
       this.messageTypes = ImmutableSet.builder();
       this.protoTypeMasks = ImmutableSet.builder();
       this.celCheckerLibraries = ImmutableSet.builder();
-      this.container = "";
-    }
-
-    private Builder(Builder builder) {
-      // The following properties are either immutable or simple primitives, thus can be assigned
-      // directly.
-      this.celOptions = builder.celOptions;
-      this.celTypeProvider = builder.celTypeProvider;
-      this.container = builder.container;
-      this.customTypeProvider = builder.customTypeProvider;
-      this.expectedResultType = builder.expectedResultType;
-      this.standardEnvironmentEnabled = builder.standardEnvironmentEnabled;
-      // The following needs to be deep copied as they are collection builders
-      this.functionDeclarations = deepCopy(builder.functionDeclarations);
-      this.identDeclarations = deepCopy(builder.identDeclarations);
-      this.fileTypes = deepCopy(builder.fileTypes);
-      this.messageTypes = deepCopy(builder.messageTypes);
-      this.protoTypeMasks = deepCopy(builder.protoTypeMasks);
-      this.celCheckerLibraries = deepCopy(builder.celCheckerLibraries);
-    }
-
-    private static <T> ImmutableSet.Builder<T> deepCopy(ImmutableSet.Builder<T> builderToCopy) {
-      ImmutableSet.Builder<T> newBuilder = ImmutableSet.builder();
-      newBuilder.addAll(builderToCopy.build());
-      return newBuilder;
+      this.container = CelContainer.ofName("");
+      this.deprecatedContainerString = "";
     }
   }
 
   private CelCheckerLegacyImpl(
       CelOptions celOptions,
-      String container,
+      CelContainer container,
       ImmutableSet<CelIdentDecl> identDeclarations,
       ImmutableSet<CelFunctionDecl> functionDeclarations,
       Optional<CelType> expectedResultType,
       TypeProvider typeProvider,
       CelTypeProvider celTypeProvider,
       boolean standardEnvironmentEnabled,
       CelStandardDeclarations overriddenStandardDeclarations,
-      Builder checkerBuilder) {
+      ImmutableSet<CelCheckerLibrary> checkerLibraries,
+      ImmutableSet<FileDescriptor> fileDescriptors,
+      ImmutableSet<ProtoTypeMask> protoTypeMasks) {
     this.celOptions = celOptions;
     this.container = container;
     this.identDeclarations = identDeclarations;
@@ -506,7 +535,9 @@ private CelCheckerLegacyImpl(
     this.celTypeProvider = celTypeProvider;
     this.standardEnvironmentEnabled = standardEnvironmentEnabled;
     this.overriddenStandardDeclarations = overriddenStandardDeclarations;
-    this.checkerBuilder = new Builder(checkerBuilder);
+    this.checkerLibraries = checkerLibraries;
+    this.fileDescriptors = fileDescriptors;
+    this.protoTypeMasks = protoTypeMasks;
   }
 
   private static ImmutableList<CelIssue> errorsToIssues(Errors errors) {