difftreelog
Merge pull request #124 from pawelbeza/missing-std-features
in: master
10 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -375,7 +375,9 @@
"serde",
"serde_json",
"serde_yaml_with_quirks",
+ "sha1",
"sha2",
+ "sha3",
"structdump",
]
@@ -388,6 +390,15 @@
]
[[package]]
+name = "keccak"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
name = "libc"
version = "0.2.139"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -676,6 +687,17 @@
]
[[package]]
+name = "sha1"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
name = "sha2"
version = "0.10.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -687,6 +709,16 @@
]
[[package]]
+name = "sha3"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+dependencies = [
+ "digest",
+ "keccak",
+]
+
+[[package]]
name = "smallvec"
version = "1.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
crates/jrsonnet-stdlib/Cargo.tomldiffbeforeafterboth--- a/crates/jrsonnet-stdlib/Cargo.toml
+++ b/crates/jrsonnet-stdlib/Cargo.toml
@@ -32,8 +32,12 @@
# std.md5
md5 = "0.7.0"
+# std.sha1
+sha1 = "0.10.5"
# std.sha256, std.sha512
sha2 = "0.10.6"
+# std.sha3
+sha3 = "0.10.8"
# std.base64
base64 = "0.21.0"
# std.parseJson
crates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -253,3 +253,26 @@
}
Ok(Val::Num(arr.iter().sum::<f64>() / (arr.len() as f64)))
}
+
+#[builtin]
+pub fn builtin_remove_at(
+ arr: ArrValue,
+ index: usize,
+) -> Result<ArrValue> {
+ let newArrLeft = arr.clone().slice(None, Some(index), None);
+ let newArrRight = arr.clone().slice(Some(index + 1), None, None);
+ return Ok(ArrValue::extended(
+ newArrLeft.unwrap_or(ArrValue::empty()),
+ newArrRight.unwrap_or(ArrValue::empty()))
+ );
+}
+
+#[builtin]
+pub fn builtin_remove(arr: ArrValue, elem: Val) -> Result<ArrValue> {
+ for (index, item) in arr.iter().enumerate() {
+ if equals(&item?, &elem)? {
+ return builtin_remove_at(arr.clone(), index)
+ }
+ }
+ Ok(arr)
+}
crates/jrsonnet-stdlib/src/hash.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/hash.rs
+++ b/crates/jrsonnet-stdlib/src/hash.rs
@@ -16,3 +16,15 @@
use sha2::digest::Digest;
format!("{:x}", sha2::Sha512::digest(s.as_bytes()))
}
+
+#[builtin]
+pub fn builtin_sha1(s: IStr) -> String {
+ use sha1::digest::Digest;
+ format!("{:x}", sha1::Sha1::digest(s.as_bytes()))
+}
+
+#[builtin]
+pub fn builtin_sha3(s: IStr) -> String {
+ use sha3::digest::Digest;
+ format!("{:x}", sha3::Sha3_512::digest(s.as_bytes()))
+}
crates/jrsonnet-stdlib/src/lib.rsdiffbeforeafterboth1use std::{2 cell::{Ref, RefCell, RefMut},3 collections::HashMap,4 rc::Rc,5};67use jrsonnet_evaluator::{8 error::{ErrorKind::*, Result},9 function::{builtin::Builtin, CallLocation, FuncVal, TlaArg},10 gc::{GcHashMap, TraceBox},11 tb,12 trace::PathResolver,13 Context, ContextBuilder, IStr, ObjValue, ObjValueBuilder, State, Thunk, Val,14};15use jrsonnet_gcmodule::{Cc, Trace};16use jrsonnet_parser::Source;1718mod expr;19mod types;20pub use types::*;21mod arrays;22pub use arrays::*;23mod math;24pub use math::*;25mod operator;26pub use operator::*;27mod sort;28pub use sort::*;29mod hash;30pub use hash::*;31mod encoding;32pub use encoding::*;33mod objects;34pub use objects::*;35mod manifest;36pub use manifest::*;37mod parse;38pub use parse::*;39mod strings;40pub use strings::*;41mod misc;42pub use misc::*;43mod sets;44pub use sets::*;45mod compat;46pub use compat::*;4748pub fn stdlib_uncached(settings: Rc<RefCell<Settings>>) -> ObjValue {49 let mut builder = ObjValueBuilder::new();5051 let expr = expr::stdlib_expr();52 let eval = jrsonnet_evaluator::evaluate(ContextBuilder::dangerous_empty_state().build(), &expr)53 .expect("stdlib.jsonnet should have no errors")54 .as_obj()55 .expect("stdlib.jsonnet should evaluate to object");5657 builder.with_super(eval);5859 for (name, builtin) in [60 // Types61 ("type", builtin_type::INST),62 ("isString", builtin_is_string::INST),63 ("isNumber", builtin_is_number::INST),64 ("isBoolean", builtin_is_boolean::INST),65 ("isObject", builtin_is_object::INST),66 ("isArray", builtin_is_array::INST),67 ("isFunction", builtin_is_function::INST),68 // Arrays69 ("makeArray", builtin_make_array::INST),70 ("repeat", builtin_repeat::INST),71 ("slice", builtin_slice::INST),72 ("map", builtin_map::INST),73 ("flatMap", builtin_flatmap::INST),74 ("filter", builtin_filter::INST),75 ("foldl", builtin_foldl::INST),76 ("foldr", builtin_foldr::INST),77 ("range", builtin_range::INST),78 ("join", builtin_join::INST),79 ("reverse", builtin_reverse::INST),80 ("any", builtin_any::INST),81 ("all", builtin_all::INST),82 ("member", builtin_member::INST),83 ("contains", builtin_member::INST),84 ("count", builtin_count::INST),85 ("avg", builtin_avg::INST),86 // Math87 ("abs", builtin_abs::INST),88 ("sign", builtin_sign::INST),89 ("max", builtin_max::INST),90 ("min", builtin_min::INST),91 ("sum", builtin_sum::INST),92 ("modulo", builtin_modulo::INST),93 ("floor", builtin_floor::INST),94 ("ceil", builtin_ceil::INST),95 ("log", builtin_log::INST),96 ("pow", builtin_pow::INST),97 ("sqrt", builtin_sqrt::INST),98 ("sin", builtin_sin::INST),99 ("cos", builtin_cos::INST),100 ("tan", builtin_tan::INST),101 ("asin", builtin_asin::INST),102 ("acos", builtin_acos::INST),103 ("atan", builtin_atan::INST),104 ("exp", builtin_exp::INST),105 ("mantissa", builtin_mantissa::INST),106 ("exponent", builtin_exponent::INST),107 // Operator108 ("mod", builtin_mod::INST),109 ("primitiveEquals", builtin_primitive_equals::INST),110 ("equals", builtin_equals::INST),111 ("xor", builtin_xor::INST),112 ("format", builtin_format::INST),113 // Sort114 ("sort", builtin_sort::INST),115 ("uniq", builtin_uniq::INST),116 ("set", builtin_set::INST),117 ("minArray", builtin_min_array::INST),118 ("maxArray", builtin_max_array::INST),119 // Hash120 ("md5", builtin_md5::INST),121 ("sha256", builtin_sha256::INST),122 ("sha512", builtin_sha512::INST),123 // Encoding124 ("encodeUTF8", builtin_encode_utf8::INST),125 ("decodeUTF8", builtin_decode_utf8::INST),126 ("base64", builtin_base64::INST),127 ("base64Decode", builtin_base64_decode::INST),128 ("base64DecodeBytes", builtin_base64_decode_bytes::INST),129 // Objects130 ("objectFieldsEx", builtin_object_fields_ex::INST),131 ("objectHasEx", builtin_object_has_ex::INST),132 // Manifest133 ("escapeStringJson", builtin_escape_string_json::INST),134 ("manifestJsonEx", builtin_manifest_json_ex::INST),135 ("manifestYamlDoc", builtin_manifest_yaml_doc::INST),136 ("manifestTomlEx", builtin_manifest_toml_ex::INST),137 // Parsing138 ("parseJson", builtin_parse_json::INST),139 ("parseYaml", builtin_parse_yaml::INST),140 // Strings141 ("codepoint", builtin_codepoint::INST),142 ("substr", builtin_substr::INST),143 ("char", builtin_char::INST),144 ("strReplace", builtin_str_replace::INST),145 ("splitLimit", builtin_splitlimit::INST),146 ("asciiUpper", builtin_ascii_upper::INST),147 ("asciiLower", builtin_ascii_lower::INST),148 ("findSubstr", builtin_find_substr::INST),149 ("parseInt", builtin_parse_int::INST),150 #[cfg(feature = "exp-bigint")]151 ("bigint", builtin_bigint::INST),152 ("parseOctal", builtin_parse_octal::INST),153 ("parseHex", builtin_parse_hex::INST),154 // Misc155 ("length", builtin_length::INST),156 ("startsWith", builtin_starts_with::INST),157 ("endsWith", builtin_ends_with::INST),158 // Sets159 ("setMember", builtin_set_member::INST),160 ("setInter", builtin_set_inter::INST),161 // Compat162 ("__compare", builtin___compare::INST),163 ]164 .iter()165 .cloned()166 {167 builder168 .member(name.into())169 .hide()170 .value(Val::Func(FuncVal::StaticBuiltin(builtin)))171 .expect("no conflict");172 }173174 builder175 .member("extVar".into())176 .hide()177 .value(Val::Func(FuncVal::builtin(builtin_ext_var {178 settings: settings.clone(),179 })))180 .expect("no conflict");181 builder182 .member("native".into())183 .hide()184 .value(Val::Func(FuncVal::builtin(builtin_native {185 settings: settings.clone(),186 })))187 .expect("no conflict");188 builder189 .member("trace".into())190 .hide()191 .value(Val::Func(FuncVal::builtin(builtin_trace { settings })))192 .expect("no conflict");193194 builder195 .member("id".into())196 .hide()197 .value(Val::Func(FuncVal::Id))198 .expect("no conflict");199200 builder.build()201}202203pub trait TracePrinter {204 fn print_trace(&self, loc: CallLocation, value: IStr);205}206207pub struct StdTracePrinter {208 resolver: PathResolver,209}210impl StdTracePrinter {211 pub fn new(resolver: PathResolver) -> Self {212 Self { resolver }213 }214}215impl TracePrinter for StdTracePrinter {216 fn print_trace(&self, loc: CallLocation, value: IStr) {217 eprint!("TRACE:");218 if let Some(loc) = loc.0 {219 let locs = loc.0.map_source_locations(&[loc.1]);220 eprint!(221 " {}:{}",222 match loc.0.source_path().path() {223 Some(p) => self.resolver.resolve(p),224 None => loc.0.source_path().to_string(),225 },226 locs[0].line227 );228 }229 eprintln!(" {value}");230 }231}232233pub struct Settings {234 /// Used for `std.extVar`235 pub ext_vars: HashMap<IStr, TlaArg>,236 /// Used for `std.native`237 pub ext_natives: HashMap<IStr, Cc<TraceBox<dyn Builtin>>>,238 /// Helper to add globals without implementing custom ContextInitializer239 pub globals: GcHashMap<IStr, Thunk<Val>>,240 /// Used for `std.trace`241 pub trace_printer: Box<dyn TracePrinter>,242 /// Used for `std.thisFile`243 pub path_resolver: PathResolver,244}245246fn extvar_source(name: &str, code: impl Into<IStr>) -> Source {247 let source_name = format!("<extvar:{name}>");248 Source::new_virtual(source_name.into(), code.into())249}250251#[derive(Trace, Clone)]252pub struct ContextInitializer {253 // When we don't need to support legacy-this-file, we can reuse same context for all files254 #[cfg(not(feature = "legacy-this-file"))]255 context: Context,256 // Otherwise, we can only keep first stdlib layer, and then stack thisFile on top of it257 #[cfg(feature = "legacy-this-file")]258 stdlib_obj: ObjValue,259 settings: Rc<RefCell<Settings>>,260}261impl ContextInitializer {262 pub fn new(_s: State, resolver: PathResolver) -> Self {263 let settings = Settings {264 ext_vars: Default::default(),265 ext_natives: Default::default(),266 globals: Default::default(),267 trace_printer: Box::new(StdTracePrinter::new(resolver.clone())),268 path_resolver: resolver,269 };270 let settings = Rc::new(RefCell::new(settings));271 Self {272 #[cfg(not(feature = "legacy-this-file"))]273 context: {274 let mut context = ContextBuilder::with_capacity(_s, 1);275 context.bind(276 "std".into(),277 Thunk::evaluated(Val::Obj(stdlib_uncached(settings.clone()))),278 );279 context.build()280 },281 #[cfg(feature = "legacy-this-file")]282 stdlib_obj: stdlib_uncached(settings.clone()),283 settings,284 }285 }286 pub fn settings(&self) -> Ref<Settings> {287 self.settings.borrow()288 }289 pub fn settings_mut(&self) -> RefMut<Settings> {290 self.settings.borrow_mut()291 }292 pub fn add_ext_var(&self, name: IStr, value: Val) {293 self.settings_mut()294 .ext_vars295 .insert(name, TlaArg::Val(value));296 }297 pub fn add_ext_str(&self, name: IStr, value: IStr) {298 self.settings_mut()299 .ext_vars300 .insert(name, TlaArg::String(value));301 }302 pub fn add_ext_code(&self, name: &str, code: impl Into<IStr>) -> Result<()> {303 let code = code.into();304 let source = extvar_source(name, code.clone());305 let parsed = jrsonnet_parser::parse(306 &code,307 &jrsonnet_parser::ParserSettings {308 source: source.clone(),309 },310 )311 .map_err(|e| ImportSyntaxError {312 path: source,313 error: Box::new(e),314 })?;315 // self.data_mut().volatile_files.insert(source_name, code);316 self.settings_mut()317 .ext_vars318 .insert(name.into(), TlaArg::Code(parsed));319 Ok(())320 }321 pub fn add_native(&self, name: IStr, cb: impl Builtin) {322 self.settings_mut()323 .ext_natives324 .insert(name, Cc::new(tb!(cb)));325 }326}327impl jrsonnet_evaluator::ContextInitializer for ContextInitializer {328 #[cfg(not(feature = "legacy-this-file"))]329 fn initialize(&self, _s: State, _source: Source) -> jrsonnet_evaluator::Context {330 let out = self.context.clone();331 let globals = &self.settings().globals;332 if globals.is_empty() {333 return out;334 }335336 let mut out = ContextBuilder::extend(out);337 for (k, v) in globals.iter() {338 out.bind(k.clone(), v.clone());339 }340 out.build()341 }342 #[cfg(feature = "legacy-this-file")]343 fn initialize(&self, s: State, source: Source) -> Context {344 use jrsonnet_evaluator::val::StrValue;345346 let mut builder = ObjValueBuilder::new();347 builder.with_super(self.stdlib_obj.clone());348 builder349 .member("thisFile".into())350 .hide()351 .value(Val::Str(StrValue::Flat(352 match source.source_path().path() {353 Some(p) => self.settings().path_resolver.resolve(p).into(),354 None => source.source_path().to_string().into(),355 },356 )))357 .expect("this object builder is empty");358 let stdlib_with_this_file = builder.build();359360 let mut context = ContextBuilder::with_capacity(s, 1);361 context.bind(362 "std".into(),363 Thunk::evaluated(Val::Obj(stdlib_with_this_file)),364 );365 for (k, v) in self.settings().globals.iter() {366 context.bind(k.clone(), v.clone());367 }368 context.build()369 }370 fn as_any(&self) -> &dyn std::any::Any {371 self372 }373}374375pub trait StateExt {376 /// This method was previously implemented in jrsonnet-evaluator itself377 fn with_stdlib(&self);378 fn add_global(&self, name: IStr, value: Thunk<Val>);379}380381impl StateExt for State {382 fn with_stdlib(&self) {383 let initializer = ContextInitializer::new(self.clone(), PathResolver::new_cwd_fallback());384 self.settings_mut().context_initializer = tb!(initializer)385 }386 fn add_global(&self, name: IStr, value: Thunk<Val>) {387 self.settings()388 .context_initializer389 .as_any()390 .downcast_ref::<ContextInitializer>()391 .expect("not standard context initializer")392 .settings_mut()393 .globals394 .insert(name, value);395 }396}1use std::{2 cell::{Ref, RefCell, RefMut},3 collections::HashMap,4 rc::Rc,5};67use jrsonnet_evaluator::{8 error::{ErrorKind::*, Result},9 function::{builtin::Builtin, CallLocation, FuncVal, TlaArg},10 gc::{GcHashMap, TraceBox},11 tb,12 trace::PathResolver,13 Context, ContextBuilder, IStr, ObjValue, ObjValueBuilder, State, Thunk, Val,14};15use jrsonnet_gcmodule::{Cc, Trace};16use jrsonnet_parser::Source;1718mod expr;19mod types;20pub use types::*;21mod arrays;22pub use arrays::*;23mod math;24pub use math::*;25mod operator;26pub use operator::*;27mod sort;28pub use sort::*;29mod hash;30pub use hash::*;31mod encoding;32pub use encoding::*;33mod objects;34pub use objects::*;35mod manifest;36pub use manifest::*;37mod parse;38pub use parse::*;39mod strings;40pub use strings::*;41mod misc;42pub use misc::*;43mod sets;44pub use sets::*;45mod compat;46pub use compat::*;4748pub fn stdlib_uncached(settings: Rc<RefCell<Settings>>) -> ObjValue {49 let mut builder = ObjValueBuilder::new();5051 let expr = expr::stdlib_expr();52 let eval = jrsonnet_evaluator::evaluate(ContextBuilder::dangerous_empty_state().build(), &expr)53 .expect("stdlib.jsonnet should have no errors")54 .as_obj()55 .expect("stdlib.jsonnet should evaluate to object");5657 builder.with_super(eval);5859 for (name, builtin) in [60 // Types61 ("type", builtin_type::INST),62 ("isString", builtin_is_string::INST),63 ("isNumber", builtin_is_number::INST),64 ("isBoolean", builtin_is_boolean::INST),65 ("isObject", builtin_is_object::INST),66 ("isArray", builtin_is_array::INST),67 ("isFunction", builtin_is_function::INST),68 // Arrays69 ("makeArray", builtin_make_array::INST),70 ("repeat", builtin_repeat::INST),71 ("slice", builtin_slice::INST),72 ("map", builtin_map::INST),73 ("flatMap", builtin_flatmap::INST),74 ("filter", builtin_filter::INST),75 ("foldl", builtin_foldl::INST),76 ("foldr", builtin_foldr::INST),77 ("range", builtin_range::INST),78 ("join", builtin_join::INST),79 ("reverse", builtin_reverse::INST),80 ("any", builtin_any::INST),81 ("all", builtin_all::INST),82 ("member", builtin_member::INST),83 ("contains", builtin_member::INST),84 ("count", builtin_count::INST),85 ("avg", builtin_avg::INST),86 ("removeAt", builtin_remove_at::INST),87 ("remove", builtin_remove::INST),88 // Math89 ("abs", builtin_abs::INST),90 ("sign", builtin_sign::INST),91 ("max", builtin_max::INST),92 ("min", builtin_min::INST),93 ("sum", builtin_sum::INST),94 ("modulo", builtin_modulo::INST),95 ("floor", builtin_floor::INST),96 ("ceil", builtin_ceil::INST),97 ("log", builtin_log::INST),98 ("pow", builtin_pow::INST),99 ("sqrt", builtin_sqrt::INST),100 ("sin", builtin_sin::INST),101 ("cos", builtin_cos::INST),102 ("tan", builtin_tan::INST),103 ("asin", builtin_asin::INST),104 ("acos", builtin_acos::INST),105 ("atan", builtin_atan::INST),106 ("exp", builtin_exp::INST),107 ("mantissa", builtin_mantissa::INST),108 ("exponent", builtin_exponent::INST),109 ("round", builtin_round::INST),110 ("isEven", builtin_is_even::INST),111 ("isOdd", builtin_is_odd::INST),112 ("isInteger", builtin_is_integer::INST),113 ("isDecimal", builtin_is_decimal::INST),114 // Operator115 ("mod", builtin_mod::INST),116 ("primitiveEquals", builtin_primitive_equals::INST),117 ("equals", builtin_equals::INST),118 ("xor", builtin_xor::INST),119 ("xnor", builtin_xnor::INST),120 ("format", builtin_format::INST),121 // Sort122 ("sort", builtin_sort::INST),123 ("uniq", builtin_uniq::INST),124 ("set", builtin_set::INST),125 ("minArray", builtin_min_array::INST),126 ("maxArray", builtin_max_array::INST),127 // Hash128 ("md5", builtin_md5::INST),129 ("sha1", builtin_sha1::INST),130 ("sha256", builtin_sha256::INST),131 ("sha512", builtin_sha512::INST),132 ("sha3", builtin_sha3::INST),133 // Encoding134 ("encodeUTF8", builtin_encode_utf8::INST),135 ("decodeUTF8", builtin_decode_utf8::INST),136 ("base64", builtin_base64::INST),137 ("base64Decode", builtin_base64_decode::INST),138 ("base64DecodeBytes", builtin_base64_decode_bytes::INST),139 // Objects140 ("objectFieldsEx", builtin_object_fields_ex::INST),141 ("objectHasEx", builtin_object_has_ex::INST),142 ("objectRemoveKey", builtin_object_remove_key::INST),143 // Manifest144 ("escapeStringJson", builtin_escape_string_json::INST),145 ("manifestJsonEx", builtin_manifest_json_ex::INST),146 ("manifestYamlDoc", builtin_manifest_yaml_doc::INST),147 ("manifestTomlEx", builtin_manifest_toml_ex::INST),148 // Parsing149 ("parseJson", builtin_parse_json::INST),150 ("parseYaml", builtin_parse_yaml::INST),151 // Strings152 ("codepoint", builtin_codepoint::INST),153 ("substr", builtin_substr::INST),154 ("char", builtin_char::INST),155 ("strReplace", builtin_str_replace::INST),156 ("isEmpty", builtin_is_empty::INST),157 ("equalsIgnoreCase", builtin_equals_ignore_case::INST),158 ("splitLimit", builtin_splitlimit::INST),159 ("asciiUpper", builtin_ascii_upper::INST),160 ("asciiLower", builtin_ascii_lower::INST),161 ("findSubstr", builtin_find_substr::INST),162 ("parseInt", builtin_parse_int::INST),163 #[cfg(feature = "exp-bigint")]164 ("bigint", builtin_bigint::INST),165 ("parseOctal", builtin_parse_octal::INST),166 ("parseHex", builtin_parse_hex::INST),167 // Misc168 ("length", builtin_length::INST),169 ("startsWith", builtin_starts_with::INST),170 ("endsWith", builtin_ends_with::INST),171 // Sets172 ("setMember", builtin_set_member::INST),173 ("setInter", builtin_set_inter::INST),174 // Compat175 ("__compare", builtin___compare::INST),176 ]177 .iter()178 .cloned()179 {180 builder181 .member(name.into())182 .hide()183 .value(Val::Func(FuncVal::StaticBuiltin(builtin)))184 .expect("no conflict");185 }186187 builder188 .member("extVar".into())189 .hide()190 .value(Val::Func(FuncVal::builtin(builtin_ext_var {191 settings: settings.clone(),192 })))193 .expect("no conflict");194 builder195 .member("native".into())196 .hide()197 .value(Val::Func(FuncVal::builtin(builtin_native {198 settings: settings.clone(),199 })))200 .expect("no conflict");201 builder202 .member("trace".into())203 .hide()204 .value(Val::Func(FuncVal::builtin(builtin_trace { settings })))205 .expect("no conflict");206207 builder208 .member("id".into())209 .hide()210 .value(Val::Func(FuncVal::Id))211 .expect("no conflict");212213 builder.build()214}215216pub trait TracePrinter {217 fn print_trace(&self, loc: CallLocation, value: IStr);218}219220pub struct StdTracePrinter {221 resolver: PathResolver,222}223impl StdTracePrinter {224 pub fn new(resolver: PathResolver) -> Self {225 Self { resolver }226 }227}228impl TracePrinter for StdTracePrinter {229 fn print_trace(&self, loc: CallLocation, value: IStr) {230 eprint!("TRACE:");231 if let Some(loc) = loc.0 {232 let locs = loc.0.map_source_locations(&[loc.1]);233 eprint!(234 " {}:{}",235 match loc.0.source_path().path() {236 Some(p) => self.resolver.resolve(p),237 None => loc.0.source_path().to_string(),238 },239 locs[0].line240 );241 }242 eprintln!(" {value}");243 }244}245246pub struct Settings {247 /// Used for `std.extVar`248 pub ext_vars: HashMap<IStr, TlaArg>,249 /// Used for `std.native`250 pub ext_natives: HashMap<IStr, Cc<TraceBox<dyn Builtin>>>,251 /// Helper to add globals without implementing custom ContextInitializer252 pub globals: GcHashMap<IStr, Thunk<Val>>,253 /// Used for `std.trace`254 pub trace_printer: Box<dyn TracePrinter>,255 /// Used for `std.thisFile`256 pub path_resolver: PathResolver,257}258259fn extvar_source(name: &str, code: impl Into<IStr>) -> Source {260 let source_name = format!("<extvar:{name}>");261 Source::new_virtual(source_name.into(), code.into())262}263264#[derive(Trace, Clone)]265pub struct ContextInitializer {266 // When we don't need to support legacy-this-file, we can reuse same context for all files267 #[cfg(not(feature = "legacy-this-file"))]268 context: Context,269 // Otherwise, we can only keep first stdlib layer, and then stack thisFile on top of it270 #[cfg(feature = "legacy-this-file")]271 stdlib_obj: ObjValue,272 settings: Rc<RefCell<Settings>>,273}274impl ContextInitializer {275 pub fn new(_s: State, resolver: PathResolver) -> Self {276 let settings = Settings {277 ext_vars: Default::default(),278 ext_natives: Default::default(),279 globals: Default::default(),280 trace_printer: Box::new(StdTracePrinter::new(resolver.clone())),281 path_resolver: resolver,282 };283 let settings = Rc::new(RefCell::new(settings));284 Self {285 #[cfg(not(feature = "legacy-this-file"))]286 context: {287 let mut context = ContextBuilder::with_capacity(_s, 1);288 context.bind(289 "std".into(),290 Thunk::evaluated(Val::Obj(stdlib_uncached(settings.clone()))),291 );292 context.build()293 },294 #[cfg(feature = "legacy-this-file")]295 stdlib_obj: stdlib_uncached(settings.clone()),296 settings,297 }298 }299 pub fn settings(&self) -> Ref<Settings> {300 self.settings.borrow()301 }302 pub fn settings_mut(&self) -> RefMut<Settings> {303 self.settings.borrow_mut()304 }305 pub fn add_ext_var(&self, name: IStr, value: Val) {306 self.settings_mut()307 .ext_vars308 .insert(name, TlaArg::Val(value));309 }310 pub fn add_ext_str(&self, name: IStr, value: IStr) {311 self.settings_mut()312 .ext_vars313 .insert(name, TlaArg::String(value));314 }315 pub fn add_ext_code(&self, name: &str, code: impl Into<IStr>) -> Result<()> {316 let code = code.into();317 let source = extvar_source(name, code.clone());318 let parsed = jrsonnet_parser::parse(319 &code,320 &jrsonnet_parser::ParserSettings {321 source: source.clone(),322 },323 )324 .map_err(|e| ImportSyntaxError {325 path: source,326 error: Box::new(e),327 })?;328 // self.data_mut().volatile_files.insert(source_name, code);329 self.settings_mut()330 .ext_vars331 .insert(name.into(), TlaArg::Code(parsed));332 Ok(())333 }334 pub fn add_native(&self, name: IStr, cb: impl Builtin) {335 self.settings_mut()336 .ext_natives337 .insert(name, Cc::new(tb!(cb)));338 }339}340impl jrsonnet_evaluator::ContextInitializer for ContextInitializer {341 #[cfg(not(feature = "legacy-this-file"))]342 fn initialize(&self, _s: State, _source: Source) -> jrsonnet_evaluator::Context {343 let out = self.context.clone();344 let globals = &self.settings().globals;345 if globals.is_empty() {346 return out;347 }348349 let mut out = ContextBuilder::extend(out);350 for (k, v) in globals.iter() {351 out.bind(k.clone(), v.clone());352 }353 out.build()354 }355 #[cfg(feature = "legacy-this-file")]356 fn initialize(&self, s: State, source: Source) -> Context {357 use jrsonnet_evaluator::val::StrValue;358359 let mut builder = ObjValueBuilder::new();360 builder.with_super(self.stdlib_obj.clone());361 builder362 .member("thisFile".into())363 .hide()364 .value(Val::Str(StrValue::Flat(365 match source.source_path().path() {366 Some(p) => self.settings().path_resolver.resolve(p).into(),367 None => source.source_path().to_string().into(),368 },369 )))370 .expect("this object builder is empty");371 let stdlib_with_this_file = builder.build();372373 let mut context = ContextBuilder::with_capacity(s, 1);374 context.bind(375 "std".into(),376 Thunk::evaluated(Val::Obj(stdlib_with_this_file)),377 );378 for (k, v) in self.settings().globals.iter() {379 context.bind(k.clone(), v.clone());380 }381 context.build()382 }383 fn as_any(&self) -> &dyn std::any::Any {384 self385 }386}387388pub trait StateExt {389 /// This method was previously implemented in jrsonnet-evaluator itself390 fn with_stdlib(&self);391 fn add_global(&self, name: IStr, value: Thunk<Val>);392}393394impl StateExt for State {395 fn with_stdlib(&self) {396 let initializer = ContextInitializer::new(self.clone(), PathResolver::new_cwd_fallback());397 self.settings_mut().context_initializer = tb!(initializer)398 }399 fn add_global(&self, name: IStr, value: Thunk<Val>) {400 self.settings()401 .context_initializer402 .as_any()403 .downcast_ref::<ContextInitializer>()404 .expect("not standard context initializer")405 .settings_mut()406 .globals407 .insert(name, value);408 }409}crates/jrsonnet-stdlib/src/math.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/math.rs
+++ b/crates/jrsonnet-stdlib/src/math.rs
@@ -114,3 +114,28 @@
pub fn builtin_exponent(x: f64) -> i16 {
frexp(x).1
}
+
+#[builtin]
+pub fn builtin_round(x: f64) -> f64 {
+ x.round()
+}
+
+#[builtin]
+pub fn builtin_is_even(x: f64) -> bool {
+ builtin_round(x) % 2.0 == 0.0
+}
+
+#[builtin]
+pub fn builtin_is_odd(x: f64) -> bool {
+ builtin_round(x) % 2.0 == 1.0
+}
+
+#[builtin]
+pub fn builtin_is_integer(x: f64) -> bool {
+ builtin_round(x) == x
+}
+
+#[builtin]
+pub fn builtin_is_decimal(x: f64) -> bool {
+ builtin_round(x) != x
+}
crates/jrsonnet-stdlib/src/objects.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/objects.rs
+++ b/crates/jrsonnet-stdlib/src/objects.rs
@@ -1,9 +1,10 @@
use jrsonnet_evaluator::{
function::builtin,
val::{StrValue, Val},
- IStr, ObjValue,
+ IStr, ObjValue, ObjValueBuilder,
};
+
#[builtin]
pub fn builtin_object_fields_ex(
obj: ObjValue,
@@ -27,3 +28,16 @@
pub fn builtin_object_has_ex(obj: ObjValue, fname: IStr, hidden: bool) -> bool {
obj.has_field_ex(fname, hidden)
}
+
+#[builtin]
+pub fn builtin_object_remove_key(obj: ObjValue, key: IStr) -> ObjValue {
+ let mut new_obj = ObjValueBuilder::with_capacity(obj.len() - 1);
+ for (k, v) in obj.iter() {
+ if k == key {
+ continue
+ }
+ new_obj.member(k).value_unchecked(v.unwrap())
+ }
+
+ new_obj.build()
+}
crates/jrsonnet-stdlib/src/operator.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/operator.rs
+++ b/crates/jrsonnet-stdlib/src/operator.rs
@@ -39,6 +39,11 @@
}
#[builtin]
+pub fn builtin_xnor(x: bool, y: bool) -> bool {
+ x == y
+}
+
+#[builtin]
pub fn builtin_format(str: IStr, vals: Val) -> Result<String> {
std_format(&str, vals)
}
crates/jrsonnet-stdlib/src/std.jsonnetdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/std.jsonnet
+++ b/crates/jrsonnet-stdlib/src/std.jsonnet
@@ -274,6 +274,12 @@
objectValuesAll(o)::
[o[k] for k in std.objectFieldsAll(o)],
+ objectKeysValues(o)::
+ [{ key: k, value: o[k] } for k in std.objectFields(o)],
+
+ objectKeysValuesAll(o)::
+ [{ key: k, value: o[k] } for k in std.objectFieldsAll(o)],
+
resolvePath(f, r)::
local arr = std.split(f, '/');
std.join('/', std.makeArray(std.length(arr) - 1, function(i) arr[i]) + [r]),
crates/jrsonnet-stdlib/src/strings.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/strings.rs
+++ b/crates/jrsonnet-stdlib/src/strings.rs
@@ -28,6 +28,16 @@
}
#[builtin]
+pub fn builtin_is_empty(str: String) -> bool {
+ str.is_empty()
+}
+
+#[builtin]
+pub fn builtin_equals_ignore_case(x: String, y: String) -> bool {
+ x.to_ascii_lowercase() == y.to_ascii_lowercase()
+}
+
+#[builtin]
pub fn builtin_splitlimit(str: IStr, c: IStr, maxsplits: Either![usize, M1]) -> ArrValue {
use Either2::*;
match maxsplits {