add the biggest test suite possible

Author: bartveneman

src/cli/reporters/pretty.ts

@@ -65,25 +65,19 @@ export function print({ report, context }: Report, params: CliArguments) {
 
 				let lines = sheet.text.split('\n')
 
-				for (let chunk of sheet.chunks) {
-					let ls = chunk.css.split('\n')
-					// TODO FIX ME
-					for (let l = 0; l < ls.length; l++) {
-						console.log(styleText('red', line_number(l + chunk.start_line, false)), indent(ls[l]))
-					}
-
+				for (let chunk of sheet.chunks.filter((chunk) => !chunk.is_covered)) {
 					// Render N leading lines
-					// for (let x = Math.max(chunk.start_line - NUM_LEADING_LINES, 0); x < chunk.start_line; x++) {
-					// 	console.log(styleText('dim', line_number(x)), styleText('dim', indent(lines[x])))
-					// }
+					for (let x = Math.max(chunk.start_line - NUM_LEADING_LINES, 0); x < chunk.start_line; x++) {
+						console.log(styleText('dim', line_number(x)), styleText('dim', indent(lines[x - 1])))
+					}
 					// Render the uncovered chunk
-					// for (let i = chunk.start_line; i <= chunk.end_line; i++) {
-					// 	console.log(styleText('red', line_number(i, false)), indent(lines[i]))
-					// }
+					for (let i = chunk.start_line; i <= chunk.end_line; i++) {
+						console.log(styleText('red', line_number(i, false)), indent(lines[i - 1]))
+					}
 					// Render N trailing lines
-					// for (let y = chunk.end_line; Math.min(chunk.end_line + NUM_TRAILING_LINES, lines.length); y++) {
-					// 	console.log(styleText('dim', line_number(y)), styleText('dim', indent(lines[y])))
-					// }
+					for (let y = chunk.end_line; y < Math.min(chunk.end_line + NUM_TRAILING_LINES, lines.length); y++) {
+						console.log(styleText('dim', line_number(y)), styleText('dim', indent(lines[y - 1])))
+					}
 					// Show empty line between blocks
 					console.log()
 				}

src/lib/decuplicate.ts

@@ -1,7 +1,7 @@
 import type { Coverage, Range } from './parse-coverage.js'
 
 // Combine multiple adjecent ranges into a single one
-export function concatenate(ranges: Set<Range>): Range[] {
+export function concatenate(ranges: Set<Range> | Range[]): Range[] {
 	let result: Range[] = []
 
 	for (let range of ranges) {
@@ -22,13 +22,20 @@ function dedupe_list(ranges: Range[]): Set<Range> {
 	outer: for (let range of ranges) {
 		for (let processed_range of new_ranges) {
 			// Case: an existing range fits within this range -> replace it
+			// { start: 0, end: 100 },
+			// { start: 0, end: 200 }
 			if (range.start <= processed_range.start && range.end >= processed_range.end) {
 				new_ranges.delete(processed_range)
 				new_ranges.add(range)
 				continue outer
 			}
+
 			// Case: this range fits within an existing range -> skip it
+			// { start: 324, end: 485 }, --> exists
+			// { start: 364, end: 485 }, --> skip
+			// { start: 404, end: 485 }, --> skip
 			if (range.start >= processed_range.start && range.end <= processed_range.end) {
+				// console.log('skip', range)
 				continue outer
 			}
 			// Case: ranges partially overlap
@@ -40,6 +47,7 @@ function dedupe_list(ranges: Range[]): Set<Range> {
 					start: processed_range.start,
 					end: range.end,
 				})
+				continue outer
 			}
 		}
 		new_ranges.add(range)
@@ -56,7 +64,7 @@ function dedupe_list(ranges: Range[]): Set<Range> {
  * - only bytes of deduplicated stylesheets are counted
  */
 export function deduplicate_entries(entries: Coverage[]): Coverage[] {
-	let checked_stylesheets = new Map<string, { url: string; ranges: Set<Range> }>()
+	let checked_stylesheets = new Map<string, { url: string; ranges: Range[] }>()
 
 	for (let entry of entries) {
 		let text = entry.text
@@ -77,20 +85,20 @@ export function deduplicate_entries(entries: Coverage[]): Coverage[] {
 				}
 
 				if (!found) {
-					ranges.add(range)
+					ranges.push(range)
 				}
 			}
 		} else {
 			checked_stylesheets.set(text, {
 				url: entry.url,
-				ranges: dedupe_list(entry.ranges),
+				ranges: entry.ranges,
 			})
 		}
 	}
 
 	return Array.from(checked_stylesheets, ([text, { url, ranges }]) => ({
 		text,
 		url,
-		ranges: concatenate(ranges).sort((a, b) => a.start - b.start),
+		ranges: concatenate(dedupe_list(ranges.sort((a, b) => a.start - b.start))).sort((a, b) => a.start - b.start),
 	}))
 }

src/lib/index.ts

@@ -88,7 +88,9 @@ export async function calculate_coverage(coverage: Coverage[]): Promise<Coverage
 
 	let filtered_coverage: Coverage[] = await filter_coverage(coverage)
 	let deduplicated: Coverage[] = deduplicate_entries(filtered_coverage)
+	// console.log(deduplicated.find((s) => s.url.includes('Container')))
 	let extended: Coverage[] = extend_ranges(deduplicated)
+	// console.log(extended.find((s) => s.url.includes('Container')))
 	let chunkified: ChunkedCoverage[] = extended.map((sheet) => chunkify(sheet))
 	let prettified: PrettifiedCoverage[] = chunkified.map((sheet) => prettify(sheet))
 	let coverage_per_stylesheet = prettified.map((stylesheet) => calculate_stylesheet_coverage(stylesheet))