dan/oxc
1
0
Fork 0
mirror of https://github.com/danbulant/oxc synced 2026-05-24 12:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(transformer/optional-chaining): avoid creating a useless reference when noDocumentAll is true (#7832)

Browse source
This commit is contained in:
Dunqing 2024-12-13 13:28:36 +00:00
parent 1428527da6
commit 4920c6a455
2 changed files with 32 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crates/oxc_transformer/src/es2020/optional_chaining.rs
View file

@ -211,13 +211,9 @@ impl<'a, 'ctx> OptionalChaining<'a, 'ctx> {
ctx: &TraverseCtx<'a>, ctx: &TraverseCtx<'a>,
) -> Expression<'a> { ) -> Expression<'a> {
let null_check = self.wrap_null_check(left1, ctx); let null_check = self.wrap_null_check(left1, ctx);
if self.ctx.assumptions.no_document_all {
null_check
} else {
let void0_check = Self::wrap_void0_check(left2, ctx); let void0_check = Self::wrap_void0_check(left2, ctx);
Self::create_logical_expression(null_check, void0_check, ctx) Self::create_logical_expression(null_check, void0_check, ctx)
} }
}
/// Return `left || right` /// Return `left || right`
fn create_logical_expression( fn create_logical_expression(
@ -566,6 +562,11 @@ impl<'a, 'ctx> OptionalChaining<'a, 'ctx> {
*expr = ctx.ast.expression_sequence(SPAN, expressions); *expr = ctx.ast.expression_sequence(SPAN, expressions);
} }
self.set_binding_context(binding); self.set_binding_context(binding);
if self.ctx.assumptions.no_document_all {
// `foo === null`
return self.wrap_null_check(left1, ctx);
}
// `foo === null || foo === void 0`
return self.wrap_optional_check(left1, left2, ctx); return self.wrap_optional_check(left1, left2, ctx);
} }
} }
@ -602,12 +603,17 @@ impl<'a, 'ctx> OptionalChaining<'a, 'ctx> {
// `(binding = expr)` // `(binding = expr)`
let assignment_expression = let assignment_expression =
Self::create_assignment_expression(temp_binding.create_write_target(ctx), expr, ctx); Self::create_assignment_expression(temp_binding.create_write_target(ctx), expr, ctx);
let expr = if self.ctx.assumptions.no_document_all {
// `(binding = expr) === null`
self.wrap_null_check(assignment_expression, ctx)
} else {
// `(binding = expr) === null || binding === void 0` // `(binding = expr) === null || binding === void 0`
let expr = self.wrap_optional_check( self.wrap_optional_check(
assignment_expression, assignment_expression,
temp_binding.create_read_expression(ctx), temp_binding.create_read_expression(ctx),
ctx, ctx,
); )
};
self.set_temp_binding(temp_binding); self.set_temp_binding(temp_binding);
expr expr

72
tasks/transform_conformance/snapshots/babel.snap.md
View file

@ -1,6 +1,6 @@
commit: 54a8389f commit: 54a8389f
Passed: 579/927 Passed: 580/927
# All Passed: # All Passed:
* babel-plugin-transform-class-static-block * babel-plugin-transform-class-static-block
@ -526,7 +526,7 @@ x Output mismatch
x Output mismatch x Output mismatch
# babel-plugin-transform-optional-chaining (31/45) # babel-plugin-transform-optional-chaining (32/45)
* assumption-noDocumentAll/assignment/input.js * assumption-noDocumentAll/assignment/input.js
Symbol reference IDs mismatch for "_obj$a": Symbol reference IDs mismatch for "_obj$a":
after transform: SymbolId(5): [ReferenceId(9), ReferenceId(10), ReferenceId(11)] after transform: SymbolId(5): [ReferenceId(9), ReferenceId(10), ReferenceId(11)]
@ -604,14 +604,11 @@ rebuilt : ScopeId(10): Some(ScopeId(9))
Symbol scope ID mismatch for "a": Symbol scope ID mismatch for "a":
after transform: SymbolId(1): ScopeId(1) after transform: SymbolId(1): ScopeId(1)
rebuilt : SymbolId(1): ScopeId(1) rebuilt : SymbolId(1): ScopeId(1)
Symbol reference IDs mismatch for "_x":
after transform: SymbolId(14): [ReferenceId(5), ReferenceId(6), ReferenceId(7)]
rebuilt : SymbolId(2): [ReferenceId(0), ReferenceId(2)]
Symbol scope ID mismatch for "a": Symbol scope ID mismatch for "a":
after transform: SymbolId(3): ScopeId(2) after transform: SymbolId(3): ScopeId(2)
rebuilt : SymbolId(4): ScopeId(3) rebuilt : SymbolId(4): ScopeId(3)
Symbol reference IDs mismatch for "a": Symbol reference IDs mismatch for "a":
after transform: SymbolId(3): [ReferenceId(1), ReferenceId(8), ReferenceId(9)] after transform: SymbolId(3): [ReferenceId(1), ReferenceId(7), ReferenceId(8)]
rebuilt : SymbolId(4): [ReferenceId(3), ReferenceId(4)] rebuilt : SymbolId(4): [ReferenceId(3), ReferenceId(4)]
Symbol scope ID mismatch for "b": Symbol scope ID mismatch for "b":
after transform: SymbolId(4): ScopeId(2) after transform: SymbolId(4): ScopeId(2)
@ -623,7 +620,7 @@ Symbol scope ID mismatch for "b":
after transform: SymbolId(7): ScopeId(3) after transform: SymbolId(7): ScopeId(3)
rebuilt : SymbolId(8): ScopeId(5) rebuilt : SymbolId(8): ScopeId(5)
Symbol reference IDs mismatch for "_a$b": Symbol reference IDs mismatch for "_a$b":
after transform: SymbolId(15): [ReferenceId(10), ReferenceId(11), ReferenceId(12), ReferenceId(13), ReferenceId(14), ReferenceId(15)] after transform: SymbolId(15): [ReferenceId(9), ReferenceId(10), ReferenceId(11), ReferenceId(12), ReferenceId(13)]
rebuilt : SymbolId(9): [ReferenceId(5), ReferenceId(7), ReferenceId(8), ReferenceId(9)] rebuilt : SymbolId(9): [ReferenceId(5), ReferenceId(7), ReferenceId(8), ReferenceId(9)]
Symbol scope ID mismatch for "a": Symbol scope ID mismatch for "a":
after transform: SymbolId(9): ScopeId(4) after transform: SymbolId(9): ScopeId(4)
@ -632,90 +629,49 @@ Symbol scope ID mismatch for "b":
after transform: SymbolId(10): ScopeId(4) after transform: SymbolId(10): ScopeId(4)
rebuilt : SymbolId(12): ScopeId(7) rebuilt : SymbolId(12): ScopeId(7)
Symbol reference IDs mismatch for "_a$b2": Symbol reference IDs mismatch for "_a$b2":
after transform: SymbolId(16): [ReferenceId(16), ReferenceId(17), ReferenceId(18), ReferenceId(19), ReferenceId(20), ReferenceId(21)] after transform: SymbolId(16): [ReferenceId(14), ReferenceId(15), ReferenceId(16), ReferenceId(17), ReferenceId(18)]
rebuilt : SymbolId(13): [ReferenceId(10), ReferenceId(12), ReferenceId(13), ReferenceId(14)] rebuilt : SymbolId(13): [ReferenceId(10), ReferenceId(12), ReferenceId(13), ReferenceId(14)]
Symbol scope ID mismatch for "a": Symbol scope ID mismatch for "a":
after transform: SymbolId(12): ScopeId(5) after transform: SymbolId(12): ScopeId(5)
rebuilt : SymbolId(15): ScopeId(9) rebuilt : SymbolId(15): ScopeId(9)
Symbol reference IDs mismatch for "a": Symbol reference IDs mismatch for "a":
after transform: SymbolId(12): [ReferenceId(4), ReferenceId(22), ReferenceId(23)] after transform: SymbolId(12): [ReferenceId(4), ReferenceId(19), ReferenceId(20)]
rebuilt : SymbolId(15): [ReferenceId(15), ReferenceId(17)] rebuilt : SymbolId(15): [ReferenceId(15), ReferenceId(17)]
Symbol scope ID mismatch for "b": Symbol scope ID mismatch for "b":
after transform: SymbolId(13): ScopeId(5) after transform: SymbolId(13): ScopeId(5)
rebuilt : SymbolId(16): ScopeId(9) rebuilt : SymbolId(16): ScopeId(9)
Symbol reference IDs mismatch for "_a$b3": Symbol reference IDs mismatch for "_a$b3":
after transform: SymbolId(17): [ReferenceId(24), ReferenceId(25), ReferenceId(26)] after transform: SymbolId(17): [ReferenceId(21), ReferenceId(22), ReferenceId(23)]
rebuilt : SymbolId(17): [ReferenceId(16), ReferenceId(18)] rebuilt : SymbolId(17): [ReferenceId(16), ReferenceId(18)]
* assumption-noDocumentAll/memoize/input.js * assumption-noDocumentAll/memoize/input.js
Symbol reference IDs mismatch for "foo": Symbol reference IDs mismatch for "foo":
after transform: SymbolId(1): [ReferenceId(0), ReferenceId(1), ReferenceId(2), ReferenceId(3), ReferenceId(4), ReferenceId(5), ReferenceId(7), ReferenceId(8), ReferenceId(10), ReferenceId(11), ReferenceId(13), ReferenceId(14), ReferenceId(15), ReferenceId(16), ReferenceId(17), ReferenceId(18), ReferenceId(19), ReferenceId(20), ReferenceId(21), ReferenceId(22), ReferenceId(23), ReferenceId(24), ReferenceId(25), ReferenceId(26), ReferenceId(27), ReferenceId(28), ReferenceId(32), ReferenceId(33), ReferenceId(34), ReferenceId(35), ReferenceId(54), ReferenceId(55), ReferenceId(56), ReferenceId(60), ReferenceId(64), ReferenceId(65), ReferenceId(76), ReferenceId(77)] after transform: SymbolId(1): [ReferenceId(0), ReferenceId(1), ReferenceId(2), ReferenceId(3), ReferenceId(4), ReferenceId(5), ReferenceId(7), ReferenceId(8), ReferenceId(10), ReferenceId(11), ReferenceId(13), ReferenceId(14), ReferenceId(15), ReferenceId(16), ReferenceId(17), ReferenceId(18), ReferenceId(19), ReferenceId(20), ReferenceId(21), ReferenceId(22), ReferenceId(23), ReferenceId(24), ReferenceId(25), ReferenceId(26), ReferenceId(27), ReferenceId(28), ReferenceId(32), ReferenceId(33), ReferenceId(34), ReferenceId(35), ReferenceId(48), ReferenceId(49), ReferenceId(50), ReferenceId(54), ReferenceId(57), ReferenceId(58), ReferenceId(68), ReferenceId(69)]
rebuilt : SymbolId(1): [ReferenceId(0), ReferenceId(1), ReferenceId(2), ReferenceId(4), ReferenceId(6), ReferenceId(7), ReferenceId(8), ReferenceId(9), ReferenceId(10), ReferenceId(12), ReferenceId(16), ReferenceId(19), ReferenceId(23), ReferenceId(26), ReferenceId(30), ReferenceId(32), ReferenceId(33), ReferenceId(34), ReferenceId(36), ReferenceId(38), ReferenceId(39), ReferenceId(41), ReferenceId(43), ReferenceId(44), ReferenceId(46), ReferenceId(48), ReferenceId(50), ReferenceId(55), ReferenceId(56), ReferenceId(58), ReferenceId(63)] rebuilt : SymbolId(1): [ReferenceId(0), ReferenceId(1), ReferenceId(2), ReferenceId(4), ReferenceId(6), ReferenceId(7), ReferenceId(8), ReferenceId(9), ReferenceId(10), ReferenceId(12), ReferenceId(16), ReferenceId(19), ReferenceId(23), ReferenceId(26), ReferenceId(30), ReferenceId(32), ReferenceId(33), ReferenceId(34), ReferenceId(36), ReferenceId(38), ReferenceId(39), ReferenceId(41), ReferenceId(43), ReferenceId(44), ReferenceId(46), ReferenceId(48), ReferenceId(50), ReferenceId(55), ReferenceId(56), ReferenceId(58), ReferenceId(63)]
Symbol reference IDs mismatch for "_foo$bar": Symbol reference IDs mismatch for "_foo$bar":
after transform: SymbolId(2): [ReferenceId(29), ReferenceId(30), ReferenceId(31)] after transform: SymbolId(2): [ReferenceId(29), ReferenceId(30), ReferenceId(31)]
rebuilt : SymbolId(2): [ReferenceId(3), ReferenceId(5)] rebuilt : SymbolId(2): [ReferenceId(3), ReferenceId(5)]
Symbol reference IDs mismatch for "_foo$get":
after transform: SymbolId(3): [ReferenceId(36), ReferenceId(37), ReferenceId(38)]
rebuilt : SymbolId(3): [ReferenceId(11), ReferenceId(14)]
Symbol reference IDs mismatch for "_foo$bar2":
after transform: SymbolId(4): [ReferenceId(39), ReferenceId(40), ReferenceId(41)]
rebuilt : SymbolId(4): [ReferenceId(15), ReferenceId(17)]
Symbol reference IDs mismatch for "_foo$bar3":
after transform: SymbolId(5): [ReferenceId(42), ReferenceId(43), ReferenceId(44)]
rebuilt : SymbolId(5): [ReferenceId(18), ReferenceId(21)]
Symbol reference IDs mismatch for "_foo$bar$baz":
after transform: SymbolId(6): [ReferenceId(45), ReferenceId(46), ReferenceId(47)]
rebuilt : SymbolId(6): [ReferenceId(22), ReferenceId(24)]
Symbol reference IDs mismatch for "_foo$bar$baz2":
after transform: SymbolId(7): [ReferenceId(48), ReferenceId(49), ReferenceId(50)]
rebuilt : SymbolId(7): [ReferenceId(25), ReferenceId(28)]
Symbol reference IDs mismatch for "_foo$bar4":
after transform: SymbolId(8): [ReferenceId(51), ReferenceId(52), ReferenceId(53)]
rebuilt : SymbolId(8): [ReferenceId(29), ReferenceId(31)]
Symbol reference IDs mismatch for "_foo$bar5": Symbol reference IDs mismatch for "_foo$bar5":
after transform: SymbolId(9): [ReferenceId(57), ReferenceId(58), ReferenceId(59)] after transform: SymbolId(9): [ReferenceId(51), ReferenceId(52), ReferenceId(53)]
rebuilt : SymbolId(9): [ReferenceId(35), ReferenceId(37)] rebuilt : SymbolId(9): [ReferenceId(35), ReferenceId(37)]
Symbol reference IDs mismatch for "_foo$bar6":
after transform: SymbolId(10): [ReferenceId(61), ReferenceId(62), ReferenceId(63)]
rebuilt : SymbolId(10): [ReferenceId(40), ReferenceId(42)]
Symbol reference IDs mismatch for "_foo$bar7": Symbol reference IDs mismatch for "_foo$bar7":
after transform: SymbolId(11): [ReferenceId(66), ReferenceId(67), ReferenceId(68)] after transform: SymbolId(11): [ReferenceId(59), ReferenceId(60), ReferenceId(61)]
rebuilt : SymbolId(11): [ReferenceId(45), ReferenceId(47)] rebuilt : SymbolId(11): [ReferenceId(45), ReferenceId(47)]
Symbol reference IDs mismatch for "_foo$bar8":
after transform: SymbolId(12): [ReferenceId(69), ReferenceId(70), ReferenceId(71), ReferenceId(75)]
rebuilt : SymbolId(12): [ReferenceId(49), ReferenceId(52), ReferenceId(54)]
Symbol reference IDs mismatch for "_foo$bar8$baz": Symbol reference IDs mismatch for "_foo$bar8$baz":
after transform: SymbolId(13): [ReferenceId(72), ReferenceId(73), ReferenceId(74)] after transform: SymbolId(13): [ReferenceId(64), ReferenceId(65), ReferenceId(66)]
rebuilt : SymbolId(13): [ReferenceId(51), ReferenceId(53)] rebuilt : SymbolId(13): [ReferenceId(51), ReferenceId(53)]
Symbol reference IDs mismatch for "_foo$bar9": Symbol reference IDs mismatch for "_foo$bar9":
after transform: SymbolId(14): [ReferenceId(78), ReferenceId(79), ReferenceId(80), ReferenceId(84)] after transform: SymbolId(14): [ReferenceId(70), ReferenceId(71), ReferenceId(72), ReferenceId(76)]
rebuilt : SymbolId(14): [ReferenceId(57), ReferenceId(60), ReferenceId(62)] rebuilt : SymbolId(14): [ReferenceId(57), ReferenceId(60), ReferenceId(62)]
Symbol reference IDs mismatch for "_foo$bar9$baz": Symbol reference IDs mismatch for "_foo$bar9$baz":
after transform: SymbolId(15): [ReferenceId(81), ReferenceId(82), ReferenceId(83)] after transform: SymbolId(15): [ReferenceId(73), ReferenceId(74), ReferenceId(75)]
rebuilt : SymbolId(15): [ReferenceId(59), ReferenceId(61)] rebuilt : SymbolId(15): [ReferenceId(59), ReferenceId(61)]
* assumption-noDocumentAll/optional-eval-call/input.js * assumption-noDocumentAll/optional-eval-call/input.js
Symbol reference IDs mismatch for "_eval":
after transform: SymbolId(1): [ReferenceId(20), ReferenceId(21), ReferenceId(22)]
rebuilt : SymbolId(0): [ReferenceId(10), ReferenceId(12)]
Symbol reference IDs mismatch for "_eval2":
after transform: SymbolId(2): [ReferenceId(23), ReferenceId(24), ReferenceId(25)]
rebuilt : SymbolId(1): [ReferenceId(13), ReferenceId(15)]
Symbol reference IDs mismatch for "_foo$eval":
after transform: SymbolId(3): [ReferenceId(26), ReferenceId(27), ReferenceId(28)]
rebuilt : SymbolId(2): [ReferenceId(16), ReferenceId(18)]
Symbol reference IDs mismatch for "_eval$foo":
after transform: SymbolId(4): [ReferenceId(30), ReferenceId(31), ReferenceId(32)]
rebuilt : SymbolId(3): [ReferenceId(21), ReferenceId(23)]
Unresolved reference IDs mismatch for "eval": Unresolved reference IDs mismatch for "eval":
after transform: [ReferenceId(0), ReferenceId(2), ReferenceId(4), ReferenceId(5), ReferenceId(6), ReferenceId(7), ReferenceId(10), ReferenceId(12), ReferenceId(13), ReferenceId(14), ReferenceId(15), ReferenceId(16), ReferenceId(17), ReferenceId(18), ReferenceId(19), ReferenceId(33)] after transform: [ReferenceId(0), ReferenceId(2), ReferenceId(4), ReferenceId(5), ReferenceId(6), ReferenceId(7), ReferenceId(10), ReferenceId(12), ReferenceId(13), ReferenceId(14), ReferenceId(15), ReferenceId(16), ReferenceId(17), ReferenceId(18), ReferenceId(19), ReferenceId(29)]
rebuilt : [ReferenceId(0), ReferenceId(1), ReferenceId(3), ReferenceId(4), ReferenceId(6), ReferenceId(7), ReferenceId(8), ReferenceId(9), ReferenceId(11), ReferenceId(14), ReferenceId(22), ReferenceId(24)] rebuilt : [ReferenceId(0), ReferenceId(1), ReferenceId(3), ReferenceId(4), ReferenceId(6), ReferenceId(7), ReferenceId(8), ReferenceId(9), ReferenceId(11), ReferenceId(14), ReferenceId(22), ReferenceId(24)]
* assumption-noDocumentAll/super-method-call/input.js
Symbol reference IDs mismatch for "_super$method":
after transform: SymbolId(2): [ReferenceId(1), ReferenceId(2), ReferenceId(3)]
rebuilt : SymbolId(2): [ReferenceId(1), ReferenceId(2)]
* general/cast-to-boolean/input.js * general/cast-to-boolean/input.js
Bindings mismatch: Bindings mismatch:
after transform: ScopeId(25): ["_o$a$b$c$non_existent", "_o$a$b$c$non_existent3", "_o$a$b10", "_o$a$b6", "_o$a$b7", "_o$a$b8", "_o$a$b9", "o"] after transform: ScopeId(25): ["_o$a$b$c$non_existent", "_o$a$b$c$non_existent3", "_o$a$b10", "_o$a$b6", "_o$a$b7", "_o$a$b8", "_o$a$b9", "o"]