Test plugin options are not used as replacements

Author: lukastaegert

src/index.js

@@ -5,44 +5,48 @@ function escape(str) {
 	return str.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
 }
 
-function functor(thing) {
-	if (typeof thing === 'function') return thing;
-	return () => thing;
+function ensureFunction(functionOrValue) {
+	if (typeof functionOrValue === 'function') return functionOrValue;
+	return () => functionOrValue;
 }
 
 function longest(a, b) {
 	return b.length - a.length;
 }
 
-export default function replace(options = {}) {
-	const filter = createFilter(options.include, options.exclude);
-	const { delimiters } = options;
-
-	let values;
-
+function getReplacements (options) {
 	if (options.values) {
-		values = Object.assign({}, options.values);
+		return Object.assign({}, options.values);
 	} else {
-		values = Object.assign({}, options);
+		const values = Object.assign({}, options);
 		delete values.delimiters;
 		delete values.include;
 		delete values.exclude;
+		delete values.sourcemap;
+		delete values.sourceMap;
+		return values;
 	}
+}
+
+function mapToFunctions(object) {
+	return Object.keys(object).reduce((functions, key) => {
+		functions[key] = ensureFunction(object[key]);
+		return functions;
+	}, {});
+}
 
-	const keys = Object.keys(values)
+export default function replace(options = {}) {
+	const filter = createFilter(options.include, options.exclude);
+	const { delimiters } = options;
+	const functionValues = mapToFunctions(getReplacements(options));
+	const keys = Object.keys(functionValues)
 		.sort(longest)
 		.map(escape);
 
 	const pattern = delimiters
 		? new RegExp(`${escape(delimiters[0])}(${keys.join('|')})${escape(delimiters[1])}`, 'g')
 		: new RegExp(`\\b(${keys.join('|')})\\b`, 'g');
 
-	// convert all values to functions
-	const functionValues = Object.keys(values).reduce((acc, key) => {
-		acc[key] = functor(values[key]);
-		return acc;
-	}, {});
-
 	return {
 		name: 'replace',
 

test/form/observe-plugin-options/_config.js

@@ -0,0 +1,11 @@
+module.exports = {
+	description: 'does not replace plugin options',
+	options: {
+		original: 'replaced',
+		delimiters: ['', ''],
+		sourcemap: true,
+		sourceMap: true,
+		include: '**/input.js',
+		exclude: 'node_modules/**'
+	}
+};

test/form/observe-plugin-options/input.js

@@ -0,0 +1,8 @@
+console.log(`
+  original
+  delimiters
+  sourcemap
+  sourceMap
+  include
+  exclude
+`);

test/form/observe-plugin-options/output.js

@@ -0,0 +1,8 @@
+console.log(`
+  replaced
+  delimiters
+  sourcemap
+  sourceMap
+  include
+  exclude
+`);

test/form/replacement-function/_config.js

@@ -1,6 +1,8 @@
 module.exports = {
 	description: 'allows replacement to be a function',
 	options: {
-		__filename: id => JSON.stringify(`dist/${id}`)
+		__filename(id) {
+			return JSON.stringify(id.slice(__dirname.length + 1));
+		}
 	}
 };

test/form/replacement-function/output.js

@@ -1 +1 @@
-export default "dist/input.js";
+export default "input.js";

test/function/replacement-function/main.js

@@ -2,5 +2,5 @@ import foo from './dir/foo.js';
 
 var bar = __filename;
 
-assert.equal(foo, 'dir/foo.js');
+assert.ok(foo.match('^dir[\\/]foo.js$'));
 assert.equal(bar, 'main.js');

test/test.js

@@ -55,12 +55,12 @@ describe('rollup-plugin-replace', () => {
 				const input = fs.readFileSync(`form/${dir}/input.js`, 'utf-8');
 				const expected = fs.readFileSync(`form/${dir}/output.js`, 'utf-8').trim();
 
-				return Promise.resolve(transform.call(transformContext, input, 'input.js')).then(
-					transformed => {
-						const actual = (transformed ? transformed.code : input).trim();
-						assert.equal(actual, expected);
-					}
-				);
+				return Promise.resolve(
+					transform.call(transformContext, input, `${__dirname}/form/${dir}/input.js`)
+				).then(transformed => {
+					const actual = (transformed ? transformed.code : input).trim();
+					assert.equal(actual, expected);
+				});
 			});
 		});
 	});