refactor: make shared util modules

src/cli/env_file.rs

@@ -0,0 +1,24 @@
+use dotenvy::Result;
+
+#[derive(Clone, Debug)]
+pub struct EnvFile {
+    inner: Vec<(String, String)>,
+}
+
+impl From<Vec<(String, String)>> for EnvFile {
+    fn from(inner: Vec<(String, String)>) -> Self {
+        Self { inner }
+    }
+}
+
+impl EnvFile {
+    pub fn from_path(path: &str) -> Result<Self> {
+        let file = dotenvy::from_filename_iter(path)?;
+        let env: Vec<(String, String)> = file.collect::<Result<_>>()?;
+        Ok(Self { inner: env })
+    }
+
+    pub fn iter(&self) -> impl Iterator<Item = (&String, &String)> {
+        self.inner.iter().map(|(a, b)| (a, b))
+    }
+}

src/cli/mod.rs

@@ -1,36 +1,16 @@
 use clap::{Args, CommandFactory, Parser, Subcommand};
+
 use color_eyre::Result;
 use owo_colors::{OwoColorize as _, Stream};
+use std::env;
 
-use std::{env, sync::OnceLock};
+use self::env_file::EnvFile;
 
+mod env_file;
 mod exec;
 mod list;
 mod run;
 
-#[derive(Clone, Debug)]
-pub struct EnvFile {
-    inner: Vec<(String, String)>,
-}
-
-impl From<Vec<(String, String)>> for EnvFile {
-    fn from(inner: Vec<(String, String)>) -> Self {
-        Self { inner }
-    }
-}
-
-impl EnvFile {
-    pub fn from_path(path: &str) -> dotenvy::Result<Self> {
-        let file = dotenvy::from_filename_iter(path)?;
-        let env = file.collect::<dotenvy::Result<Vec<(String, String)>>>()?;
-        Ok(Self { inner: env })
-    }
-
-    pub fn iter(&self) -> impl Iterator<Item = (&String, &String)> {
-        self.inner.iter().map(|(a, b)| (a, b))
-    }
-}
-
 #[derive(Parser, Clone)]
 #[command(author, version, about, long_about = None)]
 #[command(args_conflicts_with_subcommands = true)]
@@ -112,16 +92,6 @@ pub struct ExecArgs {
     pub env_file: Option<EnvFile>,
 }
 
-pub fn get_level() -> &'static usize {
-    static ONCE_LOCK: OnceLock<usize> = OnceLock::new();
-    ONCE_LOCK.get_or_init(|| {
-        std::env::var("__NRR_LEVEL")
-            .ok()
-            .and_then(|s| s.parse::<usize>().ok())
-            .unwrap_or(1)
-    })
-}
-
 impl Cli {
     pub fn execute(&self) -> Result<()> {
         let current_dir = env::current_dir()?;

src/main.rs

@@ -2,13 +2,13 @@ mod cli;
 mod package_json;
 mod run;
 mod suggest;
+mod util;
 
 use clap::Parser as _;
 use color_eyre::eyre::Result;
 use std::env;
 
 use crate::cli::{Cli, NrxCli};
-use cli::get_level;
 
 fn main() -> Result<()> {
     color_eyre::install()?;

src/run/exec.rs

@@ -4,7 +4,13 @@ use std::{env, path::Path, process::Command};
 #[cfg(unix)]
 use std::os::unix::process::CommandExt as _;
 
-use crate::{cli::ExecArgs, package_json::PackageJson, run::util};
+use crate::{
+    cli::ExecArgs,
+    package_json::PackageJson,
+    util::{get_level, itoa},
+};
+
+use super::util::make_patched_path;
 
 pub fn exec(package_path: &Path, package_data: &PackageJson, args: &ExecArgs) -> Result<()> {
     let package_folder = package_path.parent().unwrap();
@@ -18,8 +24,8 @@ pub fn exec(package_path: &Path, package_data: &PackageJson, args: &ExecArgs) ->
     }
 
     subproc
-        .env("PATH", util::make_patched_path(package_path)?)
-        .env("__NRR_LEVEL", util::itoa(crate::get_level() + 1));
+        .env("PATH", make_patched_path(package_path)?)
+        .env("__NRR_LEVEL", itoa(get_level() + 1));
 
     subproc
         .env("npm_execpath", env::current_exe()?)

src/run/script.rs

@@ -3,7 +3,13 @@ use std::{env, path::Path};
 use color_eyre::Result;
 use owo_colors::{OwoColorize as _, Stream};
 
-use crate::{cli::SharedRunOptions, package_json::PackageJson, run::util};
+use crate::{
+    cli::SharedRunOptions,
+    package_json::PackageJson,
+    util::{get_level, itoa},
+};
+
+use super::util::{make_patched_path, make_shell_cmd};
 
 #[derive(Debug, Copy, Clone, PartialEq)]
 pub enum ScriptType {
@@ -49,7 +55,7 @@ fn single_script(
     }
 
     if !options.silent {
-        let cmd_prefix = script_type.prefix() + &"$".repeat(*crate::get_level());
+        let cmd_prefix = script_type.prefix() + &"$".repeat(*get_level());
 
         eprintln!(
             "{} {}",
@@ -60,16 +66,16 @@ fn single_script(
         );
     }
 
-    let mut subproc = util::make_shell_cmd();
+    let mut subproc = make_shell_cmd();
     subproc.current_dir(package_folder).arg(&full_cmd);
 
     if let Some(env_file) = &options.env_file {
         subproc.envs(env_file.iter());
     }
 
     subproc
-        .env("PATH", util::make_patched_path(package_path)?)
-        .env("__NRR_LEVEL", util::itoa(crate::get_level() + 1));
+        .env("PATH", make_patched_path(package_path)?)
+        .env("__NRR_LEVEL", itoa(get_level() + 1));
 
     subproc
         .env("npm_execpath", env::current_exe()?)
@@ -113,7 +119,7 @@ pub fn script(
         eprint!(
             "{}",
             package_data.make_prefix(
-                match crate::get_level() {
+                match get_level() {
                     1 => None,
                     _ => Some(script_name),
                 },

src/run/util.rs

@@ -6,11 +6,6 @@ use std::{
     process::Command,
 };
 
-#[must_use]
-pub fn itoa(input: impl itoa::Integer) -> String {
-    itoa::Buffer::new().format(input).to_owned()
-}
-
 #[must_use]
 pub fn make_patched_paths(package_path: &Path) -> Vec<PathBuf> {
     let mut patched_path = package_path

src/util.rs

@@ -0,0 +1,17 @@
+use std::sync::OnceLock;
+
+#[must_use]
+#[inline]
+pub fn itoa(input: impl itoa::Integer) -> String {
+    itoa::Buffer::new().format(input).to_owned()
+}
+
+pub fn get_level() -> &'static usize {
+    static ONCE_LOCK: OnceLock<usize> = OnceLock::new();
+    ONCE_LOCK.get_or_init(|| {
+        std::env::var("__NRR_LEVEL")
+            .ok()
+            .and_then(|s| s.parse::<usize>().ok())
+            .unwrap_or(1)
+    })
+}