fix(es/minifier): Prevent inlining vars assigned outside current function scope (#7414)

**Related issue:**

 - Closes #7412.

Author: Austaras

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

@@ -182,14 +182,14 @@ where
             // new variant is added for multi inline, think carefully
             if is_inline_enabled
                 && usage.declared_count == 1
-                && (usage.can_inline_var())
+                && usage.can_inline_var()
                 && match init {
                     Expr::Ident(Ident {
                         sym: js_word!("eval"),
                         ..
                     }) => false,
 
-                    Expr::Ident(id) if !id.eq_ignore_span(ident) => self
+                    Expr::Ident(id) if !id.eq_ignore_span(ident) && usage.assigned_fn_local => self
                         .data
                         .vars
                         .get(&id.to_id())
@@ -362,6 +362,10 @@ where
                     }
 
                     Expr::Ident(id) if !id.eq_ignore_span(ident) => {
+                        if !usage.assigned_fn_local {
+                            return;
+                        }
+
                         if let Some(init_usage) = self.data.vars.get(&id.to_id()) {
                             if init_usage.reassigned() || !init_usage.declared {
                                 return;

crates/swc_ecma_minifier/src/program_data.rs

@@ -99,6 +99,11 @@ pub(crate) struct VarUsageInfo {
     /// functions.
     pub(crate) is_fn_local: bool,
 
+    used_in_non_child_fn: bool,
+
+    /// `true` if all its assign happens in the same function scope it's defined
+    pub(crate) assigned_fn_local: bool,
+
     pub(crate) executed_multiple_time: bool,
     pub(crate) used_in_cond: bool,
 
@@ -123,8 +128,6 @@ pub(crate) struct VarUsageInfo {
     /// `infects_to`. This should be renamed, but it will be done with another
     /// PR. (because it's hard to review)
     infects_to: Vec<Access>,
-
-    pub(crate) used_in_non_child_fn: bool,
     /// Only **string** properties.
     pub(crate) accessed_props: Box<AHashMap<JsWord, u32>>,
 
@@ -166,6 +169,7 @@ impl Default for VarUsageInfo {
             accessed_props: Default::default(),
             used_recursively: Default::default(),
             is_top_level: Default::default(),
+            assigned_fn_local: true,
         }
     }
 }
@@ -232,6 +236,8 @@ impl Storage for ProgramData {
             match self.vars.entry(id.clone()) {
                 Entry::Occupied(mut e) => {
                     e.get_mut().inline_prevented |= var_info.inline_prevented;
+                    let var_assigned = var_info.assign_count > 0
+                        || (var_info.var_initialized && !e.get().var_initialized);
 
                     if var_info.var_initialized {
                         if e.get().var_initialized || e.get().ref_count > 0 {
@@ -294,6 +300,8 @@ impl Storage for ProgramData {
                     e.get_mut().is_fn_local &= var_info.is_fn_local;
                     e.get_mut().used_in_non_child_fn |= var_info.used_in_non_child_fn;
 
+                    e.get_mut().assigned_fn_local &= var_info.assigned_fn_local;
+
                     for (k, v) in *var_info.accessed_props {
                         *e.get_mut().accessed_props.entry(k).or_default() += v;
                     }
@@ -304,6 +312,10 @@ impl Storage for ProgramData {
                             if !var_info.used_recursively {
                                 e.get_mut().used_in_non_child_fn = true
                             }
+
+                            if var_assigned {
+                                e.get_mut().assigned_fn_local = false
+                            }
                         }
                         ScopeKind::Block => {
                             if var_info.used_in_non_child_fn {
@@ -608,7 +620,6 @@ impl ProgramData {
             let simple_assign = ctx.is_exact_reassignment && !ctx.is_op_assign;
 
             VarUsageInfo {
-                is_fn_local: true,
                 used_above_decl: !simple_assign,
                 ..Default::default()
             }
@@ -684,7 +695,6 @@ impl ProgramData {
                 let simple_assign = ctx.is_exact_reassignment && !ctx.is_op_assign;
 
                 VarUsageInfo {
-                    is_fn_local: true,
                     used_above_decl: !simple_assign,
                     ..Default::default()
                 }

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

@@ -2,7 +2,7 @@
     'object' == typeof exports && 'undefined' != typeof module ? module.exports = factory() : 'function' == typeof define && define.amd ? define(factory) : (global1 = global1 || self).Vue = factory();
 }(this, function() {
     'use strict';
-    var Vue, cid, configDef, dataDef, propsDef, hookRE, baseCompile, _isServer, _Set, timerFunc, mark, measure, initProxy, target, len, str, chr, index$1, expressionPos, expressionEndPos, target$1, svgContainer, emptyStyle, decoder, warn$2, delimiters, transforms, preTransforms, postTransforms, platformIsPreTag, platformMustUseProp, platformGetTagNamespace, maybeComponent, isStaticKey, isPlatformReservedTag, div, emptyObject = Object.freeze({});
+    var Vue, cid, configDef, dataDef, propsDef, hookRE, baseCompile, _isServer, _Set, timerFunc, mark, measure, initProxy, target, len, str, chr, index$1, expressionPos, expressionEndPos, warn$1, target$1, svgContainer, emptyStyle, decoder, warn$2, delimiters, transforms, preTransforms, postTransforms, platformIsPreTag, platformMustUseProp, platformGetTagNamespace, maybeComponent, isStaticKey, isPlatformReservedTag, div, emptyObject = Object.freeze({});
     function isUndef(v) {
         return null == v;
     }
@@ -2918,16 +2918,17 @@
         modules: modules$1,
         directives: {
             model: function(el, dir, _warn) {
+                warn$1 = _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 ('input' === tag && 'file' === type && warn$1("<" + 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', 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) {
                     var type = el.attrsMap.type, value$1 = el.attrsMap['v-bind:value'] || el.attrsMap[':value'], typeBinding = el.attrsMap['v-bind:type'] || el.attrsMap[':type'];
                     if (value$1 && !typeBinding) {
                         var binding = el.attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
-                        _warn(binding + "=\"" + value$1 + '" conflicts with v-model on the same element because the latter already expands to a value binding internally', el.rawAttrsMap[binding]);
+                        warn$1(binding + "=\"" + value$1 + '" conflicts with v-model on the same element because the latter already expands to a value binding internally', el.rawAttrsMap[binding]);
                     }
                     var ref = modifiers || {}, lazy = ref.lazy, number = ref.number, trim = ref.trim, valueExpression = '$event.target.value';
                     trim && (valueExpression = "$event.target.value.trim()"), number && (valueExpression = "_n(" + valueExpression + ")");
@@ -2936,7 +2937,7 @@
                 }(el, value, modifiers);
                 else {
                     if (!config.isReservedTag(tag)) return genComponentModel(el, value, modifiers), !1;
-                    _warn("<" + el.tag + " v-model=\"" + value + "\">: v-model is not supported on this element type. If you are working with contenteditable, it's recommended to wrap a library dedicated for that purpose inside a custom component.", el.rawAttrsMap['v-model']);
+                    warn$1("<" + el.tag + " v-model=\"" + value + "\">: v-model is not supported on this element type. If you are working with contenteditable, it's recommended to wrap a library dedicated for that purpose inside a custom component.", el.rawAttrsMap['v-model']);
                 }
                 return !0;
             },

crates/swc_ecma_minifier/tests/fixture/issues/7412/input.js

@@ -0,0 +1,14 @@
+export function throttleTime(interval) {
+    let currentValue;
+    let timeout;
+
+    return (done) => (value) => {
+        currentValue = value;
+        if (timeout) {
+            return;
+        }
+        timeout = setTimeout(() => {
+            done(currentValue);
+        }, interval);
+    };
+}

crates/swc_ecma_minifier/tests/fixture/issues/7412/output.js

@@ -0,0 +1,8 @@
+export function throttleTime(interval) {
+    let currentValue, timeout;
+    return (done)=>(value)=>{
+            currentValue = value, timeout || (timeout = setTimeout(()=>{
+                done(currentValue);
+            }, interval));
+        };
+}

crates/swc_ecma_minifier/tests/fixture/issues/firebase-firestore/1/output.js

@@ -2369,14 +2369,14 @@
                         }).next(()=>i));
                 }
                 Dn(t, e, n) {
-                    let s;
-                    return this.He.getDocumentsMatchingQuery(t, e, n).next((n)=>(s = n, this.In.getAllMutationBatchesAffectingQuery(t, e))).next((e)=>this.Cn(t, e, s).next((t)=>{
-                            for (const t1 of (s = t, e))for (const e of t1.mutations){
+                    let s, i;
+                    return this.He.getDocumentsMatchingQuery(t, e, n).next((n)=>(s = n, this.In.getAllMutationBatchesAffectingQuery(t, e))).next((e)=>(i = e, this.Cn(t, i, s).next((t)=>{
+                            for (const t1 of (s = t, i))for (const e of t1.mutations){
                                 const n = e.key;
                                 let i = s.get(n);
                                 null == i && (i = Kt.newInvalidDocument(n), s = s.insert(n, i)), Ye(e, i, t1.localWriteTime), i.isFoundDocument() || (s = s.remove(n));
                             }
-                        })).next(()=>(s.forEach((t, n)=>{
+                        }))).next(()=>(s.forEach((t, n)=>{
                             Pe(e, n) || (s = s.remove(t));
                         }), s));
                 }

crates/swc_ecma_minifier/tests/fixture/next/react-pdf-renderer/output.js

@@ -9302,7 +9302,7 @@
         },
         4756: function(e, t, r) {
             var n, i;
-            void 0 !== (n = "function" == typeof (i = function() {
+            void 0 !== (i = "function" == typeof (n = function() {
                 var e = "debug", t = "hyphenChar", n = "minWordLength", i = "object" == typeof r.g ? r.g : "object" == typeof window ? window : "object" == typeof this ? this : {};
                 function o(e) {
                     var t = {};
@@ -9432,14 +9432,14 @@
                         }(i, y, f[D], s, b, v, m, c);
                     };
                 };
-            }) ? i.apply(t, []) : i) && (e.exports = n);
+            }) ? n.apply(t, []) : n) && (e.exports = i);
         },
         3202: function(e, t, r) {
             e.exports = r(4756);
         },
         1487: function(e, t) {
             var r, n;
-            void 0 !== (r = "function" == typeof (n = function() {
+            void 0 !== (n = "function" == typeof (r = function() {
                 return {
                     patterns: [
                         " ",
@@ -14401,7 +14401,7 @@
                         ""
                     ]
                 };
-            }) ? n.apply(t, []) : n) && (e.exports = r);
+            }) ? r.apply(t, []) : r) && (e.exports = n);
         },
         5717: function(e) {
             "function" == typeof Object.create ? e.exports = function(e, t) {