allow .ext to work if .accept is a regex (fixes #97)

Author: Rich-Harris

src/builtins/map.js

@@ -27,19 +27,18 @@ export default function map ( inputdir, outputdir, options ) {
 				if ( this.aborted ) return;
 
 				const ext = extname( filename );
-
-				// change extension if necessary, e.g. foo.coffee -> foo.js
-				const destname = ( options.ext && ~options.accept.indexOf( ext ) ) ? filename.substr( 0, filename.length - ext.length ) + options.ext : filename;
-
 				const src = join( inputdir, filename );
-				const dest = join( outputdir, destname );
 
 				// If this mapper only accepts certain extensions, and this isn't
 				// one of them, just copy the file
 				if ( shouldSkip( options, ext, filename ) ) {
-					return symlinkOrCopy( src ).to( dest );
+					return symlinkOrCopy( src ).to( outputdir, filename );
 				}
 
+				// change extension if necessary, e.g. foo.coffee -> foo.js
+				const destname = options.ext ? filename.substr( 0, filename.length - ext.length ) + options.ext : filename;
+				const dest = join( outputdir, destname );
+
 				// If this file *does* fall within this transformer's remit, but
 				// hasn't changed, we just copy the cached file
 				if ( !changed[ filename ] && options.cache.hasOwnProperty( filename ) ) {

test/scenarios.js

@@ -146,7 +146,7 @@ module.exports = function () {
 		it( 'should allow file transforms to filter with a RegExp', function () {
 			var count = 0, source = gobble( 'tmp/foo' ), task;
 
-			function checkFilter( input ) {
+			function checkFilter ( input ) {
 				count++;
 				return input;
 			}
@@ -163,10 +163,33 @@ module.exports = function () {
 			});
 		});
 
+		it( 'should allow file transforms to filter with a RegExp and an extension', function () {
+			var count = 0, source = gobble( 'tmp/foo' ), task;
+
+			function checkFilter ( input ) {
+				count++;
+				return input;
+			}
+			checkFilter.defaults = {
+				accept: /foo\.md/,
+				ext: '.txt'
+			};
+
+			task = source.transform( checkFilter ).build({
+				dest: 'tmp/output'
+			});
+
+			return task.then( function () {
+				assert.equal( count, 1 );
+				assert.deepEqual( sander.lsrSync( 'tmp/output' ).sort(), [ 'foo.txt', 'bar.md', 'baz.md' ].sort() );
+				assert.equal( sander.readFileSync( 'tmp/output/foo.txt', { encoding: 'utf-8' }).trim(), 'foo: this is some text' );
+			});
+		});
+
 		it( 'should skip files for file transforms which return null', function () {
 			var count = 0, source = gobble( 'tmp/foo' ), task;
 
-			function nullFileTransform( input ) {
+			function nullFileTransform ( input ) {
 				count++;
 				return ~input.indexOf('foo') ? input : null;
 			}