introduce CLI --plugin support

cli/help.md

@@ -16,6 +16,7 @@ Basic options:
 -m, --sourcemap             Generate sourcemap (`-m inline` for inline map)
 -n, --name <name>           Name for UMD export
 -o, --file <output>         Single output file (if absent, prints to stdout)
+-p, --plugin <name>         Use plugin specified. May be repeated.
 -v, --version               Show version number
 -w, --watch                 Watch files in bundle and rebuild on changes
 --amd.id <id>               ID for AMD module (default is anonymous)

cli/run/index.ts

@@ -1,6 +1,6 @@
 import { realpathSync } from 'fs';
 import relative from 'require-relative';
-import { WarningHandler } from '../../src/rollup/types';
+import { InputOptions, WarningHandler } from '../../src/rollup/types';
 import mergeOptions, { GenericConfigObject } from '../../src/utils/mergeOptions';
 import { getAliasName } from '../../src/utils/relativeId';
 import { handleError } from '../logging';
@@ -118,7 +118,68 @@ async function execute(
 			if (command.stdin !== false) {
 				inputOptions.plugins!.push(stdinPlugin());
 			}
+			if (command.plugin) {
+				const plugins = Array.isArray(command.plugin) ? command.plugin : [command.plugin];
+				for (const plugin of plugins) {
+					if (/[={}]/.test(plugin)) {
+						// -p plugin=value
+						// -p "{transform(c,i){...}}"
+						loadAndRegisterPlugin(inputOptions, plugin)
+					} else {
+						// split out plugins joined by commas
+						// -p node-resolve,commonjs,buble
+						plugin.split(",").forEach((plugin: string) => loadAndRegisterPlugin(inputOptions, plugin));
+					}
+				}
+			}
 			await build(inputOptions, outputOptions, warnings, command.silent);
 		}
 	}
+
+	function loadAndRegisterPlugin(inputOptions: InputOptions, pluginText: string) {
+		let plugin : any = null;
+		let pluginArg : any = undefined;
+		if (pluginText[0] === '{') {
+			// -p "{transform(c,i){...}}"
+			plugin = new Function('return ' + pluginText);
+		} else {
+			const match = pluginText.match(/^([@.\/\\\w|^{}|-]+)(=(.*))?$/);
+			if (match) {
+				// -p plugin
+				// -p plugin=arg
+				pluginText = match[1];
+				pluginArg = new Function('return ' + match[3])();
+			} else {
+				throw new Error(`Invalid --plugin argument format: ${JSON.stringify(pluginText)}`);
+			}
+			if (!/^\.|[@\/\\]/.test(pluginText)) {
+				// Try using plugin prefix variations first if applicable.
+				// Prefix order is significant - left has higher precedence.
+				for (const prefix of ['@rollup/plugin-', 'rollup-plugin-']) {
+					if (!RegExp(prefix).test(pluginText)) {
+						try {
+							plugin = require(prefix + pluginText);
+							break;
+						} catch (ex) {
+							// do nothing
+						}
+					}
+				}
+			}
+			if (!plugin) {
+				try {
+					if (pluginText[0] == ".") pluginText = process.cwd() + "/" + pluginText;
+					plugin = require(pluginText);
+				} catch (ex) {
+					throw new Error(`Cannot load plugin '${pluginText}'`);
+				}
+			}
+		}
+		if (typeof plugin === 'object' && pluginText in plugin) {
+			// some plugins do not use `export default` for their entry point.
+			// attempt to use the plugin name as the named import name.
+			plugin = plugin[pluginText];
+		}
+		inputOptions.plugins!.push(typeof plugin === 'function' ? plugin.call(plugin, pluginArg) : plugin);
+	}
 }

src/utils/mergeOptions.ts

@@ -98,6 +98,7 @@ export const commandAliases: { [key: string]: string } = {
 	m: 'sourcemap',
 	n: 'name',
 	o: 'file',
+	p: 'plugin',
 	v: 'version',
 	w: 'watch'
 };
@@ -158,6 +159,7 @@ export default function mergeOptions({
 			Object.keys(commandAliases),
 			'config',
 			'environment',
+			'plugin',
 			'silent',
 			'stdin'
 		),

test/cli/samples/plugin/absolute/_config.js

@@ -0,0 +1,5 @@
+module.exports = {
+	description: 'CLI --plugin /absolute/path',
+	skipIfWindows: true,
+	command: `echo 'console.log(VALUE);' | rollup -p "\`pwd\`/my-plugin={VALUE: 'absolute', ZZZ: 1}"`
+};

test/cli/samples/plugin/absolute/_expected.js

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

test/cli/samples/plugin/absolute/my-plugin.js

@@ -0,0 +1,14 @@
+module.exports = function(options) {
+	if (options === void 0) options = {};
+	return {
+		transform(code) {
+			// dumb search and replace for test purposes
+			for (var key in options) {
+				const rx = new RegExp(key, 'g');
+				const value = JSON.stringify(options[key]);
+				code = code.replace(rx, value);
+			}
+			return code;
+		}
+	};
+};

test/cli/samples/plugin/advanced/_config.js

@@ -0,0 +1,5 @@
+module.exports = {
+	description: 'advanced CLI --plugin functionality with rollup config',
+	skipIfWindows: true,
+	command: `rollup -c -p node-resolve,commonjs -p "terser={output: {beautify: true, indent_level: 2}}"`
+};

test/cli/samples/plugin/advanced/_expected/cjs.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: !0
+});
+
+var t = function() {
+  function t(t) {
+    this.x = t;
+  }
+  return t.prototype.output = function() {
+    var t;
+    t = this.x, console.log(t);
+  }, t;
+}();
+
+new t(123).output(), exports.Bar = t;

test/cli/samples/plugin/advanced/_expected/es.js

@@ -0,0 +1,13 @@
+var t = function() {
+  function t(t) {
+    this.x = t;
+  }
+  return t.prototype.output = function() {
+    var t;
+    t = this.x, console.log(t);
+  }, t;
+}();
+
+new t(123).output();
+
+export { t as Bar };

test/cli/samples/plugin/advanced/main.js

@@ -0,0 +1,4 @@
+import {Foo} from "foo";
+var foo = new Foo(123);
+foo.output();
+export {Foo as Bar};

test/cli/samples/plugin/advanced/rollup.config.js

@@ -0,0 +1,18 @@
+const buble = require('rollup-plugin-buble');
+
+export default {
+	input: 'main.js',
+	plugins: [
+		buble()
+	],
+	output: [
+		{
+			file: '_actual/cjs.js',
+			format: 'cjs'
+		},
+		{
+			file: '_actual/es.js',
+			format: 'esm'
+		}
+	]
+};

test/cli/samples/plugin/basic/_config.js

@@ -0,0 +1,4 @@
+module.exports = {
+	description: 'basic CLI --plugin functionality',
+	command: `rollup main.js -f cjs --plugin rollup-plugin-buble`
+};

test/cli/samples/plugin/basic/_expected.js

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var Bar = function Bar(x) {
+	this.x = value;
+};
+Bar.prototype.value = function value () {
+	return this.x;
+};
+var bar = new Bar(123);
+console.log(bar.value());
+
+exports.Bar = Bar;

test/cli/samples/plugin/basic/main.js

@@ -0,0 +1,10 @@
+export class Bar {
+	constructor(x) {
+		this.x = value;
+	}
+	value() {
+		return this.x;
+	}
+}
+var bar = new Bar(123);
+console.log(bar.value());

test/cli/samples/plugin/cannot-load/_config.js

@@ -0,0 +1,10 @@
+const { assertStderrIncludes } = require('../../../../utils.js');
+
+module.exports = {
+	description: 'unknown CLI --plugin results in an error',
+	skipIfWindows: true,
+	command: `echo "console.log(123);" | rollup --plugin foobar`,
+	stderr(err) {
+		assertStderrIncludes(err, "Cannot load plugin 'foobar'");
+	}
+};

test/cli/samples/plugin/invalid-argument/_config.js

@@ -0,0 +1,10 @@
+const { assertStderrIncludes } = require('../../../../utils.js');
+
+module.exports = {
+	description: 'invalid CLI --plugin argument format',
+	skipIfWindows: true,
+	command: `echo "console.log(123);" | rollup --plugin 'foo bar'`,
+	stderr(err) {
+		assertStderrIncludes(err, 'Invalid --plugin argument format: "foo bar"');
+	}
+};

test/cli/samples/plugin/object/_config.js

@@ -0,0 +1,5 @@
+module.exports = {
+	description: 'CLI --plugin object',
+	skipIfWindows: true,
+	command: `echo 'console.log(42);' | rollup -f cjs -p '{transform: c => c + String.fromCharCode(10) + c}'`
+};

test/cli/samples/plugin/object/_expected.js

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

test/cli/samples/plugin/relative/_config.js

@@ -0,0 +1,5 @@
+module.exports = {
+	description: 'CLI --plugin ../relative/path',
+	skipIfWindows: true,
+	command: `echo 'console.log(VALUE);' | rollup -p "../absolute/my-plugin={VALUE: 'relative', ZZZ: 1}"`
+};

test/cli/samples/plugin/relative/_expected.js

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