git.delta.rocks / jrsonnet / refs/commits / bd50dd196053

difftreelog

refactor split Typed into FromUntyped and IntoUntyped

ysonnywlYaroslav Bolyukin2026-03-22parent: #8667194.patch.diff
in: master

20 files changed

modifiedbindings/jsonnet/src/native.rsdiffbeforeafterboth
--- a/bindings/jsonnet/src/native.rs
+++ b/bindings/jsonnet/src/native.rs
@@ -6,7 +6,7 @@
 use jrsonnet_evaluator::{
 	error::{Error, ErrorKind},
 	function::builtin::{NativeCallback, NativeCallbackHandler},
-	typed::Typed,
+	typed::FromUntyped as _,
 	IStr, Val,
 };
 
modifiedcmds/jrsonnet/Cargo.tomldiffbeforeafterboth
--- a/cmds/jrsonnet/Cargo.toml
+++ b/cmds/jrsonnet/Cargo.toml
@@ -11,10 +11,6 @@
 workspace = true
 
 [features]
-default = [
-    "exp-regex",
-]
-
 experimental = [
     "exp-preserve-order",
     "exp-destruct",
modifiedcrates/jrsonnet-evaluator/src/arr/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/arr/mod.rs
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -5,11 +5,11 @@
 	rc::Rc,
 };
 
-use jrsonnet_gcmodule::{cc_dyn, Cc, Trace};
+use jrsonnet_gcmodule::{cc_dyn, Cc};
 use jrsonnet_interner::IBytes;
 use jrsonnet_parser::{Expr, Spanned};
 
-use crate::{function::NativeFn, typed::Typed, Context, Result, Thunk, Val};
+use crate::{function::NativeFn, Context, Result, Thunk, Val};
 
 mod spec;
 pub use spec::{ArrayLike, *};
@@ -241,4 +241,3 @@
 		self.0.is_cheap()
 	}
 }
-
modifiedcrates/jrsonnet-evaluator/src/arr/spec.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/arr/spec.rs
+++ b/crates/jrsonnet-evaluator/src/arr/spec.rs
@@ -8,8 +8,11 @@
 use super::ArrValue;
 use crate::function::NativeFn;
 use crate::{
-	error::ErrorKind::InfiniteRecursionDetected, evaluate, typed::Typed, val::ThunkValue, Context,
-	Error, ObjValue, Result, Thunk, Val,
+	error::ErrorKind::InfiniteRecursionDetected,
+	evaluate,
+	typed::{IntoUntyped, Typed},
+	val::ThunkValue,
+	Context, Error, ObjValue, Result, Thunk, Val,
 };
 
 pub trait ArrayLike: Any + Trace + Debug {
modifiedcrates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/evaluate/mod.rs
1use std::rc::Rc;23use jrsonnet_gcmodule::{Cc, Trace};4use jrsonnet_interner::IStr;5use jrsonnet_parser::{6	function::ParamName, ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, ExprParams,7	FieldMember, FieldName, ForSpecData, IfSpecData, ImportKind, LiteralType, ObjBody, ObjMembers,8	Spanned,9};10use jrsonnet_types::ValType;11use rustc_hash::FxHashMap;1213use self::destructure::destruct;14use crate::{15	arr::ArrValue,16	bail,17	destructure::evaluate_dest,18	error::{suggest_object_fields, ErrorKind::*},19	evaluate::operator::{evaluate_add_op, evaluate_binary_op_special, evaluate_unary_op},20	function::{CallLocation, FuncDesc, FuncVal},21	gc::WithCapacityExt as _,22	in_frame,23	typed::Typed,24	val::{CachedUnbound, IndexableVal, NumValue, StrValue, Thunk},25	with_state, Context, Error, ObjValue, ObjValueBuilder, ObjectAssertion, Pending, Result,26	ResultExt, SupThis, Unbound, Val,27};28pub mod destructure;29pub mod operator;3031// This is the amount of bytes that need to be left on the stack before increasing the size.32// It must be at least as large as the stack required by any code that does not call33// `ensure_sufficient_stack`.34const RED_ZONE: usize = 100 * 1024; // 100k3536// Only the first stack that is pushed, grows exponentially (2^n * STACK_PER_RECURSION) from then37// on. This flag has performance relevant characteristics. Don't set it too high.38const STACK_PER_RECURSION: usize = 1024 * 1024; // 1MB3940/// Grows the stack on demand to prevent stack overflow. Call this in strategic locations41/// to "break up" recursive calls. E.g. almost any call to `visit_expr` or equivalent can benefit42/// from this.43///44/// Should not be sprinkled around carelessly, as it causes a little bit of overhead.45#[inline]46pub fn ensure_sufficient_stack<R>(f: impl FnOnce() -> R) -> R {47	stacker::maybe_grow(RED_ZONE, STACK_PER_RECURSION, f)48}4950pub fn evaluate_trivial(expr: &Spanned<Expr>) -> Option<Val> {51	fn is_trivial(expr: &Spanned<Expr>) -> bool {52		match &**expr {53			Expr::Str(_)54			| Expr::Num(_)55			| Expr::Literal(LiteralType::False | LiteralType::True | LiteralType::Null) => true,56			Expr::Arr(a) => a.iter().all(is_trivial),57			_ => false,58		}59	}60	Some(match &**expr {61		Expr::Str(s) => Val::string(s.clone()),62		Expr::Num(n) => {63			Val::Num(NumValue::new(*n).expect("parser will not allow non-finite values"))64		}65		Expr::Literal(LiteralType::False) => Val::Bool(false),66		Expr::Literal(LiteralType::True) => Val::Bool(true),67		Expr::Literal(LiteralType::Null) => Val::Null,68		Expr::Arr(n) => {69			if n.iter().any(|e| !is_trivial(e)) {70				return None;71			}72			Val::Arr(ArrValue::eager(73				n.iter()74					.map(evaluate_trivial)75					.map(|e| e.expect("checked trivial"))76					.collect(),77			))78		}79		_ => return None,80	})81}8283pub fn evaluate_method(84	ctx: Context,85	name: IStr,86	params: ExprParams,87	body: Rc<Spanned<Expr>>,88) -> Val {89	Val::Func(FuncVal::Normal(Cc::new(FuncDesc {90		name,91		ctx,92		params,93		body,94	})))95}9697pub fn evaluate_field_name(ctx: Context, field_name: &FieldName) -> Result<Option<IStr>> {98	Ok(match field_name {99		FieldName::Fixed(n) => Some(n.clone()),100		FieldName::Dyn(expr) => in_frame(101			CallLocation::new(&expr.span()),102			|| "evaluating field name".to_string(),103			|| {104				let value = evaluate(ctx, expr)?;105				if matches!(value, Val::Null) {106					Ok(None)107				} else {108					Ok(Some(IStr::from_untyped(value)?))109				}110			},111		)?,112	})113}114115pub fn evaluate_comp(116	ctx: Context,117	specs: &[CompSpec],118	callback: &mut impl FnMut(Context) -> Result<()>,119) -> Result<()> {120	match specs.first() {121		None => callback(ctx)?,122		Some(CompSpec::IfSpec(IfSpecData(cond))) => {123			if bool::from_untyped(evaluate(ctx.clone(), cond)?)? {124				evaluate_comp(ctx, &specs[1..], callback)?;125			}126		}127		Some(CompSpec::ForSpec(ForSpecData(var, expr))) => match evaluate(ctx.clone(), expr)? {128			Val::Arr(list) => {129				for item in list.iter_lazy() {130					let fctx = Pending::new();131					let mut new_bindings = FxHashMap::with_capacity(var.binds_len());132					destruct(var, item, fctx.clone(), &mut new_bindings)?;133					let ctx = ctx.clone().extend_bindings(new_bindings).into_future(fctx);134135					evaluate_comp(ctx, &specs[1..], callback)?;136				}137			}138			#[cfg(feature = "exp-object-iteration")]139			Val::Obj(obj) => {140				for field in obj.fields(141					// TODO: Should there be ability to preserve iteration order?142					#[cfg(feature = "exp-preserve-order")]143					false,144				) {145					let fctx = Pending::new();146					let mut new_bindings = FxHashMap::with_capacity(var.capacity_hint());147					let obj = obj.clone();148					let value = Thunk::evaluated(Val::Arr(ArrValue::lazy(vec![149						Thunk::evaluated(Val::string(field.clone())),150						Thunk!(move || obj.get(field).transpose().expect(151							"field exists, as field name was obtained from object.fields()",152						)),153					])));154					destruct(var, value, fctx.clone(), &mut new_bindings)?;155					let ctx = ctx.clone().extend_bindings(new_bindings).into_future(fctx);156157					evaluate_comp(ctx, &specs[1..], callback)?;158				}159			}160			_ => bail!(InComprehensionCanOnlyIterateOverArray),161		},162	}163	Ok(())164}165166trait CloneableUnbound<T>: Unbound<Bound = T> + Clone {}167impl<V, T> CloneableUnbound<T> for V where V: Unbound<Bound = T> + Clone {}168169fn evaluate_object_locals(170	fctx: Context,171	locals: Rc<Vec<BindSpec>>,172) -> impl CloneableUnbound<Context> {173	#[derive(Trace, Clone)]174	struct UnboundLocals {175		fctx: Context,176		locals: Rc<Vec<BindSpec>>,177	}178	impl Unbound for UnboundLocals {179		type Bound = Context;180181		fn bind(&self, sup_this: SupThis) -> Result<Context> {182			let fctx = Context::new_future();183			let mut new_bindings =184				FxHashMap::with_capacity(self.locals.iter().map(BindSpec::binds_len).sum());185			for b in self.locals.iter() {186				evaluate_dest(b, fctx.clone(), &mut new_bindings)?;187			}188189			let ctx = self.fctx.clone();190191			let ctx = ctx192				.extend_bindings_sup_this(new_bindings, sup_this)193				.into_future(fctx);194195			Ok(ctx)196		}197	}198199	UnboundLocals { fctx, locals }200}201202pub fn evaluate_field_member<B: Unbound<Bound = Context> + Clone>(203	builder: &mut ObjValueBuilder,204	ctx: Context,205	uctx: B,206	field: &FieldMember,207) -> Result<()> {208	let name = evaluate_field_name(ctx, &field.name)?;209	let Some(name) = name else {210		return Ok(());211	};212213	match field {214		FieldMember {215			plus,216			params: None,217			visibility,218			value,219			..220		} => {221			#[derive(Trace)]222			struct UnboundValue<B: Trace> {223				uctx: B,224				value: Rc<Spanned<Expr>>,225				name: IStr,226			}227			impl<B: Unbound<Bound = Context>> Unbound for UnboundValue<B> {228				type Bound = Val;229				fn bind(&self, sup_this: SupThis) -> Result<Val> {230					evaluate_named(self.uctx.bind(sup_this)?, &self.value, self.name.clone())231				}232			}233234			builder235				.field(name.clone())236				.with_add(*plus)237				.with_visibility(*visibility)238				.with_location(value.span())239				.bindable(UnboundValue {240					uctx,241					value: value.clone(),242					name,243				})?;244		}245		FieldMember {246			params: Some(params),247			visibility,248			value,249			..250		} => {251			#[derive(Trace)]252			struct UnboundMethod<B: Trace> {253				uctx: B,254				value: Rc<Spanned<Expr>>,255				params: ExprParams,256				name: IStr,257			}258			impl<B: Unbound<Bound = Context>> Unbound for UnboundMethod<B> {259				type Bound = Val;260				fn bind(&self, sup_this: SupThis) -> Result<Val> {261					Ok(evaluate_method(262						self.uctx.bind(sup_this)?,263						self.name.clone(),264						self.params.clone(),265						self.value.clone(),266					))267				}268			}269270			builder271				.field(name.clone())272				.with_visibility(*visibility)273				.with_location(value.span())274				.bindable(UnboundMethod {275					uctx,276					value: value.clone(),277					params: params.clone(),278					name,279				})?;280		}281	}282	Ok(())283}284285#[allow(clippy::too_many_lines)]286pub fn evaluate_member_list_object(ctx: Context, members: &ObjMembers) -> Result<ObjValue> {287	let mut builder = ObjValueBuilder::new();288	let locals = members.locals.clone();289290	// We have single context for all fields, so we can cache binds291	let uctx = CachedUnbound::new(evaluate_object_locals(ctx.clone(), locals));292293	for field in &members.fields {294		evaluate_field_member(&mut builder, ctx.clone(), uctx.clone(), field)?;295	}296297	if !members.asserts.is_empty() {298		#[derive(Trace)]299		struct ObjectAssert<B: Trace> {300			uctx: B,301			asserts: Rc<Vec<AssertStmt>>,302		}303		impl<B: Unbound<Bound = Context>> ObjectAssertion for ObjectAssert<B> {304			fn run(&self, sup_this: SupThis) -> Result<()> {305				let ctx = self.uctx.bind(sup_this)?;306				for assert in &*self.asserts {307					evaluate_assert(ctx.clone(), assert)?;308				}309				Ok(())310			}311		}312		builder.assert(ObjectAssert {313			uctx,314			asserts: members.asserts.clone(),315		});316	}317318	Ok(builder.build())319}320321pub fn evaluate_object(ctx: Context, object: &ObjBody) -> Result<ObjValue> {322	Ok(match object {323		ObjBody::MemberList(members) => evaluate_member_list_object(ctx, members)?,324		ObjBody::ObjComp(obj) => {325			let mut builder = ObjValueBuilder::new();326			let locals = obj.locals.clone();327			evaluate_comp(ctx, &obj.compspecs, &mut |ctx| {328				let uctx = evaluate_object_locals(ctx.clone(), locals.clone());329330				evaluate_field_member(&mut builder, ctx, uctx, &obj.field)331			})?;332333			builder.build()334		}335	})336}337338pub fn evaluate_apply(339	ctx: Context,340	value: &Spanned<Expr>,341	args: &ArgsDesc,342	loc: CallLocation<'_>,343	tailstrict: bool,344) -> Result<Val> {345	let value = evaluate(ctx.clone(), value)?;346	Ok(match value {347		Val::Func(f) => {348			let body = || f.evaluate(ctx, loc, args, tailstrict);349			if tailstrict {350				body()?351			} else {352				in_frame(loc, || format!("function <{}> call", f.name()), body)?353			}354		}355		v => bail!(OnlyFunctionsCanBeCalledGot(v.value_type())),356	})357}358359pub fn evaluate_assert(ctx: Context, assertion: &AssertStmt) -> Result<()> {360	let value = &assertion.0;361	let msg = &assertion.1;362	let assertion_result = in_frame(363		CallLocation::new(&value.span()),364		|| "assertion condition".to_owned(),365		|| bool::from_untyped(evaluate(ctx.clone(), value)?),366	)?;367	if !assertion_result {368		in_frame(369			CallLocation::new(&value.span()),370			|| "assertion failure".to_owned(),371			|| {372				if let Some(msg) = msg {373					bail!(AssertionFailed(evaluate(ctx, msg)?.to_string()?));374				}375				bail!(AssertionFailed(Val::Null.to_string()?));376			},377		)?;378	}379	Ok(())380}381382pub fn evaluate_named_param(ctx: Context, expr: &Spanned<Expr>, name: ParamName) -> Result<Val> {383	match name {384		ParamName::Named(name) => evaluate_named(ctx, expr, name),385		ParamName::Unnamed => evaluate(ctx, expr),386	}387}388389pub fn evaluate_named(ctx: Context, expr: &Spanned<Expr>, name: IStr) -> Result<Val> {390	use Expr::*;391	Ok(match &**expr {392		Function(params, body) => evaluate_method(ctx, name, params.clone(), body.clone()),393		_ => evaluate(ctx, expr)?,394	})395}396397#[allow(clippy::too_many_lines)]398pub fn evaluate(ctx: Context, expr: &Spanned<Expr>) -> Result<Val> {399	use Expr::*;400401	if let Some(trivial) = evaluate_trivial(expr) {402		return Ok(trivial);403	}404	let loc = expr.span();405	Ok(match &**expr {406		Literal(LiteralType::This) => Val::Obj(ctx.try_this()?),407		Literal(LiteralType::Super) => Val::Obj(ctx.try_sup_this()?.standalone_super()?),408		Literal(LiteralType::Dollar) => Val::Obj(ctx.try_dollar()?),409		Literal(LiteralType::True) => Val::Bool(true),410		Literal(LiteralType::False) => Val::Bool(false),411		Literal(LiteralType::Null) => Val::Null,412		Str(v) => Val::string(v.clone()),413		Num(v) => Val::try_num(*v)?,414		// I have tried to remove special behavior from super by implementing standalone-super415		// expresion, but looks like this case still needs special treatment.416		//417		// Note that other jsonnet implementations will fail on `if value in (super)` expression,418		// because the standalone super literal is not supported, that is because in other419		// implementations `in super` treated differently from `in smth_else`.420		BinaryOp(bin)421			if matches!(&*bin.rhs, Expr::Literal(LiteralType::Super))422				&& bin.op == BinaryOpType::In =>423		{424			let sup_this = ctx.try_sup_this()?;425			// In jsonnet, "field" in e is eager, LHS expression is always executed regardless of super existence.426			// In jrsonnet, however, this wasn't true, this was kept here for compatibility.427			if !sup_this.has_super() {428				return Ok(Val::Bool(false));429			}430			let field = evaluate(ctx, &bin.lhs)?;431			Val::Bool(sup_this.field_in_super(field.to_string()?))432		}433		BinaryOp(bin) => evaluate_binary_op_special(ctx, &bin.lhs, bin.op, &bin.rhs)?,434		UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(ctx, v)?)?,435		Var(name) => in_frame(436			CallLocation::new(&loc),437			|| format!("local <{name}> access"),438			|| ctx.binding(name.clone())?.evaluate(),439		)?,440		Index { indexable, parts } => ensure_sufficient_stack(|| {441			let mut parts = parts.iter();442			let mut indexable = if matches!(&***indexable, Expr::Literal(LiteralType::Super)) {443				let part = parts.next().expect("at least part should exist");444				// sup_this existence check might also be skipped here for null-coalesce...445				// But I believe this might cause errors.446				let sup_this = ctx.try_sup_this()?;447				if !sup_this.has_super() {448					#[cfg(feature = "exp-null-coaelse")]449					if part.null_coaelse {450						return Ok(Val::Null);451					}452					bail!(NoSuperFound)453				}454				let name = evaluate(ctx.clone(), &part.value)?;455456				let Val::Str(name) = name else {457					bail!(ValueIndexMustBeTypeGot(458						ValType::Obj,459						ValType::Str,460						name.value_type(),461					))462				};463464				let name = name.into_flat();465				match sup_this466					.get_super(name.clone())467					.with_description_src(&part.value, || format!("field <{name}> access"))?468				{469					Some(v) => v,470					#[cfg(feature = "exp-null-coaelse")]471					None if part.null_coaelse => return Ok(Val::Null),472					None => {473						let suggestions = suggest_object_fields(474							&sup_this.standalone_super().expect("super exists"),475							name.clone(),476						);477478						bail!(NoSuchField(name, suggestions))479					}480				}481			} else {482				evaluate(ctx.clone(), indexable)?483			};484485			for part in parts {486				indexable = match (indexable, evaluate(ctx.clone(), &part.value)?) {487					(Val::Obj(v), Val::Str(key)) => match v488						.get(key.clone().into_flat())489						.with_description_src(&part.value, || format!("field <{key}> access"))?490					{491						Some(v) => v,492						#[cfg(feature = "exp-null-coaelse")]493						None if part.null_coaelse => return Ok(Val::Null),494						None => {495							let suggestions = suggest_object_fields(&v, key.clone().into_flat());496497							return Err(Error::from(NoSuchField(498								key.clone().into_flat(),499								suggestions,500							)))501							.with_description_src(&part.value, || format!("field <{key}> access"));502						}503					},504					(Val::Obj(_), n) => bail!(ValueIndexMustBeTypeGot(505						ValType::Obj,506						ValType::Str,507						n.value_type(),508					)),509					(Val::Arr(v), Val::Num(n)) => {510						let n = n.get();511						if n.fract() > f64::EPSILON {512							bail!(FractionalIndex)513						}514						if n < 0.0 {515							bail!(ArrayBoundsError(n as isize, v.len()));516						}517						v.get(n as usize)?518							.ok_or_else(|| ArrayBoundsError(n as isize, v.len()))?519					}520					(Val::Arr(_), Val::Str(n)) => {521						bail!(AttemptedIndexAnArrayWithString(n.into_flat()))522					}523					(Val::Arr(_), n) => bail!(ValueIndexMustBeTypeGot(524						ValType::Arr,525						ValType::Num,526						n.value_type(),527					)),528529					(Val::Str(s), Val::Num(n)) => Val::Str({530						let n = n.get();531						if n.fract() > f64::EPSILON {532							bail!(FractionalIndex)533						}534						if n < 0.0 {535							bail!(ArrayBoundsError(n as isize, s.into_flat().chars().count()));536						}537						let v: IStr = s538							.clone()539							.into_flat()540							.chars()541							.skip(n as usize)542							.take(1)543							.collect::<String>()544							.into();545						if v.is_empty() {546							bail!(StringBoundsError(n as usize, s.into_flat().chars().count()))547						}548						StrValue::Flat(v)549					}),550					(Val::Str(_), n) => bail!(ValueIndexMustBeTypeGot(551						ValType::Str,552						ValType::Num,553						n.value_type(),554					)),555					#[cfg(feature = "exp-null-coaelse")]556					(Val::Null, _) if part.null_coaelse => return Ok(Val::Null),557					(v, _) => bail!(CantIndexInto(v.value_type())),558				};559			}560			Ok(indexable)561		})?,562		LocalExpr(bindings, returned) => {563			let mut new_bindings: FxHashMap<IStr, Thunk<Val>> =564				FxHashMap::with_capacity(bindings.iter().map(BindSpec::binds_len).sum());565			let fctx = Context::new_future();566			for b in bindings {567				evaluate_dest(b, fctx.clone(), &mut new_bindings)?;568			}569			let ctx = ctx.extend_bindings(new_bindings).into_future(fctx);570			evaluate(ctx, returned)?571		}572		Arr(items) => {573			if items.is_empty() {574				Val::Arr(ArrValue::empty())575			} else {576				Val::Arr(ArrValue::expr(ctx, items.clone()))577			}578		}579		ArrComp(expr, comp_specs) => {580			let mut out = Vec::new();581			evaluate_comp(ctx, comp_specs, &mut |ctx| {582				let expr = expr.clone();583				out.push(Thunk!(move || evaluate(ctx, &expr)));584				Ok(())585			})?;586			Val::Arr(ArrValue::lazy(out))587		}588		Obj(body) => Val::Obj(evaluate_object(ctx, body)?),589		ObjExtend(a, b) => evaluate_add_op(590			&evaluate(ctx.clone(), a)?,591			&Val::Obj(evaluate_object(ctx, b)?),592		)?,593		Apply(value, args, tailstrict) => ensure_sufficient_stack(|| {594			evaluate_apply(ctx, value, args, CallLocation::new(&loc), *tailstrict)595		})?,596		Function(params, body) => {597			evaluate_method(ctx, "anonymous".into(), params.clone(), body.clone())598		}599		AssertExpr(assert) => {600			evaluate_assert(ctx.clone(), &assert.assert)?;601			evaluate(ctx, &assert.rest)?602		}603		ErrorStmt(e) => in_frame(604			CallLocation::new(&loc),605			|| "error statement".to_owned(),606			|| bail!(RuntimeError(evaluate(ctx, e)?.to_string()?,)),607		)?,608		IfElse(if_else) => {609			if in_frame(610				CallLocation::new(&loc),611				|| "if condition".to_owned(),612				|| bool::from_untyped(evaluate(ctx.clone(), &if_else.cond.0)?),613			)? {614				evaluate(ctx, &if_else.cond_then)?615			} else {616				match &if_else.cond_else {617					Some(v) => evaluate(ctx, v)?,618					None => Val::Null,619				}620			}621		}622		Slice(slice) => {623			fn parse_idx<T: Typed>(624				loc: CallLocation<'_>,625				ctx: Context,626				expr: Option<&Spanned<Expr>>,627				desc: &'static str,628			) -> Result<Option<T>> {629				if let Some(value) = expr {630					Ok(in_frame(631						loc,632						|| format!("slice {desc}"),633						|| <Option<T>>::from_untyped(evaluate(ctx, value)?),634					)?)635				} else {636					Ok(None)637				}638			}639640			let indexable = evaluate(ctx.clone(), &slice.value)?;641			let loc = CallLocation::new(&loc);642643			let start = parse_idx(loc, ctx.clone(), slice.slice.start.as_ref(), "start")?;644			let end = parse_idx(loc, ctx.clone(), slice.slice.end.as_ref(), "end")?;645			let step = parse_idx(loc, ctx, slice.slice.step.as_ref(), "step")?;646647			IndexableVal::into_untyped(indexable.into_indexable()?.slice(start, end, step)?)?648		}649		Import(kind, path) => {650			let Expr::Str(path) = &***path else {651				bail!("computed imports are not supported")652			};653			let tmp = loc.clone().0;654			with_state(|s| {655				let resolved_path = s.resolve_from(tmp.source_path(), path)?;656				Ok(match kind {657					ImportKind::Normal => in_frame(658						CallLocation::new(&loc),659						|| format!("import {:?}", path.clone()),660						|| s.import_resolved(resolved_path),661					)?,662					ImportKind::Str => Val::string(s.import_resolved_str(resolved_path)?),663					ImportKind::Bin => {664						Val::Arr(ArrValue::bytes(s.import_resolved_bin(resolved_path)?))665					}666				}) as Result<Val>667			})?668		}669	})670}
after · crates/jrsonnet-evaluator/src/evaluate/mod.rs
1use std::rc::Rc;23use jrsonnet_gcmodule::{Cc, Trace};4use jrsonnet_interner::IStr;5use jrsonnet_parser::{6	function::ParamName, ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, ExprParams,7	FieldMember, FieldName, ForSpecData, IfSpecData, ImportKind, LiteralType, ObjBody, ObjMembers,8	Spanned,9};10use jrsonnet_types::ValType;11use rustc_hash::FxHashMap;1213use self::destructure::destruct;14use crate::{15	arr::ArrValue,16	bail,17	destructure::evaluate_dest,18	error::{suggest_object_fields, ErrorKind::*},19	evaluate::operator::{evaluate_add_op, evaluate_binary_op_special, evaluate_unary_op},20	function::{CallLocation, FuncDesc, FuncVal},21	gc::WithCapacityExt as _,22	in_frame,23	typed::{FromUntyped, IntoUntyped as _, Typed},24	val::{CachedUnbound, IndexableVal, NumValue, StrValue, Thunk},25	with_state, Context, Error, ObjValue, ObjValueBuilder, ObjectAssertion, Pending, Result,26	ResultExt, SupThis, Unbound, Val,27};28pub mod destructure;29pub mod operator;3031// This is the amount of bytes that need to be left on the stack before increasing the size.32// It must be at least as large as the stack required by any code that does not call33// `ensure_sufficient_stack`.34const RED_ZONE: usize = 100 * 1024; // 100k3536// Only the first stack that is pushed, grows exponentially (2^n * STACK_PER_RECURSION) from then37// on. This flag has performance relevant characteristics. Don't set it too high.38const STACK_PER_RECURSION: usize = 1024 * 1024; // 1MB3940/// Grows the stack on demand to prevent stack overflow. Call this in strategic locations41/// to "break up" recursive calls. E.g. almost any call to `visit_expr` or equivalent can benefit42/// from this.43///44/// Should not be sprinkled around carelessly, as it causes a little bit of overhead.45#[inline]46pub fn ensure_sufficient_stack<R>(f: impl FnOnce() -> R) -> R {47	stacker::maybe_grow(RED_ZONE, STACK_PER_RECURSION, f)48}4950pub fn evaluate_trivial(expr: &Spanned<Expr>) -> Option<Val> {51	fn is_trivial(expr: &Spanned<Expr>) -> bool {52		match &**expr {53			Expr::Str(_)54			| Expr::Num(_)55			| Expr::Literal(LiteralType::False | LiteralType::True | LiteralType::Null) => true,56			Expr::Arr(a) => a.iter().all(is_trivial),57			_ => false,58		}59	}60	Some(match &**expr {61		Expr::Str(s) => Val::string(s.clone()),62		Expr::Num(n) => {63			Val::Num(NumValue::new(*n).expect("parser will not allow non-finite values"))64		}65		Expr::Literal(LiteralType::False) => Val::Bool(false),66		Expr::Literal(LiteralType::True) => Val::Bool(true),67		Expr::Literal(LiteralType::Null) => Val::Null,68		Expr::Arr(n) => {69			if n.iter().any(|e| !is_trivial(e)) {70				return None;71			}72			Val::Arr(ArrValue::eager(73				n.iter()74					.map(evaluate_trivial)75					.map(|e| e.expect("checked trivial"))76					.collect(),77			))78		}79		_ => return None,80	})81}8283pub fn evaluate_method(84	ctx: Context,85	name: IStr,86	params: ExprParams,87	body: Rc<Spanned<Expr>>,88) -> Val {89	Val::Func(FuncVal::Normal(Cc::new(FuncDesc {90		name,91		ctx,92		params,93		body,94	})))95}9697pub fn evaluate_field_name(ctx: Context, field_name: &FieldName) -> Result<Option<IStr>> {98	Ok(match field_name {99		FieldName::Fixed(n) => Some(n.clone()),100		FieldName::Dyn(expr) => in_frame(101			CallLocation::new(&expr.span()),102			|| "evaluating field name".to_string(),103			|| {104				let value = evaluate(ctx, expr)?;105				if matches!(value, Val::Null) {106					Ok(None)107				} else {108					Ok(Some(IStr::from_untyped(value)?))109				}110			},111		)?,112	})113}114115pub fn evaluate_comp(116	ctx: Context,117	specs: &[CompSpec],118	callback: &mut impl FnMut(Context) -> Result<()>,119) -> Result<()> {120	match specs.first() {121		None => callback(ctx)?,122		Some(CompSpec::IfSpec(IfSpecData(cond))) => {123			if bool::from_untyped(evaluate(ctx.clone(), cond)?)? {124				evaluate_comp(ctx, &specs[1..], callback)?;125			}126		}127		Some(CompSpec::ForSpec(ForSpecData(var, expr))) => match evaluate(ctx.clone(), expr)? {128			Val::Arr(list) => {129				for item in list.iter_lazy() {130					let fctx = Pending::new();131					let mut new_bindings = FxHashMap::with_capacity(var.binds_len());132					destruct(var, item, fctx.clone(), &mut new_bindings)?;133					let ctx = ctx.clone().extend_bindings(new_bindings).into_future(fctx);134135					evaluate_comp(ctx, &specs[1..], callback)?;136				}137			}138			#[cfg(feature = "exp-object-iteration")]139			Val::Obj(obj) => {140				for field in obj.fields(141					// TODO: Should there be ability to preserve iteration order?142					#[cfg(feature = "exp-preserve-order")]143					false,144				) {145					let fctx = Pending::new();146					let mut new_bindings = FxHashMap::with_capacity(var.capacity_hint());147					let obj = obj.clone();148					let value = Thunk::evaluated(Val::Arr(ArrValue::lazy(vec![149						Thunk::evaluated(Val::string(field.clone())),150						Thunk!(move || obj.get(field).transpose().expect(151							"field exists, as field name was obtained from object.fields()",152						)),153					])));154					destruct(var, value, fctx.clone(), &mut new_bindings)?;155					let ctx = ctx.clone().extend_bindings(new_bindings).into_future(fctx);156157					evaluate_comp(ctx, &specs[1..], callback)?;158				}159			}160			_ => bail!(InComprehensionCanOnlyIterateOverArray),161		},162	}163	Ok(())164}165166trait CloneableUnbound<T>: Unbound<Bound = T> + Clone {}167impl<V, T> CloneableUnbound<T> for V where V: Unbound<Bound = T> + Clone {}168169fn evaluate_object_locals(170	fctx: Context,171	locals: Rc<Vec<BindSpec>>,172) -> impl CloneableUnbound<Context> {173	#[derive(Trace, Clone)]174	struct UnboundLocals {175		fctx: Context,176		locals: Rc<Vec<BindSpec>>,177	}178	impl Unbound for UnboundLocals {179		type Bound = Context;180181		fn bind(&self, sup_this: SupThis) -> Result<Context> {182			let fctx = Context::new_future();183			let mut new_bindings =184				FxHashMap::with_capacity(self.locals.iter().map(BindSpec::binds_len).sum());185			for b in self.locals.iter() {186				evaluate_dest(b, fctx.clone(), &mut new_bindings)?;187			}188189			let ctx = self.fctx.clone();190191			let ctx = ctx192				.extend_bindings_sup_this(new_bindings, sup_this)193				.into_future(fctx);194195			Ok(ctx)196		}197	}198199	UnboundLocals { fctx, locals }200}201202pub fn evaluate_field_member<B: Unbound<Bound = Context> + Clone>(203	builder: &mut ObjValueBuilder,204	ctx: Context,205	uctx: B,206	field: &FieldMember,207) -> Result<()> {208	let name = evaluate_field_name(ctx, &field.name)?;209	let Some(name) = name else {210		return Ok(());211	};212213	match field {214		FieldMember {215			plus,216			params: None,217			visibility,218			value,219			..220		} => {221			#[derive(Trace)]222			struct UnboundValue<B: Trace> {223				uctx: B,224				value: Rc<Spanned<Expr>>,225				name: IStr,226			}227			impl<B: Unbound<Bound = Context>> Unbound for UnboundValue<B> {228				type Bound = Val;229				fn bind(&self, sup_this: SupThis) -> Result<Val> {230					evaluate_named(self.uctx.bind(sup_this)?, &self.value, self.name.clone())231				}232			}233234			builder235				.field(name.clone())236				.with_add(*plus)237				.with_visibility(*visibility)238				.with_location(value.span())239				.bindable(UnboundValue {240					uctx,241					value: value.clone(),242					name,243				})?;244		}245		FieldMember {246			params: Some(params),247			visibility,248			value,249			..250		} => {251			#[derive(Trace)]252			struct UnboundMethod<B: Trace> {253				uctx: B,254				value: Rc<Spanned<Expr>>,255				params: ExprParams,256				name: IStr,257			}258			impl<B: Unbound<Bound = Context>> Unbound for UnboundMethod<B> {259				type Bound = Val;260				fn bind(&self, sup_this: SupThis) -> Result<Val> {261					Ok(evaluate_method(262						self.uctx.bind(sup_this)?,263						self.name.clone(),264						self.params.clone(),265						self.value.clone(),266					))267				}268			}269270			builder271				.field(name.clone())272				.with_visibility(*visibility)273				.with_location(value.span())274				.bindable(UnboundMethod {275					uctx,276					value: value.clone(),277					params: params.clone(),278					name,279				})?;280		}281	}282	Ok(())283}284285#[allow(clippy::too_many_lines)]286pub fn evaluate_member_list_object(ctx: Context, members: &ObjMembers) -> Result<ObjValue> {287	let mut builder = ObjValueBuilder::new();288	let locals = members.locals.clone();289290	// We have single context for all fields, so we can cache binds291	let uctx = CachedUnbound::new(evaluate_object_locals(ctx.clone(), locals));292293	for field in &members.fields {294		evaluate_field_member(&mut builder, ctx.clone(), uctx.clone(), field)?;295	}296297	if !members.asserts.is_empty() {298		#[derive(Trace)]299		struct ObjectAssert<B: Trace> {300			uctx: B,301			asserts: Rc<Vec<AssertStmt>>,302		}303		impl<B: Unbound<Bound = Context>> ObjectAssertion for ObjectAssert<B> {304			fn run(&self, sup_this: SupThis) -> Result<()> {305				let ctx = self.uctx.bind(sup_this)?;306				for assert in &*self.asserts {307					evaluate_assert(ctx.clone(), assert)?;308				}309				Ok(())310			}311		}312		builder.assert(ObjectAssert {313			uctx,314			asserts: members.asserts.clone(),315		});316	}317318	Ok(builder.build())319}320321pub fn evaluate_object(ctx: Context, object: &ObjBody) -> Result<ObjValue> {322	Ok(match object {323		ObjBody::MemberList(members) => evaluate_member_list_object(ctx, members)?,324		ObjBody::ObjComp(obj) => {325			let mut builder = ObjValueBuilder::new();326			let locals = obj.locals.clone();327			evaluate_comp(ctx, &obj.compspecs, &mut |ctx| {328				let uctx = evaluate_object_locals(ctx.clone(), locals.clone());329330				evaluate_field_member(&mut builder, ctx, uctx, &obj.field)331			})?;332333			builder.build()334		}335	})336}337338pub fn evaluate_apply(339	ctx: Context,340	value: &Spanned<Expr>,341	args: &ArgsDesc,342	loc: CallLocation<'_>,343	tailstrict: bool,344) -> Result<Val> {345	let value = evaluate(ctx.clone(), value)?;346	Ok(match value {347		Val::Func(f) => {348			let body = || f.evaluate(ctx, loc, args, tailstrict);349			if tailstrict {350				body()?351			} else {352				in_frame(loc, || format!("function <{}> call", f.name()), body)?353			}354		}355		v => bail!(OnlyFunctionsCanBeCalledGot(v.value_type())),356	})357}358359pub fn evaluate_assert(ctx: Context, assertion: &AssertStmt) -> Result<()> {360	let value = &assertion.0;361	let msg = &assertion.1;362	let assertion_result = in_frame(363		CallLocation::new(&value.span()),364		|| "assertion condition".to_owned(),365		|| bool::from_untyped(evaluate(ctx.clone(), value)?),366	)?;367	if !assertion_result {368		in_frame(369			CallLocation::new(&value.span()),370			|| "assertion failure".to_owned(),371			|| {372				if let Some(msg) = msg {373					bail!(AssertionFailed(evaluate(ctx, msg)?.to_string()?));374				}375				bail!(AssertionFailed(Val::Null.to_string()?));376			},377		)?;378	}379	Ok(())380}381382pub fn evaluate_named_param(ctx: Context, expr: &Spanned<Expr>, name: ParamName) -> Result<Val> {383	match name {384		ParamName::Named(name) => evaluate_named(ctx, expr, name),385		ParamName::Unnamed => evaluate(ctx, expr),386	}387}388389pub fn evaluate_named(ctx: Context, expr: &Spanned<Expr>, name: IStr) -> Result<Val> {390	use Expr::*;391	Ok(match &**expr {392		Function(params, body) => evaluate_method(ctx, name, params.clone(), body.clone()),393		_ => evaluate(ctx, expr)?,394	})395}396397#[allow(clippy::too_many_lines)]398pub fn evaluate(ctx: Context, expr: &Spanned<Expr>) -> Result<Val> {399	use Expr::*;400401	if let Some(trivial) = evaluate_trivial(expr) {402		return Ok(trivial);403	}404	let loc = expr.span();405	Ok(match &**expr {406		Literal(LiteralType::This) => Val::Obj(ctx.try_this()?),407		Literal(LiteralType::Super) => Val::Obj(ctx.try_sup_this()?.standalone_super()?),408		Literal(LiteralType::Dollar) => Val::Obj(ctx.try_dollar()?),409		Literal(LiteralType::True) => Val::Bool(true),410		Literal(LiteralType::False) => Val::Bool(false),411		Literal(LiteralType::Null) => Val::Null,412		Str(v) => Val::string(v.clone()),413		Num(v) => Val::try_num(*v)?,414		// I have tried to remove special behavior from super by implementing standalone-super415		// expresion, but looks like this case still needs special treatment.416		//417		// Note that other jsonnet implementations will fail on `if value in (super)` expression,418		// because the standalone super literal is not supported, that is because in other419		// implementations `in super` treated differently from `in smth_else`.420		BinaryOp(bin)421			if matches!(&*bin.rhs, Expr::Literal(LiteralType::Super))422				&& bin.op == BinaryOpType::In =>423		{424			let sup_this = ctx.try_sup_this()?;425			// In jsonnet, "field" in e is eager, LHS expression is always executed regardless of super existence.426			// In jrsonnet, however, this wasn't true, this was kept here for compatibility.427			if !sup_this.has_super() {428				return Ok(Val::Bool(false));429			}430			let field = evaluate(ctx, &bin.lhs)?;431			Val::Bool(sup_this.field_in_super(field.to_string()?))432		}433		BinaryOp(bin) => evaluate_binary_op_special(ctx, &bin.lhs, bin.op, &bin.rhs)?,434		UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(ctx, v)?)?,435		Var(name) => in_frame(436			CallLocation::new(&loc),437			|| format!("local <{name}> access"),438			|| ctx.binding(name.clone())?.evaluate(),439		)?,440		Index { indexable, parts } => ensure_sufficient_stack(|| {441			let mut parts = parts.iter();442			let mut indexable = if matches!(&***indexable, Expr::Literal(LiteralType::Super)) {443				let part = parts.next().expect("at least part should exist");444				// sup_this existence check might also be skipped here for null-coalesce...445				// But I believe this might cause errors.446				let sup_this = ctx.try_sup_this()?;447				if !sup_this.has_super() {448					#[cfg(feature = "exp-null-coaelse")]449					if part.null_coaelse {450						return Ok(Val::Null);451					}452					bail!(NoSuperFound)453				}454				let name = evaluate(ctx.clone(), &part.value)?;455456				let Val::Str(name) = name else {457					bail!(ValueIndexMustBeTypeGot(458						ValType::Obj,459						ValType::Str,460						name.value_type(),461					))462				};463464				let name = name.into_flat();465				match sup_this466					.get_super(name.clone())467					.with_description_src(&part.value, || format!("field <{name}> access"))?468				{469					Some(v) => v,470					#[cfg(feature = "exp-null-coaelse")]471					None if part.null_coaelse => return Ok(Val::Null),472					None => {473						let suggestions = suggest_object_fields(474							&sup_this.standalone_super().expect("super exists"),475							name.clone(),476						);477478						bail!(NoSuchField(name, suggestions))479					}480				}481			} else {482				evaluate(ctx.clone(), indexable)?483			};484485			for part in parts {486				indexable = match (indexable, evaluate(ctx.clone(), &part.value)?) {487					(Val::Obj(v), Val::Str(key)) => match v488						.get(key.clone().into_flat())489						.with_description_src(&part.value, || format!("field <{key}> access"))?490					{491						Some(v) => v,492						#[cfg(feature = "exp-null-coaelse")]493						None if part.null_coaelse => return Ok(Val::Null),494						None => {495							let suggestions = suggest_object_fields(&v, key.clone().into_flat());496497							return Err(Error::from(NoSuchField(498								key.clone().into_flat(),499								suggestions,500							)))501							.with_description_src(&part.value, || format!("field <{key}> access"));502						}503					},504					(Val::Obj(_), n) => bail!(ValueIndexMustBeTypeGot(505						ValType::Obj,506						ValType::Str,507						n.value_type(),508					)),509					(Val::Arr(v), Val::Num(n)) => {510						let n = n.get();511						if n.fract() > f64::EPSILON {512							bail!(FractionalIndex)513						}514						if n < 0.0 {515							bail!(ArrayBoundsError(n as isize, v.len()));516						}517						v.get(n as usize)?518							.ok_or_else(|| ArrayBoundsError(n as isize, v.len()))?519					}520					(Val::Arr(_), Val::Str(n)) => {521						bail!(AttemptedIndexAnArrayWithString(n.into_flat()))522					}523					(Val::Arr(_), n) => bail!(ValueIndexMustBeTypeGot(524						ValType::Arr,525						ValType::Num,526						n.value_type(),527					)),528529					(Val::Str(s), Val::Num(n)) => Val::Str({530						let n = n.get();531						if n.fract() > f64::EPSILON {532							bail!(FractionalIndex)533						}534						if n < 0.0 {535							bail!(ArrayBoundsError(n as isize, s.into_flat().chars().count()));536						}537						let v: IStr = s538							.clone()539							.into_flat()540							.chars()541							.skip(n as usize)542							.take(1)543							.collect::<String>()544							.into();545						if v.is_empty() {546							bail!(StringBoundsError(n as usize, s.into_flat().chars().count()))547						}548						StrValue::Flat(v)549					}),550					(Val::Str(_), n) => bail!(ValueIndexMustBeTypeGot(551						ValType::Str,552						ValType::Num,553						n.value_type(),554					)),555					#[cfg(feature = "exp-null-coaelse")]556					(Val::Null, _) if part.null_coaelse => return Ok(Val::Null),557					(v, _) => bail!(CantIndexInto(v.value_type())),558				};559			}560			Ok(indexable)561		})?,562		LocalExpr(bindings, returned) => {563			let mut new_bindings: FxHashMap<IStr, Thunk<Val>> =564				FxHashMap::with_capacity(bindings.iter().map(BindSpec::binds_len).sum());565			let fctx = Context::new_future();566			for b in bindings {567				evaluate_dest(b, fctx.clone(), &mut new_bindings)?;568			}569			let ctx = ctx.extend_bindings(new_bindings).into_future(fctx);570			evaluate(ctx, returned)?571		}572		Arr(items) => {573			if items.is_empty() {574				Val::Arr(ArrValue::empty())575			} else {576				Val::Arr(ArrValue::expr(ctx, items.clone()))577			}578		}579		ArrComp(expr, comp_specs) => {580			let mut out = Vec::new();581			evaluate_comp(ctx, comp_specs, &mut |ctx| {582				let expr = expr.clone();583				out.push(Thunk!(move || evaluate(ctx, &expr)));584				Ok(())585			})?;586			Val::Arr(ArrValue::lazy(out))587		}588		Obj(body) => Val::Obj(evaluate_object(ctx, body)?),589		ObjExtend(a, b) => evaluate_add_op(590			&evaluate(ctx.clone(), a)?,591			&Val::Obj(evaluate_object(ctx, b)?),592		)?,593		Apply(value, args, tailstrict) => ensure_sufficient_stack(|| {594			evaluate_apply(ctx, value, args, CallLocation::new(&loc), *tailstrict)595		})?,596		Function(params, body) => {597			evaluate_method(ctx, "anonymous".into(), params.clone(), body.clone())598		}599		AssertExpr(assert) => {600			evaluate_assert(ctx.clone(), &assert.assert)?;601			evaluate(ctx, &assert.rest)?602		}603		ErrorStmt(e) => in_frame(604			CallLocation::new(&loc),605			|| "error statement".to_owned(),606			|| bail!(RuntimeError(evaluate(ctx, e)?.to_string()?,)),607		)?,608		IfElse(if_else) => {609			if in_frame(610				CallLocation::new(&loc),611				|| "if condition".to_owned(),612				|| bool::from_untyped(evaluate(ctx.clone(), &if_else.cond.0)?),613			)? {614				evaluate(ctx, &if_else.cond_then)?615			} else {616				match &if_else.cond_else {617					Some(v) => evaluate(ctx, v)?,618					None => Val::Null,619				}620			}621		}622		Slice(slice) => {623			fn parse_idx<T: Typed + FromUntyped>(624				loc: CallLocation<'_>,625				ctx: Context,626				expr: Option<&Spanned<Expr>>,627				desc: &'static str,628			) -> Result<Option<T>> {629				if let Some(value) = expr {630					Ok(in_frame(631						loc,632						|| format!("slice {desc}"),633						|| <Option<T>>::from_untyped(evaluate(ctx, value)?),634					)?)635				} else {636					Ok(None)637				}638			}639640			let indexable = evaluate(ctx.clone(), &slice.value)?;641			let loc = CallLocation::new(&loc);642643			let start = parse_idx(loc, ctx.clone(), slice.slice.start.as_ref(), "start")?;644			let end = parse_idx(loc, ctx.clone(), slice.slice.end.as_ref(), "end")?;645			let step = parse_idx(loc, ctx, slice.slice.step.as_ref(), "step")?;646647			IndexableVal::into_untyped(indexable.into_indexable()?.slice(start, end, step)?)?648		}649		Import(kind, path) => {650			let Expr::Str(path) = &***path else {651				bail!("computed imports are not supported")652			};653			let tmp = loc.clone().0;654			with_state(|s| {655				let resolved_path = s.resolve_from(tmp.source_path(), path)?;656				Ok(match kind {657					ImportKind::Normal => in_frame(658						CallLocation::new(&loc),659						|| format!("import {:?}", path.clone()),660						|| s.import_resolved(resolved_path),661					)?,662					ImportKind::Str => Val::string(s.import_resolved_str(resolved_path)?),663					ImportKind::Bin => {664						Val::Arr(ArrValue::bytes(s.import_resolved_bin(resolved_path)?))665					}666				}) as Result<Val>667			})?668		}669	})670}
modifiedcrates/jrsonnet-evaluator/src/evaluate/operator.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/operator.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/operator.rs
@@ -8,7 +8,7 @@
 	error::ErrorKind::*,
 	evaluate,
 	stdlib::std_format,
-	typed::Typed,
+	typed::IntoUntyped as _,
 	val::{equals, StrValue},
 	Context, Result, Val,
 };
modifiedcrates/jrsonnet-evaluator/src/function/native.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function/native.rs
+++ b/crates/jrsonnet-evaluator/src/function/native.rs
@@ -3,7 +3,11 @@
 use jrsonnet_gcmodule::Trace;
 
 use super::PreparedFuncVal;
-use crate::{bail, function::FuncVal, typed::Typed, CallLocation, Result, Val};
+use crate::{
+	function::FuncVal,
+	typed::{FromUntyped, IntoUntyped, Typed},
+	CallLocation, Result, Val,
+};
 use jrsonnet_types::{ComplexValType, ValType};
 
 #[derive(Debug, Trace, Clone)]
@@ -12,8 +16,8 @@
 	($i:expr; $($gen:ident)*) => {
 		impl<$($gen,)* O> NativeFn<($($gen,)* O,)>
 		where
-			$($gen: Typed,)*
-			O: Typed,
+			$($gen: Typed + IntoUntyped,)*
+			O: Typed + FromUntyped,
 		{
 			#[allow(non_snake_case, clippy::too_many_arguments)]
 			pub fn call(
@@ -22,7 +26,7 @@
 			) -> Result<O> {
 				let val = self.0.call(
 					CallLocation::native(),
-					&[$(Typed::into_lazy_untyped($gen),)*],
+					&[$(IntoUntyped::into_lazy_untyped($gen),)*],
 					&[],
 				)?;
 				O::from_untyped(val)
@@ -30,11 +34,9 @@
 		}
 		impl<$($gen,)* O> Typed for NativeFn<($($gen,)* O,)> {
 			const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);
-
-			fn into_untyped(_typed: Self) -> Result<Val> {
-				bail!("can only convert functions from jsonnet to native")
-			}
+		}
 
+		impl<$($gen,)* O> FromUntyped for NativeFn<($($gen,)* O,)> {
 			fn from_untyped(untyped: Val) -> Result<Self> {
 				let func = FuncVal::from_untyped(untyped)?;
 				Ok(Self(
modifiedcrates/jrsonnet-evaluator/src/stdlib/format.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/stdlib/format.rs
+++ b/crates/jrsonnet-evaluator/src/stdlib/format.rs
@@ -9,7 +9,7 @@
 use crate::{
 	bail,
 	error::{format_found, suggest_object_fields, ErrorKind::*},
-	typed::Typed,
+	typed::FromUntyped,
 	Error, ObjValue, Result, Val,
 };
 
modifiedcrates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -1,6 +1,6 @@
 use std::{collections::BTreeMap, marker::PhantomData, ops::Deref};
 
-use jrsonnet_gcmodule::{Cc, Trace};
+use jrsonnet_gcmodule::Trace;
 use jrsonnet_interner::{IBytes, IStr};
 pub use jrsonnet_macros::Typed;
 use jrsonnet_types::{ComplexValType, ValType};
@@ -8,17 +8,17 @@
 use crate::{
 	arr::{ArrValue, BytesArray},
 	bail,
-	function::{FuncDesc, FuncVal},
+	function::FuncVal,
 	typed::CheckType,
 	val::{IndexableVal, NumValue, StrValue, ThunkMapper},
 	ObjValue, ObjValueBuilder, Result, ResultExt, Thunk, Val,
 };
 
 #[derive(Trace)]
-struct FromUntyped<K: Trace>(PhantomData<fn() -> K>);
-impl<K> ThunkMapper<Val> for FromUntyped<K>
+struct ThunkFromUntyped<K: Trace>(PhantomData<fn() -> K>);
+impl<K> ThunkMapper<Val> for ThunkFromUntyped<K>
 where
-	K: Typed + Trace,
+	K: Typed + FromUntyped + Trace,
 {
 	type Output = K;
 
@@ -26,12 +26,29 @@
 		K::from_untyped(from)
 	}
 }
-impl<K: Trace> Default for FromUntyped<K> {
+impl<K: Trace> Default for ThunkFromUntyped<K> {
 	fn default() -> Self {
 		Self(PhantomData)
 	}
 }
+#[derive(Trace)]
+struct ThunkIntoUntyped<K: Trace>(PhantomData<fn() -> K>);
+impl<K> ThunkMapper<K> for ThunkIntoUntyped<K>
+where
+	K: Typed + Trace + IntoUntyped,
+{
+	type Output = Val;
 
+	fn map(self, from: K) -> Result<Self::Output> {
+		K::into_untyped(from)
+	}
+}
+impl<K: Trace> Default for ThunkIntoUntyped<K> {
+	fn default() -> Self {
+		Self(PhantomData)
+	}
+}
+
 pub trait TypedObj: Typed {
 	fn serialize(self, out: &mut ObjValueBuilder) -> Result<()>;
 	fn parse(obj: &ObjValue) -> Result<Self>;
@@ -44,31 +61,41 @@
 
 pub trait Typed: Sized {
 	const TYPE: &'static ComplexValType;
+}
+pub trait IntoUntyped: Typed {
+	// Whatever caller should use `into_lazy_untyped` instead of `into_untyped`
+	fn provides_lazy() -> bool {
+		false
+	}
 	fn into_untyped(typed: Self) -> Result<Val>;
 	fn into_lazy_untyped(typed: Self) -> Thunk<Val> {
 		Thunk::from(Self::into_untyped(typed))
 	}
+}
+pub trait IntoUntypedResult: Typed {
+	/// Hack to make builtins be able to return non-result values, and make macros able to convert those values to result
+	/// This method returns identity in impl Typed for Result, and should not be overriden
+	#[doc(hidden)]
+	fn into_untyped_result(typed: Self) -> Result<Val>;
+}
+impl<T> IntoUntypedResult for T
+where
+	T: IntoUntyped,
+{
+	fn into_untyped_result(typed: Self) -> Result<Val> {
+		T::into_untyped(typed)
+	}
+}
+
+pub trait FromUntyped: Typed {
 	fn from_untyped(untyped: Val) -> Result<Self>;
 	fn from_lazy_untyped(lazy: Thunk<Val>) -> Result<Self> {
 		Self::from_untyped(lazy.evaluate()?)
 	}
 
-	// Whatever caller should use `into_lazy_untyped` instead of `into_untyped`
-	fn provides_lazy() -> bool {
-		false
-	}
-
 	// Whatever caller should use `from_lazy_untyped` instead of `from_untyped` when possible
 	fn wants_lazy() -> bool {
 		false
-	}
-
-	/// Hack to make builtins be able to return non-result values, and make macros able to convert those values to result
-	/// This method returns identity in impl Typed for Result, and should not be overriden
-	#[doc(hidden)]
-	fn into_result(typed: Self) -> Result<Val> {
-		let value = Self::into_untyped(typed)?;
-		Ok(value)
 	}
 }
 
@@ -77,38 +104,30 @@
 	T: Typed + Trace + Clone,
 {
 	const TYPE: &'static ComplexValType = &ComplexValType::Lazy(T::TYPE);
+}
 
+impl<T> IntoUntyped for Thunk<T>
+where
+	T: Typed + IntoUntyped + Trace + Clone,
+{
 	fn into_untyped(typed: Self) -> Result<Val> {
 		T::into_untyped(typed.evaluate()?)
-	}
-
-	fn from_untyped(untyped: Val) -> Result<Self> {
-		Self::from_lazy_untyped(Thunk::evaluated(untyped))
 	}
-
 	fn provides_lazy() -> bool {
 		true
 	}
 
 	fn into_lazy_untyped(inner: Self) -> Thunk<Val> {
-		#[derive(Trace)]
-		struct IntoUntyped<K: Trace>(PhantomData<fn() -> K>);
-		impl<K> ThunkMapper<K> for IntoUntyped<K>
-		where
-			K: Typed + Trace,
-		{
-			type Output = Val;
+		inner.map(<ThunkIntoUntyped<T>>::default())
+	}
+}
 
-			fn map(self, from: K) -> Result<Self::Output> {
-				K::into_untyped(from)
-			}
-		}
-		impl<K: Trace> Default for IntoUntyped<K> {
-			fn default() -> Self {
-				Self(PhantomData)
-			}
-		}
-		inner.map(<IntoUntyped<T>>::default())
+impl<T> FromUntyped for Thunk<T>
+where
+	T: Typed + FromUntyped + Trace + Clone,
+{
+	fn from_untyped(untyped: Val) -> Result<Self> {
+		Self::from_lazy_untyped(Thunk::evaluated(untyped))
 	}
 
 	fn wants_lazy() -> bool {
@@ -116,7 +135,7 @@
 	}
 
 	fn from_lazy_untyped(inner: Thunk<Val>) -> Result<Self> {
-		Ok(inner.map(<FromUntyped<T>>::default()))
+		Ok(inner.map(<ThunkFromUntyped<T>>::default()))
 	}
 }
 
@@ -128,6 +147,8 @@
 		impl Typed for $ty {
 			const TYPE: &'static ComplexValType =
 				&ComplexValType::BoundedNumber(Some(Self::MIN as f64), Some(Self::MAX as f64));
+		}
+		impl FromUntyped for $ty {
 			fn from_untyped(value: Val) -> Result<Self> {
 				<Self as Typed>::TYPE.check(&value)?;
 				match value {
@@ -145,6 +166,8 @@
 					_ => unreachable!(),
 				}
 			}
+		}
+		impl IntoUntyped for $ty {
 			fn into_untyped(value: Self) -> Result<Val> {
 				Ok(Val::Num(value.into()))
 			}
@@ -183,7 +206,9 @@
 					Some(MIN as f64),
 					Some(MAX as f64),
 				);
+		}
 
+		impl<const MIN: $ty, const MAX: $ty> FromUntyped for $name<MIN, MAX> {
 			fn from_untyped(value: Val) -> Result<Self> {
 				<Self as Typed>::TYPE.check(&value)?;
 				match value {
@@ -201,7 +226,9 @@
 					_ => unreachable!(),
 				}
 			}
+		}
 
+		impl<const MIN: $ty, const MAX: $ty> IntoUntyped for $name<MIN, MAX> {
 			#[allow(clippy::cast_lossless)]
 			fn into_untyped(value: Self) -> Result<Val> {
 				Ok(Val::try_num(value.0)?)
@@ -220,11 +247,13 @@
 
 impl Typed for f64 {
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Num);
-
+}
+impl IntoUntyped for f64 {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::try_num(value)?)
 	}
-
+}
+impl FromUntyped for f64 {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		match value {
@@ -237,11 +266,13 @@
 pub struct PositiveF64(pub f64);
 impl Typed for PositiveF64 {
 	const TYPE: &'static ComplexValType = &ComplexValType::BoundedNumber(Some(0.0), None);
-
+}
+impl IntoUntyped for PositiveF64 {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::try_num(value.0)?)
 	}
-
+}
+impl FromUntyped for PositiveF64 {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		match value {
@@ -253,11 +284,13 @@
 impl Typed for usize {
 	const TYPE: &'static ComplexValType =
 		&ComplexValType::BoundedNumber(Some(0.0), Some(MAX_SAFE_INTEGER));
-
+}
+impl IntoUntyped for usize {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::try_num(value)?)
 	}
-
+}
+impl FromUntyped for usize {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		match value {
@@ -276,11 +309,13 @@
 
 impl Typed for IStr {
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Str);
-
+}
+impl IntoUntyped for IStr {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::string(value))
 	}
-
+}
+impl FromUntyped for IStr {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		match value {
@@ -292,11 +327,13 @@
 
 impl Typed for String {
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Str);
-
+}
+impl IntoUntyped for String {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::string(value))
 	}
-
+}
+impl FromUntyped for String {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		match value {
@@ -308,11 +345,13 @@
 
 impl Typed for StrValue {
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Str);
-
+}
+impl IntoUntyped for StrValue {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::Str(value))
 	}
-
+}
+impl FromUntyped for StrValue {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		match value {
@@ -324,11 +363,13 @@
 
 impl Typed for char {
 	const TYPE: &'static ComplexValType = &ComplexValType::Char;
-
+}
+impl IntoUntyped for char {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::string(value))
 	}
-
+}
+impl FromUntyped for char {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		match value {
@@ -338,12 +379,14 @@
 	}
 }
 
+// TODO: View into vec using ArrayLike?
 impl<T> Typed for Vec<T>
 where
 	T: Typed,
 {
 	const TYPE: &'static ComplexValType = &ComplexValType::ArrayRef(T::TYPE);
-
+}
+impl<T: Typed + IntoUntyped> IntoUntyped for Vec<T> {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::Arr(
 			value
@@ -352,7 +395,8 @@
 				.collect::<Result<ArrValue>>()?,
 		))
 	}
-
+}
+impl<T: Typed + FromUntyped> FromUntyped for Vec<T> {
 	fn from_untyped(value: Val) -> Result<Self> {
 		let Val::Arr(a) = value else {
 			<Self as Typed>::TYPE.check(&value)?;
@@ -369,9 +413,19 @@
 	}
 }
 
-impl<K: Typed + Ord, V: Typed> Typed for BTreeMap<K, V> {
+// TODO: View into BTreeMap using ObjectCore?
+impl<K, V> Typed for BTreeMap<K, V>
+where
+	K: Typed + Ord,
+	V: Typed,
+{
 	const TYPE: &'static ComplexValType = &ComplexValType::AttrsOf(V::TYPE);
-
+}
+impl<K, V> IntoUntyped for BTreeMap<K, V>
+where
+	K: Typed + Ord + IntoUntyped,
+	V: Typed + IntoUntyped,
+{
 	fn into_untyped(typed: Self) -> Result<Val> {
 		let mut out = ObjValueBuilder::with_capacity(typed.len());
 		for (k, v) in typed {
@@ -383,7 +437,12 @@
 		}
 		Ok(Val::Obj(out.build()))
 	}
-
+}
+impl<K, V> FromUntyped for BTreeMap<K, V>
+where
+	K: FromUntyped + Ord,
+	V: FromUntyped,
+{
 	fn from_untyped(value: Val) -> Result<Self> {
 		Self::TYPE.check(&value)?;
 		let obj = value.as_obj().expect("typecheck should fail");
@@ -416,32 +475,27 @@
 
 impl Typed for Val {
 	const TYPE: &'static ComplexValType = &ComplexValType::Any;
-
+}
+impl IntoUntyped for Val {
 	fn into_untyped(typed: Self) -> Result<Val> {
 		Ok(typed)
 	}
+}
+impl FromUntyped for Val {
 	fn from_untyped(untyped: Val) -> Result<Self> {
 		Ok(untyped)
 	}
 }
 
-// Hack
 #[doc(hidden)]
 impl<T> Typed for Result<T>
 where
 	T: Typed,
 {
 	const TYPE: &'static ComplexValType = &ComplexValType::Any;
-
-	fn into_untyped(_typed: Self) -> Result<Val> {
-		panic!("do not use this conversion")
-	}
-
-	fn from_untyped(_untyped: Val) -> Result<Self> {
-		panic!("do not use this conversion")
-	}
-
-	fn into_result(typed: Self) -> Result<Val> {
+}
+impl<T: IntoUntyped> IntoUntypedResult for Result<T> {
+	fn into_untyped_result(typed: Self) -> Result<Val> {
 		typed.map(T::into_untyped)?
 	}
 }
@@ -450,11 +504,13 @@
 impl Typed for IBytes {
 	const TYPE: &'static ComplexValType =
 		&ComplexValType::ArrayRef(&ComplexValType::BoundedNumber(Some(0.0), Some(255.0)));
-
+}
+impl IntoUntyped for IBytes {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::Arr(ArrValue::bytes(value)))
 	}
-
+}
+impl FromUntyped for IBytes {
 	fn from_untyped(value: Val) -> Result<Self> {
 		let Val::Arr(a) = &value else {
 			<Self as Typed>::TYPE.check(&value)?;
@@ -477,11 +533,13 @@
 pub struct M1;
 impl Typed for M1 {
 	const TYPE: &'static ComplexValType = &ComplexValType::BoundedNumber(Some(-1.0), Some(-1.0));
-
+}
+impl IntoUntyped for M1 {
 	fn into_untyped(_: Self) -> Result<Val> {
 		Ok(Val::Num(NumValue::new(-1.0).expect("finite")))
 	}
-
+}
+impl FromUntyped for M1 {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		Ok(Self)
@@ -499,13 +557,22 @@
 			$($id: Typed,)*
 		{
 			const TYPE: &'static ComplexValType = &ComplexValType::UnionRef(&[$($id::TYPE),*]);
-
+		}
+		impl<$($id),*> IntoUntyped for $name<$($id),*>
+		where
+			$($id: Typed + IntoUntyped,)*
+		{
 			fn into_untyped(value: Self) -> Result<Val> {
 				match value {$(
 					$name::$id(v) => $id::into_untyped(v)
 				),*}
 			}
+		}
 
+		impl<$($id),*> FromUntyped for $name<$($id),*>
+		where
+			$($id: Typed + FromUntyped,)*
+		{
 			fn from_untyped(value: Val) -> Result<Self> {
 				$(
 					if $id::TYPE.check(&value).is_ok() {
@@ -544,11 +611,13 @@
 
 impl Typed for ArrValue {
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Arr);
-
+}
+impl IntoUntyped for ArrValue {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::Arr(value))
 	}
-
+}
+impl FromUntyped for ArrValue {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		match value {
@@ -560,32 +629,17 @@
 
 impl Typed for FuncVal {
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);
-
+}
+impl IntoUntyped for FuncVal {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::Func(value))
 	}
-
-	fn from_untyped(value: Val) -> Result<Self> {
-		<Self as Typed>::TYPE.check(&value)?;
-		match value {
-			Val::Func(a) => Ok(a),
-			_ => unreachable!(),
-		}
-	}
 }
-
-impl Typed for Cc<FuncDesc> {
-	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);
-
-	fn into_untyped(value: Self) -> Result<Val> {
-		Ok(Val::Func(FuncVal::Normal(value)))
-	}
-
+impl FromUntyped for FuncVal {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		match value {
-			Val::Func(FuncVal::Normal(desc)) => Ok(desc),
-			Val::Func(_) => bail!("expected normal function, not builtin"),
+			Val::Func(a) => Ok(a),
 			_ => unreachable!(),
 		}
 	}
@@ -593,11 +647,13 @@
 
 impl Typed for ObjValue {
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Obj);
-
+}
+impl IntoUntyped for ObjValue {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::Obj(value))
 	}
-
+}
+impl FromUntyped for ObjValue {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		match value {
@@ -609,11 +665,13 @@
 
 impl Typed for bool {
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Bool);
-
+}
+impl IntoUntyped for bool {
 	fn into_untyped(value: Self) -> Result<Val> {
 		Ok(Val::Bool(value))
 	}
-
+}
+impl FromUntyped for bool {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		match value {
@@ -622,19 +680,22 @@
 		}
 	}
 }
+
 impl Typed for IndexableVal {
 	const TYPE: &'static ComplexValType = &ComplexValType::UnionRef(&[
 		&ComplexValType::Simple(ValType::Arr),
 		&ComplexValType::Simple(ValType::Str),
 	]);
-
+}
+impl IntoUntyped for IndexableVal {
 	fn into_untyped(value: Self) -> Result<Val> {
 		match value {
 			Self::Str(s) => Ok(Val::string(s)),
 			Self::Arr(a) => Ok(Val::Arr(a)),
 		}
 	}
-
+}
+impl FromUntyped for IndexableVal {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		value.into_indexable()
@@ -644,11 +705,13 @@
 pub struct Null;
 impl Typed for Null {
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Null);
-
+}
+impl IntoUntyped for Null {
 	fn into_untyped(_: Self) -> Result<Val> {
 		Ok(Val::Null)
 	}
-
+}
+impl FromUntyped for Null {
 	fn from_untyped(value: Val) -> Result<Self> {
 		<Self as Typed>::TYPE.check(&value)?;
 		Ok(Self)
@@ -661,11 +724,19 @@
 {
 	const TYPE: &'static ComplexValType =
 		&ComplexValType::UnionRef(&[&ComplexValType::Simple(ValType::Null), T::TYPE]);
-
+}
+impl<T> IntoUntyped for Option<T>
+where
+	T: Typed + IntoUntyped,
+{
 	fn into_untyped(typed: Self) -> Result<Val> {
 		typed.map_or_else(|| Ok(Val::Null), |v| T::into_untyped(v))
 	}
-
+}
+impl<T> FromUntyped for Option<T>
+where
+	T: Typed + FromUntyped,
+{
 	fn from_untyped(untyped: Val) -> Result<Self> {
 		if matches!(untyped, Val::Null) {
 			Ok(None)
@@ -677,11 +748,13 @@
 
 impl Typed for NumValue {
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Num);
-
+}
+impl IntoUntyped for NumValue {
 	fn into_untyped(typed: Self) -> Result<Val> {
 		Ok(Val::Num(typed))
 	}
-
+}
+impl FromUntyped for NumValue {
 	fn from_untyped(untyped: Val) -> Result<Self> {
 		Self::TYPE.check(&untyped)?;
 		match untyped {
modifiedcrates/jrsonnet-interner/src/names.rsdiffbeforeafterboth
--- a/crates/jrsonnet-interner/src/names.rs
+++ b/crates/jrsonnet-interner/src/names.rs
@@ -0,0 +1 @@
+
modifiedcrates/jrsonnet-macros/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-macros/src/lib.rs
+++ b/crates/jrsonnet-macros/src/lib.rs
@@ -8,15 +8,15 @@
 	parse_macro_input,
 	punctuated::Punctuated,
 	spanned::Spanned,
-	token::{self, Comma},
+	token::Comma,
 	Attribute, DeriveInput, Error, Expr, ExprClosure, FnArg, GenericArgument, Ident, ItemFn,
 	LitStr, Meta, Pat, Path, PathArguments, Result, ReturnType, Token, Type,
 };
 
 use self::typed::derive_typed_inner;
 
+mod names;
 mod typed;
-mod names;
 
 fn try_parse_attr_noargs<I>(attrs: &[Attribute], ident: I) -> Result<bool>
 where
@@ -202,7 +202,7 @@
 			_ => {}
 		}
 
-		let (optionality, ty) = if try_parse_attr_noargs(&mut arg.attrs, "default")? {
+		let (optionality, ty) = if try_parse_attr_noargs(&arg.attrs, "default")? {
 			remove_attr(&mut arg.attrs, "default");
 			(Optionality::TypeDefault, ty.clone())
 		} else if let Some(default) = parse_attr::<_, _>(&arg.attrs, "default")? {
@@ -322,7 +322,7 @@
 				let name = name.as_ref().map_or("<unnamed>", String::as_str);
 				let eval = quote! {jrsonnet_evaluator::in_description_frame(
 					|| format!("argument <{}> evaluation", #name),
-					|| <#ty>::from_untyped(value.evaluate()?),
+					|| <#ty as FromUntyped>::from_untyped(value.evaluate()?),
 				)?};
 				let value = match optionality {
 					Optionality::Required => quote! {{
@@ -411,7 +411,7 @@
 			use ::jrsonnet_evaluator::{
 				State, Val,
 				function::{builtin::{Builtin, StaticBuiltin}, FunctionSignature, ParamParse, ParamName, ParamDefault, CallLocation},
-				Result, Context, typed::Typed,
+				Result, Context, typed::{Typed, FromUntyped, IntoUntypedResult},
 				parser::Span, params, Thunk,
 			};
 			params!(
@@ -432,7 +432,7 @@
 				#[allow(unused_variables)]
 				fn call(&self, location: CallLocation<'_>, parsed: &[Option<Thunk<Val>>]) -> Result<Val> {
 					let result: #result = #name(#(#pass)*);
-					<_ as Typed>::into_result(result)
+					<_ as IntoUntypedResult>::into_untyped_result(result)
 				}
 				fn as_any(&self) -> &dyn ::std::any::Any {
 					self
modifiedcrates/jrsonnet-macros/src/names.rsdiffbeforeafterboth
--- a/crates/jrsonnet-macros/src/names.rs
+++ b/crates/jrsonnet-macros/src/names.rs
@@ -1,6 +1,5 @@
 use proc_macro2::TokenStream;
 use quote::quote;
-use std::cell::RefCell;
 
 #[derive(Default)]
 pub struct Names {
modifiedcrates/jrsonnet-macros/src/typed.rsdiffbeforeafterboth
--- a/crates/jrsonnet-macros/src/typed.rs
+++ b/crates/jrsonnet-macros/src/typed.rs
@@ -178,7 +178,7 @@
 					None
 				};
 
-				__value.map(<#ty as Typed>::from_untyped).transpose()?
+				__value.map(<#ty as FromUntyped>::from_untyped).transpose()?
 			},
 		}
 	}
@@ -219,7 +219,7 @@
 					return Err(ErrorKind::NoSuchField(__names[#error_text].clone(), vec![]).into());
 				};
 
-				<#ty as Typed>::from_untyped(__value)?
+				<#ty as FromUntyped>::from_untyped(__value)?
 			},
 		}
 	}
@@ -258,14 +258,14 @@
 						out.field(__names[#name].clone())
 							#hide
 							#add
-							.try_thunk(<#ty as Typed>::into_lazy_untyped(value))?;
+							.try_thunk(<#ty as IntoUntyped>::into_lazy_untyped(value))?;
 					}
 				} else {
 					quote! {
 						out.field(__names[#name].clone())
 							#hide
 							#add
-							.try_value(<#ty as Typed>::into_untyped(value)?)?;
+							.try_value(<#ty as IntoUntyped>::into_untyped(value)?)?;
 					}
 				};
 				if self.is_option {
@@ -313,18 +313,21 @@
 				const TYPE: &'static ComplexValType = &ComplexValType::ObjectRef(&[
 					#(#fields,)*
 				]);
+			}
 
+			impl #impl_generics FromUntyped for #ident #ty_generics #where_clause {
 				fn from_untyped(value: Val) -> JrResult<Self> {
 					let obj = value.as_obj().expect("shape is correct");
 					Self::parse(&obj)
 				}
+			}
 
+			impl #impl_generics IntoUntyped for #ident #ty_generics #where_clause {
 				fn into_untyped(value: Self) -> JrResult<Val> {
 					let mut out = ObjValueBuilder::with_capacity(#capacity);
 					value.serialize(&mut out)?;
 					Ok(Val::Obj(out.build()))
 				}
-
 			}
 		}
 	};
@@ -344,7 +347,7 @@
 	Ok(quote! {
 		const _: () = {
 			use ::jrsonnet_evaluator::{
-				typed::{ComplexValType, Typed, TypedObj, CheckType},
+				typed::{ComplexValType, Typed, IntoUntyped, FromUntyped, TypedObj, CheckType},
 				Val, State,
 				error::{ErrorKind, Result as JrResult},
 				ObjValueBuilder, ObjValue, IStr,
modifiedcrates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -4,7 +4,7 @@
 	bail,
 	function::{builtin, FuncVal, NativeFn},
 	runtime_error,
-	typed::{BoundedI32, BoundedUsize, Either2, Typed},
+	typed::{BoundedI32, BoundedUsize, Either2, FromUntyped},
 	val::{equals, ArrValue, IndexableVal},
 	Either, IStr, ObjValue, ObjValueBuilder, Result, ResultExt, Thunk, Val,
 };
@@ -24,7 +24,7 @@
 	}
 	func.evaluate_trivial().map_or_else(
 		// TODO: Different mapped array impl avoiding allocating unnecessary vals
-		|| Ok(ArrValue::range_exclusive(0, *sz).map(Typed::from_untyped(Val::Func(func))?)),
+		|| Ok(ArrValue::range_exclusive(0, *sz).map(FromUntyped::from_untyped(Val::Func(func))?)),
 		|trivial| {
 			let mut out = Vec::with_capacity(*sz as usize);
 			for _ in 0..*sz {
modifiedcrates/jrsonnet-stdlib/src/keyf.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/keyf.rs
+++ b/crates/jrsonnet-stdlib/src/keyf.rs
@@ -1,5 +1,5 @@
 use jrsonnet_evaluator::function::{CallLocation, FuncVal, PreparedFuncVal};
-use jrsonnet_evaluator::typed::{ComplexValType, Typed, ValType};
+use jrsonnet_evaluator::typed::{ComplexValType, FromUntyped, Typed, ValType};
 use jrsonnet_evaluator::{Error, Result, Thunk, Val};
 
 #[derive(Default, Clone)]
@@ -31,11 +31,9 @@
 
 impl Typed for KeyF {
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Func);
+}
+impl FromUntyped for KeyF {
 	fn from_untyped(untyped: Val) -> Result<Self> {
 		FuncVal::from_untyped(untyped).map(Self::new)
-	}
-
-	fn into_untyped(_typed: Self) -> Result<Val> {
-		unreachable!("unused, todo: port split of Typed trait from #193")
 	}
 }
modifiedcrates/jrsonnet-stdlib/src/manifest/ini.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/manifest/ini.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/ini.rs
@@ -2,7 +2,7 @@
 
 use jrsonnet_evaluator::{
 	manifest::{ManifestFormat, ToStringFormat},
-	typed::Typed,
+	typed::{FromUntyped, Typed},
 	ObjValue, Result, ResultExt, Val,
 };
 use jrsonnet_parser::IStr;
modifiedcrates/jrsonnet-stdlib/src/manifest/xml.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/manifest/xml.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/xml.rs
@@ -1,7 +1,7 @@
 use jrsonnet_evaluator::{
 	bail, in_description_frame,
 	manifest::{ManifestFormat, ToStringFormat},
-	typed::{ComplexValType, Either2, Typed, ValType},
+	typed::{ComplexValType, Either2, FromUntyped, Typed, ValType},
 	val::ArrValue,
 	Either, ObjValue, Result, ResultExt, Val,
 };
@@ -32,11 +32,8 @@
 }
 impl Typed for JSONMLValue {
 	const TYPE: &'static ComplexValType = &ComplexValType::Simple(ValType::Arr);
-
-	fn into_untyped(_typed: Self) -> Result<Val> {
-		unreachable!("not used, reserved for parseXML?")
-	}
-
+}
+impl FromUntyped for JSONMLValue {
 	fn from_untyped(untyped: Val) -> Result<Self> {
 		let val = <Either![ArrValue, String]>::from_untyped(untyped)
 			.description("parsing JSONML value (an array or string)")?;
@@ -73,7 +70,7 @@
 			children: in_description_frame(
 				|| "parsing children".to_owned(),
 				|| {
-					Typed::from_untyped(Val::Arr(arr.slice(
+					FromUntyped::from_untyped(Val::Arr(arr.slice(
 						Some(if has_attrs { 2 } else { 1 }),
 						None,
 						None,
modifiedcrates/jrsonnet-stdlib/src/strings.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/strings.rs
+++ b/crates/jrsonnet-stdlib/src/strings.rs
@@ -4,7 +4,7 @@
 	bail,
 	error::{ErrorKind::*, Result},
 	function::builtin,
-	typed::{Either2, Typed, M1},
+	typed::{Either2, FromUntyped, M1},
 	val::{ArrValue, IndexableVal},
 	Either, IStr, Val,
 };
modifiedtests/tests/builtin.rsdiffbeforeafterboth
--- a/tests/tests/builtin.rs
+++ b/tests/tests/builtin.rs
@@ -5,7 +5,7 @@
 	function::{CallLocation, FuncVal, builtin, builtin::Builtin},
 	parser::Source,
 	trace::PathResolver,
-	typed::Typed,
+	typed::FromUntyped,
 };
 use jrsonnet_gcmodule::Trace;
 use jrsonnet_stdlib::ContextInitializer as StdContextInitializer;
modifiedtests/tests/typed_obj.rsdiffbeforeafterboth
--- a/tests/tests/typed_obj.rs
+++ b/tests/tests/typed_obj.rs
@@ -2,7 +2,11 @@
 
 use std::fmt::Debug;
 
-use jrsonnet_evaluator::{Result, State, trace::PathResolver, typed::Typed};
+use jrsonnet_evaluator::{
+	Result, State,
+	trace::PathResolver,
+	typed::{FromUntyped, IntoUntyped, Typed},
+};
 use jrsonnet_stdlib::ContextInitializer;
 
 #[derive(Clone, Typed, PartialEq, Debug)]
@@ -11,7 +15,9 @@
 	b: u16,
 }
 
-fn test_roundtrip<T: Typed + PartialEq + Debug + Clone>(value: T) -> Result<()> {
+fn test_roundtrip<T: Typed + PartialEq + Debug + Clone + FromUntyped + IntoUntyped>(
+	value: T,
+) -> Result<()> {
 	let untyped = T::into_untyped(value.clone())?;
 	let value2 = T::from_untyped(untyped.clone())?;
 	ensure_eq!(value, value2);