terser 5.13.0 → 5.14.1

package/lib/ast.js

@@ -93,6 +93,7 @@ const set_tok_flag = (tok, flag, truth) => {
 const TOK_FLAG_NLB          = 0b0001;
 const TOK_FLAG_QUOTE_SINGLE = 0b0010;
 const TOK_FLAG_QUOTE_EXISTS = 0b0100;
+const TOK_FLAG_TEMPLATE_END = 0b1000;
 
 class AST_Token {
     constructor(type, value, line, col, pos, nlb, comments_before, comments_after, file) {
@@ -128,6 +129,14 @@ class AST_Token {
         set_tok_flag(this, TOK_FLAG_QUOTE_SINGLE, quote_type === "'");
         set_tok_flag(this, TOK_FLAG_QUOTE_EXISTS, !!quote_type);
     }
+
+    get template_end() {
+        return has_tok_flag(this, TOK_FLAG_TEMPLATE_END);
+    }
+
+    set template_end(new_template_end) {
+        set_tok_flag(this, TOK_FLAG_TEMPLATE_END, new_template_end);
+    }
 }
 
 var AST_Node = DEFNODE("Node", "start end", function AST_Node(props) {
@@ -552,11 +561,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 +620,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 +701,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 +780,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 +804,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 +828,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 +852,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 +2163,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 +2256,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 +2278,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;
@@ -2869,6 +2868,21 @@ function walk(node, cb, to_visit = [node]) {
     return false;
 }
 
+/**
+ * Walks an AST node and its children.
+ *
+ * {cb} can return `walk_abort` to interrupt the walk.
+ *
+ * @param node
+ * @param cb {(node, info: { parent: (nth) => any }) => (boolean | undefined)}
+ *
+ * @returns {boolean} whether the walk was aborted
+ *
+ * @example
+ * const found_some_cond = walk_parent(my_ast_node, (node, { parent }) => {
+ *   if (some_cond(node, parent())) return walk_abort
+ * });
+ */
 function walk_parent(node, cb, initial_stack) {
     const to_visit = [node];
     const push = to_visit.push.bind(to_visit);
@@ -2987,6 +3001,15 @@ class TreeWalker {
         }
     }
 
+    find_scope() {
+        for (let i = 0;;i++) {
+            const p = this.parent(i);
+            if (p instanceof AST_Toplevel) return p;
+            if (p instanceof AST_Lambda) return p;
+            if (p.block_scope) return p.block_scope;
+        }
+    }
+
     has_directive(type) {
         var dir = this.directives[type];
         if (dir) return dir;

package/lib/compress/common.js

@@ -80,9 +80,13 @@ import {
     AST_Undefined,
 
     TreeWalker,
+    walk,
+    walk_abort,
+    walk_parent,
 } from "../ast.js";
 import { make_node, regexp_source_fix, string_template, makePredicate } from "../utils/index.js";
 import { first_in_statement } from "../utils/first_in_statement.js";
+import { has_flag, TOP } from "./compressor-flags.js";
 
 export function merge_sequence(array, node) {
     if (node instanceof AST_Sequence) {
@@ -244,6 +248,13 @@ export function is_iife_call(node) {
     return node.expression instanceof AST_Function || is_iife_call(node.expression);
 }
 
+export function is_empty(thing) {
+    if (thing === null) return true;
+    if (thing instanceof AST_EmptyStatement) return true;
+    if (thing instanceof AST_BlockStatement) return thing.body.length == 0;
+    return false;
+}
+
 export const identifier_atom = makePredicate("Infinity NaN undefined");
 export function is_identifier_atom(node) {
     return node instanceof AST_Infinity
@@ -281,6 +292,34 @@ export function as_statement_array(thing) {
     throw new Error("Can't convert thing to statement array");
 }
 
+export function is_reachable(scope_node, defs) {
+    const find_ref = node => {
+        if (node instanceof AST_SymbolRef && defs.includes(node.definition())) {
+            return walk_abort;
+        }
+    };
+
+    return walk_parent(scope_node, (node, info) => {
+        if (node instanceof AST_Scope && node !== scope_node) {
+            var parent = info.parent();
+
+            if (
+                parent instanceof AST_Call
+                && parent.expression === node
+                // Async/Generators aren't guaranteed to sync evaluate all of
+                // their body steps, so it's possible they close over the variable.
+                && !(node.async || node.is_generator)
+            ) {
+                return;
+            }
+
+            if (walk(node, find_ref)) return walk_abort;
+
+            return true;
+        }
+    });
+}
+
 /** Check if a ref refers to the name of a function/class it's defined within */
 export function is_recursive_ref(compressor, def) {
     var node;
@@ -294,3 +333,12 @@ export function is_recursive_ref(compressor, def) {
     }
     return false;
 }
+
+// TODO this only works with AST_Defun, shouldn't it work for other ways of defining functions?
+export function retain_top_func(fn, compressor) {
+    return compressor.top_retain
+        && fn instanceof AST_Defun
+        && has_flag(fn, TOP)
+        && fn.name
+        && compressor.top_retain(fn.name);
+}