git.delta.rocks / jrsonnet / refs/commits / 64b86a5a335e

difftreelog

feat std.sqrt builtin

Yaroslav Bolyukin2021-07-12parent: #b81ad33.patch.diff
in: master

2 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			("primitiveEquals".into(), builtin_primitive_equals),85			("equals".into(), builtin_equals),86			("modulo".into(), builtin_modulo),87			("mod".into(), builtin_mod),88			("floor".into(), builtin_floor),89			("ceil".into(), builtin_ceil),90			("log".into(), builtin_log),91			("pow".into(), builtin_pow),92			("extVar".into(), builtin_ext_var),93			("native".into(), builtin_native),94			("filter".into(), builtin_filter),95			("map".into(), builtin_map),96			("flatMap".into(), builtin_flatmap),97			("foldl".into(), builtin_foldl),98			("foldr".into(), builtin_foldr),99			("sortImpl".into(), builtin_sort_impl),100			("format".into(), builtin_format),101			("range".into(), builtin_range),102			("char".into(), builtin_char),103			("encodeUTF8".into(), builtin_encode_utf8),104			("md5".into(), builtin_md5),105			("base64".into(), builtin_base64),106			("trace".into(), builtin_trace),107			("join".into(), builtin_join),108			("escapeStringJson".into(), builtin_escape_string_json),109			("manifestJsonEx".into(), builtin_manifest_json_ex),110			("reverse".into(), builtin_reverse),111			("id".into(), builtin_id),112			("strReplace".into(), builtin_str_replace),113			("parseJson".into(), builtin_parse_json),114		].iter().cloned().collect()115	};116}117118fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {119	parse_args!(context, "length", args, 1, [120		0, x: ty!((string | object | array));121	], {122		Ok(match x {123			Val::Str(n) => Val::Num(n.chars().count() as f64),124			Val::Arr(a) => Val::Num(a.len() as f64),125			Val::Obj(o) => Val::Num(126				o.fields_visibility()127					.into_iter()128					.filter(|(_k, v)| *v)129					.count() as f64,130			),131			_ => unreachable!(),132		})133	})134}135136fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {137	parse_args!(context, "type", args, 1, [138		0, x: ty!(any);139	], {140		Ok(Val::Str(x.value_type().name().into()))141	})142}143144fn builtin_make_array(145	context: Context,146	_loc: Option<&ExprLocation>,147	args: &ArgsDesc,148) -> Result<Val> {149	parse_args!(context, "makeArray", args, 2, [150		0, sz: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;151		1, func: ty!(function) => Val::Func;152	], {153		let mut out = Vec::with_capacity(sz as usize);154		for i in 0..sz as usize {155			out.push(LazyVal::new_resolved(func.evaluate_values(156				context.clone(),157				&[Val::Num(i as f64)]158			)?))159		}160		Ok(Val::Arr(out.into()))161	})162}163164fn builtin_codepoint(165	context: Context,166	_loc: Option<&ExprLocation>,167	args: &ArgsDesc,168) -> Result<Val> {169	parse_args!(context, "codepoint", args, 1, [170		0, str: ty!(char) => Val::Str;171	], {172		Ok(Val::Num(str.chars().next().unwrap() as u32 as f64))173	})174}175176fn builtin_object_fields_ex(177	context: Context,178	_loc: Option<&ExprLocation>,179	args: &ArgsDesc,180) -> Result<Val> {181	parse_args!(context, "objectFieldsEx", args, 2, [182		0, obj: ty!(object) => Val::Obj;183		1, inc_hidden: ty!(boolean) => Val::Bool;184	], {185		let out = obj.fields_ex(inc_hidden);186		Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))187	})188}189190fn builtin_object_has_ex(191	context: Context,192	_loc: Option<&ExprLocation>,193	args: &ArgsDesc,194) -> Result<Val> {195	parse_args!(context, "objectHasEx", args, 3, [196		0, obj: ty!(object) => Val::Obj;197		1, f: ty!(string) => Val::Str;198		2, inc_hidden: ty!(boolean) => Val::Bool;199	], {200		Ok(Val::Bool(obj.has_field_ex(f, inc_hidden)))201	})202}203204fn builtin_parse_json(205	context: Context,206	_loc: Option<&ExprLocation>,207	args: &ArgsDesc,208) -> Result<Val> {209	parse_args!(context, "parseJson", args, 1, [210		0, s: ty!(string) => Val::Str;211	], {212		let state = EvaluationState::default();213		let path = PathBuf::from("std.parseJson").into();214		state.evaluate_snippet_raw(path ,s)215	})216}217218fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {219	parse_args!(context, "slice", args, 4, [220		0, indexable: ty!((string | array));221		1, index: ty!((number | null));222		2, end: ty!((number | null));223		3, step: ty!((number | null));224	], {225		std_slice(226			indexable.into_indexable()?,227			index.try_cast_nullable_num("index")?.map(|v| v as usize),228			end.try_cast_nullable_num("end")?.map(|v| v as usize),229			step.try_cast_nullable_num("step")?.map(|v| v as usize),230		)231	})232}233234fn builtin_primitive_equals(235	context: Context,236	_loc: Option<&ExprLocation>,237	args: &ArgsDesc,238) -> Result<Val> {239	parse_args!(context, "primitiveEquals", args, 2, [240		0, a: ty!(any);241		1, b: ty!(any);242	], {243		Ok(Val::Bool(primitive_equals(&a, &b)?))244	})245}246247fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {248	parse_args!(context, "equals", args, 2, [249		0, a: ty!(any);250		1, b: ty!(any);251	], {252		Ok(Val::Bool(equals(&a, &b)?))253	})254}255256fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {257	parse_args!(context, "modulo", args, 2, [258		0, a: ty!(number) => Val::Num;259		1, b: ty!(number) => Val::Num;260	], {261		Ok(Val::Num(a % b))262	})263}264265fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {266	parse_args!(context, "mod", args, 2, [267		0, a: ty!((number | string));268		1, b: ty!(any);269	], {270		evaluate_mod_op(&a, &b)271	})272}273274fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {275	parse_args!(context, "floor", args, 1, [276		0, x: ty!(number) => Val::Num;277	], {278		Ok(Val::Num(x.floor()))279	})280}281282fn builtin_ceil(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {283	parse_args!(context, "ceil", args, 1, [284		0, x: ty!(number) => Val::Num;285	], {286		Ok(Val::Num(x.ceil()))287	})288}289290fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {291	parse_args!(context, "log", args, 1, [292		0, n: ty!(number) => Val::Num;293	], {294		Ok(Val::Num(n.ln()))295	})296}297298fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {299	parse_args!(context, "pow", args, 2, [300		0, x: ty!(number) => Val::Num;301		1, n: ty!(number) => Val::Num;302	], {303		Ok(Val::Num(x.powf(n)))304	})305}306307fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {308	parse_args!(context, "extVar", args, 1, [309		0, x: ty!(string) => Val::Str;310	], {311		Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)312	})313}314315fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {316	parse_args!(context, "native", args, 1, [317		0, x: ty!(string) => Val::Str;318	], {319		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))?)320	})321}322323fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {324	parse_args!(context, "filter", args, 2, [325		0, func: ty!(function) => Val::Func;326		1, arr: ty!(array) => Val::Arr;327	], {328		Ok(Val::Arr(arr.filter(|val| func329			.evaluate_values(context.clone(), &[val.clone()])?330			.try_cast_bool("filter predicate"))?))331	})332}333334fn builtin_map(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {335	parse_args!(context, "map", args, 2, [336		0, func: ty!(function) => Val::Func;337		1, arr: ty!(array) => Val::Arr;338	], {339		Ok(Val::Arr(arr.map(|val| func340			.evaluate_values(context.clone(), &[val]))?))341	})342}343344fn builtin_flatmap(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {345	parse_args!(context, "flatMap", args, 2, [346		0, func: ty!(function) => Val::Func;347		1, arr: ty!((array | string));348	], {349		match arr {350			Val::Str(s) => {351				let mut out = String::new();352				for c in s.chars() {353					match func.evaluate_values(context.clone(), &[Val::Str(c.to_string().into())])? {354						Val::Str(o) => out.push_str(&o),355						_ => throw!(RuntimeError("in std.join all items should be strings".into())),356					};357				}358				Ok(Val::Str(out.into()))359			},360			Val::Arr(a) => {361				let mut out = Vec::new();362				for el in a.iter() {363					let el = el?;364					match func.evaluate_values(context.clone(), &[el])? {365						Val::Arr(o) => for oe in o.iter() {366							out.push(oe?)367						},368						_ => throw!(RuntimeError("in std.join all items should be arrays".into())),369					};370				}371				Ok(Val::Arr(out.into()))372			},373			_ => unreachable!(),374		}375	})376}377378fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {379	parse_args!(context, "foldl", args, 3, [380		0, func: ty!(function) => Val::Func;381		1, arr: ty!(array) => Val::Arr;382		2, init: ty!(any);383	], {384		let mut acc = init;385		for i in arr.iter() {386			acc = func.evaluate_values(context.clone(), &[acc, i?])?;387		}388		Ok(acc)389	})390}391392fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {393	parse_args!(context, "foldr", args, 3, [394		0, func: ty!(function) => Val::Func;395		1, arr: ty!(array) => Val::Arr;396		2, init: ty!(any);397	], {398		let mut acc = init;399		for i in arr.iter().rev() {400			acc = func.evaluate_values(context.clone(), &[acc, i?])?;401		}402		Ok(acc)403	})404}405406#[allow(non_snake_case)]407fn builtin_sort_impl(408	context: Context,409	_loc: Option<&ExprLocation>,410	args: &ArgsDesc,411) -> Result<Val> {412	parse_args!(context, "sort", args, 2, [413		0, arr: ty!(array) => Val::Arr;414		1, keyF: ty!(function) => Val::Func;415	], {416		if arr.len() <= 1 {417			return Ok(Val::Arr(arr))418		}419		Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))420	})421}422423fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {424	parse_args!(context, "format", args, 2, [425		0, str: ty!(string) => Val::Str;426		1, vals: ty!(any)427	], {428		std_format(str, vals)429	})430}431432fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {433	parse_args!(context, "range", args, 2, [434		0, from: ty!(number) => Val::Num;435		1, to: ty!(number) => Val::Num;436	], {437		if to < from {438			return Ok(Val::Arr(ArrValue::new_eager()))439		}440		let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));441		for i in from as usize..=to as usize {442			out.push(Val::Num(i as f64));443		}444		Ok(Val::Arr(out.into()))445	})446}447448fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {449	parse_args!(context, "char", args, 1, [450		0, n: ty!(number) => Val::Num;451	], {452		let mut out = String::new();453		out.push(std::char::from_u32(n as u32).ok_or_else(||454			InvalidUnicodeCodepointGot(n as u32)455		)?);456		Ok(Val::Str(out.into()))457	})458}459460fn builtin_encode_utf8(461	context: Context,462	_loc: Option<&ExprLocation>,463	args: &ArgsDesc,464) -> Result<Val> {465	parse_args!(context, "encodeUTF8", args, 1, [466		0, str: ty!(string) => Val::Str;467	], {468		Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))469	})470}471472fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {473	parse_args!(context, "md5", args, 1, [474		0, str: ty!(string) => Val::Str;475	], {476		Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))477	})478}479480fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {481	parse_args!(context, "trace", args, 2, [482		0, str: ty!(string) => Val::Str;483		1, rest: ty!(any);484	], {485		eprint!("TRACE:");486		if let Some(loc) = loc {487			with_state(|s|{488				let locs = s.map_source_locations(&loc.0, &[loc.1]);489				eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);490			});491		}492		eprintln!(" {}", str);493		Ok(rest)494	})495}496497fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {498	parse_args!(context, "base64", args, 1, [499		0, input: ty!((string | (Array<number>)));500	], {501		Ok(Val::Str(match input {502			Val::Str(s) => {503				base64::encode(s.bytes().collect::<Vec<_>>()).into()504			},505			Val::Arr(a) => {506				base64::encode(a.iter().map(|v| {507					Ok(v?.unwrap_num()? as u8)508				}).collect::<Result<Vec<_>>>()?).into()509			},510			_ => unreachable!()511		}))512	})513}514515fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {516	parse_args!(context, "join", args, 2, [517		0, sep: ty!((string | array));518		1, arr: ty!(array) => Val::Arr;519	], {520		Ok(match sep {521			Val::Arr(joiner_items) => {522				let mut out = Vec::new();523524				let mut first = true;525				for item in arr.iter() {526					let item = item?.clone();527					if let Val::Arr(items) = item {528						if !first {529							out.reserve(joiner_items.len());530							// TODO: extend531							for item in joiner_items.iter() {532								out.push(item?);533							}534						}535						first = false;536						out.reserve(items.len());537						// TODO: extend538						for item in items.iter() {539							out.push(item?);540						}541					} else {542						throw!(RuntimeError("in std.join all items should be arrays".into()));543					}544				}545546				Val::Arr(out.into())547			},548			Val::Str(sep) => {549				let mut out = String::new();550551				let mut first = true;552				for item in arr.iter() {553					let item = item?.clone();554					if let Val::Str(item) = item {555						if !first {556							out += &sep;557						}558						first = false;559						out += &item;560					} else {561						throw!(RuntimeError("in std.join all items should be strings".into()));562					}563				}564565				Val::Str(out.into())566			},567			_ => unreachable!()568		})569	})570}571572fn builtin_escape_string_json(573	context: Context,574	_loc: Option<&ExprLocation>,575	args: &ArgsDesc,576) -> Result<Val> {577	parse_args!(context, "escapeStringJson", args, 1, [578		0, str_: ty!(string) => Val::Str;579	], {580		Ok(Val::Str(escape_string_json(&str_).into()))581	})582}583584fn builtin_manifest_json_ex(585	context: Context,586	_loc: Option<&ExprLocation>,587	args: &ArgsDesc,588) -> Result<Val> {589	parse_args!(context, "manifestJsonEx", args, 2, [590		0, value: ty!(any);591		1, indent: ty!(string) => Val::Str;592	], {593		Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {594			padding: &indent,595			mtype: ManifestType::Std,596		})?.into()))597	})598}599600fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {601	parse_args!(context, "reverse", args, 1, [602		0, value: ty!(array) => Val::Arr;603	], {604		Ok(Val::Arr(value.reversed()))605	})606}607608fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {609	parse_args!(context, "id", args, 1, [610		0, v: ty!(any);611	], {612		Ok(v)613	})614}615616fn builtin_str_replace(617	context: Context,618	_loc: Option<&ExprLocation>,619	args: &ArgsDesc,620) -> Result<Val> {621	parse_args!(context, "strReplace", args, 3, [622		0, str: ty!(string) => Val::Str;623		1, from: ty!(string) => Val::Str;624		2, to: ty!(string) => Val::Str;625	], {626		let mut out = String::new();627		let mut last_idx = 0;628		while let Some(idx) = (&str[last_idx..]).find(&from as &str) {629			out.push_str(&str[last_idx..last_idx+idx]);630			out.push_str(&to);631			last_idx += idx + from.len();632		}633		if last_idx == 0 {634			return Ok(Val::Str(str))635		}636		out.push_str(&str[last_idx..]);637		Ok(Val::Str(out.into()))638	})639}640641pub fn call_builtin(642	context: Context,643	loc: Option<&ExprLocation>,644	name: &str,645	args: &ArgsDesc,646) -> Result<Val> {647	BUILTINS648		.with(|builtins| builtins.get(name).copied())649		.ok_or_else(|| IntrinsicNotFound(name.into()))?(context, loc, args)650}
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			("primitiveEquals".into(), builtin_primitive_equals),85			("equals".into(), builtin_equals),86			("modulo".into(), builtin_modulo),87			("mod".into(), builtin_mod),88			("floor".into(), builtin_floor),89			("ceil".into(), builtin_ceil),90			("log".into(), builtin_log),91			("pow".into(), builtin_pow),92			("sqrt".into(), builtin_sqrt),93			("extVar".into(), builtin_ext_var),94			("native".into(), builtin_native),95			("filter".into(), builtin_filter),96			("map".into(), builtin_map),97			("flatMap".into(), builtin_flatmap),98			("foldl".into(), builtin_foldl),99			("foldr".into(), builtin_foldr),100			("sortImpl".into(), builtin_sort_impl),101			("format".into(), builtin_format),102			("range".into(), builtin_range),103			("char".into(), builtin_char),104			("encodeUTF8".into(), builtin_encode_utf8),105			("md5".into(), builtin_md5),106			("base64".into(), builtin_base64),107			("trace".into(), builtin_trace),108			("join".into(), builtin_join),109			("escapeStringJson".into(), builtin_escape_string_json),110			("manifestJsonEx".into(), builtin_manifest_json_ex),111			("reverse".into(), builtin_reverse),112			("id".into(), builtin_id),113			("strReplace".into(), builtin_str_replace),114			("parseJson".into(), builtin_parse_json),115		].iter().cloned().collect()116	};117}118119fn builtin_length(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {120	parse_args!(context, "length", args, 1, [121		0, x: ty!((string | object | array));122	], {123		Ok(match x {124			Val::Str(n) => Val::Num(n.chars().count() as f64),125			Val::Arr(a) => Val::Num(a.len() as f64),126			Val::Obj(o) => Val::Num(127				o.fields_visibility()128					.into_iter()129					.filter(|(_k, v)| *v)130					.count() as f64,131			),132			_ => unreachable!(),133		})134	})135}136137fn builtin_type(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {138	parse_args!(context, "type", args, 1, [139		0, x: ty!(any);140	], {141		Ok(Val::Str(x.value_type().name().into()))142	})143}144145fn builtin_make_array(146	context: Context,147	_loc: Option<&ExprLocation>,148	args: &ArgsDesc,149) -> Result<Val> {150	parse_args!(context, "makeArray", args, 2, [151		0, sz: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;152		1, func: ty!(function) => Val::Func;153	], {154		let mut out = Vec::with_capacity(sz as usize);155		for i in 0..sz as usize {156			out.push(LazyVal::new_resolved(func.evaluate_values(157				context.clone(),158				&[Val::Num(i as f64)]159			)?))160		}161		Ok(Val::Arr(out.into()))162	})163}164165fn builtin_codepoint(166	context: Context,167	_loc: Option<&ExprLocation>,168	args: &ArgsDesc,169) -> Result<Val> {170	parse_args!(context, "codepoint", args, 1, [171		0, str: ty!(char) => Val::Str;172	], {173		Ok(Val::Num(str.chars().next().unwrap() as u32 as f64))174	})175}176177fn builtin_object_fields_ex(178	context: Context,179	_loc: Option<&ExprLocation>,180	args: &ArgsDesc,181) -> Result<Val> {182	parse_args!(context, "objectFieldsEx", args, 2, [183		0, obj: ty!(object) => Val::Obj;184		1, inc_hidden: ty!(boolean) => Val::Bool;185	], {186		let out = obj.fields_ex(inc_hidden);187		Ok(Val::Arr(out.into_iter().map(Val::Str).collect::<Vec<_>>().into()))188	})189}190191fn builtin_object_has_ex(192	context: Context,193	_loc: Option<&ExprLocation>,194	args: &ArgsDesc,195) -> Result<Val> {196	parse_args!(context, "objectHasEx", args, 3, [197		0, obj: ty!(object) => Val::Obj;198		1, f: ty!(string) => Val::Str;199		2, inc_hidden: ty!(boolean) => Val::Bool;200	], {201		Ok(Val::Bool(obj.has_field_ex(f, inc_hidden)))202	})203}204205fn builtin_parse_json(206	context: Context,207	_loc: Option<&ExprLocation>,208	args: &ArgsDesc,209) -> Result<Val> {210	parse_args!(context, "parseJson", args, 1, [211		0, s: ty!(string) => Val::Str;212	], {213		let state = EvaluationState::default();214		let path = PathBuf::from("std.parseJson").into();215		state.evaluate_snippet_raw(path ,s)216	})217}218219fn builtin_slice(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {220	parse_args!(context, "slice", args, 4, [221		0, indexable: ty!((string | array));222		1, index: ty!((number | null));223		2, end: ty!((number | null));224		3, step: ty!((number | null));225	], {226		std_slice(227			indexable.into_indexable()?,228			index.try_cast_nullable_num("index")?.map(|v| v as usize),229			end.try_cast_nullable_num("end")?.map(|v| v as usize),230			step.try_cast_nullable_num("step")?.map(|v| v as usize),231		)232	})233}234235fn builtin_primitive_equals(236	context: Context,237	_loc: Option<&ExprLocation>,238	args: &ArgsDesc,239) -> Result<Val> {240	parse_args!(context, "primitiveEquals", args, 2, [241		0, a: ty!(any);242		1, b: ty!(any);243	], {244		Ok(Val::Bool(primitive_equals(&a, &b)?))245	})246}247248fn builtin_equals(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {249	parse_args!(context, "equals", args, 2, [250		0, a: ty!(any);251		1, b: ty!(any);252	], {253		Ok(Val::Bool(equals(&a, &b)?))254	})255}256257fn builtin_modulo(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {258	parse_args!(context, "modulo", args, 2, [259		0, a: ty!(number) => Val::Num;260		1, b: ty!(number) => Val::Num;261	], {262		Ok(Val::Num(a % b))263	})264}265266fn builtin_mod(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {267	parse_args!(context, "mod", args, 2, [268		0, a: ty!((number | string));269		1, b: ty!(any);270	], {271		evaluate_mod_op(&a, &b)272	})273}274275fn builtin_floor(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {276	parse_args!(context, "floor", args, 1, [277		0, x: ty!(number) => Val::Num;278	], {279		Ok(Val::Num(x.floor()))280	})281}282283fn builtin_ceil(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {284	parse_args!(context, "ceil", args, 1, [285		0, x: ty!(number) => Val::Num;286	], {287		Ok(Val::Num(x.ceil()))288	})289}290291fn builtin_log(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {292	parse_args!(context, "log", args, 1, [293		0, n: ty!(number) => Val::Num;294	], {295		Ok(Val::Num(n.ln()))296	})297}298299fn builtin_pow(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {300	parse_args!(context, "pow", args, 2, [301		0, x: ty!(number) => Val::Num;302		1, n: ty!(number) => Val::Num;303	], {304		Ok(Val::Num(x.powf(n)))305	})306}307308fn builtin_sqrt(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {309	parse_args!(context, "sqrt", args, 1, [310		0, x: ty!(BoundedNumber<(Some(0.0)), (None)>) => Val::Num;311	], {312		Ok(Val::Num(x.sqrt()))313	})314}315316fn builtin_ext_var(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {317	parse_args!(context, "extVar", args, 1, [318		0, x: ty!(string) => Val::Str;319	], {320		Ok(with_state(|s| s.settings().ext_vars.get(&x).cloned()).ok_or(UndefinedExternalVariable(x))?)321	})322}323324fn builtin_native(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {325	parse_args!(context, "native", args, 1, [326		0, x: ty!(string) => Val::Str;327	], {328		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))?)329	})330}331332fn builtin_filter(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {333	parse_args!(context, "filter", args, 2, [334		0, func: ty!(function) => Val::Func;335		1, arr: ty!(array) => Val::Arr;336	], {337		Ok(Val::Arr(arr.filter(|val| func338			.evaluate_values(context.clone(), &[val.clone()])?339			.try_cast_bool("filter predicate"))?))340	})341}342343fn builtin_map(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {344	parse_args!(context, "map", args, 2, [345		0, func: ty!(function) => Val::Func;346		1, arr: ty!(array) => Val::Arr;347	], {348		Ok(Val::Arr(arr.map(|val| func349			.evaluate_values(context.clone(), &[val]))?))350	})351}352353fn builtin_flatmap(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {354	parse_args!(context, "flatMap", args, 2, [355		0, func: ty!(function) => Val::Func;356		1, arr: ty!((array | string));357	], {358		match arr {359			Val::Str(s) => {360				let mut out = String::new();361				for c in s.chars() {362					match func.evaluate_values(context.clone(), &[Val::Str(c.to_string().into())])? {363						Val::Str(o) => out.push_str(&o),364						_ => throw!(RuntimeError("in std.join all items should be strings".into())),365					};366				}367				Ok(Val::Str(out.into()))368			},369			Val::Arr(a) => {370				let mut out = Vec::new();371				for el in a.iter() {372					let el = el?;373					match func.evaluate_values(context.clone(), &[el])? {374						Val::Arr(o) => for oe in o.iter() {375							out.push(oe?)376						},377						_ => throw!(RuntimeError("in std.join all items should be arrays".into())),378					};379				}380				Ok(Val::Arr(out.into()))381			},382			_ => unreachable!(),383		}384	})385}386387fn builtin_foldl(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {388	parse_args!(context, "foldl", args, 3, [389		0, func: ty!(function) => Val::Func;390		1, arr: ty!(array) => Val::Arr;391		2, init: ty!(any);392	], {393		let mut acc = init;394		for i in arr.iter() {395			acc = func.evaluate_values(context.clone(), &[acc, i?])?;396		}397		Ok(acc)398	})399}400401fn builtin_foldr(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {402	parse_args!(context, "foldr", args, 3, [403		0, func: ty!(function) => Val::Func;404		1, arr: ty!(array) => Val::Arr;405		2, init: ty!(any);406	], {407		let mut acc = init;408		for i in arr.iter().rev() {409			acc = func.evaluate_values(context.clone(), &[acc, i?])?;410		}411		Ok(acc)412	})413}414415#[allow(non_snake_case)]416fn builtin_sort_impl(417	context: Context,418	_loc: Option<&ExprLocation>,419	args: &ArgsDesc,420) -> Result<Val> {421	parse_args!(context, "sort", args, 2, [422		0, arr: ty!(array) => Val::Arr;423		1, keyF: ty!(function) => Val::Func;424	], {425		if arr.len() <= 1 {426			return Ok(Val::Arr(arr))427		}428		Ok(Val::Arr(ArrValue::Eager(sort::sort(context, arr.evaluated()?, &keyF)?)))429	})430}431432fn builtin_format(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {433	parse_args!(context, "format", args, 2, [434		0, str: ty!(string) => Val::Str;435		1, vals: ty!(any)436	], {437		std_format(str, vals)438	})439}440441fn builtin_range(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {442	parse_args!(context, "range", args, 2, [443		0, from: ty!(number) => Val::Num;444		1, to: ty!(number) => Val::Num;445	], {446		if to < from {447			return Ok(Val::Arr(ArrValue::new_eager()))448		}449		let mut out = Vec::with_capacity((1+to as usize-from as usize).max(0));450		for i in from as usize..=to as usize {451			out.push(Val::Num(i as f64));452		}453		Ok(Val::Arr(out.into()))454	})455}456457fn builtin_char(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {458	parse_args!(context, "char", args, 1, [459		0, n: ty!(number) => Val::Num;460	], {461		let mut out = String::new();462		out.push(std::char::from_u32(n as u32).ok_or_else(||463			InvalidUnicodeCodepointGot(n as u32)464		)?);465		Ok(Val::Str(out.into()))466	})467}468469fn builtin_encode_utf8(470	context: Context,471	_loc: Option<&ExprLocation>,472	args: &ArgsDesc,473) -> Result<Val> {474	parse_args!(context, "encodeUTF8", args, 1, [475		0, str: ty!(string) => Val::Str;476	], {477		Ok(Val::Arr((str.bytes().map(|b| Val::Num(b as f64)).collect::<Vec<Val>>()).into()))478	})479}480481fn builtin_md5(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {482	parse_args!(context, "md5", args, 1, [483		0, str: ty!(string) => Val::Str;484	], {485		Ok(Val::Str(format!("{:x}", md5::compute(&str.as_bytes())).into()))486	})487}488489fn builtin_trace(context: Context, loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {490	parse_args!(context, "trace", args, 2, [491		0, str: ty!(string) => Val::Str;492		1, rest: ty!(any);493	], {494		eprint!("TRACE:");495		if let Some(loc) = loc {496			with_state(|s|{497				let locs = s.map_source_locations(&loc.0, &[loc.1]);498				eprint!(" {}:{}", loc.0.file_name().unwrap().to_str().unwrap(), locs[0].line);499			});500		}501		eprintln!(" {}", str);502		Ok(rest)503	})504}505506fn builtin_base64(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {507	parse_args!(context, "base64", args, 1, [508		0, input: ty!((string | (Array<number>)));509	], {510		Ok(Val::Str(match input {511			Val::Str(s) => {512				base64::encode(s.bytes().collect::<Vec<_>>()).into()513			},514			Val::Arr(a) => {515				base64::encode(a.iter().map(|v| {516					Ok(v?.unwrap_num()? as u8)517				}).collect::<Result<Vec<_>>>()?).into()518			},519			_ => unreachable!()520		}))521	})522}523524fn builtin_join(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {525	parse_args!(context, "join", args, 2, [526		0, sep: ty!((string | array));527		1, arr: ty!(array) => Val::Arr;528	], {529		Ok(match sep {530			Val::Arr(joiner_items) => {531				let mut out = Vec::new();532533				let mut first = true;534				for item in arr.iter() {535					let item = item?.clone();536					if let Val::Arr(items) = item {537						if !first {538							out.reserve(joiner_items.len());539							// TODO: extend540							for item in joiner_items.iter() {541								out.push(item?);542							}543						}544						first = false;545						out.reserve(items.len());546						// TODO: extend547						for item in items.iter() {548							out.push(item?);549						}550					} else {551						throw!(RuntimeError("in std.join all items should be arrays".into()));552					}553				}554555				Val::Arr(out.into())556			},557			Val::Str(sep) => {558				let mut out = String::new();559560				let mut first = true;561				for item in arr.iter() {562					let item = item?.clone();563					if let Val::Str(item) = item {564						if !first {565							out += &sep;566						}567						first = false;568						out += &item;569					} else {570						throw!(RuntimeError("in std.join all items should be strings".into()));571					}572				}573574				Val::Str(out.into())575			},576			_ => unreachable!()577		})578	})579}580581fn builtin_escape_string_json(582	context: Context,583	_loc: Option<&ExprLocation>,584	args: &ArgsDesc,585) -> Result<Val> {586	parse_args!(context, "escapeStringJson", args, 1, [587		0, str_: ty!(string) => Val::Str;588	], {589		Ok(Val::Str(escape_string_json(&str_).into()))590	})591}592593fn builtin_manifest_json_ex(594	context: Context,595	_loc: Option<&ExprLocation>,596	args: &ArgsDesc,597) -> Result<Val> {598	parse_args!(context, "manifestJsonEx", args, 2, [599		0, value: ty!(any);600		1, indent: ty!(string) => Val::Str;601	], {602		Ok(Val::Str(manifest_json_ex(&value, &ManifestJsonOptions {603			padding: &indent,604			mtype: ManifestType::Std,605		})?.into()))606	})607}608609fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {610	parse_args!(context, "reverse", args, 1, [611		0, value: ty!(array) => Val::Arr;612	], {613		Ok(Val::Arr(value.reversed()))614	})615}616617fn builtin_id(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {618	parse_args!(context, "id", args, 1, [619		0, v: ty!(any);620	], {621		Ok(v)622	})623}624625fn builtin_str_replace(626	context: Context,627	_loc: Option<&ExprLocation>,628	args: &ArgsDesc,629) -> Result<Val> {630	parse_args!(context, "strReplace", args, 3, [631		0, str: ty!(string) => Val::Str;632		1, from: ty!(string) => Val::Str;633		2, to: ty!(string) => Val::Str;634	], {635		let mut out = String::new();636		let mut last_idx = 0;637		while let Some(idx) = (&str[last_idx..]).find(&from as &str) {638			out.push_str(&str[last_idx..last_idx+idx]);639			out.push_str(&to);640			last_idx += idx + from.len();641		}642		if last_idx == 0 {643			return Ok(Val::Str(str))644		}645		out.push_str(&str[last_idx..]);646		Ok(Val::Str(out.into()))647	})648}649650pub fn call_builtin(651	context: Context,652	loc: Option<&ExprLocation>,653	name: &str,654	args: &ArgsDesc,655) -> Result<Val> {656	BUILTINS657		.with(|builtins| builtins.get(name).copied())658		.ok_or_else(|| IntrinsicNotFound(name.into()))?(context, loc, args)659}
modifiedcrates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -13,8 +13,6 @@
   modulo:: $intrinsic(modulo),
   floor:: $intrinsic(floor),
   ceil:: $intrinsic(ceil),
-  log:: $intrinsic(log),
-  pow:: $intrinsic(pow),
   extVar:: $intrinsic(extVar),
   native:: $intrinsic(native),
   filter:: $intrinsic(filter),
@@ -25,6 +23,10 @@
   id:: $intrinsic(id),
   parseJson:: $intrinsic(parseJson),
 
+  log:: $intrinsic(log),
+  pow:: $intrinsic(pow),
+  sqrt:: $intrinsic(sqrt),
+
   isString(v):: std.type(v) == 'string',
   isNumber(v):: std.type(v) == 'number',
   isBoolean(v):: std.type(v) == 'boolean',