difftreelog
feat TLA support
in: master
2 files changed
cmds/jrsonnet/src/main.rsdiffbeforeafterboth1pub mod location;23use clap::Clap;4use jsonnet_evaluator::{EvaluationSettings, EvaluationState, LocError, StackTrace, Val};5use location::{offset_to_location, CodeLocation};6use std::env::current_dir;7use std::{path::PathBuf, str::FromStr};89enum Format {10 None,11 Json,12 Yaml,13}1415impl FromStr for Format {16 type Err = &'static str;17 fn from_str(s: &str) -> Result<Self, Self::Err> {18 Ok(match s {19 "none" => Format::None,20 "json" => Format::Json,21 "yaml" => Format::Yaml,22 _ => return Err("no such format"),23 })24 }25}2627#[derive(PartialEq)]28enum TraceFormat {29 CppJsonnet,30 GoJsonnet,31 Custom,32}33impl FromStr for TraceFormat {34 type Err = &'static str;35 fn from_str(s: &str) -> Result<Self, Self::Err> {36 Ok(match s {37 "cpp" => TraceFormat::CppJsonnet,38 "go" => TraceFormat::GoJsonnet,39 "default" => TraceFormat::Custom,40 _ => return Err("no such format"),41 })42 }43}4445#[derive(Clone)]46struct ExtStr {47 name: String,48 value: String,49}50impl FromStr for ExtStr {51 type Err = &'static str;52 fn from_str(s: &str) -> Result<Self, Self::Err> {53 let out: Vec<_> = s.split('=').collect();54 match out.len() {55 1 => Ok(ExtStr {56 name: out[0].to_owned(),57 value: std::env::var(out[0]).or(Err("missing env var"))?,58 }),59 2 => Ok(ExtStr {60 name: out[0].to_owned(),61 value: out[1].to_owned(),62 }),63 _ => Err("bad ext-str syntax"),64 }65 }66}6768#[derive(Clap)]69#[clap(version = "0.1.0", author = "Lach <iam@lach.pw>")]70struct Opts {71 #[clap(long, about = "Disable global std variable")]72 no_stdlib: bool,73 #[clap(long, about = "Add external string")]74 ext_str: Vec<ExtStr>,75 #[clap(long, about = "Add external string from code")]76 ext_code: Vec<ExtStr>,77 #[clap(long, about = "Add TLA")]78 tla_str: Vec<ExtStr>,79 #[clap(long, about = "Add TLA from code")]80 tla_code: Vec<ExtStr>,81 #[clap(long, short = "f", default_value = "json", possible_values = &["none", "json", "yaml"], about = "Output format, wraps resulting value to corresponding std.manifest call")]82 format: Format,83 #[clap(long, default_value = "default", possible_values = &["cpp", "go", "default"], about = "Emulated needed stacktrace display")]84 trace_format: TraceFormat,8586 #[clap(87 long,88 short = "s",89 default_value = "200",90 about = "Number of allowed stack frames"91 )]92 max_stack: usize,93 #[clap(94 long,95 short = "t",96 default_value = "20",97 about = "Max length of stack trace before cropping"98 )]99 max_trace: usize,100101 #[clap(102 long,103 default_value = "3",104 about = "When using --format, this option specifies string to pad output with"105 )]106 line_padding: usize,107108 #[clap(about = "File to compile", index = 1)]109 input: String,110}111112fn main() {113 let opts: Opts = Opts::parse();114 let evaluator = jsonnet_evaluator::EvaluationState::new(EvaluationSettings {115 import_resolver: Box::new(|path| String::from_utf8(std::fs::read(path).unwrap()).unwrap()),116 ..Default::default()117 });118 if !opts.no_stdlib {119 evaluator.with_stdlib();120 }121 for ExtStr { name, value } in opts.ext_str.iter().cloned() {122 evaluator.add_ext_var(name, Val::Str(value));123 }124 for ExtStr { name, value } in opts.ext_code.iter().cloned() {125 evaluator.add_ext_var(name, evaluator.parse_evaluate_raw(&value).unwrap());126 }127 let mut input = current_dir().unwrap();128 input.push(opts.input.clone());129 let code_string = String::from_utf8(std::fs::read(opts.input.clone()).unwrap()).unwrap();130 if let Err(e) = evaluator.add_file(input.clone(), code_string.clone()) {131 print_syntax_error(e, &input, &code_string);132 std::process::exit(1);133 }134 let result = evaluator.evaluate_file(&input);135 match result {136 Ok(v) => {137 let v = match opts.format {138 Format::Json => {139 if opts.no_stdlib {140 evaluator.with_stdlib();141 }142 evaluator.add_global("__tmp__to_json__".to_owned(), v);143 let v = evaluator.parse_evaluate_raw(&format!(144 "std.manifestJsonEx(__tmp__to_json__, \"{}\")",145 " ".repeat(opts.line_padding),146 ));147 match v {148 Ok(v) => v,149 Err(err) => {150 print_error(&err, evaluator, &opts);151 std::process::exit(1);152 }153 }154 }155 Format::Yaml => {156 if opts.no_stdlib {157 evaluator.with_stdlib();158 }159 evaluator.add_global("__tmp__to_yaml__".to_owned(), v);160 let v = evaluator161 .parse_evaluate_raw("std.manifestYamlDoc(__tmp__to_yaml__, \" \")");162 match v {163 Ok(v) => v,164 Err(err) => {165 print_error(&err, evaluator, &opts);166 std::process::exit(1);167 }168 }169 }170 _ => v,171 };172 match v {173 Val::Str(s) => println!("{}", s),174 Val::Num(n) => println!("{}", n),175 _v => eprintln!(176 "jsonnet output is not a string.\nDid you forgot to set --format, or wrap your data with std.manifestJson?"177 ),178 }179 }180 Err(err) => {181 print_error(&err, evaluator, &opts);182 std::process::exit(1);183 }184 }185}186187fn print_error(err: &LocError, evaluator: EvaluationState, opts: &Opts) {188 println!("Error: {:?}", err.0);189 print_trace(&(err.1), evaluator, &opts);190}191192fn print_syntax_error(error: jsonnet_parser::ParseError, file: &PathBuf, code: &str) {193 use annotate_snippets::{194 display_list::{DisplayList, FormatOptions},195 snippet::{Annotation, AnnotationType, Slice, Snippet, SourceAnnotation},196 };197 //&("Expected: ".to_owned() + error.expected)198 let origin = file.to_str().unwrap();199 let error_message = format!("Expected: {}", error.expected);200 let snippet = Snippet {201 opt: FormatOptions {202 color: true,203 ..Default::default()204 },205 title: Some(Annotation {206 label: Some(&error_message),207 id: None,208 annotation_type: AnnotationType::Error,209 }),210 footer: vec![],211 slices: vec![Slice {212 source: &code,213 line_start: 1,214 origin: Some(origin),215 fold: false,216 annotations: vec![SourceAnnotation {217 label: "At this position",218 annotation_type: AnnotationType::Error,219 range: (error.location.offset, error.location.offset + 1),220 }],221 }],222 };223224 let dl = DisplayList::from(snippet);225 println!("{}", dl);226}227228fn print_trace(trace: &StackTrace, evaluator: EvaluationState, opts: &Opts) {229 use annotate_snippets::{230 display_list::{DisplayList, FormatOptions},231 snippet::{Annotation, AnnotationType, Slice, Snippet, SourceAnnotation},232 };233 for item in trace.0.iter() {234 let desc = &item.1;235 if (item.0).1.is_none() {236 continue;237 }238 let source = (item.0).1.clone().unwrap();239 let code = evaluator.get_source(&source.0);240 if code.is_none() {241 continue;242 }243 let code = code.unwrap();244 let start_end = offset_to_location(&code, &[source.1, source.2]);245 if opts.trace_format == TraceFormat::Custom {246 let source_fragment: String = code247 .chars()248 .skip(start_end[0].line_start_offset)249 .take(start_end[1].line_end_offset - start_end[0].line_start_offset)250 .collect();251 let snippet = Snippet {252 opt: FormatOptions {253 color: true,254 ..Default::default()255 },256 title: Some(Annotation {257 label: Some(&item.1),258 id: None,259 annotation_type: AnnotationType::Error,260 }),261 footer: vec![],262 slices: vec![Slice {263 source: &source_fragment,264 line_start: start_end[0].line,265 origin: Some(&source.0.to_str().unwrap()),266 fold: false,267 annotations: vec![SourceAnnotation {268 label: desc,269 annotation_type: AnnotationType::Error,270 range: (271 source.1 - start_end[0].line_start_offset,272 source.2 - start_end[0].line_start_offset,273 ),274 }],275 }],276 };277278 let dl = DisplayList::from(snippet);279 println!("{}", dl);280 } else {281 print_jsonnet_pair(282 source.0.to_str().unwrap(),283 &start_end[0],284 &start_end[1],285 opts.trace_format == TraceFormat::GoJsonnet,286 );287 }288 }289}290291fn print_jsonnet_pair(file: &str, start: &CodeLocation, end: &CodeLocation, is_go: bool) {292 if is_go {293 print!(" ");294 } else {295 print!(" ");296 }297 print!("{}:", file);298 if start.line == end.line {299 // IDK why, but this is the behavior original jsonnet cpp impl shows300 if start.column == end.column || !is_go && start.column + 1 == end.column {301 println!("{}:{}", start.line, end.column)302 } else {303 println!("{}:{}-{}", start.line, start.column, end.column);304 }305 } else {306 println!(307 "({}:{})-({}:{})",308 start.line, end.column, start.line, end.column309 );310 }311}crates/jsonnet-evaluator/src/lib.rsdiffbeforeafterboth--- a/crates/jsonnet-evaluator/src/lib.rs
+++ b/crates/jsonnet-evaluator/src/lib.rs
@@ -191,9 +191,14 @@
file_name: PathBuf::from("raw.jsonnet"),
loc_data: true,
},
- );
+ )
+ .unwrap();
+ self.evaluate_raw(parsed)
+ }
+
+ pub fn evaluate_raw(&self, code: LocExpr) -> Result<Val> {
self.begin_state();
- let value = evaluate(self.create_default_context()?, &parsed.unwrap());
+ let value = evaluate(self.create_default_context()?, &code);
self.end_state();
value
}