When tree-shaking logical expression, make sure to remove all trailin…

…g white-space. (#5581) This should hopefully also improve sourcemaps.
rollup · Jul 20, 2024 · 1d2c1e9 · 1d2c1e9
1 parent a9a6108
commit 1d2c1e9
Show file tree

Hide file tree

Showing 23 changed files with 128 additions and 50 deletions.
diff --git a/src/ast/nodes/LogicalExpression.ts b/src/ast/nodes/LogicalExpression.ts
@@ -185,20 +185,20 @@ export default class LogicalExpression extends NodeBase implements Deoptimizable
 		}: NodeRenderOptions = BLANK
 	): void {
 		if (!this.left.included || !this.right.included) {
-			const operatorPos = findFirstOccurrenceOutsideComment(
-				code.original,
-				this.operator,
-				this.left.end
-			);
 			if (this.right.included) {
+				const operatorPos = findFirstOccurrenceOutsideComment(
+					code.original,
+					this.operator,
+					this.left.end
+				);
 				const removePos = findNonWhiteSpace(code.original, operatorPos + 2);
 				code.remove(this.start, removePos);
 				if (preventASI) {
 					removeLineBreaks(code, removePos, this.right.start);
 				}
 				this.left.removeAnnotations(code);
 			} else {
-				code.remove(operatorPos, this.end);
+				code.remove(this.left.end, this.end);
 			}
 			this.getUsedBranch()!.render(code, options, {
 				isCalleeOfRenderedParent,

diff --git a/test/form/samples/cjs-transpiler-re-exports-1/_expected/execute.mjs b/test/form/samples/cjs-transpiler-re-exports-1/_expected/execute.mjs
@@ -0,0 +1,4 @@
+import assert from "node:assert";
+import { foo, __proto__ } from "./cjs.js";
+assert.strictEqual(foo, 1);
+assert.strictEqual(__proto__, undefined);
diff --git a/test/form/samples/cjs-transpiler-re-exports-1/_expected/foo.js b/test/form/samples/cjs-transpiler-re-exports-1/_expected/foo.js
@@ -0,0 +1,5 @@
+exports.foo = 1;
+Object.defineProperty(exports, "__proto__", {
+	enumerable: true,
+	value: 2
+});
diff --git a/test/form/samples/cjs-transpiler-re-exports/_expected/execute.mjs b/test/form/samples/cjs-transpiler-re-exports/_expected/execute.mjs
@@ -0,0 +1,4 @@
+import assert from "node:assert";
+import { foo, __proto__ } from "./cjs.js";
+assert.strictEqual(foo, 1);
+assert.strictEqual(__proto__, 2);
diff --git a/test/form/samples/cjs-transpiler-re-exports/_expected/foo.js b/test/form/samples/cjs-transpiler-re-exports/_expected/foo.js
@@ -0,0 +1,5 @@
+exports.foo = 1;
+Object.defineProperty(exports, "__proto__", {
+	enumerable: true,
+	value: 2
+});
diff --git a/test/form/samples/emit-asset-file/_expected/assets/logo_reverse'-DbGK2oiS.svg b/test/form/samples/emit-asset-file/_expected/assets/logo_reverse'-DbGK2oiS.svg
diff --git a/test/form/samples/logical-expression/deopzimize-while-included/_expected.js b/test/form/samples/logical-expression/deopzimize-while-included/_expected.js
@@ -1,6 +1,6 @@
 let isFirstReassigned = false;
 
-const result1 = (foo(), isFirstReassigned );
+const result1 = (foo(), isFirstReassigned);
 console.log(result1);
 
 let isSecondReassigned = false;

diff --git a/test/form/samples/logical-expression/simplify-non-boolean/_expected.js b/test/form/samples/logical-expression/simplify-non-boolean/_expected.js
@@ -1,6 +1,6 @@
-console.log('keep' );
+console.log('keep');
 console.log('keep');
 
 const x = 'keep';
-console.log(x );
+console.log(x);
 console.log(x);
diff --git a/test/form/samples/nullish-coalescing/_expected.js b/test/form/samples/nullish-coalescing/_expected.js
@@ -5,9 +5,9 @@ function getNullSideEffect() {
 
 console.log('null');
 console.log('undefined');
-console.log(0 );
-console.log('' );
-console.log('Hello' );
+console.log(0);
+console.log('');
+console.log('Hello');
 
 console.log('null return');
 console.log(getNullSideEffect() ?? 'null return with side-effect');
diff --git a/test/form/samples/side-effects-logical-expressions/_expected/amd.js b/test/form/samples/side-effects-logical-expressions/_expected/amd.js
@@ -22,14 +22,14 @@ define((function () { 'use strict';
 	(null).foo = 1;
 
 	// effect
-	(true )();
-	(false )();
+	(true)();
+	(false)();
 	((() => console.log( 'effect' )))();
 	((() => console.log( 'effect' )))();
 
 	// effect
-	(true )()();
-	(false )()();
+	(true)()();
+	(false)()();
 	((() => () => console.log( 'effect' )))()();
 	((() => () => console.log( 'effect' )))()();
 

diff --git a/test/form/samples/side-effects-logical-expressions/_expected/cjs.js b/test/form/samples/side-effects-logical-expressions/_expected/cjs.js
@@ -22,13 +22,13 @@ const foo = {
 (null).foo = 1;
 
 // effect
-(true )();
-(false )();
+(true)();
+(false)();
 ((() => console.log( 'effect' )))();
 ((() => console.log( 'effect' )))();
 
 // effect
-(true )()();
-(false )()();
+(true)()();
+(false)()();
 ((() => () => console.log( 'effect' )))()();
 ((() => () => console.log( 'effect' )))()();
diff --git a/test/form/samples/side-effects-logical-expressions/_expected/es.js b/test/form/samples/side-effects-logical-expressions/_expected/es.js
@@ -20,13 +20,13 @@ const foo = {
 (null).foo = 1;
 
 // effect
-(true )();
-(false )();
+(true)();
+(false)();
 ((() => console.log( 'effect' )))();
 ((() => console.log( 'effect' )))();
 
 // effect
-(true )()();
-(false )()();
+(true)()();
+(false)()();
 ((() => () => console.log( 'effect' )))()();
 ((() => () => console.log( 'effect' )))()();
diff --git a/test/form/samples/side-effects-logical-expressions/_expected/iife.js b/test/form/samples/side-effects-logical-expressions/_expected/iife.js
@@ -23,14 +23,14 @@
 	(null).foo = 1;
 
 	// effect
-	(true )();
-	(false )();
+	(true)();
+	(false)();
 	((() => console.log( 'effect' )))();
 	((() => console.log( 'effect' )))();
 
 	// effect
-	(true )()();
-	(false )()();
+	(true)()();
+	(false)()();
 	((() => () => console.log( 'effect' )))()();
 	((() => () => console.log( 'effect' )))()();
 

diff --git a/test/form/samples/side-effects-logical-expressions/_expected/system.js b/test/form/samples/side-effects-logical-expressions/_expected/system.js
@@ -25,14 +25,14 @@ System.register([], (function () {
 			(null).foo = 1;
 
 			// effect
-			(true )();
-			(false )();
+			(true)();
+			(false)();
 			((() => console.log( 'effect' )))();
 			((() => console.log( 'effect' )))();
 
 			// effect
-			(true )()();
-			(false )()();
+			(true)()();
+			(false)()();
 			((() => () => console.log( 'effect' )))()();
 			((() => () => console.log( 'effect' )))()();
 

diff --git a/test/form/samples/side-effects-logical-expressions/_expected/umd.js b/test/form/samples/side-effects-logical-expressions/_expected/umd.js
@@ -25,14 +25,14 @@
 	(null).foo = 1;
 
 	// effect
-	(true )();
-	(false )();
+	(true)();
+	(false)();
 	((() => console.log( 'effect' )))();
 	((() => console.log( 'effect' )))();
 
 	// effect
-	(true )()();
-	(false )()();
+	(true)()();
+	(false)()();
 	((() => () => console.log( 'effect' )))()();
 	((() => () => console.log( 'effect' )))()();
 

diff --git a/test/form/samples/tree-shake-literal-parameter/recursion-literal/_expected.js b/test/form/samples/tree-shake-literal-parameter/recursion-literal/_expected.js
@@ -10,4 +10,4 @@ function fun2(enable) {
 	}
 }
 
-console.log(fun2());
+console.log(fun2());
diff --git a/test/form/samples/tree-shake-literal-parameter/reexport-function/_expected.js b/test/form/samples/tree-shake-literal-parameter/reexport-function/_expected.js
@@ -4,4 +4,4 @@ function module2 (enable) {
 	}
 }
 
-console.log(module2());
+console.log(module2());
diff --git a/test/form/samples/tree-shake-logical-expressions/_expected/amd.js b/test/form/samples/tree-shake-logical-expressions/_expected/amd.js
@@ -6,9 +6,9 @@ define((function () { 'use strict';
 
 	console.log(getStringA());
 
-	console.log(false );
+	console.log(false);
 
-	console.log(true );
+	console.log(true);
 
 	function getStringD() {
 		return 'D';

diff --git a/test/form/samples/tree-shake-logical-expressions/_expected/cjs.js b/test/form/samples/tree-shake-logical-expressions/_expected/cjs.js
@@ -6,9 +6,9 @@ function getStringA() {
 
 console.log(getStringA());
 
-console.log(false );
+console.log(false);
 
-console.log(true );
+console.log(true);
 
 function getStringD() {
 	return 'D';

diff --git a/test/form/samples/tree-shake-logical-expressions/_expected/es.js b/test/form/samples/tree-shake-logical-expressions/_expected/es.js
@@ -4,9 +4,9 @@ function getStringA() {
 
 console.log(getStringA());
 
-console.log(false );
+console.log(false);
 
-console.log(true );
+console.log(true);
 
 function getStringD() {
 	return 'D';

diff --git a/test/form/samples/tree-shake-logical-expressions/_expected/iife.js b/test/form/samples/tree-shake-logical-expressions/_expected/iife.js
@@ -7,9 +7,9 @@
 
 	console.log(getStringA());
 
-	console.log(false );
+	console.log(false);
 
-	console.log(true );
+	console.log(true);
 
 	function getStringD() {
 		return 'D';

diff --git a/test/form/samples/tree-shake-logical-expressions/_expected/system.js b/test/form/samples/tree-shake-logical-expressions/_expected/system.js
@@ -9,9 +9,9 @@ System.register([], (function () {
 
 			console.log(getStringA());
 
-			console.log(false );
+			console.log(false);
 
-			console.log(true );
+			console.log(true);
 
 			function getStringD() {
 				return 'D';

diff --git a/test/form/samples/tree-shake-logical-expressions/_expected/umd.js b/test/form/samples/tree-shake-logical-expressions/_expected/umd.js
@@ -9,9 +9,9 @@
 
 	console.log(getStringA());
 
-	console.log(false );
+	console.log(false);
 
-	console.log(true );
+	console.log(true);
 
 	function getStringD() {
 		return 'D';