difftreelog
feat add std.contains
in: master
2 files changed
crates/jrsonnet-stdlib/src/arrays.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/arrays.rs
+++ b/crates/jrsonnet-stdlib/src/arrays.rs
@@ -231,6 +231,11 @@
}
#[builtin]
+pub fn builtin_contains(arr: IndexableVal, elem: Val) -> Result<bool> {
+ builtin_member(arr, elem)
+}
+
+#[builtin]
pub fn builtin_count(arr: ArrValue, x: Val) -> Result<usize> {
let mut count = 0;
for item in arr.iter() {
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 ("count", builtin_count::INST),84 ("avg", builtin_avg::INST),85 // Math86 ("abs", builtin_abs::INST),87 ("sign", builtin_sign::INST),88 ("max", builtin_max::INST),89 ("min", builtin_min::INST),90 ("sum", builtin_sum::INST),91 ("modulo", builtin_modulo::INST),92 ("floor", builtin_floor::INST),93 ("ceil", builtin_ceil::INST),94 ("log", builtin_log::INST),95 ("pow", builtin_pow::INST),96 ("sqrt", builtin_sqrt::INST),97 ("sin", builtin_sin::INST),98 ("cos", builtin_cos::INST),99 ("tan", builtin_tan::INST),100 ("asin", builtin_asin::INST),101 ("acos", builtin_acos::INST),102 ("atan", builtin_atan::INST),103 ("exp", builtin_exp::INST),104 ("mantissa", builtin_mantissa::INST),105 ("exponent", builtin_exponent::INST),106 // Operator107 ("mod", builtin_mod::INST),108 ("primitiveEquals", builtin_primitive_equals::INST),109 ("equals", builtin_equals::INST),110 ("xor", builtin_xor::INST),111 ("format", builtin_format::INST),112 // Sort113 ("sort", builtin_sort::INST),114 ("uniq", builtin_uniq::INST),115 ("set", builtin_set::INST),116 ("minArray", builtin_min_array::INST),117 ("maxArray", builtin_max_array::INST),118 // Hash119 ("md5", builtin_md5::INST),120 ("sha256", builtin_sha256::INST),121 ("sha512", builtin_sha512::INST),122 // Encoding123 ("encodeUTF8", builtin_encode_utf8::INST),124 ("decodeUTF8", builtin_decode_utf8::INST),125 ("base64", builtin_base64::INST),126 ("base64Decode", builtin_base64_decode::INST),127 ("base64DecodeBytes", builtin_base64_decode_bytes::INST),128 // Objects129 ("objectFieldsEx", builtin_object_fields_ex::INST),130 ("objectHasEx", builtin_object_has_ex::INST),131 // Manifest132 ("escapeStringJson", builtin_escape_string_json::INST),133 ("manifestJsonEx", builtin_manifest_json_ex::INST),134 ("manifestYamlDoc", builtin_manifest_yaml_doc::INST),135 ("manifestTomlEx", builtin_manifest_toml_ex::INST),136 // Parsing137 ("parseJson", builtin_parse_json::INST),138 ("parseYaml", builtin_parse_yaml::INST),139 // Strings140 ("codepoint", builtin_codepoint::INST),141 ("substr", builtin_substr::INST),142 ("char", builtin_char::INST),143 ("strReplace", builtin_str_replace::INST),144 ("splitLimit", builtin_splitlimit::INST),145 ("asciiUpper", builtin_ascii_upper::INST),146 ("asciiLower", builtin_ascii_lower::INST),147 ("findSubstr", builtin_find_substr::INST),148 ("parseInt", builtin_parse_int::INST),149 #[cfg(feature = "exp-bigint")]150 ("bigint", builtin_bigint::INST),151 ("parseOctal", builtin_parse_octal::INST),152 ("parseHex", builtin_parse_hex::INST),153 // Misc154 ("length", builtin_length::INST),155 ("startsWith", builtin_starts_with::INST),156 ("endsWith", builtin_ends_with::INST),157 // Sets158 ("setMember", builtin_set_member::INST),159 ("setInter", builtin_set_inter::INST),160 // Compat161 ("__compare", builtin___compare::INST),162 ]163 .iter()164 .cloned()165 {166 builder167 .member(name.into())168 .hide()169 .value(Val::Func(FuncVal::StaticBuiltin(builtin)))170 .expect("no conflict");171 }172173 builder174 .member("extVar".into())175 .hide()176 .value(Val::Func(FuncVal::builtin(builtin_ext_var {177 settings: settings.clone(),178 })))179 .expect("no conflict");180 builder181 .member("native".into())182 .hide()183 .value(Val::Func(FuncVal::builtin(builtin_native {184 settings: settings.clone(),185 })))186 .expect("no conflict");187 builder188 .member("trace".into())189 .hide()190 .value(Val::Func(FuncVal::builtin(builtin_trace { settings })))191 .expect("no conflict");192193 builder194 .member("id".into())195 .hide()196 .value(Val::Func(FuncVal::Id))197 .expect("no conflict");198199 builder.build()200}201202pub trait TracePrinter {203 fn print_trace(&self, loc: CallLocation, value: IStr);204}205206pub struct StdTracePrinter {207 resolver: PathResolver,208}209impl StdTracePrinter {210 pub fn new(resolver: PathResolver) -> Self {211 Self { resolver }212 }213}214impl TracePrinter for StdTracePrinter {215 fn print_trace(&self, loc: CallLocation, value: IStr) {216 eprint!("TRACE:");217 if let Some(loc) = loc.0 {218 let locs = loc.0.map_source_locations(&[loc.1]);219 eprint!(220 " {}:{}",221 match loc.0.source_path().path() {222 Some(p) => self.resolver.resolve(p),223 None => loc.0.source_path().to_string(),224 },225 locs[0].line226 );227 }228 eprintln!(" {value}");229 }230}231232pub struct Settings {233 /// Used for `std.extVar`234 pub ext_vars: HashMap<IStr, TlaArg>,235 /// Used for `std.native`236 pub ext_natives: HashMap<IStr, Cc<TraceBox<dyn Builtin>>>,237 /// Helper to add globals without implementing custom ContextInitializer238 pub globals: GcHashMap<IStr, Thunk<Val>>,239 /// Used for `std.trace`240 pub trace_printer: Box<dyn TracePrinter>,241 /// Used for `std.thisFile`242 pub path_resolver: PathResolver,243}244245fn extvar_source(name: &str, code: impl Into<IStr>) -> Source {246 let source_name = format!("<extvar:{name}>");247 Source::new_virtual(source_name.into(), code.into())248}249250#[derive(Trace, Clone)]251pub struct ContextInitializer {252 // When we don't need to support legacy-this-file, we can reuse same context for all files253 #[cfg(not(feature = "legacy-this-file"))]254 context: Context,255 // Otherwise, we can only keep first stdlib layer, and then stack thisFile on top of it256 #[cfg(feature = "legacy-this-file")]257 stdlib_obj: ObjValue,258 settings: Rc<RefCell<Settings>>,259}260impl ContextInitializer {261 pub fn new(_s: State, resolver: PathResolver) -> Self {262 let settings = Settings {263 ext_vars: Default::default(),264 ext_natives: Default::default(),265 globals: Default::default(),266 trace_printer: Box::new(StdTracePrinter::new(resolver.clone())),267 path_resolver: resolver,268 };269 let settings = Rc::new(RefCell::new(settings));270 Self {271 #[cfg(not(feature = "legacy-this-file"))]272 context: {273 let mut context = ContextBuilder::with_capacity(_s, 1);274 context.bind(275 "std".into(),276 Thunk::evaluated(Val::Obj(stdlib_uncached(settings.clone()))),277 );278 context.build()279 },280 #[cfg(feature = "legacy-this-file")]281 stdlib_obj: stdlib_uncached(settings.clone()),282 settings,283 }284 }285 pub fn settings(&self) -> Ref<Settings> {286 self.settings.borrow()287 }288 pub fn settings_mut(&self) -> RefMut<Settings> {289 self.settings.borrow_mut()290 }291 pub fn add_ext_var(&self, name: IStr, value: Val) {292 self.settings_mut()293 .ext_vars294 .insert(name, TlaArg::Val(value));295 }296 pub fn add_ext_str(&self, name: IStr, value: IStr) {297 self.settings_mut()298 .ext_vars299 .insert(name, TlaArg::String(value));300 }301 pub fn add_ext_code(&self, name: &str, code: impl Into<IStr>) -> Result<()> {302 let code = code.into();303 let source = extvar_source(name, code.clone());304 let parsed = jrsonnet_parser::parse(305 &code,306 &jrsonnet_parser::ParserSettings {307 source: source.clone(),308 },309 )310 .map_err(|e| ImportSyntaxError {311 path: source,312 error: Box::new(e),313 })?;314 // self.data_mut().volatile_files.insert(source_name, code);315 self.settings_mut()316 .ext_vars317 .insert(name.into(), TlaArg::Code(parsed));318 Ok(())319 }320 pub fn add_native(&self, name: IStr, cb: impl Builtin) {321 self.settings_mut()322 .ext_natives323 .insert(name, Cc::new(tb!(cb)));324 }325}326impl jrsonnet_evaluator::ContextInitializer for ContextInitializer {327 #[cfg(not(feature = "legacy-this-file"))]328 fn initialize(&self, _s: State, _source: Source) -> jrsonnet_evaluator::Context {329 let out = self.context.clone();330 let globals = &self.settings().globals;331 if globals.is_empty() {332 return out;333 }334335 let mut out = ContextBuilder::extend(out);336 for (k, v) in globals.iter() {337 out.bind(k.clone(), v.clone());338 }339 out.build()340 }341 #[cfg(feature = "legacy-this-file")]342 fn initialize(&self, s: State, source: Source) -> Context {343 use jrsonnet_evaluator::val::StrValue;344345 let mut builder = ObjValueBuilder::new();346 builder.with_super(self.stdlib_obj.clone());347 builder348 .member("thisFile".into())349 .hide()350 .value(Val::Str(StrValue::Flat(351 match source.source_path().path() {352 Some(p) => self.settings().path_resolver.resolve(p).into(),353 None => source.source_path().to_string().into(),354 },355 )))356 .expect("this object builder is empty");357 let stdlib_with_this_file = builder.build();358359 let mut context = ContextBuilder::with_capacity(s, 1);360 context.bind(361 "std".into(),362 Thunk::evaluated(Val::Obj(stdlib_with_this_file)),363 );364 for (k, v) in self.settings().globals.iter() {365 context.bind(k.clone(), v.clone());366 }367 context.build()368 }369 fn as_any(&self) -> &dyn std::any::Any {370 self371 }372}373374pub trait StateExt {375 /// This method was previously implemented in jrsonnet-evaluator itself376 fn with_stdlib(&self);377 fn add_global(&self, name: IStr, value: Thunk<Val>);378}379380impl StateExt for State {381 fn with_stdlib(&self) {382 let initializer = ContextInitializer::new(self.clone(), PathResolver::new_cwd_fallback());383 self.settings_mut().context_initializer = tb!(initializer)384 }385 fn add_global(&self, name: IStr, value: Thunk<Val>) {386 self.settings()387 .context_initializer388 .as_any()389 .downcast_ref::<ContextInitializer>()390 .expect("not standard context initializer")391 .settings_mut()392 .globals393 .insert(name, value);394 }395}