git.delta.rocks / jrsonnet / refs/commits / d13245aaf3fc

--- a/cmds/jrsonnet/src/main.rs
+++ b/cmds/jrsonnet/src/main.rs
@@ -53,7 +53,7 @@
 	opts.general.configure(&state)?;
 	opts.manifest.configure(&state)?;
 
-	let val = if opts.input.evaluate {
+	let val = if opts.input.exec {
 		state.evaluate_snippet_raw(
 			Rc::new(PathBuf::from("args")),
 			(&opts.input.input as &str).into(),

1use crate::ConfigureState;1use crate::ConfigureState;
2use clap::Clap;2use clap::Clap;
3use jrsonnet_evaluator::{error::Result, EvaluationState};3use jrsonnet_evaluator::{error::Result, EvaluationState};
4use std::str::FromStr;4use std::{fs::read_to_string, str::FromStr};
55
6#[derive(Clone)]6#[derive(Clone)]
7pub struct ExtStr {7pub struct ExtStr {
28	}28	}
29}29}
30
31#[derive(Clone)]
32pub struct ExtFile {
33	pub name: String,
34	pub value: String,
35}
36
37impl FromStr for ExtFile {
38	type Err = String;
39
40	fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
41		let out: Vec<&str> = s.split('=').collect();
42		if out.len() != 2 {
43			return Err("bad ext-file syntax".to_owned());
44		}
45		let file = read_to_string(&out[1]);
46		match file {
47			Ok(content) => Ok(Self {
48				name: out[0].into(),
49				value: content,
50			}),
51			Err(e) => Err(format!("{}", e)),
52		}
53	}
54}
3055
31#[derive(Clap)]56#[derive(Clap)]
32// #[clap(help_heading = "EXTERNAL VARIABLES")]57// #[clap(help_heading = "EXTERNAL VARIABLES")]
38	/// Can be accessed from code via `std.extVar("name")`.63	/// Can be accessed from code via `std.extVar("name")`.
39	#[clap(long, short = 'V', name = "name[=var data]", number_of_values = 1)]64	#[clap(long, short = 'V', name = "name[=var data]", number_of_values = 1)]
40	ext_str: Vec<ExtStr>,65	ext_str: Vec<ExtStr>,
41	// / Read string external variable from file.66	/// Read string external variable from file.
42	// / See also `--ext-str`67	/// See also `--ext-str`
43	// #[clap(long, name = "name[=var path]", number_of_values = 1)]68	#[clap(long, name = "name=var path", number_of_values = 1)]
44	// ext_str_file: Vec<ExtStr>,69	ext_str_file: Vec<ExtFile>,
45	/// Add external variable from code.70	/// Add external variable from code.
46	/// See also `--ext-str`71	/// See also `--ext-str`
47	#[clap(long, name = "name[=var source]", number_of_values = 1)]72	#[clap(long, name = "name[=var source]", number_of_values = 1)]
48	ext_code: Vec<ExtStr>,73	ext_code: Vec<ExtStr>,
74	/// Read string external variable from file.
75	/// See also `--ext-str`
76	#[clap(long, name = "name=var code path", number_of_values = 1)]
77	ext_code_file: Vec<ExtFile>,
49}78}
50impl ConfigureState for ExtVarOpts {79impl ConfigureState for ExtVarOpts {
51	fn configure(&self, state: &EvaluationState) -> Result<()> {80	fn configure(&self, state: &EvaluationState) -> Result<()> {
52		for ext in self.ext_str.iter() {81		for ext in self.ext_str.iter() {
53			state.add_ext_str((&ext.name as &str).into(), (&ext.value as &str).into());82			state.add_ext_str((&ext.name as &str).into(), (&ext.value as &str).into());
54		}83		}
84		for ext in self.ext_str_file.iter() {
85			state.add_ext_str((&ext.name as &str).into(), (&ext.value as &str).into());
86		}
55		for ext in self.ext_code.iter() {87		for ext in self.ext_code.iter() {
56			state.add_ext_code((&ext.name as &str).into(), (&ext.value as &str).into())?;88			state.add_ext_code((&ext.name as &str).into(), (&ext.value as &str).into())?;
57		}89		}
90		for ext in self.ext_code_file.iter() {
91			state.add_ext_code((&ext.name as &str).into(), (&ext.value as &str).into())?;
92		}
58		Ok(())93		Ok(())
59	}94	}
60}95}

--- a/crates/jrsonnet-cli/src/lib.rs
+++ b/crates/jrsonnet-cli/src/lib.rs
@@ -24,7 +24,7 @@
 		short = 'e',
 		about = "Treat input as code, evaluate them instead of reading file"
 	)]
-	pub evaluate: bool,
+	pub exec: bool,
 
 	#[clap(
 		about = "Path to the file to be compiled if `--evaluate` is unset, otherwise code itself"

--- a/crates/jrsonnet-cli/src/tla.rs
+++ b/crates/jrsonnet-cli/src/tla.rs
@@ -1,4 +1,4 @@
-use crate::{ConfigureState, ExtStr};
+use crate::{ConfigureState, ExtFile, ExtStr};
 use clap::Clap;
 use jrsonnet_evaluator::{error::Result, EvaluationState};
 
@@ -13,21 +13,31 @@
 	tla_str: Vec<ExtStr>,
 	/// Read top level argument string from file.
 	/// See also `--tla-str`
-	// #[clap(long, name = "name[=tla path]", number_of_values = 1)]
-	// tla_str_file: Vec<ExtStr>,
+	#[clap(long, name = "name=tla path", number_of_values = 1)]
+	tla_str_file: Vec<ExtFile>,
 	/// Add top level argument from code.
 	/// See also `--tla-str`
 	#[clap(long, name = "name[=tla source]", number_of_values = 1)]
 	tla_code: Vec<ExtStr>,
+	/// Read top level argument code from file.
+	/// See also `--tla-str`
+	#[clap(long, name = "name=tla code path", number_of_values = 1)]
+	tla_code_file: Vec<ExtFile>,
 }
 impl ConfigureState for TLAOpts {
 	fn configure(&self, state: &EvaluationState) -> Result<()> {
 		for tla in self.tla_str.iter() {
 			state.add_tla_str((&tla.name as &str).into(), (&tla.value as &str).into());
 		}
+		for tla in self.tla_str_file.iter() {
+			state.add_tla_str((&tla.name as &str).into(), (&tla.value as &str).into())
+		}
 		for tla in self.tla_code.iter() {
 			state.add_tla_code((&tla.name as &str).into(), (&tla.value as &str).into())?;
 		}
+		for tla in self.tla_code_file.iter() {
+			state.add_tla_code((&tla.name as &str).into(), (&tla.value as &str).into())?;
+		}
 		Ok(())
 	}
 }