git.delta.rocks / jrsonnet / refs/commits / 78734bcaf74c

difftreelog

fix manifest formats

Yaroslav Bolyukin2024-05-17parent: #4f2e8db.patch.diff
in: master

4 files changed

modifiedcrates/jrsonnet-evaluator/src/manifest.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/manifest.rs
@@ -241,7 +241,6 @@
 					Minify => {}
 				};
 
-				buf.push_str(cur_padding);
 				State::push_description(
 					|| format!("elem <{i}> manifestification"),
 					|| manifest_json_ex_buf(&item, buf, cur_padding, options),
@@ -298,8 +297,8 @@
 						buf.push_str(options.newline);
 						buf.push_str(cur_padding);
 					}
-					ToString => buf.push(' '),
-					Minify => {}
+					ToString if i != 0 => buf.push(' '),
+					Minify | ToString => {}
 				}
 
 				escape_string_json_buf(&key, buf);
modifiedcrates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth
164		("objectRemoveKey", builtin_object_remove_key::INST),164		("objectRemoveKey", builtin_object_remove_key::INST),
165		// Manifest165		// Manifest
166		("escapeStringJson", builtin_escape_string_json::INST),166		("escapeStringJson", builtin_escape_string_json::INST),
167		("escapeStringPython", builtin_escape_string_json::INST),167		("escapeStringPython", builtin_escape_string_python::INST),
168		("escapeStringXML", builtin_escape_string_xml::INST),168		("escapeStringXML", builtin_escape_string_xml::INST),
169		("manifestJsonEx", builtin_manifest_json_ex::INST),169		("manifestJsonEx", builtin_manifest_json_ex::INST),
170		("manifestJson", builtin_manifest_json::INST),170		("manifestJson", builtin_manifest_json::INST),
modifiedcrates/jrsonnet-stdlib/src/manifest/mod.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/manifest/mod.rs
+++ b/crates/jrsonnet-stdlib/src/manifest/mod.rs
@@ -19,6 +19,11 @@
 }
 
 #[builtin]
+pub fn builtin_escape_string_python(str: IStr) -> Result<String> {
+	Ok(escape_string_json(&str))
+}
+
+#[builtin]
 pub fn builtin_manifest_json_ex(
 	value: Val,
 	indent: String,
@@ -164,13 +169,13 @@
 }
 #[builtin]
 pub fn builtin_manifest_python_vars(
-	v: Val,
+	conf: Val,
 
 	#[default(false)]
 	#[cfg(feature = "exp-preserve-order")]
 	preserve_order: bool,
 ) -> Result<String> {
-	v.manifest(PythonVarsFormat::std(
+	conf.manifest(PythonVarsFormat::std(
 		#[cfg(feature = "exp-preserve-order")]
 		preserve_order,
 	))
modifiedcrates/jrsonnet-stdlib/src/strings.rsdiffbeforeafterboth
--- a/crates/jrsonnet-stdlib/src/strings.rs
+++ b/crates/jrsonnet-stdlib/src/strings.rs
@@ -37,8 +37,8 @@
 }
 
 #[builtin]
-pub fn builtin_escape_string_dollars(str: String) -> String {
-	str.replace('$', "$$")
+pub fn builtin_escape_string_dollars(str_: String) -> String {
+	str_.replace('$', "$$")
 }
 
 #[builtin]