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

--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -276,6 +276,18 @@
 }
 
 #[builtin]
+pub fn builtin_find(value: Val, arr: ArrValue) -> Result<Vec<usize>> {
+	let mut out = Vec::new();
+	for (i, ele) in arr.iter().enumerate() {
+		let ele = ele?;
+		if equals(&ele, &value)? {
+			out.push(i);
+		}
+	}
+	Ok(out)
+}
+
+#[builtin]
 pub fn builtin_contains(arr: IndexableVal, elem: Val) -> Result<bool> {
 	builtin_member(arr, elem)
 }

--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -91,6 +91,7 @@
 		("any", builtin_any::INST),
 		("all", builtin_all::INST),
 		("member", builtin_member::INST),
+		("find", builtin_find::INST),
 		("contains", builtin_contains::INST),
 		("count", builtin_count::INST),
 		("avg", builtin_avg::INST),
@@ -213,6 +214,7 @@
 		("get", builtin_get::INST),
 		("startsWith", builtin_starts_with::INST),
 		("endsWith", builtin_ends_with::INST),
+		("assertEqual", builtin_assert_equal::INST),
 		// Sets
 		("setMember", builtin_set_member::INST),
 		("setInter", builtin_set_inter::INST),

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

--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -11,12 +11,6 @@
     else
       { [k]: func(k, obj[k]) for k in std.objectFields(obj) },
 
-  assertEqual(a, b)::
-    if a == b then
-      true
-    else
-      error 'Assertion failed. ' + a + ' != ' + b,
-
   mergePatch(target, patch)::
     if std.isObject(patch) then
       local target_object =
@@ -44,10 +38,4 @@
   resolvePath(f, r)::
     local arr = std.split(f, '/');
     std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),
-
-  find(value, arr)::
-    if !std.isArray(arr) then
-      error 'find second parameter should be an array, got ' + std.type(arr)
-    else
-      std.filter(function(i) arr[i] == value, std.range(0, std.length(arr) - 1)),
 }