Improve coverage

rollup · May 26, 2020 · ca05b26 · ca05b26
1 parent 90c5613
commit ca05b26
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 6 deletions.
diff --git a/src/ModuleLoader.ts b/src/ModuleLoader.ts
@@ -6,7 +6,6 @@ import {
 	GetManualChunk,
 	HasModuleSideEffects,
 	NormalizedInputOptions,
-	NormalizedTreeshakingOptions,
 	ResolvedId,
 	ResolveIdResult,
 	SourceDescription
@@ -51,8 +50,9 @@ export class ModuleLoader {
 		private readonly options: NormalizedInputOptions,
 		private readonly pluginDriver: PluginDriver
 	) {
-		this.hasModuleSideEffects =
-			(options.treeshake as NormalizedTreeshakingOptions)?.moduleSideEffects || (() => true);
+		this.hasModuleSideEffects = options.treeshake
+			? options.treeshake.moduleSideEffects
+			: () => true;
 	}
 
 	async addEntryModules(

diff --git a/src/ast/nodes/CallExpression.ts b/src/ast/nodes/CallExpression.ts
@@ -155,7 +155,7 @@ export default class CallExpression extends NodeBase implements DeoptimizableEnt
 			if (argument.hasEffects(context)) return true;
 		}
 		if (
-			(this.context.options.treeshake as NormalizedTreeshakingOptions)?.annotations &&
+			(this.context.options.treeshake as NormalizedTreeshakingOptions).annotations &&
 			this.annotatedPure
 		)
 			return false;

diff --git a/src/ast/nodes/NewExpression.ts b/src/ast/nodes/NewExpression.ts
@@ -26,7 +26,7 @@ export default class NewExpression extends NodeBase {
 			if (argument.hasEffects(context)) return true;
 		}
 		if (
-			(this.context.options.treeshake as NormalizedTreeshakingOptions)?.annotations &&
+			(this.context.options.treeshake as NormalizedTreeshakingOptions).annotations &&
 			this.annotatedPure
 		)
 			return false;

diff --git a/src/ast/nodes/TryStatement.ts b/src/ast/nodes/TryStatement.ts
@@ -15,7 +15,7 @@ export default class TryStatement extends StatementBase {
 
 	hasEffects(context: HasEffectsContext): boolean {
 		return (
-			((this.context.options.treeshake as NormalizedTreeshakingOptions)?.tryCatchDeoptimization
+			((this.context.options.treeshake as NormalizedTreeshakingOptions).tryCatchDeoptimization
 				? this.block.body.length > 0
 				: this.block.hasEffects(context)) ||
 			(this.finalizer !== null && this.finalizer.hasEffects(context))

diff --git a/test/form/samples/no-treeshake/_expected/amd.js b/test/form/samples/no-treeshake/_expected/amd.js
@@ -45,6 +45,10 @@ define(['exports', 'external'], function (exports, external) { 'use strict';
 		}
 	});
 
+	try {
+		const x = 1;
+	} catch {}
+
 	exports.create = create;
 	exports.getPrototypeOf = getPrototypeOf;
 	exports.quux = quux;

diff --git a/test/form/samples/no-treeshake/_expected/cjs.js b/test/form/samples/no-treeshake/_expected/cjs.js
@@ -49,6 +49,10 @@ test({
 	}
 });
 
+try {
+	const x = 1;
+} catch {}
+
 exports.create = create;
 exports.getPrototypeOf = getPrototypeOf;
 exports.quux = quux;

diff --git a/test/form/samples/no-treeshake/_expected/es.js b/test/form/samples/no-treeshake/_expected/es.js
@@ -45,4 +45,8 @@ test({
 	}
 });
 
+try {
+	const x = 1;
+} catch {}
+
 export { create, getPrototypeOf, quux, quux as strange };
diff --git a/test/form/samples/no-treeshake/_expected/iife.js b/test/form/samples/no-treeshake/_expected/iife.js
@@ -46,6 +46,10 @@ var stirred = (function (exports, external) {
 		}
 	});
 
+	try {
+		const x = 1;
+	} catch {}
+
 	exports.create = create;
 	exports.getPrototypeOf = getPrototypeOf;
 	exports.quux = quux;

diff --git a/test/form/samples/no-treeshake/_expected/system.js b/test/form/samples/no-treeshake/_expected/system.js
@@ -52,6 +52,10 @@ System.register('stirred', ['external'], function (exports) {
 				}
 			});
 
+			try {
+				const x = 1;
+			} catch {}
+
 		}
 	};
 });
diff --git a/test/form/samples/no-treeshake/_expected/umd.js b/test/form/samples/no-treeshake/_expected/umd.js
@@ -49,6 +49,10 @@
 		}
 	});
 
+	try {
+		const x = 1;
+	} catch {}
+
 	exports.create = create;
 	exports.getPrototypeOf = getPrototypeOf;
 	exports.quux = quux;

diff --git a/test/form/samples/no-treeshake/main.js b/test/form/samples/no-treeshake/main.js
@@ -42,3 +42,7 @@ test({
 		var unused = 1;
 	}
 });
+
+try {
+	const x = 1;
+} catch {}