@projectwallace/css-code-coverage 0.7.0 → 0.8.2

package/README.md

@@ -87,3 +87,13 @@ for (let file of files) {
 	coverage_data.push(...parse_coverage(json_content))
 }
 ```
+
+## CLI
+
+Use the CLI tool (`css-coverage`) to check if coverage meets minimum requirements, globally and/or per file.
+
+```sh
+css-coverage --coverage-dir=<dir> --min-coverage=<number> [options]
+```
+
+[CLI docs](src/cli/README.md)

package/dist/cli.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { parseArgs, styleText } from "node:util";
 import * as v from "valibot";
-import { format } from "@projectwallace/format-css";
+import { calculate_coverage } from "@projectwallace/css-code-coverage";
 import { readFile, readdir, stat } from "node:fs/promises";
 import { join } from "node:path";
 
@@ -13,7 +13,8 @@ const show_uncovered_options = {
 };
 const reporters = {
 	pretty: "pretty",
-	tap: "tap"
+	tap: "tap",
+	json: "json"
 };
 let CoverageDirSchema = v.pipe(v.string(), v.nonEmpty());
 let RatioPercentageSchema = v.pipe(v.string(), v.transform(Number), v.number(), v.minValue(0), v.maxValue(1));
@@ -21,8 +22,8 @@ let ShowUncoveredSchema = v.pipe(v.string(), v.enum(show_uncovered_options));
 let ReporterSchema = v.pipe(v.string(), v.enum(reporters));
 let CliArgumentsSchema = v.object({
 	"coverage-dir": CoverageDirSchema,
-	"min-line-coverage": RatioPercentageSchema,
-	"min-file-line-coverage": v.optional(RatioPercentageSchema),
+	"min-coverage": RatioPercentageSchema,
+	"min-file-coverage": v.optional(RatioPercentageSchema),
 	"show-uncovered": v.optional(ShowUncoveredSchema, show_uncovered_options.violations),
 	reporter: v.optional(ReporterSchema, reporters.pretty)
 });
@@ -44,11 +45,10 @@ function validate_arguments(args) {
 function parse_arguments(args) {
 	let { values } = parseArgs({
 		args,
-		allowPositionals: true,
 		options: {
 			"coverage-dir": { type: "string" },
-			"min-line-coverage": { type: "string" },
-			"min-file-line-coverage": {
+			"min-coverage": { type: "string" },
+			"min-file-coverage": {
 				type: "string",
 				default: "0"
 			},
@@ -65,435 +65,8 @@ function parse_arguments(args) {
 	return values;
 }
 
-//#endregion
-//#region src/lib/parse-coverage.ts
-let RangeSchema = v.object({
-	start: v.number(),
-	end: v.number()
-});
-let CoverageSchema = v.object({
-	text: v.string(),
-	url: v.string(),
-	ranges: v.array(RangeSchema)
-});
-function is_valid_coverage(input) {
-	return v.safeParse(v.array(CoverageSchema), input).success;
-}
-function parse_coverage(input) {
-	try {
-		let parse_result = JSON.parse(input);
-		return is_valid_coverage(parse_result) ? parse_result : [];
-	} catch {
-		return [];
-	}
-}
-
-//#endregion
-//#region src/lib/chunkify.ts
-function merge(stylesheet) {
-	let new_chunks = [];
-	let previous_chunk;
-	for (let i = 0; i < stylesheet.chunks.length; i++) {
-		let chunk = stylesheet.chunks.at(i);
-		if (/^\s+$/.test(stylesheet.text.slice(chunk.start_offset, chunk.end_offset))) continue;
-		let latest_chunk = new_chunks.at(-1);
-		if (i > 0 && previous_chunk && latest_chunk) {
-			if (previous_chunk.is_covered === chunk.is_covered) {
-				latest_chunk.end_offset = chunk.end_offset;
-				previous_chunk = chunk;
-				continue;
-			} else if (/^\s+$/.test(stylesheet.text.slice(chunk.start_offset, chunk.end_offset)) || chunk.end_offset === chunk.start_offset) {
-				latest_chunk.end_offset = chunk.end_offset;
-				continue;
-			}
-		}
-		previous_chunk = chunk;
-		new_chunks.push(chunk);
-	}
-	return {
-		...stylesheet,
-		chunks: new_chunks
-	};
-}
-function chunkify(stylesheet) {
-	let chunks = [];
-	let offset = 0;
-	for (let range of stylesheet.ranges) {
-		if (offset !== range.start) {
-			chunks.push({
-				start_offset: offset,
-				end_offset: range.start,
-				is_covered: false
-			});
-			offset = range.start;
-		}
-		chunks.push({
-			start_offset: range.start,
-			end_offset: range.end,
-			is_covered: true
-		});
-		offset = range.end;
-	}
-	if (offset !== stylesheet.text.length - 1) chunks.push({
-		start_offset: offset,
-		end_offset: stylesheet.text.length,
-		is_covered: false
-	});
-	return merge({
-		url: stylesheet.url,
-		text: stylesheet.text,
-		chunks
-	});
-}
-
-//#endregion
-//#region src/lib/prettify.ts
-function prettify(stylesheet) {
-	let line = 1;
-	let offset = 0;
-	let pretty_chunks = stylesheet.chunks.map((chunk, index) => {
-		let css = format(stylesheet.text.slice(chunk.start_offset, chunk.end_offset - 1)).trim();
-		if (chunk.is_covered) {
-			let is_last = index === stylesheet.chunks.length - 1;
-			if (index === 0) css = css + (is_last ? "" : "\n");
-			else if (index === stylesheet.chunks.length - 1) css = "\n" + css;
-			else css = "\n" + css + "\n";
-		}
-		let line_count = css.split("\n").length;
-		let start_offset = offset;
-		let end_offset = offset + css.length - 1;
-		let start_line = line;
-		let end_line = line + line_count;
-		line = end_line;
-		offset = end_offset;
-		return {
-			...chunk,
-			start_offset,
-			start_line,
-			end_line: end_line - 1,
-			end_offset,
-			css,
-			total_lines: end_line - start_line
-		};
-	});
-	return {
-		...stylesheet,
-		chunks: pretty_chunks,
-		text: pretty_chunks.map(({ css }) => css).join("\n")
-	};
-}
-
-//#endregion
-//#region src/lib/decuplicate.ts
-function concatenate(ranges) {
-	let result = [];
-	for (let range of ranges) if (result.length > 0 && (result.at(-1).end === range.start - 1 || result.at(-1).end === range.start)) result.at(-1).end = range.end;
-	else result.push(range);
-	return result;
-}
-function dedupe_list(ranges) {
-	let new_ranges = /* @__PURE__ */ new Set();
-	outer: for (let range of ranges) {
-		for (let processed_range of new_ranges) {
-			if (range.start <= processed_range.start && range.end >= processed_range.end) {
-				new_ranges.delete(processed_range);
-				new_ranges.add(range);
-				continue outer;
-			}
-			if (range.start >= processed_range.start && range.end <= processed_range.end) continue outer;
-			if (range.start < processed_range.end && range.start > processed_range.start && range.end > processed_range.end) {
-				new_ranges.delete(processed_range);
-				new_ranges.add({
-					start: processed_range.start,
-					end: range.end
-				});
-				continue outer;
-			}
-		}
-		new_ranges.add(range);
-	}
-	return new_ranges;
-}
-/**
-* @description
-* prerequisites
-* - we check each stylesheet content only once (to avoid counting the same content multiple times)
-* - if a duplicate stylesheet enters the room, we add it's ranges to the existing stylesheet's ranges
-* - only bytes of deduplicated stylesheets are counted
-*/
-function deduplicate_entries(entries) {
-	let checked_stylesheets = /* @__PURE__ */ new Map();
-	for (let entry of entries) {
-		let text = entry.text;
-		if (checked_stylesheets.has(text)) {
-			let ranges = checked_stylesheets.get(text).ranges;
-			for (let range of entry.ranges) {
-				let found = false;
-				for (let checked_range of ranges) if (checked_range.start === range.start && checked_range.end === range.end) {
-					found = true;
-					break;
-				}
-				if (!found) ranges.push(range);
-			}
-		} else checked_stylesheets.set(text, {
-			url: entry.url,
-			ranges: entry.ranges
-		});
-	}
-	return Array.from(checked_stylesheets, ([text, { url, ranges }]) => ({
-		text,
-		url,
-		ranges: concatenate(dedupe_list(ranges.sort((a, b) => a.start - b.start))).sort((a, b) => a.start - b.start)
-	}));
-}
-
-//#endregion
-//#region src/lib/ext.ts
-function ext(url) {
-	try {
-		let parsed_url = new URL(url);
-		return parsed_url.pathname.slice(parsed_url.pathname.lastIndexOf(".") + 1);
-	} catch {
-		let ext_index = url.lastIndexOf(".");
-		return url.slice(ext_index, url.indexOf("/", ext_index) + 1);
-	}
-}
-
-//#endregion
-//#region src/lib/html-parser.ts
-/**
-* @description
-* Very, very naive but effective DOMParser.
-* It can only find <style> elements and their .textContent
-*/
-var DOMParser = class {
-	parseFromString(html, _type) {
-		let styles = [];
-		let lower = html.toLowerCase();
-		let pos = 0;
-		while (true) {
-			let open = lower.indexOf("<style", pos);
-			if (open === -1) break;
-			let start = lower.indexOf(">", open);
-			if (start === -1) break;
-			let close = lower.indexOf("</style>", start);
-			if (close === -1) break;
-			let text = html.slice(start + 1, close);
-			styles.push({ textContent: text });
-			pos = close + 8;
-		}
-		return { querySelectorAll(selector) {
-			return styles;
-		} };
-	}
-};
-
-//#endregion
-//#region src/lib/remap-html.ts
-function get_dom_parser() {
-	if (typeof window !== "undefined" && "DOMParser" in window) return new window.DOMParser();
-	return new DOMParser();
-}
-function remap_html(html, old_ranges) {
-	let doc = get_dom_parser().parseFromString(html, "text/html");
-	let combined_css = "";
-	let new_ranges = [];
-	let current_offset = 0;
-	let style_elements = doc.querySelectorAll("style");
-	for (let style_element of Array.from(style_elements)) {
-		let style_content = style_element.textContent;
-		if (!style_content.trim()) continue;
-		combined_css += style_content;
-		let start_index = html.indexOf(style_content);
-		let end_index = start_index + style_content.length;
-		for (let range of old_ranges) if (range.start >= start_index && range.end <= end_index) new_ranges.push({
-			start: current_offset + (range.start - start_index),
-			end: current_offset + (range.end - start_index)
-		});
-		current_offset += style_content.length;
-	}
-	return {
-		css: combined_css,
-		ranges: new_ranges
-	};
-}
-
-//#endregion
-//#region src/lib/filter-entries.ts
-function is_html(text) {
-	return /<\/?(html|body|head|div|span|script|style)/i.test(text);
-}
-const SELECTOR_REGEX = /(@[a-z-]+|\[[^\]]+\]|[a-zA-Z_#.-][a-zA-Z0-9_-]*)\s*\{/;
-const DECLARATION_REGEX = /^\s*[a-zA-Z-]+\s*:\s*.+;?\s*$/m;
-function is_css_like(text) {
-	return SELECTOR_REGEX.test(text) || DECLARATION_REGEX.test(text);
-}
-function is_js_like(text) {
-	try {
-		new Function(text);
-		return true;
-	} catch {
-		return false;
-	}
-}
-function filter_coverage(coverage) {
-	let result = [];
-	for (let entry of coverage) {
-		let extension = ext(entry.url).toLowerCase();
-		if (extension === "js") continue;
-		if (extension === "css") {
-			result.push(entry);
-			continue;
-		}
-		if (is_html(entry.text)) {
-			let { css, ranges } = remap_html(entry.text, entry.ranges);
-			result.push({
-				url: entry.url,
-				text: css,
-				ranges
-			});
-			continue;
-		}
-		if (is_css_like(entry.text) && !is_js_like(entry.text)) result.push({
-			url: entry.url,
-			text: entry.text,
-			ranges: entry.ranges
-		});
-	}
-	return result;
-}
-
-//#endregion
-//#region src/lib/extend-ranges.ts
-const AT_SIGN = 64;
-const LONGEST_ATRULE_NAME = 28;
-function extend_ranges(coverage) {
-	return coverage.map(({ text, ranges, url }) => {
-		return {
-			text,
-			ranges: ranges.map((range, index) => {
-				let prev_range = ranges[index - 1];
-				for (let i = range.start; i >= range.start - LONGEST_ATRULE_NAME; i--) {
-					if (prev_range && prev_range.end > i) break;
-					let char_position = i;
-					if (text.charCodeAt(char_position) === AT_SIGN) {
-						range.start = char_position;
-						let next_offset = range.end;
-						let next_char$1 = text.charAt(next_offset);
-						while (/\s/.test(next_char$1)) {
-							next_offset++;
-							next_char$1 = text.charAt(next_offset);
-						}
-						if (next_char$1 === "{") range.end = range.end + 1;
-						break;
-					}
-				}
-				let offset = range.end;
-				let next_char = text.charAt(offset);
-				while (/\s/.test(next_char)) {
-					offset++;
-					next_char = text.charAt(offset);
-				}
-				if (next_char === "}") range.end = offset + 1;
-				return range;
-			}),
-			url
-		};
-	});
-}
-
-//#endregion
-//#region src/lib/index.ts
-function ratio(fraction, total) {
-	if (total === 0) return 0;
-	return fraction / total;
-}
-function calculate_stylesheet_coverage({ text, url, chunks }) {
-	let uncovered_bytes = 0;
-	let covered_bytes = 0;
-	let total_bytes = 0;
-	let total_lines = 0;
-	let covered_lines = 0;
-	let uncovered_lines = 0;
-	for (let chunk of chunks) {
-		let lines = chunk.total_lines;
-		let bytes = chunk.end_offset - chunk.start_offset;
-		total_lines += lines;
-		total_bytes += bytes;
-		if (chunk.is_covered) {
-			covered_lines += lines;
-			covered_bytes += bytes;
-		} else {
-			uncovered_lines += lines;
-			uncovered_bytes += bytes;
-		}
-	}
-	return {
-		url,
-		text,
-		uncovered_bytes,
-		covered_bytes,
-		total_bytes,
-		line_coverage_ratio: ratio(covered_lines, total_lines),
-		byte_coverage_ratio: ratio(covered_bytes, total_bytes),
-		total_lines,
-		covered_lines,
-		uncovered_lines,
-		chunks
-	};
-}
-/**
-* @description
-* CSS Code Coverage calculation
-*
-* These are the steps performed to calculate coverage:
-* 1. Filter eligible files / validate input
-* 2. Prettify the CSS dicovered in each Coverage and update their ranges
-* 3. De-duplicate Coverages: merge all ranges for CSS sources occurring multiple times
-* 4. Calculate used/unused CSS bytes (fastest path, no inspection of the actual CSS needed)
-* 5. Calculate line-coverage, byte-coverage per stylesheet
-*/
-function calculate_coverage(coverage) {
-	let total_files_found = coverage.length;
-	let coverage_per_stylesheet = extend_ranges(deduplicate_entries(filter_coverage(coverage))).map((sheet) => chunkify(sheet)).map((sheet) => prettify(sheet)).map((stylesheet) => calculate_stylesheet_coverage(stylesheet));
-	let { total_lines, total_covered_lines, total_uncovered_lines, total_bytes, total_used_bytes, total_unused_bytes } = coverage_per_stylesheet.reduce((totals, sheet) => {
-		totals.total_lines += sheet.total_lines;
-		totals.total_covered_lines += sheet.covered_lines;
-		totals.total_uncovered_lines += sheet.uncovered_lines;
-		totals.total_bytes += sheet.total_bytes;
-		totals.total_used_bytes += sheet.covered_bytes;
-		totals.total_unused_bytes += sheet.uncovered_bytes;
-		return totals;
-	}, {
-		total_lines: 0,
-		total_covered_lines: 0,
-		total_uncovered_lines: 0,
-		total_bytes: 0,
-		total_used_bytes: 0,
-		total_unused_bytes: 0
-	});
-	return {
-		total_files_found,
-		total_bytes,
-		total_lines,
-		covered_bytes: total_used_bytes,
-		covered_lines: total_covered_lines,
-		uncovered_bytes: total_unused_bytes,
-		uncovered_lines: total_uncovered_lines,
-		byte_coverage_ratio: ratio(total_used_bytes, total_bytes),
-		line_coverage_ratio: ratio(total_covered_lines, total_lines),
-		coverage_per_stylesheet,
-		total_stylesheets: coverage_per_stylesheet.length
-	};
-}
-
 //#endregion
 //#region src/cli/program.ts
-var MissingDataError = class extends Error {
-	constructor() {
-		super("No data to analyze");
-	}
-};
 function validate_min_line_coverage(actual, expected) {
 	return {
 		ok: actual >= expected,
@@ -513,21 +86,43 @@ function validate_min_file_line_coverage(actual, expected) {
 		expected
 	};
 }
-function program({ min_file_coverage, min_file_line_coverage }, coverage_data) {
-	if (coverage_data.length === 0) throw new MissingDataError();
+function program({ min_coverage, min_file_coverage }, coverage_data) {
 	let coverage = calculate_coverage(coverage_data);
-	let min_line_coverage_result = validate_min_line_coverage(coverage.line_coverage_ratio, min_file_coverage);
-	let min_file_line_coverage_result = validate_min_file_line_coverage(Math.min(...coverage.coverage_per_stylesheet.map((sheet) => sheet.line_coverage_ratio)), min_file_line_coverage);
+	let min_coverage_result = validate_min_line_coverage(coverage.line_coverage_ratio, min_coverage);
+	let min_file_coverage_result = validate_min_file_line_coverage(Math.min(...coverage.coverage_per_stylesheet.map((sheet) => sheet.line_coverage_ratio)), min_file_coverage);
 	return {
 		context: { coverage },
 		report: {
-			ok: min_line_coverage_result.ok && min_file_line_coverage_result.ok,
-			min_line_coverage: min_line_coverage_result,
-			min_file_line_coverage: min_file_line_coverage_result
+			ok: min_coverage_result.ok && min_file_coverage_result.ok,
+			min_line_coverage: min_coverage_result,
+			min_file_line_coverage: min_file_coverage_result
 		}
 	};
 }
 
+//#endregion
+//#region src/lib/parse-coverage.ts
+let RangeSchema = v.object({
+	start: v.number(),
+	end: v.number()
+});
+let CoverageSchema = v.object({
+	text: v.string(),
+	url: v.string(),
+	ranges: v.array(RangeSchema)
+});
+function is_valid_coverage(input) {
+	return v.safeParse(v.array(CoverageSchema), input).success;
+}
+function parse_coverage(input) {
+	try {
+		let parse_result = JSON.parse(input);
+		return is_valid_coverage(parse_result) ? parse_result : [];
+	} catch {
+		return [];
+	}
+}
+
 //#endregion
 //#region src/cli/file-reader.ts
 async function read(coverage_dir) {
@@ -548,13 +143,18 @@ function indent(line) {
 	return (line || "").replace(/^\t+/, (tabs) => " ".repeat(tabs.length * 4));
 }
 let line_number = (num, covered = true) => `${num.toString().padStart(5, " ")} ${covered ? "│" : "━"} `;
-function percentage(ratio$1, decimals = 2) {
-	return `${(ratio$1 * 100).toFixed(ratio$1 === 1 ? 0 : decimals)}%`;
+function percentage(ratio, decimals = 2) {
+	return `${(ratio * 100).toFixed(ratio === 1 ? 0 : decimals)}%`;
 }
 function print_lines({ report, context }, params, { styleText: styleText$1, print_width }) {
 	let output = [];
 	if (report.min_line_coverage.ok) output.push(`${styleText$1(["bold", "green"], "Success")}: total line coverage is ${percentage(report.min_line_coverage.actual)}`);
-	else output.push(`${styleText$1(["bold", "red"], "Failed")}: line coverage is ${percentage(report.min_line_coverage.actual)}% which is lower than the threshold of ${report.min_line_coverage.expected}`);
+	else {
+		let { actual, expected } = report.min_line_coverage;
+		output.push(`${styleText$1(["bold", "red"], "Failed")}: line coverage is ${percentage(actual)}% which is lower than the threshold of ${expected}`);
+		let lines_to_cover = expected * context.coverage.total_lines - context.coverage.covered_lines;
+		output.push(`Tip: cover ${Math.ceil(lines_to_cover)} more ${lines_to_cover === 1 ? "line" : "lines"} to meet the threshold of ${percentage(expected)}`);
+	}
 	if (report.min_file_line_coverage.expected !== void 0) {
 		let { expected, actual, ok: ok$1 } = report.min_file_line_coverage;
 		if (ok$1) output.push(`${styleText$1(["bold", "green"], "Success")}: all files pass minimum line coverage of ${percentage(expected)}`);
@@ -569,6 +169,7 @@ function print_lines({ report, context }, params, { styleText: styleText$1, prin
 		const NUM_TRAILING_LINES = NUM_LEADING_LINES;
 		print_width = print_width ?? 80;
 		let min_file_line_coverage = report.min_file_line_coverage.expected;
+		output.push();
 		for (let sheet of context.coverage.coverage_per_stylesheet.sort((a, b) => a.line_coverage_ratio - b.line_coverage_ratio)) if (sheet.line_coverage_ratio !== 1 && params["show-uncovered"] === "all" || min_file_line_coverage !== void 0 && min_file_line_coverage !== 0 && sheet.line_coverage_ratio < min_file_line_coverage && params["show-uncovered"] === "violations") {
 			output.push();
 			output.push(styleText$1("dim", "─".repeat(print_width)));
@@ -591,10 +192,11 @@ function print_lines({ report, context }, params, { styleText: styleText$1, prin
 	return output;
 }
 function print(report, params) {
+	let logger = report.report.ok ? console.log : console.error;
 	for (let line of print_lines(report, params, {
 		styleText,
 		print_width: process.stdout.columns
-	})) console.log(line);
+	})) logger(line);
 }
 
 //#endregion
@@ -609,7 +211,7 @@ function ok(n, description) {
 	console.log(`ok ${n} ${description ? `- ${description}` : ""}`);
 }
 function not_ok(n, description) {
-	console.log(`not ok ${n} ${description ? `- ${description}` : ""}`);
+	console.error(`not ok ${n} ${description ? `- ${description}` : ""}`);
 }
 function meta(data) {
 	console.log("  ---");
@@ -653,17 +255,79 @@ function print$1({ report, context }, params) {
 	}
 }
 
+//#endregion
+//#region src/cli/reporters/json.ts
+function prepare({ report, context }, params) {
+	context.coverage.coverage_per_stylesheet = context.coverage.coverage_per_stylesheet.filter((sheet) => {
+		if (params["show-uncovered"] === "violations" && report.min_file_line_coverage.expected !== void 0 && sheet.line_coverage_ratio < report.min_file_line_coverage.expected) return true;
+		if (params["show-uncovered"] === "all" && sheet.line_coverage_ratio < 1) return true;
+		return false;
+	});
+	return {
+		report,
+		context
+	};
+}
+function print$2({ report, context }, params) {
+	let logger = report.ok ? console.log : console.error;
+	let data = prepare({
+		context,
+		report
+	}, params);
+	logger(JSON.stringify(data));
+}
+
+//#endregion
+//#region src/cli/help.ts
+function help() {
+	return `
+${styleText(["bold"], "USAGE")}
+  $ css-coverage --coverage-dir=<dir> --min-coverage=<number> [options]
+
+${styleText("bold", "OPTIONS")}
+Required:
+  --coverage-dir        Where your Coverage JSON files are
+  --min-coverage        Minimum overall CSS coverage [0-1]
+
+Optional:
+  --min-file-coverage   Minimal coverage per file [0-1]
+
+  --show-uncovered      Which files to show when not meeting 
+                        the --min-file-line-coverage threshold
+                        • violations [default] ${styleText("dim", "show under-threshold files")}
+                        • all ${styleText("dim", "show partially covered files")}
+                        • none ${styleText("dim", "do not show files")}
+
+  --reporter            How to show the results 
+                        • pretty [default]
+                        • tap
+                        • json
+
+${styleText("bold", "EXAMPLES")}
+  ${styleText("dim", "# analyze all .json files in ./coverage; require 80% overall coverage")}
+  $ css-coverage --coverage-dir=./coverage --min-coverage=0.8
+
+  ${styleText("dim", "# Require 50% coverage per file")}
+  $ css-coverage --coverage-dir=./coverage --min-coverage=0.8 --min-file-coverage=0.5
+
+  ${styleText("dim", "Report JSON")}
+  $ css-coverage --coverage-dir=./coverage --min-coverage=0.8 --reporter=json
+  `.trim();
+}
+
 //#endregion
 //#region src/cli/cli.ts
 async function cli(cli_args) {
+	if (!cli_args || cli_args.length === 0 || cli_args.includes("--help") || cli_args.includes("-h")) return console.log(help());
 	let params = validate_arguments(parse_arguments(cli_args));
 	let coverage_data = await read(params["coverage-dir"]);
 	let report = program({
-		min_file_coverage: params["min-line-coverage"],
-		min_file_line_coverage: params["min-file-line-coverage"]
+		min_coverage: params["min-coverage"],
+		min_file_coverage: params["min-file-coverage"]
 	}, coverage_data);
 	if (report.report.ok === false) process.exitCode = 1;
 	if (params.reporter === "tap") return print$1(report, params);
+	if (params.reporter === "json") return print$2(report, params);
 	return print(report, params);
 }
 try {

package/dist/index.d.ts

@@ -63,17 +63,6 @@ type CoverageResult = CoverageData & {
   total_stylesheets: number;
   coverage_per_stylesheet: StylesheetCoverage[];
 };
-/**
- * @description
- * CSS Code Coverage calculation
- *
- * These are the steps performed to calculate coverage:
- * 1. Filter eligible files / validate input
- * 2. Prettify the CSS dicovered in each Coverage and update their ranges
- * 3. De-duplicate Coverages: merge all ranges for CSS sources occurring multiple times
- * 4. Calculate used/unused CSS bytes (fastest path, no inspection of the actual CSS needed)
- * 5. Calculate line-coverage, byte-coverage per stylesheet
- */
 declare function calculate_coverage(coverage: Coverage[]): CoverageResult;
 //#endregion
 export { type Coverage, CoverageData, CoverageResult, type Range, StylesheetCoverage, calculate_coverage, parse_coverage };

package/dist/index.js

@@ -25,19 +25,20 @@ function parse_coverage(input) {
 
 //#endregion
 //#region src/lib/chunkify.ts
+const WHITESPACE_ONLY_REGEX = /^\s+$/;
 function merge(stylesheet) {
 	let new_chunks = [];
 	let previous_chunk;
 	for (let i = 0; i < stylesheet.chunks.length; i++) {
 		let chunk = stylesheet.chunks.at(i);
-		if (/^\s+$/.test(stylesheet.text.slice(chunk.start_offset, chunk.end_offset))) continue;
+		if (WHITESPACE_ONLY_REGEX.test(stylesheet.text.slice(chunk.start_offset, chunk.end_offset))) continue;
 		let latest_chunk = new_chunks.at(-1);
 		if (i > 0 && previous_chunk && latest_chunk) {
 			if (previous_chunk.is_covered === chunk.is_covered) {
 				latest_chunk.end_offset = chunk.end_offset;
 				previous_chunk = chunk;
 				continue;
-			} else if (/^\s+$/.test(stylesheet.text.slice(chunk.start_offset, chunk.end_offset)) || chunk.end_offset === chunk.start_offset) {
+			} else if (WHITESPACE_ONLY_REGEX.test(stylesheet.text.slice(chunk.start_offset, chunk.end_offset)) || chunk.end_offset === chunk.start_offset) {
 				latest_chunk.end_offset = chunk.end_offset;
 				continue;
 			}
@@ -87,10 +88,10 @@ function prettify(stylesheet) {
 	let line = 1;
 	let offset = 0;
 	let pretty_chunks = stylesheet.chunks.map((chunk, index) => {
-		let css = format(stylesheet.text.slice(chunk.start_offset, chunk.end_offset - 1)).trim();
+		let css = format(stylesheet.text.substring(chunk.start_offset, chunk.end_offset - 1)).trim();
 		if (chunk.is_covered) {
-			let is_last = index === stylesheet.chunks.length - 1;
-			if (index === 0) css = css + (is_last ? "" : "\n");
+			let is_last_chunk = index === stylesheet.chunks.length - 1;
+			if (index === 0) css = css + (is_last_chunk ? "" : "\n");
 			else if (index === stylesheet.chunks.length - 1) css = "\n" + css;
 			else css = "\n" + css + "\n";
 		}
@@ -120,65 +121,46 @@ function prettify(stylesheet) {
 
 //#endregion
 //#region src/lib/decuplicate.ts
-function concatenate(ranges) {
-	let result = [];
-	for (let range of ranges) if (result.length > 0 && (result.at(-1).end === range.start - 1 || result.at(-1).end === range.start)) result.at(-1).end = range.end;
-	else result.push(range);
-	return result;
+function merge_ranges(ranges) {
+	if (ranges.length === 0) return [];
+	ranges.sort((a, b) => a.start - b.start);
+	let merged = [ranges[0]];
+	for (let r of ranges.slice(1)) {
+		let last = merged.at(-1);
+		if (last && r.start <= last.end + 1) {
+			if (r.end > last.end) last.end = r.end;
+		} else merged.push({
+			start: r.start,
+			end: r.end
+		});
+	}
+	return merged;
 }
-function dedupe_list(ranges) {
-	let new_ranges = /* @__PURE__ */ new Set();
-	outer: for (let range of ranges) {
-		for (let processed_range of new_ranges) {
-			if (range.start <= processed_range.start && range.end >= processed_range.end) {
-				new_ranges.delete(processed_range);
-				new_ranges.add(range);
-				continue outer;
-			}
-			if (range.start >= processed_range.start && range.end <= processed_range.end) continue outer;
-			if (range.start < processed_range.end && range.start > processed_range.start && range.end > processed_range.end) {
-				new_ranges.delete(processed_range);
-				new_ranges.add({
-					start: processed_range.start,
-					end: range.end
-				});
-				continue outer;
-			}
+function merge_entry_ranges(sheet, entry) {
+	if (!sheet) return {
+		url: entry.url,
+		ranges: [...entry.ranges]
+	};
+	let seen = new Set(sheet.ranges.map((r) => `${r.start}:${r.end}`));
+	for (let range of entry.ranges) {
+		let id = `${range.start}:${range.end}`;
+		if (!seen.has(id)) {
+			seen.add(id);
+			sheet.ranges.push({ ...range });
 		}
-		new_ranges.add(range);
 	}
-	return new_ranges;
+	return sheet;
 }
-/**
-* @description
-* prerequisites
-* - we check each stylesheet content only once (to avoid counting the same content multiple times)
-* - if a duplicate stylesheet enters the room, we add it's ranges to the existing stylesheet's ranges
-* - only bytes of deduplicated stylesheets are counted
-*/
 function deduplicate_entries(entries) {
-	let checked_stylesheets = /* @__PURE__ */ new Map();
-	for (let entry of entries) {
-		let text = entry.text;
-		if (checked_stylesheets.has(text)) {
-			let ranges = checked_stylesheets.get(text).ranges;
-			for (let range of entry.ranges) {
-				let found = false;
-				for (let checked_range of ranges) if (checked_range.start === range.start && checked_range.end === range.end) {
-					found = true;
-					break;
-				}
-				if (!found) ranges.push(range);
-			}
-		} else checked_stylesheets.set(text, {
-			url: entry.url,
-			ranges: entry.ranges
-		});
-	}
-	return Array.from(checked_stylesheets, ([text, { url, ranges }]) => ({
+	let grouped = entries.reduce((acc, entry) => {
+		let key = entry.text;
+		acc[key] = merge_entry_ranges(acc[key], entry);
+		return acc;
+	}, Object.create(null));
+	return Object.entries(grouped).map(([text, { url, ranges }]) => ({
 		text,
 		url,
-		ranges: concatenate(dedupe_list(ranges.sort((a, b) => a.start - b.start))).sort((a, b) => a.start - b.start)
+		ranges: merge_ranges(ranges)
 	}));
 }
 
@@ -271,31 +253,31 @@ function is_js_like(text) {
 		return false;
 	}
 }
-function filter_coverage(coverage) {
-	let result = [];
-	for (let entry of coverage) {
-		let extension = ext(entry.url).toLowerCase();
-		if (extension === "js") continue;
-		if (extension === "css") {
-			result.push(entry);
-			continue;
-		}
-		if (is_html(entry.text)) {
-			let { css, ranges } = remap_html(entry.text, entry.ranges);
-			result.push({
-				url: entry.url,
-				text: css,
-				ranges
-			});
-			continue;
-		}
-		if (is_css_like(entry.text) && !is_js_like(entry.text)) result.push({
+function filter_coverage(acc, entry) {
+	let extension = ext(entry.url).toLowerCase();
+	if (extension === "js") return acc;
+	if (extension === "css") {
+		acc.push(entry);
+		return acc;
+	}
+	if (is_html(entry.text)) {
+		let { css, ranges } = remap_html(entry.text, entry.ranges);
+		acc.push({
+			url: entry.url,
+			text: css,
+			ranges
+		});
+		return acc;
+	}
+	if (is_css_like(entry.text) && !is_js_like(entry.text)) {
+		acc.push({
 			url: entry.url,
 			text: entry.text,
 			ranges: entry.ranges
 		});
+		return acc;
 	}
-	return result;
+	return acc;
 }
 
 //#endregion
@@ -303,38 +285,37 @@ function filter_coverage(coverage) {
 const AT_SIGN = 64;
 const LONGEST_ATRULE_NAME = 28;
 function extend_ranges(coverage) {
-	return coverage.map(({ text, ranges, url }) => {
-		return {
-			text,
-			ranges: ranges.map((range, index) => {
-				let prev_range = ranges[index - 1];
-				for (let i = range.start; i >= range.start - LONGEST_ATRULE_NAME; i--) {
-					if (prev_range && prev_range.end > i) break;
-					let char_position = i;
-					if (text.charCodeAt(char_position) === AT_SIGN) {
-						range.start = char_position;
-						let next_offset = range.end;
-						let next_char$1 = text.charAt(next_offset);
-						while (/\s/.test(next_char$1)) {
-							next_offset++;
-							next_char$1 = text.charAt(next_offset);
-						}
-						if (next_char$1 === "{") range.end = range.end + 1;
-						break;
+	let { ranges, url, text } = coverage;
+	return {
+		text,
+		ranges: ranges.map((range, index) => {
+			let prev_range = ranges[index - 1];
+			for (let i = range.start; i >= range.start - LONGEST_ATRULE_NAME; i--) {
+				if (prev_range && prev_range.end > i) break;
+				let char_position = i;
+				if (text.charCodeAt(char_position) === AT_SIGN) {
+					range.start = char_position;
+					let next_offset = range.end;
+					let next_char$1 = text.charAt(next_offset);
+					while (/\s/.test(next_char$1)) {
+						next_offset++;
+						next_char$1 = text.charAt(next_offset);
 					}
+					if (next_char$1 === "{") range.end = range.end + 1;
+					break;
 				}
-				let offset = range.end;
-				let next_char = text.charAt(offset);
-				while (/\s/.test(next_char)) {
-					offset++;
-					next_char = text.charAt(offset);
-				}
-				if (next_char === "}") range.end = offset + 1;
-				return range;
-			}),
-			url
-		};
-	});
+			}
+			let offset = range.end;
+			let next_char = text.charAt(offset);
+			while (/\s/.test(next_char)) {
+				offset++;
+				next_char = text.charAt(offset);
+			}
+			if (next_char === "}") range.end = offset + 1;
+			return range;
+		}),
+		url
+	};
 }
 
 //#endregion
@@ -377,20 +358,9 @@ function calculate_stylesheet_coverage({ text, url, chunks }) {
 		chunks
 	};
 }
-/**
-* @description
-* CSS Code Coverage calculation
-*
-* These are the steps performed to calculate coverage:
-* 1. Filter eligible files / validate input
-* 2. Prettify the CSS dicovered in each Coverage and update their ranges
-* 3. De-duplicate Coverages: merge all ranges for CSS sources occurring multiple times
-* 4. Calculate used/unused CSS bytes (fastest path, no inspection of the actual CSS needed)
-* 5. Calculate line-coverage, byte-coverage per stylesheet
-*/
 function calculate_coverage(coverage) {
 	let total_files_found = coverage.length;
-	let coverage_per_stylesheet = extend_ranges(deduplicate_entries(filter_coverage(coverage))).map((sheet) => chunkify(sheet)).map((sheet) => prettify(sheet)).map((stylesheet) => calculate_stylesheet_coverage(stylesheet));
+	let coverage_per_stylesheet = coverage.reduce((acc, entry) => filter_coverage(acc, entry), []).reduce((entries, entry) => deduplicate_entries(entries.concat(entry)), []).map((coverage$1) => extend_ranges(coverage$1)).map((sheet) => chunkify(sheet)).map((sheet) => prettify(sheet)).map((stylesheet) => calculate_stylesheet_coverage(stylesheet));
 	let { total_lines, total_covered_lines, total_uncovered_lines, total_bytes, total_used_bytes, total_unused_bytes } = coverage_per_stylesheet.reduce((totals, sheet) => {
 		totals.total_lines += sheet.total_lines;
 		totals.total_covered_lines += sheet.covered_lines;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@projectwallace/css-code-coverage",
-  "version": "0.7.0",
+  "version": "0.8.2",
   "description": "Generate useful CSS Code Coverage report from browser-reported coverage",
   "author": "Bart Veneman <bart@projectwallace.com>",
   "repository": {
@@ -37,7 +37,7 @@
   },
   "types": "dist/index.d.ts",
   "scripts": {
-    "test": "c8 --reporter=text playwright test",
+    "test": "c8 --reporter=text --reporter=lcov playwright test",
     "build": "tsdown",
     "check": "tsc --noEmit",
     "lint": "oxlint --config .oxlintrc.json",
@@ -45,6 +45,7 @@
     "knip": "knip"
   },
   "devDependencies": {
+    "@codecov/vite-plugin": "^1.9.1",
     "@playwright/test": "^1.56.0",
     "@types/node": "^24.9.2",
     "c8": "^10.1.3",