Merge remote-tracking branch 'origin/master' into move-test-proto-go-mod

WORKSPACE

@@ -116,10 +116,9 @@ go_repository(
     version = "v4.13.0",
 )
 
-# CEL Spec deps v0.15.0
 go_repository(
     name = "com_google_cel_spec",
-    commit = "ae15d293dc49482180e967942612fb85e33bcde9",
+    commit = "1bc3fb168317fa77d1227c52d0becbf2d358c023",
     importpath = "github.com/google/cel-spec",
 )
 

cel/library.go

@@ -403,7 +403,7 @@ func optMap(meh MacroExprFactory, target ast.Expr, args []ast.Expr) (ast.Expr, *
 				meh.NewList(),
 				unusedIterVar,
 				varName,
-				meh.NewMemberCall(valueFunc, target),
+				meh.NewMemberCall(valueFunc, meh.Copy(target)),
 				meh.NewLiteral(types.False),
 				meh.NewIdent(varName),
 				mapExpr,
@@ -430,7 +430,7 @@ func optFlatMap(meh MacroExprFactory, target ast.Expr, args []ast.Expr) (ast.Exp
 			meh.NewList(),
 			unusedIterVar,
 			varName,
-			meh.NewMemberCall(valueFunc, target),
+			meh.NewMemberCall(valueFunc, meh.Copy(target)),
 			meh.NewLiteral(types.False),
 			meh.NewIdent(varName),
 			mapExpr,

conformance/BUILD.bazel

@@ -11,6 +11,7 @@ ALL_TESTS = [
     "@com_google_cel_spec//tests/simple:testdata/logic.textproto",
     "@com_google_cel_spec//tests/simple:testdata/macros.textproto",
     "@com_google_cel_spec//tests/simple:testdata/namespace.textproto",
+    "@com_google_cel_spec//tests/simple:testdata/optionals.textproto",
     "@com_google_cel_spec//tests/simple:testdata/parse.textproto",
     "@com_google_cel_spec//tests/simple:testdata/plumbing.textproto",
     "@com_google_cel_spec//tests/simple:testdata/proto2.textproto",

server/server.go

@@ -45,6 +45,7 @@ func (s *ConformanceServer) Parse(ctx context.Context, in *confpb.ParseRequest)
 	if in.DisableMacros {
 		parseOptions = append(parseOptions, cel.ClearMacros())
 	}
+	parseOptions = append(parseOptions, cel.OptionalTypes())
 	env, _ := cel.NewEnv(parseOptions...)
 	past, iss := env.Parse(in.CelSource)
 	resp := confpb.ParseResponse{}
@@ -75,6 +76,7 @@ func (s *ConformanceServer) Check(ctx context.Context, in *confpb.CheckRequest)
 	checkOptions = append(checkOptions, cel.Declarations(in.TypeEnv...))
 	checkOptions = append(checkOptions, cel.Types(&test2pb.TestAllTypes{}))
 	checkOptions = append(checkOptions, cel.Types(&test3pb.TestAllTypes{}))
+	checkOptions = append(checkOptions, cel.OptionalTypes())
 	env, _ := cel.NewCustomEnv(checkOptions...)
 
 	// Check the expression.
@@ -254,5 +256,6 @@ var evalEnv *cel.Env
 func init() {
 	evalEnv, _ = cel.NewEnv(
 		cel.Types(&test2pb.TestAllTypes{}, &test3pb.TestAllTypes{}),
-		cel.EagerlyValidateDeclarations(true))
+		cel.EagerlyValidateDeclarations(true),
+		cel.OptionalTypes())
 }