terser 5.16.1 → 5.17.7

package/dist/bundle.min.js

@@ -2,7 +2,7 @@
 typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@jridgewell/source-map')) :
 typeof define === 'function' && define.amd ? define(['exports', '@jridgewell/source-map'], factory) :
 (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Terser = {}, global.sourceMap));
-}(this, (function (exports, sourceMap) { 'use strict';
+})(this, (function (exports, sourceMap) { 'use strict';
 
 /***********************************************************************
 
@@ -100,48 +100,26 @@ function return_this() { return this; }
 function return_null() { return null; }
 
 var MAP = (function() {
-    function MAP(a, f, backwards) {
-        var ret = [], top = [], i;
-        function doit() {
-            var val = f(a[i], i);
-            var is_last = val instanceof Last;
-            if (is_last) val = val.v;
-            if (val instanceof AtTop) {
-                val = val.v;
-                if (val instanceof Splice) {
-                    top.push.apply(top, backwards ? val.v.slice().reverse() : val.v);
-                } else {
-                    top.push(val);
-                }
-            } else if (val !== skip) {
-                if (val instanceof Splice) {
-                    ret.push.apply(ret, backwards ? val.v.slice().reverse() : val.v);
-                } else {
-                    ret.push(val);
-                }
-            }
-            return is_last;
-        }
-        if (Array.isArray(a)) {
-            if (backwards) {
-                for (i = a.length; --i >= 0;) if (doit()) break;
-                ret.reverse();
-                top.reverse();
-            } else {
-                for (i = 0; i < a.length; ++i) if (doit()) break;
+    function MAP(a, tw, allow_splicing = true) {
+        const new_a = [];
+
+        for (let i = 0; i < a.length; ++i) {
+            let item = a[i];
+            let ret = item.transform(tw, allow_splicing);
+
+            if (ret instanceof AST_Node) {
+                new_a.push(ret);
+            } else if (ret instanceof Splice) {
+                new_a.push(...ret.v);
             }
-        } else {
-            for (i in a) if (HOP(a, i)) if (doit()) break;
         }
-        return top.concat(ret);
+
+        return new_a;
     }
-    MAP.at_top = function(val) { return new AtTop(val); };
+
     MAP.splice = function(val) { return new Splice(val); };
-    MAP.last = function(val) { return new Last(val); };
-    var skip = MAP.skip = {};
-    function AtTop(val) { this.v = val; }
+    MAP.skip = {};
     function Splice(val) { this.v = val; }
-    function Last(val) { this.v = val; }
     return MAP;
 })();
 
@@ -261,7 +239,7 @@ const re_safe_regexp = /^[\\/|\0\s\w^$.[\]()]*$/;
 /** Check if the regexp is safe for Terser to create without risking a RegExp DOS */
 const regexp_is_safe = (source) => re_safe_regexp.test(source);
 
-const all_flags = "dgimsuy";
+const all_flags = "dgimsuyv";
 function sort_regexp_flags(flags) {
     const existing_flags = new Set(flags.split(""));
     let out = "";
@@ -286,6 +264,10 @@ function set_annotation(node, annotation) {
     node._annotations |= annotation;
 }
 
+function clear_annotation(node, annotation) {
+    node._annotations &= ~annotation;
+}
+
 /***********************************************************************
 
   A JavaScript tokenizer / parser / beautifier / compressor.
@@ -426,6 +408,19 @@ var UNICODE = {
     ID_Continue: /(?:[$0-9A-Z_a-z\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B4\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF])+/,
 };
 
+try {
+    UNICODE = {
+        // https://262.ecma-international.org/13.0/#prod-IdentifierStartChar
+        // $, _, ID_Start
+        ID_Start: new RegExp("[_$\\p{ID_Start}]", "u"),
+        // https://262.ecma-international.org/13.0/#prod-IdentifierPartChar
+        // $, zero-width-joiner, zero-width-non-joiner, ID_Continue
+        ID_Continue: new RegExp("[$\\u200C\\u200D\\p{ID_Continue}]+", "u"),
+    };
+} catch(e) {
+    // Could not use modern JS \p{...}. UNICODE is already defined above so let's continue
+}
+
 function get_full_char(str, pos) {
     if (is_surrogate_pair_head(str.charCodeAt(pos))) {
         if (is_surrogate_pair_tail(str.charCodeAt(pos + 1))) {
@@ -2219,7 +2214,12 @@ function parse($TEXT, options) {
     }
 
     function try_() {
-        var body = block_(), bcatch = null, bfinally = null;
+        var body, bcatch = null, bfinally = null;
+        body = new AST_TryBlock({
+            start : S.token,
+            body  : block_(),
+            end   : prev(),
+        });
         if (is("keyword", "catch")) {
             var start = S.token;
             next();
@@ -2255,14 +2255,20 @@ function parse($TEXT, options) {
         });
     }
 
+    /**
+     * var
+     *   vardef1 = 2,
+     *   vardef2 = 3;
+     */
     function vardefs(no_in, kind) {
-        var a = [];
+        var var_defs = [];
         var def;
         for (;;) {
             var sym_type =
                 kind === "var" ? AST_SymbolVar :
                 kind === "const" ? AST_SymbolConst :
                 kind === "let" ? AST_SymbolLet : null;
+            // var { a } = b
             if (is("punc", "{") || is("punc", "[")) {
                 def = new AST_VarDef({
                     start: S.token,
@@ -2282,12 +2288,12 @@ function parse($TEXT, options) {
                 });
                 if (def.name.name == "import") croak("Unexpected token: import");
             }
-            a.push(def);
+            var_defs.push(def);
             if (!is("punc", ","))
                 break;
             next();
         }
-        return a;
+        return var_defs;
     }
 
     var var_ = function(no_in) {
@@ -2366,6 +2372,7 @@ function parse($TEXT, options) {
                 value : tok.value,
                 quote : tok.quote
             });
+            annotate(ret);            
             break;
           case "regexp":
             const [_, source, flags] = tok.value.match(/^\/(.*)\/(\w*)$/);
@@ -2448,8 +2455,8 @@ function parse($TEXT, options) {
         if (is("operator", "new")) {
             return new_(allow_calls);
         }
-        if (is("operator", "import")) {
-            return import_meta();
+        if (is("name", "import") && is_token(peek(), "punc", ".")) {
+            return import_meta(allow_calls);
         }
         var start = S.token;
         var peeked;
@@ -2942,21 +2949,22 @@ function parse($TEXT, options) {
         });
     }
 
-    function import_meta() {
+    function import_meta(allow_calls) {
         var start = S.token;
-        expect_token("operator", "import");
+        expect_token("name", "import");
         expect_token("punc", ".");
         expect_token("name", "meta");
         return subscripts(new AST_ImportMeta({
             start: start,
             end: prev()
-        }), false);
+        }), allow_calls);
     }
 
     function map_name(is_import) {
-        function make_symbol(type) {
+        function make_symbol(type, quote) {
             return new type({
                 name: as_property_name(),
+                quote: quote || undefined,
                 start: prev(),
                 end: prev()
             });
@@ -2969,16 +2977,16 @@ function parse($TEXT, options) {
         var name;
 
         if (is_import) {
-            foreign_name = make_symbol(foreign_type);
+            foreign_name = make_symbol(foreign_type, start.quote);
         } else {
-            name = make_symbol(type);
+            name = make_symbol(type, start.quote);
         }
         if (is("name", "as")) {
             next();  // The "as" word
             if (is_import) {
                 name = make_symbol(type);
             } else {
-                foreign_name = make_symbol(foreign_type);
+                foreign_name = make_symbol(foreign_type, S.token.quote);
             }
         } else if (is_import) {
             name = new type(foreign_name);
@@ -2994,20 +3002,26 @@ function parse($TEXT, options) {
         });
     }
 
-    function map_nameAsterisk(is_import, name) {
+    function map_nameAsterisk(is_import, import_or_export_foreign_name) {
         var foreign_type = is_import ? AST_SymbolImportForeign : AST_SymbolExportForeign;
         var type = is_import ? AST_SymbolImport : AST_SymbolExport;
         var start = S.token;
-        var foreign_name;
+        var name, foreign_name;
         var end = prev();
 
+        if (is_import) {
+            name = import_or_export_foreign_name;
+        } else {
+            foreign_name = import_or_export_foreign_name;
+        }
+
         name = name || new type({
             start: start,
             name: "*",
             end: end,
         });
 
-        foreign_name = new foreign_type({
+        foreign_name = foreign_name || new foreign_type({
             start: start,
             name: "*",
             end: end,
@@ -3036,9 +3050,9 @@ function parse($TEXT, options) {
         } else if (is("operator", "*")) {
             var name;
             next();
-            if (is_import && is("name", "as")) {
+            if (is("name", "as")) {
                 next();  // The "as" word
-                name = as_symbol(is_import ? AST_SymbolImport : AST_SymbolExportForeign);
+                name = is_import ? as_symbol(AST_SymbolImport) : as_symbol_or_string(AST_SymbolExportForeign);
             }
             names = [map_nameAsterisk(is_import, name)];
         }
@@ -3203,6 +3217,27 @@ function parse($TEXT, options) {
         return sym;
     }
 
+    function as_symbol_or_string(type) {
+        if (!is("name")) {
+            if (!is("string")) {
+                croak("Name or string expected");
+            }
+            var tok = S.token;
+            var ret = new type({
+                start : tok,
+                end   : tok,
+                name : tok.value,
+                quote : tok.quote
+            });
+            next();
+            return ret;
+        }
+        var sym = _make_symbol(type);
+        _verify_symbol(sym);
+        next();
+        return sym;
+    }
+
     // Annotate AST_Call, AST_Lambda or AST_New with the special comments
     function annotate(node) {
         var start = node.start;
@@ -3224,6 +3259,10 @@ function parse($TEXT, options) {
                     set_annotation(node, _NOINLINE);
                     break;
                 }
+                if (/[@#]__KEY__/.test(comment.value)) {
+                    set_annotation(node, _KEY);
+                    break;
+                }
             }
         }
     }
@@ -3682,6 +3721,14 @@ class AST_Token {
         Object.seal(this);
     }
 
+    // Return a string summary of the token for node.js console.log
+    [Symbol.for("nodejs.util.inspect.custom")](_depth, options) {
+        const special = str => options.stylize(str, "special");
+        const quote = typeof this.value === "string" && this.value.includes("`") ? "'" : "`";
+        const value = `${quote}${this.value}${quote}`;
+        return `${special("[AST_Token")} ${value} at ${this.line}:${this.col}${special("]")}`;
+    }
+
     get nlb() {
         return has_tok_flag(this, TOK_FLAG_NLB);
     }
@@ -4468,11 +4515,14 @@ var AST_Destructuring = DEFNODE("Destructuring", "names is_array", function AST_
     },
     all_symbols: function() {
         var out = [];
-        this.walk(new TreeWalker(function (node) {
-            if (node instanceof AST_Symbol) {
+        walk(this, node => {
+            if (node instanceof AST_SymbolDeclaration) {
                 out.push(node);
             }
-        }));
+            if (node instanceof AST_Lambda) {
+                return true;
+            }
+        });
         return out;
     }
 });
@@ -4565,6 +4615,7 @@ var AST_Jump = DEFNODE("Jump", null, function AST_Jump(props) {
     $documentation: "Base class for “jumps” (for now that's `return`, `throw`, `break` and `continue`)"
 }, AST_Statement);
 
+/** Base class for “exits” (`return` and `throw`) */
 var AST_Exit = DEFNODE("Exit", "value", function AST_Exit(props) {
     if (props) {
         this.value = props.value;
@@ -4827,12 +4878,11 @@ var AST_Case = DEFNODE("Case", "expression", function AST_Case(props) {
 
 /* -----[ EXCEPTIONS ]----- */
 
-var AST_Try = DEFNODE("Try", "bcatch bfinally", function AST_Try(props) {
+var AST_Try = DEFNODE("Try", "body bcatch bfinally", function AST_Try(props) {
     if (props) {
+        this.body = props.body;
         this.bcatch = props.bcatch;
         this.bfinally = props.bfinally;
-        this.body = props.body;
-        this.block_scope = props.block_scope;
         this.start = props.start;
         this.end = props.end;
     }
@@ -4841,12 +4891,13 @@ var AST_Try = DEFNODE("Try", "bcatch bfinally", function AST_Try(props) {
 }, {
     $documentation: "A `try` statement",
     $propdoc: {
+        body: "[AST_TryBlock] the try block",
         bcatch: "[AST_Catch?] the catch block, or null if not present",
         bfinally: "[AST_Finally?] the finally block, or null if not present"
     },
     _walk: function(visitor) {
         return visitor._visit(this, function() {
-            walk_body(this, visitor);
+            this.body._walk(visitor);
             if (this.bcatch) this.bcatch._walk(visitor);
             if (this.bfinally) this.bfinally._walk(visitor);
         });
@@ -4854,9 +4905,21 @@ var AST_Try = DEFNODE("Try", "bcatch bfinally", function AST_Try(props) {
     _children_backwards(push) {
         if (this.bfinally) push(this.bfinally);
         if (this.bcatch) push(this.bcatch);
-        let i = this.body.length;
-        while (i--) push(this.body[i]);
+        push(this.body);
     },
+}, AST_Statement);
+
+var AST_TryBlock = DEFNODE("TryBlock", null, function AST_TryBlock(props) {
+    if (props) {
+        this.body = props.body;
+        this.block_scope = props.block_scope;
+        this.start = props.start;
+        this.end = props.end;
+    }
+
+    this.flags = 0;
+}, {
+    $documentation: "The `try` block of a try statement"
 }, AST_Block);
 
 var AST_Catch = DEFNODE("Catch", "argname", function AST_Catch(props) {
@@ -4990,6 +5053,13 @@ var AST_VarDef = DEFNODE("VarDef", "name value", function AST_VarDef(props) {
         if (this.value) push(this.value);
         push(this.name);
     },
+    declarations_as_names() {
+        if (this.name instanceof AST_SymbolDeclaration) {
+            return [this];
+        } else {
+            return this.name.all_symbols();
+        }
+    }
 });
 
 var AST_NameMapping = DEFNODE("NameMapping", "foreign_name name", function AST_NameMapping(props) {
@@ -5770,6 +5840,40 @@ var AST_Class = DEFNODE("Class", "name extends properties", function AST_Class(p
         if (this.extends) push(this.extends);
         if (this.name) push(this.name);
     },
+    /** go through the bits that are executed instantly, not when the class is `new`'d. Doesn't walk the name. */
+    visit_nondeferred_class_parts(visitor) {
+        if (this.extends) {
+            this.extends._walk(visitor);
+        }
+        this.properties.forEach((prop) => {
+            if (prop instanceof AST_ClassStaticBlock) {
+                prop._walk(visitor);
+                return;
+            }
+            if (prop.computed_key()) {
+                visitor.push(prop);
+                prop.key._walk(visitor);
+                visitor.pop();
+            }
+            if ((prop instanceof AST_ClassPrivateProperty || prop instanceof AST_ClassProperty) && prop.static && prop.value) {
+                visitor.push(prop);
+                prop.value._walk(visitor);
+                visitor.pop();
+            }
+        });
+    },
+    /** go through the bits that are executed later, when the class is `new`'d or a static method is called */
+    visit_deferred_class_parts(visitor) {
+        this.properties.forEach((prop) => {
+            if (prop instanceof AST_ConciseMethod) {
+                prop.walk(visitor);
+            } else if (prop instanceof AST_ClassProperty && !prop.static && prop.value) {
+                visitor.push(prop);
+                prop.value._walk(visitor);
+                visitor.pop();
+            }
+        });
+    },
 }, AST_Scope /* TODO a class might have a scope but it's not a scope */);
 
 var AST_ClassProperty = DEFNODE("ClassProperty", "static quote", function AST_ClassProperty(props) {
@@ -5886,6 +5990,7 @@ var AST_ClassStaticBlock = DEFNODE("ClassStaticBlock", "body block_scope", funct
         while (i--) push(this.body[i]);
     },
     clone: clone_block_scope,
+    computed_key: () => false
 }, AST_Scope);
 
 var AST_ClassExpression = DEFNODE("ClassExpression", null, function AST_ClassExpression(props) {
@@ -6159,6 +6264,7 @@ var AST_SymbolImportForeign = DEFNODE("SymbolImportForeign", null, function AST_
         this.scope = props.scope;
         this.name = props.name;
         this.thedef = props.thedef;
+        this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
     }
@@ -6210,6 +6316,7 @@ var AST_SymbolExport = DEFNODE("SymbolExport", null, function AST_SymbolExport(p
         this.scope = props.scope;
         this.name = props.name;
         this.thedef = props.thedef;
+        this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
     }
@@ -6224,6 +6331,7 @@ var AST_SymbolExportForeign = DEFNODE("SymbolExportForeign", null, function AST_
         this.scope = props.scope;
         this.name = props.name;
         this.thedef = props.thedef;
+        this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
     }
@@ -6309,6 +6417,7 @@ var AST_String = DEFNODE("String", "value quote", function AST_String(props) {
         this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
+        this._annotations = props._annotations;
     }
 
     this.flags = 0;
@@ -6681,6 +6790,7 @@ class TreeTransformer extends TreeWalker {
 const _PURE     = 0b00000001;
 const _INLINE   = 0b00000010;
 const _NOINLINE = 0b00000100;
+const _KEY      = 0b00001000;
 
 /***********************************************************************
 
@@ -6743,12 +6853,6 @@ function def_transform(node, descend) {
     });
 }
 
-function do_list(list, tw) {
-    return MAP(list, function(node) {
-        return node.transform(tw, true);
-    });
-}
-
 def_transform(AST_Node, noop);
 
 def_transform(AST_LabeledStatement, function(self, tw) {
@@ -6761,7 +6865,7 @@ def_transform(AST_SimpleStatement, function(self, tw) {
 });
 
 def_transform(AST_Block, function(self, tw) {
-    self.body = do_list(self.body, tw);
+    self.body = MAP(self.body, tw);
 });
 
 def_transform(AST_Do, function(self, tw) {
@@ -6808,27 +6912,27 @@ def_transform(AST_If, function(self, tw) {
 
 def_transform(AST_Switch, function(self, tw) {
     self.expression = self.expression.transform(tw);
-    self.body = do_list(self.body, tw);
+    self.body = MAP(self.body, tw);
 });
 
 def_transform(AST_Case, function(self, tw) {
     self.expression = self.expression.transform(tw);
-    self.body = do_list(self.body, tw);
+    self.body = MAP(self.body, tw);
 });
 
 def_transform(AST_Try, function(self, tw) {
-    self.body = do_list(self.body, tw);
+    self.body = self.body.transform(tw);
     if (self.bcatch) self.bcatch = self.bcatch.transform(tw);
     if (self.bfinally) self.bfinally = self.bfinally.transform(tw);
 });
 
 def_transform(AST_Catch, function(self, tw) {
     if (self.argname) self.argname = self.argname.transform(tw);
-    self.body = do_list(self.body, tw);
+    self.body = MAP(self.body, tw);
 });
 
 def_transform(AST_Definitions, function(self, tw) {
-    self.definitions = do_list(self.definitions, tw);
+    self.definitions = MAP(self.definitions, tw);
 });
 
 def_transform(AST_VarDef, function(self, tw) {
@@ -6837,26 +6941,26 @@ def_transform(AST_VarDef, function(self, tw) {
 });
 
 def_transform(AST_Destructuring, function(self, tw) {
-    self.names = do_list(self.names, tw);
+    self.names = MAP(self.names, tw);
 });
 
 def_transform(AST_Lambda, function(self, tw) {
     if (self.name) self.name = self.name.transform(tw);
-    self.argnames = do_list(self.argnames, tw);
+    self.argnames = MAP(self.argnames, tw, /* allow_splicing */ false);
     if (self.body instanceof AST_Node) {
         self.body = self.body.transform(tw);
     } else {
-        self.body = do_list(self.body, tw);
+        self.body = MAP(self.body, tw);
     }
 });
 
 def_transform(AST_Call, function(self, tw) {
     self.expression = self.expression.transform(tw);
-    self.args = do_list(self.args, tw);
+    self.args = MAP(self.args, tw, /* allow_splicing */ false);
 });
 
 def_transform(AST_Sequence, function(self, tw) {
-    const result = do_list(self.expressions, tw);
+    const result = MAP(self.expressions, tw);
     self.expressions = result.length
         ? result
         : [new AST_Number({ value: 0 })];
@@ -6904,11 +7008,11 @@ def_transform(AST_Conditional, function(self, tw) {
 });
 
 def_transform(AST_Array, function(self, tw) {
-    self.elements = do_list(self.elements, tw);
+    self.elements = MAP(self.elements, tw);
 });
 
 def_transform(AST_Object, function(self, tw) {
-    self.properties = do_list(self.properties, tw);
+    self.properties = MAP(self.properties, tw);
 });
 
 def_transform(AST_ObjectProperty, function(self, tw) {
@@ -6921,11 +7025,11 @@ def_transform(AST_ObjectProperty, function(self, tw) {
 def_transform(AST_Class, function(self, tw) {
     if (self.name) self.name = self.name.transform(tw);
     if (self.extends) self.extends = self.extends.transform(tw);
-    self.properties = do_list(self.properties, tw);
+    self.properties = MAP(self.properties, tw);
 });
 
 def_transform(AST_ClassStaticBlock, function(self, tw) {
-    self.body = do_list(self.body, tw);
+    self.body = MAP(self.body, tw);
 });
 
 def_transform(AST_Expansion, function(self, tw) {
@@ -6939,19 +7043,19 @@ def_transform(AST_NameMapping, function(self, tw) {
 
 def_transform(AST_Import, function(self, tw) {
     if (self.imported_name) self.imported_name = self.imported_name.transform(tw);
-    if (self.imported_names) do_list(self.imported_names, tw);
+    if (self.imported_names) MAP(self.imported_names, tw);
     self.module_name = self.module_name.transform(tw);
 });
 
 def_transform(AST_Export, function(self, tw) {
     if (self.exported_definition) self.exported_definition = self.exported_definition.transform(tw);
     if (self.exported_value) self.exported_value = self.exported_value.transform(tw);
-    if (self.exported_names) do_list(self.exported_names, tw);
+    if (self.exported_names) MAP(self.exported_names, tw);
     if (self.module_name) self.module_name = self.module_name.transform(tw);
 });
 
 def_transform(AST_TemplateString, function(self, tw) {
-    self.segments = do_list(self.segments, tw);
+    self.segments = MAP(self.segments, tw);
 });
 
 def_transform(AST_PrefixedTemplateString, function(self, tw) {
@@ -7184,7 +7288,7 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
             return new AST_Try({
                 start    : my_start_token(M),
                 end      : my_end_token(M),
-                body     : from_moz(M.block).body,
+                body     : new AST_TryBlock(from_moz(M.block)),
                 bcatch   : from_moz(handlers[0]),
                 bfinally : M.finalizer ? new AST_Finally(from_moz(M.finalizer)) : null
             });
@@ -7234,22 +7338,25 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
         },
 
         MethodDefinition: function(M) {
+            const is_private = M.key.type === "PrivateIdentifier";
+            const key = M.computed ? from_moz(M.key) : new AST_SymbolMethod({ name: M.key.name || M.key.value });
+
             var args = {
                 start    : my_start_token(M),
                 end      : my_end_token(M),
-                key      : M.computed ? from_moz(M.key) : new AST_SymbolMethod({ name: M.key.name || M.key.value }),
+                key,
                 value    : from_moz(M.value),
                 static   : M.static,
             };
             if (M.kind == "get") {
-                return new AST_ObjectGetter(args);
+                return new (is_private ? AST_PrivateGetter : AST_ObjectGetter)(args);
             }
             if (M.kind == "set") {
-                return new AST_ObjectSetter(args);
+                return new (is_private ? AST_PrivateSetter : AST_ObjectSetter)(args);
             }
             args.is_generator = M.value.generator;
             args.async = M.value.async;
-            return new AST_ConciseMethod(args);
+            return new (is_private ? AST_PrivateMethod : AST_ConciseMethod)(args);
         },
 
         FieldDefinition: function(M) {
@@ -7273,8 +7380,16 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
             let key;
             if (M.computed) {
                 key = from_moz(M.key);
+            } else if (M.key.type === "PrivateIdentifier") {
+                return new AST_ClassPrivateProperty({
+                    start    : my_start_token(M),
+                    end      : my_end_token(M),
+                    key      : from_moz(M.key),
+                    value    : from_moz(M.value),
+                    static   : M.static,
+                });
             } else {
-                if (M.key.type !== "Identifier" && M.key.type !== "PrivateIdentifier") {
+                if (M.key.type !== "Identifier") {
                     throw new Error("Non-Identifier key in PropertyDefinition");
                 }
                 key = from_moz(M.key);
@@ -7289,6 +7404,14 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
             });
         },
 
+        PrivateIdentifier: function (M) {
+            return new AST_SymbolPrivateProperty({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                name: M.name
+            });
+        },
+
         StaticBlock: function(M) {
             return new AST_ClassStaticBlock({
                 start : my_start_token(M),
@@ -7330,6 +7453,15 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
         },
 
         MemberExpression: function(M) {
+            if (M.property.type === "PrivateIdentifier") {
+                return new AST_DotHash({
+                    start      : my_start_token(M),
+                    end        : my_end_token(M),
+                    property   : M.property.name,
+                    expression : from_moz(M.object),
+                    optional   : M.optional || false
+                });
+            }
             return new (M.computed ? AST_Sub : AST_Dot)({
                 start      : my_start_token(M),
                 end        : my_end_token(M),
@@ -7369,24 +7501,11 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
             var imported_name = null;
             var imported_names = null;
             M.specifiers.forEach(function (specifier) {
-                if (specifier.type === "ImportSpecifier") {
+                if (specifier.type === "ImportSpecifier" || specifier.type === "ImportNamespaceSpecifier") {
                     if (!imported_names) { imported_names = []; }
-                    imported_names.push(new AST_NameMapping({
-                        start: my_start_token(specifier),
-                        end: my_end_token(specifier),
-                        foreign_name: from_moz(specifier.imported),
-                        name: from_moz(specifier.local)
-                    }));
+                    imported_names.push(from_moz(specifier));
                 } else if (specifier.type === "ImportDefaultSpecifier") {
-                    imported_name = from_moz(specifier.local);
-                } else if (specifier.type === "ImportNamespaceSpecifier") {
-                    if (!imported_names) { imported_names = []; }
-                    imported_names.push(new AST_NameMapping({
-                        start: my_start_token(specifier),
-                        end: my_end_token(specifier),
-                        foreign_name: new AST_SymbolImportForeign({ name: "*" }),
-                        name: from_moz(specifier.local)
-                    }));
+                    imported_name = from_moz(specifier);
                 }
             });
             return new AST_Import({
@@ -7399,14 +7518,39 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
             });
         },
 
+        ImportSpecifier: function(M) {
+            return new AST_NameMapping({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                foreign_name: from_moz(M.imported),
+                name: from_moz(M.local)
+            });
+        },
+
+        ImportDefaultSpecifier: function(M) {
+            return from_moz(M.local);
+        },
+
+        ImportNamespaceSpecifier: function(M) {
+            return new AST_NameMapping({
+                start: my_start_token(M),
+                end: my_end_token(M),
+                foreign_name: new AST_SymbolImportForeign({ name: "*" }),
+                name: from_moz(M.local)
+            });
+        },
+
         ExportAllDeclaration: function(M) {
+            var foreign_name = M.exported == null ? 
+                new AST_SymbolExportForeign({ name: "*" }) :
+                from_moz(M.exported);
             return new AST_Export({
                 start: my_start_token(M),
                 end: my_end_token(M),
                 exported_names: [
                     new AST_NameMapping({
                         name: new AST_SymbolExportForeign({ name: "*" }),
-                        foreign_name: new AST_SymbolExportForeign({ name: "*" })
+                        foreign_name: foreign_name
                     })
                 ],
                 module_name: from_moz(M.source),
@@ -7420,10 +7564,7 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
                 end: my_end_token(M),
                 exported_definition: from_moz(M.declaration),
                 exported_names: M.specifiers && M.specifiers.length ? M.specifiers.map(function (specifier) {
-                    return new AST_NameMapping({
-                        foreign_name: from_moz(specifier.exported),
-                        name: from_moz(specifier.local)
-                    });
+                    return from_moz(specifier);
                 }) : null,
                 module_name: from_moz(M.source),
                 assert_clause: assert_clause_from_moz(M.assertions)
@@ -7439,6 +7580,13 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
             });
         },
 
+        ExportSpecifier: function(M) {
+            return new AST_NameMapping({
+                foreign_name: from_moz(M.exported),
+                name: from_moz(M.local)
+            });
+        },
+
         Literal: function(M) {
             var val = M.value, args = {
                 start  : my_start_token(M),
@@ -7464,6 +7612,22 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
             if (val === null) return new AST_Null(args);
             switch (typeof val) {
               case "string":
+                args.quote = "\"";
+                var p = FROM_MOZ_STACK[FROM_MOZ_STACK.length - 2];
+                if (p.type == "ImportSpecifier") {
+                    args.name = val;
+                    return new AST_SymbolImportForeign(args);
+                } else if (p.type == "ExportSpecifier") {
+                    args.name = val;
+                    if (M == p.exported) {
+                        return new AST_SymbolExportForeign(args);
+                    } else {
+                        return new AST_SymbolExport(args);
+                    }
+                } else if (p.type == "ExportAllDeclaration" && M == p.exported) {
+                    args.name = val;
+                    return new AST_SymbolExportForeign(args);
+                }
                 args.value = val;
                 return new AST_String(args);
               case "number":
@@ -8123,7 +8287,7 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
     def_to_moz(AST_Try, function To_Moz_TryStatement(M) {
         return {
             type: "TryStatement",
-            block: to_moz_block(M),
+            block: to_moz_block(M.body),
             handler: to_moz(M.bcatch),
             guardedHandlers: [],
             finalizer: to_moz(M.bfinally)
@@ -8168,10 +8332,17 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
 
     def_to_moz(AST_Export, function To_Moz_ExportDeclaration(M) {
         if (M.exported_names) {
-            if (M.exported_names[0].name.name === "*") {
+            var first_exported = M.exported_names[0];
+            var first_exported_name = first_exported.name;
+            if (first_exported_name.name === "*" && !first_exported_name.quote) {
+                var foreign_name = first_exported.foreign_name;
+                var exported = foreign_name.name === "*" && !foreign_name.quote
+                    ? null
+                    : to_moz(foreign_name);
                 return {
                     type: "ExportAllDeclaration",
                     source: to_moz(M.module_name),
+                    exported: exported,
                     assertions: assert_clause_to_moz(M.assert_clause)
                 };
             }
@@ -8203,19 +8374,22 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
                 local: to_moz(M.imported_name)
             });
         }
-        if (M.imported_names && M.imported_names[0].foreign_name.name === "*") {
-            specifiers.push({
-                type: "ImportNamespaceSpecifier",
-                local: to_moz(M.imported_names[0].name)
-            });
-        } else if (M.imported_names) {
-            M.imported_names.forEach(function(name_mapping) {
+        if (M.imported_names) {
+            var first_imported_foreign_name = M.imported_names[0].foreign_name;
+            if (first_imported_foreign_name.name === "*" && !first_imported_foreign_name.quote) {
                 specifiers.push({
-                    type: "ImportSpecifier",
-                    local: to_moz(name_mapping.name),
-                    imported: to_moz(name_mapping.foreign_name)
+                    type: "ImportNamespaceSpecifier",
+                    local: to_moz(M.imported_names[0].name)
                 });
-            });
+            } else {
+                M.imported_names.forEach(function(name_mapping) {
+                    specifiers.push({
+                        type: "ImportSpecifier",
+                        local: to_moz(name_mapping.name),
+                        imported: to_moz(name_mapping.foreign_name)
+                    });
+                });
+            }
         }
         return {
             type: "ImportDeclaration",
@@ -8479,7 +8653,14 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
     });
 
     def_to_moz(AST_Symbol, function To_Moz_Identifier(M, parent) {
-        if (M instanceof AST_SymbolMethod && parent.quote) {
+        if (
+            (M instanceof AST_SymbolMethod && parent.quote) ||
+            ((
+                M instanceof AST_SymbolImportForeign ||
+                M instanceof AST_SymbolExportForeign ||
+                M instanceof AST_SymbolExport
+                ) && M.quote)
+         ) {
             return {
                 type: "Literal",
                 value: M.name
@@ -9227,14 +9408,17 @@ function OutputStream(options) {
         if (!start) return;
         var printed_comments = self.printed_comments;
 
-        // There cannot be a newline between return and its value.
-        const return_with_value = node instanceof AST_Exit && node.value;
+        // There cannot be a newline between return/yield and its value.
+        const keyword_with_value = 
+            node instanceof AST_Exit && node.value
+            || (node instanceof AST_Await || node instanceof AST_Yield)
+                && node.expression;
 
         if (
             start.comments_before
             && printed_comments.has(start.comments_before)
         ) {
-            if (return_with_value) {
+            if (keyword_with_value) {
                 start.comments_before = [];
             } else {
                 return;
@@ -9247,10 +9431,12 @@ function OutputStream(options) {
         }
         printed_comments.add(comments);
 
-        if (return_with_value) {
+        if (keyword_with_value) {
             var tw = new TreeWalker(function(node) {
                 var parent = tw.parent();
                 if (parent instanceof AST_Exit
+                    || parent instanceof AST_Await
+                    || parent instanceof AST_Yield
                     || parent instanceof AST_Binary && parent.left === node
                     || parent.TYPE == "Call" && parent.expression === node
                     || parent instanceof AST_Conditional && parent.condition === node
@@ -9269,7 +9455,7 @@ function OutputStream(options) {
                 }
             });
             tw.push(node);
-            node.value.walk(tw);
+            keyword_with_value.walk(tw);
         }
 
         if (current_pos == 0) {
@@ -9645,6 +9831,12 @@ function OutputStream(options) {
             return true;
     });
 
+    PARENS(AST_Chain, function(output) {
+        var p = output.parent();
+        if (!(p instanceof AST_Call || p instanceof AST_PropAccess)) return false;
+        return p.expression === this;
+    });
+
     PARENS(AST_PropAccess, function(output) {
         var p = output.parent();
         if (p instanceof AST_New && p.expression === this) {
@@ -9791,7 +9983,7 @@ function OutputStream(options) {
     }
 
     AST_StatementWithBody.DEFMETHOD("_do_print_body", function(output) {
-        force_statement(this.body, output);
+        print_maybe_braced_body(this.body, output);
     });
 
     DEFPRINT(AST_Statement, function(self, output) {
@@ -10120,7 +10312,7 @@ function OutputStream(options) {
                 b = b.body;
             } else break;
         }
-        force_statement(self.body, output);
+        print_maybe_braced_body(self.body, output);
     }
     DEFPRINT(AST_If, function(self, output) {
         output.print("if");
@@ -10137,7 +10329,7 @@ function OutputStream(options) {
             if (self.alternative instanceof AST_If)
                 self.alternative.print(output);
             else
-                force_statement(self.alternative, output);
+                print_maybe_braced_body(self.alternative, output);
         } else {
             self._do_print_body(output);
         }
@@ -10186,7 +10378,7 @@ function OutputStream(options) {
     DEFPRINT(AST_Try, function(self, output) {
         output.print("try");
         output.space();
-        print_braced(self, output);
+        self.body.print(output);
         if (self.bcatch) {
             output.space();
             self.bcatch.print(output);
@@ -10196,6 +10388,9 @@ function OutputStream(options) {
             self.bfinally.print(output);
         }
     });
+    DEFPRINT(AST_TryBlock, function(self, output) {
+        print_braced(self, output);
+    });
     DEFPRINT(AST_Catch, function(self, output) {
         output.print("catch");
         if (self.argname) {
@@ -10247,7 +10442,9 @@ function OutputStream(options) {
             output.space();
         }
         if (self.imported_names) {
-            if (self.imported_names.length === 1 && self.imported_names[0].foreign_name.name === "*") {
+            if (self.imported_names.length === 1 &&
+                self.imported_names[0].foreign_name.name === "*" &&
+                !self.imported_names[0].foreign_name.quote) {
                 self.imported_names[0].print(output);
             } else {
                 output.print("{");
@@ -10281,14 +10478,31 @@ function OutputStream(options) {
     DEFPRINT(AST_NameMapping, function(self, output) {
         var is_import = output.parent() instanceof AST_Import;
         var definition = self.name.definition();
+        var foreign_name = self.foreign_name;
         var names_are_different =
             (definition && definition.mangled_name || self.name.name) !==
-            self.foreign_name.name;
+            foreign_name.name;
+        if (!names_are_different &&
+            foreign_name.name === "*" &&
+            foreign_name.quote != self.name.quote) {
+                // export * as "*"
+            names_are_different = true;
+        }
+        var foreign_name_is_name = foreign_name.quote == null;
         if (names_are_different) {
             if (is_import) {
-                output.print(self.foreign_name.name);
+                if (foreign_name_is_name) {
+                    output.print(foreign_name.name);
+                } else {
+                    output.print_string(foreign_name.name, foreign_name.quote);
+                }
             } else {
-                self.name.print(output);
+                if (self.name.quote == null) {
+                    self.name.print(output);
+                } else {
+                    output.print_string(self.name.name, self.name.quote);
+                }
+                
             }
             output.space();
             output.print("as");
@@ -10296,10 +10510,18 @@ function OutputStream(options) {
             if (is_import) {
                 self.name.print(output);
             } else {
-                output.print(self.foreign_name.name);
+                if (foreign_name_is_name) {
+                    output.print(foreign_name.name);
+                } else {
+                    output.print_string(foreign_name.name, foreign_name.quote);
+                }
             }
         } else {
-            self.name.print(output);
+            if (self.name.quote == null) {
+                self.name.print(output);
+            } else {
+                output.print_string(self.name.name, self.name.quote);
+            }
         }
     });
 
@@ -10311,8 +10533,10 @@ function OutputStream(options) {
             output.space();
         }
         if (self.exported_names) {
-            if (self.exported_names.length === 1 && self.exported_names[0].name.name === "*") {
-                self.exported_names[0].print(output);
+            if (self.exported_names.length === 1 &&
+                self.exported_names[0].name.name === "*" &&
+                !self.exported_names[0].name.quote) {
+                    self.exported_names[0].print(output);
             } else {
                 output.print("{");
                 self.exported_names.forEach(function(name_export, i) {
@@ -10439,7 +10663,7 @@ function OutputStream(options) {
             ? output.option("ie8")
             : !is_identifier_string(
                 prop,
-                output.option("ecma") >= 2015 || output.option("safari10")
+                output.option("ecma") >= 2015 && !output.option("safari10")
             );
 
         if (self.optional) output.print("?.");
@@ -10607,15 +10831,19 @@ function OutputStream(options) {
         output.print("new.target");
     });
 
+    /** Prints a prop name. Returns whether it can be used as a shorthand. */
     function print_property_name(key, quote, output) {
         if (output.option("quote_keys")) {
-            return output.print_string(key);
+            output.print_string(key);
+            return false;
         }
         if ("" + +key == key && key >= 0) {
             if (output.option("keep_numbers")) {
-                return output.print(key);
+                output.print(key);
+                return false;
             }
-            return output.print(make_num(key));
+            output.print(make_num(key));
+            return false;
         }
         var print_string = ALL_RESERVED_WORDS.has(key)
             ? output.option("ie8")
@@ -10625,9 +10853,11 @@ function OutputStream(options) {
                     : !is_identifier_string(key, true)
             );
         if (print_string || (quote && output.option("keep_quoted_props"))) {
-            return output.print_string(key, quote);
+            output.print_string(key, quote);
+            return false;
         }
-        return output.print_name(key);
+        output.print_name(key);
+        return true;
     }
 
     DEFPRINT(AST_ObjectKeyVal, function(self, output) {
@@ -10636,28 +10866,29 @@ function OutputStream(options) {
             return def ? def.mangled_name || def.name : self.name;
         }
 
-        var allowShortHand = output.option("shorthand");
-        if (allowShortHand &&
-            self.value instanceof AST_Symbol &&
-            is_identifier_string(
-                self.key,
-                output.option("ecma") >= 2015 || output.option("safari10")
-            ) &&
-            get_name(self.value) === self.key &&
-            !ALL_RESERVED_WORDS.has(self.key)
+        const try_shorthand = output.option("shorthand") && !(self.key instanceof AST_Node);
+        if (
+            try_shorthand
+            && self.value instanceof AST_Symbol
+            && get_name(self.value) === self.key
+            && !ALL_RESERVED_WORDS.has(self.key)
         ) {
-            print_property_name(self.key, self.quote, output);
-
-        } else if (allowShortHand &&
-            self.value instanceof AST_DefaultAssign &&
-            self.value.left instanceof AST_Symbol &&
-            is_identifier_string(
-                self.key,
-                output.option("ecma") >= 2015 || output.option("safari10")
-            ) &&
-            get_name(self.value.left) === self.key
+            const was_shorthand = print_property_name(self.key, self.quote, output);
+            if (!was_shorthand) {
+                output.colon();
+                self.value.print(output);
+            }
+        } else if (
+            try_shorthand
+            && self.value instanceof AST_DefaultAssign
+            && self.value.left instanceof AST_Symbol
+            && get_name(self.value.left) === self.key
         ) {
-            print_property_name(self.key, self.quote, output);
+            const was_shorthand = print_property_name(self.key, self.quote, output);
+            if (!was_shorthand) {
+                output.colon();
+                self.value.left.print(output);
+            }
             output.space();
             output.print("=");
             output.space();
@@ -10832,12 +11063,15 @@ function OutputStream(options) {
         }
     });
 
-    function force_statement(stat, output) {
+    /** if, for, while, may or may not have braces surrounding its body */
+    function print_maybe_braced_body(stat, output) {
         if (output.option("braces")) {
             make_block(stat, output);
         } else {
             if (!stat || stat instanceof AST_EmptyStatement)
                 output.force_semicolon();
+            else if (stat instanceof AST_Let || stat instanceof AST_Const || stat instanceof AST_Class)
+                make_block(stat, output);
             else
                 stat.print(output);
         }
@@ -11056,7 +11290,7 @@ AST_Switch.prototype.shallow_cmp = pass_through;
 AST_SwitchBranch.prototype.shallow_cmp = pass_through;
 
 AST_Try.prototype.shallow_cmp = function(other) {
-    return (this.bcatch == null ? other.bcatch == null : this.bcatch === other.bcatch) && (this.bfinally == null ? other.bfinally == null : this.bfinally === other.bfinally);
+    return (this.body === other.body) && (this.bcatch == null ? other.bcatch == null : this.bcatch === other.bcatch) && (this.bfinally == null ? other.bfinally == null : this.bfinally === other.bfinally);
 };
 
 AST_Catch.prototype.shallow_cmp = function(other) {
@@ -11323,16 +11557,12 @@ AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = null,
             const save_scope = scope;
             node.block_scope = scope = new AST_Scope(node);
             scope._block_scope = true;
-            // AST_Try in the AST sadly *is* (not has) a body itself,
-            // and its catch and finally branches are children of the AST_Try itself
-            const parent_scope = node instanceof AST_Catch
-                ? save_scope.parent_scope
-                : save_scope;
-            scope.init_scope_vars(parent_scope);
+            scope.init_scope_vars(save_scope);
             scope.uses_with = save_scope.uses_with;
             scope.uses_eval = save_scope.uses_eval;
+
             if (options.safari10) {
-                if (node instanceof AST_For || node instanceof AST_ForIn) {
+                if (node instanceof AST_For || node instanceof AST_ForIn || node instanceof AST_ForOf) {
                     for_scopes.push(scope);
                 }
             }
@@ -11342,7 +11572,7 @@ AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = null,
                 // AST_Switch has a scope within the body, but it itself "is a block scope"
                 // This means the switched expression has to belong to the outer scope
                 // while the body inside belongs to the switch itself.
-                // This is pretty nasty and warrants an AST change similar to AST_Try (read above)
+                // This is pretty nasty and warrants an AST change
                 const the_block_scope = scope;
                 scope = save_scope;
                 node.expression.walk(tw);
@@ -12288,9 +12518,7 @@ AST_Default.prototype._size = function () {
     return 8 + list_overhead(this.body);
 };
 
-AST_Try.prototype._size = function () {
-    return 3 + list_overhead(this.body);
-};
+AST_Try.prototype._size = () => 3;
 
 AST_Catch.prototype._size = function () {
     let size = 7 + list_overhead(this.body);
@@ -12813,7 +13041,8 @@ function maintain_this_binding(parent, orig, val) {
         parent instanceof AST_UnaryPrefix && parent.operator == "delete"
         || parent instanceof AST_Call && parent.expression === orig
             && (
-                val instanceof AST_PropAccess
+                val instanceof AST_Chain
+                || val instanceof AST_PropAccess
                 || val instanceof AST_SymbolRef && val.name == "eval"
             )
     ) {
@@ -12828,9 +13057,10 @@ function is_func_expr(node) {
     return node instanceof AST_Arrow || node instanceof AST_Function;
 }
 
+/**
+ * Used to determine whether the node can benefit from negation.
+ * Not the case with arrow functions (you need an extra set of parens). */
 function is_iife_call(node) {
-    // Used to determine whether the node can benefit from negation.
-    // Not the case with arrow functions (you need an extra set of parens).
     if (node.TYPE != "Call") return false;
     return node.expression instanceof AST_Function || is_iife_call(node.expression);
 }
@@ -13010,6 +13240,9 @@ const object_methods = [
 
 const is_pure_native_method = make_nested_lookup({
     Array: [
+        "at",
+        "flat",
+        "includes",
         "indexOf",
         "join",
         "lastIndexOf",
@@ -13030,22 +13263,41 @@ const is_pure_native_method = make_nested_lookup({
         ...object_methods,
     ],
     String: [
+        "at",
         "charAt",
         "charCodeAt",
+        "charPointAt",
         "concat",
+        "endsWith",
+        "fromCharCode",
+        "fromCodePoint",
+        "includes",
         "indexOf",
         "italics",
         "lastIndexOf",
+        "localeCompare",
         "match",
+        "matchAll",
+        "normalize",
+        "padStart",
+        "padEnd",
+        "repeat",
         "replace",
+        "replaceAll",
         "search",
         "slice",
         "split",
+        "startsWith",
         "substr",
         "substring",
+        "repeat",
+        "toLocaleLowerCase",
+        "toLocaleUpperCase",
         "toLowerCase",
         "toUpperCase",
         "trim",
+        "trimEnd",
+        "trimStart",
         ...object_methods,
     ],
 });
@@ -13202,7 +13454,7 @@ const unary_side_effects = makePredicate("delete ++ --");
     def_is_number(AST_Number, return_true);
     const unary = makePredicate("+ - ~ ++ --");
     def_is_number(AST_Unary, function() {
-        return unary.has(this.operator);
+        return unary.has(this.operator) && !(this.expression instanceof AST_BigInt);
     });
     const numeric_ops = makePredicate("- * / % & | ^ << >> >>>");
     def_is_number(AST_Binary, function(compressor) {
@@ -13331,7 +13583,7 @@ function is_nullish(node, compressor) {
             || any(this.body, compressor);
     });
     def_has_side_effects(AST_Try, function(compressor) {
-        return any(this.body, compressor)
+        return this.body.has_side_effects(compressor)
             || this.bcatch && this.bcatch.has_side_effects(compressor)
             || this.bfinally && this.bfinally.has_side_effects(compressor);
     });
@@ -13340,6 +13592,7 @@ function is_nullish(node, compressor) {
             || this.body && this.body.has_side_effects(compressor)
             || this.alternative && this.alternative.has_side_effects(compressor);
     });
+    def_has_side_effects(AST_ImportMeta, return_false);
     def_has_side_effects(AST_LabeledStatement, function(compressor) {
         return this.body.has_side_effects(compressor);
     });
@@ -13443,6 +13696,7 @@ function is_nullish(node, compressor) {
     def_may_throw(AST_Lambda, return_false);
     def_may_throw(AST_SymbolDeclaration, return_false);
     def_may_throw(AST_This, return_false);
+    def_may_throw(AST_ImportMeta, return_false);
 
     function any(list, compressor) {
         for (var i = list.length; --i >= 0;)
@@ -13560,7 +13814,7 @@ function is_nullish(node, compressor) {
     });
     def_may_throw(AST_SymbolClassProperty, return_false);
     def_may_throw(AST_Try, function(compressor) {
-        return this.bcatch ? this.bcatch.may_throw(compressor) : any(this.body, compressor)
+        return this.bcatch ? this.bcatch.may_throw(compressor) : this.body.may_throw(compressor)
             || this.bfinally && this.bfinally.may_throw(compressor);
     });
     def_may_throw(AST_Unary, function(compressor) {
@@ -13739,6 +13993,7 @@ function is_nullish(node, compressor) {
 function is_lhs(node, parent) {
     if (parent instanceof AST_Unary && unary_side_effects.has(parent.operator)) return parent.expression;
     if (parent instanceof AST_Assign && parent.left === node) return node;
+    if (parent instanceof AST_ForIn && parent.init === node) return node;
 }
 
 (function(def_find_defs) {
@@ -13806,6 +14061,11 @@ function is_lhs(node, parent) {
         var name = this.name + suffix;
         if (HOP(defines, name)) return to_node(defines[name], this);
     });
+    def_find_defs(AST_ImportMeta, function(compressor, suffix) {
+        var defines = compressor.option("global_defs");
+        var name = "import.meta" + suffix;
+        if (HOP(defines, name)) return to_node(defines[name], this);
+    });
 })(function(node, func) {
     node.DEFMETHOD("_find_defs", func);
 });
@@ -13837,6 +14097,9 @@ function is_lhs(node, parent) {
     def_negate(AST_Function, function() {
         return basic_negation(this);
     });
+    def_negate(AST_Class, function() {
+        return basic_negation(this);
+    });
     def_negate(AST_Arrow, function() {
         return basic_negation(this);
     });
@@ -13970,6 +14233,19 @@ const aborts = (thing) => thing && thing.aborts();
     node.DEFMETHOD("aborts", func);
 });
 
+AST_Node.DEFMETHOD("contains_this", function() {
+    return walk(this, node => {
+        if (node instanceof AST_This) return walk_abort;
+        if (
+            node !== this
+            && node instanceof AST_Scope
+            && !(node instanceof AST_Arrow)
+        ) {
+            return true;
+        }
+    });
+});
+
 function is_modified(compressor, tw, node, value, level, immutable) {
     var parent = tw.parent(level);
     var lhs = is_lhs(node, parent);
@@ -14315,6 +14591,25 @@ const regexp_flags = new Set([
 def_eval(AST_PropAccess, function (compressor, depth) {
     let obj = this.expression._eval(compressor, depth + 1);
     if (obj === nullish || (this.optional && obj == null)) return nullish;
+
+    // `.length` of strings and arrays is always safe
+    if (this.property === "length") {
+        if (typeof obj === "string") {
+            return obj.length;
+        }
+
+        const is_spreadless_array =
+            obj instanceof AST_Array
+            && obj.elements.every(el => !(el instanceof AST_Expansion));
+
+        if (
+            is_spreadless_array
+            && obj.elements.every(el => !el.has_side_effects(compressor))
+        ) {
+            return obj.elements.length;
+        }
+    }
+
     if (compressor.option("unsafe")) {
         var key = this.property;
         if (key instanceof AST_Node) {
@@ -14322,9 +14617,9 @@ def_eval(AST_PropAccess, function (compressor, depth) {
             if (key === this.property)
                 return this;
         }
+
         var exp = this.expression;
         if (is_undeclared_ref(exp)) {
-
             var aa;
             var first_arg = exp.name === "hasOwnProperty"
                 && key === "call"
@@ -14547,22 +14842,43 @@ def_drop_side_effect_free(AST_Class, function (compressor) {
     const trimmed_extends = this.extends && this.extends.drop_side_effect_free(compressor);
     if (trimmed_extends)
         with_effects.push(trimmed_extends);
+
     for (const prop of this.properties) {
         if (prop instanceof AST_ClassStaticBlock) {
-            if (prop.body.some(stat => stat.has_side_effects(compressor))) {
-                return this;
-            } else {
-                continue;
+            if (prop.has_side_effects(compressor)) {
+                return this; // Be cautious about these
             }
-        }
+        } else {
+            const trimmed_prop = prop.drop_side_effect_free(compressor);
+            if (trimmed_prop) {
+                if (trimmed_prop.contains_this()) return this;
 
-        const trimmed_prop = prop.drop_side_effect_free(compressor);
-        if (trimmed_prop)
-            with_effects.push(trimmed_prop);
+                with_effects.push(trimmed_prop);
+            }
+        }
     }
+
     if (!with_effects.length)
         return null;
-    return make_sequence(this, with_effects);
+
+    const exprs = make_sequence(this, with_effects);
+    if (this instanceof AST_DefClass) {
+        // We want a statement
+        return make_node(AST_SimpleStatement, this, { body: exprs });
+    } else {
+        return exprs;
+    }
+});
+
+def_drop_side_effect_free(AST_ClassProperty, function (compressor) {
+    const key = this.computed_key() && this.key.drop_side_effect_free(compressor);
+
+    const value = this.static && this.value
+        && this.value.drop_side_effect_free(compressor);
+
+    if (key && value)
+        return make_sequence(this, [key, value]);
+    return key || value || null;
 });
 
 def_drop_side_effect_free(AST_Binary, function (compressor, first_in_statement) {
@@ -14668,17 +14984,6 @@ def_drop_side_effect_free(AST_ObjectProperty, function (compressor, first_in_sta
     return key || value;
 });
 
-def_drop_side_effect_free(AST_ClassProperty, function (compressor) {
-    const key = this.computed_key() && this.key.drop_side_effect_free(compressor);
-
-    const value = this.static && this.value
-        && this.value.drop_side_effect_free(compressor);
-
-    if (key && value)
-        return make_sequence(this, [key, value]);
-    return key || value || null;
-});
-
 def_drop_side_effect_free(AST_ConciseMethod, function () {
     return this.computed_key() ? this.key : null;
 });
@@ -14838,6 +15143,11 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             });
         }
         if (node === self) return;
+        if (node instanceof AST_Class) {
+            if (node.has_side_effects(compressor)) {
+                node.visit_nondeferred_class_parts(tw);
+            }
+        }
         if (node instanceof AST_Defun || node instanceof AST_DefClass) {
             var node_def = node.name.definition();
             const in_export = tw.parent() instanceof AST_Export;
@@ -14846,23 +15156,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                     in_use_ids.set(node_def.id, node_def);
                 }
             }
-            if (node instanceof AST_DefClass) {
-                if (
-                    node.extends
-                    && (node.extends.has_side_effects(compressor)
-                    || node.extends.may_throw(compressor))
-                ) {
-                    node.extends.walk(tw);
-                }
-                for (const prop of node.properties) {
-                    if (
-                        prop.has_side_effects(compressor) ||
-                        prop.may_throw(compressor)
-                    ) {
-                        prop.walk(tw);
-                    }
-                }
-            }
+
             map_add(initializations, node_def.id, node);
             return true; // don't go in nested scopes
         }
@@ -14927,9 +15221,9 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                         if (!in_use || fixed_ids.has(def.id) && fixed_ids.get(def.id) !== node) {
                             return maintain_this_binding(parent, node, node.right.transform(tt));
                         }
-                    } else if (!in_use) return in_list ? MAP.skip : make_node(AST_Number, node, {
-                        value: 0
-                    });
+                    } else if (!in_use) {
+                        return in_list ? MAP.skip : make_node(AST_Number, node, { value: 0 });
+                    }
                 }
             }
             if (scope !== self) return;
@@ -14972,11 +15266,18 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             if ((node instanceof AST_Defun || node instanceof AST_DefClass) && node !== self) {
                 const def = node.name.definition();
                 const keep = def.global && !drop_funcs || in_use_ids.has(def.id);
-                // Class "extends" and static blocks may have side effects
-                const has_side_effects = !keep
-                    && node instanceof AST_Class
-                    && node.has_side_effects(compressor);
-                if (!keep && !has_side_effects) {
+                if (!keep) {
+                    // Class "extends" and static blocks may have side effects
+                    if (node instanceof AST_Class) {
+                        const kept = node.drop_side_effect_free(compressor);
+                        if (kept !== node) {
+                            def.eliminated++;
+                            if (kept) return kept;
+                            return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
+                        } else {
+                            return kept;
+                        }
+                    }
                     def.eliminated++;
                     return in_list ? MAP.skip : make_node(AST_EmptyStatement, node);
                 }
@@ -15072,9 +15373,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                   case 1:
                     return body[0];
                   default:
-                    return in_list ? MAP.splice(body) : make_node(AST_BlockStatement, node, {
-                        body: body
-                    });
+                    return in_list ? MAP.splice(body) : make_node(AST_BlockStatement, node, { body });
                 }
             }
             // certain combination of unused name + side effect leads to:
@@ -15117,7 +15416,7 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
                 }
                 return node;
             }
-            if (node instanceof AST_Scope) {
+            if (node instanceof AST_Scope && !(node instanceof AST_ClassStaticBlock)) {
                 const save_scope = scope;
                 scope = node;
                 descend(node, this);
@@ -15156,7 +15455,11 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
             }
             return true;
         }
-        if (node instanceof AST_Scope) {
+        if (node instanceof AST_Class) {
+            descend();
+            return true;
+        }
+        if (node instanceof AST_Scope && !(node instanceof AST_ClassStaticBlock)) {
             var save_scope = scope;
             scope = node;
             descend();
@@ -15209,15 +15512,17 @@ AST_Scope.DEFMETHOD("drop_unused", function(compressor) {
 
  ***********************************************************************/
 
-// Define the method AST_Node#reduce_vars, which goes through the AST in
-// execution order to perform basic flow analysis
-
+/**
+ * Define the method AST_Node#reduce_vars, which goes through the AST in
+ * execution order to perform basic flow analysis
+ */
 function def_reduce_vars(node, func) {
     node.DEFMETHOD("reduce_vars", func);
 }
 
 def_reduce_vars(AST_Node, noop);
 
+/** Clear definition properties */
 function reset_def(compressor, def) {
     def.assignments = 0;
     def.chained = false;
@@ -15226,7 +15531,10 @@ function reset_def(compressor, def) {
     def.recursive_refs = 0;
     def.references = [];
     def.single_use = undefined;
-    if (def.scope.pinned()) {
+    if (
+        def.scope.pinned()
+        || (def.orig[0] instanceof AST_SymbolFunarg && def.scope.uses_arguments)
+    ) {
         def.fixed = false;
     } else if (def.orig[0] instanceof AST_SymbolConst || !compressor.exposed(def)) {
         def.fixed = def.init;
@@ -15550,13 +15858,11 @@ function mark_lambda(tw, descend, compressor) {
     clear_flag(this, INLINED);
     push(tw);
     reset_variables(tw, compressor, this);
-    if (this.uses_arguments) {
-        descend();
-        pop(tw);
-        return;
-    }
+
     var iife;
     if (!this.name
+        && !this.uses_arguments
+        && !this.pinned()
         && (iife = tw.parent()) instanceof AST_Call
         && iife.expression === this
         && !iife.args.some(arg => arg instanceof AST_Expansion)
@@ -15581,11 +15887,101 @@ function mark_lambda(tw, descend, compressor) {
             }
         });
     }
+
     descend();
     pop(tw);
+
+    handle_defined_after_hoist(this);
+
     return true;
 }
 
+/**
+ * It's possible for a hoisted function to use something that's not defined yet. Example:
+ *
+ * hoisted();
+ * var defined_after = true;
+ * function hoisted() {
+ *   // use defined_after
+ * }
+ *
+ * This function is called on the parent to handle this issue.
+ */
+function handle_defined_after_hoist(parent) {
+    const defuns = [];
+    walk(parent, node => {
+        if (node === parent) return;
+        if (node instanceof AST_Defun) defuns.push(node);
+        if (
+            node instanceof AST_Scope
+            || node instanceof AST_SimpleStatement
+        ) return true;
+    });
+
+    for (const defun of defuns) {
+        const fname_def = defun.name.definition();
+        const found_self_ref_in_other_defuns = defuns.some(
+            d => d !== defun && d.enclosed.indexOf(fname_def) !== -1
+        );
+
+        for (const def of defun.enclosed) {
+            if (
+                def.fixed === false
+                || def === fname_def
+                || def.scope.get_defun_scope() !== parent
+            ) {
+                continue;
+            }
+
+            // defun is hoisted, so always safe
+            if (
+                def.assignments === 0
+                && def.orig.length === 1
+                && def.orig[0] instanceof AST_SymbolDefun
+            ) {
+                continue;
+            }
+
+            if (found_self_ref_in_other_defuns) {
+                def.fixed = false;
+                continue;
+            }
+
+            // Detect `call_defun(); var used_in_defun = X`
+            // Because `used_in_defun` is not certainly X when it's defined after.
+            let found_defun_ref = false;
+            let found_def_after_defun = false;
+            walk_parent(parent, (node, info) => {
+                if (node === defun) return true;
+
+                // Step 1: find `call_defun()` or other refs to the defun
+                if (
+                    !found_defun_ref
+                    && node.thedef === fname_def
+                    && node instanceof AST_Symbol
+                ) {
+                    found_defun_ref = true;
+                }
+
+                // Step 2: if Step 1 occurred, find a var the defun uses
+                if (
+                    found_defun_ref
+                    && node.thedef === def
+                    && (node instanceof AST_SymbolDeclaration
+                        || is_lhs(node, info))
+                ) {
+                    found_def_after_defun = true;
+                    return walk_abort;
+                }
+            });
+
+            if (found_def_after_defun) {
+                def.fixed = false;
+            }
+        }
+    }
+}
+
 def_reduce_vars(AST_Lambda, mark_lambda);
 
 def_reduce_vars(AST_Do, function(tw, descend, compressor) {
@@ -15706,12 +16102,15 @@ def_reduce_vars(AST_Toplevel, function(tw, descend, compressor) {
         reset_def(compressor, def);
     });
     reset_variables(tw, compressor, this);
+    descend();
+    handle_defined_after_hoist(this);
+    return true;
 });
 
 def_reduce_vars(AST_Try, function(tw, descend, compressor) {
     reset_block_variables(compressor, this);
     push(tw);
-    walk_body(this, tw);
+    this.body.walk(tw);
     pop(tw);
     if (this.bcatch) {
         push(tw);
@@ -15852,12 +16251,31 @@ function is_lhs_read_only(lhs) {
     return false;
 }
 
-// Remove code which we know is unreachable.
+/** var a = 1 --> var a*/
+function remove_initializers(var_statement) {
+    var decls = [];
+    var_statement.definitions.forEach(function(def) {
+        if (def.name instanceof AST_SymbolDeclaration) {
+            def.value = null;
+            decls.push(def);
+        } else {
+            def.declarations_as_names().forEach(name => {
+                decls.push(make_node(AST_VarDef, def, {
+                    name,
+                    value: null
+                }));
+            });
+        }
+    });
+    return decls.length ? make_node(AST_Var, var_statement, { definitions: decls }) : null;
+}
+
+/** Called on code which we know is unreachable, to keep elements that affect outside of it. */
 function trim_unreachable_code(compressor, stat, target) {
     walk(stat, node => {
         if (node instanceof AST_Var) {
-            node.remove_initializers();
-            target.push(node);
+            const no_initializers = remove_initializers(node);
+            if (no_initializers) target.push(no_initializers);
             return true;
         }
         if (
@@ -15915,13 +16333,11 @@ function tighten_body(statements, compressor) {
     function find_loop_scope_try() {
         var node = compressor.self(), level = 0, in_loop = false, in_try = false;
         do {
-            if (node instanceof AST_Catch || node instanceof AST_Finally) {
-                level++;
-            } else if (node instanceof AST_IterationStatement) {
+            if (node instanceof AST_IterationStatement) {
                 in_loop = true;
             } else if (node instanceof AST_Scope) {
                 break;
-            } else if (node instanceof AST_Try) {
+            } else if (node instanceof AST_TryBlock) {
                 in_try = true;
             }
         } while (node = compressor.parent(level++));
@@ -15965,6 +16381,9 @@ function tighten_body(statements, compressor) {
                     && (node.logical || node.operator != "=" && lhs.equivalent_to(node.left))
                 || node instanceof AST_Await
                 || node instanceof AST_Call && lhs instanceof AST_PropAccess && lhs.equivalent_to(node.expression)
+                ||
+                    (node instanceof AST_Call || node instanceof AST_PropAccess)
+                    && node.optional
                 || node instanceof AST_Debugger
                 || node instanceof AST_Destructuring
                 || node instanceof AST_Expansion
@@ -16138,7 +16557,11 @@ function tighten_body(statements, compressor) {
                 var hit = funarg;
                 var abort = false, replaced = 0, can_replace = !args || !hit;
                 if (!can_replace) {
-                    for (var j = compressor.self().argnames.lastIndexOf(candidate.name) + 1; !abort && j < args.length; j++) {
+                    for (
+                        let j = compressor.self().argnames.lastIndexOf(candidate.name) + 1;
+                        !abort && j < args.length;
+                        j++
+                    ) {
                         args[j].transform(scanner);
                     }
                     can_replace = true;
@@ -16660,27 +17083,34 @@ function tighten_body(statements, compressor) {
             }
 
             if (stat instanceof AST_If) {
-                var ab = aborts(stat.body);
-                if (can_merge_flow(ab)) {
+                let ab, new_else;
+
+                ab = aborts(stat.body);
+                if (
+                    can_merge_flow(ab)
+                    && (new_else = as_statement_array_with_return(stat.body, ab))
+                ) {
                     if (ab.label) {
                         remove(ab.label.thedef.references, ab);
                     }
                     CHANGED = true;
                     stat = stat.clone();
                     stat.condition = stat.condition.negate(compressor);
-                    var body = as_statement_array_with_return(stat.body, ab);
                     stat.body = make_node(AST_BlockStatement, stat, {
                         body: as_statement_array(stat.alternative).concat(extract_functions())
                     });
                     stat.alternative = make_node(AST_BlockStatement, stat, {
-                        body: body
+                        body: new_else
                     });
                     statements[i] = stat.transform(compressor);
                     continue;
                 }
 
-                var ab = aborts(stat.alternative);
-                if (can_merge_flow(ab)) {
+                ab = aborts(stat.alternative);
+                if (
+                    can_merge_flow(ab)
+                    && (new_else = as_statement_array_with_return(stat.alternative, ab))
+                ) {
                     if (ab.label) {
                         remove(ab.label.thedef.references, ab);
                     }
@@ -16689,9 +17119,8 @@ function tighten_body(statements, compressor) {
                     stat.body = make_node(AST_BlockStatement, stat.body, {
                         body: as_statement_array(stat.body).concat(extract_functions())
                     });
-                    var body = as_statement_array_with_return(stat.alternative, ab);
                     stat.alternative = make_node(AST_BlockStatement, stat.alternative, {
-                        body: body
+                        body: new_else
                     });
                     statements[i] = stat.transform(compressor);
                     continue;
@@ -16806,7 +17235,11 @@ function tighten_body(statements, compressor) {
         }
 
         function as_statement_array_with_return(node, ab) {
-            var body = as_statement_array(node).slice(0, -1);
+            var body = as_statement_array(node);
+            if (ab !== body[body.length - 1]) {
+                return undefined;
+            }
+            body = body.slice(0, -1);
             if (ab.value) {
                 body.push(make_node(AST_SimpleStatement, ab.value, {
                     body: ab.value.expression
@@ -17085,14 +17518,21 @@ function tighten_body(statements, compressor) {
                     CHANGED = true;
                     stat.init = exprs.length ? make_sequence(stat.init, exprs) : null;
                     statements[++j] = stat;
-                } else if (prev instanceof AST_Var && (!stat.init || stat.init.TYPE == prev.TYPE)) {
+                } else if (
+                    prev instanceof AST_Var
+                    && (!stat.init || stat.init.TYPE == prev.TYPE)
+                ) {
                     if (stat.init) {
                         prev.definitions = prev.definitions.concat(stat.init.definitions);
                     }
                     stat.init = prev;
                     statements[j] = stat;
                     CHANGED = true;
-                } else if (defs && stat.init && defs.TYPE == stat.init.TYPE && declarations_only(stat.init)) {
+                } else if (
+                    defs instanceof AST_Var
+                    && stat.init instanceof AST_Var
+                    && declarations_only(stat.init)
+                ) {
                     defs.definitions = defs.definitions.concat(stat.init.definitions);
                     stat.init = null;
                     statements[++j] = stat;
@@ -17184,6 +17624,13 @@ function tighten_body(statements, compressor) {
 
  ***********************************************************************/
 
+/**
+ * Module that contains the inlining logic.
+ *
+ * @module
+ *
+ * The stars of the show are `inline_into_symbolref` and `inline_into_call`.
+ */
 
 function within_array_or_object_literal(compressor) {
     var node, level = 0;
@@ -17214,136 +17661,135 @@ function scope_encloses_variables_in_this_scope(scope, pulled_scope) {
 
 function inline_into_symbolref(self, compressor) {
     const parent = compressor.parent();
-    if (compressor.option("reduce_vars") && is_lhs(self, parent) !== self) {
-        const def = self.definition();
-        const nearest_scope = compressor.find_scope();
-        if (compressor.top_retain && def.global && compressor.top_retain(def)) {
-            def.fixed = false;
-            def.single_use = false;
-            return self;
+
+    const def = self.definition();
+    const nearest_scope = compressor.find_scope();
+    if (compressor.top_retain && def.global && compressor.top_retain(def)) {
+        def.fixed = false;
+        def.single_use = false;
+        return self;
+    }
+
+    let fixed = self.fixed_value();
+    let single_use = def.single_use
+        && !(parent instanceof AST_Call
+            && (parent.is_callee_pure(compressor))
+                || has_annotation(parent, _NOINLINE))
+        && !(parent instanceof AST_Export
+            && fixed instanceof AST_Lambda
+            && fixed.name);
+
+    if (single_use && fixed instanceof AST_Node) {
+        single_use =
+            !fixed.has_side_effects(compressor)
+            && !fixed.may_throw(compressor);
+    }
+
+    if (single_use && (fixed instanceof AST_Lambda || fixed instanceof AST_Class)) {
+        if (retain_top_func(fixed, compressor)) {
+            single_use = false;
+        } else if (def.scope !== self.scope
+            && (def.escaped == 1
+                || has_flag(fixed, INLINED)
+                || within_array_or_object_literal(compressor)
+                || !compressor.option("reduce_funcs"))) {
+            single_use = false;
+        } else if (is_recursive_ref(compressor, def)) {
+            single_use = false;
+        } else if (def.scope !== self.scope || def.orig[0] instanceof AST_SymbolFunarg) {
+            single_use = fixed.is_constant_expression(self.scope);
+            if (single_use == "f") {
+                var scope = self.scope;
+                do {
+                    if (scope instanceof AST_Defun || is_func_expr(scope)) {
+                        set_flag(scope, INLINED);
+                    }
+                } while (scope = scope.parent_scope);
+            }
         }
+    }
 
-        let fixed = self.fixed_value();
-        let single_use = def.single_use
-            && !(parent instanceof AST_Call
-                && (parent.is_callee_pure(compressor))
-                    || has_annotation(parent, _NOINLINE))
-            && !(parent instanceof AST_Export
-                && fixed instanceof AST_Lambda
-                && fixed.name);
-
-        if (single_use && fixed instanceof AST_Node) {
-            single_use =
-                !fixed.has_side_effects(compressor)
-                && !fixed.may_throw(compressor);
-        }
-
-        if (single_use && (fixed instanceof AST_Lambda || fixed instanceof AST_Class)) {
-            if (retain_top_func(fixed, compressor)) {
-                single_use = false;
-            } else if (def.scope !== self.scope
-                && (def.escaped == 1
-                    || has_flag(fixed, INLINED)
-                    || within_array_or_object_literal(compressor)
-                    || !compressor.option("reduce_funcs"))) {
-                single_use = false;
-            } else if (is_recursive_ref(compressor, def)) {
-                single_use = false;
-            } else if (def.scope !== self.scope || def.orig[0] instanceof AST_SymbolFunarg) {
-                single_use = fixed.is_constant_expression(self.scope);
-                if (single_use == "f") {
-                    var scope = self.scope;
-                    do {
-                        if (scope instanceof AST_Defun || is_func_expr(scope)) {
-                            set_flag(scope, INLINED);
-                        }
-                    } while (scope = scope.parent_scope);
+    if (single_use && (fixed instanceof AST_Lambda || fixed instanceof AST_Class)) {
+        single_use =
+            def.scope === self.scope
+                && !scope_encloses_variables_in_this_scope(nearest_scope, fixed)
+            || parent instanceof AST_Call
+                && parent.expression === self
+                && !scope_encloses_variables_in_this_scope(nearest_scope, fixed)
+                && !(fixed.name && fixed.name.definition().recursive_refs > 0);
+    }
+
+    if (single_use && fixed) {
+        if (fixed instanceof AST_DefClass) {
+            set_flag(fixed, SQUEEZED);
+            fixed = make_node(AST_ClassExpression, fixed, fixed);
+        }
+        if (fixed instanceof AST_Defun) {
+            set_flag(fixed, SQUEEZED);
+            fixed = make_node(AST_Function, fixed, fixed);
+        }
+        if (def.recursive_refs > 0 && fixed.name instanceof AST_SymbolDefun) {
+            const defun_def = fixed.name.definition();
+            let lambda_def = fixed.variables.get(fixed.name.name);
+            let name = lambda_def && lambda_def.orig[0];
+            if (!(name instanceof AST_SymbolLambda)) {
+                name = make_node(AST_SymbolLambda, fixed.name, fixed.name);
+                name.scope = fixed;
+                fixed.name = name;
+                lambda_def = fixed.def_function(name);
+            }
+            walk(fixed, node => {
+                if (node instanceof AST_SymbolRef && node.definition() === defun_def) {
+                    node.thedef = lambda_def;
+                    lambda_def.references.push(node);
                 }
-            }
+            });
         }
+        if (
+            (fixed instanceof AST_Lambda || fixed instanceof AST_Class)
+            && fixed.parent_scope !== nearest_scope
+        ) {
+            fixed = fixed.clone(true, compressor.get_toplevel());
 
-        if (single_use && (fixed instanceof AST_Lambda || fixed instanceof AST_Class)) {
-            single_use =
-                def.scope === self.scope
-                    && !scope_encloses_variables_in_this_scope(nearest_scope, fixed)
-                || parent instanceof AST_Call
-                    && parent.expression === self
-                    && !scope_encloses_variables_in_this_scope(nearest_scope, fixed)
-                    && !(fixed.name && fixed.name.definition().recursive_refs > 0);
+            nearest_scope.add_child_scope(fixed);
         }
+        return fixed.optimize(compressor);
+    }
 
-        if (single_use && fixed) {
-            if (fixed instanceof AST_DefClass) {
-                set_flag(fixed, SQUEEZED);
-                fixed = make_node(AST_ClassExpression, fixed, fixed);
-            }
-            if (fixed instanceof AST_Defun) {
-                set_flag(fixed, SQUEEZED);
-                fixed = make_node(AST_Function, fixed, fixed);
-            }
-            if (def.recursive_refs > 0 && fixed.name instanceof AST_SymbolDefun) {
-                const defun_def = fixed.name.definition();
-                let lambda_def = fixed.variables.get(fixed.name.name);
-                let name = lambda_def && lambda_def.orig[0];
-                if (!(name instanceof AST_SymbolLambda)) {
-                    name = make_node(AST_SymbolLambda, fixed.name, fixed.name);
-                    name.scope = fixed;
-                    fixed.name = name;
-                    lambda_def = fixed.def_function(name);
-                }
-                walk(fixed, node => {
-                    if (node instanceof AST_SymbolRef && node.definition() === defun_def) {
-                        node.thedef = lambda_def;
-                        lambda_def.references.push(node);
-                    }
-                });
+    // multiple uses
+    if (fixed) {
+        let replace;
+
+        if (fixed instanceof AST_This) {
+            if (!(def.orig[0] instanceof AST_SymbolFunarg)
+                && def.references.every((ref) =>
+                    def.scope === ref.scope
+                )) {
+                replace = fixed;
             }
+        } else {
+            var ev = fixed.evaluate(compressor);
             if (
-                (fixed instanceof AST_Lambda || fixed instanceof AST_Class)
-                && fixed.parent_scope !== nearest_scope
+                ev !== fixed
+                && (compressor.option("unsafe_regexp") || !(ev instanceof RegExp))
             ) {
-                fixed = fixed.clone(true, compressor.get_toplevel());
-
-                nearest_scope.add_child_scope(fixed);
+                replace = make_node_from_constant(ev, fixed);
             }
-            return fixed.optimize(compressor);
         }
 
-        // multiple uses
-        if (fixed) {
-            let replace;
+        if (replace) {
+            const name_length = self.size(compressor);
+            const replace_size = replace.size(compressor);
 
-            if (fixed instanceof AST_This) {
-                if (!(def.orig[0] instanceof AST_SymbolFunarg)
-                    && def.references.every((ref) =>
-                        def.scope === ref.scope
-                    )) {
-                    replace = fixed;
-                }
-            } else {
-                var ev = fixed.evaluate(compressor);
-                if (
-                    ev !== fixed
-                    && (compressor.option("unsafe_regexp") || !(ev instanceof RegExp))
-                ) {
-                    replace = make_node_from_constant(ev, fixed);
-                }
+            let overhead = 0;
+            if (compressor.option("unused") && !compressor.exposed(def)) {
+                overhead =
+                    (name_length + 2 + replace_size) /
+                    (def.references.length - def.assignments);
             }
 
-            if (replace) {
-                const name_length = self.size(compressor);
-                const replace_size = replace.size(compressor);
-
-                let overhead = 0;
-                if (compressor.option("unused") && !compressor.exposed(def)) {
-                    overhead =
-                        (name_length + 2 + replace_size) /
-                        (def.references.length - def.assignments);
-                }
-
-                if (replace_size <= name_length + overhead) {
-                    return replace;
-                }
+            if (replace_size <= name_length + overhead) {
+                return replace;
             }
         }
     }
@@ -17769,6 +18215,7 @@ class Compressor extends TreeWalker {
             keep_fargs    : true,
             keep_fnames   : false,
             keep_infinity : false,
+            lhs_constants : !false_by_default,
             loops         : !false_by_default,
             module        : false,
             negate_iife   : !false_by_default,
@@ -17965,6 +18412,13 @@ class Compressor extends TreeWalker {
         if (opt === node) set_flag(opt, SQUEEZED);
         return opt;
     }
+
+    /** Alternative to plain is_lhs() which doesn't work within .optimize() */
+    is_lhs() {
+        const self = this.stack[this.stack.length - 1];
+        const parent = this.stack[this.stack.length - 2];
+        return is_lhs(self, parent);
+    }
 }
 
 function def_optimize(node, optimizer) {
@@ -18171,8 +18625,6 @@ def_optimize(AST_Lambda, opt_AST_Lambda);
 AST_Scope.DEFMETHOD("hoist_declarations", function(compressor) {
     var self = this;
     if (compressor.has_directive("use asm")) return self;
-    // Hoisting makes no sense in an arrow func
-    if (!Array.isArray(self.body)) return self;
 
     var hoist_funs = compressor.option("hoist_funs");
     var hoist_vars = compressor.option("hoist_vars");
@@ -19053,9 +19505,9 @@ def_optimize(AST_Switch, function(self, compressor) {
 });
 
 def_optimize(AST_Try, function(self, compressor) {
-    tighten_body(self.body, compressor);
     if (self.bcatch && self.bfinally && self.bfinally.body.every(is_empty)) self.bfinally = null;
-    if (compressor.option("dead_code") && self.body.every(is_empty)) {
+
+    if (compressor.option("dead_code") && self.body.body.every(is_empty)) {
         var body = [];
         if (self.bcatch) {
             trim_unreachable_code(compressor, self.bcatch, body);
@@ -19068,26 +19520,6 @@ def_optimize(AST_Try, function(self, compressor) {
     return self;
 });
 
-AST_Definitions.DEFMETHOD("remove_initializers", function() {
-    var decls = [];
-    this.definitions.forEach(function(def) {
-        if (def.name instanceof AST_SymbolDeclaration) {
-            def.value = null;
-            decls.push(def);
-        } else {
-            walk(def.name, node => {
-                if (node instanceof AST_SymbolDeclaration) {
-                    decls.push(make_node(AST_VarDef, def, {
-                        name: node,
-                        value: null
-                    }));
-                }
-            });
-        }
-    });
-    this.definitions = decls;
-});
-
 AST_Definitions.DEFMETHOD("to_assignments", function(compressor) {
     var reduce_vars = compressor.option("reduce_vars");
     var assignments = [];
@@ -19655,7 +20087,7 @@ def_optimize(AST_Binary, function(self, compressor) {
             self.right = tmp;
         }
     }
-    if (commutativeOperators.has(self.operator)) {
+    if (compressor.option("lhs_constants") && commutativeOperators.has(self.operator)) {
         if (self.right.is_constant()
             && !self.left.is_constant()) {
             // if right is a constant, whatever side effects the
@@ -19685,6 +20117,9 @@ def_optimize(AST_Binary, function(self, compressor) {
         // void 0 == x => null == x
         if (!is_strict_comparison && is_undefined(self.left, compressor)) {
             self.left = make_node(AST_Null, self.left);
+        // x == void 0 => x == null
+        } else if (!is_strict_comparison && is_undefined(self.right, compressor)) {
+            self.right = make_node(AST_Null, self.right);
         } else if (compressor.option("typeofs")
             // "undefined" == typeof x => undefined === x
             && self.left instanceof AST_String
@@ -19698,6 +20133,19 @@ def_optimize(AST_Binary, function(self, compressor) {
                 self.left = make_node(AST_Undefined, self.left).optimize(compressor);
                 if (self.operator.length == 2) self.operator += "=";
             }
+        } else if (compressor.option("typeofs")
+            // typeof x === "undefined" => x === undefined
+            && self.left instanceof AST_UnaryPrefix
+            && self.left.operator == "typeof"
+            && self.right instanceof AST_String
+            && self.right.value == "undefined") {
+            var expr = self.left.expression;
+            if (expr instanceof AST_SymbolRef ? expr.is_declared(compressor)
+                : !(expr instanceof AST_PropAccess && compressor.option("ie8"))) {
+                self.left = expr;
+                self.right = make_node(AST_Undefined, self.right).optimize(compressor);
+                if (self.operator.length == 2) self.operator += "=";
+            }
         } else if (self.left instanceof AST_SymbolRef
             // obj !== obj => false
             && self.right instanceof AST_SymbolRef
@@ -20126,8 +20574,7 @@ def_optimize(AST_SymbolRef, function(self, compressor) {
         }
     }
 
-    const parent = compressor.parent();
-    if (compressor.option("reduce_vars") && is_lhs(self, parent) !== self) {
+    if (compressor.option("reduce_vars") && !compressor.is_lhs()) {
         return inline_into_symbolref(self, compressor);
     } else {
         return self;
@@ -20151,7 +20598,7 @@ def_optimize(AST_Undefined, function(self, compressor) {
             return ref;
         }
     }
-    var lhs = is_lhs(compressor.self(), compressor.parent());
+    var lhs = compressor.is_lhs();
     if (lhs && is_atomic(lhs, self)) return self;
     return make_node(AST_UnaryPrefix, self, {
         operator: "void",
@@ -20162,7 +20609,7 @@ def_optimize(AST_Undefined, function(self, compressor) {
 });
 
 def_optimize(AST_Infinity, function(self, compressor) {
-    var lhs = is_lhs(compressor.self(), compressor.parent());
+    var lhs = compressor.is_lhs();
     if (lhs && is_atomic(lhs, self)) return self;
     if (
         compressor.option("keep_infinity")
@@ -20183,7 +20630,7 @@ def_optimize(AST_Infinity, function(self, compressor) {
 });
 
 def_optimize(AST_NaN, function(self, compressor) {
-    var lhs = is_lhs(compressor.self(), compressor.parent());
+    var lhs = compressor.is_lhs();
     if (lhs && !is_atomic(lhs, self)
         || find_variable(compressor, "NaN")) {
         return make_node(AST_Binary, self, {
@@ -20261,16 +20708,21 @@ def_optimize(AST_Assign, function(self, compressor) {
     return self;
 
     function in_try(level, node) {
-        var right = self.right;
-        self.right = make_node(AST_Null, right);
-        var may_throw = node.may_throw(compressor);
-        self.right = right;
-        var scope = self.left.definition().scope;
+        function may_assignment_throw() {
+            const right = self.right;
+            self.right = make_node(AST_Null, right);
+            const may_throw = node.may_throw(compressor);
+            self.right = right;
+
+            return may_throw;
+        }
+
+        var stop_at = self.left.definition().scope.get_defun_scope();
         var parent;
-        while ((parent = compressor.parent(level++)) !== scope) {
+        while ((parent = compressor.parent(level++)) !== stop_at) {
             if (parent instanceof AST_Try) {
                 if (parent.bfinally) return true;
-                if (may_throw && parent.bcatch) return true;
+                if (parent.bcatch && may_assignment_throw()) return true;
             }
         }
     }
@@ -20283,8 +20735,21 @@ def_optimize(AST_DefaultAssign, function(self, compressor) {
     var evaluateRight = self.right.evaluate(compressor);
 
     // `[x = undefined] = foo` ---> `[x] = foo`
+    // `(arg = undefined) => ...` ---> `(arg) => ...` (unless `keep_fargs`)
+    // `((arg = undefined) => ...)()` ---> `((arg) => ...)()`
+    let lambda, iife;
     if (evaluateRight === undefined) {
-        self = self.left;
+        if (
+            (lambda = compressor.parent()) instanceof AST_Lambda
+                ? (
+                    compressor.option("keep_fargs") === false
+                    || (iife = compressor.parent(1)).TYPE === "Call"
+                        && iife.expression === lambda
+                )
+                : true
+        ) {
+            self = self.left;
+        }
     } else if (evaluateRight !== self.right) {
         evaluateRight = make_node_from_constant(evaluateRight, self.right);
         self.right = best_of_expression(evaluateRight, self.right);
@@ -20741,7 +21206,10 @@ def_optimize(AST_Sub, function(self, compressor) {
                     }
                 }
             }
-            prop = self.property = best_of_expression(prop, make_node_from_constant(key, prop).transform(compressor));
+            prop = self.property = best_of_expression(
+                prop,
+                make_node_from_constant(key, prop).transform(compressor)
+            );
             var property = "" + key;
             if (is_basic_identifier_string(property)
                 && property.length <= prop.size() + 1) {
@@ -20799,7 +21267,7 @@ def_optimize(AST_Sub, function(self, compressor) {
             return sym;
         }
     }
-    if (is_lhs(self, compressor.parent())) return self;
+    if (compressor.is_lhs()) return self;
     if (key !== prop) {
         var sub = self.flatten_object(property, compressor);
         if (sub) {
@@ -20867,22 +21335,9 @@ def_optimize(AST_Chain, function (self, compressor) {
     return self;
 });
 
-AST_Lambda.DEFMETHOD("contains_this", function() {
-    return walk(this, node => {
-        if (node instanceof AST_This) return walk_abort;
-        if (
-            node !== this
-            && node instanceof AST_Scope
-            && !(node instanceof AST_Arrow)
-        ) {
-            return true;
-        }
-    });
-});
-
 def_optimize(AST_Dot, function(self, compressor) {
     const parent = compressor.parent();
-    if (is_lhs(self, parent)) return self;
+    if (compressor.is_lhs()) return self;
     if (compressor.option("unsafe_proto")
         && self.expression instanceof AST_Dot
         && self.expression.property == "prototype") {
@@ -24993,6 +25448,7 @@ var domprops = [
     "coneInnerAngle",
     "coneOuterAngle",
     "coneOuterGain",
+    "configurable",
     "configuration",
     "configurationName",
     "configurationValue",
@@ -25502,6 +25958,7 @@ var domprops = [
     "entities",
     "entries",
     "entryType",
+    "enumerable",
     "enumerate",
     "enumerateDevices",
     "enumerateEditable",
@@ -26184,6 +26641,7 @@ var domprops = [
     "indexOf",
     "indexedDB",
     "indicate",
+    "inert",
     "inertiaDestinationX",
     "inertiaDestinationY",
     "info",
@@ -29437,6 +29895,8 @@ function mangle_properties(ast, options) {
             addStrings(node.args[1], add);
         } else if (node instanceof AST_Binary && node.operator === "in") {
             addStrings(node.left, add);
+        } else if (node instanceof AST_String && has_annotation(node, _KEY)) {
+            add(node.value);
         }
     }));
 
@@ -29468,6 +29928,10 @@ function mangle_properties(ast, options) {
             node.args[1] = mangleStrings(node.args[1]);
         } else if (node instanceof AST_Binary && node.operator === "in") {
             node.left = mangleStrings(node.left);
+        } else if (node instanceof AST_String && has_annotation(node, _KEY)) {
+            // Clear _KEY annotation to prevent double mangling
+            clear_annotation(node, _KEY);
+            node.value = mangle(node.value);
         }
     }));
 
@@ -29533,6 +29997,8 @@ function mangle_properties(ast, options) {
                 var last = node.expressions.length - 1;
                 node.expressions[last] = mangleStrings(node.expressions[last]);
             } else if (node instanceof AST_String) {
+                // Clear _KEY annotation to prevent double mangling
+                clear_annotation(node, _KEY);
                 node.value = mangle(node.value);
             } else if (node instanceof AST_Conditional) {
                 node.consequent = mangleStrings(node.consequent);
@@ -29543,12 +30009,15 @@ function mangle_properties(ast, options) {
     }
 }
 
-var to_ascii = typeof atob == "undefined" ? function(b64) {
-    return Buffer.from(b64, "base64").toString();
-} : atob;
-var to_base64 = typeof btoa == "undefined" ? function(str) {
-    return Buffer.from(str).toString("base64");
-} : btoa;
+// to/from base64 functions
+// Prefer built-in Buffer, if available, then use hack
+// https://developer.mozilla.org/en-US/docs/Glossary/Base64#The_Unicode_Problem
+var to_ascii = typeof Buffer !== "undefined"
+    ? (b64) => Buffer.from(b64, "base64").toString()
+    : (b64) => decodeURIComponent(escape(atob(b64)));
+var to_base64 = typeof Buffer !== "undefined"
+    ? (str) => Buffer.from(str).toString("base64")
+    : (str) => btoa(unescape(encodeURIComponent(str)));
 
 function read_source_map(code) {
     var match = /(?:^|[^.])\/\/# sourceMappingURL=data:application\/json(;[\w=-]*)?;base64,([+/0-9A-Za-z]*=*)\s*$/.exec(code);
@@ -29795,10 +30264,13 @@ async function minify(files, options, _fs_module) {
     if (options.format.spidermonkey) {
         result.ast = toplevel.to_mozilla_ast();
     }
+    let format_options;
     if (!HOP(options.format, "code") || options.format.code) {
-        if (!options.format.ast) {
+        // Make a shallow copy so that we can modify without mutating the user's input.
+        format_options = {...options.format};
+        if (!format_options.ast) {
             // Destroy stuff to save RAM. (unless the deprecated `ast` option is on)
-            options.format._destroy_ast = true;
+            format_options._destroy_ast = true;
 
             walk(toplevel, node => {
                 if (node instanceof AST_Scope) {
@@ -29818,17 +30290,17 @@ async function minify(files, options, _fs_module) {
             if (options.sourceMap.includeSources && files instanceof AST_Toplevel) {
                 throw new Error("original source content unavailable");
             }
-            options.format.source_map = await SourceMap({
+            format_options.source_map = await SourceMap({
                 file: options.sourceMap.filename,
                 orig: options.sourceMap.content,
                 root: options.sourceMap.root,
                 files: options.sourceMap.includeSources ? files : null,
             });
         }
-        delete options.format.ast;
-        delete options.format.code;
-        delete options.format.spidermonkey;
-        var stream = OutputStream(options.format);
+        delete format_options.ast;
+        delete format_options.code;
+        delete format_options.spidermonkey;
+        var stream = OutputStream(format_options);
         toplevel.print(stream);
         result.code = stream.get();
         if (options.sourceMap) {
@@ -29836,7 +30308,7 @@ async function minify(files, options, _fs_module) {
                 configurable: true,
                 enumerable: true,
                 get() {
-                    const map = options.format.source_map.getEncoded();
+                    const map = format_options.source_map.getEncoded();
                     return (result.map = options.sourceMap.asObject ? map : JSON.stringify(map));
                 },
                 set(value) {
@@ -29846,7 +30318,7 @@ async function minify(files, options, _fs_module) {
                     });
                 }
             });
-            result.decoded_map = options.format.source_map.getDecoded();
+            result.decoded_map = format_options.source_map.getDecoded();
             if (options.sourceMap.url == "inline") {
                 var sourceMap = typeof result.map === "object" ? JSON.stringify(result.map) : result.map;
                 result.code += "\n//# sourceMappingURL=data:application/json;charset=utf-8;base64," + to_base64(sourceMap);
@@ -29861,8 +30333,8 @@ async function minify(files, options, _fs_module) {
             options.nameCache.props = cache_to_json(options.mangle.properties.cache);
         }
     }
-    if (options.format && options.format.source_map) {
-        options.format.source_map.destroy();
+    if (format_options && format_options.source_map) {
+        format_options.source_map.destroy();
     }
     if (timings) {
         timings.end = Date.now();
@@ -30371,4 +30843,4 @@ exports._default_options = _default_options;
 exports._run_cli = run_cli;
 exports.minify = minify;
 
-})));
+}));