terser 5.39.1 → 5.40.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 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.
+ - Update internally used acorn version requirement
+
 ## v5.39.1
 
  - Fix bitwise operations that could mix `BigInt` and `number`

package/dist/bundle.min.js

@@ -843,7 +843,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             } else if (ch == "$" && peek() == "{") {
                 next(true, true);
                 S.brace_counter++;
-                tok = token(begin ? "template_head" : "template_substitution", content);
+                tok = token(begin ? "template_head" : "template_cont", content);
                 TEMPLATE_RAWS.set(tok, raw);
                 tok.template_end = false;
                 return tok;
@@ -860,7 +860,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             content += ch;
         }
         S.template_braces.pop();
-        tok = token(begin ? "template_head" : "template_substitution", content);
+        tok = token(begin ? "template_head" : "template_cont", content);
         TEMPLATE_RAWS.set(tok, raw);
         tok.template_end = true;
         return tok;
@@ -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
@@ -2111,11 +2106,6 @@ function parse($TEXT, options) {
     }
 
     function _yield_expression() {
-        // Previous token must be keyword yield and not be interpret as an identifier
-        if (!is_in_generator()) {
-            croak("Unexpected yield expression outside generator function",
-                S.prev.line, S.prev.col, S.prev.pos);
-        }
         var start = S.token;
         var star = false;
         var has_expression = true;
@@ -2130,10 +2120,12 @@ function parse($TEXT, options) {
         // Note 1: It isn't allowed for yield* to close without an expression
         // Note 2: If there is a nlb between yield and star, it is interpret as
         //         yield <explicit undefined> <inserted automatic semicolon> *
-        if (can_insert_semicolon() ||
-            (is("punc") && PUNC_AFTER_EXPRESSION.has(S.token.value))) {
+        if (
+            can_insert_semicolon()
+            || is("punc") && PUNC_AFTER_EXPRESSION.has(S.token.value)
+            || is("template_cont")
+        ) {
             has_expression = false;
-
         } else if (is("operator", "*")) {
             star = true;
             next();
@@ -7361,6 +7353,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) {
@@ -7393,7 +7388,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);
             }
         },
@@ -7637,14 +7631,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) {
@@ -7736,8 +7742,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)
@@ -8189,30 +8196,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",
@@ -8339,6 +8322,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",
@@ -8415,8 +8406,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
@@ -8563,6 +8553,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",
@@ -8589,7 +8588,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 = {
@@ -8598,10 +8597,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";
@@ -32837,7 +32842,7 @@ async function run_cli({ program, packageJson, fs, path }) {
                 if (program.parse.acorn) {
                     files = convert_ast(function(toplevel, name) {
                         return require("acorn").parse(files[name], {
-                            ecmaVersion: 2018,
+                            ecmaVersion: 2024,
                             locations: true,
                             program: toplevel,
                             sourceFile: name,

package/lib/cli.js

@@ -202,7 +202,7 @@ export async function run_cli({ program, packageJson, fs, path }) {
                 if (program.parse.acorn) {
                     files = convert_ast(function(toplevel, name) {
                         return require("acorn").parse(files[name], {
-                            ecmaVersion: 2018,
+                            ecmaVersion: 2024,
                             locations: true,
                             program: toplevel,
                             sourceFile: name,

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/parse.js

@@ -698,7 +698,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             } else if (ch == "$" && peek() == "{") {
                 next(true, true);
                 S.brace_counter++;
-                tok = token(begin ? "template_head" : "template_substitution", content);
+                tok = token(begin ? "template_head" : "template_cont", content);
                 TEMPLATE_RAWS.set(tok, raw);
                 tok.template_end = false;
                 return tok;
@@ -715,7 +715,7 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
             content += ch;
         }
         S.template_braces.pop();
-        tok = token(begin ? "template_head" : "template_substitution", content);
+        tok = token(begin ? "template_head" : "template_cont", content);
         TEMPLATE_RAWS.set(tok, raw);
         tok.template_end = true;
         return tok;
@@ -1540,14 +1540,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
@@ -1966,11 +1961,6 @@ function parse($TEXT, options) {
     }
 
     function _yield_expression() {
-        // Previous token must be keyword yield and not be interpret as an identifier
-        if (!is_in_generator()) {
-            croak("Unexpected yield expression outside generator function",
-                S.prev.line, S.prev.col, S.prev.pos);
-        }
         var start = S.token;
         var star = false;
         var has_expression = true;
@@ -1985,10 +1975,12 @@ function parse($TEXT, options) {
         // Note 1: It isn't allowed for yield* to close without an expression
         // Note 2: If there is a nlb between yield and star, it is interpret as
         //         yield <explicit undefined> <inserted automatic semicolon> *
-        if (can_insert_semicolon() ||
-            (is("punc") && PUNC_AFTER_EXPRESSION.has(S.token.value))) {
+        if (
+            can_insert_semicolon()
+            || is("punc") && PUNC_AFTER_EXPRESSION.has(S.token.value)
+            || is("template_cont")
+        ) {
             has_expression = false;
-
         } else if (is("operator", "*")) {
             star = true;
             next();

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.1",
+  "version": "5.40.0",
   "engines": {
     "node": ">=10"
   },
@@ -45,7 +45,7 @@
   ],
   "dependencies": {
     "@jridgewell/source-map": "^0.3.3",
-    "acorn": "^8.8.2",
+    "acorn": "^8.14.0",
     "commander": "^2.20.0",
     "source-map-support": "~0.5.20"
   },