git.delta.rocks / jrsonnet / refs/commits / 6e67554e1625

difftreelog

fix std.decodeUTF8 should be lossy by default

uuxvswqwYaroslav Bolyukin2026-02-08parent: #5f96572.patch.diff
in: master

6 files changed

modifiedcrates/jrsonnet-stdlib/src/encoding.rsdiffbeforeafterboth
1use base64::{engine::general_purpose::STANDARD, Engine};1use base64::{engine::general_purpose::STANDARD, Engine};
2use jrsonnet_evaluator::{2use jrsonnet_evaluator::{
3	bail,
3	function::builtin,4	function::builtin,
4	runtime_error,5	runtime_error,
5	typed::{Either, Either2},6	typed::{Either, Either2},
12}13}
1314
14#[builtin]15#[builtin]
15pub fn builtin_decode_utf8(arr: IBytes) -> Result<IStr> {16pub fn builtin_decode_utf8(arr: IBytes, #[default(true)] lossy: bool) -> Result<IStr> {
16	arr.cast_str().ok_or_else(|| runtime_error!("bad utf8"))17	match arr.clone().cast_str() {
18		Some(s) => Ok(s),
19		None if lossy => Ok(String::from_utf8_lossy(arr.as_slice()).into()),
20		None => {
21			bail!("bad utf8")
22		}
23	}
17}24}
1825
19#[builtin]26#[builtin]
addedtests/golden/issue187.jsonnetdiffbeforeafterboth
--- /dev/null
+++ b/tests/golden/issue187.jsonnet
@@ -0,0 +1 @@
+std.decodeUTF8(std.encodeUTF8('foo bar ') + [255] + std.encodeUTF8(' baz'))
addedtests/golden/issue187.jsonnet.goldendiffbeforeafterboth
--- /dev/null
+++ b/tests/golden/issue187.jsonnet.golden
@@ -0,0 +1 @@
+"foo bar � baz"
\ No newline at end of file
addedtests/golden/issue187.rev.jsonnetdiffbeforeafterboth
--- /dev/null
+++ b/tests/golden/issue187.rev.jsonnet
@@ -0,0 +1 @@
+std.decodeUTF8(std.encodeUTF8('foo bar ') + [255] + std.encodeUTF8(' baz'), lossy = false)
addedtests/golden/issue187.rev.jsonnet.goldendiffbeforeafterboth
--- /dev/null
+++ b/tests/golden/issue187.rev.jsonnet.golden
@@ -0,0 +1,2 @@
+runtime error: bad utf8
+    issue187.rev.jsonnet:1:1-92: function <builtin_decode_utf8> call
\ No newline at end of file
modifiedtests/suite/std_param_names.jsonnetdiffbeforeafterboth
--- a/tests/suite/std_param_names.jsonnet
+++ b/tests/suite/std_param_names.jsonnet
@@ -129,7 +129,7 @@
     parseJson: ['str'],
     parseYaml: ['str'],
     encodeUTF8: ['str'],
-    decodeUTF8: ['arr'],
+    decodeUTF8: ['arr', 'lossy'],
 
     sum: ['arr'],
     avg: ['arr', 'onEmpty'],