@rollup/wasm-node 4.24.2 → 4.25.0-0

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

@@ -1,22 +1,22 @@
 /*
   @license
-	Rollup.js v4.24.2
-	Sun, 27 Oct 2024 15:39:37 GMT - commit 32d0e7dae85121ac0850ec28576a10a6302f84a9
+	Rollup.js v4.25.0-0
+	Tue, 29 Oct 2024 06:14:37 GMT - commit b7fcaba12e863db516f39de74c1eacfe5329a5c3
 
 	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, 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, Property as Property$1, 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, CallExpression as CallExpression$1, ExportDefaultDeclaration as ExportDefaultDeclaration$1, EMPTY_ARRAY, LOGLEVEL_WARN, logUnusedExternalImports, ANNOTATION_KEY, INVALID_ANNOTATION_KEY, 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, Property as Property$1, 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, convertAnnotations, FIXED_STRINGS, convertNode as convertNode$1, getAstBuffer, logImportAttributeIsInvalid, logImportOptionsAreInvalid, logSyntheticNamedExportsNeedNamespaceExport, logCircularReexport, logMissingEntryExport, logInvalidFormatForTopLevelAwait, logDuplicateExportError, logInvalidSourcemapForError, augmentCodeLocation, logInconsistentImportAttributes, logMissingJsxExport, logNamespaceConflict, logAmbiguousExternalNamespaces, logShimmedExport, parseAst, TemplateLiteral as TemplateLiteral$1, Literal as Literal$1, logAddonNotGenerated, logIncompatibleExportOptionValue, logMixedExport, logFailedValidation, isPathFragment, getAliasName, logCyclicCrossChunkReexport, logUnexpectedNamedImport, isAbsolute as isAbsolute$1, relative as relative$1, logUnexpectedNamespaceReexport, logMissingGlobalName, logEmptyChunk, logOptimizeChunkStatus, logConflictingSourcemapSources, logSourcemapBroken, logInvalidOption, URL_OUTPUT_FORMAT, URL_OUTPUT_DIR, URL_OUTPUT_SOURCEMAPFILE, URL_OUTPUT_AMD_ID, logCannotAssignModuleToChunk, logChunkInvalid, logAnonymousPluginCache, logDuplicatePluginName, LOGLEVEL_ERROR, logLevelPriority, LOGLEVEL_DEBUG, printQuotedStringList, logUnknownOption, logNoTransformMapOrAstWithoutCode, logInvalidSetAssetSourceCall, logPluginError, relativeId, logBadLoader, logExternalModulesCannotBeTransformedToModules, logInternalIdCannotBeExternal, isRelative, logUnresolvedImport, logUnresolvedImportTreatedAsExternal, logExternalSyntheticExports, logUnresolvedEntry, logUnresolvedImplicitDependant, logExternalModulesCannotBeIncludedInManualChunks, logEntryCannotBeExternal, logImplicitDependantCannotBeExternal, logNoAssetSourceSet, logFileReferenceIdNotFoundForFilename, logChunkNotGeneratedForFileName, logAssetNotFinalisedForFileName, logAssetReferenceIdNotFoundForSetSource, logAssetSourceAlreadySet, logFileNameConflict, logInvalidRollupPhaseForChunkEmission, warnDeprecation, URL_GENERATEBUNDLE, logInvalidLogPosition, logInvalidFunctionPluginHook, logInputHookInOutputPlugin, logInvalidAddonPluginHook, logImplicitDependantIsNotIncluded, logCircularDependency, augmentLogMessage, URL_TREESHAKE, URL_TREESHAKE_MODULESIDEEFFECTS, URL_JSX, URL_OUTPUT_INLINEDYNAMICIMPORTS, URL_PRESERVEENTRYSIGNATURES, URL_OUTPUT_GENERATEDCODE, URL_OUTPUT_EXTERNALIMPORTATTRIBUTES, isValidUrl, addTrailingSlashIfMissed, URL_OUTPUT_SOURCEMAPBASEURL, URL_OUTPUT_MANUALCHUNKS, logInvalidExportOptionValue, URL_OUTPUT_AMD_BASEPATH, URL_OUTPUT_INTEROP, logAlreadyClosed, logCannotEmitFromOptionsHook, logMissingFileOrDirOption, 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 { isAbsolute, win32, posix, resolve } from 'path';
+import { parseAsync, xxhashBase16, xxhashBase64Url, xxhashBase36 } from '../../native.js';
 import process$1, { env as env$1 } from 'node:process';
 import { performance } from 'node:perf_hooks';
 import { lstat, realpath, readdir, readFile, mkdir, writeFile } from 'node:fs/promises';
 import * as tty from 'tty';
 
-var version = "4.24.2";
+var version = "4.25.0-0";
 
 const comma = ','.charCodeAt(0);
 const semicolon = ';'.charCodeAt(0);
@@ -2038,7 +2038,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() }
@@ -2063,14 +2063,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, {
@@ -2080,9 +2080,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))
@@ -2091,6 +2091,55 @@ class DiscriminatedPathTracker {
         return false;
     }
 }
+const UNKNOWN_INCLUDED_PATH = Object.freeze({ [UnknownKey]: EMPTY_OBJECT });
+class IncludedPathTracker {
+    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;
+    }
+    includeAllPaths(entity, context, basePath) {
+        const { includedPaths } = this;
+        if (includedPaths) {
+            includeAllPaths(entity, context, basePath, includedPaths);
+        }
+    }
+}
+function includeAllPaths(entity, context, basePath, currentPaths) {
+    if (currentPaths[UnknownKey]) {
+        return entity.includePath([...basePath, UnknownKey], context, false);
+    }
+    const keys = Object.keys(currentPaths);
+    if (keys.length === 0) {
+        return entity.includePath(basePath, context, false);
+    }
+    for (const key of keys) {
+        includeAllPaths(entity, context, [...basePath, key], currentPaths[key]);
+    }
+}
 
 function isFlagSet(flags, flag) {
     return (flags & flag) !== 0;
@@ -2129,12 +2178,12 @@ class ExpressionEntity {
     hasEffectsOnInteractionAtPath(_path, _interaction, _context) {
         return true;
     }
-    include(_context, _includeChildrenRecursively, _options) {
+    includePath(_path, _context, _includeChildrenRecursively, _options) {
         this.included = true;
     }
-    includeCallArguments(context, parameters) {
-        for (const argument of parameters) {
-            argument.include(context, false);
+    includeCallArguments(context, interaction) {
+        for (const argument of interaction.args) {
+            argument?.includePath(UNKNOWN_PATH, context, false);
         }
     }
     shouldBeIncluded(_context) {
@@ -2249,9 +2298,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
@@ -2283,8 +2332,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;
     }
 }
@@ -2798,8 +2847,8 @@ function createInclusionContext() {
 }
 function createHasEffectsContext() {
     return {
-        accessed: new PathTracker(),
-        assigned: new PathTracker(),
+        accessed: new EntityPathTracker(),
+        assigned: new EntityPathTracker(),
         brokenFlow: false,
         called: new DiscriminatedPathTracker(),
         hasBreak: false,
@@ -2885,7 +2934,7 @@ class NodeBase extends ExpressionEntity {
         return (this.hasEffects(context) ||
             this.hasEffectsOnInteractionAtPath(EMPTY_PATH, this.assignmentInteraction, context));
     }
-    include(context, includeChildrenRecursively, _options) {
+    includePath(_path, context, includeChildrenRecursively, _options) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
         this.included = true;
@@ -2895,16 +2944,16 @@ class NodeBase extends ExpressionEntity {
                 continue;
             if (Array.isArray(value)) {
                 for (const child of value) {
-                    child?.include(context, includeChildrenRecursively);
+                    child?.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
                 }
             }
             else {
-                value.include(context, includeChildrenRecursively);
+                value.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
             }
         }
     }
     includeAsAssignmentTarget(context, includeChildrenRecursively, _deoptimizeAccess) {
-        this.include(context, includeChildrenRecursively);
+        this.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
     }
     /**
      * Override to perform special initialisation steps after the scope is
@@ -3155,6 +3204,7 @@ class ObjectEntity extends ExpressionEntity {
         this.unknownIntegerProps = [];
         this.unmatchableGetters = [];
         this.unmatchablePropertiesAndGetters = [];
+        this.unmatchablePropertiesAndSetters = [];
         this.unmatchableSetters = [];
         if (Array.isArray(properties)) {
             this.buildPropertyMaps(properties);
@@ -3389,9 +3439,37 @@ class ObjectEntity extends ExpressionEntity {
         }
         return false;
     }
+    includePath(path, context, includeChildrenRecursively) {
+        this.included = true;
+        const [key, ...subPath] = path;
+        if (key == null || includeChildrenRecursively) {
+            for (const property of this.allProperties) {
+                if (includeChildrenRecursively || property.shouldBeIncluded(context)) {
+                    property.includePath(EMPTY_PATH, context, includeChildrenRecursively);
+                }
+            }
+            this.prototypeExpression?.includePath(EMPTY_PATH, context, includeChildrenRecursively);
+        }
+        else {
+            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, includeChildrenRecursively);
+            }
+            this.prototypeExpression?.includePath(path, context, includeChildrenRecursively);
+        }
+    }
     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);
@@ -4727,16 +4805,20 @@ class GlobalVariable extends Variable {
 }
 
 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 IncludedPathTracker();
         this.expressionsToBeDeoptimized = [];
         this.declarations = declarator ? [declarator] : [];
         this.deoptimizationTracker = context.deoptimizationTracker;
         this.module = context.module;
-        this.kind = kind;
     }
     addDeclaration(identifier, init) {
         this.declarations.push(identifier);
@@ -4747,7 +4829,6 @@ class LocalVariable extends Variable {
             for (const initializer of this.additionalInitializers) {
                 initializer.deoptimizePath(UNKNOWN_PATH);
             }
-            this.additionalInitializers = null;
         }
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
@@ -4755,7 +4836,7 @@ class LocalVariable extends Variable {
             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 ||
@@ -4769,10 +4850,10 @@ 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([...this.initPath, ...path]);
         }
     }
     getLiteralValueAtPath(path, recursionTracker, origin) {
@@ -4781,7 +4862,7 @@ class LocalVariable extends Variable {
         }
         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) {
@@ -4790,7 +4871,7 @@ class LocalVariable extends Variable {
         }
         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) {
@@ -4799,7 +4880,7 @@ class LocalVariable extends Variable {
                 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)
@@ -4809,23 +4890,23 @@ 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)) {
+            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.includePath(EMPTY_PATH, 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
@@ -4836,17 +4917,26 @@ class LocalVariable extends Variable {
                     node = node.parent;
                 }
             }
+            // We need to make sure we include the correct path of the init
+            if (path.length > 0) {
+                this.init.includePath([...this.initPath, ...path], context, false);
+                this.additionalInitializers?.forEach(initializer => initializer.includePath(UNKNOWN_PATH, context, false));
+            }
         }
     }
-    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) {
+                argument?.includePath(UNKNOWN_PATH, context, false);
             }
         }
         else {
             context.includedCallArguments.add(this.init);
-            this.init.includeCallArguments(context, parameters);
+            this.init.includeCallArguments(context, interaction);
             context.includedCallArguments.delete(this.init);
         }
     }
@@ -4926,18 +5016,21 @@ class IdentifierBase extends NodeBase {
             }
         }
     }
-    include() {
+    includePath(path, context) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
         if (!this.included) {
             this.included = true;
             if (this.variable !== null) {
-                this.scope.context.includeVariableInModule(this.variable);
+                this.scope.context.includeVariableInModule(this.variable, path);
             }
         }
+        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
@@ -5037,39 +5130,17 @@ class Identifier extends IdentifierBase {
             this.isVariableReference = true;
         }
     }
-    declare(kind, init) {
+    declare(kind, includedInitPath, 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}.`);
+        if (kind === 'parameter') {
+            variable = this.scope.addParameterDeclaration(this, includedInitPath);
+        }
+        else {
+            variable = this.scope.addDeclaration(this, this.scope.context, init, includedInitPath, 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)];
@@ -5138,18 +5209,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, includedInitPath, 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, includedInitPath, context, kind);
         this.variables.set(name, newVariable);
         return newVariable;
     }
@@ -5351,7 +5421,7 @@ class BlockScope extends ChildScope {
     constructor(parent) {
         super(parent, parent.context);
     }
-    addDeclaration(identifier, context, init, kind) {
+    addDeclaration(identifier, context, init, includedInitPath, kind) {
         if (kind === 'var') {
             const name = identifier.name;
             const existingVariable = this.hoistedVariables?.get(name) || this.variables.get(name);
@@ -5363,7 +5433,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, includedInitPath, kind);
             // Necessary to make sure the init is deoptimized for conditional declarations.
             // We cannot call deoptimizePath here.
             declaredVariable.markInitializersForDeoptimization();
@@ -5371,7 +5441,7 @@ class BlockScope extends ChildScope {
             this.addHoistedVariable(name, declaredVariable);
             return declaredVariable;
         }
-        return super.addDeclaration(identifier, context, init, kind);
+        return super.addDeclaration(identifier, context, init, includedInitPath, kind);
     }
 }
 
@@ -5386,11 +5456,11 @@ class StaticBlock extends NodeBase {
         }
         return false;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         this.included = true;
         for (const node of this.body) {
             if (includeChildrenRecursively || node.shouldBeIncluded(context))
-                node.include(context, includeChildrenRecursively);
+                node.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         }
     }
     render(code, options) {
@@ -5469,22 +5539,22 @@ class ClassNode extends NodeBase {
                 false
             : this.getObjectEntity().hasEffectsOnInteractionAtPath(path, interaction, context);
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
         this.included = true;
-        this.superClass?.include(context, includeChildrenRecursively);
-        this.body.include(context, includeChildrenRecursively);
+        this.superClass?.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
+        this.body.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         for (const decorator of this.decorators)
-            decorator.include(context, includeChildrenRecursively);
+            decorator.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         if (this.id) {
             this.id.markDeclarationReached();
-            this.id.include();
+            this.id.includePath(UNKNOWN_PATH, createInclusionContext());
         }
     }
     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;
@@ -5599,7 +5669,7 @@ class ClassDeclaration extends ClassNode {
 
 class ArgumentsVariable extends LocalVariable {
     constructor(context) {
-        super('arguments', null, UNKNOWN_EXPRESSION, context, 'other');
+        super('arguments', null, UNKNOWN_EXPRESSION, EMPTY_PATH, context, 'other');
         this.deoptimizedArguments = [];
     }
     addArgumentToBeDeoptimized(argument) {
@@ -5613,8 +5683,8 @@ class ArgumentsVariable extends LocalVariable {
     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);
         }
@@ -5625,27 +5695,28 @@ class ArgumentsVariable extends LocalVariable {
 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.deoptimizationInteractions = [];
-        this.deoptimizations = new PathTracker();
+        this.deoptimizations = new EntityPathTracker();
         this.deoptimizedFields = new Set();
-        this.entitiesToBeDeoptimized = new Set();
-        this.expressionsUseTheKnownValue = [];
+        this.argumentsToBeDeoptimized = new Set();
+        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);
                 }
@@ -5655,27 +5726,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();
@@ -5692,7 +5766,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
@@ -5708,7 +5782,7 @@ class ParameterVariable extends LocalVariable {
             return;
         }
         // add tracking for the new argument
-        const newValue = argument.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this);
+        const newValue = argument.getLiteralValueAtPath(this.initPath, SHARED_RECURSION_TRACKER, this);
         if (newValue !== oldValue) {
             this.markReassigned();
         }
@@ -5730,20 +5804,25 @@ class ParameterVariable extends LocalVariable {
             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) {
             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) ||
@@ -5752,10 +5831,10 @@ class ParameterVariable extends LocalVariable {
             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
@@ -5776,17 +5855,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) {
@@ -5801,11 +5880,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);
@@ -5817,7 +5899,7 @@ class CatchBodyScope extends ChildScope {
         super(parent, parent.context);
         this.parent = parent;
     }
-    addDeclaration(identifier, context, init, kind) {
+    addDeclaration(identifier, context, init, includedInitPath, kind) {
         if (kind === 'var') {
             const name = identifier.name;
             const existingVariable = this.hoistedVariables?.get(name) || this.variables.get(name);
@@ -5830,7 +5912,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, includedInitPath, 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
@@ -5849,7 +5931,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, includedInitPath, kind);
             // Necessary to make sure the init is deoptimized for conditional declarations.
             // We cannot call deoptimizePath here.
             declaredVariable.markInitializersForDeoptimization();
@@ -5857,7 +5939,7 @@ class CatchBodyScope extends ChildScope {
             this.addHoistedVariable(name, declaredVariable);
             return declaredVariable;
         }
-        return super.addDeclaration(identifier, context, init, kind);
+        return super.addDeclaration(identifier, context, init, includedInitPath, kind);
     }
 }
 
@@ -5867,7 +5949,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, includedInitPath, kind) {
         const name = identifier.name;
         const existingVariable = this.hoistedVariables?.get(name) || this.variables.get(name);
         if (existingVariable) {
@@ -5879,7 +5961,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, includedInitPath, context, kind);
         this.variables.set(name, newVariable);
         return newVariable;
     }
@@ -5888,21 +5970,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
@@ -5920,43 +6002,54 @@ 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++) {
+            if (args[argumentIndex] instanceof SpreadElement && !argumentIncluded) {
+                argumentIncluded = true;
+                lastExplicitlyIncludedIndex = argumentIndex - 1;
+            }
+            if (argumentIncluded) {
+                args[argumentIndex].includePath(UNKNOWN_PATH, 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) {
                             calledFromTryStatement = true;
                         }
+                        if (variable.included) {
+                            argumentIncluded = true;
+                            if (calledFromTryStatement) {
+                                argument.includePath(UNKNOWN_PATH, context, true);
+                            }
+                            else {
+                                variable.includeArgumentPaths(argument, context);
+                            }
+                        }
                     }
                 }
             }
-            if (!argumentIncluded && argument.shouldBeIncluded(context)) {
+            if (!argument.included && (argumentIncluded || argument.shouldBeIncluded(context))) {
                 argumentIncluded = true;
-            }
-            if (argumentIncluded) {
-                argument.include(context, calledFromTryStatement);
+                argument.includePath(EMPTY_PATH, context, calledFromTryStatement);
             }
         }
     }
@@ -5971,11 +6064,61 @@ 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);
+            }
+        }
+        for (; position < parameters.length; 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];
@@ -5991,24 +6134,26 @@ 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) {
-                    argument.include(context, false);
-                }
+            const { args } = interaction;
+            for (let argumentIndex = 1; argumentIndex < args.length; argumentIndex++) {
+                args[argumentIndex]?.includePath(UNKNOWN_PATH, context, false);
             }
         }
     }
+    addArgumentToBeDeoptimized(argument) {
+        this.argumentsVariable.addArgumentToBeDeoptimized(argument);
+    }
 }
 
 class ExpressionStatement extends NodeBase {
@@ -6074,7 +6219,7 @@ class BlockStatement extends NodeBase {
         }
         return false;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         if (!(this.deoptimizeBody && this.directlyIncluded)) {
             this.included = true;
             this.directlyIncluded = true;
@@ -6082,7 +6227,7 @@ class BlockStatement extends NodeBase {
                 includeChildrenRecursively = true;
             for (const node of this.body) {
                 if (includeChildrenRecursively || node.shouldBeIncluded(context))
-                    node.include(context, includeChildrenRecursively);
+                    node.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
             }
         }
     }
@@ -6111,9 +6256,9 @@ class RestElement extends NodeBase {
     addExportedVariables(variables, exportNamesByVariable) {
         this.argument.addExportedVariables(variables, exportNamesByVariable);
     }
-    declare(kind, init) {
+    declare(kind, includedInitPath, init) {
         this.declarationInit = init;
-        return this.argument.declare(kind, UNKNOWN_EXPRESSION);
+        return this.argument.declare(kind, includedInitPath.at(-1) === UnknownKey ? includedInitPath : [...includedInitPath, UnknownKey], init);
     }
     deoptimizePath(path) {
         if (path.length === 0) {
@@ -6124,6 +6269,12 @@ class RestElement extends NodeBase {
         return (path.length > 0 ||
             this.argument.hasEffectsOnInteractionAtPath(EMPTY_PATH, interaction, context));
     }
+    includePath(_path, context, includeChildrenRecursively) {
+        this.included = true;
+        // This should just include the identifier, its properties should be
+        // included where the variable is used.
+        this.argument.includePath(EMPTY_PATH, context, includeChildrenRecursively);
+    }
     markDeclarationReached() {
         this.argument.markDeclarationReached();
     }
@@ -6139,8 +6290,8 @@ class RestElement extends NodeBase {
 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 */);
@@ -6160,53 +6311,9 @@ 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);
-        }
-    }
-    deoptimizeParameterVariableValues() {
-        for (const parameter of this.params) {
-            if (parameter instanceof Identifier) {
-                const parameterVariable = parameter.variable;
-                parameterVariable.markReassigned();
-            }
-        }
-    }
     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);
@@ -6218,12 +6325,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) {
@@ -6280,22 +6382,19 @@ class FunctionBase extends NodeBase {
         }
         return variable?.getOnlyFunctionCallUsed() ?? false;
     }
-    include(context, includeChildrenRecursively) {
-        if (!this.parameterVariableValuesDeoptimized && !this.onlyFunctionCallUsed()) {
+    includePath(_path, context, includeChildrenRecursively) {
+        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);
+        this.body.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
-    includeCallArguments(context, parameters) {
-        this.scope.includeCallArguments(context, parameters);
-    }
     initialise() {
         super.initialise();
         if (this.body instanceof BlockStatement) {
@@ -6317,11 +6416,10 @@ 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;
@@ -6336,13 +6434,13 @@ 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) {
@@ -6383,22 +6481,19 @@ class FunctionNode extends FunctionBase {
         }
         return false;
     }
-    include(context, includeChildrenRecursively) {
-        super.include(context, includeChildrenRecursively);
-        this.id?.include();
+    includePath(path, context, includeChildrenRecursively) {
+        super.includePath(path, context, includeChildrenRecursively);
+        this.id?.includePath(UNKNOWN_PATH, createInclusionContext());
         const hasArguments = this.scope.argumentsVariable.included;
         for (const parameter of this.params) {
             if (!(parameter instanceof Identifier) || hasArguments) {
-                parameter.include(context, includeChildrenRecursively);
+                parameter.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
             }
         }
     }
     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) {
@@ -6447,10 +6542,11 @@ function getFunctionIdInsertPosition(code, start) {
     return declarationEnd + generatorStarPos + 1;
 }
 class ExportDefaultDeclaration extends NodeBase {
-    include(context, includeChildrenRecursively) {
-        super.include(context, includeChildrenRecursively);
+    includePath(path, context, includeChildrenRecursively) {
+        this.included = true;
+        this.declaration.includePath(path, context, includeChildrenRecursively);
         if (includeChildrenRecursively) {
-            this.scope.context.includeVariableInModule(this.variable);
+            this.scope.context.includeVariableInModule(this.variable, path);
         }
     }
     initialise() {
@@ -7023,27 +7119,27 @@ class MemberExpression extends NodeBase {
         }
         return true;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(path, context, includeChildrenRecursively) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
-        this.includeProperties(context, includeChildrenRecursively);
+        this.includeProperties(path, [this.getPropertyKey(), ...path], context, includeChildrenRecursively);
     }
     includeAsAssignmentTarget(context, includeChildrenRecursively, deoptimizeAccess) {
         if (!this.assignmentDeoptimized)
             this.applyAssignmentDeoptimization();
         if (deoptimizeAccess) {
-            this.include(context, includeChildrenRecursively);
+            this.includePath([this.getPropertyKey()], context, includeChildrenRecursively);
         }
         else {
-            this.includeProperties(context, includeChildrenRecursively);
+            this.includeProperties(EMPTY_PATH, [this.getPropertyKey()], 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);
         }
     }
     initialise() {
@@ -7112,7 +7208,7 @@ 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);
                 }
                 this.scope.context.log(LOGLEVEL_WARN, logIllegalImportReassignment(this.object.name, this.scope.context.module.id), this.start);
             }
@@ -7139,15 +7235,18 @@ class MemberExpression extends NodeBase {
             (propertyReadSideEffects === 'always' ||
                 this.object.hasEffectsOnInteractionAtPath([this.getPropertyKey()], this.accessInteraction, context)));
     }
-    includeProperties(context, includeChildrenRecursively) {
+    includeProperties(includedPath, objectPath, context, includeChildrenRecursively) {
         if (!this.included) {
             this.included = true;
             if (this.variable) {
-                this.scope.context.includeVariableInModule(this.variable);
+                this.scope.context.includeVariableInModule(this.variable, includedPath);
             }
         }
-        this.object.include(context, includeChildrenRecursively);
-        this.property.include(context, includeChildrenRecursively);
+        else if (includedPath.length > 0) {
+            this.variable?.includePath(includedPath, context);
+        }
+        this.object.includePath(objectPath, context, includeChildrenRecursively);
+        this.property.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
     }
 }
 function resolveNamespaceVariables(baseVariable, path, astContext) {
@@ -7190,7 +7289,7 @@ class MetaProperty extends NodeBase {
     hasEffectsOnInteractionAtPath(path, { type }) {
         return path.length > 1 || type !== INTERACTION_ACCESSED;
     }
-    include() {
+    includePath() {
         if (!this.included) {
             this.included = true;
             if (this.meta.name === IMPORT) {
@@ -7309,7 +7408,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;
@@ -7458,8 +7557,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) {
@@ -7552,9 +7651,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);
     }
     setRenderNames(baseName, name) {
         super.setRenderNames(baseName, name);
@@ -10751,11 +10850,14 @@ class ArrayPattern extends NodeBase {
             element?.addExportedVariables(variables, exportNamesByVariable);
         }
     }
-    declare(kind) {
+    declare(kind, includedInitPath, init) {
         const variables = [];
+        const includedPatternPath = includedInitPath.at(-1) === UnknownKey
+            ? includedInitPath
+            : [...includedInitPath, UnknownInteger];
         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;
@@ -10828,11 +10930,11 @@ class ArrowFunctionExpression extends FunctionBase {
             this.parent.callee === this;
         return isIIFE || super.onlyFunctionCallUsed();
     }
-    include(context, includeChildrenRecursively) {
-        super.include(context, includeChildrenRecursively);
+    includePath(_path, context, includeChildrenRecursively) {
+        super.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         for (const parameter of this.params) {
             if (!(parameter instanceof Identifier)) {
-                parameter.include(context, includeChildrenRecursively);
+                parameter.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
             }
         }
     }
@@ -10855,10 +10957,10 @@ class ObjectPattern extends NodeBase {
             }
         }
     }
-    declare(kind, init) {
+    declare(kind, includedInitPath, init) {
         const variables = [];
         for (const property of this.properties) {
-            variables.push(...property.declare(kind, init));
+            variables.push(...property.declare(kind, includedInitPath, init));
         }
         return variables;
     }
@@ -10879,11 +10981,22 @@ class ObjectPattern extends NodeBase {
         }
         return false;
     }
+    includePath(_path, context, includeChildrenRecursively) {
+        this.included = true;
+        for (const property of this.properties) {
+            // Including a pattern should not deeply include its children as that
+            // would include all children of nested variable references. Their paths
+            // will be included via their usages instead, and we store the path in
+            // the pattern when declaring the variables.
+            property.includePath(EMPTY_PATH, context, includeChildrenRecursively);
+        }
+    }
     markDeclarationReached() {
         for (const property of this.properties) {
             property.markDeclarationReached();
         }
     }
+    applyDeoptimizations() { }
 }
 
 class AssignmentExpression extends NodeBase {
@@ -10898,7 +11011,7 @@ class AssignmentExpression extends NodeBase {
     hasEffectsOnInteractionAtPath(path, interaction, context) {
         return this.right.hasEffectsOnInteractionAtPath(path, interaction, context);
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         const { deoptimized, left, right, operator } = this;
         if (!deoptimized)
             this.applyDeoptimizations();
@@ -10909,7 +11022,7 @@ class AssignmentExpression extends NodeBase {
             left.hasEffectsAsAssignmentTarget(createHasEffectsContext(), false)) {
             left.includeAsAssignmentTarget(context, includeChildrenRecursively, operator !== '=');
         }
-        right.include(context, includeChildrenRecursively);
+        right.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
     }
     initialise() {
         super.initialise();
@@ -10981,8 +11094,8 @@ class AssignmentPattern extends NodeBase {
     addExportedVariables(variables, exportNamesByVariable) {
         this.left.addExportedVariables(variables, exportNamesByVariable);
     }
-    declare(kind, init) {
-        return this.left.declare(kind, init);
+    declare(kind, includedInitPath, init) {
+        return this.left.declare(kind, includedInitPath, init);
     }
     deoptimizePath(path) {
         if (path.length === 0) {
@@ -11013,7 +11126,7 @@ class AwaitExpression extends NodeBase {
             this.applyDeoptimizations();
         return true;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(path, context, includeChildrenRecursively) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
         if (!this.included) {
@@ -11027,7 +11140,7 @@ class AwaitExpression extends NodeBase {
                 this.scope.context.usesTopLevelAwait = true;
             }
         }
-        this.argument.include(context, includeChildrenRecursively);
+        this.argument.includePath(path, context, includeChildrenRecursively);
     }
 }
 
@@ -11109,10 +11222,10 @@ class BreakStatement extends NodeBase {
         context.brokenFlow = true;
         return false;
     }
-    include(context) {
+    includePath(_, context) {
         this.included = true;
         if (this.label) {
-            this.label.include();
+            this.label.includePath(UNKNOWN_PATH, createInclusionContext());
             context.includedLabels.add(this.label.name);
         }
         else {
@@ -11306,11 +11419,11 @@ class CallExpression extends CallExpressionBase {
             (calleeHasEffects ||
                 this.callee.hasEffectsOnInteractionAtPath(EMPTY_PATH, this.interaction, context)));
     }
-    include(context, includeChildrenRecursively) {
+    includePath(path, context, includeChildrenRecursively) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
         if (includeChildrenRecursively) {
-            super.include(context, includeChildrenRecursively);
+            super.includePath(path, context, includeChildrenRecursively);
             if (includeChildrenRecursively === INCLUDE_PARAMETERS &&
                 this.callee instanceof Identifier &&
                 this.callee.variable) {
@@ -11319,9 +11432,18 @@ 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.includePath(UNKNOWN_PATH, context, false);
+            }
+            else {
+                this.callee.includePath(UNKNOWN_PATH, context, false);
+            }
+            this.callee.includeCallArguments(context, this.interaction);
         }
-        this.callee.includeCallArguments(context, this.arguments);
     }
     initialise() {
         super.initialise();
@@ -11360,7 +11482,7 @@ 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);
@@ -11388,7 +11510,7 @@ 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));
     }
@@ -11401,11 +11523,11 @@ class ClassBody extends NodeBase {
     createScope(parentScope) {
         this.scope = new ClassBodyScope(parentScope, this.parent);
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         this.included = true;
-        this.scope.context.includeVariableInModule(this.scope.thisVariable);
+        this.scope.context.includeVariableInModule(this.scope.thisVariable, UNKNOWN_PATH);
         for (const definition of this.body) {
-            definition.include(context, includeChildrenRecursively);
+            definition.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         }
     }
     parseNode(esTreeNode) {
@@ -11528,26 +11650,26 @@ class ConditionalExpression extends NodeBase {
         }
         return usedBranch.hasEffectsOnInteractionAtPath(path, interaction, context);
     }
-    include(context, includeChildrenRecursively) {
+    includePath(path, context, includeChildrenRecursively) {
         this.included = true;
         const usedBranch = this.getUsedBranch();
         if (includeChildrenRecursively || this.test.shouldBeIncluded(context) || usedBranch === null) {
-            this.test.include(context, includeChildrenRecursively);
-            this.consequent.include(context, includeChildrenRecursively);
-            this.alternate.include(context, includeChildrenRecursively);
+            this.test.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
+            this.consequent.includePath(path, context, includeChildrenRecursively);
+            this.alternate.includePath(path, context, includeChildrenRecursively);
         }
         else {
-            usedBranch.include(context, includeChildrenRecursively);
+            usedBranch.includePath(path, context, includeChildrenRecursively);
         }
     }
-    includeCallArguments(context, parameters) {
+    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) {
@@ -11608,10 +11730,10 @@ class ContinueStatement extends NodeBase {
         context.brokenFlow = true;
         return false;
     }
-    include(context) {
+    includePath(_, context) {
         this.included = true;
         if (this.label) {
-            this.label.include();
+            this.label.includePath(UNKNOWN_PATH, createInclusionContext());
             context.includedLabels.add(this.label.name);
         }
         else {
@@ -11654,7 +11776,7 @@ function includeLoopBody(context, body, includeChildrenRecursively) {
     const { brokenFlow, hasBreak, hasContinue } = context;
     context.hasBreak = false;
     context.hasContinue = false;
-    body.include(context, includeChildrenRecursively, { asSingleStatement: true });
+    body.includePath(UNKNOWN_PATH, context, includeChildrenRecursively, { asSingleStatement: true });
     context.hasBreak = hasBreak;
     context.hasContinue = hasContinue;
     context.brokenFlow = brokenFlow;
@@ -11666,9 +11788,9 @@ class DoWhileStatement extends NodeBase {
             return true;
         return hasLoopBodyEffects(context, this.body);
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         this.included = true;
-        this.test.include(context, includeChildrenRecursively);
+        this.test.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         includeLoopBody(context, this.body, includeChildrenRecursively);
     }
 }
@@ -11739,13 +11861,13 @@ class ForInStatement extends NodeBase {
             return true;
         return hasLoopBodyEffects(context, body);
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         const { body, deoptimized, left, right } = this;
         if (!deoptimized)
             this.applyDeoptimizations();
         this.included = true;
         left.includeAsAssignmentTarget(context, includeChildrenRecursively || true, false);
-        right.include(context, includeChildrenRecursively);
+        right.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         includeLoopBody(context, body, includeChildrenRecursively);
     }
     initialise() {
@@ -11784,13 +11906,13 @@ class ForOfStatement extends NodeBase {
         // Placeholder until proper Symbol.Iterator support
         return true;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         const { body, deoptimized, left, right } = this;
         if (!deoptimized)
             this.applyDeoptimizations();
         this.included = true;
         left.includeAsAssignmentTarget(context, includeChildrenRecursively || true, false);
-        right.include(context, includeChildrenRecursively);
+        right.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         includeLoopBody(context, body, includeChildrenRecursively);
     }
     initialise() {
@@ -11826,11 +11948,13 @@ class ForStatement extends NodeBase {
         }
         return hasLoopBodyEffects(context, this.body);
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         this.included = true;
-        this.init?.include(context, includeChildrenRecursively, { asSingleStatement: true });
-        this.test?.include(context, includeChildrenRecursively);
-        this.update?.include(context, includeChildrenRecursively);
+        this.init?.includePath(UNKNOWN_PATH, context, includeChildrenRecursively, {
+            asSingleStatement: true
+        });
+        this.test?.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
+        this.update?.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         includeLoopBody(context, this.body, includeChildrenRecursively);
     }
     render(code, options) {
@@ -11871,9 +11995,9 @@ class TrackingScope extends BlockScope {
         super(...arguments);
         this.hoistedDeclarations = [];
     }
-    addDeclaration(identifier, context, init, kind) {
+    addDeclaration(identifier, context, init, includedInitPath, kind) {
         this.hoistedDeclarations.push(identifier);
-        return super.addDeclaration(identifier, context, init, kind);
+        return super.addDeclaration(identifier, context, init, includedInitPath, kind);
     }
 }
 
@@ -11906,7 +12030,7 @@ class IfStatement extends NodeBase {
         }
         return testValue ? this.consequent.hasEffects(context) : !!this.alternate?.hasEffects(context);
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_, context, includeChildrenRecursively) {
         this.included = true;
         if (includeChildrenRecursively) {
             this.includeRecursively(includeChildrenRecursively, context);
@@ -11981,31 +12105,31 @@ class IfStatement extends NodeBase {
     }
     includeKnownTest(context, testValue) {
         if (this.test.shouldBeIncluded(context)) {
-            this.test.include(context, false);
+            this.test.includePath(UNKNOWN_PATH, context, false);
         }
         if (testValue && this.consequent.shouldBeIncluded(context)) {
-            this.consequent.include(context, false, { asSingleStatement: true });
+            this.consequent.includePath(UNKNOWN_PATH, context, false, { asSingleStatement: true });
         }
         if (!testValue && this.alternate?.shouldBeIncluded(context)) {
-            this.alternate.include(context, false, { asSingleStatement: true });
+            this.alternate.includePath(UNKNOWN_PATH, context, false, { asSingleStatement: true });
         }
     }
     includeRecursively(includeChildrenRecursively, context) {
-        this.test.include(context, includeChildrenRecursively);
-        this.consequent.include(context, includeChildrenRecursively);
-        this.alternate?.include(context, includeChildrenRecursively);
+        this.test.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
+        this.consequent.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
+        this.alternate?.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
     }
     includeUnknownTest(context) {
-        this.test.include(context, false);
+        this.test.includePath(UNKNOWN_PATH, context, false);
         const { brokenFlow } = context;
         let consequentBrokenFlow = false;
         if (this.consequent.shouldBeIncluded(context)) {
-            this.consequent.include(context, false, { asSingleStatement: true });
+            this.consequent.includePath(UNKNOWN_PATH, context, false, { asSingleStatement: true });
             consequentBrokenFlow = context.brokenFlow;
             context.brokenFlow = brokenFlow;
         }
         if (this.alternate?.shouldBeIncluded(context)) {
-            this.alternate.include(context, false, { asSingleStatement: true });
+            this.alternate.includePath(UNKNOWN_PATH, context, false, { asSingleStatement: true });
             context.brokenFlow = context.brokenFlow && consequentBrokenFlow;
         }
     }
@@ -12073,7 +12197,7 @@ 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);
@@ -12085,15 +12209,15 @@ class VariableDeclarator extends NodeBase {
         this.id.markDeclarationReached();
         return initEffect || this.id.hasEffects(context) || this.isUsingDeclaration;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         const { deoptimized, id, init } = this;
         if (!deoptimized)
             this.applyDeoptimizations();
         this.included = true;
-        init?.include(context, includeChildrenRecursively);
+        init?.includePath(EMPTY_PATH, context, includeChildrenRecursively);
         id.markDeclarationReached();
         if (includeChildrenRecursively || id.shouldBeIncluded(context)) {
-            id.include(context, includeChildrenRecursively);
+            id.includePath(EMPTY_PATH, context, includeChildrenRecursively);
         }
     }
     removeAnnotations(code) {
@@ -12142,6 +12266,8 @@ 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;
@@ -12174,12 +12300,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) {
@@ -12228,13 +12357,23 @@ class ImportExpression extends NodeBase {
     hasEffects() {
         return true;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(path, context, includeChildrenRecursively) {
         if (!this.included) {
             this.included = true;
             this.scope.context.includeDynamicImport(this);
             this.scope.addAccessedDynamicImport(this);
+            this.source.includePath(path, context, includeChildrenRecursively);
+        }
+        if (this.hasUnknownAccessedKey)
+            return;
+        if (path[0] === UnknownKey) {
+            this.hasUnknownAccessedKey = true;
+            this.scope.context.includeDynamicImport(this);
+        }
+        else if (typeof path[0] === 'string') {
+            this.accessedPropKey.add(path[0]);
+            this.scope.context.includeDynamicImport(this);
         }
-        this.source.include(context, includeChildrenRecursively);
     }
     initialise() {
         super.initialise();
@@ -12562,7 +12701,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, createInclusionContext());
             // This excludes this variable from renaming
             factoryVariable.globalName = baseName;
         }
@@ -12570,7 +12709,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);
     if (factoryVariable instanceof LocalVariable) {
         factoryVariable.consolidateInitializers();
         factoryVariable.addUsedPlace(node);
@@ -12592,7 +12731,7 @@ class JSXElementBase extends NodeBase {
             this.scope.context.addImportSource(importSource);
         }
     }
-    include(context, includeChildrenRecursively) {
+    includePath(path, context, includeChildrenRecursively) {
         if (!this.included) {
             const { factory, importSource, mode } = this.jsxMode;
             if (factory) {
@@ -12600,7 +12739,7 @@ class JSXElementBase extends NodeBase {
                 this.factoryVariable = getAndIncludeFactoryVariable(factory, mode === 'preserve', importSource, this);
             }
         }
-        super.include(context, includeChildrenRecursively);
+        super.includePath(path, context, includeChildrenRecursively);
     }
     applyDeoptimizations() { }
     getRenderingMode() {
@@ -12862,7 +13001,7 @@ class JSXOpeningFragment extends NodeBase {
         this.fragment = null;
         this.fragmentVariable = null;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(path, context, includeChildrenRecursively) {
         if (!this.included) {
             const jsx = this.scope.context.options.jsx;
             if (jsx.mode === 'automatic') {
@@ -12877,7 +13016,7 @@ class JSXOpeningFragment extends NodeBase {
                 }
             }
         }
-        super.include(context, includeChildrenRecursively);
+        super.includePath(path, context, includeChildrenRecursively);
     }
     render(code, options) {
         const { mode } = this.scope.context.options.jsx;
@@ -12934,13 +13073,13 @@ class LabeledStatement extends NodeBase {
         context.includedLabels = new Set([...includedLabels, ...context.includedLabels]);
         return bodyHasEffects;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         this.included = true;
         const { brokenFlow, includedLabels } = context;
         context.includedLabels = new Set();
-        this.body.include(context, includeChildrenRecursively);
+        this.body.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         if (includeChildrenRecursively || context.includedLabels.has(this.label.name)) {
-            this.label.include();
+            this.label.includePath(UNKNOWN_PATH, createInclusionContext());
             context.includedLabels.delete(this.label.name);
             context.brokenFlow = brokenFlow;
         }
@@ -13037,17 +13176,17 @@ class LogicalExpression extends NodeBase {
         }
         return usedBranch.hasEffectsOnInteractionAtPath(path, interaction, context);
     }
-    include(context, includeChildrenRecursively) {
+    includePath(path, context, includeChildrenRecursively) {
         this.included = true;
         const usedBranch = this.getUsedBranch();
         if (includeChildrenRecursively ||
             (usedBranch === this.right && this.left.shouldBeIncluded(context)) ||
             !usedBranch) {
-            this.left.include(context, includeChildrenRecursively);
-            this.right.include(context, includeChildrenRecursively);
+            this.left.includePath(path, context, includeChildrenRecursively);
+            this.right.includePath(path, context, includeChildrenRecursively);
         }
         else {
-            usedBranch.include(context, includeChildrenRecursively);
+            usedBranch.includePath(path, context, includeChildrenRecursively);
         }
     }
     removeAnnotations(code) {
@@ -13119,17 +13258,17 @@ class NewExpression extends NodeBase {
     hasEffectsOnInteractionAtPath(path, { type }) {
         return path.length > 0 || type !== INTERACTION_ACCESSED;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(path, context, includeChildrenRecursively) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
         if (includeChildrenRecursively) {
-            super.include(context, includeChildrenRecursively);
+            super.includePath(path, context, includeChildrenRecursively);
         }
         else {
             this.included = true;
-            this.callee.include(context, false);
+            this.callee.includePath(UNKNOWN_PATH, context, false);
         }
-        this.callee.includeCallArguments(context, this.arguments);
+        this.callee.includeCallArguments(context, this.interaction);
     }
     initialise() {
         super.initialise();
@@ -13158,6 +13297,7 @@ class ObjectExpression extends NodeBase {
     constructor() {
         super(...arguments);
         this.objectEntity = null;
+        this.protoProp = null;
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         this.getObjectEntity().deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
@@ -13177,13 +13317,32 @@ class ObjectExpression extends NodeBase {
     hasEffectsOnInteractionAtPath(path, interaction, context) {
         return this.getObjectEntity().hasEffectsOnInteractionAtPath(path, interaction, context);
     }
+    includePath(path, context, includeChildrenRecursively) {
+        this.included = true;
+        this.getObjectEntity().includePath(path, context, includeChildrenRecursively);
+        this.protoProp?.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
+    }
     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() {
@@ -13214,6 +13373,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
@@ -13280,11 +13440,11 @@ class Program extends NodeBase {
         }
         return false;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         this.included = true;
         for (const node of this.body) {
             if (includeChildrenRecursively || node.shouldBeIncluded(context)) {
-                node.include(context, includeChildrenRecursively);
+                node.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
             }
         }
     }
@@ -13323,10 +13483,6 @@ class Program extends NodeBase {
 }
 
 class Property extends MethodBase {
-    constructor() {
-        super(...arguments);
-        this.declarationInit = null;
-    }
     //declare method: boolean;
     get method() {
         return isFlagSet(this.flags, 262144 /* Flag.method */);
@@ -13341,9 +13497,17 @@ 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, includedInitPath, init) {
+        const pathInProperty = includedInitPath.at(-1) === UnknownKey
+            ? includedInitPath
+            : // For now, we only consider static path as we do not know how to
+                // deoptimize the path in the dynamic case.
+                this.computed
+                    ? [...includedInitPath, UnknownKey]
+                    : this.key instanceof Identifier
+                        ? [...includedInitPath, this.key.name]
+                        : [...includedInitPath, String(this.key.value)];
+        return this.value.declare(kind, pathInProperty, init);
     }
     hasEffects(context) {
         if (!this.deoptimized)
@@ -13353,6 +13517,11 @@ class Property extends MethodBase {
             this.key.hasEffects(context) ||
             this.value.hasEffects(context));
     }
+    includePath(path, context, includeChildrenRecursively) {
+        this.included = true;
+        this.key.includePath(EMPTY_PATH, context, includeChildrenRecursively);
+        this.value.includePath(path, context, includeChildrenRecursively);
+    }
     markDeclarationReached() {
         this.value.markDeclarationReached();
     }
@@ -13362,13 +13531,7 @@ 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();
-        }
-    }
+    applyDeoptimizations() { }
 }
 
 class PropertyDefinition extends NodeBase {
@@ -13412,9 +13575,9 @@ class ReturnStatement extends NodeBase {
         context.brokenFlow = true;
         return false;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         this.included = true;
-        this.argument?.include(context, includeChildrenRecursively);
+        this.argument?.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         context.brokenFlow = true;
     }
     initialise() {
@@ -13451,14 +13614,14 @@ class SequenceExpression extends NodeBase {
     hasEffectsOnInteractionAtPath(path, interaction, context) {
         return this.expressions[this.expressions.length - 1].hasEffectsOnInteractionAtPath(path, interaction, context);
     }
-    include(context, includeChildrenRecursively) {
+    includePath(path, context, includeChildrenRecursively) {
         this.included = true;
         const lastExpression = this.expressions[this.expressions.length - 1];
         for (const expression of this.expressions) {
             if (includeChildrenRecursively ||
                 (expression === lastExpression && !(this.parent instanceof ExpressionStatement)) ||
                 expression.shouldBeIncluded(context))
-                expression.include(context, includeChildrenRecursively);
+                expression.includePath(path, context, includeChildrenRecursively);
         }
     }
     removeAnnotations(code) {
@@ -13506,10 +13669,13 @@ class Super extends NodeBase {
     deoptimizePath(path) {
         this.variable.deoptimizePath(path);
     }
-    include() {
+    includePath(path, context) {
         if (!this.included) {
             this.included = true;
-            this.scope.context.includeVariableInModule(this.variable);
+            this.scope.context.includeVariableInModule(this.variable, path);
+        }
+        else if (path.length > 0) {
+            this.variable.includePath(path, context);
         }
     }
 }
@@ -13526,12 +13692,12 @@ class SwitchCase extends NodeBase {
         }
         return false;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         this.included = true;
-        this.test?.include(context, includeChildrenRecursively);
+        this.test?.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         for (const node of this.consequent) {
             if (includeChildrenRecursively || node.shouldBeIncluded(context))
-                node.include(context, includeChildrenRecursively);
+                node.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         }
     }
     render(code, options, nodeRenderOptions) {
@@ -13579,9 +13745,9 @@ class SwitchStatement extends NodeBase {
         context.hasBreak = hasBreak;
         return false;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         this.included = true;
-        this.discriminant.include(context, includeChildrenRecursively);
+        this.discriminant.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         const { brokenFlow, hasBreak } = context;
         context.hasBreak = false;
         let onlyHasBrokenFlow = true;
@@ -13598,7 +13764,7 @@ class SwitchStatement extends NodeBase {
                 isCaseIncluded = switchCase.hasEffects(hasEffectsContext);
             }
             if (isCaseIncluded) {
-                switchCase.include(context, includeChildrenRecursively);
+                switchCase.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
                 onlyHasBrokenFlow &&= context.brokenFlow && !context.hasBreak;
                 context.hasBreak = false;
                 context.brokenFlow = brokenFlow;
@@ -13655,21 +13821,21 @@ class TaggedTemplateExpression extends CallExpressionBase {
         return (this.tag.hasEffects(context) ||
             this.tag.hasEffectsOnInteractionAtPath(EMPTY_PATH, this.interaction, context));
     }
-    include(context, includeChildrenRecursively) {
+    includePath(path, context, includeChildrenRecursively) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
         if (includeChildrenRecursively) {
-            super.include(context, includeChildrenRecursively);
+            super.includePath(path, context, includeChildrenRecursively);
         }
         else {
             this.included = true;
-            this.tag.include(context, includeChildrenRecursively);
-            this.quasi.include(context, includeChildrenRecursively);
+            this.tag.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
+            this.quasi.includePath(UNKNOWN_PATH, 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);
+            returnExpression.includePath(UNKNOWN_PATH, context, false);
         }
     }
     initialise() {
@@ -13714,7 +13880,7 @@ class TemplateElement extends NodeBase {
     hasEffects() {
         return false;
     }
-    include() {
+    includePath() {
         this.included = true;
     }
     parseNode(esTreeNode) {
@@ -13756,13 +13922,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, includedInitPath, 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, includedInitPath, kind);
     }
     addExportDefaultDeclaration(name, exportDefaultDeclaration, context) {
         const variable = new ExportDefaultVariable(name, exportDefaultDeclaration, context);
@@ -13807,10 +13973,13 @@ class ThisExpression extends NodeBase {
         }
         return this.variable.hasEffectsOnInteractionAtPath(path, interaction, context);
     }
-    include() {
+    includePath(path, context) {
         if (!this.included) {
             this.included = true;
-            this.scope.context.includeVariableInModule(this.variable);
+            this.scope.context.includeVariableInModule(this.variable, path);
+        }
+        else if (path.length > 0) {
+            this.variable.includePath(path, context);
         }
     }
     initialise() {
@@ -13837,9 +14006,9 @@ class ThrowStatement extends NodeBase {
     hasEffects() {
         return true;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         this.included = true;
-        this.argument.include(context, includeChildrenRecursively);
+        this.argument.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         context.brokenFlow = true;
     }
     render(code, options) {
@@ -13861,13 +14030,13 @@ class TryStatement extends NodeBase {
             ? this.block.body.length > 0
             : this.block.hasEffects(context)) || !!this.finalizer?.hasEffects(context));
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         const tryCatchDeoptimization = this.scope.context.options.treeshake?.tryCatchDeoptimization;
         const { brokenFlow, includedLabels } = context;
         if (!this.directlyIncluded || !tryCatchDeoptimization) {
             this.included = true;
             this.directlyIncluded = true;
-            this.block.include(context, tryCatchDeoptimization ? INCLUDE_PARAMETERS : includeChildrenRecursively);
+            this.block.includePath(UNKNOWN_PATH, context, tryCatchDeoptimization ? INCLUDE_PARAMETERS : includeChildrenRecursively);
             if (includedLabels.size > 0) {
                 this.includedLabelsAfterBlock = [...includedLabels];
             }
@@ -13879,10 +14048,10 @@ class TryStatement extends NodeBase {
             }
         }
         if (this.handler !== null) {
-            this.handler.include(context, includeChildrenRecursively);
+            this.handler.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
             context.brokenFlow = brokenFlow;
         }
-        this.finalizer?.include(context, includeChildrenRecursively);
+        this.finalizer?.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
     }
 }
 
@@ -13940,7 +14109,7 @@ class UpdateExpression extends NodeBase {
     hasEffectsOnInteractionAtPath(path, { type }) {
         return path.length > 1 || type !== INTERACTION_ACCESSED;
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_, context, includeChildrenRecursively) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
         this.included = true;
@@ -14009,20 +14178,20 @@ class VariableDeclaration extends NodeBase {
     hasEffectsOnInteractionAtPath() {
         return false;
     }
-    include(context, includeChildrenRecursively, { asSingleStatement } = BLANK) {
+    includePath(_path, context, includeChildrenRecursively, { asSingleStatement } = BLANK) {
         this.included = true;
         for (const declarator of this.declarations) {
             if (includeChildrenRecursively || declarator.shouldBeIncluded(context))
-                declarator.include(context, includeChildrenRecursively);
+                declarator.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
             const { id, init } = declarator;
             if (asSingleStatement) {
-                id.include(context, includeChildrenRecursively);
+                id.includePath(EMPTY_PATH, context, includeChildrenRecursively);
             }
             if (init &&
                 id.included &&
                 !init.included &&
                 (id instanceof ObjectPattern || id instanceof ArrayPattern)) {
-                init.include(context, includeChildrenRecursively);
+                init.includePath(EMPTY_PATH, context, includeChildrenRecursively);
             }
         }
     }
@@ -14094,8 +14263,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);
@@ -14172,9 +14340,9 @@ class WhileStatement extends NodeBase {
             return true;
         return hasLoopBodyEffects(context, this.body);
     }
-    include(context, includeChildrenRecursively) {
+    includePath(_path, context, includeChildrenRecursively) {
         this.included = true;
-        this.test.include(context, includeChildrenRecursively);
+        this.test.includePath(UNKNOWN_PATH, context, includeChildrenRecursively);
         includeLoopBody(context, this.body, includeChildrenRecursively);
     }
 }
@@ -14418,7 +14586,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) {
@@ -14464,7 +14632,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) {
@@ -14599,7 +14767,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) {
@@ -14612,7 +14780,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) {
@@ -14971,8 +15139,8 @@ class UnknownNode extends NodeBase {
     hasEffects() {
         return true;
     }
-    include(context) {
-        super.include(context, true);
+    includePath(path, context) {
+        super.includePath(path, context, true);
     }
 }
 
@@ -15076,8 +15244,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;
     }
 }
@@ -15768,7 +15936,7 @@ class Module {
     include() {
         const context = createInclusionContext();
         if (this.ast.shouldBeIncluded(context))
-            this.ast.include(context, false);
+            this.ast.includePath(EMPTY_PATH, context, false);
     }
     includeAllExports(includeNamespaceMembers) {
         if (!this.isExecuted) {
@@ -15782,9 +15950,7 @@ class Module {
                     return error(logMissingEntryExport(exportName, this.id));
                 }
                 variable.deoptimizePath(UNKNOWN_PATH);
-                if (!variable.included) {
-                    this.includeVariable(variable);
-                }
+                this.includeVariable(variable, UNKNOWN_PATH);
             }
         }
         for (const name of this.getReexports()) {
@@ -15792,7 +15958,7 @@ class Module {
             if (variable) {
                 variable.deoptimizePath(UNKNOWN_PATH);
                 if (!variable.included) {
-                    this.includeVariable(variable);
+                    this.includeVariable(variable, UNKNOWN_PATH);
                 }
                 if (variable instanceof ExternalVariable) {
                     variable.module.reexported = true;
@@ -15804,7 +15970,7 @@ class Module {
         }
     }
     includeAllInBundle() {
-        this.ast.include(createInclusionContext(), true);
+        this.ast.includePath(UNKNOWN_PATH, createInclusionContext(), true);
         this.includeAllExports(false);
     }
     includeExportsByNames(names) {
@@ -15818,7 +15984,7 @@ class Module {
             if (variable) {
                 variable.deoptimizePath(UNKNOWN_PATH);
                 if (!variable.included) {
-                    this.includeVariable(variable);
+                    this.includeVariable(variable, EMPTY_PATH);
                 }
             }
             if (!this.exports.has(name) && !this.reexportDescriptions.has(name)) {
@@ -16260,13 +16426,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);
             }
@@ -16276,7 +16442,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;
@@ -16288,7 +16456,7 @@ class Module {
             }
         }
     }
-    includeVariable(variable) {
+    includeVariable(variable, path) {
         const variableModule = variable.module;
         if (variable.included) {
             if (variableModule instanceof Module && variableModule !== this) {
@@ -16296,7 +16464,6 @@ class Module {
             }
         }
         else {
-            variable.include();
             this.graph.needsTreeshakingPass = true;
             if (variableModule instanceof Module) {
                 if (!variableModule.isExecuted) {
@@ -16312,9 +16479,10 @@ class Module {
                 }
             }
         }
+        variable.includePath(path, createInclusionContext());
     }
-    includeVariableInModule(variable) {
-        this.includeVariable(variable);
+    includeVariableInModule(variable, path) {
+        this.includeVariable(variable, path);
         const variableModule = variable.module;
         if (variableModule && variableModule !== this) {
             this.includedImports.add(variable);
@@ -20887,7 +21055,7 @@ 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;