git.delta.rocks / jrsonnet / refs/commits / 62c9d0dad748

difftreelog

Merge pull request #62 from CertainLach/fix/missing-language-features

Yaroslav Bolyukin2021-08-20parents: #7084037 #b543496.patch.diff
in: master
Missing language features

9 files changed

modifiedcrates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/builtin/mod.rs
1use crate::{2	equals,3	error::{Error::*, Result},4	operator::evaluate_mod_op,5	parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, EvaluationState,6	FuncVal, IndexableVal, LazyVal, Val,7};8use format::{format_arr, format_obj};9use jrsonnet_gc::Gc;10use jrsonnet_interner::IStr;11use jrsonnet_parser::{ArgsDesc, ExprLocation};12use jrsonnet_types::ty;13use std::{collections::HashMap, path::PathBuf, rc::Rc};1415pub mod stdlib;16pub use stdlib::*;1718use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};1920pub mod format;21pub mod manifest;22pub mod sort;2324pub fn std_format(str: IStr, vals: Val) -> Result<Val> {25	push(26		Some(&ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)),27		|| format!("std.format of {}", str),28		|| {29			Ok(match vals {30				Val::Arr(vals) => Val::Str(format_arr(&str, &vals.evaluated()?)?.into()),31				Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),32				o => Val::Str(format_arr(&str, &[o])?.into()),33			})34		},35	)36}3738pub fn std_slice(39	indexable: IndexableVal,40	index: Option<usize>,41	end: Option<usize>,42	step: Option<usize>,43) -> Result<Val> {44	let index = index.unwrap_or(0);45	let end = end.unwrap_or_else(|| match &indexable {46		IndexableVal::Str(_) => usize::MAX,47		IndexableVal::Arr(v) => v.len(),48	});49	let step = step.unwrap_or(1);50	match &indexable {51		IndexableVal::Str(s) => Ok(Val::Str(52			(s.chars()53				.skip(index)54				.take(end - index)55				.step_by(step)56				.collect::<String>())57			.into(),58		)),59		IndexableVal::Arr(arr) => Ok(Val::Arr(60			(arr.iter()61				.skip(index)62				.take(end - index)63				.step_by(step)64				.collect::<Result<Vec<Val>>>()?)65			.into(),66		)),67	}68}6970type Builtin = fn(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val>;7172type BuiltinsType = HashMap<Box<str>, Builtin>;7374thread_local! {75	static BUILTINS: BuiltinsType = {76		[77			("length".into(), builtin_length as Builtin),78			("type".into(), builtin_type),79			("makeArray".into(), builtin_make_array),80			("codepoint".into(), builtin_codepoint),81			("objectFieldsEx".into(), builtin_object_fields_ex),82			("objectHasEx".into(), builtin_object_has_ex),83			("slice".into(), builtin_slice),84			("substr".into(), builtin_substr),85			("primitiveEquals".into(), builtin_primitive_equals),86			("equals".into(), builtin_equals),87			("modulo".into(), builtin_modulo),88			("mod".into(), builtin_mod),89			("floor".into(), builtin_floor),90			("ceil".into(), builtin_ceil),91			("log".into(), builtin_log),92			("pow".into(), builtin_pow),93			("sqrt".into(), builtin_sqrt),94			("sin".into(), builtin_sin),95			("cos".into(), builtin_cos),96			("tan".into(), builtin_tan),97			("asin".into(), builtin_asin),98			("acos".into(), builtin_acos),99			("atan".into(), builtin_atan),100			("exp".into(), builtin_exp),101			("mantissa".into(), builtin_mantissa),102			("exponent".into(), builtin_exponent),103			("extVar".into(), builtin_ext_var),104			("native".into(), builtin_native),105			("filter".into(), builtin_filter),106			("map".into(), builtin_map),107			("flatMap".into(), builtin_flatmap),108			("foldl".into(), builtin_foldl),109			("foldr".into(), builtin_foldr),110			("sortImpl".into(), builtin_sort_impl),111			("format".into(), builtin_format),112			("range".into(), builtin_range),113			("char".into(), builtin_char),114			("encodeUTF8".into(), builtin_encode_utf8),115			("decodeUTF8".into(), builtin_decode_utf8),116			("md5".into(), builtin_md5),117			("base64".into(), builtin_base64),118			("base64DecodeBytes".into(), builtin_base64_decode_bytes),119			("base64Decode".into(), builtin_base64_decode),120			("trace".into(), builtin_trace),121			("join".into(), builtin_join),122			("escapeStringJson".into(), builtin_escape_string_json),123			("manifestJsonEx".into(), builtin_manifest_json_ex),124			("reverse".into(), builtin_reverse),125			("id".into(), builtin_id),126			("strReplace".into(), builtin_str_replace),127			("splitLimit".into(), builtin_splitlimit),128			("parseJson".into(), builtin_parse_json),129			("asciiUpper".into(), builtin_ascii_upper),130			("asciiLower".into(), builtin_ascii_lower),131			("member".into(), builtin_member),132			("count".into(), builtin_count),133		].iter().cloned().collect()134	};135}136137fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {138	parse_args!(context, "length", args, 1, [139		0, x: ty!((string | object | array));140	], {141		Ok(match x {142			Val::Str(n) => Val::Num(n.chars().count() as f64),143			Val::Arr(a) => Val::Num(a.len() as f64),144			Val::Obj(o) => Val::Num(145				o.fields_visibility()146					.into_iter()147					.filter(|(_k, v)| *v)148					.count() as f64,149			),150			_ => unreachable!(),151		})152	})153}154155fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {156	parse_args!(context, "type", args, 1, [157		0, x: ty!(any);158	], {159		Ok(Val::Str(x.value_type().name().into()))160	})161}162163fn builtin_make_array(164	context: Context,165	_loc: Option<&ExprLocation>,166	args: &ArgsDesc,167) -> Result<Val> {168	parse_args!(context, "makeArray", args, 2, [169		0, sz: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;170		1, func: ty!(function) => Val::Func;171	], {172		let mut out = Vec::with_capacity(sz as usize);173		for i in 0..sz as usize {174			out.push(LazyVal::new_resolved(func.evaluate_values(175				context.clone(),176				&[Val::Num(i as f64)]177			)?))178		}179		Ok(Val::Arr(out.into()))180	})181}182183fn builtin_codepoint(184	context: Context,185	_loc: Option<&ExprLocation>,186	args: &ArgsDesc,187) -> Result<Val> {188	parse_args!(context, "codepoint", args, 1, [189		0, str: ty!(char) => Val::Str;190	], {191		Ok(Val::Num(str.chars().next().unwrap() as u32 as f64))192	})193}194195fn builtin_object_fields_ex(196	context: Context,197	_loc: Option<&ExprLocation>,198	args: &ArgsDesc,199) -> Result<Val> {200	parse_args!(context, "objectFieldsEx", args, 2, [201		0, obj: ty!(object) => Val::Obj;202		1, inc_hidden: ty!(boolean) => Val::Bool;203	], {204		let out = obj.fields_ex(inc_hidden);205		Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))206	})207}208209fn builtin_object_has_ex(210	context: Context,211	_loc: Option<&ExprLocation>,212	args: &ArgsDesc,213) -> Result<Val> {214	parse_args!(context, "objectHasEx", args, 3, [215		0, obj: ty!(object) => Val::Obj;216		1, f: ty!(string) => Val::Str;217		2, inc_hidden: ty!(boolean) => Val::Bool;218	], {219		Ok(Val::Bool(obj.has_field_ex(f, inc_hidden)))220	})221}222223fn builtin_parse_json(224	context: Context,225	_loc: Option<&ExprLocation>,226	args: &ArgsDesc,227) -> Result<Val> {228	parse_args!(context, "parseJson", args, 1, [229		0, s: ty!(string) => Val::Str;230	], {231		let state = EvaluationState::default();232		let path = PathBuf::from("std.parseJson").into();233		state.evaluate_snippet_raw(path ,s)234	})235}236237fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {238	parse_args!(context, "slice", args, 4, [239		0, indexable: ty!((string | array));240		1, index: ty!((number | null));241		2, end: ty!((number | null));242		3, step: ty!((number | null));243	], {244		std_slice(245			indexable.into_indexable()?,246			index.try_cast_nullable_num("index")?.map(|v| v as usize),247			end.try_cast_nullable_num("end")?.map(|v| v as usize),248			step.try_cast_nullable_num("step")?.map(|v| v as usize),249		)250	})251}252253fn builtin_substr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {254	parse_args!(context, "substr", args, 3, [255		0, str: ty!(string) => Val::Str;256		1, from: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;257		2, len: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;258	], {259		let out: String = str.chars().skip(from as usize).take(len as usize).collect();260		Ok(Val::Str(out.into()))261	})262}263264fn builtin_primitive_equals(265	context: Context,266	_loc: Option<&ExprLocation>,267	args: &ArgsDesc,268) -> Result<Val> {269	parse_args!(context, "primitiveEquals", args, 2, [270		0, a: ty!(any);271		1, b: ty!(any);272	], {273		Ok(Val::Bool(primitive_equals(&a, &b)?))274	})275}276277fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {278	parse_args!(context, "equals", args, 2, [279		0, a: ty!(any);280		1, b: ty!(any);281	], {282		Ok(Val::Bool(equals(&a, &b)?))283	})284}285286fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {287	parse_args!(context, "modulo", args, 2, [288		0, a: ty!(number) => Val::Num;289		1, b: ty!(number) => Val::Num;290	], {291		Ok(Val::Num(a % b))292	})293}294295fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {296	parse_args!(context, "mod", args, 2, [297		0, a: ty!((number | string));298		1, b: ty!(any);299	], {300		evaluate_mod_op(&a, &b)301	})302}303304fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {305	parse_args!(context, "floor", args, 1, [306		0, x: ty!(number) => Val::Num;307	], {308		Ok(Val::Num(x.floor()))309	})310}311312fn builtin_ceil(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {313	parse_args!(context, "ceil", args, 1, [314		0, x: ty!(number) => Val::Num;315	], {316		Ok(Val::Num(x.ceil()))317	})318}319320fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {321	parse_args!(context, "log", args, 1, [322		0, n: ty!(number) => Val::Num;323	], {324		Ok(Val::Num(n.ln()))325	})326}327328fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {329	parse_args!(context, "pow", args, 2, [330		0, x: ty!(number) => Val::Num;331		1, n: ty!(number) => Val::Num;332	], {333		Ok(Val::Num(x.powf(n)))334	})335}336337fn builtin_sqrt(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {338	parse_args!(context, "sqrt", args, 1, [339		0, x: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;340	], {341		Ok(Val::Num(x.sqrt()))342	})343}344345fn builtin_sin(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {346	parse_args!(context, "sin", args, 1, [347		0, x: ty!(number) => Val::Num;348	], {349		Ok(Val::Num(x.sin()))350	})351}352353fn builtin_cos(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {354	parse_args!(context, "cos", args, 1, [355		0, x: ty!(number) => Val::Num;356	], {357		Ok(Val::Num(x.cos()))358	})359}360361fn builtin_tan(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {362	parse_args!(context, "tan", args, 1, [363		0, x: ty!(number) => Val::Num;364	], {365		Ok(Val::Num(x.tan()))366	})367}368369fn builtin_asin(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {370	parse_args!(context, "asin", args, 1, [371		0, x: ty!(number) => Val::Num;372	], {373		Ok(Val::Num(x.asin()))374	})375}376377fn builtin_acos(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {378	parse_args!(context, "acos", args, 1, [379		0, x: ty!(number) => Val::Num;380	], {381		Ok(Val::Num(x.acos()))382	})383}384385fn builtin_atan(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {386	parse_args!(context, "atan", args, 1, [387		0, x: ty!(number) => Val::Num;388	], {389		Ok(Val::Num(x.atan()))390	})391}392393fn builtin_exp(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {394	parse_args!(context, "exp", args, 1, [395		0, x: ty!(number) => Val::Num;396	], {397		Ok(Val::Num(x.exp()))398	})399}400401fn frexp(s: f64) -> (f64, i16) {402	if 0.0 == s {403		(s, 0)404	} else {405		let lg = s.abs().log2();406		let x = (lg - lg.floor() - 1.0).exp2();407		let exp = lg.floor() + 1.0;408		(s.signum() * x, exp as i16)409	}410}411412fn builtin_mantissa(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {413	parse_args!(context, "mantissa", args, 1, [414		0, x: ty!(number) => Val::Num;415	], {416		Ok(Val::Num(frexp(x).0))417	})418}419420fn builtin_exponent(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {421	parse_args!(context, "exponent", args, 1, [422		0, x: ty!(number) => Val::Num;423	], {424		Ok(Val::Num(frexp(x).1.into()))425	})426}427428fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {429	parse_args!(context, "extVar", args, 1, [430		0, x: ty!(string) => Val::Str;431	], {432		Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)433	})434}435436fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {437	parse_args!(context, "native", args, 1, [438		0, x: ty!(string) => Val::Str;439	], {440		Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Gc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or(UndefinedExternalFunction(x))?)441	})442}443444fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {445	parse_args!(context, "filter", args, 2, [446		0, func: ty!(function) => Val::Func;447		1, arr: ty!(array) => Val::Arr;448	], {449		Ok(Val::Arr(arr.filter(|val| func450			.evaluate_values(context.clone(), &[val.clone()])?451			.try_cast_bool("filter predicate"))?))452	})453}454455fn builtin_map(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {456	parse_args!(context, "map", args, 2, [457		0, func: ty!(function) => Val::Func;458		1, arr: ty!(array) => Val::Arr;459	], {460		Ok(Val::Arr(arr.map(|val| func461			.evaluate_values(context.clone(), &[val]))?))462	})463}464465fn builtin_flatmap(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {466	parse_args!(context, "flatMap", args, 2, [467		0, func: ty!(function) => Val::Func;468		1, arr: ty!((array | string));469	], {470		match arr {471			Val::Str(s) => {472				let mut out = String::new();473				for c in s.chars() {474					match func.evaluate_values(context.clone(), &[Val::Str(c.to_string().into())])? {475						Val::Str(o) => out.push_str(&o),476						_ => throw!(RuntimeError("in std.join all items should be strings".into())),477					};478				}479				Ok(Val::Str(out.into()))480			},481			Val::Arr(a) => {482				let mut out = Vec::new();483				for el in a.iter() {484					let el = el?;485					match func.evaluate_values(context.clone(), &[el])? {486						Val::Arr(o) => for oe in o.iter() {487							out.push(oe?)488						},489						_ => throw!(RuntimeError("in std.join all items should be arrays".into())),490					};491				}492				Ok(Val::Arr(out.into()))493			},494			_ => unreachable!(),495		}496	})497}498499fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {500	parse_args!(context, "foldl", args, 3, [501		0, func: ty!(function) => Val::Func;502		1, arr: ty!(array) => Val::Arr;503		2, init: ty!(any);504	], {505		let mut acc = init;506		for i in arr.iter() {507			acc = func.evaluate_values(context.clone(), &[acc, i?])?;508		}509		Ok(acc)510	})511}512513fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {514	parse_args!(context, "foldr", args, 3, [515		0, func: ty!(function) => Val::Func;516		1, arr: ty!(array) => Val::Arr;517		2, init: ty!(any);518	], {519		let mut acc = init;520		for i in arr.iter().rev() {521			acc = func.evaluate_values(context.clone(), &[acc, i?])?;522		}523		Ok(acc)524	})525}526527#[allow(non_snake_case)]528fn builtin_sort_impl(529	context: Context,530	_loc: Option<&ExprLocation>,531	args: &ArgsDesc,532) -> Result<Val> {533	parse_args!(context, "sort", args, 2, [534		0, arr: ty!(array) => Val::Arr;535		1, keyF: ty!(function) => Val::Func;536	], {537		if arr.len() <= 1 {538			return Ok(Val::Arr(arr))539		}540		Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))541	})542}543544fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {545	parse_args!(context, "format", args, 2, [546		0, str: ty!(string) => Val::Str;547		1, vals: ty!(any)548	], {549		std_format(str, vals)550	})551}552553fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {554	parse_args!(context, "range", args, 2, [555		0, from: ty!(number) => Val::Num;556		1, to: ty!(number) => Val::Num;557	], {558		if to < from {559			return Ok(Val::Arr(ArrValue::new_eager()))560		}561		let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));562		for i in from as usize..=to as usize {563			out.push(Val::Num(i as f64));564		}565		Ok(Val::Arr(out.into()))566	})567}568569fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {570	parse_args!(context, "char", args, 1, [571		0, n: ty!(number) => Val::Num;572	], {573		let mut out = String::new();574		out.push(std::char::from_u32(n as u32).ok_or_else(||575			InvalidUnicodeCodepointGot(n as u32)576		)?);577		Ok(Val::Str(out.into()))578	})579}580581fn builtin_encode_utf8(582	context: Context,583	_loc: Option<&ExprLocation>,584	args: &ArgsDesc,585) -> Result<Val> {586	parse_args!(context, "encodeUTF8", args, 1, [587		0, str: ty!(string) => Val::Str;588	], {589		Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))590	})591}592593fn builtin_decode_utf8(594	context: Context,595	_loc: Option<&ExprLocation>,596	args: &ArgsDesc,597) -> Result<Val> {598	parse_args!(context, "decodeUTF8", args, 1, [599		0, arr: ty!((Array<ubyte>)) => Val::Arr;600	], {601		let data: Result<Vec<u8>> = arr.iter().map(|v| v.map(|v| match v{602			Val::Num(n) => n as u8,603			_ => unreachable!(),604		})).collect();605		let data = data?;606		Ok(Val::Str(String::from_utf8(data).map_err(|_| RuntimeError("bad utf8".into()))?.into()))607	})608}609610fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {611	parse_args!(context, "md5", args, 1, [612		0, str: ty!(string) => Val::Str;613	], {614		Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))615	})616}617618fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {619	parse_args!(context, "trace", args, 2, [620		0, str: ty!(string) => Val::Str;621		1, rest: ty!(any);622	], {623		eprint!("TRACE:");624		if let Some(loc) = loc {625			with_state(|s|{626				let locs = s.map_source_locations(&loc.0, &[loc.1]);627				eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);628			});629		}630		eprintln!(" {}", str);631		Ok(rest)632	})633}634635fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {636	parse_args!(context, "base64", args, 1, [637		0, input: ty!((string | (Array<number>)));638	], {639		Ok(Val::Str(match input {640			Val::Str(s) => {641				base64::encode(s.bytes().collect::<Vec<_>>()).into()642			},643			Val::Arr(a) => {644				base64::encode(a.iter().map(|v| {645					Ok(v?.unwrap_num()? as u8)646				}).collect::<Result<Vec<_>>>()?).into()647			},648			_ => unreachable!()649		}))650	})651}652653fn builtin_base64_decode_bytes(654	context: Context,655	_loc: Option<&ExprLocation>,656	args: &ArgsDesc,657) -> Result<Val> {658	parse_args!(context, "base64DecodeBytes", args, 1, [659		0, input: ty!(string) => Val::Str;660	], {661		Ok(Val::Arr(662			base64::decode(&input.as_bytes())663				.map_err(|_| RuntimeError("bad base64".into()))?664				.iter()665				.map(|v| Val::Num(*v as f64)).collect::<Vec<_>>().into()666		))667	})668}669670fn builtin_base64_decode(671	context: Context,672	_loc: Option<&ExprLocation>,673	args: &ArgsDesc,674) -> Result<Val> {675	parse_args!(context, "base64Decode", args, 1, [676		0, input: ty!(string) => Val::Str;677	], {678		Ok(Val::Str(679			String::from_utf8(base64::decode(&input.as_bytes())680				.map_err(|_| RuntimeError("bad base64".into()))?)681				.map_err(|_| RuntimeError("bad utf8".into()))?.into()682		))683	})684}685686fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {687	parse_args!(context, "join", args, 2, [688		0, sep: ty!((string | array));689		1, arr: ty!(array) => Val::Arr;690	], {691		Ok(match sep {692			Val::Arr(joiner_items) => {693				let mut out = Vec::new();694695				let mut first = true;696				for item in arr.iter() {697					let item = item?.clone();698					if let Val::Arr(items) = item {699						if !first {700							out.reserve(joiner_items.len());701							// TODO: extend702							for item in joiner_items.iter() {703								out.push(item?);704							}705						}706						first = false;707						out.reserve(items.len());708						// TODO: extend709						for item in items.iter() {710							out.push(item?);711						}712					} else {713						throw!(RuntimeError("in std.join all items should be arrays".into()));714					}715				}716717				Val::Arr(out.into())718			},719			Val::Str(sep) => {720				let mut out = String::new();721722				let mut first = true;723				for item in arr.iter() {724					let item = item?.clone();725					if let Val::Str(item) = item {726						if !first {727							out += &sep;728						}729						first = false;730						out += &item;731					} else {732						throw!(RuntimeError("in std.join all items should be strings".into()));733					}734				}735736				Val::Str(out.into())737			},738			_ => unreachable!()739		})740	})741}742743fn builtin_escape_string_json(744	context: Context,745	_loc: Option<&ExprLocation>,746	args: &ArgsDesc,747) -> Result<Val> {748	parse_args!(context, "escapeStringJson", args, 1, [749		0, str_: ty!(string) => Val::Str;750	], {751		Ok(Val::Str(escape_string_json(&str_).into()))752	})753}754755fn builtin_manifest_json_ex(756	context: Context,757	_loc: Option<&ExprLocation>,758	args: &ArgsDesc,759) -> Result<Val> {760	parse_args!(context, "manifestJsonEx", args, 2, [761		0, value: ty!(any);762		1, indent: ty!(string) => Val::Str;763	], {764		Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {765			padding: &indent,766			mtype: ManifestType::Std,767		})?.into()))768	})769}770771fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {772	parse_args!(context, "reverse", args, 1, [773		0, value: ty!(array) => Val::Arr;774	], {775		Ok(Val::Arr(value.reversed()))776	})777}778779fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {780	parse_args!(context, "id", args, 1, [781		0, v: ty!(any);782	], {783		Ok(v)784	})785}786787fn builtin_str_replace(788	context: Context,789	_loc: Option<&ExprLocation>,790	args: &ArgsDesc,791) -> Result<Val> {792	parse_args!(context, "strReplace", args, 3, [793		0, str: ty!(string) => Val::Str;794		1, from: ty!(string) => Val::Str;795		2, to: ty!(string) => Val::Str;796	], {797		let mut out = String::new();798		let mut last_idx = 0;799		while let Some(idx) = (&str[last_idx..]).find(&from as &str) {800			out.push_str(&str[last_idx..last_idx+idx]);801			out.push_str(&to);802			last_idx += idx + from.len();803		}804		if last_idx == 0 {805			return Ok(Val::Str(str))806		}807		out.push_str(&str[last_idx..]);808		Ok(Val::Str(out.into()))809	})810}811812fn builtin_splitlimit(813	context: Context,814	_loc: Option<&ExprLocation>,815	args: &ArgsDesc,816) -> Result<Val> {817	parse_args!(context, "splitLimit", args, 3, [818		0, str: ty!(string) => Val::Str;819		1, c: ty!(char) => Val::Str;820		2, maxsplits: ty!(number) => Val::Num;821	], {822		let maxsplits = maxsplits as isize;823		let c = c.chars().next().unwrap();824825		let out: Vec<Val> = if maxsplits == -1 {826			str.split(c).map(|s| Val::Str(s.into())).collect()827		} else {828			str.splitn(maxsplits as usize + 1, c).map(|s| Val::Str(s.into())).collect()829		};830831		Ok(Val::Arr(out.into()))832	})833}834835fn builtin_ascii_upper(836	context: Context,837	_loc: Option<&ExprLocation>,838	args: &ArgsDesc,839) -> Result<Val> {840	parse_args!(context, "asciiUpper", args, 1, [841		0, str: ty!(string) => Val::Str;842	], {843		Ok(Val::Str(str.to_ascii_uppercase().into()))844	})845}846847fn builtin_ascii_lower(848	context: Context,849	_loc: Option<&ExprLocation>,850	args: &ArgsDesc,851) -> Result<Val> {852	parse_args!(context, "asciiLower", args, 1, [853		0, str: ty!(string) => Val::Str;854	], {855		Ok(Val::Str(str.to_ascii_lowercase().into()))856	})857}858859fn builtin_member(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {860	parse_args!(context, "member", args, 2, [861		0, arr: ty!((array | string));862		1, x: ty!(any);863	], {864		match arr {865			Val::Str(s) => {866				let x = x.try_cast_str("x should be string")?;867				Ok(Val::Bool(!x.is_empty() && s.contains(&*x)))868			}869			Val::Arr(a) => {870				for item in a.iter() {871					let item = item?;872					if equals(&item, &x)? {873						return Ok(Val::Bool(true));874					}875				}876				Ok(Val::Bool(false))877			}878			_ => unreachable!(),879		}880	})881}882883fn builtin_count(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {884	parse_args!(context, "count", args, 2, [885		0, arr: ty!(array) => Val::Arr;886		1, x: ty!(any);887	], {888		let mut count = 0;889		for item in arr.iter() {890			let item = item?;891			if equals(&item, &x)? {892				count += 1;893			}894		}895		Ok(Val::Num(count as f64))896	})897}898899pub fn call_builtin(900	context: Context,901	loc: Option<&ExprLocation>,902	name: &str,903	args: &ArgsDesc,904) -> Result<Val> {905	BUILTINS906		.with(|builtins| builtins.get(name).copied())907		.ok_or_else(|| IntrinsicNotFound(name.into()))?(context, loc, args)908}
after · crates/jrsonnet-evaluator/src/builtin/mod.rs
1use crate::{2	equals,3	error::{Error::*, Result},4	operator::evaluate_mod_op,5	parse_args, primitive_equals, push, throw, with_state, ArrValue, Context, EvaluationState,6	FuncVal, IndexableVal, LazyVal, Val,7};8use format::{format_arr, format_obj};9use jrsonnet_gc::Gc;10use jrsonnet_interner::IStr;11use jrsonnet_parser::{ArgsDesc, ExprLocation};12use jrsonnet_types::ty;13use std::{collections::HashMap, path::PathBuf, rc::Rc};1415pub mod stdlib;16pub use stdlib::*;1718use self::manifest::{escape_string_json, manifest_json_ex, ManifestJsonOptions, ManifestType};1920pub mod format;21pub mod manifest;22pub mod sort;2324pub fn std_format(str: IStr, vals: Val) -> Result<Val> {25	push(26		Some(&ExprLocation(Rc::from(PathBuf::from("std.jsonnet")), 0, 0)),27		|| format!("std.format of {}", str),28		|| {29			Ok(match vals {30				Val::Arr(vals) => Val::Str(format_arr(&str, &vals.evaluated()?)?.into()),31				Val::Obj(obj) => Val::Str(format_obj(&str, &obj)?.into()),32				o => Val::Str(format_arr(&str, &[o])?.into()),33			})34		},35	)36}3738pub fn std_slice(39	indexable: IndexableVal,40	index: Option<usize>,41	end: Option<usize>,42	step: Option<usize>,43) -> Result<Val> {44	let index = index.unwrap_or(0);45	let end = end.unwrap_or_else(|| match &indexable {46		IndexableVal::Str(_) => usize::MAX,47		IndexableVal::Arr(v) => v.len(),48	});49	let step = step.unwrap_or(1);50	match &indexable {51		IndexableVal::Str(s) => Ok(Val::Str(52			(s.chars()53				.skip(index)54				.take(end - index)55				.step_by(step)56				.collect::<String>())57			.into(),58		)),59		IndexableVal::Arr(arr) => Ok(Val::Arr(60			(arr.iter()61				.skip(index)62				.take(end - index)63				.step_by(step)64				.collect::<Result<Vec<Val>>>()?)65			.into(),66		)),67	}68}6970type Builtin = fn(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val>;7172type BuiltinsType = HashMap<Box<str>, Builtin>;7374thread_local! {75	static BUILTINS: BuiltinsType = {76		[77			("length".into(), builtin_length as Builtin),78			("type".into(), builtin_type),79			("makeArray".into(), builtin_make_array),80			("codepoint".into(), builtin_codepoint),81			("objectFieldsEx".into(), builtin_object_fields_ex),82			("objectHasEx".into(), builtin_object_has_ex),83			("slice".into(), builtin_slice),84			("substr".into(), builtin_substr),85			("primitiveEquals".into(), builtin_primitive_equals),86			("equals".into(), builtin_equals),87			("modulo".into(), builtin_modulo),88			("mod".into(), builtin_mod),89			("floor".into(), builtin_floor),90			("ceil".into(), builtin_ceil),91			("log".into(), builtin_log),92			("pow".into(), builtin_pow),93			("sqrt".into(), builtin_sqrt),94			("sin".into(), builtin_sin),95			("cos".into(), builtin_cos),96			("tan".into(), builtin_tan),97			("asin".into(), builtin_asin),98			("acos".into(), builtin_acos),99			("atan".into(), builtin_atan),100			("exp".into(), builtin_exp),101			("mantissa".into(), builtin_mantissa),102			("exponent".into(), builtin_exponent),103			("extVar".into(), builtin_ext_var),104			("native".into(), builtin_native),105			("filter".into(), builtin_filter),106			("map".into(), builtin_map),107			("flatMap".into(), builtin_flatmap),108			("foldl".into(), builtin_foldl),109			("foldr".into(), builtin_foldr),110			("sortImpl".into(), builtin_sort_impl),111			("format".into(), builtin_format),112			("range".into(), builtin_range),113			("char".into(), builtin_char),114			("encodeUTF8".into(), builtin_encode_utf8),115			("decodeUTF8".into(), builtin_decode_utf8),116			("md5".into(), builtin_md5),117			("base64".into(), builtin_base64),118			("base64DecodeBytes".into(), builtin_base64_decode_bytes),119			("base64Decode".into(), builtin_base64_decode),120			("trace".into(), builtin_trace),121			("join".into(), builtin_join),122			("escapeStringJson".into(), builtin_escape_string_json),123			("manifestJsonEx".into(), builtin_manifest_json_ex),124			("reverse".into(), builtin_reverse),125			("id".into(), builtin_id),126			("strReplace".into(), builtin_str_replace),127			("splitLimit".into(), builtin_splitlimit),128			("parseJson".into(), builtin_parse_json),129			("asciiUpper".into(), builtin_ascii_upper),130			("asciiLower".into(), builtin_ascii_lower),131			("member".into(), builtin_member),132			("count".into(), builtin_count),133		].iter().cloned().collect()134	};135}136137fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {138	parse_args!(context, "length", args, 1, [139		0, x: ty!((string | object | array));140	], {141		Ok(match x {142			Val::Str(n) => Val::Num(n.chars().count() as f64),143			Val::Arr(a) => Val::Num(a.len() as f64),144			Val::Obj(o) => Val::Num(145				o.fields_visibility()146					.into_iter()147					.filter(|(_k, v)| *v)148					.count() as f64,149			),150			_ => unreachable!(),151		})152	})153}154155fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {156	parse_args!(context, "type", args, 1, [157		0, x: ty!(any);158	], {159		Ok(Val::Str(x.value_type().name().into()))160	})161}162163fn builtin_make_array(164	context: Context,165	_loc: Option<&ExprLocation>,166	args: &ArgsDesc,167) -> Result<Val> {168	parse_args!(context, "makeArray", args, 2, [169		0, sz: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;170		1, func: ty!(function) => Val::Func;171	], {172		let mut out = Vec::with_capacity(sz as usize);173		for i in 0..sz as usize {174			out.push(LazyVal::new_resolved(func.evaluate_values(175				context.clone(),176				&[Val::Num(i as f64)]177			)?))178		}179		Ok(Val::Arr(out.into()))180	})181}182183fn builtin_codepoint(184	context: Context,185	_loc: Option<&ExprLocation>,186	args: &ArgsDesc,187) -> Result<Val> {188	parse_args!(context, "codepoint", args, 1, [189		0, str: ty!(char) => Val::Str;190	], {191		Ok(Val::Num(str.chars().next().unwrap() as u32 as f64))192	})193}194195fn builtin_object_fields_ex(196	context: Context,197	_loc: Option<&ExprLocation>,198	args: &ArgsDesc,199) -> Result<Val> {200	parse_args!(context, "objectFieldsEx", args, 2, [201		0, obj: ty!(object) => Val::Obj;202		1, inc_hidden: ty!(boolean) => Val::Bool;203	], {204		let out = obj.fields_ex(inc_hidden);205		Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))206	})207}208209fn builtin_object_has_ex(210	context: Context,211	_loc: Option<&ExprLocation>,212	args: &ArgsDesc,213) -> Result<Val> {214	parse_args!(context, "objectHasEx", args, 3, [215		0, obj: ty!(object) => Val::Obj;216		1, f: ty!(string) => Val::Str;217		2, inc_hidden: ty!(boolean) => Val::Bool;218	], {219		Ok(Val::Bool(obj.has_field_ex(f, inc_hidden)))220	})221}222223fn builtin_parse_json(224	context: Context,225	_loc: Option<&ExprLocation>,226	args: &ArgsDesc,227) -> Result<Val> {228	parse_args!(context, "parseJson", args, 1, [229		0, s: ty!(string) => Val::Str;230	], {231		let state = EvaluationState::default();232		let path = PathBuf::from("std.parseJson").into();233		state.evaluate_snippet_raw(path ,s)234	})235}236237fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {238	parse_args!(context, "slice", args, 4, [239		0, indexable: ty!((string | array));240		1, index: ty!((number | null));241		2, end: ty!((number | null));242		3, step: ty!((number | null));243	], {244		std_slice(245			indexable.into_indexable()?,246			index.try_cast_nullable_num("index")?.map(|v| v as usize),247			end.try_cast_nullable_num("end")?.map(|v| v as usize),248			step.try_cast_nullable_num("step")?.map(|v| v as usize),249		)250	})251}252253fn builtin_substr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {254	parse_args!(context, "substr", args, 3, [255		0, str: ty!(string) => Val::Str;256		1, from: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;257		2, len: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;258	], {259		let out: String = str.chars().skip(from as usize).take(len as usize).collect();260		Ok(Val::Str(out.into()))261	})262}263264fn builtin_primitive_equals(265	context: Context,266	_loc: Option<&ExprLocation>,267	args: &ArgsDesc,268) -> Result<Val> {269	parse_args!(context, "primitiveEquals", args, 2, [270		0, a: ty!(any);271		1, b: ty!(any);272	], {273		Ok(Val::Bool(primitive_equals(&a, &b)?))274	})275}276277fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {278	parse_args!(context, "equals", args, 2, [279		0, a: ty!(any);280		1, b: ty!(any);281	], {282		Ok(Val::Bool(equals(&a, &b)?))283	})284}285286fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {287	parse_args!(context, "modulo", args, 2, [288		0, a: ty!(number) => Val::Num;289		1, b: ty!(number) => Val::Num;290	], {291		Ok(Val::Num(a % b))292	})293}294295fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {296	parse_args!(context, "mod", args, 2, [297		0, a: ty!((number | string));298		1, b: ty!(any);299	], {300		evaluate_mod_op(&a, &b)301	})302}303304fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {305	parse_args!(context, "floor", args, 1, [306		0, x: ty!(number) => Val::Num;307	], {308		Ok(Val::Num(x.floor()))309	})310}311312fn builtin_ceil(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {313	parse_args!(context, "ceil", args, 1, [314		0, x: ty!(number) => Val::Num;315	], {316		Ok(Val::Num(x.ceil()))317	})318}319320fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {321	parse_args!(context, "log", args, 1, [322		0, n: ty!(number) => Val::Num;323	], {324		Ok(Val::Num(n.ln()))325	})326}327328fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {329	parse_args!(context, "pow", args, 2, [330		0, x: ty!(number) => Val::Num;331		1, n: ty!(number) => Val::Num;332	], {333		Ok(Val::Num(x.powf(n)))334	})335}336337fn builtin_sqrt(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {338	parse_args!(context, "sqrt", args, 1, [339		0, x: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;340	], {341		Ok(Val::Num(x.sqrt()))342	})343}344345fn builtin_sin(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {346	parse_args!(context, "sin", args, 1, [347		0, x: ty!(number) => Val::Num;348	], {349		Ok(Val::Num(x.sin()))350	})351}352353fn builtin_cos(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {354	parse_args!(context, "cos", args, 1, [355		0, x: ty!(number) => Val::Num;356	], {357		Ok(Val::Num(x.cos()))358	})359}360361fn builtin_tan(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {362	parse_args!(context, "tan", args, 1, [363		0, x: ty!(number) => Val::Num;364	], {365		Ok(Val::Num(x.tan()))366	})367}368369fn builtin_asin(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {370	parse_args!(context, "asin", args, 1, [371		0, x: ty!(number) => Val::Num;372	], {373		Ok(Val::Num(x.asin()))374	})375}376377fn builtin_acos(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {378	parse_args!(context, "acos", args, 1, [379		0, x: ty!(number) => Val::Num;380	], {381		Ok(Val::Num(x.acos()))382	})383}384385fn builtin_atan(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {386	parse_args!(context, "atan", args, 1, [387		0, x: ty!(number) => Val::Num;388	], {389		Ok(Val::Num(x.atan()))390	})391}392393fn builtin_exp(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {394	parse_args!(context, "exp", args, 1, [395		0, x: ty!(number) => Val::Num;396	], {397		Ok(Val::Num(x.exp()))398	})399}400401fn frexp(s: f64) -> (f64, i16) {402	if 0.0 == s {403		(s, 0)404	} else {405		let lg = s.abs().log2();406		let x = (lg - lg.floor() - 1.0).exp2();407		let exp = lg.floor() + 1.0;408		(s.signum() * x, exp as i16)409	}410}411412fn builtin_mantissa(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {413	parse_args!(context, "mantissa", args, 1, [414		0, x: ty!(number) => Val::Num;415	], {416		Ok(Val::Num(frexp(x).0))417	})418}419420fn builtin_exponent(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {421	parse_args!(context, "exponent", args, 1, [422		0, x: ty!(number) => Val::Num;423	], {424		Ok(Val::Num(frexp(x).1.into()))425	})426}427428fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {429	parse_args!(context, "extVar", args, 1, [430		0, x: ty!(string) => Val::Str;431	], {432		Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)433	})434}435436fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {437	parse_args!(context, "native", args, 1, [438		0, x: ty!(string) => Val::Str;439	], {440		Ok(with_state(|s| s.settings().ext_natives.get(&x).cloned()).map(|v| Val::Func(Gc::new(FuncVal::NativeExt(x.clone(), v)))).ok_or(UndefinedExternalFunction(x))?)441	})442}443444fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {445	parse_args!(context, "filter", args, 2, [446		0, func: ty!(function) => Val::Func;447		1, arr: ty!(array) => Val::Arr;448	], {449		Ok(Val::Arr(arr.filter(|val| func450			.evaluate_values(context.clone(), &[val.clone()])?451			.try_cast_bool("filter predicate"))?))452	})453}454455fn builtin_map(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {456	parse_args!(context, "map", args, 2, [457		0, func: ty!(function) => Val::Func;458		1, arr: ty!(array) => Val::Arr;459	], {460		Ok(Val::Arr(arr.map(|val| func461			.evaluate_values(context.clone(), &[val]))?))462	})463}464465fn builtin_flatmap(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {466	parse_args!(context, "flatMap", args, 2, [467		0, func: ty!(function) => Val::Func;468		1, arr: ty!((array | string));469	], {470		match arr {471			Val::Str(s) => {472				let mut out = String::new();473				for c in s.chars() {474					match func.evaluate_values(context.clone(), &[Val::Str(c.to_string().into())])? {475						Val::Str(o) => out.push_str(&o),476						_ => throw!(RuntimeError("in std.join all items should be strings".into())),477					};478				}479				Ok(Val::Str(out.into()))480			},481			Val::Arr(a) => {482				let mut out = Vec::new();483				for el in a.iter() {484					let el = el?;485					match func.evaluate_values(context.clone(), &[el])? {486						Val::Arr(o) => for oe in o.iter() {487							out.push(oe?)488						},489						_ => throw!(RuntimeError("in std.join all items should be arrays".into())),490					};491				}492				Ok(Val::Arr(out.into()))493			},494			_ => unreachable!(),495		}496	})497}498499fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {500	parse_args!(context, "foldl", args, 3, [501		0, func: ty!(function) => Val::Func;502		1, arr: ty!(array) => Val::Arr;503		2, init: ty!(any);504	], {505		let mut acc = init;506		for i in arr.iter() {507			acc = func.evaluate_values(context.clone(), &[acc, i?])?;508		}509		Ok(acc)510	})511}512513fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {514	parse_args!(context, "foldr", args, 3, [515		0, func: ty!(function) => Val::Func;516		1, arr: ty!(array) => Val::Arr;517		2, init: ty!(any);518	], {519		let mut acc = init;520		for i in arr.iter().rev() {521			acc = func.evaluate_values(context.clone(), &[i?, acc])?;522		}523		Ok(acc)524	})525}526527#[allow(non_snake_case)]528fn builtin_sort_impl(529	context: Context,530	_loc: Option<&ExprLocation>,531	args: &ArgsDesc,532) -> Result<Val> {533	parse_args!(context, "sort", args, 2, [534		0, arr: ty!(array) => Val::Arr;535		1, keyF: ty!(function) => Val::Func;536	], {537		if arr.len() <= 1 {538			return Ok(Val::Arr(arr))539		}540		Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))541	})542}543544fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {545	parse_args!(context, "format", args, 2, [546		0, str: ty!(string) => Val::Str;547		1, vals: ty!(any)548	], {549		std_format(str, vals)550	})551}552553fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {554	parse_args!(context, "range", args, 2, [555		0, from: ty!(number) => Val::Num;556		1, to: ty!(number) => Val::Num;557	], {558		if to < from {559			return Ok(Val::Arr(ArrValue::new_eager()))560		}561		let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));562		for i in from as usize..=to as usize {563			out.push(Val::Num(i as f64));564		}565		Ok(Val::Arr(out.into()))566	})567}568569fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {570	parse_args!(context, "char", args, 1, [571		0, n: ty!(number) => Val::Num;572	], {573		let mut out = String::new();574		out.push(std::char::from_u32(n as u32).ok_or_else(||575			InvalidUnicodeCodepointGot(n as u32)576		)?);577		Ok(Val::Str(out.into()))578	})579}580581fn builtin_encode_utf8(582	context: Context,583	_loc: Option<&ExprLocation>,584	args: &ArgsDesc,585) -> Result<Val> {586	parse_args!(context, "encodeUTF8", args, 1, [587		0, str: ty!(string) => Val::Str;588	], {589		Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))590	})591}592593fn builtin_decode_utf8(594	context: Context,595	_loc: Option<&ExprLocation>,596	args: &ArgsDesc,597) -> Result<Val> {598	parse_args!(context, "decodeUTF8", args, 1, [599		0, arr: ty!((Array<ubyte>)) => Val::Arr;600	], {601		let data: Result<Vec<u8>> = arr.iter().map(|v| v.map(|v| match v{602			Val::Num(n) => n as u8,603			_ => unreachable!(),604		})).collect();605		let data = data?;606		Ok(Val::Str(String::from_utf8(data).map_err(|_| RuntimeError("bad utf8".into()))?.into()))607	})608}609610fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {611	parse_args!(context, "md5", args, 1, [612		0, str: ty!(string) => Val::Str;613	], {614		Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))615	})616}617618fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {619	parse_args!(context, "trace", args, 2, [620		0, str: ty!(string) => Val::Str;621		1, rest: ty!(any);622	], {623		eprint!("TRACE:");624		if let Some(loc) = loc {625			with_state(|s|{626				let locs = s.map_source_locations(&loc.0, &[loc.1]);627				eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);628			});629		}630		eprintln!(" {}", str);631		Ok(rest)632	})633}634635fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {636	parse_args!(context, "base64", args, 1, [637		0, input: ty!((string | (Array<number>)));638	], {639		Ok(Val::Str(match input {640			Val::Str(s) => {641				base64::encode(s.bytes().collect::<Vec<_>>()).into()642			},643			Val::Arr(a) => {644				base64::encode(a.iter().map(|v| {645					Ok(v?.unwrap_num()? as u8)646				}).collect::<Result<Vec<_>>>()?).into()647			},648			_ => unreachable!()649		}))650	})651}652653fn builtin_base64_decode_bytes(654	context: Context,655	_loc: Option<&ExprLocation>,656	args: &ArgsDesc,657) -> Result<Val> {658	parse_args!(context, "base64DecodeBytes", args, 1, [659		0, input: ty!(string) => Val::Str;660	], {661		Ok(Val::Arr(662			base64::decode(&input.as_bytes())663				.map_err(|_| RuntimeError("bad base64".into()))?664				.iter()665				.map(|v| Val::Num(*v as f64)).collect::<Vec<_>>().into()666		))667	})668}669670fn builtin_base64_decode(671	context: Context,672	_loc: Option<&ExprLocation>,673	args: &ArgsDesc,674) -> Result<Val> {675	parse_args!(context, "base64Decode", args, 1, [676		0, input: ty!(string) => Val::Str;677	], {678		Ok(Val::Str(679			String::from_utf8(base64::decode(&input.as_bytes())680				.map_err(|_| RuntimeError("bad base64".into()))?)681				.map_err(|_| RuntimeError("bad utf8".into()))?.into()682		))683	})684}685686fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {687	parse_args!(context, "join", args, 2, [688		0, sep: ty!((string | array));689		1, arr: ty!(array) => Val::Arr;690	], {691		Ok(match sep {692			Val::Arr(joiner_items) => {693				let mut out = Vec::new();694695				let mut first = true;696				for item in arr.iter() {697					let item = item?.clone();698					if let Val::Arr(items) = item {699						if !first {700							out.reserve(joiner_items.len());701							// TODO: extend702							for item in joiner_items.iter() {703								out.push(item?);704							}705						}706						first = false;707						out.reserve(items.len());708						// TODO: extend709						for item in items.iter() {710							out.push(item?);711						}712					} else {713						throw!(RuntimeError("in std.join all items should be arrays".into()));714					}715				}716717				Val::Arr(out.into())718			},719			Val::Str(sep) => {720				let mut out = String::new();721722				let mut first = true;723				for item in arr.iter() {724					let item = item?.clone();725					if let Val::Str(item) = item {726						if !first {727							out += &sep;728						}729						first = false;730						out += &item;731					} else {732						throw!(RuntimeError("in std.join all items should be strings".into()));733					}734				}735736				Val::Str(out.into())737			},738			_ => unreachable!()739		})740	})741}742743fn builtin_escape_string_json(744	context: Context,745	_loc: Option<&ExprLocation>,746	args: &ArgsDesc,747) -> Result<Val> {748	parse_args!(context, "escapeStringJson", args, 1, [749		0, str_: ty!(string) => Val::Str;750	], {751		Ok(Val::Str(escape_string_json(&str_).into()))752	})753}754755fn builtin_manifest_json_ex(756	context: Context,757	_loc: Option<&ExprLocation>,758	args: &ArgsDesc,759) -> Result<Val> {760	parse_args!(context, "manifestJsonEx", args, 2, [761		0, value: ty!(any);762		1, indent: ty!(string) => Val::Str;763	], {764		Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {765			padding: &indent,766			mtype: ManifestType::Std,767		})?.into()))768	})769}770771fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {772	parse_args!(context, "reverse", args, 1, [773		0, value: ty!(array) => Val::Arr;774	], {775		Ok(Val::Arr(value.reversed()))776	})777}778779fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {780	parse_args!(context, "id", args, 1, [781		0, v: ty!(any);782	], {783		Ok(v)784	})785}786787fn builtin_str_replace(788	context: Context,789	_loc: Option<&ExprLocation>,790	args: &ArgsDesc,791) -> Result<Val> {792	parse_args!(context, "strReplace", args, 3, [793		0, str: ty!(string) => Val::Str;794		1, from: ty!(string) => Val::Str;795		2, to: ty!(string) => Val::Str;796	], {797		let mut out = String::new();798		let mut last_idx = 0;799		while let Some(idx) = (&str[last_idx..]).find(&from as &str) {800			out.push_str(&str[last_idx..last_idx+idx]);801			out.push_str(&to);802			last_idx += idx + from.len();803		}804		if last_idx == 0 {805			return Ok(Val::Str(str))806		}807		out.push_str(&str[last_idx..]);808		Ok(Val::Str(out.into()))809	})810}811812fn builtin_splitlimit(813	context: Context,814	_loc: Option<&ExprLocation>,815	args: &ArgsDesc,816) -> Result<Val> {817	parse_args!(context, "splitLimit", args, 3, [818		0, str: ty!(string) => Val::Str;819		1, c: ty!(char) => Val::Str;820		2, maxsplits: ty!(number) => Val::Num;821	], {822		let maxsplits = maxsplits as isize;823		let c = c.chars().next().unwrap();824825		let out: Vec<Val> = if maxsplits == -1 {826			str.split(c).map(|s| Val::Str(s.into())).collect()827		} else {828			str.splitn(maxsplits as usize + 1, c).map(|s| Val::Str(s.into())).collect()829		};830831		Ok(Val::Arr(out.into()))832	})833}834835fn builtin_ascii_upper(836	context: Context,837	_loc: Option<&ExprLocation>,838	args: &ArgsDesc,839) -> Result<Val> {840	parse_args!(context, "asciiUpper", args, 1, [841		0, str: ty!(string) => Val::Str;842	], {843		Ok(Val::Str(str.to_ascii_uppercase().into()))844	})845}846847fn builtin_ascii_lower(848	context: Context,849	_loc: Option<&ExprLocation>,850	args: &ArgsDesc,851) -> Result<Val> {852	parse_args!(context, "asciiLower", args, 1, [853		0, str: ty!(string) => Val::Str;854	], {855		Ok(Val::Str(str.to_ascii_lowercase().into()))856	})857}858859fn builtin_member(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {860	parse_args!(context, "member", args, 2, [861		0, arr: ty!((array | string));862		1, x: ty!(any);863	], {864		match arr {865			Val::Str(s) => {866				let x = x.try_cast_str("x should be string")?;867				Ok(Val::Bool(!x.is_empty() && s.contains(&*x)))868			}869			Val::Arr(a) => {870				for item in a.iter() {871					let item = item?;872					if equals(&item, &x)? {873						return Ok(Val::Bool(true));874					}875				}876				Ok(Val::Bool(false))877			}878			_ => unreachable!(),879		}880	})881}882883fn builtin_count(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {884	parse_args!(context, "count", args, 2, [885		0, arr: ty!(array) => Val::Arr;886		1, x: ty!(any);887	], {888		let mut count = 0;889		for item in arr.iter() {890			let item = item?;891			if equals(&item, &x)? {892				count += 1;893			}894		}895		Ok(Val::Num(count as f64))896	})897}898899pub fn call_builtin(900	context: Context,901	loc: Option<&ExprLocation>,902	name: &str,903	args: &ArgsDesc,904) -> Result<Val> {905	BUILTINS906		.with(|builtins| builtins.get(name).copied())907		.ok_or_else(|| IntrinsicNotFound(name.into()))?(context, loc, args)908}
modifiedcrates/jrsonnet-evaluator/src/ctx.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/ctx.rs
+++ b/crates/jrsonnet-evaluator/src/ctx.rs
@@ -73,6 +73,9 @@
 			.cloned()
 			.ok_or(VariableIsNotDefined(name))?)
 	}
+	pub fn contains_binding(&self, name: IStr) -> bool {
+		self.0.bindings.contains_key(&name)
+	}
 	pub fn into_future(self, ctx: FutureWrapper<Self>) -> Self {
 		{
 			ctx.0.borrow_mut().replace(self);
modifiedcrates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/error.rs
+++ b/crates/jrsonnet-evaluator/src/error.rs
@@ -56,7 +56,7 @@
 	BindingParameterASecondTime(IStr),
 	#[error("too many args, function has {0}")]
 	TooManyArgsFunctionHas(usize),
-	#[error("founction argument is not passed: {0}")]
+	#[error("function argument is not passed: {0}")]
 	FunctionParameterNotBoundInCall(IStr),
 
 	#[error("external variable is not defined: {0}")]
modifiedcrates/jrsonnet-evaluator/src/evaluate/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/evaluate/mod.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate/mod.rs
@@ -431,6 +431,7 @@
 						builder
 							.member(n)
 							.with_location(obj.value.1.clone())
+							.with_add(obj.plus)
 							.bindable(Box::new(ObjCompBinding {
 								context: ctx,
 								value: obj.value.clone(),
modifiedcrates/jrsonnet-evaluator/src/function.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/function.rs
+++ b/crates/jrsonnet-evaluator/src/function.rs
@@ -1,4 +1,7 @@
-use crate::{error::Error::*, evaluate, throw, Context, LazyVal, LazyValValue, Result, Val};
+use crate::{
+	error::Error::*, evaluate, evaluate_named, throw, Context, FutureWrapper, LazyVal,
+	LazyValValue, Result, Val,
+};
 use jrsonnet_gc::Trace;
 use jrsonnet_interner::IStr;
 use jrsonnet_parser::{ArgsDesc, LocExpr, ParamsDesc};
@@ -8,6 +11,18 @@
 const NO_DEFAULT_CONTEXT: &str =
 	"no default context set for call with defined default parameter value";
 
+#[derive(Trace)]
+#[trivially_drop]
+struct EvaluateLazyVal {
+	context: Context,
+	expr: LocExpr,
+}
+impl LazyValValue for EvaluateLazyVal {
+	fn get(self: Box<Self>) -> Result<Val> {
+		evaluate(self.context, &self.expr)
+	}
+}
+
 /// Creates correct [context](Context) for function body evaluation returning error on invalid call.
 ///
 /// ## Parameters
@@ -18,64 +33,119 @@
 /// * `tailstrict`: if set to `true` function arguments are eagerly executed, otherwise - lazily
 pub fn parse_function_call(
 	ctx: Context,
-	body_ctx: Option<Context>,
+	body_ctx: Context,
 	params: &ParamsDesc,
 	args: &ArgsDesc,
 	tailstrict: bool,
 ) -> Result<Context> {
-	let mut out = HashMap::with_capacity_and_hasher(params.len(), BuildHasherDefault::default());
-	let mut positioned_args = vec![None; params.0.len()];
-	for (id, arg) in args.iter().enumerate() {
-		let idx = if let Some(name) = &arg.0 {
-			params
-				.iter()
-				.position(|p| *p.0 == *name)
-				.ok_or_else(|| UnknownFunctionParameter(name.clone()))?
-		} else {
-			id
-		};
+	let mut passed_args =
+		HashMap::with_capacity_and_hasher(params.len(), BuildHasherDefault::default());
+	if args.unnamed.len() > params.len() {
+		throw!(TooManyArgsFunctionHas(params.len()))
+	}
+
+	let mut filled_args = 0;
 
-		if idx >= params.len() {
-			throw!(TooManyArgsFunctionHas(params.len()));
+	for (id, arg) in args.unnamed.iter().enumerate() {
+		let name = params[id].0.clone();
+		passed_args.insert(
+			name,
+			if tailstrict {
+				LazyVal::new_resolved(evaluate(ctx.clone(), arg)?)
+			} else {
+				LazyVal::new(Box::new(EvaluateLazyVal {
+					context: ctx.clone(),
+					expr: arg.clone(),
+				}))
+			},
+		);
+		filled_args += 1;
+	}
+
+	for (name, value) in args.named.iter() {
+		// FIXME: O(n) for arg existence check
+		if !params.iter().any(|p| &p.0 == name) {
+			throw!(UnknownFunctionParameter((name as &str).to_owned()));
 		}
-		if positioned_args[idx].is_some() {
-			throw!(BindingParameterASecondTime(params[idx].0.clone()));
+		if passed_args
+			.insert(
+				name.clone(),
+				if tailstrict {
+					LazyVal::new_resolved(evaluate(ctx.clone(), value)?)
+				} else {
+					LazyVal::new(Box::new(EvaluateLazyVal {
+						context: ctx.clone(),
+						expr: value.clone(),
+					}))
+				},
+			)
+			.is_some()
+		{
+			throw!(BindingParameterASecondTime(name.clone()));
 		}
-		positioned_args[idx] = Some(arg.1.clone());
+		filled_args += 1;
 	}
-	// Fill defaults
-	for (id, p) in params.iter().enumerate() {
-		let (ctx, expr) = if let Some(arg) = &positioned_args[id] {
-			(ctx.clone(), arg)
-		} else if let Some(default) = &p.1 {
-			(body_ctx.clone().expect(NO_DEFAULT_CONTEXT), default)
-		} else {
-			throw!(FunctionParameterNotBoundInCall(p.0.clone()));
-		};
-		let val = if tailstrict {
-			LazyVal::new_resolved(evaluate(ctx, expr)?)
-		} else {
+
+	if filled_args < params.len() {
+		// Some args are unset, but maybe we have defaults for them
+		// Default values should be created in newly created context
+		let future_context = FutureWrapper::<Context>::new();
+		let mut defaults = HashMap::with_capacity_and_hasher(
+			params.len() - filled_args,
+			BuildHasherDefault::default(),
+		);
+
+		for param in params.iter().filter(|p| p.1.is_some()) {
+			if passed_args.contains_key(&param.0.clone()) {
+				continue;
+			}
 			#[derive(Trace)]
 			#[trivially_drop]
-			struct EvaluateLazyVal {
-				context: Context,
-				expr: LocExpr,
+			struct LazyNamedBinding {
+				future_context: FutureWrapper<Context>,
+				name: IStr,
+				value: LocExpr,
 			}
-			impl LazyValValue for EvaluateLazyVal {
+			impl LazyValValue for LazyNamedBinding {
 				fn get(self: Box<Self>) -> Result<Val> {
-					evaluate(self.context, &self.expr)
+					evaluate_named(self.future_context.unwrap(), &self.value, self.name)
 				}
 			}
+			LazyVal::new(Box::new(LazyNamedBinding {
+				future_context: future_context.clone(),
+				name: param.0.clone(),
+				value: param.1.clone().unwrap(),
+			}));
 
-			LazyVal::new(Box::new(EvaluateLazyVal {
-				context: ctx.clone(),
-				expr: expr.clone(),
-			}))
-		};
-		out.insert(p.0.clone(), val);
-	}
+			defaults.insert(
+				param.0.clone(),
+				LazyVal::new(Box::new(LazyNamedBinding {
+					future_context: future_context.clone(),
+					name: param.0.clone(),
+					value: param.1.clone().unwrap(),
+				})),
+			);
+			filled_args += 1;
+		}
+
+		// Some args still wasn't filled
+		if filled_args != params.len() {
+			for param in params.iter().skip(args.unnamed.len()) {
+				if !args.named.iter().any(|a| a.0 == param.0) {
+					throw!(FunctionParameterNotBoundInCall(param.0.clone()));
+				}
+			}
+			unreachable!();
+		}
 
-	Ok(body_ctx.unwrap_or(ctx).extend(out, None, None, None))
+		Ok(body_ctx
+			.extend(passed_args, None, None, None)
+			.extend_bound(defaults)
+			.into_future(future_context))
+	} else {
+		let body_ctx = body_ctx.extend(passed_args, None, None, None);
+		Ok(body_ctx)
+	}
 }
 
 pub fn parse_function_call_map(
@@ -176,21 +246,25 @@
 		use $crate::{error::Error::*, throw, evaluate, push_stack_frame, typed::CheckType};
 
 		let args = $args;
-		if args.len() > $total_args {
+		if args.unnamed.len() + args.named.len() > $total_args {
 			throw!(TooManyArgsFunctionHas($total_args));
 		}
 		$(
-			if args.len() <= $id {
+			if args.unnamed.len() + args.named.len() <= $id {
 				throw!(FunctionParameterNotBoundInCall(stringify!($name).into()));
 			}
-			let $name = &args[$id];
-			if $name.0.is_some() {
-				if $name.0.as_ref().unwrap() != stringify!($name) {
+			// Is named
+			let $name = if $id >= $args.unnamed.len() {
+				let named = &args.named[$id - $args.unnamed.len()];
+				if &named.0 != stringify!($name) {
 					throw!(IntrinsicArgumentReorderingIsNotSupportedYet);
 				}
-			}
+				&named.1
+			} else {
+				&$args.unnamed[$id]
+			};
 			let $name = push_stack_frame(None, || format!("evaluating argument"), || {
-				let value = evaluate($ctx.clone(), &$name.1)?;
+				let value = evaluate($ctx.clone(), &$name)?;
 				$ty.check(&value)?;
 				Ok(value)
 			})?;
modifiedcrates/jrsonnet-evaluator/src/map.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/map.rs
+++ b/crates/jrsonnet-evaluator/src/map.rs
@@ -29,6 +29,16 @@
 			.get(key)
 			.or_else(|| self.0.parent.as_ref().and_then(|p| p.get(key)))
 	}
+
+	pub fn contains_key(&self, key: &IStr) -> bool {
+		(self.0).current.contains_key(key)
+			|| self
+				.0
+				.parent
+				.as_ref()
+				.map(|p| p.contains_key(key))
+				.unwrap_or(false)
+	}
 }
 
 impl Clone for LayeredHashMap {
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -11,7 +11,7 @@
 };
 use jrsonnet_gc::{Gc, GcCell, Trace};
 use jrsonnet_interner::IStr;
-use jrsonnet_parser::{el, Arg, ArgsDesc, Expr, ExprLocation, LiteralType, LocExpr, ParamsDesc};
+use jrsonnet_parser::{el, ArgsDesc, Expr, ExprLocation, LiteralType, LocExpr, ParamsDesc};
 use jrsonnet_types::ValType;
 use std::{collections::HashMap, fmt::Debug, rc::Rc};
 
@@ -127,7 +127,7 @@
 			Self::Normal(func) => {
 				let ctx = parse_function_call(
 					call_ctx,
-					Some(func.ctx.clone()),
+					func.ctx.clone(),
 					&func.params,
 					args,
 					tailstrict,
@@ -136,7 +136,8 @@
 			}
 			Self::Intrinsic(name) => call_builtin(call_ctx, loc, name, args),
 			Self::NativeExt(_name, handler) => {
-				let args = parse_function_call(call_ctx, None, &handler.params, args, true)?;
+				let args =
+					parse_function_call(call_ctx, Context::new(), &handler.params, args, true)?;
 				let mut out_args = Vec::with_capacity(handler.params.len());
 				for p in handler.params.0.iter() {
 					out_args.push(args.binding(p.0.clone())?.evaluate()?);
@@ -554,17 +555,17 @@
 						el!(Expr::Var("std".into())),
 						el!(Expr::Str("manifestYamlDoc".into()))
 					)),
-					ArgsDesc(vec![
-						Arg(None, el!(Expr::Var("__tmp__to_json__".into()))),
-						Arg(
-							None,
+					ArgsDesc::new(
+						vec![
+							el!(Expr::Var("__tmp__to_json__".into())),
 							el!(Expr::Literal(if padding != 0 {
 								LiteralType::True
 							} else {
 								LiteralType::False
-							}))
-						)
-					]),
+							})),
+						],
+						vec![]
+					),
 					false
 				)),
 			)?
modifiedcrates/jrsonnet-parser/src/expr.rsdiffbeforeafterboth
--- a/crates/jrsonnet-parser/src/expr.rs
+++ b/crates/jrsonnet-parser/src/expr.rs
@@ -194,18 +194,13 @@
 #[cfg_attr(feature = "deserialize", derive(Deserialize))]
 #[derive(Debug, PartialEq, Trace)]
 #[trivially_drop]
-pub struct Arg(pub Option<String>, pub LocExpr);
-
-#[cfg_attr(feature = "serialize", derive(Serialize))]
-#[cfg_attr(feature = "deserialize", derive(Deserialize))]
-#[derive(Debug, PartialEq, Trace)]
-#[trivially_drop]
-pub struct ArgsDesc(pub Vec<Arg>);
-
-impl Deref for ArgsDesc {
-	type Target = Vec<Arg>;
-	fn deref(&self) -> &Self::Target {
-		&self.0
+pub struct ArgsDesc {
+	pub unnamed: Vec<LocExpr>,
+	pub named: Vec<(IStr, LocExpr)>,
+}
+impl ArgsDesc {
+	pub fn new(unnamed: Vec<LocExpr>, named: Vec<(IStr, LocExpr)>) -> Self {
+		Self { unnamed, named }
 	}
 }
 
@@ -247,6 +242,7 @@
 pub struct ObjComp {
 	pub pre_locals: Vec<BindSpec>,
 	pub key: LocExpr,
+	pub plus: bool,
 	pub value: LocExpr,
 	pub post_locals: Vec<BindSpec>,
 	pub compspecs: Vec<CompSpec>,
modifiedcrates/jrsonnet-parser/src/lib.rsdiffbeforeafterboth
--- a/crates/jrsonnet-parser/src/lib.rs
+++ b/crates/jrsonnet-parser/src/lib.rs
@@ -7,6 +7,7 @@
 };
 mod expr;
 pub use expr::*;
+pub use jrsonnet_interner::IStr;
 pub use peg;
 
 pub struct ParserSettings {
@@ -70,19 +71,29 @@
 			}
 			/ { expr::ParamsDesc(Rc::new(Vec::new())) }
 
-		pub rule arg(s: &ParserSettings) -> expr::Arg
-			= name:$(id()) _ "=" _ expr:expr(s) {expr::Arg(Some(name.into()), expr)}
-			/ expr:expr(s) {expr::Arg(None, expr)}
+		pub rule arg(s: &ParserSettings) -> (Option<IStr>, LocExpr)
+			= quiet! { name:(s:$(id()) _ "=" _ {s})? expr:expr(s) {(name.map(Into::into), expr)} }
+			/ expected!("<argument>")
+
 		pub rule args(s: &ParserSettings) -> expr::ArgsDesc
-			= args:arg(s) ** comma() comma()? {
+			= args:arg(s)**comma() comma()? {?
+				let unnamed_count = args.iter().take_while(|(n, _)| n.is_none()).count();
+				let mut unnamed = Vec::with_capacity(unnamed_count);
+				let mut named = Vec::with_capacity(args.len() - unnamed_count);
 				let mut named_started = false;
-				for arg in &args {
-					named_started = named_started || arg.0.is_some();
-					assert_eq!(named_started, arg.0.is_some(), "named args should be used after all positionals");
+				for (name, value) in args {
+					if let Some(name) = name {
+						named_started = true;
+						named.push((name, value));
+					} else {
+						if named_started {
+							return Err("<named argument>")
+						}
+						unnamed.push(value);
+					}
 				}
-				expr::ArgsDesc(args)
+				Ok(expr::ArgsDesc::new(unnamed, named))
 			}
-			/ { expr::ArgsDesc(Vec::new()) }
 
 		pub rule bind(s: &ParserSettings) -> expr::BindSpec
 			= name:$(id()) _ "=" _ expr:expr(s) {expr::BindSpec{name:name.into(), params: None, value: expr}}
@@ -136,12 +147,13 @@
 			/ assertion:assertion(s) {expr::Member::AssertStmt(assertion)}
 			/ field:field(s) {expr::Member::Field(field)}
 		pub rule objinside(s: &ParserSettings) -> expr::ObjBody
-			= pre_locals:(b: obj_local(s) comma() {b})* "[" _ key:expr(s) _ "]" _ ":" _ value:expr(s) post_locals:(comma() b:obj_local(s) {b})* _ forspec:forspec(s) others:(_ rest:compspec(s) {rest})? {
+			= pre_locals:(b: obj_local(s) comma() {b})* "[" _ key:expr(s) _ "]" _ plus:"+"? _ ":" _ value:expr(s) post_locals:(comma() b:obj_local(s) {b})* _ forspec:forspec(s) others:(_ rest:compspec(s) {rest})? {
 				let mut compspecs = vec![CompSpec::ForSpec(forspec)];
 				compspecs.extend(others.unwrap_or_default());
 				expr::ObjBody::ObjComp(expr::ObjComp{
 					pre_locals,
 					key,
+					plus: plus.is_some(),
 					value,
 					post_locals,
 					compspecs,
@@ -492,7 +504,7 @@
 			el!(ArrComp(
 				el!(Apply(
 					el!(Index(el!(Var("std".into())), el!(Str("deepJoin".into())))),
-					ArgsDesc(vec![Arg(None, el!(Var("x".into())))]),
+					ArgsDesc::new(vec![el!(Var("x".into()))], vec![]),
 					false,
 				)),
 				vec![CompSpec::ForSpec(ForSpecData(