Wrap simplified assignments if necessary (#3951)

rollup · Feb 5, 2021 · 29aed19 · 29aed19
1 parent 991bb98
commit 29aed19
Show file tree

Hide file tree

Showing 72 changed files with 363 additions and 250 deletions.
diff --git a/src/ast/nodes/AssignmentExpression.ts b/src/ast/nodes/AssignmentExpression.ts
@@ -4,6 +4,7 @@ import {
 	findFirstOccurrenceOutsideComment,
 	findNonWhiteSpace,
 	NodeRenderOptions,
+	removeLineBreaks,
 	RenderOptions
 } from '../../utils/renderHelpers';
 import { getSystemExportFunctionLeft } from '../../utils/systemJsRendering';
@@ -67,17 +68,23 @@ export default class AssignmentExpression extends NodeBase {
 	render(
 		code: MagicString,
 		options: RenderOptions,
-		{ renderedParentType }: NodeRenderOptions = BLANK
+		{ preventASI, renderedParentType }: NodeRenderOptions = BLANK
 	) {
 		if (this.left.included) {
 			this.left.render(code, options);
 			this.right.render(code, options);
 		} else {
+			const inclusionStart = findNonWhiteSpace(
+				code.original,
+				findFirstOccurrenceOutsideComment(code.original, '=', this.left.end) + 1
+			);
+			code.remove(this.start, inclusionStart);
+			if (preventASI) {
+				removeLineBreaks(code, inclusionStart, this.right.start);
+			}
 			this.right.render(code, options, {
 				renderedParentType: renderedParentType || this.parent.type
 			});
-			const operatorPos = findFirstOccurrenceOutsideComment(code.original, '=', this.left.end);
-			code.remove(this.start, findNonWhiteSpace(code.original, operatorPos + 1));
 		}
 		if (options.format === 'system') {
 			const exportNames =

diff --git a/src/ast/nodes/CallExpression.ts b/src/ast/nodes/CallExpression.ts
@@ -226,9 +226,14 @@ export default class CallExpression extends NodeBase implements DeoptimizableEnt
 	render(
 		code: MagicString,
 		options: RenderOptions,
-		{ renderedParentType }: NodeRenderOptions = BLANK
+		{ renderedParentType, renderedSurroundingElement }: NodeRenderOptions = BLANK
 	) {
-		this.callee.render(code, options);
+		const surroundingELement = renderedParentType || renderedSurroundingElement;
+		this.callee.render(
+			code,
+			options,
+			surroundingELement ? { renderedSurroundingElement: surroundingELement } : BLANK
+		);
 		if (this.arguments.length > 0) {
 			if (this.arguments[this.arguments.length - 1].included) {
 				for (const arg of this.arguments) {
@@ -259,13 +264,6 @@ export default class CallExpression extends NodeBase implements DeoptimizableEnt
 				}
 			}
 		}
-		if (
-			renderedParentType === NodeType.ExpressionStatement &&
-			this.callee.type === NodeType.FunctionExpression
-		) {
-			code.appendRight(this.start, '(');
-			code.prependLeft(this.end, ')');
-		}
 	}
 
 	private getReturnExpression(recursionTracker: PathTracker): ExpressionEntity {

diff --git a/src/ast/nodes/ClassExpression.ts b/src/ast/nodes/ClassExpression.ts
@@ -1,6 +1,22 @@
+import MagicString from 'magic-string';
+import { BLANK } from '../../utils/blank';
+import { NodeRenderOptions, RenderOptions } from '../../utils/renderHelpers';
 import * as NodeType from './NodeType';
 import ClassNode from './shared/ClassNode';
 
 export default class ClassExpression extends ClassNode {
 	type!: NodeType.tClassExpression;
+
+	render(
+		code: MagicString,
+		options: RenderOptions,
+		{ renderedParentType, renderedSurroundingElement }: NodeRenderOptions = BLANK
+	) {
+		super.render(code, options);
+		const surroundingElement = renderedParentType || renderedSurroundingElement;
+		if (surroundingElement === NodeType.ExpressionStatement) {
+			code.appendRight(this.start, '(');
+			code.prependLeft(this.end, ')');
+		}
+	}
 }
diff --git a/src/ast/nodes/ConditionalExpression.ts b/src/ast/nodes/ConditionalExpression.ts
@@ -2,6 +2,7 @@ import MagicString from 'magic-string';
 import { BLANK } from '../../utils/blank';
 import {
 	findFirstOccurrenceOutsideComment,
+	findNonWhiteSpace,
 	NodeRenderOptions,
 	removeLineBreaks,
 	RenderOptions
@@ -171,10 +172,12 @@ export default class ConditionalExpression extends NodeBase implements Deoptimiz
 	) {
 		if (!this.test.included) {
 			const colonPos = findFirstOccurrenceOutsideComment(code.original, ':', this.consequent.end);
-			const inclusionStart =
+			const inclusionStart = findNonWhiteSpace(
+				code.original,
 				(this.consequent.included
 					? findFirstOccurrenceOutsideComment(code.original, '?', this.test.end)
-					: colonPos) + 1;
+					: colonPos) + 1
+			);
 			if (preventASI) {
 				removeLineBreaks(code, inclusionStart, this.usedBranch!.start);
 			}

diff --git a/src/ast/nodes/FunctionExpression.ts b/src/ast/nodes/FunctionExpression.ts
@@ -1,6 +1,22 @@
+import MagicString from 'magic-string';
+import { BLANK } from '../../utils/blank';
+import { NodeRenderOptions, RenderOptions } from '../../utils/renderHelpers';
 import * as NodeType from './NodeType';
 import FunctionNode from './shared/FunctionNode';
 
 export default class FunctionExpression extends FunctionNode {
 	type!: NodeType.tFunctionExpression;
+
+	render(
+		code: MagicString,
+		options: RenderOptions,
+		{ renderedParentType, renderedSurroundingElement }: NodeRenderOptions = BLANK
+	) {
+		super.render(code, options);
+		const surroundingElement = renderedParentType || renderedSurroundingElement;
+		if (surroundingElement === NodeType.ExpressionStatement) {
+			code.appendRight(this.start, '(');
+			code.prependLeft(this.end, ')');
+		}
+	}
 }
diff --git a/src/ast/nodes/LabeledStatement.ts b/src/ast/nodes/LabeledStatement.ts
@@ -1,5 +1,9 @@
 import MagicString from 'magic-string';
-import { findFirstOccurrenceOutsideComment, RenderOptions } from '../../utils/renderHelpers';
+import {
+	findFirstOccurrenceOutsideComment,
+	findNonWhiteSpace,
+	RenderOptions
+} from '../../utils/renderHelpers';
 import { HasEffectsContext, InclusionContext } from '../ExecutionContext';
 import Identifier from './Identifier';
 import * as NodeType from './NodeType';
@@ -39,7 +43,10 @@ export default class LabeledStatement extends StatementBase {
 		} else {
 			code.remove(
 				this.start,
-				findFirstOccurrenceOutsideComment(code.original, ':', this.label.end) + 1
+				findNonWhiteSpace(
+					code.original,
+					findFirstOccurrenceOutsideComment(code.original, ':', this.label.end) + 1
+				)
 			);
 		}
 		this.body.render(code, options);

diff --git a/src/ast/nodes/LogicalExpression.ts b/src/ast/nodes/LogicalExpression.ts
@@ -2,6 +2,7 @@ import MagicString from 'magic-string';
 import { BLANK } from '../../utils/blank';
 import {
 	findFirstOccurrenceOutsideComment,
+	findNonWhiteSpace,
 	NodeRenderOptions,
 	removeLineBreaks,
 	RenderOptions
@@ -168,9 +169,10 @@ export default class LogicalExpression extends NodeBase implements Deoptimizable
 				this.left.end
 			);
 			if (this.right.included) {
-				code.remove(this.start, operatorPos + 2);
+				const removePos = findNonWhiteSpace(code.original, operatorPos + 2);
+				code.remove(this.start, removePos);
 				if (preventASI) {
-					removeLineBreaks(code, operatorPos + 2, this.right.start);
+					removeLineBreaks(code, removePos, this.right.start);
 				}
 			} else {
 				code.remove(operatorPos, this.end);

diff --git a/src/ast/nodes/MemberExpression.ts b/src/ast/nodes/MemberExpression.ts
@@ -235,7 +235,11 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE
 	render(
 		code: MagicString,
 		options: RenderOptions,
-		{ renderedParentType, isCalleeOfRenderedParent }: NodeRenderOptions = BLANK
+		{
+			renderedParentType,
+			isCalleeOfRenderedParent,
+			renderedSurroundingElement
+		}: NodeRenderOptions = BLANK
 	) {
 		const isCalleeOfDifferentParent =
 			renderedParentType === NodeType.CallExpression && isCalleeOfRenderedParent;
@@ -250,7 +254,13 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE
 			if (isCalleeOfDifferentParent) {
 				code.appendRight(this.start, '0, ');
 			}
-			super.render(code, options);
+			const surroundingElement = renderedParentType || renderedSurroundingElement;
+			this.object.render(
+				code,
+				options,
+				surroundingElement ? { renderedSurroundingElement: surroundingElement } : BLANK
+			);
+			this.property.render(code, options);
 		}
 	}
 

diff --git a/src/ast/nodes/ObjectExpression.ts b/src/ast/nodes/ObjectExpression.ts
@@ -259,12 +259,13 @@ export default class ObjectExpression extends NodeBase implements DeoptimizableE
 	render(
 		code: MagicString,
 		options: RenderOptions,
-		{ renderedParentType }: NodeRenderOptions = BLANK
+		{ renderedParentType, renderedSurroundingElement }: NodeRenderOptions = BLANK
 	) {
 		super.render(code, options);
+		const surroundingElement = renderedParentType || renderedSurroundingElement;
 		if (
-			renderedParentType === NodeType.ExpressionStatement ||
-			renderedParentType === NodeType.ArrowFunctionExpression
+			surroundingElement === NodeType.ExpressionStatement ||
+			surroundingElement === NodeType.ArrowFunctionExpression
 		) {
 			code.appendRight(this.start, '(');
 			code.prependLeft(this.end, ')');

diff --git a/src/utils/renderHelpers.ts b/src/utils/renderHelpers.ts
@@ -24,6 +24,7 @@ export interface NodeRenderOptions {
 	isShorthandProperty?: boolean;
 	preventASI?: boolean;
 	renderedParentType?: string; // also serves as a flag if the rendered parent is different from the actual parent
+	renderedSurroundingElement?: string; // same as parent type, but for changed non-direct parents that directly preceed elements
 	start?: number;
 }
 

diff --git a/test/chunking-form/samples/namespace-reexports/_expected/amd/hsl2hsv.js b/test/chunking-form/samples/namespace-reexports/_expected/amd/hsl2hsv.js
@@ -3,7 +3,7 @@ define(['exports'], function (exports) { 'use strict';
   var hsl2hsv = (h, s, l) => {
     const t = s * (l < 0.5 ? 1 : 1 - l),
       V = 1 + t,
-      S =  2 * t / V ;
+      S = 2 * t / V ;
     return [h, S, V];
   };
 

diff --git a/test/chunking-form/samples/namespace-reexports/_expected/cjs/hsl2hsv.js b/test/chunking-form/samples/namespace-reexports/_expected/cjs/hsl2hsv.js
@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var hsl2hsv = (h, s, l) => {
   const t = s * (l < 0.5 ? 1 : 1 - l),
     V = 1 + t,
-    S =  2 * t / V ;
+    S = 2 * t / V ;
   return [h, S, V];
 };
 

diff --git a/test/chunking-form/samples/namespace-reexports/_expected/es/hsl2hsv.js b/test/chunking-form/samples/namespace-reexports/_expected/es/hsl2hsv.js
@@ -1,7 +1,7 @@
 var hsl2hsv = (h, s, l) => {
   const t = s * (l < 0.5 ? 1 : 1 - l),
     V = 1 + t,
-    S =  2 * t / V ;
+    S = 2 * t / V ;
   return [h, S, V];
 };
 

diff --git a/test/chunking-form/samples/namespace-reexports/_expected/system/hsl2hsv.js b/test/chunking-form/samples/namespace-reexports/_expected/system/hsl2hsv.js
@@ -6,7 +6,7 @@ System.register([], function (exports) {
       var hsl2hsv = exports('default', (h, s, l) => {
         const t = s * (l < 0.5 ? 1 : 1 - l),
           V = 1 + t,
-          S =  2 * t / V ;
+          S = 2 * t / V ;
         return [h, S, V];
       });
 

diff --git a/...en-dynamic-hash/_expected/amd/19d89d54.js → ...en-dynamic-hash/_expected/amd/16d985e6.js b/...en-dynamic-hash/_expected/amd/19d89d54.js → ...en-dynamic-hash/_expected/amd/16d985e6.js
@@ -1,6 +1,6 @@
 define(function () { 'use strict';
 
-	var main =  null;
+	var main = null;
 
 	return main;
 

diff --git a/...en-dynamic-hash/_expected/cjs/797a17bf.js → ...en-dynamic-hash/_expected/cjs/05ff8838.js b/...en-dynamic-hash/_expected/cjs/797a17bf.js → ...en-dynamic-hash/_expected/cjs/05ff8838.js
@@ -1,5 +1,5 @@
 'use strict';
 
-var main =  null;
+var main = null;
 
 module.exports = main;
diff --git a/...ken-dynamic-hash/_expected/es/114f0e8d.js → ...ken-dynamic-hash/_expected/es/bed29d35.js b/...ken-dynamic-hash/_expected/es/114f0e8d.js → ...ken-dynamic-hash/_expected/es/bed29d35.js
@@ -1,3 +1,3 @@
-var main =  null;
+var main = null;
 
 export default main;
diff --git a/...dynamic-hash/_expected/system/52b8365a.js → ...dynamic-hash/_expected/system/0998116a.js b/...dynamic-hash/_expected/system/52b8365a.js → ...dynamic-hash/_expected/system/0998116a.js
@@ -3,7 +3,7 @@ System.register([], function (exports) {
 	return {
 		execute: function () {
 
-			var main = exports('default',  null);
+			var main = exports('default', null);
 
 		}
 	};

diff --git a/test/form/samples/break-control-flow/break-statement-labels-in-loops/_expected.js b/test/form/samples/break-control-flow/break-statement-labels-in-loops/_expected.js
@@ -1,6 +1,6 @@
 while (globalThis.unknown) {
 	console.log('retained');
-	 {
+	{
 		break;
 	}
 }

diff --git a/test/form/samples/break-control-flow/break-statement-labels/_expected.js b/test/form/samples/break-control-flow/break-statement-labels/_expected.js
@@ -32,15 +32,15 @@ outer: {
 }
 
 function withConsequentReturn() {
-	 {
+	{
 		inner: {
 			if (globalThis.unknown) return;
 			else break inner;
 		}
 		console.log('retained');
 	}
-	 {
-		 {
+	{
+		{
 			return;
 		}
 	}
@@ -49,7 +49,7 @@ function withConsequentReturn() {
 withConsequentReturn();
 
 function withAlternateReturn() {
-	 {
+	{
 		inner: {
 			if (globalThis.unknown) break inner;
 			else return;

diff --git a/test/form/samples/builtin-prototypes/object-expression/_expected.js b/test/form/samples/builtin-prototypes/object-expression/_expected.js
@@ -1,11 +1,11 @@
 const object = {};
 object.propertyIsEnumerable( 'toString' );
-{}.propertyIsEnumerable( 'toString' );
-{}.propertyIsEnumerable( 'toString' ).valueOf();
+({}).propertyIsEnumerable( 'toString' );
+({}).propertyIsEnumerable( 'toString' ).valueOf();
 
-{}.hasOwnProperty( 'toString' ).valueOf();
-{}.isPrototypeOf( {} ).valueOf();
-{}.propertyIsEnumerable( 'toString' ).valueOf();
-{}.toLocaleString().trim();
-{}.toString().trim();
-{}.valueOf();
+({}).hasOwnProperty( 'toString' ).valueOf();
+({}).isPrototypeOf( {} ).valueOf();
+({}).propertyIsEnumerable( 'toString' ).valueOf();
+({}).toLocaleString().trim();
+({}).toString().trim();
+({}).valueOf();
diff --git a/test/form/samples/conditional-expression-paths/_expected.js b/test/form/samples/conditional-expression-paths/_expected.js
@@ -12,16 +12,16 @@ var baz = { x: () => console.log('effect') };
 (unknownValue ? foo : baz).x();
 
 // known branch without side-effects
-( foo ).y.z;
-( foo).y.z;
-( foo ).x();
-( foo).x();
+(foo ).y.z;
+(foo).y.z;
+(foo ).x();
+(foo).x();
 
 // known branch with side-effect
-( baz ).y.z;
-( baz).y.z;
-( baz ).x();
-( baz).x();
+(baz ).y.z;
+(baz).y.z;
+(baz ).x();
+(baz).x();
 var baz3 = {};
-( baz3 ).y.z = 1;
-( baz3).y.z = 1;
+(baz3 ).y.z = 1;
+(baz3).y.z = 1;
diff --git a/test/form/samples/conditional-expression/_expected.js b/test/form/samples/conditional-expression/_expected.js
@@ -9,9 +9,9 @@ unknownValue ? 1 : foo();
 (unknownValue ? function () {} : function () {this.x = 1;})();
 
 // known side-effect
- foo() ;
-( function () {this.x = 1;} )();
-( () => () => console.log( 'effect' ) )()();
- foo();
-( function () {this.x = 1;})();
-( () => () => console.log( 'effect' ))()();
+foo() ;
+(function () {this.x = 1;} )();
+(() => () => console.log( 'effect' ) )()();
+foo();
+(function () {this.x = 1;})();
+(() => () => console.log( 'effect' ))()();