difftreelog
Merge pull request #122 from expelledboy/master
in: master
Allow '=' within the body of --tla-code
1 file changed
crates/jrsonnet-cli/src/stdlib.rsdiffbeforeafterboth1use std::{fs::read_to_string, str::FromStr};23use clap::Parser;4use jrsonnet_evaluator::{error::Result, trace::PathResolver, State};5use jrsonnet_stdlib::ContextInitializer;67#[derive(Clone)]8pub struct ExtStr {9 pub name: String,10 pub value: String,11}1213impl FromStr for ExtStr {14 type Err = &'static str;15 fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {16 let out: Vec<_> = s.split('=').collect();17 match out.len() {18 1 => Ok(ExtStr {19 name: out[0].to_owned(),20 value: std::env::var(out[0]).or(Err("missing env var"))?,21 }),22 2 => Ok(ExtStr {23 name: out[0].to_owned(),24 value: out[1].to_owned(),25 }),2627 _ => Err("bad ext-str syntax"),28 }29 }30}3132#[derive(Clone)]33pub struct ExtFile {34 pub name: String,35 pub value: String,36}3738impl FromStr for ExtFile {39 type Err = String;4041 fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {42 let out: Vec<&str> = s.split('=').collect();43 if out.len() != 2 {44 return Err("bad ext-file syntax".to_owned());45 }46 let file = read_to_string(out[1]);47 match file {48 Ok(content) => Ok(Self {49 name: out[0].into(),50 value: content,51 }),52 Err(e) => Err(format!("{e}")),53 }54 }55}5657#[derive(Parser)]58#[clap(next_help_heading = "STANDARD LIBRARY")]59pub struct StdOpts {60 /// Disable standard library.61 /// By default standard library will be available via global `std` variable.62 #[clap(long)]63 no_stdlib: bool,64 /// Add string external variable.65 /// External variables are globally available so it is preferred66 /// to use top level arguments whenever it's possible.67 /// If [=data] is not set then it will be read from `name` env variable.68 /// Can be accessed from code via `std.extVar("name")`.69 #[clap(long, short = 'V', name = "name[=var data]", number_of_values = 1)]70 ext_str: Vec<ExtStr>,71 /// Read string external variable from file.72 /// See also `--ext-str`73 #[clap(long, name = "name=var path", number_of_values = 1)]74 ext_str_file: Vec<ExtFile>,75 /// Add external variable from code.76 /// See also `--ext-str`77 #[clap(long, name = "name[=var source]", number_of_values = 1)]78 ext_code: Vec<ExtStr>,79 /// Read string external variable from file.80 /// See also `--ext-str`81 #[clap(long, name = "name=var code path", number_of_values = 1)]82 ext_code_file: Vec<ExtFile>,83}84impl StdOpts {85 pub fn context_initializer(&self, s: &State) -> Result<Option<ContextInitializer>> {86 if self.no_stdlib {87 return Ok(None);88 }89 let ctx = ContextInitializer::new(s.clone(), PathResolver::new_cwd_fallback());90 for ext in self.ext_str.iter() {91 ctx.add_ext_str((&ext.name as &str).into(), (&ext.value as &str).into());92 }93 for ext in self.ext_str_file.iter() {94 ctx.add_ext_str((&ext.name as &str).into(), (&ext.value as &str).into());95 }96 for ext in self.ext_code.iter() {97 ctx.add_ext_code(&ext.name as &str, &ext.value as &str)?;98 }99 for ext in self.ext_code_file.iter() {100 ctx.add_ext_code(&ext.name as &str, &ext.value as &str)?;101 }102 Ok(Some(ctx))103 }104}1use std::{fs::read_to_string, str::FromStr};23use clap::Parser;4use jrsonnet_evaluator::{error::Result, trace::PathResolver, State};5use jrsonnet_stdlib::ContextInitializer;67#[derive(Clone)]8pub struct ExtStr {9 pub name: String,10 pub value: String,11}1213/// Parses a string like `name=<value>`, or `name` and reads value from env variable.14/// With no value it will be read from env variable.15/// If env variable is not found then it will be an error.16/// Value can contain `=` symbol.17///18/// ```19/// use std::str::FromStr;20/// use jrsonnet_cli::ExtStr;21///22/// let ext = ExtStr::from_str("name=value").unwrap();23/// assert_eq!(ext.name, "name");24/// assert_eq!(ext.value, "value");25///26/// std::env::set_var("name", "value");27///28/// let ext = ExtStr::from_str("name").unwrap();29/// assert_eq!(ext.name, "name");30/// assert_eq!(ext.value, "value");31///32/// let ext = ExtStr::from_str("name=value=with=equals").unwrap();33/// assert_eq!(ext.name, "name");34/// assert_eq!(ext.value, "value=with=equals");35/// ```36///37impl FromStr for ExtStr {38 type Err = &'static str;3940 fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {41 match s.find('=') {42 Some(idx) => Ok(ExtStr {43 name: s[..idx].to_owned(),44 value: s[idx + 1..].to_owned(),45 }),46 None => Ok(ExtStr {47 name: s.to_owned(),48 value: std::env::var(s).or(Err("missing env var"))?,49 }),50 }51 }52}5354#[derive(Clone)]55pub struct ExtFile {56 pub name: String,57 pub value: String,58}5960impl FromStr for ExtFile {61 type Err = String;6263 fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {64 let out: Vec<&str> = s.split('=').collect();65 if out.len() != 2 {66 return Err("bad ext-file syntax".to_owned());67 }68 let file = read_to_string(out[1]);69 match file {70 Ok(content) => Ok(Self {71 name: out[0].into(),72 value: content,73 }),74 Err(e) => Err(format!("{e}")),75 }76 }77}7879#[derive(Parser)]80#[clap(next_help_heading = "STANDARD LIBRARY")]81pub struct StdOpts {82 /// Disable standard library.83 /// By default standard library will be available via global `std` variable.84 #[clap(long)]85 no_stdlib: bool,86 /// Add string external variable.87 /// External variables are globally available so it is preferred88 /// to use top level arguments whenever it's possible.89 /// If [=data] is not set then it will be read from `name` env variable.90 /// Can be accessed from code via `std.extVar("name")`.91 #[clap(long, short = 'V', name = "name[=var data]", number_of_values = 1)]92 ext_str: Vec<ExtStr>,93 /// Read string external variable from file.94 /// See also `--ext-str`95 #[clap(long, name = "name=var path", number_of_values = 1)]96 ext_str_file: Vec<ExtFile>,97 /// Add external variable from code.98 /// See also `--ext-str`99 #[clap(long, name = "name[=var source]", number_of_values = 1)]100 ext_code: Vec<ExtStr>,101 /// Read string external variable from file.102 /// See also `--ext-str`103 #[clap(long, name = "name=var code path", number_of_values = 1)]104 ext_code_file: Vec<ExtFile>,105}106impl StdOpts {107 pub fn context_initializer(&self, s: &State) -> Result<Option<ContextInitializer>> {108 if self.no_stdlib {109 return Ok(None);110 }111 let ctx = ContextInitializer::new(s.clone(), PathResolver::new_cwd_fallback());112 for ext in self.ext_str.iter() {113 ctx.add_ext_str((&ext.name as &str).into(), (&ext.value as &str).into());114 }115 for ext in self.ext_str_file.iter() {116 ctx.add_ext_str((&ext.name as &str).into(), (&ext.value as &str).into());117 }118 for ext in self.ext_code.iter() {119 ctx.add_ext_code(&ext.name as &str, &ext.value as &str)?;120 }121 for ext in self.ext_code_file.iter() {122 ctx.add_ext_code(&ext.name as &str, &ext.value as &str)?;123 }124 Ok(Some(ctx))125 }126}