Respect propertyReadSideEffects in spread elements (#4119)

rollup · Jun 3, 2021 · 5c05997 · 5c05997
1 parent b3d130b
commit 5c05997
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 4 deletions.
diff --git a/src/ast/nodes/SpreadElement.ts b/src/ast/nodes/SpreadElement.ts
@@ -1,3 +1,4 @@
+import { NormalizedTreeshakingOptions } from '../../rollup/types';
 import { HasEffectsContext } from '../ExecutionContext';
 import { NodeEvent } from '../NodeEvents';
 import { ObjectPath, PathTracker, UNKNOWN_PATH, UnknownKey } from '../utils/PathTracker';
@@ -27,9 +28,14 @@ export default class SpreadElement extends NodeBase {
 	}
 
 	hasEffects(context: HasEffectsContext): boolean {
+		if (!this.deoptimized) this.applyDeoptimizations();
+		const { propertyReadSideEffects } = this.context.options
+			.treeshake as NormalizedTreeshakingOptions;
 		return (
 			this.argument.hasEffects(context) ||
-			this.argument.hasEffectsWhenAccessedAtPath(UNKNOWN_PATH, context)
+			(propertyReadSideEffects &&
+				(propertyReadSideEffects === 'always' ||
+					this.argument.hasEffectsWhenAccessedAtPath(UNKNOWN_PATH, context)))
 		);
 	}
 

diff --git a/test/form/samples/ignore-property-access-side-effects/main.js b/test/form/samples/ignore-property-access-side-effects/main.js
@@ -1,6 +1,6 @@
 const getter = {
-	get foo () {
-		console.log( 'effect' );
+	get foo() {
+		console.log('effect');
 	}
 };
 const foo1 = getter.foo;
@@ -13,4 +13,22 @@ function accessArg(arg) {
 }
 accessArg(null);
 
-const foo4 = globalThis.globalThis.unknown.unknownProperty;
+const foo4 = globalThis.unknown.unknownProperty;
+
+const foo5 = {
+	...{
+		get prop() {
+			console.log('effect');
+		}
+	}
+};
+
+const foo6 = (async function () {
+	await {
+		get then() {
+			console.log('effect');
+			return () => {};
+		}
+	};
+	return { then() {} };
+})();
diff --git a/test/form/samples/keep-property-access-side-effects/_expected.js b/test/form/samples/keep-property-access-side-effects/_expected.js
@@ -14,3 +14,21 @@ function accessArg(arg) {
 accessArg(null);
 
 globalThis.unknown.unknownProperty;
+
+({
+	...{
+		get prop() {
+			console.log('effect');
+		}
+	}
+});
+
+((async function () {
+	await {
+		get then() {
+			console.log('effect');
+			return () => {};
+		}
+	};
+	return { then() {} };
+}))();
diff --git a/test/form/samples/keep-property-access-side-effects/main.js b/test/form/samples/keep-property-access-side-effects/main.js
@@ -14,3 +14,21 @@ function accessArg(arg) {
 accessArg(null);
 
 const foo4 = globalThis.unknown.unknownProperty;
+
+const foo5 = {
+	...{
+		get prop() {
+			console.log('effect');
+		}
+	}
+};
+
+const foo6 = (async function () {
+	await {
+		get then() {
+			console.log('effect');
+			return () => {};
+		}
+	};
+	return { then() {} };
+})();