git.delta.rocks / jrsonnet / refs/commits / 3302a3dd316f

difftreelog

feat CLI

Лач2020-06-03parent: #fab41c8.patch.diff
in: master

6 files changed

modifiedCargo.lockdiffbeforeafterboth
before · Cargo.lock
10 packageslockfile v1
after · Cargo.lock
43 packageslockfile v1
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,4 +3,5 @@
 	"crates/jsonnet-parser",
 	"crates/jsonnet-evaluator",
 	"crates/jsonnet-stdlib",
+	"cmds/jsonnet"
 ]
addedcmds/jsonnet/Cargo.tomldiffbeforeafterboth
--- /dev/null
+++ b/cmds/jsonnet/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "jsonnet"
+version = "0.1.0"
+authors = ["Лач <iam@lach.pw>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+jsonnet-evaluator = { path = "../../crates/jsonnet-evaluator" }
+annotate-snippets = "0.8.0"
+
+[dependencies.clap]
+version = "3.0.0-beta.1"
+default-features = false
+features = ["std", "derive", "suggestions", "color", "unstable", "wrap_help"]
addedcmds/jsonnet/src/main.rsdiffbeforeafterboth
--- /dev/null
+++ b/cmds/jsonnet/src/main.rs
@@ -0,0 +1,64 @@
+use clap::Clap;
+
+#[derive(Clap)]
+#[clap(version = "0.1.0", author = "Lach <iam@lach.pw>")]
+struct Opts {
+	#[clap(about = "File to compile")]
+	input: String,
+	#[clap(long, about = "Disable global std variable")]
+	no_stdlib: bool,
+}
+
+fn main() {
+	let opts: Opts = Opts::parse();
+	let evaluator = jsonnet_evaluator::EvaluationState::default();
+	if !opts.no_stdlib {
+		evaluator.add_stdlib();
+	}
+	evaluator
+		.add_file(
+			opts.input.clone(),
+			String::from_utf8(std::fs::read(opts.input.clone()).unwrap()).unwrap(),
+		)
+		.unwrap();
+	let result = evaluator.evaluate_file(&opts.input.clone());
+	match result {
+		Ok(v) => println!("{:?}", v),
+		Err(err) => {
+			use annotate_snippets::{
+				display_list::{DisplayList, FormatOptions},
+				snippet::{Annotation, AnnotationType, Slice, Snippet, SourceAnnotation},
+			};
+			for item in (err.1).0.iter() {
+				let source = (item.0).1.clone().unwrap();
+				let code = evaluator.get_source(&source.0);
+				let snippet = Snippet {
+					opt: FormatOptions {
+						color: true,
+						..Default::default()
+					},
+					title: Some(Annotation {
+						label: Some(&item.1),
+						id: None,
+						annotation_type: AnnotationType::Error,
+					}),
+					footer: vec![],
+					slices: vec![Slice {
+						source: &code,
+						line_start: 1,
+						origin: Some(&source.0),
+						fold: true,
+						annotations: vec![SourceAnnotation {
+							label: &"Example error annotation",
+							annotation_type: AnnotationType::Error,
+							range: (source.1, source.2),
+						}],
+					}],
+				};
+
+				let dl = DisplayList::from(snippet);
+				println!("{}", dl);
+			}
+		}
+	}
+}
modifiedcrates/jsonnet-evaluator/src/evaluate.rsdiffbeforeafterboth
--- a/crates/jsonnet-evaluator/src/evaluate.rs
+++ b/crates/jsonnet-evaluator/src/evaluate.rs
@@ -77,6 +77,7 @@
 		(Val::Str(v1), Val::Str(v2)) => Val::Str(v1.to_owned() + &v2),
 		(Val::Str(v1), Val::Num(v2)) => Val::Str(format!("{}{}", v1, v2)),
 		(Val::Num(v1), Val::Str(v2)) => Val::Str(format!("{}{}", v1, v2)),
+		(Val::Str(v1), v2) => Val::Str(format!("{}{:?}", v1, v2)),
 		(Val::Obj(v1), Val::Obj(v2)) => Val::Obj(v2.with_super(v1.clone())),
 		(Val::Arr(a), Val::Arr(b)) => Val::Arr([&a[..], &b[..]].concat()),
 		(Val::Num(v1), Val::Num(v2)) => Val::Num(v1 + v2),
modifiedcrates/jsonnet-evaluator/src/lib.rsdiffbeforeafterboth
--- a/crates/jsonnet-evaluator/src/lib.rs
+++ b/crates/jsonnet-evaluator/src/lib.rs
@@ -84,6 +84,13 @@
 
 		Ok(())
 	}
+	pub fn get_source(&self, name: &str) -> String {
+		let ro_map = self.0.files.borrow();
+		let value = ro_map
+			.get(name)
+			.unwrap_or_else(|| panic!("file not added: {:?}", name));
+		value.0.clone()
+	}
 	pub fn evaluate_file(&self, name: &str) -> Result<Val> {
 		self.begin_state();
 		let expr: LocExpr = {