Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
44 changes: 44 additions & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,50 @@ mod tests {
}
}

#[test]
fn bun_run_existing_relative_path_uses_real_bun() {
let repo = repo_fixture();
fs::create_dir_all(repo.cwd.join("scripts/release")).unwrap();
fs::write(repo.cwd.join("scripts/release/index.ts"), "").unwrap();
fs::write(repo.cwd.join("tool"), "").unwrap();
fs::write(
repo.cwd.join("package.json"),
r#"{"scripts":{"dev":"next dev"}}"#,
)
.unwrap();

for args in [
vec!["run", "scripts/release", "1.2.0", "--dry-run"],
vec!["run", "scripts/release"],
vec!["run", "tool"],
] {
let plan =
plan_for_config(ShimTool::Bun, &os(&args), &Config::default(), &repo.cwd).unwrap();

assert_eq!(plan.target, Target::RealBun, "args={args:?}");
assert_eq!(strings(&plan.args), args);
}
}

#[test]
fn bun_run_script_or_missing_path_stays_on_aube() {
let repo = repo_fixture();
fs::create_dir_all(repo.cwd.join("dev")).unwrap();
fs::write(
repo.cwd.join("package.json"),
r#"{"scripts":{"dev":"next dev"}}"#,
)
.unwrap();

for args in [vec!["run", "dev"], vec!["run", "scripts/missing"]] {
let plan =
plan_for_config(ShimTool::Bun, &os(&args), &Config::default(), &repo.cwd).unwrap();

assert_eq!(plan.target, Target::Aube, "args={args:?}");
assert_eq!(strings(&plan.args), args);
}
}

#[test]
fn npm_prefix_with_package_json_stays_on_aube() {
let repo = repo_fixture();
Expand Down
6 changes: 6 additions & 0 deletions src/planner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,12 @@ pub fn plan_for_config(
args: args.to_vec(),
});
}
if tool == ShimTool::Bun && bun::run_target_is_local_path(args, cwd) {
return Ok(Plan {
target: Target::RealBun,
args: args.to_vec(),
});
}
let packages = global_package_names_for_resolution(tool, args);
let global_backend = resolve_backend(config.global_packages, &packages)?;
return plan_for_global_packages(tool, args, global_backend);
Expand Down
44 changes: 44 additions & 0 deletions src/planner/bun.rs
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,50 @@ fn is_bun_runtime_flag(arg: &str) -> bool {
) || matches!(arg, "-b" | "-e" | "-i" | "-p" | "-r")
}

// `bun run scripts/export` (a dir with index.ts) has no `./` or extension, so
// only the filesystem can tell it from a script name; package.json scripts win.
pub(super) fn run_target_is_local_path(args: &[OsString], cwd: &Path) -> bool {
let Some(command_idx) = command_index(args) else {
return false;
};
let command = args[command_idx].to_string_lossy().to_ascii_lowercase();
if normalize_bun_command(&command) != Some("run") {
return false;
}
let Some(target) = run_target(&args[command_idx + 1..]) else {
return false;
};
cwd.join(&target).exists() && !is_package_script(&target, cwd)
}

fn run_target(rest: &[OsString]) -> Option<String> {
for arg in rest {
let arg = arg.to_string_lossy();
if arg == "--" {
return None;
}
if !arg.starts_with('-') {
return Some(arg.into_owned());
}
}
None
}

fn is_package_script(name: &str, cwd: &Path) -> bool {
let Some(manifest) = cwd
.ancestors()
.map(|dir| dir.join("package.json"))
.find(|path| path.is_file())
else {
return false;
};
let Ok(bytes) = std::fs::read(manifest) else {
return false;
};
serde_json::from_slice::<serde_json::Value>(&bytes)
.is_ok_and(|value| value.get("scripts").and_then(|s| s.get(name)).is_some())
}

fn looks_like_file_entrypoint(arg: &str) -> bool {
arg == "-"
|| arg.starts_with("./")
Expand Down