Add treeshake.correctVarValueBeforeDeclaration option

rollup · Jun 13, 2021 · 046f3f6 · 046f3f6
1 parent abb32d7
commit 046f3f6
Show file tree

Hide file tree

Showing 16 changed files with 68 additions and 34 deletions.
diff --git a/src/ast/nodes/Identifier.ts b/src/ast/nodes/Identifier.ts
@@ -14,7 +14,7 @@ import LocalVariable from '../variables/LocalVariable';
 import Variable from '../variables/Variable';
 import * as NodeType from './NodeType';
 import SpreadElement from './SpreadElement';
-import { ExpressionEntity, LiteralValueOrUnknown } from './shared/Expression';
+import { ExpressionEntity, LiteralValueOrUnknown, UNKNOWN_EXPRESSION } from './shared/Expression';
 import { ExpressionNode, NodeBase } from './shared/Node';
 import { PatternNode } from './shared/Pattern';
 
@@ -45,9 +45,15 @@ export default class Identifier extends NodeBase implements PatternNode {
 
 	declare(kind: string, init: ExpressionEntity): LocalVariable[] {
 		let variable: LocalVariable;
+		const { treeshake } = this.context.options;
 		switch (kind) {
 			case 'var':
-				variable = this.scope.addDeclaration(this, this.context, init, true);
+				variable = this.scope.addDeclaration(
+					this,
+					this.context,
+					treeshake && treeshake.correctVarValueBeforeDeclaration ? UNKNOWN_EXPRESSION : init,
+					true
+				);
 				break;
 			case 'function':
 				// in strict mode, functions are only hoisted within a scope but not across block scopes

diff --git a/src/rollup/types.d.ts b/src/rollup/types.d.ts
@@ -478,6 +478,7 @@ type TreeshakingPreset = 'smallest' | 'safest' | 'recommended';
 
 export interface TreeshakingOptions {
 	annotations?: boolean;
+	correctVarValueBeforeDeclaration?: boolean;
 	moduleSideEffects?: ModuleSideEffectsOption;
 	preset?: TreeshakingPreset;
 	propertyReadSideEffects?: boolean | 'always';
@@ -489,6 +490,7 @@ export interface TreeshakingOptions {
 
 export interface NormalizedTreeshakingOptions {
 	annotations: boolean;
+	correctVarValueBeforeDeclaration: boolean;
 	moduleSideEffects: HasModuleSideEffects;
 	propertyReadSideEffects: boolean | 'always';
 	tryCatchDeoptimization: boolean;

diff --git a/src/utils/options/normalizeInputOptions.ts b/src/utils/options/normalizeInputOptions.ts
@@ -7,6 +7,7 @@ import {
 	PreserveEntrySignaturesOption,
 	PureModulesOption,
 	RollupBuild,
+	TreeshakingOptions,
 	WarningHandler
 } from '../../rollup/types';
 import { ensureArray } from '../ensureArray';
@@ -233,15 +234,21 @@ const getTreeshake = (
 	if (configTreeshake === false) {
 		return false;
 	}
-	if (!configTreeshake || configTreeshake === true) {
-		return {
-			annotations: true,
-			moduleSideEffects: () => true,
-			propertyReadSideEffects: true,
-			tryCatchDeoptimization: true,
-			unknownGlobalSideEffects: true
-		};
+	if (typeof configTreeshake === 'string') {
+		const preset = treeshakePresets[configTreeshake];
+		if (preset) {
+			return preset;
+		}
+		error(
+			errInvalidOption(
+				'treeshake',
+				`valid values are false, true, ${printQuotedStringList(
+					Object.keys(treeshakePresets)
+				)}. You can also supply an object for more fine-grained control`
+			)
+		);
 	}
+	let configWithPreset: TreeshakingOptions = {};
 	if (typeof configTreeshake === 'object') {
 		if (typeof configTreeshake.pureExternalModules !== 'undefined') {
 			warnDeprecationWithOptions(
@@ -251,7 +258,7 @@ const getTreeshake = (
 				strictDeprecations
 			);
 		}
-		let configWithPreset = configTreeshake;
+		configWithPreset = configTreeshake;
 		const presetName = configTreeshake.preset;
 		if (presetName) {
 			const preset = treeshakePresets[presetName];
@@ -266,34 +273,24 @@ const getTreeshake = (
 				);
 			}
 		}
-		return {
-			annotations: configWithPreset.annotations !== false,
-			moduleSideEffects: configTreeshake.pureExternalModules
+	}
+	return {
+		annotations: configWithPreset.annotations !== false,
+		correctVarValueBeforeDeclaration: configWithPreset.correctVarValueBeforeDeclaration === true,
+		moduleSideEffects:
+			typeof configTreeshake === 'object' && configTreeshake.pureExternalModules
 				? getHasModuleSideEffects(
 						configTreeshake.moduleSideEffects,
 						configTreeshake.pureExternalModules
 				  )
 				: getHasModuleSideEffects(configWithPreset.moduleSideEffects, undefined),
-			propertyReadSideEffects:
-				configWithPreset.propertyReadSideEffects === 'always'
-					? 'always'
-					: configWithPreset.propertyReadSideEffects !== false,
-			tryCatchDeoptimization: configWithPreset.tryCatchDeoptimization !== false,
-			unknownGlobalSideEffects: configWithPreset.unknownGlobalSideEffects !== false
-		};
-	}
-	const preset = treeshakePresets[configTreeshake];
-	if (preset) {
-		return preset;
-	}
-	error(
-		errInvalidOption(
-			'treeshake',
-			`valid values are false, true, ${printQuotedStringList(
-				Object.keys(treeshakePresets)
-			)}. You can also supply an object for more fine-grained control`
-		)
-	);
+		propertyReadSideEffects:
+			configWithPreset.propertyReadSideEffects === 'always'
+				? 'always'
+				: configWithPreset.propertyReadSideEffects !== false,
+		tryCatchDeoptimization: configWithPreset.tryCatchDeoptimization !== false,
+		unknownGlobalSideEffects: configWithPreset.unknownGlobalSideEffects !== false
+	};
 };
 
 const getHasModuleSideEffects = (

diff --git a/src/utils/options/options.ts b/src/utils/options/options.ts
@@ -38,20 +38,23 @@ export const treeshakePresets: {
 } = {
 	recommended: {
 		annotations: true,
+		correctVarValueBeforeDeclaration: false,
 		moduleSideEffects: () => true,
 		propertyReadSideEffects: true,
 		tryCatchDeoptimization: true,
 		unknownGlobalSideEffects: false
 	},
 	safest: {
 		annotations: true,
+		correctVarValueBeforeDeclaration: true,
 		moduleSideEffects: () => true,
 		propertyReadSideEffects: true,
 		tryCatchDeoptimization: true,
 		unknownGlobalSideEffects: true
 	},
 	smallest: {
 		annotations: true,
+		correctVarValueBeforeDeclaration: false,
 		moduleSideEffects: () => false,
 		propertyReadSideEffects: false,
 		tryCatchDeoptimization: false,

diff --git a/test/cli/samples/treeshake-preset-override/main.js b/test/cli/samples/treeshake-preset-override/main.js
@@ -13,3 +13,6 @@ try {
 } catch {}
 
 unknownGlobal;
+
+if (!foo) console.log('effect');
+var foo = true;
diff --git a/test/form/samples/treeshake-presets/preset-with-override/_config.js b/test/form/samples/treeshake-presets/preset-with-override/_config.js
@@ -11,6 +11,7 @@ module.exports = {
 		plugins: [
 			{
 				buildStart(options) {
+					assert.strictEqual(options.treeshake.correctVarValueBeforeDeclaration, false);
 					assert.strictEqual(options.treeshake.propertyReadSideEffects, false);
 					assert.strictEqual(options.treeshake.tryCatchDeoptimization, false);
 					assert.strictEqual(options.treeshake.unknownGlobalSideEffects, true);

diff --git a/test/form/samples/treeshake-presets/preset-with-override/main.js b/test/form/samples/treeshake-presets/preset-with-override/main.js
@@ -13,3 +13,6 @@ try {
 } catch {}
 
 unknownGlobal;
+
+if (!foo) console.log('effect');
+var foo = true;
diff --git a/test/form/samples/treeshake-presets/recommended/_config.js b/test/form/samples/treeshake-presets/recommended/_config.js
@@ -8,6 +8,7 @@ module.exports = {
 		plugins: [
 			{
 				buildStart(options) {
+					assert.strictEqual(options.treeshake.correctVarValueBeforeDeclaration, false);
 					assert.strictEqual(options.treeshake.propertyReadSideEffects, true);
 					assert.strictEqual(options.treeshake.tryCatchDeoptimization, true);
 					assert.strictEqual(options.treeshake.unknownGlobalSideEffects, false);

diff --git a/test/form/samples/treeshake-presets/recommended/main.js b/test/form/samples/treeshake-presets/recommended/main.js
@@ -13,3 +13,6 @@ try {
 } catch {}
 
 unknownGlobal;
+
+if (!foo) console.log('effect');
+var foo = true;
diff --git a/test/form/samples/treeshake-presets/safest/_config.js b/test/form/samples/treeshake-presets/safest/_config.js
@@ -8,6 +8,7 @@ module.exports = {
 		plugins: [
 			{
 				buildStart(options) {
+					assert.strictEqual(options.treeshake.correctVarValueBeforeDeclaration, true);
 					assert.strictEqual(options.treeshake.propertyReadSideEffects, true);
 					assert.strictEqual(options.treeshake.tryCatchDeoptimization, true);
 					assert.strictEqual(options.treeshake.unknownGlobalSideEffects, true);

diff --git a/test/form/samples/treeshake-presets/safest/_expected.js b/test/form/samples/treeshake-presets/safest/_expected.js
@@ -13,3 +13,6 @@ try {
 } catch {}
 
 unknownGlobal;
+
+if (!foo) console.log('effect');
+var foo = true;
diff --git a/test/form/samples/treeshake-presets/safest/main.js b/test/form/samples/treeshake-presets/safest/main.js
@@ -13,3 +13,6 @@ try {
 } catch {}
 
 unknownGlobal;
+
+if (!foo) console.log('effect');
+var foo = true;
diff --git a/test/form/samples/treeshake-presets/smallest/_config.js b/test/form/samples/treeshake-presets/smallest/_config.js
@@ -8,6 +8,7 @@ module.exports = {
 		plugins: [
 			{
 				buildStart(options) {
+					assert.strictEqual(options.treeshake.correctVarValueBeforeDeclaration, false);
 					assert.strictEqual(options.treeshake.propertyReadSideEffects, false);
 					assert.strictEqual(options.treeshake.tryCatchDeoptimization, false);
 					assert.strictEqual(options.treeshake.unknownGlobalSideEffects, false);

diff --git a/test/form/samples/treeshake-presets/smallest/main.js b/test/form/samples/treeshake-presets/smallest/main.js
@@ -13,3 +13,6 @@ try {
 } catch {}
 
 unknownGlobal;
+
+if (!foo) console.log('effect');
+var foo = true;
diff --git a/test/form/samples/treeshake-presets/true/_config.js b/test/form/samples/treeshake-presets/true/_config.js
@@ -8,6 +8,7 @@ module.exports = {
 		plugins: [
 			{
 				buildStart(options) {
+					assert.strictEqual(options.treeshake.correctVarValueBeforeDeclaration, false);
 					assert.strictEqual(options.treeshake.propertyReadSideEffects, true);
 					assert.strictEqual(options.treeshake.tryCatchDeoptimization, true);
 					assert.strictEqual(options.treeshake.unknownGlobalSideEffects, true);

diff --git a/test/form/samples/treeshake-presets/true/main.js b/test/form/samples/treeshake-presets/true/main.js
@@ -13,3 +13,6 @@ try {
 } catch {}
 
 unknownGlobal;
+
+if (!foo) console.log('effect');
+var foo = true;