Add support for TypeScript without precompiling

.gitignore

@@ -3,3 +3,4 @@ node_modules
 coverage
 bench/.results
 types/generated.d.ts
+yarn.lock

api.js

@@ -55,7 +55,8 @@ function Api(options) {
 	this.options = objectAssign({
 		cwd: process.cwd(),
 		resolveTestsFrom: process.cwd(),
-		match: []
+		match: [],
+		extensions: ['js']
 	}, options);
 
 	this.options.require = resolveModules(this.options.require);
@@ -81,8 +82,9 @@ Api.prototype._runFile = function (file, runStatus, execArgv) {
 
 Api.prototype.run = function (files, options) {
 	var self = this;
+	var extensions = (options && options.extensions) || this.options.extensions;
 
-	return new AvaFiles({cwd: this.options.resolveTestsFrom, files: files})
+	return new AvaFiles({cwd: this.options.resolveTestsFrom, files: files, extensions: extensions})
 		.findTestFiles()
 		.then(function (files) {
 			return self._run(files, options);
@@ -133,7 +135,8 @@ Api.prototype._setupPrecompiler = function (files) {
 	this.precompiler = new CachingPrecompiler({
 		path: cacheDir,
 		babel: this.options.babelConfig,
-		powerAssert: isPowerAssertEnabled
+		powerAssert: isPowerAssertEnabled,
+		extensions: this.options.extensions
 	});
 };
 

lib/caching-precompiler.js

@@ -20,6 +20,7 @@ function CachingPrecompiler(options) {
 
 	this.babelConfig = babelConfigHelper.validate(options.babel);
 	this.cacheDirPath = options.path;
+	this.extensions = options.extensions || ['js'];
 	this.powerAssert = Boolean(options.powerAssert);
 	this.fileHashes = {};
 	this.transform = this._createTransform();
@@ -47,8 +48,33 @@ CachingPrecompiler.prototype._init = function () {
 CachingPrecompiler.prototype._transform = function (code, filePath, hash) {
 	code = code.toString();
 
-	var options = babelConfigHelper.build(this.babelConfig, this.powerAssert, filePath, code);
-	var result = this.babel.transform(code, options);
+	var fileExt = path.extname(filePath).replace(/^\./, '');
+	var isCustomExt = this.extensions.filter(function (ext) {
+		return (ext !== 'js' && ext === fileExt);
+	}).length > 0;
+
+	var result;
+
+	if (isCustomExt) {
+		switch (fileExt) {
+			case 'ts':
+				var extTs = require('./ext/ts');
+				result = extTs.transpile(code, filePath);
+				break;
+
+			/**
+			 * here for other extensions in the future
+			 */
+
+			default:
+				throw new Error('`--extension ' + fileExt + '` is not supported by AVA.');
+		}
+	}
+
+	if (!result) {
+		var options = babelConfigHelper.build(this.babelConfig, this.powerAssert, filePath, code);
+		result = this.babel.transform(code, options);
+	}
 
 	// save source map
 	var mapPath = path.join(this.cacheDirPath, hash + '.js.map');

lib/cli.js

@@ -43,6 +43,7 @@ exports.run = function () {
 		'  --source, -S       Pattern to match source files so tests can be re-run (Can be repeated)',
 		'  --timeout, -T      Set global timeout',
 		'  --concurrency, -c  Maximum number of test files running at the same time (EXPERIMENTAL)',
+		'  --extension, -e    Test file extension, for example `ts` for TypeScript (Can be repeated)',
 		'',
 		'Examples',
 		'  ava',
@@ -60,7 +61,8 @@ exports.run = function () {
 			'timeout',
 			'source',
 			'match',
-			'concurrency'
+			'concurrency',
+			'extension'
 		],
 		boolean: [
 			'fail-fast',
@@ -78,7 +80,8 @@ exports.run = function () {
 			w: 'watch',
 			S: 'source',
 			T: 'timeout',
-			c: 'concurrency'
+			c: 'concurrency',
+			e: 'extension'
 		}
 	});
 
@@ -100,6 +103,8 @@ exports.run = function () {
 		throw new Error(colors.error(figures.cross) + ' The --require and -r flags are deprecated. Requirements should be configured in package.json - see documentation.');
 	}
 
+	var extensionList = [].concat(cli.flags.extension || 'js');
+
 	var api = new Api({
 		failFast: cli.flags.failFast,
 		serial: cli.flags.serial,
@@ -112,7 +117,8 @@ exports.run = function () {
 		resolveTestsFrom: cli.input.length === 0 ? pkgDir : process.cwd(),
 		pkgDir: pkgDir,
 		timeout: cli.flags.timeout,
-		concurrency: cli.flags.concurrency ? parseInt(cli.flags.concurrency, 10) : 0
+		concurrency: cli.flags.concurrency ? parseInt(cli.flags.concurrency, 10) : 0,
+		extensions: extensionList
 	});
 
 	var reporter;
@@ -143,7 +149,7 @@ exports.run = function () {
 
 	if (cli.flags.watch) {
 		try {
-			var watcher = new Watcher(logger, api, files, arrify(cli.flags.source));
+			var watcher = new Watcher(logger, api, files, arrify(cli.flags.source), extensionList);
 			watcher.observeStdin(process.stdin);
 		} catch (err) {
 			if (err.name === 'AvaError') {

lib/ext/ts.js

@@ -0,0 +1,111 @@
+'use strict';
+/**
+ * AVA File Extension for TypeScript
+ * Author: https://github.com/zixia
+ */
+var fs = require('fs');
+
+var typescript;
+try {
+	typescript = require('typescript');
+} catch (err) {
+	console.log('AVA error: `--extensions=ts` require TypeScript to be installed.');
+	throw err;
+}
+var tsnode; // = require('ts-node'); XXX: maybe useful in the future, because ts-node do more than typescript for our case.
+
+var typescriptOptions = {
+	module: typescript.ModuleKind.CommonJS,
+	target: typescript.ScriptTarget.ES6,
+	sourceMap: true,
+	inlineSources: true,
+	inlineSourceMap: true
+};
+
+/**
+ *
+ * Ts-Node version
+ *
+ */
+// const originalJsHandler = require.extensions['.js']
+// const tsService = require('ts-node').register()
+// const tsnodeTsHandler = require.extensions['.ts']
+// const tsnodeTsxHandler = require.extensions['.tsx']
+// delete require.extensions['.ts']
+// delete require.extensions['.tsx']
+
+function tsnodeRegister() {
+	tsnode.register(typescriptOptions);
+	// if (require.extensions['.ts']) {
+	// 	throw new Error('there has already a register for `ts`')
+	// }
+	// if (!tsService) {
+	// 	throw new Error('no ts service')
+	// }
+	// require.extensions['.ts'] 	= tsnodeTsHandler
+	// require.extensions['.tsx'] 	= tsnodeTsxHandler
+}
+
+function tsnodeTranspile(code, fileName) {
+	const tsService = require('ts-node').register(typescriptOptions);
+
+	if (!tsService) {
+		throw new Error('no ts service');
+	}
+
+	const result = tsService().compile(code, fileName);
+	// console.log(result)
+	return result;
+}
+
+/**
+ *
+ * Typescript version
+ *
+ */
+
+function typescriptRegister() {
+	require.extensions['.ts'] = function (module, fileName) {
+		var code = fs.readFileSync(fileName, 'utf8');
+		var result = typescript.transpileModule(code, {
+			fileName,
+			compilerOptions: typescriptOptions,
+			reportDiagnostics: true
+		});
+		// console.log('\n\n\n')
+		// console.log(result.outputText)
+		// console.log('\n\n\n')
+		// process.exit(0)
+		module._compile(result.outputText, fileName);
+	};
+
+	require('source-map-support').install({
+		hookRequire: true
+	});
+}
+
+function typescriptTranspile(code, fileName) {
+	var result = typescript.transpileModule(code, {
+		fileName,
+		compilerOptions: typescriptOptions,
+		reportDiagnostics: true
+	});
+	// console.log(result)
+	return {
+		code: result.outputText,
+		map: result.sourceMapText
+	};
+}
+
+var extTs = {
+	register: typescriptRegister,
+	transpile: typescriptTranspile,
+
+	typescriptRegister,
+	typescriptTranspile,
+
+	tsnodeRegister,
+	tsnodeTranspile
+};
+
+module.exports = extTs;

lib/test-worker.js

@@ -30,6 +30,23 @@ process.installPrecompilerHook();
 const dependencies = [];
 process.installDependencyTracking(dependencies, testPath);
 
+if (opts.extensions) {
+	opts.extensions.forEach(function (ext) {
+		switch (ext) {
+			case 'ts':
+				var extTs = require('./ext/ts');
+				extTs.register();
+				break;
+			case 'js':
+				// We already have babel for ES6/7
+				break;
+
+			default:
+				throw new Error('`--extension ' + ext + '` is not supported by AVA.');
+		}
+	});
+}
+
 require(testPath); // eslint-disable-line import/no-dynamic-require
 
 process.on('unhandledRejection', throwsHelper);

lib/watcher.js

@@ -16,10 +16,11 @@ function rethrowAsync(err) {
 	});
 }
 
-function Watcher(logger, api, files, sources) {
+function Watcher(logger, api, files, sources, extensions) {
 	this.debouncer = new Debouncer(this);
 	this.avaFiles = new AvaFiles({
 		files: files,
+		extensions: extensions,
 		sources: sources
 	});
 
@@ -59,7 +60,8 @@ function Watcher(logger, api, files, sources) {
 
 		var self = this;
 		this.busy = api.run(specificFiles || files, {
-			runOnlyExclusive: runOnlyExclusive
+			runOnlyExclusive: runOnlyExclusive,
+			extensions: extensions
 		}).then(function (runStatus) {
 			runStatus.previousFailCount = self.sumPreviousFailures(currentVector);
 			logger.finish(runStatus);

package.json

@@ -185,6 +185,8 @@
     "source-map-fixtures": "^2.1.0",
     "tap": "^8.0.0",
     "touch": "^1.0.0",
+    "ts-node": "^1.6.0",
+    "typescript": "^2.0.3",
     "xo": "^0.17.0",
     "zen-observable": "^0.3.0"
   },

test/api.js

@@ -56,6 +56,29 @@ test('Without Pool: test files can be forced to run in exclusive mode', function
 	});
 });
 
+test('TypeScript default not supported', function (t) {
+	var api = new Api();
+
+	return api.run(
+		[path.join(__dirname, 'fixture/typescript/simple.ts')]
+	).then(function (result) {
+		t.fail('should not get result here: ' + result);
+	}).catch(function (err) {
+		t.ok('should not found ts file by default, get err: ' + err);
+	});
+});
+
+test('TypeScript supported by set `extensions`', function (t) {
+	var api = new Api({extensions: ['ts']});
+	return api.run(
+		[path.join(__dirname, 'fixture/typescript/simple.ts')]
+	).then(function (result) {
+		t.is(result.testCount, 1);
+		t.is(result.passCount, 1);
+		t.is(result.failCount, 0);
+	});
+});
+
 generateTests('With Pool: ', function (options) {
 	options = options || {};
 	options.concurrency = 2;

test/fixture/typescript/simple.ts

@@ -0,0 +1,6 @@
+import { test } from 'ava';
+
+test('AVA run TypeScript without tsc', t => {
+  let i: number = 42;
+  t.is(i, <number>42, 'meaning of life');
+});