difftreelog
feat multi and stream manifests
in: master
5 files changed
bindings/jsonnet/src/lib.rsdiffbeforeafterboth--- a/bindings/jsonnet/src/lib.rs
+++ b/bindings/jsonnet/src/lib.rs
@@ -161,19 +161,152 @@
})
}
+fn multi_to_raw(multi: Vec<(Rc<str>, Rc<str>)>) -> *const c_char {
+ let mut out = Vec::new();
+ for (i, (k, v)) in multi.iter().enumerate() {
+ if i != 0 {
+ out.push(0);
+ }
+ out.extend_from_slice(k.as_bytes());
+ out.push(0);
+ out.extend_from_slice(v.as_bytes());
+ }
+ out.push(0);
+ out.push(0);
+ let v = out.as_ptr();
+ std::mem::forget(out);
+ v as *const c_char
+}
+
+/// # Safety
#[no_mangle]
-pub extern "C" fn jsonnet_evaluate_file_multi() {
- todo!()
+pub unsafe extern "C" fn jsonnet_evaluate_file_multi(
+ vm: &EvaluationState,
+ filename: *const c_char,
+ error: &mut c_int,
+) -> *const c_char {
+ vm.run_in_state(|| {
+ let filename = CStr::from_ptr(filename);
+ match vm
+ .evaluate_file_raw_nocwd(&PathBuf::from(filename.to_str().unwrap()))
+ .and_then(|v| vm.with_tla(v))
+ .and_then(|v| vm.manifest_multi(v))
+ {
+ Ok(v) => {
+ *error = 0;
+ multi_to_raw(v)
+ }
+ Err(e) => {
+ *error = 1;
+ let out = vm.stringify_err(&e);
+ CString::new(&out as &str).unwrap().into_raw()
+ }
+ }
+ })
}
+
+/// # Safety
#[no_mangle]
-pub extern "C" fn jsonnet_evaluate_snippet_multi() {
- todo!()
+pub unsafe extern "C" fn jsonnet_evaluate_snippet_multi(
+ vm: &EvaluationState,
+ filename: *const c_char,
+ snippet: *const c_char,
+ error: &mut c_int,
+) -> *const c_char {
+ vm.run_in_state(|| {
+ let filename = CStr::from_ptr(filename);
+ let snippet = CStr::from_ptr(snippet);
+ match vm
+ .evaluate_snippet_raw(
+ Rc::new(PathBuf::from(filename.to_str().unwrap())),
+ snippet.to_str().unwrap().into(),
+ )
+ .and_then(|v| vm.with_tla(v))
+ .and_then(|v| vm.manifest_multi(v))
+ {
+ Ok(v) => {
+ *error = 0;
+ multi_to_raw(v)
+ }
+ Err(e) => {
+ *error = 1;
+ let out = vm.stringify_err(&e);
+ CString::new(&out as &str).unwrap().into_raw()
+ }
+ }
+ })
}
+
+fn stream_to_raw(multi: Vec<Rc<str>>) -> *const c_char {
+ let mut out = Vec::new();
+ for (i, v) in multi.iter().enumerate() {
+ if i != 0 {
+ out.push(0);
+ }
+ out.extend_from_slice(v.as_bytes());
+ }
+ out.push(0);
+ out.push(0);
+ let v = out.as_ptr();
+ std::mem::forget(out);
+ v as *const c_char
+}
+
+/// # Safety
#[no_mangle]
-pub extern "C" fn jsonnet_evaluate_file_stream() {
- todo!()
+pub unsafe extern "C" fn jsonnet_evaluate_file_stream(
+ vm: &EvaluationState,
+ filename: *const c_char,
+ error: &mut c_int,
+) -> *const c_char {
+ vm.run_in_state(|| {
+ let filename = CStr::from_ptr(filename);
+ match vm
+ .evaluate_file_raw_nocwd(&PathBuf::from(filename.to_str().unwrap()))
+ .and_then(|v| vm.with_tla(v))
+ .and_then(|v| vm.manifest_stream(v))
+ {
+ Ok(v) => {
+ *error = 0;
+ stream_to_raw(v)
+ }
+ Err(e) => {
+ *error = 1;
+ let out = vm.stringify_err(&e);
+ CString::new(&out as &str).unwrap().into_raw()
+ }
+ }
+ })
}
+
+/// # Safety
#[no_mangle]
-pub extern "C" fn jsonnet_evaluate_snippet_stream() {
- todo!()
+pub unsafe extern "C" fn jsonnet_evaluate_snippet_stream(
+ vm: &EvaluationState,
+ filename: *const c_char,
+ snippet: *const c_char,
+ error: &mut c_int,
+) -> *const c_char {
+ vm.run_in_state(|| {
+ let filename = CStr::from_ptr(filename);
+ let snippet = CStr::from_ptr(snippet);
+ match vm
+ .evaluate_snippet_raw(
+ Rc::new(PathBuf::from(filename.to_str().unwrap())),
+ snippet.to_str().unwrap().into(),
+ )
+ .and_then(|v| vm.with_tla(v))
+ .and_then(|v| vm.manifest_stream(v))
+ {
+ Ok(v) => {
+ *error = 0;
+ stream_to_raw(v)
+ }
+ Err(e) => {
+ *error = 1;
+ let out = vm.stringify_err(&e);
+ CString::new(&out as &str).unwrap().into_raw()
+ }
+ }
+ })
}
crates/jrsonnet-evaluator/src/builtin/format.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/builtin/format.rs
+++ b/crates/jrsonnet-evaluator/src/builtin/format.rs
@@ -470,7 +470,7 @@
let mut tmp_out = String::new();
match code.convtype {
- ConvTypeV::String => tmp_out.push_str(&value.clone().into_string()?),
+ ConvTypeV::String => tmp_out.push_str(&value.clone().to_string()?),
ConvTypeV::Decimal => {
let value = value.clone().try_cast_num("%d/%u/%i requires number")?;
render_decimal(
crates/jrsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/evaluate.rs
+++ b/crates/jrsonnet-evaluator/src/evaluate.rs
@@ -95,8 +95,8 @@
(Val::Num(n), Val::Str(o)) => Val::Str(format!("{}{}", n, o).into()),
(Val::Str(o), Val::Num(n)) => Val::Str(format!("{}{}", o, n).into()),
- (Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().into_string()?).into()),
- (o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().into_string()?, s).into()),
+ (Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().to_string()?).into()),
+ (o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().to_string()?, s).into()),
(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),
(Val::Arr(a), Val::Arr(b)) => Val::Arr(Rc::new([&a[..], &b[..]].concat())),
@@ -975,9 +975,9 @@
if assertion_result {
evaluate(context, returned)?
} else if let Some(msg) = msg {
- throw!(AssertionFailed(evaluate(context, msg)?));
+ throw!(AssertionFailed(evaluate(context, msg)?.to_string()?));
} else {
- throw!(AssertionFailed(Val::Null));
+ throw!(AssertionFailed(Val::Null.to_string()?));
}
}
ErrorStmt(e) => push(
crates/jrsonnet-evaluator/src/lib.rsdiffbeforeafterboth1#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))]2#![allow(macro_expanded_macro_exports_accessed_by_absolute_paths)]34mod builtin;5mod ctx;6mod dynamic;7pub mod error;8mod evaluate;9mod function;10mod import;11mod integrations;12mod map;13pub mod native;14mod obj;15pub mod trace;16mod val;1718pub use ctx::*;19pub use dynamic::*;20use error::{Error::*, LocError, Result, StackTraceElement};21pub use evaluate::*;22pub use function::parse_function_call;23pub use import::*;24use jrsonnet_parser::*;25use native::NativeCallback;26pub use obj::*;27use std::{28 cell::{Ref, RefCell, RefMut},29 collections::HashMap,30 fmt::Debug,31 path::PathBuf,32 rc::Rc,33};34use trace::{offset_to_location, CodeLocation, CompactFormat, TraceFormat};35pub use val::*;3637type BindableFn = dyn Fn(Option<ObjValue>, Option<ObjValue>) -> Result<LazyVal>;38#[derive(Clone)]39pub enum LazyBinding {40 Bindable(Rc<BindableFn>),41 Bound(LazyVal),42}4344impl Debug for LazyBinding {45 fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {46 write!(f, "LazyBinding")47 }48}49impl LazyBinding {50 pub fn evaluate(&self, this: Option<ObjValue>, super_obj: Option<ObjValue>) -> Result<LazyVal> {51 match self {52 LazyBinding::Bindable(v) => v(this, super_obj),53 LazyBinding::Bound(v) => Ok(v.clone()),54 }55 }56}5758pub struct EvaluationSettings {59 /// Limits recursion by limiting stack frames60 pub max_stack: usize,61 /// Limit amount of stack trace items preserved62 pub max_trace: usize,63 /// Used for std.extVar64 pub ext_vars: HashMap<Rc<str>, Val>,65 /// Used for ext.native66 pub ext_natives: HashMap<Rc<str>, Rc<NativeCallback>>,67 /// TLA vars68 pub tla_vars: HashMap<Rc<str>, Val>,69 /// Global variables are inserted in default context70 pub globals: HashMap<Rc<str>, Val>,71 /// Used to resolve file locations/contents72 pub import_resolver: Box<dyn ImportResolver>,73 /// Used in manifestification functions74 pub manifest_format: ManifestFormat,75 /// Used for bindings76 pub trace_format: Box<dyn TraceFormat>,77}78impl Default for EvaluationSettings {79 fn default() -> Self {80 EvaluationSettings {81 max_stack: 200,82 max_trace: 20,83 globals: Default::default(),84 ext_vars: Default::default(),85 ext_natives: Default::default(),86 tla_vars: Default::default(),87 import_resolver: Box::new(DummyImportResolver),88 manifest_format: ManifestFormat::Json(4),89 trace_format: Box::new(CompactFormat {90 padding: 4,91 resolver: trace::PathResolver::Absolute,92 }),93 }94 }95}9697#[derive(Default)]98struct EvaluationData {99 /// Used for stack overflow detection, stacktrace is now populated on unwind100 stack_depth: usize,101 /// Contains file source codes and evaluated results for imports and pretty102 /// printing stacktraces103 files: HashMap<Rc<PathBuf>, FileData>,104 str_files: HashMap<Rc<PathBuf>, Rc<str>>,105}106107pub struct FileData {108 source_code: Rc<str>,109 parsed: LocExpr,110 evaluated: Option<Val>,111}112#[derive(Default)]113pub struct EvaluationStateInternals {114 /// Internal state115 data: RefCell<EvaluationData>,116 /// Settings, safe to change at runtime117 settings: RefCell<EvaluationSettings>,118}119120thread_local! {121 /// Contains state for currently executing file122 /// Global state is fine there123 pub(crate) static EVAL_STATE: RefCell<Option<EvaluationState>> = RefCell::new(None)124}125pub(crate) fn with_state<T>(f: impl FnOnce(&EvaluationState) -> T) -> T {126 EVAL_STATE.with(|s| f(s.borrow().as_ref().unwrap()))127}128pub(crate) fn push<T>(129 e: &Option<ExprLocation>,130 frame_desc: impl FnOnce() -> String,131 f: impl FnOnce() -> Result<T>,132) -> Result<T> {133 if let Some(v) = e {134 with_state(|s| s.push(&v, frame_desc, f))135 } else {136 f()137 }138}139140/// Maintains stack trace and import resolution141#[derive(Default, Clone)]142pub struct EvaluationState(Rc<EvaluationStateInternals>);143144impl EvaluationState {145 /// Parses and adds file to loaded146 pub fn add_file(&self, path: Rc<PathBuf>, source_code: Rc<str>) -> Result<()> {147 self.add_parsed_file(148 path.clone(),149 source_code.clone(),150 parse(151 &source_code,152 &ParserSettings {153 file_name: path.clone(),154 loc_data: true,155 },156 )157 .map_err(|error| ImportSyntaxError {158 error,159 path,160 source_code,161 })?,162 )?;163164 Ok(())165 }166167 /// Adds file by source code and parsed expr168 pub fn add_parsed_file(169 &self,170 name: Rc<PathBuf>,171 source_code: Rc<str>,172 parsed: LocExpr,173 ) -> Result<()> {174 self.data_mut().files.insert(175 name,176 FileData {177 source_code,178 parsed,179 evaluated: None,180 },181 );182183 Ok(())184 }185 pub fn get_source(&self, name: &PathBuf) -> Option<Rc<str>> {186 let ro_map = &self.data().files;187 ro_map.get(name).map(|value| value.source_code.clone())188 }189 pub fn map_source_locations(&self, file: &PathBuf, locs: &[usize]) -> Vec<CodeLocation> {190 offset_to_location(&self.get_source(file).unwrap(), locs)191 }192193 pub(crate) fn import_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Val> {194 let file_path = self.resolve_file(from, path)?;195 {196 let files = &self.data().files;197 if files.contains_key(&file_path) {198 return self.evaluate_loaded_file_raw(&file_path);199 }200 }201 let contents = self.load_file_contents(&file_path)?;202 self.add_file(file_path.clone(), contents)?;203 self.evaluate_loaded_file_raw(&file_path)204 }205 pub(crate) fn import_file_str(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<str>> {206 let path = self.resolve_file(from, path)?;207 if !self.data().str_files.contains_key(&path) {208 let file_str = self.load_file_contents(&path)?;209 self.data_mut().str_files.insert(path.clone(), file_str);210 }211 Ok(self.data().str_files.get(&path).cloned().unwrap())212 }213214 fn evaluate_loaded_file_raw(&self, name: &PathBuf) -> Result<Val> {215 let expr: LocExpr = {216 let ro_map = &self.data().files;217 let value = ro_map218 .get(name)219 .unwrap_or_else(|| panic!("file not added: {:?}", name));220 if let Some(ref evaluated) = value.evaluated {221 return Ok(evaluated.clone());222 }223 value.parsed.clone()224 };225 let value = evaluate(self.create_default_context()?, &expr)?;226 {227 self.data_mut()228 .files229 .get_mut(name)230 .unwrap()231 .evaluated232 .replace(value.clone());233 }234 Ok(value)235 }236237 /// Adds standard library global variable (std) to this evaluator238 pub fn with_stdlib(&self) -> &Self {239 use jrsonnet_stdlib::STDLIB_STR;240 let std_path = Rc::new(PathBuf::from("std.jsonnet"));241 self.run_in_state(|| {242 self.add_parsed_file(243 std_path.clone(),244 STDLIB_STR.to_owned().into(),245 builtin::get_parsed_stdlib(),246 )247 .unwrap();248 let val = self.evaluate_loaded_file_raw(&std_path).unwrap();249 self.settings_mut().globals.insert("std".into(), val);250 });251 self252 }253254 /// Creates context with all passed global variables255 pub fn create_default_context(&self) -> Result<Context> {256 let globals = &self.settings().globals;257 let mut new_bindings: HashMap<Rc<str>, LazyBinding> = HashMap::new();258 for (name, value) in globals.iter() {259 new_bindings.insert(260 name.clone(),261 LazyBinding::Bound(resolved_lazy_val!(value.clone())),262 );263 }264 Context::new().extend_unbound(new_bindings, None, None, None)265 }266267 /// Executes code, creating new stack frame268 pub fn push<T>(269 &self,270 e: &ExprLocation,271 frame_desc: impl FnOnce() -> String,272 f: impl FnOnce() -> Result<T>,273 ) -> Result<T> {274 {275 let mut data = self.data_mut();276 let stack_depth = &mut data.stack_depth;277 if *stack_depth > self.max_stack() {278 // Error creation uses data, so i drop guard here279 drop(data);280 throw!(StackOverflow);281 } else {282 *stack_depth += 1;283 }284 }285 let result = f();286 self.data_mut().stack_depth -= 1;287 if let Err(mut err) = result {288 (err.1).0.push(StackTraceElement {289 location: e.clone(),290 desc: frame_desc(),291 });292 return Err(err);293 }294 result295 }296297 /// Runs passed function in state (required, if function needs to modify stack trace)298 pub fn run_in_state<T>(&self, f: impl FnOnce() -> T) -> T {299 EVAL_STATE.with(|v| {300 let has_state = v.borrow().is_some();301 if !has_state {302 v.borrow_mut().replace(self.clone());303 }304 let result = f();305 if !has_state {306 v.borrow_mut().take();307 }308 result309 })310 }311312 pub fn stringify_err(&self, e: &LocError) -> String {313 let mut out = String::new();314 self.settings()315 .trace_format316 .write_trace(&mut out, self, e)317 .unwrap();318 out319 }320321 pub fn manifest(&self, val: Val) -> Result<Rc<str>> {322 self.run_in_state(|| val.manifest(&self.manifest_format()))323 }324325 /// If passed value is function - call with set TLA326 pub fn with_tla(&self, val: Val) -> Result<Val> {327 Ok(match val {328 Val::Func(func) => func.evaluate_map(329 self.create_default_context()?,330 &self.settings().tla_vars,331 true,332 )?,333 v => v,334 })335 }336}337338/// Internals339impl EvaluationState {340 fn data(&self) -> Ref<EvaluationData> {341 self.0.data.borrow()342 }343 fn data_mut(&self) -> RefMut<EvaluationData> {344 self.0.data.borrow_mut()345 }346 pub fn settings(&self) -> Ref<EvaluationSettings> {347 self.0.settings.borrow()348 }349 pub fn settings_mut(&self) -> RefMut<EvaluationSettings> {350 self.0.settings.borrow_mut()351 }352}353354/// Raw methods evaluates passed values, but not performs TLA execution355impl EvaluationState {356 pub fn evaluate_file_raw(&self, name: &PathBuf) -> Result<Val> {357 self.run_in_state(|| self.import_file(&std::env::current_dir().expect("cwd"), &name))358 }359 pub fn evaluate_file_raw_nocwd(&self, name: &PathBuf) -> Result<Val> {360 self.run_in_state(|| self.import_file(&PathBuf::from("."), &name))361 }362 /// Parses and evaluates snippet363 pub fn evaluate_snippet_raw(&self, source: Rc<PathBuf>, code: Rc<str>) -> Result<Val> {364 let parsed = parse(365 &code,366 &ParserSettings {367 file_name: source.clone(),368 loc_data: true,369 },370 )371 .unwrap();372 self.add_parsed_file(source, code, parsed.clone())?;373 self.evaluate_expr_raw(parsed)374 }375 /// Evaluates parsed expression376 pub fn evaluate_expr_raw(&self, code: LocExpr) -> Result<Val> {377 self.run_in_state(|| evaluate(self.create_default_context()?, &code))378 }379}380381/// Settings utilities382impl EvaluationState {383 pub fn add_ext_var(&self, name: Rc<str>, value: Val) {384 self.settings_mut().ext_vars.insert(name, value);385 }386 pub fn add_ext_str(&self, name: Rc<str>, value: Rc<str>) {387 self.add_ext_var(name, Val::Str(value));388 }389 pub fn add_ext_code(&self, name: Rc<str>, code: Rc<str>) -> Result<()> {390 let value =391 self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("ext_code {}", name))), code)?;392 self.add_ext_var(name, value);393 Ok(())394 }395396 pub fn add_tla(&self, name: Rc<str>, value: Val) {397 self.settings_mut().tla_vars.insert(name, value);398 }399 pub fn add_tla_str(&self, name: Rc<str>, value: Rc<str>) {400 self.add_tla(name, Val::Str(value));401 }402 pub fn add_tla_code(&self, name: Rc<str>, code: Rc<str>) -> Result<()> {403 let value =404 self.evaluate_snippet_raw(Rc::new(PathBuf::from(format!("tla_code {}", name))), code)?;405 self.add_ext_var(name, value);406 Ok(())407 }408409 pub fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Rc<PathBuf>> {410 Ok(self.settings().import_resolver.resolve_file(from, path)?)411 }412 pub fn load_file_contents(&self, path: &PathBuf) -> Result<Rc<str>> {413 Ok(self.settings().import_resolver.load_file_contents(path)?)414 }415416 pub fn import_resolver(&self) -> Ref<dyn ImportResolver> {417 Ref::map(self.settings(), |s| &*s.import_resolver)418 }419 pub fn set_import_resolver(&self, resolver: Box<dyn ImportResolver>) {420 self.settings_mut().import_resolver = resolver;421 }422423 pub fn add_native(&self, name: Rc<str>, cb: Rc<NativeCallback>) {424 self.settings_mut().ext_natives.insert(name, cb);425 }426427 pub fn manifest_format(&self) -> ManifestFormat {428 self.settings().manifest_format.clone()429 }430 pub fn set_manifest_format(&self, format: ManifestFormat) {431 self.settings_mut().manifest_format = format;432 }433434 pub fn trace_format(&self) -> Ref<dyn TraceFormat> {435 Ref::map(self.settings(), |s| &*s.trace_format)436 }437 pub fn set_trace_format(&self, format: Box<dyn TraceFormat>) {438 self.settings_mut().trace_format = format;439 }440441 pub fn max_trace(&self) -> usize {442 self.settings().max_trace443 }444 pub fn set_max_trace(&self, trace: usize) {445 self.settings_mut().max_trace = trace;446 }447448 pub fn max_stack(&self) -> usize {449 self.settings().max_stack450 }451 pub fn set_max_stack(&self, trace: usize) {452 self.settings_mut().max_stack = trace;453 }454}455456#[cfg(test)]457pub mod tests {458 use super::Val;459 use crate::{error::Error::*, primitive_equals, EvaluationState};460 use jrsonnet_parser::*;461 use std::{path::PathBuf, rc::Rc};462463 #[test]464 #[should_panic]465 fn eval_state_stacktrace() {466 let state = EvaluationState::default();467 state.run_in_state(|| {468 state469 .push(470 &ExprLocation(Rc::new(PathBuf::from("test1.jsonnet")), 10, 20),471 || "outer".to_owned(),472 || {473 state.push(474 &ExprLocation(Rc::new(PathBuf::from("test2.jsonnet")), 30, 40),475 || "inner".to_owned(),476 || Err(RuntimeError("".into()).into()),477 )?;478 Ok(())479 },480 )481 .unwrap();482 });483 }484485 #[test]486 fn eval_state_standard() {487 let state = EvaluationState::default();488 state.with_stdlib();489 assert!(primitive_equals(490 &state491 .evaluate_snippet_raw(492 Rc::new(PathBuf::from("raw.jsonnet")),493 r#"std.assertEqual(std.base64("test"), "dGVzdA==")"#.into()494 )495 .unwrap(),496 &Val::Bool(true),497 )498 .unwrap());499 }500501 macro_rules! eval {502 ($str: expr) => {503 EvaluationState::default()504 .with_stdlib()505 .evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())506 .unwrap()507 };508 }509 macro_rules! eval_json {510 ($str: expr) => {{511 let evaluator = EvaluationState::default();512 evaluator.with_stdlib();513 evaluator.run_in_state(|| {514 evaluator515 .evaluate_snippet_raw(Rc::new(PathBuf::from("raw.jsonnet")), $str.into())516 .unwrap()517 .to_json(0)518 .unwrap()519 .replace("\n", "")520 })521 }};522 }523524 /// Asserts given code returns `true`525 macro_rules! assert_eval {526 ($str: expr) => {527 assert!(primitive_equals(&eval!($str), &Val::Bool(true)).unwrap())528 };529 }530531 /// Asserts given code returns `false`532 macro_rules! assert_eval_neg {533 ($str: expr) => {534 assert!(primitive_equals(&eval!($str), &Val::Bool(false)).unwrap())535 };536 }537 macro_rules! assert_json {538 ($str: expr, $out: expr) => {539 assert_eq!(eval_json!($str), $out.replace("\t", ""))540 };541 }542543 /// Sanity checking, before trusting to another tests544 #[test]545 fn equality_operator() {546 assert_eval!("2 == 2");547 assert_eval_neg!("2 != 2");548 assert_eval!("2 != 3");549 assert_eval_neg!("2 == 3");550 assert_eval!("'Hello' == 'Hello'");551 assert_eval_neg!("'Hello' != 'Hello'");552 assert_eval!("'Hello' != 'World'");553 assert_eval_neg!("'Hello' == 'World'");554 }555556 #[test]557 fn math_evaluation() {558 assert_eval!("2 + 2 * 2 == 6");559 assert_eval!("3 + (2 + 2 * 2) == 9");560 }561562 #[test]563 fn string_concat() {564 assert_eval!("'Hello' + 'World' == 'HelloWorld'");565 assert_eval!("'Hello' * 3 == 'HelloHelloHello'");566 assert_eval!("'Hello' + 'World' * 3 == 'HelloWorldWorldWorld'");567 }568569 #[test]570 fn faster_join() {571 assert_eval!("std.join([0,0], [[1,2],[3,4],[5,6]]) == [1,2,0,0,3,4,0,0,5,6]");572 assert_eval!("std.join(',', ['1','2','3','4']) == '1,2,3,4'");573 }574575 #[test]576 fn function_contexts() {577 assert_eval!(578 r#"579 local k = {580 t(name = self.h): [self.h, name],581 h: 3,582 };583 local f = {584 t: k.t(),585 h: 4,586 };587 f.t[0] == f.t[1]588 "#589 );590 }591592 #[test]593 fn local() {594 assert_eval!("local a = 2; local b = 3; a + b == 5");595 assert_eval!("local a = 1, b = a + 1; a + b == 3");596 assert_eval!("local a = 1; local a = 2; a == 2");597 }598599 #[test]600 fn object_lazyness() {601 assert_json!("local a = {a:error 'test'}; {}", r#"{}"#);602 }603604 #[test]605 fn object_inheritance() {606 assert_json!("{a: self.b} + {b:3}", r#"{"a": 3,"b": 3}"#);607 }608609 #[test]610 fn object_assertion_success() {611 eval!("{assert \"a\" in self} + {a:2}");612 }613614 #[test]615 fn object_assertion_error() {616 eval!("{assert \"a\" in self}");617 }618619 #[test]620 fn lazy_args() {621 eval!("local test(a) = 2; test(error '3')");622 }623624 #[test]625 #[should_panic]626 fn tailstrict_args() {627 eval!("local test(a) = 2; test(error '3') tailstrict");628 }629630 #[test]631 #[should_panic]632 fn no_binding_error() {633 eval!("a");634 }635636 #[test]637 fn test_object() {638 assert_json!("{a:2}", r#"{"a": 2}"#);639 assert_json!("{a:2+2}", r#"{"a": 4}"#);640 assert_json!("{a:2}+{b:2}", r#"{"a": 2,"b": 2}"#);641 assert_json!("{b:3}+{b:2}", r#"{"b": 2}"#);642 assert_json!("{b:3}+{b+:2}", r#"{"b": 5}"#);643 assert_json!("local test='a'; {[test]:2}", r#"{"a": 2}"#);644 assert_json!(645 r#"646 {647 name: "Alice",648 welcome: "Hello " + self.name + "!",649 }650 "#,651 r#"{"name": "Alice","welcome": "Hello Alice!"}"#652 );653 assert_json!(654 r#"655 {656 name: "Alice",657 welcome: "Hello " + self.name + "!",658 } + {659 name: "Bob"660 }661 "#,662 r#"{"name": "Bob","welcome": "Hello Bob!"}"#663 );664 }665666 #[test]667 fn functions() {668 assert_json!(r#"local a = function(b, c = 2) b + c; a(2)"#, "4");669 assert_json!(670 r#"local a = function(b, c = "Dear") b + c + d, d = "World"; a("Hello")"#,671 r#""HelloDearWorld""#672 );673 }674675 #[test]676 fn local_methods() {677 assert_json!(r#"local a(b, c = 2) = b + c; a(2)"#, "4");678 assert_json!(679 r#"local a(b, c = "Dear") = b + c + d, d = "World"; a("Hello")"#,680 r#""HelloDearWorld""#681 );682 }683684 #[test]685 fn object_locals() {686 assert_json!(r#"{local a = 3, b: a}"#, r#"{"b": 3}"#);687 assert_json!(r#"{local a = 3, local c = a, b: c}"#, r#"{"b": 3}"#);688 assert_json!(689 r#"{local a = function (b) {[b]:4}, test: a("test")}"#,690 r#"{"test": {"test": 4}}"#691 );692 }693694 #[test]695 fn object_comp() {696 assert_json!(697 r#"{local t = "a", ["h"+i+"_"+z]: if "h"+(i-1)+"_"+z in self then t+1 else 0+t for i in [1,2,3] for z in [2,3,4] if z != i}"#,698 "{\"h1_2\": \"0a\",\"h1_3\": \"0a\",\"h1_4\": \"0a\",\"h2_3\": \"a1\",\"h2_4\": \"a1\",\"h3_2\": \"0a\",\"h3_4\": \"a1\"}"699 )700 }701702 #[test]703 fn direct_self() {704 println!(705 "{:#?}",706 eval!(707 r#"708 {709 local me = self,710 a: 3,711 b(): me.a,712 }713 "#714 )715 );716 }717718 #[test]719 fn indirect_self() {720 // `self` assigned to `me` was lost when being721 // referenced from field722 eval!(723 r#"{724 local me = self,725 a: 3,726 b: me.a,727 }.b"#728 );729 }730731 // We can't trust other tests (And official jsonnet testsuite), if assert is not working correctly732 #[test]733 fn std_assert_ok() {734 eval!("std.assertEqual(4.5 << 2, 16)");735 }736737 #[test]738 #[should_panic]739 fn std_assert_failure() {740 eval!("std.assertEqual(4.5 << 2, 15)");741 }742743 #[test]744 fn string_is_string() {745 assert!(primitive_equals(746 &eval!("local arr = 'hello'; (!std.isArray(arr)) && (!std.isString(arr))"),747 &Val::Bool(false),748 )749 .unwrap());750 }751752 #[test]753 fn base64_works() {754 assert_json!(r#"std.base64("test")"#, r#""dGVzdA==""#);755 }756757 #[test]758 fn utf8_chars() {759 assert_json!(760 r#"local c="😎";{c:std.codepoint(c),l:std.length(c)}"#,761 r#"{"c": 128526,"l": 1}"#762 )763 }764765 #[test]766 fn json() {767 assert_json!(768 r#"std.manifestJsonEx({a:3, b:4, c:6},"")"#,769 r#""{\n\"a\": 3,\n\"b\": 4,\n\"c\": 6\n}""#770 );771 }772773 #[test]774 fn test() {775 assert_json!(776 r#"[[a, b] for a in [1,2,3] for b in [4,5,6]]"#,777 "[[1,4],[1,5],[1,6],[2,4],[2,5],[2,6],[3,4],[3,5],[3,6]]"778 );779 }780781 #[test]782 fn sjsonnet() {783 eval!(784 r#"785 local x0 = {k: 1};786 local x1 = {k: x0.k + x0.k};787 local x2 = {k: x1.k + x1.k};788 local x3 = {k: x2.k + x2.k};789 local x4 = {k: x3.k + x3.k};790 local x5 = {k: x4.k + x4.k};791 local x6 = {k: x5.k + x5.k};792 local x7 = {k: x6.k + x6.k};793 local x8 = {k: x7.k + x7.k};794 local x9 = {k: x8.k + x8.k};795 local x10 = {k: x9.k + x9.k};796 local x11 = {k: x10.k + x10.k};797 local x12 = {k: x11.k + x11.k};798 local x13 = {k: x12.k + x12.k};799 local x14 = {k: x13.k + x13.k};800 local x15 = {k: x14.k + x14.k};801 local x16 = {k: x15.k + x15.k};802 local x17 = {k: x16.k + x16.k};803 local x18 = {k: x17.k + x17.k};804 local x19 = {k: x18.k + x18.k};805 local x20 = {k: x19.k + x19.k};806 local x21 = {k: x20.k + x20.k};807 x21.k808 "#809 );810 }811812 // This test is commented out by default, because of huge compilation slowdown813 // #[bench]814 // fn bench_codegen(b: &mut Bencher) {815 // b.iter(|| {816 // #[allow(clippy::all)]817 // let stdlib = {818 // use jrsonnet_parser::*;819 // include!(concat!(env!("OUT_DIR"), "/stdlib.rs"))820 // };821 // stdlib822 // })823 // }824825 /*826 #[bench]827 fn bench_serialize(b: &mut Bencher) {828 b.iter(|| {829 bincode::deserialize::<jrsonnet_parser::LocExpr>(include_bytes!(concat!(830 env!("OUT_DIR"),831 "/stdlib.bincode"832 )))833 .expect("deserialize stdlib")834 })835 }836837 #[bench]838 fn bench_parse(b: &mut Bencher) {839 b.iter(|| {840 jrsonnet_parser::parse(841 jrsonnet_stdlib::STDLIB_STR,842 &jrsonnet_parser::ParserSettings {843 loc_data: true,844 file_name: Rc::new(PathBuf::from("std.jsonnet")),845 },846 )847 })848 }849 */850851 #[test]852 fn equality() {853 println!(854 "{:?}",855 jrsonnet_parser::parse(856 "{ x: 1, y: 2 } == { x: 1, y: 2 }",857 &ParserSettings::default()858 )859 );860 assert_eval!("{ x: 1, y: 2 } == { x: 1, y: 2 }")861 }862863 #[test]864 fn native_ext() -> crate::error::Result<()> {865 use super::native::NativeCallback;866 let evaluator = EvaluationState::default();867868 evaluator.with_stdlib();869 evaluator.settings_mut().ext_natives.insert(870 "native_add".into(),871 Rc::new(NativeCallback::new(872 ParamsDesc(Rc::new(vec![873 Param("a".into(), None),874 Param("b".into(), None),875 ])),876 |args| match (&args[0], &args[1]) {877 (Val::Num(a), Val::Num(b)) => Ok(Val::Num(a + b)),878 (_, _) => todo!(),879 },880 )),881 );882 evaluator.evaluate_snippet_raw(883 Rc::new(PathBuf::from("test.jsonnet")),884 "std.assertEqual(std.native(\"native_add\")(1, 2), 3)".into(),885 )?;886 Ok(())887 }888}crates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -213,7 +213,7 @@
})
}
- pub fn into_string(self) -> Result<Rc<str>> {
+ pub fn to_string(&self) -> Result<Rc<str>> {
Ok(match self.unwrap_if_lazy()? {
Val::Bool(true) => "true".into(),
Val::Bool(false) => "false".into(),
@@ -230,6 +230,36 @@
})
}
+ /// Expects value to be object, outputs (key, manifested value) pairs
+ pub fn manifest_multi(&self, ty: &ManifestFormat) -> Result<Vec<(Rc<str>, Rc<str>)>> {
+ let obj = match self {
+ Val::Obj(obj) => obj,
+ _ => throw!(MultiManifestOutputIsNotAObject),
+ };
+ let keys = obj.visible_fields();
+ let mut out = Vec::with_capacity(keys.len());
+ for key in keys {
+ let value = obj
+ .get(key.clone())?
+ .expect("item in object")
+ .manifest(ty)?;
+ out.push((key, value));
+ }
+ Ok(out)
+ }
+
+ /// Expects value to be array, outputs manifested values
+ pub fn manifest_stream(&self, ty: &ManifestFormat) -> Result<Vec<Rc<str>>> {
+ let arr = match self {
+ Val::Arr(a) => a,
+ _ => throw!(StreamManifestOutputIsNotAArray),
+ };
+ let mut out = Vec::with_capacity(arr.len());
+ for i in arr.iter() {
+ out.push(i.manifest(ty)?);
+ }
+ Ok(out)
+ }
pub fn manifest(&self, ty: &ManifestFormat) -> Result<Rc<str>> {
Ok(match ty {