terser 5.16.3 → 5.16.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## v5.16.4
+
+ - Keep `(defaultArg = undefined) => ...`, because default args don't count for function length
+ - Prevent inlining variables into `?.` optional chains
+ - Avoid removing unused arguments while transforming
+ - Optimize iterating AST node lists
+ - Make sure `catch` and `finally` aren't children of `try` in the AST
+ - Use modern unicode property escapes (`\p{...}`) to parse identifiers when available
+
 ## v5.16.3
 
  - Ensure function definitions, don't assume the values of variables defined after them.

package/dist/bundle.min.js

@@ -100,48 +100,42 @@ 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);
+    function MAP(a, tw, allow_splicing = true) {
+        // Loop but try not to build a new array
+        for (let i = 0; i < a.length; ++i) {
+            let item = a[i];
+            let ret = item.transform(tw, allow_splicing);
+
+            if (ret !== item) {
+                const a1 = a.slice(0, i);
+
+                // Looks like something was transformed. Change the loop.
+                if (ret instanceof AST_Node) {
+                    a1.push(ret);
+                } else if (ret instanceof Splice) {
+                    a1.push(...ret.v);
                 }
-            } else if (val !== skip) {
-                if (val instanceof Splice) {
-                    ret.push.apply(ret, backwards ? val.v.slice().reverse() : val.v);
-                } else {
-                    ret.push(val);
+
+                while ((item = a[++i])) {
+                    const ret = item.transform(tw, true);
+
+                    if (ret instanceof AST_Node) {
+                        a1.push(ret);
+                    } else if (ret instanceof Splice) {
+                        a1.push(...ret.v);
+                    }
                 }
+
+                return a1;
             }
-            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;
-            }
-        } else {
-            for (i in a) if (HOP(a, i)) if (doit()) break;
         }
-        return top.concat(ret);
+
+        return 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;
 })();
 
@@ -426,6 +420,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 +2226,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();
@@ -3716,6 +3728,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);
     }
@@ -4862,12 +4882,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;
     }
@@ -4876,12 +4895,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);
         });
@@ -4889,9 +4909,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) {
@@ -6781,12 +6813,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) {
@@ -6799,7 +6825,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) {
@@ -6846,27 +6872,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) {
@@ -6875,26 +6901,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 })];
@@ -6942,11 +6968,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) {
@@ -6959,11 +6985,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) {
@@ -6977,19 +7003,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) {
@@ -7222,7 +7248,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
             });
@@ -8193,7 +8219,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)
@@ -10273,7 +10299,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);
@@ -10283,6 +10309,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) {
@@ -11175,7 +11204,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) {
@@ -11442,12 +11471,7 @@ 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;
 
@@ -11462,7 +11486,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);
@@ -12408,9 +12432,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);
@@ -13474,7 +13496,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);
     });
@@ -13703,7 +13725,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) {
@@ -15873,7 +15895,7 @@ def_reduce_vars(AST_Toplevel, function(tw, descend, compressor) {
 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);
@@ -16077,13 +16099,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++));
@@ -16127,6 +16147,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
@@ -16300,7 +16323,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;
@@ -19228,9 +19255,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);
@@ -20436,16 +20463,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;
             }
         }
     }
@@ -20458,7 +20490,13 @@ def_optimize(AST_DefaultAssign, function(self, compressor) {
     var evaluateRight = self.right.evaluate(compressor);
 
     // `[x = undefined] = foo` ---> `[x] = foo`
-    if (evaluateRight === undefined) {
+    // `(arg = undefined) => ...` ---> `(arg) => ...` (unless `keep_fargs`)
+    if (
+        evaluateRight === undefined &&
+        (compressor.parent() instanceof AST_Lambda
+            ? compressor.option("keep_fargs") === false
+            : true)
+    ) {
         self = self.left;
     } else if (evaluateRight !== self.right) {
         evaluateRight = make_node_from_constant(evaluateRight, self.right);

package/lib/ast.js

@@ -111,6 +111,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);
     }
@@ -1257,12 +1265,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;
     }
@@ -1271,12 +1278,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);
         });
@@ -1284,9 +1292,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) {
@@ -3235,6 +3255,7 @@ export {
     AST_Toplevel,
     AST_True,
     AST_Try,
+    AST_TryBlock,
     AST_Unary,
     AST_UnaryPostfix,
     AST_UnaryPrefix,

package/lib/compress/index.js

@@ -1529,9 +1529,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);
@@ -2737,16 +2737,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;
             }
         }
     }
@@ -2759,7 +2764,13 @@ def_optimize(AST_DefaultAssign, function(self, compressor) {
     var evaluateRight = self.right.evaluate(compressor);
 
     // `[x = undefined] = foo` ---> `[x] = foo`
-    if (evaluateRight === undefined) {
+    // `(arg = undefined) => ...` ---> `(arg) => ...` (unless `keep_fargs`)
+    if (
+        evaluateRight === undefined &&
+        (compressor.parent() instanceof AST_Lambda
+            ? compressor.option("keep_fargs") === false
+            : true)
+    ) {
         self = self.left;
     } else if (evaluateRight !== self.right) {
         evaluateRight = make_node_from_constant(evaluateRight, self.right);

package/lib/compress/inference.js

@@ -300,7 +300,7 @@ export 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);
     });
@@ -529,7 +529,7 @@ export 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) {

package/lib/compress/reduce-vars.js

@@ -624,7 +624,7 @@ def_reduce_vars(AST_Toplevel, function(tw, descend, compressor) {
 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);

package/lib/compress/tighten-body.js

@@ -52,7 +52,6 @@ import {
     AST_Break,
     AST_Call,
     AST_Case,
-    AST_Catch,
     AST_Chain,
     AST_Class,
     AST_Conditional,
@@ -71,7 +70,6 @@ import {
     AST_Exit,
     AST_Expansion,
     AST_Export,
-    AST_Finally,
     AST_For,
     AST_ForIn,
     AST_If,
@@ -103,6 +101,7 @@ import {
     AST_SymbolVar,
     AST_This,
     AST_Try,
+    AST_TryBlock,
     AST_Unary,
     AST_UnaryPostfix,
     AST_UnaryPrefix,
@@ -234,13 +233,11 @@ export 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++));
@@ -284,6 +281,9 @@ export 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
@@ -457,7 +457,11 @@ export 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;

package/lib/equivalent-to.js

@@ -172,7 +172,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) {

package/lib/mozilla-ast.js

@@ -151,6 +151,7 @@ import {
     AST_Toplevel,
     AST_True,
     AST_Try,
+    AST_TryBlock,
     AST_Unary,
     AST_UnaryPostfix,
     AST_UnaryPrefix,
@@ -344,7 +345,7 @@ import { is_basic_identifier_string } from "./parse.js";
             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
             });
@@ -1315,7 +1316,7 @@ import { is_basic_identifier_string } from "./parse.js";
     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)

package/lib/output.js

@@ -143,6 +143,7 @@ import {
     AST_Throw,
     AST_Toplevel,
     AST_Try,
+    AST_TryBlock,
     AST_Unary,
     AST_UnaryPostfix,
     AST_UnaryPrefix,
@@ -1620,7 +1621,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);
@@ -1630,6 +1631,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) {

package/lib/parse.js

@@ -152,6 +152,7 @@ import {
     AST_Toplevel,
     AST_True,
     AST_Try,
+    AST_TryBlock,
     AST_UnaryPostfix,
     AST_UnaryPrefix,
     AST_Var,
@@ -260,6 +261,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))) {
@@ -2053,7 +2067,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();

package/lib/scope.js

@@ -58,7 +58,6 @@ import {
     AST_Arrow,
     AST_Block,
     AST_Call,
-    AST_Catch,
     AST_Class,
     AST_Conditional,
     AST_DefClass,
@@ -223,12 +222,7 @@ 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;
 
@@ -243,7 +237,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);

package/lib/size.js

@@ -216,9 +216,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);

package/lib/transform.js

@@ -89,7 +89,7 @@ import {
     AST_Yield,
 } from "./ast.js";
 import {
-    MAP,
+    MAP as do_list,
     noop,
 } from "./utils/index.js";
 
@@ -111,12 +111,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) {
@@ -185,7 +179,7 @@ def_transform(AST_Case, function(self, 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);
 });
@@ -210,7 +204,7 @@ def_transform(AST_Destructuring, function(self, 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 = do_list(self.argnames, tw, /* allow_splicing */ false);
     if (self.body instanceof AST_Node) {
         self.body = self.body.transform(tw);
     } else {
@@ -220,7 +214,7 @@ def_transform(AST_Lambda, function(self, tw) {
 
 def_transform(AST_Call, function(self, tw) {
     self.expression = self.expression.transform(tw);
-    self.args = do_list(self.args, tw);
+    self.args = do_list(self.args, tw, /* allow_splicing */ false);
 });
 
 def_transform(AST_Sequence, function(self, tw) {

package/lib/utils/index.js

@@ -43,6 +43,8 @@
 
 "use strict";
 
+import { AST_Node } from "../ast.js";
+
 function characters(str) {
     return str.split("");
 }
@@ -96,48 +98,42 @@ 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);
+    function MAP(a, tw, allow_splicing = true) {
+        // Loop but try not to build a new array
+        for (let i = 0; i < a.length; ++i) {
+            let item = a[i];
+            let ret = item.transform(tw, allow_splicing);
+
+            if (ret !== item) {
+                const a1 = a.slice(0, i);
+
+                // Looks like something was transformed. Change the loop.
+                if (ret instanceof AST_Node) {
+                    a1.push(ret);
+                } else if (ret instanceof Splice) {
+                    a1.push(...ret.v);
                 }
-            } else if (val !== skip) {
-                if (val instanceof Splice) {
-                    ret.push.apply(ret, backwards ? val.v.slice().reverse() : val.v);
-                } else {
-                    ret.push(val);
+
+                while ((item = a[++i])) {
+                    const ret = item.transform(tw, true);
+
+                    if (ret instanceof AST_Node) {
+                        a1.push(ret);
+                    } else if (ret instanceof Splice) {
+                        a1.push(...ret.v);
+                    }
                 }
+
+                return a1;
             }
-            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;
-            }
-        } else {
-            for (i in a) if (HOP(a, i)) if (doit()) break;
         }
-        return top.concat(ret);
+
+        return 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;
 })();
 

package/package.json

@@ -4,7 +4,7 @@
   "homepage": "https://terser.org",
   "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
   "license": "BSD-2-Clause",
-  "version": "5.16.3",
+  "version": "5.16.4",
   "engines": {
     "node": ">=10"
   },