Skip to content

Commit

Permalink
Fix delete on optional chain (#1103)
Browse files Browse the repository at this point in the history
  • Loading branch information
jridgewell committed Nov 13, 2021
1 parent aadf03d commit 8f30357
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 11 deletions.
31 changes: 20 additions & 11 deletions lib/compress/index.js
Expand Up @@ -2750,16 +2750,16 @@ def_optimize(AST_UnaryPostfix, function(self, compressor) {

def_optimize(AST_UnaryPrefix, function(self, compressor) {
var e = self.expression;
if (self.operator == "delete"
&& !(e instanceof AST_SymbolRef
|| e instanceof AST_PropAccess
|| is_identifier_atom(e))) {
if (e instanceof AST_Sequence) {
const exprs = e.expressions.slice();
exprs.push(make_node(AST_True, self));
return make_sequence(self, exprs).optimize(compressor);
}
return make_sequence(self, [ e, make_node(AST_True, self) ]).optimize(compressor);
if (
self.operator == "delete" &&
!(
e instanceof AST_SymbolRef ||
e instanceof AST_PropAccess ||
e instanceof AST_Chain ||
is_identifier_atom(e)
)
) {
return make_sequence(self, [e, make_node(AST_True, self)]).optimize(compressor);
}
var seq = self.lift_sequences(compressor);
if (seq !== self) {
Expand Down Expand Up @@ -4251,7 +4251,16 @@ def_optimize(AST_Sub, function(self, compressor) {
});

def_optimize(AST_Chain, function (self, compressor) {
if (is_nullish(self.expression, compressor)) return make_node(AST_Undefined, self);
if (is_nullish(self.expression, compressor)) {
let parent = compressor.parent();
// It's valid to delete a nullish optional chain, but if we optimized
// this to `delete undefined` then it would appear to be a syntax error
// when we try to optimize the delete. Thankfully, `delete 0` is fine.
if (parent instanceof AST_UnaryPrefix && parent.operator === "delete") {
return make_node_from_constant(0, self);
}
return make_node(AST_Undefined, self);
}
return self;
});

Expand Down
30 changes: 30 additions & 0 deletions test/compress/nullish.js
Expand Up @@ -145,3 +145,33 @@ nullish_coalescing_parens: {
"PASS",
]
}

delete_nullish: {
input: {
delete obj?.key;
const other = { key: true };
delete other?.key;
}
expect: {
delete obj?.key;
const other = { key: true };
delete other?.key;
}
}

delete_nullish_2: {
options = {
defaults: true,
evaluate: true,
passes: 3,
}
input: {
delete null?.key;
delete null?.deep.key;
delete null.deep?.key;
delete null?.deep?.key;
}
expect: {
delete null.deep?.key;
}
}

0 comments on commit 8f30357

Please sign in to comment.