From 02d35e4aa6ef84cdbd01d881bdc5c1acd50fc7dc Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 10 Jan 2023 14:52:59 +0300 Subject: feat(tvix/eval): implement builtins.toJSON Implements `Serialize` for `tvix_eval::Value`. Special care is taken with serialisation of attribute sets, and forcing of thunks. The tests should cover both cases well. Change-Id: I9bb135bacf6f87bc6bd0bd88cef0a42308e6c335 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7803 Reviewed-by: flokli Tested-by: BuildkiteCI Autosubmit: tazjin --- tvix/eval/src/builtins/mod.rs | 11 +++++++++++ 1 file changed, 11 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 9c9d171a21..331dcbcd41 100644 --- a/tvix/eval/src/builtins/mod.rs +++ b/tvix/eval/src/builtins/mod.rs @@ -343,6 +343,17 @@ mod pure_builtins { serde_json::from_str(&json_str).map_err(|err| err.into()) } + #[builtin("toJSON")] + fn builtin_to_json(vm: &mut VM, val: Value) -> Result { + // All thunks need to be evaluated before serialising, as the + // data structure is fully traversed by the Serializer (which + // does not have a `VM` available). + val.deep_force(vm, &mut Default::default())?; + + let json_str = serde_json::to_string(&val)?; + Ok(json_str.into()) + } + #[builtin("genericClosure")] fn builtin_generic_closure(vm: &mut VM, input: Value) -> Result { let attrs = input.to_attrs()?; -- cgit 1.4.1