mirror of
https://github.com/oven-sh/bun
synced 2026-02-13 20:39:05 +00:00
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>
248 lines
8.6 KiB
Zig
248 lines
8.6 KiB
Zig
/// Files for Server Components are generated using `AstBuilder`, instead of
|
|
/// running through the js_parser. It emits a ParseTask.Result and joins
|
|
/// with the same logic that it runs though.
|
|
pub const ServerComponentParseTask = @This();
|
|
|
|
task: ThreadPoolLib.Task = .{ .callback = &taskCallbackWrap },
|
|
data: Data,
|
|
ctx: *BundleV2,
|
|
source: Logger.Source,
|
|
|
|
pub const Data = union(enum) {
|
|
/// Generate server-side code for a "use client" module. Given the
|
|
/// client ast, a "reference proxy" is created with identical exports.
|
|
client_reference_proxy: ReferenceProxy,
|
|
|
|
client_entry_wrapper: ClientEntryWrapper,
|
|
|
|
pub const ReferenceProxy = struct {
|
|
other_source: Logger.Source,
|
|
named_exports: JSAst.NamedExports,
|
|
};
|
|
|
|
pub const ClientEntryWrapper = struct {
|
|
path: []const u8,
|
|
};
|
|
};
|
|
|
|
fn taskCallbackWrap(thread_pool_task: *ThreadPoolLib.Task) void {
|
|
const task: *ServerComponentParseTask = @fieldParentPtr("task", thread_pool_task);
|
|
var worker = ThreadPool.Worker.get(task.ctx);
|
|
defer worker.unget();
|
|
var log = Logger.Log.init(worker.allocator);
|
|
|
|
const result = bun.handleOom(bun.default_allocator.create(ParseTask.Result));
|
|
result.* = .{
|
|
.ctx = task.ctx,
|
|
.task = undefined,
|
|
|
|
.value = if (taskCallback(
|
|
task,
|
|
&log,
|
|
worker.allocator,
|
|
)) |success|
|
|
.{ .success = success }
|
|
else |err| switch (err) {
|
|
error.OutOfMemory => bun.outOfMemory(),
|
|
},
|
|
|
|
.watcher_data = .none,
|
|
};
|
|
|
|
switch (worker.ctx.loop().*) {
|
|
.js => |jsc_event_loop| {
|
|
jsc_event_loop.enqueueTaskConcurrent(jsc.ConcurrentTask.fromCallback(result, ParseTask.onComplete));
|
|
},
|
|
.mini => |*mini| {
|
|
mini.enqueueTaskConcurrentWithExtraCtx(
|
|
ParseTask.Result,
|
|
BundleV2,
|
|
result,
|
|
BundleV2.onParseTaskComplete,
|
|
.task,
|
|
);
|
|
},
|
|
}
|
|
}
|
|
|
|
fn taskCallback(
|
|
task: *ServerComponentParseTask,
|
|
log: *Logger.Log,
|
|
allocator: std.mem.Allocator,
|
|
) bun.OOM!ParseTask.Result.Success {
|
|
var ab = try AstBuilder.init(allocator, &task.source, task.ctx.transpiler.options.hot_module_reloading);
|
|
|
|
switch (task.data) {
|
|
.client_reference_proxy => |data| try task.generateClientReferenceProxy(data, &ab),
|
|
.client_entry_wrapper => |data| try task.generateClientEntryWrapper(data, &ab),
|
|
}
|
|
|
|
var bundled_ast = try ab.toBundledAst(switch (task.data) {
|
|
// Server-side
|
|
.client_reference_proxy => task.ctx.transpiler.options.target,
|
|
// Client-side,
|
|
.client_entry_wrapper => .browser,
|
|
});
|
|
|
|
// `wrapper_ref` is used to hold the HMR api ref (see comment in
|
|
// `src/ast/Ast.zig`)
|
|
bundled_ast.wrapper_ref = ab.hmr_api_ref;
|
|
|
|
return .{
|
|
.ast = bundled_ast,
|
|
.source = task.source,
|
|
.loader = .js,
|
|
.log = log.*,
|
|
.use_directive = .none,
|
|
.side_effects = .no_side_effects__pure_data,
|
|
};
|
|
}
|
|
|
|
fn generateClientEntryWrapper(_: *ServerComponentParseTask, data: Data.ClientEntryWrapper, b: *AstBuilder) !void {
|
|
const record = try b.addImportRecord(data.path, .stmt);
|
|
const namespace_ref = try b.newSymbol(.other, "main");
|
|
try b.appendStmt(S.Import{
|
|
.namespace_ref = namespace_ref,
|
|
.import_record_index = record,
|
|
.items = &.{},
|
|
.is_single_line = true,
|
|
});
|
|
b.import_records.items[record].was_originally_bare_import = true;
|
|
}
|
|
|
|
fn generateClientReferenceProxy(task: *ServerComponentParseTask, data: Data.ReferenceProxy, b: *AstBuilder) !void {
|
|
const server_components = task.ctx.framework.?.server_components orelse
|
|
unreachable; // config must be non-null to enter this function
|
|
|
|
const client_named_exports = data.named_exports;
|
|
|
|
const register_client_reference = (try b.addImportStmt(
|
|
server_components.server_runtime_import,
|
|
&.{server_components.server_register_client_reference},
|
|
))[0];
|
|
|
|
const module_path = b.newExpr(E.String{
|
|
// In development, the path loaded is the source file: Easy!
|
|
//
|
|
// In production, the path here must be the final chunk path, but
|
|
// that information is not yet available since chunks are not
|
|
// computed. The unique_key replacement system is used here.
|
|
.data = if (task.ctx.transpiler.options.dev_server != null)
|
|
data.other_source.path.pretty
|
|
else
|
|
try std.fmt.allocPrint(b.allocator, "{f}S{d:0>8}", .{
|
|
bun.fmt.hexIntLower(task.ctx.unique_key),
|
|
data.other_source.index.get(),
|
|
}),
|
|
});
|
|
|
|
for (client_named_exports.keys()) |key| {
|
|
const is_default = bun.strings.eqlComptime(key, "default");
|
|
|
|
// This error message is taken from
|
|
// https://github.com/facebook/react/blob/c5b9375767e2c4102d7e5559d383523736f1c902/packages/react-server-dom-webpack/src/ReactFlightWebpackNodeLoader.js#L323-L354
|
|
const err_msg_string = try if (is_default)
|
|
std.fmt.allocPrint(
|
|
b.allocator,
|
|
"Attempted to call the default export of {[module_path]s} from " ++
|
|
"the server, but it's on the client. It's not possible to invoke a " ++
|
|
"client function from the server, it can only be rendered as a " ++
|
|
"Component or passed to props of a Client Component.",
|
|
.{ .module_path = data.other_source.path.pretty },
|
|
)
|
|
else
|
|
std.fmt.allocPrint(
|
|
b.allocator,
|
|
"Attempted to call {[key]s}() from the server but {[key]s} " ++
|
|
"is on the client. It's not possible to invoke a client function from " ++
|
|
"the server, it can only be rendered as a Component or passed to " ++
|
|
"props of a Client Component.",
|
|
.{ .key = key },
|
|
);
|
|
|
|
// throw new Error(...)
|
|
const err_msg = b.newExpr(E.New{
|
|
.target = b.newExpr(E.Identifier{
|
|
.ref = try b.newExternalSymbol("Error"),
|
|
}),
|
|
.args = try BabyList(Expr).fromSlice(b.allocator, &.{
|
|
b.newExpr(E.String{ .data = err_msg_string }),
|
|
}),
|
|
.close_parens_loc = Logger.Loc.Empty,
|
|
});
|
|
|
|
// registerClientReference(
|
|
// () => { throw new Error(...) },
|
|
// "src/filepath.tsx",
|
|
// "Comp"
|
|
// );
|
|
const value = b.newExpr(E.Call{
|
|
.target = register_client_reference,
|
|
.args = try js_ast.ExprNodeList.fromSlice(b.allocator, &.{
|
|
b.newExpr(E.Arrow{ .body = .{
|
|
.stmts = try b.allocator.dupe(Stmt, &.{
|
|
b.newStmt(S.Throw{ .value = err_msg }),
|
|
}),
|
|
.loc = Logger.Loc.Empty,
|
|
} }),
|
|
module_path,
|
|
b.newExpr(E.String{ .data = key }),
|
|
}),
|
|
});
|
|
|
|
if (is_default) {
|
|
const ref = try b.newSymbol(.other, "default");
|
|
// export default registerClientReference(...);
|
|
try b.appendStmt(S.ExportDefault{ .value = .{ .expr = value }, .default_name = .{ .ref = ref } });
|
|
} else {
|
|
// export const Component = registerClientReference(...);
|
|
const export_ref = try b.newSymbol(.other, key);
|
|
try b.appendStmt(S.Local{
|
|
.decls = try G.Decl.List.fromSlice(b.allocator, &.{.{
|
|
.binding = Binding.alloc(b.allocator, B.Identifier{ .ref = export_ref }, Logger.Loc.Empty),
|
|
.value = value,
|
|
}}),
|
|
.is_export = true,
|
|
.kind = .k_const,
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
pub const Ref = bun.ast.Ref;
|
|
|
|
pub const Index = bun.ast.Index;
|
|
|
|
pub const DeferredBatchTask = bun.bundle_v2.DeferredBatchTask;
|
|
pub const ThreadPool = bun.bundle_v2.ThreadPool;
|
|
pub const ParseTask = bun.bundle_v2.ParseTask;
|
|
|
|
const options = @import("../options.zig");
|
|
const std = @import("std");
|
|
|
|
const Logger = @import("../logger.zig");
|
|
const Loc = Logger.Loc;
|
|
|
|
const bun = @import("bun");
|
|
const OOM = bun.OOM;
|
|
const ThreadPoolLib = bun.ThreadPool;
|
|
const default_allocator = bun.default_allocator;
|
|
const js_parser = bun.js_parser;
|
|
const jsc = bun.jsc;
|
|
const strings = bun.strings;
|
|
const BabyList = bun.collections.BabyList;
|
|
|
|
const js_ast = bun.ast;
|
|
const B = js_ast.B;
|
|
const Binding = js_ast.Binding;
|
|
const E = js_ast.E;
|
|
const Expr = js_ast.Expr;
|
|
const G = js_ast.G;
|
|
const JSAst = js_ast.BundledAst;
|
|
const S = js_ast.S;
|
|
const Stmt = js_ast.Stmt;
|
|
|
|
const bundler = bun.bundle_v2;
|
|
const AstBuilder = bundler.AstBuilder;
|
|
const BundleV2 = bundler.BundleV2;
|