mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't run json files (#16733)

Browse Source
This commit is contained in:
pfg
2025-01-24 22:08:01 -08:00
committed by GitHub
parent e5b9082319
commit ee1932e92c
3 changed files with 41 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/cli/run_command.zig
View File

@@ -1522,14 +1522,18 @@ pub const RunCommand = struct {
// TODO: run module resolution here - try the next condition if the module can't be found
log("Try resolve `{s}` in `{s}`", .{ target_name, this_transpiler.fs.top_level_dir });
if (this_transpiler.resolver.resolve(this_transpiler.fs.top_level_dir, target_name, .entry_point_run)) |resolved| {
if (this_transpiler.resolver.resolve(this_transpiler.fs.top_level_dir, target_name, .entry_point_run) catch
this_transpiler.resolver.resolve(this_transpiler.fs.top_level_dir, try std.mem.join(ctx.allocator, "", &.{ "./", target_name }), .entry_point_run)) |resolved|
{
var resolved_mutable = resolved;
log("Resolved to: `{s}`", .{resolved_mutable.path().?.text});
return _bootAndHandleError(ctx, resolved_mutable.path().?.text);
} else |_| if (this_transpiler.resolver.resolve(this_transpiler.fs.top_level_dir, try std.mem.join(ctx.allocator, "", &.{ "./", target_name }), .entry_point_run)) |resolved| {
var resolved_mutable = resolved;
log("Resolved with `./` to: `{s}`", .{resolved_mutable.path().?.text});
return _bootAndHandleError(ctx, resolved_mutable.path().?.text);
const path = resolved_mutable.path().?;
const loader: bun.options.Loader = this_transpiler.options.loaders.get(path.name.ext) orelse .tsx;
if (loader.canBeRunByBun()) {
log("Resolved to: `{s}`", .{path.text});
return _bootAndHandleError(ctx, path.text);
} else {
log("Resolved file `{s}` but ignoring because loader is {s}", .{ path.text, @tagName(loader) });
}
} else |_| {}
// execute a node_modules/.bin/<X> command, or (run only) a system command like 'ls'

2
src/options.zig
View File

@@ -697,7 +697,7 @@ pub const Loader = enum(u8) {
pub fn canBeRunByBun(this: Loader) bool {
return switch (this) {
.jsx, .js, .ts, .tsx, .json, .wasm, .bunsh => true,
.jsx, .js, .ts, .tsx, .wasm, .bunsh => true,
else => false,
};
}

30
test/cli/install/bun-run.test.ts
View File

@@ -682,10 +682,18 @@ describe("'bun run' priority", async () => {
},
main: "main.js",
}),
"nx.json": JSON.stringify({}),
"§'.js": 'console.log("§\'.js")',
"node_modules": { ".bin": { "confabulate": `#!${bunExe()}\nconsole.log("node_modules/.bin/confabulate")` } },
"node_modules": {
".bin": {
"confabulate": `#!${bunExe()}\nconsole.log("node_modules/.bin/confabulate")`,
"nx": `#!${bunExe()}\nconsole.log("node_modules/.bin/nx")`,
},
},
"no_run_json.json": JSON.stringify({}),
});
chmodSync(dir + "/node_modules/.bin/confabulate", 0o755);
chmodSync(dir + "/node_modules/.bin/nx", 0o755);
const commands: {
command: string[];
@@ -765,6 +773,25 @@ describe("'bun run' priority", async () => {
{ command: ["./.secretscript"], stdout: ".secretscript.js", stderr: "" },
{ command: [dir + "/.secretscript"], stdout: ".secretscript.js", stderr: "" },
{
command: ["no_run_json"],
stdout: "",
stderr: /error: Script not found "no_run_json"|EACCES/,
exitCode: 1,
},
{
command: ["no_run_json.json"],
stdout: "",
stderr: /error: Module not found "no_run_json\.json"|EACCES/,
exitCode: 1,
},
{
command: ["./no_run_json"],
stdout: "",
stderr: /error: Module not found "\.(\/|\\|\\\\)no_run_json"|EACCES/,
exitCode: 1,
},
{
command: ["/absolute"],
stdout: "",
@@ -786,6 +813,7 @@ describe("'bun run' priority", async () => {
: [
// node_modules command
{ command: ["confabulate"], stdout: "node_modules/.bin/confabulate", stderr: "" },
{ command: ["nx"], stdout: "node_modules/.bin/nx", stderr: "" },
// system command
{ command: ["echo", "abc"], stdout: "abc", stderr: "", req_run: true },