difftreelog
feat add std.isEmpty
in: master
Upstream issue: https://github.com/google/go-jsonnet/pull/678
2 files changed
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 ("round", builtin_round::INST),108 ("isEven", builtin_is_even::INST),109 ("isOdd", builtin_is_odd::INST),110 ("isInteger", builtin_is_integer::INST),111 ("isDecimal", builtin_is_decimal::INST),112 // Operator113 ("mod", builtin_mod::INST),114 ("primitiveEquals", builtin_primitive_equals::INST),115 ("equals", builtin_equals::INST),116 ("xor", builtin_xor::INST),117 ("xnor", builtin_xnor::INST),118 ("format", builtin_format::INST),119 // Sort120 ("sort", builtin_sort::INST),121 ("uniq", builtin_uniq::INST),122 ("set", builtin_set::INST),123 ("minArray", builtin_min_array::INST),124 ("maxArray", builtin_max_array::INST),125 // Hash126 ("md5", builtin_md5::INST),127 ("sha256", builtin_sha256::INST),128 ("sha512", builtin_sha512::INST),129 // Encoding130 ("encodeUTF8", builtin_encode_utf8::INST),131 ("decodeUTF8", builtin_decode_utf8::INST),132 ("base64", builtin_base64::INST),133 ("base64Decode", builtin_base64_decode::INST),134 ("base64DecodeBytes", builtin_base64_decode_bytes::INST),135 // Objects136 ("objectFieldsEx", builtin_object_fields_ex::INST),137 ("objectHasEx", builtin_object_has_ex::INST),138 // Manifest139 ("escapeStringJson", builtin_escape_string_json::INST),140 ("manifestJsonEx", builtin_manifest_json_ex::INST),141 ("manifestYamlDoc", builtin_manifest_yaml_doc::INST),142 ("manifestTomlEx", builtin_manifest_toml_ex::INST),143 // Parsing144 ("parseJson", builtin_parse_json::INST),145 ("parseYaml", builtin_parse_yaml::INST),146 // Strings147 ("codepoint", builtin_codepoint::INST),148 ("substr", builtin_substr::INST),149 ("char", builtin_char::INST),150 ("strReplace", builtin_str_replace::INST),151 ("splitLimit", builtin_splitlimit::INST),152 ("asciiUpper", builtin_ascii_upper::INST),153 ("asciiLower", builtin_ascii_lower::INST),154 ("findSubstr", builtin_find_substr::INST),155 ("parseInt", builtin_parse_int::INST),156 #[cfg(feature = "exp-bigint")]157 ("bigint", builtin_bigint::INST),158 ("parseOctal", builtin_parse_octal::INST),159 ("parseHex", builtin_parse_hex::INST),160 // Misc161 ("length", builtin_length::INST),162 ("startsWith", builtin_starts_with::INST),163 ("endsWith", builtin_ends_with::INST),164 // Sets165 ("setMember", builtin_set_member::INST),166 ("setInter", builtin_set_inter::INST),167 // Compat168 ("__compare", builtin___compare::INST),169 ]170 .iter()171 .cloned()172 {173 builder174 .member(name.into())175 .hide()176 .value(Val::Func(FuncVal::StaticBuiltin(builtin)))177 .expect("no conflict");178 }179180 builder181 .member("extVar".into())182 .hide()183 .value(Val::Func(FuncVal::builtin(builtin_ext_var {184 settings: settings.clone(),185 })))186 .expect("no conflict");187 builder188 .member("native".into())189 .hide()190 .value(Val::Func(FuncVal::builtin(builtin_native {191 settings: settings.clone(),192 })))193 .expect("no conflict");194 builder195 .member("trace".into())196 .hide()197 .value(Val::Func(FuncVal::builtin(builtin_trace { settings })))198 .expect("no conflict");199200 builder201 .member("id".into())202 .hide()203 .value(Val::Func(FuncVal::Id))204 .expect("no conflict");205206 builder.build()207}208209pub trait TracePrinter {210 fn print_trace(&self, loc: CallLocation, value: IStr);211}212213pub struct StdTracePrinter {214 resolver: PathResolver,215}216impl StdTracePrinter {217 pub fn new(resolver: PathResolver) -> Self {218 Self { resolver }219 }220}221impl TracePrinter for StdTracePrinter {222 fn print_trace(&self, loc: CallLocation, value: IStr) {223 eprint!("TRACE:");224 if let Some(loc) = loc.0 {225 let locs = loc.0.map_source_locations(&[loc.1]);226 eprint!(227 " {}:{}",228 match loc.0.source_path().path() {229 Some(p) => self.resolver.resolve(p),230 None => loc.0.source_path().to_string(),231 },232 locs[0].line233 );234 }235 eprintln!(" {value}");236 }237}238239pub struct Settings {240 /// Used for `std.extVar`241 pub ext_vars: HashMap<IStr, TlaArg>,242 /// Used for `std.native`243 pub ext_natives: HashMap<IStr, Cc<TraceBox<dyn Builtin>>>,244 /// Helper to add globals without implementing custom ContextInitializer245 pub globals: GcHashMap<IStr, Thunk<Val>>,246 /// Used for `std.trace`247 pub trace_printer: Box<dyn TracePrinter>,248 /// Used for `std.thisFile`249 pub path_resolver: PathResolver,250}251252fn extvar_source(name: &str, code: impl Into<IStr>) -> Source {253 let source_name = format!("<extvar:{name}>");254 Source::new_virtual(source_name.into(), code.into())255}256257#[derive(Trace, Clone)]258pub struct ContextInitializer {259 // When we don't need to support legacy-this-file, we can reuse same context for all files260 #[cfg(not(feature = "legacy-this-file"))]261 context: Context,262 // Otherwise, we can only keep first stdlib layer, and then stack thisFile on top of it263 #[cfg(feature = "legacy-this-file")]264 stdlib_obj: ObjValue,265 settings: Rc<RefCell<Settings>>,266}267impl ContextInitializer {268 pub fn new(_s: State, resolver: PathResolver) -> Self {269 let settings = Settings {270 ext_vars: Default::default(),271 ext_natives: Default::default(),272 globals: Default::default(),273 trace_printer: Box::new(StdTracePrinter::new(resolver.clone())),274 path_resolver: resolver,275 };276 let settings = Rc::new(RefCell::new(settings));277 Self {278 #[cfg(not(feature = "legacy-this-file"))]279 context: {280 let mut context = ContextBuilder::with_capacity(_s, 1);281 context.bind(282 "std".into(),283 Thunk::evaluated(Val::Obj(stdlib_uncached(settings.clone()))),284 );285 context.build()286 },287 #[cfg(feature = "legacy-this-file")]288 stdlib_obj: stdlib_uncached(settings.clone()),289 settings,290 }291 }292 pub fn settings(&self) -> Ref<Settings> {293 self.settings.borrow()294 }295 pub fn settings_mut(&self) -> RefMut<Settings> {296 self.settings.borrow_mut()297 }298 pub fn add_ext_var(&self, name: IStr, value: Val) {299 self.settings_mut()300 .ext_vars301 .insert(name, TlaArg::Val(value));302 }303 pub fn add_ext_str(&self, name: IStr, value: IStr) {304 self.settings_mut()305 .ext_vars306 .insert(name, TlaArg::String(value));307 }308 pub fn add_ext_code(&self, name: &str, code: impl Into<IStr>) -> Result<()> {309 let code = code.into();310 let source = extvar_source(name, code.clone());311 let parsed = jrsonnet_parser::parse(312 &code,313 &jrsonnet_parser::ParserSettings {314 source: source.clone(),315 },316 )317 .map_err(|e| ImportSyntaxError {318 path: source,319 error: Box::new(e),320 })?;321 // self.data_mut().volatile_files.insert(source_name, code);322 self.settings_mut()323 .ext_vars324 .insert(name.into(), TlaArg::Code(parsed));325 Ok(())326 }327 pub fn add_native(&self, name: IStr, cb: impl Builtin) {328 self.settings_mut()329 .ext_natives330 .insert(name, Cc::new(tb!(cb)));331 }332}333impl jrsonnet_evaluator::ContextInitializer for ContextInitializer {334 #[cfg(not(feature = "legacy-this-file"))]335 fn initialize(&self, _s: State, _source: Source) -> jrsonnet_evaluator::Context {336 let out = self.context.clone();337 let globals = &self.settings().globals;338 if globals.is_empty() {339 return out;340 }341342 let mut out = ContextBuilder::extend(out);343 for (k, v) in globals.iter() {344 out.bind(k.clone(), v.clone());345 }346 out.build()347 }348 #[cfg(feature = "legacy-this-file")]349 fn initialize(&self, s: State, source: Source) -> Context {350 use jrsonnet_evaluator::val::StrValue;351352 let mut builder = ObjValueBuilder::new();353 builder.with_super(self.stdlib_obj.clone());354 builder355 .member("thisFile".into())356 .hide()357 .value(Val::Str(StrValue::Flat(358 match source.source_path().path() {359 Some(p) => self.settings().path_resolver.resolve(p).into(),360 None => source.source_path().to_string().into(),361 },362 )))363 .expect("this object builder is empty");364 let stdlib_with_this_file = builder.build();365366 let mut context = ContextBuilder::with_capacity(s, 1);367 context.bind(368 "std".into(),369 Thunk::evaluated(Val::Obj(stdlib_with_this_file)),370 );371 for (k, v) in self.settings().globals.iter() {372 context.bind(k.clone(), v.clone());373 }374 context.build()375 }376 fn as_any(&self) -> &dyn std::any::Any {377 self378 }379}380381pub trait StateExt {382 /// This method was previously implemented in jrsonnet-evaluator itself383 fn with_stdlib(&self);384 fn add_global(&self, name: IStr, value: Thunk<Val>);385}386387impl StateExt for State {388 fn with_stdlib(&self) {389 let initializer = ContextInitializer::new(self.clone(), PathResolver::new_cwd_fallback());390 self.settings_mut().context_initializer = tb!(initializer)391 }392 fn add_global(&self, name: IStr, value: Thunk<Val>) {393 self.settings()394 .context_initializer395 .as_any()396 .downcast_ref::<ContextInitializer>()397 .expect("not standard context initializer")398 .settings_mut()399 .globals400 .insert(name, value);401 }402}crates/jrsonnet-stdlib/src/strings.rsdiffbeforeafterboth--- a/crates/jrsonnet-stdlib/src/strings.rs
+++ b/crates/jrsonnet-stdlib/src/strings.rs
@@ -28,6 +28,11 @@
}
#[builtin]
+pub fn builtin_is_empty(str: String) -> bool {
+ str.is_empty()
+}
+
+#[builtin]
pub fn builtin_splitlimit(str: IStr, c: IStr, maxsplits: Either![usize, M1]) -> ArrValue {
use Either2::*;
match maxsplits {