terser 5.35.0 → 5.36.0

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v5.36.0
+
+ - Support import attributes `with` syntax
+
 ## v5.35.0
 
  - Ensure parent directory exists when using --output on CLI (#1530)

package/dist/bundle.min.js

@@ -2871,8 +2871,11 @@ function parse($TEXT, options) {
         return new AST_ClassStaticBlock({ start, body, end: prev() });
     }
 
-    function maybe_import_assertion() {
-        if (is("name", "assert") && !has_newline_before(S.token)) {
+    function maybe_import_attributes() {
+        if (
+            (is("keyword", "with") || is("name", "assert"))
+            && !has_newline_before(S.token)
+        ) {
             next();
             return object_or_destructuring_();
         }
@@ -2903,7 +2906,7 @@ function parse($TEXT, options) {
         }
         next();
 
-        const assert_clause = maybe_import_assertion();
+        const attributes = maybe_import_attributes();
 
         return new AST_Import({
             start,
@@ -2915,7 +2918,7 @@ function parse($TEXT, options) {
                 quote: mod_str.quote,
                 end: mod_str,
             }),
-            assert_clause,
+            attributes,
             end: S.token,
         });
     }
@@ -3048,7 +3051,7 @@ function parse($TEXT, options) {
                 }
                 next();
 
-                const assert_clause = maybe_import_assertion();
+                const attributes = maybe_import_attributes();
 
                 return new AST_Export({
                     start: start,
@@ -3061,7 +3064,7 @@ function parse($TEXT, options) {
                         end: mod_str,
                     }),
                     end: prev(),
-                    assert_clause
+                    attributes
                 });
             } else {
                 return new AST_Export({
@@ -3107,7 +3110,7 @@ function parse($TEXT, options) {
             exported_value: exported_value,
             exported_definition: exported_definition,
             end: prev(),
-            assert_clause: null
+            attributes: null
         });
     }
 
@@ -5097,13 +5100,13 @@ var AST_NameMapping = DEFNODE("NameMapping", "foreign_name name", function AST_N
 
 var AST_Import = DEFNODE(
     "Import",
-    "imported_name imported_names module_name assert_clause",
+    "imported_name imported_names module_name attributes",
     function AST_Import(props) {
         if (props) {
             this.imported_name = props.imported_name;
             this.imported_names = props.imported_names;
             this.module_name = props.module_name;
-            this.assert_clause = props.assert_clause;
+            this.attributes = props.attributes;
             this.start = props.start;
             this.end = props.end;
         }
@@ -5116,7 +5119,7 @@ var AST_Import = DEFNODE(
             imported_name: "[AST_SymbolImport] The name of the variable holding the module's default export.",
             imported_names: "[AST_NameMapping*] The names of non-default imported variables",
             module_name: "[AST_String] String literal describing where this module came from",
-            assert_clause: "[AST_Object?] The import assertion"
+            attributes: "[AST_Object?] The import attributes (with {...})"
         },
         _walk: function(visitor) {
             return visitor._visit(this, function() {
@@ -5155,7 +5158,7 @@ var AST_ImportMeta = DEFNODE("ImportMeta", null, function AST_ImportMeta(props)
 
 var AST_Export = DEFNODE(
     "Export",
-    "exported_definition exported_value is_default exported_names module_name assert_clause",
+    "exported_definition exported_value is_default exported_names module_name attributes",
     function AST_Export(props) {
         if (props) {
             this.exported_definition = props.exported_definition;
@@ -5163,7 +5166,7 @@ var AST_Export = DEFNODE(
             this.is_default = props.is_default;
             this.exported_names = props.exported_names;
             this.module_name = props.module_name;
-            this.assert_clause = props.assert_clause;
+            this.attributes = props.attributes;
             this.start = props.start;
             this.end = props.end;
         }
@@ -5178,7 +5181,7 @@ var AST_Export = DEFNODE(
             exported_names: "[AST_NameMapping*?] List of exported names",
             module_name: "[AST_String?] Name of the file to load exports from",
             is_default: "[Boolean] Whether this is the default exported value of this module",
-            assert_clause: "[AST_Object?] The import assertion"
+            attributes: "[AST_Object?] The import attributes"
         },
         _walk: function (visitor) {
             return visitor._visit(this, function () {
@@ -7157,23 +7160,23 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
         return body;
     };
 
-    const assert_clause_from_moz = (assertions) => {
-        if (assertions && assertions.length > 0) {
+    function import_attributes_from_moz(attributes) {
+        if (attributes && attributes.length > 0) {
             return new AST_Object({
-                start: my_start_token(assertions),
-                end: my_end_token(assertions),
-                properties: assertions.map((assertion_kv) =>
+                start: my_start_token(attributes),
+                end: my_end_token(attributes),
+                properties: attributes.map((attr) =>
                     new AST_ObjectKeyVal({
-                        start: my_start_token(assertion_kv),
-                        end: my_end_token(assertion_kv),
-                        key: assertion_kv.key.name || assertion_kv.key.value,
-                        value: from_moz(assertion_kv.value)
+                        start: my_start_token(attr),
+                        end: my_end_token(attr),
+                        key: attr.key.name || attr.key.value,
+                        value: from_moz(attr.value)
                     })
                 )
             });
         }
         return null;
-    };
+    }
 
     var MOZ_TO_ME = {
         Program: function(M) {
@@ -7545,7 +7548,7 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
                 imported_name: imported_name,
                 imported_names : imported_names,
                 module_name : from_moz(M.source),
-                assert_clause: assert_clause_from_moz(M.assertions)
+                attributes: import_attributes_from_moz(M.attributes || M.assertions)
             });
         },
 
@@ -7572,6 +7575,10 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
         },
 
         ImportExpression: function(M) {
+            const args = [from_moz(M.source)];
+            if (M.options) {
+                args.push(from_moz(M.options));
+            }
             return new AST_Call({
                 start: my_start_token(M),
                 end: my_end_token(M),
@@ -7580,7 +7587,7 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
                     name: "import"
                 }),
                 optional: false,
-                args: [from_moz(M.source)]
+                args
             });
         },
 
@@ -7598,7 +7605,7 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
                     })
                 ],
                 module_name: from_moz(M.source),
-                assert_clause: assert_clause_from_moz(M.assertions)
+                attributes: import_attributes_from_moz(M.attributes || M.assertions)
             });
         },
 
@@ -7609,7 +7616,7 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
                 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),
-                assert_clause: assert_clause_from_moz(M.assertions)
+                attributes: import_attributes_from_moz(M.attributes || M.assertions)
             });
         },
 
@@ -8196,10 +8203,11 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
     });
     def_to_moz(AST_Call, function To_Moz_CallExpression(M) {
         if (M.expression instanceof AST_SymbolRef && M.expression.name === "import") {
-            const [source] = M.args.map(to_moz);
+            const [source, options] = M.args.map(to_moz);
             return {
                 type: "ImportExpression",
                 source,
+                options
             };
         }
 
@@ -8360,22 +8368,22 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
         };
     });
 
-    const assert_clause_to_moz = assert_clause => {
-        const assertions = [];
-        if (assert_clause) {
-            for (const { key, value } of assert_clause.properties) {
+    function import_attributes_to_moz(attribute) {
+        const import_attributes = [];
+        if (attribute) {
+            for (const { key, value } of attribute.properties) {
                 const key_moz = is_basic_identifier_string(key)
                     ? { type: "Identifier", name: key }
                     : { type: "Literal", value: key, raw: JSON.stringify(key) };
-                assertions.push({
+                import_attributes.push({
                     type: "ImportAttribute",
                     key: key_moz,
                     value: to_moz(value)
                 });
             }
         }
-        return assertions;
-    };
+        return import_attributes;
+    }
 
     def_to_moz(AST_Export, function To_Moz_ExportDeclaration(M) {
         if (M.exported_names) {
@@ -8390,7 +8398,7 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
                     type: "ExportAllDeclaration",
                     source: to_moz(M.module_name),
                     exported: exported,
-                    assertions: assert_clause_to_moz(M.assert_clause)
+                    attributes: import_attributes_to_moz(M.attributes)
                 };
             }
             return {
@@ -8404,7 +8412,7 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
                 }),
                 declaration: to_moz(M.exported_definition),
                 source: to_moz(M.module_name),
-                assertions: assert_clause_to_moz(M.assert_clause)
+                attributes: import_attributes_to_moz(M.attributes)
             };
         }
         return {
@@ -8442,7 +8450,7 @@ def_transform(AST_PrefixedTemplateString, function(self, tw) {
             type: "ImportDeclaration",
             specifiers: specifiers,
             source: to_moz(M.module_name),
-            assertions: assert_clause_to_moz(M.assert_clause)
+            attributes: import_attributes_to_moz(M.attributes)
         };
     });
 
@@ -10590,9 +10598,9 @@ function OutputStream(options) {
             output.space();
         }
         self.module_name.print(output);
-        if (self.assert_clause) {
-            output.print("assert");
-            self.assert_clause.print(output);
+        if (self.attributes) {
+            output.print("with");
+            self.attributes.print(output);
         }
         output.semicolon();
     });
@@ -10686,9 +10694,9 @@ function OutputStream(options) {
             output.space();
             self.module_name.print(output);
         }
-        if (self.assert_clause) {
-            output.print("assert");
-            self.assert_clause.print(output);
+        if (self.attributes) {
+            output.print("with");
+            self.attributes.print(output);
         }
         if (self.exported_value
                 && !(self.exported_value instanceof AST_Defun ||

package/lib/ast.js

@@ -1481,13 +1481,13 @@ var AST_NameMapping = DEFNODE("NameMapping", "foreign_name name", function AST_N
 
 var AST_Import = DEFNODE(
     "Import",
-    "imported_name imported_names module_name assert_clause",
+    "imported_name imported_names module_name attributes",
     function AST_Import(props) {
         if (props) {
             this.imported_name = props.imported_name;
             this.imported_names = props.imported_names;
             this.module_name = props.module_name;
-            this.assert_clause = props.assert_clause;
+            this.attributes = props.attributes;
             this.start = props.start;
             this.end = props.end;
         }
@@ -1500,7 +1500,7 @@ var AST_Import = DEFNODE(
             imported_name: "[AST_SymbolImport] The name of the variable holding the module's default export.",
             imported_names: "[AST_NameMapping*] The names of non-default imported variables",
             module_name: "[AST_String] String literal describing where this module came from",
-            assert_clause: "[AST_Object?] The import assertion"
+            attributes: "[AST_Object?] The import attributes (with {...})"
         },
         _walk: function(visitor) {
             return visitor._visit(this, function() {
@@ -1539,7 +1539,7 @@ var AST_ImportMeta = DEFNODE("ImportMeta", null, function AST_ImportMeta(props)
 
 var AST_Export = DEFNODE(
     "Export",
-    "exported_definition exported_value is_default exported_names module_name assert_clause",
+    "exported_definition exported_value is_default exported_names module_name attributes",
     function AST_Export(props) {
         if (props) {
             this.exported_definition = props.exported_definition;
@@ -1547,7 +1547,7 @@ var AST_Export = DEFNODE(
             this.is_default = props.is_default;
             this.exported_names = props.exported_names;
             this.module_name = props.module_name;
-            this.assert_clause = props.assert_clause;
+            this.attributes = props.attributes;
             this.start = props.start;
             this.end = props.end;
         }
@@ -1562,7 +1562,7 @@ var AST_Export = DEFNODE(
             exported_names: "[AST_NameMapping*?] List of exported names",
             module_name: "[AST_String?] Name of the file to load exports from",
             is_default: "[Boolean] Whether this is the default exported value of this module",
-            assert_clause: "[AST_Object?] The import assertion"
+            attributes: "[AST_Object?] The import attributes"
         },
         _walk: function (visitor) {
             return visitor._visit(this, function () {

package/lib/mozilla-ast.js

@@ -181,23 +181,23 @@ import { is_basic_identifier_string } from "./parse.js";
         return body;
     };
 
-    const assert_clause_from_moz = (assertions) => {
-        if (assertions && assertions.length > 0) {
+    function import_attributes_from_moz(attributes) {
+        if (attributes && attributes.length > 0) {
             return new AST_Object({
-                start: my_start_token(assertions),
-                end: my_end_token(assertions),
-                properties: assertions.map((assertion_kv) =>
+                start: my_start_token(attributes),
+                end: my_end_token(attributes),
+                properties: attributes.map((attr) =>
                     new AST_ObjectKeyVal({
-                        start: my_start_token(assertion_kv),
-                        end: my_end_token(assertion_kv),
-                        key: assertion_kv.key.name || assertion_kv.key.value,
-                        value: from_moz(assertion_kv.value)
+                        start: my_start_token(attr),
+                        end: my_end_token(attr),
+                        key: attr.key.name || attr.key.value,
+                        value: from_moz(attr.value)
                     })
                 )
             });
         }
         return null;
-    };
+    }
 
     var MOZ_TO_ME = {
         Program: function(M) {
@@ -569,7 +569,7 @@ import { is_basic_identifier_string } from "./parse.js";
                 imported_name: imported_name,
                 imported_names : imported_names,
                 module_name : from_moz(M.source),
-                assert_clause: assert_clause_from_moz(M.assertions)
+                attributes: import_attributes_from_moz(M.attributes || M.assertions)
             });
         },
 
@@ -596,6 +596,10 @@ import { is_basic_identifier_string } from "./parse.js";
         },
 
         ImportExpression: function(M) {
+            const args = [from_moz(M.source)];
+            if (M.options) {
+                args.push(from_moz(M.options));
+            }
             return new AST_Call({
                 start: my_start_token(M),
                 end: my_end_token(M),
@@ -604,7 +608,7 @@ import { is_basic_identifier_string } from "./parse.js";
                     name: "import"
                 }),
                 optional: false,
-                args: [from_moz(M.source)]
+                args
             });
         },
 
@@ -622,7 +626,7 @@ import { is_basic_identifier_string } from "./parse.js";
                     })
                 ],
                 module_name: from_moz(M.source),
-                assert_clause: assert_clause_from_moz(M.assertions)
+                attributes: import_attributes_from_moz(M.attributes || M.assertions)
             });
         },
 
@@ -633,7 +637,7 @@ import { is_basic_identifier_string } from "./parse.js";
                 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),
-                assert_clause: assert_clause_from_moz(M.assertions)
+                attributes: import_attributes_from_moz(M.attributes || M.assertions)
             });
         },
 
@@ -1220,10 +1224,11 @@ import { is_basic_identifier_string } from "./parse.js";
     });
     def_to_moz(AST_Call, function To_Moz_CallExpression(M) {
         if (M.expression instanceof AST_SymbolRef && M.expression.name === "import") {
-            const [source] = M.args.map(to_moz);
+            const [source, options] = M.args.map(to_moz);
             return {
                 type: "ImportExpression",
                 source,
+                options
             };
         }
 
@@ -1384,22 +1389,22 @@ import { is_basic_identifier_string } from "./parse.js";
         };
     });
 
-    const assert_clause_to_moz = assert_clause => {
-        const assertions = [];
-        if (assert_clause) {
-            for (const { key, value } of assert_clause.properties) {
+    function import_attributes_to_moz(attribute) {
+        const import_attributes = [];
+        if (attribute) {
+            for (const { key, value } of attribute.properties) {
                 const key_moz = is_basic_identifier_string(key)
                     ? { type: "Identifier", name: key }
                     : { type: "Literal", value: key, raw: JSON.stringify(key) };
-                assertions.push({
+                import_attributes.push({
                     type: "ImportAttribute",
                     key: key_moz,
                     value: to_moz(value)
                 });
             }
         }
-        return assertions;
-    };
+        return import_attributes;
+    }
 
     def_to_moz(AST_Export, function To_Moz_ExportDeclaration(M) {
         if (M.exported_names) {
@@ -1414,7 +1419,7 @@ import { is_basic_identifier_string } from "./parse.js";
                     type: "ExportAllDeclaration",
                     source: to_moz(M.module_name),
                     exported: exported,
-                    assertions: assert_clause_to_moz(M.assert_clause)
+                    attributes: import_attributes_to_moz(M.attributes)
                 };
             }
             return {
@@ -1428,7 +1433,7 @@ import { is_basic_identifier_string } from "./parse.js";
                 }),
                 declaration: to_moz(M.exported_definition),
                 source: to_moz(M.module_name),
-                assertions: assert_clause_to_moz(M.assert_clause)
+                attributes: import_attributes_to_moz(M.attributes)
             };
         }
         return {
@@ -1466,7 +1471,7 @@ import { is_basic_identifier_string } from "./parse.js";
             type: "ImportDeclaration",
             specifiers: specifiers,
             source: to_moz(M.module_name),
-            assertions: assert_clause_to_moz(M.assert_clause)
+            attributes: import_attributes_to_moz(M.attributes)
         };
     });
 

package/lib/output.js

@@ -1792,9 +1792,9 @@ function OutputStream(options) {
             output.space();
         }
         self.module_name.print(output);
-        if (self.assert_clause) {
-            output.print("assert");
-            self.assert_clause.print(output);
+        if (self.attributes) {
+            output.print("with");
+            self.attributes.print(output);
         }
         output.semicolon();
     });
@@ -1888,9 +1888,9 @@ function OutputStream(options) {
             output.space();
             self.module_name.print(output);
         }
-        if (self.assert_clause) {
-            output.print("assert");
-            self.assert_clause.print(output);
+        if (self.attributes) {
+            output.print("with");
+            self.attributes.print(output);
         }
         if (self.exported_value
                 && !(self.exported_value instanceof AST_Defun ||

package/lib/parse.js

@@ -2726,8 +2726,11 @@ function parse($TEXT, options) {
         return new AST_ClassStaticBlock({ start, body, end: prev() });
     }
 
-    function maybe_import_assertion() {
-        if (is("name", "assert") && !has_newline_before(S.token)) {
+    function maybe_import_attributes() {
+        if (
+            (is("keyword", "with") || is("name", "assert"))
+            && !has_newline_before(S.token)
+        ) {
             next();
             return object_or_destructuring_();
         }
@@ -2758,7 +2761,7 @@ function parse($TEXT, options) {
         }
         next();
 
-        const assert_clause = maybe_import_assertion();
+        const attributes = maybe_import_attributes();
 
         return new AST_Import({
             start,
@@ -2770,7 +2773,7 @@ function parse($TEXT, options) {
                 quote: mod_str.quote,
                 end: mod_str,
             }),
-            assert_clause,
+            attributes,
             end: S.token,
         });
     }
@@ -2903,7 +2906,7 @@ function parse($TEXT, options) {
                 }
                 next();
 
-                const assert_clause = maybe_import_assertion();
+                const attributes = maybe_import_attributes();
 
                 return new AST_Export({
                     start: start,
@@ -2916,7 +2919,7 @@ function parse($TEXT, options) {
                         end: mod_str,
                     }),
                     end: prev(),
-                    assert_clause
+                    attributes
                 });
             } else {
                 return new AST_Export({
@@ -2962,7 +2965,7 @@ function parse($TEXT, options) {
             exported_value: exported_value,
             exported_definition: exported_definition,
             end: prev(),
-            assert_clause: null
+            attributes: null
         });
     }
 

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