mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-13 20:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make a couple shell tests pass

Browse Source
This commit is contained in:
Jarred Sumner
2024-03-07 17:10:10 -08:00
parent cecea3da88
commit e69e7e96b9
2 changed files with 46 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/bun.js/bindings/bindings.zig
View File

@@ -3766,6 +3766,18 @@ pub const JSValue = enum(JSValueReprInt) {
return FetchHeaders.cast(value);
}
if (comptime ZigType == JSC.WebCore.Body.Value) {
if (value.as(JSC.WebCore.Request)) |req| {
return req.getBodyValue();
}
if (value.as(JSC.WebCore.Response)) |res| {
return res.getBodyValue();
}
return null;
}
if (comptime @hasDecl(ZigType, "fromJS") and @TypeOf(ZigType.fromJS) == fn (JSC.JSValue) ?*ZigType) {
if (comptime ZigType == JSC.WebCore.Blob) {
if (ZigType.fromJS(value)) |blob| {

35
src/shell/interpreter.zig
View File

@@ -1037,7 +1037,8 @@ pub const Interpreter = struct {
// This will save ~2x memory
var export_env = EnvMap.initWithCapacity(allocator, env_loader.map.map.unmanaged.entries.len);
var iter = env_loader.map.iterator();
var iter = env_loader.iterator();
while (iter.next()) |entry| {
const value = EnvStr.initSlice(entry.value_ptr.value);
const key = EnvStr.initSlice(entry.key_ptr.*);
@@ -4265,7 +4266,39 @@ pub const Interpreter = struct {
cmd.exec.bltn.stderr.deref();
cmd.exec.bltn.stderr = .{ .arraybuf = arraybuf };
}
} else if (interpreter.jsobjs[file.jsbuf.idx].as(JSC.WebCore.Body.Value)) |body| {
if ((node.redirect.stdout or node.redirect.stderr) and !(body.* == .Blob and !body.Blob.needsToReadFile())) {
// TODO: Locked->stream -> file -> blob conversion via .toBlobIfPossible() except we want to avoid modifying the Response/Request if unnecessary.
cmd.base.interpreter.event_loop.js.global.throw("Cannot redirect stdout/stderr to an immutable blob. Expected a file", .{});
return .yield;
}
var original_blob = body.use();
defer original_blob.deinit();
const blob: *bun.JSC.WebCore.Blob = bun.newWithAlloc(arena.allocator(), JSC.WebCore.Blob, original_blob.dupe());
if (node.redirect.stdin) {
cmd.exec.bltn.stdin.deref();
cmd.exec.bltn.stdin = .{ .blob = blob };
}
if (node.redirect.stdout) {
cmd.exec.bltn.stdout.deref();
cmd.exec.bltn.stdout = .{ .blob = blob };
}
if (node.redirect.stderr) {
cmd.exec.bltn.stderr.deref();
cmd.exec.bltn.stderr = .{ .blob = blob };
}
} else if (interpreter.jsobjs[file.jsbuf.idx].as(JSC.WebCore.Blob)) |blob| {
if ((node.redirect.stdout or node.redirect.stderr) and !blob.needsToReadFile()) {
// TODO: Locked->stream -> file -> blob conversion via .toBlobIfPossible() except we want to avoid modifying the Response/Request if unnecessary.
cmd.base.interpreter.event_loop.js.global.throw("Cannot redirect stdout/stderr to an immutable blob. Expected a file", .{});
return .yield;
}
const theblob: *bun.JSC.WebCore.Blob = bun.newWithAlloc(arena.allocator(), JSC.WebCore.Blob, blob.dupe());
if (node.redirect.stdin) {