git.delta.rocks / jrsonnet / refs/commits / 5e5ab6bd1d3a

--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -128,6 +128,8 @@
 			("parseJson".into(), builtin_parse_json),
 			("asciiUpper".into(), builtin_ascii_upper),
 			("asciiLower".into(), builtin_ascii_lower),
+			("member".into(), builtin_member),
+			("count".into(), builtin_count),
 		].iter().cloned().collect()
 	};
 }
@@ -854,6 +856,46 @@
 	})
 }
 
+fn builtin_member(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+	parse_args!(context, "member", args, 2, [
+		0, arr: ty!((array | string));
+		1, x: ty!(any);
+	], {
+		match arr {
+			Val::Str(s) => {
+				let x = x.try_cast_str("x should be string")?;
+				Ok(Val::Bool(!x.is_empty() && s.contains(&*x)))
+			}
+			Val::Arr(a) => {
+				for item in a.iter() {
+					let item = item?;
+					if equals(&item, &x)? {
+						return Ok(Val::Bool(true));
+					}
+				}
+				Ok(Val::Bool(false))
+			}
+			_ => unreachable!(),
+		}
+	})
+}
+
+fn builtin_count(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
+	parse_args!(context, "count", args, 2, [
+		0, arr: ty!(array) => Val::Arr;
+		1, x: ty!(any);
+	], {
+		let mut count = 0;
+		for item in arr.iter() {
+			let item = item?;
+			if equals(&item, &x)? {
+				count += 1;
+			}
+		}
+		Ok(Val::Num(count as f64))
+	})
+}
+
 pub fn call_builtin(
 	context: Context,
 	loc: Option<&ExprLocation>,

1052		assert_eval!(r#"std.assertEqual(std.asciiLower("aBc😀"), "abc😀")"#);1052		assert_eval!(r#"std.assertEqual(std.asciiLower("aBc😀"), "abc😀")"#);
1053	}1053	}
1054
1055	#[test]
1056	fn test_member() {
1057		assert_eval!(r#"!std.member("", "")"#);
1058		assert_eval!(r#"std.member("abc", "a")"#);
1059		assert_eval!(r#"!std.member("abc", "d")"#);
1060		assert_eval!(r#"!std.member([], "")"#);
1061		assert_eval!(r#"std.member(["a", "b", "c"], "a")"#);
1062		assert_eval!(r#"!std.member(["a", "b", "c"], "d")"#);
1063	}
1064
1065	#[test]
1066	fn test_count() {
1067		assert_eval!(r#"std.assertEqual(std.count([], ""), 0)"#);
1068		assert_eval!(r#"std.assertEqual(std.count(["a", "b", "a"], "d"), 0)"#);
1069		assert_eval!(r#"std.assertEqual(std.count(["a", "b", "a"], "a"), 2)"#);
1070	}
1054}1071}
10551072

--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -143,14 +143,9 @@
 
   slice:: $intrinsic(slice),
 
-  member(arr, x)::
-    if std.isArray(arr) then
-      std.count(arr, x) > 0
-    else if std.isString(arr) then
-      std.length(std.findSubstr(x, arr)) > 0
-    else error 'std.member first argument must be an array or a string',
+  member:: $intrinsic(member),
 
-  count(arr, x):: std.length(std.filter(function(v) v == x, arr)),
+  count:: $intrinsic(count),
 
   mod:: $intrinsic(mod),