Skip to content

fix(hook-env): path order #4946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdx merged 1 commit into from
Apr 26, 2025
Merged

fix(hook-env): path order #4946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions e2e/tools/test_path_order
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ $MISE_DATA_DIR/installs/pitchfork/0.1.5
$MISE_DATA_DIR/installs/jq/1.7.1"

assert "mise env | grep PATH" "export PATH='$HOME/workdir/subdir/bin:$HOME/workdir/subdir/bin2:$HOME/workdir/bin:$HOME/workdir/bin2:$MISE_DATA_DIR/installs/dummy/2.0.0/bin:$MISE_DATA_DIR/installs/pitchfork/0.1.5:$MISE_DATA_DIR/installs/jq/1.7.1:$PATH'"
assert "mise hook-env | grep PATH | tail -n1" "export PATH='$HOME/workdir/subdir/bin:$HOME/workdir/subdir/bin2:$HOME/workdir/bin:$HOME/workdir/bin2:$MISE_DATA_DIR/installs/dummy/2.0.0/bin:$MISE_DATA_DIR/installs/pitchfork/0.1.5:$MISE_DATA_DIR/installs/jq/1.7.1:$PATH'"
50 changes: 25 additions & 25 deletions src/toolset/tool_request_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,15 +151,14 @@ impl ToolRequestSetBuilder {

pub fn build(&self) -> eyre::Result<ToolRequestSet> {
let mut trs = ToolRequestSet::default();
self.load_config_files(&mut trs)?;
self.load_runtime_env(&mut trs)?;
self.load_runtime_args(&mut trs)?;

let backends = trs.tools.keys().cloned().collect::<Vec<_>>();
for fa in &backends {
if self.is_disabled(fa) {
trs.tools.shift_remove(fa);
trs.sources.remove(fa);
trs = self.load_config_files(trs)?;
trs = self.load_runtime_env(trs)?;
trs = self.load_runtime_args(trs)?;

for ba in trs.tools.keys().cloned().collect_vec() {
if self.is_disabled(&ba) {
trs.tools.shift_remove(&ba);
trs.sources.remove(&ba);
}
}

Expand All @@ -175,15 +174,15 @@ impl ToolRequestSetBuilder {
|| self.disable_tools.contains(ba)
}

fn load_config_files(&self, trs: &mut ToolRequestSet) -> eyre::Result<()> {
fn load_config_files(&self, mut trs: ToolRequestSet) -> eyre::Result<ToolRequestSet> {
let config = Config::get();
for cf in config.config_files.values().rev() {
merge(trs, cf.to_tool_request_set()?);
trs = merge(trs, cf.to_tool_request_set()?);
}
Ok(())
Ok(trs)
}

fn load_runtime_env(&self, trs: &mut ToolRequestSet) -> eyre::Result<()> {
fn load_runtime_env(&self, mut trs: ToolRequestSet) -> eyre::Result<ToolRequestSet> {
for (k, v) in env::vars() {
if k.starts_with("MISE_") && k.ends_with("_VERSION") && k != "MISE_VERSION" {
let plugin_name = k
Expand All @@ -201,13 +200,13 @@ impl ToolRequestSetBuilder {
let tvr = ToolRequest::new(fa.clone(), v, source.clone())?;
env_ts.add_version(tvr, &source);
}
merge(trs, env_ts);
trs = merge(trs, env_ts);
}
}
Ok(())
Ok(trs)
}

fn load_runtime_args(&self, trs: &mut ToolRequestSet) -> eyre::Result<()> {
fn load_runtime_args(&self, mut trs: ToolRequestSet) -> eyre::Result<ToolRequestSet> {
for (_, args) in self.args.iter().into_group_map_by(|arg| arg.ba.clone()) {
let mut arg_ts = ToolRequestSet::new();
for arg in args {
Expand All @@ -225,7 +224,7 @@ impl ToolRequestSetBuilder {
}
}
}
merge(trs, arg_ts);
trs = merge(trs, arg_ts);
}

let tool_args = env::TOOL_ARGS.read().unwrap();
Expand All @@ -239,16 +238,17 @@ impl ToolRequestSetBuilder {
arg_trs.add_version(tr, &ToolSource::Argument);
}
}
merge(trs, arg_trs);
trs = merge(trs, arg_trs);

Ok(())
Ok(trs)
}
}

fn merge(a: &mut ToolRequestSet, b: ToolRequestSet) {
for (fa, versions) in b.tools {
let source = b.sources[&fa].clone();
a.tools.insert(fa.clone(), versions);
a.sources.insert(fa, source);
}
fn merge(mut a: ToolRequestSet, mut b: ToolRequestSet) -> ToolRequestSet {
// move things around such that the tools are in the config order
a.tools.retain(|ba, _| !b.tools.contains_key(ba));
a.sources.retain(|ba, _| !b.sources.contains_key(ba));
b.tools.extend(a.tools);
b.sources.extend(a.sources);
b
}