rollup 3.2.4 → 3.2.5

package/dist/bin/rollup

@@ -2,8 +2,8 @@
 
 /*
   @license
-	Rollup.js v3.2.4
-	Mon, 31 Oct 2022 19:14:16 GMT - commit bac9826579aff66109b29c48aa4f0731792f6a26
+	Rollup.js v3.2.5
+	Tue, 01 Nov 2022 05:28:36 GMT - commit 465d2396ba8dabba0366461d4014998cc13a9cc2
 
 	https://github.com/rollup/rollup
 

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.2.4
-	Mon, 31 Oct 2022 19:14:16 GMT - commit bac9826579aff66109b29c48aa4f0731792f6a26
+	Rollup.js v3.2.5
+	Tue, 01 Nov 2022 05:28:36 GMT - commit 465d2396ba8dabba0366461d4014998cc13a9cc2
 
 	https://github.com/rollup/rollup
 

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.2.4
-	Mon, 31 Oct 2022 19:14:16 GMT - commit bac9826579aff66109b29c48aa4f0731792f6a26
+	Rollup.js v3.2.5
+	Tue, 01 Nov 2022 05:28:36 GMT - commit 465d2396ba8dabba0366461d4014998cc13a9cc2
 
 	https://github.com/rollup/rollup
 
@@ -16,7 +16,7 @@ import { promises } from 'node:fs';
 import { EventEmitter } from 'node:events';
 import * as tty from 'tty';
 
-var version$1 = "3.2.4";
+var version$1 = "3.2.5";
 
 var charToInteger = {};
 var chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -1825,6 +1825,7 @@ class Variable extends ExpressionEntity {
         super();
         this.name = name;
         this.alwaysRendered = false;
+        this.forbiddenNames = null;
         this.initReached = false;
         this.isId = false;
         this.isReassigned = false;
@@ -1837,6 +1838,13 @@ class Variable extends ExpressionEntity {
      * Necessary to be able to change variable names.
      */
     addReference(_identifier) { }
+    /**
+     * Prevent this variable from being renamed to this name to avoid name
+     * collisions
+     */
+    forbidName(name) {
+        (this.forbiddenNames || (this.forbiddenNames = new Set())).add(name);
+    }
     getBaseVariableName() {
         return this.renderBaseName || this.renderName || this.name;
     }
@@ -6562,10 +6570,10 @@ function toBase64(value) {
     return outString;
 }
 
-function getSafeName(baseName, usedNames) {
+function getSafeName(baseName, usedNames, forbiddenNames) {
     let safeName = baseName;
     let count = 1;
-    while (usedNames.has(safeName) || RESERVED_NAMES$1.has(safeName)) {
+    while (usedNames.has(safeName) || RESERVED_NAMES$1.has(safeName) || forbiddenNames?.has(safeName)) {
         safeName = `${baseName}$${toBase64(count++)}`;
     }
     usedNames.add(safeName);
@@ -6658,7 +6666,7 @@ class ChildScope extends Scope$1 {
         }
         for (const [name, variable] of this.variables) {
             if (variable.included || variable.alwaysRendered) {
-                variable.setRenderNames(null, getSafeName(name, usedNames));
+                variable.setRenderNames(null, getSafeName(name, usedNames, variable.forbiddenNames));
             }
         }
         for (const scope of this.children) {
@@ -9634,6 +9642,18 @@ class ClassDeclaration extends ClassNode {
         }
         super.render(code, options);
     }
+    applyDeoptimizations() {
+        super.applyDeoptimizations();
+        const { id, scope } = this;
+        if (id) {
+            const { name, variable } = id;
+            for (const accessedVariable of scope.accessedOutsideVariables.values()) {
+                if (accessedVariable !== variable) {
+                    accessedVariable.forbidName(name);
+                }
+            }
+        }
+    }
 }
 
 class ClassExpression extends ClassNode {
@@ -12124,16 +12144,21 @@ class VariableDeclarator extends NodeBase {
         this.id.deoptimizePath(path);
     }
     hasEffects(context) {
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
         const initEffect = this.init?.hasEffects(context);
         this.id.markDeclarationReached();
         return initEffect || this.id.hasEffects(context);
     }
     include(context, includeChildrenRecursively) {
+        const { deoptimized, id, init } = this;
+        if (!deoptimized)
+            this.applyDeoptimizations();
         this.included = true;
-        this.init?.include(context, includeChildrenRecursively);
-        this.id.markDeclarationReached();
-        if (includeChildrenRecursively || this.id.shouldBeIncluded(context)) {
-            this.id.include(context, includeChildrenRecursively);
+        init?.include(context, includeChildrenRecursively);
+        id.markDeclarationReached();
+        if (includeChildrenRecursively || id.shouldBeIncluded(context)) {
+            id.include(context, includeChildrenRecursively);
         }
     }
     render(code, options) {
@@ -12161,7 +12186,18 @@ class VariableDeclarator extends NodeBase {
             code.appendLeft(end, `${_}=${_}void 0`);
         }
     }
-    applyDeoptimizations() { }
+    applyDeoptimizations() {
+        this.deoptimized = true;
+        const { id, init } = this;
+        if (init && id instanceof Identifier && init instanceof ClassExpression && !init.id) {
+            const { name, variable } = id;
+            for (const accessedVariable of init.scope.accessedOutsideVariables.values()) {
+                if (accessedVariable !== variable) {
+                    accessedVariable.forbidName(name);
+                }
+            }
+        }
+    }
 }
 
 class WhileStatement extends NodeBase {
@@ -14296,7 +14332,7 @@ function deconflictImportsEsmOrSystem(usedNames, imports, dependenciesToBeDeconf
     // This is needed for namespace reexports
     for (const dependency of dependenciesToBeDeconflicted.dependencies) {
         if (preserveModules || dependency instanceof ExternalChunk) {
-            dependency.variableName = getSafeName(dependency.suggestedVariableName, usedNames);
+            dependency.variableName = getSafeName(dependency.suggestedVariableName, usedNames, null);
         }
     }
     for (const variable of imports) {
@@ -14310,29 +14346,29 @@ function deconflictImportsEsmOrSystem(usedNames, imports, dependenciesToBeDeconf
         else if (module instanceof ExternalModule && name === 'default') {
             variable.setRenderNames(null, getSafeName([...module.exportedVariables].some(([exportedVariable, exportedName]) => exportedName === '*' && exportedVariable.included)
                 ? module.suggestedVariableName + '__default'
-                : module.suggestedVariableName, usedNames));
+                : module.suggestedVariableName, usedNames, variable.forbiddenNames));
         }
         else {
-            variable.setRenderNames(null, getSafeName(name, usedNames));
+            variable.setRenderNames(null, getSafeName(name, usedNames, variable.forbiddenNames));
         }
     }
     for (const variable of syntheticExports) {
-        variable.setRenderNames(null, getSafeName(variable.name, usedNames));
+        variable.setRenderNames(null, getSafeName(variable.name, usedNames, variable.forbiddenNames));
     }
 }
 function deconflictImportsOther(usedNames, imports, { deconflictedDefault, deconflictedNamespace, dependencies }, interop, preserveModules, externalLiveBindings, chunkByModule, externalChunkByModule) {
     for (const chunk of dependencies) {
-        chunk.variableName = getSafeName(chunk.suggestedVariableName, usedNames);
+        chunk.variableName = getSafeName(chunk.suggestedVariableName, usedNames, null);
     }
     for (const chunk of deconflictedNamespace) {
-        chunk.namespaceVariableName = getSafeName(`${chunk.suggestedVariableName}__namespace`, usedNames);
+        chunk.namespaceVariableName = getSafeName(`${chunk.suggestedVariableName}__namespace`, usedNames, null);
     }
     for (const externalModule of deconflictedDefault) {
         externalModule.defaultVariableName =
             deconflictedNamespace.has(externalModule) &&
                 canDefaultBeTakenFromNamespace(interop(externalModule.id), externalLiveBindings)
                 ? externalModule.namespaceVariableName
-                : getSafeName(`${externalModule.suggestedVariableName}__default`, usedNames);
+                : getSafeName(`${externalModule.suggestedVariableName}__default`, usedNames, null);
     }
     for (const variable of imports) {
         const module = variable.module;
@@ -14382,12 +14418,12 @@ function deconflictTopLevelVariables(usedNames, modules, includedNamespaces) {
                 // this will only happen for exports in some formats
                 !(variable.renderBaseName ||
                     (variable instanceof ExportDefaultVariable && variable.getOriginalVariable() !== variable))) {
-                variable.setRenderNames(null, getSafeName(variable.name, usedNames));
+                variable.setRenderNames(null, getSafeName(variable.name, usedNames, variable.forbiddenNames));
             }
         }
         if (includedNamespaces.has(module)) {
             const namespace = module.namespace;
-            namespace.setRenderNames(null, getSafeName(namespace.name, usedNames));
+            namespace.setRenderNames(null, getSafeName(namespace.name, usedNames, namespace.forbiddenNames));
         }
     }
 }

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.2.4
-	Mon, 31 Oct 2022 19:14:16 GMT - commit bac9826579aff66109b29c48aa4f0731792f6a26
+	Rollup.js v3.2.5
+	Tue, 01 Nov 2022 05:28:36 GMT - commit 465d2396ba8dabba0366461d4014998cc13a9cc2
 
 	https://github.com/rollup/rollup
 

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.2.4
-	Mon, 31 Oct 2022 19:14:16 GMT - commit bac9826579aff66109b29c48aa4f0731792f6a26
+	Rollup.js v3.2.5
+	Tue, 01 Nov 2022 05:28:36 GMT - commit 465d2396ba8dabba0366461d4014998cc13a9cc2
 
 	https://github.com/rollup/rollup
 

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.2.4
-	Mon, 31 Oct 2022 19:14:16 GMT - commit bac9826579aff66109b29c48aa4f0731792f6a26
+	Rollup.js v3.2.5
+	Tue, 01 Nov 2022 05:28:36 GMT - commit 465d2396ba8dabba0366461d4014998cc13a9cc2
 
 	https://github.com/rollup/rollup
 

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.2.4
-	Mon, 31 Oct 2022 19:14:16 GMT - commit bac9826579aff66109b29c48aa4f0731792f6a26
+	Rollup.js v3.2.5
+	Tue, 01 Nov 2022 05:28:36 GMT - commit 465d2396ba8dabba0366461d4014998cc13a9cc2
 
 	https://github.com/rollup/rollup
 

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.2.4
-	Mon, 31 Oct 2022 19:14:16 GMT - commit bac9826579aff66109b29c48aa4f0731792f6a26
+	Rollup.js v3.2.5
+	Tue, 01 Nov 2022 05:28:36 GMT - commit 465d2396ba8dabba0366461d4014998cc13a9cc2
 
 	https://github.com/rollup/rollup
 

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.2.4
-	Mon, 31 Oct 2022 19:14:16 GMT - commit bac9826579aff66109b29c48aa4f0731792f6a26
+	Rollup.js v3.2.5
+	Tue, 01 Nov 2022 05:28:36 GMT - commit 465d2396ba8dabba0366461d4014998cc13a9cc2
 
 	https://github.com/rollup/rollup
 
@@ -31,7 +31,7 @@ function _interopNamespaceDefault(e) {
 
 const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty);
 
-var version$1 = "3.2.4";
+var version$1 = "3.2.5";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -2964,6 +2964,7 @@ class Variable extends ExpressionEntity {
         super();
         this.name = name;
         this.alwaysRendered = false;
+        this.forbiddenNames = null;
         this.initReached = false;
         this.isId = false;
         this.isReassigned = false;
@@ -2976,6 +2977,13 @@ class Variable extends ExpressionEntity {
      * Necessary to be able to change variable names.
      */
     addReference(_identifier) { }
+    /**
+     * Prevent this variable from being renamed to this name to avoid name
+     * collisions
+     */
+    forbidName(name) {
+        (this.forbiddenNames || (this.forbiddenNames = new Set())).add(name);
+    }
     getBaseVariableName() {
         return this.renderBaseName || this.renderName || this.name;
     }
@@ -7073,10 +7081,10 @@ function toBase64(value) {
     return outString;
 }
 
-function getSafeName(baseName, usedNames) {
+function getSafeName(baseName, usedNames, forbiddenNames) {
     let safeName = baseName;
     let count = 1;
-    while (usedNames.has(safeName) || RESERVED_NAMES$1.has(safeName)) {
+    while (usedNames.has(safeName) || RESERVED_NAMES$1.has(safeName) || forbiddenNames?.has(safeName)) {
         safeName = `${baseName}$${toBase64(count++)}`;
     }
     usedNames.add(safeName);
@@ -7169,7 +7177,7 @@ class ChildScope extends Scope$1 {
         }
         for (const [name, variable] of this.variables) {
             if (variable.included || variable.alwaysRendered) {
-                variable.setRenderNames(null, getSafeName(name, usedNames));
+                variable.setRenderNames(null, getSafeName(name, usedNames, variable.forbiddenNames));
             }
         }
         for (const scope of this.children) {
@@ -10145,6 +10153,18 @@ class ClassDeclaration extends ClassNode {
         }
         super.render(code, options);
     }
+    applyDeoptimizations() {
+        super.applyDeoptimizations();
+        const { id, scope } = this;
+        if (id) {
+            const { name, variable } = id;
+            for (const accessedVariable of scope.accessedOutsideVariables.values()) {
+                if (accessedVariable !== variable) {
+                    accessedVariable.forbidName(name);
+                }
+            }
+        }
+    }
 }
 
 class ClassExpression extends ClassNode {
@@ -12635,16 +12655,21 @@ class VariableDeclarator extends NodeBase {
         this.id.deoptimizePath(path);
     }
     hasEffects(context) {
+        if (!this.deoptimized)
+            this.applyDeoptimizations();
         const initEffect = this.init?.hasEffects(context);
         this.id.markDeclarationReached();
         return initEffect || this.id.hasEffects(context);
     }
     include(context, includeChildrenRecursively) {
+        const { deoptimized, id, init } = this;
+        if (!deoptimized)
+            this.applyDeoptimizations();
         this.included = true;
-        this.init?.include(context, includeChildrenRecursively);
-        this.id.markDeclarationReached();
-        if (includeChildrenRecursively || this.id.shouldBeIncluded(context)) {
-            this.id.include(context, includeChildrenRecursively);
+        init?.include(context, includeChildrenRecursively);
+        id.markDeclarationReached();
+        if (includeChildrenRecursively || id.shouldBeIncluded(context)) {
+            id.include(context, includeChildrenRecursively);
         }
     }
     render(code, options) {
@@ -12672,7 +12697,18 @@ class VariableDeclarator extends NodeBase {
             code.appendLeft(end, `${_}=${_}void 0`);
         }
     }
-    applyDeoptimizations() { }
+    applyDeoptimizations() {
+        this.deoptimized = true;
+        const { id, init } = this;
+        if (init && id instanceof Identifier && init instanceof ClassExpression && !init.id) {
+            const { name, variable } = id;
+            for (const accessedVariable of init.scope.accessedOutsideVariables.values()) {
+                if (accessedVariable !== variable) {
+                    accessedVariable.forbidName(name);
+                }
+            }
+        }
+    }
 }
 
 class WhileStatement extends NodeBase {
@@ -14807,7 +14843,7 @@ function deconflictImportsEsmOrSystem(usedNames, imports, dependenciesToBeDeconf
     // This is needed for namespace reexports
     for (const dependency of dependenciesToBeDeconflicted.dependencies) {
         if (preserveModules || dependency instanceof ExternalChunk) {
-            dependency.variableName = getSafeName(dependency.suggestedVariableName, usedNames);
+            dependency.variableName = getSafeName(dependency.suggestedVariableName, usedNames, null);
         }
     }
     for (const variable of imports) {
@@ -14821,29 +14857,29 @@ function deconflictImportsEsmOrSystem(usedNames, imports, dependenciesToBeDeconf
         else if (module instanceof ExternalModule && name === 'default') {
             variable.setRenderNames(null, getSafeName([...module.exportedVariables].some(([exportedVariable, exportedName]) => exportedName === '*' && exportedVariable.included)
                 ? module.suggestedVariableName + '__default'
-                : module.suggestedVariableName, usedNames));
+                : module.suggestedVariableName, usedNames, variable.forbiddenNames));
         }
         else {
-            variable.setRenderNames(null, getSafeName(name, usedNames));
+            variable.setRenderNames(null, getSafeName(name, usedNames, variable.forbiddenNames));
         }
     }
     for (const variable of syntheticExports) {
-        variable.setRenderNames(null, getSafeName(variable.name, usedNames));
+        variable.setRenderNames(null, getSafeName(variable.name, usedNames, variable.forbiddenNames));
     }
 }
 function deconflictImportsOther(usedNames, imports, { deconflictedDefault, deconflictedNamespace, dependencies }, interop, preserveModules, externalLiveBindings, chunkByModule, externalChunkByModule) {
     for (const chunk of dependencies) {
-        chunk.variableName = getSafeName(chunk.suggestedVariableName, usedNames);
+        chunk.variableName = getSafeName(chunk.suggestedVariableName, usedNames, null);
     }
     for (const chunk of deconflictedNamespace) {
-        chunk.namespaceVariableName = getSafeName(`${chunk.suggestedVariableName}__namespace`, usedNames);
+        chunk.namespaceVariableName = getSafeName(`${chunk.suggestedVariableName}__namespace`, usedNames, null);
     }
     for (const externalModule of deconflictedDefault) {
         externalModule.defaultVariableName =
             deconflictedNamespace.has(externalModule) &&
                 canDefaultBeTakenFromNamespace(interop(externalModule.id), externalLiveBindings)
                 ? externalModule.namespaceVariableName
-                : getSafeName(`${externalModule.suggestedVariableName}__default`, usedNames);
+                : getSafeName(`${externalModule.suggestedVariableName}__default`, usedNames, null);
     }
     for (const variable of imports) {
         const module = variable.module;
@@ -14893,12 +14929,12 @@ function deconflictTopLevelVariables(usedNames, modules, includedNamespaces) {
                 // this will only happen for exports in some formats
                 !(variable.renderBaseName ||
                     (variable instanceof ExportDefaultVariable && variable.getOriginalVariable() !== variable))) {
-                variable.setRenderNames(null, getSafeName(variable.name, usedNames));
+                variable.setRenderNames(null, getSafeName(variable.name, usedNames, variable.forbiddenNames));
             }
         }
         if (includedNamespaces.has(module)) {
             const namespace = module.namespace;
-            namespace.setRenderNames(null, getSafeName(namespace.name, usedNames));
+            namespace.setRenderNames(null, getSafeName(namespace.name, usedNames, namespace.forbiddenNames));
         }
     }
 }

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.2.4
-	Mon, 31 Oct 2022 19:14:16 GMT - commit bac9826579aff66109b29c48aa4f0731792f6a26
+	Rollup.js v3.2.5
+	Tue, 01 Nov 2022 05:28:36 GMT - commit 465d2396ba8dabba0366461d4014998cc13a9cc2
 
 	https://github.com/rollup/rollup
 

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.2.4
-	Mon, 31 Oct 2022 19:14:16 GMT - commit bac9826579aff66109b29c48aa4f0731792f6a26
+	Rollup.js v3.2.5
+	Tue, 01 Nov 2022 05:28:36 GMT - commit 465d2396ba8dabba0366461d4014998cc13a9cc2
 
 	https://github.com/rollup/rollup
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "3.2.4",
+  "version": "3.2.5",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",