rollup 4.0.2 → 4.1.0

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v4.0.2
-	Fri, 06 Oct 2023 14:17:45 GMT - commit 3d9c833c4fcb666301967554bac7ab0a0a698efe
+	Rollup.js v4.1.0
+	Sat, 14 Oct 2023 05:51:28 GMT - commit cb144b2be4262b3743b31983b26f7fa985be3ceb
 
 	https://github.com/rollup/rollup
 
@@ -31,7 +31,7 @@ function _interopNamespaceDefault(e) {
 
 const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty);
 
-var version = "4.0.2";
+var version = "4.1.0";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -3267,11 +3267,24 @@ class DiscriminatedPathTracker {
     }
 }
 
+function isFlagSet(flags, flag) {
+    return (flags & flag) !== 0;
+}
+function setFlag(flags, flag, value) {
+    return (flags & ~flag) | (-value & flag);
+}
+
 const UnknownValue = Symbol('Unknown Value');
 const UnknownTruthyValue = Symbol('Unknown Truthy Value');
 class ExpressionEntity {
     constructor() {
-        this.included = false;
+        this.flags = 0;
+    }
+    get included() {
+        return isFlagSet(this.flags, 1 /* Flag.included */);
+    }
+    set included(value) {
+        this.flags = setFlag(this.flags, 1 /* Flag.included */, value);
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, _path, _recursionTracker) {
         deoptimizeInteraction(interaction);
@@ -5996,33 +6009,40 @@ const keys = {
     Literal: [],
     Program: ['body']
 };
-function getAndCreateKeys(esTreeNode) {
-    keys[esTreeNode.type] = Object.keys(esTreeNode).filter(key => typeof esTreeNode[key] === 'object' && key.charCodeAt(0) !== 95 /* _ */);
-    return keys[esTreeNode.type];
+function createKeysForNode(esTreeNode) {
+    return Object.keys(esTreeNode).filter(key => typeof esTreeNode[key] === 'object' && key.charCodeAt(0) !== 95 /* _ */);
 }
 
 const INCLUDE_PARAMETERS = 'variables';
 class NodeBase extends ExpressionEntity {
+    /**
+     * Nodes can apply custom deoptimizations once they become part of the
+     * executed code. To do this, they must initialize this as false, implement
+     * applyDeoptimizations and call this from include and hasEffects if they have
+     * custom handlers
+     */
+    get deoptimized() {
+        return isFlagSet(this.flags, 2 /* Flag.deoptimized */);
+    }
+    set deoptimized(value) {
+        this.flags = setFlag(this.flags, 2 /* Flag.deoptimized */, value);
+    }
     constructor(esTreeNode, parent, parentScope, keepEsTreeNode = false) {
         super();
-        /**
-         * Nodes can apply custom deoptimizations once they become part of the
-         * executed code. To do this, they must initialize this as false, implement
-         * applyDeoptimizations and call this from include and hasEffects if they have
-         * custom handlers
-         */
-        this.deoptimized = false;
         // Nodes can opt-in to keep the AST if needed during the build pipeline.
         // Avoid true when possible as large AST takes up memory.
-        this.esTreeNode = keepEsTreeNode ? esTreeNode : null;
-        this.keys = keys[esTreeNode.type] || getAndCreateKeys(esTreeNode);
+        if (keepEsTreeNode) {
+            this.esTreeNode = esTreeNode;
+        }
+        const { type } = esTreeNode;
+        keys[type] ||= createKeysForNode(esTreeNode);
         this.parent = parent;
-        this.context = parent.context;
+        this.scope = parentScope;
         this.createScope(parentScope);
         this.parseNode(esTreeNode);
         this.initialise();
-        this.context.magicString.addSourcemapLocation(this.start);
-        this.context.magicString.addSourcemapLocation(this.end);
+        this.scope.context.magicString.addSourcemapLocation(this.start);
+        this.scope.context.magicString.addSourcemapLocation(this.end);
     }
     addExportedVariables(_variables, _exportNamesByVariable) { }
     /**
@@ -6030,7 +6050,7 @@ class NodeBase extends ExpressionEntity {
      * that require the scopes to be populated with variables.
      */
     bind() {
-        for (const key of this.keys) {
+        for (const key of keys[this.type]) {
             const value = this[key];
             if (Array.isArray(value)) {
                 for (const child of value) {
@@ -6052,7 +6072,7 @@ class NodeBase extends ExpressionEntity {
     hasEffects(context) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
-        for (const key of this.keys) {
+        for (const key of keys[this.type]) {
             const value = this[key];
             if (value === null)
                 continue;
@@ -6075,7 +6095,7 @@ class NodeBase extends ExpressionEntity {
         if (!this.deoptimized)
             this.applyDeoptimizations();
         this.included = true;
-        for (const key of this.keys) {
+        for (const key of keys[this.type]) {
             const value = this[key];
             if (value === null)
                 continue;
@@ -6099,23 +6119,26 @@ class NodeBase extends ExpressionEntity {
     initialise() { }
     parseNode(esTreeNode, keepEsTreeNodeKeys) {
         for (const [key, value] of Object.entries(esTreeNode)) {
-            // That way, we can override this function to add custom initialisation and then call super.parseNode
+            // Skip properties defined on the class already.
+            // This way, we can override this function to add custom initialisation and then call super.parseNode
+            // Note: this doesn't skip properties with defined getters/setters which we use to pack wrap booleans
+            // in bitfields. Those are still assigned from the value in the esTreeNode.
             if (this.hasOwnProperty(key))
                 continue;
             if (key.charCodeAt(0) === 95 /* _ */) {
                 if (key === parseAst_js.ANNOTATION_KEY) {
                     const annotations = value;
                     this.annotations = annotations;
-                    if (this.context.options.treeshake.annotations) {
+                    if (this.scope.context.options.treeshake.annotations) {
                         this.annotationNoSideEffects = annotations.some(comment => comment.type === 'noSideEffects');
                         this.annotationPure = annotations.some(comment => comment.type === 'pure');
                     }
                 }
                 else if (key === parseAst_js.INVALID_ANNOTATION_KEY) {
                     for (const { start, end, type } of value) {
-                        this.context.magicString.remove(start, end);
+                        this.scope.context.magicString.remove(start, end);
                         if (type === 'pure' || type === 'noSideEffects') {
-                            this.context.log(parseAst_js.LOGLEVEL_WARN, parseAst_js.logInvalidAnnotation(this.context.code.slice(start, end), this.context.module.id, type), start);
+                            this.scope.context.log(parseAst_js.LOGLEVEL_WARN, parseAst_js.logInvalidAnnotation(this.scope.context.code.slice(start, end), this.scope.context.module.id, type), start);
                         }
                     }
                 }
@@ -6128,11 +6151,11 @@ class NodeBase extends ExpressionEntity {
                 for (const child of value) {
                     this[key].push(child === null
                         ? null
-                        : new (this.context.getNodeConstructor(child.type))(child, this, this.scope, keepEsTreeNodeKeys?.includes(key)));
+                        : new (this.scope.context.getNodeConstructor(child.type))(child, this, this.scope, keepEsTreeNodeKeys?.includes(key)));
                 }
             }
             else {
-                this[key] = new (this.context.getNodeConstructor(value.type))(value, this, this.scope, keepEsTreeNodeKeys?.includes(key));
+                this[key] = new (this.scope.context.getNodeConstructor(value.type))(value, this, this.scope, keepEsTreeNodeKeys?.includes(key));
             }
         }
     }
@@ -6144,7 +6167,7 @@ class NodeBase extends ExpressionEntity {
         }
     }
     render(code, options) {
-        for (const key of this.keys) {
+        for (const key of keys[this.type]) {
             const value = this[key];
             if (value === null)
                 continue;
@@ -6171,7 +6194,7 @@ class NodeBase extends ExpressionEntity {
      */
     applyDeoptimizations() {
         this.deoptimized = true;
-        for (const key of this.keys) {
+        for (const key of keys[this.type]) {
             const value = this[key];
             if (value === null)
                 continue;
@@ -6184,7 +6207,7 @@ class NodeBase extends ExpressionEntity {
                 value.deoptimizePath(UNKNOWN_PATH);
             }
         }
-        this.context.requestTreeshakingPass();
+        this.scope.context.requestTreeshakingPass();
     }
 }
 
@@ -6197,7 +6220,7 @@ class SpreadElement extends NodeBase {
     hasEffects(context) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
-        const { propertyReadSideEffects } = this.context.options
+        const { propertyReadSideEffects } = this.scope.context.options
             .treeshake;
         return (this.argument.hasEffects(context) ||
             (propertyReadSideEffects &&
@@ -6209,7 +6232,7 @@ class SpreadElement extends NodeBase {
         // Only properties of properties of the argument could become subject to reassignment
         // This will also reassign the return values of iterators
         this.argument.deoptimizePath([UnknownKey, UnknownKey]);
-        this.context.requestTreeshakingPass();
+        this.scope.context.requestTreeshakingPass();
     }
 }
 
@@ -6292,6 +6315,24 @@ const METHOD_RETURNS_UNKNOWN = [
 
 const INTEGER_REG_EXP = /^\d+$/;
 class ObjectEntity extends ExpressionEntity {
+    get hasLostTrack() {
+        return isFlagSet(this.flags, 2048 /* Flag.hasLostTrack */);
+    }
+    set hasLostTrack(value) {
+        this.flags = setFlag(this.flags, 2048 /* Flag.hasLostTrack */, value);
+    }
+    get hasUnknownDeoptimizedInteger() {
+        return isFlagSet(this.flags, 4096 /* Flag.hasUnknownDeoptimizedInteger */);
+    }
+    set hasUnknownDeoptimizedInteger(value) {
+        this.flags = setFlag(this.flags, 4096 /* Flag.hasUnknownDeoptimizedInteger */, value);
+    }
+    get hasUnknownDeoptimizedProperty() {
+        return isFlagSet(this.flags, 8192 /* Flag.hasUnknownDeoptimizedProperty */);
+    }
+    set hasUnknownDeoptimizedProperty(value) {
+        this.flags = setFlag(this.flags, 8192 /* Flag.hasUnknownDeoptimizedProperty */, value);
+    }
     // If a PropertyMap is used, this will be taken as propertiesAndGettersByKey
     // and we assume there are no setters or getters
     constructor(properties, prototypeExpression, immutable = false) {
@@ -6303,9 +6344,6 @@ class ObjectEntity extends ExpressionEntity {
         this.deoptimizedPaths = Object.create(null);
         this.expressionsToBeDeoptimizedByKey = Object.create(null);
         this.gettersByKey = Object.create(null);
-        this.hasLostTrack = false;
-        this.hasUnknownDeoptimizedInteger = false;
-        this.hasUnknownDeoptimizedProperty = false;
         this.propertiesAndGettersByKey = Object.create(null);
         this.propertiesAndSettersByKey = Object.create(null);
         this.settersByKey = Object.create(null);
@@ -6837,7 +6875,7 @@ class ArrayExpression extends NodeBase {
                 element.deoptimizePath(UNKNOWN_PATH);
             }
         }
-        this.context.requestTreeshakingPass();
+        this.scope.context.requestTreeshakingPass();
     }
     getObjectEntity() {
         if (this.objectEntity !== null) {
@@ -7198,10 +7236,11 @@ class Scope {
 }
 
 class ChildScope extends Scope {
-    constructor(parent) {
+    constructor(parent, context) {
         super();
         this.accessedOutsideVariables = new Map();
         this.parent = parent;
+        this.context = context;
         parent.children.push(this);
     }
     addAccessedDynamicImport(importExpression) {
@@ -7281,11 +7320,10 @@ class ChildScope extends Scope {
 
 class ParameterScope extends ChildScope {
     constructor(parent, context) {
-        super(parent);
+        super(parent, context);
         this.parameters = [];
         this.hasRest = false;
-        this.context = context;
-        this.hoistedBodyVarScope = new ChildScope(this);
+        this.hoistedBodyVarScope = new ChildScope(this, context);
     }
     /**
      * Adds a parameter to this scope. Parameters must be added in the correct
@@ -8457,7 +8495,16 @@ class Identifier extends NodeBase {
     constructor() {
         super(...arguments);
         this.variable = null;
-        this.isTDZAccess = null;
+    }
+    get isTDZAccess() {
+        if (!isFlagSet(this.flags, 4 /* Flag.tdzAccessDefined */)) {
+            return null;
+        }
+        return isFlagSet(this.flags, 8 /* Flag.tdzAccess */);
+    }
+    set isTDZAccess(value) {
+        this.flags = setFlag(this.flags, 4 /* Flag.tdzAccessDefined */, true);
+        this.flags = setFlag(this.flags, 8 /* Flag.tdzAccess */, value);
     }
     addExportedVariables(variables, exportNamesByVariable) {
         if (exportNamesByVariable.has(this.variable)) {
@@ -8472,10 +8519,10 @@ class Identifier extends NodeBase {
     }
     declare(kind, init) {
         let variable;
-        const { treeshake } = this.context.options;
+        const { treeshake } = this.scope.context.options;
         switch (kind) {
             case 'var': {
-                variable = this.scope.addDeclaration(this, this.context, init, true);
+                variable = this.scope.addDeclaration(this, this.scope.context, init, true);
                 if (treeshake && treeshake.correctVarValueBeforeDeclaration) {
                     // Necessary to make sure the init is deoptimized. We cannot call deoptimizePath here.
                     variable.markInitializersForDeoptimization();
@@ -8484,13 +8531,13 @@ class Identifier extends NodeBase {
             }
             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);
+                variable = this.scope.addDeclaration(this, this.scope.context, init, false);
                 break;
             }
             case 'let':
             case 'const':
             case 'class': {
-                variable = this.scope.addDeclaration(this, this.context, init, false);
+                variable = this.scope.addDeclaration(this, this.scope.context, init, false);
                 break;
             }
             case 'parameter': {
@@ -8527,7 +8574,8 @@ class Identifier extends NodeBase {
         if (this.isPossibleTDZ() && this.variable.kind !== 'var') {
             return true;
         }
-        return (this.context.options.treeshake.unknownGlobalSideEffects &&
+        return (this.scope.context.options.treeshake
+            .unknownGlobalSideEffects &&
             this.variable instanceof GlobalVariable &&
             !this.isPureFunction(EMPTY_PATH) &&
             this.variable.hasEffectsOnInteractionAtPath(EMPTY_PATH, NODE_INTERACTION_UNKNOWN_ACCESS, context));
@@ -8554,7 +8602,7 @@ class Identifier extends NodeBase {
         if (!this.included) {
             this.included = true;
             if (this.variable !== null) {
-                this.context.includeVariableInModule(this.variable);
+                this.scope.context.includeVariableInModule(this.variable);
             }
         }
     }
@@ -8563,14 +8611,15 @@ class Identifier extends NodeBase {
     }
     isPossibleTDZ() {
         // return cached value to avoid issues with the next tree-shaking pass
-        if (this.isTDZAccess !== null)
-            return this.isTDZAccess;
+        const cachedTdzAccess = this.isTDZAccess;
+        if (cachedTdzAccess !== null)
+            return cachedTdzAccess;
         if (!(this.variable instanceof LocalVariable &&
             this.variable.kind &&
             this.variable.kind in tdzVariableKinds &&
             // we ignore possible TDZs due to circular module dependencies as
             // otherwise we get many false positives
-            this.variable.module === this.context.module)) {
+            this.variable.module === this.scope.context.module)) {
             return (this.isTDZAccess = false);
         }
         let decl_id;
@@ -8617,7 +8666,7 @@ class Identifier extends NodeBase {
         this.deoptimized = true;
         if (this.variable instanceof LocalVariable) {
             this.variable.consolidateInitializers();
-            this.context.requestTreeshakingPass();
+            this.scope.context.requestTreeshakingPass();
         }
     }
     getVariableRespectingTDZ() {
@@ -8627,7 +8676,7 @@ class Identifier extends NodeBase {
         return this.variable;
     }
     isPureFunction(path) {
-        let currentPureFunction = this.context.manualPureFunctions[this.name];
+        let currentPureFunction = this.scope.context.manualPureFunctions[this.name];
         for (const segment of path) {
             if (currentPureFunction) {
                 if (currentPureFunction[PureFunctionKey]) {
@@ -8807,9 +8856,9 @@ class ExpressionStatement extends NodeBase {
         if (this.directive &&
             this.directive !== 'use strict' &&
             this.parent.type === Program$1) {
-            this.context.log(parseAst_js.LOGLEVEL_WARN, 
+            this.scope.context.log(parseAst_js.LOGLEVEL_WARN, 
             // This is necessary, because either way (deleting or not) can lead to errors.
-            parseAst_js.logModuleLevelDirective(this.directive, this.context.module.id), this.start);
+            parseAst_js.logModuleLevelDirective(this.directive, this.scope.context.module.id), this.start);
         }
     }
     removeAnnotations(code) {
@@ -8830,9 +8879,17 @@ class ExpressionStatement extends NodeBase {
 }
 
 class BlockStatement extends NodeBase {
-    constructor() {
-        super(...arguments);
-        this.directlyIncluded = false;
+    get deoptimizeBody() {
+        return isFlagSet(this.flags, 32768 /* Flag.deoptimizeBody */);
+    }
+    set deoptimizeBody(value) {
+        this.flags = setFlag(this.flags, 32768 /* Flag.deoptimizeBody */, value);
+    }
+    get directlyIncluded() {
+        return isFlagSet(this.flags, 16384 /* Flag.directlyIncluded */);
+    }
+    set directlyIncluded(value) {
+        this.flags = setFlag(this.flags, 16384 /* Flag.directlyIncluded */, value);
     }
     addImplicitReturnExpressionToScope() {
         const lastStatement = this.body[this.body.length - 1];
@@ -8843,7 +8900,7 @@ class BlockStatement extends NodeBase {
     createScope(parentScope) {
         this.scope = this.parent.preventChildBlockScope
             ? parentScope
-            : new BlockScope(parentScope);
+            : new BlockScope(parentScope, this.scope.context);
     }
     hasEffects(context) {
         if (this.deoptimizeBody)
@@ -8910,7 +8967,7 @@ class RestElement extends NodeBase {
         this.deoptimized = true;
         if (this.declarationInit !== null) {
             this.declarationInit.deoptimizePath([UnknownKey, UnknownKey]);
-            this.context.requestTreeshakingPass();
+            this.scope.context.requestTreeshakingPass();
         }
     }
 }
@@ -8919,7 +8976,18 @@ class FunctionBase extends NodeBase {
     constructor() {
         super(...arguments);
         this.objectEntity = null;
-        this.deoptimizedReturn = false;
+    }
+    get async() {
+        return isFlagSet(this.flags, 256 /* Flag.async */);
+    }
+    set async(value) {
+        this.flags = setFlag(this.flags, 256 /* Flag.async */, value);
+    }
+    get deoptimizedReturn() {
+        return isFlagSet(this.flags, 512 /* Flag.deoptimizedReturn */);
+    }
+    set deoptimizedReturn(value) {
+        this.flags = setFlag(this.flags, 512 /* Flag.deoptimizedReturn */, value);
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         if (interaction.type === INTERACTION_CALLED) {
@@ -8974,7 +9042,7 @@ class FunctionBase extends NodeBase {
             if (!this.deoptimizedReturn) {
                 this.deoptimizedReturn = true;
                 this.scope.getReturnExpression().deoptimizePath(UNKNOWN_PATH);
-                this.context.requestTreeshakingPass();
+                this.scope.context.requestTreeshakingPass();
             }
             return UNKNOWN_RETURN_EXPRESSION;
         }
@@ -8988,7 +9056,7 @@ class FunctionBase extends NodeBase {
             return false;
         }
         if (this.async) {
-            const { propertyReadSideEffects } = this.context.options
+            const { propertyReadSideEffects } = this.scope.context.options
                 .treeshake;
             const returnExpression = this.scope.getReturnExpression();
             if (returnExpression.hasEffectsOnInteractionAtPath(['then'], NODE_INTERACTION_UNKNOWN_CALL, context) ||
@@ -9042,7 +9110,7 @@ class ArrowFunctionExpression extends FunctionBase {
         this.objectEntity = null;
     }
     createScope(parentScope) {
-        this.scope = new ReturnValueScope(parentScope, this.context);
+        this.scope = new ReturnValueScope(parentScope, this.scope.context);
     }
     hasEffects() {
         if (!this.deoptimized)
@@ -9252,7 +9320,7 @@ class AssignmentExpression extends NodeBase {
         this.deoptimized = true;
         this.left.deoptimizePath(EMPTY_PATH);
         this.right.deoptimizePath(UNKNOWN_PATH);
-        this.context.requestTreeshakingPass();
+        this.scope.context.requestTreeshakingPass();
     }
 }
 
@@ -9280,7 +9348,7 @@ class AssignmentPattern extends NodeBase {
         this.deoptimized = true;
         this.left.deoptimizePath(EMPTY_PATH);
         this.right.deoptimizePath(UNKNOWN_PATH);
-        this.context.requestTreeshakingPass();
+        this.scope.context.requestTreeshakingPass();
     }
 }
 
@@ -9345,7 +9413,7 @@ class FunctionNode extends FunctionBase {
         this.objectEntity = null;
     }
     createScope(parentScope) {
-        this.scope = new FunctionScope(parentScope, this.context);
+        this.scope = new FunctionScope(parentScope, this.scope.context);
         this.constructedEntity = new ObjectEntity(Object.create(null), OBJECT_PROTOTYPE);
         // This makes sure that all deoptimizations of "this" are applied to the
         // constructed entity.
@@ -9438,13 +9506,13 @@ class AwaitExpression extends NodeBase {
             this.applyDeoptimizations();
         if (!this.included) {
             this.included = true;
-            checkTopLevelAwait: if (!this.context.usesTopLevelAwait) {
+            checkTopLevelAwait: if (!this.scope.context.usesTopLevelAwait) {
                 let parent = this.parent;
                 do {
                     if (parent instanceof FunctionNode || parent instanceof ArrowFunctionExpression)
                         break checkTopLevelAwait;
                 } while ((parent = parent.parent));
-                this.context.usesTopLevelAwait = true;
+                this.scope.context.usesTopLevelAwait = true;
             }
         }
         this.argument.include(context, includeChildrenRecursively);
@@ -9572,10 +9640,10 @@ class Literal extends NodeBase {
     getLiteralValueAtPath(path) {
         if (path.length > 0 ||
             // unknown literals can also be null but do not start with an "n"
-            (this.value === null && this.context.code.charCodeAt(this.start) !== 110) ||
+            (this.value === null && this.scope.context.code.charCodeAt(this.start) !== 110) ||
             typeof this.value === 'bigint' ||
             // to support shims for regular expressions
-            this.context.code.charCodeAt(this.start) === 47) {
+            this.scope.context.code.charCodeAt(this.start) === 47) {
             return UnknownValue;
         }
         return this.value;
@@ -9660,17 +9728,44 @@ class MemberExpression extends NodeBase {
     constructor() {
         super(...arguments);
         this.variable = null;
-        this.assignmentDeoptimized = false;
-        this.bound = false;
         this.expressionsToBeDeoptimized = [];
-        this.isUndefined = false;
+    }
+    get computed() {
+        return isFlagSet(this.flags, 1024 /* Flag.computed */);
+    }
+    set computed(value) {
+        this.flags = setFlag(this.flags, 1024 /* Flag.computed */, value);
+    }
+    get optional() {
+        return isFlagSet(this.flags, 128 /* Flag.optional */);
+    }
+    set optional(value) {
+        this.flags = setFlag(this.flags, 128 /* Flag.optional */, value);
+    }
+    get assignmentDeoptimized() {
+        return isFlagSet(this.flags, 16 /* Flag.assignmentDeoptimized */);
+    }
+    set assignmentDeoptimized(value) {
+        this.flags = setFlag(this.flags, 16 /* Flag.assignmentDeoptimized */, value);
+    }
+    get bound() {
+        return isFlagSet(this.flags, 32 /* Flag.bound */);
+    }
+    set bound(value) {
+        this.flags = setFlag(this.flags, 32 /* Flag.bound */, value);
+    }
+    get isUndefined() {
+        return isFlagSet(this.flags, 64 /* Flag.isUndefined */);
+    }
+    set isUndefined(value) {
+        this.flags = setFlag(this.flags, 64 /* Flag.isUndefined */, value);
     }
     bind() {
         this.bound = true;
         const path = getPathIfNotComputed(this);
         const baseVariable = path && this.scope.findVariable(path[0].key);
         if (baseVariable?.isNamespace) {
-            const resolvedVariable = resolveNamespaceVariables(baseVariable, path.slice(1), this.context);
+            const resolvedVariable = resolveNamespaceVariables(baseVariable, path.slice(1), this.scope.context);
             if (!resolvedVariable) {
                 super.bind();
             }
@@ -9838,7 +9933,7 @@ class MemberExpression extends NodeBase {
     }
     applyDeoptimizations() {
         this.deoptimized = true;
-        const { propertyReadSideEffects } = this.context.options
+        const { propertyReadSideEffects } = this.scope.context.options
             .treeshake;
         if (
         // Namespaces are not bound and should not be deoptimized
@@ -9847,12 +9942,12 @@ class MemberExpression extends NodeBase {
             !(this.variable || this.isUndefined)) {
             const propertyKey = this.getPropertyKey();
             this.object.deoptimizeArgumentsOnInteractionAtPath(this.accessInteraction, [propertyKey], SHARED_RECURSION_TRACKER);
-            this.context.requestTreeshakingPass();
+            this.scope.context.requestTreeshakingPass();
         }
     }
     applyAssignmentDeoptimization() {
         this.assignmentDeoptimized = true;
-        const { propertyReadSideEffects } = this.context.options
+        const { propertyReadSideEffects } = this.scope.context.options
             .treeshake;
         if (
         // Namespaces are not bound and should not be deoptimized
@@ -9860,7 +9955,7 @@ class MemberExpression extends NodeBase {
             propertyReadSideEffects &&
             !(this.variable || this.isUndefined)) {
             this.object.deoptimizeArgumentsOnInteractionAtPath(this.assignmentInteraction, [this.getPropertyKey()], SHARED_RECURSION_TRACKER);
-            this.context.requestTreeshakingPass();
+            this.scope.context.requestTreeshakingPass();
         }
     }
     disallowNamespaceReassignment() {
@@ -9868,9 +9963,9 @@ class MemberExpression extends NodeBase {
             const variable = this.scope.findVariable(this.object.name);
             if (variable.isNamespace) {
                 if (this.variable) {
-                    this.context.includeVariableInModule(this.variable);
+                    this.scope.context.includeVariableInModule(this.variable);
                 }
-                this.context.log(parseAst_js.LOGLEVEL_WARN, parseAst_js.logIllegalImportReassignment(this.object.name, this.context.module.id), this.start);
+                this.scope.context.log(parseAst_js.LOGLEVEL_WARN, parseAst_js.logIllegalImportReassignment(this.object.name, this.scope.context.module.id), this.start);
             }
         }
     }
@@ -9888,7 +9983,7 @@ class MemberExpression extends NodeBase {
         return this.propertyKey;
     }
     hasAccessEffect(context) {
-        const { propertyReadSideEffects } = this.context.options
+        const { propertyReadSideEffects } = this.scope.context.options
             .treeshake;
         return (!(this.variable || this.isUndefined) &&
             propertyReadSideEffects &&
@@ -9899,7 +9994,7 @@ class MemberExpression extends NodeBase {
         if (!this.included) {
             this.included = true;
             if (this.variable) {
-                this.context.includeVariableInModule(this.variable);
+                this.scope.context.includeVariableInModule(this.variable);
             }
         }
         this.object.include(context, includeChildrenRecursively);
@@ -9969,7 +10064,7 @@ class CallExpressionBase extends NodeBase {
     }
     deoptimizePath(path) {
         if (path.length === 0 ||
-            this.context.deoptimizationTracker.trackEntityAtPathAndGetIfTracked(path, this)) {
+            this.scope.context.deoptimizationTracker.trackEntityAtPathAndGetIfTracked(path, this)) {
             return;
         }
         const [returnExpression] = this.getReturnExpression();
@@ -10018,15 +10113,21 @@ class CallExpressionBase extends NodeBase {
 }
 
 class CallExpression extends CallExpressionBase {
+    get optional() {
+        return isFlagSet(this.flags, 128 /* Flag.optional */);
+    }
+    set optional(value) {
+        this.flags = setFlag(this.flags, 128 /* Flag.optional */, value);
+    }
     bind() {
         super.bind();
         if (this.callee instanceof Identifier) {
             const variable = this.scope.findVariable(this.callee.name);
             if (variable.isNamespace) {
-                this.context.log(parseAst_js.LOGLEVEL_WARN, parseAst_js.logCannotCallNamespace(this.callee.name), this.start);
+                this.scope.context.log(parseAst_js.LOGLEVEL_WARN, parseAst_js.logCannotCallNamespace(this.callee.name), this.start);
             }
             if (this.callee.name === 'eval') {
-                this.context.log(parseAst_js.LOGLEVEL_WARN, parseAst_js.logEval(this.context.module.id), this.start);
+                this.scope.context.log(parseAst_js.LOGLEVEL_WARN, parseAst_js.logEval(this.scope.context.module.id), this.start);
             }
         }
         this.interaction = {
@@ -10089,7 +10190,7 @@ class CallExpression extends CallExpressionBase {
     applyDeoptimizations() {
         this.deoptimized = true;
         this.callee.deoptimizeArgumentsOnInteractionAtPath(this.interaction, EMPTY_PATH, SHARED_RECURSION_TRACKER);
-        this.context.requestTreeshakingPass();
+        this.scope.context.requestTreeshakingPass();
     }
     getReturnExpression(recursionTracker = SHARED_RECURSION_TRACKER) {
         if (this.returnExpression === null) {
@@ -10117,7 +10218,7 @@ class CatchScope extends ParameterScope {
 
 class CatchClause extends NodeBase {
     createScope(parentScope) {
-        this.scope = new CatchScope(parentScope, this.context);
+        this.scope = new CatchScope(parentScope, this.scope.context);
     }
     parseNode(esTreeNode) {
         // Parameters need to be declared first as the logic is that initializers
@@ -10125,7 +10226,7 @@ class CatchClause extends NodeBase {
         // name instead of the variable
         const { param } = esTreeNode;
         if (param) {
-            this.param = new (this.context.getNodeConstructor(param.type))(param, this, this.scope);
+            this.param = new (this.scope.context.getNodeConstructor(param.type))(param, this, this.scope);
             this.param.declare('parameter', UNKNOWN_EXPRESSION);
         }
         super.parseNode(esTreeNode);
@@ -10152,9 +10253,9 @@ class ChainExpression extends NodeBase {
 
 class ClassBodyScope extends ChildScope {
     constructor(parent, classNode, context) {
-        super(parent);
+        super(parent, context);
         this.variables.set('this', (this.thisVariable = new LocalVariable('this', null, classNode, context)));
-        this.instanceScope = new ChildScope(this);
+        this.instanceScope = new ChildScope(this, context);
         this.instanceScope.variables.set('this', new ThisVariable(context));
     }
     findLexicalBoundary() {
@@ -10164,11 +10265,11 @@ class ClassBodyScope extends ChildScope {
 
 class ClassBody extends NodeBase {
     createScope(parentScope) {
-        this.scope = new ClassBodyScope(parentScope, this.parent, this.context);
+        this.scope = new ClassBodyScope(parentScope, this.parent, this.scope.context);
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
-        this.context.includeVariableInModule(this.scope.thisVariable);
+        this.scope.context.includeVariableInModule(this.scope.thisVariable);
         for (const definition of this.body) {
             definition.include(context, includeChildrenRecursively);
         }
@@ -10176,7 +10277,7 @@ class ClassBody extends NodeBase {
     parseNode(esTreeNode) {
         const body = (this.body = []);
         for (const definition of esTreeNode.body) {
-            body.push(new (this.context.getNodeConstructor(definition.type))(definition, this, definition.static ? this.scope : this.scope.instanceScope));
+            body.push(new (this.scope.context.getNodeConstructor(definition.type))(definition, this, definition.static ? this.scope : this.scope.instanceScope));
         }
         super.parseNode(esTreeNode);
     }
@@ -10188,6 +10289,12 @@ class MethodBase extends NodeBase {
         super(...arguments);
         this.accessedValue = null;
     }
+    get computed() {
+        return isFlagSet(this.flags, 1024 /* Flag.computed */);
+    }
+    set computed(value) {
+        this.flags = setFlag(this.flags, 1024 /* Flag.computed */, value);
+    }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         if (interaction.type === INTERACTION_ACCESSED && this.kind === 'get' && path.length === 0) {
             return this.value.deoptimizeArgumentsOnInteractionAtPath({
@@ -10286,7 +10393,7 @@ class ClassNode extends NodeBase {
         this.objectEntity = null;
     }
     createScope(parentScope) {
-        this.scope = new ChildScope(parentScope);
+        this.scope = new ChildScope(parentScope, this.scope.context);
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         this.getObjectEntity().deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
@@ -10349,7 +10456,7 @@ class ClassNode extends NodeBase {
                 definition.deoptimizePath(UNKNOWN_PATH);
             }
         }
-        this.context.requestTreeshakingPass();
+        this.scope.context.requestTreeshakingPass();
     }
     getObjectEntity() {
         if (this.objectEntity !== null) {
@@ -10454,7 +10561,6 @@ class MultiExpression extends ExpressionEntity {
     constructor(expressions) {
         super();
         this.expressions = expressions;
-        this.included = false;
     }
     deoptimizePath(path) {
         for (const expression of this.expressions) {
@@ -10480,9 +10586,14 @@ class ConditionalExpression extends NodeBase {
     constructor() {
         super(...arguments);
         this.expressionsToBeDeoptimized = [];
-        this.isBranchResolutionAnalysed = false;
         this.usedBranch = null;
     }
+    get isBranchResolutionAnalysed() {
+        return isFlagSet(this.flags, 65536 /* Flag.isBranchResolutionAnalysed */);
+    }
+    set isBranchResolutionAnalysed(value) {
+        this.flags = setFlag(this.flags, 65536 /* Flag.isBranchResolutionAnalysed */, value);
+    }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         this.consequent.deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
         this.alternate.deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
@@ -10689,7 +10800,7 @@ class ExportAllDeclaration extends NodeBase {
         return false;
     }
     initialise() {
-        this.context.addExport(this);
+        this.scope.context.addExport(this);
     }
     render(code, _options, nodeRenderOptions) {
         code.remove(nodeRenderOptions.start, nodeRenderOptions.end);
@@ -10730,15 +10841,15 @@ class ExportDefaultDeclaration extends NodeBase {
     include(context, includeChildrenRecursively) {
         super.include(context, includeChildrenRecursively);
         if (includeChildrenRecursively) {
-            this.context.includeVariableInModule(this.variable);
+            this.scope.context.includeVariableInModule(this.variable);
         }
     }
     initialise() {
         const declaration = this.declaration;
         this.declarationName =
             (declaration.id && declaration.id.name) || this.declaration.name;
-        this.variable = this.scope.addExportDefaultDeclaration(this.declarationName || this.context.getModuleName(), this, this.context);
-        this.context.addExport(this);
+        this.variable = this.scope.addExportDefaultDeclaration(this.declarationName || this.scope.context.getModuleName(), this, this.scope.context);
+        this.scope.context.addExport(this);
     }
     removeAnnotations(code) {
         this.declaration.removeAnnotations(code);
@@ -10817,7 +10928,7 @@ class ExportNamedDeclaration extends NodeBase {
         return !!this.declaration?.hasEffects(context);
     }
     initialise() {
-        this.context.addExport(this);
+        this.scope.context.addExport(this);
     }
     removeAnnotations(code) {
         this.declaration?.removeAnnotations(code);
@@ -10842,7 +10953,7 @@ class ExportSpecifier extends NodeBase {
 
 class ForInStatement extends NodeBase {
     createScope(parentScope) {
-        this.scope = new BlockScope(parentScope);
+        this.scope = new BlockScope(parentScope, this.scope.context);
     }
     hasEffects(context) {
         const { body, deoptimized, left, right } = this;
@@ -10876,13 +10987,19 @@ class ForInStatement extends NodeBase {
     applyDeoptimizations() {
         this.deoptimized = true;
         this.left.deoptimizePath(EMPTY_PATH);
-        this.context.requestTreeshakingPass();
+        this.scope.context.requestTreeshakingPass();
     }
 }
 
 class ForOfStatement extends NodeBase {
+    get await() {
+        return isFlagSet(this.flags, 131072 /* Flag.await */);
+    }
+    set await(value) {
+        this.flags = setFlag(this.flags, 131072 /* Flag.await */, value);
+    }
     createScope(parentScope) {
-        this.scope = new BlockScope(parentScope);
+        this.scope = new BlockScope(parentScope, this.scope.context);
     }
     hasEffects() {
         if (!this.deoptimized)
@@ -10915,13 +11032,13 @@ class ForOfStatement extends NodeBase {
         this.deoptimized = true;
         this.left.deoptimizePath(EMPTY_PATH);
         this.right.deoptimizePath(UNKNOWN_PATH);
-        this.context.requestTreeshakingPass();
+        this.scope.context.requestTreeshakingPass();
     }
 }
 
 class ForStatement extends NodeBase {
     createScope(parentScope) {
-        this.scope = new BlockScope(parentScope);
+        this.scope = new BlockScope(parentScope, this.scope.context);
     }
     hasEffects(context) {
         if (this.init?.hasEffects(context) ||
@@ -11014,11 +11131,11 @@ class IfStatement extends NodeBase {
         }
     }
     parseNode(esTreeNode) {
-        this.consequentScope = new TrackingScope(this.scope);
-        this.consequent = new (this.context.getNodeConstructor(esTreeNode.consequent.type))(esTreeNode.consequent, this, this.consequentScope);
+        this.consequentScope = new TrackingScope(this.scope, this.scope.context);
+        this.consequent = new (this.scope.context.getNodeConstructor(esTreeNode.consequent.type))(esTreeNode.consequent, this, this.consequentScope);
         if (esTreeNode.alternate) {
-            this.alternateScope = new TrackingScope(this.scope);
-            this.alternate = new (this.context.getNodeConstructor(esTreeNode.alternate.type))(esTreeNode.alternate, this, this.alternateScope);
+            this.alternateScope = new TrackingScope(this.scope, this.scope.context);
+            this.alternate = new (this.scope.context.getNodeConstructor(esTreeNode.alternate.type))(esTreeNode.alternate, this, this.alternateScope);
         }
         super.parseNode(esTreeNode);
     }
@@ -11028,7 +11145,7 @@ class IfStatement extends NodeBase {
         const testValue = this.getTestValue();
         const hoistedDeclarations = [];
         const includesIfElse = this.test.included;
-        const noTreeshake = !this.context.options.treeshake;
+        const noTreeshake = !this.scope.context.options.treeshake;
         if (includesIfElse) {
             this.test.render(code, options);
         }
@@ -11148,7 +11265,7 @@ class ImportDeclaration extends NodeBase {
         return false;
     }
     initialise() {
-        this.context.addImport(this);
+        this.scope.context.addImport(this);
     }
     render(code, _options, nodeRenderOptions) {
         code.remove(nodeRenderOptions.start, nodeRenderOptions.end);
@@ -11532,13 +11649,13 @@ class ImportExpression extends NodeBase {
     include(context, includeChildrenRecursively) {
         if (!this.included) {
             this.included = true;
-            this.context.includeDynamicImport(this);
+            this.scope.context.includeDynamicImport(this);
             this.scope.addAccessedDynamicImport(this);
         }
         this.source.include(context, includeChildrenRecursively);
     }
     initialise() {
-        this.context.addDynamicImport(this);
+        this.scope.context.addDynamicImport(this);
     }
     parseNode(esTreeNode) {
         // Keep the source AST to be used by renderDynamicImport
@@ -11610,7 +11727,7 @@ class ImportExpression extends NodeBase {
             {
                 customResolution: typeof this.resolution === 'string' ? this.resolution : null,
                 format,
-                moduleId: this.context.module.id,
+                moduleId: this.scope.context.module.id,
                 targetModuleId: this.resolution && typeof this.resolution !== 'string' ? this.resolution.id : null
             }
         ]);
@@ -11763,9 +11880,15 @@ class LogicalExpression extends NodeBase {
         super(...arguments);
         // We collect deoptimization information if usedBranch !== null
         this.expressionsToBeDeoptimized = [];
-        this.isBranchResolutionAnalysed = false;
         this.usedBranch = null;
     }
+    //private isBranchResolutionAnalysed = false;
+    get isBranchResolutionAnalysed() {
+        return isFlagSet(this.flags, 65536 /* Flag.isBranchResolutionAnalysed */);
+    }
+    set isBranchResolutionAnalysed(value) {
+        this.flags = setFlag(this.flags, 65536 /* Flag.isBranchResolutionAnalysed */, value);
+    }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         this.left.deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
         this.right.deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
@@ -11775,7 +11898,7 @@ class LogicalExpression extends NodeBase {
             const unusedBranch = this.usedBranch === this.left ? this.right : this.left;
             this.usedBranch = null;
             unusedBranch.deoptimizePath(UNKNOWN_PATH);
-            const { context, expressionsToBeDeoptimized } = this;
+            const { scope: { context }, expressionsToBeDeoptimized } = this;
             this.expressionsToBeDeoptimized = EMPTY_ARRAY;
             for (const expression of expressionsToBeDeoptimized) {
                 expression.deoptimizeCache();
@@ -11923,7 +12046,7 @@ class MetaProperty extends NodeBase {
         if (!this.included) {
             this.included = true;
             if (this.meta.name === IMPORT) {
-                this.context.addImportMeta(this);
+                this.scope.context.addImportMeta(this);
                 const parent = this.parent;
                 const metaProperty = (this.metaProperty =
                     parent instanceof MemberExpression && typeof parent.propertyKey === 'string'
@@ -11937,7 +12060,7 @@ class MetaProperty extends NodeBase {
     }
     render(code, renderOptions) {
         const { format, pluginDriver, snippets } = renderOptions;
-        const { context: { module }, meta: { name }, metaProperty, parent, preliminaryChunkId, referenceId, start, end } = this;
+        const { scope: { context: { module } }, meta: { name }, metaProperty, parent, preliminaryChunkId, referenceId, start, end } = this;
         const { id: moduleId } = module;
         if (name !== IMPORT)
             return;
@@ -12074,7 +12197,7 @@ class NewExpression extends NodeBase {
     applyDeoptimizations() {
         this.deoptimized = true;
         this.callee.deoptimizeArgumentsOnInteractionAtPath(this.interaction, EMPTY_PATH, SHARED_RECURSION_TRACKER);
-        this.context.requestTreeshakingPass();
+        this.scope.context.requestTreeshakingPass();
     }
 }
 
@@ -12171,9 +12294,9 @@ class Program extends NodeBase {
     hasEffects(context) {
         for (const node of this.body) {
             if (node.hasEffects(context)) {
-                if (this.context.options.experimentalLogSideEffects && !this.hasLoggedEffect) {
+                if (this.scope.context.options.experimentalLogSideEffects && !this.hasLoggedEffect) {
                     this.hasLoggedEffect = true;
-                    const { code, log, module } = this.context;
+                    const { code, log, module } = this.scope.context;
                     log(parseAst_js.LOGLEVEL_INFO, parseAst_js.logFirstSideEffect(code, module.id, parseAst_js.locate(code, node.start, { offsetLine: 1 })), node.start);
                 }
                 return (this.hasCachedEffect = true);
@@ -12218,6 +12341,20 @@ class Property extends MethodBase {
         super(...arguments);
         this.declarationInit = null;
     }
+    //declare method: boolean;
+    get method() {
+        return isFlagSet(this.flags, 262144 /* Flag.method */);
+    }
+    set method(value) {
+        this.flags = setFlag(this.flags, 262144 /* Flag.method */, value);
+    }
+    //declare shorthand: boolean;
+    get shorthand() {
+        return isFlagSet(this.flags, 524288 /* Flag.shorthand */);
+    }
+    set shorthand(value) {
+        this.flags = setFlag(this.flags, 524288 /* Flag.shorthand */, value);
+    }
     declare(kind, init) {
         this.declarationInit = init;
         return this.value.declare(kind, UNKNOWN_EXPRESSION);
@@ -12225,8 +12362,7 @@ class Property extends MethodBase {
     hasEffects(context) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
-        const propertyReadSideEffects = this.context.options.treeshake
-            .propertyReadSideEffects;
+        const propertyReadSideEffects = this.scope.context.options.treeshake.propertyReadSideEffects;
         return ((this.parent.type === 'ObjectPattern' && propertyReadSideEffects === 'always') ||
             this.key.hasEffects(context) ||
             this.value.hasEffects(context));
@@ -12244,12 +12380,18 @@ class Property extends MethodBase {
         this.deoptimized = true;
         if (this.declarationInit !== null) {
             this.declarationInit.deoptimizePath([UnknownKey, UnknownKey]);
-            this.context.requestTreeshakingPass();
+            this.scope.context.requestTreeshakingPass();
         }
     }
 }
 
 class PropertyDefinition extends NodeBase {
+    get computed() {
+        return isFlagSet(this.flags, 1024 /* Flag.computed */);
+    }
+    set computed(value) {
+        this.flags = setFlag(this.flags, 1024 /* Flag.computed */, value);
+    }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         this.value?.deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
     }
@@ -12367,7 +12509,7 @@ class SequenceExpression extends NodeBase {
 
 class StaticBlock extends NodeBase {
     createScope(parentScope) {
-        this.scope = new BlockScope(parentScope);
+        this.scope = new BlockScope(parentScope, this.scope.context);
     }
     hasEffects(context) {
         for (const node of this.body) {
@@ -12407,7 +12549,7 @@ class Super extends NodeBase {
     include() {
         if (!this.included) {
             this.included = true;
-            this.context.includeVariableInModule(this.variable);
+            this.scope.context.includeVariableInModule(this.variable);
         }
     }
 }
@@ -12451,7 +12593,7 @@ SwitchCase.prototype.needsBoundaries = true;
 class SwitchStatement extends NodeBase {
     createScope(parentScope) {
         this.parentScope = parentScope;
-        this.scope = new BlockScope(parentScope);
+        this.scope = new BlockScope(parentScope, this.scope.context);
     }
     hasEffects(context) {
         if (this.discriminant.hasEffects(context))
@@ -12520,7 +12662,7 @@ class SwitchStatement extends NodeBase {
         this.defaultCase = null;
     }
     parseNode(esTreeNode) {
-        this.discriminant = new (this.context.getNodeConstructor(esTreeNode.discriminant.type))(esTreeNode.discriminant, this, this.parentScope);
+        this.discriminant = new (this.scope.context.getNodeConstructor(esTreeNode.discriminant.type))(esTreeNode.discriminant, this, this.parentScope);
         super.parseNode(esTreeNode);
     }
     render(code, options) {
@@ -12538,7 +12680,7 @@ class TaggedTemplateExpression extends CallExpressionBase {
             const name = this.tag.name;
             const variable = this.scope.findVariable(name);
             if (variable.isNamespace) {
-                this.context.log(parseAst_js.LOGLEVEL_WARN, parseAst_js.logCannotCallNamespace(name), this.start);
+                this.scope.context.log(parseAst_js.LOGLEVEL_WARN, parseAst_js.logCannotCallNamespace(name), this.start);
             }
         }
     }
@@ -12591,7 +12733,7 @@ class TaggedTemplateExpression extends CallExpressionBase {
     applyDeoptimizations() {
         this.deoptimized = true;
         this.tag.deoptimizeArgumentsOnInteractionAtPath(this.interaction, EMPTY_PATH, SHARED_RECURSION_TRACKER);
-        this.context.requestTreeshakingPass();
+        this.scope.context.requestTreeshakingPass();
     }
     getReturnExpression(recursionTracker = SHARED_RECURSION_TRACKER) {
         if (this.returnExpression === null) {
@@ -12603,6 +12745,12 @@ class TaggedTemplateExpression extends CallExpressionBase {
 }
 
 class TemplateElement extends NodeBase {
+    get tail() {
+        return isFlagSet(this.flags, 1048576 /* Flag.tail */);
+    }
+    set tail(value) {
+        this.flags = setFlag(this.flags, 1048576 /* Flag.tail */, value);
+    }
     // Do not try to bind value
     bind() { }
     hasEffects() {
@@ -12728,8 +12876,7 @@ class ExportDefaultVariable extends LocalVariable {
 
 class ModuleScope extends ChildScope {
     constructor(parent, context) {
-        super(parent);
-        this.context = context;
+        super(parent, context);
         this.variables.set('this', new LocalVariable('this', null, UNDEFINED_EXPRESSION, context));
     }
     addExportDefaultDeclaration(name, exportDefaultDeclaration, context) {
@@ -12778,14 +12925,16 @@ class ThisExpression extends NodeBase {
     include() {
         if (!this.included) {
             this.included = true;
-            this.context.includeVariableInModule(this.variable);
+            this.scope.context.includeVariableInModule(this.variable);
         }
     }
     initialise() {
         this.alias =
-            this.scope.findLexicalBoundary() instanceof ModuleScope ? this.context.moduleContext : null;
+            this.scope.findLexicalBoundary() instanceof ModuleScope
+                ? this.scope.context.moduleContext
+                : null;
         if (this.alias === 'undefined') {
-            this.context.log(parseAst_js.LOGLEVEL_WARN, parseAst_js.logThisIsUndefined(), this.start);
+            this.scope.context.log(parseAst_js.LOGLEVEL_WARN, parseAst_js.logThisIsUndefined(), this.start);
         }
     }
     render(code) {
@@ -12822,13 +12971,12 @@ class TryStatement extends NodeBase {
         this.includedLabelsAfterBlock = null;
     }
     hasEffects(context) {
-        return ((this.context.options.treeshake.tryCatchDeoptimization
+        return ((this.scope.context.options.treeshake.tryCatchDeoptimization
             ? this.block.body.length > 0
             : this.block.hasEffects(context)) || !!this.finalizer?.hasEffects(context));
     }
     include(context, includeChildrenRecursively) {
-        const tryCatchDeoptimization = this.context.options.treeshake
-            ?.tryCatchDeoptimization;
+        const tryCatchDeoptimization = this.scope.context.options.treeshake?.tryCatchDeoptimization;
         const { brokenFlow, includedLabels } = context;
         if (!this.directlyIncluded || !tryCatchDeoptimization) {
             this.included = true;
@@ -12862,6 +13010,12 @@ const unaryOperators = {
     '~': value => ~value
 };
 class UnaryExpression extends NodeBase {
+    get prefix() {
+        return isFlagSet(this.flags, 2097152 /* Flag.prefix */);
+    }
+    set prefix(value) {
+        this.flags = setFlag(this.flags, 2097152 /* Flag.prefix */, value);
+    }
     getLiteralValueAtPath(path, recursionTracker, origin) {
         if (path.length > 0)
             return UnknownValue;
@@ -12886,7 +13040,7 @@ class UnaryExpression extends NodeBase {
         this.deoptimized = true;
         if (this.operator === 'delete') {
             this.argument.deoptimizePath(EMPTY_PATH);
-            this.context.requestTreeshakingPass();
+            this.scope.context.requestTreeshakingPass();
         }
     }
 }
@@ -12947,7 +13101,7 @@ class UpdateExpression extends NodeBase {
             const variable = this.scope.findVariable(this.argument.name);
             variable.isReassigned = true;
         }
-        this.context.requestTreeshakingPass();
+        this.scope.context.requestTreeshakingPass();
     }
 }
 
@@ -13371,7 +13525,8 @@ class NamespaceVariable extends Variable {
         this.mergedNamespaces = mergedNamespaces;
         const moduleExecIndex = this.context.getModuleExecIndex();
         for (const identifier of this.references) {
-            if (identifier.context.getModuleExecIndex() <= moduleExecIndex) {
+            const { context } = identifier.scope;
+            if (context.getModuleExecIndex() <= moduleExecIndex) {
                 this.referencedEarly = true;
                 break;
             }
@@ -13520,7 +13675,7 @@ function getOriginalLocation(sourcemapChain, location) {
 
 const ATTRIBUTE_KEYWORDS = new Set(['assert', 'with']);
 function getAttributesFromImportExpression(node) {
-    const { context, options, start } = node;
+    const { scope: { context }, options, start } = node;
     if (!(options instanceof ObjectExpression)) {
         if (options) {
             context.module.log(parseAst_js.LOGLEVEL_WARN, parseAst_js.logImportAttributeIsInvalid(context.module.id), start);