terser 5.7.1 → 5.7.2

package/lib/output.js

@@ -159,7 +159,7 @@ import {
     is_basic_identifier_string,
     is_identifier_string,
     PRECEDENCE,
-    RESERVED_WORDS,
+    ALL_RESERVED_WORDS,
 } from "./parse.js";
 
 const EXPECT_DIRECTIVE = /^$|[;{][\s\n]*$/;
@@ -1717,7 +1717,11 @@ function OutputStream(options) {
         //    https://github.com/mishoo/UglifyJS2/issues/60
         if (noin) {
             parens = walk(node, node => {
-                if (node instanceof AST_Scope) return true;
+                // Don't go into scopes -- except arrow functions:
+                // https://github.com/terser/terser/issues/1019#issuecomment-877642607
+                if (node instanceof AST_Scope && !(node instanceof AST_Arrow)) {
+                    return true;
+                }
                 if (node instanceof AST_Binary && node.operator == "in") {
                     return walk_abort;  // makes walk() return true
                 }
@@ -1787,7 +1791,7 @@ function OutputStream(options) {
         var expr = self.expression;
         expr.print(output);
         var prop = self.property;
-        var print_computed = RESERVED_WORDS.has(prop)
+        var print_computed = ALL_RESERVED_WORDS.has(prop)
             ? output.option("ie8")
             : !is_identifier_string(
                 prop,
@@ -1968,7 +1972,7 @@ function OutputStream(options) {
             }
             return output.print(make_num(key));
         }
-        var print_string = RESERVED_WORDS.has(key)
+        var print_string = ALL_RESERVED_WORDS.has(key)
             ? output.option("ie8")
             : (
                 output.option("ecma") < 2015 || output.option("safari10")
@@ -1995,7 +1999,7 @@ function OutputStream(options) {
                 output.option("ecma") >= 2015 || output.option("safari10")
             ) &&
             get_name(self.value) === self.key &&
-            !RESERVED_WORDS.has(self.key)
+            !ALL_RESERVED_WORDS.has(self.key)
         ) {
             print_property_name(self.key, self.quote, output);
 

package/lib/parse.js

@@ -166,13 +166,15 @@ var LATEST_TEMPLATE_END = true;
 
 var KEYWORDS = "break case catch class const continue debugger default delete do else export extends finally for function if in instanceof let new return switch throw try typeof var void while with";
 var KEYWORDS_ATOM = "false null true";
-var RESERVED_WORDS = "enum implements import interface package private protected public static super this " + KEYWORDS_ATOM + " " + KEYWORDS;
+var RESERVED_WORDS = "enum import super this " + KEYWORDS_ATOM + " " + KEYWORDS;
+var ALL_RESERVED_WORDS = "implements interface package private protected public static " + RESERVED_WORDS;
 var KEYWORDS_BEFORE_EXPRESSION = "return new delete throw else case yield await";
 
 KEYWORDS = makePredicate(KEYWORDS);
 RESERVED_WORDS = makePredicate(RESERVED_WORDS);
 KEYWORDS_BEFORE_EXPRESSION = makePredicate(KEYWORDS_BEFORE_EXPRESSION);
 KEYWORDS_ATOM = makePredicate(KEYWORDS_ATOM);
+ALL_RESERVED_WORDS = makePredicate(ALL_RESERVED_WORDS);
 
 var OPERATOR_CHARS = makePredicate(characters("+-*&%=<>!?|~^"));
 
@@ -3339,6 +3341,6 @@ export {
     JS_Parse_Error,
     parse,
     PRECEDENCE,
-    RESERVED_WORDS,
+    ALL_RESERVED_WORDS,
     tokenizer,
 };

package/lib/scope.js

@@ -107,7 +107,7 @@ import {
     walk
 } from "./ast.js";
 import {
-    RESERVED_WORDS,
+    ALL_RESERVED_WORDS,
     js_error,
 } from "./parse.js";
 
@@ -669,7 +669,7 @@ function next_mangled(scope, options) {
     var ext = scope.enclosed;
     out: while (true) {
         var m = base54(++scope.cname);
-        if (RESERVED_WORDS.has(m)) continue; // skip over "do"
+        if (ALL_RESERVED_WORDS.has(m)) continue; // skip over "do"
 
         // https://github.com/mishoo/UglifyJS2/issues/242 -- do not
         // shadow a name reserved from mangling.
@@ -817,7 +817,7 @@ AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
             let name;
             do {
                 name = base54(++lname);
-            } while (RESERVED_WORDS.has(name));
+            } while (ALL_RESERVED_WORDS.has(name));
             node.mangled_name = name;
             return true;
         }
@@ -893,7 +893,7 @@ AST_Toplevel.DEFMETHOD("expand_names", function(options) {
         var name;
         do {
             name = base54(cname++);
-        } while (avoid.has(name) || RESERVED_WORDS.has(name));
+        } while (avoid.has(name) || ALL_RESERVED_WORDS.has(name));
         return name;
     }
 

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.7.1",
+  "version": "5.7.2",
   "engines": {
     "node": ">=10"
   },
@@ -93,7 +93,7 @@
   "eslintConfig": {
     "parserOptions": {
       "sourceType": "module",
-      "ecmaVersion": "2020"
+      "ecmaVersion": 2020
     },
     "env": {
       "node": true,

package/tools/terser.d.ts

@@ -138,6 +138,7 @@ export enum OutputQuoteStyle {
 export interface MinifyOptions {
     compress?: boolean | CompressOptions;
     ecma?: ECMA;
+    enclose?: boolean | string;
     ie8?: boolean;
     keep_classnames?: boolean | RegExp;
     keep_fnames?: boolean | RegExp;

package/bin/terser.mjs

@@ -1,21 +0,0 @@
-#!/usr/bin/env node
-
-"use strict";
-
-import "../tools/exit.cjs";
-
-import fs from "fs"
-import path from "path"
-import program from "commander"
-
-import { run_cli } from "../lib/cli.js"
-
-const packageJson = {
-    name: "terser",
-    version: "experimental module CLI"
-}
-
-run_cli({ program, packageJson, fs, path }).catch((error) => {
-    console.error(error);
-    process.exitCode = 1;
-});