WIP: simplify steps like prettification etc.

Author: bartveneman

src/css-tree.d.ts

@@ -6,11 +6,11 @@ import type { Coverage, Range } from './parse-coverage.ts'
  * - 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
  */
-export function deduplicate_entries(entries: Coverage[]): Map<NonNullable<Coverage['text']>, Pick<Coverage, 'ranges' | 'url'>> {
+export function deduplicate_entries(entries: Coverage[]): Coverage[] {
 	let checked_stylesheets = new Map<string, { url: string; ranges: Range[] }>()
 
 	for (let entry of entries) {
-		let text = entry.text || ''
+		let text = entry.text
 		if (checked_stylesheets.has(text)) {
 			let sheet = checked_stylesheets.get(text)!
 			let ranges = sheet.ranges
@@ -36,5 +36,5 @@ export function deduplicate_entries(entries: Coverage[]): Map<NonNullable<Covera
 		}
 	}
 
-	return checked_stylesheets
+	return Array.from(checked_stylesheets, ([text, { url, ranges }]) => ({ text, url, ranges }))
 }

src/decuplicate.ts

@@ -7,16 +7,16 @@ test('handles a single entry', () => {
 		ranges: [{ start: 0, end: 4 }],
 		url: 'example.com',
 	}
-	expect(deduplicate_entries([entry])).toEqual(new Map([[entry.text, { url: entry.url, ranges: entry.ranges }]]))
+	expect(deduplicate_entries([entry])).toEqual([entry])
 })
 
-test('deduplicats a simple duplicate entry', () => {
+test('deduplicates a simple duplicate entry', () => {
 	let entry = {
 		text: 'a {}',
 		ranges: [{ start: 0, end: 4 }],
 		url: 'example.com',
 	}
-	expect(deduplicate_entries([entry, entry])).toEqual(new Map([[entry.text, { url: entry.url, ranges: entry.ranges }]]))
+	expect(deduplicate_entries([entry, entry])).toEqual([entry])
 })
 
 test('merges two identical texts with different URLs and identical ranges', () => {
@@ -33,7 +33,7 @@ test('merges two identical texts with different URLs and identical ranges', () =
 		},
 	]
 	let first = entries.at(0)!
-	expect(deduplicate_entries(entries)).toEqual(new Map([[first.text, { url: first.url, ranges: first.ranges }]]))
+	expect(deduplicate_entries(entries)).toEqual([{ text: first.text, url: first.url, ranges: first.ranges }])
 })
 
 test('merges different ranges on identical CSS, different URLs', () => {
@@ -50,9 +50,7 @@ test('merges different ranges on identical CSS, different URLs', () => {
 		},
 	]
 	let first = entries.at(0)!
-	expect(deduplicate_entries(entries)).toEqual(
-		new Map([[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: [first.ranges[0], entries[1]!.ranges[0]] }])
 })
 
 test('merges different ranges on identical CSS, identical URLs', () => {
@@ -68,9 +66,9 @@ test('merges different ranges on identical CSS, identical URLs', () => {
 			url: 'example.com',
 		},
 	]
-	expect(deduplicate_entries(entries)).toEqual(
-		new Map([[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: [entries[0]!.ranges[0], entries[1]!.ranges[0]] },
+	])
 })
 
 test('does not merge different CSS with different URLs and identical ranges', () => {
@@ -86,12 +84,10 @@ test('does not merge different CSS with different URLs and identical ranges', ()
 			url: 'example.com/b',
 		},
 	]
-	expect(deduplicate_entries(entries)).toEqual(
-		new Map([
-			[entries[0]!.text, { url: entries[0]!.url, ranges: entries[0]!.ranges }],
-			[entries[1]!.text, { url: entries[1]!.url, ranges: entries[1]!.ranges }],
-		]),
-	)
+	expect(deduplicate_entries(entries)).toEqual([
+		{ text: entries[0]!.text, url: entries[0]!.url, ranges: entries[0]!.ranges },
+		{ text: entries[1]!.text, url: entries[1]!.url, ranges: entries[1]!.ranges },
+	])
 })
 
 test('does not merge different CSS with same URLs and identical ranges', () => {
@@ -107,10 +103,8 @@ test('does not merge different CSS with same URLs and identical ranges', () => {
 			url: 'example.com',
 		},
 	]
-	expect(deduplicate_entries(entries)).toEqual(
-		new Map([
-			[entries[0]!.text, { url: entries[0]!.url, ranges: entries[0]!.ranges }],
-			[entries[1]!.text, { url: entries[1]!.url, ranges: entries[1]!.ranges }],
-		]),
-	)
+	expect(deduplicate_entries(entries)).toEqual([
+		{ text: entries[0]!.text, url: entries[0]!.url, ranges: entries[0]!.ranges },
+		{ text: entries[1]!.text, url: entries[1]!.url, ranges: entries[1]!.ranges },
+	])
 })

src/deduplicate.test.ts

@@ -11,7 +11,6 @@ export function filter_coverage(coverage: Coverage[], parse_html?: Parser): Cove
 	let result = []
 
 	for (let entry of coverage) {
-		if (!entry.text) continue
 		let extension = ext(entry.url).toLowerCase()
 		if (extension === 'js') continue