Improve coverage

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(

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;

src/ast/nodes/Identifier.ts

@@ -102,7 +102,7 @@ export default class Identifier extends NodeBase implements PatternNode {
 
 	hasEffects(): boolean {
 		return (
-			(this.context.options.treeshake as NormalizedTreeshakingOptions)?.unknownGlobalSideEffects &&
+			(this.context.options.treeshake as NormalizedTreeshakingOptions).unknownGlobalSideEffects &&
 			this.variable instanceof GlobalVariable &&
 			this.variable.hasEffectsWhenAccessedAtPath(EMPTY_PATH)
 		);

src/ast/nodes/MemberExpression.ts

@@ -176,7 +176,7 @@ export default class MemberExpression extends NodeBase implements DeoptimizableE
 		return (
 			this.property.hasEffects(context) ||
 			this.object.hasEffects(context) ||
-			((this.context.options.treeshake as NormalizedTreeshakingOptions)?.propertyReadSideEffects &&
+			((this.context.options.treeshake as NormalizedTreeshakingOptions).propertyReadSideEffects &&
 				this.object.hasEffectsWhenAccessedAtPath([this.propertyKey!], context))
 		);
 	}

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;

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))

src/finalisers/umd.ts

@@ -75,13 +75,11 @@ export default function umd(
 		factoryArgs.unshift('exports');
 	}
 
-	const amdOptions = options.amd || {};
-
 	const amdParams =
-		(amdOptions.id ? `'${amdOptions.id}',${_}` : ``) +
+		(options.amd.id ? `'${options.amd.id}',${_}` : ``) +
 		(amdDeps.length ? `[${amdDeps.join(`,${_}`)}],${_}` : ``);
 
-	const define = amdOptions.define;
+	const define = options.amd.define;
 	const cjsExport = !namedExportsMode && hasExports ? `module.exports${_}=${_}` : ``;
 	const useStrict = options.strict ? `${_}'use strict';${n}` : ``;
 

src/utils/options/mergeOptions.ts

@@ -91,7 +91,7 @@ type CompleteInputOptions<U extends keyof InputOptions> = {
 
 function mergeInputOptions(
 	config: GenericConfigObject,
-	overrides: CommandConfigObject = { external: [], globals: undefined },
+	overrides: CommandConfigObject,
 	defaultOnWarnHandler: WarningHandler
 ): InputOptions {
 	const getOption = (name: string): any => overrides[name] ?? config[name];
@@ -179,7 +179,7 @@ type CompleteOutputOptions<U extends keyof OutputOptions> = {
 
 function mergeOutputOptions(
 	config: GenericConfigObject,
-	overrides: GenericConfigObject = {},
+	overrides: GenericConfigObject,
 	warn: WarningHandler
 ): OutputOptions {
 	const getOption = (name: string): any => overrides[name] ?? config[name];

test/form/samples/amd-id/_config.js

@@ -0,0 +1,4 @@
+module.exports = {
+	description: 'allows to declare an AMD id',
+	options: { output: { amd: { id: 'my-id' } } }
+};

test/form/samples/amd-id/_expected/amd.js

@@ -0,0 +1,5 @@
+define('my-id', function () { 'use strict';
+
+	console.log(42);
+
+});

test/form/samples/amd-id/_expected/cjs.js

@@ -0,0 +1,3 @@
+'use strict';
+
+console.log(42);

test/form/samples/amd-id/_expected/es.js

@@ -0,0 +1 @@
+console.log(42);

test/form/samples/amd-id/_expected/iife.js

@@ -0,0 +1,6 @@
+(function () {
+	'use strict';
+
+	console.log(42);
+
+}());

test/form/samples/amd-id/_expected/system.js

@@ -0,0 +1,10 @@
+System.register([], function () {
+	'use strict';
+	return {
+		execute: function () {
+
+			console.log(42);
+
+		}
+	};
+});

test/form/samples/amd-id/_expected/umd.js

@@ -0,0 +1,8 @@
+(function (factory) {
+	typeof define === 'function' && define.amd ? define('my-id', factory) :
+	factory();
+}((function () { 'use strict';
+
+	console.log(42);
+
+})));

test/form/samples/amd-id/main.js

@@ -0,0 +1 @@
+console.log(42);

test/form/samples/globals-function/_config.js

@@ -0,0 +1,10 @@
+module.exports = {
+	description: 'Externals aliases with deshadowing',
+	options: {
+		external: ['a', 'b'],
+		output: {
+			globals: id => `thisIs${id.toUpperCase()}`,
+			name: 'myBundle'
+		}
+	}
+};

test/form/samples/globals-function/_expected/amd.js

@@ -0,0 +1,8 @@
+define(['a', 'b'], function (a, b) { 'use strict';
+
+	a = a && Object.prototype.hasOwnProperty.call(a, 'default') ? a['default'] : a;
+	b = b && Object.prototype.hasOwnProperty.call(b, 'default') ? b['default'] : b;
+
+	console.log(a, b);
+
+});

test/form/samples/globals-function/_expected/cjs.js

@@ -0,0 +1,8 @@
+'use strict';
+
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var a = _interopDefault(require('a'));
+var b = _interopDefault(require('b'));
+
+console.log(a, b);

test/form/samples/globals-function/_expected/es.js

@@ -0,0 +1,4 @@
+import a from 'a';
+import b from 'b';
+
+console.log(a, b);

test/form/samples/globals-function/_expected/iife.js

@@ -0,0 +1,9 @@
+(function (a, b) {
+	'use strict';
+
+	a = a && Object.prototype.hasOwnProperty.call(a, 'default') ? a['default'] : a;
+	b = b && Object.prototype.hasOwnProperty.call(b, 'default') ? b['default'] : b;
+
+	console.log(a, b);
+
+}(thisIsA, thisIsB));

test/form/samples/globals-function/_expected/system.js

@@ -0,0 +1,16 @@
+System.register('myBundle', ['a', 'b'], function () {
+	'use strict';
+	var a, b;
+	return {
+		setters: [function (module) {
+			a = module.default;
+		}, function (module) {
+			b = module.default;
+		}],
+		execute: function () {
+
+			console.log(a, b);
+
+		}
+	};
+});

test/form/samples/globals-function/_expected/umd.js

@@ -0,0 +1,12 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('a'), require('b')) :
+	typeof define === 'function' && define.amd ? define(['a', 'b'], factory) :
+	(global = global || self, factory(global.thisIsA, global.thisIsB));
+}(this, (function (a, b) { 'use strict';
+
+	a = a && Object.prototype.hasOwnProperty.call(a, 'default') ? a['default'] : a;
+	b = b && Object.prototype.hasOwnProperty.call(b, 'default') ? b['default'] : b;
+
+	console.log(a, b);
+
+})));

test/form/samples/globals-function/main.js

@@ -0,0 +1,4 @@
+import a from 'a';
+import b from 'b';
+
+console.log(a, 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;

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;

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 };

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;

test/form/samples/no-treeshake/_expected/system.js

@@ -52,6 +52,10 @@ System.register('stirred', ['external'], function (exports) {
 				}
 			});
 
+			try {
+				const x = 1;
+			} catch {}
+
 		}
 	};
 });

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;

test/form/samples/no-treeshake/main.js

@@ -42,3 +42,7 @@ test({
 		var unused = 1;
 	}
 });
+
+try {
+	const x = 1;
+} catch {}