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

9090
91[[package]]91[[package]]
92name = "anyhow"92name = "anyhow"
93version = "1.0.83"93version = "1.0.86"
94source = "registry+https://github.com/rust-lang/crates.io-index"94source = "registry+https://github.com/rust-lang/crates.io-index"
95checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"95checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
9696
97[[package]]97[[package]]
98name = "autocfg"98name = "autocfg"
102102
103[[package]]103[[package]]
104name = "base64"104name = "base64"
105version = "0.21.7"105version = "0.22.1"
106source = "registry+https://github.com/rust-lang/crates.io-index"106source = "registry+https://github.com/rust-lang/crates.io-index"
107checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"107checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
108108
109[[package]]109[[package]]
110name = "beef"110name = "beef"
194 "heck",194 "heck",
195 "proc-macro2",195 "proc-macro2",
196 "quote",196 "quote",
197 "syn 2.0.61",197 "syn 2.0.64",
198]198]
199199
200[[package]]200[[package]]
257 "syn 1.0.109",257 "syn 1.0.109",
258]258]
259
260[[package]]
261name = "difflib"
262version = "0.4.0"
263source = "registry+https://github.com/rust-lang/crates.io-index"
264checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
259265
260[[package]]266[[package]]
261name = "digest"267name = "digest"
289295
290[[package]]296[[package]]
291name = "either"297name = "either"
292version = "1.11.0"298version = "1.12.0"
293source = "registry+https://github.com/rust-lang/crates.io-index"299source = "registry+https://github.com/rust-lang/crates.io-index"
294checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"300checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
295301
296[[package]]302[[package]]
297name = "encode_unicode"303name = "encode_unicode"
412418
413[[package]]419[[package]]
414name = "insta"420name = "insta"
415version = "1.38.0"421version = "1.39.0"
416source = "registry+https://github.com/rust-lang/crates.io-index"422source = "registry+https://github.com/rust-lang/crates.io-index"
417checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc"423checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5"
418dependencies = [424dependencies = [
419 "console",425 "console",
420 "lazy_static",426 "lazy_static",
430436
431[[package]]437[[package]]
432name = "itertools"438name = "itertools"
433version = "0.12.1"439version = "0.13.0"
434source = "registry+https://github.com/rust-lang/crates.io-index"440source = "registry+https://github.com/rust-lang/crates.io-index"
435checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"441checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
436dependencies = [442dependencies = [
437 "either",443 "either",
438]444]
547dependencies = [553dependencies = [
548 "proc-macro2",554 "proc-macro2",
549 "quote",555 "quote",
550 "syn 2.0.61",556 "syn 2.0.64",
551]557]
552558
553[[package]]559[[package]]
607 "peg",613 "peg",
608]614]
615
616[[package]]
617name = "json-structural-diff"
618version = "0.1.0"
619source = "registry+https://github.com/rust-lang/crates.io-index"
620checksum = "25c7940d3c84d2079306c176c7b2b37622b6bc5e43fbd1541b1e4a4e1fd02045"
621dependencies = [
622 "difflib",
623 "regex",
624 "serde_json",
625]
609626
610[[package]]627[[package]]
611name = "keccak"628name = "keccak"
624641
625[[package]]642[[package]]
626name = "libc"643name = "libc"
627version = "0.2.154"644version = "0.2.155"
628source = "registry+https://github.com/rust-lang/crates.io-index"645source = "registry+https://github.com/rust-lang/crates.io-index"
629checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"646checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
630647
631[[package]]648[[package]]
632name = "libjsonnet"649name = "libjsonnet"
646663
647[[package]]664[[package]]
648name = "linux-raw-sys"665name = "linux-raw-sys"
649version = "0.4.13"666version = "0.4.14"
650source = "registry+https://github.com/rust-lang/crates.io-index"667source = "registry+https://github.com/rust-lang/crates.io-index"
651checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"668checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
652669
653[[package]]670[[package]]
654name = "lock_api"671name = "lock_api"
681 "proc-macro2",698 "proc-macro2",
682 "quote",699 "quote",
683 "regex-syntax",700 "regex-syntax",
684 "syn 2.0.61",701 "syn 2.0.64",
685]702]
686703
687[[package]]704[[package]]
9891006
990[[package]]1007[[package]]
991name = "serde"1008name = "serde"
992version = "1.0.201"1009version = "1.0.202"
993source = "registry+https://github.com/rust-lang/crates.io-index"1010source = "registry+https://github.com/rust-lang/crates.io-index"
994checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"1011checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
995dependencies = [1012dependencies = [
996 "serde_derive",1013 "serde_derive",
997]1014]
9981015
999[[package]]1016[[package]]
1000name = "serde_derive"1017name = "serde_derive"
1001version = "1.0.201"1018version = "1.0.202"
1002source = "registry+https://github.com/rust-lang/crates.io-index"1019source = "registry+https://github.com/rust-lang/crates.io-index"
1003checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"1020checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
1004dependencies = [1021dependencies = [
1005 "proc-macro2",1022 "proc-macro2",
1006 "quote",1023 "quote",
1007 "syn 2.0.61",1024 "syn 2.0.64",
1008]1025]
10091026
1010[[package]]1027[[package]]
11211138
1122[[package]]1139[[package]]
1123name = "syn"1140name = "syn"
1124version = "2.0.61"1141version = "2.0.64"
1125source = "registry+https://github.com/rust-lang/crates.io-index"1142source = "registry+https://github.com/rust-lang/crates.io-index"
1126checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"1143checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f"
1127dependencies = [1144dependencies = [
1128 "proc-macro2",1145 "proc-macro2",
1129 "quote",1146 "quote",
1149 "jrsonnet-evaluator",1166 "jrsonnet-evaluator",
1150 "jrsonnet-gcmodule",1167 "jrsonnet-gcmodule",
1151 "jrsonnet-stdlib",1168 "jrsonnet-stdlib",
1169 "json-structural-diff",
1152 "serde",1170 "serde",
1171 "serde_json",
1153]1172]
11541173
1155[[package]]1174[[package]]
11601179
1161[[package]]1180[[package]]
1162name = "thiserror"1181name = "thiserror"
1163version = "1.0.60"1182version = "1.0.61"
1164source = "registry+https://github.com/rust-lang/crates.io-index"1183source = "registry+https://github.com/rust-lang/crates.io-index"
1165checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"1184checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
1166dependencies = [1185dependencies = [
1167 "thiserror-impl",1186 "thiserror-impl",
1168]1187]
11691188
1170[[package]]1189[[package]]
1171name = "thiserror-impl"1190name = "thiserror-impl"
1172version = "1.0.60"1191version = "1.0.61"
1173source = "registry+https://github.com/rust-lang/crates.io-index"1192source = "registry+https://github.com/rust-lang/crates.io-index"
1174checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"1193checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
1175dependencies = [1194dependencies = [
1176 "proc-macro2",1195 "proc-macro2",
1177 "quote",1196 "quote",
1178 "syn 2.0.61",1197 "syn 2.0.64",
1179]1198]
11801199
1181[[package]]1200[[package]]
1347dependencies = [1366dependencies = [
1348 "proc-macro2",1367 "proc-macro2",
1349 "quote",1368 "quote",
1350 "syn 2.0.61",1369 "syn 2.0.64",
1351]1370]
13521371

--- a/Cargo.toml
+++ b/Cargo.toml
@@ -44,8 +44,8 @@
 serde_yaml_with_quirks = "0.8.24"
 
 # Error handling
-anyhow = "1.0.80"
-thiserror = "1.0"
+anyhow = "1.0.83"
+thiserror = "1.0.60"
 
 # Code formatting
 dprint-core = "0.65.0"
@@ -63,20 +63,20 @@
 # Source code parsing.
 # Jrsonnet has two parsers for jsonnet - one is for execution, and another is for better parsing diagnostics/lints/LSP.
 # First (and fast one) is based on peg, second is based on rowan.
-peg = "0.8.2"
+peg = "0.8.3"
 logos = "0.14.0"
 ungrammar = "1.16.1"
-rowan = "0.15"
+rowan = "0.15.15"
 
 mimallocator = "0.1.3"
 indoc = "2.0"
-insta = "1.35"
+insta = "1.39"
 tempfile = "3.10"
 pathdiff = "0.2.1"
-hashbrown = "0.14.3"
+hashbrown = "0.14.5"
 static_assertions = "1.1"
 rustc-hash = "1.1"
-num-bigint = "0.4.4"
+num-bigint = "0.4.5"
 derivative = "2.2.0"
 strsim = "0.11.0"
 structdump = "0.2.0"
@@ -84,16 +84,18 @@
 quote = "1.0"
 syn = "2.0"
 drop_bomb = "0.1.5"
-base64 = "0.21.7"
+base64 = "0.22.1"
 indexmap = "2.2.3"
-itertools = "0.12.1"
-xshell = "0.2.5"
+itertools = "0.13.0"
+xshell = "0.2.6"
 
 lsp-server = "0.7.6"
-lsp-types = "0.95.0"
+lsp-types = "0.96.0"
 
-regex = "1.10.3"
-lru = "0.12.2"
+regex = "1.10"
+lru = "0.12.3"
+
+json-structural-diff = "0.1.0"
 
 [workspace.lints.rust]
 unsafe_op_in_unsafe_fn = "deny"

--- a/crates/jrsonnet-evaluator/src/arr/mod.rs
+++ b/crates/jrsonnet-evaluator/src/arr/mod.rs
@@ -11,7 +11,7 @@
 
 /// Represents a Jsonnet array value.
 #[derive(Debug, Clone, Trace)]
-// may contrain other ArrValue
+// may contain other ArrValue
 #[trace(tracking(force))]
 pub struct ArrValue(Cc<TraceBox<dyn ArrayLike>>);
 

--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -220,6 +220,13 @@
 	Arr(ArrValue),
 }
 impl IndexableVal {
+	pub fn is_empty(&self) -> bool {
+		match self {
+			Self::Str(s) => s.is_empty(),
+			Self::Arr(s) => s.is_empty(),
+		}
+	}
+
 	pub fn to_array(self) -> ArrValue {
 		match self {
 			Self::Str(s) => ArrValue::chars(s.chars()),

--- a/crates/jrsonnet-stdlib/src/lib.rs
+++ b/crates/jrsonnet-stdlib/src/lib.rs
@@ -201,6 +201,9 @@
 		("parseOctal", builtin_parse_octal::INST),
 		("parseHex", builtin_parse_hex::INST),
 		("stringChars", builtin_string_chars::INST),
+		("lstripChars", builtin_lstrip_chars::INST),
+		("rstripChars", builtin_rstrip_chars::INST),
+		("stripChars", builtin_strip_chars::INST),
 		// Misc
 		("length", builtin_length::INST),
 		("get", builtin_get::INST),

--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -3,22 +3,6 @@
 
   thisFile:: error 'std.thisFile is deprecated, to enable its support in jrsonnet - recompile it with "legacy-this-file" support.\nThis will slow down stdlib caching a bit, though',
 
-  lstripChars(str, chars)::
-    if std.length(str) > 0 && std.member(chars, str[0]) then
-      std.lstripChars(str[1:], chars)
-    else
-      str,
-
-  rstripChars(str, chars)::
-    local len = std.length(str);
-    if len > 0 && std.member(chars, str[len - 1]) then
-      std.rstripChars(str[:len - 1], chars)
-    else
-      str,
-
-  stripChars(str, chars)::
-    std.lstripChars(std.rstripChars(str, chars), chars),
-
   mapWithIndex(func, arr)::
     if !std.isFunction(func) then
       error ('std.mapWithIndex first param must be function, got ' + std.type(func))

--- a/crates/jrsonnet-stdlib/src/strings.rs
+++ b/crates/jrsonnet-stdlib/src/strings.rs
@@ -1,9 +1,11 @@
+use std::collections::BTreeSet;
+
 use jrsonnet_evaluator::{
 	bail,
 	error::{ErrorKind::*, Result},
 	function::builtin,
-	typed::{Either2, M1},
-	val::ArrValue,
+	typed::{Either2, Typed, M1},
+	val::{ArrValue, IndexableVal},
 	Either, IStr, Val,
 };
 
@@ -215,6 +217,53 @@
 	})
 }
 
+#[builtin]
+pub fn builtin_string_chars(str: IStr) -> ArrValue {
+	ArrValue::chars(str.chars())
+}
+
+#[builtin]
+pub fn builtin_lstrip_chars(str: IStr, chars: IndexableVal) -> Result<IStr> {
+	if str.is_empty() || chars.is_empty() {
+		return Ok(str);
+	}
+
+	let pattern = new_trim_pattern(chars)?;
+	Ok(str.as_str().trim_start_matches(pattern).into())
+}
+
+#[builtin]
+pub fn builtin_rstrip_chars(str: IStr, chars: IndexableVal) -> Result<IStr> {
+	if str.is_empty() || chars.is_empty() {
+		return Ok(str);
+	}
+
+	let pattern = new_trim_pattern(chars)?;
+	Ok(str.as_str().trim_end_matches(pattern).into())
+}
+
+#[builtin]
+pub fn builtin_strip_chars(str: IStr, chars: IndexableVal) -> Result<IStr> {
+	if str.is_empty() || chars.is_empty() {
+		return Ok(str);
+	}
+
+	let pattern = new_trim_pattern(chars)?;
+	Ok(str.as_str().trim_matches(pattern).into())
+}
+
+fn new_trim_pattern(chars: IndexableVal) -> Result<impl Fn(char) -> bool> {
+	let chars: BTreeSet<char> = match chars {
+		IndexableVal::Str(chars) => chars.chars().collect(),
+		IndexableVal::Arr(chars) => chars
+			.iter()
+			.filter_map(|it| it.map(|it| char::from_untyped(it).ok()).transpose())
+			.collect::<Result<_, _>>()?,
+	};
+
+	Ok(move |char| chars.contains(&char))
+}
+
 #[cfg(test)]
 mod tests {
 	use super::*;
@@ -242,9 +291,4 @@
 		assert_eq!(parse_nat::<16>("a9").unwrap(), 0xA9 as f64);
 		assert_eq!(parse_nat::<16>("BbC").unwrap(), 0xBBC as f64);
 	}
-}
-
-#[builtin]
-pub fn builtin_string_chars(str: IStr) -> ArrValue {
-	ArrValue::chars(str.chars())
 }

--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -12,3 +12,5 @@
 jrsonnet-gcmodule.workspace = true
 jrsonnet-stdlib.workspace = true
 serde.workspace = true
+json-structural-diff.workspace = true
+serde_json.workspace = true

--- a/tests/tests/golden.rs
+++ b/tests/tests/golden.rs
@@ -9,7 +9,6 @@
 	FileImportResolver, State,
 };
 use jrsonnet_stdlib::StateExt;
-
 mod common;
 
 fn run(file: &Path) -> String {
@@ -35,6 +34,8 @@
 
 #[test]
 fn test() -> io::Result<()> {
+	use json_structural_diff::JsonDiff;
+
 	let mut root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
 	root.push("golden");
 
@@ -54,6 +55,35 @@
 		} else {
 			let golden = fs::read_to_string(golden_path)?;
 
+			match (serde_json::from_str(&result), serde_json::from_str(&golden)) {
+				(Err(_), Ok(_)) => assert_eq!(
+					result,
+					golden,
+					"unexpected error for golden {}",
+					entry.path().display()
+				),
+				(Ok(_), Err(_)) => assert_eq!(
+					result,
+					golden,
+					"expected error for golden {}",
+					entry.path().display()
+				),
+				(Ok(result), Ok(golden)) => {
+					// Show diff relative to golden`.
+					let diff = JsonDiff::diff_string(&golden, &result, false);
+					if let Some(diff) = diff {
+						panic!(
+							"Result \n{result:#}\n\
+								and golden \n{golden:#}\n\
+								did not match structurally:\n{diff:#}\n\
+								for golden {}",
+							entry.path().display()
+						);
+					}
+				}
+				(Err(_), Err(_)) => {}
+			};
+
 			assert_eq!(
 				result,
 				golden,