From 7d339d27627de12e7dc99f823e84c381281babfc Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Fri, 3 Mar 2023 23:55:00 +0300 Subject: fix(tvix/eval): handle `__toString` when JSON-serialising attrsets These must be serialised to a JSON string of the *result* of coercing the function application to a string. Change-Id: Ib7f49ccd950503ddbdbf99643cd59565e26b50da Reviewed-on: https://cl.tvl.fyi/c/depot/+/8204 Reviewed-by: raitobezarius Tested-by: BuildkiteCI --- tvix/eval/src/builtins/mod.rs | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'tvix/eval/src/builtins/mod.rs') diff --git a/tvix/eval/src/builtins/mod.rs b/tvix/eval/src/builtins/mod.rs index e19de961588d..a9d04ba7c3fb 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -359,6 +359,15 @@ mod pure_builtins { #[builtin("toJSON")] async fn builtin_to_json(co: GenCo, val: Value) -> Result { + if let Value::Attrs(attrs) = &val { + // Attribute sets with a callable `__toString` attribute + // serialise to the string-coerced version of the result of + // calling that. + if let Some(s) = attrs.try_to_string(&co, CoercionKind::Weak).await { + return Ok(Value::String(serde_json::to_string(&s)?.into())); + } + } + // All thunks need to be evaluated before serialising, as the // data structure is fully traversed by the Serializer. let val = generators::request_deep_force(&co, val, SharedThunkSet::default()).await; -- cgit 1.4.1