ava 0.24.0 → 0.25.0

package/cli.js

@@ -8,7 +8,7 @@ if (importLocal(__filename)) {
 	debug('Using local install of AVA');
 } else {
 	if (debug.enabled) {
-		require('time-require'); // eslint-disable-line import/no-unassigned-import
+		require('@ladjs/time-require'); // eslint-disable-line import/no-unassigned-import
 	}
 
 	try {

package/index.js.flow

@@ -84,7 +84,7 @@ type TestContext = AssertContext & {
 	title: string;
 	plan(count: number): void;
 	skip: AssertContext;
-	log(message: string): void;
+	log(...values: Array<any>): void;
 };
 type ContextualTestContext         = TestContext & { context: any; };
 type ContextualCallbackTestContext = TestContext & { context: any; end(): void; };

package/lib/assert.js

@@ -49,14 +49,22 @@ class AssertionError extends Error {
 
 		if (opts.stack) {
 			this.stack = opts.stack;
+		} else {
+			const limitBefore = Error.stackTraceLimit;
+			Error.stackTraceLimit = Infinity;
+			Error.captureStackTrace(this);
+			Error.stackTraceLimit = limitBefore;
 		}
 	}
 }
 exports.AssertionError = AssertionError;
 
 function getStack() {
+	const limitBefore = Error.stackTraceLimit;
+	Error.stackTraceLimit = Infinity;
 	const obj = {};
 	Error.captureStackTrace(obj, getStack);
+	Error.stackTraceLimit = limitBefore;
 	return obj.stack;
 }
 
@@ -122,8 +130,16 @@ function wrapAssertions(callbacks) {
 			}
 		},
 
-		log(text) {
-			log(this, text);
+		log() {
+			const args = Array.from(arguments, value => {
+				return typeof value === 'string' ?
+					value :
+					concordance.format(value, concordanceOptions);
+			});
+
+			if (args.length > 0) {
+				log(this, args.join(' '));
+			}
 		},
 
 		deepEqual(actual, expected, message) {

package/lib/caching-precompiler.js

@@ -76,9 +76,7 @@ class CachingPrecompiler {
 
 		// Append source map comment to transformed code
 		// So that other libraries (like nyc) can find the source map
-		const dirPath = path.dirname(filePath);
-		const relativeMapPath = path.relative(dirPath, mapPath);
-		const comment = convertSourceMap.generateMapFileComment(relativeMapPath);
+		const comment = convertSourceMap.generateMapFileComment(mapPath);
 
 		return `${result.code}\n${comment}`;
 	}

package/lib/main.js

@@ -23,8 +23,6 @@ worker.setRunner(runner);
 // that no more tests should be logged
 let isFailed = false;
 
-Error.stackTraceLimit = Infinity;
-
 function test(props) {
 	if (isFailed) {
 		return;

package/lib/process-adapter.js

@@ -48,13 +48,13 @@ if (opts.tty) {
 }
 
 if (debug.enabled) {
-	// Forward the `time-require` `--sorted` flag.
+	// Forward the `@ladjs/time-require` `--sorted` flag.
 	// Intended for internal optimization tests only.
 	if (opts._sorted) {
 		process.argv.push('--sorted');
 	}
 
-	require('time-require'); // eslint-disable-line import/no-unassigned-import
+	require('@ladjs/time-require'); // eslint-disable-line import/no-unassigned-import
 }
 
 const sourceMapCache = new Map();

package/lib/reporters/tap.js

@@ -1,8 +1,6 @@
 'use strict';
-const format = require('util').format;
-const indentString = require('indent-string');
+const supertap = require('supertap');
 const stripAnsi = require('strip-ansi');
-const yaml = require('js-yaml');
 
 function dumpError(error, includeMessage) {
 	const obj = Object.assign({}, error.object);
@@ -32,7 +30,7 @@ function dumpError(error, includeMessage) {
 		obj.at = error.stack.split('\n')[0];
 	}
 
-	return `  ---\n${indentString(yaml.safeDump(obj).trim(), 4)}\n  ...`;
+	return obj;
 }
 
 class TapReporter {
@@ -41,79 +39,42 @@ class TapReporter {
 	}
 
 	start() {
-		return 'TAP version 13';
+		return supertap.start();
 	}
 
 	test(test) {
-		const output = [];
-
-		let directive = '';
-		const passed = test.todo ? 'not ok' : 'ok';
-
-		if (test.todo) {
-			directive = '# TODO';
-		} else if (test.skip) {
-			directive = '# SKIP';
-		}
-
-		const title = stripAnsi(test.title);
-
-		const appendLogs = () => {
-			if (test.logs) {
-				test.logs.forEach(log => {
-					const logLines = indentString(log, 4);
-					const logLinesWithLeadingFigure = logLines.replace(
-						/^ {4}/,
-						'  * '
-					);
-
-					output.push(logLinesWithLeadingFigure);
-				});
-			}
-		};
-
-		output.push(`# ${title}`);
-
-		if (test.error) {
-			output.push(format('not ok %d - %s', ++this.i, title));
-			appendLogs();
-			output.push(dumpError(test.error, true));
-		} else {
-			output.push(format('%s %d - %s %s', passed, ++this.i, title, directive).trim());
-			appendLogs();
-		}
-
-		return output.join('\n');
+		return supertap.test(test.title, {
+			passed: !test.error,
+			index: ++this.i,
+			todo: test.todo,
+			skip: test.skip,
+			comment: test.logs,
+			error: test.error ? dumpError(test.error, true) : null
+		});
 	}
 
 	unhandledError(err) {
-		const output = [
-			`# ${err.message}`,
-			format('not ok %d - %s', ++this.i, err.message)
-		];
+		let error;
+
 		// AvaErrors don't have stack traces
 		if (err.type !== 'exception' || err.name !== 'AvaError') {
-			output.push(dumpError(err, false));
+			error = dumpError(err, false);
 		}
 
-		return output.join('\n');
+		return supertap.test(err.message, {
+			passed: false,
+			index: ++this.i,
+			error
+		});
 	}
 
 	finish(runStatus) {
-		const output = [
-			'',
-			'1..' + (runStatus.passCount + runStatus.failCount + runStatus.skipCount),
-			'# tests ' + (runStatus.passCount + runStatus.failCount + runStatus.skipCount),
-			'# pass ' + runStatus.passCount
-		];
-
-		if (runStatus.skipCount > 0) {
-			output.push(`# skip ${runStatus.skipCount}`);
-		}
-
-		output.push('# fail ' + (runStatus.failCount + runStatus.rejectionCount + runStatus.exceptionCount), '');
-
-		return output.join('\n');
+		return supertap.finish({
+			passed: runStatus.passCount,
+			failed: runStatus.failCount,
+			skipped: runStatus.skipCount,
+			crashed: runStatus.rejectionCount + runStatus.exceptionCount
+		});
 	}
 
 	write(str) {

package/lib/test-worker.js

@@ -27,7 +27,13 @@ globals.options = opts;
 
 const serializeError = require('./serialize-error');
 
-(opts.require || []).forEach(x => require(x));
+(opts.require || []).forEach(x => {
+	if (/[/\\]@std[/\\]esm[/\\]index\.js$/.test(x)) {
+		require = require(x)(module); // eslint-disable-line no-global-assign
+	} else {
+		require(x);
+	}
+});
 
 adapter.installSourceMapSupport();
 adapter.installPrecompilerHook();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ava",
-	"version": "0.24.0",
+	"version": "0.25.0",
 	"description": "Futuristic test runner 🚀",
 	"license": "MIT",
 	"repository": "avajs/ava",
@@ -65,6 +65,7 @@
 		"@ava/babel-preset-transform-test-files": "^3.0.0",
 		"@ava/write-file-atomic": "^2.2.0",
 		"@concordance/react": "^1.0.0",
+		"@ladjs/time-require": "^0.1.4",
 		"ansi-escapes": "^3.0.0",
 		"ansi-styles": "^3.1.0",
 		"arr-flatten": "^1.0.1",
@@ -86,10 +87,10 @@
 		"cli-spinners": "^1.0.0",
 		"cli-truncate": "^1.0.0",
 		"co-with-promise": "^4.6.0",
-		"code-excerpt": "^2.1.0",
+		"code-excerpt": "^2.1.1",
 		"common-path-prefix": "^1.0.0",
 		"concordance": "^3.0.0",
-		"convert-source-map": "^1.2.0",
+		"convert-source-map": "^1.5.1",
 		"core-assert": "^0.2.0",
 		"currently-unhandled": "^0.4.1",
 		"debug": "^3.0.1",
@@ -111,7 +112,6 @@
 		"is-obj": "^1.0.0",
 		"is-observable": "^1.0.0",
 		"is-promise": "^2.1.0",
-		"js-yaml": "^3.8.2",
 		"last-line-stream": "^1.0.0",
 		"lodash.clonedeepwith": "^4.5.0",
 		"lodash.debounce": "^4.0.3",
@@ -139,13 +139,14 @@
 		"stack-utils": "^1.0.1",
 		"strip-ansi": "^4.0.0",
 		"strip-bom-buf": "^1.0.0",
+		"supertap": "^1.0.0",
 		"supports-color": "^5.0.0",
-		"time-require": "^0.1.2",
 		"trim-off-newlines": "^1.0.1",
 		"unique-temp-dir": "^1.0.0",
 		"update-notifier": "^2.3.0"
 	},
 	"devDependencies": {
+		"@std/esm": "^0.19.1",
 		"cli-table2": "^0.2.0",
 		"codecov": "^3.0.0",
 		"del": "^3.0.0",

package/readme.md

@@ -890,9 +890,9 @@ Plan how many assertion there are in the test. The test will fail if the actual
 
 End the test. Only works with `test.cb()`.
 
-###### `t.log(message)`
+###### `t.log(...values)`
 
-Print a log message contextually alongside the test result instead of immediately printing it to `stdout` like `console.log`.
+Log values contextually alongside the test result instead of immediately printing them to `stdout`. Behaves somewhat like `console.log`, but without support for placeholder tokens.
 
 ## Assertions
 

package/types/generated.d.ts

@@ -7,6 +7,9 @@ export type ErrorValidator
 export interface Observable {
 	subscribe(observer: (value: {}) => void): void;
 }
+export interface SnapshotOptions {
+	id?: string;
+}
 export type Test = (t: TestContext) => PromiseLike<void> | Iterator<any> | Observable | void;
 export type GenericTest<T> = (t: GenericTestContext<T>) => PromiseLike<void> | Iterator<any> | Observable | void;
 export type CallbackTest = (t: CallbackTestContext) => void;
@@ -78,6 +81,7 @@ export interface AssertContext {
 	 * Assert that contents matches a snapshot.
 	 */
 	snapshot(contents: any, message?: string): void;
+	snapshot(contents: any, options: SnapshotOptions, message?: string): void;
 	/**
 	 * Assert that contents does not match regex.
 	 */
@@ -100,9 +104,9 @@ export interface TestContext extends AssertContext {
 
 	skip: AssertContext;
 	/**
-	 * Print a log message contextually alongside the test result instead of immediately printing it to stdout like console.log.
+	 * Log values contextually alongside the test result instead of immediately printing them to `stdout`.
 	 */
-	log(message: string): void;
+	log(...values: any[]): void;
 }
 export interface CallbackTestContext extends TestContext {
 	/**