rollup 2.74.0 → 2.74.1

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.74.0
-	Thu, 19 May 2022 05:01:43 GMT - commit fc99e96e09d26798f1c0aabdd7429307cc908c8e
+	Rollup.js v2.74.1
+	Thu, 19 May 2022 17:50:11 GMT - commit e823eded9920d6082cc8c1afcf591b716ab6b160
 
 	https://github.com/rollup/rollup
 
@@ -14,7 +14,7 @@ import { createHash as createHash$1 } from 'crypto';
 import { promises } from 'fs';
 import { EventEmitter } from 'events';
 
-var version$1 = "2.74.0";
+var version$1 = "2.74.1";
 
 var charToInteger = {};
 var chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -1209,7 +1209,7 @@ class MagicString {
 const hasOwnProp = Object.prototype.hasOwnProperty;
 
 class Bundle$1 {
-	constructor(options) {
+	constructor(options = {}) {
 		this.intro = options.intro || '';
 		this.separator = options.separator !== undefined ? options.separator : '\n';
 		this.sources = [];
@@ -1588,7 +1588,6 @@ class DiscriminatedPathTracker {
 }
 
 const UnknownValue = Symbol('Unknown Value');
-const UnknownTruthyValue = Symbol('Unknown Truthy Value');
 class ExpressionEntity {
     constructor() {
         this.included = false;
@@ -1617,17 +1616,14 @@ class ExpressionEntity {
     hasEffectsWhenCalledAtPath(_path, _callOptions, _context) {
         return true;
     }
-    include(_context, _includeChildrenRecursively, _options) {
+    include(_context, _includeChildrenRecursively) {
         this.included = true;
     }
-    includeArgumentsWhenCalledAtPath(_path, context, args) {
+    includeCallArguments(context, args) {
         for (const arg of args) {
             arg.include(context, false);
         }
     }
-    shouldBeIncluded(_context) {
-        return true;
-    }
 }
 const UNKNOWN_EXPRESSION = new (class UnknownExpression extends ExpressionEntity {
 })();
@@ -4669,9 +4665,9 @@ const stringReplace = {
         hasEffectsWhenCalled(callOptions, context) {
             const arg1 = callOptions.args[1];
             return (callOptions.args.length < 2 ||
-                (typeof arg1.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, {
+                (arg1.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, {
                     deoptimizeCache() { }
-                }) === 'symbol' &&
+                }) === UnknownValue &&
                     arg1.hasEffectsWhenCalledAtPath(EMPTY_PATH, {
                         args: NO_ARGS,
                         thisParam: null,
@@ -5226,7 +5222,8 @@ class NodeBase extends ExpressionEntity {
                 continue;
             if (Array.isArray(value)) {
                 for (const child of value) {
-                    child === null || child === void 0 ? void 0 : child.bind();
+                    if (child !== null)
+                        child.bind();
                 }
             }
             else {
@@ -5249,7 +5246,7 @@ class NodeBase extends ExpressionEntity {
                 continue;
             if (Array.isArray(value)) {
                 for (const child of value) {
-                    if (child === null || child === void 0 ? void 0 : child.hasEffects(context))
+                    if (child !== null && child.hasEffects(context))
                         return true;
                 }
             }
@@ -5258,7 +5255,7 @@ class NodeBase extends ExpressionEntity {
         }
         return false;
     }
-    include(context, includeChildrenRecursively, _options) {
+    include(context, includeChildrenRecursively) {
         if (this.deoptimized === false)
             this.applyDeoptimizations();
         this.included = true;
@@ -5268,7 +5265,8 @@ class NodeBase extends ExpressionEntity {
                 continue;
             if (Array.isArray(value)) {
                 for (const child of value) {
-                    child === null || child === void 0 ? void 0 : child.include(context, includeChildrenRecursively);
+                    if (child !== null)
+                        child.include(context, includeChildrenRecursively);
                 }
             }
             else {
@@ -5276,6 +5274,9 @@ class NodeBase extends ExpressionEntity {
             }
         }
     }
+    includeAsSingleStatement(context, includeChildrenRecursively) {
+        this.include(context, includeChildrenRecursively);
+    }
     /**
      * Override to perform special initialisation steps after the scope is initialised
      */
@@ -5322,7 +5323,8 @@ class NodeBase extends ExpressionEntity {
                 continue;
             if (Array.isArray(value)) {
                 for (const child of value) {
-                    child === null || child === void 0 ? void 0 : child.render(code, options);
+                    if (child !== null)
+                        child.render(code, options);
                 }
             }
             else {
@@ -5333,28 +5335,7 @@ class NodeBase extends ExpressionEntity {
     shouldBeIncluded(context) {
         return this.included || (!context.brokenFlow && this.hasEffects(createHasEffectsContext()));
     }
-    /**
-     * Just deoptimize everything by default so that when e.g. we do not track
-     * something properly, it is deoptimized.
-     * @protected
-     */
-    applyDeoptimizations() {
-        this.deoptimized = true;
-        for (const key of this.keys) {
-            const value = this[key];
-            if (value === null)
-                continue;
-            if (Array.isArray(value)) {
-                for (const child of value) {
-                    child === null || child === void 0 ? void 0 : child.deoptimizePath(UNKNOWN_PATH);
-                }
-            }
-            else {
-                value.deoptimizePath(UNKNOWN_PATH);
-            }
-        }
-        this.context.requestTreeshakingPass();
-    }
+    applyDeoptimizations() { }
 }
 
 class SpreadElement extends NodeBase {
@@ -5436,7 +5417,7 @@ class Method extends ExpressionEntity {
         }
         return false;
     }
-    includeArgumentsWhenCalledAtPath(_path, context, args) {
+    includeCallArguments(context, args) {
         for (const arg of args) {
             arg.include(context, false);
         }
@@ -5640,7 +5621,7 @@ class ObjectEntity extends ExpressionEntity {
     }
     getLiteralValueAtPath(path, recursionTracker, origin) {
         if (path.length === 0) {
-            return UnknownTruthyValue;
+            return UnknownValue;
         }
         const key = path[0];
         const expressionAtPath = this.getMemberExpressionAndTrackDeopt(key, origin);
@@ -5776,16 +5757,6 @@ class ObjectEntity extends ExpressionEntity {
         }
         return true;
     }
-    includeArgumentsWhenCalledAtPath(path, context, args) {
-        const key = path[0];
-        const expressionAtPath = this.getMemberExpression(key);
-        if (expressionAtPath) {
-            return expressionAtPath.includeArgumentsWhenCalledAtPath(path.slice(1), context, args);
-        }
-        if (this.prototypeExpression) {
-            return this.prototypeExpression.includeArgumentsWhenCalledAtPath(path, context, args);
-        }
-    }
     buildPropertyMaps(properties) {
         const { allProperties, propertiesAndGettersByKey, propertiesAndSettersByKey, settersByKey, gettersByKey, unknownIntegerProps, unmatchablePropertiesAndGetters, unmatchableGetters, unmatchableSetters } = this;
         const unmatchablePropertiesAndSetters = [];
@@ -6055,7 +6026,6 @@ const ARRAY_PROTOTYPE = new ObjectEntity({
 class ArrayExpression extends NodeBase {
     constructor() {
         super(...arguments);
-        this.deoptimized = false;
         this.objectEntity = null;
     }
     deoptimizePath(path) {
@@ -6079,23 +6049,6 @@ class ArrayExpression extends NodeBase {
     hasEffectsWhenCalledAtPath(path, callOptions, context) {
         return this.getObjectEntity().hasEffectsWhenCalledAtPath(path, callOptions, context);
     }
-    includeArgumentsWhenCalledAtPath(path, context, args) {
-        this.getObjectEntity().includeArgumentsWhenCalledAtPath(path, context, args);
-    }
-    applyDeoptimizations() {
-        this.deoptimized = true;
-        let hasSpread = false;
-        for (let index = 0; index < this.elements.length; index++) {
-            const element = this.elements[index];
-            if (hasSpread || element instanceof SpreadElement) {
-                if (element) {
-                    hasSpread = true;
-                    element.deoptimizePath(UNKNOWN_PATH);
-                }
-            }
-        }
-        this.context.requestTreeshakingPass();
-    }
     getObjectEntity() {
         if (this.objectEntity !== null) {
             return this.objectEntity;
@@ -6106,7 +6059,7 @@ class ArrayExpression extends NodeBase {
         let hasSpread = false;
         for (let index = 0; index < this.elements.length; index++) {
             const element = this.elements[index];
-            if (hasSpread || element instanceof SpreadElement) {
+            if (element instanceof SpreadElement || hasSpread) {
                 if (element) {
                     hasSpread = true;
                     properties.unshift({ key: UnknownInteger, kind: 'init', property: element });
@@ -6126,7 +6079,9 @@ class ArrayExpression extends NodeBase {
 class ArrayPattern extends NodeBase {
     addExportedVariables(variables, exportNamesByVariable) {
         for (const element of this.elements) {
-            element === null || element === void 0 ? void 0 : element.addExportedVariables(variables, exportNamesByVariable);
+            if (element !== null) {
+                element.addExportedVariables(variables, exportNamesByVariable);
+            }
         }
     }
     declare(kind) {
@@ -6138,23 +6093,29 @@ class ArrayPattern extends NodeBase {
         }
         return variables;
     }
-    // Patterns can only be deoptimized at the empty path at the moment
-    deoptimizePath() {
-        for (const element of this.elements) {
-            element === null || element === void 0 ? void 0 : element.deoptimizePath(EMPTY_PATH);
+    deoptimizePath(path) {
+        if (path.length === 0) {
+            for (const element of this.elements) {
+                if (element !== null) {
+                    element.deoptimizePath(path);
+                }
+            }
         }
     }
-    // Patterns are only checked at the emtpy path at the moment
-    hasEffectsWhenAssignedAtPath(_path, context) {
+    hasEffectsWhenAssignedAtPath(path, context) {
+        if (path.length > 0)
+            return true;
         for (const element of this.elements) {
-            if (element === null || element === void 0 ? void 0 : element.hasEffectsWhenAssignedAtPath(EMPTY_PATH, context))
+            if (element !== null && element.hasEffectsWhenAssignedAtPath(EMPTY_PATH, context))
                 return true;
         }
         return false;
     }
     markDeclarationReached() {
         for (const element of this.elements) {
-            element === null || element === void 0 ? void 0 : element.markDeclarationReached();
+            if (element !== null) {
+                element.markDeclarationReached();
+            }
         }
     }
 }
@@ -6274,7 +6235,7 @@ class LocalVariable extends Variable {
             }
         }
     }
-    includeArgumentsWhenCalledAtPath(path, context, args) {
+    includeCallArguments(context, args) {
         if (this.isReassigned || (this.init && context.includedCallArguments.has(this.init))) {
             for (const arg of args) {
                 arg.include(context, false);
@@ -6282,7 +6243,7 @@ class LocalVariable extends Variable {
         }
         else if (this.init) {
             context.includedCallArguments.add(this.init);
-            this.init.includeArgumentsWhenCalledAtPath(path, context, args);
+            this.init.includeCallArguments(context, args);
             context.includedCallArguments.delete(this.init);
         }
     }
@@ -6530,618 +6491,88 @@ class ReturnValueScope extends ParameterScope {
     }
 }
 
-class AssignmentPattern extends NodeBase {
-    constructor() {
-        super(...arguments);
-        this.deoptimized = false;
-    }
-    addExportedVariables(variables, exportNamesByVariable) {
-        this.left.addExportedVariables(variables, exportNamesByVariable);
-    }
-    declare(kind, init) {
-        return this.left.declare(kind, init);
-    }
-    deoptimizePath(path) {
-        path.length === 0 && this.left.deoptimizePath(path);
-    }
-    hasEffectsWhenAssignedAtPath(path, context) {
-        return path.length > 0 || this.left.hasEffectsWhenAssignedAtPath(EMPTY_PATH, context);
-    }
-    include(context, includeChildrenRecursively) {
-        this.included = true;
-        this.left.include(context, includeChildrenRecursively);
-        this.right.include(context, includeChildrenRecursively);
-    }
-    markDeclarationReached() {
-        this.left.markDeclarationReached();
-    }
-    render(code, options, { isShorthandProperty } = BLANK) {
-        this.left.render(code, options, { isShorthandProperty });
-        if (this.right.included) {
-            this.right.render(code, options);
-        }
-        else {
-            code.remove(this.left.end, this.end);
-        }
-    }
-    applyDeoptimizations() {
-        this.deoptimized = true;
-        this.left.deoptimizePath(EMPTY_PATH);
-        this.right.deoptimizePath(UNKNOWN_PATH);
-        this.context.requestTreeshakingPass();
-    }
-}
+//@ts-check
+/** @typedef { import('estree').Node} Node */
+/** @typedef {Node | {
+ *   type: 'PropertyDefinition';
+ *   computed: boolean;
+ *   value: Node
+ * }} NodeWithPropertyDefinition */
 
-function treeshakeNode(node, code, start, end) {
-    code.remove(start, end);
-    if (node.annotations) {
-        for (const annotation of node.annotations) {
-            if (annotation.start < start) {
-                code.remove(annotation.start, annotation.end);
-            }
-            else {
-                return;
-            }
-        }
-    }
-}
-function removeAnnotations(node, code) {
-    if (!node.annotations && node.parent.type === ExpressionStatement$1) {
-        node = node.parent;
-    }
-    if (node.annotations) {
-        for (const annotation of node.annotations) {
-            code.remove(annotation.start, annotation.end);
-        }
-    }
+/**
+ *
+ * @param {NodeWithPropertyDefinition} node
+ * @param {NodeWithPropertyDefinition} parent
+ * @returns boolean
+ */
+function is_reference (node, parent) {
+	if (node.type === 'MemberExpression') {
+		return !node.computed && is_reference(node.object, node);
+	}
+
+	if (node.type === 'Identifier') {
+		if (!parent) return true;
+
+		switch (parent.type) {
+			// disregard `bar` in `foo.bar`
+			case 'MemberExpression': return parent.computed || node === parent.object;
+
+			// disregard the `foo` in `class {foo(){}}` but keep it in `class {[foo](){}}`
+			case 'MethodDefinition': return parent.computed;
+
+			// disregard the `foo` in `class {foo=bar}` but keep it in `class {[foo]=bar}` and `class {bar=foo}`
+			case 'PropertyDefinition': return parent.computed || node === parent.value;
+
+			// disregard the `bar` in `{ bar: foo }`, but keep it in `{ [bar]: foo }`
+			case 'Property': return parent.computed || node === parent.value;
+
+			// disregard the `bar` in `export { foo as bar }` or
+			// the foo in `import { foo as bar }`
+			case 'ExportSpecifier':
+			case 'ImportSpecifier': return node === parent.local;
+
+			// disregard the `foo` in `foo: while (...) { ... break foo; ... continue foo;}`
+			case 'LabeledStatement':
+			case 'BreakStatement':
+			case 'ContinueStatement': return false;
+			default: return true;
+		}
+	}
+
+	return false;
 }
 
-const NO_SEMICOLON = { isNoStatement: true };
-// This assumes there are only white-space and comments between start and the string we are looking for
-function findFirstOccurrenceOutsideComment(code, searchString, start = 0) {
-    let searchPos, charCodeAfterSlash;
-    searchPos = code.indexOf(searchString, start);
-    while (true) {
-        start = code.indexOf('/', start);
-        if (start === -1 || start >= searchPos)
-            return searchPos;
-        charCodeAfterSlash = code.charCodeAt(++start);
-        ++start;
-        // With our assumption, '/' always starts a comment. Determine comment type:
-        start =
-            charCodeAfterSlash === 47 /*"/"*/
-                ? code.indexOf('\n', start) + 1
-                : code.indexOf('*/', start) + 2;
-        if (start > searchPos) {
-            searchPos = code.indexOf(searchString, start);
-        }
+/* eslint sort-keys: "off" */
+const ValueProperties = Symbol('Value Properties');
+const PURE = {
+    hasEffectsWhenCalled() {
+        return false;
     }
-}
-const NON_WHITESPACE = /\S/g;
-function findNonWhiteSpace(code, index) {
-    NON_WHITESPACE.lastIndex = index;
-    const result = NON_WHITESPACE.exec(code);
-    return result.index;
-}
-// This assumes "code" only contains white-space and comments
-// Returns position of line-comment if applicable
-function findFirstLineBreakOutsideComment(code) {
-    let lineBreakPos, charCodeAfterSlash, start = 0;
-    lineBreakPos = code.indexOf('\n', start);
-    while (true) {
-        start = code.indexOf('/', start);
-        if (start === -1 || start > lineBreakPos)
-            return [lineBreakPos, lineBreakPos + 1];
-        // With our assumption, '/' always starts a comment. Determine comment type:
-        charCodeAfterSlash = code.charCodeAt(start + 1);
-        if (charCodeAfterSlash === 47 /*"/"*/)
-            return [start, lineBreakPos + 1];
-        start = code.indexOf('*/', start + 3) + 2;
-        if (start > lineBreakPos) {
-            lineBreakPos = code.indexOf('\n', start);
-        }
+};
+const IMPURE = {
+    hasEffectsWhenCalled() {
+        return true;
     }
-}
-function renderStatementList(statements, code, start, end, options) {
-    let currentNode, currentNodeStart, currentNodeNeedsBoundaries, nextNodeStart;
-    let nextNode = statements[0];
-    let nextNodeNeedsBoundaries = !nextNode.included || nextNode.needsBoundaries;
-    if (nextNodeNeedsBoundaries) {
-        nextNodeStart =
-            start + findFirstLineBreakOutsideComment(code.original.slice(start, nextNode.start))[1];
-    }
-    for (let nextIndex = 1; nextIndex <= statements.length; nextIndex++) {
-        currentNode = nextNode;
-        currentNodeStart = nextNodeStart;
-        currentNodeNeedsBoundaries = nextNodeNeedsBoundaries;
-        nextNode = statements[nextIndex];
-        nextNodeNeedsBoundaries =
-            nextNode === undefined ? false : !nextNode.included || nextNode.needsBoundaries;
-        if (currentNodeNeedsBoundaries || nextNodeNeedsBoundaries) {
-            nextNodeStart =
-                currentNode.end +
-                    findFirstLineBreakOutsideComment(code.original.slice(currentNode.end, nextNode === undefined ? end : nextNode.start))[1];
-            if (currentNode.included) {
-                currentNodeNeedsBoundaries
-                    ? currentNode.render(code, options, {
-                        end: nextNodeStart,
-                        start: currentNodeStart
-                    })
-                    : currentNode.render(code, options);
-            }
-            else {
-                treeshakeNode(currentNode, code, currentNodeStart, nextNodeStart);
-            }
-        }
-        else {
-            currentNode.render(code, options);
-        }
-    }
-}
-// This assumes that the first character is not part of the first node
-function getCommaSeparatedNodesWithBoundaries(nodes, code, start, end) {
-    const splitUpNodes = [];
-    let node, nextNode, nextNodeStart, contentEnd, char;
-    let separator = start - 1;
-    for (let nextIndex = 0; nextIndex < nodes.length; nextIndex++) {
-        nextNode = nodes[nextIndex];
-        if (node !== undefined) {
-            separator =
-                node.end +
-                    findFirstOccurrenceOutsideComment(code.original.slice(node.end, nextNode.start), ',');
-        }
-        nextNodeStart = contentEnd =
-            separator +
-                1 +
-                findFirstLineBreakOutsideComment(code.original.slice(separator + 1, nextNode.start))[1];
-        while (((char = code.original.charCodeAt(nextNodeStart)),
-            char === 32 /*" "*/ || char === 9 /*"\t"*/ || char === 10 /*"\n"*/ || char === 13) /*"\r"*/)
-            nextNodeStart++;
-        if (node !== undefined) {
-            splitUpNodes.push({
-                contentEnd,
-                end: nextNodeStart,
-                node,
-                separator,
-                start
-            });
-        }
-        node = nextNode;
-        start = nextNodeStart;
-    }
-    splitUpNodes.push({
-        contentEnd: end,
-        end,
-        node: node,
-        separator: null,
-        start
-    });
-    return splitUpNodes;
-}
-// This assumes there are only white-space and comments between start and end
-function removeLineBreaks(code, start, end) {
-    while (true) {
-        const [removeStart, removeEnd] = findFirstLineBreakOutsideComment(code.original.slice(start, end));
-        if (removeStart === -1) {
-            break;
-        }
-        code.remove(start + removeStart, (start += removeEnd));
-    }
-}
-
-class BlockScope extends ChildScope {
-    addDeclaration(identifier, context, init, isHoisted) {
-        if (isHoisted) {
-            const variable = this.parent.addDeclaration(identifier, context, init, isHoisted);
-            // Necessary to make sure the init is deoptimized for conditional declarations.
-            // We cannot call deoptimizePath here.
-            variable.markInitializersForDeoptimization();
-            return variable;
-        }
-        else {
-            return super.addDeclaration(identifier, context, init, false);
-        }
-    }
-}
-
-class ExpressionStatement extends NodeBase {
-    initialise() {
-        if (this.directive &&
-            this.directive !== 'use strict' &&
-            this.parent.type === Program$1) {
-            this.context.warn(
-            // This is necessary, because either way (deleting or not) can lead to errors.
-            {
-                code: 'MODULE_LEVEL_DIRECTIVE',
-                message: `Module level directives cause errors when bundled, '${this.directive}' was ignored.`
-            }, this.start);
-        }
-    }
-    render(code, options) {
-        super.render(code, options);
-        if (this.included)
-            this.insertSemicolon(code);
-    }
-    shouldBeIncluded(context) {
-        if (this.directive && this.directive !== 'use strict')
-            return this.parent.type !== Program$1;
-        return super.shouldBeIncluded(context);
-    }
-}
-
-class BlockStatement extends NodeBase {
-    constructor() {
-        super(...arguments);
-        this.directlyIncluded = false;
-    }
-    addImplicitReturnExpressionToScope() {
-        const lastStatement = this.body[this.body.length - 1];
-        if (!lastStatement || lastStatement.type !== ReturnStatement$1) {
-            this.scope.addReturnExpression(UNKNOWN_EXPRESSION);
-        }
-    }
-    createScope(parentScope) {
-        this.scope = this.parent.preventChildBlockScope
-            ? parentScope
-            : new BlockScope(parentScope);
-    }
-    hasEffects(context) {
-        if (this.deoptimizeBody)
-            return true;
-        for (const node of this.body) {
-            if (context.brokenFlow)
-                break;
-            if (node.hasEffects(context))
-                return true;
-        }
-        return false;
-    }
-    include(context, includeChildrenRecursively) {
-        if (!(this.deoptimizeBody && this.directlyIncluded)) {
-            this.included = true;
-            this.directlyIncluded = true;
-            if (this.deoptimizeBody)
-                includeChildrenRecursively = true;
-            for (const node of this.body) {
-                if (includeChildrenRecursively || node.shouldBeIncluded(context))
-                    node.include(context, includeChildrenRecursively);
-            }
-        }
-    }
-    initialise() {
-        const firstBodyStatement = this.body[0];
-        this.deoptimizeBody =
-            firstBodyStatement instanceof ExpressionStatement &&
-                firstBodyStatement.directive === 'use asm';
-    }
-    render(code, options) {
-        if (this.body.length) {
-            renderStatementList(this.body, code, this.start + 1, this.end - 1, options);
-        }
-        else {
-            super.render(code, options);
-        }
-    }
-}
-
-class RestElement extends NodeBase {
-    constructor() {
-        super(...arguments);
-        this.deoptimized = false;
-        this.declarationInit = null;
-    }
-    addExportedVariables(variables, exportNamesByVariable) {
-        this.argument.addExportedVariables(variables, exportNamesByVariable);
-    }
-    declare(kind, init) {
-        this.declarationInit = init;
-        return this.argument.declare(kind, UNKNOWN_EXPRESSION);
-    }
-    deoptimizePath(path) {
-        path.length === 0 && this.argument.deoptimizePath(EMPTY_PATH);
-    }
-    hasEffectsWhenAssignedAtPath(path, context) {
-        return path.length > 0 || this.argument.hasEffectsWhenAssignedAtPath(EMPTY_PATH, context);
-    }
-    markDeclarationReached() {
-        this.argument.markDeclarationReached();
-    }
-    applyDeoptimizations() {
-        this.deoptimized = true;
-        if (this.declarationInit !== null) {
-            this.declarationInit.deoptimizePath([UnknownKey, UnknownKey]);
-            this.context.requestTreeshakingPass();
-        }
-    }
-}
-
-class FunctionBase extends NodeBase {
-    constructor() {
-        super(...arguments);
-        // By default, parameters are included via includeArgumentsWhenCalledAtPath
-        this.alwaysIncludeParameters = false;
-        this.objectEntity = null;
-        this.deoptimizedReturn = false;
-    }
-    deoptimizeCache() {
-        this.alwaysIncludeParameters = true;
-    }
-    deoptimizePath(path) {
-        this.getObjectEntity().deoptimizePath(path);
-        if (path.length === 1 && path[0] === UnknownKey) {
-            // A reassignment of UNKNOWN_PATH is considered equivalent to having lost track
-            // which means the return expression needs to be reassigned
-            this.alwaysIncludeParameters = true;
-            this.scope.getReturnExpression().deoptimizePath(UNKNOWN_PATH);
-        }
-    }
-    deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker) {
-        if (path.length > 0) {
-            this.getObjectEntity().deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker);
-        }
-    }
-    getLiteralValueAtPath(path, recursionTracker, origin) {
-        return this.getObjectEntity().getLiteralValueAtPath(path, recursionTracker, origin);
-    }
-    getReturnExpressionWhenCalledAtPath(path, callOptions, recursionTracker, origin) {
-        if (path.length > 0) {
-            return this.getObjectEntity().getReturnExpressionWhenCalledAtPath(path, callOptions, recursionTracker, origin);
-        }
-        if (this.async) {
-            if (!this.deoptimizedReturn) {
-                this.deoptimizedReturn = true;
-                this.scope.getReturnExpression().deoptimizePath(UNKNOWN_PATH);
-                this.context.requestTreeshakingPass();
-            }
-            return UNKNOWN_EXPRESSION;
-        }
-        return this.scope.getReturnExpression();
-    }
-    hasEffectsWhenAccessedAtPath(path, context) {
-        return this.getObjectEntity().hasEffectsWhenAccessedAtPath(path, context);
-    }
-    hasEffectsWhenAssignedAtPath(path, context) {
-        return this.getObjectEntity().hasEffectsWhenAssignedAtPath(path, context);
-    }
-    hasEffectsWhenCalledAtPath(path, callOptions, context) {
-        if (path.length > 0) {
-            return this.getObjectEntity().hasEffectsWhenCalledAtPath(path, callOptions, context);
-        }
-        if (this.async) {
-            const { propertyReadSideEffects } = this.context.options
-                .treeshake;
-            const returnExpression = this.scope.getReturnExpression();
-            if (returnExpression.hasEffectsWhenCalledAtPath(['then'], { args: NO_ARGS, thisParam: null, withNew: false }, context) ||
-                (propertyReadSideEffects &&
-                    (propertyReadSideEffects === 'always' ||
-                        returnExpression.hasEffectsWhenAccessedAtPath(['then'], context)))) {
-                return true;
-            }
-        }
-        for (const param of this.params) {
-            if (param.hasEffects(context))
-                return true;
-        }
-        return false;
-    }
-    include(context, includeChildrenRecursively) {
-        this.included = true;
-        const { brokenFlow } = context;
-        context.brokenFlow = BROKEN_FLOW_NONE;
-        this.body.include(context, includeChildrenRecursively);
-        context.brokenFlow = brokenFlow;
-        if (includeChildrenRecursively || this.alwaysIncludeParameters) {
-            for (const param of this.params) {
-                param.include(context, includeChildrenRecursively);
-            }
-        }
-    }
-    includeArgumentsWhenCalledAtPath(path, context, args) {
-        var _a;
-        if (path.length === 0) {
-            for (let position = 0; position < this.params.length; position++) {
-                const parameter = this.params[position];
-                if (parameter instanceof AssignmentPattern) {
-                    if (parameter.left.shouldBeIncluded(context)) {
-                        parameter.left.include(context, false);
-                    }
-                    const argumentValue = (_a = args[position]) === null || _a === void 0 ? void 0 : _a.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this);
-                    // If argumentValue === UnknownTruthyValue, then we do not need to
-                    // include the default
-                    if ((argumentValue === undefined || argumentValue === UnknownValue) &&
-                        (this.parameterVariables[position].some(variable => variable.included) ||
-                            parameter.right.shouldBeIncluded(context))) {
-                        parameter.right.include(context, false);
-                    }
-                }
-                else if (parameter.shouldBeIncluded(context)) {
-                    parameter.include(context, false);
-                }
-            }
-            this.scope.includeCallArguments(context, args);
-        }
-        else {
-            this.getObjectEntity().includeArgumentsWhenCalledAtPath(path, context, args);
-        }
-    }
-    initialise() {
-        this.parameterVariables = this.params.map(param => param.declare('parameter', UNKNOWN_EXPRESSION));
-        this.scope.addParameterVariables(this.parameterVariables, this.params[this.params.length - 1] instanceof RestElement);
-        if (this.body instanceof BlockStatement) {
-            this.body.addImplicitReturnExpressionToScope();
-        }
-        else {
-            this.scope.addReturnExpression(this.body);
-        }
-    }
-    parseNode(esTreeNode) {
-        if (esTreeNode.body.type === BlockStatement$1) {
-            this.body = new BlockStatement(esTreeNode.body, this, this.scope.hoistedBodyVarScope);
-        }
-        super.parseNode(esTreeNode);
-    }
-}
-FunctionBase.prototype.preventChildBlockScope = true;
-
-class ArrowFunctionExpression extends FunctionBase {
-    constructor() {
-        super(...arguments);
-        this.objectEntity = null;
-    }
-    createScope(parentScope) {
-        this.scope = new ReturnValueScope(parentScope, this.context);
-    }
-    hasEffects() {
-        return false;
-    }
-    hasEffectsWhenCalledAtPath(path, callOptions, context) {
-        if (super.hasEffectsWhenCalledAtPath(path, callOptions, context))
-            return true;
-        const { ignore, brokenFlow } = context;
-        context.ignore = {
-            breaks: false,
-            continues: false,
-            labels: new Set(),
-            returnYield: true
-        };
-        if (this.body.hasEffects(context))
-            return true;
-        context.ignore = ignore;
-        context.brokenFlow = brokenFlow;
-        return false;
-    }
-    getObjectEntity() {
-        if (this.objectEntity !== null) {
-            return this.objectEntity;
-        }
-        return (this.objectEntity = new ObjectEntity([], OBJECT_PROTOTYPE));
-    }
-}
-
-function getSystemExportStatement(exportedVariables, { exportNamesByVariable, snippets: { _, getObject, getPropertyAccess } }, modifier = '') {
-    if (exportedVariables.length === 1 &&
-        exportNamesByVariable.get(exportedVariables[0]).length === 1) {
-        const variable = exportedVariables[0];
-        return `exports('${exportNamesByVariable.get(variable)}',${_}${variable.getName(getPropertyAccess)}${modifier})`;
-    }
-    else {
-        const fields = [];
-        for (const variable of exportedVariables) {
-            for (const exportName of exportNamesByVariable.get(variable)) {
-                fields.push([exportName, variable.getName(getPropertyAccess) + modifier]);
-            }
-        }
-        return `exports(${getObject(fields, { lineBreakIndent: null })})`;
-    }
-}
-function renderSystemExportExpression(exportedVariable, expressionStart, expressionEnd, code, { exportNamesByVariable, snippets: { _ } }) {
-    code.prependRight(expressionStart, `exports('${exportNamesByVariable.get(exportedVariable)}',${_}`);
-    code.appendLeft(expressionEnd, ')');
-}
-function renderSystemExportFunction(exportedVariables, expressionStart, expressionEnd, needsParens, code, options) {
-    const { _, getDirectReturnIifeLeft } = options.snippets;
-    code.prependRight(expressionStart, getDirectReturnIifeLeft(['v'], `${getSystemExportStatement(exportedVariables, options)},${_}v`, { needsArrowReturnParens: true, needsWrappedFunction: needsParens }));
-    code.appendLeft(expressionEnd, ')');
-}
-function renderSystemExportSequenceAfterExpression(exportedVariable, expressionStart, expressionEnd, needsParens, code, options) {
-    const { _, getPropertyAccess } = options.snippets;
-    code.appendLeft(expressionEnd, `,${_}${getSystemExportStatement([exportedVariable], options)},${_}${exportedVariable.getName(getPropertyAccess)}`);
-    if (needsParens) {
-        code.prependRight(expressionStart, '(');
-        code.appendLeft(expressionEnd, ')');
-    }
-}
-function renderSystemExportSequenceBeforeExpression(exportedVariable, expressionStart, expressionEnd, needsParens, code, options, modifier) {
-    const { _ } = options.snippets;
-    code.prependRight(expressionStart, `${getSystemExportStatement([exportedVariable], options, modifier)},${_}`);
-    if (needsParens) {
-        code.prependRight(expressionStart, '(');
-        code.appendLeft(expressionEnd, ')');
-    }
-}
-
-//@ts-check
-/** @typedef { import('estree').Node} Node */
-/** @typedef {Node | {
- *   type: 'PropertyDefinition';
- *   computed: boolean;
- *   value: Node
- * }} NodeWithPropertyDefinition */
-
-/**
- *
- * @param {NodeWithPropertyDefinition} node
- * @param {NodeWithPropertyDefinition} parent
- * @returns boolean
- */
-function is_reference (node, parent) {
-	if (node.type === 'MemberExpression') {
-		return !node.computed && is_reference(node.object, node);
-	}
-
-	if (node.type === 'Identifier') {
-		if (!parent) return true;
-
-		switch (parent.type) {
-			// disregard `bar` in `foo.bar`
-			case 'MemberExpression': return parent.computed || node === parent.object;
-
-			// disregard the `foo` in `class {foo(){}}` but keep it in `class {[foo](){}}`
-			case 'MethodDefinition': return parent.computed;
-
-			// disregard the `foo` in `class {foo=bar}` but keep it in `class {[foo]=bar}` and `class {bar=foo}`
-			case 'PropertyDefinition': return parent.computed || node === parent.value;
-
-			// disregard the `bar` in `{ bar: foo }`, but keep it in `{ [bar]: foo }`
-			case 'Property': return parent.computed || node === parent.value;
-
-			// disregard the `bar` in `export { foo as bar }` or
-			// the foo in `import { foo as bar }`
-			case 'ExportSpecifier':
-			case 'ImportSpecifier': return node === parent.local;
-
-			// disregard the `foo` in `foo: while (...) { ... break foo; ... continue foo;}`
-			case 'LabeledStatement':
-			case 'BreakStatement':
-			case 'ContinueStatement': return false;
-			default: return true;
-		}
-	}
-
-	return false;
-}
-
-/* eslint sort-keys: "off" */
-const ValueProperties = Symbol('Value Properties');
-const PURE = {
-    hasEffectsWhenCalled() {
-        return false;
-    }
-};
-const IMPURE = {
-    hasEffectsWhenCalled() {
-        return true;
-    }
-};
-// We use shortened variables to reduce file size here
-/* OBJECT */
-const O = {
-    __proto__: null,
-    [ValueProperties]: IMPURE
-};
-/* PURE FUNCTION */
-const PF = {
-    __proto__: null,
-    [ValueProperties]: PURE
-};
-/* FUNCTION THAT MUTATES FIRST ARG WITHOUT TRIGGERING ACCESSORS */
-const MUTATES_ARG_WITHOUT_ACCESSOR = {
-    __proto__: null,
-    [ValueProperties]: {
-        hasEffectsWhenCalled(callOptions, context) {
-            return (!callOptions.args.length ||
-                callOptions.args[0].hasEffectsWhenAssignedAtPath(UNKNOWN_NON_ACCESSOR_PATH, context));
-        }
+};
+// We use shortened variables to reduce file size here
+/* OBJECT */
+const O = {
+    __proto__: null,
+    [ValueProperties]: IMPURE
+};
+/* PURE FUNCTION */
+const PF = {
+    __proto__: null,
+    [ValueProperties]: PURE
+};
+/* FUNCTION THAT MUTATES FIRST ARG WITHOUT TRIGGERING ACCESSORS */
+const MUTATES_ARG_WITHOUT_ACCESSOR = {
+    __proto__: null,
+    [ValueProperties]: {
+        hasEffectsWhenCalled(callOptions, context) {
+            return (!callOptions.args.length ||
+                callOptions.args[0].hasEffectsWhenAssignedAtPath(UNKNOWN_NON_ACCESSOR_PATH, context));
+        }
     }
 };
 /* CONSTRUCTOR */
@@ -7957,222 +7388,682 @@ const knownGlobals = {
 for (const global of ['window', 'global', 'self', 'globalThis']) {
     knownGlobals[global] = knownGlobals;
 }
-function getGlobalAtPath(path) {
-    let currentGlobal = knownGlobals;
-    for (const pathSegment of path) {
-        if (typeof pathSegment !== 'string') {
-            return null;
+function getGlobalAtPath(path) {
+    let currentGlobal = knownGlobals;
+    for (const pathSegment of path) {
+        if (typeof pathSegment !== 'string') {
+            return null;
+        }
+        currentGlobal = currentGlobal[pathSegment];
+        if (!currentGlobal) {
+            return null;
+        }
+    }
+    return currentGlobal[ValueProperties];
+}
+
+class GlobalVariable extends Variable {
+    constructor() {
+        super(...arguments);
+        // Ensure we use live-bindings for globals as we do not know if they have
+        // been reassigned
+        this.isReassigned = true;
+    }
+    hasEffectsWhenAccessedAtPath(path) {
+        if (path.length === 0) {
+            // Technically, "undefined" is a global variable of sorts
+            return this.name !== 'undefined' && getGlobalAtPath([this.name]) === null;
+        }
+        return getGlobalAtPath([this.name, ...path].slice(0, -1)) === null;
+    }
+    hasEffectsWhenCalledAtPath(path, callOptions, context) {
+        const globalAtPath = getGlobalAtPath([this.name, ...path]);
+        return globalAtPath === null || globalAtPath.hasEffectsWhenCalled(callOptions, context);
+    }
+}
+
+const tdzVariableKinds = {
+    __proto__: null,
+    class: true,
+    const: true,
+    let: true,
+    var: true
+};
+class Identifier extends NodeBase {
+    constructor() {
+        super(...arguments);
+        this.variable = null;
+        this.deoptimized = false;
+        this.isTDZAccess = null;
+    }
+    addExportedVariables(variables, exportNamesByVariable) {
+        if (this.variable !== null && exportNamesByVariable.has(this.variable)) {
+            variables.push(this.variable);
+        }
+    }
+    bind() {
+        if (this.variable === null && is_reference(this, this.parent)) {
+            this.variable = this.scope.findVariable(this.name);
+            this.variable.addReference(this);
+        }
+    }
+    declare(kind, init) {
+        let variable;
+        const { treeshake } = this.context.options;
+        switch (kind) {
+            case 'var':
+                variable = this.scope.addDeclaration(this, this.context, init, true);
+                if (treeshake && treeshake.correctVarValueBeforeDeclaration) {
+                    // Necessary to make sure the init is deoptimized. We cannot call deoptimizePath here.
+                    variable.markInitializersForDeoptimization();
+                }
+                break;
+            case 'function':
+                // in strict mode, functions are only hoisted within a scope but not across block scopes
+                variable = this.scope.addDeclaration(this, this.context, init, false);
+                break;
+            case 'let':
+            case 'const':
+            case 'class':
+                variable = this.scope.addDeclaration(this, this.context, init, false);
+                break;
+            case 'parameter':
+                variable = this.scope.addParameterDeclaration(this);
+                break;
+            /* istanbul ignore next */
+            default:
+                /* istanbul ignore next */
+                throw new Error(`Internal Error: Unexpected identifier kind ${kind}.`);
+        }
+        variable.kind = kind;
+        return [(this.variable = variable)];
+    }
+    deoptimizePath(path) {
+        if (path.length === 0 && !this.scope.contains(this.name)) {
+            this.disallowImportReassignment();
+        }
+        this.variable.deoptimizePath(path);
+    }
+    deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker) {
+        this.variable.deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker);
+    }
+    getLiteralValueAtPath(path, recursionTracker, origin) {
+        return this.getVariableRespectingTDZ().getLiteralValueAtPath(path, recursionTracker, origin);
+    }
+    getReturnExpressionWhenCalledAtPath(path, callOptions, recursionTracker, origin) {
+        return this.getVariableRespectingTDZ().getReturnExpressionWhenCalledAtPath(path, callOptions, recursionTracker, origin);
+    }
+    hasEffects() {
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        if (this.isPossibleTDZ() && this.variable.kind !== 'var') {
+            return true;
+        }
+        return (this.context.options.treeshake.unknownGlobalSideEffects &&
+            this.variable instanceof GlobalVariable &&
+            this.variable.hasEffectsWhenAccessedAtPath(EMPTY_PATH));
+    }
+    hasEffectsWhenAccessedAtPath(path, context) {
+        return (this.variable !== null &&
+            this.getVariableRespectingTDZ().hasEffectsWhenAccessedAtPath(path, context));
+    }
+    hasEffectsWhenAssignedAtPath(path, context) {
+        return (!this.variable ||
+            (path.length > 0
+                ? this.getVariableRespectingTDZ()
+                : this.variable).hasEffectsWhenAssignedAtPath(path, context));
+    }
+    hasEffectsWhenCalledAtPath(path, callOptions, context) {
+        return (!this.variable ||
+            this.getVariableRespectingTDZ().hasEffectsWhenCalledAtPath(path, callOptions, context));
+    }
+    include() {
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        if (!this.included) {
+            this.included = true;
+            if (this.variable !== null) {
+                this.context.includeVariableInModule(this.variable);
+            }
+        }
+    }
+    includeCallArguments(context, args) {
+        this.getVariableRespectingTDZ().includeCallArguments(context, args);
+    }
+    isPossibleTDZ() {
+        // return cached value to avoid issues with the next tree-shaking pass
+        if (this.isTDZAccess !== null)
+            return this.isTDZAccess;
+        if (!(this.variable instanceof LocalVariable) ||
+            !this.variable.kind ||
+            !(this.variable.kind in tdzVariableKinds)) {
+            return (this.isTDZAccess = false);
+        }
+        let decl_id;
+        if (this.variable.declarations &&
+            this.variable.declarations.length === 1 &&
+            (decl_id = this.variable.declarations[0]) &&
+            this.start < decl_id.start &&
+            closestParentFunctionOrProgram(this) === closestParentFunctionOrProgram(decl_id)) {
+            // a variable accessed before its declaration
+            // in the same function or at top level of module
+            return (this.isTDZAccess = true);
+        }
+        if (!this.variable.initReached) {
+            // Either a const/let TDZ violation or
+            // var use before declaration was encountered.
+            return (this.isTDZAccess = true);
+        }
+        return (this.isTDZAccess = false);
+    }
+    markDeclarationReached() {
+        this.variable.initReached = true;
+    }
+    render(code, { snippets: { getPropertyAccess } }, { renderedParentType, isCalleeOfRenderedParent, isShorthandProperty } = BLANK) {
+        if (this.variable) {
+            const name = this.variable.getName(getPropertyAccess);
+            if (name !== this.name) {
+                code.overwrite(this.start, this.end, name, {
+                    contentOnly: true,
+                    storeName: true
+                });
+                if (isShorthandProperty) {
+                    code.prependRight(this.start, `${this.name}: `);
+                }
+            }
+            // In strict mode, any variable named "eval" must be the actual "eval" function
+            if (name === 'eval' &&
+                renderedParentType === CallExpression$1 &&
+                isCalleeOfRenderedParent) {
+                code.appendRight(this.start, '0, ');
+            }
+        }
+    }
+    applyDeoptimizations() {
+        this.deoptimized = true;
+        if (this.variable !== null && this.variable instanceof LocalVariable) {
+            this.variable.consolidateInitializers();
+            this.context.requestTreeshakingPass();
+        }
+    }
+    disallowImportReassignment() {
+        return this.context.error({
+            code: 'ILLEGAL_REASSIGNMENT',
+            message: `Illegal reassignment to import '${this.name}'`
+        }, this.start);
+    }
+    getVariableRespectingTDZ() {
+        if (this.isPossibleTDZ()) {
+            return UNKNOWN_EXPRESSION;
+        }
+        return this.variable;
+    }
+}
+function closestParentFunctionOrProgram(node) {
+    while (node && !/^Program|Function/.test(node.type)) {
+        node = node.parent;
+    }
+    // one of: ArrowFunctionExpression, FunctionDeclaration, FunctionExpression or Program
+    return node;
+}
+
+function treeshakeNode(node, code, start, end) {
+    code.remove(start, end);
+    if (node.annotations) {
+        for (const annotation of node.annotations) {
+            if (annotation.start < start) {
+                code.remove(annotation.start, annotation.end);
+            }
+            else {
+                return;
+            }
+        }
+    }
+}
+function removeAnnotations(node, code) {
+    if (!node.annotations && node.parent.type === ExpressionStatement$1) {
+        node = node.parent;
+    }
+    if (node.annotations) {
+        for (const annotation of node.annotations) {
+            code.remove(annotation.start, annotation.end);
+        }
+    }
+}
+
+const NO_SEMICOLON = { isNoStatement: true };
+// This assumes there are only white-space and comments between start and the string we are looking for
+function findFirstOccurrenceOutsideComment(code, searchString, start = 0) {
+    let searchPos, charCodeAfterSlash;
+    searchPos = code.indexOf(searchString, start);
+    while (true) {
+        start = code.indexOf('/', start);
+        if (start === -1 || start >= searchPos)
+            return searchPos;
+        charCodeAfterSlash = code.charCodeAt(++start);
+        ++start;
+        // With our assumption, '/' always starts a comment. Determine comment type:
+        start =
+            charCodeAfterSlash === 47 /*"/"*/
+                ? code.indexOf('\n', start) + 1
+                : code.indexOf('*/', start) + 2;
+        if (start > searchPos) {
+            searchPos = code.indexOf(searchString, start);
+        }
+    }
+}
+const NON_WHITESPACE = /\S/g;
+function findNonWhiteSpace(code, index) {
+    NON_WHITESPACE.lastIndex = index;
+    const result = NON_WHITESPACE.exec(code);
+    return result.index;
+}
+// This assumes "code" only contains white-space and comments
+// Returns position of line-comment if applicable
+function findFirstLineBreakOutsideComment(code) {
+    let lineBreakPos, charCodeAfterSlash, start = 0;
+    lineBreakPos = code.indexOf('\n', start);
+    while (true) {
+        start = code.indexOf('/', start);
+        if (start === -1 || start > lineBreakPos)
+            return [lineBreakPos, lineBreakPos + 1];
+        // With our assumption, '/' always starts a comment. Determine comment type:
+        charCodeAfterSlash = code.charCodeAt(start + 1);
+        if (charCodeAfterSlash === 47 /*"/"*/)
+            return [start, lineBreakPos + 1];
+        start = code.indexOf('*/', start + 3) + 2;
+        if (start > lineBreakPos) {
+            lineBreakPos = code.indexOf('\n', start);
         }
-        currentGlobal = currentGlobal[pathSegment];
-        if (!currentGlobal) {
-            return null;
+    }
+}
+function renderStatementList(statements, code, start, end, options) {
+    let currentNode, currentNodeStart, currentNodeNeedsBoundaries, nextNodeStart;
+    let nextNode = statements[0];
+    let nextNodeNeedsBoundaries = !nextNode.included || nextNode.needsBoundaries;
+    if (nextNodeNeedsBoundaries) {
+        nextNodeStart =
+            start + findFirstLineBreakOutsideComment(code.original.slice(start, nextNode.start))[1];
+    }
+    for (let nextIndex = 1; nextIndex <= statements.length; nextIndex++) {
+        currentNode = nextNode;
+        currentNodeStart = nextNodeStart;
+        currentNodeNeedsBoundaries = nextNodeNeedsBoundaries;
+        nextNode = statements[nextIndex];
+        nextNodeNeedsBoundaries =
+            nextNode === undefined ? false : !nextNode.included || nextNode.needsBoundaries;
+        if (currentNodeNeedsBoundaries || nextNodeNeedsBoundaries) {
+            nextNodeStart =
+                currentNode.end +
+                    findFirstLineBreakOutsideComment(code.original.slice(currentNode.end, nextNode === undefined ? end : nextNode.start))[1];
+            if (currentNode.included) {
+                currentNodeNeedsBoundaries
+                    ? currentNode.render(code, options, {
+                        end: nextNodeStart,
+                        start: currentNodeStart
+                    })
+                    : currentNode.render(code, options);
+            }
+            else {
+                treeshakeNode(currentNode, code, currentNodeStart, nextNodeStart);
+            }
+        }
+        else {
+            currentNode.render(code, options);
         }
     }
-    return currentGlobal[ValueProperties];
+}
+// This assumes that the first character is not part of the first node
+function getCommaSeparatedNodesWithBoundaries(nodes, code, start, end) {
+    const splitUpNodes = [];
+    let node, nextNode, nextNodeStart, contentEnd, char;
+    let separator = start - 1;
+    for (let nextIndex = 0; nextIndex < nodes.length; nextIndex++) {
+        nextNode = nodes[nextIndex];
+        if (node !== undefined) {
+            separator =
+                node.end +
+                    findFirstOccurrenceOutsideComment(code.original.slice(node.end, nextNode.start), ',');
+        }
+        nextNodeStart = contentEnd =
+            separator +
+                1 +
+                findFirstLineBreakOutsideComment(code.original.slice(separator + 1, nextNode.start))[1];
+        while (((char = code.original.charCodeAt(nextNodeStart)),
+            char === 32 /*" "*/ || char === 9 /*"\t"*/ || char === 10 /*"\n"*/ || char === 13) /*"\r"*/)
+            nextNodeStart++;
+        if (node !== undefined) {
+            splitUpNodes.push({
+                contentEnd,
+                end: nextNodeStart,
+                node,
+                separator,
+                start
+            });
+        }
+        node = nextNode;
+        start = nextNodeStart;
+    }
+    splitUpNodes.push({
+        contentEnd: end,
+        end,
+        node: node,
+        separator: null,
+        start
+    });
+    return splitUpNodes;
+}
+// This assumes there are only white-space and comments between start and end
+function removeLineBreaks(code, start, end) {
+    while (true) {
+        const [removeStart, removeEnd] = findFirstLineBreakOutsideComment(code.original.slice(start, end));
+        if (removeStart === -1) {
+            break;
+        }
+        code.remove(start + removeStart, (start += removeEnd));
+    }
 }
 
-class GlobalVariable extends Variable {
+class BlockScope extends ChildScope {
+    addDeclaration(identifier, context, init, isHoisted) {
+        if (isHoisted) {
+            const variable = this.parent.addDeclaration(identifier, context, init, isHoisted);
+            // Necessary to make sure the init is deoptimized for conditional declarations.
+            // We cannot call deoptimizePath here.
+            variable.markInitializersForDeoptimization();
+            return variable;
+        }
+        else {
+            return super.addDeclaration(identifier, context, init, false);
+        }
+    }
+}
+
+class ExpressionStatement extends NodeBase {
+    initialise() {
+        if (this.directive &&
+            this.directive !== 'use strict' &&
+            this.parent.type === Program$1) {
+            this.context.warn(
+            // This is necessary, because either way (deleting or not) can lead to errors.
+            {
+                code: 'MODULE_LEVEL_DIRECTIVE',
+                message: `Module level directives cause errors when bundled, '${this.directive}' was ignored.`
+            }, this.start);
+        }
+    }
+    render(code, options) {
+        super.render(code, options);
+        if (this.included)
+            this.insertSemicolon(code);
+    }
+    shouldBeIncluded(context) {
+        if (this.directive && this.directive !== 'use strict')
+            return this.parent.type !== Program$1;
+        return super.shouldBeIncluded(context);
+    }
+}
+
+class BlockStatement extends NodeBase {
     constructor() {
         super(...arguments);
-        // Ensure we use live-bindings for globals as we do not know if they have
-        // been reassigned
-        this.isReassigned = true;
+        this.directlyIncluded = false;
+    }
+    addImplicitReturnExpressionToScope() {
+        const lastStatement = this.body[this.body.length - 1];
+        if (!lastStatement || lastStatement.type !== ReturnStatement$1) {
+            this.scope.addReturnExpression(UNKNOWN_EXPRESSION);
+        }
     }
-    getLiteralValueAtPath(path, _recursionTracker, _origin) {
-        return getGlobalAtPath([this.name, ...path]) ? UnknownTruthyValue : UnknownValue;
+    createScope(parentScope) {
+        this.scope = this.parent.preventChildBlockScope
+            ? parentScope
+            : new BlockScope(parentScope);
     }
-    hasEffectsWhenAccessedAtPath(path) {
-        if (path.length === 0) {
-            // Technically, "undefined" is a global variable of sorts
-            return this.name !== 'undefined' && !getGlobalAtPath([this.name]);
+    hasEffects(context) {
+        if (this.deoptimizeBody)
+            return true;
+        for (const node of this.body) {
+            if (context.brokenFlow)
+                break;
+            if (node.hasEffects(context))
+                return true;
         }
-        return !getGlobalAtPath([this.name, ...path].slice(0, -1));
+        return false;
     }
-    hasEffectsWhenCalledAtPath(path, callOptions, context) {
-        const globalAtPath = getGlobalAtPath([this.name, ...path]);
-        return !globalAtPath || globalAtPath.hasEffectsWhenCalled(callOptions, context);
+    include(context, includeChildrenRecursively) {
+        if (!(this.deoptimizeBody && this.directlyIncluded)) {
+            this.included = true;
+            this.directlyIncluded = true;
+            if (this.deoptimizeBody)
+                includeChildrenRecursively = true;
+            for (const node of this.body) {
+                if (includeChildrenRecursively || node.shouldBeIncluded(context))
+                    node.include(context, includeChildrenRecursively);
+            }
+        }
+    }
+    initialise() {
+        const firstBodyStatement = this.body[0];
+        this.deoptimizeBody =
+            firstBodyStatement instanceof ExpressionStatement &&
+                firstBodyStatement.directive === 'use asm';
+    }
+    render(code, options) {
+        if (this.body.length) {
+            renderStatementList(this.body, code, this.start + 1, this.end - 1, options);
+        }
+        else {
+            super.render(code, options);
+        }
     }
 }
 
-const tdzVariableKinds = {
-    __proto__: null,
-    class: true,
-    const: true,
-    let: true,
-    var: true
-};
-class Identifier extends NodeBase {
+class RestElement extends NodeBase {
     constructor() {
         super(...arguments);
-        this.variable = null;
         this.deoptimized = false;
-        this.isTDZAccess = null;
+        this.declarationInit = null;
     }
     addExportedVariables(variables, exportNamesByVariable) {
-        if (exportNamesByVariable.has(this.variable)) {
-            variables.push(this.variable);
-        }
+        this.argument.addExportedVariables(variables, exportNamesByVariable);
     }
-    bind() {
-        if (!this.variable && is_reference(this, this.parent)) {
-            this.variable = this.scope.findVariable(this.name);
-            this.variable.addReference(this);
+    declare(kind, init) {
+        this.declarationInit = init;
+        return this.argument.declare(kind, UNKNOWN_EXPRESSION);
+    }
+    deoptimizePath(path) {
+        path.length === 0 && this.argument.deoptimizePath(EMPTY_PATH);
+    }
+    hasEffectsWhenAssignedAtPath(path, context) {
+        return path.length > 0 || this.argument.hasEffectsWhenAssignedAtPath(EMPTY_PATH, context);
+    }
+    markDeclarationReached() {
+        this.argument.markDeclarationReached();
+    }
+    applyDeoptimizations() {
+        this.deoptimized = true;
+        if (this.declarationInit !== null) {
+            this.declarationInit.deoptimizePath([UnknownKey, UnknownKey]);
+            this.context.requestTreeshakingPass();
         }
     }
-    declare(kind, init) {
-        let variable;
-        const { treeshake } = this.context.options;
-        switch (kind) {
-            case 'var':
-                variable = this.scope.addDeclaration(this, this.context, init, true);
-                if (treeshake && treeshake.correctVarValueBeforeDeclaration) {
-                    // Necessary to make sure the init is deoptimized. We cannot call deoptimizePath here.
-                    variable.markInitializersForDeoptimization();
-                }
-                break;
-            case 'function':
-                // in strict mode, functions are only hoisted within a scope but not across block scopes
-                variable = this.scope.addDeclaration(this, this.context, init, false);
-                break;
-            case 'let':
-            case 'const':
-            case 'class':
-                variable = this.scope.addDeclaration(this, this.context, init, false);
-                break;
-            case 'parameter':
-                variable = this.scope.addParameterDeclaration(this);
-                break;
-            /* istanbul ignore next */
-            default:
-                /* istanbul ignore next */
-                throw new Error(`Internal Error: Unexpected identifier kind ${kind}.`);
-        }
-        variable.kind = kind;
-        return [(this.variable = variable)];
+}
+
+class FunctionBase extends NodeBase {
+    constructor() {
+        super(...arguments);
+        this.objectEntity = null;
+        this.deoptimizedReturn = false;
     }
     deoptimizePath(path) {
-        if (path.length === 0 && !this.scope.contains(this.name)) {
-            this.disallowImportReassignment();
+        this.getObjectEntity().deoptimizePath(path);
+        if (path.length === 1 && path[0] === UnknownKey) {
+            // A reassignment of UNKNOWN_PATH is considered equivalent to having lost track
+            // which means the return expression needs to be reassigned
+            this.scope.getReturnExpression().deoptimizePath(UNKNOWN_PATH);
         }
-        this.variable.deoptimizePath(path);
     }
     deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker) {
-        this.variable.deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker);
+        if (path.length > 0) {
+            this.getObjectEntity().deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker);
+        }
     }
     getLiteralValueAtPath(path, recursionTracker, origin) {
-        return this.getVariableRespectingTDZ().getLiteralValueAtPath(path, recursionTracker, origin);
+        return this.getObjectEntity().getLiteralValueAtPath(path, recursionTracker, origin);
     }
     getReturnExpressionWhenCalledAtPath(path, callOptions, recursionTracker, origin) {
-        return this.getVariableRespectingTDZ().getReturnExpressionWhenCalledAtPath(path, callOptions, recursionTracker, origin);
-    }
-    hasEffects() {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
-        if (this.isPossibleTDZ() && this.variable.kind !== 'var') {
-            return true;
+        if (path.length > 0) {
+            return this.getObjectEntity().getReturnExpressionWhenCalledAtPath(path, callOptions, recursionTracker, origin);
         }
-        return (this.context.options.treeshake.unknownGlobalSideEffects &&
-            this.variable instanceof GlobalVariable &&
-            this.variable.hasEffectsWhenAccessedAtPath(EMPTY_PATH));
+        if (this.async) {
+            if (!this.deoptimizedReturn) {
+                this.deoptimizedReturn = true;
+                this.scope.getReturnExpression().deoptimizePath(UNKNOWN_PATH);
+                this.context.requestTreeshakingPass();
+            }
+            return UNKNOWN_EXPRESSION;
+        }
+        return this.scope.getReturnExpression();
     }
     hasEffectsWhenAccessedAtPath(path, context) {
-        var _a;
-        return (_a = this.getVariableRespectingTDZ()) === null || _a === void 0 ? void 0 : _a.hasEffectsWhenAccessedAtPath(path, context);
+        return this.getObjectEntity().hasEffectsWhenAccessedAtPath(path, context);
     }
     hasEffectsWhenAssignedAtPath(path, context) {
-        return (path.length > 0 ? this.getVariableRespectingTDZ() : this.variable).hasEffectsWhenAssignedAtPath(path, context);
+        return this.getObjectEntity().hasEffectsWhenAssignedAtPath(path, context);
     }
     hasEffectsWhenCalledAtPath(path, callOptions, context) {
-        return this.getVariableRespectingTDZ().hasEffectsWhenCalledAtPath(path, callOptions, context);
-    }
-    include() {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
-        if (!this.included) {
-            this.included = true;
-            if (this.variable !== null) {
-                this.context.includeVariableInModule(this.variable);
+        if (path.length > 0) {
+            return this.getObjectEntity().hasEffectsWhenCalledAtPath(path, callOptions, context);
+        }
+        if (this.async) {
+            const { propertyReadSideEffects } = this.context.options
+                .treeshake;
+            const returnExpression = this.scope.getReturnExpression();
+            if (returnExpression.hasEffectsWhenCalledAtPath(['then'], { args: NO_ARGS, thisParam: null, withNew: false }, context) ||
+                (propertyReadSideEffects &&
+                    (propertyReadSideEffects === 'always' ||
+                        returnExpression.hasEffectsWhenAccessedAtPath(['then'], context)))) {
+                return true;
             }
         }
+        for (const param of this.params) {
+            if (param.hasEffects(context))
+                return true;
+        }
+        return false;
     }
-    includeArgumentsWhenCalledAtPath(path, context, args) {
-        this.variable.includeArgumentsWhenCalledAtPath(path, context, args);
+    include(context, includeChildrenRecursively) {
+        this.included = true;
+        const { brokenFlow } = context;
+        context.brokenFlow = BROKEN_FLOW_NONE;
+        this.body.include(context, includeChildrenRecursively);
+        context.brokenFlow = brokenFlow;
     }
-    isPossibleTDZ() {
-        // return cached value to avoid issues with the next tree-shaking pass
-        if (this.isTDZAccess !== null)
-            return this.isTDZAccess;
-        if (!(this.variable instanceof LocalVariable) ||
-            !this.variable.kind ||
-            !(this.variable.kind in tdzVariableKinds)) {
-            return (this.isTDZAccess = false);
+    includeCallArguments(context, args) {
+        this.scope.includeCallArguments(context, args);
+    }
+    initialise() {
+        this.scope.addParameterVariables(this.params.map(param => param.declare('parameter', UNKNOWN_EXPRESSION)), this.params[this.params.length - 1] instanceof RestElement);
+        if (this.body instanceof BlockStatement) {
+            this.body.addImplicitReturnExpressionToScope();
         }
-        let decl_id;
-        if (this.variable.declarations &&
-            this.variable.declarations.length === 1 &&
-            (decl_id = this.variable.declarations[0]) &&
-            this.start < decl_id.start &&
-            closestParentFunctionOrProgram(this) === closestParentFunctionOrProgram(decl_id)) {
-            // a variable accessed before its declaration
-            // in the same function or at top level of module
-            return (this.isTDZAccess = true);
+        else {
+            this.scope.addReturnExpression(this.body);
         }
-        if (!this.variable.initReached) {
-            // Either a const/let TDZ violation or
-            // var use before declaration was encountered.
-            return (this.isTDZAccess = true);
+    }
+    parseNode(esTreeNode) {
+        if (esTreeNode.body.type === BlockStatement$1) {
+            this.body = new BlockStatement(esTreeNode.body, this, this.scope.hoistedBodyVarScope);
         }
-        return (this.isTDZAccess = false);
+        super.parseNode(esTreeNode);
     }
-    markDeclarationReached() {
-        this.variable.initReached = true;
+}
+FunctionBase.prototype.preventChildBlockScope = true;
+
+class ArrowFunctionExpression extends FunctionBase {
+    constructor() {
+        super(...arguments);
+        this.objectEntity = null;
     }
-    render(code, { snippets: { getPropertyAccess } }, { renderedParentType, isCalleeOfRenderedParent, isShorthandProperty } = BLANK) {
-        if (this.variable) {
-            const name = this.variable.getName(getPropertyAccess);
-            if (name !== this.name) {
-                code.overwrite(this.start, this.end, name, {
-                    contentOnly: true,
-                    storeName: true
-                });
-                if (isShorthandProperty) {
-                    code.prependRight(this.start, `${this.name}: `);
-                }
-            }
-            // In strict mode, any variable named "eval" must be the actual "eval" function
-            if (name === 'eval' &&
-                renderedParentType === CallExpression$1 &&
-                isCalleeOfRenderedParent) {
-                code.appendRight(this.start, '0, ');
+    createScope(parentScope) {
+        this.scope = new ReturnValueScope(parentScope, this.context);
+    }
+    hasEffects() {
+        return false;
+    }
+    hasEffectsWhenCalledAtPath(path, callOptions, context) {
+        if (super.hasEffectsWhenCalledAtPath(path, callOptions, context))
+            return true;
+        const { ignore, brokenFlow } = context;
+        context.ignore = {
+            breaks: false,
+            continues: false,
+            labels: new Set(),
+            returnYield: true
+        };
+        if (this.body.hasEffects(context))
+            return true;
+        context.ignore = ignore;
+        context.brokenFlow = brokenFlow;
+        return false;
+    }
+    include(context, includeChildrenRecursively) {
+        super.include(context, includeChildrenRecursively);
+        for (const param of this.params) {
+            if (!(param instanceof Identifier)) {
+                param.include(context, includeChildrenRecursively);
             }
         }
     }
-    applyDeoptimizations() {
-        this.deoptimized = true;
-        if (this.variable instanceof LocalVariable) {
-            this.variable.consolidateInitializers();
-            this.context.requestTreeshakingPass();
+    getObjectEntity() {
+        if (this.objectEntity !== null) {
+            return this.objectEntity;
         }
+        return (this.objectEntity = new ObjectEntity([], OBJECT_PROTOTYPE));
     }
-    disallowImportReassignment() {
-        return this.context.error({
-            code: 'ILLEGAL_REASSIGNMENT',
-            message: `Illegal reassignment to import '${this.name}'`
-        }, this.start);
+}
+
+function getSystemExportStatement(exportedVariables, { exportNamesByVariable, snippets: { _, getObject, getPropertyAccess } }, modifier = '') {
+    if (exportedVariables.length === 1 &&
+        exportNamesByVariable.get(exportedVariables[0]).length === 1) {
+        const variable = exportedVariables[0];
+        return `exports('${exportNamesByVariable.get(variable)}',${_}${variable.getName(getPropertyAccess)}${modifier})`;
     }
-    getVariableRespectingTDZ() {
-        if (this.isPossibleTDZ()) {
-            return UNKNOWN_EXPRESSION;
+    else {
+        const fields = [];
+        for (const variable of exportedVariables) {
+            for (const exportName of exportNamesByVariable.get(variable)) {
+                fields.push([exportName, variable.getName(getPropertyAccess) + modifier]);
+            }
         }
-        return this.variable;
+        return `exports(${getObject(fields, { lineBreakIndent: null })})`;
     }
 }
-function closestParentFunctionOrProgram(node) {
-    while (node && !/^Program|Function/.test(node.type)) {
-        node = node.parent;
+function renderSystemExportExpression(exportedVariable, expressionStart, expressionEnd, code, { exportNamesByVariable, snippets: { _ } }) {
+    code.prependRight(expressionStart, `exports('${exportNamesByVariable.get(exportedVariable)}',${_}`);
+    code.appendLeft(expressionEnd, ')');
+}
+function renderSystemExportFunction(exportedVariables, expressionStart, expressionEnd, needsParens, code, options) {
+    const { _, getDirectReturnIifeLeft } = options.snippets;
+    code.prependRight(expressionStart, getDirectReturnIifeLeft(['v'], `${getSystemExportStatement(exportedVariables, options)},${_}v`, { needsArrowReturnParens: true, needsWrappedFunction: needsParens }));
+    code.appendLeft(expressionEnd, ')');
+}
+function renderSystemExportSequenceAfterExpression(exportedVariable, expressionStart, expressionEnd, needsParens, code, options) {
+    const { _, getPropertyAccess } = options.snippets;
+    code.appendLeft(expressionEnd, `,${_}${getSystemExportStatement([exportedVariable], options)},${_}${exportedVariable.getName(getPropertyAccess)}`);
+    if (needsParens) {
+        code.prependRight(expressionStart, '(');
+        code.appendLeft(expressionEnd, ')');
+    }
+}
+function renderSystemExportSequenceBeforeExpression(exportedVariable, expressionStart, expressionEnd, needsParens, code, options, modifier) {
+    const { _ } = options.snippets;
+    code.prependRight(expressionStart, `${getSystemExportStatement([exportedVariable], options, modifier)},${_}`);
+    if (needsParens) {
+        code.prependRight(expressionStart, '(');
+        code.appendLeft(expressionEnd, ')');
     }
-    // one of: ArrowFunctionExpression, FunctionDeclaration, FunctionExpression or Program
-    return node;
 }
 
 class ObjectPattern extends NodeBase {
@@ -8301,6 +8192,38 @@ class AssignmentExpression extends NodeBase {
     }
 }
 
+class AssignmentPattern extends NodeBase {
+    constructor() {
+        super(...arguments);
+        this.deoptimized = false;
+    }
+    addExportedVariables(variables, exportNamesByVariable) {
+        this.left.addExportedVariables(variables, exportNamesByVariable);
+    }
+    declare(kind, init) {
+        return this.left.declare(kind, init);
+    }
+    deoptimizePath(path) {
+        path.length === 0 && this.left.deoptimizePath(path);
+    }
+    hasEffectsWhenAssignedAtPath(path, context) {
+        return path.length > 0 || this.left.hasEffectsWhenAssignedAtPath(EMPTY_PATH, context);
+    }
+    markDeclarationReached() {
+        this.left.markDeclarationReached();
+    }
+    render(code, options, { isShorthandProperty } = BLANK) {
+        this.left.render(code, options, { isShorthandProperty });
+        this.right.render(code, options);
+    }
+    applyDeoptimizations() {
+        this.deoptimized = true;
+        this.left.deoptimizePath(EMPTY_PATH);
+        this.right.deoptimizePath(UNKNOWN_PATH);
+        this.context.requestTreeshakingPass();
+    }
+}
+
 class ArgumentsVariable extends LocalVariable {
     constructor(context) {
         super('arguments', null, UNKNOWN_EXPRESSION, context);
@@ -8408,8 +8331,7 @@ class FunctionNode extends FunctionBase {
         }
     }
     hasEffects() {
-        var _a;
-        return (_a = this.id) === null || _a === void 0 ? void 0 : _a.hasEffects();
+        return this.id !== null && this.id.hasEffects();
     }
     hasEffectsWhenCalledAtPath(path, callOptions, context) {
         if (super.hasEffectsWhenCalledAtPath(path, callOptions, context))
@@ -8438,13 +8360,15 @@ class FunctionNode extends FunctionBase {
         return false;
     }
     include(context, includeChildrenRecursively) {
-        var _a;
-        // This ensures that super.include will also include all parameters
-        if (this.scope.argumentsVariable.included) {
-            this.alwaysIncludeParameters = true;
-        }
-        (_a = this.id) === null || _a === void 0 ? void 0 : _a.include();
         super.include(context, includeChildrenRecursively);
+        if (this.id)
+            this.id.include();
+        const hasArguments = this.scope.argumentsVariable.included;
+        for (const param of this.params) {
+            if (!(param instanceof Identifier) || hasArguments) {
+                param.include(context, includeChildrenRecursively);
+            }
+        }
     }
     initialise() {
         var _a;
@@ -8491,6 +8415,11 @@ class AwaitExpression extends NodeBase {
         }
         this.argument.include(context, includeChildrenRecursively);
     }
+    applyDeoptimizations() {
+        this.deoptimized = true;
+        this.argument.deoptimizePath(UNKNOWN_PATH);
+        this.context.requestTreeshakingPass();
+    }
 }
 
 const binaryOperators = {
@@ -8524,10 +8453,10 @@ class BinaryExpression extends NodeBase {
         if (path.length > 0)
             return UnknownValue;
         const leftValue = this.left.getLiteralValueAtPath(EMPTY_PATH, recursionTracker, origin);
-        if (typeof leftValue === 'symbol')
+        if (leftValue === UnknownValue)
             return UnknownValue;
         const rightValue = this.right.getLiteralValueAtPath(EMPTY_PATH, recursionTracker, origin);
-        if (typeof rightValue === 'symbol')
+        if (rightValue === UnknownValue)
             return UnknownValue;
         const operatorFn = binaryOperators[this.operator];
         if (!operatorFn)
@@ -8818,15 +8747,12 @@ class MemberExpression extends NodeBase {
         this.object.include(context, includeChildrenRecursively);
         this.property.include(context, includeChildrenRecursively);
     }
-    includeArgumentsWhenCalledAtPath(path, context, args) {
+    includeCallArguments(context, args) {
         if (this.variable) {
-            this.variable.includeArgumentsWhenCalledAtPath(path, context, args);
+            this.variable.includeCallArguments(context, args);
         }
-        else if (this.replacement) {
-            super.includeArgumentsWhenCalledAtPath(path, context, args);
-        }
-        else if (path.length < MAX_PATH_DEPTH) {
-            this.object.includeArgumentsWhenCalledAtPath([this.getPropertyKey(), ...path], context, args);
+        else {
+            super.includeCallArguments(context, args);
         }
     }
     initialise() {
@@ -8888,7 +8814,7 @@ class MemberExpression extends NodeBase {
         if (this.propertyKey === null) {
             this.propertyKey = UnknownKey;
             const value = this.property.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this);
-            return (this.propertyKey = typeof value === 'symbol' ? UnknownKey : String(value));
+            return (this.propertyKey = value === UnknownValue ? UnknownKey : String(value));
         }
         return this.propertyKey;
     }
@@ -8915,13 +8841,39 @@ class MemberExpression extends NodeBase {
     }
 }
 
-class CallExpressionBase extends NodeBase {
+class CallExpression extends NodeBase {
     constructor() {
         super(...arguments);
         this.deoptimized = false;
-        this.returnExpression = null;
         this.deoptimizableDependentExpressions = [];
         this.expressionsToBeDeoptimized = new Set();
+        this.returnExpression = null;
+    }
+    bind() {
+        super.bind();
+        if (this.callee instanceof Identifier) {
+            const variable = this.scope.findVariable(this.callee.name);
+            if (variable.isNamespace) {
+                this.context.warn({
+                    code: 'CANNOT_CALL_NAMESPACE',
+                    message: `Cannot call a namespace ('${this.callee.name}')`
+                }, this.start);
+            }
+            if (this.callee.name === 'eval') {
+                this.context.warn({
+                    code: 'EVAL',
+                    message: `Use of eval is strongly discouraged, as it poses security risks and may cause issues with minification`,
+                    url: 'https://rollupjs.org/guide/en/#avoiding-eval'
+                }, this.start);
+            }
+        }
+        this.callOptions = {
+            args: this.arguments,
+            thisParam: this.callee instanceof MemberExpression && !this.callee.variable
+                ? this.callee.object
+                : null,
+            withNew: false
+        };
     }
     deoptimizeCache() {
         if (this.returnExpression !== UNKNOWN_EXPRESSION) {
@@ -8976,47 +8928,6 @@ class CallExpressionBase extends NodeBase {
             return returnExpression.getReturnExpressionWhenCalledAtPath(path, callOptions, recursionTracker, origin);
         }, UNKNOWN_EXPRESSION);
     }
-    hasEffectsWhenAccessedAtPath(path, context) {
-        return (!context.accessed.trackEntityAtPathAndGetIfTracked(path, this) &&
-            this.getReturnExpression().hasEffectsWhenAccessedAtPath(path, context));
-    }
-    hasEffectsWhenAssignedAtPath(path, context) {
-        return (!context.assigned.trackEntityAtPathAndGetIfTracked(path, this) &&
-            this.getReturnExpression().hasEffectsWhenAssignedAtPath(path, context));
-    }
-    hasEffectsWhenCalledAtPath(path, callOptions, context) {
-        return (!(callOptions.withNew ? context.instantiated : context.called).trackEntityAtPathAndGetIfTracked(path, callOptions, this) &&
-            this.getReturnExpression().hasEffectsWhenCalledAtPath(path, callOptions, context));
-    }
-}
-
-class CallExpression extends CallExpressionBase {
-    bind() {
-        super.bind();
-        if (this.callee instanceof Identifier) {
-            const variable = this.scope.findVariable(this.callee.name);
-            if (variable.isNamespace) {
-                this.context.warn({
-                    code: 'CANNOT_CALL_NAMESPACE',
-                    message: `Cannot call a namespace ('${this.callee.name}')`
-                }, this.start);
-            }
-            if (this.callee.name === 'eval') {
-                this.context.warn({
-                    code: 'EVAL',
-                    message: `Use of eval is strongly discouraged, as it poses security risks and may cause issues with minification`,
-                    url: 'https://rollupjs.org/guide/en/#avoiding-eval'
-                }, this.start);
-            }
-        }
-        this.callOptions = {
-            args: this.arguments,
-            thisParam: this.callee instanceof MemberExpression && !this.callee.variable
-                ? this.callee.object
-                : null,
-            withNew: false
-        };
-    }
     hasEffects(context) {
         try {
             for (const argument of this.arguments) {
@@ -9034,6 +8945,18 @@ class CallExpression extends CallExpressionBase {
                 this.applyDeoptimizations();
         }
     }
+    hasEffectsWhenAccessedAtPath(path, context) {
+        return (!context.accessed.trackEntityAtPathAndGetIfTracked(path, this) &&
+            this.getReturnExpression().hasEffectsWhenAccessedAtPath(path, context));
+    }
+    hasEffectsWhenAssignedAtPath(path, context) {
+        return (!context.assigned.trackEntityAtPathAndGetIfTracked(path, this) &&
+            this.getReturnExpression().hasEffectsWhenAssignedAtPath(path, context));
+    }
+    hasEffectsWhenCalledAtPath(path, callOptions, context) {
+        return (!(callOptions.withNew ? context.instantiated : context.called).trackEntityAtPathAndGetIfTracked(path, callOptions, this) &&
+            this.getReturnExpression().hasEffectsWhenCalledAtPath(path, callOptions, context));
+    }
     include(context, includeChildrenRecursively) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
@@ -9049,7 +8972,7 @@ class CallExpression extends CallExpressionBase {
             this.included = true;
             this.callee.include(context, false);
         }
-        this.callee.includeArgumentsWhenCalledAtPath(EMPTY_PATH, context, this.arguments);
+        this.callee.includeCallArguments(context, this.arguments);
         const returnExpression = this.getReturnExpression();
         if (!returnExpression.included) {
             returnExpression.include(context, false);
@@ -9220,9 +9143,6 @@ class MethodBase extends NodeBase {
     hasEffectsWhenCalledAtPath(path, callOptions, context) {
         return this.getAccessedValue().hasEffectsWhenCalledAtPath(path, callOptions, context);
     }
-    includeArgumentsWhenCalledAtPath(path, context, args) {
-        this.getAccessedValue().includeArgumentsWhenCalledAtPath(path, context, args);
-    }
     getAccessedValue() {
         if (this.accessedValue === null) {
             if (this.kind === 'get') {
@@ -9259,6 +9179,8 @@ class ObjectMember extends ExpressionEntity {
         return this.object.getReturnExpressionWhenCalledAtPath([this.key, ...path], callOptions, recursionTracker, origin);
     }
     hasEffectsWhenAccessedAtPath(path, context) {
+        if (path.length === 0)
+            return false;
         return this.object.hasEffectsWhenAccessedAtPath([this.key, ...path], context);
     }
     hasEffectsWhenAssignedAtPath(path, context) {
@@ -9272,7 +9194,6 @@ class ObjectMember extends ExpressionEntity {
 class ClassNode extends NodeBase {
     constructor() {
         super(...arguments);
-        this.deoptimized = false;
         this.objectEntity = null;
     }
     createScope(parentScope) {
@@ -9282,14 +9203,7 @@ class ClassNode extends NodeBase {
         this.getObjectEntity().deoptimizeAllProperties();
     }
     deoptimizePath(path) {
-        var _a, _b;
         this.getObjectEntity().deoptimizePath(path);
-        if (path.length === 1 && path[0] === UnknownKey) {
-            // A reassignment of UNKNOWN_PATH is considered equivalent to having lost track
-            // which means the constructor needs to be reassigned
-            (_a = this.classConstructor) === null || _a === void 0 ? void 0 : _a.deoptimizePath(UNKNOWN_PATH);
-            (_b = this.superClass) === null || _b === void 0 ? void 0 : _b.deoptimizePath(UNKNOWN_PATH);
-        }
     }
     deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker) {
         this.getObjectEntity().deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker);
@@ -9302,8 +9216,6 @@ class ClassNode extends NodeBase {
     }
     hasEffects(context) {
         var _a, _b;
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
         const initEffect = ((_a = this.superClass) === null || _a === void 0 ? void 0 : _a.hasEffects(context)) || this.body.hasEffects(context);
         (_b = this.id) === null || _b === void 0 ? void 0 : _b.markDeclarationReached();
         return initEffect || super.hasEffects(context);
@@ -9315,13 +9227,12 @@ class ClassNode extends NodeBase {
         return this.getObjectEntity().hasEffectsWhenAssignedAtPath(path, context);
     }
     hasEffectsWhenCalledAtPath(path, callOptions, context) {
-        var _a;
         if (path.length === 0) {
             return (!callOptions.withNew ||
                 (this.classConstructor !== null
                     ? this.classConstructor.hasEffectsWhenCalledAtPath(EMPTY_PATH, callOptions, context)
-                    : (_a = this.superClass) === null || _a === void 0 ? void 0 : _a.hasEffectsWhenCalledAtPath(path, callOptions, context)) ||
-                false);
+                    : this.superClass !== null &&
+                        this.superClass.hasEffectsWhenCalledAtPath(path, callOptions, context)));
         }
         else {
             return this.getObjectEntity().hasEffectsWhenCalledAtPath(path, callOptions, context);
@@ -9329,8 +9240,6 @@ class ClassNode extends NodeBase {
     }
     include(context, includeChildrenRecursively) {
         var _a;
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
         this.included = true;
         (_a = this.superClass) === null || _a === void 0 ? void 0 : _a.include(context, includeChildrenRecursively);
         this.body.include(context, includeChildrenRecursively);
@@ -9339,20 +9248,6 @@ class ClassNode extends NodeBase {
             this.id.include();
         }
     }
-    includeArgumentsWhenCalledAtPath(path, context, args) {
-        var _a;
-        if (path.length === 0) {
-            if (this.classConstructor) {
-                this.classConstructor.includeArgumentsWhenCalledAtPath(path, context, args);
-            }
-            else {
-                (_a = this.superClass) === null || _a === void 0 ? void 0 : _a.includeArgumentsWhenCalledAtPath(path, context, args);
-            }
-        }
-        else {
-            this.getObjectEntity().includeArgumentsWhenCalledAtPath(path, context, args);
-        }
-    }
     initialise() {
         var _a;
         (_a = this.id) === null || _a === void 0 ? void 0 : _a.declare('class', this);
@@ -9364,18 +9259,6 @@ class ClassNode extends NodeBase {
         }
         this.classConstructor = null;
     }
-    applyDeoptimizations() {
-        this.deoptimized = true;
-        for (const definition of this.body.body) {
-            if (!(definition.static ||
-                (definition instanceof MethodDefinition && definition.kind === 'constructor'))) {
-                // Calls to methods are not tracked, ensure that parameter defaults are
-                // included and the return value is deoptimized
-                definition.deoptimizePath(UNKNOWN_PATH);
-            }
-        }
-        this.context.requestTreeshakingPass();
-    }
     getObjectEntity() {
         if (this.objectEntity !== null) {
             return this.objectEntity;
@@ -9392,7 +9275,7 @@ class ClassNode extends NodeBase {
             let key;
             if (definition.computed) {
                 const keyValue = definition.key.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this);
-                if (typeof keyValue === 'symbol') {
+                if (keyValue === UnknownValue) {
                     properties.push({ key: UnknownKey, kind, property: definition });
                     continue;
                 }
@@ -9588,14 +9471,14 @@ class ConditionalExpression extends NodeBase {
             usedBranch.include(context, includeChildrenRecursively);
         }
     }
-    includeArgumentsWhenCalledAtPath(path, context, args) {
+    includeCallArguments(context, args) {
         const usedBranch = this.getUsedBranch();
         if (usedBranch === null) {
-            this.consequent.includeArgumentsWhenCalledAtPath(path, context, args);
-            this.alternate.includeArgumentsWhenCalledAtPath(path, context, args);
+            this.consequent.includeCallArguments(context, args);
+            this.alternate.includeCallArguments(context, args);
         }
         else {
-            usedBranch.includeArgumentsWhenCalledAtPath(path, context, args);
+            usedBranch.includeCallArguments(context, args);
         }
     }
     render(code, options, { isCalleeOfRenderedParent, preventASI, renderedParentType, renderedSurroundingElement } = BLANK) {
@@ -9632,7 +9515,7 @@ class ConditionalExpression extends NodeBase {
         }
         this.isBranchResolutionAnalysed = true;
         const testValue = this.test.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this);
-        return typeof testValue === 'symbol'
+        return testValue === UnknownValue
             ? null
             : (this.usedBranch = testValue ? this.consequent : this.alternate);
     }
@@ -9681,7 +9564,7 @@ class DoWhileStatement extends NodeBase {
         this.included = true;
         this.test.include(context, includeChildrenRecursively);
         const { brokenFlow } = context;
-        this.body.include(context, includeChildrenRecursively, { asSingleStatement: true });
+        this.body.includeAsSingleStatement(context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
 }
@@ -9809,13 +9692,12 @@ ExportDefaultDeclaration.prototype.needsBoundaries = true;
 
 class ExportNamedDeclaration extends NodeBase {
     bind() {
-        var _a;
         // Do not bind specifiers
-        (_a = this.declaration) === null || _a === void 0 ? void 0 : _a.bind();
+        if (this.declaration !== null)
+            this.declaration.bind();
     }
     hasEffects(context) {
-        var _a;
-        return (_a = this.declaration) === null || _a === void 0 ? void 0 : _a.hasEffects(context);
+        return this.declaration !== null && this.declaration.hasEffects(context);
     }
     initialise() {
         this.context.addExport(this);
@@ -9869,7 +9751,7 @@ class ForInStatement extends NodeBase {
         this.left.include(context, includeChildrenRecursively || true);
         this.right.include(context, includeChildrenRecursively);
         const { brokenFlow } = context;
-        this.body.include(context, includeChildrenRecursively, { asSingleStatement: true });
+        this.body.includeAsSingleStatement(context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
     render(code, options) {
@@ -9909,7 +9791,7 @@ class ForOfStatement extends NodeBase {
         this.left.include(context, includeChildrenRecursively || true);
         this.right.include(context, includeChildrenRecursively);
         const { brokenFlow } = context;
-        this.body.include(context, includeChildrenRecursively, { asSingleStatement: true });
+        this.body.includeAsSingleStatement(context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
     render(code, options) {
@@ -9933,10 +9815,9 @@ class ForStatement extends NodeBase {
         this.scope = new BlockScope(parentScope);
     }
     hasEffects(context) {
-        var _a, _b, _c;
-        if (((_a = this.init) === null || _a === void 0 ? void 0 : _a.hasEffects(context)) ||
-            ((_b = this.test) === null || _b === void 0 ? void 0 : _b.hasEffects(context)) ||
-            ((_c = this.update) === null || _c === void 0 ? void 0 : _c.hasEffects(context)))
+        if ((this.init && this.init.hasEffects(context)) ||
+            (this.test && this.test.hasEffects(context)) ||
+            (this.update && this.update.hasEffects(context)))
             return true;
         const { brokenFlow, ignore: { breaks, continues } } = context;
         context.ignore.breaks = true;
@@ -9949,20 +9830,24 @@ class ForStatement extends NodeBase {
         return false;
     }
     include(context, includeChildrenRecursively) {
-        var _a, _b, _c;
         this.included = true;
-        (_a = this.init) === null || _a === void 0 ? void 0 : _a.include(context, includeChildrenRecursively, { asSingleStatement: true });
-        (_b = this.test) === null || _b === void 0 ? void 0 : _b.include(context, includeChildrenRecursively);
+        if (this.init)
+            this.init.includeAsSingleStatement(context, includeChildrenRecursively);
+        if (this.test)
+            this.test.include(context, includeChildrenRecursively);
         const { brokenFlow } = context;
-        (_c = this.update) === null || _c === void 0 ? void 0 : _c.include(context, includeChildrenRecursively);
-        this.body.include(context, includeChildrenRecursively, { asSingleStatement: true });
+        if (this.update)
+            this.update.include(context, includeChildrenRecursively);
+        this.body.includeAsSingleStatement(context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
     render(code, options) {
-        var _a, _b, _c;
-        (_a = this.init) === null || _a === void 0 ? void 0 : _a.render(code, options, NO_SEMICOLON);
-        (_b = this.test) === null || _b === void 0 ? void 0 : _b.render(code, options, NO_SEMICOLON);
-        (_c = this.update) === null || _c === void 0 ? void 0 : _c.render(code, options, NO_SEMICOLON);
+        if (this.init)
+            this.init.render(code, options, NO_SEMICOLON);
+        if (this.test)
+            this.test.render(code, options, NO_SEMICOLON);
+        if (this.update)
+            this.update.render(code, options, NO_SEMICOLON);
         this.body.render(code, options);
     }
 }
@@ -9998,12 +9883,11 @@ class IfStatement extends NodeBase {
         this.testValue = UnknownValue;
     }
     hasEffects(context) {
-        var _a;
         if (this.test.hasEffects(context)) {
             return true;
         }
         const testValue = this.getTestValue();
-        if (typeof testValue === 'symbol') {
+        if (testValue === UnknownValue) {
             const { brokenFlow } = context;
             if (this.consequent.hasEffects(context))
                 return true;
@@ -10017,7 +9901,9 @@ class IfStatement extends NodeBase {
                 context.brokenFlow < consequentBrokenFlow ? context.brokenFlow : consequentBrokenFlow;
             return false;
         }
-        return testValue ? this.consequent.hasEffects(context) : (_a = this.alternate) === null || _a === void 0 ? void 0 : _a.hasEffects(context);
+        return testValue
+            ? this.consequent.hasEffects(context)
+            : this.alternate !== null && this.alternate.hasEffects(context);
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
@@ -10026,7 +9912,7 @@ class IfStatement extends NodeBase {
         }
         else {
             const testValue = this.getTestValue();
-            if (typeof testValue === 'symbol') {
+            if (testValue === UnknownValue) {
                 this.includeUnknownTest(context);
             }
             else {
@@ -10056,7 +9942,7 @@ class IfStatement extends NodeBase {
         else {
             code.remove(this.start, this.consequent.start);
         }
-        if (this.consequent.included && (noTreeshake || typeof testValue === 'symbol' || testValue)) {
+        if (this.consequent.included && (noTreeshake || testValue === UnknownValue || testValue)) {
             this.consequent.render(code, options);
         }
         else {
@@ -10064,7 +9950,7 @@ class IfStatement extends NodeBase {
             hoistedDeclarations.push(...this.consequentScope.hoistedDeclarations);
         }
         if (this.alternate) {
-            if (this.alternate.included && (noTreeshake || typeof testValue === 'symbol' || !testValue)) {
+            if (this.alternate.included && (noTreeshake || testValue === UnknownValue || !testValue)) {
                 if (includesIfElse) {
                     if (code.original.charCodeAt(this.alternate.start - 1) === 101) {
                         code.prependLeft(this.alternate.start, ' ');
@@ -10094,35 +9980,34 @@ class IfStatement extends NodeBase {
         return this.testValue;
     }
     includeKnownTest(context, testValue) {
-        var _a;
         if (this.test.shouldBeIncluded(context)) {
             this.test.include(context, false);
         }
         if (testValue && this.consequent.shouldBeIncluded(context)) {
-            this.consequent.include(context, false, { asSingleStatement: true });
+            this.consequent.includeAsSingleStatement(context, false);
         }
-        if (!testValue && ((_a = this.alternate) === null || _a === void 0 ? void 0 : _a.shouldBeIncluded(context))) {
-            this.alternate.include(context, false, { asSingleStatement: true });
+        if (this.alternate !== null && !testValue && this.alternate.shouldBeIncluded(context)) {
+            this.alternate.includeAsSingleStatement(context, false);
         }
     }
     includeRecursively(includeChildrenRecursively, context) {
-        var _a;
         this.test.include(context, includeChildrenRecursively);
         this.consequent.include(context, includeChildrenRecursively);
-        (_a = this.alternate) === null || _a === void 0 ? void 0 : _a.include(context, includeChildrenRecursively);
+        if (this.alternate !== null) {
+            this.alternate.include(context, includeChildrenRecursively);
+        }
     }
     includeUnknownTest(context) {
-        var _a;
         this.test.include(context, false);
         const { brokenFlow } = context;
         let consequentBrokenFlow = BROKEN_FLOW_NONE;
         if (this.consequent.shouldBeIncluded(context)) {
-            this.consequent.include(context, false, { asSingleStatement: true });
+            this.consequent.includeAsSingleStatement(context, false);
             consequentBrokenFlow = context.brokenFlow;
             context.brokenFlow = brokenFlow;
         }
-        if ((_a = this.alternate) === null || _a === void 0 ? void 0 : _a.shouldBeIncluded(context)) {
-            this.alternate.include(context, false, { asSingleStatement: true });
+        if (this.alternate !== null && this.alternate.shouldBeIncluded(context)) {
+            this.alternate.includeAsSingleStatement(context, false);
             context.brokenFlow =
                 context.brokenFlow < consequentBrokenFlow ? context.brokenFlow : consequentBrokenFlow;
         }
@@ -10709,7 +10594,7 @@ class LogicalExpression extends NodeBase {
         if (!this.isBranchResolutionAnalysed) {
             this.isBranchResolutionAnalysed = true;
             const leftValue = this.left.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this);
-            if (typeof leftValue === 'symbol') {
+            if (leftValue === UnknownValue) {
                 return null;
             }
             else {
@@ -10895,32 +10780,21 @@ class NewExpression extends NodeBase {
         this.deoptimized = false;
     }
     hasEffects(context) {
-        try {
-            for (const argument of this.arguments) {
-                if (argument.hasEffects(context))
-                    return true;
-            }
-            if (this.context.options.treeshake.annotations &&
-                this.annotations)
-                return false;
-            return (this.callee.hasEffects(context) ||
-                this.callee.hasEffectsWhenCalledAtPath(EMPTY_PATH, this.callOptions, context));
-        }
-        finally {
-            if (!this.deoptimized)
-                this.applyDeoptimizations();
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        for (const argument of this.arguments) {
+            if (argument.hasEffects(context))
+                return true;
         }
+        if (this.context.options.treeshake.annotations &&
+            this.annotations)
+            return false;
+        return (this.callee.hasEffects(context) ||
+            this.callee.hasEffectsWhenCalledAtPath(EMPTY_PATH, this.callOptions, context));
     }
     hasEffectsWhenAccessedAtPath(path) {
         return path.length > 0;
     }
-    include(context, includeChildrenRecursively) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
-        this.included = true;
-        this.callee.include(context, includeChildrenRecursively);
-        this.callee.includeArgumentsWhenCalledAtPath(EMPTY_PATH, context, this.arguments);
-    }
     initialise() {
         this.callOptions = {
             args: this.arguments,
@@ -10967,9 +10841,6 @@ class ObjectExpression extends NodeBase {
     hasEffectsWhenCalledAtPath(path, callOptions, context) {
         return this.getObjectEntity().hasEffectsWhenCalledAtPath(path, callOptions, context);
     }
-    includeArgumentsWhenCalledAtPath(path, context, args) {
-        this.getObjectEntity().includeArgumentsWhenCalledAtPath(path, context, args);
-    }
     render(code, options, { renderedSurroundingElement } = BLANK) {
         super.render(code, options);
         if (renderedSurroundingElement === ExpressionStatement$1 ||
@@ -10992,7 +10863,7 @@ class ObjectExpression extends NodeBase {
             let key;
             if (property.computed) {
                 const keyValue = property.key.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this);
-                if (typeof keyValue === 'symbol') {
+                if (keyValue === UnknownValue) {
                     properties.push({ key: UnknownKey, kind: property.kind, property });
                     continue;
                 }
@@ -11113,8 +10984,8 @@ class PropertyDefinition extends NodeBase {
             : UNKNOWN_EXPRESSION;
     }
     hasEffects(context) {
-        var _a;
-        return this.key.hasEffects(context) || (this.static && ((_a = this.value) === null || _a === void 0 ? void 0 : _a.hasEffects(context)));
+        return (this.key.hasEffects(context) ||
+            (this.static && this.value !== null && this.value.hasEffects(context)));
     }
     hasEffectsWhenAccessedAtPath(path, context) {
         return !this.value || this.value.hasEffectsWhenAccessedAtPath(path, context);
@@ -11125,24 +10996,21 @@ class PropertyDefinition extends NodeBase {
     hasEffectsWhenCalledAtPath(path, callOptions, context) {
         return !this.value || this.value.hasEffectsWhenCalledAtPath(path, callOptions, context);
     }
-    includeArgumentsWhenCalledAtPath(path, context, args) {
-        var _a;
-        (_a = this.value) === null || _a === void 0 ? void 0 : _a.includeArgumentsWhenCalledAtPath(path, context, args);
-    }
 }
 
 class ReturnStatement extends NodeBase {
     hasEffects(context) {
-        var _a;
-        if (!context.ignore.returnYield || ((_a = this.argument) === null || _a === void 0 ? void 0 : _a.hasEffects(context)))
+        if (!context.ignore.returnYield ||
+            (this.argument !== null && this.argument.hasEffects(context)))
             return true;
         context.brokenFlow = BROKEN_FLOW_ERROR_RETURN_LABEL;
         return false;
     }
     include(context, includeChildrenRecursively) {
-        var _a;
         this.included = true;
-        (_a = this.argument) === null || _a === void 0 ? void 0 : _a.include(context, includeChildrenRecursively);
+        if (this.argument) {
+            this.argument.include(context, includeChildrenRecursively);
+        }
         context.brokenFlow = BROKEN_FLOW_ERROR_RETURN_LABEL;
     }
     initialise() {
@@ -11262,9 +11130,6 @@ class Super extends NodeBase {
     deoptimizePath(path) {
         this.variable.deoptimizePath(path);
     }
-    deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker) {
-        this.variable.deoptimizeThisOnEventAtPath(event, path, thisParameter, recursionTracker);
-    }
     include() {
         if (!this.included) {
             this.included = true;
@@ -11275,8 +11140,7 @@ class Super extends NodeBase {
 
 class SwitchCase extends NodeBase {
     hasEffects(context) {
-        var _a;
-        if ((_a = this.test) === null || _a === void 0 ? void 0 : _a.hasEffects(context))
+        if (this.test && this.test.hasEffects(context))
             return true;
         for (const node of this.consequent) {
             if (context.brokenFlow)
@@ -11287,9 +11151,9 @@ class SwitchCase extends NodeBase {
         return false;
     }
     include(context, includeChildrenRecursively) {
-        var _a;
         this.included = true;
-        (_a = this.test) === null || _a === void 0 ? void 0 : _a.include(context, includeChildrenRecursively);
+        if (this.test)
+            this.test.include(context, includeChildrenRecursively);
         for (const node of this.consequent) {
             if (includeChildrenRecursively || node.shouldBeIncluded(context))
                 node.include(context, includeChildrenRecursively);
@@ -11382,7 +11246,7 @@ class SwitchStatement extends NodeBase {
     }
 }
 
-class TaggedTemplateExpression extends CallExpressionBase {
+class TaggedTemplateExpression extends NodeBase {
     bind() {
         super.bind();
         if (this.tag.type === Identifier$1) {
@@ -11397,35 +11261,13 @@ class TaggedTemplateExpression extends CallExpressionBase {
         }
     }
     hasEffects(context) {
-        try {
-            for (const argument of this.quasi.expressions) {
-                if (argument.hasEffects(context))
-                    return true;
-            }
-            return (this.tag.hasEffects(context) ||
-                this.tag.hasEffectsWhenCalledAtPath(EMPTY_PATH, this.callOptions, context));
-        }
-        finally {
-            if (!this.deoptimized)
-                this.applyDeoptimizations();
-        }
-    }
-    include(context, includeChildrenRecursively) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
-        this.included = true;
-        this.tag.include(context, includeChildrenRecursively);
-        this.quasi.include(context, includeChildrenRecursively);
-        this.tag.includeArgumentsWhenCalledAtPath(EMPTY_PATH, context, this.callOptions.args);
-        const returnExpression = this.getReturnExpression();
-        if (!returnExpression.included) {
-            returnExpression.include(context, false);
-        }
+        return (super.hasEffects(context) ||
+            this.tag.hasEffectsWhenCalledAtPath(EMPTY_PATH, this.callOptions, context));
     }
     initialise() {
         this.callOptions = {
-            args: [UNKNOWN_EXPRESSION, ...this.quasi.expressions],
-            thisParam: this.tag instanceof MemberExpression && !this.tag.variable ? this.tag.object : null,
+            args: NO_ARGS,
+            thisParam: null,
             withNew: false
         };
     }
@@ -11433,25 +11275,6 @@ class TaggedTemplateExpression extends CallExpressionBase {
         this.tag.render(code, options, { isCalleeOfRenderedParent: true });
         this.quasi.render(code, options);
     }
-    applyDeoptimizations() {
-        this.deoptimized = true;
-        const { thisParam } = this.callOptions;
-        if (thisParam) {
-            this.tag.deoptimizeThisOnEventAtPath(EVENT_CALLED, EMPTY_PATH, thisParam, SHARED_RECURSION_TRACKER);
-        }
-        for (const argument of this.quasi.expressions) {
-            // This will make sure all properties of parameters behave as "unknown"
-            argument.deoptimizePath(UNKNOWN_PATH);
-        }
-        this.context.requestTreeshakingPass();
-    }
-    getReturnExpression(recursionTracker = SHARED_RECURSION_TRACKER) {
-        if (this.returnExpression === null) {
-            this.returnExpression = UNKNOWN_EXPRESSION;
-            return (this.returnExpression = this.tag.getReturnExpressionWhenCalledAtPath(EMPTY_PATH, this.callOptions, recursionTracker, this));
-        }
-        return this.returnExpression;
-    }
 }
 
 class TemplateElement extends NodeBase {
@@ -11663,15 +11486,13 @@ class TryStatement extends NodeBase {
         this.includedLabelsAfterBlock = null;
     }
     hasEffects(context) {
-        var _a;
         return ((this.context.options.treeshake.tryCatchDeoptimization
             ? this.block.body.length > 0
             : this.block.hasEffects(context)) ||
-            ((_a = this.finalizer) === null || _a === void 0 ? void 0 : _a.hasEffects(context)) ||
-            false);
+            (this.finalizer !== null && this.finalizer.hasEffects(context)));
     }
     include(context, includeChildrenRecursively) {
-        var _a, _b;
+        var _a;
         const tryCatchDeoptimization = (_a = this.context.options.treeshake) === null || _a === void 0 ? void 0 : _a.tryCatchDeoptimization;
         const { brokenFlow } = context;
         if (!this.directlyIncluded || !tryCatchDeoptimization) {
@@ -11692,7 +11513,9 @@ class TryStatement extends NodeBase {
             this.handler.include(context, includeChildrenRecursively);
             context.brokenFlow = brokenFlow;
         }
-        (_b = this.finalizer) === null || _b === void 0 ? void 0 : _b.include(context, includeChildrenRecursively);
+        if (this.finalizer !== null) {
+            this.finalizer.include(context, includeChildrenRecursively);
+        }
     }
 }
 
@@ -11714,7 +11537,7 @@ class UnaryExpression extends NodeBase {
         if (path.length > 0)
             return UnknownValue;
         const argumentValue = this.argument.getLiteralValueAtPath(EMPTY_PATH, recursionTracker, origin);
-        if (typeof argumentValue === 'symbol')
+        if (argumentValue === UnknownValue)
             return UnknownValue;
         return unaryOperators[this.operator](argumentValue);
     }
@@ -11828,12 +11651,18 @@ class VariableDeclaration extends NodeBase {
     hasEffectsWhenAssignedAtPath() {
         return false;
     }
-    include(context, includeChildrenRecursively, { asSingleStatement } = BLANK) {
+    include(context, includeChildrenRecursively) {
         this.included = true;
         for (const declarator of this.declarations) {
             if (includeChildrenRecursively || declarator.shouldBeIncluded(context))
                 declarator.include(context, includeChildrenRecursively);
-            if (asSingleStatement) {
+        }
+    }
+    includeAsSingleStatement(context, includeChildrenRecursively) {
+        this.included = true;
+        for (const declarator of this.declarations) {
+            if (includeChildrenRecursively || declarator.shouldBeIncluded(context)) {
+                declarator.include(context, includeChildrenRecursively);
                 declarator.id.include(context, includeChildrenRecursively);
             }
         }
@@ -11981,15 +11810,15 @@ class VariableDeclarator extends NodeBase {
         this.id.deoptimizePath(path);
     }
     hasEffects(context) {
-        var _a;
-        const initEffect = (_a = this.init) === null || _a === void 0 ? void 0 : _a.hasEffects(context);
+        const initEffect = this.init !== null && this.init.hasEffects(context);
         this.id.markDeclarationReached();
         return initEffect || this.id.hasEffects(context);
     }
     include(context, includeChildrenRecursively) {
-        var _a;
         this.included = true;
-        (_a = this.init) === null || _a === void 0 ? void 0 : _a.include(context, includeChildrenRecursively);
+        if (this.init) {
+            this.init.include(context, includeChildrenRecursively);
+        }
         this.id.markDeclarationReached();
         if (includeChildrenRecursively || this.id.shouldBeIncluded(context)) {
             this.id.include(context, includeChildrenRecursively);
@@ -12033,7 +11862,7 @@ class WhileStatement extends NodeBase {
         this.included = true;
         this.test.include(context, includeChildrenRecursively);
         const { brokenFlow } = context;
-        this.body.include(context, includeChildrenRecursively, { asSingleStatement: true });
+        this.body.includeAsSingleStatement(context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
 }
@@ -12044,10 +11873,9 @@ class YieldExpression extends NodeBase {
         this.deoptimized = false;
     }
     hasEffects(context) {
-        var _a;
         if (!this.deoptimized)
             this.applyDeoptimizations();
-        return !context.ignore.returnYield || ((_a = this.argument) === null || _a === void 0 ? void 0 : _a.hasEffects(context));
+        return (!context.ignore.returnYield || (this.argument !== null && this.argument.hasEffects(context)));
     }
     render(code, options) {
         if (this.argument) {
@@ -12057,6 +11885,14 @@ class YieldExpression extends NodeBase {
             }
         }
     }
+    applyDeoptimizations() {
+        this.deoptimized = true;
+        const { argument } = this;
+        if (argument) {
+            argument.deoptimizePath(UNKNOWN_PATH);
+            this.context.requestTreeshakingPass();
+        }
+    }
 }
 
 const nodeConstructors = {