rollup 4.3.1 → 4.4.1

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

@@ -1,13 +1,13 @@
 /*
   @license
-	Rollup.js v4.3.1
-	Sat, 11 Nov 2023 07:57:25 GMT - commit 52c55bb1e17154ae6d01fb40e0e4a3589bc20a8f
+	Rollup.js v4.4.1
+	Tue, 14 Nov 2023 05:24:21 GMT - commit 01d8c9d1b68919c2c429427ae7e60f503a8bb5f4
 
 	https://github.com/rollup/rollup
 
 	Released under the MIT License.
 */
-import { normalize, getImportPath, LOGLEVEL_WARN, logUnusedExternalImports, ANNOTATION_KEY, INVALID_ANNOTATION_KEY, logInvalidAnnotation, logModuleLevelDirective, logIllegalImportReassignment, logMissingExport, logCannotCallNamespace, logEval, LOGLEVEL_INFO, logFirstSideEffect, locate, logThisIsUndefined, logImportAttributeIsInvalid, logImportOptionsAreInvalid, error, logSyntheticNamedExportsNeedNamespaceExport, logInvalidFormatForTopLevelAwait, logInvalidSourcemapForError, augmentCodeLocation, logInconsistentImportAttributes, logNamespaceConflict, logAmbiguousExternalNamespaces, logShimmedExport, parseAst, logModuleParseError, parseAstAsync, logCircularReexport, logMissingNodeBuiltins, logIllegalIdentifierAsName, logMissingNameOptionForIifeExport, logMissingNameOptionForUmdExport, 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, LOGLEVEL_ERROR, logLevelPriority, relativeId, LOGLEVEL_DEBUG, logUnknownOption, printQuotedStringList, logInvalidSetAssetSourceCall, logPluginError, logNoTransformMapOrAstWithoutCode, logBadLoader, logExternalModulesCannotBeTransformedToModules, logInternalIdCannotBeExternal, isRelative, logUnresolvedImport, logUnresolvedImportTreatedAsExternal, logExternalSyntheticExports, logUnresolvedEntry, logUnresolvedImplicitDependant, logExternalModulesCannotBeIncludedInManualChunks, logEntryCannotBeExternal, logImplicitDependantCannotBeExternal, logNoAssetSourceSet, logFileReferenceIdNotFoundForFilename, logAssetReferenceIdNotFoundForSetSource, logAssetSourceAlreadySet, logInvalidRollupPhaseForChunkEmission, logFileNameConflict, logAssetNotFinalisedForFileName, logChunkNotGeneratedForFileName, logInvalidLogPosition, logInvalidRollupPhaseForAddWatchFile, logInputHookInOutputPlugin, logInvalidFunctionPluginHook, logInvalidAddonPluginHook, logImplicitDependantIsNotIncluded, logCircularDependency, URL_TREESHAKE_MODULESIDEEFFECTS, URL_TREESHAKE, URL_OUTPUT_INLINEDYNAMICIMPORTS, URL_PRESERVEENTRYSIGNATURES, URL_OUTPUT_AMD_BASEPATH, logInvalidExportOptionValue, warnDeprecation, URL_OUTPUT_INTEROP, URL_OUTPUT_MANUALCHUNKS, isValidUrl, addTrailingSlashIfMissed, URL_OUTPUT_SOURCEMAPBASEURL, URL_OUTPUT_GENERATEDCODE, URL_OUTPUT_EXTERNALIMPORTATTRIBUTES, logAlreadyClosed, logMissingFileOrDirOption, logCannotEmitFromOptionsHook, URL_WATCH } from './parseAst.js';
+import { normalize, getImportPath, LOGLEVEL_WARN, logUnusedExternalImports, ANNOTATION_KEY, INVALID_ANNOTATION_KEY, logInvalidAnnotation, logRedeclarationError, logDuplicateArgumentNameError, logIllegalImportReassignment, logModuleLevelDirective, logMissingExport, logCannotCallNamespace, logEval, LOGLEVEL_INFO, logFirstSideEffect, locate, logThisIsUndefined, logImportAttributeIsInvalid, logImportOptionsAreInvalid, error, logSyntheticNamedExportsNeedNamespaceExport, logMissingEntryExport, logInvalidFormatForTopLevelAwait, logDuplicateExportError, logInvalidSourcemapForError, augmentCodeLocation, logInconsistentImportAttributes, logNamespaceConflict, logAmbiguousExternalNamespaces, logShimmedExport, parseAst, logModuleParseError, parseAstAsync, logCircularReexport, logMissingNodeBuiltins, logIllegalIdentifierAsName, logMissingNameOptionForIifeExport, logMissingNameOptionForUmdExport, 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, LOGLEVEL_ERROR, logLevelPriority, relativeId, LOGLEVEL_DEBUG, logUnknownOption, printQuotedStringList, logInvalidSetAssetSourceCall, logPluginError, logNoTransformMapOrAstWithoutCode, logBadLoader, logExternalModulesCannotBeTransformedToModules, logInternalIdCannotBeExternal, isRelative, logUnresolvedImport, logUnresolvedImportTreatedAsExternal, logExternalSyntheticExports, logUnresolvedEntry, logUnresolvedImplicitDependant, logExternalModulesCannotBeIncludedInManualChunks, logEntryCannotBeExternal, logImplicitDependantCannotBeExternal, logNoAssetSourceSet, logFileReferenceIdNotFoundForFilename, logAssetReferenceIdNotFoundForSetSource, logAssetSourceAlreadySet, logInvalidRollupPhaseForChunkEmission, logFileNameConflict, logAssetNotFinalisedForFileName, logChunkNotGeneratedForFileName, logInvalidLogPosition, logInvalidRollupPhaseForAddWatchFile, logInputHookInOutputPlugin, logInvalidFunctionPluginHook, logInvalidAddonPluginHook, logImplicitDependantIsNotIncluded, logCircularDependency, URL_TREESHAKE_MODULESIDEEFFECTS, URL_TREESHAKE, URL_OUTPUT_INLINEDYNAMICIMPORTS, URL_PRESERVEENTRYSIGNATURES, URL_OUTPUT_AMD_BASEPATH, logInvalidExportOptionValue, warnDeprecation, URL_OUTPUT_INTEROP, URL_OUTPUT_MANUALCHUNKS, isValidUrl, addTrailingSlashIfMissed, URL_OUTPUT_SOURCEMAPBASEURL, URL_OUTPUT_GENERATEDCODE, URL_OUTPUT_EXTERNALIMPORTATTRIBUTES, logAlreadyClosed, logMissingFileOrDirOption, logCannotEmitFromOptionsHook, URL_WATCH } from './parseAst.js';
 import { relative, dirname, basename, extname, resolve as resolve$1 } from 'node:path';
 import require$$0$1, { win32, posix, isAbsolute, resolve } from 'path';
 import process$1, { env as env$1 } from 'node:process';
@@ -16,7 +16,7 @@ import { xxhashBase64Url } from '../../native.js';
 import { lstat, realpath, readdir, readFile, mkdir, writeFile } from 'node:fs/promises';
 import * as tty from 'tty';
 
-var version = "4.3.1";
+var version = "4.4.1";
 
 const comma = ','.charCodeAt(0);
 const semicolon = ';'.charCodeAt(0);
@@ -1917,12 +1917,18 @@ class Variable extends ExpressionEntity {
         (this.forbiddenNames ||= new Set()).add(name);
     }
     getBaseVariableName() {
-        return this.renderBaseName || this.renderName || this.name;
+        return (this.renderedLikeHoisted?.getBaseVariableName() ||
+            this.renderBaseName ||
+            this.renderName ||
+            this.name);
     }
     getName(getPropertyAccess, useOriginalName) {
         if (useOriginalName?.(this)) {
             return this.name;
         }
+        if (this.renderedLikeHoisted) {
+            return this.renderedLikeHoisted.getName(getPropertyAccess, useOriginalName);
+        }
         const name = this.renderName || this.name;
         return this.renderBaseName ? `${this.renderBaseName}${getPropertyAccess(name)}` : name;
     }
@@ -1937,6 +1943,14 @@ class Variable extends ExpressionEntity {
      */
     include() {
         this.included = true;
+        this.renderedLikeHoisted?.include();
+    }
+    /**
+     * Links the rendered name of this variable to another variable and includes
+     * this variable if the other variable is included.
+     */
+    renderLikeHoisted(variable) {
+        this.renderedLikeHoisted = variable;
     }
     markCalledFromTryStatement() { }
     setRenderNames(baseName, name) {
@@ -1962,10 +1976,8 @@ class ExternalVariable extends Variable {
         return type !== INTERACTION_ACCESSED || path.length > (this.isNamespace ? 1 : 0);
     }
     include() {
-        if (!this.included) {
-            this.included = true;
-            this.module.used = true;
-        }
+        super.include();
+        this.module.used = true;
     }
 }
 
@@ -5495,6 +5507,7 @@ class ArrayPattern extends NodeBase {
 const ArrowFunctionExpression$1 = 'ArrowFunctionExpression';
 const BlockStatement$1 = 'BlockStatement';
 const CallExpression$1 = 'CallExpression';
+const CatchClause$1 = 'CatchClause';
 const ExpressionStatement$1 = 'ExpressionStatement';
 const Identifier$1 = 'Identifier';
 const Program$1 = 'Program';
@@ -5502,7 +5515,7 @@ const Property$1 = 'Property';
 const ReturnStatement$1 = 'ReturnStatement';
 
 class LocalVariable extends Variable {
-    constructor(name, declarator, init, context) {
+    constructor(name, declarator, init, context, kind) {
         super(name);
         this.init = init;
         this.calledFromTryStatement = false;
@@ -5511,6 +5524,7 @@ class LocalVariable extends Variable {
         this.declarations = declarator ? [declarator] : [];
         this.deoptimizationTracker = context.deoptimizationTracker;
         this.module = context.module;
+        this.kind = kind;
     }
     addDeclaration(identifier, init) {
         this.declarations.push(identifier);
@@ -5537,15 +5551,13 @@ class LocalVariable extends Variable {
             return;
         }
         if (path.length === 0) {
-            if (!this.isReassigned) {
-                this.isReassigned = true;
-                const expressionsToBeDeoptimized = this.expressionsToBeDeoptimized;
-                this.expressionsToBeDeoptimized = EMPTY_ARRAY;
-                for (const expression of expressionsToBeDeoptimized) {
-                    expression.deoptimizeCache();
-                }
-                this.init.deoptimizePath(UNKNOWN_PATH);
+            this.isReassigned = true;
+            const expressionsToBeDeoptimized = this.expressionsToBeDeoptimized;
+            this.expressionsToBeDeoptimized = EMPTY_ARRAY;
+            for (const expression of expressionsToBeDeoptimized) {
+                expression.deoptimizeCache();
             }
+            this.init.deoptimizePath(UNKNOWN_PATH);
         }
         else {
             this.init.deoptimizePath(path);
@@ -5597,7 +5609,7 @@ class LocalVariable extends Variable {
     }
     include() {
         if (!this.included) {
-            this.included = true;
+            super.include();
             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)
@@ -5637,19 +5649,6 @@ class LocalVariable extends Variable {
         }
         return this.additionalInitializers;
     }
-    mergeDeclarations(variable) {
-        const { declarations } = this;
-        for (const declaration of variable.declarations) {
-            declarations.push(declaration);
-        }
-        const additionalInitializers = this.markInitializersForDeoptimization();
-        additionalInitializers.push(variable.init);
-        if (variable.additionalInitializers) {
-            for (const initializer of variable.additionalInitializers) {
-                additionalInitializers.push(initializer);
-            }
-        }
-    }
 }
 
 const MAX_TRACKED_INTERACTIONS = 20;
@@ -5659,7 +5658,7 @@ const EMPTY_PATH_TRACKER = new PathTracker();
 const UNKNOWN_DEOPTIMIZED_ENTITY = new Set([UNKNOWN_EXPRESSION]);
 class ParameterVariable extends LocalVariable {
     constructor(name, declarator, context) {
-        super(name, declarator, UNKNOWN_EXPRESSION, context);
+        super(name, declarator, UNKNOWN_EXPRESSION, context, "parameter" /* VariableKind.parameter */);
         this.deoptimizationInteractions = [];
         this.deoptimizations = new PathTracker();
         this.deoptimizedFields = new Set();
@@ -5779,22 +5778,41 @@ class Scope {
         this.children = [];
         this.variables = new Map();
     }
-    addDeclaration(identifier, context, init, _isHoisted) {
+    /*
+    Redeclaration rules:
+    - var can redeclare var
+    - in function scopes, function and var can redeclare function and var
+    - var is hoisted across scopes, function remains in the scope it is declared
+    - var and function can redeclare function parameters, but parameters cannot redeclare parameters
+    - function cannot redeclare catch scope parameters
+    - var can redeclare catch scope parameters in a way
+        - if the parameter is an identifier and not a pattern
+        - 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) {
         const name = identifier.name;
-        let variable = this.variables.get(name);
-        if (variable) {
-            variable.addDeclaration(identifier, init);
-        }
-        else {
-            variable = new LocalVariable(identifier.name, identifier, init || UNDEFINED_EXPRESSION, context);
-            this.variables.set(name, variable);
+        const existingVariable = this.hoistedVariables?.get(name) || this.variables.get(name);
+        if (existingVariable) {
+            const existingKind = existingVariable.kind;
+            if (kind === "var" /* VariableKind.var */ && existingKind === "var" /* VariableKind.var */) {
+                existingVariable.addDeclaration(identifier, init);
+                return existingVariable;
+            }
+            context.error(logRedeclarationError(name), identifier.start);
         }
-        return variable;
+        const newVariable = new LocalVariable(identifier.name, identifier, init, context, kind);
+        this.variables.set(name, newVariable);
+        return newVariable;
+    }
+    addHoistedVariable(name, variable) {
+        (this.hoistedVariables ||= new Map()).set(name, variable);
     }
     contains(name) {
         return this.variables.has(name);
     }
     findVariable(_name) {
+        /* istanbul ignore next */
         throw new Error('Internal Error: findVariable needs to be implemented by a subclass');
     }
 }
@@ -5802,9 +5820,9 @@ class Scope {
 class ChildScope extends Scope {
     constructor(parent, context) {
         super();
-        this.accessedOutsideVariables = new Map();
         this.parent = parent;
         this.context = context;
+        this.accessedOutsideVariables = new Map();
         parent.children.push(this);
     }
     addAccessedDynamicImport(importExpression) {
@@ -5882,26 +5900,110 @@ class ChildScope extends Scope {
     }
 }
 
-class ParameterScope extends ChildScope {
+class CatchBodyScope extends ChildScope {
     constructor(parent, context) {
+        super(parent, context);
+        this.parent = parent;
+        this.context = context;
+    }
+    addDeclaration(identifier, context, init, kind) {
+        if (kind === "var" /* VariableKind.var */) {
+            const name = identifier.name;
+            const existingVariable = this.hoistedVariables?.get(name) || this.variables.get(name);
+            if (existingVariable) {
+                const existingKind = existingVariable.kind;
+                if (existingKind === "parameter" /* VariableKind.parameter */ &&
+                    // If this is a destructured parameter, it is forbidden to redeclare
+                    existingVariable.declarations[0].parent.type === CatchClause$1) {
+                    // If this is a var with the same name as the catch scope parameter,
+                    // 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);
+                    // 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
+                    // removed again.
+                    // We do not need to check whether there already is a linked
+                    // variable because then declaredVariable would be that linked
+                    // variable.
+                    existingVariable.renderLikeHoisted(declaredVariable);
+                    this.addHoistedVariable(name, declaredVariable);
+                    return declaredVariable;
+                }
+                if (existingKind === "var" /* VariableKind.var */) {
+                    existingVariable.addDeclaration(identifier, init);
+                    return existingVariable;
+                }
+                return context.error(logRedeclarationError(name), identifier.start);
+            }
+            // We only add parameters to parameter scopes
+            const declaredVariable = this.parent.parent.addDeclaration(identifier, context, init, kind);
+            // Necessary to make sure the init is deoptimized for conditional declarations.
+            // We cannot call deoptimizePath here.
+            declaredVariable.markInitializersForDeoptimization();
+            // We add the variable to this and all parent scopes to reliably detect conflicts
+            this.addHoistedVariable(name, declaredVariable);
+            return declaredVariable;
+        }
+        return super.addDeclaration(identifier, context, init, kind);
+    }
+}
+
+class FunctionBodyScope extends ChildScope {
+    constructor(parent, context) {
+        super(parent, context);
+        this.parent = parent;
+        this.context = context;
+    }
+    // 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) {
+        const name = identifier.name;
+        const existingVariable = this.hoistedVariables?.get(name) || this.variables.get(name);
+        if (existingVariable) {
+            const existingKind = existingVariable.kind;
+            if ((kind === "var" /* VariableKind.var */ || kind === "function" /* VariableKind.function */) &&
+                (existingKind === "var" /* VariableKind.var */ ||
+                    existingKind === "function" /* VariableKind.function */ ||
+                    existingKind === "parameter" /* VariableKind.parameter */)) {
+                existingVariable.addDeclaration(identifier, init);
+                return existingVariable;
+            }
+            context.error(logRedeclarationError(name), identifier.start);
+        }
+        const newVariable = new LocalVariable(identifier.name, identifier, init, context, kind);
+        this.variables.set(name, newVariable);
+        return newVariable;
+    }
+}
+
+class ParameterScope extends ChildScope {
+    constructor(parent, context, isCatchScope) {
         super(parent, context);
         this.parameters = [];
         this.hasRest = false;
-        this.hoistedBodyVarScope = new ChildScope(this, context);
+        this.bodyScope = isCatchScope
+            ? new CatchBodyScope(this, context)
+            : new FunctionBodyScope(this, context);
     }
     /**
      * Adds a parameter to this scope. Parameters must be added in the correct
      * order, i.e. from left to right.
      */
     addParameterDeclaration(identifier) {
-        const { name } = identifier;
-        const variable = new ParameterVariable(name, identifier, this.context);
-        const localVariable = this.hoistedBodyVarScope.variables.get(name);
-        if (localVariable) {
-            this.hoistedBodyVarScope.variables.set(name, variable);
-            variable.mergeDeclarations(localVariable);
+        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);
         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
+        // defaults are NOT taken from the body scope but from the parameters or
+        // outside scope.
+        this.bodyScope.addHoistedVariable(name, variable);
         return variable;
     }
     addParameterVariables(parameters, hasRest) {
@@ -7087,26 +7189,26 @@ class Identifier extends NodeBase {
         let variable;
         const { treeshake } = this.scope.context.options;
         switch (kind) {
-            case 'var': {
-                variable = this.scope.addDeclaration(this, this.scope.context, init, true);
+            case "var" /* VariableKind.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': {
+            case "function" /* VariableKind.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, false);
+                variable = this.scope.addDeclaration(this, this.scope.context, init, kind);
                 break;
             }
-            case 'let':
-            case 'const':
-            case 'class': {
-                variable = this.scope.addDeclaration(this, this.scope.context, init, false);
+            case "let" /* VariableKind.let */:
+            case "const" /* VariableKind.const */:
+            case "class" /* VariableKind.class */: {
+                variable = this.scope.addDeclaration(this, this.scope.context, init, kind);
                 break;
             }
-            case 'parameter': {
+            case "parameter" /* VariableKind.parameter */: {
                 variable = this.scope.addParameterDeclaration(this);
                 break;
             }
@@ -7116,13 +7218,15 @@ class Identifier extends NodeBase {
                 throw new Error(`Internal Error: Unexpected identifier kind ${kind}.`);
             }
         }
-        variable.kind = kind;
         return [(this.variable = variable)];
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         this.variable.deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
     }
     deoptimizePath(path) {
+        if (path.length === 0 && !this.scope.contains(this.name)) {
+            this.disallowImportReassignment();
+        }
         // We keep conditional chaining because an unknown Node could have an
         // Identifier as property that might be deoptimized by default
         this.variable?.deoptimizePath(path);
@@ -7137,7 +7241,7 @@ class Identifier extends NodeBase {
     hasEffects(context) {
         if (!this.deoptimized)
             this.applyDeoptimizations();
-        if (this.isPossibleTDZ() && this.variable.kind !== 'var') {
+        if (this.isPossibleTDZ() && this.variable.kind !== "var" /* VariableKind.var */) {
             return true;
         }
         return (this.scope.context.options.treeshake
@@ -7228,6 +7332,9 @@ class Identifier extends NodeBase {
             }
         }
     }
+    disallowImportReassignment() {
+        return this.scope.context.error(logIllegalImportReassignment(this.name, this.scope.context.module.id), this.start);
+    }
     applyDeoptimizations() {
         this.deoptimized = true;
         if (this.variable instanceof LocalVariable) {
@@ -7403,17 +7510,26 @@ function removeLineBreaks(code, start, end) {
 }
 
 class BlockScope extends ChildScope {
-    addDeclaration(identifier, context, init, isHoisted) {
-        if (isHoisted) {
-            const variable = this.parent.addDeclaration(identifier, context, init, isHoisted);
+    addDeclaration(identifier, context, init, kind) {
+        if (kind === "var" /* VariableKind.var */) {
+            const name = identifier.name;
+            const existingVariable = this.hoistedVariables?.get(name) || this.variables.get(name);
+            if (existingVariable) {
+                if (existingVariable.kind === "var" /* VariableKind.var */) {
+                    existingVariable.addDeclaration(identifier, init);
+                    return existingVariable;
+                }
+                return context.error(logRedeclarationError(name), identifier.start);
+            }
+            const declaredVariable = this.parent.addDeclaration(identifier, context, init, kind);
             // Necessary to make sure the init is deoptimized for conditional declarations.
             // We cannot call deoptimizePath here.
-            variable.markInitializersForDeoptimization();
-            return variable;
-        }
-        else {
-            return super.addDeclaration(identifier, context, init, false);
+            declaredVariable.markInitializersForDeoptimization();
+            // We add the variable to this and all parent scopes to reliably detect conflicts
+            this.addHoistedVariable(name, declaredVariable);
+            return declaredVariable;
         }
+        return super.addDeclaration(identifier, context, init, kind);
     }
 }
 
@@ -7651,7 +7767,6 @@ class FunctionBase extends NodeBase {
         this.scope.includeCallArguments(context, parameters);
     }
     initialise() {
-        this.scope.addParameterVariables(this.params.map(parameter => parameter.declare('parameter', UNKNOWN_EXPRESSION)), this.params[this.params.length - 1] instanceof RestElement);
         if (this.body instanceof BlockStatement) {
             this.body.addImplicitReturnExpressionToScope();
         }
@@ -7660,9 +7775,18 @@ class FunctionBase extends NodeBase {
         }
     }
     parseNode(esTreeNode) {
-        if (esTreeNode.body.type === BlockStatement$1) {
-            this.body = new BlockStatement(esTreeNode.body, this, this.scope.hoistedBodyVarScope);
-        }
+        const { body, params } = esTreeNode;
+        const parameters = (this.params = []);
+        const { scope } = this;
+        const { bodyScope, context } = scope;
+        // We need to ensure that parameters are declared before the body is parsed
+        // so that the scope already knows all parameters and can detect conflicts
+        // when parsing the body.
+        for (const parameter of params) {
+            parameters.push(new (context.getNodeConstructor(parameter.type))(parameter, this, scope, false));
+        }
+        scope.addParameterVariables(parameters.map(parameter => parameter.declare("parameter" /* VariableKind.parameter */, UNKNOWN_EXPRESSION)), parameters[parameters.length - 1] instanceof RestElement);
+        this.body = new (context.getNodeConstructor(body.type))(body, this, bodyScope);
         super.parseNode(esTreeNode);
     }
     addArgumentToBeDeoptimized(_argument) { }
@@ -7676,7 +7800,7 @@ class ArrowFunctionExpression extends FunctionBase {
         this.objectEntity = null;
     }
     createScope(parentScope) {
-        this.scope = new ReturnValueScope(parentScope, this.scope.context);
+        this.scope = new ReturnValueScope(parentScope, this.scope.context, false);
     }
     hasEffects() {
         if (!this.deoptimized)
@@ -7920,7 +8044,7 @@ class AssignmentPattern extends NodeBase {
 
 class ArgumentsVariable extends LocalVariable {
     constructor(context) {
-        super('arguments', null, UNKNOWN_EXPRESSION, context);
+        super('arguments', null, UNKNOWN_EXPRESSION, context, "other" /* VariableKind.other */);
         this.deoptimizedArguments = [];
     }
     addArgumentToBeDeoptimized(argument) {
@@ -7954,7 +8078,7 @@ class ThisVariable extends ParameterVariable {
 
 class FunctionScope extends ReturnValueScope {
     constructor(parent, context) {
-        super(parent, context);
+        super(parent, context, false);
         this.variables.set('arguments', (this.argumentsVariable = new ArgumentsVariable(context)));
         this.variables.set('this', (this.thisVariable = new ThisVariable(context)));
     }
@@ -8042,7 +8166,7 @@ class FunctionNode extends FunctionBase {
     }
     initialise() {
         super.initialise();
-        this.id?.declare('function', this);
+        this.id?.declare("function" /* VariableKind.function */, this);
     }
     addArgumentToBeDeoptimized(argument) {
         this.scope.argumentsVariable.addArgumentToBeDeoptimized(argument);
@@ -8767,37 +8891,22 @@ class CallExpression extends CallExpressionBase {
     }
 }
 
-class CatchScope extends ParameterScope {
-    addDeclaration(identifier, context, init, isHoisted) {
-        const existingParameter = this.variables.get(identifier.name);
-        if (existingParameter) {
-            // While we still create a hoisted declaration, the initializer goes to
-            // the parameter. Note that technically, the declaration now belongs to
-            // two variables, which is not correct but should not cause issues.
-            this.parent.addDeclaration(identifier, context, UNDEFINED_EXPRESSION, isHoisted);
-            existingParameter.addDeclaration(identifier, init);
-            return existingParameter;
-        }
-        return this.parent.addDeclaration(identifier, context, init, isHoisted);
-    }
-}
-
 class CatchClause extends NodeBase {
     createScope(parentScope) {
-        this.scope = new CatchScope(parentScope, this.scope.context);
+        this.scope = new ParameterScope(parentScope, this.scope.context, true);
     }
     parseNode(esTreeNode) {
-        // Parameters need to be declared first as the logic is that initializers
-        // of hoisted body variables are associated with parameters of the same
-        // name instead of the variable
-        const { param } = esTreeNode;
+        const { body, param, type } = esTreeNode;
+        this.type = type;
         if (param) {
             this.param = new (this.scope.context.getNodeConstructor(param.type))(param, this, this.scope);
-            this.param.declare('parameter', UNKNOWN_EXPRESSION);
+            this.param.declare("parameter" /* VariableKind.parameter */, UNKNOWN_EXPRESSION);
         }
+        this.body = new BlockStatement(body, this, this.scope.bodyScope);
         super.parseNode(esTreeNode);
     }
 }
+CatchClause.prototype.preventChildBlockScope = true;
 
 class ChainExpression extends NodeBase {
     // deoptimizations are not relevant as we are not caching values
@@ -8820,7 +8929,7 @@ class ChainExpression extends NodeBase {
 class ClassBodyScope extends ChildScope {
     constructor(parent, classNode, context) {
         super(parent, context);
-        this.variables.set('this', (this.thisVariable = new LocalVariable('this', null, classNode, context)));
+        this.variables.set('this', (this.thisVariable = new LocalVariable('this', null, classNode, context, "other" /* VariableKind.other */)));
         this.instanceScope = new ChildScope(this, context);
         this.instanceScope.variables.set('this', new ThisVariable(context));
     }
@@ -9004,7 +9113,7 @@ class ClassNode extends NodeBase {
         }
     }
     initialise() {
-        this.id?.declare('class', this);
+        this.id?.declare("class" /* VariableKind.class */, this);
         for (const method of this.body.body) {
             if (method instanceof MethodDefinition && method.kind === 'constructor') {
                 this.classConstructor = method;
@@ -9644,9 +9753,9 @@ class TrackingScope extends BlockScope {
         super(...arguments);
         this.hoistedDeclarations = [];
     }
-    addDeclaration(identifier, context, init, isHoisted) {
+    addDeclaration(identifier, context, init, kind) {
         this.hoistedDeclarations.push(identifier);
-        return super.addDeclaration(identifier, context, init, isHoisted);
+        return super.addDeclaration(identifier, context, init, kind);
     }
 }
 
@@ -11372,7 +11481,7 @@ class UndefinedVariable extends Variable {
 
 class ExportDefaultVariable extends LocalVariable {
     constructor(name, exportDefaultDeclaration, context) {
-        super(name, exportDefaultDeclaration, exportDefaultDeclaration.declaration, context);
+        super(name, exportDefaultDeclaration, exportDefaultDeclaration.declaration, context, "other" /* VariableKind.other */);
         this.hasId = false;
         this.originalId = null;
         this.originalVariable = null;
@@ -11443,7 +11552,13 @@ class ExportDefaultVariable extends LocalVariable {
 class ModuleScope extends ChildScope {
     constructor(parent, context) {
         super(parent, context);
-        this.variables.set('this', new LocalVariable('this', null, UNDEFINED_EXPRESSION, context));
+        this.variables.set('this', new LocalVariable('this', null, UNDEFINED_EXPRESSION, context, "other" /* VariableKind.other */));
+    }
+    addDeclaration(identifier, context, init, kind) {
+        if (this.context.module.importDescriptions.has(identifier.name)) {
+            context.error(logRedeclarationError(identifier.name), identifier.start);
+        }
+        return super.addDeclaration(identifier, context, init, kind);
     }
     addExportDefaultDeclaration(name, exportDefaultDeclaration, context) {
         const variable = new ExportDefaultVariable(name, exportDefaultDeclaration, context);
@@ -12040,7 +12155,7 @@ class NamespaceVariable extends Variable {
             memberVariable.hasEffectsOnInteractionAtPath(path.slice(1), interaction, context));
     }
     include() {
-        this.included = true;
+        super.include();
         this.context.includeAllExports();
     }
     prepare(accessedGlobalsByScope) {
@@ -12134,7 +12249,7 @@ class SyntheticNamedExportVariable extends Variable {
         return `${this.syntheticNamespace.getName(getPropertyAccess)}${getPropertyAccess(this.name)}`;
     }
     include() {
-        this.included = true;
+        super.include();
         this.context.includeVariableInModule(this.syntheticNamespace);
     }
     setRenderNames(baseName, name) {
@@ -12743,7 +12858,7 @@ class Module {
         const removedExports = [];
         for (const exportName of this.exports.keys()) {
             const [variable] = this.getVariableForExportName(exportName);
-            (variable && variable.included ? renderedExports : removedExports).push(exportName);
+            (variable?.included ? renderedExports : removedExports).push(exportName);
         }
         return { removedExports, renderedExports };
     }
@@ -12840,6 +12955,9 @@ class Module {
         for (const exportName of this.exports.keys()) {
             if (includeNamespaceMembers || exportName !== this.info.syntheticNamedExports) {
                 const variable = this.getVariableForExportName(exportName)[0];
+                if (!variable) {
+                    return error(logMissingEntryExport(exportName, this.id));
+                }
                 variable.deoptimizePath(UNKNOWN_PATH);
                 if (!variable.included) {
                     this.includeVariable(variable);
@@ -13077,9 +13195,15 @@ class Module {
         }
         this.dynamicImports.push({ argument, id: null, node, resolution: null });
     }
+    assertUniqueExportName(name, nodeStart) {
+        if (this.exports.has(name) || this.reexportDescriptions.has(name)) {
+            this.error(logDuplicateExportError(name), nodeStart);
+        }
+    }
     addExport(node) {
         if (node instanceof ExportDefaultDeclaration) {
             // export default foo;
+            this.assertUniqueExportName('default', node.start);
             this.exports.set('default', {
                 identifier: node.variable.getAssignedVariableName(),
                 localName: 'default'
@@ -13091,6 +13215,7 @@ class Module {
             if (node.exported) {
                 // export * as name from './other'
                 const name = node.exported.name;
+                this.assertUniqueExportName(name, node.exported.start);
                 this.reexportDescriptions.set(name, {
                     localName: '*',
                     module: null,
@@ -13109,6 +13234,7 @@ class Module {
             this.addSource(source, node);
             for (const { exported, local, start } of node.specifiers) {
                 const name = exported instanceof Literal ? exported.value : exported.name;
+                this.assertUniqueExportName(name, start);
                 this.reexportDescriptions.set(name, {
                     localName: local instanceof Literal ? local.value : local.name,
                     module: null,
@@ -13124,6 +13250,7 @@ class Module {
                 // export var foo = 1, bar = 2;
                 for (const declarator of declaration.declarations) {
                     for (const localName of extractAssignedNames(declarator.id)) {
+                        this.assertUniqueExportName(localName, declarator.id.start);
                         this.exports.set(localName, { identifier: null, localName });
                     }
                 }
@@ -13131,6 +13258,7 @@ class Module {
             else {
                 // export function foo () {}
                 const localName = declaration.id.name;
+                this.assertUniqueExportName(localName, declaration.id.start);
                 this.exports.set(localName, { identifier: null, localName });
             }
         }
@@ -13140,6 +13268,7 @@ class Module {
                 // except for reexports, local must be an Identifier
                 const localName = local.name;
                 const exportedName = exported instanceof Identifier ? exported.name : exported.value;
+                this.assertUniqueExportName(exportedName, exported.start);
                 this.exports.set(exportedName, { identifier: null, localName });
             }
         }
@@ -13148,6 +13277,10 @@ class Module {
         const source = node.source.value;
         this.addSource(source, node);
         for (const specifier of node.specifiers) {
+            const localName = specifier.local.name;
+            if (this.scope.variables.has(localName) || this.importDescriptions.has(localName)) {
+                this.error(logRedeclarationError(localName), specifier.local.start);
+            }
             const name = specifier instanceof ImportDefaultSpecifier
                 ? 'default'
                 : specifier instanceof ImportNamespaceSpecifier
@@ -13155,7 +13288,7 @@ class Module {
                     : specifier.imported instanceof Identifier
                         ? specifier.imported.name
                         : specifier.imported.value;
-            this.importDescriptions.set(specifier.local.name, {
+            this.importDescriptions.set(localName, {
                 module: null,
                 name,
                 source,