difftreelog
feat use visitor for async_import etc
in: master
4 files changed
crates/jrsonnet-evaluator/src/async_import.rsdiffbeforeafterboth1use std::rc::Rc;2use std::{any::Any, cell::RefCell, future::Future};34use jrsonnet_gcmodule::Acyclic;5use jrsonnet_ir::visit::Visitor;6use jrsonnet_ir::{7 ArgsDesc, AssertExpr, AssertStmt, BindSpec, CompSpec, Destruct, Expr, ExprParam, ExprParams,8 FieldMember, FieldName, ForSpecData, IStr, IfElse, IfSpecData, ImportKind, ObjBody, Slice,9 SliceDesc, Source, SourcePath, Spanned,10};11use rustc_hash::FxHashMap;1213use crate::{AsPathLike, FileData, ImportResolver, ResolvePathOwned, State};1415pub struct Import {16 path: ResolvePathOwned,17 expression: bool,18}1920pub struct FoundImports(Vec<Import>);21impl Visitor for FoundImports {22 fn visit_import(&mut self, expression: bool, value: IStr) {23 self.0.push(Import {24 path: ResolvePathOwned::Str(value.to_string()),25 expression,26 })27 }28}2930pub trait AsyncImportResolver {31 type Error;32 /// Resolves file path, e.g. `(/home/user/manifests, b.libjsonnet)` can correspond33 /// both to `/home/user/manifests/b.libjsonnet` and to `/home/user/${vendor}/b.libjsonnet`34 /// where `${vendor}` is a library path.35 ///36 /// `from` should only be returned from [`ImportResolver::resolve`],37 /// or from other defined file, any other value may result in panic38 fn resolve_from(39 &self,40 from: &SourcePath,41 path: &dyn AsPathLike,42 ) -> impl Future<Output = Result<SourcePath, Self::Error>>;43 fn resolve_from_default(44 &self,45 path: &dyn AsPathLike,46 ) -> impl Future<Output = Result<SourcePath, Self::Error>> {47 async { self.resolve_from(&SourcePath::default(), path).await }48 }4950 /// Load resolved file51 /// This should only be called with value returned52 /// from [`ImportResolver::resolve_file`]/[`ImportResolver::resolve`],53 /// this cannot be resolved using associated type,54 /// as the evaluator uses object instead of generic for [`ImportResolver`]55 fn load_file_contents(56 &self,57 resolved: &SourcePath,58 ) -> impl Future<Output = Result<Vec<u8>, Self::Error>>;59}6061#[derive(Acyclic)]62struct ResolvedImportResolver {63 resolved: RefCell<FxHashMap<(SourcePath, ResolvePathOwned), (SourcePath, bool)>>,64}65impl ImportResolver for ResolvedImportResolver {66 fn load_file_contents(&self, _resolved: &SourcePath) -> crate::Result<Vec<u8>> {67 unreachable!("all files should be loaded at this point");68 }6970 fn resolve_from(&self, from: &SourcePath, path: &dyn AsPathLike) -> crate::Result<SourcePath> {71 Ok(self72 .resolved73 .borrow()74 .get(&(from.clone(), path.as_path().to_owned()))75 .expect("all imports should be resolved at this point")76 .077 .clone())78 }7980 fn resolve_from_default(&self, path: &dyn AsPathLike) -> crate::Result<SourcePath> {81 self.resolve_from(&SourcePath::default(), path)82 }83}8485enum Job {86 LoadFile { path: SourcePath, parse: bool },87 ParseFile(SourcePath),88 ResolveImport { from: SourcePath, import: Import },89}9091#[allow(clippy::future_not_send)]92pub async fn async_import<H>(s: State, handler: H, path: &dyn AsPathLike) -> Result<(), H::Error>93where94 H: AsyncImportResolver,95{96 let resolved = (s.import_resolver() as &dyn Any)97 .downcast_ref::<ResolvedImportResolver>()98 .expect("for async imports, import_resolver should be set to ResolvedImportResolver");99100 let mut queue = vec![Job::LoadFile {101 path: handler.resolve_from_default(path).await?,102 parse: true,103 }];104 while let Some(job) = queue.pop() {105 match job {106 Job::LoadFile { path, parse } => {107 if !s.0.file_cache.borrow().contains_key(&path) {108 let data = handler.load_file_contents(&path).await?;109 s.0.file_cache110 .borrow_mut()111 .insert(path.clone(), FileData::new_bytes(data.as_slice().into()));112 }113 if parse {114 queue.push(Job::ParseFile(path));115 }116 }117 Job::ParseFile(path) => {118 if let Some(file) = s.0.file_cache.borrow_mut().get_mut(&path) {119 if file.parsed.is_none() {120 let Some(code) = file.get_string() else {121 continue;122 };123 let source = Source::new(path.clone(), code.clone());124 // If failed - then skip import125 file.parsed = crate::parse_jsonnet(&code, source).map(Rc::new).ok();126 if let Some(parsed) = &file.parsed {127 let mut imports = FoundImports(vec![]);128 imports.visit_expr(parsed);129 for import in imports.0 {130 queue.push(Job::ResolveImport {131 from: path.clone(),132 import,133 });134 }135 }136 }137 }138 }139 Job::ResolveImport { from, import } => {140 {141 let mut resolved_map = resolved.resolved.borrow_mut();142 if let Some((resolved, expression)) =143 resolved_map.get_mut(&(from.clone(), import.path.clone()))144 {145 if import.expression && !*expression {146 *expression = true;147 queue.push(Job::ParseFile(resolved.clone()));148 }149 continue;150 }151 }152 let resolved = handler.resolve_from(&from, &import.path).await?;153 queue.push(Job::LoadFile {154 path: resolved,155 parse: import.expression,156 });157 }158 }159 }160 Ok(())161}crates/jrsonnet-ir/src/expr.rsdiffbeforeafterboth--- a/crates/jrsonnet-ir/src/expr.rs
+++ b/crates/jrsonnet-ir/src/expr.rs
@@ -160,7 +160,7 @@
pub struct ExprParams {
pub exprs: Rc<Vec<ExprParam>>,
pub signature: FunctionSignature,
- binds_len: usize,
+ pub(crate) binds_len: usize,
}
impl ExprParams {
pub fn len(&self) -> usize {
crates/jrsonnet-ir/src/lib.rsdiffbeforeafterboth--- a/crates/jrsonnet-ir/src/lib.rs
+++ b/crates/jrsonnet-ir/src/lib.rs
@@ -7,6 +7,7 @@
mod location;
mod source;
pub mod unescape;
+pub mod visit;
pub use location::CodeLocation;
pub use source::{
crates/jrsonnet-ir/src/visit.rsdiffbeforeafterboth--- /dev/null
+++ b/crates/jrsonnet-ir/src/visit.rs
@@ -0,0 +1,271 @@
+use jrsonnet_interner::IStr;
+
+use crate::{
+ ArgsDesc, AssertExpr, AssertStmt, BinaryOp, BindSpec, CompSpec, Destruct, Expr, ExprParam,
+ ExprParams, FieldMember, FieldName, ForSpecData, IfElse, IfSpecData, ImportKind, IndexPart,
+ ObjBody, ObjComp, ObjMembers, Slice, SliceDesc,
+};
+
+pub trait Visitor: Sized {
+ fn visit_expr(&mut self, e: &Expr) {
+ visit_expr(self, e)
+ }
+ fn visit_import(&mut self, _as_expression: bool, _value: IStr) {}
+}
+
+#[cfg(feature = "exp-destruct")]
+pub fn visit_destruct_rest<V: Visitor>(_v: &mut V, destruct: &crate::DestructRest) {
+ match destruct {
+ crate::DestructRest::Keep(_name) => {}
+ crate::DestructRest::Drop => {}
+ }
+}
+
+pub fn visit_destruct<V: Visitor>(v: &mut V, destruct: &Destruct) {
+ match destruct {
+ Destruct::Full(_istr) => {}
+ #[cfg(feature = "exp-destruct")]
+ Destruct::Skip => {}
+ #[cfg(feature = "exp-destruct")]
+ Destruct::Array { start, rest, end } => {
+ for s in start {
+ visit_destruct(v, s);
+ }
+ if let Some(rest) = rest {
+ visit_destruct_rest(v, rest);
+ }
+ for s in end {
+ visit_destruct(v, s);
+ }
+ }
+ #[cfg(feature = "exp-destruct")]
+ Destruct::Object { fields, rest } => {
+ for (_name, into, default) in fields {
+ if let Some(into) = into {
+ visit_destruct(v, into);
+ }
+ if let Some(default) = default {
+ v.visit_expr(default);
+ }
+ if let Some(rest) = rest {
+ visit_destruct_rest(v, rest);
+ }
+ }
+ }
+ }
+}
+
+pub fn visit_if_spec<V: Visitor>(v: &mut V, cond: &IfSpecData) {
+ let IfSpecData { span: _, cond } = cond;
+ v.visit_expr(cond);
+}
+
+pub fn visit_comp_spec<V: Visitor>(v: &mut V, c: &CompSpec) {
+ match c {
+ CompSpec::IfSpec(cond) => visit_if_spec(v, cond),
+ CompSpec::ForSpec(for_spec_data) => {
+ let ForSpecData { destruct, over } = for_spec_data;
+ visit_destruct(v, destruct);
+ v.visit_expr(over);
+ }
+ }
+}
+pub fn visit_params<V: Visitor>(v: &mut V, par: &ExprParams) {
+ let ExprParams {
+ exprs,
+ signature: _,
+ binds_len: _,
+ } = par;
+ for par in &**exprs {
+ let ExprParam { destruct, default } = ∥
+ visit_destruct(v, destruct);
+ if let Some(default) = default {
+ v.visit_expr(default);
+ }
+ }
+}
+
+pub fn visit_bind_spec<V: Visitor>(v: &mut V, bind: &BindSpec) {
+ match bind {
+ BindSpec::Field { into, value } => {
+ visit_destruct(v, into);
+ v.visit_expr(value);
+ }
+ BindSpec::Function {
+ name: _,
+ params,
+ value,
+ } => {
+ visit_params(v, params);
+ v.visit_expr(value);
+ }
+ }
+}
+
+pub fn visit_field_member<V: Visitor>(v: &mut V, mem: &FieldMember) {
+ let FieldMember {
+ name,
+ plus: _,
+ params,
+ visibility: _,
+ value,
+ } = mem;
+ match &**name {
+ FieldName::Fixed(_istr) => {}
+ FieldName::Dyn(expr) => v.visit_expr(expr),
+ }
+ if let Some(params) = params {
+ visit_params(v, params);
+ }
+ v.visit_expr(value);
+}
+
+pub fn visit_obj_body<V: Visitor>(v: &mut V, obj_body: &ObjBody) {
+ match obj_body {
+ ObjBody::MemberList(obj_members) => {
+ let ObjMembers {
+ locals,
+ asserts,
+ fields,
+ } = obj_members;
+ for local in &**locals {
+ visit_bind_spec(v, local);
+ }
+ for assert in &**asserts {
+ visit_assert_stmt(v, assert);
+ }
+ for field in fields {
+ visit_field_member(v, field);
+ }
+ }
+ ObjBody::ObjComp(obj_comp) => {
+ let ObjComp {
+ locals,
+ field,
+ compspecs,
+ } = obj_comp;
+ for local in &**locals {
+ visit_bind_spec(v, local);
+ }
+ visit_field_member(v, field);
+ for compspec in compspecs {
+ visit_comp_spec(v, compspec);
+ }
+ }
+ }
+}
+
+pub fn visit_assert_stmt<V: Visitor>(v: &mut V, ass: &AssertStmt) {
+ let AssertStmt(cond, msg) = ass;
+ v.visit_expr(cond);
+ if let Some(msg) = msg {
+ v.visit_expr(msg);
+ }
+}
+pub fn visit_expr<V: Visitor>(v: &mut V, e: &Expr) {
+ match e {
+ Expr::Literal(_literal_type) => {}
+ Expr::Str(_istr) => {}
+ Expr::Num(_num) => {}
+ Expr::Var(_spanned) => {}
+ Expr::Arr(exprs) => {
+ for e in &**exprs {
+ v.visit_expr(e);
+ }
+ }
+ Expr::ArrComp(expr, comp_specs) => {
+ v.visit_expr(expr);
+ for ele in comp_specs {
+ visit_comp_spec(v, ele);
+ }
+ }
+ Expr::Obj(obj_body) => visit_obj_body(v, obj_body),
+ Expr::ObjExtend(expr, obj_body) => {
+ v.visit_expr(expr);
+ visit_obj_body(v, obj_body);
+ }
+ Expr::UnaryOp(_unary_op_type, expr) => {
+ v.visit_expr(expr);
+ }
+ Expr::BinaryOp(binary_op) => {
+ let BinaryOp { lhs, op: _, rhs } = &**binary_op;
+ v.visit_expr(lhs);
+ v.visit_expr(rhs);
+ }
+ Expr::AssertExpr(assert_expr) => {
+ let AssertExpr { assert, rest } = &**assert_expr;
+ visit_assert_stmt(v, assert);
+ v.visit_expr(rest);
+ }
+ Expr::LocalExpr(bind_specs, expr) => {
+ for local in bind_specs {
+ visit_bind_spec(v, local);
+ }
+ v.visit_expr(expr);
+ }
+ Expr::Import(kind, expr) => {
+ v.visit_expr(expr);
+
+ if let Expr::Str(expr) = &**expr {
+ v.visit_import(matches!(**kind, ImportKind::Normal), expr.clone());
+ }
+ }
+ Expr::ErrorStmt(_span, expr) => {
+ v.visit_expr(expr);
+ }
+ Expr::Apply(expr, spanned, _) => {
+ v.visit_expr(expr);
+ let ArgsDesc { unnamed, named } = &**spanned;
+ for unnamed in unnamed {
+ v.visit_expr(unnamed);
+ }
+ for (_name, named) in named {
+ v.visit_expr(named);
+ }
+ }
+ Expr::Index { indexable, parts } => {
+ v.visit_expr(indexable);
+
+ for part in parts {
+ let IndexPart {
+ span: _,
+ value,
+ #[cfg(feature = "exp-null-coaelse")]
+ null_coaelse: _,
+ } = part;
+ v.visit_expr(value);
+ }
+ }
+ Expr::Function(expr_params, expr) => {
+ visit_params(v, expr_params);
+ v.visit_expr(expr);
+ }
+ Expr::IfElse(if_else) => {
+ let IfElse {
+ cond,
+ cond_then,
+ cond_else,
+ } = &**if_else;
+ visit_if_spec(v, cond);
+ v.visit_expr(cond_then);
+ if let Some(cond_else) = cond_else {
+ v.visit_expr(cond_else);
+ }
+ }
+ Expr::Slice(slice) => {
+ let Slice { value, slice } = &**slice;
+ v.visit_expr(value);
+ let SliceDesc { start, end, step } = slice;
+
+ if let Some(start) = start {
+ v.visit_expr(start);
+ }
+ if let Some(end) = end {
+ v.visit_expr(end);
+ }
+ if let Some(step) = step {
+ v.visit_expr(step);
+ }
+ }
+ }
+}