`f009c169a67c`

4 files changed

modifiedcrates/jrsonnet-stdlib/src/arrays.rsdiff before after both

275	}275	}
276}276}
277
278#[builtin]
279pub fn builtin_find(value: Val, arr: ArrValue) -> Result<Vec<usize>> {
280	let mut out = Vec::new();
281	for (i, ele) in arr.iter().enumerate() {
282		let ele = ele?;
283		if equals(&ele, &value)? {
284			out.push(i);
285		}
286	}
287	Ok(out)
288}
277289
278#[builtin]290#[builtin]
279pub fn builtin_contains(arr: IndexableVal, elem: Val) -> Result<bool> {291pub fn builtin_contains(arr: IndexableVal, elem: Val) -> Result<bool> {

modifiedcrates/jrsonnet-stdlib/src/lib.rsdiff before after both

91		("any", builtin_any::INST),91		("any", builtin_any::INST),
92		("all", builtin_all::INST),92		("all", builtin_all::INST),
93		("member", builtin_member::INST),93		("member", builtin_member::INST),
94		("find", builtin_find::INST),
94		("contains", builtin_contains::INST),95		("contains", builtin_contains::INST),
95		("count", builtin_count::INST),96		("count", builtin_count::INST),
96		("avg", builtin_avg::INST),97		("avg", builtin_avg::INST),
213		("get", builtin_get::INST),214		("get", builtin_get::INST),
214		("startsWith", builtin_starts_with::INST),215		("startsWith", builtin_starts_with::INST),
215		("endsWith", builtin_ends_with::INST),216		("endsWith", builtin_ends_with::INST),
217		("assertEqual", builtin_assert_equal::INST),
216		// Sets218		// Sets
217		("setMember", builtin_set_member::INST),219		("setMember", builtin_set_member::INST),
218		("setInter", builtin_set_inter::INST),220		("setInter", builtin_set_inter::INST),

modifiedcrates/jrsonnet-stdlib/src/misc.rsdiff before after both

7	manifest::JsonFormat,7	manifest::JsonFormat,
8	typed::{Either2, Either4},8	typed::{Either2, Either4},
9	val::{equals, ArrValue},9	val::{equals, ArrValue},
10	Context, Either, IStr, ObjValue, Thunk, Val,10	Context, Either, IStr, ObjValue, ResultExt, Thunk, Val,
11};11};
1212
13use crate::{extvar_source, Settings};13use crate::{extvar_source, Settings};
142	})142	})
143}143}
144
145#[builtin]
146pub fn builtin_assert_equal(a: Val, b: Val) -> Result<bool> {
147	if equals(&a, &b)? {
148		return Ok(true);
149	}
150	let format = JsonFormat::std_to_json("  ".to_owned(), "\n", ": ");
151	let a = a.manifest(&format).description("<a> manifestification")?;
152	let b = b.manifest(&format).description("<b> manifestification")?;
153	bail!("assertion failed: A != B\nA: {a}\nB: {b}")
154}
144155

modifiedcrates/jrsonnet-stdlib/src/std.jsonnetdiff before after both

11    else11    else
12      { [k]: func(k, obj[k]) for k in std.objectFields(obj) },12      { [k]: func(k, obj[k]) for k in std.objectFields(obj) },
1313
14  assertEqual(a, b)::
15    if a == b then
16      true
17    else
18      error 'Assertion failed. ' + a + ' != ' + b,
19
20  mergePatch(target, patch)::14  mergePatch(target, patch)::
21    if std.isObject(patch) then15    if std.isObject(patch) then
22      local target_object =16      local target_object =
44  resolvePath(f, r)::38  resolvePath(f, r)::
45    local arr = std.split(f, '/');39    local arr = std.split(f, '/');
46    std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),40    std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),
47
48  find(value, arr)::
49    if !std.isArray(arr) then
50      error 'find second parameter should be an array, got ' + std.type(arr)
51    else
52      std.filter(function(i) arr[i] == value, std.range(0, std.length(arr) - 1)),
53}41}
5442