rollup 3.20.3 → 3.20.5

package/dist/bin/rollup

@@ -2,8 +2,8 @@
 
 /*
   @license
-	Rollup.js v3.20.3
-	Sun, 16 Apr 2023 13:03:29 GMT - commit bd675b104147594767b56df2756426d032a68583
+	Rollup.js v3.20.5
+	Tue, 18 Apr 2023 05:00:18 GMT - commit 8411bd07421c8b02b53722fb943cb96700a6e058
 
 	https://github.com/rollup/rollup
 

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.3
-	Sun, 16 Apr 2023 13:03:29 GMT - commit bd675b104147594767b56df2756426d032a68583
+	Rollup.js v3.20.5
+	Tue, 18 Apr 2023 05:00:18 GMT - commit 8411bd07421c8b02b53722fb943cb96700a6e058
 
 	https://github.com/rollup/rollup
 

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

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.3
-	Sun, 16 Apr 2023 13:03:29 GMT - commit bd675b104147594767b56df2756426d032a68583
+	Rollup.js v3.20.5
+	Tue, 18 Apr 2023 05:00:18 GMT - commit 8411bd07421c8b02b53722fb943cb96700a6e058
 
 	https://github.com/rollup/rollup
 
@@ -16,7 +16,7 @@ import { lstat, realpath, readdir, readFile, mkdir, writeFile } from 'node:fs/pr
 import { EventEmitter } from 'node:events';
 import * as tty from 'tty';
 
-var version$1 = "3.20.3";
+var version$1 = "3.20.5";
 
 const comma = ','.charCodeAt(0);
 const semicolon = ';'.charCodeAt(0);
@@ -5039,12 +5039,11 @@ const builtins = 'arguments Infinity NaN undefined null true false eval uneval i
 const forbiddenIdentifiers = new Set(`${reservedWords$1} ${builtins}`.split(' '));
 forbiddenIdentifiers.add('');
 
-const BROKEN_FLOW_NONE = 0;
-const BROKEN_FLOW_BREAK_CONTINUE = 1;
-const BROKEN_FLOW_ERROR_RETURN_LABEL = 2;
 function createInclusionContext() {
     return {
-        brokenFlow: BROKEN_FLOW_NONE,
+        brokenFlow: false,
+        hasBreak: false,
+        hasContinue: false,
         includedCallArguments: new Set(),
         includedLabels: new Set()
     };
@@ -5053,8 +5052,10 @@ function createHasEffectsContext() {
     return {
         accessed: new PathTracker(),
         assigned: new PathTracker(),
-        brokenFlow: BROKEN_FLOW_NONE,
+        brokenFlow: false,
         called: new DiscriminatedPathTracker(),
+        hasBreak: false,
+        hasContinue: false,
         ignore: {
             breaks: false,
             continues: false,
@@ -6859,11 +6860,17 @@ function toBase64(value) {
     return outString;
 }
 
+const validIdentifier = /^(?!\d)[\w$]+$/;
+function isValidIdentifier(name) {
+    return validIdentifier.test(name);
+}
+
 function getSafeName(baseName, usedNames, forbiddenNames) {
-    let safeName = baseName;
+    const safeBase = isValidIdentifier(baseName) ? baseName : '_safe';
+    let safeName = safeBase;
     let count = 1;
     while (usedNames.has(safeName) || RESERVED_NAMES$1.has(safeName) || forbiddenNames?.has(safeName)) {
-        safeName = `${baseName}$${toBase64(count++)}`;
+        safeName = `${safeBase}$${toBase64(count++)}`;
     }
     usedNames.add(safeName);
     return safeName;
@@ -8672,7 +8679,7 @@ class FunctionBase extends NodeBase {
             this.applyDeoptimizations();
         this.included = true;
         const { brokenFlow } = context;
-        context.brokenFlow = BROKEN_FLOW_NONE;
+        context.brokenFlow = false;
         this.body.include(context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
@@ -9150,13 +9157,13 @@ class BreakStatement extends NodeBase {
             if (!context.ignore.labels.has(this.label.name))
                 return true;
             context.includedLabels.add(this.label.name);
-            context.brokenFlow = BROKEN_FLOW_ERROR_RETURN_LABEL;
         }
         else {
             if (!context.ignore.breaks)
                 return true;
-            context.brokenFlow = BROKEN_FLOW_BREAK_CONTINUE;
+            context.hasBreak = true;
         }
+        context.brokenFlow = true;
         return false;
     }
     include(context) {
@@ -9165,7 +9172,10 @@ class BreakStatement extends NodeBase {
             this.label.include();
             context.includedLabels.add(this.label.name);
         }
-        context.brokenFlow = this.label ? BROKEN_FLOW_ERROR_RETURN_LABEL : BROKEN_FLOW_BREAK_CONTINUE;
+        else {
+            context.hasBreak = true;
+        }
+        context.brokenFlow = true;
     }
 }
 
@@ -10238,13 +10248,13 @@ class ContinueStatement extends NodeBase {
             if (!context.ignore.labels.has(this.label.name))
                 return true;
             context.includedLabels.add(this.label.name);
-            context.brokenFlow = BROKEN_FLOW_ERROR_RETURN_LABEL;
         }
         else {
             if (!context.ignore.continues)
                 return true;
-            context.brokenFlow = BROKEN_FLOW_BREAK_CONTINUE;
+            context.hasContinue = true;
         }
+        context.brokenFlow = true;
         return false;
     }
     include(context) {
@@ -10253,31 +10263,49 @@ class ContinueStatement extends NodeBase {
             this.label.include();
             context.includedLabels.add(this.label.name);
         }
-        context.brokenFlow = this.label ? BROKEN_FLOW_ERROR_RETURN_LABEL : BROKEN_FLOW_BREAK_CONTINUE;
+        else {
+            context.hasContinue = true;
+        }
+        context.brokenFlow = true;
     }
 }
 
+function hasLoopBodyEffects(context, body) {
+    const { brokenFlow, hasBreak, hasContinue, ignore } = context;
+    const { breaks, continues } = ignore;
+    ignore.breaks = true;
+    ignore.continues = true;
+    context.hasBreak = false;
+    context.hasContinue = false;
+    if (body.hasEffects(context))
+        return true;
+    ignore.breaks = breaks;
+    ignore.continues = continues;
+    context.hasBreak = hasBreak;
+    context.hasContinue = hasContinue;
+    context.brokenFlow = brokenFlow;
+    return false;
+}
+function includeLoopBody(context, body, includeChildrenRecursively) {
+    const { brokenFlow, hasBreak, hasContinue } = context;
+    context.hasBreak = false;
+    context.hasContinue = false;
+    body.include(context, includeChildrenRecursively, { asSingleStatement: true });
+    context.hasBreak = hasBreak;
+    context.hasContinue = hasContinue;
+    context.brokenFlow = brokenFlow;
+}
+
 class DoWhileStatement extends NodeBase {
     hasEffects(context) {
         if (this.test.hasEffects(context))
             return true;
-        const { brokenFlow, ignore } = context;
-        const { breaks, continues } = ignore;
-        ignore.breaks = true;
-        ignore.continues = true;
-        if (this.body.hasEffects(context))
-            return true;
-        ignore.breaks = breaks;
-        ignore.continues = continues;
-        context.brokenFlow = brokenFlow;
-        return false;
+        return hasLoopBodyEffects(context, this.body);
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
         this.test.include(context, includeChildrenRecursively);
-        const { brokenFlow } = context;
-        this.body.include(context, includeChildrenRecursively, { asSingleStatement: true });
-        context.brokenFlow = brokenFlow;
+        includeLoopBody(context, this.body, includeChildrenRecursively);
     }
 }
 
@@ -10443,16 +10471,7 @@ class ForInStatement extends NodeBase {
             this.applyDeoptimizations();
         if (left.hasEffectsAsAssignmentTarget(context, false) || right.hasEffects(context))
             return true;
-        const { brokenFlow, ignore } = context;
-        const { breaks, continues } = ignore;
-        ignore.breaks = true;
-        ignore.continues = true;
-        if (body.hasEffects(context))
-            return true;
-        ignore.breaks = breaks;
-        ignore.continues = continues;
-        context.brokenFlow = brokenFlow;
-        return false;
+        return hasLoopBodyEffects(context, body);
     }
     include(context, includeChildrenRecursively) {
         const { body, deoptimized, left, right } = this;
@@ -10461,9 +10480,7 @@ class ForInStatement extends NodeBase {
         this.included = true;
         left.includeAsAssignmentTarget(context, includeChildrenRecursively || true, false);
         right.include(context, includeChildrenRecursively);
-        const { brokenFlow } = context;
-        body.include(context, includeChildrenRecursively, { asSingleStatement: true });
-        context.brokenFlow = brokenFlow;
+        includeLoopBody(context, body, includeChildrenRecursively);
     }
     initialise() {
         this.left.setAssignedValue(UNKNOWN_EXPRESSION);
@@ -10501,9 +10518,7 @@ class ForOfStatement extends NodeBase {
         this.included = true;
         left.includeAsAssignmentTarget(context, includeChildrenRecursively || true, false);
         right.include(context, includeChildrenRecursively);
-        const { brokenFlow } = context;
-        body.include(context, includeChildrenRecursively, { asSingleStatement: true });
-        context.brokenFlow = brokenFlow;
+        includeLoopBody(context, body, includeChildrenRecursively);
     }
     initialise() {
         this.left.setAssignedValue(UNKNOWN_EXPRESSION);
@@ -10531,27 +10546,17 @@ class ForStatement extends NodeBase {
     hasEffects(context) {
         if (this.init?.hasEffects(context) ||
             this.test?.hasEffects(context) ||
-            this.update?.hasEffects(context))
+            this.update?.hasEffects(context)) {
             return true;
-        const { brokenFlow, ignore } = context;
-        const { breaks, continues } = ignore;
-        ignore.breaks = true;
-        ignore.continues = true;
-        if (this.body.hasEffects(context))
-            return true;
-        ignore.breaks = breaks;
-        ignore.continues = continues;
-        context.brokenFlow = brokenFlow;
-        return false;
+        }
+        return hasLoopBodyEffects(context, this.body);
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
         this.init?.include(context, includeChildrenRecursively, { asSingleStatement: true });
         this.test?.include(context, includeChildrenRecursively);
-        const { brokenFlow } = context;
         this.update?.include(context, includeChildrenRecursively);
-        this.body.include(context, includeChildrenRecursively, { asSingleStatement: true });
-        context.brokenFlow = brokenFlow;
+        includeLoopBody(context, this.body, includeChildrenRecursively);
     }
     render(code, options) {
         this.init?.render(code, options, NO_SEMICOLON);
@@ -10607,9 +10612,8 @@ class IfStatement extends NodeBase {
                 return false;
             if (this.alternate.hasEffects(context))
                 return true;
-            context.brokenFlow =
-                // eslint-disable-next-line unicorn/consistent-destructuring
-                context.brokenFlow < consequentBrokenFlow ? context.brokenFlow : consequentBrokenFlow;
+            // eslint-disable-next-line unicorn/consistent-destructuring
+            context.brokenFlow = context.brokenFlow && consequentBrokenFlow;
             return false;
         }
         return testValue ? this.consequent.hasEffects(context) : !!this.alternate?.hasEffects(context);
@@ -10708,7 +10712,7 @@ class IfStatement extends NodeBase {
     includeUnknownTest(context) {
         this.test.include(context, false);
         const { brokenFlow } = context;
-        let consequentBrokenFlow = BROKEN_FLOW_NONE;
+        let consequentBrokenFlow = false;
         if (this.consequent.shouldBeIncluded(context)) {
             this.consequent.include(context, false, { asSingleStatement: true });
             // eslint-disable-next-line unicorn/consistent-destructuring
@@ -10717,9 +10721,8 @@ class IfStatement extends NodeBase {
         }
         if (this.alternate?.shouldBeIncluded(context)) {
             this.alternate.include(context, false, { asSingleStatement: true });
-            context.brokenFlow =
-                // eslint-disable-next-line unicorn/consistent-destructuring
-                context.brokenFlow < consequentBrokenFlow ? context.brokenFlow : consequentBrokenFlow;
+            // eslint-disable-next-line unicorn/consistent-destructuring
+            context.brokenFlow = context.brokenFlow && consequentBrokenFlow;
         }
     }
     renderHoistedDeclarations(hoistedDeclarations, code, getPropertyAccess) {
@@ -11770,13 +11773,13 @@ class ReturnStatement extends NodeBase {
     hasEffects(context) {
         if (!context.ignore.returnYield || this.argument?.hasEffects(context))
             return true;
-        context.brokenFlow = BROKEN_FLOW_ERROR_RETURN_LABEL;
+        context.brokenFlow = true;
         return false;
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
         this.argument?.include(context, includeChildrenRecursively);
-        context.brokenFlow = BROKEN_FLOW_ERROR_RETURN_LABEL;
+        context.brokenFlow = true;
     }
     initialise() {
         this.scope.addReturnExpression(this.argument || UNKNOWN_EXPRESSION);
@@ -11943,28 +11946,32 @@ class SwitchStatement extends NodeBase {
     hasEffects(context) {
         if (this.discriminant.hasEffects(context))
             return true;
-        const { brokenFlow, ignore } = context;
+        const { brokenFlow, hasBreak, ignore } = context;
         const { breaks } = ignore;
-        let minBrokenFlow = Infinity;
         ignore.breaks = true;
+        context.hasBreak = false;
+        let onlyHasBrokenFlow = true;
         for (const switchCase of this.cases) {
             if (switchCase.hasEffects(context))
                 return true;
             // eslint-disable-next-line unicorn/consistent-destructuring
-            minBrokenFlow = context.brokenFlow < minBrokenFlow ? context.brokenFlow : minBrokenFlow;
+            onlyHasBrokenFlow && (onlyHasBrokenFlow = context.brokenFlow && !context.hasBreak);
+            context.hasBreak = false;
             context.brokenFlow = brokenFlow;
         }
-        if (this.defaultCase !== null && !(minBrokenFlow === BROKEN_FLOW_BREAK_CONTINUE)) {
-            context.brokenFlow = minBrokenFlow;
+        if (this.defaultCase !== null) {
+            context.brokenFlow = onlyHasBrokenFlow;
         }
         ignore.breaks = breaks;
+        context.hasBreak = hasBreak;
         return false;
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
         this.discriminant.include(context, includeChildrenRecursively);
-        const { brokenFlow } = context;
-        let minBrokenFlow = Infinity;
+        const { brokenFlow, hasBreak } = context;
+        context.hasBreak = false;
+        let onlyHasBrokenFlow = true;
         let isCaseIncluded = includeChildrenRecursively ||
             (this.defaultCase !== null && this.defaultCase < this.cases.length - 1);
         for (let caseIndex = this.cases.length - 1; caseIndex >= 0; caseIndex--) {
@@ -11980,18 +11987,18 @@ class SwitchStatement extends NodeBase {
             if (isCaseIncluded) {
                 switchCase.include(context, includeChildrenRecursively);
                 // eslint-disable-next-line unicorn/consistent-destructuring
-                minBrokenFlow = minBrokenFlow < context.brokenFlow ? minBrokenFlow : context.brokenFlow;
+                onlyHasBrokenFlow && (onlyHasBrokenFlow = context.brokenFlow && !context.hasBreak);
+                context.hasBreak = false;
                 context.brokenFlow = brokenFlow;
             }
             else {
-                minBrokenFlow = brokenFlow;
+                onlyHasBrokenFlow = brokenFlow;
             }
         }
-        if (isCaseIncluded &&
-            this.defaultCase !== null &&
-            !(minBrokenFlow === BROKEN_FLOW_BREAK_CONTINUE)) {
-            context.brokenFlow = minBrokenFlow;
+        if (isCaseIncluded && this.defaultCase !== null) {
+            context.brokenFlow = onlyHasBrokenFlow;
         }
+        context.hasBreak = hasBreak;
     }
     initialise() {
         for (let caseIndex = 0; caseIndex < this.cases.length; caseIndex++) {
@@ -12284,7 +12291,7 @@ class ThrowStatement extends NodeBase {
     include(context, includeChildrenRecursively) {
         this.included = true;
         this.argument.include(context, includeChildrenRecursively);
-        context.brokenFlow = BROKEN_FLOW_ERROR_RETURN_LABEL;
+        context.brokenFlow = true;
     }
     render(code, options) {
         this.argument.render(code, options, { preventASI: true });
@@ -12678,23 +12685,12 @@ class WhileStatement extends NodeBase {
     hasEffects(context) {
         if (this.test.hasEffects(context))
             return true;
-        const { brokenFlow, ignore } = context;
-        const { breaks, continues } = ignore;
-        ignore.breaks = true;
-        ignore.continues = true;
-        if (this.body.hasEffects(context))
-            return true;
-        ignore.breaks = breaks;
-        ignore.continues = continues;
-        context.brokenFlow = brokenFlow;
-        return false;
+        return hasLoopBodyEffects(context, this.body);
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
         this.test.include(context, includeChildrenRecursively);
-        const { brokenFlow } = context;
-        this.body.include(context, includeChildrenRecursively, { asSingleStatement: true });
-        context.brokenFlow = brokenFlow;
+        includeLoopBody(context, this.body, includeChildrenRecursively);
     }
 }
 
@@ -14411,6 +14407,7 @@ function getImportBlock$1(dependencies, { _, cnst, n }, compact) {
     return '';
 }
 
+const safeExportName = (name) => isValidIdentifier(name) ? name : JSON.stringify(name);
 function es(magicString, { accessedGlobals, indent: t, intro, outro, dependencies, exports, snippets }, { externalLiveBindings, freeze, namespaceToStringTag }) {
     const { n } = snippets;
     const importBlock = getImportBlock(dependencies, snippets);
@@ -14460,7 +14457,7 @@ function getImportBlock(dependencies, { _ }) {
                 importBlock.push(`import ${defaultImport ? `${defaultImport.local},${_}` : ''}{${_}${importedNames
                     .map(specifier => specifier.imported === specifier.local
                     ? specifier.imported
-                    : `${specifier.imported} as ${specifier.local}`)
+                    : `${safeExportName(specifier.imported)} as ${specifier.local}`)
                     .join(`,${_}`)}${_}}${_}from${_}${pathWithAssertion}`);
             }
         }
@@ -14488,14 +14485,16 @@ function getImportBlock(dependencies, { _ }) {
                     importBlock.push(`import${_}*${_}as ${name} from${_}${pathWithAssertion}`);
                 }
                 for (const specifier of namespaceReexports) {
-                    importBlock.push(`export${_}{${_}${name === specifier.reexported ? name : `${name} as ${specifier.reexported}`} };`);
+                    importBlock.push(`export${_}{${_}${name === specifier.reexported
+                        ? name
+                        : `${name} as ${safeExportName(specifier.reexported)}`} };`);
                 }
             }
             if (namedReexports.length > 0) {
                 importBlock.push(`export${_}{${_}${namedReexports
                     .map(specifier => specifier.imported === specifier.reexported
-                    ? specifier.imported
-                    : `${specifier.imported} as ${specifier.reexported}`)
+                    ? safeExportName(specifier.imported)
+                    : `${safeExportName(specifier.imported)} as ${safeExportName(specifier.reexported)}`)
                     .join(`,${_}`)}${_}}${_}from${_}${pathWithAssertion}`);
             }
         }
@@ -14511,7 +14510,7 @@ function getExportBlock(exports, { _, cnst }) {
         }
         exportDeclaration.push(specifier.exported === specifier.local
             ? specifier.local
-            : `${specifier.local} as ${specifier.exported}`);
+            : `${specifier.local} as ${safeExportName(specifier.exported)}`);
     }
     if (exportDeclaration.length > 0) {
         exportBlock.push(`export${_}{${_}${exportDeclaration.join(`,${_}`)}${_}};`);
@@ -16969,8 +16968,8 @@ function getGenerateCodeSnippets({ compact, generatedCode: { arrowFunctions, con
             : `${s}${lineBreakIndent ? `${n}${lineBreakIndent.base}` : _}}`
     ];
     const isValidPropertyName = reservedNamesAsProps
-        ? (name) => validPropertyName.test(name)
-        : (name) => !RESERVED_NAMES$1.has(name) && validPropertyName.test(name);
+        ? isValidIdentifier
+        : (name) => !RESERVED_NAMES$1.has(name) && isValidIdentifier(name);
     return {
         _,
         cnst,
@@ -17004,7 +17003,6 @@ function getGenerateCodeSnippets({ compact, generatedCode: { arrowFunctions, con
     };
 }
 const wrapIfNeeded = (code, needsParens) => needsParens ? `(${code})` : code;
-const validPropertyName = /^(?!\d)[\w$]+$/;
 
 class Source {
     constructor(filename, content) {

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.3
-	Sun, 16 Apr 2023 13:03:29 GMT - commit bd675b104147594767b56df2756426d032a68583
+	Rollup.js v3.20.5
+	Tue, 18 Apr 2023 05:00:18 GMT - commit 8411bd07421c8b02b53722fb943cb96700a6e058
 
 	https://github.com/rollup/rollup
 

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.3
-	Sun, 16 Apr 2023 13:03:29 GMT - commit bd675b104147594767b56df2756426d032a68583
+	Rollup.js v3.20.5
+	Tue, 18 Apr 2023 05:00:18 GMT - commit 8411bd07421c8b02b53722fb943cb96700a6e058
 
 	https://github.com/rollup/rollup
 

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.3
-	Sun, 16 Apr 2023 13:03:29 GMT - commit bd675b104147594767b56df2756426d032a68583
+	Rollup.js v3.20.5
+	Tue, 18 Apr 2023 05:00:18 GMT - commit 8411bd07421c8b02b53722fb943cb96700a6e058
 
 	https://github.com/rollup/rollup
 

package/dist/shared/fsevents-importer.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.3
-	Sun, 16 Apr 2023 13:03:29 GMT - commit bd675b104147594767b56df2756426d032a68583
+	Rollup.js v3.20.5
+	Tue, 18 Apr 2023 05:00:18 GMT - commit 8411bd07421c8b02b53722fb943cb96700a6e058
 
 	https://github.com/rollup/rollup
 

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.3
-	Sun, 16 Apr 2023 13:03:29 GMT - commit bd675b104147594767b56df2756426d032a68583
+	Rollup.js v3.20.5
+	Tue, 18 Apr 2023 05:00:18 GMT - commit 8411bd07421c8b02b53722fb943cb96700a6e058
 
 	https://github.com/rollup/rollup
 

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.3
-	Sun, 16 Apr 2023 13:03:29 GMT - commit bd675b104147594767b56df2756426d032a68583
+	Rollup.js v3.20.5
+	Tue, 18 Apr 2023 05:00:18 GMT - commit 8411bd07421c8b02b53722fb943cb96700a6e058
 
 	https://github.com/rollup/rollup
 

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.3
-	Sun, 16 Apr 2023 13:03:29 GMT - commit bd675b104147594767b56df2756426d032a68583
+	Rollup.js v3.20.5
+	Tue, 18 Apr 2023 05:00:18 GMT - commit 8411bd07421c8b02b53722fb943cb96700a6e058
 
 	https://github.com/rollup/rollup
 
@@ -31,7 +31,7 @@ function _interopNamespaceDefault(e) {
 
 const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty);
 
-var version$1 = "3.20.3";
+var version$1 = "3.20.5";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -5537,12 +5537,11 @@ const builtins = 'arguments Infinity NaN undefined null true false eval uneval i
 const forbiddenIdentifiers = new Set(`${reservedWords$1} ${builtins}`.split(' '));
 forbiddenIdentifiers.add('');
 
-const BROKEN_FLOW_NONE = 0;
-const BROKEN_FLOW_BREAK_CONTINUE = 1;
-const BROKEN_FLOW_ERROR_RETURN_LABEL = 2;
 function createInclusionContext() {
     return {
-        brokenFlow: BROKEN_FLOW_NONE,
+        brokenFlow: false,
+        hasBreak: false,
+        hasContinue: false,
         includedCallArguments: new Set(),
         includedLabels: new Set()
     };
@@ -5551,8 +5550,10 @@ function createHasEffectsContext() {
     return {
         accessed: new PathTracker(),
         assigned: new PathTracker(),
-        brokenFlow: BROKEN_FLOW_NONE,
+        brokenFlow: false,
         called: new DiscriminatedPathTracker(),
+        hasBreak: false,
+        hasContinue: false,
         ignore: {
             breaks: false,
             continues: false,
@@ -7357,11 +7358,17 @@ function toBase64(value) {
     return outString;
 }
 
+const validIdentifier = /^(?!\d)[\w$]+$/;
+function isValidIdentifier(name) {
+    return validIdentifier.test(name);
+}
+
 function getSafeName(baseName, usedNames, forbiddenNames) {
-    let safeName = baseName;
+    const safeBase = isValidIdentifier(baseName) ? baseName : '_safe';
+    let safeName = safeBase;
     let count = 1;
     while (usedNames.has(safeName) || RESERVED_NAMES$1.has(safeName) || forbiddenNames?.has(safeName)) {
-        safeName = `${baseName}$${toBase64(count++)}`;
+        safeName = `${safeBase}$${toBase64(count++)}`;
     }
     usedNames.add(safeName);
     return safeName;
@@ -9170,7 +9177,7 @@ class FunctionBase extends NodeBase {
             this.applyDeoptimizations();
         this.included = true;
         const { brokenFlow } = context;
-        context.brokenFlow = BROKEN_FLOW_NONE;
+        context.brokenFlow = false;
         this.body.include(context, includeChildrenRecursively);
         context.brokenFlow = brokenFlow;
     }
@@ -9648,13 +9655,13 @@ class BreakStatement extends NodeBase {
             if (!context.ignore.labels.has(this.label.name))
                 return true;
             context.includedLabels.add(this.label.name);
-            context.brokenFlow = BROKEN_FLOW_ERROR_RETURN_LABEL;
         }
         else {
             if (!context.ignore.breaks)
                 return true;
-            context.brokenFlow = BROKEN_FLOW_BREAK_CONTINUE;
+            context.hasBreak = true;
         }
+        context.brokenFlow = true;
         return false;
     }
     include(context) {
@@ -9663,7 +9670,10 @@ class BreakStatement extends NodeBase {
             this.label.include();
             context.includedLabels.add(this.label.name);
         }
-        context.brokenFlow = this.label ? BROKEN_FLOW_ERROR_RETURN_LABEL : BROKEN_FLOW_BREAK_CONTINUE;
+        else {
+            context.hasBreak = true;
+        }
+        context.brokenFlow = true;
     }
 }
 
@@ -10736,13 +10746,13 @@ class ContinueStatement extends NodeBase {
             if (!context.ignore.labels.has(this.label.name))
                 return true;
             context.includedLabels.add(this.label.name);
-            context.brokenFlow = BROKEN_FLOW_ERROR_RETURN_LABEL;
         }
         else {
             if (!context.ignore.continues)
                 return true;
-            context.brokenFlow = BROKEN_FLOW_BREAK_CONTINUE;
+            context.hasContinue = true;
         }
+        context.brokenFlow = true;
         return false;
     }
     include(context) {
@@ -10751,31 +10761,49 @@ class ContinueStatement extends NodeBase {
             this.label.include();
             context.includedLabels.add(this.label.name);
         }
-        context.brokenFlow = this.label ? BROKEN_FLOW_ERROR_RETURN_LABEL : BROKEN_FLOW_BREAK_CONTINUE;
+        else {
+            context.hasContinue = true;
+        }
+        context.brokenFlow = true;
     }
 }
 
+function hasLoopBodyEffects(context, body) {
+    const { brokenFlow, hasBreak, hasContinue, ignore } = context;
+    const { breaks, continues } = ignore;
+    ignore.breaks = true;
+    ignore.continues = true;
+    context.hasBreak = false;
+    context.hasContinue = false;
+    if (body.hasEffects(context))
+        return true;
+    ignore.breaks = breaks;
+    ignore.continues = continues;
+    context.hasBreak = hasBreak;
+    context.hasContinue = hasContinue;
+    context.brokenFlow = brokenFlow;
+    return false;
+}
+function includeLoopBody(context, body, includeChildrenRecursively) {
+    const { brokenFlow, hasBreak, hasContinue } = context;
+    context.hasBreak = false;
+    context.hasContinue = false;
+    body.include(context, includeChildrenRecursively, { asSingleStatement: true });
+    context.hasBreak = hasBreak;
+    context.hasContinue = hasContinue;
+    context.brokenFlow = brokenFlow;
+}
+
 class DoWhileStatement extends NodeBase {
     hasEffects(context) {
         if (this.test.hasEffects(context))
             return true;
-        const { brokenFlow, ignore } = context;
-        const { breaks, continues } = ignore;
-        ignore.breaks = true;
-        ignore.continues = true;
-        if (this.body.hasEffects(context))
-            return true;
-        ignore.breaks = breaks;
-        ignore.continues = continues;
-        context.brokenFlow = brokenFlow;
-        return false;
+        return hasLoopBodyEffects(context, this.body);
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
         this.test.include(context, includeChildrenRecursively);
-        const { brokenFlow } = context;
-        this.body.include(context, includeChildrenRecursively, { asSingleStatement: true });
-        context.brokenFlow = brokenFlow;
+        includeLoopBody(context, this.body, includeChildrenRecursively);
     }
 }
 
@@ -10941,16 +10969,7 @@ class ForInStatement extends NodeBase {
             this.applyDeoptimizations();
         if (left.hasEffectsAsAssignmentTarget(context, false) || right.hasEffects(context))
             return true;
-        const { brokenFlow, ignore } = context;
-        const { breaks, continues } = ignore;
-        ignore.breaks = true;
-        ignore.continues = true;
-        if (body.hasEffects(context))
-            return true;
-        ignore.breaks = breaks;
-        ignore.continues = continues;
-        context.brokenFlow = brokenFlow;
-        return false;
+        return hasLoopBodyEffects(context, body);
     }
     include(context, includeChildrenRecursively) {
         const { body, deoptimized, left, right } = this;
@@ -10959,9 +10978,7 @@ class ForInStatement extends NodeBase {
         this.included = true;
         left.includeAsAssignmentTarget(context, includeChildrenRecursively || true, false);
         right.include(context, includeChildrenRecursively);
-        const { brokenFlow } = context;
-        body.include(context, includeChildrenRecursively, { asSingleStatement: true });
-        context.brokenFlow = brokenFlow;
+        includeLoopBody(context, body, includeChildrenRecursively);
     }
     initialise() {
         this.left.setAssignedValue(UNKNOWN_EXPRESSION);
@@ -10999,9 +11016,7 @@ class ForOfStatement extends NodeBase {
         this.included = true;
         left.includeAsAssignmentTarget(context, includeChildrenRecursively || true, false);
         right.include(context, includeChildrenRecursively);
-        const { brokenFlow } = context;
-        body.include(context, includeChildrenRecursively, { asSingleStatement: true });
-        context.brokenFlow = brokenFlow;
+        includeLoopBody(context, body, includeChildrenRecursively);
     }
     initialise() {
         this.left.setAssignedValue(UNKNOWN_EXPRESSION);
@@ -11029,27 +11044,17 @@ class ForStatement extends NodeBase {
     hasEffects(context) {
         if (this.init?.hasEffects(context) ||
             this.test?.hasEffects(context) ||
-            this.update?.hasEffects(context))
+            this.update?.hasEffects(context)) {
             return true;
-        const { brokenFlow, ignore } = context;
-        const { breaks, continues } = ignore;
-        ignore.breaks = true;
-        ignore.continues = true;
-        if (this.body.hasEffects(context))
-            return true;
-        ignore.breaks = breaks;
-        ignore.continues = continues;
-        context.brokenFlow = brokenFlow;
-        return false;
+        }
+        return hasLoopBodyEffects(context, this.body);
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
         this.init?.include(context, includeChildrenRecursively, { asSingleStatement: true });
         this.test?.include(context, includeChildrenRecursively);
-        const { brokenFlow } = context;
         this.update?.include(context, includeChildrenRecursively);
-        this.body.include(context, includeChildrenRecursively, { asSingleStatement: true });
-        context.brokenFlow = brokenFlow;
+        includeLoopBody(context, this.body, includeChildrenRecursively);
     }
     render(code, options) {
         this.init?.render(code, options, NO_SEMICOLON);
@@ -11105,9 +11110,8 @@ class IfStatement extends NodeBase {
                 return false;
             if (this.alternate.hasEffects(context))
                 return true;
-            context.brokenFlow =
-                // eslint-disable-next-line unicorn/consistent-destructuring
-                context.brokenFlow < consequentBrokenFlow ? context.brokenFlow : consequentBrokenFlow;
+            // eslint-disable-next-line unicorn/consistent-destructuring
+            context.brokenFlow = context.brokenFlow && consequentBrokenFlow;
             return false;
         }
         return testValue ? this.consequent.hasEffects(context) : !!this.alternate?.hasEffects(context);
@@ -11206,7 +11210,7 @@ class IfStatement extends NodeBase {
     includeUnknownTest(context) {
         this.test.include(context, false);
         const { brokenFlow } = context;
-        let consequentBrokenFlow = BROKEN_FLOW_NONE;
+        let consequentBrokenFlow = false;
         if (this.consequent.shouldBeIncluded(context)) {
             this.consequent.include(context, false, { asSingleStatement: true });
             // eslint-disable-next-line unicorn/consistent-destructuring
@@ -11215,9 +11219,8 @@ class IfStatement extends NodeBase {
         }
         if (this.alternate?.shouldBeIncluded(context)) {
             this.alternate.include(context, false, { asSingleStatement: true });
-            context.brokenFlow =
-                // eslint-disable-next-line unicorn/consistent-destructuring
-                context.brokenFlow < consequentBrokenFlow ? context.brokenFlow : consequentBrokenFlow;
+            // eslint-disable-next-line unicorn/consistent-destructuring
+            context.brokenFlow = context.brokenFlow && consequentBrokenFlow;
         }
     }
     renderHoistedDeclarations(hoistedDeclarations, code, getPropertyAccess) {
@@ -12268,13 +12271,13 @@ class ReturnStatement extends NodeBase {
     hasEffects(context) {
         if (!context.ignore.returnYield || this.argument?.hasEffects(context))
             return true;
-        context.brokenFlow = BROKEN_FLOW_ERROR_RETURN_LABEL;
+        context.brokenFlow = true;
         return false;
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
         this.argument?.include(context, includeChildrenRecursively);
-        context.brokenFlow = BROKEN_FLOW_ERROR_RETURN_LABEL;
+        context.brokenFlow = true;
     }
     initialise() {
         this.scope.addReturnExpression(this.argument || UNKNOWN_EXPRESSION);
@@ -12441,28 +12444,32 @@ class SwitchStatement extends NodeBase {
     hasEffects(context) {
         if (this.discriminant.hasEffects(context))
             return true;
-        const { brokenFlow, ignore } = context;
+        const { brokenFlow, hasBreak, ignore } = context;
         const { breaks } = ignore;
-        let minBrokenFlow = Infinity;
         ignore.breaks = true;
+        context.hasBreak = false;
+        let onlyHasBrokenFlow = true;
         for (const switchCase of this.cases) {
             if (switchCase.hasEffects(context))
                 return true;
             // eslint-disable-next-line unicorn/consistent-destructuring
-            minBrokenFlow = context.brokenFlow < minBrokenFlow ? context.brokenFlow : minBrokenFlow;
+            onlyHasBrokenFlow && (onlyHasBrokenFlow = context.brokenFlow && !context.hasBreak);
+            context.hasBreak = false;
             context.brokenFlow = brokenFlow;
         }
-        if (this.defaultCase !== null && !(minBrokenFlow === BROKEN_FLOW_BREAK_CONTINUE)) {
-            context.brokenFlow = minBrokenFlow;
+        if (this.defaultCase !== null) {
+            context.brokenFlow = onlyHasBrokenFlow;
         }
         ignore.breaks = breaks;
+        context.hasBreak = hasBreak;
         return false;
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
         this.discriminant.include(context, includeChildrenRecursively);
-        const { brokenFlow } = context;
-        let minBrokenFlow = Infinity;
+        const { brokenFlow, hasBreak } = context;
+        context.hasBreak = false;
+        let onlyHasBrokenFlow = true;
         let isCaseIncluded = includeChildrenRecursively ||
             (this.defaultCase !== null && this.defaultCase < this.cases.length - 1);
         for (let caseIndex = this.cases.length - 1; caseIndex >= 0; caseIndex--) {
@@ -12478,18 +12485,18 @@ class SwitchStatement extends NodeBase {
             if (isCaseIncluded) {
                 switchCase.include(context, includeChildrenRecursively);
                 // eslint-disable-next-line unicorn/consistent-destructuring
-                minBrokenFlow = minBrokenFlow < context.brokenFlow ? minBrokenFlow : context.brokenFlow;
+                onlyHasBrokenFlow && (onlyHasBrokenFlow = context.brokenFlow && !context.hasBreak);
+                context.hasBreak = false;
                 context.brokenFlow = brokenFlow;
             }
             else {
-                minBrokenFlow = brokenFlow;
+                onlyHasBrokenFlow = brokenFlow;
             }
         }
-        if (isCaseIncluded &&
-            this.defaultCase !== null &&
-            !(minBrokenFlow === BROKEN_FLOW_BREAK_CONTINUE)) {
-            context.brokenFlow = minBrokenFlow;
+        if (isCaseIncluded && this.defaultCase !== null) {
+            context.brokenFlow = onlyHasBrokenFlow;
         }
+        context.hasBreak = hasBreak;
     }
     initialise() {
         for (let caseIndex = 0; caseIndex < this.cases.length; caseIndex++) {
@@ -12782,7 +12789,7 @@ class ThrowStatement extends NodeBase {
     include(context, includeChildrenRecursively) {
         this.included = true;
         this.argument.include(context, includeChildrenRecursively);
-        context.brokenFlow = BROKEN_FLOW_ERROR_RETURN_LABEL;
+        context.brokenFlow = true;
     }
     render(code, options) {
         this.argument.render(code, options, { preventASI: true });
@@ -13176,23 +13183,12 @@ class WhileStatement extends NodeBase {
     hasEffects(context) {
         if (this.test.hasEffects(context))
             return true;
-        const { brokenFlow, ignore } = context;
-        const { breaks, continues } = ignore;
-        ignore.breaks = true;
-        ignore.continues = true;
-        if (this.body.hasEffects(context))
-            return true;
-        ignore.breaks = breaks;
-        ignore.continues = continues;
-        context.brokenFlow = brokenFlow;
-        return false;
+        return hasLoopBodyEffects(context, this.body);
     }
     include(context, includeChildrenRecursively) {
         this.included = true;
         this.test.include(context, includeChildrenRecursively);
-        const { brokenFlow } = context;
-        this.body.include(context, includeChildrenRecursively, { asSingleStatement: true });
-        context.brokenFlow = brokenFlow;
+        includeLoopBody(context, this.body, includeChildrenRecursively);
     }
 }
 
@@ -14909,6 +14905,7 @@ function getImportBlock$1(dependencies, { _, cnst, n }, compact) {
     return '';
 }
 
+const safeExportName = (name) => isValidIdentifier(name) ? name : JSON.stringify(name);
 function es(magicString, { accessedGlobals, indent: t, intro, outro, dependencies, exports, snippets }, { externalLiveBindings, freeze, namespaceToStringTag }) {
     const { n } = snippets;
     const importBlock = getImportBlock(dependencies, snippets);
@@ -14958,7 +14955,7 @@ function getImportBlock(dependencies, { _ }) {
                 importBlock.push(`import ${defaultImport ? `${defaultImport.local},${_}` : ''}{${_}${importedNames
                     .map(specifier => specifier.imported === specifier.local
                     ? specifier.imported
-                    : `${specifier.imported} as ${specifier.local}`)
+                    : `${safeExportName(specifier.imported)} as ${specifier.local}`)
                     .join(`,${_}`)}${_}}${_}from${_}${pathWithAssertion}`);
             }
         }
@@ -14986,14 +14983,16 @@ function getImportBlock(dependencies, { _ }) {
                     importBlock.push(`import${_}*${_}as ${name} from${_}${pathWithAssertion}`);
                 }
                 for (const specifier of namespaceReexports) {
-                    importBlock.push(`export${_}{${_}${name === specifier.reexported ? name : `${name} as ${specifier.reexported}`} };`);
+                    importBlock.push(`export${_}{${_}${name === specifier.reexported
+                        ? name
+                        : `${name} as ${safeExportName(specifier.reexported)}`} };`);
                 }
             }
             if (namedReexports.length > 0) {
                 importBlock.push(`export${_}{${_}${namedReexports
                     .map(specifier => specifier.imported === specifier.reexported
-                    ? specifier.imported
-                    : `${specifier.imported} as ${specifier.reexported}`)
+                    ? safeExportName(specifier.imported)
+                    : `${safeExportName(specifier.imported)} as ${safeExportName(specifier.reexported)}`)
                     .join(`,${_}`)}${_}}${_}from${_}${pathWithAssertion}`);
             }
         }
@@ -15009,7 +15008,7 @@ function getExportBlock(exports, { _, cnst }) {
         }
         exportDeclaration.push(specifier.exported === specifier.local
             ? specifier.local
-            : `${specifier.local} as ${specifier.exported}`);
+            : `${specifier.local} as ${safeExportName(specifier.exported)}`);
     }
     if (exportDeclaration.length > 0) {
         exportBlock.push(`export${_}{${_}${exportDeclaration.join(`,${_}`)}${_}};`);
@@ -17467,8 +17466,8 @@ function getGenerateCodeSnippets({ compact, generatedCode: { arrowFunctions, con
             : `${s}${lineBreakIndent ? `${n}${lineBreakIndent.base}` : _}}`
     ];
     const isValidPropertyName = reservedNamesAsProps
-        ? (name) => validPropertyName.test(name)
-        : (name) => !RESERVED_NAMES$1.has(name) && validPropertyName.test(name);
+        ? isValidIdentifier
+        : (name) => !RESERVED_NAMES$1.has(name) && isValidIdentifier(name);
     return {
         _,
         cnst,
@@ -17502,7 +17501,6 @@ function getGenerateCodeSnippets({ compact, generatedCode: { arrowFunctions, con
     };
 }
 const wrapIfNeeded = (code, needsParens) => needsParens ? `(${code})` : code;
-const validPropertyName = /^(?!\d)[\w$]+$/;
 
 class Source {
     constructor(filename, content) {

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.3
-	Sun, 16 Apr 2023 13:03:29 GMT - commit bd675b104147594767b56df2756426d032a68583
+	Rollup.js v3.20.5
+	Tue, 18 Apr 2023 05:00:18 GMT - commit 8411bd07421c8b02b53722fb943cb96700a6e058
 
 	https://github.com/rollup/rollup
 

package/dist/shared/watch-proxy.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.3
-	Sun, 16 Apr 2023 13:03:29 GMT - commit bd675b104147594767b56df2756426d032a68583
+	Rollup.js v3.20.5
+	Tue, 18 Apr 2023 05:00:18 GMT - commit 8411bd07421c8b02b53722fb943cb96700a6e058
 
 	https://github.com/rollup/rollup
 

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.3
-	Sun, 16 Apr 2023 13:03:29 GMT - commit bd675b104147594767b56df2756426d032a68583
+	Rollup.js v3.20.5
+	Tue, 18 Apr 2023 05:00:18 GMT - commit 8411bd07421c8b02b53722fb943cb96700a6e058
 
 	https://github.com/rollup/rollup
 

package/package.json

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