Add two var comprehensions to repl (#1167)

Author: l46kok

repl/evaluator.go

@@ -43,14 +43,15 @@ import (
 
 var (
 	extensionMap = map[string]cel.EnvOption{
-		"optional": cel.OptionalTypes(),
-		"bindings": ext.Bindings(),
-		"strings":  ext.Strings(),
-		"protos":   ext.Protos(),
-		"math":     ext.Math(),
-		"encoders": ext.Encoders(),
-		"sets":     ext.Sets(),
-		"lists":    ext.Lists(),
+		"optional":               cel.OptionalTypes(),
+		"bindings":               ext.Bindings(),
+		"strings":                ext.Strings(),
+		"protos":                 ext.Protos(),
+		"math":                   ext.Math(),
+		"encoders":               ext.Encoders(),
+		"sets":                   ext.Sets(),
+		"lists":                  ext.Lists(),
+		"two_var_comprehensions": ext.TwoVarComprehensions(),
 	}
 )
 

repl/evaluator_test.go

@@ -709,7 +709,8 @@ func TestProcess(t *testing.T) {
 					expr: "'test'.substring(2) == 'st' && " +
 						"proto.getExt(google.expr.proto2.test.ExampleType{}, google.expr.proto2.test.int32_ext) == 0 && " +
 						"math.greatest(1,2) == 2 && " +
-						"base64.encode(b'hello') == 'aGVsbG8='",
+						"base64.encode(b'hello') == 'aGVsbG8=' && " +
+						"{'key': 1}.exists(k, v, k == 'key' && v == 1)",
 				},
 			},
 			wantText:  "true : bool",
@@ -1040,7 +1041,7 @@ func TestProcessOptionError(t *testing.T) {
 					"'bogus'",
 				},
 			},
-			errorMsg: "extension: Unknown option: 'bogus'. Available options are: ['all', 'bindings', 'encoders', 'lists', 'math', 'optional', 'protos', 'sets', 'strings']",
+			errorMsg: "extension: Unknown option: 'bogus'. Available options are: ['all', 'bindings', 'encoders', 'lists', 'math', 'optional', 'protos', 'sets', 'strings', 'two_var_comprehensions']",
 		},
 	}
 

repl/go.mod

@@ -3,7 +3,7 @@ module github.com/google/cel-go/repl
 go 1.22.0
 
 require (
-	cel.dev/expr v0.22.1
+	cel.dev/expr v0.23.1
 	github.com/antlr4-go/antlr/v4 v4.13.0
 	github.com/chzyer/readline v1.5.1
 	github.com/google/cel-go v0.0.0-00010101000000-000000000000

repl/main/README.md

@@ -50,7 +50,7 @@ into a protocol buffer text format representing the type-checked AST.
 
 `%compile <expr>`
 
-Example: 
+Example:
 
 ```
 > %compile 3u
@@ -158,14 +158,15 @@ may take string arguments.
 
 `--container <string>` sets the expression container for name resolution.
 
-`--extension <extensionType>` enables CEL extensions. Valid options are: 
-`strings`, `protos`, `math`, `encoders`, `optional`, `bindings`, and `all`.
+`--extension <extensionType>` enables CEL extensions. Valid options are:
+`strings`, `protos`, `math`, `encoders`, `optional`, `bindings`,
+`two_var_comprehensions` and `all` (enables all extensions).
 
 `--enable_partial_eval` enables partial evaluations
 
 example:
 
-`%option --container 'google.protobuf'` 
+`%option --container 'google.protobuf'`
 
 `%option --extension 'strings'`
 
@@ -175,7 +176,7 @@ example:
 
 #### reset
 
-`%reset` drops all options and let expressions, returning the evaluator to a 
+`%reset` drops all options and let expressions, returning the evaluator to a
 starting empty state.
 
 ### Evaluation Model