git.delta.rocks / jrsonnet / refs/commits / 2d3e9127fca2

difftreelog

Merge remote-tracking branch 'origin/master' into gcmodule

Yaroslav Bolyukin2022-01-04parents: #fa16ccf #e1fb5e1.patch.diff
in: master

7 files changed

modifiedcrates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/builtin/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/manifest.rs
@@ -19,6 +19,8 @@
 pub struct ManifestJsonOptions<'s> {
 	pub padding: &'s str,
 	pub mtype: ManifestType,
+	pub newline: &'s str,
+	pub key_val_sep: &'s str,
 }
 
 pub fn manifest_json_ex(val: &Val, options: &ManifestJsonOptions<'_>) -> Result<String> {
@@ -49,7 +51,7 @@
 			buf.push('[');
 			if !items.is_empty() {
 				if mtype != ManifestType::ToString && mtype != ManifestType::Minify {
-					buf.push('\n');
+					buf.push_str(options.newline);
 				}
 
 				let old_len = cur_padding.len();
@@ -60,7 +62,7 @@
 						if mtype == ManifestType::ToString {
 							buf.push(' ');
 						} else if mtype != ManifestType::Minify {
-							buf.push('\n');
+							buf.push_str(options.newline);
 						}
 					}
 					buf.push_str(cur_padding);
@@ -69,7 +71,7 @@
 				cur_padding.truncate(old_len);
 
 				if mtype != ManifestType::ToString && mtype != ManifestType::Minify {
-					buf.push('\n');
+					buf.push_str(options.newline);
 					buf.push_str(cur_padding);
 				}
 			} else if mtype == ManifestType::Std {
@@ -86,7 +88,7 @@
 			let fields = obj.fields();
 			if !fields.is_empty() {
 				if mtype != ManifestType::ToString && mtype != ManifestType::Minify {
-					buf.push('\n');
+					buf.push_str(options.newline);
 				}
 
 				let old_len = cur_padding.len();
@@ -97,12 +99,12 @@
 						if mtype == ManifestType::ToString {
 							buf.push(' ');
 						} else if mtype != ManifestType::Minify {
-							buf.push('\n');
+							buf.push_str(options.newline);
 						}
 					}
 					buf.push_str(cur_padding);
 					escape_string_json_buf(&field, buf);
-					buf.push_str(": ");
+					buf.push_str(options.key_val_sep);
 					push_description_frame(
 						|| format!("field <{}> manifestification", field.clone()),
 						|| {
@@ -115,7 +117,7 @@
 				cur_padding.truncate(old_len);
 
 				if mtype != ManifestType::ToString && mtype != ManifestType::Minify {
-					buf.push('\n');
+					buf.push_str(options.newline);
 					buf.push_str(cur_padding);
 				}
 			} else if mtype == ManifestType::Std {
modifiedcrates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/builtin/mod.rs
1use crate::function::StaticBuiltin;2use crate::typed::{Any, Null, PositiveF64, VecVal, M1};3use crate::{self as jrsonnet_evaluator, Either, ObjValue};4use crate::{5	builtin::manifest::{manifest_yaml_ex, ManifestYamlOptions},6	equals,7	error::{Error::*, Result},8	operator::evaluate_mod_op,9	primitive_equals, push_frame, throw,10	typed::{Either2, Either4},11	with_state, ArrValue, Context, FuncVal, IndexableVal, Val,12};13use format::{format_arr, format_obj};14use gcmodule::Cc;15use jrsonnet_interner::IStr;16use jrsonnet_parser::ExprLocation;17use serde::Deserialize;18use serde_yaml::DeserializingQuirks;19use std::collections::HashMap;20use std::convert::{TryFrom, TryInto};2122pub mod stdlib;23pub use stdlib::*;2425use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};2627pub mod format;28pub mod manifest;29pub mod sort;3031pub fn std_format(str: IStr, vals: Val) -> Result<String> {32	push_frame(33		None,34		|| format!("std.format of {}", str),35		|| {36			Ok(match vals {37				Val::Arr(vals) => format_arr(&str, &vals.evaluated()?)?,38				Val::Obj(obj) => format_obj(&str, &obj)?,39				o => format_arr(&str, &[o])?,40			})41		},42	)43}4445pub fn std_slice(46	indexable: IndexableVal,47	index: Option<usize>,48	end: Option<usize>,49	step: Option<usize>,50) -> Result<Val> {51	let index = index.unwrap_or(0);52	let end = end.unwrap_or_else(|| match &indexable {53		IndexableVal::Str(_) => usize::MAX,54		IndexableVal::Arr(v) => v.len(),55	});56	let step = step.unwrap_or(1);57	match &indexable {58		IndexableVal::Str(s) => Ok(Val::Str(59			(s.chars()60				.skip(index)61				.take(end - index)62				.step_by(step)63				.collect::<String>())64			.into(),65		)),66		IndexableVal::Arr(arr) => Ok(Val::Arr(67			(arr.iter()68				.skip(index)69				.take(end - index)70				.step_by(step)71				.collect::<Result<Vec<Val>>>()?)72			.into(),73		)),74	}75}7677type BuiltinsType = HashMap<IStr, &'static dyn StaticBuiltin>;7879thread_local! {80	pub static BUILTINS: BuiltinsType = {81		[82			("length".into(), builtin_length::INST),83			("type".into(), builtin_type::INST),84			("makeArray".into(), builtin_make_array::INST),85			("codepoint".into(), builtin_codepoint::INST),86			("objectFieldsEx".into(), builtin_object_fields_ex::INST),87			("objectHasEx".into(), builtin_object_has_ex::INST),88			("slice".into(), builtin_slice::INST),89			("substr".into(), builtin_substr::INST),90			("primitiveEquals".into(), builtin_primitive_equals::INST),91			("equals".into(), builtin_equals::INST),92			("modulo".into(), builtin_modulo::INST),93			("mod".into(), builtin_mod::INST),94			("floor".into(), builtin_floor::INST),95			("ceil".into(), builtin_ceil::INST),96			("log".into(), builtin_log::INST),97			("pow".into(), builtin_pow::INST),98			("sqrt".into(), builtin_sqrt::INST),99			("sin".into(), builtin_sin::INST),100			("cos".into(), builtin_cos::INST),101			("tan".into(), builtin_tan::INST),102			("asin".into(), builtin_asin::INST),103			("acos".into(), builtin_acos::INST),104			("atan".into(), builtin_atan::INST),105			("exp".into(), builtin_exp::INST),106			("mantissa".into(), builtin_mantissa::INST),107			("exponent".into(), builtin_exponent::INST),108			("extVar".into(), builtin_ext_var::INST),109			("native".into(), builtin_native::INST),110			("filter".into(), builtin_filter::INST),111			("map".into(), builtin_map::INST),112			("flatMap".into(), builtin_flatmap::INST),113			("foldl".into(), builtin_foldl::INST),114			("foldr".into(), builtin_foldr::INST),115			("sort".into(), builtin_sort::INST),116			("format".into(), builtin_format::INST),117			("range".into(), builtin_range::INST),118			("char".into(), builtin_char::INST),119			("encodeUTF8".into(), builtin_encode_utf8::INST),120			("decodeUTF8".into(), builtin_decode_utf8::INST),121			("md5".into(), builtin_md5::INST),122			("base64".into(), builtin_base64::INST),123			("base64DecodeBytes".into(), builtin_base64_decode_bytes::INST),124			("base64Decode".into(), builtin_base64_decode::INST),125			("trace".into(), builtin_trace::INST),126			("join".into(), builtin_join::INST),127			("escapeStringJson".into(), builtin_escape_string_json::INST),128			("manifestJsonEx".into(), builtin_manifest_json_ex::INST),129			("manifestYamlDoc".into(), builtin_manifest_yaml_doc::INST),130			("reverse".into(), builtin_reverse::INST),131			("id".into(), builtin_id::INST),132			("strReplace".into(), builtin_str_replace::INST),133			("splitLimit".into(), builtin_splitlimit::INST),134			("parseJson".into(), builtin_parse_json::INST),135			("parseYaml".into(), builtin_parse_yaml::INST),136			("asciiUpper".into(), builtin_ascii_upper::INST),137			("asciiLower".into(), builtin_ascii_lower::INST),138			("member".into(), builtin_member::INST),139			("count".into(), builtin_count::INST),140		].iter().cloned().collect()141	};142}143144#[jrsonnet_macros::builtin]145fn builtin_length(x: Either![IStr, VecVal, ObjValue, Cc<FuncVal>]) -> Result<usize> {146	use Either4::*;147	Ok(match x {148		A(x) => x.len(),149		B(x) => x.0.len(),150		C(x) => x151			.fields_visibility()152			.into_iter()153			.filter(|(_k, v)| *v)154			.count(),155		D(f) => f.args_len(),156	})157}158159#[jrsonnet_macros::builtin]160fn builtin_type(x: Any) -> Result<IStr> {161	Ok(x.0.value_type().name().into())162}163164#[jrsonnet_macros::builtin]165fn builtin_make_array(sz: usize, func: Cc<FuncVal>) -> Result<VecVal> {166	let mut out = Vec::with_capacity(sz);167	for i in 0..sz {168		out.push(func.evaluate_simple(&[i as f64].as_slice())?)169	}170	Ok(VecVal(out))171}172173#[jrsonnet_macros::builtin]174const fn builtin_codepoint(str: char) -> Result<u32> {175	Ok(str as u32)176}177178#[jrsonnet_macros::builtin]179fn builtin_object_fields_ex(obj: ObjValue, inc_hidden: bool) -> Result<VecVal> {180	let out = obj.fields_ex(inc_hidden);181	Ok(VecVal(out.into_iter().map(Val::Str).collect::<Vec<_>>()))182}183184#[jrsonnet_macros::builtin]185fn builtin_object_has_ex(obj: ObjValue, f: IStr, inc_hidden: bool) -> Result<bool> {186	Ok(obj.has_field_ex(f, inc_hidden))187}188189#[jrsonnet_macros::builtin]190fn builtin_parse_json(s: IStr) -> Result<Any> {191	let value: serde_json::Value = serde_json::from_str(&s)192		.map_err(|e| RuntimeError(format!("failed to parse json: {}", e).into()))?;193	Ok(Any(Val::try_from(&value)?))194}195196#[jrsonnet_macros::builtin]197fn builtin_parse_yaml(s: IStr) -> Result<Any> {198	let value = serde_yaml::Deserializer::from_str_with_quirks(199		&s,200		DeserializingQuirks { old_octals: true },201	);202	let mut out = vec![];203	for item in value {204		let value = serde_json::Value::deserialize(item)205			.map_err(|e| RuntimeError(format!("failed to parse yaml: {}", e).into()))?;206		let val = Val::try_from(&value)?;207		out.push(val);208	}209	Ok(Any(if out.is_empty() {210		Val::Null211	} else if out.len() == 1 {212		out.into_iter().next().unwrap()213	} else {214		Val::Arr(out.into())215	}))216}217218#[jrsonnet_macros::builtin]219fn builtin_slice(220	indexable: IndexableVal,221	index: Option<usize>,222	end: Option<usize>,223	step: Option<usize>,224) -> Result<Any> {225	std_slice(indexable, index, end, step).map(Any)226}227228#[jrsonnet_macros::builtin]229fn builtin_substr(str: IStr, from: usize, len: usize) -> Result<String> {230	Ok(str.chars().skip(from as usize).take(len as usize).collect())231}232233#[jrsonnet_macros::builtin]234fn builtin_primitive_equals(a: Any, b: Any) -> Result<bool> {235	primitive_equals(&a.0, &b.0)236}237238#[jrsonnet_macros::builtin]239fn builtin_equals(a: Any, b: Any) -> Result<bool> {240	equals(&a.0, &b.0)241}242243#[jrsonnet_macros::builtin]244fn builtin_modulo(a: f64, b: f64) -> Result<f64> {245	Ok(a % b)246}247248#[jrsonnet_macros::builtin]249fn builtin_mod(a: Either![f64, IStr], b: Any) -> Result<Any> {250	use Either2::*;251	Ok(Any(evaluate_mod_op(252		&match a {253			A(v) => Val::Num(v),254			B(s) => Val::Str(s),255		},256		&b.0,257	)?))258}259260#[jrsonnet_macros::builtin]261fn builtin_floor(x: f64) -> Result<f64> {262	Ok(x.floor())263}264265#[jrsonnet_macros::builtin]266fn builtin_ceil(x: f64) -> Result<f64> {267	Ok(x.ceil())268}269270#[jrsonnet_macros::builtin]271fn builtin_log(n: f64) -> Result<f64> {272	Ok(n.ln())273}274275#[jrsonnet_macros::builtin]276fn builtin_pow(x: f64, n: f64) -> Result<f64> {277	Ok(x.powf(n))278}279280#[jrsonnet_macros::builtin]281fn builtin_sqrt(x: PositiveF64) -> Result<f64> {282	Ok(x.0.sqrt())283}284285#[jrsonnet_macros::builtin]286fn builtin_sin(x: f64) -> Result<f64> {287	Ok(x.sin())288}289290#[jrsonnet_macros::builtin]291fn builtin_cos(x: f64) -> Result<f64> {292	Ok(x.cos())293}294295#[jrsonnet_macros::builtin]296fn builtin_tan(x: f64) -> Result<f64> {297	Ok(x.tan())298}299300#[jrsonnet_macros::builtin]301fn builtin_asin(x: f64) -> Result<f64> {302	Ok(x.asin())303}304305#[jrsonnet_macros::builtin]306fn builtin_acos(x: f64) -> Result<f64> {307	Ok(x.acos())308}309310#[jrsonnet_macros::builtin]311fn builtin_atan(x: f64) -> Result<f64> {312	Ok(x.atan())313}314315#[jrsonnet_macros::builtin]316fn builtin_exp(x: f64) -> Result<f64> {317	Ok(x.exp())318}319320fn frexp(s: f64) -> (f64, i16) {321	if 0.0 == s {322		(s, 0)323	} else {324		let lg = s.abs().log2();325		let x = (lg - lg.floor() - 1.0).exp2();326		let exp = lg.floor() + 1.0;327		(s.signum() * x, exp as i16)328	}329}330331#[jrsonnet_macros::builtin]332fn builtin_mantissa(x: f64) -> Result<f64> {333	Ok(frexp(x).0)334}335336#[jrsonnet_macros::builtin]337fn builtin_exponent(x: f64) -> Result<i16> {338	Ok(frexp(x).1)339}340341#[jrsonnet_macros::builtin]342fn builtin_ext_var(x: IStr) -> Result<Any> {343	Ok(Any(with_state(|s| s.settings().ext_vars.get(&x).cloned())344		.ok_or(UndefinedExternalVariable(x))?))345}346347#[jrsonnet_macros::builtin]348fn builtin_native(name: IStr) -> Result<Cc<FuncVal>> {349	Ok(with_state(|s| s.settings().ext_natives.get(&name).cloned())350		.map(|v| Cc::new(FuncVal::NativeExt(name.clone(), v)))351		.ok_or(UndefinedExternalFunction(name))?)352}353354#[jrsonnet_macros::builtin]355fn builtin_filter(func: Cc<FuncVal>, arr: ArrValue) -> Result<ArrValue> {356	arr.filter(|val| bool::try_from(func.evaluate_simple(&[Any(val.clone())].as_slice())?))357}358359#[jrsonnet_macros::builtin]360fn builtin_map(func: Cc<FuncVal>, arr: ArrValue) -> Result<ArrValue> {361	arr.map(|val| func.evaluate_simple(&[Any(val)].as_slice()))362}363364#[jrsonnet_macros::builtin]365fn builtin_flatmap(func: Cc<FuncVal>, arr: IndexableVal) -> Result<IndexableVal> {366	match arr {367		IndexableVal::Str(s) => {368			let mut out = String::new();369			for c in s.chars() {370				match func.evaluate_simple(&[c.to_string()].as_slice())? {371					Val::Str(o) => out.push_str(&o),372					_ => throw!(RuntimeError(373						"in std.join all items should be strings".into()374					)),375				};376			}377			Ok(IndexableVal::Str(out.into()))378		}379		IndexableVal::Arr(a) => {380			let mut out = Vec::new();381			for el in a.iter() {382				let el = el?;383				match func.evaluate_simple(&[Any(el)].as_slice())? {384					Val::Arr(o) => {385						for oe in o.iter() {386							out.push(oe?)387						}388					}389					_ => throw!(RuntimeError(390						"in std.join all items should be arrays".into()391					)),392				};393			}394			Ok(IndexableVal::Arr(out.into()))395		}396	}397}398399#[jrsonnet_macros::builtin]400fn builtin_foldl(func: Cc<FuncVal>, arr: ArrValue, init: Any) -> Result<Any> {401	let mut acc = init.0;402	for i in arr.iter() {403		acc = func.evaluate_simple(&[Any(acc), Any(i?)].as_slice())?;404	}405	Ok(Any(acc))406}407408#[jrsonnet_macros::builtin]409fn builtin_foldr(func: Cc<FuncVal>, arr: ArrValue, init: Any) -> Result<Any> {410	let mut acc = init.0;411	for i in arr.iter().rev() {412		acc = func.evaluate_simple(&[Any(i?), Any(acc)].as_slice())?;413	}414	Ok(Any(acc))415}416417#[jrsonnet_macros::builtin]418#[allow(non_snake_case)]419fn builtin_sort(arr: ArrValue, keyF: Option<Cc<FuncVal>>) -> Result<ArrValue> {420	if arr.len() <= 1 {421		return Ok(arr);422	}423	Ok(ArrValue::Eager(sort::sort(424		arr.evaluated()?,425		keyF.as_deref(),426	)?))427}428429#[jrsonnet_macros::builtin]430fn builtin_format(str: IStr, vals: Any) -> Result<String> {431	std_format(str, vals.0)432}433434#[jrsonnet_macros::builtin]435fn builtin_range(from: i32, to: i32) -> Result<VecVal> {436	if to < from {437		return Ok(VecVal(Vec::new()));438	}439	let mut out = Vec::with_capacity((1 + to as usize - from as usize).max(0));440	for i in from as usize..=to as usize {441		out.push(Val::Num(i as f64));442	}443	Ok(VecVal(out))444}445446#[jrsonnet_macros::builtin]447fn builtin_char(n: u32) -> Result<char> {448	Ok(std::char::from_u32(n as u32).ok_or(InvalidUnicodeCodepointGot(n as u32))?)449}450451#[jrsonnet_macros::builtin]452fn builtin_encode_utf8(str: IStr) -> Result<VecVal> {453	Ok(VecVal(454		str.bytes()455			.map(|b| Val::Num(b as f64))456			.collect::<Vec<Val>>(),457	))458}459460#[jrsonnet_macros::builtin]461fn builtin_decode_utf8(arr: Vec<u8>) -> Result<String> {462	Ok(String::from_utf8(arr).map_err(|_| RuntimeError("bad utf8".into()))?)463}464465#[jrsonnet_macros::builtin]466fn builtin_md5(str: IStr) -> Result<String> {467	Ok(format!("{:x}", md5::compute(&str.as_bytes())))468}469470#[jrsonnet_macros::builtin]471fn builtin_trace(#[location] loc: Option<&ExprLocation>, str: IStr, rest: Any) -> Result<Any> {472	eprint!("TRACE:");473	if let Some(loc) = loc {474		with_state(|s| {475			let locs = s.map_source_locations(&loc.0, &[loc.1]);476			eprint!(477				" {}:{}",478				loc.0.file_name().unwrap().to_str().unwrap(),479				locs[0].line480			);481		});482	}483	eprintln!(" {}", str);484	Ok(rest) as Result<Any>485}486487#[jrsonnet_macros::builtin]488fn builtin_base64(input: Either![Vec<u8>, IStr]) -> Result<String> {489	use Either2::*;490	Ok(match input {491		A(a) => base64::encode(a),492		B(l) => base64::encode(l.bytes().collect::<Vec<_>>()),493	})494}495496#[jrsonnet_macros::builtin]497fn builtin_base64_decode_bytes(input: IStr) -> Result<Vec<u8>> {498	Ok(base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?)499}500501#[jrsonnet_macros::builtin]502fn builtin_base64_decode(input: IStr) -> Result<String> {503	let bytes = base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?;504	Ok(String::from_utf8(bytes).map_err(|_| RuntimeError("bad utf8".into()))?)505}506507#[jrsonnet_macros::builtin]508fn builtin_join(sep: IndexableVal, arr: ArrValue) -> Result<IndexableVal> {509	Ok(match sep {510		IndexableVal::Arr(joiner_items) => {511			let mut out = Vec::new();512513			let mut first = true;514			for item in arr.iter() {515				let item = item?.clone();516				if let Val::Arr(items) = item {517					if !first {518						out.reserve(joiner_items.len());519						// TODO: extend520						for item in joiner_items.iter() {521							out.push(item?);522						}523					}524					first = false;525					out.reserve(items.len());526					// TODO: extend527					for item in items.iter() {528						out.push(item?);529					}530				} else {531					throw!(RuntimeError(532						"in std.join all items should be arrays".into()533					));534				}535			}536537			IndexableVal::Arr(out.into())538		}539		IndexableVal::Str(sep) => {540			let mut out = String::new();541542			let mut first = true;543			for item in arr.iter() {544				let item = item?.clone();545				if let Val::Str(item) = item {546					if !first {547						out += &sep;548					}549					first = false;550					out += &item;551				} else {552					throw!(RuntimeError(553						"in std.join all items should be strings".into()554					));555				}556			}557558			IndexableVal::Str(out.into())559		}560	})561}562563#[jrsonnet_macros::builtin]564fn builtin_escape_string_json(str_: IStr) -> Result<String> {565	Ok(escape_string_json(&str_))566}567568#[jrsonnet_macros::builtin]569fn builtin_manifest_json_ex(value: Any, indent: IStr) -> Result<String> {570	manifest_json_ex(571		&value.0,572		&ManifestJsonOptions {573			padding: &indent,574			mtype: ManifestType::Std,575		},576	)577}578579#[jrsonnet_macros::builtin]580fn builtin_manifest_yaml_doc(581	value: Any,582	indent_array_in_object: Option<bool>,583	quote_keys: Option<bool>,584) -> Result<String> {585	manifest_yaml_ex(586		&value.0,587		&ManifestYamlOptions {588			padding: "  ",589			arr_element_padding: if indent_array_in_object.unwrap_or(false) {590				"  "591			} else {592				""593			},594			quote_keys: quote_keys.unwrap_or(true),595		},596	)597}598599#[jrsonnet_macros::builtin]600fn builtin_reverse(value: ArrValue) -> Result<ArrValue> {601	Ok(value.reversed())602}603604#[jrsonnet_macros::builtin]605const fn builtin_id(v: Any) -> Result<Any> {606	Ok(v)607}608609#[jrsonnet_macros::builtin]610fn builtin_str_replace(str: String, from: IStr, to: IStr) -> Result<String> {611	Ok(str.replace(&from as &str, &to as &str))612}613614#[jrsonnet_macros::builtin]615fn builtin_splitlimit(str: IStr, c: char, maxsplits: Either![usize, M1]) -> Result<VecVal> {616	use Either2::*;617	Ok(VecVal(match maxsplits {618		A(n) => str.splitn(n + 1, c).map(|s| Val::Str(s.into())).collect(),619		B(_) => str.split(c).map(|s| Val::Str(s.into())).collect(),620	}))621}622623#[jrsonnet_macros::builtin]624fn builtin_ascii_upper(str: IStr) -> Result<String> {625	Ok(str.to_ascii_uppercase())626}627628#[jrsonnet_macros::builtin]629fn builtin_ascii_lower(str: IStr) -> Result<String> {630	Ok(str.to_ascii_lowercase())631}632633#[jrsonnet_macros::builtin]634fn builtin_member(arr: IndexableVal, x: Any) -> Result<bool> {635	match arr {636		IndexableVal::Str(s) => {637			let x: IStr = IStr::try_from(x.0)?;638			Ok(!x.is_empty() && s.contains(&*x))639		}640		IndexableVal::Arr(a) => {641			for item in a.iter() {642				let item = item?;643				if equals(&item, &x.0)? {644					return Ok(true);645				}646			}647			Ok(false)648		}649	}650}651652#[jrsonnet_macros::builtin]653fn builtin_count(arr: Vec<Any>, v: Any) -> Result<usize> {654	let mut count = 0;655	for item in arr.iter() {656		if equals(&item.0, &v.0)? {657			count += 1;658		}659	}660	Ok(count)661}
after · crates/jrsonnet-evaluator/src/builtin/mod.rs
1use crate::function::StaticBuiltin;2use crate::typed::{Any, PositiveF64, VecVal, M1};3use crate::{4	builtin::manifest::{manifest_yaml_ex, ManifestYamlOptions},5	equals,6	error::{Error::*, Result},7	operator::evaluate_mod_op,8	primitive_equals, push_frame, throw,9	typed::{Either2, Either4},10	with_state, ArrValue, Context, FuncVal, IndexableVal, Val,11};12use crate::{Either, ObjValue};13use format::{format_arr, format_obj};14use gcmodule::Cc;15use jrsonnet_interner::IStr;16use jrsonnet_parser::ExprLocation;17use serde::Deserialize;18use serde_yaml::DeserializingQuirks;19use std::collections::HashMap;20use std::convert::{TryFrom, TryInto};2122pub mod stdlib;23pub use stdlib::*;2425use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};2627pub mod format;28pub mod manifest;29pub mod sort;3031pub fn std_format(str: IStr, vals: Val) -> Result<String> {32	push_frame(33		None,34		|| format!("std.format of {}", str),35		|| {36			Ok(match vals {37				Val::Arr(vals) => format_arr(&str, &vals.evaluated()?)?,38				Val::Obj(obj) => format_obj(&str, &obj)?,39				o => format_arr(&str, &[o])?,40			})41		},42	)43}4445pub fn std_slice(46	indexable: IndexableVal,47	index: Option<usize>,48	end: Option<usize>,49	step: Option<usize>,50) -> Result<Val> {51	let index = index.unwrap_or(0);52	let end = end.unwrap_or_else(|| match &indexable {53		IndexableVal::Str(_) => usize::MAX,54		IndexableVal::Arr(v) => v.len(),55	});56	let step = step.unwrap_or(1);57	match &indexable {58		IndexableVal::Str(s) => Ok(Val::Str(59			(s.chars()60				.skip(index)61				.take(end - index)62				.step_by(step)63				.collect::<String>())64			.into(),65		)),66		IndexableVal::Arr(arr) => Ok(Val::Arr(67			(arr.iter()68				.skip(index)69				.take(end - index)70				.step_by(step)71				.collect::<Result<Vec<Val>>>()?)72			.into(),73		)),74	}75}7677type BuiltinsType = HashMap<IStr, &'static dyn StaticBuiltin>;7879thread_local! {80	pub static BUILTINS: BuiltinsType = {81		[82			("length".into(), builtin_length::INST),83			("type".into(), builtin_type::INST),84			("makeArray".into(), builtin_make_array::INST),85			("codepoint".into(), builtin_codepoint::INST),86			("objectFieldsEx".into(), builtin_object_fields_ex::INST),87			("objectHasEx".into(), builtin_object_has_ex::INST),88			("slice".into(), builtin_slice::INST),89			("substr".into(), builtin_substr::INST),90			("primitiveEquals".into(), builtin_primitive_equals::INST),91			("equals".into(), builtin_equals::INST),92			("modulo".into(), builtin_modulo::INST),93			("mod".into(), builtin_mod::INST),94			("floor".into(), builtin_floor::INST),95			("ceil".into(), builtin_ceil::INST),96			("log".into(), builtin_log::INST),97			("pow".into(), builtin_pow::INST),98			("sqrt".into(), builtin_sqrt::INST),99			("sin".into(), builtin_sin::INST),100			("cos".into(), builtin_cos::INST),101			("tan".into(), builtin_tan::INST),102			("asin".into(), builtin_asin::INST),103			("acos".into(), builtin_acos::INST),104			("atan".into(), builtin_atan::INST),105			("exp".into(), builtin_exp::INST),106			("mantissa".into(), builtin_mantissa::INST),107			("exponent".into(), builtin_exponent::INST),108			("extVar".into(), builtin_ext_var::INST),109			("native".into(), builtin_native::INST),110			("filter".into(), builtin_filter::INST),111			("map".into(), builtin_map::INST),112			("flatMap".into(), builtin_flatmap::INST),113			("foldl".into(), builtin_foldl::INST),114			("foldr".into(), builtin_foldr::INST),115			("sort".into(), builtin_sort::INST),116			("format".into(), builtin_format::INST),117			("range".into(), builtin_range::INST),118			("char".into(), builtin_char::INST),119			("encodeUTF8".into(), builtin_encode_utf8::INST),120			("decodeUTF8".into(), builtin_decode_utf8::INST),121			("md5".into(), builtin_md5::INST),122			("base64".into(), builtin_base64::INST),123			("base64DecodeBytes".into(), builtin_base64_decode_bytes::INST),124			("base64Decode".into(), builtin_base64_decode::INST),125			("trace".into(), builtin_trace::INST),126			("join".into(), builtin_join::INST),127			("escapeStringJson".into(), builtin_escape_string_json::INST),128			("manifestJsonEx".into(), builtin_manifest_json_ex::INST),129			("manifestYamlDoc".into(), builtin_manifest_yaml_doc::INST),130			("reverse".into(), builtin_reverse::INST),131			("id".into(), builtin_id::INST),132			("strReplace".into(), builtin_str_replace::INST),133			("splitLimit".into(), builtin_splitlimit::INST),134			("parseJson".into(), builtin_parse_json::INST),135			("parseYaml".into(), builtin_parse_yaml::INST),136			("asciiUpper".into(), builtin_ascii_upper::INST),137			("asciiLower".into(), builtin_ascii_lower::INST),138			("member".into(), builtin_member::INST),139			("count".into(), builtin_count::INST),140		].iter().cloned().collect()141	};142}143144#[jrsonnet_macros::builtin]145fn builtin_length(x: Either![IStr, VecVal, ObjValue, Cc<FuncVal>]) -> Result<usize> {146	use Either4::*;147	Ok(match x {148		A(x) => x.chars().count(),149		B(x) => x.0.len(),150		C(x) => x151			.fields_visibility()152			.into_iter()153			.filter(|(_k, v)| *v)154			.count(),155		D(f) => f.args_len(),156	})157}158159#[jrsonnet_macros::builtin]160fn builtin_type(x: Any) -> Result<IStr> {161	Ok(x.0.value_type().name().into())162}163164#[jrsonnet_macros::builtin]165fn builtin_make_array(sz: usize, func: Cc<FuncVal>) -> Result<VecVal> {166	let mut out = Vec::with_capacity(sz);167	for i in 0..sz {168		out.push(func.evaluate_simple(&[i as f64].as_slice())?)169	}170	Ok(VecVal(out))171}172173#[jrsonnet_macros::builtin]174const fn builtin_codepoint(str: char) -> Result<u32> {175	Ok(str as u32)176}177178#[jrsonnet_macros::builtin]179fn builtin_object_fields_ex(obj: ObjValue, inc_hidden: bool) -> Result<VecVal> {180	let out = obj.fields_ex(inc_hidden);181	Ok(VecVal(out.into_iter().map(Val::Str).collect::<Vec<_>>()))182}183184#[jrsonnet_macros::builtin]185fn builtin_object_has_ex(obj: ObjValue, f: IStr, inc_hidden: bool) -> Result<bool> {186	Ok(obj.has_field_ex(f, inc_hidden))187}188189#[jrsonnet_macros::builtin]190fn builtin_parse_json(s: IStr) -> Result<Any> {191	let value: serde_json::Value = serde_json::from_str(&s)192		.map_err(|e| RuntimeError(format!("failed to parse json: {}", e).into()))?;193	Ok(Any(Val::try_from(&value)?))194}195196#[jrsonnet_macros::builtin]197fn builtin_parse_yaml(s: IStr) -> Result<Any> {198	let value = serde_yaml::Deserializer::from_str_with_quirks(199		&s,200		DeserializingQuirks { old_octals: true },201	);202	let mut out = vec![];203	for item in value {204		let value = serde_json::Value::deserialize(item)205			.map_err(|e| RuntimeError(format!("failed to parse yaml: {}", e).into()))?;206		let val = Val::try_from(&value)?;207		out.push(val);208	}209	Ok(Any(if out.is_empty() {210		Val::Null211	} else if out.len() == 1 {212		out.into_iter().next().unwrap()213	} else {214		Val::Arr(out.into())215	}))216}217218#[jrsonnet_macros::builtin]219fn builtin_slice(220	indexable: IndexableVal,221	index: Option<usize>,222	end: Option<usize>,223	step: Option<usize>,224) -> Result<Any> {225	std_slice(indexable, index, end, step).map(Any)226}227228#[jrsonnet_macros::builtin]229fn builtin_substr(str: IStr, from: usize, len: usize) -> Result<String> {230	Ok(str.chars().skip(from as usize).take(len as usize).collect())231}232233#[jrsonnet_macros::builtin]234fn builtin_primitive_equals(a: Any, b: Any) -> Result<bool> {235	primitive_equals(&a.0, &b.0)236}237238#[jrsonnet_macros::builtin]239fn builtin_equals(a: Any, b: Any) -> Result<bool> {240	equals(&a.0, &b.0)241}242243#[jrsonnet_macros::builtin]244fn builtin_modulo(a: f64, b: f64) -> Result<f64> {245	Ok(a % b)246}247248#[jrsonnet_macros::builtin]249fn builtin_mod(a: Either![f64, IStr], b: Any) -> Result<Any> {250	use Either2::*;251	Ok(Any(evaluate_mod_op(252		&match a {253			A(v) => Val::Num(v),254			B(s) => Val::Str(s),255		},256		&b.0,257	)?))258}259260#[jrsonnet_macros::builtin]261fn builtin_floor(x: f64) -> Result<f64> {262	Ok(x.floor())263}264265#[jrsonnet_macros::builtin]266fn builtin_ceil(x: f64) -> Result<f64> {267	Ok(x.ceil())268}269270#[jrsonnet_macros::builtin]271fn builtin_log(n: f64) -> Result<f64> {272	Ok(n.ln())273}274275#[jrsonnet_macros::builtin]276fn builtin_pow(x: f64, n: f64) -> Result<f64> {277	Ok(x.powf(n))278}279280#[jrsonnet_macros::builtin]281fn builtin_sqrt(x: PositiveF64) -> Result<f64> {282	Ok(x.0.sqrt())283}284285#[jrsonnet_macros::builtin]286fn builtin_sin(x: f64) -> Result<f64> {287	Ok(x.sin())288}289290#[jrsonnet_macros::builtin]291fn builtin_cos(x: f64) -> Result<f64> {292	Ok(x.cos())293}294295#[jrsonnet_macros::builtin]296fn builtin_tan(x: f64) -> Result<f64> {297	Ok(x.tan())298}299300#[jrsonnet_macros::builtin]301fn builtin_asin(x: f64) -> Result<f64> {302	Ok(x.asin())303}304305#[jrsonnet_macros::builtin]306fn builtin_acos(x: f64) -> Result<f64> {307	Ok(x.acos())308}309310#[jrsonnet_macros::builtin]311fn builtin_atan(x: f64) -> Result<f64> {312	Ok(x.atan())313}314315#[jrsonnet_macros::builtin]316fn builtin_exp(x: f64) -> Result<f64> {317	Ok(x.exp())318}319320fn frexp(s: f64) -> (f64, i16) {321	if 0.0 == s {322		(s, 0)323	} else {324		let lg = s.abs().log2();325		let x = (lg - lg.floor() - 1.0).exp2();326		let exp = lg.floor() + 1.0;327		(s.signum() * x, exp as i16)328	}329}330331#[jrsonnet_macros::builtin]332fn builtin_mantissa(x: f64) -> Result<f64> {333	Ok(frexp(x).0)334}335336#[jrsonnet_macros::builtin]337fn builtin_exponent(x: f64) -> Result<i16> {338	Ok(frexp(x).1)339}340341#[jrsonnet_macros::builtin]342fn builtin_ext_var(x: IStr) -> Result<Any> {343	Ok(Any(with_state(|s| s.settings().ext_vars.get(&x).cloned())344		.ok_or(UndefinedExternalVariable(x))?))345}346347#[jrsonnet_macros::builtin]348fn builtin_native(name: IStr) -> Result<Cc<FuncVal>> {349	Ok(with_state(|s| s.settings().ext_natives.get(&name).cloned())350		.map(|v| Cc::new(FuncVal::NativeExt(name.clone(), v)))351		.ok_or(UndefinedExternalFunction(name))?)352}353354#[jrsonnet_macros::builtin]355fn builtin_filter(func: Cc<FuncVal>, arr: ArrValue) -> Result<ArrValue> {356	arr.filter(|val| bool::try_from(func.evaluate_simple(&[Any(val.clone())].as_slice())?))357}358359#[jrsonnet_macros::builtin]360fn builtin_map(func: Cc<FuncVal>, arr: ArrValue) -> Result<ArrValue> {361	arr.map(|val| func.evaluate_simple(&[Any(val)].as_slice()))362}363364#[jrsonnet_macros::builtin]365fn builtin_flatmap(func: Cc<FuncVal>, arr: IndexableVal) -> Result<IndexableVal> {366	match arr {367		IndexableVal::Str(s) => {368			let mut out = String::new();369			for c in s.chars() {370				match func.evaluate_simple(&[c.to_string()].as_slice())? {371					Val::Str(o) => out.push_str(&o),372					_ => throw!(RuntimeError(373						"in std.join all items should be strings".into()374					)),375				};376			}377			Ok(IndexableVal::Str(out.into()))378		}379		IndexableVal::Arr(a) => {380			let mut out = Vec::new();381			for el in a.iter() {382				let el = el?;383				match func.evaluate_simple(&[Any(el)].as_slice())? {384					Val::Arr(o) => {385						for oe in o.iter() {386							out.push(oe?)387						}388					}389					_ => throw!(RuntimeError(390						"in std.join all items should be arrays".into()391					)),392				};393			}394			Ok(IndexableVal::Arr(out.into()))395		}396	}397}398399#[jrsonnet_macros::builtin]400fn builtin_foldl(func: Cc<FuncVal>, arr: ArrValue, init: Any) -> Result<Any> {401	let mut acc = init.0;402	for i in arr.iter() {403		acc = func.evaluate_simple(&[Any(acc), Any(i?)].as_slice())?;404	}405	Ok(Any(acc))406}407408#[jrsonnet_macros::builtin]409fn builtin_foldr(func: Cc<FuncVal>, arr: ArrValue, init: Any) -> Result<Any> {410	let mut acc = init.0;411	for i in arr.iter().rev() {412		acc = func.evaluate_simple(&[Any(i?), Any(acc)].as_slice())?;413	}414	Ok(Any(acc))415}416417#[jrsonnet_macros::builtin]418#[allow(non_snake_case)]419fn builtin_sort(arr: ArrValue, keyF: Option<Cc<FuncVal>>) -> Result<ArrValue> {420	if arr.len() <= 1 {421		return Ok(arr);422	}423	Ok(ArrValue::Eager(sort::sort(424		arr.evaluated()?,425		keyF.as_deref(),426	)?))427}428429#[jrsonnet_macros::builtin]430fn builtin_format(str: IStr, vals: Any) -> Result<String> {431	std_format(str, vals.0)432}433434#[jrsonnet_macros::builtin]435fn builtin_range(from: i32, to: i32) -> Result<VecVal> {436	if to < from {437		return Ok(VecVal(Vec::new()));438	}439	let mut out = Vec::with_capacity((1 + to as usize - from as usize).max(0));440	for i in from as usize..=to as usize {441		out.push(Val::Num(i as f64));442	}443	Ok(VecVal(out))444}445446#[jrsonnet_macros::builtin]447fn builtin_char(n: u32) -> Result<char> {448	Ok(std::char::from_u32(n as u32).ok_or(InvalidUnicodeCodepointGot(n as u32))?)449}450451#[jrsonnet_macros::builtin]452fn builtin_encode_utf8(str: IStr) -> Result<VecVal> {453	Ok(VecVal(454		str.bytes()455			.map(|b| Val::Num(b as f64))456			.collect::<Vec<Val>>(),457	))458}459460#[jrsonnet_macros::builtin]461fn builtin_decode_utf8(arr: Vec<u8>) -> Result<String> {462	Ok(String::from_utf8(arr).map_err(|_| RuntimeError("bad utf8".into()))?)463}464465#[jrsonnet_macros::builtin]466fn builtin_md5(str: IStr) -> Result<String> {467	Ok(format!("{:x}", md5::compute(&str.as_bytes())))468}469470#[jrsonnet_macros::builtin]471fn builtin_trace(#[location] loc: Option<&ExprLocation>, str: IStr, rest: Any) -> Result<Any> {472	eprint!("TRACE:");473	if let Some(loc) = loc {474		with_state(|s| {475			let locs = s.map_source_locations(&loc.0, &[loc.1]);476			eprint!(477				" {}:{}",478				loc.0.file_name().unwrap().to_str().unwrap(),479				locs[0].line480			);481		});482	}483	eprintln!(" {}", str);484	Ok(rest) as Result<Any>485}486487#[jrsonnet_macros::builtin]488fn builtin_base64(input: Either![Vec<u8>, IStr]) -> Result<String> {489	use Either2::*;490	Ok(match input {491		A(a) => base64::encode(a),492		B(l) => base64::encode(l.bytes().collect::<Vec<_>>()),493	})494}495496#[jrsonnet_macros::builtin]497fn builtin_base64_decode_bytes(input: IStr) -> Result<Vec<u8>> {498	Ok(base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?)499}500501#[jrsonnet_macros::builtin]502fn builtin_base64_decode(input: IStr) -> Result<String> {503	let bytes = base64::decode(&input.as_bytes()).map_err(|_| RuntimeError("bad base64".into()))?;504	Ok(String::from_utf8(bytes).map_err(|_| RuntimeError("bad utf8".into()))?)505}506507#[jrsonnet_macros::builtin]508fn builtin_join(sep: IndexableVal, arr: ArrValue) -> Result<IndexableVal> {509	Ok(match sep {510		IndexableVal::Arr(joiner_items) => {511			let mut out = Vec::new();512513			let mut first = true;514			for item in arr.iter() {515				let item = item?.clone();516				if let Val::Arr(items) = item {517					if !first {518						out.reserve(joiner_items.len());519						// TODO: extend520						for item in joiner_items.iter() {521							out.push(item?);522						}523					}524					first = false;525					out.reserve(items.len());526					// TODO: extend527					for item in items.iter() {528						out.push(item?);529					}530				} else {531					throw!(RuntimeError(532						"in std.join all items should be arrays".into()533					));534				}535			}536537			IndexableVal::Arr(out.into())538		}539		IndexableVal::Str(sep) => {540			let mut out = String::new();541542			let mut first = true;543			for item in arr.iter() {544				let item = item?.clone();545				if let Val::Str(item) = item {546					if !first {547						out += &sep;548					}549					first = false;550					out += &item;551				} else {552					throw!(RuntimeError(553						"in std.join all items should be strings".into()554					));555				}556			}557558			IndexableVal::Str(out.into())559		}560	})561}562563#[jrsonnet_macros::builtin]564fn builtin_escape_string_json(str_: IStr) -> Result<String> {565	Ok(escape_string_json(&str_))566}567568#[jrsonnet_macros::builtin]569fn builtin_manifest_json_ex(570	value: Any,571	indent: IStr,572	newline: Option<IStr>,573	key_val_sep: Option<IStr>,574) -> Result<String> {575	let newline = newline.as_deref().unwrap_or("\n");576	let key_val_sep = key_val_sep.as_deref().unwrap_or(": ");577	manifest_json_ex(578		&value.0,579		&ManifestJsonOptions {580			padding: &indent,581			mtype: ManifestType::Std,582			newline,583			key_val_sep,584		},585	)586}587588#[jrsonnet_macros::builtin]589fn builtin_manifest_yaml_doc(590	value: Any,591	indent_array_in_object: Option<bool>,592	quote_keys: Option<bool>,593) -> Result<String> {594	manifest_yaml_ex(595		&value.0,596		&ManifestYamlOptions {597			padding: "  ",598			arr_element_padding: if indent_array_in_object.unwrap_or(false) {599				"  "600			} else {601				""602			},603			quote_keys: quote_keys.unwrap_or(true),604		},605	)606}607608#[jrsonnet_macros::builtin]609fn builtin_reverse(value: ArrValue) -> Result<ArrValue> {610	Ok(value.reversed())611}612613#[jrsonnet_macros::builtin]614const fn builtin_id(v: Any) -> Result<Any> {615	Ok(v)616}617618#[jrsonnet_macros::builtin]619fn builtin_str_replace(str: String, from: IStr, to: IStr) -> Result<String> {620	Ok(str.replace(&from as &str, &to as &str))621}622623#[jrsonnet_macros::builtin]624fn builtin_splitlimit(str: IStr, c: char, maxsplits: Either![usize, M1]) -> Result<VecVal> {625	use Either2::*;626	Ok(VecVal(match maxsplits {627		A(n) => str.splitn(n + 1, c).map(|s| Val::Str(s.into())).collect(),628		B(_) => str.split(c).map(|s| Val::Str(s.into())).collect(),629	}))630}631632#[jrsonnet_macros::builtin]633fn builtin_ascii_upper(str: IStr) -> Result<String> {634	Ok(str.to_ascii_uppercase())635}636637#[jrsonnet_macros::builtin]638fn builtin_ascii_lower(str: IStr) -> Result<String> {639	Ok(str.to_ascii_lowercase())640}641642#[jrsonnet_macros::builtin]643fn builtin_member(arr: IndexableVal, x: Any) -> Result<bool> {644	match arr {645		IndexableVal::Str(s) => {646			let x: IStr = IStr::try_from(x.0)?;647			Ok(!x.is_empty() && s.contains(&*x))648		}649		IndexableVal::Arr(a) => {650			for item in a.iter() {651				let item = item?;652				if equals(&item, &x.0)? {653					return Ok(true);654				}655			}656			Ok(false)657		}658	}659}660661#[jrsonnet_macros::builtin]662fn builtin_count(arr: Vec<Any>, v: Any) -> Result<usize> {663	let mut count = 0;664	for item in arr.iter() {665		if equals(&item.0, &v.0)? {666			count += 1;667		}668	}669	Ok(count)670}
modifiedcrates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/lib.rs
+++ b/crates/jrsonnet-evaluator/src/lib.rs
@@ -5,6 +5,9 @@
 	clippy::ptr_arg
 )]
 
+// For jrsonnet-macros
+extern crate self as jrsonnet_evaluator;
+
 mod builtin;
 mod ctx;
 mod dynamic;
@@ -976,6 +979,14 @@
 	}
 
 	#[test]
+	fn json_minified() {
+		assert_json!(
+			r#"std.manifestJsonMinified({a:3, b:4, c:6})"#,
+			r#""{\"a\":3,\"b\":4,\"c\":6}""#
+		);
+	}
+
+	#[test]
 	fn parse_json() {
 		assert_json!(
 			r#"std.parseJson('{"a": -1,"b": 1,"c": 3.141,"d": []}')"#,
modifiedcrates/jrsonnet-evaluator/src/typed/conversions.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/typed/conversions.rs
+++ b/crates/jrsonnet-evaluator/src/typed/conversions.rs
@@ -19,7 +19,7 @@
 	($($ty:ty)*) => {$(
 		impl Typed for $ty {
 			const TYPE: &'static ComplexValType =
-				&ComplexValType::BoundedNumber(Some(<$ty>::MIN as f64), Some(<$ty>::MAX as f64));
+				&ComplexValType::BoundedNumber(Some(Self::MIN as f64), Some(Self::MAX as f64));
 		}
 		impl TryFrom<Val> for $ty {
 			type Error = LocError;
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -400,6 +400,8 @@
 				&ManifestJsonOptions {
 					padding: "",
 					mtype: ManifestType::ToString,
+					newline: "\n",
+					key_val_sep: ": ",
 				},
 			)?
 			.into(),
@@ -484,6 +486,8 @@
 				} else {
 					ManifestType::Manifest
 				},
+				newline: "\n",
+				key_val_sep: ": ",
 			},
 		)
 		.map(|s| s.into())
@@ -496,6 +500,8 @@
 			&ManifestJsonOptions {
 				padding: &" ".repeat(padding),
 				mtype: ManifestType::Std,
+				newline: "\n",
+				key_val_sep: ": ",
 			},
 		)
 		.map(|s| s.into())
modifiedcrates/jrsonnet-macros/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-macros/src/lib.rs
+++ b/crates/jrsonnet-macros/src/lib.rs
@@ -105,7 +105,7 @@
 				if let Some(opt_ty) = extract_type_from_option(&t.ty) {
 					quote! {{
 						if let Some(value) = parsed.get(#ident) {
-							Some(jrsonnet_evaluator::push_description_frame(
+							Some(::jrsonnet_evaluator::push_description_frame(
 								|| format!("argument <{}> evaluation", #ident),
 								|| <#opt_ty>::try_from(value.evaluate()?),
 							)?)
@@ -117,7 +117,7 @@
 					quote! {{
 						let value = parsed.get(#ident).unwrap();
 
-						jrsonnet_evaluator::push_description_frame(
+						::jrsonnet_evaluator::push_description_frame(
 							|| format!("argument <{}> evaluation", #ident),
 							|| <#ty>::try_from(value.evaluate()?),
 						)?
@@ -136,7 +136,7 @@
 		#[derive(Clone, Copy, gcmodule::Trace)]
 		#vis struct #name {}
 		const _: () = {
-			use jrsonnet_evaluator::function::{Builtin, StaticBuiltin, BuiltinParam, ArgsLike};
+			use ::jrsonnet_evaluator::function::{Builtin, StaticBuiltin, BuiltinParam, ArgsLike};
 			const PARAMS: &'static [BuiltinParam] = &[
 				#(#params),*
 			];
@@ -156,7 +156,7 @@
 					PARAMS
 				}
 				fn call(&self, context: Context, loc: Option<&ExprLocation>, args: &dyn ArgsLike) -> Result<Val> {
-					let parsed = jrsonnet_evaluator::function::parse_builtin_call(context, &PARAMS, args, false)?;
+					let parsed = ::jrsonnet_evaluator::function::parse_builtin_call(context, &PARAMS, args, false)?;
 
 					let result: #result = #name(#(#args),*);
 					let result = result?;
modifiedcrates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -373,6 +373,8 @@
 
   manifestJson(value):: std.manifestJsonEx(value, '    ') tailstrict,
 
+  manifestJsonMinified(value):: std.manifestJsonEx(value, '', '', ':'),
+
   manifestJsonEx:: $intrinsic(manifestJsonEx),
 
   manifestYamlDoc:: $intrinsic(manifestYamlDoc),
@@ -530,6 +532,9 @@
     else
       patch,
 
+  get(o, f, default = null, inc_hidden = true)::
+    if std.objectHasEx(o, f, inc_hidden) then o[f] else default,
+
   objectFields(o)::
     std.objectFieldsEx(o, false),