Skip to content

Commit

Permalink
fix(es/minifier): Do not drop used properties (#8703)
Browse files Browse the repository at this point in the history
**Related issue:**

 - Closes #8692
  • Loading branch information
kdy1 committed Mar 7, 2024
1 parent c6464ad commit 6069217
Show file tree
Hide file tree
Showing 7 changed files with 178 additions and 0 deletions.
63 changes: 63 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8692/input/.swcrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"$schema": "http://json.schemastore.org/swcrc",
"jsc": {
"externalHelpers": false,
"parser": {
"syntax": "typescript",
"tsx": false,
"dynamicImport": true,
"decorators": true
},
"keepClassNames": true,
"target": "es2020",
"minify": {
"compress": {
"arguments": false,
"arrows": false,
"booleans": false,
"booleans_as_integers": false,
"collapse_vars": false,
"comparisons": false,
"computed_props": false,
"conditionals": false,
"dead_code": false,
"directives": false,
"drop_console": false,
"drop_debugger": false,
"evaluate": false,
"expression": false,
"hoist_funs": false,
"hoist_props": true,
"hoist_vars": false,
"if_return": false,
"join_vars": false,
"keep_classnames": false,
"keep_fargs": false,
"keep_fnames": false,
"keep_infinity": false,
"loops": false,
"negate_iife": false,
"properties": false,
"reduce_funcs": false,
"reduce_vars": false,
"side_effects": false,
"switches": false,
"typeofs": false,
"unsafe": false,
"unsafe_arrows": false,
"unsafe_comps": false,
"unsafe_Function": false,
"unsafe_math": false,
"unsafe_symbols": false,
"unsafe_methods": false,
"unsafe_proto": false,
"unsafe_regexp": false,
"unsafe_undefined": false,
"unused": false,
"const_to_let": false,
"pristine_globals": false
},
"mangle": false
}
}
}
10 changes: 10 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8692/input/input.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const props = {
neededProp: 1,
nestedProp: {
getProps: () => props,
getProp() {
return this.getProps().neededProp;
},
},
};
console.log(props.nestedProp.getProp()); // should log: 1
10 changes: 10 additions & 0 deletions crates/swc/tests/fixture/issues-8xxx/8692/output/input.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const props = {
neededProp: 1,
nestedProp: {
getProps: ()=>props,
getProp () {
return this.getProps().neededProp;
}
}
};
console.log(props.nestedProp.getProp());
28 changes: 28 additions & 0 deletions crates/swc_ecma_minifier/src/compress/optimize/unused.rs
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,34 @@ impl Visit for ThisPropertyVisitor {
}
}

fn visit_callee(&mut self, c: &Callee) {
if self.should_abort {
return;
}

c.visit_children_with(self);

if self.should_abort {
return;
}

if let Callee::Expr(e) = c {
match &**e {
Expr::This(..) => {
self.should_abort = true;
}

Expr::Member(e) => {
if e.obj.is_this() {
self.should_abort = true;
}
}

_ => {}
}
}
}

fn visit_member_expr(&mut self, e: &MemberExpr) {
if self.should_abort {
return;
Expand Down
47 changes: 47 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/8692/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"arguments": false,
"arrows": false,
"booleans": false,
"booleans_as_integers": false,
"collapse_vars": false,
"comparisons": false,
"computed_props": false,
"conditionals": false,
"dead_code": false,
"directives": false,
"drop_console": false,
"drop_debugger": false,
"evaluate": false,
"expression": false,
"hoist_funs": false,
"hoist_props": true,
"hoist_vars": false,
"if_return": false,
"join_vars": false,
"keep_classnames": false,
"keep_fargs": false,
"keep_fnames": false,
"keep_infinity": false,
"loops": false,
"negate_iife": false,
"properties": false,
"reduce_funcs": false,
"reduce_vars": false,
"side_effects": false,
"switches": false,
"typeofs": false,
"unsafe": false,
"unsafe_arrows": false,
"unsafe_comps": false,
"unsafe_Function": false,
"unsafe_math": false,
"unsafe_symbols": false,
"unsafe_methods": false,
"unsafe_proto": false,
"unsafe_regexp": false,
"unsafe_undefined": false,
"unused": false,
"const_to_let": false,
"pristine_globals": false,
"defaults": true
}
10 changes: 10 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/8692/input.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const props = {
neededProp: 1,
nestedProp: {
getProps: () => props,
getProp() {
return this.getProps().neededProp;
},
},
};
console.log(props.nestedProp.getProp()); // should log: 1
10 changes: 10 additions & 0 deletions crates/swc_ecma_minifier/tests/fixture/issues/8692/output.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
const props = {
neededProp: 1,
nestedProp: {
getProps: ()=>props,
getProp () {
return this.getProps().neededProp;
}
}
};
console.log(props.nestedProp.getProp());

0 comments on commit 6069217

Please sign in to comment.