terser 5.17.5 → 5.17.6

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## v5.17.6
+ - Fixes to mozilla AST input and output, for class properties, private properties and static blocks
+ - Fix outputting a shorthand property in quotes when safari10 and ecma=2015 options are enabled
+ - `configurable` and `enumerable`, used in Object.defineProperty, added to domprops (#1393)
+
 ## v5.17.5
  - Take into account the non-deferred bits of a class, such as static properties, while dropping unused code.
 

package/dist/bundle.min.js

@@ -7338,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) {
@@ -7377,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);
@@ -7393,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),
@@ -7434,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),
@@ -10635,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("?.");
@@ -10803,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")
@@ -10821,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) {
@@ -10832,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();
@@ -25413,6 +25448,7 @@ var domprops = [
     "coneInnerAngle",
     "coneOuterAngle",
     "coneOuterGain",
+    "configurable",
     "configuration",
     "configurationName",
     "configurationValue",
@@ -25922,6 +25958,7 @@ var domprops = [
     "entities",
     "entries",
     "entryType",
+    "enumerable",
     "enumerate",
     "enumerateDevices",
     "enumerateEditable",

package/lib/mozilla-ast.js

@@ -395,22 +395,25 @@ import { is_basic_identifier_string } from "./parse.js";
         },
 
         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) {
@@ -434,8 +437,16 @@ import { is_basic_identifier_string } from "./parse.js";
             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);
@@ -450,6 +461,14 @@ import { is_basic_identifier_string } from "./parse.js";
             });
         },
 
+        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),
@@ -491,6 +510,15 @@ import { is_basic_identifier_string } from "./parse.js";
         },
 
         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),

package/lib/output.js

@@ -1917,7 +1917,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("?.");
@@ -2085,15 +2085,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")
@@ -2103,9 +2107,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) {
@@ -2114,28 +2120,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();

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.17.5",
+  "version": "5.17.6",
   "engines": {
     "node": ">=10"
   },

package/tools/domprops.js

@@ -3575,6 +3575,7 @@ export var domprops = [
     "coneInnerAngle",
     "coneOuterAngle",
     "coneOuterGain",
+    "configurable",
     "configuration",
     "configurationName",
     "configurationValue",
@@ -4084,6 +4085,7 @@ export var domprops = [
     "entities",
     "entries",
     "entryType",
+    "enumerable",
     "enumerate",
     "enumerateDevices",
     "enumerateEditable",