Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix delete on optional chain #1103

Merged
merged 1 commit into from Nov 13, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
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)
)
) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing instanceof AST_Sequence isn't checked here to avoid nested AST_Sequence because the extra one would be compressed right away

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.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great thinking here!

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;
}
}