Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/cel-spec/scripts/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ module github.com/bufbuild/cel-es/packages/scripts

go 1.23.2

require github.com/google/cel-go v0.26.1
require github.com/google/cel-go v0.29.0

require (
cel.dev/expr v0.25.0
cel.dev/expr v0.25.1
google.golang.org/protobuf v1.36.10
)

require (
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
github.com/stoewer/go-strcase v1.3.0 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
golang.org/x/text v0.22.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241223144023-3abc09e42ca8 // indirect
Expand Down
28 changes: 7 additions & 21 deletions packages/cel-spec/scripts/go.sum
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
cel.dev/expr v0.25.0 h1:qbCFvDJJthxLvf3TqeF9Ys7pjjWrO7LMzfYhpJUc30g=
cel.dev/expr v0.25.0/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/google/cel-go v0.26.1 h1:iPbVVEdkhTX++hpe3lzSk7D3G3QSYqLGoHOcEio+UXQ=
github.com/google/cel-go v0.26.1/go.mod h1:A9O8OU9rdvrK5MQyrqfIxo1a0u4g3sF8KB6PUIaryMM=
github.com/google/cel-go v0.29.0 h1:fEG+Ja3YRwNOqnQxTyJwoByAUAvTuxUGiro/jhrm4F4=
github.com/google/cel-go v0.29.0/go.mod h1:X0bD6iVNR8pkROSOoHVdgTkzmRcosof7WQqCD6wcMc8=
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stoewer/go-strcase v1.3.0 h1:g0eASXYtp+yvN9fK8sH94oCIk0fau9uV1/ZdJ0AVEzs=
github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8wodgtPmh1xo=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
Expand All @@ -30,7 +18,5 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8 h1:
google.golang.org/genproto/googleapis/rpc v0.0.0-20241223144023-3abc09e42ca8/go.mod h1:lcTa1sDdWEIHMWlITnIczmw5w60CF9ffkb8Z+DVmmjA=
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
93 changes: 91 additions & 2 deletions packages/cel-spec/src/testdata/checking.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Generated from cel-go github.com/google/cel-go@v0.26.1/checker/checker_test.go
// Generated from cel-go github.com/google/cel-go@v0.29.0/checker/checker_test.go
import type { SerializedIncrementalTestSuite } from "./tests.js";
export const tests: SerializedIncrementalTestSuite = {
name: "checking",
Expand Down Expand Up @@ -1651,7 +1651,7 @@ export const tests: SerializedIncrementalTestSuite = {
},
ast: "NotAMessage{}^#*expr.Expr_StructExpr#",
error:
"ERROR: \u003cinput\u003e:1:12: 'wrapper(int)' is not a type\n | NotAMessage{}\n | ...........^",
"ERROR: \u003cinput\u003e:1:12: undeclared reference to 'NotAMessage' (in container '')\n | NotAMessage{}\n | ...........^",
},
{
original: { expr: "{}.map(c,[c,type(c)])" },
Expand All @@ -1660,5 +1660,94 @@ export const tests: SerializedIncrementalTestSuite = {
"__comprehension__(\n // Variable\n c,\n // Target\n {}~map(dyn, dyn),\n // Accumulator\n @result,\n // Init\n []~list(list(dyn)),\n // LoopCondition\n true~bool,\n // LoopStep\n _+_(\n @result~list(list(dyn))^@result,\n [\n [\n c~dyn^c,\n type(\n c~dyn^c\n )~type(dyn)^type\n ]~list(dyn)\n ]~list(list(dyn))\n )~list(list(dyn))^add_list,\n // Result\n @result~list(list(dyn))^@result)~list(list(dyn))",
type: "list(list(dyn))",
},
{
original: {
expr: "[{'z': 0}].exists(y, y.z == 0)",
typeEnv: [
{
name: "cel.example.y",
ident: {
type: {
mapType: {
keyType: { primitive: "STRING" },
valueType: { primitive: "INT64" },
},
},
},
},
],
},
ast: '__comprehension__(\n // Variable\n y,\n // Target\n [\n {\n "z"^#*expr.Constant_StringValue#:0^#*expr.Constant_Int64Value#^#*expr.Expr_CreateStruct_Entry#\n }^#*expr.Expr_StructExpr#\n ]^#*expr.Expr_ListExpr#,\n // Accumulator\n @result,\n // Init\n false^#*expr.Constant_BoolValue#,\n // LoopCondition\n @not_strictly_false(\n !_(\n @result^#*expr.Expr_IdentExpr#\n )^#*expr.Expr_CallExpr#\n )^#*expr.Expr_CallExpr#,\n // LoopStep\n _||_(\n @result^#*expr.Expr_IdentExpr#,\n _==_(\n y^#*expr.Expr_IdentExpr#.z^#*expr.Expr_SelectExpr#,\n 0^#*expr.Constant_Int64Value#\n )^#*expr.Expr_CallExpr#\n )^#*expr.Expr_CallExpr#,\n // Result\n @result^#*expr.Expr_IdentExpr#)^#*expr.Expr_ComprehensionExpr#',
checkedAst:
'__comprehension__(\n // Variable\n y,\n // Target\n [\n {\n "z"~string:0~int\n }~map(string, int)\n ]~list(map(string, int)),\n // Accumulator\n @result,\n // Init\n false~bool,\n // LoopCondition\n @not_strictly_false(\n !_(\n @result~bool^@result\n )~bool^logical_not\n )~bool^not_strictly_false,\n // LoopStep\n _||_(\n @result~bool^@result,\n _==_(\n y~map(string, int)^y.z~int,\n 0~int\n )~bool^equals\n )~bool^logical_or,\n // Result\n @result~bool^@result)~bool',
type: "bool",
},
{
original: {
expr: "[{'y': 0}].exists(x, x.y == 0)",
typeEnv: [
{
name: "x",
ident: {
type: {
mapType: {
keyType: { primitive: "STRING" },
valueType: { primitive: "INT64" },
},
},
},
},
],
},
ast: '__comprehension__(\n // Variable\n x,\n // Target\n [\n {\n "y"^#*expr.Constant_StringValue#:0^#*expr.Constant_Int64Value#^#*expr.Expr_CreateStruct_Entry#\n }^#*expr.Expr_StructExpr#\n ]^#*expr.Expr_ListExpr#,\n // Accumulator\n @result,\n // Init\n false^#*expr.Constant_BoolValue#,\n // LoopCondition\n @not_strictly_false(\n !_(\n @result^#*expr.Expr_IdentExpr#\n )^#*expr.Expr_CallExpr#\n )^#*expr.Expr_CallExpr#,\n // LoopStep\n _||_(\n @result^#*expr.Expr_IdentExpr#,\n _==_(\n x^#*expr.Expr_IdentExpr#.y^#*expr.Expr_SelectExpr#,\n 0^#*expr.Constant_Int64Value#\n )^#*expr.Expr_CallExpr#\n )^#*expr.Expr_CallExpr#,\n // Result\n @result^#*expr.Expr_IdentExpr#)^#*expr.Expr_ComprehensionExpr#',
checkedAst:
'__comprehension__(\n // Variable\n x,\n // Target\n [\n {\n "y"~string:0~int\n }~map(string, int)\n ]~list(map(string, int)),\n // Accumulator\n @result,\n // Init\n false~bool,\n // LoopCondition\n @not_strictly_false(\n !_(\n @result~bool^@result\n )~bool^logical_not\n )~bool^not_strictly_false,\n // LoopStep\n _||_(\n @result~bool^@result,\n _==_(\n x~map(string, int)^x.y~int,\n 0~int\n )~bool^equals\n )~bool^logical_or,\n // Result\n @result~bool^@result)~bool',
type: "bool",
},
{
original: {
expr: "[0].exists(x, x != .x)",
typeEnv: [{ name: "x", ident: { type: { primitive: "INT64" } } }],
},
ast: "__comprehension__(\n // Variable\n x,\n // Target\n [\n 0^#*expr.Constant_Int64Value#\n ]^#*expr.Expr_ListExpr#,\n // Accumulator\n @result,\n // Init\n false^#*expr.Constant_BoolValue#,\n // LoopCondition\n @not_strictly_false(\n !_(\n @result^#*expr.Expr_IdentExpr#\n )^#*expr.Expr_CallExpr#\n )^#*expr.Expr_CallExpr#,\n // LoopStep\n _||_(\n @result^#*expr.Expr_IdentExpr#,\n _!=_(\n x^#*expr.Expr_IdentExpr#,\n .x^#*expr.Expr_IdentExpr#\n )^#*expr.Expr_CallExpr#\n )^#*expr.Expr_CallExpr#,\n // Result\n @result^#*expr.Expr_IdentExpr#)^#*expr.Expr_ComprehensionExpr#",
checkedAst:
"__comprehension__(\n // Variable\n x,\n // Target\n [\n 0~int\n ]~list(int),\n // Accumulator\n @result,\n // Init\n false~bool,\n // LoopCondition\n @not_strictly_false(\n !_(\n @result~bool^@result\n )~bool^logical_not\n )~bool^not_strictly_false,\n // LoopStep\n _||_(\n @result~bool^@result,\n _!=_(\n x~int^x,\n .x~int^.x\n )~bool^not_equals\n )~bool^logical_or,\n // Result\n @result~bool^@result)~bool",
type: "bool",
},
{
original: {
expr: "[{'z': 0}].exists(y, .y.z == y.z)",
typeEnv: [{ name: "y.z", ident: { type: { primitive: "INT64" } } }],
},
ast: '__comprehension__(\n // Variable\n y,\n // Target\n [\n {\n "z"^#*expr.Constant_StringValue#:0^#*expr.Constant_Int64Value#^#*expr.Expr_CreateStruct_Entry#\n }^#*expr.Expr_StructExpr#\n ]^#*expr.Expr_ListExpr#,\n // Accumulator\n @result,\n // Init\n false^#*expr.Constant_BoolValue#,\n // LoopCondition\n @not_strictly_false(\n !_(\n @result^#*expr.Expr_IdentExpr#\n )^#*expr.Expr_CallExpr#\n )^#*expr.Expr_CallExpr#,\n // LoopStep\n _||_(\n @result^#*expr.Expr_IdentExpr#,\n _==_(\n .y^#*expr.Expr_IdentExpr#.z^#*expr.Expr_SelectExpr#,\n y^#*expr.Expr_IdentExpr#.z^#*expr.Expr_SelectExpr#\n )^#*expr.Expr_CallExpr#\n )^#*expr.Expr_CallExpr#,\n // Result\n @result^#*expr.Expr_IdentExpr#)^#*expr.Expr_ComprehensionExpr#',
checkedAst:
'__comprehension__(\n // Variable\n y,\n // Target\n [\n {\n "z"~string:0~int\n }~map(string, int)\n ]~list(map(string, int)),\n // Accumulator\n @result,\n // Init\n false~bool,\n // LoopCondition\n @not_strictly_false(\n !_(\n @result~bool^@result\n )~bool^logical_not\n )~bool^not_strictly_false,\n // LoopStep\n _||_(\n @result~bool^@result,\n _==_(\n .y.z~int^.y.z,\n y~map(string, int)^y.z~int\n )~bool^equals\n )~bool^logical_or,\n // Result\n @result~bool^@result)~bool',
type: "bool",
},
{
original: {
expr: "TestAllTypes{?singleInt32: {}.?i}",
container: "google.expr.proto2.test",
},
error:
"ERROR: :1:14: unsupported syntax '?'\n | TestAllTypes{?singleInt32: {}.?i}\n | .............^",
},
{
original: {
expr: "TestAllTypes{?singleInt32: {'i': 20}.?i}.singleInt32",
container: "google.expr.proto2.test",
},
error:
"ERROR: :1:14: unsupported syntax '?'\n | TestAllTypes{?singleInt32: {'i': 20}.?i}.singleInt32\n | .............^",
},
{
original: {
expr: "TestAllTypes{singleInt32: 1, single_bool: true}.singleInt32",
container: "google.expr.proto2.test",
},
ast: "TestAllTypes{\n singleInt32:1^#*expr.Constant_Int64Value#^#*expr.Expr_CreateStruct_Entry#,\n single_bool:true^#*expr.Constant_BoolValue#^#*expr.Expr_CreateStruct_Entry#\n}^#*expr.Expr_StructExpr#.singleInt32^#*expr.Expr_SelectExpr#",
error:
"ERROR: \u003cinput\u003e:1:25: undefined field 'singleInt32'\n | TestAllTypes{singleInt32: 1, single_bool: true}.singleInt32\n | ........................^\nERROR: \u003cinput\u003e:1:48: undefined field 'singleInt32'\n | TestAllTypes{singleInt32: 1, single_bool: true}.singleInt32\n | ...............................................^",
},
],
} as const;
4 changes: 2 additions & 2 deletions packages/cel-spec/src/testdata/comprehension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

// Generated from cel-go github.com/google/cel-go@v0.26.1/ext/comprehensions_test.go
// Generated from cel-go github.com/google/cel-go@v0.29.0/ext/comprehensions_test.go
import type { SerializedIncrementalTestSuite } from "./tests.js";
export const tests: SerializedIncrementalTestSuite = {
name: "comprehensions",
name: "comprehension",
tests: [
{
original: {
Expand Down
Loading