Deterministic precompilation with extension property

Author: greym0uth

api.js

@@ -43,6 +43,12 @@ class Api extends EventEmitter {
 		const apiOptions = this.options;
 		runtimeOptions = runtimeOptions || {};
 
+		const doNotCompileExtensions = apiOptions.extensions || [];
+		const babelExtensions = apiOptions.babelConfig.extensions || [];
+
+		// Combine all extensions possible for testing.
+		const allExts = [...doNotCompileExtensions, ...babelExtensions];
+
 		// Each run will have its own status. It can only be created when test files
 		// have been found.
 		let runStatus;
@@ -81,7 +87,7 @@ class Api extends EventEmitter {
 		}
 
 		// Find all test files.
-		return new AvaFiles({cwd: apiOptions.resolveTestsFrom, files}).findTestFiles()
+		return new AvaFiles({cwd: apiOptions.resolveTestsFrom, files, extensions: allExts}).findTestFiles()
 			.then(files => {
 				runStatus = new RunStatus({
 					runOnlyExclusive: runtimeOptions.runOnlyExclusive,
@@ -125,21 +131,22 @@ class Api extends EventEmitter {
 						// helpers from within the `resolveTestsFrom` directory. Without
 						// arguments this is the `projectDir`, else it's `process.cwd()`
 						// which may be nested too deeply.
-						return new AvaFiles({cwd: this.options.resolveTestsFrom}).findTestHelpers().then(helpers => {
-							return {
-								cacheDir: precompilation.cacheDir,
-								map: files.concat(helpers).reduce((acc, file) => {
-									try {
-										const realpath = fs.realpathSync(file);
-										const hash = precompilation.precompiler.precompileFile(realpath);
-										acc[realpath] = hash;
-									} catch (err) {
-										throw Object.assign(err, {file});
-									}
-									return acc;
-								}, {})
-							};
-						});
+						return new AvaFiles({cwd: this.options.resolveTestsFrom, extensions: allExts})
+							.findTestHelpers().then(helpers => {
+								return {
+									cacheDir: precompilation.cacheDir,
+									map: files.concat(helpers).reduce((acc, file) => {
+										try {
+											const realpath = fs.realpathSync(file);
+											const hash = precompilation.precompiler.precompileFile(realpath, doNotCompileExtensions);
+											acc[realpath] = hash;
+										} catch (err) {
+											throw Object.assign(err, {file});
+										}
+										return acc;
+									}, {})
+								};
+							});
 					})
 					.then(precompilation => {
 						// Resolve the correct concurrency value.

lib/ava-files.js

@@ -79,19 +79,19 @@ const defaultExcludePatterns = () => [
 	'!**/helpers/**'
 ];
 
-const defaultIncludePatterns = () => [
-	'test.js',
-	'test-*.js',
-	'test',
-	'**/__tests__',
-	'**/*.test.js'
+const defaultIncludePatterns = exts => [
+	'test.' + exts,
+	'test-*.' + exts,
+	'test', // Directory
+	'**/__tests__', // Directory
+	'**/*.test.' + exts
 ];
 
-const defaultHelperPatterns = () => [
-	'**/__tests__/helpers/**/*.js',
-	'**/__tests__/**/_*.js',
-	'**/test/helpers/**/*.js',
-	'**/test/**/_*.js'
+const defaultHelperPatterns = exts => [
+	'**/__tests__/helpers/**/*.' + exts,
+	'**/__tests__/**/_*.' + exts,
+	'**/test/helpers/**/*.' + exts,
+	'**/test/**/_*.' + exts
 ];
 
 const getDefaultIgnorePatterns = () => defaultIgnore.map(dir => `${dir}/**/*`);
@@ -118,6 +118,7 @@ class AvaFiles {
 			files = defaultIncludePatterns();
 		}
 
+		this.extensions = options.extensions ? `{${options.extensions.join(',')}}` : '{js}';
 		this.excludePatterns = defaultExcludePatterns();
 		this.files = files;
 		this.sources = options.sources || [];
@@ -141,7 +142,7 @@ class AvaFiles {
 	}
 
 	findTestHelpers() {
-		return handlePaths(defaultHelperPatterns(), ['!**/node_modules/**'], Object.assign({
+		return handlePaths(defaultHelperPatterns(this.extensions), ['!**/node_modules/**'], Object.assign({
 			cwd: this.cwd,
 			includeUnderscoredFiles: true,
 			expandDirectories: false,
@@ -151,7 +152,7 @@ class AvaFiles {
 
 	isSource(filePath) {
 		let mixedPatterns = [];
-		const defaultIgnorePatterns = getDefaultIgnorePatterns();
+		const defaultIgnorePatterns = getDefaultIgnorePatterns(this.options.extensions);
 		const overrideDefaultIgnorePatterns = [];
 
 		let hasPositivePattern = false;

lib/babel-config.js

@@ -22,7 +22,7 @@ function validate(conf) {
 		return {testOptions: {}};
 	}
 
-	if (!conf || typeof conf !== 'object' || !conf.testOptions || typeof conf.testOptions !== 'object' || Array.isArray(conf.testOptions) || Object.keys(conf).length > 1) {
+	if (!conf || typeof conf !== 'object' || !conf.testOptions || typeof conf.testOptions !== 'object' || Array.isArray(conf.testOptions)) {
 		throw new Error(`${colors.error(figures.cross)} Unexpected Babel configuration for AVA. See ${chalk.underline('https://github.com/avajs/ava/blob/master/docs/recipes/babel.md')} for allowed values.`);
 	}
 

lib/caching-precompiler.js

@@ -30,7 +30,11 @@ class CachingPrecompiler {
 		this.transform = this._createTransform();
 	}
 
-	precompileFile(filePath) {
+	precompileFile(filePath, excludeExtensions) {
+		if (excludeExtensions.includes(path.extname(filePath))) {
+			return filePath;
+		}
+
 		if (!this.fileHashes[filePath]) {
 			const source = stripBomBuf(fs.readFileSync(filePath));
 			this.transform(source, filePath);

lib/cli.js

@@ -152,6 +152,7 @@ exports.run = () => {
 		compileEnhancements: conf.compileEnhancements !== false,
 		explicitTitles: conf.watch,
 		match: arrify(conf.match),
+		extensions: conf.extensions,
 		babelConfig: babelConfigHelper.validate(conf.babel),
 		resolveTestsFrom: cli.input.length === 0 ? projectDir : process.cwd(),
 		projectDir,