fix(es/minifier): Fix minifier (#2551)

swc_ecma_minifier:
 - `hoist_props`: Check for infection. (#2506)

ecmascript/minifier/Cargo.toml

@@ -7,7 +7,7 @@ include = ["Cargo.toml", "src/**/*.rs", "src/lists/*.json"]
 license = "Apache-2.0/MIT"
 name = "swc_ecma_minifier"
 repository = "https://github.com/swc-project/swc.git"
-version = "0.46.3"
+version = "0.46.4"
 
 [features]
 debug = ["backtrace"]

ecmascript/minifier/src/analyzer/mod.rs

@@ -118,6 +118,10 @@ impl VarUsageInfo {
     pub fn is_mutated_only_by_one_call(&self) -> bool {
         self.assign_count == 0 && self.mutation_by_call_count == 1
     }
+
+    pub fn is_infected(&self) -> bool {
+        !self.infects.is_empty()
+    }
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

ecmascript/minifier/src/compress/optimize/hoist_props.rs

@@ -22,7 +22,11 @@ where
                 if !self
                     .data
                     .as_ref()
-                    .and_then(|data| data.vars.get(&name.to_id()).map(|v| !v.mutated))
+                    .and_then(|data| {
+                        data.vars
+                            .get(&name.to_id())
+                            .map(|v| !v.mutated && !v.reassigned && !v.is_infected())
+                    })
                     .unwrap_or(false)
                 {
                     return;

ecmascript/minifier/tests/compress/fixture/issues/2257/full/output.js

@@ -4755,7 +4755,7 @@
             };
         },
         88986: function(module, __unused_webpack_exports, __webpack_require__) {
-            var setGlobal = __webpack_require__(65933), store = __webpack_require__(19514)["__core-js_shared__"] || setGlobal("__core-js_shared__", {
+            var global = __webpack_require__(19514), setGlobal = __webpack_require__(65933), store = global["__core-js_shared__"] || setGlobal("__core-js_shared__", {
             });
             module.exports = store;
         },
@@ -5197,7 +5197,7 @@
         },
         39803: function(__unused_webpack_module, __unused_webpack_exports, __webpack_require__) {
             "use strict";
-            var $ = __webpack_require__(35437), setSpecies = __webpack_require__(53988), ArrayBuffer = __webpack_require__(44757).ArrayBuffer, NativeArrayBuffer = __webpack_require__(19514).ArrayBuffer;
+            var $ = __webpack_require__(35437), global = __webpack_require__(19514), arrayBufferModule = __webpack_require__(44757), setSpecies = __webpack_require__(53988), ArrayBuffer = arrayBufferModule.ArrayBuffer, NativeArrayBuffer = global.ArrayBuffer;
             $({
                 global: !0,
                 forced: NativeArrayBuffer !== ArrayBuffer
@@ -11431,6 +11431,11 @@
                 var b = a.textContent;
                 b === a._wrapperState.initialValue && "" !== b && null !== b && (a.value = b);
             }
+            var kb = {
+                html: "http://www.w3.org/1999/xhtml",
+                mathml: "http://www.w3.org/1998/Math/MathML",
+                svg: "http://www.w3.org/2000/svg"
+            };
             function lb(a) {
                 switch(a){
                     case "svg":
@@ -11451,7 +11456,7 @@
                     });
                 } : a;
             }(function(a, b) {
-                if ("http://www.w3.org/2000/svg" !== a.namespaceURI || "innerHTML" in a) a.innerHTML = b;
+                if (a.namespaceURI !== kb.svg || "innerHTML" in a) a.innerHTML = b;
                 else {
                     for((nb = nb || document.createElement("div")).innerHTML = "<svg>" + b.valueOf().toString() + "</svg>", b = nb.firstChild; a.firstChild;)a.removeChild(a.firstChild);
                     for(; b.firstChild;)a.appendChild(b.firstChild);
@@ -14353,7 +14358,7 @@
                                 }
                                 d = a, b.updateQueue = d, null !== d && (b.flags |= 4);
                             } else {
-                                switch(g = 9 === e.nodeType ? e : e.ownerDocument, "http://www.w3.org/1999/xhtml" === a && (a = lb(c)), "http://www.w3.org/1999/xhtml" === a ? "script" === c ? ((a = g.createElement("div")).innerHTML = "<script></script>", a = a.removeChild(a.firstChild)) : "string" == typeof d.is ? a = g.createElement(c, {
+                                switch(g = 9 === e.nodeType ? e : e.ownerDocument, a === kb.html && (a = lb(c)), a === kb.html ? "script" === c ? ((a = g.createElement("div")).innerHTML = "<script></script>", a = a.removeChild(a.firstChild)) : "string" == typeof d.is ? a = g.createElement(c, {
                                     is: d.is
                                 }) : (a = g.createElement(c), "select" === c && (g = a, d.multiple ? g.multiple = !0 : d.size && (g.size = d.size))) : a = g.createElementNS(a, c), a[wf] = b, a[xf] = d, Bi(a, b, !1, !1), b.stateNode = a, g = wb(c, d), c){
                                     case "dialog":
@@ -16913,7 +16918,9 @@
             }, D.prototype = C.prototype;
             var F = E.prototype = new D;
             F.constructor = E, l(F, C.prototype), F.isPureReactComponent = !0;
-            var H = Object.prototype.hasOwnProperty, I = {
+            var G = {
+                current: null
+            }, H = Object.prototype.hasOwnProperty, I = {
                 key: !0,
                 ref: !0,
                 __self: !0,
@@ -16936,7 +16943,7 @@
                     key: k,
                     ref: h,
                     props: d,
-                    _owner: null
+                    _owner: G.current
                 };
             }
             function L(a) {
@@ -17006,9 +17013,13 @@
                 if (1 === a._status) return a._result;
                 throw a._result;
             }
+            var R = {
+                current: null
+            };
             function S() {
-                throw Error(z(321));
-                return null;
+                var a = R.current;
+                if (null === a) throw Error(z(321));
+                return a;
             }
             exports.Children = {
                 map: P,
@@ -17033,15 +17044,11 @@
                     return a;
                 }
             }, exports.Component = C, exports.PureComponent = E, exports.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED = {
-                ReactCurrentDispatcher: {
-                    current: null
-                },
+                ReactCurrentDispatcher: R,
                 ReactCurrentBatchConfig: {
                     transition: 0
                 },
-                ReactCurrentOwner: {
-                    current: null
-                },
+                ReactCurrentOwner: G,
                 IsSomeRendererActing: {
                     current: !1
                 },
@@ -17051,7 +17058,7 @@
                 var e = l({
                 }, a.props), d = a.key, k = a.ref, h = a._owner;
                 if (null != b) {
-                    if (void 0 !== b.ref && (k = b.ref, h = null), void 0 !== b.key && (d = "" + b.key), a.type && a.type.defaultProps) var g = a.type.defaultProps;
+                    if (void 0 !== b.ref && (k = b.ref, h = G.current), void 0 !== b.key && (d = "" + b.key), a.type && a.type.defaultProps) var g = a.type.defaultProps;
                     for(f in b)H.call(b, f) && !I.hasOwnProperty(f) && (e[f] = void 0 === b[f] && void 0 !== g ? g[f] : b[f]);
                 }
                 var f = arguments.length - 2;

ecmascript/minifier/tests/compress/fixture/issues/moment/1/output.js

@@ -1579,8 +1579,8 @@
     });
     var proto$1 = Locale.prototype;
     function get$1(format, index, field, setter) {
-        var utc = createUTC().set(setter, index);
-        return getLocale()[field](utc, format);
+        var locale = getLocale(), utc = createUTC().set(setter, index);
+        return locale[field](utc, format);
     }
     function listMonthsImpl(format, index, field) {
         if (isNumber(format) && (index = format, format = void 0), format = format || "", null != index) return get$1(format, index, field, "month");

ecmascript/minifier/tests/projects/output/react-dom-17.0.2.js

@@ -851,6 +851,11 @@
         var node = element, textContent = node.textContent;
         textContent === node._wrapperState.initialValue && "" !== textContent && null !== textContent && (node.value = textContent);
     }
+    var Namespaces = {
+        html: "http://www.w3.org/1999/xhtml",
+        mathml: "http://www.w3.org/1998/Math/MathML",
+        svg: "http://www.w3.org/2000/svg"
+    };
     function getIntrinsicNamespace(type) {
         switch(type){
             case "svg":
@@ -871,7 +876,7 @@
             });
         } : func;
     }(function(node, html) {
-        if ("http://www.w3.org/2000/svg" === node.namespaceURI && !("innerHTML" in node)) {
+        if (node.namespaceURI === Namespaces.svg && !("innerHTML" in node)) {
             (reusableSVGContainer = reusableSVGContainer || document.createElement("div")).innerHTML = "<svg>" + html.valueOf().toString() + "</svg>";
             for(var svgNode = reusableSVGContainer.firstChild; node.firstChild;)node.removeChild(node.firstChild);
             for(; svgNode.firstChild;)node.appendChild(svgNode.firstChild);
@@ -3670,7 +3675,7 @@
     function getListenerSetKey(domEventName, capture) {
         return domEventName + "__" + (capture ? "capture" : "bubble");
     }
-    var didWarnInvalidHydration = !1;
+    var didWarnInvalidHydration = !1, HTML_NAMESPACE$1 = Namespaces.html;
     warnedUnknownTags = {
         dialog: !0,
         webview: !0
@@ -3739,7 +3744,7 @@
     }, warnForInvalidEventListener = function(registrationName, listener) {
         !1 === listener ? error1("Expected `%s` listener to be a function, instead got `false`.\n\nIf you used to conditionally omit it with %s={condition && value}, pass %s={condition ? value : undefined} instead.", registrationName, registrationName, registrationName) : error1("Expected `%s` listener to be a function, instead got a value of `%s` type.", registrationName, typeof listener);
     }, normalizeHTML = function(parent, html) {
-        var testElement = "http://www.w3.org/1999/xhtml" === parent.namespaceURI ? parent.ownerDocument.createElement(parent.tagName) : parent.ownerDocument.createElementNS(parent.namespaceURI, parent.tagName);
+        var testElement = parent.namespaceURI === HTML_NAMESPACE$1 ? parent.ownerDocument.createElement(parent.tagName) : parent.ownerDocument.createElementNS(parent.namespaceURI, parent.tagName);
         return testElement.innerHTML = html, testElement.innerHTML;
     };
     var validateDOMNesting = function() {
@@ -7172,7 +7177,7 @@
                                     if (null !== propertyInfo) extraAttributeNames.delete(propertyInfo.attributeName), serverValue = getValueForProperty(domElement, propKey, nextProp, propertyInfo);
                                     else {
                                         var ownNamespace = parentNamespace;
-                                        if ("http://www.w3.org/1999/xhtml" === ownNamespace && (ownNamespace = getIntrinsicNamespace(tag)), "http://www.w3.org/1999/xhtml" === ownNamespace) extraAttributeNames.delete(propKey.toLowerCase());
+                                        if (ownNamespace === HTML_NAMESPACE$1 && (ownNamespace = getIntrinsicNamespace(tag)), ownNamespace === HTML_NAMESPACE$1) extraAttributeNames.delete(propKey.toLowerCase());
                                         else {
                                             var standardName = getPossibleStandardName(propKey);
                                             null !== standardName && standardName !== propKey && (isMismatchDueToBadCasing = !0, extraAttributeNames.delete(standardName)), extraAttributeNames.delete(propKey);
@@ -7202,7 +7207,7 @@
                     else {
                         var type8, props9, rootContainerInstance1, hostContext, internalInstanceHandle, hostContextDev, domElement1, fiber, hostContext1, instance, type9, props7, hostContext2, internalInstanceHandle1, updatePayload1, type10, props8, instance7 = (type8 = type11, props9 = newProps, rootContainerInstance1 = rootContainerInstance, hostContext = currentHostContext, internalInstanceHandle = workInProgress, validateDOMNesting(type8, null, (hostContextDev = hostContext).ancestorInfo), ("string" == typeof props9.children || "number" == typeof props9.children) && validateDOMNesting(null, "" + props9.children, updatedAncestorInfo(hostContextDev.ancestorInfo, type8)), hostContextDev.namespace, precacheFiberNode(internalInstanceHandle, domElement1 = function(type, props, rootContainerElement, parentNamespace) {
                             var isCustomComponentTag, domElement, ownerDocument = getOwnerDocumentFromRootContainer(rootContainerElement), namespaceURI = parentNamespace;
-                            if ("http://www.w3.org/1999/xhtml" === namespaceURI && (namespaceURI = getIntrinsicNamespace(type)), "http://www.w3.org/1999/xhtml" === namespaceURI) {
+                            if (namespaceURI === HTML_NAMESPACE$1 && (namespaceURI = getIntrinsicNamespace(type)), namespaceURI === HTML_NAMESPACE$1) {
                                 if ((isCustomComponentTag = isCustomComponent(type, props)) || type === type.toLowerCase() || error1("<%s /> is using incorrect casing. Use PascalCase for React components, or lowercase for HTML elements.", type), "script" === type) {
                                     var div = ownerDocument.createElement("div");
                                     div.innerHTML = "<script></script>";
@@ -7216,7 +7221,7 @@
                                     props.multiple ? node.multiple = !0 : props.size && (node.size = props.size);
                                 }
                             } else domElement = ownerDocument.createElementNS(namespaceURI, type);
-                            return "http://www.w3.org/1999/xhtml" !== namespaceURI || isCustomComponentTag || "[object HTMLUnknownElement]" !== Object.prototype.toString.call(domElement) || Object.prototype.hasOwnProperty.call(warnedUnknownTags, type) || (warnedUnknownTags[type] = !0, error1("The tag <%s> is unrecognized in this browser. If you meant to render a React component, start its name with an uppercase letter.", type)), domElement;
+                            return namespaceURI !== HTML_NAMESPACE$1 || isCustomComponentTag || "[object HTMLUnknownElement]" !== Object.prototype.toString.call(domElement) || Object.prototype.hasOwnProperty.call(warnedUnknownTags, type) || (warnedUnknownTags[type] = !0, error1("The tag <%s> is unrecognized in this browser. If you meant to render a React component, start its name with an uppercase letter.", type)), domElement;
                         }(type8, props9, rootContainerInstance1, hostContextDev.namespace)), updateFiberProps(domElement1, props9), domElement1);
                         appendAllChildren(instance7, workInProgress, !1, !1), workInProgress.stateNode = instance7, (function(domElement2, tag1, rawProps, rootContainerElement) {
                             var element, props, element1, props10, node, value, props11, isCustomComponentTag1 = isCustomComponent(tag1, rawProps);

tests/tsc-references/classes/members/privateNames/privateNameComputedPropertyName2/input.ts/es2015.2.minified/output.js

@@ -1,11 +1,11 @@
 let getX;
 var tmp = (getX = (a)=>a.#x
-, "_");
+, "_"), _x = new WeakMap();
 console.log(getX(new class {
     [tmp]() {
     }
     constructor(){
-        new WeakMap().set(this, {
+        _x.set(this, {
             writable: !0,
             value: 100
         });

tests/tsc-references/es6/binaryAndOctalIntegerLiteral/binaryIntegerLiteral/input.ts/es2015.2.minified/output.js

@@ -11,4 +11,4 @@ var obj1 = {
     b: 26,
     9671406556917009000000000: !1
 };
-obj1[26], obj1[26], obj1["26"], obj1["0b11010"], obj1.Infinity, obj2[26], obj2[26], obj2["26"], obj2["0B11010"], obj2[9671406556917009000000000], obj2["9.671406556917009e+24"], obj2.Infinity;
+obj1[26], obj1[26], obj1["26"], obj1["0b11010"], obj1.a, obj1.b, obj1.bin1, obj1.Infinity, obj2[26], obj2[26], obj2["26"], obj2["0B11010"], obj2.a, obj2.b, obj2.bin2, obj2[9671406556917009000000000], obj2["9.671406556917009e+24"], obj2.Infinity;

tests/tsc-references/es6/binaryAndOctalIntegerLiteral/binaryIntegerLiteral/input.ts/es5.2.minified/output.js

@@ -11,4 +11,4 @@ var obj1 = {
     b: 26,
     9671406556917009000000000: !1
 };
-obj1[26], obj1[26], obj1["26"], obj1["0b11010"], obj1.Infinity, obj2[26], obj2[26], obj2["26"], obj2["0B11010"], obj2[9671406556917009000000000], obj2["9.671406556917009e+24"], obj2.Infinity;
+obj1[26], obj1[26], obj1["26"], obj1["0b11010"], obj1.a, obj1.b, obj1.bin1, obj1.Infinity, obj2[26], obj2[26], obj2["26"], obj2["0B11010"], obj2.a, obj2.b, obj2.bin2, obj2[9671406556917009000000000], obj2["9.671406556917009e+24"], obj2.Infinity;

tests/tsc-references/es6/binaryAndOctalIntegerLiteral/binaryIntegerLiteralES6/input.ts/es2015.2.minified/output.js

@@ -11,4 +11,4 @@ var obj1 = {
     b: 26,
     9671406556917009000000000: !1
 };
-obj1[26], obj1[26], obj1["26"], obj1["0b11010"], obj1.Infinity, obj2[26], obj2[26], obj2["26"], obj2["0B11010"], obj2[9671406556917009000000000], obj2["9.671406556917009e+24"], obj2.Infinity;
+obj1[26], obj1[26], obj1["26"], obj1["0b11010"], obj1.a, obj1.b, obj1.bin1, obj1.Infinity, obj2[26], obj2[26], obj2["26"], obj2["0B11010"], obj2.a, obj2.b, obj2.bin2, obj2[9671406556917009000000000], obj2["9.671406556917009e+24"], obj2.Infinity;

tests/tsc-references/es6/binaryAndOctalIntegerLiteral/binaryIntegerLiteralES6/input.ts/es5.2.minified/output.js

@@ -11,4 +11,4 @@ var obj1 = {
     b: 26,
     9671406556917009000000000: !1
 };
-obj1[26], obj1[26], obj1["26"], obj1["0b11010"], obj1.Infinity, obj2[26], obj2[26], obj2["26"], obj2["0B11010"], obj2[9671406556917009000000000], obj2["9.671406556917009e+24"], obj2.Infinity;
+obj1[26], obj1[26], obj1["26"], obj1["0b11010"], obj1.a, obj1.b, obj1.bin1, obj1.Infinity, obj2[26], obj2[26], obj2["26"], obj2["0B11010"], obj2.a, obj2.b, obj2.bin2, obj2[9671406556917009000000000], obj2["9.671406556917009e+24"], obj2.Infinity;

tests/tsc-references/es6/binaryAndOctalIntegerLiteral/octalIntegerLiteral/input.ts/es2015.2.minified/output.js

@@ -11,4 +11,4 @@ var obj1 = {
     oct2: 19230,
     54624374234151770000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000: !1
 };
-obj1[19230], obj1["0o45436"], obj1["19230"], obj1[19230], obj1.Infinity, obj2[19230], obj2["0O45436"], obj2["19230"], obj2[19230], obj2[54624374234151770000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000], obj2["5.462437423415177e+244"], obj2.Infinity;
+obj1[19230], obj1["0o45436"], obj1["19230"], obj1[19230], obj1.a, obj1.b, obj1.oct1, obj1.Infinity, obj2[19230], obj2["0O45436"], obj2["19230"], obj2[19230], obj2.a, obj2.b, obj2.oct2, obj2[54624374234151770000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000], obj2["5.462437423415177e+244"], obj2.Infinity;

tests/tsc-references/es6/binaryAndOctalIntegerLiteral/octalIntegerLiteral/input.ts/es5.2.minified/output.js

@@ -11,4 +11,4 @@ var obj1 = {
     oct2: 19230,
     54624374234151770000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000: !1
 };
-obj1[19230], obj1["0o45436"], obj1["19230"], obj1[19230], obj1.Infinity, obj2[19230], obj2["0O45436"], obj2["19230"], obj2[19230], obj2[54624374234151770000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000], obj2["5.462437423415177e+244"], obj2.Infinity;
+obj1[19230], obj1["0o45436"], obj1["19230"], obj1[19230], obj1.a, obj1.b, obj1.oct1, obj1.Infinity, obj2[19230], obj2["0O45436"], obj2["19230"], obj2[19230], obj2.a, obj2.b, obj2.oct2, obj2[54624374234151770000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000], obj2["5.462437423415177e+244"], obj2.Infinity;