Files
bun.sh/src/shell/ParsedShellScript.zig
pfg 05d0475c6c Update to zig 0.15.2 (#24204)
Fixes ENG-21287

Build times, from `bun run build && echo '//' >> src/main.zig && time
bun run build`

|Platform|0.14.1|0.15.2|Speedup|
|-|-|-|-|
|macos debug asan|126.90s|106.27s|1.19x|
|macos debug noasan|60.62s|50.85s|1.19x|
|linux debug asan|292.77s|241.45s|1.21x|
|linux debug noasan|146.58s|130.94s|1.12x|
|linux debug use_llvm=false|n/a|78.27s|1.87x|
|windows debug asan|177.13s|142.55s|1.24x|

Runtime performance:

- next build memory usage may have gone up by 5%. Otherwise seems the
same. Some code with writers may have gotten slower, especially one
instance of a counting writer and a few instances of unbuffered writers
that now have vtable overhead.
- File size reduced by 800kb (from 100.2mb to 99.4mb)

Improvements:

- `@export` hack is no longer needed for watch
- native x86_64 backend for linux builds faster. to use it, set use_llvm
false and no_link_obj false. also set `ASAN_OPTIONS=detect_leaks=0`
otherwise it will spam the output with tens of thousands of lines of
debug info errors. may need to use the zig lldb fork for debugging.
- zig test-obj, which we will be able to use for zig unit tests

Still an issue:

- false 'dependency loop' errors remain in watch mode
- watch mode crashes observed

Follow-up:

- [ ] search `comptime Writer: type` and `comptime W: type` and remove
- [ ] remove format_mode in our zig fork
- [ ] remove deprecated.zig autoFormatLabelFallback
- [ ] remove deprecated.zig autoFormatLabel
- [ ] remove deprecated.BufferedWriter and BufferedReader
- [ ] remove override_no_export_cpp_apis as it is no longer needed
- [ ] css Parser(W) -> Parser, and remove all the comptime writer: type
params
- [ ] remove deprecated writer fully

Files that add lines:

```
649     src/deprecated.zig
167     scripts/pack-codegen-for-zig-team.ts
54      scripts/cleartrace-impl.js
46      scripts/cleartrace.ts
43      src/windows.zig
18      src/fs.zig
17      src/bun.js/ConsoleObject.zig
16      src/output.zig
12      src/bun.js/test/debug.zig
12      src/bun.js/node/node_fs.zig
8       src/env_loader.zig
7       src/css/printer.zig
7       src/cli/init_command.zig
7       src/bun.js/node.zig
6       src/string/escapeRegExp.zig
6       src/install/PnpmMatcher.zig
5       src/bun.js/webcore/Blob.zig
4       src/crash_handler.zig
4       src/bun.zig
3       src/install/lockfile/bun.lock.zig
3       src/cli/update_interactive_command.zig
3       src/cli/pack_command.zig
3       build.zig
2       src/Progress.zig
2       src/install/lockfile/lockfile_json_stringify_for_debugging.zig
2       src/css/small_list.zig
2       src/bun.js/webcore/prompt.zig
1       test/internal/ban-words.test.ts
1       test/internal/ban-limits.json
1       src/watcher/WatcherTrace.zig
1       src/transpiler.zig
1       src/shell/builtin/cp.zig
1       src/js_printer.zig
1       src/io/PipeReader.zig
1       src/install/bin.zig
1       src/css/selectors/selector.zig
1       src/cli/run_command.zig
1       src/bun.js/RuntimeTranspilerStore.zig
1       src/bun.js/bindings/JSRef.zig
1       src/bake/DevServer.zig
```

Files that remove lines:

```
-1      src/test/recover.zig
-1      src/sql/postgres/SocketMonitor.zig
-1      src/sql/mysql/MySQLRequestQueue.zig
-1      src/sourcemap/CodeCoverage.zig
-1      src/css/values/color_js.zig
-1      src/compile_target.zig
-1      src/bundler/linker_context/convertStmtsForChunk.zig
-1      src/bundler/bundle_v2.zig
-1      src/bun.js/webcore/blob/read_file.zig
-1      src/ast/base.zig
-2      src/sql/postgres/protocol/ArrayList.zig
-2      src/shell/builtin/mkdir.zig
-2      src/install/PackageManager/patchPackage.zig
-2      src/install/PackageManager/PackageManagerDirectories.zig
-2      src/fmt.zig
-2      src/css/declaration.zig
-2      src/css/css_parser.zig
-2      src/collections/baby_list.zig
-2      src/bun.js/bindings/ZigStackFrame.zig
-2      src/ast/E.zig
-3      src/StandaloneModuleGraph.zig
-3      src/deps/picohttp.zig
-3      src/deps/libuv.zig
-3      src/btjs.zig
-4      src/threading/Futex.zig
-4      src/shell/builtin/touch.zig
-4      src/meta.zig
-4      src/install/lockfile.zig
-4      src/css/selectors/parser.zig
-5      src/shell/interpreter.zig
-5      src/css/error.zig
-5      src/bun.js/web_worker.zig
-5      src/bun.js.zig
-6      src/cli/test_command.zig
-6      src/bun.js/VirtualMachine.zig
-6      src/bun.js/uuid.zig
-6      src/bun.js/bindings/JSValue.zig
-9      src/bun.js/test/pretty_format.zig
-9      src/bun.js/api/BunObject.zig
-14     src/install/install_binding.zig
-14     src/fd.zig
-14     src/bun.js/node/path.zig
-14     scripts/pack-codegen-for-zig-team.sh
-17     src/bun.js/test/diff_format.zig
```

`git diff --numstat origin/main...HEAD | awk '{ print ($1-$2)"\t"$3 }' |
sort -rn`

---------

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Co-authored-by: Dylan Conway <dylan.conway567@gmail.com>
Co-authored-by: Meghan Denny <meghan@bun.com>
Co-authored-by: tayor.fish <contact@taylor.fish>
2025-11-10 14:38:26 -08:00

216 lines
7.0 KiB
Zig

const ParsedShellScript = @This();
pub const js = jsc.Codegen.JSParsedShellScript;
pub const toJS = js.toJS;
pub const fromJS = js.fromJS;
pub const fromJSDirect = js.fromJSDirect;
args: ?*ShellArgs = null,
/// allocated with arena in jsobjs
jsobjs: std.array_list.Managed(JSValue),
export_env: ?EnvMap = null,
quiet: bool = false,
cwd: ?bun.String = null,
this_jsvalue: JSValue = .zero,
estimated_size_for_gc: usize = 0,
fn #computeEstimatedSizeForGC(this: *const ParsedShellScript) usize {
var size: usize = @sizeOf(ParsedShellScript);
if (this.args) |args| {
size += args.memoryCost();
}
if (this.export_env) |*env| {
size += env.memoryCost();
}
if (this.cwd) |*cwd| {
size += cwd.estimatedSize();
}
size += std.mem.sliceAsBytes(this.jsobjs.allocatedSlice()).len;
return size;
}
pub fn memoryCost(this: *const ParsedShellScript) usize {
return this.#computeEstimatedSizeForGC();
}
pub fn estimatedSize(this: *const ParsedShellScript) usize {
return this.estimated_size_for_gc;
}
pub fn take(
this: *ParsedShellScript,
_: *jsc.JSGlobalObject,
out_args: **ShellArgs,
out_jsobjs: *std.array_list.Managed(JSValue),
out_quiet: *bool,
out_cwd: *?bun.String,
out_export_env: *?EnvMap,
) void {
out_args.* = this.args.?;
out_jsobjs.* = this.jsobjs;
out_quiet.* = this.quiet;
out_cwd.* = this.cwd;
out_export_env.* = this.export_env;
this.args = null;
this.jsobjs = std.array_list.Managed(JSValue).init(bun.default_allocator);
this.cwd = null;
this.export_env = null;
}
pub fn finalize(
this: *ParsedShellScript,
) void {
this.this_jsvalue = .zero;
if (this.export_env) |*env| env.deinit();
if (this.cwd) |*cwd| cwd.deref();
if (this.args) |a| a.deinit();
bun.destroy(this);
}
pub fn setCwd(this: *ParsedShellScript, globalThis: *JSGlobalObject, callframe: *jsc.CallFrame) bun.JSError!jsc.JSValue {
const arguments_ = callframe.arguments_old(2);
var arguments = jsc.CallFrame.ArgumentsSlice.init(globalThis.bunVM(), arguments_.slice());
const str_js = arguments.nextEat() orelse {
return globalThis.throw("$`...`.cwd(): expected a string argument", .{});
};
const str = try bun.String.fromJS(str_js, globalThis);
this.cwd = str;
return .js_undefined;
}
pub fn setQuiet(this: *ParsedShellScript, _: *JSGlobalObject, callframe: *jsc.CallFrame) bun.JSError!jsc.JSValue {
const arg = callframe.argument(0);
this.quiet = arg.toBoolean();
return .js_undefined;
}
pub fn setEnv(this: *ParsedShellScript, globalThis: *JSGlobalObject, callframe: *jsc.CallFrame) bun.JSError!jsc.JSValue {
const value1 = callframe.argument(0).getObject() orelse {
return globalThis.throwInvalidArguments("env must be an object", .{});
};
var object_iter = try jsc.JSPropertyIterator(.{
.skip_empty_name = false,
.include_value = true,
}).init(globalThis, value1);
defer object_iter.deinit();
var env: EnvMap = EnvMap.init(bun.default_allocator);
env.ensureTotalCapacity(object_iter.len);
// If the env object does not include a $PATH, it must disable path lookup for argv[0]
// PATH = "";
while (try object_iter.next()) |key| {
const keyslice = bun.handleOom(key.toOwnedSlice(bun.default_allocator));
var value = object_iter.value;
if (value.isUndefined()) continue;
const value_str = try value.getZigString(globalThis);
const slice = bun.handleOom(value_str.toOwnedSlice(bun.default_allocator));
const keyref = EnvStr.initRefCounted(keyslice);
defer keyref.deref();
const valueref = EnvStr.initRefCounted(slice);
defer valueref.deref();
env.insert(keyref, valueref);
}
if (this.export_env) |*previous| {
previous.deinit();
}
this.export_env = env;
return .js_undefined;
}
pub const createParsedShellScript = jsc.MarkedArgumentBuffer.wrap(createParsedShellScriptImpl);
fn createParsedShellScriptImpl(globalThis: *jsc.JSGlobalObject, callframe: *jsc.CallFrame, marked_argument_buffer: *jsc.MarkedArgumentBuffer) bun.JSError!JSValue {
var shargs = ShellArgs.init();
var needs_to_free_shargs = true;
defer if (needs_to_free_shargs) shargs.deinit();
const arguments_ = callframe.arguments_old(2);
const arguments = arguments_.slice();
if (arguments.len < 2) {
return globalThis.throwNotEnoughArguments("Bun.$", 2, arguments.len);
}
const string_args = arguments[0];
const template_args_js = arguments[1];
var template_args = try template_args_js.arrayIterator(globalThis);
var stack_alloc = std.heap.stackFallback(@sizeOf(bun.String) * 4, shargs.arena_allocator());
var jsstrings = try std.array_list.Managed(bun.String).initCapacity(stack_alloc.get(), 4);
defer {
for (jsstrings.items[0..]) |bunstr| {
bunstr.deref();
}
jsstrings.deinit();
}
var jsobjs = std.array_list.Managed(JSValue).init(shargs.arena_allocator());
var script = std.array_list.Managed(u8).init(shargs.arena_allocator());
try bun.shell.shellCmdFromJS(globalThis, string_args, &template_args, &jsobjs, &jsstrings, &script, marked_argument_buffer);
var parser: ?bun.shell.Parser = null;
var lex_result: ?shell.LexResult = null;
const script_ast = Interpreter.parse(
shargs.arena_allocator(),
script.items[0..],
jsobjs.items[0..],
jsstrings.items[0..],
&parser,
&lex_result,
) catch |err| {
if (err == shell.ParseError.Lex) {
assert(lex_result != null);
const str = lex_result.?.combineErrors(shargs.arena_allocator());
return globalThis.throwPretty("{s}", .{str});
}
if (parser) |*p| {
if (bun.Environment.allow_assert) {
assert(p.errors.items.len > 0);
}
const errstr = p.combineErrors();
return globalThis.throwPretty("{s}", .{errstr});
}
return globalThis.throwError(err, "failed to lex/parse shell");
};
shargs.script_ast = script_ast;
const parsed_shell_script = bun.new(ParsedShellScript, .{
.args = shargs,
.jsobjs = jsobjs,
});
parsed_shell_script.estimated_size_for_gc = parsed_shell_script.#computeEstimatedSizeForGC();
const this_jsvalue = jsc.Codegen.JSParsedShellScript.toJSWithValues(parsed_shell_script, globalThis, marked_argument_buffer);
parsed_shell_script.this_jsvalue = this_jsvalue;
bun.analytics.Features.shell += 1;
needs_to_free_shargs = false;
return this_jsvalue;
}
const std = @import("std");
const interpreter = @import("./interpreter.zig");
const ShellArgs = interpreter.ShellArgs;
const bun = @import("bun");
const assert = bun.assert;
const jsc = bun.jsc;
const JSGlobalObject = jsc.JSGlobalObject;
const JSValue = jsc.JSValue;
const CallFrame = jsc.CallFrame;
const ArgumentsSlice = jsc.CallFrame.ArgumentsSlice;
const shell = bun.shell;
const EnvMap = shell.EnvMap;
const EnvStr = shell.EnvStr;
const Interpreter = shell.Interpreter;