terser 5.13.1 → 5.14.0

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v5.14.0
+ - Switched to @jridgewell/source-map for sourcemap generation (#1190, #1181)
+ - Fixed source maps with non-terminated segments (#1106)
+ - Enabled typescript types to be imported from the package (#1194)
+ - Extra DOM props have been added (#1191)
+ - Delete the AST while generating code, as a means to save RAM
+
 ## v5.13.1
  - Removed self-assignments (`varname=varname`) (closes #1081)
  - Separated inlining code (for inlining things into references, or removing IIFEs)

package/dist/bundle.min.js

@@ -1,12 +1,8 @@
 (function (global, factory) {
-typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('source-map')) :
-typeof define === 'function' && define.amd ? define(['exports', 'source-map'], factory) :
+typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@jridgewell/source-map')) :
+typeof define === 'function' && define.amd ? define(['exports', '@jridgewell/source-map'], factory) :
 (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.Terser = {}, global.sourceMap));
-}(this, (function (exports, MOZ_SourceMap) { 'use strict';
-
-function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
-
-var MOZ_SourceMap__default = /*#__PURE__*/_interopDefaultLegacy(MOZ_SourceMap);
+}(this, (function (exports, sourceMap) { 'use strict';
 
 /***********************************************************************
 
@@ -4059,11 +4055,10 @@ var AST_With = DEFNODE("With", "expression", function AST_With(props) {
 
 var AST_Scope = DEFNODE(
     "Scope",
-    "variables functions uses_with uses_eval parent_scope enclosed cname",
+    "variables uses_with uses_eval parent_scope enclosed cname",
     function AST_Scope(props) {
         if (props) {
             this.variables = props.variables;
-            this.functions = props.functions;
             this.uses_with = props.uses_with;
             this.uses_eval = props.uses_eval;
             this.parent_scope = props.parent_scope;
@@ -4119,7 +4114,6 @@ var AST_Toplevel = DEFNODE("Toplevel", "globals", function AST_Toplevel(props) {
     if (props) {
         this.globals = props.globals;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -4201,7 +4195,6 @@ var AST_Lambda = DEFNODE(
             this.is_generator = props.is_generator;
             this.async = props.async;
             this.variables = props.variables;
-            this.functions = props.functions;
             this.uses_with = props.uses_with;
             this.uses_eval = props.uses_eval;
             this.parent_scope = props.parent_scope;
@@ -4281,7 +4274,6 @@ var AST_Accessor = DEFNODE("Accessor", null, function AST_Accessor(props) {
         this.is_generator = props.is_generator;
         this.async = props.async;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -4306,7 +4298,6 @@ var AST_Function = DEFNODE("Function", null, function AST_Function(props) {
         this.is_generator = props.is_generator;
         this.async = props.async;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -4331,7 +4322,6 @@ var AST_Arrow = DEFNODE("Arrow", null, function AST_Arrow(props) {
         this.is_generator = props.is_generator;
         this.async = props.async;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -4356,7 +4346,6 @@ var AST_Defun = DEFNODE("Defun", null, function AST_Defun(props) {
         this.is_generator = props.is_generator;
         this.async = props.async;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -5668,7 +5657,6 @@ var AST_Class = DEFNODE("Class", "name extends properties", function AST_Class(p
         this.extends = props.extends;
         this.properties = props.properties;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -5762,7 +5750,6 @@ var AST_DefClass = DEFNODE("DefClass", null, function AST_DefClass(props) {
         this.extends = props.extends;
         this.properties = props.properties;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -5785,7 +5772,6 @@ var AST_ClassExpression = DEFNODE("ClassExpression", null, function AST_ClassExp
         this.extends = props.extends;
         this.properties = props.properties;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -8644,6 +8630,8 @@ function OutputStream(options) {
         width                : 80,
         wrap_iife            : false,
         wrap_func_args       : true,
+
+        _destroy_ast         : false
     }, true);
 
     if (options.shorthand === undefined)
@@ -9193,6 +9181,18 @@ function OutputStream(options) {
         if (OUTPUT.length() > insert) newline_insert = insert;
     }
 
+    /**
+     * When output.option("_destroy_ast") is enabled, destroy the function.
+     * Call this after printing it.
+     */
+    const gc_scope =
+      options["_destroy_ast"]
+        ? function gc_scope(scope) {
+            scope.body.length = 0;
+            scope.argnames.length = 0;
+        }
+        : noop;
+
     var stack = [];
     return {
         get             : get,
@@ -9239,6 +9239,7 @@ function OutputStream(options) {
         with_square     : with_square,
         add_mapping     : add_mapping,
         option          : function(opt) { return options[opt]; },
+        gc_scope,
         printed_comments: printed_comments,
         prepend_comments: readonly ? noop : prepend_comments,
         append_comments : readonly || comment_filter === return_false ? noop : append_comments,
@@ -9755,6 +9756,7 @@ function OutputStream(options) {
     });
     DEFPRINT(AST_Lambda, function(self, output) {
         self._do_print(output);
+        output.gc_scope(self);
     });
 
     DEFPRINT(AST_PrefixedTemplateString, function(self, output) {
@@ -9834,6 +9836,7 @@ function OutputStream(options) {
             print_braced(self, output);
         }
         if (needs_parens) { output.print(")"); }
+        output.gc_scope(self);
     });
 
     /* -----[ exits ]----- */
@@ -21021,40 +21024,56 @@ def_optimize(AST_Destructuring, function(self, compressor) {
 
  ***********************************************************************/
 
-// a small wrapper around fitzgen's source-map library
+// a small wrapper around source-map and @jridgewell/source-map
 async function SourceMap(options) {
     options = defaults(options, {
         file : null,
         root : null,
         orig : null,
-
-        orig_line_diff : 0,
-        dest_line_diff : 0,
+        files: {},
     });
 
     var orig_map;
-    var generator = new MOZ_SourceMap__default['default'].SourceMapGenerator({
+    var generator = new sourceMap.SourceMapGenerator({
         file       : options.file,
         sourceRoot : options.root
     });
 
+    let sourcesContent = {__proto__: null};
+    let files = options.files;
+    for (var name in files) if (HOP(files, name)) {
+        sourcesContent[name] = files[name];
+    }
     if (options.orig) {
-        orig_map = await new MOZ_SourceMap__default['default'].SourceMapConsumer(options.orig);
-        orig_map.sources.forEach(function(source) {
-            var sourceContent = orig_map.sourceContentFor(source, true);
-            if (sourceContent) {
-                generator.setSourceContent(source, sourceContent);
-            }
-        });
+        // We support both @jridgewell/source-map (which has a sync
+        // SourceMapConsumer) and source-map (which has an async
+        // SourceMapConsumer).
+        orig_map = await new sourceMap.SourceMapConsumer(options.orig);
+        if (orig_map.sourcesContent) {
+            orig_map.sources.forEach(function(source, i) {
+                var content = orig_map.sourcesContent[i];
+                if (content) {
+                    sourcesContent[source] = content;
+                }
+            });
+        }
     }
 
     function add(source, gen_line, gen_col, orig_line, orig_col, name) {
+        let generatedPos = { line: gen_line, column: gen_col };
+
         if (orig_map) {
             var info = orig_map.originalPositionFor({
                 line: orig_line,
                 column: orig_col
             });
             if (info.source === null) {
+                generator.addMapping({
+                    generated: generatedPos,
+                    original: null,
+                    source: null,
+                    name: null
+                });
                 return;
             }
             source = info.source;
@@ -21063,22 +21082,42 @@ async function SourceMap(options) {
             name = info.name || name;
         }
         generator.addMapping({
-            generated : { line: gen_line + options.dest_line_diff, column: gen_col },
-            original  : { line: orig_line + options.orig_line_diff, column: orig_col },
+            generated : generatedPos,
+            original  : { line: orig_line, column: orig_col },
             source    : source,
             name      : name
         });
+        generator.setSourceContent(source, sourcesContent[source]);
+    }
+
+    function clean(map) {
+        const allNull = map.sourcesContent && map.sourcesContent.every(c => c == null);
+        if (allNull) delete map.sourcesContent;
+        if (map.file === undefined) delete map.file;
+        if (map.sourceRoot === undefined) delete map.sourceRoot;
+        return map;
+    }
+
+    function getDecoded() {
+        if (!generator.toDecodedMap) return null;
+        return clean(generator.toDecodedMap());
+    }
+
+    function getEncoded() {
+        return clean(generator.toJSON());
+    }
+
+    function destroy() {
+        // @jridgewell/source-map's SourceMapConsumer does not need to be
+        // manually freed.
+        if (orig_map && orig_map.destroy) orig_map.destroy();
     }
 
     return {
-        add        : add,
-        get        : function() { return generator; },
-        toString   : function() { return generator.toString(); },
-        destroy    : function () {
-            if (orig_map && orig_map.destroy) {
-                orig_map.destroy();
-            }
-        }
+        add,
+        getDecoded,
+        getEncoded,
+        destroy,
     };
 }
 
@@ -21404,6 +21443,7 @@ var domprops = [
     "COMMENT_NODE",
     "COMPARE_REF_TO_TEXTURE",
     "COMPILE_STATUS",
+    "COMPLETION_STATUS_KHR",
     "COMPRESSED_RGBA_S3TC_DXT1_EXT",
     "COMPRESSED_RGBA_S3TC_DXT3_EXT",
     "COMPRESSED_RGBA_S3TC_DXT5_EXT",
@@ -29379,6 +29419,8 @@ async function minify(files, options, _fs_module) {
             url: null,
         }, true);
     }
+
+    // -- Parse phase --
     if (timings) timings.parse = Date.now();
     var toplevel;
     if (files instanceof AST_Toplevel) {
@@ -29422,12 +29464,16 @@ async function minify(files, options, _fs_module) {
         toplevel = toplevel.wrap_enclose(options.enclose);
     }
     if (timings) timings.rename = Date.now();
+
+    // -- Compress phase --
     if (timings) timings.compress = Date.now();
     if (options.compress) {
         toplevel = new Compressor(options.compress, {
             mangle_options: options.mangle
         }).compress(toplevel);
     }
+
+    // -- Mangle phase --
     if (timings) timings.scope = Date.now();
     if (options.mangle) toplevel.figure_out_scope(options.mangle);
     if (timings) timings.mangle = Date.now();
@@ -29440,6 +29486,8 @@ async function minify(files, options, _fs_module) {
     if (options.mangle && options.mangle.properties) {
         toplevel = mangle_properties(toplevel, options.mangle.properties);
     }
+
+    // Format phase
     if (timings) timings.format = Date.now();
     var result = {};
     if (options.format.ast) {
@@ -29449,19 +29497,34 @@ async function minify(files, options, _fs_module) {
         result.ast = toplevel.to_mozilla_ast();
     }
     if (!HOP(options.format, "code") || options.format.code) {
+        if (!options.format.ast) {
+            // Destroy stuff to save RAM. (unless the deprecated `ast` option is on)
+            options.format._destroy_ast = true;
+
+            walk(toplevel, node => {
+                if (node instanceof AST_Scope) {
+                    node.variables = undefined;
+                    node.enclosed = undefined;
+                    node.parent_scope = undefined;
+                }
+                if (node.block_scope) {
+                    node.block_scope.variables = undefined;
+                    node.block_scope.enclosed = undefined;
+                    node.parent_scope = undefined;
+                }
+            });
+        }
+
         if (options.sourceMap) {
+            if (options.sourceMap.includeSources && files instanceof AST_Toplevel) {
+                throw new Error("original source content unavailable");
+            }
             options.format.source_map = await SourceMap({
                 file: options.sourceMap.filename,
                 orig: options.sourceMap.content,
-                root: options.sourceMap.root
+                root: options.sourceMap.root,
+                files: options.sourceMap.includeSources ? files : null,
             });
-            if (options.sourceMap.includeSources) {
-                if (files instanceof AST_Toplevel) {
-                    throw new Error("original source content unavailable");
-                } else for (var name in files) if (HOP(files, name)) {
-                    options.format.source_map.get().setSourceContent(name, files[name]);
-                }
-            }
         }
         delete options.format.ast;
         delete options.format.code;
@@ -29470,11 +29533,21 @@ async function minify(files, options, _fs_module) {
         toplevel.print(stream);
         result.code = stream.get();
         if (options.sourceMap) {
-            if(options.sourceMap.asObject) {
-                result.map = options.format.source_map.get().toJSON();
-            } else {
-                result.map = options.format.source_map.toString();
-            }
+            Object.defineProperty(result, "map", {
+                configurable: true,
+                enumerable: true,
+                get() {
+                    const map = options.format.source_map.getEncoded();
+                    return (result.map = options.sourceMap.asObject ? map : JSON.stringify(map));
+                },
+                set(value) {
+                    Object.defineProperty(result, "map", {
+                        value,
+                        writable: true,
+                    });
+                }
+            });
+            result.decoded_map = options.format.source_map.getDecoded();
             if (options.sourceMap.url == "inline") {
                 var sourceMap = typeof result.map === "object" ? JSON.stringify(result.map) : result.map;
                 result.code += "\n//# sourceMappingURL=data:application/json;charset=utf-8;base64," + to_base64(sourceMap);

package/lib/ast.js

@@ -552,11 +552,10 @@ var AST_With = DEFNODE("With", "expression", function AST_With(props) {
 
 var AST_Scope = DEFNODE(
     "Scope",
-    "variables functions uses_with uses_eval parent_scope enclosed cname",
+    "variables uses_with uses_eval parent_scope enclosed cname",
     function AST_Scope(props) {
         if (props) {
             this.variables = props.variables;
-            this.functions = props.functions;
             this.uses_with = props.uses_with;
             this.uses_eval = props.uses_eval;
             this.parent_scope = props.parent_scope;
@@ -612,7 +611,6 @@ var AST_Toplevel = DEFNODE("Toplevel", "globals", function AST_Toplevel(props) {
     if (props) {
         this.globals = props.globals;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -694,7 +692,6 @@ var AST_Lambda = DEFNODE(
             this.is_generator = props.is_generator;
             this.async = props.async;
             this.variables = props.variables;
-            this.functions = props.functions;
             this.uses_with = props.uses_with;
             this.uses_eval = props.uses_eval;
             this.parent_scope = props.parent_scope;
@@ -774,7 +771,6 @@ var AST_Accessor = DEFNODE("Accessor", null, function AST_Accessor(props) {
         this.is_generator = props.is_generator;
         this.async = props.async;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -799,7 +795,6 @@ var AST_Function = DEFNODE("Function", null, function AST_Function(props) {
         this.is_generator = props.is_generator;
         this.async = props.async;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -824,7 +819,6 @@ var AST_Arrow = DEFNODE("Arrow", null, function AST_Arrow(props) {
         this.is_generator = props.is_generator;
         this.async = props.async;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -849,7 +843,6 @@ var AST_Defun = DEFNODE("Defun", null, function AST_Defun(props) {
         this.is_generator = props.is_generator;
         this.async = props.async;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -2161,7 +2154,6 @@ var AST_Class = DEFNODE("Class", "name extends properties", function AST_Class(p
         this.extends = props.extends;
         this.properties = props.properties;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -2255,7 +2247,6 @@ var AST_DefClass = DEFNODE("DefClass", null, function AST_DefClass(props) {
         this.extends = props.extends;
         this.properties = props.properties;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;
@@ -2278,7 +2269,6 @@ var AST_ClassExpression = DEFNODE("ClassExpression", null, function AST_ClassExp
         this.extends = props.extends;
         this.properties = props.properties;
         this.variables = props.variables;
-        this.functions = props.functions;
         this.uses_with = props.uses_with;
         this.uses_eval = props.uses_eval;
         this.parent_scope = props.parent_scope;

package/lib/minify.js

@@ -7,7 +7,7 @@ import {
     map_to_object,
     HOP,
 } from "./utils/index.js";
-import { AST_Toplevel, AST_Node } from "./ast.js";
+import { AST_Toplevel, AST_Node, walk, AST_Scope } from "./ast.js";
 import { parse } from "./parse.js";
 import { OutputStream } from "./output.js";
 import { Compressor } from "./compress/index.js";
@@ -194,6 +194,8 @@ async function minify(files, options, _fs_module) {
             url: null,
         }, true);
     }
+
+    // -- Parse phase --
     if (timings) timings.parse = Date.now();
     var toplevel;
     if (files instanceof AST_Toplevel) {
@@ -243,12 +245,16 @@ async function minify(files, options, _fs_module) {
         toplevel.figure_out_scope(options.mangle);
         toplevel.expand_names(options.mangle);
     }
+
+    // -- Compress phase --
     if (timings) timings.compress = Date.now();
     if (options.compress) {
         toplevel = new Compressor(options.compress, {
             mangle_options: options.mangle
         }).compress(toplevel);
     }
+
+    // -- Mangle phase --
     if (timings) timings.scope = Date.now();
     if (options.mangle) toplevel.figure_out_scope(options.mangle);
     if (timings) timings.mangle = Date.now();
@@ -261,6 +267,8 @@ async function minify(files, options, _fs_module) {
     if (options.mangle && options.mangle.properties) {
         toplevel = mangle_properties(toplevel, options.mangle.properties);
     }
+
+    // Format phase
     if (timings) timings.format = Date.now();
     var result = {};
     if (options.format.ast) {
@@ -270,19 +278,34 @@ async function minify(files, options, _fs_module) {
         result.ast = toplevel.to_mozilla_ast();
     }
     if (!HOP(options.format, "code") || options.format.code) {
+        if (!options.format.ast) {
+            // Destroy stuff to save RAM. (unless the deprecated `ast` option is on)
+            options.format._destroy_ast = true;
+
+            walk(toplevel, node => {
+                if (node instanceof AST_Scope) {
+                    node.variables = undefined;
+                    node.enclosed = undefined;
+                    node.parent_scope = undefined;
+                }
+                if (node.block_scope) {
+                    node.block_scope.variables = undefined;
+                    node.block_scope.enclosed = undefined;
+                    node.parent_scope = undefined;
+                }
+            });
+        }
+
         if (options.sourceMap) {
+            if (options.sourceMap.includeSources && files instanceof AST_Toplevel) {
+                throw new Error("original source content unavailable");
+            }
             options.format.source_map = await SourceMap({
                 file: options.sourceMap.filename,
                 orig: options.sourceMap.content,
-                root: options.sourceMap.root
+                root: options.sourceMap.root,
+                files: options.sourceMap.includeSources ? files : null,
             });
-            if (options.sourceMap.includeSources) {
-                if (files instanceof AST_Toplevel) {
-                    throw new Error("original source content unavailable");
-                } else for (var name in files) if (HOP(files, name)) {
-                    options.format.source_map.get().setSourceContent(name, files[name]);
-                }
-            }
         }
         delete options.format.ast;
         delete options.format.code;
@@ -291,11 +314,21 @@ async function minify(files, options, _fs_module) {
         toplevel.print(stream);
         result.code = stream.get();
         if (options.sourceMap) {
-            if(options.sourceMap.asObject) {
-                result.map = options.format.source_map.get().toJSON();
-            } else {
-                result.map = options.format.source_map.toString();
-            }
+            Object.defineProperty(result, "map", {
+                configurable: true,
+                enumerable: true,
+                get() {
+                    const map = options.format.source_map.getEncoded();
+                    return (result.map = options.sourceMap.asObject ? map : JSON.stringify(map));
+                },
+                set(value) {
+                    Object.defineProperty(result, "map", {
+                        value,
+                        writable: true,
+                    });
+                }
+            });
+            result.decoded_map = options.format.source_map.getDecoded();
             if (options.sourceMap.url == "inline") {
                 var sourceMap = typeof result.map === "object" ? JSON.stringify(result.map) : result.map;
                 result.code += "\n//# sourceMappingURL=data:application/json;charset=utf-8;base64," + to_base64(sourceMap);

package/lib/output.js

@@ -247,6 +247,8 @@ function OutputStream(options) {
         width                : 80,
         wrap_iife            : false,
         wrap_func_args       : true,
+
+        _destroy_ast         : false
     }, true);
 
     if (options.shorthand === undefined)
@@ -796,6 +798,18 @@ function OutputStream(options) {
         if (OUTPUT.length() > insert) newline_insert = insert;
     }
 
+    /**
+     * When output.option("_destroy_ast") is enabled, destroy the function.
+     * Call this after printing it.
+     */
+    const gc_scope =
+      options["_destroy_ast"]
+        ? function gc_scope(scope) {
+            scope.body.length = 0;
+            scope.argnames.length = 0;
+        }
+        : noop;
+
     var stack = [];
     return {
         get             : get,
@@ -842,6 +856,7 @@ function OutputStream(options) {
         with_square     : with_square,
         add_mapping     : add_mapping,
         option          : function(opt) { return options[opt]; },
+        gc_scope,
         printed_comments: printed_comments,
         prepend_comments: readonly ? noop : prepend_comments,
         append_comments : readonly || comment_filter === return_false ? noop : append_comments,
@@ -1358,6 +1373,7 @@ function OutputStream(options) {
     });
     DEFPRINT(AST_Lambda, function(self, output) {
         self._do_print(output);
+        output.gc_scope(self);
     });
 
     DEFPRINT(AST_PrefixedTemplateString, function(self, output) {
@@ -1437,6 +1453,7 @@ function OutputStream(options) {
             print_braced(self, output);
         }
         if (needs_parens) { output.print(")"); }
+        output.gc_scope(self);
     });
 
     /* -----[ exits ]----- */

package/lib/sourcemap.js

@@ -43,45 +43,59 @@
 
 "use strict";
 
-import MOZ_SourceMap from "source-map";
-import {
-    defaults,
-} from "./utils/index.js";
+import {SourceMapConsumer, SourceMapGenerator} from "@jridgewell/source-map";
+import {defaults, HOP} from "./utils/index.js";
 
-// a small wrapper around fitzgen's source-map library
+// a small wrapper around source-map and @jridgewell/source-map
 async function SourceMap(options) {
     options = defaults(options, {
         file : null,
         root : null,
         orig : null,
-
-        orig_line_diff : 0,
-        dest_line_diff : 0,
+        files: {},
     });
 
     var orig_map;
-    var generator = new MOZ_SourceMap.SourceMapGenerator({
+    var generator = new SourceMapGenerator({
         file       : options.file,
         sourceRoot : options.root
     });
 
+    let sourcesContent = {__proto__: null};
+    let files = options.files;
+    for (var name in files) if (HOP(files, name)) {
+        sourcesContent[name] = files[name];
+    }
     if (options.orig) {
-        orig_map = await new MOZ_SourceMap.SourceMapConsumer(options.orig);
-        orig_map.sources.forEach(function(source) {
-            var sourceContent = orig_map.sourceContentFor(source, true);
-            if (sourceContent) {
-                generator.setSourceContent(source, sourceContent);
-            }
-        });
+        // We support both @jridgewell/source-map (which has a sync
+        // SourceMapConsumer) and source-map (which has an async
+        // SourceMapConsumer).
+        orig_map = await new SourceMapConsumer(options.orig);
+        if (orig_map.sourcesContent) {
+            orig_map.sources.forEach(function(source, i) {
+                var content = orig_map.sourcesContent[i];
+                if (content) {
+                    sourcesContent[source] = content;
+                }
+            });
+        }
     }
 
     function add(source, gen_line, gen_col, orig_line, orig_col, name) {
+        let generatedPos = { line: gen_line, column: gen_col };
+
         if (orig_map) {
             var info = orig_map.originalPositionFor({
                 line: orig_line,
                 column: orig_col
             });
             if (info.source === null) {
+                generator.addMapping({
+                    generated: generatedPos,
+                    original: null,
+                    source: null,
+                    name: null
+                });
                 return;
             }
             source = info.source;
@@ -90,22 +104,42 @@ async function SourceMap(options) {
             name = info.name || name;
         }
         generator.addMapping({
-            generated : { line: gen_line + options.dest_line_diff, column: gen_col },
-            original  : { line: orig_line + options.orig_line_diff, column: orig_col },
+            generated : generatedPos,
+            original  : { line: orig_line, column: orig_col },
             source    : source,
             name      : name
         });
+        generator.setSourceContent(source, sourcesContent[source]);
+    }
+
+    function clean(map) {
+        const allNull = map.sourcesContent && map.sourcesContent.every(c => c == null);
+        if (allNull) delete map.sourcesContent;
+        if (map.file === undefined) delete map.file;
+        if (map.sourceRoot === undefined) delete map.sourceRoot;
+        return map;
+    }
+
+    function getDecoded() {
+        if (!generator.toDecodedMap) return null;
+        return clean(generator.toDecodedMap());
+    }
+
+    function getEncoded() {
+        return clean(generator.toJSON());
+    }
+
+    function destroy() {
+        // @jridgewell/source-map's SourceMapConsumer does not need to be
+        // manually freed.
+        if (orig_map && orig_map.destroy) orig_map.destroy();
     }
 
     return {
-        add        : add,
-        get        : function() { return generator; },
-        toString   : function() { return generator.toString(); },
-        destroy    : function () {
-            if (orig_map && orig_map.destroy) {
-                orig_map.destroy();
-            }
-        }
+        add,
+        getDecoded,
+        getEncoded,
+        destroy,
     };
 }
 

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.13.1",
+  "version": "5.14.0",
   "engines": {
     "node": ">=10"
   },
@@ -18,6 +18,7 @@
   "exports": {
     ".": [
       {
+        "types": "./tools/terser.d.ts",
         "import": "./main.js",
         "require": "./dist/bundle.min.js"
       },
@@ -43,9 +44,9 @@
     "main.js"
   ],
   "dependencies": {
+    "@jridgewell/source-map": "^0.3.2",
     "acorn": "^8.5.0",
     "commander": "^2.20.0",
-    "source-map": "~0.8.0-beta.0",
     "source-map-support": "~0.5.20"
   },
   "devDependencies": {
@@ -58,7 +59,8 @@
     "pre-commit": "^1.2.2",
     "rimraf": "^3.0.2",
     "rollup": "2.56.3",
-    "semver": "^7.3.4"
+    "semver": "^7.3.4",
+    "source-map": "~0.8.0-beta.0"
   },
   "scripts": {
     "test": "node test/compress.js && mocha test/mocha",

package/tools/domprops.js

@@ -320,6 +320,7 @@ export var domprops = [
     "COMMENT_NODE",
     "COMPARE_REF_TO_TEXTURE",
     "COMPILE_STATUS",
+    "COMPLETION_STATUS_KHR",
     "COMPRESSED_RGBA_S3TC_DXT1_EXT",
     "COMPRESSED_RGBA_S3TC_DXT3_EXT",
     "COMPRESSED_RGBA_S3TC_DXT5_EXT",

package/tools/terser.d.ts

@@ -1,11 +1,12 @@
 /// <reference lib="es2015" />
 
-import { RawSourceMap } from 'source-map';
+import { SectionedSourceMapInput, EncodedSourceMap, DecodedSourceMap } from '@jridgewell/source-map';
 
 export type ECMA = 5 | 2015 | 2016 | 2017 | 2018 | 2019 | 2020;
 
 export interface ParseOptions {
     bare_returns?: boolean;
+    /** @deprecated legacy option. Currently, all supported EcmaScript is valid to parse. */
     ecma?: ECMA;
     html5_comments?: boolean;
     shebang?: boolean;
@@ -192,12 +193,13 @@ export interface MinifyOptions {
 
 export interface MinifyOutput {
     code?: string;
-    map?: RawSourceMap | string;
+    map?: EncodedSourceMap | string;
+    decoded_map?: DecodedSourceMap | null;
 }
 
 export interface SourceMapOptions {
     /** Source map object, 'inline' or source map file content */
-    content?: RawSourceMap | string;
+    content?: SectionedSourceMapInput | string;
     includeSources?: boolean;
     filename?: string;
     root?: string;