terser 5.13.0 → 5.14.1

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

@@ -162,7 +162,7 @@ import {
 } from "./ast.js";
 
 var LATEST_RAW = "";  // Only used for numbers and template strings
-var LATEST_TEMPLATE_END = true;
+var TEMPLATE_RAWS = new Map();  // Raw template strings
 
 var KEYWORDS = "break case catch class const continue debugger default delete do else export extends finally for function if in instanceof let new return switch throw try typeof var void while with";
 var KEYWORDS_ATOM = "false null true";
@@ -693,8 +693,8 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
                 next(true, true);
                 S.brace_counter++;
                 tok = token(begin ? "template_head" : "template_substitution", content);
-                LATEST_RAW = raw;
-                LATEST_TEMPLATE_END = false;
+                TEMPLATE_RAWS.set(tok, raw);
+                tok.template_end = false;
                 return tok;
             }
 
@@ -710,8 +710,8 @@ function tokenizer($TEXT, filename, html5_comments, shebang) {
         }
         S.template_braces.pop();
         tok = token(begin ? "template_head" : "template_substitution", content);
-        LATEST_RAW = raw;
-        LATEST_TEMPLATE_END = true;
+        TEMPLATE_RAWS.set(tok, raw);
+        tok.template_end = true;
         return tok;
     });
 
@@ -1572,66 +1572,66 @@ function parse($TEXT, options) {
         });
     };
 
-    function track_used_binding_identifiers(is_parameter, strict) {
-        var parameters = new Set();
-        var duplicate = false;
-        var default_assignment = false;
-        var spread = false;
-        var strict_mode = !!strict;
-        var tracker = {
-            add_parameter: function(token) {
-                if (parameters.has(token.value)) {
-                    if (duplicate === false) {
-                        duplicate = token;
-                    }
-                    tracker.check_strict();
-                } else {
-                    parameters.add(token.value);
-                    if (is_parameter) {
-                        switch (token.value) {
-                          case "arguments":
-                          case "eval":
-                          case "yield":
-                            if (strict_mode) {
-                                token_error(token, "Unexpected " + token.value + " identifier as parameter inside strict mode");
-                            }
-                            break;
-                          default:
-                            if (RESERVED_WORDS.has(token.value)) {
-                                unexpected();
-                            }
+    class UsedParametersTracker {
+        constructor(is_parameter, strict, duplicates_ok = false) {
+            this.is_parameter = is_parameter;
+            this.duplicates_ok = duplicates_ok;
+            this.parameters = new Set();
+            this.duplicate = null;
+            this.default_assignment = false;
+            this.spread = false;
+            this.strict_mode = !!strict;
+        }
+        add_parameter(token) {
+            if (this.parameters.has(token.value)) {
+                if (this.duplicate === null) {
+                    this.duplicate = token;
+                }
+                this.check_strict();
+            } else {
+                this.parameters.add(token.value);
+                if (this.is_parameter) {
+                    switch (token.value) {
+                      case "arguments":
+                      case "eval":
+                      case "yield":
+                        if (this.strict_mode) {
+                            token_error(token, "Unexpected " + token.value + " identifier as parameter inside strict mode");
+                        }
+                        break;
+                      default:
+                        if (RESERVED_WORDS.has(token.value)) {
+                            unexpected();
                         }
                     }
                 }
-            },
-            mark_default_assignment: function(token) {
-                if (default_assignment === false) {
-                    default_assignment = token;
-                }
-            },
-            mark_spread: function(token) {
-                if (spread === false) {
-                    spread = token;
-                }
-            },
-            mark_strict_mode: function() {
-                strict_mode = true;
-            },
-            is_strict: function() {
-                return default_assignment !== false || spread !== false || strict_mode;
-            },
-            check_strict: function() {
-                if (tracker.is_strict() && duplicate !== false) {
-                    token_error(duplicate, "Parameter " + duplicate.value + " was used already");
-                }
             }
-        };
-
-        return tracker;
+        }
+        mark_default_assignment(token) {
+            if (this.default_assignment === false) {
+                this.default_assignment = token;
+            }
+        }
+        mark_spread(token) {
+            if (this.spread === false) {
+                this.spread = token;
+            }
+        }
+        mark_strict_mode() {
+            this.strict_mode = true;
+        }
+        is_strict() {
+            return this.default_assignment !== false || this.spread !== false || this.strict_mode;
+        }
+        check_strict() {
+            if (this.is_strict() && this.duplicate !== null && !this.duplicates_ok) {
+                token_error(this.duplicate, "Parameter " + this.duplicate.value + " was used already");
+            }
+        }
     }
 
     function parameters(params) {
-        var used_parameters = track_used_binding_identifiers(true, S.input.has_directive("use strict"));
+        var used_parameters = new UsedParametersTracker(true, S.input.has_directive("use strict"));
 
         expect("(");
 
@@ -1655,7 +1655,7 @@ function parse($TEXT, options) {
         var param;
         var expand = false;
         if (used_parameters === undefined) {
-            used_parameters = track_used_binding_identifiers(true, S.input.has_directive("use strict"));
+            used_parameters = new UsedParametersTracker(true, S.input.has_directive("use strict"));
         }
         if (is("expand", "...")) {
             expand = S.token;
@@ -1698,7 +1698,9 @@ function parse($TEXT, options) {
         var expand_token;
         var first_token = S.token;
         if (used_parameters === undefined) {
-            used_parameters = track_used_binding_identifiers(false, S.input.has_directive("use strict"));
+            const strict = S.input.has_directive("use strict");
+            const duplicates_ok = symbol_type === AST_SymbolVar;
+            used_parameters = new UsedParametersTracker(false, strict, duplicates_ok);
         }
         symbol_type = symbol_type === undefined ? AST_SymbolFunarg : symbol_type;
         if (is("punc", "[")) {
@@ -2091,7 +2093,7 @@ function parse($TEXT, options) {
             if (is("punc", "{") || is("punc", "[")) {
                 def = new AST_VarDef({
                     start: S.token,
-                    name: binding_element(undefined ,sym_type),
+                    name: binding_element(undefined, sym_type),
                     value: is("operator", "=") ? (expect_token("operator", "="), expression(false, no_in)) : null,
                     end: prev()
                 });
@@ -2365,19 +2367,19 @@ function parse($TEXT, options) {
 
         segments.push(new AST_TemplateSegment({
             start: S.token,
-            raw: LATEST_RAW,
+            raw: TEMPLATE_RAWS.get(S.token),
             value: S.token.value,
             end: S.token
         }));
 
-        while (!LATEST_TEMPLATE_END) {
+        while (!S.token.template_end) {
             next();
             handle_regexp();
             segments.push(expression(true));
 
             segments.push(new AST_TemplateSegment({
                 start: S.token,
-                raw: LATEST_RAW,
+                raw: TEMPLATE_RAWS.get(S.token),
                 value: S.token.value,
                 end: S.token
             }));
@@ -3340,6 +3342,7 @@ function parse($TEXT, options) {
         } else {
             toplevel = new AST_Toplevel({ start: start, body: body, end: end });
         }
+        TEMPLATE_RAWS = new Map();
         return toplevel;
     })();
 

package/lib/size.js

@@ -115,6 +115,7 @@ AST_Directive.prototype._size = function () {
     return 2 + this.value.length;
 };
 
+/** Count commas/semicolons necessary to show a list of expressions/statements */
 const list_overhead = (array) => array.length && array.length - 1;
 
 AST_Block.prototype._size = function () {
@@ -167,7 +168,7 @@ AST_Arrow.prototype._size = function () {
             && this.argnames[0] instanceof AST_Symbol
         )
     ) {
-        args_and_arrow += 2;
+        args_and_arrow += 2; // parens around the args
     }
 
     const body_overhead = this.is_braceless() ? 0 : list_overhead(this.body) + 2;
@@ -229,19 +230,16 @@ AST_Finally.prototype._size = function () {
     return 7 + list_overhead(this.body);
 };
 
-/*#__INLINE__*/
-const def_size = (size, def) => size + list_overhead(def.definitions);
-
 AST_Var.prototype._size = function () {
-    return def_size(4, this);
+    return 4 + list_overhead(this.definitions);
 };
 
 AST_Let.prototype._size = function () {
-    return def_size(4, this);
+    return 4 + list_overhead(this.definitions);
 };
 
 AST_Const.prototype._size = function () {
-    return def_size(6, this);
+    return 6 + list_overhead(this.definitions);
 };
 
 AST_VarDef.prototype._size = function () {
@@ -477,7 +475,7 @@ AST_NaN.prototype._size = () => 3;
 
 AST_Undefined.prototype._size = () => 6; // "void 0"
 
-AST_Hole.prototype._size = () => 0;  // comma is taken into account
+AST_Hole.prototype._size = () => 0;  // comma is taken into account by list_overhead()
 
 AST_Infinity.prototype._size = () => 8;
 

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.0",
+  "version": "5.14.1",
   "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;
@@ -144,6 +145,7 @@ export interface FormatOptions {
     }) => boolean );
     ecma?: ECMA;
     ie8?: boolean;
+    keep_numbers?: boolean;
     indent_level?: number;
     indent_start?: number;
     inline_script?: boolean;
@@ -192,12 +194,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;