From 0ef9787dd3a6f9ddd97a1c3a793e3ddbb45d6757 Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Sun, 19 May 2024 17:49:25 +0000
Subject: [PATCH] fix: ToStringFormat should not quote top-level string


---
--- a/crates/jrsonnet-evaluator/src/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/manifest.rs
@@ -84,8 +84,9 @@
 			debug_truncate_strings: None,
 		}
 	}
-	// Same format as std.toString
-	pub fn std_to_string() -> Self {
+	/// Same format as std.toString, except does not keeps top-level string as-is
+	/// To avoid confusion, the format is private in jrsonnet, use [`ToStringFormat`] instead
+	const fn std_to_string_helper() -> Self {
 		Self {
 			padding: Cow::Borrowed(""),
 			mtype: JsonFormatting::ToString,
@@ -344,10 +345,17 @@
 	}
 }
 
+/// Same as [`JsonFormat`] with pre-set options, but top-level string is serialized as-is,
+/// without quoting.
 pub struct ToStringFormat;
 impl ManifestFormat for ToStringFormat {
 	fn manifest_buf(&self, val: Val, out: &mut String) -> Result<()> {
-		JsonFormat::std_to_string().manifest_buf(val, out)
+		const JSON_TO_STRING: JsonFormat = JsonFormat::std_to_string_helper();
+		if let Some(str) = val.as_str() {
+			out.push_str(&str);
+			return Ok(());
+		}
+		JSON_TO_STRING.manifest_buf(val, out)
 	}
 	fn file_trailing_newline(&self) -> bool {
 		false
--- a/crates/jrsonnet-macros/src/lib.rs
+++ b/crates/jrsonnet-macros/src/lib.rs
@@ -132,11 +132,6 @@
 	Optional,
 	Default(Expr),
 }
-impl Optionality {
-	fn is_optional(&self) -> bool {
-		!matches!(self, Self::Required)
-	}
-}
 
 enum ArgInfo {
 	Normal {

-- 
gitstuff