From 61cce49a8a8ddb7b7c4783d08946091544305d5b Mon Sep 17 00:00:00 2001 From: William Carroll Date: Tue, 6 Sep 2022 14:20:14 -0700 Subject: feat(tvix/eval): Support builtins.getAttr Support looking-up values from attrsets by their keys. Change-Id: Ib37a472a511dab145f99ebc849879b3494e8e89f Reviewed-on: https://cl.tvl.fyi/c/depot/+/6554 Reviewed-by: wpcarro Reviewed-by: sterni Autosubmit: wpcarro Tested-by: BuildkiteCI --- tvix/eval/src/builtins/mod.rs | 11 +++++++++++ tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getattr.exp | 1 + tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getattr.nix | 6 ++++++ 3 files changed, 18 insertions(+) create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getattr.exp create mode 100644 tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getattr.nix diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index f6af16f96f..9714c96d05 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -131,6 +131,17 @@ fn pure_builtins() -> Vec { } } }), + Builtin::new("getAttr", &[true, true], |args, _| { + let k = args[0].to_str()?; + let xs = args[1].to_attrs()?; + + match xs.select(k.as_str()) { + Some(x) => Ok(x.clone()), + None => Err(ErrorKind::AttributeNotFound { + name: k.to_string(), + }), + } + }), Builtin::new("length", &[true], |args, _| { Ok(Value::Integer(args[0].to_list()?.len() as i64)) }), diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getattr.exp b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getattr.exp new file mode 100644 index 0000000000..89fa6c6810 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getattr.exp @@ -0,0 +1 @@ +[ 1 2 3 { bar = { baz = 3; }; } ] diff --git a/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getattr.nix b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getattr.nix new file mode 100644 index 0000000000..87a2adbcd3 --- /dev/null +++ b/tvix/eval/src/tests/tvix_tests/eval-okay-builtins-getattr.nix @@ -0,0 +1,6 @@ +[ + (builtins.getAttr "foo" { foo = 1; bar = 2; baz = 3; }) + (builtins.getAttr "bar" { foo = 1; bar = 2; baz = 3; }) + (builtins.getAttr "baz" { foo = 1; bar = 2; baz = 3; }) + (builtins.getAttr "foo" { foo = { bar = { baz = 3; }; }; }) +] -- cgit 1.4.1