Merge branch 'master' of https://github.com/rollup/rollup into sync-9…

…4917087
rollup · Jan 7, 2025 · df7d58c · df7d58c
2 parents e544146 + 9491708
commit df7d58c
Show file tree

Hide file tree

Showing 11 changed files with 90 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # rollup changelog
 
+## 4.30.1
+
+_2025-01-07_
+
+### Bug Fixes
+
+- Prevent invalid code when simplifying unary expressions in switch cases (#5786)
+
+### Pull Requests
+
+- [#5786](https://github.com/rollup/rollup/pull/5786): fix: consider that literals cannot following switch case. (@TrickyPi)
+
 ## 4.30.0
 
 _2025-01-06_

diff --git a/browser/package.json b/browser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rollup/browser",
-  "version": "4.30.0",
+  "version": "4.30.1",
   "description": "Next-generation ES module bundler browser build",
   "main": "dist/rollup.browser.js",
   "module": "dist/es/rollup.browser.js",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "4.30.0",
+  "version": "4.30.1",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",

diff --git a/src/ast/nodes/SwitchCase.ts b/src/ast/nodes/SwitchCase.ts
@@ -39,17 +39,18 @@ export default class SwitchCase extends NodeBase {
 	}
 
 	render(code: MagicString, options: RenderOptions, nodeRenderOptions?: NodeRenderOptions): void {
-		if (this.consequent.length > 0) {
-			if (this.test) {
-				this.test.render(code, options);
+		if (this.test) {
+			this.test.render(code, options);
+			if (this.test.start === this.start + 4) {
+				code.prependLeft(this.test.start, ' ');
 			}
+		}
+		if (this.consequent.length > 0) {
 			const testEnd = this.test
 				? this.test.end
 				: findFirstOccurrenceOutsideComment(code.original, 'default', this.start) + 7;
 			const consequentStart = findFirstOccurrenceOutsideComment(code.original, ':', testEnd) + 1;
 			renderStatementList(this.consequent, code, consequentStart, nodeRenderOptions!.end!, options);
-		} else {
-			super.render(code, options);
 		}
 	}
 }

diff --git a/src/ast/nodes/UnaryExpression.ts b/src/ast/nodes/UnaryExpression.ts
@@ -90,7 +90,7 @@ export default class UnaryExpression extends NodeBase {
 		if (this.renderedLiteralValue !== UNASSIGNED) return this.renderedLiteralValue;
 		return (this.renderedLiteralValue = includeChildrenRecursively
 			? UnknownValue
-			: getSimplifiedLiterals(
+			: getRenderedLiteralValue(
 					this.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, this)
 				));
 	}
@@ -115,12 +115,18 @@ export default class UnaryExpression extends NodeBase {
 		if (typeof this.renderedLiteralValue === 'symbol') {
 			super.render(code, options);
 		} else {
-			code.overwrite(this.start, this.end, this.renderedLiteralValue);
+			let value = this.renderedLiteralValue;
+			if (!CHARACTERS_THAT_DO_NOT_REQUIRE_SPACE.test(code.original[this.start - 1])) {
+				value = ` ${value}`;
+			}
+			code.overwrite(this.start, this.end, value);
 		}
 	}
 }
 
-function getSimplifiedLiterals(value: unknown) {
+const CHARACTERS_THAT_DO_NOT_REQUIRE_SPACE = /[\s([=%&*+-/<>^|,?:;]/;
+
+function getRenderedLiteralValue(value: unknown) {
 	if (value === undefined || typeof value === 'boolean') {
 		return String(value);
 	}

diff --git a/test/form/samples/switch-cases/missing-space/_config.js b/test/form/samples/switch-cases/missing-space/_config.js
@@ -0,0 +1,3 @@
+module.exports = defineTest({
+	description: 'Inserts space when simplifying switch cases without space'
+});
diff --git a/test/form/samples/switch-cases/missing-space/_expected.js b/test/form/samples/switch-cases/missing-space/_expected.js
@@ -0,0 +1,5 @@
+switch (bar) {
+	case 1:
+		console.log('1');
+		break;
+}
diff --git a/test/form/samples/switch-cases/missing-space/main.js b/test/form/samples/switch-cases/missing-space/main.js
@@ -0,0 +1,5 @@
+switch (bar) {
+	case!0?1:2:
+		console.log('1');
+		break;
+}
diff --git a/test/form/samples/treeshake-unary/_expected.js b/test/form/samples/treeshake-unary/_expected.js
@@ -27,3 +27,27 @@ function foo3() {
 }
 
 console.log(delete foo3.a);
+
+switch (bar) {
+	case  false:
+		console.log('false');
+		break;
+	case  true:
+		console.log('true');
+		break;
+	case  1:
+		console.log('1');
+		break;
+	case  1:
+		console.log('1');
+		break;
+	case 1:
+		console.log('1');
+		break;
+}
+
+async function baz(){
+	await true;
+}
+
+export { baz };
diff --git a/test/form/samples/treeshake-unary/main.js b/test/form/samples/treeshake-unary/main.js
@@ -32,3 +32,25 @@ function foo3() {
 }
 
 console.log(delete foo3.a);
+
+switch (bar) {
+	case!1:
+		console.log('false');
+		break;
+	case!0:
+		console.log('true');
+		break;
+	case+1:
+		console.log('1');
+		break;
+	case~-2:
+		console.log('1');
+		break;
+	case ~-2:
+		console.log('1');
+		break;
+}
+
+export async function baz(){
+	await!0;
+}