Refactor reporters

* Coverage -> TextCoverage, BaseCoverage -> Coverage
* Ensure other coverage reporters pass the right options to istanbul

Fixes #814

Author: bryanforbes

docs/api.json

@@ -60,6 +60,7 @@
 			"_tests/tests/unit/lib/reporters/Runner.js",
 			"_tests/tests/unit/lib/reporters/Simple.js",
 			"_tests/tests/unit/lib/reporters/TeamCity.js",
+			"_tests/tests/unit/lib/reporters/TextCoverage.js",
 			"_tests/tests/unit/tasks/intern.js"
 		],
 		"plugins": [

intern.json

@@ -1,5 +1,31 @@
-import Coverage, { ReportType } from './Coverage';
+import Coverage, { ReportType, CoverageProperties } from './Coverage';
+import Node from '../executors/Node';
+
+export default class Cobertura extends Coverage
+	implements CoberturaCoverageProperties {
 
-export default class Cobertura extends Coverage {
 	readonly reportType: ReportType = 'cobertura';
+	projectRoot: string;
+
+	constructor(executor: Node, options: CoberturaCoverageOptions = {}) {
+		super(executor, options);
+
+		if (options.projectRoot) {
+			this.projectRoot = options.projectRoot;
+		}
+	}
+
+	getReporterOptions(): { [key: string]: any; } {
+		const options = super.getReporterOptions();
+
+		options.projectRoot = this.projectRoot;
+
+		return options;
+	}
+}
+
+export interface CoberturaCoverageProperties extends CoverageProperties {
+	projectRoot?: string;
 }
+
+export type CoberturaCoverageOptions = Partial<CoberturaCoverageProperties>;

src/lib/reporters/Cobertura.ts

@@ -14,10 +14,12 @@ const eventHandler = createEventHandler<Events>();
 
 export default abstract class Coverage extends Reporter
 	implements CoverageProperties {
-	readonly reportType: ReportType = 'text';
+
+	abstract readonly reportType: ReportType;
 
 	executor: Node;
 	filename: string;
+	directory: string;
 	watermarks: Watermarks;
 
 	constructor(executor: Node, options: CoverageOptions = {}) {
@@ -26,11 +28,20 @@ export default abstract class Coverage extends Reporter
 		if (options.filename) {
 			this.filename = options.filename;
 		}
+		if (options.directory) {
+			this.directory = options.directory;
+		}
 		if (options.watermarks) {
 			this.watermarks = options.watermarks;
 		}
 	}
 
+	getReporterOptions(): { [key: string]: any; } {
+		return {
+			file: this.filename
+		};
+	}
+
 	createCoverageReport(
 		type: ReportType,
 		data: CoverageMapData | CoverageMap
@@ -46,11 +57,12 @@ export default abstract class Coverage extends Reporter
 		const transformed = this.executor.sourceMapStore.transformCoverage(map);
 
 		const context = createContext({
+			dir: this.directory,
 			sourceFinder: transformed.sourceFinder,
 			watermarks: this.watermarks
 		});
 		const tree = summarizers.pkg(transformed.map);
-		const report = create(type, { file: this.filename });
+		const report = create(type, this.getReporterOptions());
 		tree.visit(report, context);
 	}
 
@@ -67,6 +79,9 @@ export interface CoverageProperties extends ReporterProperties {
 	/** A filename to write coverage data to */
 	filename?: string;
 
+	/** A direcotry to write coverage data to */
+	directory?: string;
+
 	/** Watermarks used to check coverage */
 	watermarks?: Watermarks;
 }

src/lib/reporters/Coverage.ts

@@ -1,5 +1,31 @@
-import Coverage, { ReportType } from './Coverage';
+import Coverage, { ReportType, CoverageProperties } from './Coverage';
+import Node from '../executors/Node';
+
+export default class HtmlCoverage extends Coverage
+	implements HtmlCoverageProperties {
 
-export default class HtmlCoverage extends Coverage {
 	readonly reportType: ReportType = 'html';
+	verbose: boolean;
+
+	constructor(executor: Node, options: HtmlCoverageOptions = {}) {
+		super(executor, options);
+
+		if ('verbose' in options) {
+			this.verbose = options.verbose!;
+		}
+	}
+
+	getReporterOptions(): { [key: string]: any; } {
+		const options = super.getReporterOptions();
+
+		options.verbose = this.verbose;
+
+		return options;
+	}
+}
+
+export interface HtmlCoverageProperties extends CoverageProperties {
+	verbose: boolean;
 }
+
+export type HtmlCoverageOptions = Partial<HtmlCoverageProperties>;

src/lib/reporters/HtmlCoverage.ts

@@ -10,7 +10,7 @@ import Suite from '../Suite';
 import Test from '../Test';
 import RemoteSuite from '../RemoteSuite';
 import { createEventHandler } from './Reporter';
-import Coverage, { CoverageProperties } from './Coverage';
+import TextCoverage, { TextCoverageProperties } from './TextCoverage';
 import { CoverageMessage, DeprecationMessage } from '../executors/Executor';
 import { Events, TunnelMessage } from '../executors/Node';
 
@@ -19,7 +19,7 @@ const eventHandler = createEventHandler<Events>();
 /**
  * Handles presentation of runner results to the user
  */
-export default class Pretty extends Coverage implements PrettyProperties {
+export default class Pretty extends TextCoverage implements PrettyProperties {
 	colorReplacement: { [key: string]: string };
 	dimensions: any;
 	titleWidth: number;
@@ -437,7 +437,7 @@ export default class Pretty extends Coverage implements PrettyProperties {
 	}
 }
 
-export interface PrettyProperties extends CoverageProperties {
+export interface PrettyProperties extends TextCoverageProperties {
 	colorReplacement: { [key: string]: string };
 	dimensions: any;
 	maxProgressBarWidth: number;

src/lib/reporters/Pretty.ts

@@ -5,7 +5,7 @@ import { Writable } from 'stream';
 import Test from '../Test';
 import Suite from '../Suite';
 import { createEventHandler } from './Reporter';
-import Coverage, { CoverageProperties } from './Coverage';
+import TextCoverage, { TextCoverageProperties } from './TextCoverage';
 import Server from '../Server';
 import { CoverageMessage, DeprecationMessage } from '../executors/Executor';
 import Node, { Events, TunnelMessage } from '../executors/Node';
@@ -15,7 +15,7 @@ export type Charm = charm.CharmInstance;
 
 const eventHandler = createEventHandler<Events>();
 
-export default class Runner extends Coverage implements RunnerProperties {
+export default class Runner extends TextCoverage implements RunnerProperties {
 	sessions: {
 		[sessionId: string]: {
 			coverage?: CoverageMap;
@@ -318,7 +318,7 @@ export default class Runner extends Coverage implements RunnerProperties {
 	}
 }
 
-export interface RunnerProperties extends CoverageProperties {
+export interface RunnerProperties extends TextCoverageProperties {
 	hidePassed: boolean;
 	hideSkipped: boolean;
 }

src/lib/reporters/Runner.ts

@@ -1,12 +1,12 @@
 import Suite from '../Suite';
 import Test from '../Test';
-import Coverage from './Coverage';
+import TextCoverage from './TextCoverage';
 import { eventHandler } from './Reporter';
 
 /**
  * The Simple reporter outputs to the terminal console.
  */
-export default class Simple extends Coverage {
+export default class Simple extends TextCoverage {
 	@eventHandler()
 	error(error: Error) {
 		this.console.error(this.formatError(error));

src/lib/reporters/Simple.ts

@@ -0,0 +1,32 @@
+import Coverage, { ReportType, CoverageProperties } from './Coverage';
+import Node from '../executors/Node';
+
+export default class TextCoverage extends Coverage
+	implements TextCoverageProperties {
+
+	readonly reportType: ReportType = 'text';
+	maxColumns: number;
+
+	constructor(executor: Node, options: TextCoverageOptions = {}) {
+		super(executor, options);
+
+		if (options.maxColumns) {
+			this.maxColumns = options.maxColumns;
+		}
+	}
+
+	getReporterOptions(): { [key: string]: any; } {
+		const options = super.getReporterOptions();
+
+		options.maxColumns = this.maxColumns;
+
+		return options;
+	}
+}
+
+export interface TextCoverageProperties extends CoverageProperties {
+	/** Maximum number of columns */
+	maxColumns: number;
+}
+
+export type TextCoverageOptions = Partial<TextCoverageProperties>;

src/lib/reporters/TextCoverage.ts

@@ -39,6 +39,7 @@
 		"./unit/lib/reporters/Runner.ts",
 		"./unit/lib/reporters/Simple.ts",
 		"./unit/lib/reporters/TeamCity.ts",
+		"./unit/lib/reporters/TextCoverage.ts",
 		"./unit/lib/*.ts",
 		"./unit/loaders/*.ts",
 		"./unit/tasks/*.ts",