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

difftreelog

feat `*stripChars` builtins

Petr Portnov2024-06-18parent: #eced1a8.patch.diff
in: master

12 files changed

added.editorconfigdiffbeforeafterboth
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,7 @@
+root = true
+
+[tests/golden/*.jsonnet.golden]
+generated_code = true
+indent_style = space
+indent_size = 4
+insert_final_newline = false
modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -90,9 +90,9 @@
 
 [[package]]
 name = "anyhow"
-version = "1.0.83"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "autocfg"
@@ -102,9 +102,9 @@
 
 [[package]]
 name = "base64"
-version = "0.21.7"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "beef"
@@ -194,7 +194,7 @@
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.61",
+ "syn 2.0.64",
 ]
 
 [[package]]
@@ -258,6 +258,12 @@
 ]
 
 [[package]]
+name = "difflib"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
+
+[[package]]
 name = "digest"
 version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -289,9 +295,9 @@
 
 [[package]]
 name = "either"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
 
 [[package]]
 name = "encode_unicode"
@@ -412,9 +418,9 @@
 
 [[package]]
 name = "insta"
-version = "1.38.0"
+version = "1.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3eab73f58e59ca6526037208f0e98851159ec1633cf17b6cd2e1f2c3fd5d53cc"
+checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5"
 dependencies = [
  "console",
  "lazy_static",
@@ -430,9 +436,9 @@
 
 [[package]]
 name = "itertools"
-version = "0.12.1"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
 dependencies = [
  "either",
 ]
@@ -547,7 +553,7 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.61",
+ "syn 2.0.64",
 ]
 
 [[package]]
@@ -608,6 +614,17 @@
 ]
 
 [[package]]
+name = "json-structural-diff"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25c7940d3c84d2079306c176c7b2b37622b6bc5e43fbd1541b1e4a4e1fd02045"
+dependencies = [
+ "difflib",
+ "regex",
+ "serde_json",
+]
+
+[[package]]
 name = "keccak"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -624,9 +641,9 @@
 
 [[package]]
 name = "libc"
-version = "0.2.154"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libjsonnet"
@@ -646,9 +663,9 @@
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "lock_api"
@@ -681,7 +698,7 @@
  "proc-macro2",
  "quote",
  "regex-syntax",
- "syn 2.0.61",
+ "syn 2.0.64",
 ]
 
 [[package]]
@@ -989,22 +1006,22 @@
 
 [[package]]
 name = "serde"
-version = "1.0.201"
+version = "1.0.202"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
+checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.201"
+version = "1.0.202"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
+checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.61",
+ "syn 2.0.64",
 ]
 
 [[package]]
@@ -1121,9 +1138,9 @@
 
 [[package]]
 name = "syn"
-version = "2.0.61"
+version = "2.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
+checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1149,7 +1166,9 @@
  "jrsonnet-evaluator",
  "jrsonnet-gcmodule",
  "jrsonnet-stdlib",
+ "json-structural-diff",
  "serde",
+ "serde_json",
 ]
 
 [[package]]
@@ -1160,22 +1179,22 @@
 
 [[package]]
 name = "thiserror"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.61",
+ "syn 2.0.64",
 ]
 
 [[package]]
@@ -1347,5 +1366,5 @@
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.61",
+ "syn 2.0.64",
 ]
modifiedCargo.tomldiffbeforeafterboth
--- 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"
modifiedcrates/jrsonnet-evaluator/src/arr/mod.rsdiffbeforeafterboth
--- 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>>);
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- 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()),
modifiedcrates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth
--- 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),
modifiedcrates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth
33
4  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',4  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',
55
6  lstripChars(str, chars)::
7    if std.length(str) > 0 && std.member(chars, str[0]) then
8      std.lstripChars(str[1:], chars)
9    else
10      str,
11
12  rstripChars(str, chars)::
13    local len = std.length(str);
14    if len > 0 && std.member(chars, str[len - 1]) then
15      std.rstripChars(str[:len - 1], chars)
16    else
17      str,
18
19  stripChars(str, chars)::
20    std.lstripChars(std.rstripChars(str, chars), chars),
21
22  mapWithIndex(func, arr)::6  mapWithIndex(func, arr)::
23    if !std.isFunction(func) then7    if !std.isFunction(func) then
24      error ('std.mapWithIndex first param must be function, got ' + std.type(func))8      error ('std.mapWithIndex first param must be function, got ' + std.type(func))
modifiedcrates/jrsonnet-stdlib/src/strings.rsdiffbeforeafterboth
--- 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())
 }
modifiedtests/Cargo.tomldiffbeforeafterboth
--- 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
addedtests/golden/builtin_strings_string.jsonnetdiffbeforeafterboth
--- /dev/null
+++ b/tests/golden/builtin_strings_string.jsonnet
@@ -0,0 +1,21 @@
+{
+	lstripChars_singleChar: std.lstripChars("aaabcdef", "a"),
+	lstripChars_multipleChars: std.lstripChars("klmn", "kql"),
+	lstripChars_array: std.lstripChars("forward", [1, "f", [], "o", "d", "for"]),
+
+	rstripChars_singleChar: std.rstripChars("nice_boy", "y"),
+	rstripChars_multipleChars: std.rstripChars("amoguass", "sa"),
+	rstripChars_array: std.rstripChars("cool just cool", ["o", "l", 12.2323443]),
+
+	stripChars_singleCharL: std.stripChars("feefoofaa", "f"),
+	stripChars_singleCharR: std.stripChars("lolkekw", "w"),
+	stripChars_singleChar: std.stripChars("joper jej", "j"),
+
+	stripChars_multipleCharsL: std.stripChars("abcdefg", "cab"),
+	stripChars_multipleCharsR: std.stripChars("still breathing", "gthin"),
+	stripChars_multipleChars: std.stripChars("sus sus sus", "us"),
+
+	stripChars_arrayL: std.stripChars("chel medvedo svin", ["c", 3204990, {"svin": {}}, "vi"]),
+	stripChars_arrayR: std.stripChars("lach-vs-miri", ["r", "i", "craft", "is", "mine"]),
+	stripChars_array: std.stripChars("UwU Lel Stosh", ["h", "U", "s", {}, [], null, "w", [1, 2, 3]]),
+}
addedtests/golden/builtin_strings_string.jsonnet.goldendiffbeforeafterboth
--- /dev/null
+++ b/tests/golden/builtin_strings_string.jsonnet.golden
@@ -0,0 +1,17 @@
+{
+    "lstripChars_array": "rward",
+    "lstripChars_multipleChars": "mn",
+    "lstripChars_singleChar": "bcdef",
+    "rstripChars_array": "cool just c",
+    "rstripChars_multipleChars": "amogu",
+    "rstripChars_singleChar": "nice_bo",
+    "stripChars_array": " Lel Sto",
+    "stripChars_arrayL": "hel medvedo svin",
+    "stripChars_arrayR": "lach-vs-m",
+    "stripChars_multipleChars": " sus ",
+    "stripChars_multipleCharsL": "defg",
+    "stripChars_multipleCharsR": "still brea",
+    "stripChars_singleChar": "oper je",
+    "stripChars_singleCharL": "eefoofaa",
+    "stripChars_singleCharR": "lolkek"
+}
\ No newline at end of file
modifiedtests/tests/golden.rsdiffbeforeafterboth
--- 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,