terser 5.16.0 → 5.16.2

package/lib/scope.js

@@ -69,6 +69,7 @@ import {
     AST_Export,
     AST_For,
     AST_ForIn,
+    AST_ForOf,
     AST_Function,
     AST_Import,
     AST_IterationStatement,
@@ -104,7 +105,8 @@ import {
     AST_VarDef,
     AST_With,
     TreeWalker,
-    walk
+    walk,
+    walk_abort
 } from "./ast.js";
 import {
     ALL_RESERVED_WORDS,
@@ -229,8 +231,9 @@ AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = null,
             scope.init_scope_vars(parent_scope);
             scope.uses_with = save_scope.uses_with;
             scope.uses_eval = save_scope.uses_eval;
+
             if (options.safari10) {
-                if (node instanceof AST_For || node instanceof AST_ForIn) {
+                if (node instanceof AST_For || node instanceof AST_ForIn || node instanceof AST_ForOf) {
                     for_scopes.push(scope);
                 }
             }
@@ -418,7 +421,7 @@ AST_Scope.DEFMETHOD("figure_out_scope", function(options, { parent_scope = null,
                 sym = toplevel.def_global(node);
                 if (node instanceof AST_SymbolExport) sym.export = MASK_EXPORT_DONT_MANGLE;
             } else if (sym.scope instanceof AST_Lambda && name == "arguments") {
-                sym.scope.uses_arguments = true;
+                sym.scope.get_defun_scope().uses_arguments = true;
             }
             node.thedef = sym;
             node.reference();
@@ -520,7 +523,25 @@ AST_Scope.DEFMETHOD("add_child_scope", function (scope) {
 
     scope.parent_scope = this;
 
-    // TODO uses_with, uses_eval, etc
+    // Propagate to this.uses_arguments from arrow functions
+    if ((scope instanceof AST_Arrow) && !this.uses_arguments) {
+        this.uses_arguments = walk(scope, node => {
+            if (
+                node instanceof AST_SymbolRef
+                && node.scope instanceof AST_Lambda
+                && node.name === "arguments"
+            ) {
+                return walk_abort;
+            }
+
+            if (node instanceof AST_Lambda && !(node instanceof AST_Arrow)) {
+                return true;
+            }
+        });
+    }
+
+    this.uses_with = this.uses_with || scope.uses_with;
+    this.uses_eval = this.uses_eval || scope.uses_eval;
 
     const scope_ancestry = (() => {
         const ancestry = [];
@@ -756,7 +777,10 @@ AST_Symbol.DEFMETHOD("global", function() {
     return this.thedef.global;
 });
 
-AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options) {
+/**
+ * Format the mangler options (if any) into their appropriate types
+ */
+export function format_mangler_options(options) {
     options = defaults(options, {
         eval        : false,
         nth_identifier : base54,
@@ -777,10 +801,10 @@ AST_Toplevel.DEFMETHOD("_default_mangler_options", function(options) {
     // Never mangle arguments
     options.reserved.add("arguments");
     return options;
-});
+}
 
 AST_Toplevel.DEFMETHOD("mangle_names", function(options) {
-    options = this._default_mangler_options(options);
+    options = format_mangler_options(options);
     var nth_identifier = options.nth_identifier;
 
     // We only need to mangle declaration nodes.  Special logic wired
@@ -904,7 +928,7 @@ AST_Toplevel.DEFMETHOD("find_colliding_names", function(options) {
 });
 
 AST_Toplevel.DEFMETHOD("expand_names", function(options) {
-    options = this._default_mangler_options(options);
+    options = format_mangler_options(options);
     var nth_identifier = options.nth_identifier;
     if (nth_identifier.reset && nth_identifier.sort) {
         nth_identifier.reset();
@@ -947,7 +971,7 @@ AST_Sequence.DEFMETHOD("tail_node", function() {
 });
 
 AST_Toplevel.DEFMETHOD("compute_char_frequency", function(options) {
-    options = this._default_mangler_options(options);
+    options = format_mangler_options(options);
     var nth_identifier = options.nth_identifier;
     if (!nth_identifier.reset || !nth_identifier.consider || !nth_identifier.sort) {
         // If the identifier mangler is invariant, skip computing character frequency.

package/lib/size.js

@@ -425,9 +425,11 @@ AST_ClassPrivateProperty.prototype._size = function () {
 };
 
 AST_Symbol.prototype._size = function () {
-    return !mangle_options || this.definition().unmangleable(mangle_options)
-        ? this.name.length
-        : 1;
+    if (!(mangle_options && this.thedef && !this.thedef.unmangleable(mangle_options))) {
+        return this.name.length;
+    } else {
+        return 1;
+    }
 };
 
 // TODO take propmangle into account
@@ -436,11 +438,7 @@ AST_SymbolClassProperty.prototype._size = function () {
 };
 
 AST_SymbolRef.prototype._size = AST_SymbolDeclaration.prototype._size = function () {
-    const { name, thedef } = this;
-
-    if (thedef && thedef.global) return name.length;
-
-    if (name === "arguments") return 9;
+    if (this.name === "arguments") return 9;
 
     return AST_Symbol.prototype._size.call(this);
 };

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

package/tools/terser.d.ts

@@ -204,6 +204,7 @@ export interface SourceMapOptions {
     includeSources?: boolean;
     filename?: string;
     root?: string;
+    asObject?: boolean;
     url?: string | 'inline';
 }
 

package/bin/terser.mjs

@@ -1,21 +0,0 @@
-#!/usr/bin/env node
-
-"use strict";
-
-import "../tools/exit.cjs";
-
-import fs from "fs"
-import path from "path"
-import program from "commander"
-
-import { run_cli } from "../lib/cli.js"
-
-const packageJson = {
-    name: "terser",
-    version: "experimental module CLI"
-}
-
-run_cli({ program, packageJson, fs, path }).catch((error) => {
-    console.error(error);
-    process.exitCode = 1;
-});