difftreelog
Merge pull request #64 from CertainLach/feat/manifest-yaml-doc-builtin
in: master
Make manifestYamlDoc builtin
6 files changed
crates/jrsonnet-cli/src/manifest.rsdiffbeforeafterboth--- a/crates/jrsonnet-cli/src/manifest.rs
+++ b/crates/jrsonnet-cli/src/manifest.rs
@@ -38,9 +38,9 @@
#[clap(long, short = 'y')]
yaml_stream: bool,
/// Number of spaces to pad output manifest with.
- /// `0` for hard tabs, `-1` for single line output
- #[clap(long, default_value = "3")]
- line_padding: usize,
+ /// `0` for hard tabs, `-1` for single line output [default: 3 for json, 2 for yaml]
+ #[clap(long)]
+ line_padding: Option<usize>,
}
impl ConfigureState for ManifestOpts {
fn configure(&self, state: &EvaluationState) -> Result<()> {
@@ -50,10 +50,10 @@
match self.format {
ManifestFormatName::String => state.set_manifest_format(ManifestFormat::String),
ManifestFormatName::Json => {
- state.set_manifest_format(ManifestFormat::Json(self.line_padding))
+ state.set_manifest_format(ManifestFormat::Json(self.line_padding.unwrap_or(3)))
}
ManifestFormatName::Yaml => {
- state.set_manifest_format(ManifestFormat::Yaml(self.line_padding))
+ state.set_manifest_format(ManifestFormat::Yaml(self.line_padding.unwrap_or(2)))
}
}
}
crates/jrsonnet-evaluator/src/builtin/manifest.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/manifest.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/manifest.rs
@@ -156,3 +156,127 @@
}
buf.push('"');
}
+
+pub struct ManifestYamlOptions<'s> {
+ /// Padding before fields, i.e
+ /// ```yaml
+ /// a:
+ /// b:
+ /// ## <- this
+ /// ```
+ pub padding: &'s str,
+ /// Padding before array elements in objects
+ /// ```yaml
+ /// a:
+ /// - 1
+ /// ## <- this
+ /// ```
+ pub arr_element_padding: &'s str,
+}
+
+pub fn manifest_yaml_ex(val: &Val, options: &ManifestYamlOptions<'_>) -> Result<String> {
+ let mut out = String::new();
+ manifest_yaml_ex_buf(val, &mut out, &mut String::new(), options)?;
+ Ok(out)
+}
+fn manifest_yaml_ex_buf(
+ val: &Val,
+ buf: &mut String,
+ cur_padding: &mut String,
+ options: &ManifestYamlOptions<'_>,
+) -> Result<()> {
+ use std::fmt::Write;
+ match val {
+ Val::Bool(v) => {
+ if *v {
+ buf.push_str("true")
+ } else {
+ buf.push_str("false")
+ }
+ }
+ Val::Null => buf.push_str("null"),
+ Val::Str(s) => {
+ if s.is_empty() {
+ buf.push_str("\"\"");
+ } else if let Some(s) = s.strip_suffix('\n') {
+ buf.push('|');
+ for line in s.split('\n') {
+ buf.push('\n');
+ buf.push_str(options.padding);
+ buf.push_str(line);
+ }
+ } else {
+ escape_string_json_buf(s, buf)
+ }
+ }
+ Val::Num(n) => write!(buf, "{}", *n).unwrap(),
+ Val::Arr(a) => {
+ if a.is_empty() {
+ buf.push_str("[]");
+ } else {
+ for (i, item) in a.iter().enumerate() {
+ if i != 0 {
+ buf.push('\n');
+ buf.push_str(cur_padding);
+ }
+ let item = item?;
+ buf.push('-');
+ match &item {
+ Val::Arr(a) if !a.is_empty() => {
+ buf.push('\n');
+ buf.push_str(cur_padding);
+ buf.push_str(options.padding);
+ }
+ _ => buf.push(' '),
+ }
+ let extra_padding = match &item {
+ Val::Arr(a) => !a.is_empty(),
+ Val::Obj(o) => !o.is_empty(),
+ _ => false,
+ };
+ let prev_len = cur_padding.len();
+ if extra_padding {
+ cur_padding.push_str(options.padding);
+ }
+ manifest_yaml_ex_buf(&item, buf, cur_padding, options)?;
+ cur_padding.truncate(prev_len);
+ }
+ }
+ }
+ Val::Obj(o) => {
+ if o.is_empty() {
+ buf.push_str("{}");
+ } else {
+ for (i, key) in o.fields().iter().enumerate() {
+ if i != 0 {
+ buf.push('\n');
+ buf.push_str(cur_padding);
+ }
+ escape_string_json_buf(key, buf);
+ buf.push(':');
+ let prev_len = cur_padding.len();
+ let item = o.get(key.clone())?.expect("field exists");
+ match &item {
+ Val::Arr(a) if !a.is_empty() => {
+ buf.push('\n');
+ buf.push_str(cur_padding);
+ buf.push_str(options.arr_element_padding);
+ cur_padding.push_str(options.arr_element_padding);
+ }
+ Val::Obj(o) if !o.is_empty() => {
+ buf.push('\n');
+ buf.push_str(cur_padding);
+ buf.push_str(options.padding);
+ cur_padding.push_str(options.padding);
+ }
+ _ => buf.push(' '),
+ }
+ manifest_yaml_ex_buf(&item, buf, cur_padding, options)?;
+ cur_padding.truncate(prev_len);
+ }
+ }
+ }
+ Val::Func(_) => throw!(RuntimeError("tried to manifest function".into())),
+ }
+ Ok(())
+}
crates/jrsonnet-evaluator/src/builtin/mod.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/mod.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/mod.rs
@@ -1,4 +1,5 @@
use crate::{
+ builtin::manifest::{manifest_yaml_ex, ManifestYamlOptions},
equals,
error::{Error::*, Result},
operator::evaluate_mod_op,
@@ -121,6 +122,7 @@
("join".into(), builtin_join),
("escapeStringJson".into(), builtin_escape_string_json),
("manifestJsonEx".into(), builtin_manifest_json_ex),
+ ("manifestYamlDocImpl".into(), builtin_manifest_yaml_doc),
("reverse".into(), builtin_reverse),
("id".into(), builtin_id),
("strReplace".into(), builtin_str_replace),
@@ -768,6 +770,22 @@
})
}
+fn builtin_manifest_yaml_doc(
+ context: Context,
+ _loc: Option<&ExprLocation>,
+ args: &ArgsDesc,
+) -> Result<Val> {
+ parse_args!(context, "manifestYamlDoc", args, 2, [
+ 0, value: ty!(any);
+ 1, indent_array_in_object: ty!(boolean) => Val::Bool;
+ ], {
+ Ok(Val::Str(manifest_yaml_ex(&value, &ManifestYamlOptions {
+ padding: " ",
+ arr_element_padding: if indent_array_in_object { " " } else { "" },
+ })?.into()))
+ })
+}
+
fn builtin_reverse(context: Context, _loc: Option<&ExprLocation>, args: &ArgsDesc) -> Result<Val> {
parse_args!(context, "reverse", args, 1, [
0, value: ty!(array) => Val::Arr;
@@ -794,18 +812,7 @@
1, from: ty!(string) => Val::Str;
2, to: ty!(string) => Val::Str;
], {
- let mut out = String::new();
- let mut last_idx = 0;
- while let Some(idx) = (&str[last_idx..]).find(&from as &str) {
- out.push_str(&str[last_idx..last_idx+idx]);
- out.push_str(&to);
- last_idx += idx + from.len();
- }
- if last_idx == 0 {
- return Ok(Val::Str(str))
- }
- out.push_str(&str[last_idx..]);
- Ok(Val::Str(out.into()))
+ Ok(Val::Str(str.replace(&from as &str, &to as &str).into()))
})
}
crates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -105,6 +105,17 @@
}))
}
+ pub fn is_empty(&self) -> bool {
+ if !self.0.this_entries.is_empty() {
+ return false;
+ }
+ self.0
+ .super_obj
+ .as_ref()
+ .map(|s| s.is_empty())
+ .unwrap_or(true)
+ }
+
/// Run callback for every field found in object
pub(crate) fn enum_fields(&self, handler: &mut impl FnMut(&IStr, &Visibility) -> bool) -> bool {
if let Some(s) = &self.0.super_obj {
crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth1use crate::{2 builtin::{3 call_builtin,4 manifest::{manifest_json_ex, ManifestJsonOptions, ManifestType},5 },6 error::{Error::*, LocError},7 evaluate,8 function::{parse_function_call, parse_function_call_map, place_args},9 native::NativeCallback,10 throw, with_state, Context, ObjValue, Result,11};12use jrsonnet_gc::{Gc, GcCell, Trace};13use jrsonnet_interner::IStr;14use jrsonnet_parser::{el, ArgsDesc, Expr, ExprLocation, LiteralType, LocExpr, ParamsDesc};15use jrsonnet_types::ValType;16use std::{collections::HashMap, fmt::Debug, rc::Rc};1718pub trait LazyValValue: Trace {19 fn get(self: Box<Self>) -> Result<Val>;20}2122#[derive(Trace)]23#[trivially_drop]24enum LazyValInternals {25 Computed(Val),26 Errored(LocError),27 Waiting(Box<dyn LazyValValue>),28 Pending,29}3031#[derive(Clone, Trace)]32#[trivially_drop]33pub struct LazyVal(Gc<GcCell<LazyValInternals>>);34impl LazyVal {35 pub fn new(f: Box<dyn LazyValValue>) -> Self {36 Self(Gc::new(GcCell::new(LazyValInternals::Waiting(f))))37 }38 pub fn new_resolved(val: Val) -> Self {39 Self(Gc::new(GcCell::new(LazyValInternals::Computed(val))))40 }41 pub fn evaluate(&self) -> Result<Val> {42 match &*self.0.borrow() {43 LazyValInternals::Computed(v) => return Ok(v.clone()),44 LazyValInternals::Errored(e) => return Err(e.clone()),45 LazyValInternals::Pending => return Err(RecursiveLazyValueEvaluation.into()),46 _ => (),47 };48 let value = if let LazyValInternals::Waiting(value) =49 std::mem::replace(&mut *self.0.borrow_mut(), LazyValInternals::Pending)50 {51 value52 } else {53 unreachable!()54 };55 let new_value = match value.get() {56 Ok(v) => v,57 Err(e) => {58 *self.0.borrow_mut() = LazyValInternals::Errored(e.clone());59 return Err(e);60 }61 };62 *self.0.borrow_mut() = LazyValInternals::Computed(new_value.clone());63 Ok(new_value)64 }65}6667impl Debug for LazyVal {68 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {69 write!(f, "Lazy")70 }71}72impl PartialEq for LazyVal {73 fn eq(&self, other: &Self) -> bool {74 Gc::ptr_eq(&self.0, &other.0)75 }76}7778#[derive(Debug, PartialEq, Trace)]79#[trivially_drop]80pub struct FuncDesc {81 pub name: IStr,82 pub ctx: Context,83 pub params: ParamsDesc,84 pub body: LocExpr,85}8687#[derive(Debug, Trace)]88#[trivially_drop]89pub enum FuncVal {90 /// Plain function implemented in jsonnet91 Normal(FuncDesc),92 /// Standard library function93 Intrinsic(IStr),94 /// Library functions implemented in native95 NativeExt(IStr, Gc<NativeCallback>),96}9798impl PartialEq for FuncVal {99 fn eq(&self, other: &Self) -> bool {100 match (self, other) {101 (Self::Normal(a), Self::Normal(b)) => a == b,102 (Self::Intrinsic(an), Self::Intrinsic(bn)) => an == bn,103 (Self::NativeExt(an, _), Self::NativeExt(bn, _)) => an == bn,104 (..) => false,105 }106 }107}108impl FuncVal {109 pub fn is_ident(&self) -> bool {110 matches!(&self, Self::Intrinsic(n) if n as &str == "id")111 }112 pub fn name(&self) -> IStr {113 match self {114 Self::Normal(normal) => normal.name.clone(),115 Self::Intrinsic(name) => format!("std.{}", name).into(),116 Self::NativeExt(n, _) => format!("native.{}", n).into(),117 }118 }119 pub fn evaluate(120 &self,121 call_ctx: Context,122 loc: Option<&ExprLocation>,123 args: &ArgsDesc,124 tailstrict: bool,125 ) -> Result<Val> {126 match self {127 Self::Normal(func) => {128 let ctx = parse_function_call(129 call_ctx,130 func.ctx.clone(),131 &func.params,132 args,133 tailstrict,134 )?;135 evaluate(ctx, &func.body)136 }137 Self::Intrinsic(name) => call_builtin(call_ctx, loc, name, args),138 Self::NativeExt(_name, handler) => {139 let args =140 parse_function_call(call_ctx, Context::new(), &handler.params, args, true)?;141 let mut out_args = Vec::with_capacity(handler.params.len());142 for p in handler.params.0.iter() {143 out_args.push(args.binding(p.0.clone())?.evaluate()?);144 }145 Ok(handler.call(loc.map(|l| l.0.clone()), &out_args)?)146 }147 }148 }149150 pub fn evaluate_map(151 &self,152 call_ctx: Context,153 args: &HashMap<IStr, Val>,154 tailstrict: bool,155 ) -> Result<Val> {156 match self {157 Self::Normal(func) => {158 let ctx = parse_function_call_map(159 call_ctx,160 Some(func.ctx.clone()),161 &func.params,162 args,163 tailstrict,164 )?;165 evaluate(ctx, &func.body)166 }167 Self::Intrinsic(_) => todo!(),168 Self::NativeExt(_, _) => todo!(),169 }170 }171172 pub fn evaluate_values(&self, call_ctx: Context, args: &[Val]) -> Result<Val> {173 match self {174 Self::Normal(func) => {175 let ctx = place_args(call_ctx, Some(func.ctx.clone()), &func.params, args)?;176 evaluate(ctx, &func.body)177 }178 Self::Intrinsic(_) => todo!(),179 Self::NativeExt(_, _) => todo!(),180 }181 }182}183184#[derive(Clone)]185pub enum ManifestFormat {186 YamlStream(Box<ManifestFormat>),187 Yaml(usize),188 Json(usize),189 ToString,190 String,191}192193#[derive(Debug, Clone, Trace)]194#[trivially_drop]195pub enum ArrValue {196 Lazy(Gc<Vec<LazyVal>>),197 Eager(Gc<Vec<Val>>),198 Extended(Box<(Self, Self)>),199}200impl ArrValue {201 pub fn new_eager() -> Self {202 Self::Eager(Gc::new(Vec::new()))203 }204205 pub fn len(&self) -> usize {206 match self {207 Self::Lazy(l) => l.len(),208 Self::Eager(e) => e.len(),209 Self::Extended(v) => v.0.len() + v.1.len(),210 }211 }212213 pub fn is_empty(&self) -> bool {214 self.len() == 0215 }216217 pub fn get(&self, index: usize) -> Result<Option<Val>> {218 match self {219 Self::Lazy(vec) => {220 if let Some(v) = vec.get(index) {221 Ok(Some(v.evaluate()?))222 } else {223 Ok(None)224 }225 }226 Self::Eager(vec) => Ok(vec.get(index).cloned()),227 Self::Extended(v) => {228 let a_len = v.0.len();229 if a_len > index {230 v.0.get(index)231 } else {232 v.1.get(index - a_len)233 }234 }235 }236 }237238 pub fn get_lazy(&self, index: usize) -> Option<LazyVal> {239 match self {240 Self::Lazy(vec) => vec.get(index).cloned(),241 Self::Eager(vec) => vec.get(index).cloned().map(LazyVal::new_resolved),242 Self::Extended(v) => {243 let a_len = v.0.len();244 if a_len > index {245 v.0.get_lazy(index)246 } else {247 v.1.get_lazy(index - a_len)248 }249 }250 }251 }252253 pub fn evaluated(&self) -> Result<Gc<Vec<Val>>> {254 Ok(match self {255 Self::Lazy(vec) => {256 let mut out = Vec::with_capacity(vec.len());257 for item in vec.iter() {258 out.push(item.evaluate()?);259 }260 Gc::new(out)261 }262 Self::Eager(vec) => vec.clone(),263 Self::Extended(_v) => {264 let mut out = Vec::with_capacity(self.len());265 for item in self.iter() {266 out.push(item?);267 }268 Gc::new(out)269 }270 })271 }272273 pub fn iter(&self) -> impl DoubleEndedIterator<Item = Result<Val>> + '_ {274 (0..self.len()).map(move |idx| match self {275 Self::Lazy(l) => l[idx].evaluate(),276 Self::Eager(e) => Ok(e[idx].clone()),277 Self::Extended(_) => self.get(idx).map(|e| e.unwrap()),278 })279 }280281 pub fn iter_lazy(&self) -> impl DoubleEndedIterator<Item = LazyVal> + '_ {282 (0..self.len()).map(move |idx| match self {283 Self::Lazy(l) => l[idx].clone(),284 Self::Eager(e) => LazyVal::new_resolved(e[idx].clone()),285 Self::Extended(_) => self.get_lazy(idx).unwrap(),286 })287 }288289 pub fn reversed(self) -> Self {290 match self {291 Self::Lazy(vec) => {292 let mut out = (&vec as &Vec<_>).clone();293 out.reverse();294 Self::Lazy(Gc::new(out))295 }296 Self::Eager(vec) => {297 let mut out = (&vec as &Vec<_>).clone();298 out.reverse();299 Self::Eager(Gc::new(out))300 }301 Self::Extended(b) => Self::Extended(Box::new((b.1.reversed(), b.0.reversed()))),302 }303 }304305 pub fn map(self, mapper: impl Fn(Val) -> Result<Val>) -> Result<Self> {306 let mut out = Vec::with_capacity(self.len());307308 for value in self.iter() {309 out.push(mapper(value?)?);310 }311312 Ok(Self::Eager(Gc::new(out)))313 }314315 pub fn filter(self, filter: impl Fn(&Val) -> Result<bool>) -> Result<Self> {316 let mut out = Vec::with_capacity(self.len());317318 for value in self.iter() {319 let value = value?;320 if filter(&value)? {321 out.push(value);322 }323 }324325 Ok(Self::Eager(Gc::new(out)))326 }327328 pub fn ptr_eq(a: &Self, b: &Self) -> bool {329 match (a, b) {330 (Self::Lazy(a), Self::Lazy(b)) => Gc::ptr_eq(a, b),331 (Self::Eager(a), Self::Eager(b)) => Gc::ptr_eq(a, b),332 _ => false,333 }334 }335}336337impl From<Vec<LazyVal>> for ArrValue {338 fn from(v: Vec<LazyVal>) -> Self {339 Self::Lazy(Gc::new(v))340 }341}342343impl From<Vec<Val>> for ArrValue {344 fn from(v: Vec<Val>) -> Self {345 Self::Eager(Gc::new(v))346 }347}348349pub enum IndexableVal {350 Str(IStr),351 Arr(ArrValue),352}353354#[derive(Debug, Clone, Trace)]355#[trivially_drop]356pub enum Val {357 Bool(bool),358 Null,359 Str(IStr),360 Num(f64),361 Arr(ArrValue),362 Obj(ObjValue),363 Func(Gc<FuncVal>),364}365366macro_rules! matches_unwrap {367 ($e: expr, $p: pat, $r: expr) => {368 match $e {369 $p => $r,370 _ => panic!("no match"),371 }372 };373}374impl Val {375 /// Creates `Val::Num` after checking for numeric overflow.376 /// As numbers are `f64`, we can just check for their finity.377 pub fn new_checked_num(num: f64) -> Result<Self> {378 if num.is_finite() {379 Ok(Self::Num(num))380 } else {381 throw!(RuntimeError("overflow".into()))382 }383 }384385 pub fn assert_type(&self, context: &'static str, val_type: ValType) -> Result<()> {386 let this_type = self.value_type();387 if this_type != val_type {388 throw!(TypeMismatch(context, vec![val_type], this_type))389 } else {390 Ok(())391 }392 }393 pub fn unwrap_num(self) -> Result<f64> {394 Ok(matches_unwrap!(self, Self::Num(v), v))395 }396 pub fn unwrap_func(self) -> Result<Gc<FuncVal>> {397 Ok(matches_unwrap!(self, Self::Func(v), v))398 }399 pub fn try_cast_bool(self, context: &'static str) -> Result<bool> {400 self.assert_type(context, ValType::Bool)?;401 Ok(matches_unwrap!(self, Self::Bool(v), v))402 }403 pub fn try_cast_str(self, context: &'static str) -> Result<IStr> {404 self.assert_type(context, ValType::Str)?;405 Ok(matches_unwrap!(self, Self::Str(v), v))406 }407 pub fn try_cast_num(self, context: &'static str) -> Result<f64> {408 self.assert_type(context, ValType::Num)?;409 self.unwrap_num()410 }411 pub fn try_cast_nullable_num(self, context: &'static str) -> Result<Option<f64>> {412 Ok(match self {413 Val::Null => None,414 Val::Num(num) => Some(num),415 _ => throw!(TypeMismatch(416 context,417 vec![ValType::Null, ValType::Num],418 self.value_type()419 )),420 })421 }422 pub const fn value_type(&self) -> ValType {423 match self {424 Self::Str(..) => ValType::Str,425 Self::Num(..) => ValType::Num,426 Self::Arr(..) => ValType::Arr,427 Self::Obj(..) => ValType::Obj,428 Self::Bool(_) => ValType::Bool,429 Self::Null => ValType::Null,430 Self::Func(..) => ValType::Func,431 }432 }433434 pub fn to_string(&self) -> Result<IStr> {435 Ok(match self {436 Self::Bool(true) => "true".into(),437 Self::Bool(false) => "false".into(),438 Self::Null => "null".into(),439 Self::Str(s) => s.clone(),440 v => manifest_json_ex(441 v,442 &ManifestJsonOptions {443 padding: "",444 mtype: ManifestType::ToString,445 },446 )?447 .into(),448 })449 }450451 /// Expects value to be object, outputs (key, manifested value) pairs452 pub fn manifest_multi(&self, ty: &ManifestFormat) -> Result<Vec<(IStr, IStr)>> {453 let obj = match self {454 Self::Obj(obj) => obj,455 _ => throw!(MultiManifestOutputIsNotAObject),456 };457 let keys = obj.fields();458 let mut out = Vec::with_capacity(keys.len());459 for key in keys {460 let value = obj461 .get(key.clone())?462 .expect("item in object")463 .manifest(ty)?;464 out.push((key, value));465 }466 Ok(out)467 }468469 /// Expects value to be array, outputs manifested values470 pub fn manifest_stream(&self, ty: &ManifestFormat) -> Result<Vec<IStr>> {471 let arr = match self {472 Self::Arr(a) => a,473 _ => throw!(StreamManifestOutputIsNotAArray),474 };475 let mut out = Vec::with_capacity(arr.len());476 for i in arr.iter() {477 out.push(i?.manifest(ty)?);478 }479 Ok(out)480 }481482 pub fn manifest(&self, ty: &ManifestFormat) -> Result<IStr> {483 Ok(match ty {484 ManifestFormat::YamlStream(format) => {485 let arr = match self {486 Self::Arr(a) => a,487 _ => throw!(StreamManifestOutputIsNotAArray),488 };489 let mut out = String::new();490491 match format as &ManifestFormat {492 ManifestFormat::YamlStream(_) => throw!(StreamManifestOutputCannotBeRecursed),493 ManifestFormat::String => throw!(StreamManifestCannotNestString),494 _ => {}495 };496497 if !arr.is_empty() {498 for v in arr.iter() {499 out.push_str("---\n");500 out.push_str(&v?.manifest(format)?);501 out.push('\n');502 }503 out.push_str("...");504 }505506 out.into()507 }508 ManifestFormat::Yaml(padding) => self.to_yaml(*padding)?,509 ManifestFormat::Json(padding) => self.to_json(*padding)?,510 ManifestFormat::ToString => self.to_string()?,511 ManifestFormat::String => match self {512 Self::Str(s) => s.clone(),513 _ => throw!(StringManifestOutputIsNotAString),514 },515 })516 }517518 /// For manifestification519 pub fn to_json(&self, padding: usize) -> Result<IStr> {520 manifest_json_ex(521 self,522 &ManifestJsonOptions {523 padding: &" ".repeat(padding),524 mtype: if padding == 0 {525 ManifestType::Minify526 } else {527 ManifestType::Manifest528 },529 },530 )531 .map(|s| s.into())532 }533534 /// Calls `std.manifestJson`535 pub fn to_std_json(&self, padding: usize) -> Result<Rc<str>> {536 manifest_json_ex(537 self,538 &ManifestJsonOptions {539 padding: &" ".repeat(padding),540 mtype: ManifestType::Std,541 },542 )543 .map(|s| s.into())544 }545546 pub fn to_yaml(&self, padding: usize) -> Result<IStr> {547 with_state(|s| {548 let ctx = s549 .create_default_context()550 .with_var("__tmp__to_json__".into(), self.clone());551 evaluate(552 ctx,553 &el!(Expr::Apply(554 el!(Expr::Index(555 el!(Expr::Var("std".into())),556 el!(Expr::Str("manifestYamlDoc".into()))557 )),558 ArgsDesc::new(559 vec![560 el!(Expr::Var("__tmp__to_json__".into())),561 el!(Expr::Literal(if padding != 0 {562 LiteralType::True563 } else {564 LiteralType::False565 })),566 ],567 vec![]568 ),569 false570 )),571 )?572 .try_cast_str("to json")573 })574 }575 pub fn into_indexable(self) -> Result<IndexableVal> {576 Ok(match self {577 Val::Str(s) => IndexableVal::Str(s),578 Val::Arr(arr) => IndexableVal::Arr(arr),579 _ => throw!(ValueIsNotIndexable(self.value_type())),580 })581 }582}583584const fn is_function_like(val: &Val) -> bool {585 matches!(val, Val::Func(_))586}587588/// Native implementation of `std.primitiveEquals`589pub fn primitive_equals(val_a: &Val, val_b: &Val) -> Result<bool> {590 Ok(match (val_a, val_b) {591 (Val::Bool(a), Val::Bool(b)) => a == b,592 (Val::Null, Val::Null) => true,593 (Val::Str(a), Val::Str(b)) => a == b,594 (Val::Num(a), Val::Num(b)) => (a - b).abs() <= f64::EPSILON,595 (Val::Arr(_), Val::Arr(_)) => throw!(RuntimeError(596 "primitiveEquals operates on primitive types, got array".into(),597 )),598 (Val::Obj(_), Val::Obj(_)) => throw!(RuntimeError(599 "primitiveEquals operates on primitive types, got object".into(),600 )),601 (a, b) if is_function_like(a) && is_function_like(b) => {602 throw!(RuntimeError("cannot test equality of functions".into()))603 }604 (_, _) => false,605 })606}607608/// Native implementation of `std.equals`609pub fn equals(val_a: &Val, val_b: &Val) -> Result<bool> {610 if val_a.value_type() != val_b.value_type() {611 return Ok(false);612 }613 match (val_a, val_b) {614 (Val::Arr(a), Val::Arr(b)) => {615 if ArrValue::ptr_eq(a, b) {616 return Ok(true);617 }618 if a.len() != b.len() {619 return Ok(false);620 }621 for (a, b) in a.iter().zip(b.iter()) {622 if !equals(&a?, &b?)? {623 return Ok(false);624 }625 }626 Ok(true)627 }628 (Val::Obj(a), Val::Obj(b)) => {629 if ObjValue::ptr_eq(a, b) {630 return Ok(true);631 }632 let fields = a.fields();633 if fields != b.fields() {634 return Ok(false);635 }636 for field in fields {637 if !equals(&a.get(field.clone())?.unwrap(), &b.get(field)?.unwrap())? {638 return Ok(false);639 }640 }641 Ok(true)642 }643 (a, b) => Ok(primitive_equals(a, b)?),644 }645}crates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -374,88 +374,9 @@
manifestJsonEx:: $intrinsic(manifestJsonEx),
- manifestYamlDoc(value, indent_array_in_object=false)::
- local aux(v, path, cindent) =
- if v == true then
- 'true'
- else if v == false then
- 'false'
- else if v == null then
- 'null'
- else if std.isNumber(v) then
- '' + v
- else if std.isString(v) then
- local len = std.length(v);
- if len == 0 then
- '""'
- else if v[len - 1] == '\n' then
- local split = std.split(v, '\n');
- std.join('\n' + cindent + ' ', ['|'] + split[0:std.length(split) - 1])
- else
- std.escapeStringJson(v)
- else if std.isFunction(v) then
- error 'Tried to manifest function at ' + path
- else if std.isArray(v) then
- if std.length(v) == 0 then
- '[]'
- else
- local params(value) =
- if std.isArray(value) && std.length(value) > 0 then {
- // While we could avoid the new line, it yields YAML that is
- // hard to read, e.g.:
- // - - - 1
- // - 2
- // - - 3
- // - 4
- new_indent: cindent + ' ',
- space: '\n' + self.new_indent,
- } else if std.isObject(value) && std.length(value) > 0 then {
- new_indent: cindent + ' ',
- // In this case we can start on the same line as the - because the indentation
- // matches up then. The converse is not true, because fields are not always
- // 1 character long.
- space: ' ',
- } else {
- // In this case, new_indent is only used in the case of multi-line strings.
- new_indent: cindent,
- space: ' ',
- };
- local range = std.range(0, std.length(v) - 1);
- local parts = [
- '-' + param.space + aux(v[i], path + [i], param.new_indent)
- for i in range
- for param in [params(v[i])]
- ];
- std.join('\n' + cindent, parts)
- else if std.isObject(v) then
- if std.length(v) == 0 then
- '{}'
- else
- local params(value) =
- if std.isArray(value) && std.length(value) > 0 then {
- // Not indenting allows e.g.
- // ports:
- // - 80
- // instead of
- // ports:
- // - 80
- new_indent: if indent_array_in_object then cindent + ' ' else cindent,
- space: '\n' + self.new_indent,
- } else if std.isObject(value) && std.length(value) > 0 then {
- new_indent: cindent + ' ',
- space: '\n' + self.new_indent,
- } else {
- // In this case, new_indent is only used in the case of multi-line strings.
- new_indent: cindent,
- space: ' ',
- };
- local lines = [
- std.escapeStringJson(k) + ':' + param.space + aux(v[k], path + [k], param.new_indent)
- for k in std.objectFields(v)
- for param in [params(v[k])]
- ];
- std.join('\n' + cindent, lines);
- aux(value, [], ''),
+ manifestYamlDocImpl:: $intrinsic(manifestYamlDocImpl),
+
+ manifestYamlDoc(value, indent_array_in_object=false):: std.manifestYamlDocImpl(value, indent_array_in_object),
manifestYamlStream(value, indent_array_in_object=false, c_document_end=true)::
if !std.isArray(value) then