fix(es/minifier): Fix remapping of vars upon inlining (#7362)

**Related issue:**

 - Closes #7331.

Author: kdy1

crates/swc_ecma_minifier/src/compress/optimize/iife.rs

@@ -875,12 +875,11 @@ where
                     for decl in &var.decls {
                         let ids: Vec<Id> = find_pat_ids(&decl.name);
 
-                        remap.extend(ids.into_iter().map(|id| {
-                            (
-                                id,
-                                SyntaxContext::empty().apply_mark(Mark::fresh(Mark::root())),
-                            )
-                        }));
+                        for id in ids {
+                            remap
+                                .entry(id)
+                                .or_insert_with(|| SyntaxContext::empty().apply_mark(Mark::new()));
+                        }
                     }
                 }
             }

crates/swc_ecma_minifier/src/compress/optimize/sequences.rs

@@ -2216,6 +2216,8 @@ where
                             if !usage.reassigned() && usage.usage_count == 1 && usage.declared {
                                 can_remove = true;
                             }
+                        } else {
+                            return Ok(false);
                         }
 
                         (left_id.clone(), Some(right))

crates/swc_ecma_minifier/tests/benches-full/echarts.js

@@ -26724,21 +26724,21 @@
     }
     function updateRectShape(controller, cover, name, x, y, w, h) {
         var points, xmin, ymin, el = cover.childOfName(name);
-        el && el.setShape({
-            x: xmin = mathMin$9((points = clipByPanel(controller, cover, [
-                [
-                    x,
-                    y
-                ],
-                [
-                    x + w,
-                    y + h
-                ]
-            ]))[0][0], points[1][0]),
+        el && el.setShape((xmin = mathMin$9((points = clipByPanel(controller, cover, [
+            [
+                x,
+                y
+            ],
+            [
+                x + w,
+                y + h
+            ]
+        ]))[0][0], points[1][0]), {
+            x: xmin,
             y: ymin = mathMin$9(points[0][1], points[1][1]),
             width: mathMax$9(points[0][0], points[1][0]) - xmin,
             height: mathMax$9(points[0][1], points[1][1]) - ymin
-        });
+        }));
     }
     function makeStyle(brushOption) {
         return defaults({
@@ -34714,25 +34714,25 @@
             header.innerHTML = lang[0] || model.get('title'), header.style.cssText = 'margin: 10px 20px;', header.style.color = model.get('textColor');
             var viewMain = document.createElement('div'), textarea = document.createElement('textarea');
             viewMain.style.cssText = 'display:block;width:100%;overflow:auto;';
-            var optionToContent = model.get('optionToContent'), contentToOption = model.get('contentToOption'), result1 = {
+            var optionToContent = model.get('optionToContent'), contentToOption = model.get('contentToOption'), result1 = (seriesGroupByCategoryAxis = {}, otherSeries = [], meta = [], ecModel.eachRawSeries(function(seriesModel) {
+                var coordSys = seriesModel.coordinateSystem;
+                if (coordSys && ('cartesian2d' === coordSys.type || 'polar' === coordSys.type)) {
+                    var baseAxis = coordSys.getBaseAxis();
+                    if ('category' === baseAxis.type) {
+                        var key = baseAxis.dim + '_' + baseAxis.index;
+                        seriesGroupByCategoryAxis[key] || (seriesGroupByCategoryAxis[key] = {
+                            categoryAxis: baseAxis,
+                            valueAxis: coordSys.getOtherAxis(baseAxis),
+                            series: []
+                        }, meta.push({
+                            axisDim: baseAxis.dim,
+                            axisIndex: baseAxis.index
+                        })), seriesGroupByCategoryAxis[key].series.push(seriesModel);
+                    } else otherSeries.push(seriesModel);
+                } else otherSeries.push(seriesModel);
+            }), {
                 value: filter([
-                    (groups = (seriesGroupByCategoryAxis = {}, otherSeries = [], meta = [], ecModel.eachRawSeries(function(seriesModel) {
-                        var coordSys = seriesModel.coordinateSystem;
-                        if (coordSys && ('cartesian2d' === coordSys.type || 'polar' === coordSys.type)) {
-                            var baseAxis = coordSys.getBaseAxis();
-                            if ('category' === baseAxis.type) {
-                                var key = baseAxis.dim + '_' + baseAxis.index;
-                                seriesGroupByCategoryAxis[key] || (seriesGroupByCategoryAxis[key] = {
-                                    categoryAxis: baseAxis,
-                                    valueAxis: coordSys.getOtherAxis(baseAxis),
-                                    series: []
-                                }, meta.push({
-                                    axisDim: baseAxis.dim,
-                                    axisIndex: baseAxis.index
-                                })), seriesGroupByCategoryAxis[key].series.push(seriesModel);
-                            } else otherSeries.push(seriesModel);
-                        } else otherSeries.push(seriesModel);
-                    }), result = {
+                    (groups = (result = {
                         seriesGroupByCategoryAxis: seriesGroupByCategoryAxis,
                         other: otherSeries,
                         meta: meta
@@ -34771,7 +34771,7 @@
                     return !!str.replace(/[\n\t\s]/g, '');
                 }).join('\n\n' + BLOCK_SPLITER + '\n\n'),
                 meta: result.meta
-            };
+            });
             if ('function' == typeof optionToContent) {
                 var htmlOrDom = optionToContent(api.getOption());
                 'string' == typeof htmlOrDom ? viewMain.innerHTML = htmlOrDom : isDom(htmlOrDom) && viewMain.appendChild(htmlOrDom);

crates/swc_ecma_minifier/tests/benches-full/victory.js

@@ -13431,9 +13431,9 @@
                 return childComponents.map(function(child, index) {
                     var child1, props1, calculatedProps1, domain, scale, stringMap, categories, axisChild, role = child.type && child.type.role, style = Array.isArray(child.props.style) ? child.props.style : lodash_defaults__WEBPACK_IMPORTED_MODULE_1___default()({}, child.props.style, {
                         parent: baseStyle
-                    }), childProps = (child1 = child, props1 = props, calculatedProps1 = calculatedProps, (axisChild = victory_core__WEBPACK_IMPORTED_MODULE_3__.Axis.findAxisComponents([
+                    }), childProps = (child1 = child, props1 = props, calculatedProps1 = calculatedProps, axisChild = victory_core__WEBPACK_IMPORTED_MODULE_3__.Axis.findAxisComponents([
                         child1
-                    ])).length > 0 ? (axisChild[0], domain = calculatedProps1.domain, scale = calculatedProps1.scale, stringMap = calculatedProps1.stringMap, categories = calculatedProps1.categories, {
+                    ]), axisChild.length > 0 ? (axisChild[0], domain = calculatedProps1.domain, scale = calculatedProps1.scale, stringMap = calculatedProps1.stringMap, categories = calculatedProps1.categories, {
                         stringMap: stringMap,
                         horizontal: calculatedProps1.horizontal,
                         categories: categories,
@@ -18462,8 +18462,8 @@
                             x: x,
                             y: y
                         };
-                        var polarPadding = (style = props.style, degrees = getDegrees(props, datum), labelStyle = style.labels || {}, {
-                            x: (padding = _helpers__WEBPACK_IMPORTED_MODULE_1__.default.evaluateProp(labelStyle.padding, props) || 0) * Math.cos(angle = _helpers__WEBPACK_IMPORTED_MODULE_1__.default.degreesToRadians(degrees)),
+                        var polarPadding = (style = props.style, degrees = getDegrees(props, datum), labelStyle = style.labels || {}, padding = _helpers__WEBPACK_IMPORTED_MODULE_1__.default.evaluateProp(labelStyle.padding, props) || 0, {
+                            x: padding * Math.cos(angle = _helpers__WEBPACK_IMPORTED_MODULE_1__.default.degreesToRadians(degrees)),
                             y: -padding * Math.sin(angle)
                         });
                         return {
@@ -28461,13 +28461,13 @@
                     return dataset.filter(function(datum) {
                         return null !== datum._x && null !== datum._y;
                     });
-                }), (fillInMissingData = props1.fillInMissingData, xMap = filterNullChildData.reduce(function(prev, dataset) {
+                }), fillInMissingData = props1.fillInMissingData, xMap = filterNullChildData.reduce(function(prev, dataset) {
                     return dataset.forEach(function(datum) {
                         prev[datum._x instanceof Date ? datum._x.getTime() : datum._x] = !0;
                     }), prev;
                 }, {}), xKeys = lodash_keys__WEBPACK_IMPORTED_MODULE_1___default()(xMap).map(function(k) {
                     return +k;
-                }), xArr = lodash_orderBy__WEBPACK_IMPORTED_MODULE_0___default()(xKeys), datasets = filterNullChildData.map(function(dataset) {
+                }), xArr = lodash_orderBy__WEBPACK_IMPORTED_MODULE_0___default()(xKeys), (datasets = filterNullChildData.map(function(dataset) {
                     var indexOffset = 0, isDate = dataset[0] && dataset[0]._x instanceof Date;
                     return xArr.map(function(x, index) {
                         x = +x;

crates/swc_ecma_minifier/tests/benches-full/vue.js

@@ -2922,7 +2922,7 @@
             model: function(el, dir, _warn) {
                 var code, number, valueBinding, trueValueBinding, falseValueBinding, number1, valueBinding1, value = dir.value, modifiers = dir.modifiers, tag = el.tag, type = el.attrsMap.type;
                 if ('input' === tag && 'file' === type && _warn("<" + el.tag + " v-model=\"" + value + '" type="file">:\nFile inputs are read only. Use a v-on:change listener instead.', el.rawAttrsMap['v-model']), el.component) return genComponentModel(el, value, modifiers), !1;
-                if ('select' === tag) addHandler(el, 'change', 'var $$selectedVal = Array.prototype.filter.call($event.target.options,function(o){return o.selected}).map(function(o){var val = "_value" in o ? o._value : o.value;return ' + (modifiers && modifiers.number ? '_n(val)' : 'val') + "}); " + genAssignmentCode(value, '$event.target.multiple ? $$selectedVal : $$selectedVal[0]'), null, !0);
+                if ('select' === tag) addHandler(el, 'change', code = (code = 'var $$selectedVal = Array.prototype.filter.call($event.target.options,function(o){return o.selected}).map(function(o){var val = "_value" in o ? o._value : o.value;return ' + (modifiers && modifiers.number ? '_n(val)' : 'val') + "});") + " " + genAssignmentCode(value, '$event.target.multiple ? $$selectedVal : $$selectedVal[0]'), null, !0);
                 else if ('input' === tag && 'checkbox' === type) number = modifiers && modifiers.number, valueBinding = getBindingAttr(el, 'value') || 'null', trueValueBinding = getBindingAttr(el, 'true-value') || 'true', falseValueBinding = getBindingAttr(el, 'false-value') || 'false', addProp(el, 'checked', "Array.isArray(" + value + ")?_i(" + value + "," + valueBinding + ")>-1" + ('true' === trueValueBinding ? ":(" + value + ")" : ":_q(" + value + "," + trueValueBinding + ")")), addHandler(el, 'change', "var $$a=" + value + ",$$el=$event.target,$$c=$$el.checked?(" + trueValueBinding + "):(" + falseValueBinding + ");if(Array.isArray($$a)){var $$v=" + (number ? '_n(' + valueBinding + ')' : valueBinding) + ",$$i=_i($$a,$$v);if($$el.checked){$$i<0&&(" + genAssignmentCode(value, '$$a.concat([$$v])') + ")}else{$$i>-1&&(" + genAssignmentCode(value, '$$a.slice(0,$$i).concat($$a.slice($$i+1))') + ")}}else{" + genAssignmentCode(value, '$$c') + "}", null, !0);
                 else if ('input' === tag && 'radio' === type) number1 = modifiers && modifiers.number, valueBinding1 = getBindingAttr(el, 'value') || 'null', valueBinding1 = number1 ? "_n(" + valueBinding1 + ")" : valueBinding1, addProp(el, 'checked', "_q(" + value + "," + valueBinding1 + ")"), addHandler(el, 'change', genAssignmentCode(value, valueBinding1), null, !0);
                 else if ('input' === tag || 'textarea' === tag) !function(el, value, modifiers) {
@@ -3092,7 +3092,7 @@
         if (el.for && !el.forProcessed) return genFor(el, state);
         if (el.if && !el.ifProcessed) return genIf(el, state);
         if ('template' === el.tag && !el.slotTarget && !state.pre) return genChildren(el, state) || 'void 0';
-        if ('slot' === el.tag) return res = "_t(" + (el.slotName || '"default"') + ((children = genChildren(el, state)) ? "," + children : ''), attrs = el.attrs || el.dynamicAttrs ? genProps((el.attrs || []).concat(el.dynamicAttrs || []).map(function(attr) {
+        if ('slot' === el.tag) return slotName = el.slotName || '"default"', res = "_t(" + slotName + ((children = genChildren(el, state)) ? "," + children : ''), attrs = el.attrs || el.dynamicAttrs ? genProps((el.attrs || []).concat(el.dynamicAttrs || []).map(function(attr) {
             return {
                 name: camelize(attr.name),
                 value: attr.value,
@@ -3102,7 +3102,7 @@
         if (el.component) componentName = el.component, children1 = el.inlineTemplate ? null : genChildren(el, state, !0), code = "_c(" + componentName + "," + genData$2(el, state) + (children1 ? "," + children1 : '') + ")";
         else {
             (!el.plain || el.pre && state.maybeComponent(el)) && (data = genData$2(el, state));
-            var children, res, attrs, bind$$1, code, componentName, children1, data, children2 = el.inlineTemplate ? null : genChildren(el, state, !0);
+            var slotName, children, res, attrs, bind$$1, code, componentName, children1, data, children2 = el.inlineTemplate ? null : genChildren(el, state, !0);
             code = "_c('" + el.tag + "'" + (data ? "," + data : '') + (children2 ? "," + children2 : '') + ")";
         }
         for(var i = 0; i < state.transforms.length; i++)code = state.transforms[i](el, code);

crates/swc_ecma_minifier/tests/fixture/issues/7331/1/config.json

@@ -0,0 +1,5 @@
+{
+    "inline": true,
+    "toplevel": true,
+    "passes": 1
+}

crates/swc_ecma_minifier/tests/fixture/issues/7331/1/input.js

@@ -0,0 +1,7 @@
+export default function () {
+    function foo(arg) {
+        var arg = arg.slice()
+        return arg
+    }
+    foo([])
+}

crates/swc_ecma_minifier/tests/fixture/issues/7331/1/output.js

@@ -0,0 +1,5 @@
+export default function() {
+    var arg;
+    var arg;
+    arg = (arg = []).slice();
+}

crates/swc_ecma_minifier/tests/fixture/issues/7331/2/input.js

@@ -0,0 +1,7 @@
+export default function () {
+    function foo(arg) {
+        var arg = arg.slice()
+        return arg
+    }
+    foo([])
+}

crates/swc_ecma_minifier/tests/fixture/issues/7331/2/output.js

@@ -0,0 +1 @@
+export default function() {}