git.delta.rocks / jrsonnet / refs/commits / 7324ad9b219d

difftreelog

refactor jrsonnet cli should not depend on ir

kmmmlsnrYaroslav Bolyukin2026-05-06parent: #34f8ef7.patch.diff
in: master

3 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2459,7 +2459,6 @@
  "jrsonnet-cli",
  "jrsonnet-evaluator",
  "jrsonnet-gcmodule",
- "jrsonnet-ir",
  "mimallocator",
  "serde",
  "serde_json",
modifiedcmds/jrsonnet/Cargo.tomldiffbeforeafterboth
--- a/cmds/jrsonnet/Cargo.toml
+++ b/cmds/jrsonnet/Cargo.toml
@@ -40,7 +40,6 @@
 # obj?.field, obj?.['field']
 exp-null-coaelse = [
   "jrsonnet-evaluator/exp-null-coaelse",
-  "jrsonnet-ir/exp-null-coaelse",
   "jrsonnet-cli/exp-null-coaelse",
 ]
 # --exp-apply
@@ -48,7 +47,6 @@
 
 [dependencies]
 jrsonnet-evaluator.workspace = true
-jrsonnet-ir.workspace = true
 jrsonnet-cli.workspace = true
 jrsonnet-gcmodule.workspace = true
 
modifiedcmds/jrsonnet/src/main.rsdiffbeforeafterboth
before · cmds/jrsonnet/src/main.rs
1use std::{2	fs::{File, create_dir_all},3	io::{Read, Write},4};56use clap::{CommandFactory, Parser};7use clap_complete::Shell;8use jrsonnet_cli::{GcOpts, ManifestOpts, MiscOpts, OutputOpts, StdOpts, TlaOpts, TraceOpts};9use jrsonnet_evaluator::{10	ResultExt, State, Val, apply_tla, bail,11	error::{Error as JrError, ErrorKind},12};13use jrsonnet_ir::{SourceDefaultIgnoreJpath, SourcePath};1415#[cfg(feature = "mimalloc")]16#[global_allocator]17static GLOBAL: mimallocator::Mimalloc = mimallocator::Mimalloc;1819#[derive(Parser)]20enum SubOpts {21	/// Generate completions for specified shell22	Generate {23		/// Target shell name24		shell: Shell,25	},26}2728#[derive(Parser)]29#[clap(next_help_heading = "DEBUG")]30struct DebugOpts {31	/// Required OS stack size.32	/// This shouldn't be changed unless jrsonnet is failing with stack overflow error.33	#[clap(long, name = "size")]34	pub os_stack: Option<usize>,35}3637#[derive(Parser)]38#[clap(next_help_heading = "INPUT")]39struct InputOpts {40	/// Treat input as code, evaluate it instead of reading file.41	#[clap(long, short = 'e')]42	pub exec: bool,4344	/// Path to the file to be compiled if `--exec` is unset, otherwise code itself.45	pub input: Option<String>,4647	/// After executing input, apply specified code.48	/// Output of the initial input will be accessible using `_`.49	#[cfg(feature = "exp-apply")]50	#[clap(long)]51	pub exp_apply: Vec<String>,52}5354/// Jsonnet commandline interpreter (Rust implementation)55#[derive(Parser)]56#[clap(57	args_conflicts_with_subcommands = true,58	disable_version_flag = true,59	version,60	author61)]62struct Opts {63	#[clap(subcommand)]64	sub: Option<SubOpts>,65	/// Print version66	#[clap(long)]67	version: bool,6869	#[clap(flatten)]70	input: InputOpts,71	#[clap(flatten)]72	misc: MiscOpts,73	#[clap(flatten)]74	tla: TlaOpts,75	#[clap(flatten)]76	std: StdOpts,77	#[clap(flatten)]78	gc: GcOpts,7980	#[clap(flatten)]81	trace: TraceOpts,82	#[clap(flatten)]83	manifest: ManifestOpts,84	#[clap(flatten)]85	output: OutputOpts,86	#[clap(flatten)]87	debug: DebugOpts,88}8990// TODO: Add unix_sigpipe = "sig_dfl"91fn main() {92	let opts: Opts = Opts::parse();9394	if opts.version {95		print!("{}", Opts::command().render_version());96		std::process::exit(0)97	}9899	if let Some(sub) = opts.sub {100		match sub {101			SubOpts::Generate { shell } => {102				use clap_complete::generate;103				let app = &mut Opts::command();104				let buf = &mut std::io::stdout();105				generate(shell, app, "jrsonnet", buf);106				std::process::exit(0)107			}108		}109	}110111	let success = if let Some(size) = opts.debug.os_stack {112		std::thread::Builder::new()113			.stack_size(size * 1024 * 1024)114			.spawn(|| main_catch(opts))115			.expect("new thread spawned")116			.join()117			.expect("thread finished successfully")118	} else {119		main_catch(opts)120	};121	if !success {122		std::process::exit(1);123	}124}125126#[derive(thiserror::Error, Debug)]127enum Error {128	// Handled differently129	#[error("evaluation error")]130	Evaluation(JrError),131	#[error("io error")]132	Io(#[from] std::io::Error),133	#[error("input is not utf8 encoded")]134	Utf8(#[from] std::str::Utf8Error),135	#[error("missing input argument")]136	MissingInputArgument,137}138impl From<JrError> for Error {139	fn from(e: JrError) -> Self {140		Self::Evaluation(e)141	}142}143impl From<ErrorKind> for Error {144	fn from(e: ErrorKind) -> Self {145		Self::from(JrError::from(e))146	}147}148149fn main_catch(opts: Opts) -> bool {150	let trace = opts.trace.trace_format();151	if let Err(e) = main_real(opts) {152		if let Error::Evaluation(e) = e {153			let mut out = String::new();154			trace.write_trace(&mut out, &e).expect("format error");155			eprintln!("{out}");156		} else {157			eprintln!("{e}");158		}159		return false;160	}161	true162}163164fn main_real(opts: Opts) -> Result<(), Error> {165	let _gc_leak_guard = opts.gc.leak_on_exit();166	let _gc_print_stats = opts.gc.stats_printer();167	let _stack_depth_override = opts.misc.stack_size_override();168169	let import_resolver = opts.misc.import_resolver();170	let std = opts.std.context_initializer()?;171172	let mut s = State::builder();173	s.import_resolver(import_resolver).context_initializer(std);174	let s = s.build();175	let _s = s.enter();176177	let input = opts.input.input.ok_or(Error::MissingInputArgument)?;178	let val = if opts.input.exec {179		s.evaluate_snippet("<cmdline>".to_owned(), &input as &str)?180	} else if input == "-" {181		let mut input = Vec::new();182		std::io::stdin().read_to_end(&mut input)?;183		let input_str = std::str::from_utf8(&input)?;184		s.evaluate_snippet("<stdin>".to_owned(), input_str)?185	} else {186		s.import_from(&SourcePath::new(SourceDefaultIgnoreJpath), input.as_str())?187	};188189	let tla = opts.tla.tla_opts()?;190	#[allow(191		// It is not redundant/unused in exp-apply192		unused_mut,193		clippy::redundant_clone,194	)]195	let mut val = apply_tla(&tla, val)?;196197	#[cfg(feature = "exp-apply")]198	for apply in opts.input.exp_apply {199		use jrsonnet_evaluator::{InitialUnderscore, Thunk};200		val = s.evaluate_snippet_with(201			"<exp_apply>".to_owned(),202			&apply,203			&InitialUnderscore(Thunk::evaluated(val)),204		)?;205	}206207	let manifest_format = opts.manifest.manifest_format();208	if let Some(multi) = opts.output.multi {209		if opts.output.create_output_dirs {210			let mut dir = multi.clone();211			dir.pop();212			create_dir_all(dir)?;213		}214		let Val::Obj(obj) = val else {215			bail!(216				"value should be object for --multi manifest, got {}",217				val.value_type()218			)219		};220		for (field, data) in obj.iter(221			#[cfg(feature = "exp-preserve-order")]222			opts.manifest.preserve_order,223		) {224			let data = data.with_description(|| format!("getting field {field} for manifest"))?;225226			let mut path = multi.clone();227			path.push(&field as &str);228			if opts.output.create_output_dirs {229				let mut dir = path.clone();230				dir.pop();231				create_dir_all(dir)?;232			}233			println!("{}", path.to_str().expect("path"));234			let mut file = File::create(path)?;235			write!(236				file,237				"{}",238				data.manifest(&manifest_format)239					.with_description(|| format!("manifesting {field}"))?,240			)?;241			if !opts.manifest.no_trailing_newline {242				writeln!(file)?;243			}244			file.flush()?;245		}246	} else if let Some(path) = opts.output.output_file {247		if opts.output.create_output_dirs {248			let mut dir = path.clone();249			dir.pop();250			create_dir_all(dir)?;251		}252		let mut file = File::create(path)?;253		writeln!(file, "{}", val.manifest(manifest_format)?)?;254	} else {255		let output = val.manifest(manifest_format)?;256		if !output.is_empty() {257			println!("{output}");258		}259	}260261	Ok(())262}
after · cmds/jrsonnet/src/main.rs
1use std::{2	fs::{File, create_dir_all},3	io::{Read, Write},4};56use clap::{CommandFactory, Parser};7use clap_complete::Shell;8use jrsonnet_cli::{GcOpts, ManifestOpts, MiscOpts, OutputOpts, StdOpts, TlaOpts, TraceOpts};9use jrsonnet_evaluator::{10	ResultExt, SourceDefaultIgnoreJpath, SourcePath, State, Val, apply_tla, bail,11	error::{Error as JrError, ErrorKind},12};1314#[cfg(feature = "mimalloc")]15#[global_allocator]16static GLOBAL: mimallocator::Mimalloc = mimallocator::Mimalloc;1718#[derive(Parser)]19enum SubOpts {20	/// Generate completions for specified shell21	Generate {22		/// Target shell name23		shell: Shell,24	},25}2627#[derive(Parser)]28#[clap(next_help_heading = "DEBUG")]29struct DebugOpts {30	/// Required OS stack size.31	/// This shouldn't be changed unless jrsonnet is failing with stack overflow error.32	#[clap(long, name = "size")]33	pub os_stack: Option<usize>,34}3536#[derive(Parser)]37#[clap(next_help_heading = "INPUT")]38struct InputOpts {39	/// Treat input as code, evaluate it instead of reading file.40	#[clap(long, short = 'e')]41	pub exec: bool,4243	/// Path to the file to be compiled if `--exec` is unset, otherwise code itself.44	pub input: Option<String>,4546	/// After executing input, apply specified code.47	/// Output of the initial input will be accessible using `_`.48	#[cfg(feature = "exp-apply")]49	#[clap(long)]50	pub exp_apply: Vec<String>,51}5253/// Jsonnet commandline interpreter (Rust implementation)54#[derive(Parser)]55#[clap(56	args_conflicts_with_subcommands = true,57	disable_version_flag = true,58	version,59	author60)]61struct Opts {62	#[clap(subcommand)]63	sub: Option<SubOpts>,64	/// Print version65	#[clap(long)]66	version: bool,6768	#[clap(flatten)]69	input: InputOpts,70	#[clap(flatten)]71	misc: MiscOpts,72	#[clap(flatten)]73	tla: TlaOpts,74	#[clap(flatten)]75	std: StdOpts,76	#[clap(flatten)]77	gc: GcOpts,7879	#[clap(flatten)]80	trace: TraceOpts,81	#[clap(flatten)]82	manifest: ManifestOpts,83	#[clap(flatten)]84	output: OutputOpts,85	#[clap(flatten)]86	debug: DebugOpts,87}8889// TODO: Add unix_sigpipe = "sig_dfl"90fn main() {91	let opts: Opts = Opts::parse();9293	if opts.version {94		print!("{}", Opts::command().render_version());95		std::process::exit(0)96	}9798	if let Some(sub) = opts.sub {99		match sub {100			SubOpts::Generate { shell } => {101				use clap_complete::generate;102				let app = &mut Opts::command();103				let buf = &mut std::io::stdout();104				generate(shell, app, "jrsonnet", buf);105				std::process::exit(0)106			}107		}108	}109110	let success = if let Some(size) = opts.debug.os_stack {111		std::thread::Builder::new()112			.stack_size(size * 1024 * 1024)113			.spawn(|| main_catch(opts))114			.expect("new thread spawned")115			.join()116			.expect("thread finished successfully")117	} else {118		main_catch(opts)119	};120	if !success {121		std::process::exit(1);122	}123}124125#[derive(thiserror::Error, Debug)]126enum Error {127	// Handled differently128	#[error("evaluation error")]129	Evaluation(JrError),130	#[error("io error")]131	Io(#[from] std::io::Error),132	#[error("input is not utf8 encoded")]133	Utf8(#[from] std::str::Utf8Error),134	#[error("missing input argument")]135	MissingInputArgument,136}137impl From<JrError> for Error {138	fn from(e: JrError) -> Self {139		Self::Evaluation(e)140	}141}142impl From<ErrorKind> for Error {143	fn from(e: ErrorKind) -> Self {144		Self::from(JrError::from(e))145	}146}147148fn main_catch(opts: Opts) -> bool {149	let trace = opts.trace.trace_format();150	if let Err(e) = main_real(opts) {151		if let Error::Evaluation(e) = e {152			let mut out = String::new();153			trace.write_trace(&mut out, &e).expect("format error");154			eprintln!("{out}");155		} else {156			eprintln!("{e}");157		}158		return false;159	}160	true161}162163fn main_real(opts: Opts) -> Result<(), Error> {164	let _gc_leak_guard = opts.gc.leak_on_exit();165	let _gc_print_stats = opts.gc.stats_printer();166	let _stack_depth_override = opts.misc.stack_size_override();167168	let import_resolver = opts.misc.import_resolver();169	let std = opts.std.context_initializer()?;170171	let mut s = State::builder();172	s.import_resolver(import_resolver).context_initializer(std);173	let s = s.build();174	let _s = s.enter();175176	let input = opts.input.input.ok_or(Error::MissingInputArgument)?;177	let val = if opts.input.exec {178		s.evaluate_snippet("<cmdline>".to_owned(), &input as &str)?179	} else if input == "-" {180		let mut input = Vec::new();181		std::io::stdin().read_to_end(&mut input)?;182		let input_str = std::str::from_utf8(&input)?;183		s.evaluate_snippet("<stdin>".to_owned(), input_str)?184	} else {185		s.import_from(&SourcePath::new(SourceDefaultIgnoreJpath), input.as_str())?186	};187188	let tla = opts.tla.tla_opts()?;189	#[allow(190		// It is not redundant/unused in exp-apply191		unused_mut,192		clippy::redundant_clone,193	)]194	let mut val = apply_tla(&tla, val)?;195196	#[cfg(feature = "exp-apply")]197	for apply in opts.input.exp_apply {198		use jrsonnet_evaluator::{InitialUnderscore, Thunk};199		val = s.evaluate_snippet_with(200			"<exp_apply>".to_owned(),201			&apply,202			&InitialUnderscore(Thunk::evaluated(val)),203		)?;204	}205206	let manifest_format = opts.manifest.manifest_format();207	if let Some(multi) = opts.output.multi {208		if opts.output.create_output_dirs {209			let mut dir = multi.clone();210			dir.pop();211			create_dir_all(dir)?;212		}213		let Val::Obj(obj) = val else {214			bail!(215				"value should be object for --multi manifest, got {}",216				val.value_type()217			)218		};219		for (field, data) in obj.iter(220			#[cfg(feature = "exp-preserve-order")]221			opts.manifest.preserve_order,222		) {223			let data = data.with_description(|| format!("getting field {field} for manifest"))?;224225			let mut path = multi.clone();226			path.push(&field as &str);227			if opts.output.create_output_dirs {228				let mut dir = path.clone();229				dir.pop();230				create_dir_all(dir)?;231			}232			println!("{}", path.to_str().expect("path"));233			let mut file = File::create(path)?;234			write!(235				file,236				"{}",237				data.manifest(&manifest_format)238					.with_description(|| format!("manifesting {field}"))?,239			)?;240			if !opts.manifest.no_trailing_newline {241				writeln!(file)?;242			}243			file.flush()?;244		}245	} else if let Some(path) = opts.output.output_file {246		if opts.output.create_output_dirs {247			let mut dir = path.clone();248			dir.pop();249			create_dir_all(dir)?;250		}251		let mut file = File::create(path)?;252		writeln!(file, "{}", val.manifest(manifest_format)?)?;253	} else {254		let output = val.manifest(manifest_format)?;255		if !output.is_empty() {256			println!("{output}");257		}258	}259260	Ok(())261}