Skip to content

Add support for nested element type #1190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 18, 2025
Merged

Add support for nested element type #1190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ext/native.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,8 @@ func newNativeTypes(fieldNameHandler NativeTypesFieldNameHandler, rawType reflec
var iterateStructMembers func(reflect.Type)
iterateStructMembers = func(t reflect.Type) {
if k := t.Kind(); k == reflect.Pointer || k == reflect.Slice || k == reflect.Array || k == reflect.Map {
t = t.Elem()
iterateStructMembers(t.Elem())
return
}
if t.Kind() != reflect.Struct {
return
Expand Down
61 changes: 61 additions & 0 deletions ext/native_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,67 @@ func TestNativeStructEmbedded(t *testing.T) {
}
}

type TestNestedStruct struct {
ListVal []*TestNestedType
}

func TestNativeNestedStruct(t *testing.T) {
var nativeTests = []struct {
expr string
in any
}{
{
expr: `test.ListVal.exists(x, x.custom_name == "name")`,
in: map[string]any{
"test": &TestNestedStruct{ListVal: []*TestNestedType{{NestedCustomName: "name"}}},
},
},
}

envOpts := []cel.EnvOption{
NativeTypes(
reflect.ValueOf(&TestNestedStruct{}),
ParseStructTag("json"),
),
cel.Variable("test", cel.ObjectType("ext.TestNestedStruct")),
}

env, err := cel.NewEnv(envOpts...)
if err != nil {
t.Fatalf("cel.NewEnv(NativeTypes()) failed: %v", err)
}

for i, tst := range nativeTests {
tc := tst
t.Run(fmt.Sprintf("[%d]", i), func(t *testing.T) {
var asts []*cel.Ast
pAst, iss := env.Parse(tc.expr)
if iss.Err() != nil {
t.Fatalf("env.Parse(%v) failed: %v", tc.expr, iss.Err())
}
asts = append(asts, pAst)
cAst, iss := env.Check(pAst)
if iss.Err() != nil {
t.Fatalf("env.Check(%v) failed: %v", tc.expr, iss.Err())
}
asts = append(asts, cAst)
for _, ast := range asts {
prg, err := env.Program(ast)
if err != nil {
t.Fatal(err)
}
out, _, err := prg.Eval(tc.in)
if err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(out.Value(), true) {
t.Errorf("got %v, wanted true for expr: %s", out.Value(), tc.expr)
}
}
})
}
}

func TestNativeTypesVersion(t *testing.T) {
_, err := cel.NewEnv(NativeTypes(NativeTypesVersion(0)))
if err != nil {
Expand Down