about summary refs log tree commit diff
path: root/tvix/eval/src/builtins/mod.rs
diff options
context:
space:
mode:
authorVincent Ambo <mail@tazj.in>2023-03-03T20·55+0300
committertazjin <tazjin@tvl.su>2023-03-13T20·30+0000
commit7d339d27627de12e7dc99f823e84c381281babfc (patch)
treea26c6e2408677b34bc4ff1059452f8e69605823f /tvix/eval/src/builtins/mod.rs
parenta9f44721e51a189349910a5cf95e1071b01632a1 (diff)
fix(tvix/eval): handle `__toString` when JSON-serialising attrsets r/5976
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 <tvl@lahfa.xyz>
Tested-by: BuildkiteCI
Diffstat (limited to 'tvix/eval/src/builtins/mod.rs')
-rw-r--r--tvix/eval/src/builtins/mod.rs9
1 files changed, 9 insertions, 0 deletions
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<Value, ErrorKind> {
+        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;