mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-17 22:32:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

HOLY FUCK big refactor

Browse Source
This commit is contained in:
Zack Radisic
2024-02-27 14:44:13 -08:00
parent 468b21f31b
commit ee6f2c8a75
18 changed files with 1182 additions and 1039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2068
src/shell/interpreter.zig
View File

File diff suppressed because it is too large Load Diff

11
src/shell/shell.zig
View File

@@ -26,6 +26,7 @@ pub const EnvMap = interpret.EnvMap;
pub const EnvStr = interpret.EnvStr;
pub const Interpreter = eval.Interpreter;
pub const Subprocess = subproc.ShellSubprocess;
// pub const IOWriter = interpret.IOWriter;
// pub const SubprocessMini = subproc.ShellSubprocessMini;
const GlobWalker = Glob.GlobWalker_(null, true);
@@ -40,9 +41,13 @@ pub const ShellErr = union(enum) {
invalid_arguments: struct { val: []const u8 = "" },
todo: []const u8,
pub fn newSys(e: Syscall.Error) @This() {
pub fn newSys(e: anytype) @This() {
return .{
.sys = e.toSystemError(),
.sys = switch (@TypeOf(e)) {
Syscall.Error => e.toSystemError(),
JSC.SystemError => e,
else => @compileError("Invalid `e`: " ++ @typeName(e)),
},
};
}
@@ -68,6 +73,7 @@ pub const ShellErr = union(enum) {
}
pub fn throwJS(this: *const @This(), globalThis: *JSC.JSGlobalObject) void {
defer this.deinit(bun.default_allocator);
switch (this.*) {
.sys => {
const err = this.sys.toErrorInstance(globalThis);
@@ -90,6 +96,7 @@ pub const ShellErr = union(enum) {
}
pub fn throwMini(this: @This()) void {
defer this.deinit(bun.default_allocator);
switch (this) {
.sys => {
const err = this.sys;

20
src/shell/subproc.zig
View File

@@ -866,7 +866,7 @@ pub const PipeReader = struct {
pub fn onReadChunk(ptr: *anyopaque, chunk: []const u8, has_more: bun.io.ReadState) bool {
var this: *PipeReader = @ptrCast(@alignCast(ptr));
this.buffered_output.append(chunk);
log("PipeReader(0x{x}, {s}) onReadChunk(...)", .{ @intFromPtr(this), @tagName(this.out_type) });
log("PipeReader(0x{x}, {s}) onReadChunk(chunk_len={d}, has_more={s})", .{ @intFromPtr(this), @tagName(this.out_type), chunk.len, @tagName(has_more) });
if (!this.captured_writer.dead) {
if (this.captured_writer.writer.getPoll() == null) {
this.captured_writer.writer.handle = .{ .poll = Async.FilePoll.init(this.eventLoop(), if (this.out_type == .stdout) bun.STDOUT_FD else bun.STDERR_FD, .{}, @TypeOf(this.captured_writer.writer), &this.captured_writer.writer) };
@@ -880,7 +880,14 @@ pub const PipeReader = struct {
else => {},
}
}
return has_more != .eof;
const should_continue = has_more != .eof;
if (should_continue) {
this.reader.registerPoll();
}
return should_continue;
}
pub fn onReaderDone(this: *PipeReader) void {
@@ -989,12 +996,17 @@ pub const PipeReader = struct {
}
pub fn onReaderError(this: *PipeReader, err: bun.sys.Error) void {
log("PipeReader(0x{x}) onReaderError {}", .{ @intFromPtr(this), err });
if (this.state == .done) {
bun.default_allocator.free(this.state.done);
}
this.state = .{ .err = err };
if (this.process) |process|
this.signalDoneToCmd();
if (this.process) |process| {
this.process = null;
process.onCloseIO(this.kind(process));
this.deref();
}
}
pub fn close(this: *PipeReader) void {
@@ -1018,7 +1030,7 @@ pub const PipeReader = struct {
pub fn deinit(this: *PipeReader) void {
log("PipeReader(0x{x}, {s}) deinit()", .{ @intFromPtr(this), @tagName(this.out_type) });
if (comptime Environment.isPosix) {
std.debug.assert(this.reader.isDone());
std.debug.assert(this.reader.isDone() or this.state == .err);
}
if (comptime Environment.isWindows) {