terser 5.39.2 → 5.41.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## v5.41.0
+
+ - fixed semicolon insertion between class fields, when the field names are number literals
+ - `keep_numbers` format option now works for bigint
+ - internal: correctly mark accessors' is_generator property
+ - internal: do not read or assign quote properties without need
+ - internal: add missing equivalent_to comparison
+
+## v5.40.0
+
+ - Fix exporting AssignmentExpression (default assign pattern) to ESTree
+ - Fix ESTree output of object keys with quotes
+ - Fix handling of an ESTree empty `export {}` (#1601)
+ - Fix some `const` and `let` resulting from ESTree input (#1599)
+
 ## v5.39.2
 
  - Fix crash when parsing bare `yield` inside a template string.

package/dist/bundle.min.js

@@ -1685,14 +1685,9 @@ function parse($TEXT, options) {
 
         var body = _function_body(is("punc", "{"), false, is_async);
 
-        var end =
-            body instanceof Array && body.length ? body[body.length - 1].end :
-            body instanceof Array ? start :
-                body.end;
-
         return new AST_Arrow({
             start    : start,
-            end      : end,
+            end      : body.end,
             async    : is_async,
             argnames : argnames,
             body     : body
@@ -1723,7 +1718,7 @@ function parse($TEXT, options) {
         return new ctor({
             start : args.start,
             end   : body.end,
-            is_generator: is_generator,
+            is_generator: is_generator || is_generator_property,
             async : is_async,
             name  : name,
             argnames: args,
@@ -2351,7 +2346,12 @@ function parse($TEXT, options) {
             });
             break;
           case "big_int":
-            ret = new AST_BigInt({ start: tok, end: tok, value: tok.value });
+            ret = new AST_BigInt({
+                start: tok,
+                end: tok,
+                value: tok.value,
+                raw: LATEST_RAW,
+            });
             break;
           case "string":
             ret = new AST_String({
@@ -2615,7 +2615,7 @@ function parse($TEXT, options) {
 
             // Check property and fetch value
             if (!is("punc", ":")) {
-                var concise = concise_method_or_getset(name, start);
+                var concise = object_or_class_property(name, start);
                 if (concise) {
                     a.push(concise);
                     continue;
@@ -2650,7 +2650,7 @@ function parse($TEXT, options) {
             const kv = new AST_ObjectKeyVal({
                 start: start,
                 quote: start.quote,
-                key: name instanceof AST_Node ? name : "" + name,
+                key: name,
                 value: value,
                 end: prev()
             });
@@ -2661,7 +2661,7 @@ function parse($TEXT, options) {
     });
 
     function class_(KindOfClass, is_export_default) {
-        var start, method, class_name, extends_, a = [];
+        var start, method, class_name, extends_, properties = [];
 
         S.input.push_directives_stack(); // Push directive stack, but not scope stack
         S.input.add_directive("use strict");
@@ -2690,9 +2690,9 @@ function parse($TEXT, options) {
         while (is("punc", ";")) { next(); }  // Leading semicolons are okay in class bodies.
         while (!is("punc", "}")) {
             start = S.token;
-            method = concise_method_or_getset(as_property_name(), start, true);
+            method = object_or_class_property(as_property_name(), start, true);
             if (!method) { unexpected(); }
-            a.push(method);
+            properties.push(method);
             while (is("punc", ";")) { next(); }
         }
         // mark in class feild,
@@ -2706,19 +2706,15 @@ function parse($TEXT, options) {
             start: start,
             name: class_name,
             extends: extends_,
-            properties: a,
+            properties: properties,
             end: prev(),
         });
     }
 
-    function concise_method_or_getset(name, start, is_class) {
-        const get_symbol_ast = (name, SymbolClass = AST_SymbolMethod) => {
-            if (typeof name === "string" || typeof name === "number") {
-                return new SymbolClass({
-                    start,
-                    name: "" + name,
-                    end: prev()
-                });
+    function object_or_class_property(name, start, is_class) {
+        const get_symbol_ast = (name, SymbolClass) => {
+            if (typeof name === "string") {
+                return new SymbolClass({ start, name, end: prev() });
             } else if (name === null) {
                 unexpected();
             }
@@ -2766,7 +2762,7 @@ function parse($TEXT, options) {
                     ? AST_ObjectGetter
                     : AST_ObjectSetter;
 
-                name = get_symbol_ast(name);
+                name = get_symbol_ast(name, AST_SymbolMethod);
                 return annotate(new AccessorClass({
                     start,
                     static: is_static,
@@ -2783,7 +2779,7 @@ function parse($TEXT, options) {
                 return annotate(new AccessorClass({
                     start,
                     static: is_static,
-                    key: get_symbol_ast(name),
+                    key: get_symbol_ast(name, AST_SymbolMethod),
                     value: create_accessor(),
                     end: prev(),
                 }));
@@ -2791,7 +2787,7 @@ function parse($TEXT, options) {
         }
 
         if (is("punc", "(")) {
-            name = get_symbol_ast(name);
+            name = get_symbol_ast(name, AST_SymbolMethod);
             const AST_MethodVariant = is_private
                 ? AST_PrivateMethod
                 : AST_ConciseMethod;
@@ -2810,13 +2806,17 @@ function parse($TEXT, options) {
         }
 
         if (is_class) {
-            const key = get_symbol_ast(name, AST_SymbolClassProperty);
-            const quote = key instanceof AST_SymbolClassProperty
-                ? property_token.quote
-                : undefined;
+            const AST_SymbolVariant = is_private
+                ? AST_SymbolPrivateProperty
+                : AST_SymbolClassProperty;
             const AST_ClassPropertyVariant = is_private
                 ? AST_ClassPrivateProperty
                 : AST_ClassProperty;
+
+            const key = get_symbol_ast(name, AST_SymbolVariant);
+            const quote = key instanceof AST_SymbolClassProperty
+                ? property_token.quote
+                : undefined;
             if (is("operator", "=")) {
                 next();
                 return annotate(
@@ -2836,6 +2836,9 @@ function parse($TEXT, options) {
                 || is("operator", "*")
                 || is("punc", ";")
                 || is("punc", "}")
+                || is("string")
+                || is("num")
+                || is("big_int")
             ) {
                 return annotate(
                     new AST_ClassPropertyVariant({
@@ -2960,10 +2963,12 @@ function parse($TEXT, options) {
             } else {
                 foreign_name = make_symbol(foreign_type, S.token.quote);
             }
-        } else if (is_import) {
-            name = new type(foreign_name);
         } else {
-            foreign_name = new foreign_type(name);
+            if (is_import) {
+                name = new type(foreign_name);
+            } else {
+                foreign_name = new foreign_type(name);
+            }
         }
 
         return new AST_NameMapping({
@@ -3134,12 +3139,14 @@ function parse($TEXT, options) {
           case "name":
           case "privatename":
           case "string":
-          case "num":
-          case "big_int":
           case "keyword":
           case "atom":
             next();
             return tmp.value;
+          case "num":
+          case "big_int":
+            next();
+            return "" + tmp.value;
           default:
             unexpected(tmp);
         }
@@ -5797,7 +5804,6 @@ var AST_ConciseMethod = DEFNODE("ConciseMethod", "quote static is_generator asyn
 
 var AST_PrivateMethod = DEFNODE("PrivateMethod", "", function AST_PrivateMethod(props) {
     if (props) {
-        this.quote = props.quote;
         this.static = props.static;
         this.is_generator = props.is_generator;
         this.async = props.async;
@@ -5958,7 +5964,6 @@ var AST_ClassProperty = DEFNODE("ClassProperty", "static quote", function AST_Cl
 var AST_ClassPrivateProperty = DEFNODE("ClassPrivateProperty", "", function AST_ClassPrivateProperty(props) {
     if (props) {
         this.static = props.static;
-        this.quote = props.quote;
         this.key = props.key;
         this.value = props.value;
         this.start = props.start;
@@ -6318,12 +6323,12 @@ var AST_SymbolImport = DEFNODE("SymbolImport", null, function AST_SymbolImport(p
     $documentation: "Symbol referring to an imported name",
 }, AST_SymbolBlockDeclaration);
 
-var AST_SymbolImportForeign = DEFNODE("SymbolImportForeign", null, function AST_SymbolImportForeign(props) {
+var AST_SymbolImportForeign = DEFNODE("SymbolImportForeign", "quote", function AST_SymbolImportForeign(props) {
     if (props) {
+        this.quote = props.quote;
         this.scope = props.scope;
         this.name = props.name;
         this.thedef = props.thedef;
-        this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
     }
@@ -6370,12 +6375,12 @@ var AST_SymbolRef = DEFNODE("SymbolRef", null, function AST_SymbolRef(props) {
     $documentation: "Reference to some symbol (not definition/declaration)",
 }, AST_Symbol);
 
-var AST_SymbolExport = DEFNODE("SymbolExport", null, function AST_SymbolExport(props) {
+var AST_SymbolExport = DEFNODE("SymbolExport", "quote", function AST_SymbolExport(props) {
     if (props) {
+        this.quote = props.quote;
         this.scope = props.scope;
         this.name = props.name;
         this.thedef = props.thedef;
-        this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
     }
@@ -6385,12 +6390,12 @@ var AST_SymbolExport = DEFNODE("SymbolExport", null, function AST_SymbolExport(p
     $documentation: "Symbol referring to a name to export",
 }, AST_SymbolRef);
 
-var AST_SymbolExportForeign = DEFNODE("SymbolExportForeign", null, function AST_SymbolExportForeign(props) {
+var AST_SymbolExportForeign = DEFNODE("SymbolExportForeign", "quote", function AST_SymbolExportForeign(props) {
     if (props) {
+        this.quote = props.quote;
         this.scope = props.scope;
         this.name = props.name;
         this.thedef = props.thedef;
-        this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
     }
@@ -6505,9 +6510,10 @@ var AST_Number = DEFNODE("Number", "value raw", function AST_Number(props) {
     }
 }, AST_Constant);
 
-var AST_BigInt = DEFNODE("BigInt", "value", function AST_BigInt(props) {
+var AST_BigInt = DEFNODE("BigInt", "value raw", function AST_BigInt(props) {
     if (props) {
         this.value = props.value;
+        this.raw = props.raw;
         this.start = props.start;
         this.end = props.end;
     }
@@ -6516,7 +6522,8 @@ var AST_BigInt = DEFNODE("BigInt", "value", function AST_BigInt(props) {
 }, {
     $documentation: "A big int literal",
     $propdoc: {
-        value: "[string] big int value"
+        value: "[string] big int value, represented as a string",
+        raw: "[string] the original format preserved"
     }
 }, AST_Constant);
 
@@ -7358,6 +7365,9 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
                 start    : my_start_token(key || M.value),
                 end      : my_end_token(M.value),
                 key      : key.type == "Identifier" ? key.name : key.value,
+                quote    : !key.computed && key.type === "Literal" && typeof key.value === "string"
+                            ? '"'
+                            : null,
                 value    : from_moz(M.value)
             };
             if (M.computed) {
@@ -7390,7 +7400,6 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
             if (M.kind == "method") {
                 args.async = M.value.async;
                 args.is_generator = M.value.generator;
-                args.quote = M.computed ? "\"" : null;
                 return new AST_ConciseMethod(args);
             }
         },
@@ -7634,14 +7643,26 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
         },
 
         ExportNamedDeclaration: function(M) {
-            return new AST_Export({
-                start: my_start_token(M),
-                end: my_end_token(M),
-                exported_definition: from_moz(M.declaration),
-                exported_names: M.specifiers && M.specifiers.length ? M.specifiers.map(from_moz) : null,
-                module_name: from_moz(M.source),
-                attributes: import_attributes_from_moz(M.attributes || M.assertions)
-            });
+            if (M.declaration) {
+                // export const, export function, ...
+                return new AST_Export({
+                    start: my_start_token(M),
+                    end: my_end_token(M),
+                    exported_definition: from_moz(M.declaration),
+                    exported_names: null,
+                    module_name: null,
+                    attributes: null,
+                });
+            } else {
+                return new AST_Export({
+                    start: my_start_token(M),
+                    end: my_end_token(M),
+                    exported_definition: null,
+                    exported_names: M.specifiers && M.specifiers.length ? M.specifiers.map(from_moz) : [],
+                    module_name: from_moz(M.source),
+                    attributes: import_attributes_from_moz(M.attributes || M.assertions),
+                });
+            }
         },
 
         ExportDefaultDeclaration: function(M) {
@@ -7733,8 +7754,9 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
 
         Identifier: function(M) {
             var p = FROM_MOZ_STACK[FROM_MOZ_STACK.length - 2];
+            var q = FROM_MOZ_STACK[FROM_MOZ_STACK.length - 3];
             return new (  p.type == "LabeledStatement" ? AST_Label
-                        : p.type == "VariableDeclarator" && p.id === M ? (p.kind == "const" ? AST_SymbolConst : p.kind == "let" ? AST_SymbolLet : AST_SymbolVar)
+                        : p.type == "VariableDeclarator" && p.id === M ? (q.kind == "const" ? AST_SymbolConst : q.kind == "let" ? AST_SymbolLet : AST_SymbolVar)
                         : /Import.*Specifier/.test(p.type) ? (p.local === M ? AST_SymbolImport : AST_SymbolImportForeign)
                         : p.type == "ExportSpecifier" ? (p.local === M ? AST_SymbolExport : AST_SymbolExportForeign)
                         : p.type == "FunctionExpression" ? (p.id === M ? AST_SymbolLambda : AST_SymbolFunarg)
@@ -8186,30 +8208,6 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
             type: "Super"
         };
     });
-    def_to_moz(AST_Binary, function To_Moz_BinaryExpression(M) {
-        return {
-            type: "BinaryExpression",
-            operator: M.operator,
-            left: to_moz(M.left),
-            right: to_moz(M.right)
-        };
-    });
-    def_to_moz(AST_Binary, function To_Moz_LogicalExpression(M) {
-        return {
-            type: "LogicalExpression",
-            operator: M.operator,
-            left: to_moz(M.left),
-            right: to_moz(M.right)
-        };
-    });
-    def_to_moz(AST_Assign, function To_Moz_AssignmentExpression(M) {
-        return {
-            type: "AssignmentExpression",
-            operator: M.operator,
-            left: to_moz(M.left),
-            right: to_moz(M.right)
-        };
-    });
     def_to_moz(AST_Conditional, function To_Moz_ConditionalExpression(M) {
         return {
             type: "ConditionalExpression",
@@ -8336,6 +8334,14 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
         };
     });
 
+    def_to_moz(AST_DefaultAssign, function To_Moz_AssignmentExpression(M) {
+        return {
+            type: "AssignmentPattern",
+            left: to_moz(M.left),
+            right: to_moz(M.right),
+        };
+    });
+
     def_to_moz(AST_Directive, function To_Moz_Directive(M) {
         return {
             type: "ExpressionStatement",
@@ -8412,8 +8418,7 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
     def_to_moz(AST_Export, function To_Moz_ExportDeclaration(M) {
         if (M.exported_names) {
             var first_exported = M.exported_names[0];
-            var first_exported_name = first_exported.name;
-            if (first_exported_name.name === "*" && !first_exported_name.quote) {
+            if (first_exported && first_exported.name.name === "*" && !first_exported.name.quote) {
                 var foreign_name = first_exported.foreign_name;
                 var exported = foreign_name.name === "*" && !foreign_name.quote
                     ? null
@@ -8560,6 +8565,15 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
         };
     });
 
+    def_to_moz(AST_Assign, function To_Moz_AssignmentExpression(M) {
+        return {
+            type: "AssignmentExpression",
+            operator: M.operator,
+            left: to_moz(M.left),
+            right: to_moz(M.right)
+        };
+    });
+
     def_to_moz(AST_PrivateIn, function To_Moz_BinaryExpression_PrivateIn(M) {
         return {
             type: "BinaryExpression",
@@ -8586,7 +8600,7 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
     def_to_moz(AST_ObjectProperty, function To_Moz_Property(M, parent) {
         var key = M.key instanceof AST_Node ? to_moz(M.key) : {
             type: "Identifier",
-            value: M.key
+            value: M.key,
         };
         if (typeof M.key === "number") {
             key = {
@@ -8595,10 +8609,16 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
             };
         }
         if (typeof M.key === "string") {
-            key = {
-                type: "Identifier",
-                name: M.key
-            };
+            key = M.quote
+                ? {
+                    type: "Literal",
+                    value: M.key,
+                    raw: JSON.stringify(M.key),
+                }
+                : {
+                    type: "Identifier",
+                    name: M.key,
+                };
         }
         var kind;
         var string_or_num = typeof M.key === "string" || typeof M.key === "number";
@@ -10645,11 +10665,11 @@ function OutputStream(options) {
             foreign_name.name;
         if (!names_are_different &&
             foreign_name.name === "*" &&
-            foreign_name.quote != self.name.quote) {
+            !!foreign_name.quote != !!self.name.quote) {
                 // export * as "*"
             names_are_different = true;
         }
-        var foreign_name_is_name = foreign_name.quote == null;
+        var foreign_name_is_name = !foreign_name.quote;
         if (names_are_different) {
             if (is_import) {
                 if (foreign_name_is_name) {
@@ -10658,7 +10678,7 @@ function OutputStream(options) {
                     output.print_string(foreign_name.name, foreign_name.quote);
                 }
             } else {
-                if (self.name.quote == null) {
+                if (!self.name.quote) {
                     self.name.print(output);
                 } else {
                     output.print_string(self.name.name, self.name.quote);
@@ -10678,7 +10698,7 @@ function OutputStream(options) {
                 }
             }
         } else {
-            if (self.name.quote == null) {
+            if (!self.name.quote) {
                 self.name.print(output);
             } else {
                 output.print_string(self.name.name, self.name.quote);
@@ -11067,7 +11087,7 @@ function OutputStream(options) {
 
         output.print("#");
         
-        print_property_name(self.key.name, self.quote, output);
+        print_property_name(self.key.name, undefined, output);
 
         if (self.value) {
             output.print("=");
@@ -11195,7 +11215,11 @@ function OutputStream(options) {
         }
     });
     DEFPRINT(AST_BigInt, function(self, output) {
-        output.print(self.getValue() + "n");
+        if (output.option("keep_numbers") && self.raw) {
+            output.print(self.raw);
+        } else {
+            output.print(self.getValue() + "n");
+        }
     });
 
     const r_slash_script = /(<\s*\/\s*script)/i;
@@ -11483,13 +11507,13 @@ AST_VarDef.prototype.shallow_cmp = function(other) {
 AST_NameMapping.prototype.shallow_cmp = pass_through;
 
 AST_Import.prototype.shallow_cmp = function(other) {
-    return (this.imported_name == null ? other.imported_name == null : this.imported_name === other.imported_name) && (this.imported_names == null ? other.imported_names == null : this.imported_names === other.imported_names);
+    return (this.imported_name == null ? other.imported_name == null : this.imported_name === other.imported_name) && (this.imported_names == null ? other.imported_names == null : this.imported_names === other.imported_names) && (this.attributes == null ? other.attributes == null : this.attributes === other.attributes);
 };
 
 AST_ImportMeta.prototype.shallow_cmp = pass_through;
 
 AST_Export.prototype.shallow_cmp = function(other) {
-    return (this.exported_definition == null ? other.exported_definition == null : this.exported_definition === other.exported_definition) && (this.exported_value == null ? other.exported_value == null : this.exported_value === other.exported_value) && (this.exported_names == null ? other.exported_names == null : this.exported_names === other.exported_names) && this.module_name === other.module_name && this.is_default === other.is_default;
+    return (this.exported_definition == null ? other.exported_definition == null : this.exported_definition === other.exported_definition) && (this.exported_value == null ? other.exported_value == null : this.exported_value === other.exported_value) && (this.exported_names == null ? other.exported_names == null : this.exported_names === other.exported_names) && (this.attributes == null ? other.attributes == null : this.attributes === other.attributes) && this.module_name === other.module_name && this.is_default === other.is_default;
 };
 
 AST_Call.prototype.shallow_cmp = pass_through;
@@ -11516,6 +11540,8 @@ AST_Binary.prototype.shallow_cmp = function(other) {
     return this.operator === other.operator;
 };
 
+AST_PrivateIn.prototype.shallow_cmp = pass_through;
+
 AST_Conditional.prototype.shallow_cmp = pass_through;
 
 AST_Array.prototype.shallow_cmp = pass_through;
@@ -11525,7 +11551,7 @@ AST_Object.prototype.shallow_cmp = pass_through;
 AST_ObjectProperty.prototype.shallow_cmp = pass_through;
 
 AST_ObjectKeyVal.prototype.shallow_cmp = function(other) {
-    return this.key === other.key;
+    return this.key === other.key && this.quote === other.quote;
 };
 
 AST_ObjectSetter.prototype.shallow_cmp = function(other) {

package/lib/ast.js

@@ -2179,7 +2179,6 @@ var AST_ConciseMethod = DEFNODE("ConciseMethod", "quote static is_generator asyn
 
 var AST_PrivateMethod = DEFNODE("PrivateMethod", "", function AST_PrivateMethod(props) {
     if (props) {
-        this.quote = props.quote;
         this.static = props.static;
         this.is_generator = props.is_generator;
         this.async = props.async;
@@ -2340,7 +2339,6 @@ var AST_ClassProperty = DEFNODE("ClassProperty", "static quote", function AST_Cl
 var AST_ClassPrivateProperty = DEFNODE("ClassPrivateProperty", "", function AST_ClassPrivateProperty(props) {
     if (props) {
         this.static = props.static;
-        this.quote = props.quote;
         this.key = props.key;
         this.value = props.value;
         this.start = props.start;
@@ -2700,12 +2698,12 @@ var AST_SymbolImport = DEFNODE("SymbolImport", null, function AST_SymbolImport(p
     $documentation: "Symbol referring to an imported name",
 }, AST_SymbolBlockDeclaration);
 
-var AST_SymbolImportForeign = DEFNODE("SymbolImportForeign", null, function AST_SymbolImportForeign(props) {
+var AST_SymbolImportForeign = DEFNODE("SymbolImportForeign", "quote", function AST_SymbolImportForeign(props) {
     if (props) {
+        this.quote = props.quote;
         this.scope = props.scope;
         this.name = props.name;
         this.thedef = props.thedef;
-        this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
     }
@@ -2752,12 +2750,12 @@ var AST_SymbolRef = DEFNODE("SymbolRef", null, function AST_SymbolRef(props) {
     $documentation: "Reference to some symbol (not definition/declaration)",
 }, AST_Symbol);
 
-var AST_SymbolExport = DEFNODE("SymbolExport", null, function AST_SymbolExport(props) {
+var AST_SymbolExport = DEFNODE("SymbolExport", "quote", function AST_SymbolExport(props) {
     if (props) {
+        this.quote = props.quote;
         this.scope = props.scope;
         this.name = props.name;
         this.thedef = props.thedef;
-        this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
     }
@@ -2767,12 +2765,12 @@ var AST_SymbolExport = DEFNODE("SymbolExport", null, function AST_SymbolExport(p
     $documentation: "Symbol referring to a name to export",
 }, AST_SymbolRef);
 
-var AST_SymbolExportForeign = DEFNODE("SymbolExportForeign", null, function AST_SymbolExportForeign(props) {
+var AST_SymbolExportForeign = DEFNODE("SymbolExportForeign", "quote", function AST_SymbolExportForeign(props) {
     if (props) {
+        this.quote = props.quote;
         this.scope = props.scope;
         this.name = props.name;
         this.thedef = props.thedef;
-        this.quote = props.quote;
         this.start = props.start;
         this.end = props.end;
     }
@@ -2887,9 +2885,10 @@ var AST_Number = DEFNODE("Number", "value raw", function AST_Number(props) {
     }
 }, AST_Constant);
 
-var AST_BigInt = DEFNODE("BigInt", "value", function AST_BigInt(props) {
+var AST_BigInt = DEFNODE("BigInt", "value raw", function AST_BigInt(props) {
     if (props) {
         this.value = props.value;
+        this.raw = props.raw;
         this.start = props.start;
         this.end = props.end;
     }
@@ -2898,7 +2897,8 @@ var AST_BigInt = DEFNODE("BigInt", "value", function AST_BigInt(props) {
 }, {
     $documentation: "A big int literal",
     $propdoc: {
-        value: "[string] big int value"
+        value: "[string] big int value, represented as a string",
+        raw: "[string] the original format preserved"
     }
 }, AST_Constant);
 

package/lib/equivalent-to.js

@@ -44,6 +44,7 @@ import {
     AST_ObjectProperty,
     AST_ObjectSetter,
     AST_PrefixedTemplateString,
+    AST_PrivateIn,
     AST_PrivateMethod,
     AST_PropAccess,
     AST_RegExp,
@@ -192,13 +193,13 @@ AST_VarDef.prototype.shallow_cmp = function(other) {
 AST_NameMapping.prototype.shallow_cmp = pass_through;
 
 AST_Import.prototype.shallow_cmp = function(other) {
-    return (this.imported_name == null ? other.imported_name == null : this.imported_name === other.imported_name) && (this.imported_names == null ? other.imported_names == null : this.imported_names === other.imported_names);
+    return (this.imported_name == null ? other.imported_name == null : this.imported_name === other.imported_name) && (this.imported_names == null ? other.imported_names == null : this.imported_names === other.imported_names) && (this.attributes == null ? other.attributes == null : this.attributes === other.attributes);
 };
 
 AST_ImportMeta.prototype.shallow_cmp = pass_through;
 
 AST_Export.prototype.shallow_cmp = function(other) {
-    return (this.exported_definition == null ? other.exported_definition == null : this.exported_definition === other.exported_definition) && (this.exported_value == null ? other.exported_value == null : this.exported_value === other.exported_value) && (this.exported_names == null ? other.exported_names == null : this.exported_names === other.exported_names) && this.module_name === other.module_name && this.is_default === other.is_default;
+    return (this.exported_definition == null ? other.exported_definition == null : this.exported_definition === other.exported_definition) && (this.exported_value == null ? other.exported_value == null : this.exported_value === other.exported_value) && (this.exported_names == null ? other.exported_names == null : this.exported_names === other.exported_names) && (this.attributes == null ? other.attributes == null : this.attributes === other.attributes) && this.module_name === other.module_name && this.is_default === other.is_default;
 };
 
 AST_Call.prototype.shallow_cmp = pass_through;
@@ -225,6 +226,8 @@ AST_Binary.prototype.shallow_cmp = function(other) {
     return this.operator === other.operator;
 };
 
+AST_PrivateIn.prototype.shallow_cmp = pass_through;
+
 AST_Conditional.prototype.shallow_cmp = pass_through;
 
 AST_Array.prototype.shallow_cmp = pass_through;
@@ -234,7 +237,7 @@ AST_Object.prototype.shallow_cmp = pass_through;
 AST_ObjectProperty.prototype.shallow_cmp = pass_through;
 
 AST_ObjectKeyVal.prototype.shallow_cmp = function(other) {
-    return this.key === other.key;
+    return this.key === other.key && this.quote === other.quote;
 };
 
 AST_ObjectSetter.prototype.shallow_cmp = function(other) {

package/lib/mozilla-ast.js

@@ -355,6 +355,9 @@ import { is_basic_identifier_string } from "./parse.js";
                 start    : my_start_token(key || M.value),
                 end      : my_end_token(M.value),
                 key      : key.type == "Identifier" ? key.name : key.value,
+                quote    : !key.computed && key.type === "Literal" && typeof key.value === "string"
+                            ? '"'
+                            : null,
                 value    : from_moz(M.value)
             };
             if (M.computed) {
@@ -387,7 +390,6 @@ import { is_basic_identifier_string } from "./parse.js";
             if (M.kind == "method") {
                 args.async = M.value.async;
                 args.is_generator = M.value.generator;
-                args.quote = M.computed ? "\"" : null;
                 return new AST_ConciseMethod(args);
             }
         },
@@ -631,14 +633,26 @@ import { is_basic_identifier_string } from "./parse.js";
         },
 
         ExportNamedDeclaration: function(M) {
-            return new AST_Export({
-                start: my_start_token(M),
-                end: my_end_token(M),
-                exported_definition: from_moz(M.declaration),
-                exported_names: M.specifiers && M.specifiers.length ? M.specifiers.map(from_moz) : null,
-                module_name: from_moz(M.source),
-                attributes: import_attributes_from_moz(M.attributes || M.assertions)
-            });
+            if (M.declaration) {
+                // export const, export function, ...
+                return new AST_Export({
+                    start: my_start_token(M),
+                    end: my_end_token(M),
+                    exported_definition: from_moz(M.declaration),
+                    exported_names: null,
+                    module_name: null,
+                    attributes: null,
+                });
+            } else {
+                return new AST_Export({
+                    start: my_start_token(M),
+                    end: my_end_token(M),
+                    exported_definition: null,
+                    exported_names: M.specifiers && M.specifiers.length ? M.specifiers.map(from_moz) : [],
+                    module_name: from_moz(M.source),
+                    attributes: import_attributes_from_moz(M.attributes || M.assertions),
+                });
+            }
         },
 
         ExportDefaultDeclaration: function(M) {
@@ -730,8 +744,9 @@ import { is_basic_identifier_string } from "./parse.js";
 
         Identifier: function(M) {
             var p = FROM_MOZ_STACK[FROM_MOZ_STACK.length - 2];
+            var q = FROM_MOZ_STACK[FROM_MOZ_STACK.length - 3];
             return new (  p.type == "LabeledStatement" ? AST_Label
-                        : p.type == "VariableDeclarator" && p.id === M ? (p.kind == "const" ? AST_SymbolConst : p.kind == "let" ? AST_SymbolLet : AST_SymbolVar)
+                        : p.type == "VariableDeclarator" && p.id === M ? (q.kind == "const" ? AST_SymbolConst : q.kind == "let" ? AST_SymbolLet : AST_SymbolVar)
                         : /Import.*Specifier/.test(p.type) ? (p.local === M ? AST_SymbolImport : AST_SymbolImportForeign)
                         : p.type == "ExportSpecifier" ? (p.local === M ? AST_SymbolExport : AST_SymbolExportForeign)
                         : p.type == "FunctionExpression" ? (p.id === M ? AST_SymbolLambda : AST_SymbolFunarg)
@@ -1183,30 +1198,6 @@ import { is_basic_identifier_string } from "./parse.js";
             type: "Super"
         };
     });
-    def_to_moz(AST_Binary, function To_Moz_BinaryExpression(M) {
-        return {
-            type: "BinaryExpression",
-            operator: M.operator,
-            left: to_moz(M.left),
-            right: to_moz(M.right)
-        };
-    });
-    def_to_moz(AST_Binary, function To_Moz_LogicalExpression(M) {
-        return {
-            type: "LogicalExpression",
-            operator: M.operator,
-            left: to_moz(M.left),
-            right: to_moz(M.right)
-        };
-    });
-    def_to_moz(AST_Assign, function To_Moz_AssignmentExpression(M) {
-        return {
-            type: "AssignmentExpression",
-            operator: M.operator,
-            left: to_moz(M.left),
-            right: to_moz(M.right)
-        };
-    });
     def_to_moz(AST_Conditional, function To_Moz_ConditionalExpression(M) {
         return {
             type: "ConditionalExpression",
@@ -1333,6 +1324,14 @@ import { is_basic_identifier_string } from "./parse.js";
         };
     });
 
+    def_to_moz(AST_DefaultAssign, function To_Moz_AssignmentExpression(M) {
+        return {
+            type: "AssignmentPattern",
+            left: to_moz(M.left),
+            right: to_moz(M.right),
+        };
+    });
+
     def_to_moz(AST_Directive, function To_Moz_Directive(M) {
         return {
             type: "ExpressionStatement",
@@ -1409,8 +1408,7 @@ import { is_basic_identifier_string } from "./parse.js";
     def_to_moz(AST_Export, function To_Moz_ExportDeclaration(M) {
         if (M.exported_names) {
             var first_exported = M.exported_names[0];
-            var first_exported_name = first_exported.name;
-            if (first_exported_name.name === "*" && !first_exported_name.quote) {
+            if (first_exported && first_exported.name.name === "*" && !first_exported.name.quote) {
                 var foreign_name = first_exported.foreign_name;
                 var exported = foreign_name.name === "*" && !foreign_name.quote
                     ? null
@@ -1557,6 +1555,15 @@ import { is_basic_identifier_string } from "./parse.js";
         };
     });
 
+    def_to_moz(AST_Assign, function To_Moz_AssignmentExpression(M) {
+        return {
+            type: "AssignmentExpression",
+            operator: M.operator,
+            left: to_moz(M.left),
+            right: to_moz(M.right)
+        };
+    });
+
     def_to_moz(AST_PrivateIn, function To_Moz_BinaryExpression_PrivateIn(M) {
         return {
             type: "BinaryExpression",
@@ -1583,7 +1590,7 @@ import { is_basic_identifier_string } from "./parse.js";
     def_to_moz(AST_ObjectProperty, function To_Moz_Property(M, parent) {
         var key = M.key instanceof AST_Node ? to_moz(M.key) : {
             type: "Identifier",
-            value: M.key
+            value: M.key,
         };
         if (typeof M.key === "number") {
             key = {
@@ -1592,10 +1599,16 @@ import { is_basic_identifier_string } from "./parse.js";
             };
         }
         if (typeof M.key === "string") {
-            key = {
-                type: "Identifier",
-                name: M.key
-            };
+            key = M.quote
+                ? {
+                    type: "Literal",
+                    value: M.key,
+                    raw: JSON.stringify(M.key),
+                }
+                : {
+                    type: "Identifier",
+                    name: M.key,
+                };
         }
         var kind;
         var string_or_num = typeof M.key === "string" || typeof M.key === "number";

package/lib/output.js

@@ -1811,11 +1811,11 @@ function OutputStream(options) {
             foreign_name.name;
         if (!names_are_different &&
             foreign_name.name === "*" &&
-            foreign_name.quote != self.name.quote) {
+            !!foreign_name.quote != !!self.name.quote) {
                 // export * as "*"
             names_are_different = true;
         }
-        var foreign_name_is_name = foreign_name.quote == null;
+        var foreign_name_is_name = !foreign_name.quote;
         if (names_are_different) {
             if (is_import) {
                 if (foreign_name_is_name) {
@@ -1824,7 +1824,7 @@ function OutputStream(options) {
                     output.print_string(foreign_name.name, foreign_name.quote);
                 }
             } else {
-                if (self.name.quote == null) {
+                if (!self.name.quote) {
                     self.name.print(output);
                 } else {
                     output.print_string(self.name.name, self.name.quote);
@@ -1844,7 +1844,7 @@ function OutputStream(options) {
                 }
             }
         } else {
-            if (self.name.quote == null) {
+            if (!self.name.quote) {
                 self.name.print(output);
             } else {
                 output.print_string(self.name.name, self.name.quote);
@@ -2233,7 +2233,7 @@ function OutputStream(options) {
 
         output.print("#");
         
-        print_property_name(self.key.name, self.quote, output);
+        print_property_name(self.key.name, undefined, output);
 
         if (self.value) {
             output.print("=");
@@ -2361,7 +2361,11 @@ function OutputStream(options) {
         }
     });
     DEFPRINT(AST_BigInt, function(self, output) {
-        output.print(self.getValue() + "n");
+        if (output.option("keep_numbers") && self.raw) {
+            output.print(self.raw);
+        } else {
+            output.print(self.getValue() + "n");
+        }
     });
 
     const r_slash_script = /(<\s*\/\s*script)/i;

package/lib/parse.js

@@ -108,7 +108,6 @@ import {
     AST_NameMapping,
     AST_New,
     AST_NewTarget,
-    AST_Node,
     AST_Null,
     AST_Number,
     AST_Object,
@@ -1540,14 +1539,9 @@ function parse($TEXT, options) {
 
         var body = _function_body(is("punc", "{"), false, is_async);
 
-        var end =
-            body instanceof Array && body.length ? body[body.length - 1].end :
-            body instanceof Array ? start :
-                body.end;
-
         return new AST_Arrow({
             start    : start,
-            end      : end,
+            end      : body.end,
             async    : is_async,
             argnames : argnames,
             body     : body
@@ -1578,7 +1572,7 @@ function parse($TEXT, options) {
         return new ctor({
             start : args.start,
             end   : body.end,
-            is_generator: is_generator,
+            is_generator: is_generator || is_generator_property,
             async : is_async,
             name  : name,
             argnames: args,
@@ -2206,7 +2200,12 @@ function parse($TEXT, options) {
             });
             break;
           case "big_int":
-            ret = new AST_BigInt({ start: tok, end: tok, value: tok.value });
+            ret = new AST_BigInt({
+                start: tok,
+                end: tok,
+                value: tok.value,
+                raw: LATEST_RAW,
+            });
             break;
           case "string":
             ret = new AST_String({
@@ -2470,7 +2469,7 @@ function parse($TEXT, options) {
 
             // Check property and fetch value
             if (!is("punc", ":")) {
-                var concise = concise_method_or_getset(name, start);
+                var concise = object_or_class_property(name, start);
                 if (concise) {
                     a.push(concise);
                     continue;
@@ -2505,7 +2504,7 @@ function parse($TEXT, options) {
             const kv = new AST_ObjectKeyVal({
                 start: start,
                 quote: start.quote,
-                key: name instanceof AST_Node ? name : "" + name,
+                key: name,
                 value: value,
                 end: prev()
             });
@@ -2516,7 +2515,7 @@ function parse($TEXT, options) {
     });
 
     function class_(KindOfClass, is_export_default) {
-        var start, method, class_name, extends_, a = [];
+        var start, method, class_name, extends_, properties = [];
 
         S.input.push_directives_stack(); // Push directive stack, but not scope stack
         S.input.add_directive("use strict");
@@ -2545,9 +2544,9 @@ function parse($TEXT, options) {
         while (is("punc", ";")) { next(); }  // Leading semicolons are okay in class bodies.
         while (!is("punc", "}")) {
             start = S.token;
-            method = concise_method_or_getset(as_property_name(), start, true);
+            method = object_or_class_property(as_property_name(), start, true);
             if (!method) { unexpected(); }
-            a.push(method);
+            properties.push(method);
             while (is("punc", ";")) { next(); }
         }
         // mark in class feild,
@@ -2561,19 +2560,15 @@ function parse($TEXT, options) {
             start: start,
             name: class_name,
             extends: extends_,
-            properties: a,
+            properties: properties,
             end: prev(),
         });
     }
 
-    function concise_method_or_getset(name, start, is_class) {
-        const get_symbol_ast = (name, SymbolClass = AST_SymbolMethod) => {
-            if (typeof name === "string" || typeof name === "number") {
-                return new SymbolClass({
-                    start,
-                    name: "" + name,
-                    end: prev()
-                });
+    function object_or_class_property(name, start, is_class) {
+        const get_symbol_ast = (name, SymbolClass) => {
+            if (typeof name === "string") {
+                return new SymbolClass({ start, name, end: prev() });
             } else if (name === null) {
                 unexpected();
             }
@@ -2621,7 +2616,7 @@ function parse($TEXT, options) {
                     ? AST_ObjectGetter
                     : AST_ObjectSetter;
 
-                name = get_symbol_ast(name);
+                name = get_symbol_ast(name, AST_SymbolMethod);
                 return annotate(new AccessorClass({
                     start,
                     static: is_static,
@@ -2638,7 +2633,7 @@ function parse($TEXT, options) {
                 return annotate(new AccessorClass({
                     start,
                     static: is_static,
-                    key: get_symbol_ast(name),
+                    key: get_symbol_ast(name, AST_SymbolMethod),
                     value: create_accessor(),
                     end: prev(),
                 }));
@@ -2646,7 +2641,7 @@ function parse($TEXT, options) {
         }
 
         if (is("punc", "(")) {
-            name = get_symbol_ast(name);
+            name = get_symbol_ast(name, AST_SymbolMethod);
             const AST_MethodVariant = is_private
                 ? AST_PrivateMethod
                 : AST_ConciseMethod;
@@ -2665,13 +2660,17 @@ function parse($TEXT, options) {
         }
 
         if (is_class) {
-            const key = get_symbol_ast(name, AST_SymbolClassProperty);
-            const quote = key instanceof AST_SymbolClassProperty
-                ? property_token.quote
-                : undefined;
+            const AST_SymbolVariant = is_private
+                ? AST_SymbolPrivateProperty
+                : AST_SymbolClassProperty;
             const AST_ClassPropertyVariant = is_private
                 ? AST_ClassPrivateProperty
                 : AST_ClassProperty;
+
+            const key = get_symbol_ast(name, AST_SymbolVariant);
+            const quote = key instanceof AST_SymbolClassProperty
+                ? property_token.quote
+                : undefined;
             if (is("operator", "=")) {
                 next();
                 return annotate(
@@ -2691,6 +2690,9 @@ function parse($TEXT, options) {
                 || is("operator", "*")
                 || is("punc", ";")
                 || is("punc", "}")
+                || is("string")
+                || is("num")
+                || is("big_int")
             ) {
                 return annotate(
                     new AST_ClassPropertyVariant({
@@ -2815,10 +2817,12 @@ function parse($TEXT, options) {
             } else {
                 foreign_name = make_symbol(foreign_type, S.token.quote);
             }
-        } else if (is_import) {
-            name = new type(foreign_name);
         } else {
-            foreign_name = new foreign_type(name);
+            if (is_import) {
+                name = new type(foreign_name);
+            } else {
+                foreign_name = new foreign_type(name);
+            }
         }
 
         return new AST_NameMapping({
@@ -2989,12 +2993,14 @@ function parse($TEXT, options) {
           case "name":
           case "privatename":
           case "string":
-          case "num":
-          case "big_int":
           case "keyword":
           case "atom":
             next();
             return tmp.value;
+          case "num":
+          case "big_int":
+            next();
+            return "" + tmp.value;
           default:
             unexpected(tmp);
         }

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