mirror of
https://github.com/oven-sh/bun
synced 2026-02-15 05:12:29 +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>
320 lines
15 KiB
Zig
320 lines
15 KiB
Zig
pub fn ParseJSXElement(
|
|
comptime parser_feature__typescript: bool,
|
|
comptime parser_feature__jsx: JSXTransformType,
|
|
comptime parser_feature__scan_only: bool,
|
|
) type {
|
|
return struct {
|
|
const P = js_parser.NewParser_(parser_feature__typescript, parser_feature__jsx, parser_feature__scan_only);
|
|
const is_typescript_enabled = P.is_typescript_enabled;
|
|
const only_scan_imports_and_do_not_visit = P.only_scan_imports_and_do_not_visit;
|
|
|
|
pub fn parseJSXElement(noalias p: *P, loc: logger.Loc) anyerror!Expr {
|
|
if (only_scan_imports_and_do_not_visit) {
|
|
p.needs_jsx_import = true;
|
|
}
|
|
|
|
const tag = try JSXTag.parse(P, p);
|
|
|
|
// The tag may have TypeScript type arguments: "<Foo<T>/>"
|
|
if (is_typescript_enabled) {
|
|
// Pass a flag to the type argument skipper because we need to call
|
|
_ = try p.skipTypeScriptTypeArguments(true);
|
|
}
|
|
|
|
var previous_string_with_backslash_loc = logger.Loc{};
|
|
var properties = G.Property.List{};
|
|
var key_prop_i: i32 = -1;
|
|
var flags = Flags.JSXElement.Bitset{};
|
|
var start_tag: ?ExprNodeIndex = null;
|
|
|
|
// Fragments don't have props
|
|
// Fragments of the form "React.Fragment" are not parsed as fragments.
|
|
if (@as(JSXTag.TagType, tag.data) == .tag) {
|
|
start_tag = tag.data.tag;
|
|
|
|
var spread_loc: logger.Loc = logger.Loc.Empty;
|
|
var props = ListManaged(G.Property).init(p.allocator);
|
|
var first_spread_prop_i: i32 = -1;
|
|
var i: i32 = 0;
|
|
parse_attributes: while (true) {
|
|
switch (p.lexer.token) {
|
|
.t_identifier => {
|
|
defer i += 1;
|
|
// Parse the prop name
|
|
const key_range = p.lexer.range();
|
|
const prop_name_literal = p.lexer.identifier;
|
|
const special_prop = E.JSXElement.SpecialProp.Map.get(prop_name_literal) orelse E.JSXElement.SpecialProp.any;
|
|
try p.lexer.nextInsideJSXElement();
|
|
|
|
if (special_prop == .key) {
|
|
// <ListItem key>
|
|
if (p.lexer.token != .t_equals) {
|
|
// Unlike Babel, we're going to just warn here and move on.
|
|
try p.log.addWarning(p.source, key_range.loc, "\"key\" prop ignored. Must be a string, number or symbol.");
|
|
continue;
|
|
}
|
|
|
|
key_prop_i = i;
|
|
}
|
|
|
|
const prop_name = p.newExpr(E.String{ .data = prop_name_literal }, key_range.loc);
|
|
|
|
// Parse the value
|
|
var value: Expr = undefined;
|
|
if (p.lexer.token != .t_equals) {
|
|
|
|
// Implicitly true value
|
|
// <button selected>
|
|
value = p.newExpr(E.Boolean{ .value = true }, logger.Loc{ .start = key_range.loc.start + key_range.len });
|
|
} else {
|
|
value = try p.parseJSXPropValueIdentifier(&previous_string_with_backslash_loc);
|
|
}
|
|
|
|
try props.append(G.Property{ .key = prop_name, .value = value });
|
|
},
|
|
.t_open_brace => {
|
|
defer i += 1;
|
|
// Use Next() not ExpectInsideJSXElement() so we can parse "..."
|
|
try p.lexer.next();
|
|
|
|
switch (p.lexer.token) {
|
|
.t_dot_dot_dot => {
|
|
try p.lexer.next();
|
|
|
|
if (first_spread_prop_i == -1) first_spread_prop_i = i;
|
|
spread_loc = p.lexer.loc();
|
|
try props.append(G.Property{ .value = try p.parseExpr(.comma), .kind = .spread });
|
|
},
|
|
// This implements
|
|
// <div {foo} />
|
|
// ->
|
|
// <div foo={foo} />
|
|
T.t_identifier => {
|
|
// we need to figure out what the key they mean is
|
|
// to do that, we must determine the key name
|
|
const expr = try p.parseExpr(Level.lowest);
|
|
|
|
const key = brk: {
|
|
switch (expr.data) {
|
|
.e_import_identifier => |ident| {
|
|
break :brk p.newExpr(E.String{ .data = p.loadNameFromRef(ident.ref) }, expr.loc);
|
|
},
|
|
.e_commonjs_export_identifier => |ident| {
|
|
break :brk p.newExpr(E.String{ .data = p.loadNameFromRef(ident.ref) }, expr.loc);
|
|
},
|
|
.e_identifier => |ident| {
|
|
break :brk p.newExpr(E.String{ .data = p.loadNameFromRef(ident.ref) }, expr.loc);
|
|
},
|
|
.e_dot => |dot| {
|
|
break :brk p.newExpr(E.String{ .data = dot.name }, dot.name_loc);
|
|
},
|
|
.e_index => |index| {
|
|
if (index.index.data == .e_string) {
|
|
break :brk index.index;
|
|
}
|
|
},
|
|
else => {},
|
|
}
|
|
|
|
// If we get here, it's invalid
|
|
try p.log.addError(p.source, expr.loc, "Invalid JSX prop shorthand, must be identifier, dot or string");
|
|
return error.SyntaxError;
|
|
};
|
|
|
|
try props.append(G.Property{ .value = expr, .key = key, .kind = .normal });
|
|
},
|
|
// This implements
|
|
// <div {"foo"} />
|
|
// <div {'foo'} />
|
|
// ->
|
|
// <div foo="foo" />
|
|
// note: template literals are not supported, operations on strings are not supported either
|
|
T.t_string_literal => {
|
|
const key = p.newExpr(try p.lexer.toEString(), p.lexer.loc());
|
|
try p.lexer.next();
|
|
try props.append(G.Property{ .value = key, .key = key, .kind = .normal });
|
|
},
|
|
|
|
else => try p.lexer.unexpected(),
|
|
}
|
|
|
|
try p.lexer.nextInsideJSXElement();
|
|
},
|
|
else => {
|
|
break :parse_attributes;
|
|
},
|
|
}
|
|
}
|
|
|
|
const is_key_after_spread = key_prop_i > -1 and first_spread_prop_i > -1 and key_prop_i > first_spread_prop_i;
|
|
flags.setPresent(.is_key_after_spread, is_key_after_spread);
|
|
properties = G.Property.List.moveFromList(&props);
|
|
if (is_key_after_spread and p.options.jsx.runtime == .automatic and !p.has_classic_runtime_warned) {
|
|
try p.log.addWarning(p.source, spread_loc, "\"key\" prop after a {...spread} is deprecated in JSX. Falling back to classic runtime.");
|
|
p.has_classic_runtime_warned = true;
|
|
}
|
|
}
|
|
|
|
// People sometimes try to use the output of "JSON.stringify()" as a JSX
|
|
// attribute when automatically-generating JSX code. Doing so is incorrect
|
|
// because JSX strings work like XML instead of like JS (since JSX is XML-in-
|
|
// JS). Specifically, using a backslash before a quote does not cause it to
|
|
// be escaped:
|
|
//
|
|
// JSX ends the "content" attribute here and sets "content" to 'some so-called \\'
|
|
// v
|
|
// <Button content="some so-called \"button text\"" />
|
|
// ^
|
|
// There is no "=" after the JSX attribute "text", so we expect a ">"
|
|
//
|
|
// This code special-cases this error to provide a less obscure error message.
|
|
if (p.lexer.token == .t_syntax_error and strings.eqlComptime(p.lexer.raw(), "\\") and previous_string_with_backslash_loc.start > 0) {
|
|
const r = p.lexer.range();
|
|
// Not dealing with this right now.
|
|
try p.log.addRangeError(p.source, r, "Invalid JSX escape - use XML entity codes quotes or pass a JavaScript string instead");
|
|
return error.SyntaxError;
|
|
}
|
|
|
|
// A slash here is a self-closing element
|
|
if (p.lexer.token == .t_slash) {
|
|
const close_tag_loc = p.lexer.loc();
|
|
// Use NextInsideJSXElement() not Next() so we can parse ">>" as ">"
|
|
|
|
try p.lexer.nextInsideJSXElement();
|
|
|
|
if (p.lexer.token != .t_greater_than) {
|
|
try p.lexer.expected(.t_greater_than);
|
|
}
|
|
|
|
return p.newExpr(E.JSXElement{
|
|
.tag = start_tag,
|
|
.properties = properties,
|
|
.key_prop_index = key_prop_i,
|
|
.flags = flags,
|
|
.close_tag_loc = close_tag_loc,
|
|
}, loc);
|
|
}
|
|
|
|
// Use ExpectJSXElementChild() so we parse child strings
|
|
try p.lexer.expectJSXElementChild(.t_greater_than);
|
|
var children = ListManaged(Expr).init(p.allocator);
|
|
// var last_element_i: usize = 0;
|
|
|
|
while (true) {
|
|
switch (p.lexer.token) {
|
|
.t_string_literal => {
|
|
try children.append(p.newExpr(try p.lexer.toEString(), loc));
|
|
try p.lexer.nextJSXElementChild();
|
|
},
|
|
.t_open_brace => {
|
|
// Use Next() instead of NextJSXElementChild() here since the next token is an expression
|
|
try p.lexer.next();
|
|
|
|
const is_spread = p.lexer.token == .t_dot_dot_dot;
|
|
if (is_spread) {
|
|
try p.lexer.next();
|
|
}
|
|
|
|
// The expression is optional, and may be absent
|
|
if (p.lexer.token != .t_close_brace) {
|
|
var item = try p.parseExpr(.lowest);
|
|
if (is_spread) {
|
|
item = p.newExpr(E.Spread{ .value = item }, loc);
|
|
}
|
|
try children.append(item);
|
|
}
|
|
|
|
// Use ExpectJSXElementChild() so we parse child strings
|
|
try p.lexer.expectJSXElementChild(.t_close_brace);
|
|
},
|
|
.t_less_than => {
|
|
const less_than_loc = p.lexer.loc();
|
|
try p.lexer.nextInsideJSXElement();
|
|
|
|
if (p.lexer.token != .t_slash) {
|
|
// This is a child element
|
|
|
|
children.append(try p.parseJSXElement(less_than_loc)) catch unreachable;
|
|
|
|
// The call to parseJSXElement() above doesn't consume the last
|
|
// TGreaterThan because the caller knows what Next() function to call.
|
|
// Use NextJSXElementChild() here since the next token is an element
|
|
// child.
|
|
try p.lexer.nextJSXElementChild();
|
|
continue;
|
|
}
|
|
|
|
// This is the closing element
|
|
try p.lexer.nextInsideJSXElement();
|
|
const end_tag = try JSXTag.parse(P, p);
|
|
|
|
if (!strings.eql(end_tag.name, tag.name)) {
|
|
try p.log.addRangeErrorFmtWithNote(
|
|
p.source,
|
|
end_tag.range,
|
|
p.allocator,
|
|
"Expected closing JSX tag to match opening tag \"\\<{s}\\>\"",
|
|
.{tag.name},
|
|
"Opening tag here:",
|
|
.{},
|
|
tag.range,
|
|
);
|
|
return error.SyntaxError;
|
|
}
|
|
|
|
if (p.lexer.token != .t_greater_than) {
|
|
try p.lexer.expected(.t_greater_than);
|
|
}
|
|
|
|
return p.newExpr(E.JSXElement{
|
|
.tag = end_tag.data.asExpr(),
|
|
.children = ExprNodeList.moveFromList(&children),
|
|
.properties = properties,
|
|
.key_prop_index = key_prop_i,
|
|
.flags = flags,
|
|
.close_tag_loc = end_tag.range.loc,
|
|
}, loc);
|
|
},
|
|
else => {
|
|
try p.lexer.unexpected();
|
|
return error.SyntaxError;
|
|
},
|
|
}
|
|
}
|
|
}
|
|
};
|
|
}
|
|
|
|
const string = []const u8;
|
|
|
|
const bun = @import("bun");
|
|
const logger = bun.logger;
|
|
const strings = bun.strings;
|
|
|
|
const js_ast = bun.ast;
|
|
const E = js_ast.E;
|
|
const Expr = js_ast.Expr;
|
|
const ExprNodeIndex = js_ast.ExprNodeIndex;
|
|
const ExprNodeList = js_ast.ExprNodeList;
|
|
const Flags = js_ast.Flags;
|
|
|
|
const G = js_ast.G;
|
|
const Property = G.Property;
|
|
|
|
const Op = js_ast.Op;
|
|
const Level = js_ast.Op.Level;
|
|
|
|
const js_lexer = bun.js_lexer;
|
|
const T = js_lexer.T;
|
|
|
|
const js_parser = bun.js_parser;
|
|
const JSXTag = js_parser.JSXTag;
|
|
const JSXTransformType = js_parser.JSXTransformType;
|
|
const TypeScript = js_parser.TypeScript;
|
|
const options = js_parser.options;
|
|
|
|
const std = @import("std");
|
|
const List = std.ArrayListUnmanaged;
|
|
const Map = std.AutoHashMapUnmanaged;
|
|
const ListManaged = std.array_list.Managed;
|