difftreelog
feat library paths
in: master
5 files changed
cmds/jrsonnet/src/main.rsdiffbeforeafterboth--- a/cmds/jrsonnet/src/main.rs
+++ b/cmds/jrsonnet/src/main.rs
@@ -99,6 +99,9 @@
)]
max_trace: usize,
+ #[clap(long, short = "J", about = "Library search dir")]
+ jpath: Vec<PathBuf>,
+
#[clap(
long,
default_value = "3",
@@ -112,10 +115,15 @@
fn main() {
let opts: Opts = Opts::parse();
- let evaluator = jsonnet_evaluator::EvaluationState::new(EvaluationSettings {
- import_resolver: Box::new(|path| String::from_utf8(std::fs::read(path).unwrap()).unwrap()),
- ..Default::default()
- });
+ let evaluator = jsonnet_evaluator::EvaluationState::new(
+ EvaluationSettings {
+ max_stack_trace_size: opts.max_trace,
+ max_stack_frames: opts.max_stack,
+ },
+ Box::new(jsonnet_evaluator::FileImportResolver {
+ library_paths: opts.jpath.clone(),
+ }),
+ );
if !opts.no_stdlib {
evaluator.with_stdlib();
}
crates/jsonnet-evaluator/src/error.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/error.rs
+++ b/crates/jsonnet-evaluator/src/error.rs
@@ -1,5 +1,6 @@
use crate::ValType;
use jsonnet_parser::LocExpr;
+use std::path::PathBuf;
#[derive(Debug)]
pub enum Error {
@@ -24,6 +25,12 @@
StandaloneSuper,
+ ImportFileNotFound(PathBuf, PathBuf),
+ ResolvedFileNotFound(PathBuf),
+ ImportBadFileUtf8(PathBuf),
+ ImportNotSupported(PathBuf, PathBuf),
+ ImportSyntaxError(jsonnet_parser::ParseError),
+
RuntimeError(String),
StackOverflow,
FractionalIndex,
crates/jsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth1use crate::{2 context_creator, create_error, future_wrapper, lazy_val, push, with_state, Context,3 ContextCreator, Error, FuncDesc, LazyBinding, LazyVal, ObjMember, ObjValue, Result, Val,4 ValType,5};6use closure::closure;7use jsonnet_parser::{8 el, Arg, ArgsDesc, AssertStmt, BinaryOpType, BindSpec, CompSpec, Expr, FieldMember,9 ForSpecData, IfSpecData, LiteralType, LocExpr, Member, ObjBody, ParamsDesc, UnaryOpType,10 Visibility,11};12use std::{13 collections::{BTreeMap, HashMap},14 rc::Rc,15};1617pub fn evaluate_binding(b: &BindSpec, context_creator: ContextCreator) -> (String, LazyBinding) {18 let b = b.clone();19 if let Some(params) = &b.params {20 let params = params.clone();21 (22 b.name.clone(),23 LazyBinding::Bindable(Rc::new(move |this, super_obj| {24 Ok(lazy_val!(25 closure!(clone b, clone params, clone context_creator, || Ok(evaluate_method(26 context_creator.0(this.clone(), super_obj.clone())?,27 params.clone(),28 b.value.clone(),29 )))30 ))31 })),32 )33 } else {34 (35 b.name.clone(),36 LazyBinding::Bindable(Rc::new(move |this, super_obj| {37 Ok(lazy_val!(closure!(clone context_creator, clone b, ||38 push(b.value.clone(), "thunk".to_owned(), ||{39 evaluate(40 context_creator.0(this.clone(), super_obj.clone())?,41 &b.value42 )43 })44 )))45 })),46 )47 }48}4950pub fn evaluate_method(ctx: Context, params: ParamsDesc, body: LocExpr) -> Val {51 Val::Func(FuncDesc { ctx, params, body })52}5354pub fn evaluate_field_name(55 context: Context,56 field_name: &jsonnet_parser::FieldName,57) -> Result<Option<String>> {58 Ok(match field_name {59 jsonnet_parser::FieldName::Fixed(n) => Some(n.clone()),60 jsonnet_parser::FieldName::Dyn(expr) => {61 let value = evaluate(context, expr)?.unwrap_if_lazy()?;62 if matches!(value, Val::Null) {63 None64 } else {65 Some(value.try_cast_str("dynamic field name")?)66 }67 }68 })69}7071pub fn evaluate_unary_op(op: UnaryOpType, b: &Val) -> Result<Val> {72 Ok(match (op, b) {73 (o, Val::Lazy(l)) => evaluate_unary_op(o, &l.evaluate()?)?,74 (UnaryOpType::Not, Val::Bool(v)) => Val::Bool(!v),75 (UnaryOpType::Minus, Val::Num(n)) => Val::Num(-*n),76 (UnaryOpType::BitNot, Val::Num(n)) => Val::Num(!(*n as i32) as f64),77 (op, o) => panic!("unary op not implemented: {:?} {:?}", op, o),78 })79}8081pub(crate) fn evaluate_add_op(a: &Val, b: &Val) -> Result<Val> {82 Ok(match (a, b) {83 (Val::Str(v1), Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),8485 // Can't use generic json serialization way, because it depends on number to string concatenation (std.jsonnet:890)86 (Val::Num(n), Val::Str(o)) => Val::Str(format!("{}{}", n, o)),87 (Val::Str(o), Val::Num(n)) => Val::Str(format!("{}{}", o, n)),8889 (Val::Str(s), o) => Val::Str(format!("{}{}", s, o.clone().into_json(0)?)),90 (o, Val::Str(s)) => Val::Str(format!("{}{}", o.clone().into_json(0)?, s)),9192 (Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),93 (Val::Arr(a), Val::Arr(b)) => Val::Arr([&a[..], &b[..]].concat()),94 (Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),95 _ => panic!("can't add: {:?} and {:?}", a, b),96 })97}9899pub fn evaluate_binary_op_special(100 context: Context,101 a: &LocExpr,102 op: BinaryOpType,103 b: &LocExpr,104) -> Result<Val> {105 Ok(106 match (evaluate(context.clone(), &a)?.unwrap_if_lazy()?, op, b) {107 (Val::Bool(true), BinaryOpType::Or, _o) => Val::Bool(true),108 (Val::Bool(false), BinaryOpType::And, _o) => Val::Bool(false),109 (a, op, eb) => {110 evaluate_binary_op_normal(&a, op, &evaluate(context, eb)?.unwrap_if_lazy()?)?111 }112 },113 )114}115116pub fn evaluate_binary_op_normal(a: &Val, op: BinaryOpType, b: &Val) -> Result<Val> {117 Ok(match (a, op, b) {118 (a, BinaryOpType::Add, b) => evaluate_add_op(a, b)?,119120 (Val::Str(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Str(v1.repeat(*v2 as usize)),121122 // Bool X Bool123 (Val::Bool(a), BinaryOpType::And, Val::Bool(b)) => Val::Bool(*a && *b),124 (Val::Bool(a), BinaryOpType::Or, Val::Bool(b)) => Val::Bool(*a || *b),125126 // Str X Str127 (Val::Str(v1), BinaryOpType::Lt, Val::Str(v2)) => Val::Bool(v1 < v2),128 (Val::Str(v1), BinaryOpType::Gt, Val::Str(v2)) => Val::Bool(v1 > v2),129 (Val::Str(v1), BinaryOpType::Lte, Val::Str(v2)) => Val::Bool(v1 <= v2),130 (Val::Str(v1), BinaryOpType::Gte, Val::Str(v2)) => Val::Bool(v1 >= v2),131132 // Num X Num133 (Val::Num(v1), BinaryOpType::Mul, Val::Num(v2)) => Val::Num(v1 * v2),134 (Val::Num(v1), BinaryOpType::Div, Val::Num(v2)) => {135 if *v2 <= f64::EPSILON {136 create_error(crate::Error::DivisionByZero)?137 }138 Val::Num(v1 / v2)139 }140141 (Val::Num(v1), BinaryOpType::Sub, Val::Num(v2)) => Val::Num(v1 - v2),142143 (Val::Num(v1), BinaryOpType::Lt, Val::Num(v2)) => Val::Bool(v1 < v2),144 (Val::Num(v1), BinaryOpType::Gt, Val::Num(v2)) => Val::Bool(v1 > v2),145 (Val::Num(v1), BinaryOpType::Lte, Val::Num(v2)) => Val::Bool(v1 <= v2),146 (Val::Num(v1), BinaryOpType::Gte, Val::Num(v2)) => Val::Bool(v1 >= v2),147148 (Val::Num(v1), BinaryOpType::BitAnd, Val::Num(v2)) => {149 Val::Num(((*v1 as i32) & (*v2 as i32)) as f64)150 }151 (Val::Num(v1), BinaryOpType::BitOr, Val::Num(v2)) => {152 Val::Num(((*v1 as i32) | (*v2 as i32)) as f64)153 }154 (Val::Num(v1), BinaryOpType::BitXor, Val::Num(v2)) => {155 Val::Num(((*v1 as i32) ^ (*v2 as i32)) as f64)156 }157 (Val::Num(v1), BinaryOpType::Lhs, Val::Num(v2)) => {158 Val::Num(((*v1 as i32) << (*v2 as i32)) as f64)159 }160 (Val::Num(v1), BinaryOpType::Rhs, Val::Num(v2)) => {161 Val::Num(((*v1 as i32) >> (*v2 as i32)) as f64)162 }163164 _ => panic!("no rules for binary operation: {:?} {:?} {:?}", a, op, b),165 })166}167168future_wrapper!(HashMap<String, LazyBinding>, FutureNewBindings);169future_wrapper!(ObjValue, FutureObjValue);170171#[inline(always)]172pub fn evaluate_comp<T>(173 context: Context,174 value: &impl Fn(Context) -> Result<T>,175 specs: &[CompSpec],176) -> Result<Option<Vec<T>>> {177 Ok(match specs.get(0) {178 None => Some(vec![value(context)?]),179 Some(CompSpec::IfSpec(IfSpecData(cond))) => {180 if evaluate(context.clone(), &cond)?.try_cast_bool("if spec")? {181 evaluate_comp(context, value, &specs[1..])?182 } else {183 None184 }185 }186 Some(CompSpec::ForSpec(ForSpecData(var, expr))) => {187 match evaluate(context.clone(), &expr)?.unwrap_if_lazy()? {188 Val::Arr(list) => {189 let mut out = Vec::new();190 for item in list {191 let item = item.clone().unwrap_if_lazy()?;192 out.push(evaluate_comp(193 context.with_var(var.clone(), item)?,194 value,195 &specs[1..],196 )?);197 }198 Some(out.into_iter().flatten().flatten().collect())199 }200 _ => panic!("for expression evaluated to non-iterable value"),201 }202 }203 })204}205206// TODO: Asserts207pub fn evaluate_object(context: Context, object: ObjBody) -> Result<ObjValue> {208 Ok(match object {209 ObjBody::MemberList(members) => {210 let new_bindings = FutureNewBindings::new();211 let future_this = FutureObjValue::new();212 let context_creator = context_creator!(213 closure!(clone context, clone new_bindings, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {214 Ok(context.clone().extend_unbound(215 new_bindings.clone().unwrap(),216 context.clone().dollar().clone().or_else(||this.clone()),217 Some(this.unwrap()),218 super_obj219 )?)220 })221 );222 {223 let mut bindings: HashMap<String, LazyBinding> = HashMap::new();224 for (n, b) in members225 .iter()226 .filter_map(|m| match m {227 Member::BindStmt(b) => Some(b.clone()),228 _ => None,229 })230 .map(|b| evaluate_binding(&b, context_creator.clone()))231 {232 bindings.insert(n, b);233 }234 new_bindings.fill(bindings);235 }236237 let mut new_members = BTreeMap::new();238 for member in members.into_iter() {239 match member {240 Member::Field(FieldMember {241 name,242 plus,243 params: None,244 visibility,245 value,246 }) => {247 let name = evaluate_field_name(context.clone(), &name)?;248 if name.is_none() {249 continue;250 }251 let name = name.unwrap();252 new_members.insert(253 name.clone(),254 ObjMember {255 add: plus,256 visibility: visibility.clone(),257 invoke: LazyBinding::Bindable(Rc::new(258 closure!(clone name, clone value, clone context_creator, |this, super_obj| {259 Ok(LazyVal::new_resolved(push(value.clone(), "object ".to_owned()+&name+" field", ||{260 let context = context_creator.0(this, super_obj)?;261 evaluate(262 context,263 &value,264 )?.unwrap_if_lazy()265 })?))266 }),267 )),268 },269 );270 }271 Member::Field(FieldMember {272 name,273 params: Some(params),274 value,275 ..276 }) => {277 let name = evaluate_field_name(context.clone(), &name)?;278 if name.is_none() {279 continue;280 }281 let name = name.unwrap();282 new_members.insert(283 name,284 ObjMember {285 add: false,286 visibility: Visibility::Hidden,287 invoke: LazyBinding::Bindable(Rc::new(288 closure!(clone value, clone context_creator, |this, super_obj| {289 // TODO: Assert290 Ok(LazyVal::new_resolved(evaluate_method(291 context_creator.0(this, super_obj)?,292 params.clone(),293 value.clone(),294 )))295 }),296 )),297 },298 );299 }300 Member::BindStmt(_) => {}301 Member::AssertStmt(_) => {}302 }303 }304 future_this.fill(ObjValue::new(None, Rc::new(new_members)))305 }306 ObjBody::ObjComp {307 pre_locals,308 key,309 value,310 post_locals,311 compspecs,312 } => {313 let future_this = FutureObjValue::new();314 let mut new_members = BTreeMap::new();315 for (k, v) in evaluate_comp(316 context.clone(),317 &|ctx| {318 let new_bindings = FutureNewBindings::new();319 let context_creator = context_creator!(320 closure!(clone context, clone new_bindings, |this: Option<ObjValue>, super_obj: Option<ObjValue>| {321 Ok(context.clone().extend_unbound(322 new_bindings.clone().unwrap(),323 context.clone().dollar().clone().or_else(||this.clone()),324 None,325 super_obj326 )?)327 })328 );329 let mut bindings: HashMap<String, LazyBinding> = HashMap::new();330 for (n, b) in pre_locals331 .iter()332 .chain(post_locals.iter())333 .map(|b| evaluate_binding(b, context_creator.clone()))334 {335 bindings.insert(n, b);336 }337 let bindings = new_bindings.fill(bindings);338 let ctx = ctx.extend_unbound(bindings, None, None, None)?;339 let key = evaluate(ctx.clone(), &key)?;340 let value = LazyBinding::Bindable(Rc::new(341 closure!(clone ctx, clone value, |this, _super_obj| {342 Ok(LazyVal::new_resolved(evaluate(ctx.extend(HashMap::new(), None, this, None)?, &value)?))343 }),344 ));345346 Ok((key, value))347 },348 &compspecs,349 )?350 .unwrap()351 {352 match k {353 Val::Null => {}354 Val::Str(n) => {355 new_members.insert(356 n,357 ObjMember {358 add: false,359 visibility: Visibility::Normal,360 invoke: v,361 },362 );363 }364 v => create_error(Error::FieldMustBeStringGot(v.value_type()?))?,365 }366 }367368 future_this.fill(ObjValue::new(None, Rc::new(new_members)))369 }370 })371}372373#[inline(always)]374pub fn evaluate(context: Context, expr: &LocExpr) -> Result<Val> {375 use Expr::*;376 let locexpr = expr.clone();377 let LocExpr(expr, loc) = expr;378 Ok(match &**expr {379 Literal(LiteralType::This) => Val::Obj(380 context381 .this()382 .clone()383 .unwrap_or_else(|| panic!("this not found")),384 ),385 Literal(LiteralType::Dollar) => Val::Obj(386 context387 .dollar()388 .clone()389 .unwrap_or_else(|| panic!("dollar not found")),390 ),391 Literal(LiteralType::True) => Val::Bool(true),392 Literal(LiteralType::False) => Val::Bool(false),393 Literal(LiteralType::Null) => Val::Null,394 Parened(e) => evaluate(context, e)?,395 Str(v) => Val::Str(v.clone()),396 Num(v) => Val::Num(*v),397 BinaryOp(v1, o, v2) => evaluate_binary_op_special(context, &v1, *o, &v2)?,398 UnaryOp(o, v) => evaluate_unary_op(*o, &evaluate(context, v)?)?,399 Var(name) => push(locexpr, "var".to_owned(), || {400 Val::Lazy(context.binding(&name)?).unwrap_if_lazy()401 })?,402 Index(LocExpr(v, _), index) if matches!(&**v, Expr::Literal(LiteralType::Super)) => {403 let name = evaluate(context.clone(), index)?.try_cast_str("object index")?;404 context405 .super_obj()406 .clone()407 .expect("no super found")408 .get_raw(&name, &context.this().clone().expect("no this found"))?409 .expect("value not found")410 }411 Index(value, index) => {412 match (413 evaluate(context.clone(), value)?.unwrap_if_lazy()?,414 evaluate(context, index)?,415 ) {416 (Val::Obj(v), Val::Str(s)) => {417 if let Some(v) = v.get(&s)? {418 v.unwrap_if_lazy()?419 } else if let Some(Val::Str(n)) = v.get("__intristic_namespace__")? {420 Val::Intristic(n, s)421 } else {422 create_error(crate::Error::NoSuchField(s))?423 }424 }425 (Val::Obj(_), n) => create_error(crate::Error::ValueIndexMustBeTypeGot(426 ValType::Obj,427 ValType::Str,428 n.value_type()?,429 ))?,430431 (Val::Arr(v), Val::Num(n)) => {432 if n.fract() > f64::EPSILON {433 create_error(crate::Error::FractionalIndex)?434 }435 v.get(n as usize)436 .unwrap_or_else(|| panic!("out of bounds"))437 .clone()438 .unwrap_if_lazy()?439 }440 (Val::Arr(_), Val::Str(n)) => {441 create_error(crate::Error::AttemptedIndexAnArrayWithString(n))?442 }443 (Val::Arr(_), n) => create_error(crate::Error::ValueIndexMustBeTypeGot(444 ValType::Arr,445 ValType::Num,446 n.value_type()?,447 ))?,448449 (Val::Str(s), Val::Num(n)) => {450 Val::Str(s.chars().skip(n as usize).take(1).collect())451 }452 (Val::Str(_), n) => create_error(crate::Error::ValueIndexMustBeTypeGot(453 ValType::Str,454 ValType::Num,455 n.value_type()?,456 ))?,457458 (v, _) => create_error(crate::Error::CantIndexInto(v.value_type()?))?,459 }460 }461 LocalExpr(bindings, returned) => {462 let mut new_bindings: HashMap<String, LazyBinding> = HashMap::new();463 let future_context = Context::new_future();464465 let context_creator = context_creator!(466 closure!(clone future_context, |_, _| Ok(future_context.clone().unwrap()))467 );468469 for (k, v) in bindings470 .iter()471 .map(|b| evaluate_binding(b, context_creator.clone()))472 {473 new_bindings.insert(k, v);474 }475476 let context = context477 .extend_unbound(new_bindings, None, None, None)?478 .into_future(future_context);479 evaluate(context, &returned.clone())?480 }481 Arr(items) => {482 let mut out = Vec::with_capacity(items.len());483 for item in items {484 out.push(Val::Lazy(lazy_val!(485 closure!(clone context, clone item, || {486 evaluate(context.clone(), &item)487 })488 )));489 }490 Val::Arr(out)491 }492 ArrComp(expr, compspecs) => Val::Arr(493 // First compspec should be forspec, so no "None" possible here494 evaluate_comp(context, &|ctx| evaluate(ctx, expr), compspecs)?.unwrap(),495 ),496 Obj(body) => Val::Obj(evaluate_object(context, body.clone())?),497 ObjExtend(s, t) => evaluate_add_op(498 &evaluate(context.clone(), s)?,499 &Val::Obj(evaluate_object(context, t.clone())?),500 )?,501 Apply(value, args, tailstrict) => {502 let value = evaluate(context.clone(), value)?.unwrap_if_lazy()?;503 match value {504 Val::Intristic(ns, name) => match (&ns as &str, &name as &str) {505 // arr/string/function506 ("std", "length") => {507 assert_eq!(args.len(), 1);508 let expr = &args.get(0).unwrap().1;509 match evaluate(context, expr)? {510 Val::Str(n) => Val::Num(n.chars().count() as f64),511 Val::Arr(i) => Val::Num(i.len() as f64),512 Val::Obj(o) => Val::Num(513 o.fields_visibility()514 .into_iter()515 .filter(|(_k, v)| *v)516 .count() as f64,517 ),518 v => panic!("can't get length of {:?}", v),519 }520 }521 // any522 ("std", "type") => {523 assert_eq!(args.len(), 1);524 let expr = &args.get(0).unwrap().1;525 Val::Str(evaluate(context, expr)?.value_type()?.name().to_owned())526 }527 // length, idx=>any528 ("std", "makeArray") => {529 assert_eq!(args.len(), 2);530 if let (Val::Num(v), Val::Func(d)) = (531 evaluate(context.clone(), &args[0].1)?,532 evaluate(context, &args[1].1)?,533 ) {534 assert!(v >= 0.0);535 let mut out = Vec::with_capacity(v as usize);536 for i in 0..v as usize {537 let call_ctx =538 Context::new().with_var("v".to_owned(), Val::Num(i as f64))?;539 out.push(d.evaluate(540 call_ctx,541 &ArgsDesc(vec![Arg(None, el!(Expr::Var("v".to_owned())))]),542 true,543 )?)544 }545 Val::Arr(out)546 } else {547 panic!("bad makeArray call");548 }549 }550 // string551 ("std", "codepoint") => {552 assert_eq!(args.len(), 1);553 if let Val::Str(s) = evaluate(context, &args[0].1)? {554 assert!(555 s.chars().count() == 1,556 "std.codepoint should receive single char string"557 );558 Val::Num(s.chars().take(1).next().unwrap() as u32 as f64)559 } else {560 panic!("bad codepoint call");561 }562 }563 // object, includeHidden564 ("std", "objectFieldsEx") => {565 assert_eq!(args.len(), 2);566 if let (Val::Obj(body), Val::Bool(include_hidden)) = (567 evaluate(context.clone(), &args[0].1)?,568 evaluate(context, &args[1].1)?,569 ) {570 Val::Arr(571 body.fields_visibility()572 .into_iter()573 .filter(|(_k, v)| *v || include_hidden)574 .map(|(k, _v)| Val::Str(k))575 .collect(),576 )577 } else {578 panic!("bad objectFieldsEx call");579 }580 }581 // object, field, includeHidden582 ("std", "objectHasEx") => {583 assert_eq!(args.len(), 3);584 if let (Val::Obj(body), Val::Str(name), Val::Bool(include_hidden)) = (585 evaluate(context.clone(), &args[0].1)?,586 evaluate(context.clone(), &args[1].1)?,587 evaluate(context, &args[2].1)?,588 ) {589 Val::Bool(590 body.fields_visibility()591 .into_iter()592 .filter(|(_k, v)| *v || include_hidden)593 .any(|(k, _v)| k == name),594 )595 } else {596 panic!("bad objectHasEx call");597 }598 }599 ("std", "primitiveEquals") => {600 assert_eq!(args.len(), 2);601 let (a, b) = (602 evaluate(context.clone(), &args[0].1)?,603 evaluate(context, &args[1].1)?,604 );605 Val::Bool(a == b)606 }607 ("std", "modulo") => {608 assert_eq!(args.len(), 2);609 if let (Val::Num(a), Val::Num(b)) = (610 evaluate(context.clone(), &args[0].1)?,611 evaluate(context, &args[1].1)?,612 ) {613 Val::Num(a % b)614 } else {615 panic!("bad modulo call");616 }617 }618 ("std", "floor") => {619 assert_eq!(args.len(), 1);620 if let Val::Num(a) = evaluate(context, &args[0].1)? {621 Val::Num(a.floor())622 } else {623 panic!("bad floor call");624 }625 }626 ("std", "trace") => {627 assert_eq!(args.len(), 2);628 if let (Val::Str(a), b) = (629 evaluate(context.clone(), &args[0].1)?,630 evaluate(context, &args[1].1)?,631 ) {632 // TODO: Line numbers as in original jsonnet633 println!("TRACE: {}", a);634 b635 } else {636 panic!("bad trace call");637 }638 }639 ("std", "pow") => {640 assert_eq!(args.len(), 2);641 if let (Val::Num(a), Val::Num(b)) = (642 evaluate(context.clone(), &args[0].1)?,643 evaluate(context, &args[1].1)?,644 ) {645 Val::Num(a.powf(b))646 } else {647 panic!("bad pow call");648 }649 }650 ("std", "extVar") => {651 assert_eq!(args.len(), 1);652 if let Val::Str(a) = evaluate(context, &args[0].1)? {653 with_state(|s| s.0.ext_vars.borrow().get(&a).cloned()).ok_or_else(654 || {655 create_error::<()>(crate::Error::UndefinedExternalVariable(a))656 .err()657 .unwrap()658 },659 )?660 } else {661 panic!("bad extVar call");662 }663 }664 ("std", "filter") => {665 assert_eq!(args.len(), 2);666 if let (Val::Func(predicate), Val::Arr(arr)) = (667 evaluate(context, &args[0].1)?,668 evaluate(context, &args[1].1)?,669 ) {670 Val::Arr(671 arr.into_iter()672 .filter(|e| {673 predicate674 .evaluate_values(&context, &[e.clone()])675 .unwrap()676 .try_cast_bool("filter predicate")677 .unwrap()678 })679 .collect(),680 )681 } else {682 panic!("bad filter call");683 }684 }685 // faster686 ("std", "join") => {687 assert_eq!(args.len(), 2);688 let joiner = evaluate(context, &args[0].1)?.unwrap_if_lazy()?;689 let items = evaluate(context, &args[1].1)?.unwrap_if_lazy()?;690 println!("Before");691 let result = match (joiner, items) {692 (Val::Arr(joiner_items), Val::Arr(items)) => {693 // TODO: Minimal size should be known694 let mut out = Vec::new();695696 let mut first = true;697 for item in items {698 if let Val::Arr(items) = item.unwrap_if_lazy()? {699 if !first {700 out.extend(joiner_items.iter().cloned());701 }702 first = false;703 out.extend(items);704 } else {705 panic!("all array items should be arrays")706 }707 }708709 Val::Arr(out)710 }711 (Val::Str(joiner), Val::Arr(items)) => {712 let mut out = String::new();713714 let mut first = true;715 for item in items {716 if let Val::Str(item) = item.unwrap_if_lazy()? {717 if !first {718 out += &joiner;719 }720 first = false;721 out += &item;722 } else {723 panic!("all array items should be strings")724 }725 }726727 Val::Str(out)728 }729 (joiner, items) => panic!("bad join call: {:?} {:?}", joiner, items),730 };731 println!("After");732 result733 }734 (ns, name) => panic!("Intristic not found: {}.{}", ns, name),735 },736 Val::Func(f) => {737 let body = #[inline(always)]738 || f.evaluate(context, args, *tailstrict);739 if *tailstrict {740 body()?741 } else {742 push(locexpr, "function call".to_owned(), body)?743 }744 }745 _ => panic!("{:?} is not a function", value),746 }747 }748 Function(params, body) => evaluate_method(context, params.clone(), body.clone()),749 AssertExpr(AssertStmt(value, msg), returned) => {750 let assertion_result = push(value.clone(), "assertion condition".to_owned(), || {751 evaluate(context.clone(), &value)?752 .try_cast_bool("assertion condition should be boolean")753 })?;754 if assertion_result {755 push(756 returned.clone(),757 "assert 'return' branch".to_owned(),758 || evaluate(context, returned),759 )?760 } else if let Some(msg) = msg {761 panic!(762 "assertion failed ({:?}): {}",763 value,764 evaluate(context, msg)?.try_cast_str("assertion message should be string")?765 );766 } else {767 panic!("assertion failed ({:?}): no message", value);768 }769 }770 Error(e) => create_error(crate::Error::RuntimeError(771 evaluate(context, e)?.try_cast_str("error text should be string")?,772 ))?,773 IfElse {774 cond,775 cond_then,776 cond_else,777 } => {778 if evaluate(context, &cond.0)?.try_cast_bool("if condition should be boolean")? {779 evaluate(context, cond_then)?780 } else {781 match cond_else {782 Some(v) => evaluate(context, v)?,783 None => Val::Null,784 }785 }786 }787 Import(path) => {788 let mut lib_path = loc789 .clone()790 .expect("imports can't be used without loc_data")791 .0792 .clone();793 lib_path.pop();794 lib_path.push(path);795 with_state(|s| s.import_file(&lib_path))?796 }797 ImportStr(path) => {798 let mut file_path = loc799 .clone()800 .expect("imports can't be used without loc_data")801 .0802 .clone();803 file_path.pop();804 file_path.push(path);805 Val::Str(with_state(|s| s.import_file_str(&file_path))?)806 }807 Literal(LiteralType::Super) => return create_error(crate::error::Error::StandaloneSuper),808 })809}crates/jsonnet-evaluator/src/import.rsdiffbeforeafterboth--- /dev/null
+++ b/crates/jsonnet-evaluator/src/import.rs
@@ -0,0 +1,85 @@
+use crate::create_error;
+use crate::error::{Error, Result};
+use fs::File;
+use std::fs;
+use std::io::Read;
+use std::{cell::RefCell, collections::HashMap, path::PathBuf};
+
+pub trait ImportResolver {
+ fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<PathBuf>;
+ fn load_file_contents(&self, resolved: &PathBuf) -> Result<String>;
+}
+
+pub struct DummyImportResolver;
+impl ImportResolver for DummyImportResolver {
+ fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<PathBuf> {
+ create_error(Error::ImportNotSupported(from.clone(), path.clone()))
+ }
+ fn load_file_contents(&self, _resolved: &PathBuf) -> Result<String> {
+ // Can be only caused by library direct consumer, not by supplied jsonnet
+ panic!("dummy resolver can't load any file")
+ }
+}
+impl Default for Box<dyn ImportResolver> {
+ fn default() -> Self {
+ Box::new(DummyImportResolver)
+ }
+}
+
+pub struct FileImportResolver {
+ pub library_paths: Vec<PathBuf>,
+}
+impl ImportResolver for FileImportResolver {
+ fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<PathBuf> {
+ let mut new_path = from.clone();
+ new_path.push(path);
+ if new_path.exists() {
+ Ok(new_path)
+ } else {
+ for library_path in self.library_paths.iter() {
+ let mut cloned = library_path.clone();
+ cloned.push(path);
+ if cloned.exists() {
+ return Ok(cloned);
+ }
+ }
+ create_error(Error::ImportFileNotFound(from.clone(), path.clone()))
+ }
+ }
+ fn load_file_contents(&self, id: &PathBuf) -> Result<String> {
+ let mut file = File::open(id).map_err(|_e| {
+ create_error::<()>(Error::ResolvedFileNotFound(id.clone()))
+ .err()
+ .unwrap()
+ })?;
+ let mut out = String::new();
+ file.read_to_string(&mut out).map_err(|_e| {
+ create_error::<()>(Error::ImportBadFileUtf8(id.clone()))
+ .err()
+ .unwrap()
+ })?;
+ Ok(out)
+ }
+}
+
+pub struct CachingImportResolver {
+ resolution_cache: RefCell<HashMap<(PathBuf, PathBuf), Result<PathBuf>>>,
+ loading_cache: RefCell<HashMap<PathBuf, Result<String>>>,
+ inner: Box<dyn ImportResolver>,
+}
+impl ImportResolver for CachingImportResolver {
+ fn resolve_file(&self, from: &PathBuf, path: &PathBuf) -> Result<PathBuf> {
+ self.resolution_cache
+ .borrow_mut()
+ .entry((from.clone(), path.clone()))
+ .or_insert_with(|| self.inner.resolve_file(from, path))
+ .clone()
+ }
+ fn load_file_contents(&self, resolved: &PathBuf) -> Result<String> {
+ self.loading_cache
+ .borrow_mut()
+ .entry(resolved.clone())
+ .or_insert_with(|| self.inner.load_file_contents(resolved))
+ .clone()
+ }
+}
crates/jsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/lib.rs
+++ b/crates/jsonnet-evaluator/src/lib.rs
@@ -8,6 +8,7 @@
mod error;
mod evaluate;
mod function;
+mod import;
mod map;
mod obj;
mod val;
@@ -17,6 +18,7 @@
pub use error::*;
pub use evaluate::*;
pub use function::parse_function_call;
+pub use import::*;
use jsonnet_parser::*;
pub use obj::*;
use std::{cell::RefCell, collections::HashMap, fmt::Debug, path::PathBuf, rc::Rc};
@@ -46,16 +48,12 @@
pub struct EvaluationSettings {
pub max_stack_frames: usize,
pub max_stack_trace_size: usize,
- pub import_resolver: Box<dyn Fn(&PathBuf) -> String>,
}
impl Default for EvaluationSettings {
fn default() -> Self {
EvaluationSettings {
max_stack_frames: 200,
max_stack_trace_size: 20,
- import_resolver: Box::new(|path| {
- panic!("default EvaluationSettings have no support for import resolution, can't import {:?}", path)
- }),
}
}
}
@@ -75,6 +73,7 @@
ext_vars: RefCell<HashMap<String, Val>>,
settings: EvaluationSettings,
+ import_resolver: Box<dyn ImportResolver>,
}
thread_local! {
@@ -101,9 +100,10 @@
#[derive(Default, Clone)]
pub struct EvaluationState(Rc<EvaluationStateInternals>);
impl EvaluationState {
- pub fn new(settings: EvaluationSettings) -> Self {
+ pub fn new(settings: EvaluationSettings, import_resolver: Box<dyn ImportResolver>) -> Self {
EvaluationState(Rc::new(EvaluationStateInternals {
settings,
+ import_resolver,
..Default::default()
}))
}
@@ -171,19 +171,29 @@
}
Ok(value)
}
- pub(crate) fn import_file(&self, path: &PathBuf) -> Result<Val> {
- if !self.0.files.borrow().contains_key(path) {
- let file_str = (self.0.settings.import_resolver)(path);
- self.add_file(path.clone(), file_str).unwrap();
+ pub(crate) fn import_file(&self, from: &PathBuf, path: &PathBuf) -> Result<Val> {
+ let file_path = self.0.import_resolver.resolve_file(from, path)?;
+ {
+ let files = self.0.files.borrow();
+ if files.contains_key(&file_path) {
+ return self.evaluate_file(&file_path);
+ }
}
- self.evaluate_file_in_current_state(path)
+ let contents = self.0.import_resolver.load_file_contents(&file_path)?;
+ self.add_file(file_path.clone(), contents).map_err(|e| {
+ create_error::<()>(Error::ImportSyntaxError(e))
+ .err()
+ .unwrap()
+ })?;
+ self.evaluate_file(&file_path)
}
- pub(crate) fn import_file_str(&self, path: &PathBuf) -> Result<String> {
- if !self.0.str_files.borrow().contains_key(path) {
- let file_str = (self.0.settings.import_resolver)(path);
+ pub(crate) fn import_file_str(&self, from: &PathBuf, path: &PathBuf) -> Result<String> {
+ let path = self.0.import_resolver.resolve_file(from, path)?;
+ if !self.0.str_files.borrow().contains_key(&path) {
+ let file_str = self.0.import_resolver.load_file_contents(&path)?;
self.0.str_files.borrow_mut().insert(path.clone(), file_str);
}
- Ok(self.0.str_files.borrow().get(path).cloned().unwrap())
+ Ok(self.0.str_files.borrow().get(&path).cloned().unwrap())
}
pub fn parse_evaluate_raw(&self, code: &str) -> Result<Val> {