Improve coverage

rollup · Aug 12, 2020 · e651d11 · e651d11
1 parent 89136d9
commit e651d11
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 8 deletions.
diff --git a/src/Chunk.ts b/src/Chunk.ts
@@ -1161,9 +1161,7 @@ export default class Chunk {
 				}
 			}
 			for (const importMeta of module.importMetas) {
-				if (importMeta.included) {
-					importMeta.addAccessedGlobals(this.outputOptions.format, accessedGlobalsByScope);
-				}
+				importMeta.addAccessedGlobals(this.outputOptions.format, accessedGlobalsByScope);
 			}
 		}
 	}

diff --git a/src/ast/scopes/ModuleScope.ts b/src/ast/scopes/ModuleScope.ts
@@ -29,11 +29,7 @@ export default class ModuleScope extends ChildScope {
 		return variable;
 	}
 
-	addNamespaceMemberAccess(_name: string, variable: Variable) {
-		if (variable instanceof GlobalVariable) {
-			this.accessedOutsideVariables.set(variable.name, variable);
-		}
-	}
+	addNamespaceMemberAccess() {}
 
 	deconflict(
 		format: InternalModuleFormat,

diff --git a/src/utils/interopHelpers.ts b/src/utils/interopHelpers.ts
@@ -4,6 +4,7 @@ const INTEROP_NAMESPACE_VARIABLE = '_interopNamespace';
 const INTEROP_NAMESPACE_DEFAULT_VARIABLE = '_interopNamespaceDefault';
 const INTEROP_NAMESPACE_DEFAULT_ONLY_VARIABLE = '_interopNamespaceDefaultOnly';
 
+// TODO Lukas find missing coverage
 export const defaultInteropHelpersByInteropType: { [interopType: string]: string | null } = {
 	auto: INTEROP_DEFAULT_VARIABLE,
 	default: null,

diff --git a/test/form/samples/interop-per-dependency/_config.js b/test/form/samples/interop-per-dependency/_config.js
@@ -4,6 +4,9 @@ module.exports = {
 		external: id => id.startsWith('external'),
 		output: {
 			interop(id) {
+				if (id === null) {
+					return 'auto';
+				}
 				return id.split('-')[1];
 			},
 			globals(id) {

diff --git a/test/form/samples/interop-per-dependency/_expected/amd.js b/test/form/samples/interop-per-dependency/_expected/amd.js
@@ -40,5 +40,7 @@ define(['require', 'external-auto', 'external-default', 'external-defaultOnly',
 	new Promise(function (resolve, reject) { require(['external-default'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefault(m)); }, reject) }).then(console.log);
 	new Promise(function (resolve, reject) { require(['external-defaultOnly'], function (m) { resolve(/*#__PURE__*/_interopNamespaceDefaultOnly(m)); }, reject) }).then(console.log);
 	new Promise(function (resolve, reject) { require(['external-esModule'], resolve, reject) }).then(console.log);
+	new Promise(function (resolve, reject) { require([globalThis.external1], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject) }).then(console.log);
+	new Promise(function (resolve, reject) { require([globalThis.external2], function (m) { resolve(/*#__PURE__*/_interopNamespace(m)); }, reject) }).then(console.log);
 
 });
diff --git a/test/form/samples/interop-per-dependency/_expected/cjs.js b/test/form/samples/interop-per-dependency/_expected/cjs.js
@@ -45,3 +45,5 @@ Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(requi
 Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefault(require('external-default')); }).then(console.log);
 Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespaceDefaultOnly(require('external-defaultOnly')); }).then(console.log);
 Promise.resolve().then(function () { return require('external-esModule'); }).then(console.log);
+Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(globalThis.external1)); }).then(console.log);
+Promise.resolve().then(function () { return /*#__PURE__*/_interopNamespace(require(globalThis.external2)); }).then(console.log);
diff --git a/test/form/samples/interop-per-dependency/_expected/es.js b/test/form/samples/interop-per-dependency/_expected/es.js
@@ -16,3 +16,5 @@ import('external-auto').then(console.log);
 import('external-default').then(console.log);
 import('external-defaultOnly').then(console.log);
 import('external-esModule').then(console.log);
+import(globalThis.external1).then(console.log);
+import(globalThis.external2).then(console.log);
diff --git a/test/form/samples/interop-per-dependency/_expected/iife.js b/test/form/samples/interop-per-dependency/_expected/iife.js
@@ -41,5 +41,7 @@
 	import('external-default').then(console.log);
 	import('external-defaultOnly').then(console.log);
 	import('external-esModule').then(console.log);
+	import(globalThis.external1).then(console.log);
+	import(globalThis.external2).then(console.log);
 
 }(externalauto, externaldefault, externaldefaultOnly, externalesModule));
diff --git a/test/form/samples/interop-per-dependency/_expected/system.js b/test/form/samples/interop-per-dependency/_expected/system.js
@@ -29,6 +29,8 @@ System.register(['external-auto', 'external-default', 'external-defaultOnly', 'e
 			module.import('external-default').then(console.log);
 			module.import('external-defaultOnly').then(console.log);
 			module.import('external-esModule').then(console.log);
+			module.import(globalThis.external1).then(console.log);
+			module.import(globalThis.external2).then(console.log);
 
 		}
 	};

diff --git a/test/form/samples/interop-per-dependency/_expected/umd.js b/test/form/samples/interop-per-dependency/_expected/umd.js
@@ -44,5 +44,7 @@
 	import('external-default').then(console.log);
 	import('external-defaultOnly').then(console.log);
 	import('external-esModule').then(console.log);
+	import(globalThis.external1).then(console.log);
+	import(globalThis.external2).then(console.log);
 
 })));
diff --git a/test/form/samples/interop-per-dependency/main.js b/test/form/samples/interop-per-dependency/main.js
@@ -16,3 +16,5 @@ import('external-auto').then(console.log);
 import('external-default').then(console.log);
 import('external-defaultOnly').then(console.log);
 import('external-esModule').then(console.log);
+import(globalThis.external1).then(console.log);
+import(globalThis.external2).then(console.log);