soooo close now

Author: bartveneman

src/lib/decuplicate.ts

@@ -1,5 +1,21 @@
 import type { Coverage, Range } from './parse-coverage.js'
 
+// Combine multiple adjecent ranges into a single one
+export function concatenate(ranges: Set<Range>): Range[] {
+	let result: Range[] = []
+
+	for (let range of ranges) {
+		// Update the last range if this range starts at last-range-end + 1
+		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: Range[]): Set<Range> {
 	let new_ranges: Set<Range> = new Set()
 
@@ -75,6 +91,6 @@ export function deduplicate_entries(entries: Coverage[]): Coverage[] {
 	return Array.from(checked_stylesheets, ([text, { url, ranges }]) => ({
 		text,
 		url,
-		ranges: Array.from(ranges).sort((a, b) => a.start - b.start),
+		ranges: concatenate(ranges).sort((a, b) => a.start - b.start),
 	}))
 }

src/lib/deduplicate.test.ts

@@ -50,7 +50,7 @@ test('merges different ranges on identical CSS, different URLs', () => {
 		},
 	]
 	let first = entries.at(0)!
-	expect(deduplicate_entries(entries)).toEqual([{ text: first.text, url: first.url, ranges: [first.ranges[0], entries[1]!.ranges[0]] }])
+	expect(deduplicate_entries(entries)).toEqual([{ text: first.text, url: first.url, ranges: [{ start: 0, end: 9 }] }])
 })
 
 test('merges different ranges on identical CSS, identical URLs', () => {
@@ -66,9 +66,7 @@ test('merges different ranges on identical CSS, identical URLs', () => {
 			url: 'example.com',
 		},
 	]
-	expect(deduplicate_entries(entries)).toEqual([
-		{ text: entries[0]!.text, url: entries[0]!.url, ranges: [entries[0]!.ranges[0], entries[1]!.ranges[0]] },
-	])
+	expect(deduplicate_entries(entries)).toEqual([{ text: entries[0]!.text, url: entries[0]!.url, ranges: [{ start: 0, end: 9 }] }])
 })
 
 test('does not merge different CSS with different URLs and identical ranges', () => {

src/lib/index.ts

@@ -1,6 +1,6 @@
 import { type Coverage, type Range } from './parse-coverage.js'
 import { prettify, type PrettifiedChunk, type PrettifiedCoverage } from './prettify.js'
-import { deduplicate_entries } from './decuplicate.js'
+import { deduplicate_entries, concatenate } from './decuplicate.js'
 import { filter_coverage } from './filter-entries.js'
 import { extend_ranges } from './extend-ranges.js'
 import { chunkify, type ChunkedCoverage } from './chunkify.js'
@@ -95,6 +95,26 @@ export async function calculate_coverage(coverage: Coverage[]): Promise<Coverage
 	// console.log('extended')
 	// console.log(extended.at(0))
 	// console.log()
+	// let concatenated: Coverage[] = extended.map((cov) => ({
+	// 	...cov,
+	// 	ranges: concatenate(cov.ranges),
+	// }))
+	// console.log('concatenated')
+	// console.log(concatenated.at(0))
+	// console.log()
+	// if (concatenated.at(0)!.ranges[0].start !== 0) {
+	// 	console.log(0, concatenated.at(0)!.ranges[0].start)
+	// 	console.log(concatenated.at(0)!.text.substring(0, concatenated.at(0)!.ranges[0].start))
+	// 	console.log()
+	// }
+	// for (let i = 0; i < concatenated.at(0)!.ranges.length; i++) {
+	// 	let str = concatenated.at(0)!.text.slice(concatenated.at(0)!.ranges[i].end, concatenated.at(0)!.ranges[i + 1]?.start)
+	// 	if (str.trim().length > 0) {
+	// 		console.log(concatenated.at(0)!.ranges[i].end, concatenated.at(0)!.ranges[i + 1]?.start)
+	// 		console.log(str)
+	// 		console.log()
+	// 	}
+	// }
 	let chunkified: ChunkedCoverage[] = extended.map((sheet) => chunkify(sheet))
 	// console.log('chunkified')
 	// console.log(chunkified.at(0))

src/lib/prettify.ts

@@ -30,7 +30,7 @@ export function prettify(stylesheet: ChunkedCoverage): PrettifiedCoverage {
 			} else {
 				// mark the newline after the previous uncovered block as covered
 				// and mark the line between this chunk and the next on as covered
-				css = '\n' + css + (is_last ? '' : '\n')
+				css = '\n' + css + '\n'
 			}
 		}
 

src/lib/test/kitchen-sink.test.ts

@@ -271,4 +271,22 @@ test.describe('Wallace mega soverage suite', () => {
 			{ is_covered: true, start_line: 25, end_line: 44 },
 		])
 	})
+
+	// This was a notoriously difficult one to fix
+	test('main sheet has partial coverage', async () => {
+		let data = coverage.find(({ url }) => url.endsWith('0.RC2DzJv0.css')) as Coverage
+		let result = await calculate_coverage([data])
+		let sheet = result.coverage_per_stylesheet.at(0)!
+		expect.soft(sheet.chunks.filter((c) => !c.is_covered).map(({ start_line, end_line, css }) => ({ start_line, end_line }))).toEqual([
+			{ start_line: 77, end_line: 81 }, // @media print { .nav-list.svelte-1h32yp1
+			{ start_line: 127, end_line: 130 }, // .nav-popover-trigger.svelte-1h32yp1.invisible
+			{ start_line: 146, end_line: 152 }, // @supports not (right: anchor(end)) { .nav-popover
+			{ start_line: 171, end_line: 173 }, // .popover-item.svelte-1h32yp1[aria-current=\"page\"]:hover
+			{ start_line: 198, end_line: 202 }, // @media print { .footer.svelte-jz8lnl
+			{ start_line: 275, end_line: 277 }, // .shortcut.svelte-1c8nzn6:hover
+			{ start_line: 296, end_line: 298 }, // .cmd-k.svelte-1ux7hi0:focus-visible
+			{ start_line: 1291, end_line: 1293 }, // .theme-popover-trigger.svelte-mls84d:focus-visible
+			{ start_line: 1318, end_line: 1324 }, // @supports not (right: anchor(end)) { .theme-popover.svelte-mls84d
+		])
+	})
 })