Merge pull request #396 from rollup/gh-293

allow options.globals to be a function, warn on miss

src/finalisers/iife.js

@@ -2,6 +2,7 @@ import { blank } from '../utils/object.js';
 import { getName } from '../utils/map-helpers.js';
 import getInteropBlock from './shared/getInteropBlock.js';
 import getExportBlock from './shared/getExportBlock.js';
+import getGlobalNameMaker from './shared/getGlobalNameMaker.js';
 
 function setupNamespace ( keypath ) {
 	let parts = keypath.split( '.' ); // TODO support e.g. `foo['something-hyphenated']`?
@@ -16,13 +17,12 @@ function setupNamespace ( keypath ) {
 }
 
 export default function iife ( bundle, magicString, { exportMode, indentString }, options ) {
-	const globalNames = options.globals || blank();
+	const globalNameMaker = getGlobalNameMaker( options.globals || blank(), bundle.onwarn );
+
 	const name = options.moduleName;
 	const isNamespaced = name && ~name.indexOf( '.' );
 
-	let dependencies = bundle.externalModules.map( module => {
+	let dependencies = bundle.externalModules.map( globalNameMaker );
-		return globalNames[ module.id ] || module.name;
-	});
 
 	let args = bundle.externalModules.map( getName );
 

src/finalisers/shared/getGlobalNameMaker.js

@@ -0,0 +1,11 @@
+export default function getGlobalNameMaker ( globals, onwarn ) {
+	const fn = typeof globals === 'function' ? globals : id => globals[ id ];
+
+	return function ( module ) {
+		const name = fn( module.id );
+		if ( name ) return name;
+
+		onwarn( `No name was provided for external module '${module.id}' in options.globals – guessing '${module.name}'` );
+		return module.name;
+	};
+}

src/finalisers/umd.js

@@ -2,6 +2,7 @@ import { blank } from '../utils/object.js';
 import { getName, quoteId, req } from '../utils/map-helpers.js';
 import getInteropBlock from './shared/getInteropBlock.js';
 import getExportBlock from './shared/getExportBlock.js';
+import getGlobalNameMaker from './shared/getGlobalNameMaker.js';
 
 function setupNamespace ( name ) {
 	const parts = name.split( '.' );
@@ -19,13 +20,11 @@ export default function umd ( bundle, magicString, { exportMode, indentString },
 		throw new Error( 'You must supply options.moduleName for UMD bundles' );
 	}
 
-	const globalNames = options.globals || blank();
+	const globalNameMaker = getGlobalNameMaker( options.globals || blank(), bundle.onwarn );
 
 	let amdDeps = bundle.externalModules.map( quoteId );
 	let cjsDeps = bundle.externalModules.map( req );
-	let globalDeps = bundle.externalModules.map( module => {
+	let globalDeps = bundle.externalModules.map( module => `global.${globalNameMaker( module )}` );
-		return 'global.' + (globalNames[ module.id ] || module.name);
-	});
 
 	let args = bundle.externalModules.map( getName );
 

test/form/external-imports-custom-names-function/_config.js

@@ -0,0 +1,8 @@
+module.exports = {
+	description: 'allows globals to be specified as a function',
+	options: {
+		globals: function ( id ) {
+			return id.replace( /-/g, '_' );
+		}
+	}
+};

test/form/external-imports-custom-names-function/_expected/amd.js

@@ -0,0 +1,5 @@
+define(['a-b-c'], function (aBC) { 'use strict';
+
+	aBC.foo();
+
+});

test/form/external-imports-custom-names-function/_expected/cjs.js

@@ -0,0 +1,5 @@
+'use strict';
+
+var aBC = require('a-b-c');
+
+aBC.foo();

test/form/external-imports-custom-names-function/_expected/es6.js

@@ -0,0 +1,3 @@
+import { foo } from 'a-b-c';
+
+foo();

test/form/external-imports-custom-names-function/_expected/iife.js

@@ -0,0 +1,5 @@
+(function (aBC) { 'use strict';
+
+	aBC.foo();
+
+})(a_b_c);

test/form/external-imports-custom-names-function/_expected/umd.js

@@ -0,0 +1,9 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? factory(require('a-b-c')) :
+	typeof define === 'function' && define.amd ? define(['a-b-c'], factory) :
+	(factory(global.a_b_c));
+}(this, function (aBC) { 'use strict';
+
+	aBC.foo();
+
+}));

test/form/external-imports-custom-names-function/main.js

@@ -0,0 +1,2 @@
+import { foo } from 'a-b-c';
+foo();