@projectwallace/css-code-coverage 0.9.0 → 0.10.0

package/dist/{cli.js → cli.mjs}

@@ -1,52 +1,24 @@
 #!/usr/bin/env node
 import { parseArgs, styleText } from "node:util";
-import * as v from "valibot";
+import { join, resolve, sep } from "node:path";
 import { calculate_coverage } from "@projectwallace/css-code-coverage";
 import { readFile, readdir, stat } from "node:fs/promises";
-import { join } from "node:path";
-
 //#region src/cli/arguments.ts
-const show_uncovered_options = {
-	none: "none",
-	all: "all",
-	violations: "violations"
-};
-const reporters = {
-	pretty: "pretty",
-	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));
-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-coverage": RatioPercentageSchema,
-	"min-file-coverage": v.optional(RatioPercentageSchema),
-	"show-uncovered": v.optional(ShowUncoveredSchema, show_uncovered_options.violations),
-	reporter: v.optional(ReporterSchema, reporters.pretty)
-});
-var InvalidArgumentsError = class extends Error {
-	issues;
-	constructor(issues) {
-		super();
-		this.issues = issues;
-	}
-};
-function validate_arguments(args) {
-	let parse_result = v.safeParse(CliArgumentsSchema, args);
-	if (!parse_result.success) throw new InvalidArgumentsError(parse_result.issues.map((issue) => ({
-		path: issue.path?.map((path) => path.key).join("."),
-		message: issue.message
-	})));
-	return parse_result.output;
-}
+const SHOW_UNCOVERED = [
+	"none",
+	"all",
+	"violations"
+];
+const REPORTERS = [
+	"pretty",
+	"tap",
+	"json"
+];
 function parse_arguments(args) {
-	let { values } = parseArgs({
+	let { values, positionals } = parseArgs({
 		args,
+		allowPositionals: true,
 		options: {
-			"coverage-dir": { type: "string" },
 			"min-coverage": { type: "string" },
 			"min-file-coverage": {
 				type: "string",
@@ -62,9 +34,31 @@ function parse_arguments(args) {
 			}
 		}
 	});
-	return values;
+	let issues = [];
+	let coverage_dir = positionals[0];
+	if (!coverage_dir) issues.push("<coverage-dir> is required");
+	else {
+		let resolved = resolve(coverage_dir);
+		let cwd = process.cwd();
+		if (resolved !== cwd && !resolved.startsWith(cwd + sep)) issues.push("InvalidPath");
+	}
+	let min_coverage = Number(values["min-coverage"]);
+	if (values["min-coverage"] === void 0 || isNaN(min_coverage) || min_coverage < 0 || min_coverage > 1) issues.push("--min-coverage must be a number between 0 and 1");
+	let min_file_coverage = Number(values["min-file-coverage"]);
+	if (isNaN(min_file_coverage) || min_file_coverage < 0 || min_file_coverage > 1) issues.push("--min-file-coverage must be a number between 0 and 1");
+	let show_uncovered = values["show-uncovered"];
+	if (!SHOW_UNCOVERED.includes(show_uncovered)) issues.push(`--show-uncovered must be one of: ${SHOW_UNCOVERED.join(", ")}`);
+	let reporter = values["reporter"];
+	if (!REPORTERS.includes(reporter)) issues.push(`--reporter must be one of: ${REPORTERS.join(", ")}`);
+	if (issues.length > 0) throw new Error(issues.join("\n"));
+	return {
+		"coverage-dir": resolve(coverage_dir),
+		"min-coverage": min_coverage,
+		"min-file-coverage": min_file_coverage,
+		"show-uncovered": show_uncovered,
+		reporter
+	};
 }
-
 //#endregion
 //#region src/cli/program.ts
 function validate_min_line_coverage(actual, expected) {
@@ -99,30 +93,19 @@ function program({ min_coverage, min_file_coverage }, coverage_data) {
 		}
 	};
 }
-
 //#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;
+	return Array.isArray(input) && input.every((item) => typeof item === "object" && item !== null && typeof item.text === "string" && typeof item.url === "string" && Array.isArray(item.ranges) && item.ranges.every((r) => typeof r === "object" && r !== null && typeof r.start === "number" && typeof r.end === "number"));
 }
 function parse_coverage(input) {
 	try {
-		let parse_result = JSON.parse(input);
-		return is_valid_coverage(parse_result) ? parse_result : [];
+		let parsed = JSON.parse(input);
+		return is_valid_coverage(parsed) ? parsed : [];
 	} catch {
 		return [];
 	}
 }
-
 //#endregion
 //#region src/cli/file-reader.ts
 async function read(coverage_dir) {
@@ -136,7 +119,6 @@ async function read(coverage_dir) {
 	}
 	return parsed_files;
 }
-
 //#endregion
 //#region src/cli/reporters/pretty.ts
 function indent(line) {
@@ -146,7 +128,7 @@ let line_number = (num) => `${num.toString().padStart(5, " ")} │ `;
 function percentage(ratio, decimals = 2) {
 	return `${(ratio * 100).toFixed(ratio === 1 ? 0 : decimals)}%`;
 }
-function highlight(css, styleText$1) {
+function highlight(css, styleText) {
 	if (css.trim().startsWith("@")) {
 		let at_pos = css.indexOf("@");
 		let space_pos = css.indexOf(" ", at_pos);
@@ -154,38 +136,38 @@ function highlight(css, styleText$1) {
 		let is_empty = css.endsWith("{}");
 		let prelude = css.slice(space_pos, is_empty ? -2 : -1);
 		return [
-			styleText$1("blueBright", name),
-			styleText$1("magentaBright", prelude),
+			styleText("blueBright", name),
+			styleText("magentaBright", prelude),
 			is_empty ? "{}" : "{"
 		].join("");
 	}
 	if (css.includes(":") && css.endsWith(";")) return [
-		styleText$1("cyanBright", css.slice(0, css.indexOf(":"))),
+		styleText("cyanBright", css.slice(0, css.indexOf(":"))),
 		":",
 		css.slice(css.indexOf(":") + 1, css.length - 1),
 		";"
 	].join("");
-	if (css.endsWith("{}")) return [styleText$1("greenBright", css.slice(0, -2)), "{}"].join("");
+	if (css.endsWith("{}")) return [styleText("greenBright", css.slice(0, -2)), "{}"].join("");
 	if (css.endsWith("}")) return css;
 	if (css.trim() === "") return css;
-	if (css.endsWith(",")) return [styleText$1("greenBright", css.slice(0, -1)), ","].join("");
-	return [styleText$1("greenBright", css.slice(0, -1)), "{"].join("");
+	if (css.endsWith(",")) return [styleText("greenBright", css.slice(0, -1)), ","].join("");
+	return [styleText("greenBright", css.slice(0, -1)), "{"].join("");
 }
-function print_lines({ report, context }, params, { styleText: styleText$1, print_width }) {
+function print_lines({ report, context }, params, { styleText, 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)}`);
+	if (report.min_line_coverage.ok) output.push(`${styleText(["bold", "green"], "Success")}: total line coverage is ${percentage(report.min_line_coverage.actual)}`);
 	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}`);
+		output.push(`${styleText(["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)}`);
+		let { expected, actual, ok } = report.min_file_line_coverage;
+		if (ok) output.push(`${styleText(["bold", "green"], "Success")}: all files pass minimum line coverage of ${percentage(expected)}`);
 		else {
 			let num_files_failed = context.coverage.coverage_per_stylesheet.filter((sheet) => sheet.line_coverage_ratio < expected).length;
-			output.push(`${styleText$1(["bold", "red"], "Failed")}: ${num_files_failed} ${num_files_failed === 1 ? "file does" : "files do"} not meet the minimum line coverage of ${percentage(expected)} (minimum coverage was ${percentage(actual)})`);
+			output.push(`${styleText(["bold", "red"], "Failed")}: ${num_files_failed} ${num_files_failed === 1 ? "file does" : "files do"} not meet the minimum line coverage of ${percentage(expected)} (minimum coverage was ${percentage(actual)})`);
 			if (params["show-uncovered"] === "none") output.push(`  Hint: set --show-uncovered=violations to see which files didn't pass`);
 		}
 	}
@@ -197,30 +179,30 @@ function print_lines({ report, context }, params, { styleText: styleText$1, prin
 		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)));
+			output.push(styleText("dim", "─".repeat(print_width)));
 			output.push(`File: ${sheet.url}`);
 			output.push(`Coverage: ${percentage(sheet.line_coverage_ratio)}, ${sheet.covered_lines}/${sheet.total_lines} lines covered`);
 			if (min_file_line_coverage && min_file_line_coverage !== 0 && sheet.line_coverage_ratio < min_file_line_coverage) {
 				let lines_to_cover = min_file_line_coverage * sheet.total_lines - sheet.covered_lines;
 				output.push(`Tip: cover ${Math.ceil(lines_to_cover)} more ${lines_to_cover === 1 ? "line" : "lines"} to meet the file threshold of ${percentage(min_file_line_coverage)}`);
 			}
-			output.push(styleText$1("dim", "─".repeat(print_width)));
+			output.push(styleText("dim", "─".repeat(print_width)));
 			let lines = sheet.text.split("\n");
-			for (let chunk of sheet.chunks.filter((chunk$1) => !chunk$1.is_covered)) {
+			for (let chunk of sheet.chunks.filter((chunk) => !chunk.is_covered)) {
 				for (let x = Math.max(chunk.start_line - NUM_LEADING_LINES, 1); x < chunk.start_line; x++) output.push([
 					" ",
-					styleText$1("dim", line_number(x)),
-					styleText$1("dim", indent(lines[x - 1]))
+					styleText("dim", line_number(x)),
+					styleText("dim", indent(lines[x - 1]))
 				].join(""));
 				for (let i = chunk.start_line; i <= chunk.end_line; i++) output.push([
-					styleText$1("red", "▌"),
-					styleText$1("dim", line_number(i)),
-					highlight(indent(lines[i - 1]), styleText$1)
+					styleText("red", "▌"),
+					styleText("dim", line_number(i)),
+					highlight(indent(lines[i - 1]), styleText)
 				].join(""));
 				for (let y = chunk.end_line + 1; y < Math.min(chunk.end_line + NUM_TRAILING_LINES + 1, lines.length); y++) output.push([
 					" ",
-					styleText$1("dim", line_number(y)),
-					styleText$1("dim", indent(lines[y - 1]))
+					styleText("dim", line_number(y)),
+					styleText("dim", indent(lines[y - 1]))
 				].join(""));
 				output.push("");
 			}
@@ -228,14 +210,13 @@ function print_lines({ report, context }, params, { styleText: styleText$1, prin
 	}
 	return output;
 }
-function print(report, params) {
+function print$2(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
 	})) logger(line);
 }
-
 //#endregion
 //#region src/cli/reporters/tap.ts
 function version() {
@@ -291,7 +272,6 @@ function print$1({ report, context }, _params) {
 		}
 	}
 }
-
 //#endregion
 //#region src/cli/reporters/json.ts
 function prepare({ report, context }, params) {
@@ -305,7 +285,7 @@ function prepare({ report, context }, params) {
 		context
 	};
 }
-function print$2({ report, context }, params) {
+function print({ report, context }, params) {
 	let logger = report.ok ? console.log : console.error;
 	let data = prepare({
 		context,
@@ -313,17 +293,18 @@ function print$2({ report, context }, params) {
 	}, 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]
+  $ css-coverage <coverage-dir> --min-coverage=<number> [options]
+
+${styleText("bold", "ARGUMENTS")}
+  <coverage-dir>        Where your Coverage JSON files are
 
 ${styleText("bold", "OPTIONS")}
 Required:
-  --coverage-dir        Where your Coverage JSON files are
   --min-coverage        Minimum overall CSS coverage [0-1]
 
 Optional:
@@ -342,21 +323,20 @@ Optional:
 
 ${styleText("bold", "EXAMPLES")}
   ${styleText("dim", "# analyze all .json files in ./coverage; require 80% overall coverage")}
-  $ css-coverage --coverage-dir=./coverage --min-coverage=0.8
+  $ css-coverage ./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
+  $ css-coverage ./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
+  $ css-coverage ./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 params = parse_arguments(cli_args);
 	let coverage_data = await read(params["coverage-dir"]);
 	let report = program({
 		min_coverage: params["min-coverage"],
@@ -364,8 +344,8 @@ async function cli(cli_args) {
 	}, 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);
+	if (params.reporter === "json") return print(report, params);
+	return print$2(report, params);
 }
 try {
 	await cli(process.argv.slice(2));
@@ -373,6 +353,5 @@ try {
 	console.error(error);
 	process.exit(1);
 }
-
 //#endregion
-export {  };
+export {};

package/dist/index.d.ts

@@ -1,28 +1,14 @@
-import * as v from "valibot";
-
 //#region src/lib/parse-coverage.d.ts
-declare let RangeSchema: v.ObjectSchema<{
-  readonly start: v.NumberSchema<undefined>;
-  readonly end: v.NumberSchema<undefined>;
-}, undefined>;
-type Range = v.InferInput<typeof RangeSchema>;
-declare let CoverageSchema: v.ObjectSchema<{
-  readonly text: v.StringSchema<undefined>;
-  readonly url: v.StringSchema<undefined>;
-  readonly ranges: v.ArraySchema<v.ObjectSchema<{
-    readonly start: v.NumberSchema<undefined>;
-    readonly end: v.NumberSchema<undefined>;
-  }, undefined>, undefined>;
-}, undefined>;
-type Coverage = v.InferInput<typeof CoverageSchema>;
-declare function parse_coverage(input: string): {
+type Range = {
+  start: number;
+  end: number;
+};
+type Coverage = {
   text: string;
   url: string;
-  ranges: {
-    start: number;
-    end: number;
-  }[];
-}[];
+  ranges: Range[];
+};
+declare function parse_coverage(input: string): Coverage[];
 //#endregion
 //#region src/lib/chunkify.d.ts
 type Chunk = {

package/dist/index.js

@@ -1,28 +1,17 @@
-import * as v from "valibot";
+import { tokenize } from "@projectwallace/css-parser/tokenizer";
 import { format } from "@projectwallace/format-css";
-
 //#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;
+	return Array.isArray(input) && input.every((item) => typeof item === "object" && item !== null && typeof item.text === "string" && typeof item.url === "string" && Array.isArray(item.ranges) && item.ranges.every((r) => typeof r === "object" && r !== null && typeof r.start === "number" && typeof r.end === "number"));
 }
 function parse_coverage(input) {
 	try {
-		let parse_result = JSON.parse(input);
-		return is_valid_coverage(parse_result) ? parse_result : [];
+		let parsed = JSON.parse(input);
+		return is_valid_coverage(parsed) ? parsed : [];
 	} catch {
 		return [];
 	}
 }
-
 //#endregion
 //#region src/lib/chunkify.ts
 const WHITESPACE_ONLY_REGEX = /^\s+$/;
@@ -38,7 +27,7 @@ function merge(stylesheet) {
 				latest_chunk.end_offset = chunk.end_offset;
 				previous_chunk = chunk;
 				continue;
-			} else if (WHITESPACE_ONLY_REGEX.test(stylesheet.text.slice(chunk.start_offset, chunk.end_offset)) || chunk.end_offset === chunk.start_offset) {
+			} else if (chunk.end_offset === chunk.start_offset) {
 				latest_chunk.end_offset = chunk.end_offset;
 				continue;
 			}
@@ -51,6 +40,48 @@ function merge(stylesheet) {
 		chunks: new_chunks
 	};
 }
+function mark_comments_as_covered(stylesheet) {
+	let new_chunks = [];
+	for (let chunk of stylesheet.chunks) {
+		if (chunk.is_covered) {
+			new_chunks.push(chunk);
+			continue;
+		}
+		let text = stylesheet.text.slice(chunk.start_offset, chunk.end_offset);
+		let comments = [];
+		for (const _ of tokenize(text, ({ start, end }) => comments.push({
+			start,
+			end
+		})));
+		if (comments.length === 0) {
+			new_chunks.push(chunk);
+			continue;
+		}
+		let last_end = 0;
+		for (let comment of comments) {
+			if (comment.start > last_end) new_chunks.push({
+				start_offset: chunk.start_offset + last_end,
+				end_offset: chunk.start_offset + comment.start,
+				is_covered: false
+			});
+			new_chunks.push({
+				start_offset: chunk.start_offset + comment.start,
+				end_offset: chunk.start_offset + comment.end,
+				is_covered: true
+			});
+			last_end = comment.end;
+		}
+		if (last_end < text.length) new_chunks.push({
+			start_offset: chunk.start_offset + last_end,
+			end_offset: chunk.end_offset,
+			is_covered: false
+		});
+	}
+	return merge({
+		...stylesheet,
+		chunks: new_chunks
+	});
+}
 function chunkify(stylesheet) {
 	let chunks = [];
 	let offset = 0;
@@ -70,7 +101,7 @@ function chunkify(stylesheet) {
 		});
 		offset = range.end;
 	}
-	if (offset !== stylesheet.text.length - 1) chunks.push({
+	if (offset < stylesheet.text.length) chunks.push({
 		start_offset: offset,
 		end_offset: stylesheet.text.length,
 		is_covered: false
@@ -81,14 +112,13 @@ function chunkify(stylesheet) {
 		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.substring(chunk.start_offset, chunk.end_offset - 1)).trim();
+		let css = format(stylesheet.text.substring(chunk.start_offset, chunk.end_offset)).trim();
 		if (chunk.is_covered) {
 			let is_last_chunk = index === stylesheet.chunks.length - 1;
 			if (index === 0) css = css + (is_last_chunk ? "" : "\n");
@@ -118,7 +148,6 @@ function prettify(stylesheet) {
 		text: pretty_chunks.map(({ css }) => css).join("\n")
 	};
 }
-
 //#endregion
 //#region src/lib/decuplicate.ts
 function merge_ranges(ranges) {
@@ -141,14 +170,7 @@ function merge_entry_ranges(sheet, entry) {
 		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 });
-		}
-	}
+	for (let range of entry.ranges) sheet.ranges.push({ ...range });
 	return sheet;
 }
 function deduplicate_entries(entries) {
@@ -163,7 +185,6 @@ function deduplicate_entries(entries) {
 		ranges: merge_ranges(ranges)
 	}));
 }
-
 //#endregion
 //#region src/lib/ext.ts
 function ext(url) {
@@ -175,7 +196,6 @@ function ext(url) {
 		return url.slice(ext_index, url.indexOf("/", ext_index) + 1);
 	}
 }
-
 //#endregion
 //#region src/lib/html-parser.ts
 /**
@@ -204,7 +224,6 @@ var DOMParser = class {
 		} };
 	}
 };
-
 //#endregion
 //#region src/lib/remap-html.ts
 function get_dom_parser() {
@@ -217,12 +236,14 @@ function remap_html(html, old_ranges) {
 	let new_ranges = [];
 	let current_offset = 0;
 	let style_elements = doc.querySelectorAll("style");
+	let search_from = 0;
 	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 start_index = html.indexOf(style_content, search_from);
 		let end_index = start_index + style_content.length;
+		search_from = end_index;
 		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)
@@ -234,7 +255,6 @@ function remap_html(html, old_ranges) {
 		ranges: new_ranges
 	};
 }
-
 //#endregion
 //#region src/lib/filter-entries.ts
 function is_html(text) {
@@ -279,7 +299,6 @@ function filter_coverage(acc, entry) {
 	}
 	return acc;
 }
-
 //#endregion
 //#region src/lib/extend-ranges.ts
 const AT_SIGN = 64;
@@ -296,12 +315,12 @@ function extend_ranges(coverage) {
 				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)) {
+					let next_char = text.charAt(next_offset);
+					while (/\s/.test(next_char)) {
 						next_offset++;
-						next_char$1 = text.charAt(next_offset);
+						next_char = text.charAt(next_offset);
 					}
-					if (next_char$1 === "{") range.end = range.end + 1;
+					if (next_char === "{") range.end = range.end + 1;
 					break;
 				}
 			}
@@ -317,7 +336,6 @@ function extend_ranges(coverage) {
 		url
 	};
 }
-
 //#endregion
 //#region src/lib/index.ts
 function ratio(fraction, total) {
@@ -360,7 +378,7 @@ function calculate_stylesheet_coverage({ text, url, chunks }) {
 }
 function calculate_coverage(coverage) {
 	let total_files_found = coverage.length;
-	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 coverage_per_stylesheet = deduplicate_entries(coverage.reduce((acc, entry) => filter_coverage(acc, entry), [])).map((coverage) => extend_ranges(coverage)).map((sheet) => mark_comments_as_covered(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;
@@ -391,6 +409,5 @@ function calculate_coverage(coverage) {
 		total_stylesheets: coverage_per_stylesheet.length
 	};
 }
-
 //#endregion
-export { calculate_coverage, parse_coverage };
+export { calculate_coverage, parse_coverage };

package/package.json

@@ -1,63 +1,67 @@
 {
 	"name": "@projectwallace/css-code-coverage",
-	"version": "0.9.0",
+	"version": "0.10.0",
 	"description": "Generate useful CSS Code Coverage report from browser-reported coverage",
-	"author": "Bart Veneman <bart@projectwallace.com>",
-	"repository": {
-		"type": "git",
-		"url": "git+https://github.com/projectwallace/css-code-coverage.git"
-	},
-	"issues": "https://github.com/projectwallace/css-code-coverage/issues",
-	"homepage": "https://github.com/projectwallace/css-code-coverage",
 	"keywords": [
-		"css",
 		"code",
 		"coverage",
+		"css",
+		"dead",
+		"styles",
 		"testing",
-		"used",
 		"unused",
-		"dead",
-		"styles"
+		"used"
 	],
+	"homepage": "https://github.com/projectwallace/css-code-coverage",
 	"license": "EUPL-1.2",
-	"engines": {
-		"node": ">=20"
+	"author": "Bart Veneman <bart@projectwallace.com>",
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/projectwallace/css-code-coverage.git"
+	},
+	"bin": {
+		"css-coverage": "dist/cli.mjs"
 	},
-	"type": "module",
 	"files": [
 		"dist"
 	],
-	"bin": {
-		"css-coverage": "dist/cli.js"
-	},
+	"type": "module",
 	"main": "dist/index.js",
+	"types": "dist/index.d.ts",
 	"exports": {
 		"types": "./dist/index.d.ts",
 		"default": "./dist/index.js"
 	},
-	"types": "dist/index.d.ts",
 	"scripts": {
 		"test": "c8 --reporter=text --reporter=lcov playwright test",
 		"build": "tsdown",
 		"check": "tsc --noEmit",
-		"lint": "oxlint --config .oxlintrc.json",
+		"lint": "oxlint --config .oxlintrc.json; oxfmt --check",
 		"lint-package": "publint",
 		"knip": "knip"
 	},
+	"dependencies": {
+		"@projectwallace/css-parser": "^0.13.8",
+		"@projectwallace/format-css": "^2.2.6"
+	},
 	"devDependencies": {
 		"@codecov/vite-plugin": "^1.9.1",
 		"@playwright/test": "^1.57.0",
 		"@projectwallace/preset-oxlint": "^0.0.7",
 		"@types/node": "^25.0.3",
-		"c8": "^10.1.3",
+		"c8": "^11.0.0",
 		"knip": "^5.82.0",
+		"oxfmt": "^0.41.0",
 		"oxlint": "^1.39.0",
 		"publint": "^0.3.16",
-		"tsdown": "^0.15.8",
+		"tsdown": "^0.21.2",
 		"typescript": "^5.9.3"
 	},
-	"dependencies": {
-		"@projectwallace/format-css": "^2.2.0",
-		"valibot": "^1.2.0"
-	}
+	"overrides": {
+		"@projectwallace/css-parser": "$@projectwallace/css-parser"
+	},
+	"engines": {
+		"node": ">=20"
+	},
+	"issues": "https://github.com/projectwallace/css-code-coverage/issues"
 }