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

--- a/crates/jsonnet-evaluator/build.rs
+++ b/crates/jsonnet-evaluator/build.rs
@@ -34,7 +34,7 @@
 								Member::Field(FieldMember {
 									name: FieldName::Fixed(name),
 									..
-								}) if **name == *"join"
+								}) if **name == *"join" || **name == *"manifestJsonEx" || **name == *"escapeStringJson"
 							)
 						})
 						.collect(),

--- a/crates/jsonnet-evaluator/src/evaluate.rs
+++ b/crates/jsonnet-evaluator/src/evaluate.rs
@@ -1,7 +1,7 @@
 use crate::{
-	context_creator, create_error, future_wrapper, lazy_val, push, with_state, Context,
-	ContextCreator, Error, FuncDesc, LazyBinding, LazyVal, ObjMember, ObjValue, Result, Val,
-	ValType,
+	context_creator, create_error, escape_string_json, future_wrapper, lazy_val, manifest_json_ex,
+	push, with_state, Context, ContextCreator, Error, FuncDesc, LazyBinding, LazyVal, ObjMember,
+	ObjValue, Result, Val, ValType,
 };
 use closure::closure;
 use jsonnet_parser::{
@@ -730,6 +730,24 @@
 							(joiner, items) => panic!("bad join call: {:?} {:?}", joiner, items),
 						}
 					}
+					// Faster
+					("std", "escapeStringJson") => {
+						assert_eq!(args.len(), 1);
+						match evaluate(context, &args[0].1)?.unwrap_if_lazy()? {
+							Val::Str(s) => Val::Str(escape_string_json(&s).into()),
+							_ => panic!("bad escapeStringJson call"),
+						}
+					}
+					// Faster
+					("std", "manifestJsonEx") => {
+						assert_eq!(args.len(), 2);
+						let value = evaluate(context.clone(), &args[0].1)?.unwrap_if_lazy()?;
+						let ident = evaluate(context, &args[1].1)?.unwrap_if_lazy()?;
+						match (value, ident) {
+							(o, Val::Str(s)) => Val::Str(manifest_json_ex(&o, &s)?.into()),
+							_ => panic!("bad escapeStringJson call"),
+						}
+					}
 					(ns, name) => panic!("Intristic not found: {}.{}", ns, name),
 				},
 				Val::Func(f) => {

194	}194	}
195}195}
196196
197pub fn manifest_json_ex(val: &Val, padding: &str) -> Result<String> {
198	let mut out = String::new();
199	manifest_json_ex_buf(val, &mut out, padding, &mut String::new())?;
200	Ok(out)
201}
202fn manifest_json_ex_buf(
203	val: &Val,
204	buf: &mut String,
205	padding: &str,
206	cur_padding: &mut String,
207) -> Result<()> {
208	use std::fmt::Write;
209	match val.unwrap_if_lazy()? {
210		Val::Bool(v) => {
211			if v {
212				buf.push_str("true");
197			} else {213			} else {
198				unreachable!()214				buf.push_str("false");
199			}215			}
200		})216		}
217		Val::Null => buf.push_str("null"),
218		Val::Str(s) => buf.push_str(&escape_string_json(&s)),
219		Val::Num(n) => write!(buf, "{}", n).unwrap(),
220		Val::Arr(items) => {
221			buf.push_str("[\n");
222			if !items.is_empty() {
223				let old_len = cur_padding.len();
224				cur_padding.push_str(padding);
225				for (i, item) in items.iter().enumerate() {
226					if i != 0 {
227						buf.push_str(",\n")
228					}
229					buf.push_str(cur_padding);
230					manifest_json_ex_buf(item, buf, padding, cur_padding)?;
231				}
232				cur_padding.truncate(old_len);
233			}
234			buf.push('\n');
235			buf.push_str(cur_padding);
236			buf.push(']');
237		}
238		Val::Obj(obj) => {
239			buf.push_str("{\n");
240			let fields = obj.visible_fields();
241			if !fields.is_empty() {
242				let old_len = cur_padding.len();
243				cur_padding.push_str(padding);
244				for (i, field) in fields.into_iter().enumerate() {
245					if i != 0 {
246						buf.push_str(",\n")
247					}
248					buf.push_str(cur_padding);
249					buf.push_str(&escape_string_json(&field));
250					buf.push_str(": ");
251					manifest_json_ex_buf(&obj.get(field)?.unwrap(), buf, padding, cur_padding)?;
252				}
253				cur_padding.truncate(old_len);
254			}
255			buf.push('\n');
256			buf.push_str(cur_padding);
257			buf.push('}');
258		}
259		Val::Func(_) | Val::Intristic(_, _) => panic!("tried to manifest function"),
260		Val::Lazy(_) => unreachable!(),
261	};
262	Ok(())
263}
264pub fn escape_string_json(s: &str) -> String {
265	use std::fmt::Write;
266	let mut out = String::new();
267	out.push('"');
268	for c in s.chars() {
269		match c {
270			'"' => out.push_str("\\\""),
271			'\\' => out.push_str("\\\\"),
272			'\u{0008}' => out.push_str("\\b"),
273			'\u{000c}' => out.push_str("\\f"),
274			'\n' => out.push_str("\\n"),
275			'\r' => out.push_str("\\r"),
276			'\t' => out.push_str("\\t"),
277			c if c < 32 as char || (c >= 127 as char && c <= 159 as char) => {
278				write!(out, "\\u{:04x}", c as u32).unwrap()
279			}
280			c => out.push(c),
281		}
201	}282	}
283	out.push('"');
284	out
285}
286
287#[test]
288fn json_test() {
289	assert_eq!(escape_string_json("\u{001f}"), "\"\\u001f\"")
202}290}
203291