normalise options

bin/src/run/batchWarnings.js

@@ -74,6 +74,13 @@ export default function batchWarnings () {
 }
 
 const immediateHandlers = {
+	DEPRECATED_OPTIONS: warning => {
+		title( `Some options have been renamed` );
+		warning.options.forEach(({ key, replacement }) => {
+			stderr( `${chalk.bold(key)} is now ${replacement}` );
+		});
+	},
+
 	MISSING_NODE_BUILTINS: warning => {
 		title( `Missing shims for Node.js built-ins` );
 

bin/src/run/build.js

@@ -7,25 +7,25 @@ import { mapSequence } from '../../../src/utils/promise.js';
 import SOURCEMAPPING_URL from '../sourceMappingUrl.js';
 
 export default function build ( options, warnings, silent ) {
-	const useStdout = !options.targets && !options.dest;
-	const targets = options.targets ? options.targets : [{ dest: options.dest, format: options.format }];
+	const useStdout = !options.targets && !options.output;
+	const targets = options.targets ? options.targets : [{ output: options.output, format: options.format }];
 
 	const start = Date.now();
-	const dests = useStdout ? [ 'stdout' ] : targets.map( t => relativeId( t.dest ) );
-	if ( !silent ) stderr( chalk.cyan( `\n${chalk.bold( options.entry )} → ${chalk.bold( dests.join( ', ' ) )}...` ) );
+	const dests = useStdout ? [ 'stdout' ] : targets.map( t => relativeId( t.output ) );
+	if ( !silent ) stderr( chalk.cyan( `\n${chalk.bold( options.input )} → ${chalk.bold( dests.join( ', ' ) )}...` ) );
 
 	return rollup.rollup( options )
 		.then( bundle => {
 			if ( useStdout ) {
-				if ( options.sourceMap && options.sourceMap !== 'inline' ) {
+				if ( options.sourcemap && options.sourcemap !== 'inline' ) {
 					handleError({
 						code: 'MISSING_OUTPUT_OPTION',
 						message: 'You must specify an --output (-o) option when creating a file with a sourcemap'
 					});
 				}
 
 				return bundle.generate(options).then( ({ code, map }) => {
-					if ( options.sourceMap === 'inline' ) {
+					if ( options.sourcemap === 'inline' ) {
 						code += `\n//# ${SOURCEMAPPING_URL}=${map.toUrl()}\n`;
 					}
 

bin/src/run/loadConfigFile.js

@@ -9,7 +9,7 @@ export default function loadConfigFile (configFile, silent) {
 	const warnings = batchWarnings();
 
 	return rollup.rollup({
-		entry: configFile,
+		input: configFile,
 		external: id => {
 			return (id[0] !== '.' && !path.isAbsolute(id)) || id.slice(-5,id.length) === '.json';
 		},

bin/src/run/mergeOptions.js

@@ -1,21 +1,19 @@
-import batchWarnings from './batchWarnings.js';
-
 const equivalents = {
-	useStrict: 'useStrict',
+	strict: 'strict',
 	banner: 'banner',
 	footer: 'footer',
 	format: 'format',
 	globals: 'globals',
 	id: 'moduleId',
 	indent: 'indent',
 	interop: 'interop',
-	input: 'entry',
+	input: 'input',
 	intro: 'intro',
 	legacy: 'legacy',
-	name: 'moduleName',
-	output: 'dest',
+	name: 'name',
+	output: 'output',
 	outro: 'outro',
-	sourcemap: 'sourceMap',
+	sourcemap: 'sourcemap',
 	treeshake: 'treeshake'
 };
 
@@ -68,9 +66,9 @@ export default function mergeOptions ( config, command ) {
 		}
 	});
 
-	const targets = options.dest ? [{ dest: options.dest, format: options.format }] : options.targets;
+	const targets = options.output ? [{ output: options.output, format: options.format }] : options.targets;
 	options.targets = targets;
-	delete options.dest;
+	delete options.output;
 
 	return options;
 }

src/Bundle.js

@@ -37,11 +37,11 @@ export default class Bundle {
 			return acc;
 		}, options );
 
-		if ( !options.entry ) {
-			throw new Error( 'You must supply options.entry to rollup' );
+		if ( !options.input ) {
+			throw new Error( 'You must supply options.input to rollup' );
 		}
 
-		this.entry = options.entry;
+		this.entry = options.input;
 		this.entryId = null;
 		this.entryModule = null;
 
@@ -338,15 +338,15 @@ export default class Bundle {
 				return transform( this, source, id, this.plugins );
 			} )
 			.then( source => {
-				const { code, originalCode, originalSourceMap, ast, sourceMapChain, resolvedIds } = source;
+				const { code, originalCode, originalSourcemap, ast, sourcemapChain, resolvedIds } = source;
 
 				const module = new Module( {
 					id,
 					code,
 					originalCode,
-					originalSourceMap,
+					originalSourcemap,
 					ast,
-					sourceMapChain,
+					sourcemapChain,
 					resolvedIds,
 					bundle: this
 				} );
@@ -545,10 +545,10 @@ export default class Bundle {
 			const bundleSourcemapChain = [];
 
 			return transformBundle( prevCode, this.plugins, bundleSourcemapChain, options ).then( code => {
-				if ( options.sourceMap ) {
-					timeStart( 'sourceMap' );
+				if ( options.sourcemap ) {
+					timeStart( 'sourcemap' );
 
-					let file = options.sourceMapFile || options.dest;
+					let file = options.sourcemapFile || options.output;
 					if ( file ) file = resolve( typeof process !== 'undefined' ? process.cwd() : '', file );
 
 					if ( this.hasLoaders || find( this.plugins, plugin => plugin.transform || plugin.transformBundle ) ) {
@@ -563,7 +563,7 @@ export default class Bundle {
 
 					map.sources = map.sources.map( normalize );
 
-					timeEnd( 'sourceMap' );
+					timeEnd( 'sourcemap' );
 				}
 
 				if ( code[ code.length - 1 ] !== '\n' ) code += '\n';

src/Module.js

@@ -32,13 +32,13 @@ function tryParse ( module, acornOptions ) {
 }
 
 export default class Module {
-	constructor ( { id, code, originalCode, originalSourceMap, ast, sourceMapChain, resolvedIds, resolvedExternalIds, bundle } ) {
+	constructor ( { id, code, originalCode, originalSourcemap, ast, sourcemapChain, resolvedIds, resolvedExternalIds, bundle } ) {
 		this.code = code;
 		this.id = id;
 		this.bundle = bundle;
 		this.originalCode = originalCode;
-		this.originalSourceMap = originalSourceMap;
-		this.sourceMapChain = sourceMapChain;
+		this.originalSourcemap = originalSourcemap;
+		this.sourcemapChain = sourcemapChain;
 
 		this.comments = [];
 
@@ -363,9 +363,9 @@ export default class Module {
 			dependencies: this.dependencies.map( module => module.id ),
 			code: this.code,
 			originalCode: this.originalCode,
-			originalSourceMap: this.originalSourceMap,
+			originalSourcemap: this.originalSourcemap,
 			ast: this.astClone,
-			sourceMapChain: this.sourceMapChain,
+			sourcemapChain: this.sourcemapChain,
 			resolvedIds: this.resolvedIds,
 			resolvedExternalIds: this.resolvedExternalIds
 		};

src/finalisers/amd.js

@@ -20,7 +20,7 @@ export default function amd ( bundle, magicString, { exportMode, indentString, i
 		( amdOptions.id ? `'${amdOptions.id}', ` : `` ) +
 		( deps.length ? `[${deps.join( ', ' )}], ` : `` );
 
-	const useStrict = options.useStrict !== false ? ` 'use strict';` : ``;
+	const useStrict = options.strict !== false ? ` 'use strict';` : ``;
 	const define = amdOptions.define || 'define';
 	const wrapperStart = `${define}(${params}function (${args.join( ', ' )}) {${useStrict}\n\n`;
 

src/finalisers/cjs.js

@@ -2,7 +2,7 @@ import getExportBlock from './shared/getExportBlock.js';
 import esModuleExport from './shared/esModuleExport.js';
 
 export default function cjs ( bundle, magicString, { exportMode, intro, outro }, options ) {
-	intro = ( options.useStrict === false ? intro : `'use strict';\n\n${intro}` ) +
+	intro = ( options.strict === false ? intro : `'use strict';\n\n${intro}` ) +
 	        ( exportMode === 'named' && options.legacy !== true ? `${esModuleExport}\n\n` : '' );
 
 	let needsInterop = false;

src/finalisers/iife.js

@@ -26,14 +26,14 @@ const thisProp = name => `this${keypath( name )}`;
 export default function iife ( bundle, magicString, { exportMode, indentString, intro, outro }, options ) {
 	const globalNameMaker = getGlobalNameMaker( options.globals || blank(), bundle, 'null' );
 
-	const { extend, moduleName: name } = options;
+	const { extend, name } = options;
 	const isNamespaced = name && name.indexOf( '.' ) !== -1;
 	const possibleVariableAssignment = !extend && !isNamespaced;
 
 	if ( name && possibleVariableAssignment && !isLegal(name) ) {
 		error({
 			code: 'ILLEGAL_IDENTIFIER_AS_NAME',
-			message: `Given moduleName (${name}) is not legal JS identifier. If you need this you can try --extend option`
+			message: `Given name (${name}) is not legal JS identifier. If you need this you can try --extend option`
 		});
 	}
 
@@ -46,7 +46,7 @@ export default function iife ( bundle, magicString, { exportMode, indentString,
 	if ( exportMode !== 'none' && !name ) {
 		error({
 			code: 'INVALID_OPTION',
-			message: `You must supply options.moduleName for IIFE bundles`
+			message: `You must supply options.name for IIFE bundles`
 		});
 	}
 
@@ -58,7 +58,7 @@ export default function iife ( bundle, magicString, { exportMode, indentString,
 		args.unshift( 'exports' );
 	}
 
-	const useStrict = options.useStrict !== false ? `${indentString}'use strict';\n\n` : ``;
+	const useStrict = options.strict !== false ? `${indentString}'use strict';\n\n` : ``;
 
 	let wrapperIntro = `(function (${args}) {\n${useStrict}`;
 

src/finalisers/umd.js

@@ -37,10 +37,10 @@ function safeAccess ( name ) {
 const wrapperOutro = '\n\n})));';
 
 export default function umd ( bundle, magicString, { exportMode, indentString, intro, outro }, options ) {
-	if ( exportMode !== 'none' && !options.moduleName ) {
+	if ( exportMode !== 'none' && !options.name ) {
 		error({
 			code: 'INVALID_OPTION',
-			message: 'You must supply options.moduleName for UMD bundles'
+			message: 'You must supply options.name for UMD bundles'
 		});
 	}
 
@@ -58,7 +58,7 @@ export default function umd ( bundle, magicString, { exportMode, indentString, i
 	if ( exportMode === 'named' ) {
 		amdDeps.unshift( `'exports'` );
 		cjsDeps.unshift( `exports` );
-		globalDeps.unshift( `(${setupNamespace(options.moduleName)} = ${options.extend ? `${globalProp(options.moduleName)} || ` : '' }{})` );
+		globalDeps.unshift( `(${setupNamespace(options.name)} = ${options.extend ? `${globalProp(options.name)} || ` : '' }{})` );
 
 		args.unshift( 'exports' );
 	}
@@ -72,9 +72,9 @@ export default function umd ( bundle, magicString, { exportMode, indentString, i
 	const define = amdOptions.define || 'define';
 
 	const cjsExport = exportMode === 'default' ? `module.exports = ` : ``;
-	const defaultExport = exportMode === 'default' ? `${setupNamespace(options.moduleName)} = ` : '';
+	const defaultExport = exportMode === 'default' ? `${setupNamespace(options.name)} = ` : '';
 
-	const useStrict = options.useStrict !== false ? ` 'use strict';` : ``;
+	const useStrict = options.strict !== false ? ` 'use strict';` : ``;
 
 	let globalExport;
 
@@ -89,10 +89,10 @@ export default function umd ( bundle, magicString, { exportMode, indentString, i
 				factory(${['exports'].concat(globalDeps)});`;
 		}
 		globalExport = `(function() {
-				var current = ${safeAccess(options.moduleName)};
+				var current = ${safeAccess(options.name)};
 				${factory}
-				${globalProp(options.moduleName)} = exports;
-				exports.noConflict = function() { ${globalProp(options.moduleName)} = current; return exports; };
+				${globalProp(options.name)} = exports;
+				exports.noConflict = function() { ${globalProp(options.name)} = current; return exports; };
 			})()`;
 	} else {
 		globalExport = `(${defaultExport}factory(${globalDeps}))`;