@rollup/wasm-node 4.33.0 → 4.34.0

package/dist/es/shared/node-entry.js

@@ -1,21 +1,21 @@
 /*
   @license
-	Rollup.js v4.33.0
-	Sat, 01 Feb 2025 07:11:29 GMT - commit 494483e8df7b5d04796b30e37f54d7e96fa91a97
+	Rollup.js v4.34.0
+	Sat, 01 Feb 2025 08:39:54 GMT - commit 979d62888dbe75f92e50fdd64246c737c52f5f1f
 
 	https://github.com/rollup/rollup
 
 	Released under the MIT License.
 */
-import { ExportDefaultDeclaration as ExportDefaultDeclaration$1, CallExpression as CallExpression$1, EMPTY_ARRAY, LOGLEVEL_WARN, logUnusedExternalImports, ANNOTATION_KEY, INVALID_ANNOTATION_KEY, ObjectExpression as ObjectExpression$1, Property as Property$1, Program as Program$1, logIllegalImportReassignment, BLANK, logRedeclarationError, StaticBlock as StaticBlock$1, CatchClause as CatchClause$1, logDuplicateArgumentNameError, logModuleLevelDirective, ReturnStatement as ReturnStatement$1, VariableDeclarator as VariableDeclarator$1, ExpressionStatement as ExpressionStatement$1, logMissingExport, normalize, getImportPath, logMissingNodeBuiltins, logReservedNamespace, error, logIllegalIdentifierAsName, logMissingNameOptionForIifeExport, logMissingNameOptionForUmdExport, logConstVariableReassignError, ArrowFunctionExpression as ArrowFunctionExpression$1, EMPTY_SET, logCannotCallNamespace, logEval, BlockStatement as BlockStatement$1, getRollupError, logParseError, logModuleParseError, LOGLEVEL_INFO, logFirstSideEffect, locate, logInvalidAnnotation, Identifier as Identifier$1, logThisIsUndefined, getAstBuffer, convertAnnotations, FIXED_STRINGS, convertNode as convertNode$1, EMPTY_OBJECT, logImportAttributeIsInvalid, logImportOptionsAreInvalid, logSyntheticNamedExportsNeedNamespaceExport, logMissingEntryExport, logDuplicateExportError, logInvalidSourcemapForError, augmentCodeLocation, logInconsistentImportAttributes, logMissingJsxExport, logNamespaceConflict, logAmbiguousExternalNamespaces, logShimmedExport, parseAst, logCircularReexport, logInvalidFormatForTopLevelAwait, TemplateLiteral as TemplateLiteral$1, Literal as Literal$1, logAddonNotGenerated, logIncompatibleExportOptionValue, logMixedExport, logFailedValidation, isPathFragment, logCyclicCrossChunkReexport, getAliasName, logUnexpectedNamedImport, isAbsolute as isAbsolute$1, relative as relative$1, logUnexpectedNamespaceReexport, logEmptyChunk, logMissingGlobalName, logOptimizeChunkStatus, logSourcemapBroken, logConflictingSourcemapSources, logChunkInvalid, logInvalidOption, URL_OUTPUT_FORMAT, URL_OUTPUT_DIR, URL_OUTPUT_SOURCEMAPFILE, URL_OUTPUT_AMD_ID, logCannotAssignModuleToChunk, logAnonymousPluginCache, logDuplicatePluginName, logUnknownOption, printQuotedStringList, LOGLEVEL_ERROR, logLevelPriority, LOGLEVEL_DEBUG, logInvalidSetAssetSourceCall, logPluginError, logNoTransformMapOrAstWithoutCode, relativeId, logBadLoader, logExternalModulesCannotBeTransformedToModules, logInternalIdCannotBeExternal, isRelative, logUnresolvedImport, logUnresolvedImportTreatedAsExternal, logExternalSyntheticExports, logUnresolvedEntry, logUnresolvedImplicitDependant, logExternalModulesCannotBeIncludedInManualChunks, logEntryCannotBeExternal, logImplicitDependantCannotBeExternal, logNoAssetSourceSet, logFileReferenceIdNotFoundForFilename, logAssetReferenceIdNotFoundForSetSource, logAssetSourceAlreadySet, logInvalidRollupPhaseForChunkEmission, warnDeprecation, URL_GENERATEBUNDLE, logFileNameConflict, logAssetNotFinalisedForFileName, logChunkNotGeneratedForFileName, logInvalidLogPosition, logInputHookInOutputPlugin, logInvalidFunctionPluginHook, logInvalidAddonPluginHook, logImplicitDependantIsNotIncluded, logCircularDependency, augmentLogMessage, URL_JSX, URL_TREESHAKE, URL_TREESHAKE_MODULESIDEEFFECTS, logInvalidExportOptionValue, URL_OUTPUT_INTEROP, isValidUrl, addTrailingSlashIfMissed, URL_OUTPUT_SOURCEMAPBASEURL, URL_OUTPUT_INLINEDYNAMICIMPORTS, URL_PRESERVEENTRYSIGNATURES, URL_OUTPUT_AMD_BASEPATH, URL_OUTPUT_GENERATEDCODE, URL_OUTPUT_MANUALCHUNKS, URL_OUTPUT_EXTERNALIMPORTATTRIBUTES, logAlreadyClosed, logMissingFileOrDirOption, logCannotEmitFromOptionsHook, URL_WATCH } from './parseAst.js';
+import { EMPTY_OBJECT, ExportDefaultDeclaration as ExportDefaultDeclaration$1, CallExpression as CallExpression$1, EMPTY_ARRAY, LOGLEVEL_WARN, logUnusedExternalImports, ANNOTATION_KEY, INVALID_ANNOTATION_KEY, ObjectExpression as ObjectExpression$1, Property as Property$1, Program as Program$1, logIllegalImportReassignment, BLANK, logRedeclarationError, StaticBlock as StaticBlock$1, CatchClause as CatchClause$1, logDuplicateArgumentNameError, logModuleLevelDirective, ReturnStatement as ReturnStatement$1, VariableDeclarator as VariableDeclarator$1, ExpressionStatement as ExpressionStatement$1, logMissingExport, normalize, getImportPath, logMissingNodeBuiltins, logReservedNamespace, error, logIllegalIdentifierAsName, logMissingNameOptionForIifeExport, logMissingNameOptionForUmdExport, logConstVariableReassignError, ArrowFunctionExpression as ArrowFunctionExpression$1, EMPTY_SET, logCannotCallNamespace, logEval, BlockStatement as BlockStatement$1, getRollupError, logModuleParseError, logParseError, LOGLEVEL_INFO, logFirstSideEffect, locate, logInvalidAnnotation, Identifier as Identifier$1, logThisIsUndefined, getAstBuffer, convertAnnotations, FIXED_STRINGS, convertNode as convertNode$1, logImportAttributeIsInvalid, logImportOptionsAreInvalid, logSyntheticNamedExportsNeedNamespaceExport, logMissingEntryExport, logDuplicateExportError, logInvalidSourcemapForError, augmentCodeLocation, logInconsistentImportAttributes, logMissingJsxExport, logNamespaceConflict, logAmbiguousExternalNamespaces, logShimmedExport, parseAst, logInvalidFormatForTopLevelAwait, TemplateLiteral as TemplateLiteral$1, Literal as Literal$1, logCircularReexport, logAddonNotGenerated, logIncompatibleExportOptionValue, logMixedExport, logFailedValidation, isPathFragment, logCyclicCrossChunkReexport, getAliasName, logUnexpectedNamedImport, isAbsolute as isAbsolute$1, relative as relative$1, logUnexpectedNamespaceReexport, logEmptyChunk, logMissingGlobalName, logOptimizeChunkStatus, logSourcemapBroken, logConflictingSourcemapSources, logChunkInvalid, logInvalidOption, logCannotAssignModuleToChunk, URL_OUTPUT_FORMAT, URL_OUTPUT_DIR, URL_OUTPUT_SOURCEMAPFILE, URL_OUTPUT_AMD_ID, logAnonymousPluginCache, logDuplicatePluginName, logUnknownOption, LOGLEVEL_ERROR, logLevelPriority, LOGLEVEL_DEBUG, printQuotedStringList, logInvalidSetAssetSourceCall, logPluginError, logNoTransformMapOrAstWithoutCode, relativeId, logBadLoader, logExternalModulesCannotBeTransformedToModules, logInternalIdCannotBeExternal, isRelative, logUnresolvedImport, logUnresolvedImportTreatedAsExternal, logExternalSyntheticExports, logUnresolvedEntry, logUnresolvedImplicitDependant, logExternalModulesCannotBeIncludedInManualChunks, logEntryCannotBeExternal, logImplicitDependantCannotBeExternal, logNoAssetSourceSet, logFileReferenceIdNotFoundForFilename, logAssetReferenceIdNotFoundForSetSource, logAssetSourceAlreadySet, logInvalidRollupPhaseForChunkEmission, warnDeprecation, logChunkNotGeneratedForFileName, logAssetNotFinalisedForFileName, logFileNameConflict, URL_GENERATEBUNDLE, logInvalidLogPosition, logInputHookInOutputPlugin, logInvalidAddonPluginHook, logInvalidFunctionPluginHook, logImplicitDependantIsNotIncluded, logCircularDependency, augmentLogMessage, URL_TREESHAKE, URL_JSX, URL_TREESHAKE_MODULESIDEEFFECTS, URL_OUTPUT_INLINEDYNAMICIMPORTS, URL_PRESERVEENTRYSIGNATURES, URL_OUTPUT_GENERATEDCODE, isValidUrl, addTrailingSlashIfMissed, URL_OUTPUT_SOURCEMAPBASEURL, URL_OUTPUT_MANUALCHUNKS, logInvalidExportOptionValue, URL_OUTPUT_AMD_BASEPATH, URL_OUTPUT_INTEROP, URL_OUTPUT_EXTERNALIMPORTATTRIBUTES, logAlreadyClosed, logMissingFileOrDirOption, logCannotEmitFromOptionsHook, URL_WATCH } from './parseAst.js';
 import { relative, dirname, basename, extname, resolve as resolve$1 } from 'node:path';
-import { posix, win32, isAbsolute, resolve } from 'path';
-import { parseAsync, xxhashBase64Url, xxhashBase36, xxhashBase16 } from '../../native.js';
+import { posix, isAbsolute, resolve, win32 } from 'path';
+import { parseAsync, xxhashBase16, xxhashBase64Url, xxhashBase36 } from '../../native.js';
 import process$1, { env } from 'node:process';
 import { performance } from 'node:perf_hooks';
 import { lstat, realpath, readdir, readFile, mkdir, writeFile } from 'node:fs/promises';
 
-var version = "4.33.0";
+var version = "4.34.0";
 
 const comma = ','.charCodeAt(0);
 const semicolon = ';'.charCodeAt(0);
@@ -1964,71 +1964,6 @@ function renderSystemExportSequenceBeforeExpression(exportedVariable, expression
     }
 }
 
-/** @import { Node } from 'estree' */
-
-/**
- * @param {Node} node
- * @param {Node} parent
- * @returns {boolean}
- */
-function is_reference(node, parent) {
-	if (node.type === 'MemberExpression') {
-		return !node.computed && is_reference(node.object, node);
-	}
-
-	if (node.type !== 'Identifier') return false;
-
-	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 `meta` in `import.meta`
-		case 'MetaProperty':
-			return parent.meta === node;
-
-		// 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;
-	}
-}
-
-const PureFunctionKey = Symbol('PureFunction');
-const getPureFunctions = ({ treeshake }) => {
-    const pureFunctions = Object.create(null);
-    for (const functionName of treeshake ? treeshake.manualPureFunctions : []) {
-        let currentFunctions = pureFunctions;
-        for (const pathSegment of functionName.split('.')) {
-            currentFunctions = currentFunctions[pathSegment] ||= Object.create(null);
-        }
-        currentFunctions[PureFunctionKey] = true;
-    }
-    return pureFunctions;
-};
-
 function getOrCreate(map, key, init) {
     const existing = map.get(key);
     if (existing !== undefined) {
@@ -2059,7 +1994,7 @@ const UNKNOWN_PATH = [UnknownKey];
 const UNKNOWN_NON_ACCESSOR_PATH = [UnknownNonAccessorKey];
 const UNKNOWN_INTEGER_PATH = [UnknownInteger];
 const EntitiesKey = Symbol('Entities');
-class PathTracker {
+class EntityPathTracker {
     constructor() {
         this.entityPaths = Object.create(null, {
             [EntitiesKey]: { value: new Set() }
@@ -2084,14 +2019,14 @@ class PathTracker {
     getEntities(path) {
         let currentPaths = this.entityPaths;
         for (const pathSegment of path) {
-            currentPaths = currentPaths[pathSegment] =
-                currentPaths[pathSegment] ||
-                    Object.create(null, { [EntitiesKey]: { value: new Set() } });
+            currentPaths = currentPaths[pathSegment] ||= Object.create(null, {
+                [EntitiesKey]: { value: new Set() }
+            });
         }
         return currentPaths[EntitiesKey];
     }
 }
-const SHARED_RECURSION_TRACKER = new PathTracker();
+const SHARED_RECURSION_TRACKER = new EntityPathTracker();
 class DiscriminatedPathTracker {
     constructor() {
         this.entityPaths = Object.create(null, {
@@ -2101,9 +2036,9 @@ class DiscriminatedPathTracker {
     trackEntityAtPathAndGetIfTracked(path, discriminator, entity) {
         let currentPaths = this.entityPaths;
         for (const pathSegment of path) {
-            currentPaths = currentPaths[pathSegment] =
-                currentPaths[pathSegment] ||
-                    Object.create(null, { [EntitiesKey]: { value: new Map() } });
+            currentPaths = currentPaths[pathSegment] ||= Object.create(null, {
+                [EntitiesKey]: { value: new Map() }
+            });
         }
         const trackedEntities = getOrCreate(currentPaths[EntitiesKey], discriminator, (getNewSet));
         if (trackedEntities.has(entity))
@@ -2112,6 +2047,174 @@ class DiscriminatedPathTracker {
         return false;
     }
 }
+const UNKNOWN_INCLUDED_PATH = Object.freeze({ [UnknownKey]: EMPTY_OBJECT });
+class IncludedFullPathTracker {
+    constructor() {
+        this.includedPaths = null;
+    }
+    includePathAndGetIfIncluded(path) {
+        let included = true;
+        let parent = this;
+        let parentSegment = 'includedPaths';
+        let currentPaths = (this.includedPaths ||=
+            ((included = false), Object.create(null)));
+        for (const pathSegment of path) {
+            // This means from here, all paths are included
+            if (currentPaths[UnknownKey]) {
+                return true;
+            }
+            // Including UnknownKey automatically includes all nested paths.
+            // From above, we know that UnknownKey is not included yet.
+            if (typeof pathSegment === 'symbol') {
+                // Hopefully, this saves some memory over just setting
+                // currentPaths[UnknownKey] = EMPTY_OBJECT
+                parent[parentSegment] = UNKNOWN_INCLUDED_PATH;
+                return false;
+            }
+            parent = currentPaths;
+            parentSegment = pathSegment;
+            currentPaths = currentPaths[pathSegment] ||= ((included = false), Object.create(null));
+        }
+        return included;
+    }
+}
+const UNKNOWN_INCLUDED_TOP_LEVEL_PATH = Object.freeze({
+    [UnknownKey]: true
+});
+class IncludedTopLevelPathTracker {
+    constructor() {
+        this.includedPaths = null;
+    }
+    includePathAndGetIfIncluded(path) {
+        let included = true;
+        const includedPaths = (this.includedPaths ||=
+            ((included = false), Object.create(null)));
+        if (includedPaths[UnknownKey]) {
+            return true;
+        }
+        const [firstPathSegment, secondPathSegment] = path;
+        if (!firstPathSegment) {
+            return included;
+        }
+        if (typeof firstPathSegment === 'symbol') {
+            this.includedPaths = UNKNOWN_INCLUDED_TOP_LEVEL_PATH;
+            return false;
+        }
+        if (secondPathSegment) {
+            if (includedPaths[firstPathSegment] === UnknownKey) {
+                return true;
+            }
+            includedPaths[firstPathSegment] = UnknownKey;
+            return false;
+        }
+        if (includedPaths[firstPathSegment]) {
+            return true;
+        }
+        includedPaths[firstPathSegment] = true;
+        return false;
+    }
+    includeAllPaths(entity, context, basePath) {
+        const { includedPaths } = this;
+        if (includedPaths) {
+            if (includedPaths[UnknownKey]) {
+                entity.includePath([...basePath, UnknownKey], context);
+            }
+            else {
+                const inclusionEntries = Object.entries(includedPaths);
+                if (inclusionEntries.length === 0) {
+                    entity.includePath(basePath, context);
+                }
+                else {
+                    for (const [key, value] of inclusionEntries) {
+                        entity.includePath(value === UnknownKey ? [...basePath, key, UnknownKey] : [...basePath, key], context);
+                    }
+                }
+            }
+        }
+    }
+}
+
+/** @import { Node } from 'estree' */
+
+/**
+ * @param {Node} node
+ * @param {Node} parent
+ * @returns {boolean}
+ */
+function is_reference(node, parent) {
+	if (node.type === 'MemberExpression') {
+		return !node.computed && is_reference(node.object, node);
+	}
+
+	if (node.type !== 'Identifier') return false;
+
+	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 `meta` in `import.meta`
+		case 'MetaProperty':
+			return parent.meta === node;
+
+		// 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;
+	}
+}
+
+function createInclusionContext() {
+    return {
+        brokenFlow: false,
+        hasBreak: false,
+        hasContinue: false,
+        includedCallArguments: new Set(),
+        includedLabels: new Set()
+    };
+}
+function createHasEffectsContext() {
+    return {
+        accessed: new EntityPathTracker(),
+        assigned: new EntityPathTracker(),
+        brokenFlow: false,
+        called: new DiscriminatedPathTracker(),
+        hasBreak: false,
+        hasContinue: false,
+        ignore: {
+            breaks: false,
+            continues: false,
+            labels: new Set(),
+            returnYield: false,
+            this: false
+        },
+        includedLabels: new Set(),
+        instantiated: new DiscriminatedPathTracker(),
+        replacedVariableInits: new Map()
+    };
+}
 
 function isFlagSet(flags, flag) {
     return (flags & flag) !== 0;
@@ -2151,12 +2254,25 @@ class ExpressionEntity {
     hasEffectsOnInteractionAtPath(_path, _interaction, _context) {
         return true;
     }
-    include(_context, _includeChildrenRecursively, _options) {
+    include(context, _includeChildrenRecursively, _options) {
+        if (!this.included)
+            this.includeNode(context);
+    }
+    includeNode(_context) {
         this.included = true;
     }
-    includeCallArguments(context, parameters) {
-        for (const argument of parameters) {
-            argument.include(context, false);
+    includePath(_path, context) {
+        if (!this.included)
+            this.includeNode(context);
+    }
+    /* We are both including and including an unknown path here as the former
+     * ensures that nested nodes are included while the latter ensures that all
+     * paths of the expression are included.
+     * */
+    includeCallArguments(context, interaction) {
+        for (const argument of interaction.args) {
+            argument?.includePath(UNKNOWN_PATH, context);
+            argument?.include(context, false);
         }
     }
     shouldBeIncluded(_context) {
@@ -2195,6 +2311,19 @@ const NODE_INTERACTION_UNKNOWN_CALL = {
     withNew: false
 };
 
+const PureFunctionKey = Symbol('PureFunction');
+const getPureFunctions = ({ treeshake }) => {
+    const pureFunctions = Object.create(null);
+    for (const functionName of treeshake ? treeshake.manualPureFunctions : []) {
+        let currentFunctions = pureFunctions;
+        for (const pathSegment of functionName.split('.')) {
+            currentFunctions = currentFunctions[pathSegment] ||= Object.create(null);
+        }
+        currentFunctions[PureFunctionKey] = true;
+    }
+    return pureFunctions;
+};
+
 class Variable extends ExpressionEntity {
     markReassigned() {
         this.isReassigned = true;
@@ -2271,9 +2400,9 @@ class Variable extends ExpressionEntity {
      * has not been included previously. Once a variable is included, it should
      * take care all its declarations are included.
      */
-    include() {
+    includePath(path, context) {
         this.included = true;
-        this.renderedLikeHoisted?.include();
+        this.renderedLikeHoisted?.includePath(path, context);
     }
     /**
      * Links the rendered name of this variable to another variable and includes
@@ -2305,8 +2434,8 @@ class ExternalVariable extends Variable {
     hasEffectsOnInteractionAtPath(path, { type }) {
         return type !== INTERACTION_ACCESSED || path.length > (this.isNamespace ? 1 : 0);
     }
-    include() {
-        super.include();
+    includePath(path, context) {
+        super.includePath(path, context);
         this.module.used = true;
     }
 }
@@ -2607,36 +2736,6 @@ const childNodeKeys = {
     YieldExpression: ['argument']
 };
 
-function createInclusionContext() {
-    return {
-        brokenFlow: false,
-        hasBreak: false,
-        hasContinue: false,
-        includedCallArguments: new Set(),
-        includedLabels: new Set()
-    };
-}
-function createHasEffectsContext() {
-    return {
-        accessed: new PathTracker(),
-        assigned: new PathTracker(),
-        brokenFlow: false,
-        called: new DiscriminatedPathTracker(),
-        hasBreak: false,
-        hasContinue: false,
-        ignore: {
-            breaks: false,
-            continues: false,
-            labels: new Set(),
-            returnYield: false,
-            this: false
-        },
-        includedLabels: new Set(),
-        instantiated: new DiscriminatedPathTracker(),
-        replacedVariableInits: new Map()
-    };
-}
-
 const INCLUDE_PARAMETERS = 'variables';
 const IS_SKIPPED_CHAIN = Symbol('IS_SKIPPED_CHAIN');
 class NodeBase extends ExpressionEntity {
@@ -2706,9 +2805,8 @@ class NodeBase extends ExpressionEntity {
             this.hasEffectsOnInteractionAtPath(EMPTY_PATH, this.assignmentInteraction, context));
     }
     include(context, includeChildrenRecursively, _options) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
-        this.included = true;
+        if (!this.included)
+            this.includeNode(context);
         for (const key of childNodeKeys[this.type]) {
             const value = this[key];
             if (value === null)
@@ -2723,6 +2821,24 @@ class NodeBase extends ExpressionEntity {
             }
         }
     }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        for (const key of childNodeKeys[this.type]) {
+            const value = this[key];
+            if (value === null)
+                continue;
+            if (Array.isArray(value)) {
+                for (const child of value) {
+                    child?.includePath(UNKNOWN_PATH, context);
+                }
+            }
+            else {
+                value.includePath(UNKNOWN_PATH, context);
+            }
+        }
+    }
     includeAsAssignmentTarget(context, includeChildrenRecursively, _deoptimizeAccess) {
         this.include(context, includeChildrenRecursively);
     }
@@ -2826,6 +2942,17 @@ class NodeBase extends ExpressionEntity {
 function createChildNodeKeysForNode(esTreeNode) {
     return Object.keys(esTreeNode).filter(key => typeof esTreeNode[key] === 'object' && key.charCodeAt(0) !== 95 /* _ */);
 }
+function onlyIncludeSelf() {
+    this.included = true;
+    if (!this.deoptimized)
+        this.applyDeoptimizations();
+}
+function onlyIncludeSelfNoDeoptimize() {
+    this.included = true;
+}
+function doNotDeoptimize() {
+    this.deoptimized = true;
+}
 
 function isObjectExpressionNode(node) {
     return node instanceof NodeBase && node.type === ObjectExpression$1;
@@ -2838,8 +2965,8 @@ function assembleMemberDescriptions(memberDescriptions, inheritedDescriptions =
     return Object.create(inheritedDescriptions, memberDescriptions);
 }
 const UNDEFINED_EXPRESSION = new (class UndefinedExpression extends ExpressionEntity {
-    getLiteralValueAtPath() {
-        return undefined;
+    getLiteralValueAtPath(path) {
+        return path.length > 0 ? UnknownValue : undefined;
     }
 })();
 const returnsUnknown = {
@@ -3036,31 +3163,6 @@ function getMemberReturnExpressionWhenCalled(members, memberName) {
     return [members[memberName].returns, false];
 }
 
-class SpreadElement extends NodeBase {
-    deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
-        if (path.length > 0) {
-            this.argument.deoptimizeArgumentsOnInteractionAtPath(interaction, UNKNOWN_PATH, recursionTracker);
-        }
-    }
-    hasEffects(context) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
-        const { propertyReadSideEffects } = this.scope.context.options
-            .treeshake;
-        return (this.argument.hasEffects(context) ||
-            (propertyReadSideEffects &&
-                (propertyReadSideEffects === 'always' ||
-                    this.argument.hasEffectsOnInteractionAtPath(UNKNOWN_PATH, NODE_INTERACTION_UNKNOWN_ACCESS, context))));
-    }
-    applyDeoptimizations() {
-        this.deoptimized = true;
-        // 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.scope.context.requestTreeshakingPass();
-    }
-}
-
 class Method extends ExpressionEntity {
     constructor(description) {
         super();
@@ -3186,6 +3288,7 @@ class ObjectEntity extends ExpressionEntity {
         this.unknownIntegerProps = [];
         this.unmatchableGetters = [];
         this.unmatchablePropertiesAndGetters = [];
+        this.unmatchablePropertiesAndSetters = [];
         this.unmatchableSetters = [];
         if (Array.isArray(properties)) {
             this.buildPropertyMaps(properties);
@@ -3342,7 +3445,12 @@ class ObjectEntity extends ExpressionEntity {
     }
     getLiteralValueAtPath(path, recursionTracker, origin) {
         if (path.length === 0) {
-            return UnknownTruthyValue;
+            // This should actually be "UnknownTruthyValue". However, this currently
+            // causes an issue with TypeScript enums in files with moduleSideEffects:
+            // false because we cannot properly track whether a "var" has been
+            // initialized. This should be reverted once we can properly track this.
+            // return UnknownTruthyValue;
+            return UnknownValue;
         }
         const key = path[0];
         const expressionAtPath = this.getMemberExpressionAndTrackDeopt(key, origin);
@@ -3420,9 +3528,36 @@ class ObjectEntity extends ExpressionEntity {
         }
         return false;
     }
+    include(context, includeChildrenRecursively) {
+        this.included = true;
+        for (const property of this.allProperties) {
+            if (includeChildrenRecursively || property.shouldBeIncluded(context)) {
+                property.include(context, includeChildrenRecursively);
+            }
+        }
+        this.prototypeExpression?.include(context, includeChildrenRecursively);
+    }
+    includePath(path, context) {
+        this.included = true;
+        if (path.length === 0)
+            return;
+        const [key, ...subPath] = path;
+        const [includedMembers, includedPath] = typeof key === 'string'
+            ? [
+                new Set([
+                    ...(this.propertiesAndGettersByKey[key] || this.unmatchablePropertiesAndGetters),
+                    ...(this.propertiesAndSettersByKey[key] || this.unmatchablePropertiesAndSetters)
+                ]),
+                subPath
+            ]
+            : [this.allProperties, UNKNOWN_PATH];
+        for (const property of includedMembers) {
+            property.includePath(includedPath, context);
+        }
+        this.prototypeExpression?.includePath(path, context);
+    }
     buildPropertyMaps(properties) {
-        const { allProperties, propertiesAndGettersByKey, propertiesAndSettersByKey, settersByKey, gettersByKey, unknownIntegerProps, unmatchablePropertiesAndGetters, unmatchableGetters, unmatchableSetters } = this;
-        const unmatchablePropertiesAndSetters = [];
+        const { allProperties, propertiesAndGettersByKey, propertiesAndSettersByKey, settersByKey, gettersByKey, unknownIntegerProps, unmatchablePropertiesAndGetters, unmatchablePropertiesAndSetters, unmatchableGetters, unmatchableSetters } = this;
         for (let index = properties.length - 1; index >= 0; index--) {
             const { key, kind, property } = properties[index];
             allProperties.push(property);
@@ -3692,6 +3827,37 @@ const ARRAY_PROTOTYPE = new ObjectEntity({
     values: METHOD_DEOPTS_SELF_RETURNS_UNKNOWN
 }, OBJECT_PROTOTYPE, true);
 
+class SpreadElement extends NodeBase {
+    deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
+        if (path.length > 0) {
+            this.argument.deoptimizeArgumentsOnInteractionAtPath(interaction, UNKNOWN_PATH, recursionTracker);
+        }
+    }
+    hasEffects(context) {
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        const { propertyReadSideEffects } = this.scope.context.options
+            .treeshake;
+        return (this.argument.hasEffects(context) ||
+            (propertyReadSideEffects &&
+                (propertyReadSideEffects === 'always' ||
+                    this.argument.hasEffectsOnInteractionAtPath(UNKNOWN_PATH, NODE_INTERACTION_UNKNOWN_ACCESS, context))));
+    }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        this.argument.includePath(UNKNOWN_PATH, context);
+    }
+    applyDeoptimizations() {
+        this.deoptimized = true;
+        // 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.scope.context.requestTreeshakingPass();
+    }
+}
+
 class ArrayExpression extends NodeBase {
     constructor() {
         super(...arguments);
@@ -3712,6 +3878,16 @@ class ArrayExpression extends NodeBase {
     hasEffectsOnInteractionAtPath(path, interaction, context) {
         return this.getObjectEntity().hasEffectsOnInteractionAtPath(path, interaction, context);
     }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        for (const element of this.elements) {
+            if (element) {
+                element?.includePath(UNKNOWN_PATH, context);
+            }
+        }
+    }
     applyDeoptimizations() {
         this.deoptimized = true;
         let hasSpread = false;
@@ -4779,17 +4955,37 @@ class GlobalVariable extends Variable {
     }
 }
 
+// To avoid infinite recursions
+const MAX_PATH_DEPTH = 6;
+// If a path is longer than MAX_PATH_DEPTH, it is truncated so that it is at
+// most MAX_PATH_DEPTH long. The last element is always UnknownKey
+const limitConcatenatedPathDepth = (path1, path2) => {
+    const { length: length1 } = path1;
+    const { length: length2 } = path2;
+    return length1 === 0
+        ? path2
+        : length2 === 0
+            ? path1
+            : length1 + length2 > MAX_PATH_DEPTH
+                ? [...path1, ...path2.slice(0, MAX_PATH_DEPTH - 1 - path1.length), 'UnknownKey']
+                : [...path1, ...path2];
+};
+
 class LocalVariable extends Variable {
-    constructor(name, declarator, init, context, kind) {
+    constructor(name, declarator, init, 
+    /** if this is non-empty, the actual init is this path of this.init */
+    initPath, context, kind) {
         super(name);
         this.init = init;
+        this.initPath = initPath;
+        this.kind = kind;
         this.calledFromTryStatement = false;
         this.additionalInitializers = null;
+        this.includedPathTracker = new IncludedFullPathTracker();
         this.expressionsToBeDeoptimized = [];
         this.declarations = declarator ? [declarator] : [];
         this.deoptimizationTracker = context.deoptimizationTracker;
         this.module = context.module;
-        this.kind = kind;
     }
     addDeclaration(identifier, init) {
         this.declarations.push(identifier);
@@ -4800,15 +4996,16 @@ class LocalVariable extends Variable {
             for (const initializer of this.additionalInitializers) {
                 initializer.deoptimizePath(UNKNOWN_PATH);
             }
-            this.additionalInitializers = null;
         }
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
-        if (this.isReassigned) {
+        if (this.isReassigned || path.length + this.initPath.length > MAX_PATH_DEPTH) {
             deoptimizeInteraction(interaction);
             return;
         }
-        recursionTracker.withTrackedEntityAtPath(path, this.init, () => this.init.deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker), undefined);
+        recursionTracker.withTrackedEntityAtPath(path, this.init, () => {
+            this.init.deoptimizeArgumentsOnInteractionAtPath(interaction, [...this.initPath, ...path], recursionTracker);
+        }, undefined);
     }
     deoptimizePath(path) {
         if (this.isReassigned ||
@@ -4822,37 +5019,40 @@ class LocalVariable extends Variable {
             for (const expression of expressionsToBeDeoptimized) {
                 expression.deoptimizeCache();
             }
-            this.init.deoptimizePath(UNKNOWN_PATH);
+            this.init.deoptimizePath([...this.initPath, UnknownKey]);
         }
         else {
-            this.init.deoptimizePath(path);
+            this.init.deoptimizePath(limitConcatenatedPathDepth(this.initPath, path));
         }
     }
     getLiteralValueAtPath(path, recursionTracker, origin) {
-        if (this.isReassigned) {
+        if (this.isReassigned || path.length + this.initPath.length > MAX_PATH_DEPTH) {
             return UnknownValue;
         }
         return recursionTracker.withTrackedEntityAtPath(path, this.init, () => {
             this.expressionsToBeDeoptimized.push(origin);
-            return this.init.getLiteralValueAtPath(path, recursionTracker, origin);
+            return this.init.getLiteralValueAtPath([...this.initPath, ...path], recursionTracker, origin);
         }, UnknownValue);
     }
     getReturnExpressionWhenCalledAtPath(path, interaction, recursionTracker, origin) {
-        if (this.isReassigned) {
+        if (this.isReassigned || path.length + this.initPath.length > MAX_PATH_DEPTH) {
             return UNKNOWN_RETURN_EXPRESSION;
         }
         return recursionTracker.withTrackedEntityAtPath(path, this.init, () => {
             this.expressionsToBeDeoptimized.push(origin);
-            return this.init.getReturnExpressionWhenCalledAtPath(path, interaction, recursionTracker, origin);
+            return this.init.getReturnExpressionWhenCalledAtPath([...this.initPath, ...path], interaction, recursionTracker, origin);
         }, UNKNOWN_RETURN_EXPRESSION);
     }
     hasEffectsOnInteractionAtPath(path, interaction, context) {
+        if (path.length + this.initPath.length > MAX_PATH_DEPTH) {
+            return true;
+        }
         switch (interaction.type) {
             case INTERACTION_ACCESSED: {
                 if (this.isReassigned)
                     return true;
                 return (!context.accessed.trackEntityAtPathAndGetIfTracked(path, this) &&
-                    this.init.hasEffectsOnInteractionAtPath(path, interaction, context));
+                    this.init.hasEffectsOnInteractionAtPath([...this.initPath, ...path], interaction, context));
             }
             case INTERACTION_ASSIGNED: {
                 if (this.included)
@@ -4862,44 +5062,63 @@ class LocalVariable extends Variable {
                 if (this.isReassigned)
                     return true;
                 return (!context.assigned.trackEntityAtPathAndGetIfTracked(path, this) &&
-                    this.init.hasEffectsOnInteractionAtPath(path, interaction, context));
+                    this.init.hasEffectsOnInteractionAtPath([...this.initPath, ...path], interaction, context));
             }
             case INTERACTION_CALLED: {
                 if (this.isReassigned)
                     return true;
                 return (!(interaction.withNew ? context.instantiated : context.called).trackEntityAtPathAndGetIfTracked(path, interaction.args, this) &&
-                    this.init.hasEffectsOnInteractionAtPath(path, interaction, context));
+                    this.init.hasEffectsOnInteractionAtPath([...this.initPath, ...path], interaction, context));
             }
         }
     }
-    include() {
-        if (!this.included) {
-            super.include();
+    includePath(path, context) {
+        if (!this.includedPathTracker.includePathAndGetIfIncluded(path)) {
+            this.module.scope.context.requestTreeshakingPass();
+            if (!this.included) {
+                // This will reduce the number of tree-shaking passes by eagerly
+                // including inits. By pushing this here instead of directly including
+                // we avoid deep call stacks.
+                this.module.scope.context.newlyIncludedVariableInits.add(this.init);
+            }
+            super.includePath(path, context);
             for (const declaration of this.declarations) {
                 // If node is a default export, it can save a tree-shaking run to include the full declaration now
                 if (!declaration.included)
-                    declaration.include(createInclusionContext(), false);
+                    declaration.include(context, false);
                 let node = declaration.parent;
                 while (!node.included) {
                     // We do not want to properly include parents in case they are part of a dead branch
                     // in which case .include() might pull in more dead code
-                    node.included = true;
+                    node.includeNode(context);
                     if (node.type === Program$1)
                         break;
                     node = node.parent;
                 }
             }
+            // We need to make sure we include the correct path of the init
+            if (path.length > 0) {
+                this.init.includePath(limitConcatenatedPathDepth(this.initPath, path), context);
+                this.additionalInitializers?.forEach(initializer => initializer.includePath(UNKNOWN_PATH, context));
+            }
         }
     }
-    includeCallArguments(context, parameters) {
-        if (this.isReassigned || context.includedCallArguments.has(this.init)) {
-            for (const argument of parameters) {
-                argument.include(context, false);
+    includeCallArguments(context, interaction) {
+        if (this.isReassigned ||
+            context.includedCallArguments.has(this.init) ||
+            // This can be removed again once we can include arguments when called at
+            // a specific path
+            this.initPath.length > 0) {
+            for (const argument of interaction.args) {
+                if (argument) {
+                    argument.includePath(UNKNOWN_PATH, context);
+                    argument.include(context, false);
+                }
             }
         }
         else {
             context.includedCallArguments.add(this.init);
-            this.init.includeCallArguments(context, parameters);
+            this.init.includeCallArguments(context, interaction);
             context.includedCallArguments.delete(this.init);
         }
     }
@@ -4979,18 +5198,31 @@ class IdentifierBase extends NodeBase {
             }
         }
     }
-    include() {
+    include(context) {
+        if (!this.included)
+            this.includeNode(context);
+    }
+    includeNode(context) {
+        this.included = true;
         if (!this.deoptimized)
             this.applyDeoptimizations();
+        if (this.variable !== null) {
+            this.scope.context.includeVariableInModule(this.variable, EMPTY_PATH, context);
+        }
+    }
+    includePath(path, context) {
         if (!this.included) {
             this.included = true;
             if (this.variable !== null) {
-                this.scope.context.includeVariableInModule(this.variable);
+                this.scope.context.includeVariableInModule(this.variable, path, context);
             }
         }
+        else if (path.length > 0) {
+            this.variable?.includePath(path, context);
+        }
     }
-    includeCallArguments(context, parameters) {
-        this.variable.includeCallArguments(context, parameters);
+    includeCallArguments(context, interaction) {
+        this.variable.includeCallArguments(context, interaction);
     }
     isPossibleTDZ() {
         // return cached value to avoid issues with the next tree-shaking pass
@@ -5073,11 +5305,40 @@ function closestParentFunctionOrProgram(node) {
     return node;
 }
 
+class ObjectMember extends ExpressionEntity {
+    constructor(object, path) {
+        super();
+        this.object = object;
+        this.path = path;
+    }
+    deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
+        this.object.deoptimizeArgumentsOnInteractionAtPath(interaction, [...this.path, ...path], recursionTracker);
+    }
+    deoptimizePath(path) {
+        this.object.deoptimizePath([...this.path, ...path]);
+    }
+    getLiteralValueAtPath(path, recursionTracker, origin) {
+        return this.object.getLiteralValueAtPath([...this.path, ...path], recursionTracker, origin);
+    }
+    getReturnExpressionWhenCalledAtPath(path, interaction, recursionTracker, origin) {
+        return this.object.getReturnExpressionWhenCalledAtPath([...this.path, ...path], interaction, recursionTracker, origin);
+    }
+    hasEffectsOnInteractionAtPath(path, interaction, context) {
+        return this.object.hasEffectsOnInteractionAtPath([...this.path, ...path], interaction, context);
+    }
+}
+
 class Identifier extends IdentifierBase {
     constructor() {
         super(...arguments);
         this.variable = null;
     }
+    get isDestructuringDeoptimized() {
+        return isFlagSet(this.flags, 16777216 /* Flag.destructuringDeoptimized */);
+    }
+    set isDestructuringDeoptimized(value) {
+        this.flags = setFlag(this.flags, 16777216 /* Flag.destructuringDeoptimized */, value);
+    }
     addExportedVariables(variables, exportNamesByVariable) {
         if (exportNamesByVariable.has(this.variable)) {
             variables.push(this.variable);
@@ -5089,44 +5350,54 @@ class Identifier extends IdentifierBase {
             this.variable.addReference(this);
             this.isVariableReference = true;
         }
-    }
-    declare(kind, init) {
-        let variable;
-        const { treeshake } = this.scope.context.options;
-        switch (kind) {
-            case 'var': {
-                variable = this.scope.addDeclaration(this, this.scope.context, init, kind);
-                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.scope.context, init, kind);
-                break;
-            }
-            case 'let':
-            case 'const':
-            case 'using':
-            case 'await using':
-            case 'class': {
-                variable = this.scope.addDeclaration(this, this.scope.context, init, kind);
-                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}.`);
+    }
+    declare(kind, destructuredInitPath, init) {
+        let variable;
+        const { treeshake } = this.scope.context.options;
+        if (kind === 'parameter') {
+            variable = this.scope.addParameterDeclaration(this, destructuredInitPath);
+        }
+        else {
+            variable = this.scope.addDeclaration(this, this.scope.context, init, destructuredInitPath, kind);
+            if (kind === 'var' && treeshake && treeshake.correctVarValueBeforeDeclaration) {
+                // Necessary to make sure the init is deoptimized. We cannot call deoptimizePath here.
+                variable.markInitializersForDeoptimization();
             }
         }
         return [(this.variable = variable)];
     }
+    deoptimizeAssignment(destructuredInitPath, init) {
+        this.deoptimizePath(EMPTY_PATH);
+        init.deoptimizePath([...destructuredInitPath, UnknownKey]);
+    }
+    hasEffectsWhenDestructuring(context, destructuredInitPath, init) {
+        return (destructuredInitPath.length > 0 &&
+            init.hasEffectsOnInteractionAtPath(destructuredInitPath, NODE_INTERACTION_UNKNOWN_ACCESS, context));
+    }
+    includeDestructuredIfNecessary(context, destructuredInitPath, init) {
+        if (destructuredInitPath.length > 0 && !this.isDestructuringDeoptimized) {
+            this.isDestructuringDeoptimized = true;
+            init.deoptimizeArgumentsOnInteractionAtPath({
+                args: [new ObjectMember(init, destructuredInitPath.slice(0, -1))],
+                type: INTERACTION_ACCESSED
+            }, destructuredInitPath, SHARED_RECURSION_TRACKER);
+        }
+        const { propertyReadSideEffects } = this.scope.context.options
+            .treeshake;
+        if ((this.included ||=
+            destructuredInitPath.length > 0 &&
+                !context.brokenFlow &&
+                propertyReadSideEffects &&
+                (propertyReadSideEffects === 'always' ||
+                    init.hasEffectsOnInteractionAtPath(destructuredInitPath, NODE_INTERACTION_UNKNOWN_ACCESS, createHasEffectsContext())))) {
+            if (this.variable && !this.variable.included) {
+                this.scope.context.includeVariableInModule(this.variable, EMPTY_PATH, context);
+            }
+            init.includePath(destructuredInitPath, context);
+            return true;
+        }
+        return false;
+    }
     markDeclarationReached() {
         this.variable.initReached = true;
     }
@@ -5191,18 +5462,17 @@ class Scope {
         - then the variable is still declared in the hoisted outer scope, but the initializer is assigned to the parameter
     - const, let, class, and function except in the cases above cannot redeclare anything
      */
-    addDeclaration(identifier, context, init, kind) {
+    addDeclaration(identifier, context, init, destructuredInitPath, kind) {
         const name = identifier.name;
         const existingVariable = this.hoistedVariables?.get(name) || this.variables.get(name);
         if (existingVariable) {
-            const existingKind = existingVariable.kind;
-            if (kind === 'var' && existingKind === 'var') {
+            if (kind === 'var' && existingVariable.kind === 'var') {
                 existingVariable.addDeclaration(identifier, init);
                 return existingVariable;
             }
             context.error(logRedeclarationError(name), identifier.start);
         }
-        const newVariable = new LocalVariable(identifier.name, identifier, init, context, kind);
+        const newVariable = new LocalVariable(identifier.name, identifier, init, destructuredInitPath, context, kind);
         this.variables.set(name, newVariable);
         return newVariable;
     }
@@ -5378,7 +5648,6 @@ class MethodBase extends NodeBase {
         }
         return this.getAccessedValue()[0].hasEffectsOnInteractionAtPath(path, interaction, context);
     }
-    applyDeoptimizations() { }
     getAccessedValue() {
         if (this.accessedValue === null) {
             if (this.kind === 'get') {
@@ -5392,19 +5661,20 @@ class MethodBase extends NodeBase {
         return this.accessedValue;
     }
 }
+MethodBase.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+MethodBase.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class MethodDefinition extends MethodBase {
     hasEffects(context) {
         return super.hasEffects(context) || checkEffectForNodes(this.decorators, context);
     }
-    applyDeoptimizations() { }
 }
 
 class BlockScope extends ChildScope {
     constructor(parent) {
         super(parent, parent.context);
     }
-    addDeclaration(identifier, context, init, kind) {
+    addDeclaration(identifier, context, init, destructuredInitPath, kind) {
         if (kind === 'var') {
             const name = identifier.name;
             const existingVariable = this.hoistedVariables?.get(name) || this.variables.get(name);
@@ -5416,7 +5686,7 @@ class BlockScope extends ChildScope {
                 }
                 return context.error(logRedeclarationError(name), identifier.start);
             }
-            const declaredVariable = this.parent.addDeclaration(identifier, context, init, kind);
+            const declaredVariable = this.parent.addDeclaration(identifier, context, init, destructuredInitPath, kind);
             // Necessary to make sure the init is deoptimized for conditional declarations.
             // We cannot call deoptimizePath here.
             declaredVariable.markInitializersForDeoptimization();
@@ -5424,7 +5694,7 @@ class BlockScope extends ChildScope {
             this.addHoistedVariable(name, declaredVariable);
             return declaredVariable;
         }
-        return super.addDeclaration(identifier, context, init, kind);
+        return super.addDeclaration(identifier, context, init, destructuredInitPath, kind);
     }
 }
 
@@ -5456,33 +5726,12 @@ class StaticBlock extends NodeBase {
         }
     }
 }
+StaticBlock.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+StaticBlock.prototype.applyDeoptimizations = doNotDeoptimize;
 function isStaticBlock(statement) {
     return statement.type === StaticBlock$1;
 }
 
-class ObjectMember extends ExpressionEntity {
-    constructor(object, key) {
-        super();
-        this.object = object;
-        this.key = key;
-    }
-    deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
-        this.object.deoptimizeArgumentsOnInteractionAtPath(interaction, [this.key, ...path], recursionTracker);
-    }
-    deoptimizePath(path) {
-        this.object.deoptimizePath([this.key, ...path]);
-    }
-    getLiteralValueAtPath(path, recursionTracker, origin) {
-        return this.object.getLiteralValueAtPath([this.key, ...path], recursionTracker, origin);
-    }
-    getReturnExpressionWhenCalledAtPath(path, interaction, recursionTracker, origin) {
-        return this.object.getReturnExpressionWhenCalledAtPath([this.key, ...path], interaction, recursionTracker, origin);
-    }
-    hasEffectsOnInteractionAtPath(path, interaction, context) {
-        return this.object.hasEffectsOnInteractionAtPath([this.key, ...path], interaction, context);
-    }
-}
-
 class ClassNode extends NodeBase {
     constructor() {
         super(...arguments);
@@ -5523,21 +5772,20 @@ class ClassNode extends NodeBase {
             : this.getObjectEntity().hasEffectsOnInteractionAtPath(path, interaction, context);
     }
     include(context, includeChildrenRecursively) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
-        this.included = true;
+        if (!this.included)
+            this.includeNode(context);
         this.superClass?.include(context, includeChildrenRecursively);
         this.body.include(context, includeChildrenRecursively);
         for (const decorator of this.decorators)
             decorator.include(context, includeChildrenRecursively);
         if (this.id) {
             this.id.markDeclarationReached();
-            this.id.include();
+            this.id.include(context);
         }
     }
     initialise() {
         super.initialise();
-        this.id?.declare('class', this);
+        this.id?.declare('class', EMPTY_PATH, this);
         for (const method of this.body.body) {
             if (method instanceof MethodDefinition && method.kind === 'constructor') {
                 this.classConstructor = method;
@@ -5595,11 +5843,12 @@ class ClassNode extends NodeBase {
         staticProperties.unshift({
             key: 'prototype',
             kind: 'init',
-            property: new ObjectEntity(dynamicMethods, this.superClass ? new ObjectMember(this.superClass, 'prototype') : OBJECT_PROTOTYPE)
+            property: new ObjectEntity(dynamicMethods, this.superClass ? new ObjectMember(this.superClass, ['prototype']) : OBJECT_PROTOTYPE)
         });
         return (this.objectEntity = new ObjectEntity(staticProperties, this.superClass || OBJECT_PROTOTYPE));
     }
 }
+ClassNode.prototype.includeNode = onlyIncludeSelf;
 
 class ClassDeclaration extends ClassNode {
     initialise() {
@@ -5652,53 +5901,60 @@ class ClassDeclaration extends ClassNode {
 
 class ArgumentsVariable extends LocalVariable {
     constructor(context) {
-        super('arguments', null, UNKNOWN_EXPRESSION, context, 'other');
-        this.deoptimizedArguments = [];
+        super('arguments', null, UNKNOWN_EXPRESSION, EMPTY_PATH, context, 'other');
     }
-    addArgumentToBeDeoptimized(argument) {
-        if (this.included) {
-            argument.deoptimizePath(UNKNOWN_PATH);
-        }
-        else {
-            this.deoptimizedArguments.push(argument);
-        }
+    addArgumentToBeDeoptimized(_argument) { }
+    // Only If there is at least one reference, then we need to track all
+    // arguments in order to be able to deoptimize them.
+    addReference() {
+        this.deoptimizedArguments = [];
+        this.addArgumentToBeDeoptimized = addArgumentToBeDeoptimized;
     }
     hasEffectsOnInteractionAtPath(path, { type }) {
         return type !== INTERACTION_ACCESSED || path.length > 1;
     }
-    include() {
-        super.include();
+    includePath(path, context) {
+        super.includePath(path, context);
         for (const argument of this.deoptimizedArguments) {
             argument.deoptimizePath(UNKNOWN_PATH);
         }
         this.deoptimizedArguments.length = 0;
     }
 }
+function addArgumentToBeDeoptimized(argument) {
+    if (this.included) {
+        argument.deoptimizePath(UNKNOWN_PATH);
+    }
+    else {
+        this.deoptimizedArguments?.push(argument);
+    }
+}
 
 const MAX_TRACKED_INTERACTIONS = 20;
 const NO_INTERACTIONS = EMPTY_ARRAY;
 const UNKNOWN_DEOPTIMIZED_FIELD = new Set([UnknownKey]);
-const EMPTY_PATH_TRACKER = new PathTracker();
+const EMPTY_PATH_TRACKER = new EntityPathTracker();
 const UNKNOWN_DEOPTIMIZED_ENTITY = new Set([UNKNOWN_EXPRESSION]);
 class ParameterVariable extends LocalVariable {
-    constructor(name, declarator, context) {
-        super(name, declarator, UNKNOWN_EXPRESSION, context, 'parameter');
+    constructor(name, declarator, argumentPath, context) {
+        super(name, declarator, UNKNOWN_EXPRESSION, argumentPath, context, 'parameter');
+        this.includedPathTracker = new IncludedTopLevelPathTracker();
+        this.argumentsToBeDeoptimized = new Set();
         this.deoptimizationInteractions = [];
-        this.deoptimizations = new PathTracker();
+        this.deoptimizations = new EntityPathTracker();
         this.deoptimizedFields = new Set();
-        this.entitiesToBeDeoptimized = new Set();
-        this.expressionsUseTheKnownValue = [];
+        this.expressionsDependingOnKnownValue = [];
         this.knownValue = null;
         this.knownValueLiteral = UnknownValue;
-        this.frozenValue = null;
     }
-    addEntityToBeDeoptimized(entity) {
+    addArgumentValue(entity) {
+        this.updateKnownValue(entity);
         if (entity === UNKNOWN_EXPRESSION) {
             // As unknown expressions fully deoptimize all interactions, we can clear
             // the interaction cache at this point provided we keep this optimization
             // in mind when adding new interactions
-            if (!this.entitiesToBeDeoptimized.has(UNKNOWN_EXPRESSION)) {
-                this.entitiesToBeDeoptimized.add(UNKNOWN_EXPRESSION);
+            if (!this.argumentsToBeDeoptimized.has(UNKNOWN_EXPRESSION)) {
+                this.argumentsToBeDeoptimized.add(UNKNOWN_EXPRESSION);
                 for (const { interaction } of this.deoptimizationInteractions) {
                     deoptimizeInteraction(interaction);
                 }
@@ -5708,27 +5964,30 @@ class ParameterVariable extends LocalVariable {
         else if (this.deoptimizedFields.has(UnknownKey)) {
             // This means that we already deoptimized all interactions and no longer
             // track them
-            entity.deoptimizePath(UNKNOWN_PATH);
+            entity.deoptimizePath([...this.initPath, UnknownKey]);
         }
-        else if (!this.entitiesToBeDeoptimized.has(entity)) {
-            this.entitiesToBeDeoptimized.add(entity);
+        else if (!this.argumentsToBeDeoptimized.has(entity)) {
+            this.argumentsToBeDeoptimized.add(entity);
             for (const field of this.deoptimizedFields) {
-                entity.deoptimizePath([field]);
+                entity.deoptimizePath([...this.initPath, field]);
             }
             for (const { interaction, path } of this.deoptimizationInteractions) {
-                entity.deoptimizeArgumentsOnInteractionAtPath(interaction, path, SHARED_RECURSION_TRACKER);
+                entity.deoptimizeArgumentsOnInteractionAtPath(interaction, [...this.initPath, ...path], SHARED_RECURSION_TRACKER);
             }
         }
     }
+    /** This says we should not make assumptions about the value of the parameter.
+     *  This is different from deoptimization that will also cause argument values
+     *  to be deoptimized. */
     markReassigned() {
         if (this.isReassigned) {
             return;
         }
         super.markReassigned();
-        for (const expression of this.expressionsUseTheKnownValue) {
+        for (const expression of this.expressionsDependingOnKnownValue) {
             expression.deoptimizeCache();
         }
-        this.expressionsUseTheKnownValue = EMPTY_ARRAY;
+        this.expressionsDependingOnKnownValue = EMPTY_ARRAY;
     }
     deoptimizeCache() {
         this.markReassigned();
@@ -5745,7 +6004,7 @@ class ParameterVariable extends LocalVariable {
         }
         if (this.knownValue === null) {
             this.knownValue = argument;
-            this.knownValueLiteral = argument.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this);
+            this.knownValueLiteral = argument.getLiteralValueAtPath(this.initPath, SHARED_RECURSION_TRACKER, this);
             return;
         }
         // the same literal or identifier, do nothing
@@ -5755,14 +6014,10 @@ class ParameterVariable extends LocalVariable {
                 this.knownValue.variable === argument.variable)) {
             return;
         }
-        const oldValue = this.knownValueLiteral;
-        if (typeof oldValue === 'symbol') {
-            this.markReassigned();
-            return;
-        }
-        // add tracking for the new argument
-        const newValue = argument.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this);
-        if (newValue !== oldValue) {
+        const { knownValueLiteral } = this;
+        if (typeof knownValueLiteral === 'symbol' ||
+            argument.getLiteralValueAtPath(this.initPath, SHARED_RECURSION_TRACKER, this) !==
+                knownValueLiteral) {
             this.markReassigned();
         }
     }
@@ -5773,42 +6028,47 @@ class ParameterVariable extends LocalVariable {
      * @returns the frozen value
      */
     getKnownValue() {
-        if (this.frozenValue === null) {
-            this.frozenValue = this.knownValue || UNKNOWN_EXPRESSION;
-        }
-        return this.frozenValue;
+        return this.knownValue || UNKNOWN_EXPRESSION;
     }
     getLiteralValueAtPath(path, recursionTracker, origin) {
-        if (this.isReassigned) {
+        if (this.isReassigned || path.length + this.initPath.length > MAX_PATH_DEPTH) {
             return UnknownValue;
         }
         const knownValue = this.getKnownValue();
-        this.expressionsUseTheKnownValue.push(origin);
-        return recursionTracker.withTrackedEntityAtPath(path, knownValue, () => knownValue.getLiteralValueAtPath(path, recursionTracker, origin), UnknownValue);
+        this.expressionsDependingOnKnownValue.push(origin);
+        return recursionTracker.withTrackedEntityAtPath(path, knownValue, () => knownValue.getLiteralValueAtPath([...this.initPath, ...path], recursionTracker, origin), UnknownValue);
     }
     hasEffectsOnInteractionAtPath(path, interaction, context) {
-        if (this.isReassigned || interaction.type === INTERACTION_ASSIGNED) {
+        const { type } = interaction;
+        if (this.isReassigned ||
+            type === INTERACTION_ASSIGNED ||
+            path.length + this.initPath.length > MAX_PATH_DEPTH) {
             return super.hasEffectsOnInteractionAtPath(path, interaction, context);
         }
-        const knownValue = this.getKnownValue();
-        return knownValue.hasEffectsOnInteractionAtPath(path, interaction, context);
+        return (!(type === INTERACTION_CALLED
+            ? (interaction.withNew
+                ? context.instantiated
+                : context.called).trackEntityAtPathAndGetIfTracked(path, interaction.args, this)
+            : context.accessed.trackEntityAtPathAndGetIfTracked(path, this)) &&
+            this.getKnownValue().hasEffectsOnInteractionAtPath([...this.initPath, ...path], interaction, context));
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path) {
         // For performance reasons, we fully deoptimize all deeper interactions
         if (path.length >= 2 ||
-            this.entitiesToBeDeoptimized.has(UNKNOWN_EXPRESSION) ||
+            this.argumentsToBeDeoptimized.has(UNKNOWN_EXPRESSION) ||
             this.deoptimizationInteractions.length >= MAX_TRACKED_INTERACTIONS ||
             (path.length === 1 &&
                 (this.deoptimizedFields.has(UnknownKey) ||
-                    (interaction.type === INTERACTION_CALLED && this.deoptimizedFields.has(path[0]))))) {
+                    (interaction.type === INTERACTION_CALLED && this.deoptimizedFields.has(path[0])))) ||
+            this.initPath.length + path.length > MAX_PATH_DEPTH) {
             deoptimizeInteraction(interaction);
             return;
         }
         if (!this.deoptimizations.trackEntityAtPathAndGetIfTracked(path, interaction.args)) {
-            for (const entity of this.entitiesToBeDeoptimized) {
-                entity.deoptimizeArgumentsOnInteractionAtPath(interaction, path, SHARED_RECURSION_TRACKER);
+            for (const entity of this.argumentsToBeDeoptimized) {
+                entity.deoptimizeArgumentsOnInteractionAtPath(interaction, [...this.initPath, ...path], SHARED_RECURSION_TRACKER);
             }
-            if (!this.entitiesToBeDeoptimized.has(UNKNOWN_EXPRESSION)) {
+            if (!this.argumentsToBeDeoptimized.has(UNKNOWN_EXPRESSION)) {
                 this.deoptimizationInteractions.push({
                     interaction,
                     path
@@ -5829,17 +6089,17 @@ class ParameterVariable extends LocalVariable {
             return;
         }
         this.deoptimizedFields.add(key);
-        for (const entity of this.entitiesToBeDeoptimized) {
+        for (const entity of this.argumentsToBeDeoptimized) {
             // We do not need a recursion tracker here as we already track whether
             // this field is deoptimized
-            entity.deoptimizePath([key]);
+            entity.deoptimizePath([...this.initPath, key]);
         }
         if (key === UnknownKey) {
             // save some memory
             this.deoptimizationInteractions = NO_INTERACTIONS;
             this.deoptimizations = EMPTY_PATH_TRACKER;
             this.deoptimizedFields = UNKNOWN_DEOPTIMIZED_FIELD;
-            this.entitiesToBeDeoptimized = UNKNOWN_DEOPTIMIZED_ENTITY;
+            this.argumentsToBeDeoptimized = UNKNOWN_DEOPTIMIZED_ENTITY;
         }
     }
     getReturnExpressionWhenCalledAtPath(path) {
@@ -5854,11 +6114,14 @@ class ParameterVariable extends LocalVariable {
         }
         return UNKNOWN_RETURN_EXPRESSION;
     }
+    includeArgumentPaths(entity, context) {
+        this.includedPathTracker.includeAllPaths(entity, context, this.initPath);
+    }
 }
 
 class ThisVariable extends ParameterVariable {
     constructor(context) {
-        super('this', null, context);
+        super('this', null, EMPTY_PATH, context);
     }
     hasEffectsOnInteractionAtPath(path, interaction, context) {
         return (context.replacedVariableInits.get(this) || UNKNOWN_EXPRESSION).hasEffectsOnInteractionAtPath(path, interaction, context);
@@ -5870,7 +6133,7 @@ class CatchBodyScope extends ChildScope {
         super(parent, parent.context);
         this.parent = parent;
     }
-    addDeclaration(identifier, context, init, kind) {
+    addDeclaration(identifier, context, init, destructuredInitPath, kind) {
         if (kind === 'var') {
             const name = identifier.name;
             const existingVariable = this.hoistedVariables?.get(name) || this.variables.get(name);
@@ -5883,7 +6146,7 @@ class CatchBodyScope extends ChildScope {
                     // the assignment actually goes to the parameter and the var is
                     // hoisted without assignment. Locally, it is shadowed by the
                     // parameter
-                    const declaredVariable = this.parent.parent.addDeclaration(identifier, context, UNDEFINED_EXPRESSION, kind);
+                    const declaredVariable = this.parent.parent.addDeclaration(identifier, context, UNDEFINED_EXPRESSION, destructuredInitPath, kind);
                     // To avoid the need to rewrite the declaration, we link the variable
                     // names. If we ever implement a logic that splits initialization and
                     // assignment for hoisted vars, the "renderLikeHoisted" logic can be
@@ -5902,7 +6165,7 @@ class CatchBodyScope extends ChildScope {
                 return context.error(logRedeclarationError(name), identifier.start);
             }
             // We only add parameters to parameter scopes
-            const declaredVariable = this.parent.parent.addDeclaration(identifier, context, init, kind);
+            const declaredVariable = this.parent.parent.addDeclaration(identifier, context, init, destructuredInitPath, kind);
             // Necessary to make sure the init is deoptimized for conditional declarations.
             // We cannot call deoptimizePath here.
             declaredVariable.markInitializersForDeoptimization();
@@ -5910,7 +6173,7 @@ class CatchBodyScope extends ChildScope {
             this.addHoistedVariable(name, declaredVariable);
             return declaredVariable;
         }
-        return super.addDeclaration(identifier, context, init, kind);
+        return super.addDeclaration(identifier, context, init, destructuredInitPath, kind);
     }
 }
 
@@ -5920,7 +6183,7 @@ class FunctionBodyScope extends ChildScope {
     }
     // There is stuff that is only allowed in function scopes, i.e. functions can
     // be redeclared, functions and var can redeclare each other
-    addDeclaration(identifier, context, init, kind) {
+    addDeclaration(identifier, context, init, destructuredInitPath, kind) {
         const name = identifier.name;
         const existingVariable = this.hoistedVariables?.get(name) || this.variables.get(name);
         if (existingVariable) {
@@ -5932,7 +6195,7 @@ class FunctionBodyScope extends ChildScope {
             }
             context.error(logRedeclarationError(name), identifier.start);
         }
-        const newVariable = new LocalVariable(identifier.name, identifier, init, context, kind);
+        const newVariable = new LocalVariable(identifier.name, identifier, init, destructuredInitPath, context, kind);
         this.variables.set(name, newVariable);
         return newVariable;
     }
@@ -5941,21 +6204,21 @@ class FunctionBodyScope extends ChildScope {
 class ParameterScope extends ChildScope {
     constructor(parent, isCatchScope) {
         super(parent, parent.context);
-        this.parameters = [];
         this.hasRest = false;
+        this.parameters = [];
         this.bodyScope = isCatchScope ? new CatchBodyScope(this) : new FunctionBodyScope(this);
     }
     /**
      * Adds a parameter to this scope. Parameters must be added in the correct
      * order, i.e. from left to right.
      */
-    addParameterDeclaration(identifier) {
+    addParameterDeclaration(identifier, argumentPath) {
         const { name, start } = identifier;
         const existingParameter = this.variables.get(name);
         if (existingParameter) {
             return this.context.error(logDuplicateArgumentNameError(name), start);
         }
-        const variable = new ParameterVariable(name, identifier, this.context);
+        const variable = new ParameterVariable(name, identifier, argumentPath, this.context);
         this.variables.set(name, variable);
         // We also add it to the body scope to detect name conflicts with local
         // variables. We still need the intermediate scope, though, as parameter
@@ -5973,42 +6236,56 @@ class ParameterScope extends ChildScope {
         }
         this.hasRest = hasRest;
     }
-    includeCallArguments(context, parameters) {
+    includeCallArguments(context, interaction) {
         let calledFromTryStatement = false;
         let argumentIncluded = false;
         const restParameter = this.hasRest && this.parameters[this.parameters.length - 1];
-        for (const checkedArgument of parameters) {
-            if (checkedArgument instanceof SpreadElement) {
-                for (const argument of parameters) {
-                    argument.include(context, false);
-                }
-                break;
+        const { args } = interaction;
+        let lastExplicitlyIncludedIndex = args.length - 1;
+        // If there is a SpreadElement, we need to include all arguments after it
+        // because we no longer know which argument corresponds to which parameter.
+        for (let argumentIndex = 1; argumentIndex < args.length; argumentIndex++) {
+            const argument = args[argumentIndex];
+            if (argument instanceof SpreadElement && !argumentIncluded) {
+                argumentIncluded = true;
+                lastExplicitlyIncludedIndex = argumentIndex - 1;
+            }
+            if (argumentIncluded) {
+                argument.includePath(UNKNOWN_PATH, context);
+                argument.include(context, false);
             }
         }
-        for (let index = parameters.length - 1; index >= 0; index--) {
-            const parameterVariables = this.parameters[index] || restParameter;
-            const argument = parameters[index];
+        // Now we go backwards either starting from the last argument or before the
+        // first SpreadElement to ensure all arguments before are included as needed
+        for (let index = lastExplicitlyIncludedIndex; index >= 1; index--) {
+            const parameterVariables = this.parameters[index - 1] || restParameter;
+            const argument = args[index];
             if (parameterVariables) {
                 calledFromTryStatement = false;
                 if (parameterVariables.length === 0) {
-                    // handle empty destructuring
+                    // handle empty destructuring to avoid destructuring undefined
                     argumentIncluded = true;
                 }
                 else {
-                    for (const variable of parameterVariables) {
-                        if (variable.included) {
-                            argumentIncluded = true;
-                        }
-                        if (variable.calledFromTryStatement) {
+                    for (const parameterVariable of parameterVariables) {
+                        if (parameterVariable.calledFromTryStatement) {
                             calledFromTryStatement = true;
                         }
+                        if (parameterVariable.included) {
+                            argumentIncluded = true;
+                            if (calledFromTryStatement) {
+                                argument.include(context, true);
+                            }
+                            else {
+                                parameterVariable.includeArgumentPaths(argument, context);
+                                argument.include(context, false);
+                            }
+                        }
                     }
                 }
             }
-            if (!argumentIncluded && argument.shouldBeIncluded(context)) {
+            if (!argument.included && (argumentIncluded || argument.shouldBeIncluded(context))) {
                 argumentIncluded = true;
-            }
-            if (argumentIncluded) {
                 argument.include(context, calledFromTryStatement);
             }
         }
@@ -6024,11 +6301,62 @@ class ReturnValueScope extends ParameterScope {
     addReturnExpression(expression) {
         this.returnExpressions.push(expression);
     }
+    deoptimizeArgumentsOnCall(interaction) {
+        const { parameters } = this;
+        const { args } = interaction;
+        let position = 0;
+        for (; position < args.length - 1; position++) {
+            // Only the "this" argument arg[0] can be null
+            const argument = args[position + 1];
+            if (argument instanceof SpreadElement) {
+                // This deoptimizes the current and remaining parameters and arguments
+                for (; position < parameters.length; position++) {
+                    args[position + 1]?.deoptimizePath(UNKNOWN_PATH);
+                    parameters[position].forEach(variable => variable.markReassigned());
+                }
+                break;
+            }
+            if (this.hasRest && position >= parameters.length - 1) {
+                argument.deoptimizePath(UNKNOWN_PATH);
+            }
+            else {
+                const variables = parameters[position];
+                if (variables) {
+                    for (const variable of variables) {
+                        variable.addArgumentValue(argument);
+                    }
+                }
+                this.addArgumentToBeDeoptimized(argument);
+            }
+        }
+        const nonRestParameterLength = this.hasRest ? parameters.length - 1 : parameters.length;
+        for (; position < nonRestParameterLength; position++) {
+            for (const variable of parameters[position]) {
+                variable.addArgumentValue(UNDEFINED_EXPRESSION);
+            }
+        }
+    }
     getReturnExpression() {
         if (this.returnExpression === null)
             this.updateReturnExpression();
         return this.returnExpression;
     }
+    deoptimizeAllParameters() {
+        for (const parameter of this.parameters) {
+            for (const variable of parameter) {
+                variable.deoptimizePath(UNKNOWN_PATH);
+                variable.markReassigned();
+            }
+        }
+    }
+    reassignAllParameters() {
+        for (const parameter of this.parameters) {
+            for (const variable of parameter) {
+                variable.markReassigned();
+            }
+        }
+    }
+    addArgumentToBeDeoptimized(_argument) { }
     updateReturnExpression() {
         if (this.returnExpressions.length === 1) {
             this.returnExpression = this.returnExpressions[0];
@@ -6044,24 +6372,30 @@ class ReturnValueScope extends ParameterScope {
 
 class FunctionScope extends ReturnValueScope {
     constructor(parent) {
-        const { context } = parent;
         super(parent, false);
+        const { context } = parent;
         this.variables.set('arguments', (this.argumentsVariable = new ArgumentsVariable(context)));
         this.variables.set('this', (this.thisVariable = new ThisVariable(context)));
     }
     findLexicalBoundary() {
         return this;
     }
-    includeCallArguments(context, parameters) {
-        super.includeCallArguments(context, parameters);
+    includeCallArguments(context, interaction) {
+        super.includeCallArguments(context, interaction);
         if (this.argumentsVariable.included) {
-            for (const argument of parameters) {
-                if (!argument.included) {
+            const { args } = interaction;
+            for (let argumentIndex = 1; argumentIndex < args.length; argumentIndex++) {
+                const argument = args[argumentIndex];
+                if (argument) {
+                    argument.includePath(UNKNOWN_PATH, context);
                     argument.include(context, false);
                 }
             }
         }
     }
+    addArgumentToBeDeoptimized(argument) {
+        this.argumentsVariable.addArgumentToBeDeoptimized(argument);
+    }
 }
 
 class ExpressionStatement extends NodeBase {
@@ -6089,8 +6423,9 @@ class ExpressionStatement extends NodeBase {
             return this.parent.type !== Program$1;
         return super.shouldBeIncluded(context);
     }
-    applyDeoptimizations() { }
 }
+ExpressionStatement.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ExpressionStatement.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class BlockStatement extends NodeBase {
     get deoptimizeBody() {
@@ -6155,6 +6490,8 @@ class BlockStatement extends NodeBase {
         }
     }
 }
+BlockStatement.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+BlockStatement.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class RestElement extends NodeBase {
     constructor() {
@@ -6164,9 +6501,12 @@ class RestElement extends NodeBase {
     addExportedVariables(variables, exportNamesByVariable) {
         this.argument.addExportedVariables(variables, exportNamesByVariable);
     }
-    declare(kind, init) {
+    declare(kind, destructuredInitPath, init) {
         this.declarationInit = init;
-        return this.argument.declare(kind, UNKNOWN_EXPRESSION);
+        return this.argument.declare(kind, getIncludedPatternPath$1(destructuredInitPath), init);
+    }
+    deoptimizeAssignment(destructuredInitPath, init) {
+        this.argument.deoptimizeAssignment(getIncludedPatternPath$1(destructuredInitPath), init);
     }
     deoptimizePath(path) {
         if (path.length === 0) {
@@ -6177,6 +6517,20 @@ class RestElement extends NodeBase {
         return (path.length > 0 ||
             this.argument.hasEffectsOnInteractionAtPath(EMPTY_PATH, interaction, context));
     }
+    hasEffectsWhenDestructuring(context, destructuredInitPath, init) {
+        return this.argument.hasEffectsWhenDestructuring(context, getIncludedPatternPath$1(destructuredInitPath), init);
+    }
+    includeDestructuredIfNecessary(context, destructuredInitPath, init) {
+        return (this.included =
+            this.argument.includeDestructuredIfNecessary(context, getIncludedPatternPath$1(destructuredInitPath), init) || this.included);
+    }
+    include(context, includeChildrenRecursively) {
+        if (!this.included)
+            this.includeNode(context);
+        // This should just include the identifier, its properties should be
+        // included where the variable is used.
+        this.argument.include(context, includeChildrenRecursively);
+    }
     markDeclarationReached() {
         this.argument.markDeclarationReached();
     }
@@ -6188,12 +6542,16 @@ class RestElement extends NodeBase {
         }
     }
 }
+RestElement.prototype.includeNode = onlyIncludeSelf;
+const getIncludedPatternPath$1 = (destructuredInitPath) => destructuredInitPath.at(-1) === UnknownKey
+    ? destructuredInitPath
+    : [...destructuredInitPath, UnknownKey];
 
 class FunctionBase extends NodeBase {
     constructor() {
         super(...arguments);
-        this.objectEntity = null;
         this.parameterVariableValuesDeoptimized = false;
+        this.includeCallArguments = this.scope.includeCallArguments.bind(this.scope);
     }
     get async() {
         return isFlagSet(this.flags, 256 /* Flag.async */);
@@ -6213,53 +6571,15 @@ class FunctionBase extends NodeBase {
     set generator(value) {
         this.flags = setFlag(this.flags, 4194304 /* Flag.generator */, value);
     }
-    updateParameterVariableValues(_arguments) {
-        for (let position = 0; position < this.params.length; position++) {
-            const parameter = this.params[position];
-            if (!(parameter instanceof Identifier)) {
-                continue;
-            }
-            const parameterVariable = parameter.variable;
-            const argument = _arguments[position + 1] ?? UNDEFINED_EXPRESSION;
-            parameterVariable.updateKnownValue(argument);
-        }
+    get hasCachedEffects() {
+        return isFlagSet(this.flags, 67108864 /* Flag.hasEffects */);
     }
-    deoptimizeParameterVariableValues() {
-        for (const parameter of this.params) {
-            if (parameter instanceof Identifier) {
-                const parameterVariable = parameter.variable;
-                parameterVariable.markReassigned();
-            }
-        }
+    set hasCachedEffects(value) {
+        this.flags = setFlag(this.flags, 67108864 /* Flag.hasEffects */, value);
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
-        if (interaction.type === INTERACTION_CALLED) {
-            const { parameters } = this.scope;
-            const { args } = interaction;
-            let hasRest = false;
-            for (let position = 0; position < args.length - 1; position++) {
-                const parameter = this.params[position];
-                // Only the "this" argument arg[0] can be null
-                const argument = args[position + 1];
-                if (argument instanceof SpreadElement) {
-                    this.deoptimizeParameterVariableValues();
-                }
-                if (hasRest || parameter instanceof RestElement) {
-                    hasRest = true;
-                    argument.deoptimizePath(UNKNOWN_PATH);
-                }
-                else if (parameter instanceof Identifier) {
-                    parameters[position][0].addEntityToBeDeoptimized(argument);
-                    this.addArgumentToBeDeoptimized(argument);
-                }
-                else if (parameter) {
-                    argument.deoptimizePath(UNKNOWN_PATH);
-                }
-                else {
-                    this.addArgumentToBeDeoptimized(argument);
-                }
-            }
-            this.updateParameterVariableValues(args);
+        if (interaction.type === INTERACTION_CALLED && path.length === 0) {
+            this.scope.deoptimizeArgumentsOnCall(interaction);
         }
         else {
             this.getObjectEntity().deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
@@ -6271,12 +6591,7 @@ class FunctionBase extends NodeBase {
             // A reassignment of UNKNOWN_PATH is considered equivalent to having lost track
             // which means the return expression and parameters need to be reassigned
             this.scope.getReturnExpression().deoptimizePath(UNKNOWN_PATH);
-            for (const parameterList of this.scope.parameters) {
-                for (const parameter of parameterList) {
-                    parameter.deoptimizePath(UNKNOWN_PATH);
-                    parameter.markReassigned();
-                }
-            }
+            this.scope.deoptimizeAllParameters();
         }
     }
     getLiteralValueAtPath(path, recursionTracker, origin) {
@@ -6300,8 +6615,8 @@ class FunctionBase extends NodeBase {
         if (path.length > 0 || interaction.type !== INTERACTION_CALLED) {
             return this.getObjectEntity().hasEffectsOnInteractionAtPath(path, interaction, context);
         }
-        if (this.annotationNoSideEffects) {
-            return false;
+        if (this.hasCachedEffects) {
+            return true;
         }
         if (this.async) {
             const { propertyReadSideEffects } = this.scope.context.options
@@ -6311,12 +6626,20 @@ class FunctionBase extends NodeBase {
                 (propertyReadSideEffects &&
                     (propertyReadSideEffects === 'always' ||
                         returnExpression.hasEffectsOnInteractionAtPath(['then'], NODE_INTERACTION_UNKNOWN_ACCESS, context)))) {
+                this.hasCachedEffects = true;
                 return true;
             }
         }
-        for (const parameter of this.params) {
-            if (parameter.hasEffects(context))
+        const { propertyReadSideEffects } = this.scope.context.options
+            .treeshake;
+        for (let index = 0; index < this.params.length; index++) {
+            const parameter = this.params[index];
+            if (parameter.hasEffects(context) ||
+                (propertyReadSideEffects &&
+                    parameter.hasEffectsWhenDestructuring(context, EMPTY_PATH, interaction.args[index + 1] || UNDEFINED_EXPRESSION))) {
+                this.hasCachedEffects = true;
                 return true;
+            }
         }
         return false;
     }
@@ -6334,21 +6657,17 @@ class FunctionBase extends NodeBase {
         return variable?.getOnlyFunctionCallUsed() ?? false;
     }
     include(context, includeChildrenRecursively) {
-        if (!this.parameterVariableValuesDeoptimized && !this.onlyFunctionCallUsed()) {
+        if (!this.included)
+            this.includeNode(context);
+        if (!(this.parameterVariableValuesDeoptimized || this.onlyFunctionCallUsed())) {
             this.parameterVariableValuesDeoptimized = true;
-            this.deoptimizeParameterVariableValues();
+            this.scope.reassignAllParameters();
         }
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
-        this.included = true;
         const { brokenFlow } = context;
         context.brokenFlow = false;
         this.body.include(context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
-    includeCallArguments(context, parameters) {
-        this.scope.includeCallArguments(context, parameters);
-    }
     initialise() {
         super.initialise();
         if (this.body instanceof BlockStatement) {
@@ -6370,14 +6689,14 @@ class FunctionBase extends NodeBase {
         // so that the scope already knows all parameters and can detect conflicts
         // when parsing the body.
         const parameters = (this.params = params.map((parameter) => new (context.getNodeConstructor(parameter.type))(this, scope).parseNode(parameter)));
-        scope.addParameterVariables(parameters.map(parameter => parameter.declare('parameter', UNKNOWN_EXPRESSION)), parameters[parameters.length - 1] instanceof RestElement);
+        scope.addParameterVariables(parameters.map(parameter => parameter.declare('parameter', EMPTY_PATH, UNKNOWN_EXPRESSION)), parameters[parameters.length - 1] instanceof RestElement);
         this.body = new (context.getNodeConstructor(body.type))(this, bodyScope).parseNode(body);
         return super.parseNode(esTreeNode);
     }
-    addArgumentToBeDeoptimized(_argument) { }
-    applyDeoptimizations() { }
 }
 FunctionBase.prototype.preventChildBlockScope = true;
+FunctionBase.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+FunctionBase.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class FunctionNode extends FunctionBase {
     constructor() {
@@ -6389,30 +6708,31 @@ class FunctionNode extends FunctionBase {
         this.constructedEntity = new ObjectEntity(Object.create(null), OBJECT_PROTOTYPE);
         // This makes sure that all deoptimizations of "this" are applied to the
         // constructed entity.
-        this.scope.thisVariable.addEntityToBeDeoptimized(this.constructedEntity);
+        this.scope.thisVariable.addArgumentValue(this.constructedEntity);
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         super.deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
         if (interaction.type === INTERACTION_CALLED && path.length === 0 && interaction.args[0]) {
             // args[0] is the "this" argument
-            this.scope.thisVariable.addEntityToBeDeoptimized(interaction.args[0]);
+            this.scope.thisVariable.addArgumentValue(interaction.args[0]);
         }
     }
     hasEffects(context) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
         if (this.annotationNoSideEffects) {
             return false;
         }
         return !!this.id?.hasEffects(context);
     }
     hasEffectsOnInteractionAtPath(path, interaction, context) {
-        if (super.hasEffectsOnInteractionAtPath(path, interaction, context))
-            return true;
-        if (this.annotationNoSideEffects) {
+        if (this.annotationNoSideEffects &&
+            path.length === 0 &&
+            interaction.type === INTERACTION_CALLED) {
             return false;
         }
-        if (interaction.type === INTERACTION_CALLED) {
+        if (super.hasEffectsOnInteractionAtPath(path, interaction, context)) {
+            return true;
+        }
+        if (path.length === 0 && interaction.type === INTERACTION_CALLED) {
             const thisInit = context.replacedVariableInits.get(this.scope.thisVariable);
             context.replacedVariableInits.set(this.scope.thisVariable, interaction.withNew ? this.constructedEntity : UNKNOWN_EXPRESSION);
             const { brokenFlow, ignore, replacedVariableInits } = context;
@@ -6423,8 +6743,10 @@ class FunctionNode extends FunctionBase {
                 returnYield: true,
                 this: interaction.withNew
             };
-            if (this.body.hasEffects(context))
+            if (this.body.hasEffects(context)) {
+                this.hasCachedEffects = true;
                 return true;
+            }
             context.brokenFlow = brokenFlow;
             if (thisInit) {
                 replacedVariableInits.set(this.scope.thisVariable, thisInit);
@@ -6438,7 +6760,7 @@ class FunctionNode extends FunctionBase {
     }
     include(context, includeChildrenRecursively) {
         super.include(context, includeChildrenRecursively);
-        this.id?.include();
+        this.id?.include(context);
         const hasArguments = this.scope.argumentsVariable.included;
         for (const parameter of this.params) {
             if (!(parameter instanceof Identifier) || hasArguments) {
@@ -6446,12 +6768,18 @@ class FunctionNode extends FunctionBase {
             }
         }
     }
+    includeNode(context) {
+        this.included = true;
+        const hasArguments = this.scope.argumentsVariable.included;
+        for (const parameter of this.params) {
+            if (!(parameter instanceof Identifier) || hasArguments) {
+                parameter.includePath(UNKNOWN_PATH, context);
+            }
+        }
+    }
     initialise() {
         super.initialise();
-        this.id?.declare('function', this);
-    }
-    addArgumentToBeDeoptimized(argument) {
-        this.scope.argumentsVariable.addArgumentToBeDeoptimized(argument);
+        this.id?.declare('function', EMPTY_PATH, this);
     }
     getObjectEntity() {
         if (this.objectEntity !== null) {
@@ -6501,11 +6829,16 @@ function getFunctionIdInsertPosition(code, start) {
 }
 class ExportDefaultDeclaration extends NodeBase {
     include(context, includeChildrenRecursively) {
-        super.include(context, includeChildrenRecursively);
+        this.included = true;
+        this.declaration.include(context, includeChildrenRecursively);
         if (includeChildrenRecursively) {
-            this.scope.context.includeVariableInModule(this.variable);
+            this.scope.context.includeVariableInModule(this.variable, UNKNOWN_PATH, context);
         }
     }
+    includePath(path, context) {
+        this.included = true;
+        this.declaration.includePath(path, context);
+    }
     initialise() {
         super.initialise();
         const declaration = this.declaration;
@@ -6550,7 +6883,6 @@ class ExportDefaultDeclaration extends NodeBase {
         }
         this.declaration.render(code, options);
     }
-    applyDeoptimizations() { }
     renderNamedDeclaration(code, declarationStart, idInsertPosition, options) {
         const { exportNamesByVariable, format, snippets: { getPropertyAccess } } = options;
         const name = this.variable.getName(getPropertyAccess);
@@ -6581,6 +6913,8 @@ class ExportDefaultDeclaration extends NodeBase {
     }
 }
 ExportDefaultDeclaration.prototype.needsBoundaries = true;
+ExportDefaultDeclaration.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ExportDefaultDeclaration.prototype.applyDeoptimizations = doNotDeoptimize;
 
 const needsEscapeRegEx = /[\n\r'\\\u2028\u2029]/;
 const quoteNewlineRegEx = /([\n\r'\u2028\u2029])/g;
@@ -6850,6 +7184,7 @@ class Literal extends NodeBase {
         }
     }
 }
+Literal.prototype.includeNode = onlyIncludeSelf;
 
 function getChainElementLiteralValueAtPath(element, object, path, recursionTracker, origin) {
     if ('getLiteralValueAtPathAsChainElement' in object) {
@@ -6865,8 +7200,6 @@ function getChainElementLiteralValueAtPath(element, object, path, recursionTrack
     return element.getLiteralValueAtPath(path, recursionTracker, origin);
 }
 
-// To avoid infinite recursions
-const MAX_PATH_DEPTH = 7;
 function getResolvablePropertyKey(memberExpression) {
     return memberExpression.computed
         ? getResolvableComputedPropertyKey(memberExpression.property)
@@ -6965,18 +7298,27 @@ class MemberExpression extends NodeBase {
         }
         else if (!this.isUndefined) {
             if (path.length < MAX_PATH_DEPTH) {
-                this.object.deoptimizeArgumentsOnInteractionAtPath(interaction, [this.getPropertyKey(), ...path], recursionTracker);
+                this.object.deoptimizeArgumentsOnInteractionAtPath(interaction, this.propertyKey === UnknownKey ? UNKNOWN_PATH : [this.propertyKey, ...path], recursionTracker);
             }
             else {
                 deoptimizeInteraction(interaction);
             }
         }
     }
+    deoptimizeAssignment(destructuredInitPath, init) {
+        this.deoptimizePath(EMPTY_PATH);
+        init.deoptimizePath([...destructuredInitPath, UnknownKey]);
+    }
     deoptimizeCache() {
+        if (this.propertyKey === this.dynamicPropertyKey)
+            return;
         const { expressionsToBeDeoptimized, object } = this;
         this.expressionsToBeDeoptimized = EMPTY_ARRAY;
-        this.propertyKey = UnknownKey;
+        this.dynamicPropertyKey = this.propertyKey;
         object.deoptimizePath(UNKNOWN_PATH);
+        if (this.included) {
+            object.includePath(UNKNOWN_PATH, createInclusionContext());
+        }
         for (const expression of expressionsToBeDeoptimized) {
             expression.deoptimizeCache();
         }
@@ -6987,11 +7329,13 @@ class MemberExpression extends NodeBase {
         if (this.variable) {
             this.variable.deoptimizePath(path);
         }
-        else if (!this.isUndefined && path.length < MAX_PATH_DEPTH) {
-            const propertyKey = this.getPropertyKey();
+        else if (!this.isUndefined) {
+            const { propertyKey } = this;
             this.object.deoptimizePath([
                 propertyKey === UnknownKey ? UnknownNonAccessorKey : propertyKey,
-                ...path
+                ...(path.length < MAX_PATH_DEPTH
+                    ? path
+                    : [...path.slice(0, MAX_PATH_DEPTH), UnknownKey])
             ]);
         }
     }
@@ -7002,9 +7346,11 @@ class MemberExpression extends NodeBase {
         if (this.isUndefined) {
             return undefined;
         }
-        if (this.propertyKey !== UnknownKey && path.length < MAX_PATH_DEPTH) {
-            this.expressionsToBeDeoptimized.push(origin);
-            return this.object.getLiteralValueAtPath([this.getPropertyKey(), ...path], recursionTracker, origin);
+        const propertyKey = this.getDynamicPropertyKey();
+        if (propertyKey !== UnknownKey && path.length < MAX_PATH_DEPTH) {
+            if (propertyKey !== this.propertyKey)
+                this.expressionsToBeDeoptimized.push(origin);
+            return this.object.getLiteralValueAtPath([propertyKey, ...path], recursionTracker, origin);
         }
         return UnknownValue;
     }
@@ -7024,9 +7370,11 @@ class MemberExpression extends NodeBase {
         if (this.isUndefined) {
             return [UNDEFINED_EXPRESSION, false];
         }
-        if (this.propertyKey !== UnknownKey && path.length < MAX_PATH_DEPTH) {
-            this.expressionsToBeDeoptimized.push(origin);
-            return this.object.getReturnExpressionWhenCalledAtPath([this.getPropertyKey(), ...path], interaction, recursionTracker, origin);
+        const propertyKey = this.getDynamicPropertyKey();
+        if (propertyKey !== UnknownKey && path.length < MAX_PATH_DEPTH) {
+            if (propertyKey !== this.propertyKey)
+                this.expressionsToBeDeoptimized.push(origin);
+            return this.object.getReturnExpressionWhenCalledAtPath([propertyKey, ...path], interaction, recursionTracker, origin);
         }
         return UNKNOWN_RETURN_EXPRESSION;
     }
@@ -7072,14 +7420,45 @@ class MemberExpression extends NodeBase {
             return true;
         }
         if (path.length < MAX_PATH_DEPTH) {
-            return this.object.hasEffectsOnInteractionAtPath([this.getPropertyKey(), ...path], interaction, context);
+            return this.object.hasEffectsOnInteractionAtPath([this.getDynamicPropertyKey(), ...path], interaction, context);
         }
         return true;
     }
+    hasEffectsWhenDestructuring(context, destructuredInitPath, init) {
+        return (destructuredInitPath.length > 0 &&
+            init.hasEffectsOnInteractionAtPath(destructuredInitPath, NODE_INTERACTION_UNKNOWN_ACCESS, context));
+    }
     include(context, includeChildrenRecursively) {
+        if (!this.included)
+            this.includeNode(context);
+        this.object.include(context, includeChildrenRecursively);
+        this.property.include(context, includeChildrenRecursively);
+    }
+    includeNode(context) {
+        this.included = true;
         if (!this.deoptimized)
             this.applyDeoptimizations();
-        this.includeProperties(context, includeChildrenRecursively);
+        if (this.variable) {
+            this.scope.context.includeVariableInModule(this.variable, EMPTY_PATH, context);
+        }
+        else if (!this.isUndefined) {
+            this.object.includePath([this.propertyKey], context);
+        }
+    }
+    includePath(path, context) {
+        if (!this.included)
+            this.includeNode(context);
+        if (this.variable) {
+            this.variable?.includePath(path, context);
+        }
+        else if (!this.isUndefined) {
+            this.object.includePath([
+                this.propertyKey,
+                ...(path.length < MAX_PATH_DEPTH
+                    ? path
+                    : [...path.slice(0, MAX_PATH_DEPTH), UnknownKey])
+            ], context);
+        }
     }
     includeAsAssignmentTarget(context, includeChildrenRecursively, deoptimizeAccess) {
         if (!this.assignmentDeoptimized)
@@ -7088,20 +7467,34 @@ class MemberExpression extends NodeBase {
             this.include(context, includeChildrenRecursively);
         }
         else {
-            this.includeProperties(context, includeChildrenRecursively);
+            if (!this.included)
+                this.includeNode(context);
+            this.object.include(context, includeChildrenRecursively);
+            this.property.include(context, includeChildrenRecursively);
         }
     }
-    includeCallArguments(context, parameters) {
+    includeCallArguments(context, interaction) {
         if (this.variable) {
-            this.variable.includeCallArguments(context, parameters);
+            this.variable.includeCallArguments(context, interaction);
         }
         else {
-            super.includeCallArguments(context, parameters);
+            super.includeCallArguments(context, interaction);
+        }
+    }
+    includeDestructuredIfNecessary(context, destructuredInitPath, init) {
+        if ((this.included ||=
+            destructuredInitPath.length > 0 &&
+                !context.brokenFlow &&
+                init.hasEffectsOnInteractionAtPath(destructuredInitPath, NODE_INTERACTION_UNKNOWN_ACCESS, createHasEffectsContext()))) {
+            init.include(context, false);
+            return true;
         }
+        return false;
     }
     initialise() {
         super.initialise();
-        this.propertyKey = getResolvablePropertyKey(this);
+        this.dynamicPropertyKey = getResolvablePropertyKey(this);
+        this.propertyKey = this.dynamicPropertyKey === null ? UnknownKey : this.dynamicPropertyKey;
         this.accessInteraction = { args: [this.object], type: INTERACTION_ACCESSED };
     }
     render(code, options, { renderedParentType, isCalleeOfRenderedParent, renderedSurroundingElement } = BLANK) {
@@ -7138,8 +7531,7 @@ class MemberExpression extends NodeBase {
         this.bound &&
             propertyReadSideEffects &&
             !(this.variable || this.isUndefined)) {
-            const propertyKey = this.getPropertyKey();
-            this.object.deoptimizeArgumentsOnInteractionAtPath(this.accessInteraction, [propertyKey], SHARED_RECURSION_TRACKER);
+            this.object.deoptimizeArgumentsOnInteractionAtPath(this.accessInteraction, [this.propertyKey], SHARED_RECURSION_TRACKER);
             this.scope.context.requestTreeshakingPass();
         }
         if (this.variable) {
@@ -7156,7 +7548,7 @@ class MemberExpression extends NodeBase {
         this.bound &&
             propertyReadSideEffects &&
             !(this.variable || this.isUndefined)) {
-            this.object.deoptimizeArgumentsOnInteractionAtPath(this.assignmentInteraction, [this.getPropertyKey()], SHARED_RECURSION_TRACKER);
+            this.object.deoptimizeArgumentsOnInteractionAtPath(this.assignmentInteraction, [this.propertyKey], SHARED_RECURSION_TRACKER);
             this.scope.context.requestTreeshakingPass();
         }
     }
@@ -7165,24 +7557,24 @@ class MemberExpression extends NodeBase {
             const variable = this.scope.findVariable(this.object.name);
             if (variable.isNamespace) {
                 if (this.variable) {
-                    this.scope.context.includeVariableInModule(this.variable);
+                    this.scope.context.includeVariableInModule(this.variable, UNKNOWN_PATH, createInclusionContext());
                 }
                 this.scope.context.log(LOGLEVEL_WARN, logIllegalImportReassignment(this.object.name, this.scope.context.module.id), this.start);
             }
         }
     }
-    getPropertyKey() {
-        if (this.propertyKey === null) {
-            this.propertyKey = UnknownKey;
+    getDynamicPropertyKey() {
+        if (this.dynamicPropertyKey === null) {
+            this.dynamicPropertyKey = this.propertyKey;
             const value = this.property.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this);
-            return (this.propertyKey =
+            return (this.dynamicPropertyKey =
                 value === SymbolToStringTag
                     ? value
                     : typeof value === 'symbol'
                         ? UnknownKey
                         : String(value));
         }
-        return this.propertyKey;
+        return this.dynamicPropertyKey;
     }
     hasAccessEffect(context) {
         const { propertyReadSideEffects } = this.scope.context.options
@@ -7190,17 +7582,7 @@ class MemberExpression extends NodeBase {
         return (!(this.variable || this.isUndefined) &&
             propertyReadSideEffects &&
             (propertyReadSideEffects === 'always' ||
-                this.object.hasEffectsOnInteractionAtPath([this.getPropertyKey()], this.accessInteraction, context)));
-    }
-    includeProperties(context, includeChildrenRecursively) {
-        if (!this.included) {
-            this.included = true;
-            if (this.variable) {
-                this.scope.context.includeVariableInModule(this.variable);
-            }
-        }
-        this.object.include(context, includeChildrenRecursively);
-        this.property.include(context, includeChildrenRecursively);
+                this.object.hasEffectsOnInteractionAtPath([this.getDynamicPropertyKey()], this.accessInteraction, context)));
     }
 }
 function resolveNamespaceVariables(baseVariable, path, astContext) {
@@ -7244,18 +7626,20 @@ class MetaProperty extends NodeBase {
         return path.length > 1 || type !== INTERACTION_ACCESSED;
     }
     include() {
-        if (!this.included) {
-            this.included = true;
-            if (this.meta.name === IMPORT) {
-                this.scope.context.addImportMeta(this);
-                const parent = this.parent;
-                const metaProperty = (this.metaProperty =
-                    parent instanceof MemberExpression && typeof parent.propertyKey === 'string'
-                        ? parent.propertyKey
-                        : null);
-                if (metaProperty?.startsWith(FILE_PREFIX)) {
-                    this.referenceId = metaProperty.slice(FILE_PREFIX.length);
-                }
+        if (!this.included)
+            this.includeNode();
+    }
+    includeNode() {
+        this.included = true;
+        if (this.meta.name === IMPORT) {
+            this.scope.context.addImportMeta(this);
+            const parent = this.parent;
+            const metaProperty = (this.metaProperty =
+                parent instanceof MemberExpression && typeof parent.propertyKey === 'string'
+                    ? parent.propertyKey
+                    : null);
+            if (metaProperty?.startsWith(FILE_PREFIX)) {
+                this.referenceId = metaProperty.slice(FILE_PREFIX.length);
             }
         }
     }
@@ -7362,7 +7746,7 @@ class UndefinedVariable extends Variable {
 
 class ExportDefaultVariable extends LocalVariable {
     constructor(name, exportDefaultDeclaration, context) {
-        super(name, exportDefaultDeclaration, exportDefaultDeclaration.declaration, context, 'other');
+        super(name, exportDefaultDeclaration, exportDefaultDeclaration.declaration, EMPTY_PATH, context, 'other');
         this.hasId = false;
         this.originalId = null;
         this.originalVariable = null;
@@ -7511,8 +7895,8 @@ class NamespaceVariable extends Variable {
         return (!memberVariable ||
             memberVariable.hasEffectsOnInteractionAtPath(path.slice(1), interaction, context));
     }
-    include() {
-        super.include();
+    includePath(path, context) {
+        super.includePath(path, context);
         this.context.includeAllExports();
     }
     prepare(accessedGlobalsByScope) {
@@ -7605,9 +7989,9 @@ class SyntheticNamedExportVariable extends Variable {
     getName(getPropertyAccess) {
         return `${this.syntheticNamespace.getName(getPropertyAccess)}${getPropertyAccess(this.name)}`;
     }
-    include() {
-        super.include();
-        this.context.includeVariableInModule(this.syntheticNamespace);
+    includePath(path, context) {
+        super.includePath(path, context);
+        this.context.includeVariableInModule(this.syntheticNamespace, path, context);
     }
     setRenderNames(baseName, name) {
         super.setRenderNames(baseName, name);
@@ -10812,21 +11196,37 @@ class ArrayPattern extends NodeBase {
             element?.addExportedVariables(variables, exportNamesByVariable);
         }
     }
-    declare(kind) {
+    declare(kind, destructuredInitPath, init) {
         const variables = [];
+        const includedPatternPath = getIncludedPatternPath(destructuredInitPath);
         for (const element of this.elements) {
             if (element !== null) {
-                variables.push(...element.declare(kind, UNKNOWN_EXPRESSION));
+                variables.push(...element.declare(kind, includedPatternPath, init));
             }
         }
         return variables;
     }
+    deoptimizeAssignment(destructuredInitPath, init) {
+        const includedPatternPath = getIncludedPatternPath(destructuredInitPath);
+        for (const element of this.elements) {
+            element?.deoptimizeAssignment(includedPatternPath, init);
+        }
+    }
     // Patterns can only be deoptimized at the empty path at the moment
     deoptimizePath() {
         for (const element of this.elements) {
             element?.deoptimizePath(EMPTY_PATH);
         }
     }
+    hasEffectsWhenDestructuring(context, destructuredInitPath, init) {
+        const includedPatternPath = getIncludedPatternPath(destructuredInitPath);
+        for (const element of this.elements) {
+            if (element?.hasEffectsWhenDestructuring(context, includedPatternPath, init)) {
+                return true;
+            }
+        }
+        return false;
+    }
     // Patterns are only checked at the empty path at the moment
     hasEffectsOnInteractionAtPath(_path, interaction, context) {
         for (const element of this.elements) {
@@ -10835,12 +11235,38 @@ class ArrayPattern extends NodeBase {
         }
         return false;
     }
+    includeDestructuredIfNecessary(context, destructuredInitPath, init) {
+        let included = false;
+        const includedPatternPath = getIncludedPatternPath(destructuredInitPath);
+        for (const element of this.elements) {
+            if (element) {
+                element.included ||= included;
+                included =
+                    element.includeDestructuredIfNecessary(context, includedPatternPath, init) || included;
+            }
+        }
+        if (included) {
+            // This is necessary so that if any pattern element is included, all are
+            // included for proper deconflicting
+            for (const element of this.elements) {
+                if (element && !element.included) {
+                    element.included = true;
+                    element.includeDestructuredIfNecessary(context, includedPatternPath, init);
+                }
+            }
+        }
+        return (this.included ||= included);
+    }
     markDeclarationReached() {
         for (const element of this.elements) {
             element?.markDeclarationReached();
         }
     }
 }
+ArrayPattern.prototype.includeNode = onlyIncludeSelf;
+const getIncludedPatternPath = (destructuredInitPath) => destructuredInitPath.at(-1) === UnknownKey
+    ? destructuredInitPath
+    : [...destructuredInitPath, UnknownInteger];
 
 class ArrowFunctionExpression extends FunctionBase {
     constructor() {
@@ -10857,17 +11283,17 @@ class ArrowFunctionExpression extends FunctionBase {
         this.scope = new ReturnValueScope(parentScope, false);
     }
     hasEffects() {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
         return false;
     }
     hasEffectsOnInteractionAtPath(path, interaction, context) {
+        if (this.annotationNoSideEffects &&
+            path.length === 0 &&
+            interaction.type === INTERACTION_CALLED) {
+            return false;
+        }
         if (super.hasEffectsOnInteractionAtPath(path, interaction, context)) {
             return true;
         }
-        if (this.annotationNoSideEffects) {
-            return false;
-        }
         if (interaction.type === INTERACTION_CALLED) {
             const { ignore, brokenFlow } = context;
             context.ignore = {
@@ -10897,6 +11323,15 @@ class ArrowFunctionExpression extends FunctionBase {
             }
         }
     }
+    includeNode(context) {
+        this.included = true;
+        this.body.includePath(UNKNOWN_PATH, context);
+        for (const parameter of this.params) {
+            if (!(parameter instanceof Identifier)) {
+                parameter.includePath(UNKNOWN_PATH, context);
+            }
+        }
+    }
     getObjectEntity() {
         if (this.objectEntity !== null) {
             return this.objectEntity;
@@ -10916,13 +11351,18 @@ class ObjectPattern extends NodeBase {
             }
         }
     }
-    declare(kind, init) {
+    declare(kind, destructuredInitPath, init) {
         const variables = [];
         for (const property of this.properties) {
-            variables.push(...property.declare(kind, init));
+            variables.push(...property.declare(kind, destructuredInitPath, init));
         }
         return variables;
     }
+    deoptimizeAssignment(destructuredInitPath, init) {
+        for (const property of this.properties) {
+            property.deoptimizeAssignment(destructuredInitPath, init);
+        }
+    }
     deoptimizePath(path) {
         if (path.length === 0) {
             for (const property of this.properties) {
@@ -10940,12 +11380,46 @@ class ObjectPattern extends NodeBase {
         }
         return false;
     }
+    hasEffectsWhenDestructuring(context, destructuredInitPath, init) {
+        for (const property of this.properties) {
+            if (property.hasEffectsWhenDestructuring(context, destructuredInitPath, init))
+                return true;
+        }
+        return false;
+    }
+    includeDestructuredIfNecessary(context, destructuredInitPath, init) {
+        let included = false;
+        for (const property of this.properties) {
+            included =
+                property.includeDestructuredIfNecessary(context, destructuredInitPath, init) || included;
+        }
+        return (this.included ||= included);
+    }
     markDeclarationReached() {
         for (const property of this.properties) {
             property.markDeclarationReached();
         }
     }
+    render(code, options) {
+        if (this.properties.length > 0) {
+            const separatedNodes = getCommaSeparatedNodesWithBoundaries(this.properties, code, this.start + 1, this.end - 1);
+            let lastSeparatorPos = null;
+            for (const { node, separator, start, end } of separatedNodes) {
+                if (!node.included) {
+                    treeshakeNode(node, code, start, end);
+                    continue;
+                }
+                lastSeparatorPos = separator;
+                node.render(code, options);
+            }
+            if (lastSeparatorPos) {
+                code.remove(lastSeparatorPos, this.end - 1);
+            }
+        }
+    }
 }
+ObjectPattern.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ObjectPattern.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class AssignmentExpression extends NodeBase {
     hasEffects(context) {
@@ -10954,7 +11428,9 @@ class AssignmentExpression extends NodeBase {
             this.applyDeoptimizations();
         // MemberExpressions do not access the property before assignments if the
         // operator is '='.
-        return (right.hasEffects(context) || left.hasEffectsAsAssignmentTarget(context, operator !== '='));
+        return (right.hasEffects(context) ||
+            left.hasEffectsAsAssignmentTarget(context, operator !== '=') ||
+            this.left.hasEffectsWhenDestructuring?.(context, EMPTY_PATH, right));
     }
     hasEffectsOnInteractionAtPath(path, interaction, context) {
         return this.right.hasEffectsOnInteractionAtPath(path, interaction, context);
@@ -10963,15 +11439,24 @@ class AssignmentExpression extends NodeBase {
         const { deoptimized, left, right, operator } = this;
         if (!deoptimized)
             this.applyDeoptimizations();
-        this.included = true;
+        if (!this.included)
+            this.includeNode(context);
+        const hasEffectsContext = createHasEffectsContext();
         if (includeChildrenRecursively ||
             operator !== '=' ||
             left.included ||
-            left.hasEffectsAsAssignmentTarget(createHasEffectsContext(), false)) {
+            left.hasEffectsAsAssignmentTarget(hasEffectsContext, false) ||
+            left.hasEffectsWhenDestructuring?.(hasEffectsContext, EMPTY_PATH, right)) {
             left.includeAsAssignmentTarget(context, includeChildrenRecursively, operator !== '=');
         }
         right.include(context, includeChildrenRecursively);
     }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        this.right.includePath(UNKNOWN_PATH, context);
+    }
     initialise() {
         super.initialise();
         if (this.left instanceof Identifier) {
@@ -11032,8 +11517,7 @@ class AssignmentExpression extends NodeBase {
     }
     applyDeoptimizations() {
         this.deoptimized = true;
-        this.left.deoptimizePath(EMPTY_PATH);
-        this.right.deoptimizePath(UNKNOWN_PATH);
+        this.left.deoptimizeAssignment(EMPTY_PATH, this.right);
         this.scope.context.requestTreeshakingPass();
     }
 }
@@ -11042,8 +11526,11 @@ class AssignmentPattern extends NodeBase {
     addExportedVariables(variables, exportNamesByVariable) {
         this.left.addExportedVariables(variables, exportNamesByVariable);
     }
-    declare(kind, init) {
-        return this.left.declare(kind, init);
+    declare(kind, destructuredInitPath, init) {
+        return this.left.declare(kind, destructuredInitPath, init);
+    }
+    deoptimizeAssignment(destructuredInitPath, init) {
+        this.left.deoptimizeAssignment(destructuredInitPath, init);
     }
     deoptimizePath(path) {
         if (path.length === 0) {
@@ -11053,6 +11540,29 @@ class AssignmentPattern extends NodeBase {
     hasEffectsOnInteractionAtPath(path, interaction, context) {
         return (path.length > 0 || this.left.hasEffectsOnInteractionAtPath(EMPTY_PATH, interaction, context));
     }
+    hasEffectsWhenDestructuring(context, destructuredInitPath, init) {
+        return this.left.hasEffectsWhenDestructuring(context, destructuredInitPath, init);
+    }
+    includeDestructuredIfNecessary(context, destructuredInitPath, init) {
+        let included = this.left.includeDestructuredIfNecessary(context, destructuredInitPath, init) ||
+            this.included;
+        if ((included ||= this.right.shouldBeIncluded(context))) {
+            this.right.include(context, false);
+            if (!this.left.included) {
+                this.left.included = true;
+                // Unfortunately, we need to include the left side again now, so that
+                // any declared variables are properly included.
+                this.left.includeDestructuredIfNecessary(context, destructuredInitPath, init);
+            }
+        }
+        return (this.included = included);
+    }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        this.right.includePath(UNKNOWN_PATH, context);
+    }
     markDeclarationReached() {
         this.left.markDeclarationReached();
     }
@@ -11075,22 +11585,34 @@ class AwaitExpression extends NodeBase {
         return true;
     }
     include(context, includeChildrenRecursively) {
+        if (!this.included)
+            this.includeNode(context);
+        this.argument.include(context, includeChildrenRecursively);
+    }
+    includeNode(context) {
+        this.included = true;
         if (!this.deoptimized)
             this.applyDeoptimizations();
-        if (!this.included) {
-            this.included = true;
-            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.scope.context.usesTopLevelAwait = true;
-            }
+        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.scope.context.usesTopLevelAwait = true;
         }
-        this.argument.include(context, includeChildrenRecursively);
+        // Thenables need to be included
+        this.argument.includePath(THEN_PATH, context);
+    }
+    includePath(path, context) {
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        if (!this.included)
+            this.includeNode(context);
+        this.argument.includePath(path, context);
     }
 }
+const THEN_PATH = ['then'];
 
 const binaryOperators = {
     '!=': (left, right) => left != right,
@@ -11146,6 +11668,12 @@ class BinaryExpression extends NodeBase {
     hasEffectsOnInteractionAtPath(path, { type }) {
         return type !== INTERACTION_ACCESSED || path.length > 1;
     }
+    includeNode(context) {
+        this.included = true;
+        if (this.operator === 'in') {
+            this.right.includePath(UNKNOWN_PATH, context);
+        }
+    }
     removeAnnotations(code) {
         this.left.removeAnnotations(code);
     }
@@ -11154,6 +11682,7 @@ class BinaryExpression extends NodeBase {
         this.right.render(code, options);
     }
 }
+BinaryExpression.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class BreakStatement extends NodeBase {
     hasEffects(context) {
@@ -11173,7 +11702,7 @@ class BreakStatement extends NodeBase {
     include(context) {
         this.included = true;
         if (this.label) {
-            this.label.include();
+            this.label.include(context);
             context.includedLabels.add(this.label.name);
         }
         else {
@@ -11182,6 +11711,8 @@ class BreakStatement extends NodeBase {
         context.brokenFlow = true;
     }
 }
+BreakStatement.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+BreakStatement.prototype.applyDeoptimizations = doNotDeoptimize;
 
 function renderCallArguments(code, options, node) {
     if (node.arguments.length > 0) {
@@ -11368,10 +11899,14 @@ class CallExpression extends CallExpressionBase {
                 this.callee.hasEffectsOnInteractionAtPath(EMPTY_PATH, this.interaction, context)));
     }
     include(context, includeChildrenRecursively) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
+        if (!this.included)
+            this.includeNode(context);
         if (includeChildrenRecursively) {
-            super.include(context, includeChildrenRecursively);
+            this.callee.include(context, true);
+            for (const argument of this.arguments) {
+                argument.includePath(UNKNOWN_PATH, context);
+                argument.include(context, true);
+            }
             if (includeChildrenRecursively === INCLUDE_PARAMETERS &&
                 this.callee instanceof Identifier &&
                 this.callee.variable) {
@@ -11379,10 +11914,24 @@ class CallExpression extends CallExpressionBase {
             }
         }
         else {
-            this.included = true;
-            this.callee.include(context, false);
+            // If the callee is a member expression and does not have a variable, its
+            // object will already be included via the first argument of the
+            // interaction in includeCallArguments. Including it again can lead to
+            // severe performance problems.
+            if (this.callee instanceof MemberExpression && !this.callee.variable) {
+                this.callee.property.include(context, false);
+            }
+            else {
+                this.callee.include(context, false);
+            }
+            this.callee.includeCallArguments(context, this.interaction);
         }
-        this.callee.includeCallArguments(context, this.arguments);
+    }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        this.callee.includePath(UNKNOWN_PATH, context);
     }
     initialise() {
         super.initialise();
@@ -11421,13 +11970,14 @@ class CatchClause extends NodeBase {
         this.type = type;
         if (param) {
             this.param = new (this.scope.context.getNodeConstructor(param.type))(this, this.scope).parseNode(param);
-            this.param.declare('parameter', UNKNOWN_EXPRESSION);
+            this.param.declare('parameter', EMPTY_PATH, UNKNOWN_EXPRESSION);
         }
         this.body = new BlockStatement(this, this.scope.bodyScope).parseNode(body);
         return super.parseNode(esTreeNode);
     }
 }
 CatchClause.prototype.preventChildBlockScope = true;
+CatchClause.prototype.includeNode = onlyIncludeSelf;
 
 class ChainExpression extends NodeBase {
     // deoptimizations are not relevant as we are not caching values
@@ -11439,17 +11989,22 @@ class ChainExpression extends NodeBase {
     hasEffects(context) {
         return this.expression.hasEffectsAsChainElement(context) === true;
     }
+    includePath(path, context) {
+        this.included = true;
+        this.expression.includePath(path, context);
+    }
     removeAnnotations(code) {
         this.expression.removeAnnotations(code);
     }
-    applyDeoptimizations() { }
 }
+ChainExpression.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ChainExpression.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class ClassBodyScope extends ChildScope {
     constructor(parent, classNode) {
         const { context } = parent;
         super(parent, context);
-        this.variables.set('this', (this.thisVariable = new LocalVariable('this', null, classNode, context, 'other')));
+        this.variables.set('this', (this.thisVariable = new LocalVariable('this', null, classNode, EMPTY_PATH, context, 'other')));
         this.instanceScope = new ChildScope(this, context);
         this.instanceScope.variables.set('this', new ThisVariable(context));
     }
@@ -11464,7 +12019,7 @@ class ClassBody extends NodeBase {
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
-        this.scope.context.includeVariableInModule(this.scope.thisVariable);
+        this.scope.context.includeVariableInModule(this.scope.thisVariable, UNKNOWN_PATH, context);
         for (const definition of this.body) {
             definition.include(context, includeChildrenRecursively);
         }
@@ -11477,8 +12032,9 @@ class ClassBody extends NodeBase {
         }
         return super.parseNode(esTreeNode);
     }
-    applyDeoptimizations() { }
 }
+ClassBody.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ClassBody.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class ClassExpression extends ClassNode {
     render(code, options, { renderedSurroundingElement } = BLANK) {
@@ -11549,6 +12105,9 @@ class ConditionalExpression extends NodeBase {
             const unusedBranch = this.usedBranch === this.consequent ? this.alternate : this.consequent;
             this.usedBranch = null;
             unusedBranch.deoptimizePath(UNKNOWN_PATH);
+            if (this.included) {
+                unusedBranch.includePath(UNKNOWN_PATH, createInclusionContext());
+            }
             const { expressionsToBeDeoptimized } = this;
             this.expressionsToBeDeoptimized = EMPTY_ARRAY;
             for (const expression of expressionsToBeDeoptimized) {
@@ -11606,7 +12165,7 @@ class ConditionalExpression extends NodeBase {
     include(context, includeChildrenRecursively) {
         this.included = true;
         const usedBranch = this.getUsedBranch();
-        if (includeChildrenRecursively || this.test.shouldBeIncluded(context) || usedBranch === null) {
+        if (usedBranch === null || includeChildrenRecursively || this.test.shouldBeIncluded(context)) {
             this.test.include(context, includeChildrenRecursively);
             this.consequent.include(context, includeChildrenRecursively);
             this.alternate.include(context, includeChildrenRecursively);
@@ -11615,27 +12174,38 @@ class ConditionalExpression extends NodeBase {
             usedBranch.include(context, includeChildrenRecursively);
         }
     }
-    includeCallArguments(context, parameters) {
+    includePath(path, context) {
+        this.included = true;
+        const usedBranch = this.getUsedBranch();
+        if (usedBranch === null || this.test.shouldBeIncluded(context)) {
+            this.consequent.includePath(path, context);
+            this.alternate.includePath(path, context);
+        }
+        else {
+            usedBranch.includePath(path, context);
+        }
+    }
+    includeCallArguments(context, interaction) {
         const usedBranch = this.getUsedBranch();
         if (usedBranch) {
-            usedBranch.includeCallArguments(context, parameters);
+            usedBranch.includeCallArguments(context, interaction);
         }
         else {
-            this.consequent.includeCallArguments(context, parameters);
-            this.alternate.includeCallArguments(context, parameters);
+            this.consequent.includeCallArguments(context, interaction);
+            this.alternate.includeCallArguments(context, interaction);
         }
     }
     removeAnnotations(code) {
         this.test.removeAnnotations(code);
     }
     render(code, options, { isCalleeOfRenderedParent, preventASI, renderedParentType, renderedSurroundingElement } = BLANK) {
-        const usedBranch = this.getUsedBranch();
         if (this.test.included) {
             this.test.render(code, options, { renderedSurroundingElement });
             this.consequent.render(code, options);
             this.alternate.render(code, options);
         }
         else {
+            const usedBranch = this.getUsedBranch();
             const colonPos = findFirstOccurrenceOutsideComment(code.original, ':', this.consequent.end);
             const inclusionStart = findNonWhiteSpace(code.original, (this.consequent.included
                 ? findFirstOccurrenceOutsideComment(code.original, '?', this.test.end)
@@ -11667,6 +12237,8 @@ class ConditionalExpression extends NodeBase {
             : (this.usedBranch = testValue ? this.consequent : this.alternate);
     }
 }
+ConditionalExpression.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ConditionalExpression.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class ContinueStatement extends NodeBase {
     hasEffects(context) {
@@ -11686,7 +12258,7 @@ class ContinueStatement extends NodeBase {
     include(context) {
         this.included = true;
         if (this.label) {
-            this.label.include();
+            this.label.include(context);
             context.includedLabels.add(this.label.name);
         }
         else {
@@ -11695,12 +12267,15 @@ class ContinueStatement extends NodeBase {
         context.brokenFlow = true;
     }
 }
+ContinueStatement.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ContinueStatement.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class DebuggerStatement extends NodeBase {
     hasEffects() {
         return true;
     }
 }
+DebuggerStatement.prototype.includeNode = onlyIncludeSelf;
 
 class Decorator extends NodeBase {
     hasEffects(context) {
@@ -11708,6 +12283,7 @@ class Decorator extends NodeBase {
             this.expression.hasEffectsOnInteractionAtPath(EMPTY_PATH, NODE_INTERACTION_UNKNOWN_CALL, context));
     }
 }
+Decorator.prototype.includeNode = onlyIncludeSelf;
 
 function hasLoopBodyEffects(context, body) {
     const { brokenFlow, hasBreak, hasContinue, ignore } = context;
@@ -11747,12 +12323,15 @@ class DoWhileStatement extends NodeBase {
         includeLoopBody(context, this.body, includeChildrenRecursively);
     }
 }
+DoWhileStatement.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+DoWhileStatement.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class EmptyStatement extends NodeBase {
     hasEffects() {
         return false;
     }
 }
+EmptyStatement.prototype.includeNode = onlyIncludeSelf;
 
 class ExportAllDeclaration extends NodeBase {
     hasEffects() {
@@ -11765,9 +12344,10 @@ class ExportAllDeclaration extends NodeBase {
     render(code, _options, nodeRenderOptions) {
         code.remove(nodeRenderOptions.start, nodeRenderOptions.end);
     }
-    applyDeoptimizations() { }
 }
 ExportAllDeclaration.prototype.needsBoundaries = true;
+ExportAllDeclaration.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ExportAllDeclaration.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class ExportNamedDeclaration extends NodeBase {
     bind() {
@@ -11794,13 +12374,15 @@ class ExportNamedDeclaration extends NodeBase {
             this.declaration.render(code, options, { end, start });
         }
     }
-    applyDeoptimizations() { }
 }
 ExportNamedDeclaration.prototype.needsBoundaries = true;
+ExportNamedDeclaration.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ExportNamedDeclaration.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class ExportSpecifier extends NodeBase {
-    applyDeoptimizations() { }
 }
+ExportSpecifier.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ExportSpecifier.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class ForInStatement extends NodeBase {
     createScope(parentScope) {
@@ -11818,11 +12400,18 @@ class ForInStatement extends NodeBase {
         const { body, deoptimized, left, right } = this;
         if (!deoptimized)
             this.applyDeoptimizations();
-        this.included = true;
+        if (!this.included)
+            this.includeNode(context);
         left.includeAsAssignmentTarget(context, includeChildrenRecursively || true, false);
         right.include(context, includeChildrenRecursively);
         includeLoopBody(context, body, includeChildrenRecursively);
     }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        this.right.includePath(UNKNOWN_PATH, context);
+    }
     initialise() {
         super.initialise();
         this.left.setAssignedValue(UNKNOWN_EXPRESSION);
@@ -11863,11 +12452,18 @@ class ForOfStatement extends NodeBase {
         const { body, deoptimized, left, right } = this;
         if (!deoptimized)
             this.applyDeoptimizations();
-        this.included = true;
+        if (!this.included)
+            this.includeNode(context);
         left.includeAsAssignmentTarget(context, includeChildrenRecursively || true, false);
         right.include(context, includeChildrenRecursively);
         includeLoopBody(context, body, includeChildrenRecursively);
     }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        this.right.includePath(UNKNOWN_PATH, context);
+    }
     initialise() {
         super.initialise();
         this.left.setAssignedValue(UNKNOWN_EXPRESSION);
@@ -11903,7 +12499,9 @@ class ForStatement extends NodeBase {
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
-        this.init?.include(context, includeChildrenRecursively, { asSingleStatement: true });
+        this.init?.include(context, includeChildrenRecursively, {
+            asSingleStatement: true
+        });
         this.test?.include(context, includeChildrenRecursively);
         this.update?.include(context, includeChildrenRecursively);
         includeLoopBody(context, this.body, includeChildrenRecursively);
@@ -11915,6 +12513,8 @@ class ForStatement extends NodeBase {
         this.body.render(code, options);
     }
 }
+ForStatement.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ForStatement.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class FunctionExpression extends FunctionNode {
     createScope(parentScope) {
@@ -11946,9 +12546,9 @@ class TrackingScope extends BlockScope {
         super(...arguments);
         this.hoistedDeclarations = [];
     }
-    addDeclaration(identifier, context, init, kind) {
+    addDeclaration(identifier, context, init, destructuredInitPath, kind) {
         this.hoistedDeclarations.push(identifier);
-        return super.addDeclaration(identifier, context, init, kind);
+        return super.addDeclaration(identifier, context, init, destructuredInitPath, kind);
     }
 }
 
@@ -12047,7 +12647,6 @@ class IfStatement extends NodeBase {
         }
         this.renderHoistedDeclarations(hoistedDeclarations, code, getPropertyAccess);
     }
-    applyDeoptimizations() { }
     getTestValue() {
         if (this.testValue === unset) {
             return (this.testValue = tryCastLiteralValueToBoolean(this.test.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this)));
@@ -12116,6 +12715,8 @@ class IfStatement extends NodeBase {
         return false;
     }
 }
+IfStatement.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+IfStatement.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class ImportAttribute extends NodeBase {
 }
@@ -12133,13 +12734,15 @@ class ImportDeclaration extends NodeBase {
     render(code, _options, nodeRenderOptions) {
         code.remove(nodeRenderOptions.start, nodeRenderOptions.end);
     }
-    applyDeoptimizations() { }
 }
 ImportDeclaration.prototype.needsBoundaries = true;
+ImportDeclaration.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ImportDeclaration.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class ImportDefaultSpecifier extends NodeBase {
-    applyDeoptimizations() { }
 }
+ImportDefaultSpecifier.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ImportDefaultSpecifier.prototype.applyDeoptimizations = doNotDeoptimize;
 
 function isReassignedExportsMember(variable, exportNamesByVariable) {
     return (variable.renderBaseName !== null && exportNamesByVariable.has(variable) && variable.isReassigned);
@@ -12148,28 +12751,33 @@ function isReassignedExportsMember(variable, exportNamesByVariable) {
 class VariableDeclarator extends NodeBase {
     declareDeclarator(kind, isUsingDeclaration) {
         this.isUsingDeclaration = isUsingDeclaration;
-        this.id.declare(kind, this.init || UNDEFINED_EXPRESSION);
+        this.id.declare(kind, EMPTY_PATH, this.init || UNDEFINED_EXPRESSION);
     }
     deoptimizePath(path) {
         this.id.deoptimizePath(path);
     }
     hasEffects(context) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
         const initEffect = this.init?.hasEffects(context);
         this.id.markDeclarationReached();
-        return initEffect || this.id.hasEffects(context) || this.isUsingDeclaration;
+        return (initEffect ||
+            this.isUsingDeclaration ||
+            this.id.hasEffects(context) ||
+            (this.scope.context.options.treeshake
+                .propertyReadSideEffects &&
+                this.id.hasEffectsWhenDestructuring(context, EMPTY_PATH, this.init || UNDEFINED_EXPRESSION)));
     }
     include(context, includeChildrenRecursively) {
-        const { deoptimized, id, init } = this;
-        if (!deoptimized)
-            this.applyDeoptimizations();
-        this.included = true;
+        const { id, init } = this;
+        if (!this.included)
+            this.includeNode();
         init?.include(context, includeChildrenRecursively);
         id.markDeclarationReached();
-        if (includeChildrenRecursively || id.shouldBeIncluded(context)) {
+        if (includeChildrenRecursively) {
             id.include(context, includeChildrenRecursively);
         }
+        else {
+            id.includeDestructuredIfNecessary(context, EMPTY_PATH, init || UNDEFINED_EXPRESSION);
+        }
     }
     removeAnnotations(code) {
         this.init?.removeAnnotations(code);
@@ -12199,8 +12807,8 @@ class VariableDeclarator extends NodeBase {
             code.appendLeft(end, `${_}=${_}void 0`);
         }
     }
-    applyDeoptimizations() {
-        this.deoptimized = true;
+    includeNode() {
+        this.included = true;
         const { id, init } = this;
         if (init && id instanceof Identifier && init instanceof ClassExpression && !init.id) {
             const { name, variable } = id;
@@ -12212,11 +12820,14 @@ class VariableDeclarator extends NodeBase {
         }
     }
 }
+VariableDeclarator.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class ImportExpression extends NodeBase {
     constructor() {
         super(...arguments);
         this.inlineNamespace = null;
+        this.hasUnknownAccessedKey = false;
+        this.accessedPropKey = new Set();
         this.attributes = null;
         this.mechanism = null;
         this.namespaceExportName = undefined;
@@ -12249,12 +12860,15 @@ class ImportExpression extends NodeBase {
             if (parent2 instanceof ExpressionStatement) {
                 return EMPTY_ARRAY;
             }
-            // Case 1: const { foo } = await import('bar')
+            // Case 1: const { foo } / module = await import('bar')
             if (parent2 instanceof VariableDeclarator) {
                 const declaration = parent2.id;
-                return declaration instanceof ObjectPattern
-                    ? getDeterministicObjectDestructure(declaration)
-                    : undefined;
+                if (declaration instanceof Identifier) {
+                    return this.hasUnknownAccessedKey ? undefined : [...this.accessedPropKey];
+                }
+                if (declaration instanceof ObjectPattern) {
+                    return getDeterministicObjectDestructure(declaration);
+                }
             }
             // Case 2: (await import('bar')).foo
             if (parent2 instanceof MemberExpression) {
@@ -12304,13 +12918,30 @@ class ImportExpression extends NodeBase {
         return true;
     }
     include(context, includeChildrenRecursively) {
-        if (!this.included) {
-            this.included = true;
-            this.scope.context.includeDynamicImport(this);
-            this.scope.addAccessedDynamicImport(this);
-        }
+        if (!this.included)
+            this.includeNode();
         this.source.include(context, includeChildrenRecursively);
     }
+    includeNode() {
+        this.included = true;
+        this.scope.context.includeDynamicImport(this);
+        this.scope.addAccessedDynamicImport(this);
+    }
+    includePath(path) {
+        if (!this.included)
+            this.includeNode();
+        // Technically, this is not correct as dynamic imports return a Promise.
+        if (this.hasUnknownAccessedKey)
+            return;
+        if (path[0] === UnknownKey) {
+            this.hasUnknownAccessedKey = true;
+        }
+        else if (typeof path[0] === 'string') {
+            this.accessedPropKey.add(path[0]);
+        }
+        // Update included paths
+        this.scope.context.includeDynamicImport(this);
+    }
     initialise() {
         super.initialise();
         this.scope.context.addDynamicImport(this);
@@ -12379,7 +13010,6 @@ class ImportExpression extends NodeBase {
     setInternalResolution(inlineNamespace) {
         this.inlineNamespace = inlineNamespace;
     }
-    applyDeoptimizations() { }
     getDynamicImportMechanismAndHelper(resolution, exportMode, { compact, dynamicImportInCjs, format, generatedCode: { arrowFunctions }, interop }, { _, getDirectReturnFunction, getDirectReturnIifeLeft }, pluginDriver) {
         const mechanism = pluginDriver.hookFirstSync('renderDynamicImport', [
             {
@@ -12469,6 +13099,7 @@ class ImportExpression extends NodeBase {
         return { helper: null, mechanism: null };
     }
 }
+ImportExpression.prototype.applyDeoptimizations = doNotDeoptimize;
 function getInteropHelper(resolution, exportMode, interop) {
     return exportMode === 'external'
         ? namespaceInteropHelpersByInteropType[interop(resolution instanceof ExternalModule ? resolution.id : null)]
@@ -12492,12 +13123,14 @@ function getDeterministicObjectDestructure(objectPattern) {
 }
 
 class ImportNamespaceSpecifier extends NodeBase {
-    applyDeoptimizations() { }
 }
+ImportNamespaceSpecifier.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ImportNamespaceSpecifier.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class ImportSpecifier extends NodeBase {
-    applyDeoptimizations() { }
 }
+ImportSpecifier.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+ImportSpecifier.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class JSXIdentifier extends IdentifierBase {
     constructor() {
@@ -12514,6 +13147,29 @@ class JSXIdentifier extends IdentifierBase {
             this.isNativeElement = true;
         }
     }
+    include(context) {
+        if (!this.included)
+            this.includeNode(context);
+    }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        if (this.variable !== null) {
+            this.scope.context.includeVariableInModule(this.variable, EMPTY_PATH, context);
+        }
+    }
+    includePath(path, context) {
+        if (!this.included) {
+            this.included = true;
+            if (this.variable !== null) {
+                this.scope.context.includeVariableInModule(this.variable, path, context);
+            }
+        }
+        else if (path.length > 0) {
+            this.variable?.includePath(path, context);
+        }
+    }
     render(code, { snippets: { getPropertyAccess }, useOriginalName }) {
         if (this.variable) {
             const name = this.variable.getName(getPropertyAccess, useOriginalName);
@@ -12575,6 +13231,7 @@ class JSXAttribute extends NodeBase {
         }
     }
 }
+JSXAttribute.prototype.includeNode = onlyIncludeSelf;
 
 class JSXClosingBase extends NodeBase {
     render(code, options) {
@@ -12587,6 +13244,7 @@ class JSXClosingBase extends NodeBase {
         }
     }
 }
+JSXClosingBase.prototype.includeNode = onlyIncludeSelf;
 
 class JSXClosingElement extends JSXClosingBase {
 }
@@ -12607,8 +13265,15 @@ class JSXSpreadAttribute extends NodeBase {
 
 class JSXEmptyExpression extends NodeBase {
 }
+JSXEmptyExpression.prototype.includeNode = onlyIncludeSelf;
 
 class JSXExpressionContainer extends NodeBase {
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        this.expression.includePath(UNKNOWN_PATH, context);
+    }
     render(code, options) {
         const { mode } = this.scope.context.options.jsx;
         if (mode !== 'preserve') {
@@ -12629,7 +13294,7 @@ function getRenderedJsxChildren(children) {
     return renderedChildren;
 }
 
-function getAndIncludeFactoryVariable(factory, preserve, importSource, node) {
+function getAndIncludeFactoryVariable(factory, preserve, importSource, node, context) {
     const [baseName, nestedName] = factory.split('.');
     let factoryVariable;
     if (importSource) {
@@ -12637,7 +13302,7 @@ function getAndIncludeFactoryVariable(factory, preserve, importSource, node) {
         if (preserve) {
             // This pretends we are accessing an included global variable of the same name
             const globalVariable = node.scope.findGlobal(baseName);
-            globalVariable.include();
+            globalVariable.includePath(UNKNOWN_PATH, context);
             // This excludes this variable from renaming
             factoryVariable.globalName = baseName;
         }
@@ -12645,7 +13310,7 @@ function getAndIncludeFactoryVariable(factory, preserve, importSource, node) {
     else {
         factoryVariable = node.scope.findGlobal(baseName);
     }
-    node.scope.context.includeVariableInModule(factoryVariable);
+    node.scope.context.includeVariableInModule(factoryVariable, UNKNOWN_PATH, context);
     if (factoryVariable instanceof LocalVariable) {
         factoryVariable.consolidateInitializers();
         factoryVariable.addUsedPlace(node);
@@ -12668,16 +13333,20 @@ class JSXElementBase extends NodeBase {
         }
     }
     include(context, includeChildrenRecursively) {
-        if (!this.included) {
-            const { factory, importSource, mode } = this.jsxMode;
-            if (factory) {
-                this.factory = factory;
-                this.factoryVariable = getAndIncludeFactoryVariable(factory, mode === 'preserve', importSource, this);
-            }
+        if (!this.included)
+            this.includeNode(context);
+        for (const child of this.children) {
+            child.include(context, includeChildrenRecursively);
+        }
+    }
+    includeNode(context) {
+        this.included = true;
+        const { factory, importSource, mode } = this.jsxMode;
+        if (factory) {
+            this.factory = factory;
+            this.factoryVariable = getAndIncludeFactoryVariable(factory, mode === 'preserve', importSource, this, context);
         }
-        super.include(context, includeChildrenRecursively);
     }
-    applyDeoptimizations() { }
     getRenderingMode() {
         const jsx = this.scope.context.options.jsx;
         const { mode, factory, importSource } = jsx;
@@ -12715,8 +13384,14 @@ class JSXElementBase extends NodeBase {
         return { childrenEnd, firstChild, hasMultipleChildren };
     }
 }
+JSXElementBase.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class JSXElement extends JSXElementBase {
+    include(context, includeChildrenRecursively) {
+        super.include(context, includeChildrenRecursively);
+        this.openingElement.include(context, includeChildrenRecursively);
+        this.closingElement?.include(context, includeChildrenRecursively);
+    }
     render(code, options) {
         switch (this.jsxMode.mode) {
             case 'classic': {
@@ -12868,6 +13543,11 @@ class JSXElement extends JSXElementBase {
 }
 
 class JSXFragment extends JSXElementBase {
+    include(context, includeChildrenRecursively) {
+        super.include(context, includeChildrenRecursively);
+        this.openingFragment.include(context, includeChildrenRecursively);
+        this.closingFragment.include(context, includeChildrenRecursively);
+    }
     render(code, options) {
         switch (this.jsxMode.mode) {
             case 'classic': {
@@ -12917,10 +13597,22 @@ class JSXFragment extends JSXElementBase {
 }
 
 class JSXMemberExpression extends NodeBase {
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        this.object.includePath([this.property.name], context);
+    }
+    includePath(path, context) {
+        if (!this.included)
+            this.includeNode(context);
+        this.object.includePath([this.property.name, ...path], context);
+    }
 }
 
 class JSXNamespacedName extends NodeBase {
 }
+JSXNamespacedName.prototype.includeNode = onlyIncludeSelf;
 
 class JSXOpeningElement extends NodeBase {
     render(code, options, { jsxMode = this.scope.context.options.jsx.mode } = {}) {
@@ -12930,6 +13622,7 @@ class JSXOpeningElement extends NodeBase {
         }
     }
 }
+JSXOpeningElement.prototype.includeNode = onlyIncludeSelf;
 
 class JSXOpeningFragment extends NodeBase {
     constructor() {
@@ -12937,22 +13630,22 @@ class JSXOpeningFragment extends NodeBase {
         this.fragment = null;
         this.fragmentVariable = null;
     }
-    include(context, includeChildrenRecursively) {
-        if (!this.included) {
-            const jsx = this.scope.context.options.jsx;
-            if (jsx.mode === 'automatic') {
-                this.fragment = 'Fragment';
-                this.fragmentVariable = getAndIncludeFactoryVariable('Fragment', false, jsx.jsxImportSource, this);
-            }
-            else {
-                const { fragment, importSource, mode } = jsx;
-                if (fragment != null) {
-                    this.fragment = fragment;
-                    this.fragmentVariable = getAndIncludeFactoryVariable(fragment, mode === 'preserve', importSource, this);
-                }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        const jsx = this.scope.context.options.jsx;
+        if (jsx.mode === 'automatic') {
+            this.fragment = 'Fragment';
+            this.fragmentVariable = getAndIncludeFactoryVariable('Fragment', false, jsx.jsxImportSource, this, context);
+        }
+        else {
+            const { fragment, importSource, mode } = jsx;
+            if (fragment != null) {
+                this.fragment = fragment;
+                this.fragmentVariable = getAndIncludeFactoryVariable(fragment, mode === 'preserve', importSource, this, context);
             }
         }
-        super.include(context, includeChildrenRecursively);
     }
     render(code, options) {
         const { mode } = this.scope.context.options.jsx;
@@ -12989,6 +13682,7 @@ class JSXText extends NodeBase {
         }
     }
 }
+JSXText.prototype.includeNode = onlyIncludeSelf;
 
 class LabeledStatement extends NodeBase {
     hasEffects(context) {
@@ -13010,17 +13704,22 @@ class LabeledStatement extends NodeBase {
         return bodyHasEffects;
     }
     include(context, includeChildrenRecursively) {
-        this.included = true;
+        if (!this.included)
+            this.includeNode(context);
         const { brokenFlow, includedLabels } = context;
         context.includedLabels = new Set();
         this.body.include(context, includeChildrenRecursively);
         if (includeChildrenRecursively || context.includedLabels.has(this.label.name)) {
-            this.label.include();
+            this.label.include(context);
             context.includedLabels.delete(this.label.name);
             context.brokenFlow = brokenFlow;
         }
         context.includedLabels = new Set([...includedLabels, ...context.includedLabels]);
     }
+    includeNode(context) {
+        this.included = true;
+        this.body.includePath(UNKNOWN_PATH, context);
+    }
     render(code, options) {
         if (this.label.included) {
             this.label.render(code, options);
@@ -13031,6 +13730,7 @@ class LabeledStatement extends NodeBase {
         this.body.render(code, options);
     }
 }
+LabeledStatement.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class LogicalExpression extends NodeBase {
     constructor() {
@@ -13047,10 +13747,10 @@ class LogicalExpression extends NodeBase {
         this.flags = setFlag(this.flags, 65536 /* Flag.isBranchResolutionAnalysed */, value);
     }
     get hasDeoptimizedCache() {
-        return isFlagSet(this.flags, 16777216 /* Flag.hasDeoptimizedCache */);
+        return isFlagSet(this.flags, 33554432 /* Flag.hasDeoptimizedCache */);
     }
     set hasDeoptimizedCache(value) {
-        this.flags = setFlag(this.flags, 16777216 /* Flag.hasDeoptimizedCache */, value);
+        this.flags = setFlag(this.flags, 33554432 /* Flag.hasDeoptimizedCache */, value);
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         this.left.deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
@@ -13064,6 +13764,10 @@ class LogicalExpression extends NodeBase {
             const unusedBranch = this.usedBranch === this.left ? this.right : this.left;
             this.usedBranch = null;
             unusedBranch.deoptimizePath(UNKNOWN_PATH);
+            if (this.included) {
+                // As we are not tracking inclusions, we just include everything
+                unusedBranch.includePath(UNKNOWN_PATH, createInclusionContext());
+            }
         }
         const { scope: { context }, expressionsToBeDeoptimized } = this;
         this.expressionsToBeDeoptimized = EMPTY_ARRAY;
@@ -13110,16 +13814,17 @@ class LogicalExpression extends NodeBase {
     }
     getReturnExpressionWhenCalledAtPath(path, interaction, recursionTracker, origin) {
         const usedBranch = this.getUsedBranch();
-        if (!usedBranch)
-            return [
-                new MultiExpression([
-                    this.left.getReturnExpressionWhenCalledAtPath(path, interaction, recursionTracker, origin)[0],
-                    this.right.getReturnExpressionWhenCalledAtPath(path, interaction, recursionTracker, origin)[0]
-                ]),
-                false
-            ];
-        this.expressionsToBeDeoptimized.push(origin);
-        return usedBranch.getReturnExpressionWhenCalledAtPath(path, interaction, recursionTracker, origin);
+        if (usedBranch) {
+            this.expressionsToBeDeoptimized.push(origin);
+            return usedBranch.getReturnExpressionWhenCalledAtPath(path, interaction, recursionTracker, origin);
+        }
+        return [
+            new MultiExpression([
+                this.left.getReturnExpressionWhenCalledAtPath(path, interaction, recursionTracker, origin)[0],
+                this.right.getReturnExpressionWhenCalledAtPath(path, interaction, recursionTracker, origin)[0]
+            ]),
+            false
+        ];
     }
     hasEffects(context) {
         if (this.left.hasEffects(context)) {
@@ -13132,18 +13837,18 @@ class LogicalExpression extends NodeBase {
     }
     hasEffectsOnInteractionAtPath(path, interaction, context) {
         const usedBranch = this.getUsedBranch();
-        if (!usedBranch) {
-            return (this.left.hasEffectsOnInteractionAtPath(path, interaction, context) ||
-                this.right.hasEffectsOnInteractionAtPath(path, interaction, context));
+        if (usedBranch) {
+            return usedBranch.hasEffectsOnInteractionAtPath(path, interaction, context);
         }
-        return usedBranch.hasEffectsOnInteractionAtPath(path, interaction, context);
+        return (this.left.hasEffectsOnInteractionAtPath(path, interaction, context) ||
+            this.right.hasEffectsOnInteractionAtPath(path, interaction, context));
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
         const usedBranch = this.getUsedBranch();
         if (includeChildrenRecursively ||
-            (usedBranch === this.right && this.left.shouldBeIncluded(context)) ||
-            !usedBranch) {
+            !usedBranch ||
+            (usedBranch === this.right && this.left.shouldBeIncluded(context))) {
             this.left.include(context, includeChildrenRecursively);
             this.right.include(context, includeChildrenRecursively);
         }
@@ -13151,6 +13856,17 @@ class LogicalExpression extends NodeBase {
             usedBranch.include(context, includeChildrenRecursively);
         }
     }
+    includePath(path, context) {
+        this.included = true;
+        const usedBranch = this.getUsedBranch();
+        if (!usedBranch || (usedBranch === this.right && this.left.shouldBeIncluded(context))) {
+            this.left.includePath(path, context);
+            this.right.includePath(path, context);
+        }
+        else {
+            usedBranch.includePath(path, context);
+        }
+    }
     removeAnnotations(code) {
         this.left.removeAnnotations(code);
     }
@@ -13203,6 +13919,8 @@ class LogicalExpression extends NodeBase {
         return this.usedBranch;
     }
 }
+LogicalExpression.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+LogicalExpression.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class NewExpression extends NodeBase {
     hasEffects(context) {
@@ -13222,16 +13940,21 @@ class NewExpression extends NodeBase {
         return path.length > 0 || type !== INTERACTION_ACCESSED;
     }
     include(context, includeChildrenRecursively) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
         if (includeChildrenRecursively) {
             super.include(context, includeChildrenRecursively);
         }
         else {
-            this.included = true;
+            if (!this.included)
+                this.includeNode(context);
             this.callee.include(context, false);
         }
-        this.callee.includeCallArguments(context, this.arguments);
+        this.callee.includeCallArguments(context, this.interaction);
+    }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        this.callee.includePath(UNKNOWN_PATH, context);
     }
     initialise() {
         super.initialise();
@@ -13260,6 +13983,7 @@ class ObjectExpression extends NodeBase {
     constructor() {
         super(...arguments);
         this.objectEntity = null;
+        this.protoProp = null;
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         this.getObjectEntity().deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
@@ -13279,15 +14003,43 @@ class ObjectExpression extends NodeBase {
     hasEffectsOnInteractionAtPath(path, interaction, context) {
         return this.getObjectEntity().hasEffectsOnInteractionAtPath(path, interaction, context);
     }
+    include(context, includeChildrenRecursively) {
+        if (!this.included)
+            this.includeNode(context);
+        this.getObjectEntity().include(context, includeChildrenRecursively);
+        this.protoProp?.include(context, includeChildrenRecursively);
+    }
+    includeNode(context) {
+        this.included = true;
+        this.protoProp?.includePath(UNKNOWN_PATH, context);
+    }
+    includePath(path, context) {
+        if (!this.included)
+            this.includeNode(context);
+        this.getObjectEntity().includePath(path, context);
+    }
     render(code, options, { renderedSurroundingElement } = BLANK) {
-        super.render(code, options);
         if (renderedSurroundingElement === ExpressionStatement$1 ||
             renderedSurroundingElement === ArrowFunctionExpression$1) {
             code.appendRight(this.start, '(');
             code.prependLeft(this.end, ')');
         }
+        if (this.properties.length > 0) {
+            const separatedNodes = getCommaSeparatedNodesWithBoundaries(this.properties, code, this.start + 1, this.end - 1);
+            let lastSeparatorPos = null;
+            for (const { node, separator, start, end } of separatedNodes) {
+                if (!node.included) {
+                    treeshakeNode(node, code, start, end);
+                    continue;
+                }
+                lastSeparatorPos = separator;
+                node.render(code, options);
+            }
+            if (lastSeparatorPos) {
+                code.remove(lastSeparatorPos, this.end - 1);
+            }
+        }
     }
-    applyDeoptimizations() { }
     getObjectEntity() {
         if (this.objectEntity !== null) {
             return this.objectEntity;
@@ -13316,6 +14068,7 @@ class ObjectExpression extends NodeBase {
                         ? property.key.name
                         : String(property.key.value);
                 if (key === '__proto__' && property.kind === 'init') {
+                    this.protoProp = property;
                     prototype =
                         property.value instanceof Literal && property.value.value === null
                             ? null
@@ -13328,6 +14081,7 @@ class ObjectExpression extends NodeBase {
         return (this.objectEntity = new ObjectEntity(properties, prototype));
     }
 }
+ObjectExpression.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class PanicError extends NodeBase {
     initialise() {
@@ -13354,6 +14108,7 @@ class ParseError extends NodeBase {
 
 class PrivateIdentifier extends NodeBase {
 }
+PrivateIdentifier.prototype.includeNode = onlyIncludeSelf;
 
 class Program extends NodeBase {
     constructor() {
@@ -13421,14 +14176,11 @@ class Program extends NodeBase {
             super.render(code, options);
         }
     }
-    applyDeoptimizations() { }
 }
+Program.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+Program.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class Property extends MethodBase {
-    constructor() {
-        super(...arguments);
-        this.declarationInit = null;
-    }
     //declare method: boolean;
     get method() {
         return isFlagSet(this.flags, 262144 /* Flag.method */);
@@ -13443,17 +14195,41 @@ class Property extends MethodBase {
     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);
+    declare(kind, destructuredInitPath, init) {
+        return this.value.declare(kind, this.getPathInProperty(destructuredInitPath), init);
+    }
+    deoptimizeAssignment(destructuredInitPath, init) {
+        this.value.deoptimizeAssignment?.(this.getPathInProperty(destructuredInitPath), init);
     }
     hasEffects(context) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
-        const propertyReadSideEffects = this.scope.context.options.treeshake.propertyReadSideEffects;
-        return ((this.parent.type === 'ObjectPattern' && propertyReadSideEffects === 'always') ||
-            this.key.hasEffects(context) ||
-            this.value.hasEffects(context));
+        return this.key.hasEffects(context) || this.value.hasEffects(context);
+    }
+    hasEffectsWhenDestructuring(context, destructuredInitPath, init) {
+        return this.value.hasEffectsWhenDestructuring?.(context, this.getPathInProperty(destructuredInitPath), init);
+    }
+    includeDestructuredIfNecessary(context, destructuredInitPath, init) {
+        const path = this.getPathInProperty(destructuredInitPath);
+        let included = this.value.includeDestructuredIfNecessary(context, path, init) ||
+            this.included;
+        if ((included ||= this.key.hasEffects(createHasEffectsContext()))) {
+            this.key.include(context, false);
+            if (!this.value.included) {
+                this.value.included = true;
+                // Unfortunately, we need to include the value again now, so that any
+                // declared variables are properly included.
+                this.value.includeDestructuredIfNecessary(context, path, init);
+            }
+        }
+        return (this.included = included);
+    }
+    include(context, includeChildrenRecursively) {
+        this.included = true;
+        this.key.include(context, includeChildrenRecursively);
+        this.value.include(context, includeChildrenRecursively);
+    }
+    includePath(path, context) {
+        this.included = true;
+        this.value.includePath(path, context);
     }
     markDeclarationReached() {
         this.value.markDeclarationReached();
@@ -13464,14 +14240,20 @@ class Property extends MethodBase {
         }
         this.value.render(code, options, { isShorthandProperty: this.shorthand });
     }
-    applyDeoptimizations() {
-        this.deoptimized = true;
-        if (this.declarationInit !== null) {
-            this.declarationInit.deoptimizePath([UnknownKey, UnknownKey]);
-            this.scope.context.requestTreeshakingPass();
-        }
+    getPathInProperty(destructuredInitPath) {
+        return destructuredInitPath.at(-1) === UnknownKey
+            ? destructuredInitPath
+            : // For now, we only consider static paths as we do not know how to
+                // deoptimize the path in the dynamic case.
+                this.computed
+                    ? [...destructuredInitPath, UnknownKey]
+                    : this.key instanceof Identifier
+                        ? [...destructuredInitPath, this.key.name]
+                        : [...destructuredInitPath, String(this.key.value)];
     }
 }
+Property.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+Property.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class PropertyDefinition extends NodeBase {
     get computed() {
@@ -13504,8 +14286,15 @@ class PropertyDefinition extends NodeBase {
     hasEffectsOnInteractionAtPath(path, interaction, context) {
         return !this.value || this.value.hasEffectsOnInteractionAtPath(path, interaction, context);
     }
-    applyDeoptimizations() { }
+    includeNode(context) {
+        this.included = true;
+        this.value?.includePath(UNKNOWN_PATH, context);
+        for (const decorator of this.decorators) {
+            decorator.includePath(UNKNOWN_PATH, context);
+        }
+    }
 }
+PropertyDefinition.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class ReturnStatement extends NodeBase {
     hasEffects(context) {
@@ -13515,10 +14304,15 @@ class ReturnStatement extends NodeBase {
         return false;
     }
     include(context, includeChildrenRecursively) {
-        this.included = true;
+        if (!this.included)
+            this.includeNode(context);
         this.argument?.include(context, includeChildrenRecursively);
         context.brokenFlow = true;
     }
+    includeNode(context) {
+        this.included = true;
+        this.argument?.includePath(UNKNOWN_PATH, context);
+    }
     initialise() {
         super.initialise();
         this.scope.addReturnExpression(this.argument || UNKNOWN_EXPRESSION);
@@ -13532,6 +14326,7 @@ class ReturnStatement extends NodeBase {
         }
     }
 }
+ReturnStatement.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class SequenceExpression extends NodeBase {
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
@@ -13559,10 +14354,15 @@ class SequenceExpression extends NodeBase {
         for (const expression of this.expressions) {
             if (includeChildrenRecursively ||
                 (expression === lastExpression && !(this.parent instanceof ExpressionStatement)) ||
-                expression.shouldBeIncluded(context))
+                expression.shouldBeIncluded(context)) {
                 expression.include(context, includeChildrenRecursively);
+            }
         }
     }
+    includePath(path, context) {
+        this.included = true;
+        this.expressions[this.expressions.length - 1].includePath(path, context);
+    }
     removeAnnotations(code) {
         this.expressions[0].removeAnnotations(code);
     }
@@ -13597,6 +14397,8 @@ class SequenceExpression extends NodeBase {
         }
     }
 }
+SequenceExpression.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+SequenceExpression.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class Super extends NodeBase {
     bind() {
@@ -13608,11 +14410,15 @@ class Super extends NodeBase {
     deoptimizePath(path) {
         this.variable.deoptimizePath(path);
     }
-    include() {
-        if (!this.included) {
-            this.included = true;
-            this.scope.context.includeVariableInModule(this.variable);
-        }
+    include(context) {
+        if (!this.included)
+            this.includeNode(context);
+    }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        this.scope.context.includeVariableInModule(this.variable, EMPTY_PATH, context);
     }
 }
 
@@ -13653,6 +14459,8 @@ class SwitchCase extends NodeBase {
     }
 }
 SwitchCase.prototype.needsBoundaries = true;
+SwitchCase.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+SwitchCase.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class SwitchStatement extends NodeBase {
     createScope(parentScope) {
@@ -13735,6 +14543,8 @@ class SwitchStatement extends NodeBase {
         }
     }
 }
+SwitchStatement.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+SwitchStatement.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class TaggedTemplateExpression extends CallExpressionBase {
     bind() {
@@ -13758,8 +14568,8 @@ class TaggedTemplateExpression extends CallExpressionBase {
             this.tag.hasEffectsOnInteractionAtPath(EMPTY_PATH, this.interaction, context));
     }
     include(context, includeChildrenRecursively) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
+        if (!this.included)
+            this.includeNode(context);
         if (includeChildrenRecursively) {
             super.include(context, includeChildrenRecursively);
         }
@@ -13768,7 +14578,7 @@ class TaggedTemplateExpression extends CallExpressionBase {
             this.tag.include(context, includeChildrenRecursively);
             this.quasi.include(context, includeChildrenRecursively);
         }
-        this.tag.includeCallArguments(context, this.args);
+        this.tag.includeCallArguments(context, this.interaction);
         const [returnExpression] = this.getReturnExpression();
         if (!returnExpression.included) {
             returnExpression.include(context, false);
@@ -13803,6 +14613,7 @@ class TaggedTemplateExpression extends CallExpressionBase {
         return this.returnExpression;
     }
 }
+TaggedTemplateExpression.prototype.includeNode = onlyIncludeSelf;
 
 class TemplateElement extends NodeBase {
     get tail() {
@@ -13816,15 +14627,13 @@ class TemplateElement extends NodeBase {
     hasEffects() {
         return false;
     }
-    include() {
-        this.included = true;
-    }
     parseNode(esTreeNode) {
         this.value = esTreeNode.value;
         return super.parseNode(esTreeNode);
     }
     render() { }
 }
+TemplateElement.prototype.includeNode = onlyIncludeSelf;
 
 class TemplateLiteral extends NodeBase {
     deoptimizeArgumentsOnInteractionAtPath() { }
@@ -13849,6 +14658,14 @@ class TemplateLiteral extends NodeBase {
         }
         return true;
     }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        for (const node of this.expressions) {
+            node.includePath(UNKNOWN_PATH, context);
+        }
+    }
     render(code, options) {
         code.indentExclusionRanges.push([this.start, this.end]);
         super.render(code, options);
@@ -13858,13 +14675,13 @@ class TemplateLiteral extends NodeBase {
 class ModuleScope extends ChildScope {
     constructor(parent, context) {
         super(parent, context);
-        this.variables.set('this', new LocalVariable('this', null, UNDEFINED_EXPRESSION, context, 'other'));
+        this.variables.set('this', new LocalVariable('this', null, UNDEFINED_EXPRESSION, EMPTY_PATH, context, 'other'));
     }
-    addDeclaration(identifier, context, init, kind) {
+    addDeclaration(identifier, context, init, destructuredInitPath, kind) {
         if (this.context.module.importDescriptions.has(identifier.name)) {
             context.error(logRedeclarationError(identifier.name), identifier.start);
         }
-        return super.addDeclaration(identifier, context, init, kind);
+        return super.addDeclaration(identifier, context, init, destructuredInitPath, kind);
     }
     addExportDefaultDeclaration(name, exportDefaultDeclaration, context) {
         const variable = new ExportDefaultVariable(name, exportDefaultDeclaration, context);
@@ -13909,10 +14726,23 @@ class ThisExpression extends NodeBase {
         }
         return this.variable.hasEffectsOnInteractionAtPath(path, interaction, context);
     }
-    include() {
+    include(context) {
+        if (!this.included)
+            this.includeNode(context);
+    }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        this.scope.context.includeVariableInModule(this.variable, EMPTY_PATH, context);
+    }
+    includePath(path, context) {
         if (!this.included) {
             this.included = true;
-            this.scope.context.includeVariableInModule(this.variable);
+            this.scope.context.includeVariableInModule(this.variable, path, context);
+        }
+        else if (path.length > 0) {
+            this.variable.includePath(path, context);
         }
     }
     initialise() {
@@ -13940,7 +14770,8 @@ class ThrowStatement extends NodeBase {
         return true;
     }
     include(context, includeChildrenRecursively) {
-        this.included = true;
+        if (!this.included)
+            this.includeNode(context);
         this.argument.include(context, includeChildrenRecursively);
         context.brokenFlow = true;
     }
@@ -13951,6 +14782,7 @@ class ThrowStatement extends NodeBase {
         }
     }
 }
+ThrowStatement.prototype.includeNode = onlyIncludeSelf;
 
 class TryStatement extends NodeBase {
     constructor() {
@@ -13987,6 +14819,8 @@ class TryStatement extends NodeBase {
         this.finalizer?.include(context, includeChildrenRecursively);
     }
 }
+TryStatement.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+TryStatement.prototype.applyDeoptimizations = doNotDeoptimize;
 
 const unaryOperators = {
     '!': value => !value,
@@ -14102,6 +14936,7 @@ function getSimplifiedNumber(value) {
     const stringifiedValue = String(value).replace('+', '');
     return finalizedExp.length < stringifiedValue.length ? finalizedExp : stringifiedValue;
 }
+UnaryExpression.prototype.includeNode = onlyIncludeSelf;
 
 class UpdateExpression extends NodeBase {
     hasEffects(context) {
@@ -14113,9 +14948,8 @@ class UpdateExpression extends NodeBase {
         return path.length > 1 || type !== INTERACTION_ACCESSED;
     }
     include(context, includeChildrenRecursively) {
-        if (!this.deoptimized)
-            this.applyDeoptimizations();
-        this.included = true;
+        if (!this.included)
+            this.includeNode(context);
         this.argument.includeAsAssignmentTarget(context, includeChildrenRecursively, true);
     }
     initialise() {
@@ -14154,6 +14988,7 @@ class UpdateExpression extends NodeBase {
         this.scope.context.requestTreeshakingPass();
     }
 }
+UpdateExpression.prototype.includeNode = onlyIncludeSelf;
 
 function areAllDeclarationsIncludedAndNotExported(declarations, exportNamesByVariable) {
     for (const declarator of declarations) {
@@ -14184,8 +15019,9 @@ class VariableDeclaration extends NodeBase {
     include(context, includeChildrenRecursively, { asSingleStatement } = BLANK) {
         this.included = true;
         for (const declarator of this.declarations) {
-            if (includeChildrenRecursively || declarator.shouldBeIncluded(context))
+            if (includeChildrenRecursively || declarator.shouldBeIncluded(context)) {
                 declarator.include(context, includeChildrenRecursively);
+            }
             const { id, init } = declarator;
             if (asSingleStatement) {
                 id.include(context, includeChildrenRecursively);
@@ -14223,7 +15059,6 @@ class VariableDeclaration extends NodeBase {
             this.renderReplacedDeclarations(code, options);
         }
     }
-    applyDeoptimizations() { }
     renderDeclarationEnd(code, separatorString, lastSeparatorPos, actualContentEnd, renderedContentEnd, systemPatternExports, options) {
         if (code.original.charCodeAt(this.end - 1) === 59 /*";"*/) {
             code.remove(this.end - 1, this.end);
@@ -14266,8 +15101,7 @@ class VariableDeclaration extends NodeBase {
         const singleSystemExport = gatherSystemExportsAndGetSingleExport(separatedNodes, options, aggregatedSystemExports);
         for (const { node, start, separator, contentEnd, end } of separatedNodes) {
             if (!node.included) {
-                code.remove(start, end);
-                node.removeAnnotations(code);
+                treeshakeNode(node, code, start, end);
                 continue;
             }
             node.render(code, options);
@@ -14337,6 +15171,8 @@ function gatherSystemExportsAndGetSingleExport(separatedNodes, options, aggregat
     }
     return singleSystemExport;
 }
+VariableDeclaration.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+VariableDeclaration.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class WhileStatement extends NodeBase {
     hasEffects(context) {
@@ -14350,13 +15186,25 @@ class WhileStatement extends NodeBase {
         includeLoopBody(context, this.body, includeChildrenRecursively);
     }
 }
+WhileStatement.prototype.includeNode = onlyIncludeSelfNoDeoptimize;
+WhileStatement.prototype.applyDeoptimizations = doNotDeoptimize;
 
 class YieldExpression extends NodeBase {
+    applyDeoptimizations() {
+        this.deoptimized = true;
+        this.argument?.deoptimizePath(UNKNOWN_PATH);
+    }
     hasEffects(context) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
         return !(context.ignore.returnYield && !this.argument?.hasEffects(context));
     }
+    includeNode(context) {
+        this.included = true;
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
+        this.argument?.includePath(UNKNOWN_PATH, context);
+    }
     render(code, options) {
         if (this.argument) {
             this.argument.render(code, options, { preventASI: true });
@@ -14590,7 +15438,7 @@ const bufferParsers = [
         const annotations = (node.annotations = convertAnnotations(buffer[position + 1], buffer));
         node.annotationNoSideEffects = annotations.some(comment => comment.type === 'noSideEffects');
         const parameters = (node.params = convertNodeList(node, scope, buffer[position + 2], buffer));
-        scope.addParameterVariables(parameters.map(parameter => parameter.declare('parameter', UNKNOWN_EXPRESSION)), parameters[parameters.length - 1] instanceof RestElement);
+        scope.addParameterVariables(parameters.map(parameter => parameter.declare('parameter', EMPTY_PATH, UNKNOWN_EXPRESSION)), parameters[parameters.length - 1] instanceof RestElement);
         node.body = convertNode(node, scope.bodyScope, buffer[position + 3], buffer);
     },
     function assignmentExpression(node, position, buffer) {
@@ -14636,7 +15484,7 @@ const bufferParsers = [
         const parameterPosition = buffer[position];
         const parameter = (node.param =
             parameterPosition === 0 ? null : convertNode(node, scope, parameterPosition, buffer));
-        parameter?.declare('parameter', UNKNOWN_EXPRESSION);
+        parameter?.declare('parameter', EMPTY_PATH, UNKNOWN_EXPRESSION);
         node.body = convertNode(node, scope.bodyScope, buffer[position + 1], buffer);
     },
     function chainExpression(node, position, buffer) {
@@ -14774,7 +15622,7 @@ const bufferParsers = [
         node.id =
             idPosition === 0 ? null : convertNode(node, scope.parent, idPosition, buffer);
         const parameters = (node.params = convertNodeList(node, scope, buffer[position + 3], buffer));
-        scope.addParameterVariables(parameters.map(parameter => parameter.declare('parameter', UNKNOWN_EXPRESSION)), parameters[parameters.length - 1] instanceof RestElement);
+        scope.addParameterVariables(parameters.map(parameter => parameter.declare('parameter', EMPTY_PATH, UNKNOWN_EXPRESSION)), parameters[parameters.length - 1] instanceof RestElement);
         node.body = convertNode(node, scope.bodyScope, buffer[position + 4], buffer);
     },
     function functionExpression(node, position, buffer) {
@@ -14787,7 +15635,7 @@ const bufferParsers = [
         const idPosition = buffer[position + 2];
         node.id = idPosition === 0 ? null : convertNode(node, node.idScope, idPosition, buffer);
         const parameters = (node.params = convertNodeList(node, scope, buffer[position + 3], buffer));
-        scope.addParameterVariables(parameters.map(parameter => parameter.declare('parameter', UNKNOWN_EXPRESSION)), parameters[parameters.length - 1] instanceof RestElement);
+        scope.addParameterVariables(parameters.map(parameter => parameter.declare('parameter', EMPTY_PATH, UNKNOWN_EXPRESSION)), parameters[parameters.length - 1] instanceof RestElement);
         node.body = convertNode(node, scope.bodyScope, buffer[position + 4], buffer);
     },
     function identifier(node, position, buffer) {
@@ -15251,8 +16099,8 @@ class ExportShimVariable extends Variable {
         super(MISSING_EXPORT_SHIM_VARIABLE);
         this.module = module;
     }
-    include() {
-        super.include();
+    includePath(path, context) {
+        super.includePath(path, context);
         this.module.needsExportShim = true;
     }
 }
@@ -15950,16 +16798,15 @@ class Module {
             markModuleAndImpureDependenciesAsExecuted(this);
             this.graph.needsTreeshakingPass = true;
         }
+        const inclusionContext = createInclusionContext();
         for (const exportName of this.exports.keys()) {
             if (includeNamespaceMembers || exportName !== this.info.syntheticNamedExports) {
                 const variable = this.getVariableForExportName(exportName)[0];
                 if (!variable) {
                     return error(logMissingEntryExport(exportName, this.id));
                 }
+                this.includeVariable(variable, UNKNOWN_PATH, inclusionContext);
                 variable.deoptimizePath(UNKNOWN_PATH);
-                if (!variable.included) {
-                    this.includeVariable(variable);
-                }
             }
         }
         for (const name of this.getReexports()) {
@@ -15967,7 +16814,7 @@ class Module {
             if (variable) {
                 variable.deoptimizePath(UNKNOWN_PATH);
                 if (!variable.included) {
-                    this.includeVariable(variable);
+                    this.includeVariable(variable, UNKNOWN_PATH, inclusionContext);
                 }
                 if (variable instanceof ExternalVariable) {
                     variable.module.reexported = true;
@@ -15988,13 +16835,12 @@ class Module {
             this.graph.needsTreeshakingPass = true;
         }
         let includeNamespaceMembers = false;
+        const inclusionContext = createInclusionContext();
         for (const name of names) {
             const variable = this.getVariableForExportName(name)[0];
             if (variable) {
                 variable.deoptimizePath(UNKNOWN_PATH);
-                if (!variable.included) {
-                    this.includeVariable(variable);
-                }
+                this.includeVariable(variable, UNKNOWN_PATH, inclusionContext);
             }
             if (!this.exports.has(name) && !this.reexportDescriptions.has(name)) {
                 includeNamespaceMembers = true;
@@ -16095,6 +16941,7 @@ class Module {
             manualPureFunctions: this.graph.pureFunctions,
             module: this,
             moduleContext: this.context,
+            newlyIncludedVariableInits: this.graph.newlyIncludedVariableInits,
             options: this.options,
             requestTreeshakingPass: () => (this.graph.needsTreeshakingPass = true),
             traceExport: (name) => this.getVariableForExportName(name)[0],
@@ -16435,13 +17282,13 @@ class Module {
         for (const module of [this, ...this.exportAllModules]) {
             if (module instanceof ExternalModule) {
                 const [externalVariable] = module.getVariableForExportName('*');
-                externalVariable.include();
+                externalVariable.includePath(UNKNOWN_PATH, createInclusionContext());
                 this.includedImports.add(externalVariable);
                 externalNamespaces.add(externalVariable);
             }
             else if (module.info.syntheticNamedExports) {
                 const syntheticNamespace = module.getSyntheticNamespace();
-                syntheticNamespace.include();
+                syntheticNamespace.includePath(UNKNOWN_PATH, createInclusionContext());
                 this.includedImports.add(syntheticNamespace);
                 syntheticNamespaces.add(syntheticNamespace);
             }
@@ -16451,7 +17298,9 @@ class Module {
     includeDynamicImport(node) {
         const resolution = this.dynamicImports.find(dynamicImport => dynamicImport.node === node).resolution;
         if (resolution instanceof Module) {
-            resolution.includedDynamicImporters.push(this);
+            if (!resolution.includedDynamicImporters.includes(this)) {
+                resolution.includedDynamicImporters.push(this);
+            }
             const importedNames = this.options.treeshake
                 ? node.getDeterministicImportedNames()
                 : undefined;
@@ -16463,15 +17312,15 @@ class Module {
             }
         }
     }
-    includeVariable(variable) {
-        const variableModule = variable.module;
-        if (variable.included) {
+    includeVariable(variable, path, context) {
+        const { included, module: variableModule } = variable;
+        variable.includePath(path, context);
+        if (included) {
             if (variableModule instanceof Module && variableModule !== this) {
                 getAndExtendSideEffectModules(variable, this);
             }
         }
         else {
-            variable.include();
             this.graph.needsTreeshakingPass = true;
             if (variableModule instanceof Module) {
                 if (!variableModule.isExecuted) {
@@ -16488,8 +17337,8 @@ class Module {
             }
         }
     }
-    includeVariableInModule(variable) {
-        this.includeVariable(variable);
+    includeVariableInModule(variable, path, context) {
+        this.includeVariable(variable, path, context);
         const variableModule = variable.module;
         if (variableModule && variableModule !== this) {
             this.includedImports.add(variable);
@@ -21097,10 +21946,11 @@ class Graph {
         this.options = options;
         this.astLru = flru(5);
         this.cachedModules = new Map();
-        this.deoptimizationTracker = new PathTracker();
+        this.deoptimizationTracker = new EntityPathTracker();
         this.entryModules = [];
         this.modulesById = new Map();
         this.needsTreeshakingPass = false;
+        this.newlyIncludedVariableInits = new Set();
         this.phase = BuildPhase.LOAD_AND_PARSE;
         this.scope = new GlobalScope();
         this.watchFiles = Object.create(null);
@@ -21194,6 +22044,7 @@ class Graph {
         }
         if (this.options.treeshake) {
             let treeshakingPass = 1;
+            this.newlyIncludedVariableInits.clear();
             do {
                 timeStart(`treeshaking pass ${treeshakingPass}`, 3);
                 this.needsTreeshakingPass = false;
@@ -21206,6 +22057,10 @@ class Graph {
                         else {
                             module.include();
                         }
+                        for (const entity of this.newlyIncludedVariableInits) {
+                            this.newlyIncludedVariableInits.delete(entity);
+                            entity.include(createInclusionContext(), false);
+                        }
                     }
                 }
                 if (treeshakingPass === 1) {
@@ -22078,7 +22933,7 @@ const pc = /*@__PURE__*/getDefaultExportFromCjs(picocolorsExports);
 
 // @see https://no-color.org
 // @see https://www.npmjs.com/package/chalk
-const { bold, cyan, dim, gray, green, red, underline, yellow } = pc.createColors(env.FORCE_COLOR !== '0' && !env.NO_COLOR);
+const { bold, cyan, dim, red} = pc.createColors(env.FORCE_COLOR !== '0' && !env.NO_COLOR);
 
 // log to stderr to keep `rollup main.js > bundle.js` from breaking
 const stderr = (...parameters) => process$1.stderr.write(`${parameters.join('')}\n`);