Add CelType as a property to CelValue

PiperOrigin-RevId: 584665130
google · Nov 22, 2023 · 86b38a5 · 86b38a5
1 parent 1d38ec6
commit 86b38a5
Show file tree

Hide file tree

Showing 36 changed files with 272 additions and 6 deletions.
diff --git a/common/src/main/java/dev/cel/common/values/BUILD.bazel b/common/src/main/java/dev/cel/common/values/BUILD.bazel
@@ -37,6 +37,7 @@ java_library(
     ],
     deps = [
         "//common/annotations",
+        "//common/types:type_providers",
         "@maven//:com_google_errorprone_error_prone_annotations",
     ],
 )
@@ -51,6 +52,7 @@ java_library(
         ":cel_value",
         "//:auto_value",
         "//common/annotations",
+        "//common/types",
         "//common/types:type_providers",
         "@maven//:com_google_errorprone_error_prone_annotations",
         "@maven//:com_google_guava_guava",

diff --git a/common/src/main/java/dev/cel/common/values/BoolValue.java b/common/src/main/java/dev/cel/common/values/BoolValue.java
@@ -16,6 +16,8 @@
 
 import com.google.auto.value.AutoValue;
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.types.CelType;
+import dev.cel.common.types.SimpleType;
 
 /** BoolValue is a simple CelValue wrapper around Java booleans. */
 @AutoValue
@@ -30,6 +32,11 @@ public boolean isZeroValue() {
     return !value();
   }
 
+  @Override
+  public CelType celType() {
+    return SimpleType.BOOL;
+  }
+
   public static BoolValue create(Boolean value) {
     return new AutoValue_BoolValue(value);
   }

diff --git a/common/src/main/java/dev/cel/common/values/BytesValue.java b/common/src/main/java/dev/cel/common/values/BytesValue.java
@@ -16,6 +16,8 @@
 
 import com.google.auto.value.AutoValue;
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.types.CelType;
+import dev.cel.common.types.SimpleType;
 
 /** BytesValue is a simple CelValue wrapper around CelByteString (immutable byte string). */
 @AutoValue
@@ -30,6 +32,11 @@ public boolean isZeroValue() {
     return value().isEmpty();
   }
 
+  @Override
+  public CelType celType() {
+    return SimpleType.BYTES;
+  }
+
   public static BytesValue create(CelByteString value) {
     return new AutoValue_BytesValue(value);
   }

diff --git a/common/src/main/java/dev/cel/common/values/CelValue.java b/common/src/main/java/dev/cel/common/values/CelValue.java
@@ -16,6 +16,7 @@
 
 import com.google.errorprone.annotations.Immutable;
 import dev.cel.common.annotations.Internal;
+import dev.cel.common.types.CelType;
 
 /**
  * A representation of a CEL value for the runtime. Clients should never directly extend from
@@ -35,8 +36,10 @@ public abstract class CelValue {
   /** Returns true if the {@link #value()} is a zero value for its type. */
   public abstract boolean isZeroValue();
 
+  /** The CelType that represents this value. */
+  public abstract CelType celType();
+
   // TOOD(b/309695452): Add CelEquals method
-  // TODO: Add a getter for CelType
 
   public CelValue() {}
 }
diff --git a/common/src/main/java/dev/cel/common/values/DoubleValue.java b/common/src/main/java/dev/cel/common/values/DoubleValue.java
@@ -15,6 +15,8 @@
 package dev.cel.common.values;
 
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.types.CelType;
+import dev.cel.common.types.SimpleType;
 
 /** DoubleValue is a simple CelValue wrapper around Java doubles. */
 @Immutable
@@ -35,6 +37,11 @@ public boolean isZeroValue() {
     return value() == 0;
   }
 
+  @Override
+  public CelType celType() {
+    return SimpleType.DOUBLE;
+  }
+
   public static DoubleValue create(double value) {
     return new DoubleValue(value);
   }

diff --git a/common/src/main/java/dev/cel/common/values/DurationValue.java b/common/src/main/java/dev/cel/common/values/DurationValue.java
@@ -16,6 +16,8 @@
 
 import com.google.auto.value.AutoValue;
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.types.CelType;
+import dev.cel.common.types.SimpleType;
 import java.time.Duration;
 
 /** DurationValue is a simple CelValue wrapper around {@link java.time.Duration} */
@@ -31,6 +33,11 @@ public boolean isZeroValue() {
     return value().isZero();
   }
 
+  @Override
+  public CelType celType() {
+    return SimpleType.DURATION;
+  }
+
   public static DurationValue create(Duration value) {
     return new AutoValue_DurationValue(value);
   }

diff --git a/common/src/main/java/dev/cel/common/values/EnumValue.java b/common/src/main/java/dev/cel/common/values/EnumValue.java
@@ -16,6 +16,8 @@
 
 import com.google.auto.value.AutoValue;
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.types.CelType;
+import dev.cel.common.types.SimpleType;
 
 /**
  * EnumValue is a simple CelValue wrapper around Java enums.
@@ -35,6 +37,12 @@ public boolean isZeroValue() {
     return false;
   }
 
+  @Override
+  public CelType celType() {
+    // (b/178627883) Strongly typed enum is not supported yet
+    return SimpleType.INT;
+  }
+
   public static <E extends Enum<E>> EnumValue<E> create(Enum<E> value) {
     return new AutoValue_EnumValue<>(value);
   }

diff --git a/common/src/main/java/dev/cel/common/values/ErrorValue.java b/common/src/main/java/dev/cel/common/values/ErrorValue.java
@@ -16,6 +16,8 @@
 
 import com.google.auto.value.AutoValue;
 import dev.cel.common.annotations.Internal;
+import dev.cel.common.types.CelType;
+import dev.cel.common.types.SimpleType;
 
 /**
  * CelErrorValue represent the intermediate error that occurs during evaluation in the form of Java
@@ -39,6 +41,11 @@ public boolean isZeroValue() {
     return false;
   }
 
+  @Override
+  public CelType celType() {
+    return SimpleType.ERROR;
+  }
+
   public static ErrorValue create(Exception value) {
     return new AutoValue_ErrorValue(value);
   }

diff --git a/common/src/main/java/dev/cel/common/values/IntValue.java b/common/src/main/java/dev/cel/common/values/IntValue.java
@@ -15,6 +15,8 @@
 package dev.cel.common.values;
 
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.types.CelType;
+import dev.cel.common.types.SimpleType;
 
 /** IntValue is a simple CelValue wrapper around Java longs. */
 @Immutable
@@ -35,6 +37,11 @@ public boolean isZeroValue() {
     return value() == 0;
   }
 
+  @Override
+  public CelType celType() {
+    return SimpleType.INT;
+  }
+
   public static IntValue create(long value) {
     return new IntValue(value);
   }

diff --git a/common/src/main/java/dev/cel/common/values/ListValue.java b/common/src/main/java/dev/cel/common/values/ListValue.java
@@ -17,6 +17,9 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.DoNotCall;
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.types.CelType;
+import dev.cel.common.types.ListType;
+import dev.cel.common.types.SimpleType;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.List;
@@ -31,6 +34,7 @@
  */
 @Immutable
 public abstract class ListValue<E extends CelValue> extends CelValue implements List<E> {
+  private static final ListType LIST_TYPE = ListType.create(SimpleType.DYN);
 
   @Override
   @SuppressWarnings("Immutable") // ListValue APIs prohibit mutation.
@@ -41,6 +45,11 @@ public boolean isZeroValue() {
     return isEmpty();
   }
 
+  @Override
+  public CelType celType() {
+    return LIST_TYPE;
+  }
+
   /**
    * Guaranteed to throw an exception and leave the list unmodified.
    *

diff --git a/common/src/main/java/dev/cel/common/values/MapValue.java b/common/src/main/java/dev/cel/common/values/MapValue.java
@@ -17,6 +17,9 @@
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
 import com.google.errorprone.annotations.DoNotCall;
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.types.CelType;
+import dev.cel.common.types.MapType;
+import dev.cel.common.types.SimpleType;
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Function;
@@ -31,6 +34,8 @@
 @Immutable(containerOf = {"K", "V"})
 public abstract class MapValue<K extends CelValue, V extends CelValue> extends CelValue
     implements Map<K, V> {
+
+  private static final MapType MAP_TYPE = MapType.create(SimpleType.DYN, SimpleType.DYN);
 
   @Override
   public abstract Map<K, V> value();
@@ -54,6 +59,11 @@ public V get(K key) {
     return value().get(key);
   }
 
+  @Override
+  public CelType celType() {
+    return MAP_TYPE;
+  }
+
   public boolean has(K key) {
     return value().containsKey(key);
   }

diff --git a/common/src/main/java/dev/cel/common/values/NullValue.java b/common/src/main/java/dev/cel/common/values/NullValue.java
@@ -15,6 +15,8 @@
 package dev.cel.common.values;
 
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.types.CelType;
+import dev.cel.common.types.SimpleType;
 
 /**
  * NullValue represents the value 'null' of 'null_type' according to the CEL specification. One of
@@ -31,6 +33,11 @@ public NullValue value() {
     return NULL_VALUE;
   }
 
+  @Override
+  public CelType celType() {
+    return SimpleType.NULL_TYPE;
+  }
+
   @Override
   public boolean isZeroValue() {
     return true;

diff --git a/common/src/main/java/dev/cel/common/values/OpaqueValue.java b/common/src/main/java/dev/cel/common/values/OpaqueValue.java
@@ -15,6 +15,7 @@
 package dev.cel.common.values;
 
 import com.google.auto.value.AutoValue;
+import dev.cel.common.types.OpaqueType;
 
 /** OpaqueValue is the value representation of OpaqueType. */
 @AutoValue
@@ -27,7 +28,10 @@ public boolean isZeroValue() {
     return false;
   }
 
-  public static OpaqueValue create(Object value) {
-    return new AutoValue_OpaqueValue(value);
+  @Override
+  public abstract OpaqueType celType();
+
+  public static OpaqueValue create(String name, Object value) {
+    return new AutoValue_OpaqueValue(value, OpaqueType.create(name));
   }
 }
diff --git a/common/src/main/java/dev/cel/common/values/OptionalValue.java b/common/src/main/java/dev/cel/common/values/OptionalValue.java
@@ -17,6 +17,8 @@
 import com.google.auto.value.AutoValue;
 import com.google.common.base.Preconditions;
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.types.OptionalType;
+import dev.cel.common.types.SimpleType;
 import java.util.NoSuchElementException;
 import org.jspecify.nullness.Nullable;
 
@@ -28,6 +30,7 @@
 @AutoValue
 @Immutable(containerOf = "E")
 public abstract class OptionalValue<E extends CelValue> extends CelValue {
+  private static final OptionalType OPTIONAL_TYPE = OptionalType.create(SimpleType.DYN);
 
   /** Sentinel value representing an empty optional ('optional.none()' in CEL) */
   public static final OptionalValue<CelValue> EMPTY = empty();
@@ -49,6 +52,11 @@ public boolean isZeroValue() {
     return innerValue() == null;
   }
 
+  @Override
+  public OptionalType celType() {
+    return OPTIONAL_TYPE;
+  }
+
   /**
    * Optional field selection on maps or structs.
    *

diff --git a/common/src/main/java/dev/cel/common/values/StringValue.java b/common/src/main/java/dev/cel/common/values/StringValue.java
@@ -16,6 +16,8 @@
 
 import com.google.auto.value.AutoValue;
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.types.CelType;
+import dev.cel.common.types.SimpleType;
 
 /** StringValue is a simple CelValue wrapper around Java strings. */
 @AutoValue
@@ -30,6 +32,11 @@ public boolean isZeroValue() {
     return value().isEmpty();
   }
 
+  @Override
+  public CelType celType() {
+    return SimpleType.STRING;
+  }
+
   public static StringValue create(String value) {
     return new AutoValue_StringValue(value);
   }

diff --git a/common/src/main/java/dev/cel/common/values/TimestampValue.java b/common/src/main/java/dev/cel/common/values/TimestampValue.java
@@ -16,6 +16,8 @@
 
 import com.google.auto.value.AutoValue;
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.types.CelType;
+import dev.cel.common.types.SimpleType;
 import java.time.Instant;
 
 /** TimestampValue is a simple CelValue wrapper around {@link java.time.Instant} */
@@ -31,6 +33,11 @@ public boolean isZeroValue() {
     return Instant.EPOCH.equals(value());
   }
 
+  @Override
+  public CelType celType() {
+    return SimpleType.TIMESTAMP;
+  }
+
   public static TimestampValue create(Instant value) {
     return new AutoValue_TimestampValue(value);
   }

diff --git a/common/src/main/java/dev/cel/common/values/TypeValue.java b/common/src/main/java/dev/cel/common/values/TypeValue.java
@@ -17,6 +17,7 @@
 import com.google.auto.value.AutoValue;
 import com.google.errorprone.annotations.Immutable;
 import dev.cel.common.types.CelType;
+import dev.cel.common.types.TypeType;
 
 /** TypeValue holds the CEL type information for the underlying CelValue. */
 @AutoValue
@@ -31,7 +32,10 @@ public boolean isZeroValue() {
     return false;
   }
 
+  @Override
+  public abstract TypeType celType();
+
   public static TypeValue create(CelType value) {
-    return new AutoValue_TypeValue(value);
+    return new AutoValue_TypeValue(value, TypeType.create(value));
   }
 }
diff --git a/common/src/main/java/dev/cel/common/values/UintValue.java b/common/src/main/java/dev/cel/common/values/UintValue.java
@@ -17,6 +17,8 @@
 import com.google.auto.value.AutoValue;
 import com.google.common.primitives.UnsignedLong;
 import com.google.errorprone.annotations.Immutable;
+import dev.cel.common.types.CelType;
+import dev.cel.common.types.SimpleType;
 
 /**
  * UintValue represents CelValue for unsigned longs, leveraging Guava's implementation of {@link
@@ -37,6 +39,11 @@ public boolean isZeroValue() {
     return UnsignedLong.ZERO.equals(value());
   }
 
+  @Override
+  public CelType celType() {
+    return SimpleType.UINT;
+  }
+
   public static UintValue create(UnsignedLong value) {
     return new AutoValue_UintValue(value);
   }