diff options
| -rw-r--r-- | src/feature_flags.zig | 1 | ||||
| -rw-r--r-- | src/js_ast.zig | 20 | ||||
| -rw-r--r-- | src/js_parser/js_parser.zig | 67 |
3 files changed, 63 insertions, 25 deletions
diff --git a/src/feature_flags.zig b/src/feature_flags.zig index 2819c1cbd..17d6873f5 100644 --- a/src/feature_flags.zig +++ b/src/feature_flags.zig @@ -71,3 +71,4 @@ pub const auto_import_buffer = false; pub const is_macro_enabled = env.isDebug; pub const force_macro = false; +pub const include_filename_in_jsx = false; diff --git a/src/js_ast.zig b/src/js_ast.zig index ab36c995d..c33523bf9 100644 --- a/src/js_ast.zig +++ b/src/js_ast.zig @@ -4259,18 +4259,30 @@ pub const Macro = struct { return js.JSObjectMakeArray(ctx, 0, null, exception); } - for (obj.properties) |*prop, i| { + var object_properties_array: [64]js.JSObjectRef = undefined; + + var did_allocate = false; + var properties_list = if (obj.properties.len < object_properties_array.len) + object_properties_array[0..obj.properties.len] + else brk: { + did_allocate = true; + break :brk getAllocator(ctx).alloc(js.JSObjectRef, obj.properties.len) catch unreachable; + }; + + defer if (did_allocate) getAllocator(ctx).free(properties_list); + + for (obj.properties) |_, i| { var node = JSCBase.getAllocator(ctx).create(JSNode) catch unreachable; node.* = JSNode{ .data = .{ - .g_property = prop, + .g_property = &obj.properties[i], }, .loc = this.loc, }; - temporary_call_args_array[i] = JSNode.Class.make(ctx, node); + properties_list[i] = JSNode.Class.make(ctx, node); } - return js.JSObjectMakeArray(ctx, obj.properties.len, &temporary_call_args_array, exception); + return js.JSObjectMakeArray(ctx, properties_list.len, properties_list.ptr, exception); } fn toObjectPrimitive(this: *JSNode, ctx: js.JSContextRef, obj: E.Object, exception: js.ExceptionRef) js.JSObjectRef { diff --git a/src/js_parser/js_parser.zig b/src/js_parser/js_parser.zig index 3efa382b3..cf251c66a 100644 --- a/src/js_parser/js_parser.zig +++ b/src/js_parser/js_parser.zig @@ -11931,7 +11931,10 @@ pub fn NewParser( var has_spread = false; var has_proto = false; - for (e_.properties) |*property, i| { + var i: usize = 0; + while (i < e_.properties.len) : (i += 1) { + var property = &e_.properties[i]; + if (property.kind != .spread) { property.key = p.visitExpr(property.key orelse Global.panic("Expected property key", .{})); const key = property.key.?; @@ -12023,11 +12026,33 @@ pub fn NewParser( .has_chain_parent = (e_.optional_chain orelse js_ast.OptionalChain.start) == .ccontinue, }); - // TODO: wan about import namespace call - var has_spread = false; - for (e_.args) |*arg| { - arg.* = p.visitExpr(arg.*); - has_spread = has_spread or @as(Expr.Tag, arg.data) == .e_spread; + // Copy the call side effect flag over if this is a known target + switch (e_.target.data) { + .e_identifier => |ident| { + e_.can_be_unwrapped_if_unused = e_.can_be_unwrapped_if_unused or ident.call_can_be_unwrapped_if_unused; + }, + .e_dot => |dot| { + e_.can_be_unwrapped_if_unused = e_.can_be_unwrapped_if_unused or dot.call_can_be_unwrapped_if_unused; + }, + else => {}, + } + + const is_macro_ref: bool = if (comptime FeatureFlags.is_macro_enabled and + jsx_transform_type != .macro) + e_.target.data == .e_import_identifier and p.macro_refs.contains(e_.target.data.e_import_identifier.ref) + else + false; + + { + const old_ce = p.options.ignore_dce_annotations; + defer p.options.ignore_dce_annotations = old_ce; + if (is_macro_ref) + p.options.ignore_dce_annotations = true; + + for (e_.args) |_, i| { + const arg = e_.args[i]; + e_.args[i] = p.visitExpr(arg); + } } if (e_.optional_chain == null and @as(Expr.Tag, e_.target.data) == .e_identifier and e_.target.data.e_identifier.ref.eql(p.require_ref)) { @@ -12043,22 +12068,22 @@ pub fn NewParser( } if (comptime FeatureFlags.is_macro_enabled and jsx_transform_type != .macro) { - if (e_.target.data == .e_import_identifier) { + if (is_macro_ref) { const ref = e_.target.data.e_import_identifier.ref; - if (p.macro_refs.get(ref)) |import_record_id| { - const name = p.symbols.items[ref.inner_index].original_name; - const record = &p.import_records.items[import_record_id]; - return p.options.macro_context.call( - record.path.text, - p.source.path.sourceDir(), - p.log, - p.source, - record.range, - expr, - &.{}, - name, - ) catch return expr; - } + const import_record_id = p.macro_refs.get(ref).?; + const name = p.symbols.items[ref.inner_index].original_name; + const record = &p.import_records.items[import_record_id]; + const copied = Expr{ .loc = expr.loc, .data = .{ .e_call = e_ } }; + return p.options.macro_context.call( + record.path.text, + p.source.path.sourceDir(), + p.log, + p.source, + record.range, + copied, + &.{}, + name, + ) catch return expr; } } |